[Pkg-kde-commits] rev 977 - in branches/kde-3.4.0/packages/kdelibs/debian: . patches
Christopher Martin
chrsmrtn-guest@costa.debian.org
Wed, 06 Apr 2005 22:56:51 +0000
Author: chrsmrtn-guest
Date: 2005-04-06 22:56:40 +0000 (Wed, 06 Apr 2005)
New Revision: 977
Added:
branches/kde-3.4.0/packages/kdelibs/debian/patches/01_kdelibs_branch_2005-04-06.diff
branches/kde-3.4.0/packages/kdelibs/debian/patches/16_default_fonts.diff
Removed:
branches/kde-3.4.0/packages/kdelibs/debian/patches/01_kdelibs_branch_2005-03-18.diff
Modified:
branches/kde-3.4.0/packages/kdelibs/debian/changelog
branches/kde-3.4.0/packages/kdelibs/debian/patches/98_buildprep.diff
Log:
Branch pull, and the kdelibs half of a font patch I've been brewing...
Modified: branches/kde-3.4.0/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/changelog 2005-04-05 22:31:25 UTC (rev 976)
+++ branches/kde-3.4.0/packages/kdelibs/debian/changelog 2005-04-06 22:56:40 UTC (rev 977)
@@ -1,4 +1,4 @@
-kdelibs (4:3.4.0-0pre2) experimental; urgency=low
+kdelibs (4:3.4.0-0pre3) experimental; urgency=low
* New upstream release.
Deleted: branches/kde-3.4.0/packages/kdelibs/debian/patches/01_kdelibs_branch_2005-03-18.diff
Added: branches/kde-3.4.0/packages/kdelibs/debian/patches/01_kdelibs_branch_2005-04-06.diff
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/patches/01_kdelibs_branch_2005-04-06.diff 2005-04-05 22:31:25 UTC (rev 976)
+++ branches/kde-3.4.0/packages/kdelibs/debian/patches/01_kdelibs_branch_2005-04-06.diff 2005-04-06 22:56:40 UTC (rev 977)
@@ -0,0 +1,20355 @@
+diff -Nru kdelibs-release-3.4.0/admin/acinclude.m4.in kdelibs-branch-3.4/admin/acinclude.m4.in
+--- kdelibs-release-3.4.0/admin/acinclude.m4.in 2005-02-09 17:21:09.000000000 -0500
++++ kdelibs-branch-3.4/admin/acinclude.m4.in 2005-03-24 14:18:09.000000000 -0500
+@@ -1644,7 +1644,15 @@
+
+ AC_MSG_RESULT([$kde_cv_uic_plugins])
+ if test "$kde_cv_uic_plugins" != yes; then
+- AC_MSG_ERROR([you need to install kdelibs first.])
++ AC_MSG_ERROR([
++you need to install kdelibs first.
++
++If you did install kdelibs, then the Qt version that is picked up by
++this configure is not the same version you used to compile kdelibs.
++The Qt Plugin installed by kdelibs is *ONLY* loadable if its the
++same Qt version, compiled with the same compiler and the same Qt
++configuration settings.
++])
+ fi
+ fi
+ ])
+@@ -3104,8 +3112,8 @@
+ fi
+ rm -f conftest.h conftest.h.gch
+ fi
+- AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
+ fi
++ AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
+ if test "$CXX" = "KCC"; then
+ dnl unfortunately we currently cannot disable exception support in KCC
+ dnl because doing so is binary incompatible and Qt by default links with exceptions :-(
+@@ -3194,6 +3202,51 @@
+ ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
+ ])
+
++AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG],
++ [
++ AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], kde_cv_val_gcc_visibility_bug,
++ [
++ AC_LANG_SAVE
++ AC_LANG_CPLUSPLUS
++
++ safe_CXXFLAGS=$CXXFLAGS
++ safe_LDFLAGS=$LDFLAGS
++ CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
++ LDFLAGS="$LDFLAGS -shared -fPIC"
++
++ AC_TRY_LINK(
++ [
++ /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
++ template<typename CharT>
++ struct VisTest
++ {
++ inline VisTest ();
++ };
++ template<typename CharT>
++ inline VisTest<CharT>::VisTest()
++ {}
++ extern template class VisTest<char>; // It works if we drop that line
++ int some_function( int do_something ) __attribute__ ((visibility("default")));
++ int some_function( int )
++ {
++ VisTest<char> a;
++ return 0;
++ }
++ ], [/* elvis is alive */],
++ kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes)
++
++ CXXFLAGS=$safe_CXXFLAGS
++ LDFLAGS=$safe_LDFLAGS
++ AC_LANG_RESTORE
++ ]
++ )
++
++ if test x$kde_cv_val_gcc_visibility_bug = xno; then
++ CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
++ fi
++ ]
++)
++
+ AC_DEFUN([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY],
+ [
+ if test "$GXX" = "yes"; then
+@@ -3202,7 +3255,9 @@
+ KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
+ KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
+ [
+- CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
++ CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
++ KDE_CHECK_VISIBILITY_GCC_BUG
++
+ HAVE_GCC_VISIBILITY=1
+ AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
+ ])
+diff -Nru kdelibs-release-3.4.0/admin/am_edit kdelibs-branch-3.4/admin/am_edit
+--- kdelibs-release-3.4.0/admin/am_edit 2004-12-17 15:18:28.000000000 -0500
++++ kdelibs-branch-3.4/admin/am_edit 2005-03-29 04:15:16.000000000 -0500
+@@ -483,6 +483,7 @@
+ $MakefileData =~ s/$lookup/$replacement/;
+ $lookup =~ s/\\\$\\\(CXXFLAGS\\\)/\\\$\\\(KCXXFLAGS\\\)/;
+ $replacement = "$stuff_before\$(KCXXFLAGS) \$(KDE_CXXFLAGS)$stuff_after";
++ next if ($stuff_before =~ /\$\(KDE_CXXFLAGS\)/ or $stuff_after =~ /\$\(KDE_CXXFLAGS\)/);
+ substituteLine($lookup, $replacement);
+ } else {
+ $found = 0;
+@@ -634,7 +635,7 @@
+ if ($pre eq '' && exists($varcontent{$variable})) {
+ my @addlist = split(/[\034\s]+/, $varcontent{$variable});
+ push(@objlist, @addlist);
+- } elsif ($variable !~ 'OBJEXT') {
++ } elsif ($variable !~ 'OBJEXT' && $variable !~ /am__objects_\d+/ ) {
+ $ocv = 1;
+ }
+ }
+@@ -2276,7 +2277,7 @@
+ "\t echo \"\$\$i\"; \\\n" .
+ "\t if ! ";
+ $t .= $cxxsuffix eq "KKK" ?
+- "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(KDE_CXXFLAGS) " :
++ "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(CXXFLAGS) \$(KDE_CXXFLAGS) " :
+ "\$(CXXCOMPILE) ";
+ $t .= " --dump-class-hierarchy -c \$\$i.bchecktest.cc; then \\\n" .
+ "\t rm -f \$\$i.bchecktest.cc; exit 1; \\\n" .
+@@ -2352,7 +2353,7 @@
+ $MakefileData =~ s/\034/\\\n/g; # Restore continuation lines
+ # Append our $progId line, _below_ the "generated by automake" line
+ # because automake-1.6 relies on the first line to be his own.
+- my $progIdLine = "\# $progId - " . '$Revision: 1.412 $ '."\n";
++ my $progIdLine = "\# $progId - " . '$Revision: 1.412.6.3 $ '."\n";
+ if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) {
+ warn "automake line not found in $makefile\n";
+ # Fallback: first line
+diff -Nru kdelibs-release-3.4.0/arts/kde/mcop-dcop/kmcop.desktop kdelibs-branch-3.4/arts/kde/mcop-dcop/kmcop.desktop
+--- kdelibs-release-3.4.0/arts/kde/mcop-dcop/kmcop.desktop 2005-02-23 00:04:12.000000000 -0500
++++ kdelibs-branch-3.4/arts/kde/mcop-dcop/kmcop.desktop 2005-03-10 11:04:42.000000000 -0500
+@@ -2,12 +2,10 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=KMCOP
+-Name[af]=Kmcop
+ Name[hi]=के-एमकॉप
+-Name[xx]=xxKMCOPxx
+ Exec=kmcop
+ Comment=KDE MCOP-DCOP Bridge
+-Comment[af]=Kde MCOP-DCOP Brug
++Comment[af]=KDE MCOP-DCOP Brug
+ Comment[ar]=جسر KDE MCOP-DCOP
+ Comment[az]=KDE MCOP-DCOP Körpüsü
+ Comment[be]=Мост KDE MCOP-DCOP
+@@ -71,7 +69,6 @@
+ Comment[uz]=KDE MCOP-DCOP кўприги
+ Comment[ven]=KDE MCOP-DCOP Buroho
+ Comment[xh]=KDE MCOP-DCOP Ibhulorho
+-Comment[xx]=xxKDE MCOP-DCOP Bridgexx
+ Comment[zh_CN]=KDED MCOP-DCOP 桥
+ Comment[zh_TW]=KDE MCOP-DCOP 橋樑
+ Comment[zu]=Ibhulogo le-KDE MCOP-DCOP
+diff -Nru kdelibs-release-3.4.0/arts/knotify/knotify.cpp kdelibs-branch-3.4/arts/knotify/knotify.cpp
+--- kdelibs-release-3.4.0/arts/knotify/knotify.cpp 2004-12-15 06:03:57.000000000 -0500
++++ kdelibs-branch-3.4/arts/knotify/knotify.cpp 2005-03-17 10:26:27.000000000 -0500
+@@ -388,11 +388,8 @@
+ if ( present & KNotifyClient::Sound ) // && QFile(sound).isReadable()
+ notifyBySound( sound, fromApp, eventId );
+
+- if ( present & KNotifyClient::PassivePopup )
+- notifyByPassivePopup( text, fromApp, checkWinId( fromApp, winId ));
+-
+- else if ( present & KNotifyClient::Messagebox )
+- notifyByMessagebox( text, level, checkWinId( fromApp, winId ));
++ if ( present & KNotifyClient::Execute )
++ notifyByExecute( commandline, event, fromApp, text, winId, eventId );
+
+ if ( present & KNotifyClient::Logfile ) // && QFile(file).isWritable()
+ notifyByLogfile( text, file );
+@@ -400,12 +397,14 @@
+ if ( present & KNotifyClient::Stderr )
+ notifyByStderr( text );
+
+- if ( present & KNotifyClient::Execute )
+- notifyByExecute( commandline, event, fromApp, text, winId, eventId );
+-
+ if ( present & KNotifyClient::Taskbar )
+ notifyByTaskbar( checkWinId( fromApp, winId ));
+
++ if ( present & KNotifyClient::PassivePopup )
++ notifyByPassivePopup( text, fromApp, checkWinId( fromApp, winId ));
++ else if ( present & KNotifyClient::Messagebox )
++ notifyByMessagebox( text, level, checkWinId( fromApp, winId ));
++
+ QByteArray qbd;
+ QDataStream ds(qbd, IO_WriteOnly);
+ ds << event << fromApp << text << sound << file << present << level
+diff -Nru kdelibs-release-3.4.0/arts/knotify/knotify.desktop kdelibs-branch-3.4/arts/knotify/knotify.desktop
+--- kdelibs-release-3.4.0/arts/knotify/knotify.desktop 2005-02-23 00:04:14.000000000 -0500
++++ kdelibs-branch-3.4/arts/knotify/knotify.desktop 2005-03-07 09:13:12.000000000 -0500
+@@ -23,7 +23,6 @@
+ Name[tg]=Хабарҳои системавӣ
+ Name[th]=ระบบแจ้งเตือน - K
+ Name[ven]=U divhadza ha K
+-Name[xx]=xxKNotifyxx
+ Name[zu]=I-KNotify
+ Exec=knotify
+ Comment=KDE Notification Daemon
+@@ -97,7 +96,6 @@
+ Comment[vi]=Daemon thông báo của KDE
+ Comment[wa]=Démon di notifiaedje di KDE
+ Comment[xh]=Daemon Ulwaziso lwe KDE
+-Comment[xx]=xxKDE Notification Daemonxx
+ Comment[zh_CN]=KDE 通告守护进程
+ Comment[zh_TW]=KDE 通知服務程式
+ Comment[zu]=Isaziso se-Daemon ye-KDE
+diff -Nru kdelibs-release-3.4.0/dnssd/configure.in.bot kdelibs-branch-3.4/dnssd/configure.in.bot
+--- kdelibs-release-3.4.0/dnssd/configure.in.bot 2005-02-10 08:28:45.000000000 -0500
++++ kdelibs-branch-3.4/dnssd/configure.in.bot 2005-03-10 14:03:43.000000000 -0500
+@@ -1,4 +1,4 @@
+-if test -z "$LIB_DNSSD"; then
++if test "$have_libdns_sd" = "no"; then
+ echo ""
+ echo "You're missing Apple mDNSResponder 85 or later, therefore"
+ echo "dnssd will be compiled as stub, without any real functionality."
+diff -Nru kdelibs-release-3.4.0/dnssd/configure.in.in kdelibs-branch-3.4/dnssd/configure.in.in
+--- kdelibs-release-3.4.0/dnssd/configure.in.in 2005-01-15 16:14:28.000000000 -0500
++++ kdelibs-branch-3.4/dnssd/configure.in.in 2005-03-10 14:03:43.000000000 -0500
+@@ -8,7 +8,11 @@
+ save_dnssdtest_CPPFLAGS="$CPPFLAGS"
+ LDFLAGS="$all_libraries $LDFLAGS"
+ CPPFLAGS="$CPPFLAGS $all_includes"
+-LIBS="-ldns_sd"
++case $host_os in
++ darwin*) LIBS="" ;;
++ *) LIBS="-ldns_sd" ;;
++esac
++have_libdns_sd="no"
+ AC_TRY_LINK( [
+ #include <dns_sd.h>
+ ],[
+@@ -16,7 +20,11 @@
+ TXTRecordDeallocate( (TXTRecordRef*) 0);
+ ],[
+ AC_DEFINE(HAVE_DNSSD,1,[Define if dns-sd is available])
+- LIB_DNSSD="-ldns_sd"
++ case $host_os in
++ darwin*) LIB_DNSSD="" ;;
++ *) LIB_DNSSD="-ldns_sd" ;;
++ esac
++ have_libdns_sd="yes"
+ AC_MSG_RESULT(yes)
+ ],[
+ AC_MSG_RESULT(no)
+@@ -27,5 +35,5 @@
+ LIBS=$save_dnssdtest_LIBS
+ fi
+ AC_SUBST(LIB_DNSSD)
+-AM_CONDITIONAL(HAVE_DNSSD, test -n "$LIB_DNSSD")
++AM_CONDITIONAL(HAVE_DNSSD, test "$have_libdns_sd" = "yes")
+
+diff -Nru kdelibs-release-3.4.0/dnssd/publicservice.cpp kdelibs-branch-3.4/dnssd/publicservice.cpp
+--- kdelibs-release-3.4.0/dnssd/publicservice.cpp 2004-12-12 07:35:38.000000000 -0500
++++ kdelibs-branch-3.4/dnssd/publicservice.cpp 2005-03-25 06:45:27.000000000 -0500
+@@ -18,7 +18,12 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
++#include "config.h"
++
+ #include "publicservice.h"
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
+ #include <netinet/in.h>
+ #include <qapplication.h>
+ #include "sdevent.h"
+diff -Nru kdelibs-release-3.4.0/interfaces/kimproxy/interface/dcopinstantmessenger.desktop kdelibs-branch-3.4/interfaces/kimproxy/interface/dcopinstantmessenger.desktop
+--- kdelibs-release-3.4.0/interfaces/kimproxy/interface/dcopinstantmessenger.desktop 2005-02-23 00:04:14.000000000 -0500
++++ kdelibs-branch-3.4/interfaces/kimproxy/interface/dcopinstantmessenger.desktop 2005-03-10 11:04:42.000000000 -0500
+@@ -3,6 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=DCOP/InstantMessenger
+ Comment=Instant Messenger with a DCOP interface
++Comment[af]=Oombliklike Boodskapper met DCOP intervlak
+ Comment[bg]=Програма за съобщения в реално време с интерфейс DCOP
+ Comment[bn]=ডিকপ (DCOP) ইন্টারফেস সহ ইনস্ট্যান্ট মেসেঞ্জার
+ Comment[bs]=Instant poruke sa DCOP interfejsom
+@@ -42,11 +43,10 @@
+ Comment[sk]=Instant Messanger s rozhraním DCOP
+ Comment[sl]=Takojšni sporočilnik z vmesnikom DCOP
+ Comment[sr]=Брзи гласник са DCOP интерфејсом
+-Comment[sr@Latn]=Брзи гласник са DCOP интерфејсом
++Comment[sr@Latn]=Brzi glasnik sa DCOP interfejsom
+ Comment[sv]=Direktmeddelanden med ett DCOP-gränssnitt
+ Comment[ta]=உடனடி செய்தியாளர் DCOP இடைமுகத்தோடு
+ Comment[tg]=Клиенти мубодилаи иттилоот бо интерфейси DCOP
+ Comment[tr]=DCOP arayüzüyle Anında Mesajlaşma
+ Comment[uk]=Програма для миттєвого зв'язку через DCOP
+-Comment[xx]=xxInstant Messenger with a DCOP interfacexx
+ Comment[zh_CN]=带 DCOP 接口的即时通讯程序
+diff -Nru kdelibs-release-3.4.0/interfaces/kimproxy/interface/kcm_instantmessenger.desktop kdelibs-branch-3.4/interfaces/kimproxy/interface/kcm_instantmessenger.desktop
+--- kdelibs-release-3.4.0/interfaces/kimproxy/interface/kcm_instantmessenger.desktop 2005-02-23 00:04:14.000000000 -0500
++++ kdelibs-branch-3.4/interfaces/kimproxy/interface/kcm_instantmessenger.desktop 2005-03-30 01:47:17.000000000 -0500
+@@ -1,16 +1,19 @@
+ Name=Instant Messenger
++Name[af]=Oombliklike Boodskapper
+ Name[bg]=Съобщения в реално време
+ Name[bn]=ইনস্ট্যান্ট মেসেঞ্জার
+ Name[bs]=Instant poruke
+ Name[ca]=Missatgeria instantània
+ Name[cs]=Komunikátor
+ Name[cy]=Negesydd Chwim
++Name[el]=Στιγμιαίος αποστολέας
+ Name[eo]=Tujmesaĝilo
+ Name[et]=Kiirsuhtlus
++Name[eu]=Berehalako mezularitza
+ Name[fi]=Pikaviestiohjelma
+ Name[fr]=Messagerie instantanée
+ Name[ga]=Clár teachtaireachtaí meandaracha
+-Name[he]=מסרים מיידיים
++Name[he]=מסרים מידיים
+ Name[hi]=इंस्टैंट मैसेंजर
+ Name[hu]=Azonnali üzenetküldő
+ Name[is]=Spjallforrit
+@@ -32,16 +35,16 @@
+ Name[se]=Šleađgadieđut
+ Name[sl]=Takojšni sporočilnik
+ Name[sr]=Брзи гласник
+-Name[sr@Latn]=Брзи гласник
++Name[sr@Latn]=Brzi glasnik
+ Name[sv]=Direktmeddelanden
+ Name[ta]=உடனடி செய்தியாளர்
+ Name[tg]=Мубодилаи иттилоотҳо
+ Name[tr]=Anında Mesajlaşma
+ Name[uk]=Програма для миттєвого зв'язку через DCOP
+ Name[uz]=Хабар алмашиш воситаси
+-Name[xx]=xxInstant Messengerxx
+ 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[bg]=Разговор между различни хора в реално време.
+ Comment[bn]=ইনস্ট্যান্ট মেসেঞ্জার একাধিক ব্যক্তি বা গোষ্ঠীকে দ্বিমুখী বার্তালাপ বা আড্ডার সুযোগ দেয়।
+ Comment[bs]=Program za instant poruke omogućuje dvosmjernu komunikaciju između pojedinaca i grupa.
+@@ -81,13 +84,12 @@
+ Comment[sk]=Instant messenger umožňuje rozhovor medzi rôznymi osobami a skupinami.
+ Comment[sl]=Takojšni sporočilnik omogoča dvosmeren klepet med posamezniki in skupinami.
+ Comment[sr]=Брзи гласник вам омогућава двосмерно ћаскање између индивидуа и група.
+-Comment[sr@Latn]=Брзи гласник вам омогућава двосмерно ћаскање између индивидуа и група.
++Comment[sr@Latn]=Brzi glasnik vam omogućava dvosmerno ćaskanje između individua i grupa.
+ Comment[sv]=Direktmeddelanden möjliggör tvåvägschatt mellan individer och grupper.
+ Comment[ta]=உடனடி தகவல் உங்களை இரண்டு வழியில் தனிநபர் மற்றும் குழுக்கள் இடையே அனுமதிக்கும்.
+ Comment[tg]=Клиенти мубодилаи иттилоот барои мубодилаи иттилоот байни одамон ва гурӯҳҳо хизмат мерасонад.
+ Comment[tr]=Anında mesajlaştırıcı iki yollu sohbet sağlar: bireyler ve gruplar.
+ Comment[uk]=Програма для миттєвого зв'язку дозволяє розмовляти з іншою людиною чи групою людей.
+-Comment[xx]=xxThe instant messenger allows two-way chat between individuals and groups.xx
+ Comment[zh_CN]=允许在个人和群组之间双向聊天的即时通讯程序。
+ ServiceTypeToConfigure=DCOP/InstantMessenger
+ MimeTypeOfInterest=DCOP/InstantMessenger
+diff -Nru kdelibs-release-3.4.0/interfaces/kscript/sample/shellscript.desktop kdelibs-branch-3.4/interfaces/kscript/sample/shellscript.desktop
+--- kdelibs-release-3.4.0/interfaces/kscript/sample/shellscript.desktop 2005-02-23 00:04:16.000000000 -0500
++++ kdelibs-branch-3.4/interfaces/kscript/sample/shellscript.desktop 2005-03-10 11:04:42.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Bash Shell Script Runner
++Name[af]=Bash Tolk Skrip Hardloper
+ Name[az]=Bash Qabıq Skripti İcraçısı
+ Name[bn]=ব্যাশ শেল স্ক্রিপ্ট চালক
+ Name[bs]=Izvršavanje Bash shell skripti
+@@ -53,13 +54,13 @@
+ Name[uk]=Виконувач скриптів командної оболонки (bash)
+ Name[uz]=Bash шелл скриптини ишга тушурувчи
+ Name[wa]=Enondeu di scripes shell bash
+-Name[xx]=xxBash Shell Script Runnerxx
+ Name[zh_CN]=Bash Shell 脚本运行程序
+ Type=Service
+ X-KDE-Library=libshellscript
+ X-KDE-Script-Runner=ShellScript/bash
+ ServiceTypes=KScriptRunner/KScriptRunner
+ Comment=Runs bash shell scripts from inside the application.
++Comment[af]=Laai bash tolk skripte vanuit die program.
+ Comment[ar]=يشغَل bash shell scripts من داخل التطبيق
+ Comment[az]=Proqramın içindən bash qabıq skriptlərini icra edin
+ Comment[bg]=Изпълнение на скриптове на bash от друга програма.
+@@ -118,6 +119,5 @@
+ Comment[uk]=Запускає скрипти командної оболонки (bash) з програми.
+ Comment[uz]=Дастурларнинг ичдан bash шелл скриптини ишга туширади
+ Comment[wa]=Enonder des scripes shell bash a pårti do programe
+-Comment[xx]=xxRuns bash shell scripts from inside the application.xx
+ Comment[zh_CN]=在应用程序内运行 bash shell 脚本。
+ Comment[zh_TW]=於程式內執行 bash shell script 檔案
+diff -Nru kdelibs-release-3.4.0/interfaces/kscript/scriptinterface.desktop kdelibs-branch-3.4/interfaces/kscript/scriptinterface.desktop
+--- kdelibs-release-3.4.0/interfaces/kscript/scriptinterface.desktop 2005-02-23 00:04:15.000000000 -0500
++++ kdelibs-branch-3.4/interfaces/kscript/scriptinterface.desktop 2005-03-07 09:13:13.000000000 -0500
+@@ -67,7 +67,6 @@
+ Comment[vi]=Đây là bộ script thử nghiệm chung cho việc thử các script giao diện
+ Comment[wa]=Çouchal est on programe di saye po vey kimint rote l' eterface di scripes.
+ Comment[xh]=Olu luvavanyo luka wonke-wonke lwenjini yokushicilelweyo yokuvavanya ujongano loshicilelo.
+-Comment[xx]=xxThis is a generic test script engine for testing the script interface.xx
+ Comment[zh_CN]=这是一个用于测试脚本接口的通用脚本测试引擎。
+ Comment[zh_TW]=這是用來測試手稿介面用的一般性測試手稿引擎
+ Comment[zu]=Lena yinjini yesikripti sokuvivinya sawonke wonke yokuvivinya isikripti somxhumanisi.
+diff -Nru kdelibs-release-3.4.0/interfaces/kspeech/dcoptexttospeech.desktop kdelibs-branch-3.4/interfaces/kspeech/dcoptexttospeech.desktop
+--- kdelibs-release-3.4.0/interfaces/kspeech/dcoptexttospeech.desktop 2005-02-23 00:04:16.000000000 -0500
++++ kdelibs-branch-3.4/interfaces/kspeech/dcoptexttospeech.desktop 2005-03-27 02:28:40.000000000 -0500
+@@ -5,6 +5,7 @@
+ Comment=Text-to-Speech Service with a DCOP interface
+ Comment[bg]=Синтез на глас с интерфейс DCOP
+ Comment[bn]=ডিকপ (DCOP) ইন্টারফেস সহ টেক্সট-টু-স্পীচ সার্ভিস
++Comment[bs]=Servis za izgovaranje teksta sa DCOP interfejsom
+ Comment[ca]=Servei de síntesi de veu amb una interfície DCOP
+ Comment[cs]=Služba text-na-řeč s DCOP rozhraním
+ Comment[cy]=Gwasanaeth Testun-i-Lafar efo rhyngwyneb DCOP
+@@ -12,12 +13,16 @@
+ Comment[de]=Sprachausgabe mit DCOP-Schnittstelle
+ Comment[es]=Texto a servicio de voz con un interfaz DCOP
+ Comment[et]=Teksti kõneks muutmise teenus DCOP liidesega
++Comment[eu]=DCOP interfazea duen testua-hitz-egitera
++Comment[fi]=Teksti-Puheeksi palvelu DCOP-rajapinnalla
+ Comment[fr]=Service de synthèse vocale munie d'une interface DCOP
+ Comment[ga]=Seirbhís Téacs-go-Caint le comhéadan DCOP
++Comment[he]=שירות טקסט לדיבור עם ממשק DCOP
++Comment[hi]=डीकॉप इंटरफेस सहित पाठ से ध्वनि
+ Comment[hsb]=konwertowanje teksta na rěč z DCOP-interfejsom
+ Comment[hu]=Szövegfelolvasó szolgáltatás DCOP-felülettel
+ Comment[is]=Texti-í-tal þjónusta með DCOP viðmóti
+-Comment[it]=Servizio di lettura vocale di testi con un'interfaccia DCOP
++Comment[it]=Servizio di pronuncia con un'interfaccia DCOP
+ Comment[lt]=Teksto vertimo kalba tarnyba su DCOP sąsaja
+ Comment[nb]=Tekst til tale-program med DCOP-grensesnitt
+ Comment[nl]=Tekst-tot-spraak-dienst met een DCOP interface
+@@ -31,8 +36,7 @@
+ Comment[sk]=Služba prevodu textu na reč s rozhraním DCOP
+ Comment[sl]=Servis, ki spremeni besedilo v govor, z vmesnikom DCOP
+ Comment[sr]=Текст—у—говор сервис са DCOP интерфејсом
+-Comment[sr@Latn]=Текст—у—говор сервис са DCOP интерфејсом
++Comment[sr@Latn]=Tekst—u—govor servis sa DCOP interfejsom
+ Comment[sv]=Text till tal-tjänst med ett DCOP-gränssnitt
+ Comment[uk]=Служба синтезу мовлення з інтерфейсом DCOP
+-Comment[xx]=xxText-to-Speech Service with a DCOP interfacexx
+ Comment[zh_CN]=带 DCOP 接口的文本到语音服务
+diff -Nru kdelibs-release-3.4.0/interfaces/ktexteditor/kcm_ktexteditor.desktop kdelibs-branch-3.4/interfaces/ktexteditor/kcm_ktexteditor.desktop
+--- kdelibs-release-3.4.0/interfaces/ktexteditor/kcm_ktexteditor.desktop 2005-02-23 00:04:17.000000000 -0500
++++ kdelibs-branch-3.4/interfaces/ktexteditor/kcm_ktexteditor.desktop 2005-03-07 09:13:14.000000000 -0500
+@@ -63,7 +63,6 @@
+ Name[ven]=Musengulusi wa manwalwa o dzheniswaho
+ Name[wa]=Ravalé aspougneu di tecse
+ Name[xh]=Umhleli Wombhalo Olungiselelweyo
+-Name[xx]=xxEmbedded Text Editorxx
+ Name[zh_CN]=嵌入式文本编辑器
+ Name[zh_TW]=嵌入式文字編輯器
+ Name[zu]=Umlungisi Wombhalo Oshuthekiwe
+@@ -129,7 +128,6 @@
+ Comment[uz]=Матн тарҳрирчи хизмати дастурларни матн кўрувчи ва таҳрирчи билан таъминлайди. Матн таҳрирлаш имкониятини яратувчи KDE дастурлари шу хизматни ишлатиши керак.
+ Comment[ven]=Tshumelo ya musengulusi wa manwalwa i diswa apulifikhesheni dzirena na vhavhoni vha manwalwa na musengulusi. Apulifikhesheni ya KDE ine ya disa zwishumiswa zwa u sengulusa manwalwa i fanela u shumisa tshumelo ino.
+ Comment[xh]=Inkonzo yomhleli wombhalo onika izicelo ngombonisi wombhalo nomhleli Izicelo ze KDE ezinikezela ngohlelo lombhalo ekufuneka isebenzise lenkonzo.
+-Comment[xx]=xxThe text editor service provides applications with a text viewer and editor. KDE applications that provide text editing facilities should use this service.xx
+ Comment[zh_CN]=文本编辑器服务提供了文本查看器和编辑器的应用程序。提供文本编辑功能的 KDE 应用程序都应该使用此服务。
+ Comment[zh_TW]=文字編輯服務提供程式一個文字檢視器以及編輯器。提供文字編輯功能的 KDE 程式擁該使用這項服務。
+ Comment[zu]=Umsebenzi womlungisi wombhalo onikeza imiyaleli ngombukisi wombhalo kanye nomhleli.Abayaleli abanikeza izisebenzi zokulungisa umbhalo okumele zisebenzise lomsebenzi.
+diff -Nru kdelibs-release-3.4.0/interfaces/ktexteditor/ktexteditor.desktop kdelibs-branch-3.4/interfaces/ktexteditor/ktexteditor.desktop
+--- kdelibs-release-3.4.0/interfaces/ktexteditor/ktexteditor.desktop 2005-02-23 00:04:17.000000000 -0500
++++ kdelibs-branch-3.4/interfaces/ktexteditor/ktexteditor.desktop 2005-03-07 09:13:14.000000000 -0500
+@@ -69,7 +69,6 @@
+ Comment[ven]=Khomphonente ya musengulusi ya manwalwa (ina Doc/u khethekana ha u vhona)
+ Comment[vi]=Componet của trình soạn thảo văn bản có thể embeđ
+ Comment[xh]=Inxenye Yomhleli Wombhalo Olungiselelweyo (ngo Xwebhu/Ulwahlulo Lwemboniselo)
+-Comment[xx]=xxEmbeddable Text Editor Component (with Doc/View Separation)xx
+ Comment[zh_CN]=可嵌入的文本编辑器部件(带 文档/查看 分离)
+ Comment[zh_TW]=可嵌入的文字編輯器元件 (Doc/View 分開)
+ Comment[zu]=IIunga Lomlungisi Wombhalo (Ngokuhlukana kwe-Doc/Umbukiso)
+diff -Nru kdelibs-release-3.4.0/interfaces/ktexteditor/ktexteditoreditor.desktop kdelibs-branch-3.4/interfaces/ktexteditor/ktexteditoreditor.desktop
+--- kdelibs-release-3.4.0/interfaces/ktexteditor/ktexteditoreditor.desktop 2005-02-23 00:04:17.000000000 -0500
++++ kdelibs-branch-3.4/interfaces/ktexteditor/ktexteditoreditor.desktop 2005-03-07 09:13:14.000000000 -0500
+@@ -69,7 +69,6 @@
+ Comment[ven]=Khomphonente ya musengulusi wa manwalwa (i sina Doc/U khethekana hau vhona)
+ Comment[vi]=Componet của trình soạn thảo văn bản có thể Embed( không phan^ biệtn Doc/ View)
+ Comment[xh]=Ingxenye Yomhleli Wombhalo Olungiselekayo (ngaphandle Koxwebhu/Ulwahlulo Lwemboniselo)
+-Comment[xx]=xxEmbeddable Text Editor Component (without Doc/View Separation)xx
+ Comment[zh_CN]=可嵌入的文本编辑器部件(不带 文档/查看 分离)
+ Comment[zh_TW]=可嵌入的文字編輯器元件 (Doc/View 不分開)
+ Comment[zu]=Ilunga Lomlungisi Wombhalo (ngaphandle Kokuhlukana kwe-Doc/Umbukiso)
+diff -Nru kdelibs-release-3.4.0/interfaces/ktexteditor/ktexteditorplugin.desktop kdelibs-branch-3.4/interfaces/ktexteditor/ktexteditorplugin.desktop
+--- kdelibs-release-3.4.0/interfaces/ktexteditor/ktexteditorplugin.desktop 2005-02-23 00:04:17.000000000 -0500
++++ kdelibs-branch-3.4/interfaces/ktexteditor/ktexteditorplugin.desktop 2005-03-10 11:04:43.000000000 -0500
+@@ -4,6 +4,7 @@
+ X-KDE-ServiceType=KTextEditor/Plugin
+ X-KDE-Derived=
+ Comment=KTextEditor Plugin
++Comment[af]=KTextEditor Inprop Module
+ Comment[ar]=مساعد برنامج KTextEditor
+ Comment[az]=KTextEditor Əlavəsi
+ Comment[be]=Дапаўненьне K Тэкставага рэдактара
+@@ -57,7 +58,7 @@
+ Comment[sl]=Vstavek KTextEditor
+ Comment[sq]=Shtojca KTextEditor
+ Comment[sr]=KTextEditor прикључак
+-Comment[sr@Latn]=KTextEditor dodatak
++Comment[sr@Latn]=KTextEditor priključak
+ Comment[ss]=I-plugini ye KTextEditor
+ Comment[sv]=Insticksprogram för texteditor
+ Comment[ta]=கேஉரைதொகுப்பி சொருகுப்பொருள்
+@@ -68,7 +69,6 @@
+ Comment[ven]=Pulagini ya musengulusi wa manwalwa a K
+ Comment[wa]=Tchôke-divins KTextEditor
+ Comment[xh]=KTextEditor ye Plagi efakiweyo
+-Comment[xx]=xxKTextEditor Pluginxx
+ Comment[zh_CN]=KTextEditor 插件
+ Comment[zh_TW]=KTextEditor 外掛程式
+ Comment[zu]= Ukungena ngaphakathi kwe-KTextEditor
+diff -Nru kdelibs-release-3.4.0/kabc/distributionlistdialog.cpp kdelibs-branch-3.4/kabc/distributionlistdialog.cpp
+--- kdelibs-release-3.4.0/kabc/distributionlistdialog.cpp 2004-07-08 05:55:37.000000000 -0400
++++ kdelibs-branch-3.4/kabc/distributionlistdialog.cpp 2005-03-09 10:19:35.000000000 -0500
+@@ -53,12 +53,15 @@
+ {
+ }
+
++static QMap<QWidget*,QString> *sEmailMap = 0;
+
+ EmailSelector::EmailSelector( const QStringList &emails, const QString ¤t,
+ QWidget *parent ) :
+ KDialogBase( KDialogBase::Plain, i18n("Select Email Address"), Ok, Ok,
+ parent )
+ {
++ if (!sEmailMap)
++ sEmailMap = new QMap<QWidget*,QString>();
+ QFrame *topFrame = plainPage();
+ QBoxLayout *topLayout = new QVBoxLayout( topFrame );
+
+@@ -69,8 +72,9 @@
+ QStringList::ConstIterator it;
+ for( it = emails.begin(); it != emails.end(); ++it ) {
+ QRadioButton *button = new QRadioButton( *it, mButtonGroup );
++ sEmailMap->insert( button, *it );
+ if ( (*it) == current ) {
+- button->setDown( true );
++ mButtonGroup->setButton(mButtonGroup->id(button));
+ }
+ }
+ }
+@@ -78,7 +82,7 @@
+ QString EmailSelector::selected()
+ {
+ QButton *button = mButtonGroup->selected();
+- if ( button ) return button->text();
++ if ( button ) return (*sEmailMap)[button];
+ return QString::null;
+ }
+
+diff -Nru kdelibs-release-3.4.0/kabc/formats/binary.desktop kdelibs-branch-3.4/kabc/formats/binary.desktop
+--- kdelibs-release-3.4.0/kabc/formats/binary.desktop 2005-02-23 00:04:19.000000000 -0500
++++ kdelibs-branch-3.4/kabc/formats/binary.desktop 2005-03-07 09:13:14.000000000 -0500
+@@ -66,7 +66,6 @@
+ Name[ven]=Zwivhili
+ Name[wa]=Binaire
+ Name[xh]=Ephindwe kabini
+-Name[xx]=xxBinaryxx
+ Name[zh_CN]=二进制
+ Name[zh_TW]=二進位
+ Name[zu]=Okuhambisana ngambili
+diff -Nru kdelibs-release-3.4.0/kabc/kab2kabc.desktop kdelibs-branch-3.4/kabc/kab2kabc.desktop
+--- kdelibs-release-3.4.0/kabc/kab2kabc.desktop 2005-02-23 00:04:18.000000000 -0500
++++ kdelibs-branch-3.4/kabc/kab2kabc.desktop 2005-03-07 09:13:14.000000000 -0500
+@@ -13,7 +13,6 @@
+ Name[pt_BR]=Conversão de kab para kabc
+ Name[ro]=Kab2kabc
+ Name[sv]=Kab2kabc
+-Name[xx]=xxkab2kabcxx
+ Name[zu]=i-kab2kabc
+ Exec=kab2kabc --disable-autostart --quiet
+ Icon=misc
+@@ -84,7 +83,6 @@
+ Comment[ven]=Tshishumiswa tsha u shandukisa libkab itshi ya kha libkabc
+ Comment[vi]=Công cụ hoán chuyển libkab thành libkabc .
+ Comment[xh]=libkab kwi libkabc isixhobo sokuguqulela.
+-Comment[xx]=xxlibkab to libkabc conversion tool.xx
+ Comment[zh_CN]=libkab 到 libkabc 的转换工具。
+ Comment[zh_TW]=libkab 至 libkabc 轉換工具
+ Comment[zu]=Ithuluzi lokuguqula le-libkab kuyaku-libkabc
+diff -Nru kdelibs-release-3.4.0/kabc/kabc_manager.desktop kdelibs-branch-3.4/kabc/kabc_manager.desktop
+--- kdelibs-release-3.4.0/kabc/kabc_manager.desktop 2005-02-23 00:04:18.000000000 -0500
++++ kdelibs-branch-3.4/kabc/kabc_manager.desktop 2005-03-30 01:47:18.000000000 -0500
+@@ -3,13 +3,16 @@
+ Encoding=UTF-8
+ Name=Contacts
+ Name[br]=Darempredoù
++Name[bs]=Kontakti
+ Name[ca]=Contactes
+ Name[cs]=Kontakty
+ Name[cy]=Cysylltau
+ Name[de]=Kontakte
++Name[el]=Επαφές
+ Name[es]=Contactos
+ Name[et]=Kontaktid
+ Name[eu]=Kontaktuak
++Name[fi]=Yhteystiedot
+ Name[fy]=Kontakten
+ Name[ga]=Teagmhálacha
+ Name[he]=אנשי קשר
+@@ -21,7 +24,7 @@
+ Name[lt]=Kontaktai
+ Name[mk]=Контакти
+ Name[nb]=Kontakter
+-Name[nl]=Contacten
++Name[nl]=Contactpersonen
+ Name[nn]=Kontaktar
+ Name[pa]=ਸੰਪਰਕ
+ Name[pl]=Kontakty
+@@ -33,12 +36,11 @@
+ Name[sk]=Kontakty
+ Name[sl]=Stiki
+ Name[sr]=Контакти
+-Name[sr@Latn]=Контакти
++Name[sr@Latn]=Kontakti
+ Name[sv]=Kontakter
+ Name[ta]=தொடர்புகள்
+ Name[tg]=Алоқаҳо
+ Name[uk]=Контакти
+-Name[xx]=xxContactsxx
+ Name[zh_CN]=联系人
+ Type=Service
+ ServiceTypes=KResources/Manager
+diff -Nru kdelibs-release-3.4.0/kabc/lock.cpp kdelibs-branch-3.4/kabc/lock.cpp
+--- kdelibs-release-3.4.0/kabc/lock.cpp 2004-08-02 15:12:30.000000000 -0400
++++ kdelibs-branch-3.4/kabc/lock.cpp 2005-03-06 17:25:30.000000000 -0500
+@@ -99,8 +99,11 @@
+ kdWarning(5700) << "Removed stale lock file from process '" << app << "'"
+ << endl;
+ } else {
++ QString identifier( mIdentifier );
++ identifier.replace( '_', '/' );
++
+ mError = i18n("The resource '%1' is locked by application '%2'.")
+- .arg( mIdentifier.replace( '_', '/' ) ).arg( app );
++ .arg( identifier ).arg( app );
+ return false;
+ }
+ }
+diff -Nru kdelibs-release-3.4.0/kabc/plugins/dir/dir.desktop kdelibs-branch-3.4/kabc/plugins/dir/dir.desktop
+--- kdelibs-release-3.4.0/kabc/plugins/dir/dir.desktop 2005-02-23 00:04:19.000000000 -0500
++++ kdelibs-branch-3.4/kabc/plugins/dir/dir.desktop 2005-03-07 09:13:15.000000000 -0500
+@@ -71,7 +71,6 @@
+ Name[vi]=Thư mục
+ Name[wa]=Ridant
+ Name[xh]=Ulawulo
+-Name[xx]=xxDirectoryxx
+ Name[zh_CN]=目录
+ Name[zh_TW]=目錄
+ Name[zu]=Uhlu lwamafayela
+diff -Nru kdelibs-release-3.4.0/kabc/plugins/evolution/evolution.desktop kdelibs-branch-3.4/kabc/plugins/evolution/evolution.desktop
+--- kdelibs-release-3.4.0/kabc/plugins/evolution/evolution.desktop 2005-02-23 00:04:20.000000000 -0500
++++ kdelibs-branch-3.4/kabc/plugins/evolution/evolution.desktop 2005-03-07 09:13:15.000000000 -0500
+@@ -15,7 +15,6 @@
+ Name[ven]=Tsikoni
+ Name[wa]=Evolucion
+ Name[xh]=Utshintsho lwendawo ngokwenqanawa
+-Name[xx]=xxEvolutionxx
+ Name[zu]=Evolushini
+ X-KDE-Library=kabc_evo
+ Type=Service
+diff -Nru kdelibs-release-3.4.0/kabc/plugins/file/file.desktop kdelibs-branch-3.4/kabc/plugins/file/file.desktop
+--- kdelibs-release-3.4.0/kabc/plugins/file/file.desktop 2005-01-23 23:26:30.000000000 -0500
++++ kdelibs-branch-3.4/kabc/plugins/file/file.desktop 2005-03-10 11:04:43.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=File
++Name[af]=Lêer
+ Name[ar]=ملفّ
+ Name[az]=Fayl
+ Name[be]=Файл
+@@ -60,7 +61,6 @@
+ Name[uk]=Файл
+ Name[uz]=Файл
+ Name[wa]=Fitchî
+-Name[xx]=xxFilexx
+ Name[zh_CN]=文件
+ X-KDE-Library=kabc_file
+ Type=Service
+diff -Nru kdelibs-release-3.4.0/kabc/plugins/ldapkio/ldapkio.desktop kdelibs-branch-3.4/kabc/plugins/ldapkio/ldapkio.desktop
+--- kdelibs-release-3.4.0/kabc/plugins/ldapkio/ldapkio.desktop 2004-10-25 22:42:12.000000000 -0400
++++ kdelibs-branch-3.4/kabc/plugins/ldapkio/ldapkio.desktop 2005-03-07 09:13:15.000000000 -0500
+@@ -3,7 +3,6 @@
+ Name=LDAP
+ Name[bn]=এল-ডি-এ-পি (LDAP)
+ Name[hi]=एलडीएपी (LDAP)
+-Name[xx]=xxLDAPxx
+ X-KDE-Library=kabc_ldapkio
+ Type=Service
+ ServiceTypes=KResources/Plugin
+diff -Nru kdelibs-release-3.4.0/kabc/plugins/net/net.desktop kdelibs-branch-3.4/kabc/plugins/net/net.desktop
+--- kdelibs-release-3.4.0/kabc/plugins/net/net.desktop 2005-02-23 00:04:20.000000000 -0500
++++ kdelibs-branch-3.4/kabc/plugins/net/net.desktop 2005-03-10 11:04:43.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Network
++Name[af]=Netwerk
+ Name[ar]=الشبكة
+ Name[az]=Şəbəkə
+ Name[be]=Сетка
+@@ -68,7 +69,6 @@
+ Name[vi]=Mạng
+ Name[wa]=Rantoele
+ Name[xh]=Umsebenzi womnatha
+-Name[xx]=xxNetworkxx
+ Name[zh_CN]=网络
+ Name[zh_TW]=網路
+ Name[zu]=Umsebenzi wokuxhumana okusakazekile
+diff -Nru kdelibs-release-3.4.0/kabc/plugins/sql/sql.desktop kdelibs-branch-3.4/kabc/plugins/sql/sql.desktop
+--- kdelibs-release-3.4.0/kabc/plugins/sql/sql.desktop 2004-10-25 22:42:12.000000000 -0400
++++ kdelibs-branch-3.4/kabc/plugins/sql/sql.desktop 2005-03-10 11:04:44.000000000 -0500
+@@ -1,11 +1,9 @@
+ [Misc]
+ Encoding=UTF-8
+ Name=SQL
+-Name[af]=Sql
+ Name[bn]=এস-কিউ-এল (SQL)
+ Name[hi]=एसक्यूएल (SQL)
+ Name[ss]=I-SQL
+-Name[xx]=xxSQLxx
+
+ [Plugin]
+ Type=sql
+diff -Nru kdelibs-release-3.4.0/kabc/scripts/addressee.src.cpp kdelibs-branch-3.4/kabc/scripts/addressee.src.cpp
+--- kdelibs-release-3.4.0/kabc/scripts/addressee.src.cpp 2005-01-31 13:55:41.000000000 -0500
++++ kdelibs-branch-3.4/kabc/scripts/addressee.src.cpp 2005-03-28 16:16:02.000000000 -0500
+@@ -2,6 +2,7 @@
+ This file is part of libkabc.
+ Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
+ Copyright (c) 2003 Carsten Pfeiffer <pfeiffer@kde.org>
++ Copyright (c) 2005 Ingo Kloecker <kloecker@kde.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+@@ -196,7 +197,7 @@
+ QString spaceStr = " ";
+ QString emptyStr = "";
+ AddresseeHelper *helper = AddresseeHelper::self();
+-
++
+ int i = str.find( ',' );
+ if( i < 0 ) {
+ QStringList parts = QStringList::split( spaceStr, str );
+@@ -817,61 +818,158 @@
+ void Addressee::parseEmailAddress( const QString &rawEmail, QString &fullName,
+ QString &email)
+ {
+- int startPos, endPos, len;
+- QString partA, partB, result;
+- char endCh = '>';
+-
+- startPos = rawEmail.find( '<' );
+- if ( startPos < 0 ) {
+- startPos = rawEmail.find( '(' );
+- endCh = ')';
+- }
+-
+- if ( startPos < 0 ) {
+- // We couldn't find any separators, so we assume the whole string
+- // is the email address
+- email = rawEmail;
+- fullName = "";
+- } else {
+- // We have a start position, try to find an end
+- endPos = rawEmail.find( endCh, startPos + 1 );
++ // This is a simplified version of KPIM::splitAddress().
+
+- if ( endPos < 0 ) {
+- // We couldn't find the end of the email address. We can only
+- // assume the entire string is the email address.
+- email = rawEmail;
+- fullName = "";
+- } else {
+- // We have a start and end to the email address
+-
+- // Grab the name part
+- QString left = rawEmail.left( startPos ).stripWhiteSpace();
+- // grab the email part
+- QString right = rawEmail.mid( startPos + 1, endPos - startPos - 1 )
+- .stripWhiteSpace();
+-
+- // Either "Name <email>" or "email (Name)"
+- if ( endCh == '>' ) {
+- fullName = left;
+- email = right;
+- } else { // endCh == ')'
+- fullName = right;
+- email = left;
++ fullName = "";
++ email = "";
++ if ( rawEmail.isEmpty() )
++ return; // KPIM::AddressEmpty;
++
++ // The code works on 8-bit strings, so convert the input to UTF-8.
++ QCString address = rawEmail.utf8();
++
++ QCString displayName;
++ QCString addrSpec;
++ QCString comment;
++
++ // The following is a primitive parser for a mailbox-list (cf. RFC 2822).
++ // The purpose is to extract a displayable string from the mailboxes.
++ // Comments in the addr-spec are not handled. No error checking is done.
++
++ enum { TopLevel, InComment, InAngleAddress } context = TopLevel;
++ bool inQuotedString = false;
++ int commentLevel = 0;
++ bool stop = false;
++
++ for ( char* p = address.data(); *p && !stop; ++p ) {
++ switch ( context ) {
++ case TopLevel : {
++ switch ( *p ) {
++ case '"' : inQuotedString = !inQuotedString;
++ displayName += *p;
++ break;
++ case '(' : if ( !inQuotedString ) {
++ context = InComment;
++ commentLevel = 1;
++ }
++ else
++ displayName += *p;
++ break;
++ case '<' : if ( !inQuotedString ) {
++ context = InAngleAddress;
++ }
++ else
++ displayName += *p;
++ break;
++ case '\\' : // quoted character
++ displayName += *p;
++ ++p; // skip the '\'
++ if ( *p )
++ displayName += *p;
++ else
++ //return KPIM::UnexpectedEnd;
++ goto ABORT_PARSING;
++ break;
++ case ',' : if ( !inQuotedString ) {
++ //if ( allowMultipleAddresses )
++ // stop = true;
++ //else
++ // return KPIM::UnexpectedComma;
++ goto ABORT_PARSING;
++ }
++ else
++ displayName += *p;
++ break;
++ default : displayName += *p;
++ }
++ break;
++ }
++ case InComment : {
++ switch ( *p ) {
++ case '(' : ++commentLevel;
++ comment += *p;
++ break;
++ case ')' : --commentLevel;
++ if ( commentLevel == 0 ) {
++ context = TopLevel;
++ comment += ' '; // separate the text of several comments
++ }
++ else
++ comment += *p;
++ break;
++ case '\\' : // quoted character
++ comment += *p;
++ ++p; // skip the '\'
++ if ( *p )
++ comment += *p;
++ else
++ //return KPIM::UnexpectedEnd;
++ goto ABORT_PARSING;
++ break;
++ default : comment += *p;
++ }
++ break;
++ }
++ case InAngleAddress : {
++ switch ( *p ) {
++ case '"' : inQuotedString = !inQuotedString;
++ addrSpec += *p;
++ break;
++ case '>' : if ( !inQuotedString ) {
++ context = TopLevel;
++ }
++ else
++ addrSpec += *p;
++ break;
++ case '\\' : // quoted character
++ addrSpec += *p;
++ ++p; // skip the '\'
++ if ( *p )
++ addrSpec += *p;
++ else
++ //return KPIM::UnexpectedEnd;
++ goto ABORT_PARSING;
++ break;
++ default : addrSpec += *p;
+ }
++ break;
++ }
++ } // switch ( context )
++ }
+
+- // Check that we do not have any extra characters on the end of the
+- // strings
+- len = fullName.length();
+- if ( fullName[ 0 ] == '"' && fullName[ len - 1 ] == '"' )
+- fullName = fullName.mid( 1, len - 2 );
+- else if ( fullName[ 0 ] == '(' && fullName[ len - 1 ] == ')' )
+- fullName = fullName.mid( 1, len - 2 );
+-
+- len = email.length();
+- if ( email[ 0 ] == '<' && email[ len - 1 ] == '>' )
+- email = email.mid( 1, len - 2 );
++ABORT_PARSING:
++ displayName = displayName.stripWhiteSpace();
++ comment = comment.stripWhiteSpace();
++ addrSpec = addrSpec.stripWhiteSpace();
++
++ fullName = QString::fromUtf8( displayName );
++ email = QString::fromUtf8( addrSpec );
++
++ // check for errors
++ if ( inQuotedString )
++ return; // KPIM::UnbalancedQuote;
++ if ( context == InComment )
++ return; // KPIM::UnbalancedParens;
++ if ( context == InAngleAddress )
++ return; // KPIM::UnclosedAngleAddr;
++
++ if ( addrSpec.isEmpty() ) {
++ if ( displayName.isEmpty() )
++ return; // KPIM::NoAddressSpec;
++ else {
++ //addrSpec = displayName;
++ //displayName.truncate( 0 );
++ // Address of the form "foo@bar" or "foo@bar (Name)".
++ email = fullName;
++ fullName = QString::fromUtf8( comment );
+ }
+ }
++
++ // Check that we do not have any extra characters on the end of the
++ // strings
++ unsigned int len = fullName.length();
++ if ( fullName[ 0 ] == '"' && fullName[ len - 1 ] == '"' )
++ fullName = fullName.mid( 1, len - 2 );
+ }
+
+ void Addressee::setResource( Resource *resource )
+diff -Nru kdelibs-release-3.4.0/kate/data/cpp.xml kdelibs-branch-3.4/kate/data/cpp.xml
+--- kdelibs-release-3.4.0/kate/data/cpp.xml 2004-12-29 15:29:27.000000000 -0500
++++ kdelibs-branch-3.4/kate/data/cpp.xml 2005-03-11 16:09:03.000000000 -0500
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE language SYSTEM "language.dtd">
+-<language name="C++" version="1.29" kateversion="2.4" section="Sources" extensions="*.cxx;*.cpp;*.cc;*.C;*.h;*.H;*.hxx;*.hpp;*.hcc;*.moc" mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr" priority="9">
++<language name="C++" version="1.30" kateversion="2.4" section="Sources" extensions="*.cxx;*.cpp;*.cc;*.C;*.h;*.H;*.hxx;*.hpp;*.hcc;*.moc" mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr" priority="9">
+ <highlighting>
+ <list name="keywords">
+ <item> asm </item>
+@@ -86,6 +86,7 @@
+ <item> emit </item>
+ <item> signals </item>
+ <item> slots </item>
++ <item> foreach </item>
+ </list>
+ <list name="types">
+ <item> auto </item>
+diff -Nru kdelibs-release-3.4.0/kate/data/fortran.xml kdelibs-branch-3.4/kate/data/fortran.xml
+--- kdelibs-release-3.4.0/kate/data/fortran.xml 2005-02-14 12:52:17.000000000 -0500
++++ kdelibs-branch-3.4/kate/data/fortran.xml 2005-04-01 15:06:28.000000000 -0500
+@@ -1,8 +1,12 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE language SYSTEM "language.dtd">
+-<language name="Fortran" version="1.08" kateversion="2.4" section="Sources" extensions="*.f;*.F;*.for;*.FOR;*.f90;*.F90;*.fpp;*.FPP;*.f95;*.F95;" mimetype="text/x-fortran-src" casesensitive="0" author="Franchin Matteo (fnch@libero.it)" license="LGPL">
++<language name="Fortran" version="1.11" kateversion="2.4" section="Sources" extensions="*.f;*.F;*.for;*.FOR;*.f90;*.F90;*.fpp;*.FPP;*.f95;*.F95;" mimetype="text/x-fortran-src" casesensitive="0" author="Franchin Matteo (fnch@libero.it)" license="LGPL">
+ <!-- by Franchin Matteo, fnch@libero.it -->
+ <highlighting>
++
++<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
++<!-- * L I S T S * -->
++<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
+ <list name="keywords">
+ <item> allocate </item>
+ <item> break </item>
+@@ -20,15 +24,10 @@
+ <item> elsewhere </item>
+ <item> elseif </item>
+ <item> else </item>
+- <item> enddo </item>
+- <item> endif </item>
+- <item> end </item>
+- <item> endselect </item>
+ <item> equivalence </item>
+ <item> exit </item>
+ <item> external </item>
+ <item> for </item>
+- <item> function </item>
+ <item> go </item>
+ <item> goto </item>
+ <item> if </item>
+@@ -36,14 +35,13 @@
+ <item> include </item>
+ <item> interface </item>
+ <item> intrinsic </item>
+- <item> module </item>
++ <item> namelist </item>
+ <item> none </item>
+ <item> nullify </item>
+ <item> operator </item>
+ <item> assignment </item>
+ <item> pause </item>
+ <item> procedure </item>
+- <item> program </item>
+ <item> pure </item>
+ <item> elemental </item>
+ <item> record </item>
+@@ -51,8 +49,8 @@
+ <item> result </item>
+ <item> return </item>
+ <item> select </item>
++ <item> selectcase </item>
+ <item> stop </item>
+- <item> subroutine </item>
+ <item> then </item>
+ <item> to </item>
+ <item> use </item>
+@@ -72,10 +70,66 @@
+ <item> write </item>
+ <item> format </item>
+ </list>
++ <!-- Keywords inside read(...), write(...), backspace(...),
++ rewind(...), endfile(...), close(...) -->
++ <list name="io_keywords">
++ <item> unit </item>
++ <item> end </item>
++ <item> err </item>
++ <item> fmt </item>
++ <item> iostat </item>
++ <item> status </item>
++ <item> advance </item>
++ <item> size </item>
++ <item> eor </item>
++ </list>
++ <!-- Keywords inside open(...) -->
++ <list name="open_keywords">
++ <item> unit </item>
++ <item> iostat </item>
++ <item> err </item>
++ <item> file </item>
++ <item> status </item>
++ <item> access </item>
++ <item> form </item>
++ <item> recl </item>
++ <item> blank </item>
++ <item> position </item>
++ <item> action </item>
++ <item> delim </item>
++ <item> pad </item>
++ </list>
++ <!-- Keywords inside inquire(...) -->
++ <list name="inquire_keywords">
++ <item> unit </item>
++ <item> iostat </item>
++ <item> err </item>
++ <item> file </item>
++ <item> exist </item>
++ <item> opened </item>
++ <item> number </item>
++ <item> named </item>
++ <item> name </item>
++ <item> access </item>
++ <item> sequential </item>
++ <item> direct </item>
++ <item> form </item>
++ <item> formatted </item>
++ <item> unformatted </item>
++ <item> recl </item>
++ <item> nextrec </item>
++ <item> blank </item>
++ <item> position </item>
++ <item> action </item>
++ <item> read </item>
++ <item> write </item>
++ <item> readwrite </item>
++ <item> delim </item>
++ <item> pad </item>
++ </list>
+ <list name="types">
+ <item> double </item>
+ <item> precision </item>
+- <item> real*8 </item>
+ <item> parameter </item>
+ <item> save </item>
+ <item> pointer </item>
+@@ -84,11 +138,7 @@
+ <item> target </item>
+ <item> allocatable </item>
+ <item> optional </item>
+- <item> char </item>
+- <item> cmplx </item>
+- <item> dble </item>
+- <item> dcmplx </item>
+- <item> ichar </item>
++ <item> sequence </item>
+ </list>
+
+ <!-- There are 4 types of intrinsic procedures in Fortran 90:
+@@ -105,7 +155,7 @@
+ <!-- E L E M E N T A L P R O C E D U R E S -->
+ <list name="elemental_procs">
+ <!-- Elemental functions that may convert -->
+- <item> abs </item> <!-- Generic form: abs -->
++ <item> abs </item> <!-- Generic form: abs -->
+ <item> cabs </item> <!-- Specific names for abs -->
+ <item> dabs </item>
+ <item> iabs </item>
+@@ -116,6 +166,8 @@
+ <item> dnint </item> <!-- Specific name for anint -->
+ <item> ceiling </item>
+ <item> cmplx </item>
++ <item> dcmplx </item> <!-- (non standard) -->
++ <item> dimag </item> <!-- (non standard) -->
+ <item> floor </item>
+ <item> nint </item> <!-- Generic form: nint -->
+ <item> idnint </item><!-- Specific name for nint -->
+@@ -125,8 +177,10 @@
+ <item> real </item> <!-- Generic form: real -->
+ <item> float </item> <!-- Specific names for real -->
+ <item> sngl </item>
+- <item> aprime </item> <!-- 5 functions from fortran.xml -->
+- <item> dconjg </item> <!-- I don't know if they really belong to -->
++ <item> dble </item>
++ <item> dreal </item> <!-- (non standard) -->
++ <item> aprime </item> <!-- 5 functions from fortran.xml -->
++ <item> dconjg </item> <!-- I don't know if they really belong to -->
+ <item> dfloat </item> <!-- the fortran 90/95 standard! -->
+ <item> ddmim </item>
+ <item> rand </item>
+@@ -312,39 +366,148 @@
+ <item> random_seed </item>
+ </list>
+
++<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
++<!-- * C O N T E X T S * -->
++<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
+ <contexts>
+ <context attribute="Normal Text" lineEndContext="#stay" name="default" >
+ <IncludeRules context="find_strings" />
++ <IncludeRules context="find_decls" />
++ <IncludeRules context="find_intrinsics" />
++ <IncludeRules context="find_io_stmnts" />
++ <IncludeRules context="find_op_and_log" />
++ <IncludeRules context="find_numbers" />
++ <IncludeRules context="find_preprocessor" />
++ <IncludeRules context="find_comments" />
++ <IncludeRules context="find_symbols" />
++ <IncludeRules context="find_end_stmnts" />
++ <IncludeRules context="find_begin_stmnts" />
++ </context>
++<!--************************END OF THE MAIN CONTEXT*************************-->
+
+- <RegExpr attribute="Data Type" context="#stay" String="end[ \t]*type" insensitive="TRUE"/>
+- <keyword attribute="Data Type" context="#stay" String="types"/>
+- <RegExpr attribute="Data Type" context="#stay" String="\b(type|integer|real|complex|character|logical|intent|dimension)\b([ \t]*[(][^)]*[)])?" insensitive="TRUE"/>
+- <keyword attribute="Keyword" context="#stay" String="keywords"/>
++
++
++<!-- This context highlights preprocessor lines -->
++ <context attribute="Normal Text" lineEndContext="#stay" name="find_preprocessor">
++ <RegExpr attribute="Preprocessor" context="#stay" String="(#|cDEC\$|CDEC\$).*$" column="0"/>
++ </context>
++
++<!-- This context highlights operators and the logical values .true. .false. -->
++ <context attribute="Normal Text" lineEndContext="#stay" name="find_op_and_log">
++ <RegExpr attribute="Logical" context="#stay" String="\.(true|false)\." insensitive="TRUE"/>
++ <RegExpr attribute="Operator" context="#stay" String="\.[A-Za-z]+\."/>
++ <RegExpr attribute="Operator" context="#stay" String="(==|/=|<|<=|>|>=)"/>
++ </context>
++
++<!-- This context highlights comments -->
++ <context attribute="Normal Text" lineEndContext="#stay" name="find_comments">
++ <RegExpr attribute="Comment" context="#stay" String="[cC\*].*$" column="0"/>
++ <RegExpr attribute="Comment" context="#stay" String="!.*$"/>
++ </context>
++
++<!-- This context highlights symbols -->
++ <context attribute="Normal Text" lineEndContext="#stay" name="find_symbols">
++ <Detect2Chars attribute="Keyword" context="#stay" char="*" char1="*"/>
++ <Detect2Chars attribute="Keyword" context="#stay" char="(" char1="/"/>
++ <Detect2Chars attribute="Keyword" context="#stay" char="/" char1=")"/>
++ <AnyChar attribute="Keyword" context="#stay" String="&+-*/=?[]^{|}~"/>
++ <AnyChar attribute="Symbol" context="#stay" String="(),"/>
++ </context>
++
++<!-- This context highlights items inside the parentesis of a function -->
++ <context attribute="Normal Text" lineEndContext="#stay" name="inside_func_paren">
++ <DetectChar attribute="Normal Text" context="inside_func_paren" char="("/>
++ <DetectChar attribute="Normal Text" context="#pop" char=")"/>
++ <IncludeRules context="find_strings" />
++ <IncludeRules context="find_intrinsics" />
++ <IncludeRules context="find_numbers" />
++ </context>
++
++<!-- The following two contexts match input/output statements -->
++ <context attribute="Normal Text" lineEndContext="#stay" name="find_io_stmnts">
++ <RegExpr attribute="IO Function" context="find_io_paren" String="\b(read|write|backspace|rewind|end\s*file|close)\s*[(]" insensitive="TRUE"/>
++ <RegExpr attribute="IO Function" context="find_io_paren" String="\bopen\s*[(]" insensitive="TRUE"/>
++ <RegExpr attribute="IO Function" context="find_io_paren" String="\binquire\s*[(]" insensitive="TRUE"/>
++ <RegExpr attribute="IO Function" context="format_stmnt" String="\bformat\s*[(]" insensitive="TRUE"/>
++ <RegExpr attribute="IO Function" context="#stay" String="\bend\s*file\b" insensitive="TRUE"/>
+ <keyword attribute="IO Function" context="#stay" String="io_functions"/>
++ </context>
++<!-- This context matches parenthesis for the read, write, ... statements -->
++ <context attribute="Normal Text" lineEndContext="#stay" name="find_io_paren">
++ <DetectChar attribute="IO Function" context="#stay" char="*"/>
++ <DetectChar attribute="Normal Text" context="inside_func_paren" char="("/>
++ <DetectChar attribute="IO Function" context="#pop" char=")"/>
++ <keyword attribute="IO Function" context="#stay" String="io_keywords"/>
++ <keyword attribute="IO Function" context="#stay" String="inquire_keywords"/>
++ <keyword attribute="IO Function" context="#stay" String="open_keywords"/>
++ <IncludeRules context="find_strings" />
++ <IncludeRules context="find_intrinsics" />
++ <IncludeRules context="find_numbers" />
++ <IncludeRules context="find_symbols" />
++ </context>
++<!-- This context highlights the text inside the parenthesis of fortran statement -->
++ <context attribute="Normal Text" lineEndContext="#stay" name="format_stmnt">
++ <DetectChar attribute="IO Function" context="format_stmnt" char="("/>
++ <DetectChar attribute="IO Function" context="#pop" char=")"/>
++ <RegExpr attribute="IO Function" context="#stay" String="[0-9]*/" insensitive="TRUE"/>
++ <AnyChar attribute="IO Function" context="#stay" String=":"/>
++ <IncludeRules context="find_strings" />
++ <IncludeRules context="find_symbols" />
++ </context>
++
++<!-- The following context matches the begin of program units -->
++ <context attribute="Normal Text" lineEndContext="#stay" name="find_begin_stmnts">
++ <RegExpr attribute="Keyword" context="#stay" String="\bmodule\s+procedure\b" insensitive="TRUE"/>
++ <RegExpr attribute="Keyword" context="#stay" String="\b(program|subroutine|function|module|block\s*data)\b" insensitive="TRUE" beginRegion="Unit"/>
++ </context>
++<!-- The following context matches the end of program units -->
++ <context attribute="Normal Text" lineEndContext="#stay" name="find_end_stmnts">
++ <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(program|subroutine|function|module|block\s*data)\b" insensitive="TRUE" endRegion="Unit"/>
++ <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(do|if|select|where|forall|interface)\b" insensitive="TRUE"/>
++ <RegExpr attribute="Keyword" context="#stay" String="\bend\b" insensitive="TRUE" endRegion="Unit"/>
++ </context>
++
++<!-- The following two contexts match declarations -->
++ <context attribute="Normal Text" lineEndContext="#stay" name="find_decls">
++ <RegExpr attribute="Data Type" context="#stay" String="\binteger[\*]\d{1,2}" insensitive="TRUE"/>
++ <RegExpr attribute="Data Type" context="#stay" String="\breal[\*]\d{1,2}" insensitive="TRUE"/>
++ <RegExpr attribute="Data Type" context="#stay" String="\bcomplex[\*]\d{1,2}" insensitive="TRUE"/>
++ <RegExpr attribute="Data Type" context="#stay" String="\bend\s*type\b" insensitive="TRUE"/>
++ <keyword attribute="Data Type" context="#stay" String="types"/>
++ <RegExpr attribute="Data Type" context="#stay" String="^\s*data\b" insensitive="TRUE"/>
++ <RegExpr attribute="Data Type" context="find_paren" String="^\s*real\s*[(]" insensitive="TRUE"/>
++ <RegExpr attribute="Data Type" context="#stay" String="^\s*real(?![\w\*])" insensitive="TRUE"/>
++ <RegExpr attribute="Data Type" context="#stay" String="\bcharacter[*][0-9]+\b" insensitive="TRUE"/>
++ <RegExpr attribute="Data Type" context="find_paren" String="\b(type|integer|complex|character|logical|intent|dimension)\b\s*[(]" insensitive="TRUE"/>
++ <RegExpr attribute="Data Type" context="#stay" String="\b(type|integer|complex|character|logical|intent|dimension)\b" insensitive="TRUE"/>
++ <Detect2Chars attribute="Data Type" context="#stay" char=":" char1=":"/>
++ </context>
++<!-- This context matches parenthesis in data type declarations, such as in 'real(...)'-->
++ <context attribute="Data Type" lineEndContext="#pop" name="find_paren">
++ <DetectChar attribute="Data Type" context="find_paren" char="("/>
++ <DetectChar attribute="Data Type" context="#pop" char=")"/>
++ </context>
+
++<!-- The following context matches intrinsic procedures -->
++ <context attribute="Normal Text" lineEndContext="#stay" name="find_intrinsics">
++ <keyword attribute="Keyword" context="#stay" String="keywords"/>
+ <!-- INTRINSIC PROCEDURES -->
+ <keyword attribute="Elemental Procedure" context="#stay" String="elemental_procs"/>
+ <keyword attribute="Inquiry Function" context="#stay" String="inquiry_fn"/>
+ <keyword attribute="Transformational Function" context="#stay" String="transform_fn"/>
+ <keyword attribute="Non elemental subroutine" context="#stay" String="non_elem_subr"/>
++ </context>
+
+- <RegExpr attribute="Logical" context="#stay" String="\.(true|false)\." insensitive="TRUE"/>
+- <RegExpr attribute="Operator" context="#stay" String="\.[A-Za-z]+[.]"/>
++<!-- The following context matches integer and real numbers -->
++ <context attribute="Normal Text" lineEndContext="#stay" name="find_numbers">
+ <!-- Floating-point numbers with optional kind -->
+- <RegExpr attribute="Float" context="#stay" String="\b[0-9]*\.[0-9]+([de][+-]?[0-9]+)?([_]([0-9]+|[a-z][\w_]*))?" insensitive="TRUE"/>
+- <RegExpr attribute="Float" context="#stay" String="\b[0-9]+\.[0-9]*([de][+-]?[0-9]+)?([_]([0-9]+|[a-z][\w_]*))?" insensitive="TRUE"/>
+- <Float attribute="Float" context="#stay">
+- <AnyChar attribute="Float" context="#stay" String="fFdD"/>
+- </Float>
++ <RegExpr attribute="Float" context="#stay" String="[0-9]*\.[0-9]+([de][+-]?[0-9]+)?([_]([0-9]+|[a-z][\w_]*))?" insensitive="TRUE"/>
++ <RegExpr attribute="Float" context="#stay" String="\b[0-9]+\.[0-9]*([de][+-]?[0-9]+)?([_]([0-9]+|[a-z][\w_]*))?(?![a-z])" insensitive="TRUE"/>
++ <RegExpr attribute="Float" context="#stay" String="\b[0-9]+[de][+-]?[0-9]+([_]([0-9]+|[a-z][\w_]*))?" insensitive="TRUE"/>
+ <!-- Integers with optional kind specifier -->
+ <RegExpr attribute="Decimal" context="#stay" String="\b[0-9]+([_]([0-9]+|[a-zA-Z][\w_]*))?"/>
+- <!-- Integers in binary octal and hexadecimal notations -->
+- <RegExpr attribute="Decimal" context="#stay" String="\b[boz](['][0-9a-f]+[']|["][0-9a-f]+["])" insensitive="TRUE"/>
+- <HlCChar attribute="Char" context="#stay"/>
+- <RegExpr attribute="Preprocessor" context="#stay" String="(#|cDEC\$|CDEC\$).*$" column="0"/>
+- <RegExpr attribute="Comment" context="#stay" String="[cC\*].*$" column="0"/>
+- <RegExpr attribute="Comment" context="#stay" String="!.*$"/>
+- <AnyChar attribute="Symbol" context="#stay" String="!%&()+,-<=>?[]^{|}~"/>
++ <!-- Integers in binary, octal and hexadecimal notations -->
++ <RegExpr attribute="Decimal" context="#stay" String="\b[bozx](['][0-9a-f]+[']|["][0-9a-f]+["])" insensitive="TRUE"/>
+ </context>
+
+ <!-- The following four contexts implement the complex string multi-line declarations -->
+@@ -367,24 +530,23 @@
+ </context>
+
+ <context attribute="String" lineEndContext="#stay" name="end_of_string" fallthrough="true" fallthroughContext="#pop#pop">
++ <DetectSpaces />
+ <RegExpr attribute="Keyword" context="#stay" String="&\s*$"/>
+- <DetectChar attribute="Keyword" context="#pop" char="&" column="0"/>
+- <RegExpr attribute="Comment" context="#stay" String="(!.*)?$" column="0"/>
++ <DetectChar attribute="Keyword" context="#pop" char="&" firstNonSpace="true"/>
++ <RegExpr attribute="Comment" context="#stay" String="(!.*)?$" firstNonSpace="true"/>
+ </context>
+-
+-
+ </contexts>
++
++<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
++<!-- * S T Y L E I T E M D E F I N I T I O N S * -->
++<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
+ <itemDatas>
+ <itemData name="Normal Text" defStyleNum="dsNormal"/>
+ <itemData name="Keyword" defStyleNum="dsKeyword"/>
+ <itemData name="Data Type" defStyleNum="dsDataType"/>
+ <itemData name="Decimal" defStyleNum="dsDecVal"/>
+- <itemData name="Octal" defStyleNum="dsBaseN"/>
+- <itemData name="Hex" defStyleNum="dsBaseN"/>
+ <itemData name="Float" defStyleNum="dsFloat"/>
+- <itemData name="Char" defStyleNum="dsChar"/>
+ <itemData name="String" defStyleNum="dsString"/>
+- <itemData name="String Char" defStyleNum="dsChar"/>
+ <itemData name="Comment" defStyleNum="dsComment"/>
+ <itemData name="Symbol" defStyleNum="dsNormal"/>
+ <itemData name="Preprocessor" defStyleNum="dsOthers"/>
+@@ -398,10 +560,10 @@
+ </itemDatas>
+ </highlighting>
+ <general>
+- <keywords casesensitive="0"/>
+ <comments>
+- <comment name="singleLine" start="!"/>
+ <comment name="singleLine" start="c"/>
++ <comment name="singleLine" start="!"/>
+ </comments>
++ <keywords casesensitive="0"/>
+ </general>
+ </language>
+diff -Nru kdelibs-release-3.4.0/kate/data/katepart.desktop kdelibs-branch-3.4/kate/data/katepart.desktop
+--- kdelibs-release-3.4.0/kate/data/katepart.desktop 2005-02-23 00:04:20.000000000 -0500
++++ kdelibs-branch-3.4/kate/data/katepart.desktop 2005-03-07 09:13:16.000000000 -0500
+@@ -6,6 +6,7 @@
+ Name[az]=Daxili Mütəxəssis Mətn Editoru
+ Name[bg]=Разширен текстов редактор
+ Name[bn]=অভ্যন্তরীন উন্নত টেক্সট সম্পাদক
++Name[br]=Aozer skrid barek enframmet
+ Name[bs]=Umetnuti napredni tekst editor
+ Name[ca]=Editor avançat de text, encastable
+ Name[cs]=Zabudovaný rozšířený editor
+@@ -65,7 +66,6 @@
+ Name[ven]=Musengulusi wa manwalwa a nthesa o dzheniswaho
+ Name[wa]=Ravalé aspougneu di tecse avancî
+ Name[xh]=Umhleli Wombhalo Obhekisa phambili Olungiselweyo
+-Name[xx]=xxEmbedded Advanced Text Editorxx
+ Name[zh_CN]=嵌入式 KDE 高级文本编辑器
+ Name[zh_TW]=嵌入式進階文字編輯器
+ Name[zu]=Umlungisi Wezinga Eliphezulu Oshuthekiwe
+diff -Nru kdelibs-release-3.4.0/kate/data/progress.xml kdelibs-branch-3.4/kate/data/progress.xml
+--- kdelibs-release-3.4.0/kate/data/progress.xml 2005-02-13 19:06:59.000000000 -0500
++++ kdelibs-branch-3.4/kate/data/progress.xml 2005-04-01 15:19:07.000000000 -0500
+@@ -1,13 +1,13 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE language SYSTEM "language.dtd">
+-<!-- By: Rares Stanciulescu <rstanciu@operamail.com> -->
+-<language name="Progress" version="1.06" kateversion="2.4" section="Database" extensions="*.p;*.w;*.i" casesensitive="0" author="Rares Stanciulescu (rstanciu@operamail.com)" license="">
+-
++<language name="progress" version="1.08" kateversion="2.4" section="Database" extensions="*.p;*.w;*.i" author="Rares Stanciulescu (rstanciu@operamail.com)" license="GPL">
++
+ <highlighting>
+-
++
+ <list name="mytypes">
+ <item> CHAR </item>
+ <item> CHARACTER </item>
++ <item> COM-HANDLE </item>
+ <item> DECI </item>
+ <item> DECIMAL </item>
+ <item> DATE </item>
+@@ -16,6 +16,7 @@
+ <item> ROWID </item>
+ <item> RECID </item>
+ <item> LOGI </item>
++ <item> LONGCHAR </item>
+ <item> LOGICAL </item>
+ <item> HANDLE </item>
+ <item> WIDGET-HANDLE </item>
+@@ -32,1401 +33,1539 @@
+ <item> STREAM </item>
+ <item> MEMPTR </item>
+ </list>
+-
+-<list name="operators">
+- <item> + </item>
+- <item> - </item>
+- <item> * </item>
+- <item> / </item>
+- <item> = </item>
+- <item> < </item>
+- <item> > </item>
+- <item> <= </item>
+- <item> >= </item>
+- <item> <> </item>
+- <item> AND </item>
+- <item> OR </item>
+- <item> NOT </item>
+- <item> BEGINS </item>
+- <item> MATCHES </item>
+- <item> MODULO </item>
+- <item> EQ </item>
+- <item> NE </item>
+- <item> LT </item>
+- <item> GT </item>
+- <item> GE </item>
+- <item> LE </item>
+- <item> FALSE </item>
+- <item> TRUE </item>
+- <item> yes </item>
+- <item> no </item>
++
++ <list name="operators">
++ <item> + </item>
++ <item> - </item>
++ <item> * </item>
++ <item> / </item>
++ <item> = </item>
++ <item> < </item>
++ <item> > </item>
++ <item> <= </item>
++ <item> >= </item>
++ <item> <> </item>
++ <item> AND </item>
++ <item> OR </item>
++ <item> NOT </item>
++ <item> BEGINS </item>
++ <item> MATCHES </item>
++ <item> MODULO </item>
++ <item> EQ </item>
++ <item> NE </item>
++ <item> LT </item>
++ <item> GT </item>
++ <item> GE </item>
++ <item> LE </item>
++ <item> FALSE </item>
++ <item> TRUE </item>
++ <item> YES </item>
++ <item> NO </item>
+ </list>
+-
+-
++
+ <list name="preprocvar">
+- <item> &OUT </item>
+- <item> &BATCH-MODE </item>
+- <item> &FILE-NAME </item>
+- <item> &GLOBAL-DEFINE </item>
+- <item> &LINE-NUMBER </item>
+- <item> &MESSAGE </item>
+- <item> &OPSYS </item>
+- <item> &IF </item>
+- <item> &ELSEIF </item>
+- <item> &ELSE </item>
+- <item> &ENDIF </item>
+- <item> &SCOPED-DEFINE </item>
+- <item> &SEQUENCE </item>
+- <item> &UNDEFINE </item>
+- <item> &WINDOW-SYSTEM </item>
++ <item> OUT </item>
++ <item> BATCH-MODE </item>
++ <item> FILE-NAME </item>
++ <item> GLOBAL-DEFINE </item>
++ <item> LINE-NUMBER </item>
++ <item> OPSYS </item>
++ <item> ENDIF </item>
++ <item> SCOPED-DEFINE </item>
++ <item> SEQUENCE </item>
++ <item> UNDEFINE </item>
++ <item> WINDOW-SYSTEM </item>
++ <item> ANALYZE-RESUME </item>
++ <item> ANALYZE-SUSPEND </item>
++ <item> WEBSTREAM </item>
+ </list>
+-
++
+ <list name="phrases">
+- <item> AS </item>
+- <item> AT </item>
+- <item> COLOR </item>
+- <item> COMBO-BOX </item>
+- <item> EDITING </item>
+- <item> EDITOR </item>
+- <item> FORMAT </item>
+- <item> FRAME </item>
+- <item> IMAGE </item>
+- <item> ON ENDKEY </item>
+- <item> ON ERROR </item>
+- <item> ON QUIT </item>
+- <item> STOP </item>
+- <item> PRESELECT </item>
+- <item> QUERY-TUNING </item>
+- <item> RADIO-SET </item>
+- <item> RECORD </item>
+- <item> SELECTION-LIST </item>
+- <item> SIZE </item>
+- <item> SLIDER </item>
+- <item> TRIGGER </item>
+- <item> WIDGET </item>
+- <item> VIEW-AS </item>
+- <item> NO-UNDO </item>
+- <item> NO-ERROR </item>
+- <item> OUT </item>
+- <item> WHERE </item>
+- <item> SHARED </item>
+- <item> GLOBAL-SHARED </item>
+- <item> DEFINED </item>
++ <item> AS </item>
++ <item> ALERT-BOX </item>
++ <item> AT </item>
++ <item> COLOR </item>
++ <item> COMBO-BOX </item>
++ <item> EDITING </item>
++ <item> EDITOR </item>
++ <item> FORMAT </item>
++ <item> FRAME </item>
++ <item> IMAGE </item>
++ <item> ENDKEY </item>
++ <item> ERROR </item>
++ <item> QUIT </item>
++ <item> STOP </item>
++ <item> PRESELECT </item>
++ <item> QUERY-TUNING </item>
++ <item> RADIO-SET </item>
++ <item> RECORD </item>
++ <item> SELECTION-LIST </item>
++ <item> SIZE </item>
++ <item> SLIDER </item>
++ <item> TRIGGER </item>
++ <item> WIDGET </item>
++ <item> VIEW-AS </item>
++ <item> NO-UNDO </item>
++ <item> NO-ERROR </item>
++ <item> OUT </item>
++ <item> WHERE </item>
++ <item> GLOBAL </item>
++ <item> SHARED </item>
++ <item> DEFINED </item>
++ <item> EXCLUSIVE-LOCK </item>
++ <item> SHARE-LOCK </item>
++ <item> NO-LOCK </item>
++ <item> EACH </item>
++ <item> FIRST </item>
++ <item> PREV </item>
++ <item> LAST </item>
++ <item> SKIP </item>
++ <item> FORWARD </item>
++ <item> UNIQUE </item>
++ <item> UNFORMATTED </item>
++ <item> APPEND </item>
++ <item> IN </item>
++ <item> OF </item>
++ <item> BEFORE-HIDE </item>
++ <item> NO-BOX </item>
++ <item> NO-UNDERLINE </item>
++ <item> KEEP-TAB-ORDER </item>
++ <item> UNBUFFERED </item>
++ <item> BINARY </item>
++ <item> NO-CONVERT </item>
++ <item> CONVERT </item>
++ <item> TARGET </item>
++ <item> NO-FILL </item>
++ <item> BY </item>
++ <item> NO-LABEL </item>
++ <item> GROUP </item>
++ <item> BREAK </item>
++ <item> COLON-ALIGNED </item>
++ <item> WITH </item>
++ <item> NO-LABELS </item>
++ <item> NO-PAUSE </item>
++ <item> NO-MESSAGE </item>
++ <item> NO-ECHO </item>
++ <item> NO-MAP </item>
++ <item> PRIVATE </item>
+ </list>
+-
++
+ <list name="functions">
+- <item> ABSOLUTE </item>
+- <item> ACCUM </item>
+- <item> ADD-INTERVAL </item>
+- <item> ALIAS </item>
+- <item> AMBIGUOUS </item>
+- <item> ASC </item>
+- <item> AVAILABLE </item>
+- <item> CAN-DO </item>
+- <item> CAN-FIND </item>
+- <item> CAN-QUERY </item>
+- <item> CAN-SET </item>
+- <item> CAPS </item>
+- <item> CHR </item>
+- <item> CODEPAGE-CONVERT </item>
+- <item> COMPARE </item>
+- <item> CONNECTED </item>
+- <item> COUNT-OF </item>
+- <item> CURRENT-CHANGED </item>
+- <item> CURRENT-LANGUAGE </item>
+- <item> CURRENT-RESULT-ROW </item>
+- <item> CURRENT-VALUE </item>
+- <item> DATASERVERS </item>
+- <item> DATE </item>
+- <item> DATETIME </item>
+- <item> DATETIME-TZ </item>
+- <item> DAY </item>
+- <item> DBCODEPAGE </item>
+- <item> DBCOLLATION </item>
+- <item> DBNAME </item>
+- <item> DBPARAM </item>
+- <item> DBRESTRICTIONS </item>
+- <item> DBTASKID </item>
+- <item> DBTYPE </item>
+- <item> DBVERSION </item>
+- <item> DECIMAL </item>
+- <item> DYNAMIC-CURRENT-VALUE </item>
+- <item> DYNAMIC-FUNCTION </item>
+- <item> DYNAMIC-NEXT-VALUE </item>
+- <item> ENCODE </item>
+- <item> ENTERED </item>
+- <item> ENTRY </item>
+- <item> ETIME </item>
+- <item> EXP </item>
+- <item> EXTENT </item>
+- <item> FILL </item>
+- <item> FIRST </item>
+- <item> FIRST-OF </item>
+- <item> FIX-CODEPAGE </item>
+- <item> FRAME-COL </item>
+- <item> FRAME-DB </item>
+- <item> FRAME-DOWN </item>
+- <item> FRAME-FIELD </item>
+- <item> FRAME-FILE </item>
+- <item> FRAME-INDEX </item>
+- <item> FRAME-LINE </item>
+- <item> FRAME-NAME </item>
+- <item> FRAME-ROW </item>
+- <item> FRAME-VALUE </item>
+- <item> GATEWAYS </item>
+- <item> GET-BITS </item>
+- <item> GET-BYTE </item>
+- <item> GET-BYTE-ORDER </item>
+- <item> GET-BYTES </item>
+- <item> GET-CODEPAGE </item>
+- <item> GET-CODEPAGES </item>
+- <item> GET-COLLATION </item>
+- <item> GET-COLLATIONS </item>
+- <item> GET-DOUBLE </item>
+- <item> GET-FLOAT </item>
+- <item> GET-LONG </item>
+- <item> GET-POINTER-VALUE </item>
+- <item> GET-SHORT </item>
+- <item> GET-SIZE </item>
+- <item> GET-STRING </item>
+- <item> GET-UNSIGNED-SHORT </item>
+- <item> GO-PENDING </item>
+- <item> INDEX </item>
+- <item> INPUT </item>
+- <item> INTEGER </item>
+- <item> INTERVAL </item>
+- <item> IS-ATTR-SPACE </item>
+- <item> IS-CODEPAGE-FIXED </item>
+- <item> IS-COLUMN-CODEPAGE </item>
+- <item> IS-LEAD-BYTE </item>
+- <item> ISO-DATE </item>
+- <item> KBLABEL </item>
+- <item> KEYCODE </item>
+- <item> KEYFUNCTION </item>
+- <item> KEYLABEL </item>
+- <item> KEYWORD </item>
+- <item> KEYWORD-ALL </item>
+- <item> LAST </item>
+- <item> LASTKEY </item>
+- <item> LAST-OF </item>
+- <item> LC </item>
+- <item> LDBNAME </item>
+- <item> LEFT-TRIM </item>
+- <item> LENGTH </item>
+- <item> LIBRARY </item>
+- <item> LINE-COUNTER </item>
+- <item> LIST-EVENTS </item>
+- <item> LIST-QUERY-ATTRS </item>
+- <item> LIST-SET-ATTRS </item>
+- <item> LIST-WIDGETS </item>
+- <item> LOCKED </item>
+- <item> LOG </item>
+- <item> LOOKUP </item>
+- <item> MAXIMUM </item>
+- <item> MEMBER </item>
+- <item> MESSAGE-LINES </item>
+- <item> MINIMUM </item>
+- <item> MONTH </item>
+- <item> MTIME </item>
+- <item> NEW </item>
+- <item> NEXT-VALUE </item>
+- <item> NOT ENTERED </item>
+- <item> NOW </item>
+- <item> NUM-ALIASES </item>
+- <item> NUM-DBS </item>
+- <item> NUM-ENTRIES </item>
+- <item> NUM-RESULTS </item>
+- <item> OPSYS </item>
+- <item> OS-DRIVES </item>
+- <item> OS-ERROR </item>
+- <item> OS-GETENV </item>
+- <item> PAGE-NUMBER </item>
+- <item> PAGE-SIZE </item>
+- <item> PDBNAME </item>
+- <item> PROC-HANDLE </item>
+- <item> PROC-STATUS </item>
+- <item> PROGRAM-NAME </item>
+- <item> PROGRESS </item>
+- <item> PROMSGS </item>
+- <item> PROPATH </item>
+- <item> PROVERSION </item>
+- <item> QUERY-OFF-END </item>
+- <item> Quoter </item>
+- <item> RANDOM </item>
+- <item> RECID </item>
+- <item> RECORD-LENGTH </item>
+- <item> REPLACE </item>
+- <item> RETRY </item>
+- <item> RETURN-VALUE </item>
+- <item> RGB-VALUE </item>
+- <item> RIGHT-TRIM </item>
+- <item> R-INDEX </item>
+- <item> ROUND </item>
+- <item> ROWID </item>
+- <item> SCREEN-LINES </item>
+- <item> SDBNAME </item>
+- <item> SEARCH </item>
+- <item> SEEK </item>
+- <item> SETUSERID </item>
+- <item> SQRT </item>
+- <item> STRING </item>
+- <item> SUBSTITUTE </item>
+- <item> SUBSTRING </item>
+- <item> SUPER </item>
+- <item> TERMINAL </item>
+- <item> TIME </item>
+- <item> TIMEZONE </item>
+- <item> TODAY </item>
+- <item> TO-ROWID </item>
+- <item> TRANSACTION </item>
+- <item> TRIM </item>
+- <item> TRUNCATE </item>
+- <item> USERID </item>
+- <item> VALID-EVENT </item>
+- <item> VALID-HANDLE </item>
+- <item> WEEKDAY </item>
+- <item> YEAR </item>
++ <item> ABSOLUTE </item>
++ <item> ACCUM </item>
++ <item> ADD-INTERVAL </item>
++ <item> ALIAS </item>
++ <item> AMBIGUOUS </item>
++ <item> ASC </item>
++ <item> AVAILABLE </item>
++ <item> BASE64-DECODE </item>
++ <item> BASE64-ENCODE </item>
++ <item> CAN-DO </item>
++ <item> CAN-FIND </item>
++ <item> CAN-QUERY </item>
++ <item> CAN-SET </item>
++ <item> CAPS </item>
++ <item> CHR </item>
++ <item> CODEPAGE-CONVERT </item>
++ <item> COMPARE </item>
++ <item> CONNECTED </item>
++ <item> COUNT-OF </item>
++ <item> CURRENT-CHANGED </item>
++ <item> CURRENT-LANGUAGE </item>
++ <item> CURRENT-RESULT-ROW </item>
++ <item> CURRENT-VALUE </item>
++ <item> DATASERVERS </item>
++ <item> DATA-SOURCE-MODIFIED </item>
++ <item> DATE </item>
++ <item> DATETIME </item>
++ <item> DATETIME-TZ </item>
++ <item> DAY </item>
++ <item> DBCODEPAGE </item>
++ <item> DBCOLLATION </item>
++ <item> DBNAME </item>
++ <item> DBPARAM </item>
++ <item> DBRESTRICTIONS </item>
++ <item> DBTASKID </item>
++ <item> DBTYPE </item>
++ <item> DBVERSION </item>
++ <item> DECIMAL </item>
++ <item> DECRYPT </item>
++ <item> DYNAMIC-CURRENT-VALUE </item>
++ <item> DYNAMIC-FUNCTION </item>
++ <item> DYNAMIC-NEXT-VALUE </item>
++ <item> ENCODE </item>
++ <item> ENCRYPT </item>
++ <item> ENTERED </item>
++ <item> ENTRY </item>
++ <item> ERROR </item>
++ <item> ETIME </item>
++ <item> EXP </item>
++ <item> EXTENT </item>
++ <item> FILL </item>
++ <item> FIRST </item>
++ <item> FIRST-OF </item>
++ <item> FIX-CODEPAGE </item>
++ <item> FRAME-COL </item>
++ <item> FRAME-DB </item>
++ <item> FRAME-DOWN </item>
++ <item> FRAME-FIELD </item>
++ <item> FRAME-FILE </item>
++ <item> FRAME-INDEX </item>
++ <item> FRAME-LINE </item>
++ <item> FRAME-NAME </item>
++ <item> FRAME-ROW </item>
++ <item> FRAME-VALUE </item>
++ <item> GATEWAYS </item>
++ <item> GENERATE-PBE-KEY </item>
++ <item> GENERATE-PBE-SALT </item>
++ <item> GENERATE-RANDOM-KEY </item>
++ <item> GET-BITS </item>
++ <item> GET-BYTE </item>
++ <item> GET-BYTE-ORDER </item>
++ <item> GET-BYTES </item>
++ <item> GET-CODEPAGE </item>
++ <item> GET-CODEPAGES </item>
++ <item> GET-COLLATION </item>
++ <item> GET-COLLATIONS </item>
++ <item> GET-DOUBLE </item>
++ <item> GET-FLOAT </item>
++ <item> GET-LONG </item>
++ <item> GET-POINTER-VALUE </item>
++ <item> GET-SHORT </item>
++ <item> GET-SIZE </item>
++ <item> GET-STRING </item>
++ <item> GET-UNSIGNED-SHORT </item>
++ <item> GO-PENDING </item>
++ <item> INDEX </item>
++ <item> INTEGER </item>
++ <item> INTERVAL </item>
++ <item> IS-ATTR-SPACE </item>
++ <item> IS-CODEPAGE-FIXED </item>
++ <item> IS-COLUMN-CODEPAGE </item>
++ <item> IS-LEAD-BYTE </item>
++ <item> ISO-DATE </item>
++ <item> KBLABEL </item>
++ <item> KEYCODE </item>
++ <item> KEYFUNCTION </item>
++ <item> KEYLABEL </item>
++ <item> KEYWORD </item>
++ <item> KEYWORD-ALL </item>
++ <item> LAST </item>
++ <item> LASTKEY </item>
++ <item> LAST-OF </item>
++ <item> LC </item>
++ <item> LDBNAME </item>
++ <item> LEFT-TRIM </item>
++ <item> LENGTH </item>
++ <item> LIBRARY </item>
++ <item> LINE-COUNTER </item>
++ <item> LIST-EVENTS </item>
++ <item> LIST-QUERY-ATTRS </item>
++ <item> LIST-SET-ATTRS </item>
++ <item> LIST-WIDGETS </item>
++ <item> LOCKED </item>
++ <item> LOG </item>
++ <item> LOGICAL </item>
++ <item> LOOKUP </item>
++ <item> MAXIMUM </item>
++ <item> MD5-DIGEST </item>
++ <item> MEMBER </item>
++ <item> MESSAGE-LINES </item>
++ <item> MINIMUM </item>
++ <item> MONTH </item>
++ <item> MTIME </item>
++ <item> NEW </item>
++ <item> NEXT-VALUE </item>
++ <item> NORMALIZE </item>
++ <item> NOT ENTERED </item>
++ <item> NOW </item>
++ <item> NUM-ALIASES </item>
++ <item> NUM-DBS </item>
++ <item> NUM-ENTRIES </item>
++ <item> NUM-RESULTS </item>
++ <item> OPSYS </item>
++ <item> OS-DRIVES </item>
++ <item> OS-ERROR </item>
++ <item> OS-GETENV </item>
++ <item> PAGE-NUMBER </item>
++ <item> PAGE-SIZE </item>
++ <item> PDBNAME </item>
++ <item> PROC-HANDLE </item>
++ <item> PROC-STATUS </item>
++ <item> PROGRAM-NAME </item>
++ <item> PROGRESS </item>
++ <item> PROMSGS </item>
++ <item> PROPATH </item>
++ <item> PROVERSION </item>
++ <item> QUERY-OFF-END </item>
++ <item> QUOTER </item>
++ <item> RANDOM </item>
++ <item> RAW </item>
++ <item> RECID </item>
++ <item> RECORD-LENGTH </item>
++ <item> REJECTED </item>
++ <item> REPLACE </item>
++ <item> RETRY </item>
++ <item> RETURN-VALUE </item>
++ <item> RGB-VALUE </item>
++ <item> RIGHT-TRIM </item>
++ <item> R-INDEX </item>
++ <item> ROUND </item>
++ <item> ROWID </item>
++ <item> ROW-STATE </item>
++ <item> SCREEN-LINES </item>
++ <item> SDBNAME </item>
++ <item> SEARCH </item>
++ <item> SEEK </item>
++ <item> SETUSERID </item>
++ <item> SHA1-DIGEST </item>
++ <item> SQRT </item>
++ <item> SSL-SERVER-NAME </item>
++ <item> STRING </item>
++ <item> SUBSTITUTE </item>
++ <item> SUBSTRING </item>
++ <item> SUPER </item>
++ <item> TERMINAL </item>
++ <item> TIME </item>
++ <item> TIMEZONE </item>
++ <item> TODAY </item>
++ <item> TO-ROWID </item>
++ <item> TRANSACTION </item>
++ <item> TRIM </item>
++ <item> TRUNCATE </item>
++ <item> USERID </item>
++ <item> VALID-EVENT </item>
++ <item> VALID-HANDLE </item>
++ <item> WEEKDAY </item>
++ <item> WIDGET-HANDLE </item>
++ <item> YEAR </item>
+ </list>
+-
++
+ <list name="statements">
+- <item> ACCUMULATE </item>
+- <item> APPLY </item>
+- <item> ASSIGN </item>
+- <item> BELL </item>
+- <item> BUFFER-COMPARE </item>
+- <item> BUFFER-COPY </item>
+- <item> CASE </item>
+- <item> CHOOSE </item>
+- <item> CLEAR </item>
+- <item> CLOSE QUERY </item>
+- <item> CLOSE STORED-PROCEDURE </item>
+- <item> COLOR </item>
+- <item> COMPILE </item>
+- <item> CONNECT </item>
+- <item> COPY-LOB </item>
+- <item> CREATE </item>
+- <item> CREATE ALIAS </item>
+- <item> CREATE BROWSE </item>
+- <item> CREATE BUFFER </item>
+- <item> CREATE CALL </item>
+- <item> CREATE DATABASE </item>
+- <item> CREATE DATASET </item>
+- <item> CREATE DATA-SOURCE </item>
+- <item> CREATE QUERY </item>
+- <item> CREATE SAX-READER </item>
+- <item> CREATE SERVER </item>
+- <item> CREATE SERVER-SOCKET </item>
+- <item> CREATE SOAP-HEADER </item>
+- <item> CREATE SOAP-HEADER-ENTRYREF </item>
+- <item> CREATE SOCKET </item>
+- <item> CREATE TEMP-TABLE </item>
+- <item> CREATE widget </item>
+- <item> CREATE WIDGET-POOL </item>
+- <item> CREATE X-DOCUMENT </item>
+- <item> CREATE X-NODEREF </item>
+- <item> CURRENT-LANGUAGE </item>
+- <item> CURRENT-VALUE </item>
+- <item> DDE ADVISE </item>
+- <item> DDE EXECUTE </item>
+- <item> DDE GET </item>
+- <item> DDE INITIATE </item>
+- <item> DDE REQUEST </item>
+- <item> DDE SEND </item>
+- <item> DDE TERMINATE </item>
+- <item> DEF </item>
+- <item> DEFINE </item>
+- <item> VAR </item>
+- <item> VARIABLE </item>
+- <item> DEFINE BROWSE </item>
+- <item> DEFINE BUFFER </item>
+- <item> DEFINE BUTTON </item>
+- <item> DEFINE DATASET </item>
+- <item> DEFINE DATA-SOURCE </item>
+- <item> DEFINE FRAME </item>
+- <item> DEFINE IMAGE </item>
+- <item> DEFINE MENU </item>
+- <item> DEFINE PARAMETER </item>
+- <item> DEFINE QUERY </item>
+- <item> DEFINE RECTANGLE </item>
+- <item> DEFINE STREAM </item>
+- <item> DEFINE SUB-MENU </item>
+- <item> DEFINE TEMP-TABLE </item>
+- <item> DEFINE VARIABLE </item>
+- <item> DEFINE WORK-TABLE </item>
+- <item> DEFINE WORKFILE </item>
+- <item> DELETE </item>
+- <item> DELETE ALIAS </item>
+- <item> DELETE OBJECT </item>
+- <item> DELETE PROCEDURE </item>
+- <item> DELETE WIDGET </item>
+- <item> DELETE WIDGET-POOL </item>
+- <item> DICTIONARY </item>
+- <item> DISABLE </item>
+- <item> DISABLE TRIGGERS </item>
+- <item> DISCONNECT </item>
+- <item> DISPLAY </item>
+- <item> DO </item>
+- <item> DOS </item>
+- <item> DOWN </item>
+- <item> DYNAMIC-CURRENT-VALUE </item>
+- <item> EMPTY TEMP-TABLE </item>
+- <item> ENABLE </item>
+- <item> END </item>
+- <item> ENTRY </item>
+- <item> EXPORT </item>
+- <item> FIND </item>
+- <item> FOR </item>
+- <item> FORM </item>
+- <item> FRAME-VALUE </item>
+- <item> FUNCTION </item>
+- <item> GET </item>
+- <item> GET-KEY-VALUE </item>
+- <item> HIDE </item>
+- <item> IF </item>
+- <item> THEN </item>
+- <item> ELSE </item>
+- <item> IMPORT </item>
+- <item> INPUT CLEAR </item>
+- <item> INPUT CLOSE </item>
+- <item> INPUT FROM </item>
+- <item> INPUT THROUGH </item>
+- <item> INPUT-OUTPUT CLOSE </item>
+- <item> INPUT-OUTPUT THROUGH </item>
+- <item> INSERT </item>
+- <item> LEAVE </item>
+- <item> LENGTH </item>
+- <item> LOAD </item>
+- <item> LOAD-PICTURE </item>
+- <item> MESSAGE </item>
+- <item> NEXT </item>
+- <item> NEXT-PROMPT </item>
+- <item> ON </item>
+- <item> OPEN QUERY </item>
+- <item> OS-APPEND </item>
+- <item> OS-COMMAND </item>
+- <item> OS-COPY </item>
+- <item> OS-CREATE-DIR </item>
+- <item> OS-DELETE </item>
+- <item> OS-RENAME </item>
+- <item> OUTPUT CLOSE </item>
+- <item> OUTPUT THROUGH </item>
+- <item> OUTPUT TO </item>
+- <item> OVERLAY </item>
+- <item> PAGE </item>
+- <item> PAUSE </item>
+- <item> PROCEDURE </item>
+- <item> PROCESS EVENTS </item>
+- <item> PROMPT-FOR </item>
+- <item> PROMSGS </item>
+- <item> PROPATH </item>
+- <item> PUBLISH </item>
+- <item> PUT CURSOR </item>
+- <item> PUT SCREEN </item>
+- <item> PUT </item>
+- <item> PUT-BITS </item>
+- <item> PUT-BYTE </item>
+- <item> PUT-BYTES </item>
+- <item> PUT-DOUBLE </item>
+- <item> PUT-FLOAT </item>
+- <item> PUT-KEY-VALUE </item>
+- <item> PUT-LONG </item>
+- <item> PUT-SHORT </item>
+- <item> PUT-STRING </item>
+- <item> PUT-UNSIGNED-SHORT </item>
+- <item> QUIT </item>
+- <item> RAW-TRANSFER </item>
+- <item> READKEY </item>
+- <item> RELEASE </item>
+- <item> RELEASE EXTERNAL </item>
+- <item> RELEASE OBJECT </item>
+- <item> REPEAT </item>
+- <item> REPOSITION </item>
+- <item> RETURN </item>
+- <item> RUN </item>
+- <item> RUN STORED-PROCEDURE </item>
+- <item> RUN SUPER </item>
+- <item> SAVE CACHE </item>
+- <item> SEEK </item>
+- <item> SET </item>
+- <item> SET-BYTE-ORDER </item>
+- <item> SET-POINTER-VALUE </item>
+- <item> SET-SIZE </item>
+- <item> SCROLL </item>
+- <item> SHOW-STATS </item>
+- <item> STATUS </item>
+- <item> STOP </item>
+- <item> SUBSCRIBE </item>
+- <item> SUBSTRING </item>
+- <item> SYSTEM-DIALOG COLOR </item>
+- <item> SYSTEM-DIALOG FONT </item>
+- <item> SYSTEM-DIALOG GET-DIR </item>
+- <item> SYSTEM-DIALOG GET-FILE </item>
+- <item> SYSTEM-DIALOG PRINTER-SETUP </item>
+- <item> SYSTEM-HELP </item>
+- <item> TERMINAL </item>
+- <item> TRANSACTION-MODE AUTOMATIC </item>
+- <item> TRIGGER PROCEDURE </item>
+- <item> UNDERLINE </item>
+- <item> UNDO </item>
+- <item> UNIX </item>
+- <item> UNLOAD </item>
+- <item> UNSUBSCRIBE </item>
+- <item> UP </item>
+- <item> UPDATE </item>
+- <item> USE </item>
+- <item> VALIDATE </item>
+- <item> VIEW </item>
+- <item> WAIT-FOR </item>
++ <item> IF </item>
++ <item> THEN </item>
++ <item> ELSE </item>
++ <item> WHEN </item>
++ <item> OTHERWISE </item>
++ <item> ACCUMULATE </item>
++ <item> APPLY </item>
++ <item> ASSIGN </item>
++ <item> BELL </item>
++ <item> BUFFER-COMPARE </item>
++ <item> BUFFER-COPY </item>
++ <item> CHOOSE </item>
++ <item> CLEAR </item>
++ <item> CLOSE </item>
++ <item> QUERY </item>
++ <item> STORED-PROCEDURE </item>
++ <item> COLOR </item>
++ <item> COMPILE </item>
++ <item> CONNECT </item>
++ <item> COPY-LOB </item>
++ <item> CREATE </item>
++ <item> ALIAS </item>
++ <item> BROWSE </item>
++ <item> BUFFER </item>
++ <item> CALL </item>
++ <item> DATABASE </item>
++ <item> DATASET </item>
++ <item> DATA-SOURCE </item>
++ <item> QUERY </item>
++ <item> SAX-READER </item>
++ <item> SERVER </item>
++ <item> SERVER-SOCKET </item>
++ <item> SOAP-HEADER </item>
++ <item> SOAP-HEADER-ENTRYREF </item>
++ <item> SOCKET </item>
++ <item> TEMP-TABLE </item>
++ <item> WIDGET </item>
++ <item> WIDGET-POOL </item>
++ <item> X-DOCUMENT </item>
++ <item> X-NODEREF </item>
++ <item> CURRENT-LANGUAGE </item>
++ <item> CURRENT-VALUE </item>
++ <item> DDE </item>
++ <item> ADVISE </item>
++ <item> EXECUTE </item>
++ <item> GET </item>
++ <item> INITIATE </item>
++ <item> REQUEST </item>
++ <item> SEND </item>
++ <item> TERMINATE </item>
++ <item> DEF </item>
++ <item> DEFINE </item>
++ <item> VAR </item>
++ <item> VARIABLE </item>
++ <item> BROWSE </item>
++ <item> BUFFER </item>
++ <item> BUTTON </item>
++ <item> DATASET </item>
++ <item> DATA-SOURCE </item>
++ <item> FRAME </item>
++ <item> IMAGE </item>
++ <item> MENU </item>
++ <item> PARAM </item>
++ <item> PARAMETER </item>
++ <item> QUERY </item>
++ <item> RECTANGLE </item>
++ <item> STREAM </item>
++ <item> SUB-MENU </item>
++ <item> TEMP-TABLE </item>
++ <item> VARIABLE </item>
++ <item> WORK-TABLE </item>
++ <item> WORKFILE </item>
++ <item> DELETE </item>
++ <item> ALIAS </item>
++ <item> OBJECT </item>
++ <item> WIDGET </item>
++ <item> WIDGET-POOL </item>
++ <item> DICTIONARY </item>
++ <item> DISABLE </item>
++ <item> TRIGGERS </item>
++ <item> DISCONNECT </item>
++ <item> DISPLAY </item>
++ <item> DOS </item>
++ <item> DOWN </item>
++ <item> DYNAMIC-CURRENT-VALUE </item>
++ <item> EMPTY </item>
++ <item> TEMP-TABLE </item>
++ <item> ENABLE </item>
++ <item> ENTRY </item>
++ <item> EXPORT </item>
++ <item> FIND </item>
++ <item> FORM </item>
++ <item> FRAME-VALUE </item>
++ <item> GET </item>
++ <item> GET-KEY-VALUE </item>
++ <item> HIDE </item>
++ <item> IMPORT </item>
++ <item> INPUT </item>
++ <item> CLEAR </item>
++ <item> CLOSE </item>
++ <item> FROM </item>
++ <item> TO </item>
++ <item> THROUGH </item>
++ <item> INPUT-OUTPUT</item>
++ <item> THROUGH </item>
++ <item> INSERT </item>
++ <item> LEAVE </item>
++ <item> LENGTH </item>
++ <item> LOAD </item>
++ <item> LOAD-PICTURE </item>
++ <item> MESSAGE </item>
++ <item> NEXT </item>
++ <item> NEXT-PROMPT </item>
++ <item> QUERY </item>
++ <item> OPEN </item>
++ <item> OS-APPEND </item>
++ <item> OS-COMMAND </item>
++ <item> OS-COPY </item>
++ <item> OS-CREATE-DIR </item>
++ <item> OS-DELETE </item>
++ <item> OS-RENAME </item>
++ <item> OUTPUT </item>
++ <item> OVERLAY </item>
++ <item> PAGE </item>
++ <item> PAUSE </item>
++ <item> PROCESS </item>
++ <item> EVENTS </item>
++ <item> PROMPT-FOR </item>
++ <item> PROMSGS </item>
++ <item> PROPATH </item>
++ <item> PUBLISH </item>
++ <item> CURSOR </item>
++ <item> PUT </item>
++ <item> SCREEN </item>
++ <item> PUT-BITS </item>
++ <item> PUT-BYTE </item>
++ <item> PUT-BYTES </item>
++ <item> PUT-DOUBLE </item>
++ <item> PUT-FLOAT </item>
++ <item> PUT-KEY-VALUE </item>
++ <item> PUT-LONG </item>
++ <item> PUT-SHORT </item>
++ <item> PUT-STRING </item>
++ <item> PUT-UNSIGNED-SHORT </item>
++ <item> QUIT </item>
++ <item> RAW </item>
++ <item> RAW-TRANSFER </item>
++ <item> READKEY </item>
++ <item> RELEASE </item>
++ <item> EXTERNAL </item>
++ <item> OBJECT </item>
++ <item> REPOSITION </item>
++ <item> RETURN </item>
++ <item> RETURNS </item>
++ <item> RUN </item>
++ <item> STORED-PROCEDURE </item>
++ <item> SUPER </item>
++ <item> SAVE </item>
++ <item> CACHE </item>
++ <item> SEEK </item>
++ <item> SET </item>
++ <item> SET-BYTE-ORDER </item>
++ <item> SET-POINTER-VALUE </item>
++ <item> SET-SIZE </item>
++ <item> SCROLL </item>
++ <item> SHOW-STATS </item>
++ <item> STATUS </item>
++ <item> STOP </item>
++ <item> SUBSCRIBE </item>
++ <item> SUBSTRING </item>
++ <item> COLOR </item>
++ <item> SYSTEM-DIALOG </item>
++ <item> FONT </item>
++ <item> GET-DIR </item>
++ <item> GET-FILE </item>
++ <item> PRINTER-SETUP </item>
++ <item> SYSTEM-HELP </item>
++ <item> TERMINAL </item>
++ <item> TRANSACTION-MODE </item>
++ <item> AUTOMATIC </item>
++ <item> TRIGGER </item>
++ <item> UNDERLINE </item>
++ <item> UNDO </item>
++ <item> UNIX </item>
++ <item> UNLOAD </item>
++ <item> UNSUBSCRIBE </item>
++ <item> UP </item>
++ <item> UPDATE </item>
++ <item> USE </item>
++ <item> VALIDATE </item>
++ <item> VIEW </item>
++ <item> WAIT-FOR </item>
+ </list>
+
+ <list name="widgets">
+- <item> BROWSE </item>
+- <item> BUTTON </item>
+- <item> COMBO-BOX </item>
+- <item> CONTROL-FRAME </item>
+- <item> DIALOG-BOX </item>
+- <item> EDITOR </item>
+- <item> FIELD-GROUP </item>
+- <item> FILL-IN </item>
+- <item> FRAME </item>
+- <item> IMAGE </item>
+- <item> LITERAL </item>
+- <item> MENU </item>
+- <item> MENU-ITEM </item>
+- <item> RADIO-SET </item>
+- <item> RECTANGLE </item>
+- <item> SELECTION-LIST </item>
+- <item> SLIDER </item>
+- <item> SUB-MENU </item>
+- <item> TEXT </item>
+- <item> TOGGLE-BOX </item>
+- <item> WINDOW </item>
++ <item> BROWSE </item>
++ <item> BUTTON </item>
++ <item> COMBO-BOX </item>
++ <item> CONTROL-FRAME </item>
++ <item> DIALOG-BOX </item>
++ <item> EDITOR </item>
++ <item> FIELD-GROUP </item>
++ <item> FILL-IN </item>
++ <item> FRAME </item>
++ <item> IMAGE </item>
++ <item> LITERAL </item>
++ <item> MENU </item>
++ <item> MENU-ITEM </item>
++ <item> RADIO-SET </item>
++ <item> RECTANGLE </item>
++ <item> SELECTION-LIST </item>
++ <item> SLIDER </item>
++ <item> SUB-MENU </item>
++ <item> TEXT </item>
++ <item> TOGGLE-BOX </item>
++ <item> WINDOW </item>
+ </list>
+
+ <list name="handles">
+- <item> ACTIVE-WINDOW </item>
+- <item> Buffer </item>
+- <item> Buffer-field </item>
+- <item> CALL </item>
+- <item> CLIPBOARD </item>
+- <item> CODEBASE-LOCATOR </item>
+- <item> COLOR-TABLE </item>
+- <item> COM-SELF </item>
+- <item> COMPILER </item>
+- <item> CURRENT-WINDOW </item>
+- <item> DATA-RELATION </item>
+- <item> DATE-SOURCE </item>
+- <item> DEBUGGER </item>
+- <item> DEFAULT-WINDOW </item>
+- <item> ERROR-STATUS </item>
+- <item> FILE-INFO </item>
+- <item> FOCUS </item>
+- <item> FONT-TABLE </item>
+- <item> LAST-EVENT </item>
+- <item> LOG-MANAGER </item>
+- <item> PRODATASET </item>
+- <item> QUERY </item>
+- <item> RCODE-INFO </item>
+- <item> SAX-ATTRIBUTES </item>
+- <item> SAX-READER </item>
+- <item> SELF </item>
+- <item> SERVER SOCKET </item>
+- <item> SESSION </item>
+- <item> SOAP-FAULT </item>
+- <item> SOAP-FAULT-DETAIL </item>
+- <item> SOAP-HEADER </item>
+- <item> SOAP-HEADER-ENTRYREF </item>
+- <item> SOCKET </item>
+- <item> SOURCE-PROCEDURE </item>
+- <item> TARGET-PROCEDURE </item>
+- <item> TEMP-TABLE </item>
+- <item> THIS-PROCEDURE </item>
+- <item> TRANSACTION </item>
+- <item> WEB-CONTEXT </item>
+- <item> X-DOCUMENT </item>
+- <item> X-NODEREF </item>
++ <item> ACTIVE-WINDOW </item>
++ <item> BUFFER </item>
++ <item> BUFFER-FIELD </item>
++ <item> CALL </item>
++ <item> CLIPBOARD </item>
++ <item> CODEBASE-LOCATOR </item>
++ <item> COLOR-TABLE </item>
++ <item> COM-SELF </item>
++ <item> COMPILER </item>
++ <item> CURRENT-WINDOW </item>
++ <item> DATA-RELATION </item>
++ <item> DATE-SOURCE </item>
++ <item> DEBUGGER </item>
++ <item> DEFAULT-WINDOW </item>
++ <item> ERROR-STATUS </item>
++ <item> FILE-INFO </item>
++ <item> FOCUS </item>
++ <item> FONT-TABLE </item>
++ <item> LAST-EVENT </item>
++ <item> LOG-MANAGER </item>
++ <item> PRODATASET </item>
++ <item> QUERY </item>
++ <item> RCODE-INFO </item>
++ <item> SAX-ATTRIBUTES </item>
++ <item> SAX-READER </item>
++ <item> SELF </item>
++ <item> SERVER SOCKET </item>
++ <item> SESSION </item>
++ <item> SOAP-FAULT </item>
++ <item> SOAP-FAULT-DETAIL </item>
++ <item> SOAP-HEADER </item>
++ <item> SOAP-HEADER-ENTRYREF </item>
++ <item> SOCKET </item>
++ <item> SOURCE-PROCEDURE </item>
++ <item> TARGET-PROCEDURE </item>
++ <item> TEMP-TABLE </item>
++ <item> THIS-PROCEDURE </item>
++ <item> TRANSACTION </item>
++ <item> WEB-CONTEXT </item>
++ <item> X-DOCUMENT </item>
++ <item> X-NODEREF </item>
+ </list>
+
+ <list name="properties">
+- <item> Control-Name </item>
+- <item> CONTROLS </item>
+- <item> Height </item>
+- <item> HonorProKeys </item>
+- <item> HonorReturnKey </item>
+- <item> LEFT </item>
+- <item> NAME </item>
+- <item> TOP </item>
+- <item> WIDTH </item>
+- <item> TAG </item>
++ <item> CONTROL-NAME </item>
++ <item> CONTROLS </item>
++ <item> HEIGHT </item>
++ <item> HONORPROKEYS </item>
++ <item> HONORRETURNKEY </item>
++ <item> LEFT </item>
++ <item> NAME </item>
++ <item> TOP </item>
++ <item> WIDTH </item>
++ <item> TAG </item>
+ </list>
+-
++
+ <list name="attributes">
+- <item> ACCELERATOR </item>
+- <item> ACTIVE </item>
+- <item> ACTOR </item>
+- <item> ADM-DATA </item>
+- <item> AFTER-BUFFER </item>
+- <item> AFTER-ROWID </item>
+- <item> AFTER-TABLE </item>
+- <item> ALLOW-COLUMN-SEARCHING </item>
+- <item> ALWAYS-ON-TOP </item>
+- <item> AMBIGUOUS </item>
+- <item> APPL-ALERT-BOXES </item>
+- <item> APPSERVER-INFO </item>
+- <item> APPSERVER-PASSWORD </item>
+- <item> APPSERVER-USERID </item>
+- <item> ASYNCHRONOUS </item>
+- <item> ASYNC-REQUEST-COUNT </item>
+- <item> ASYNC-REQUEST-HANDLE </item>
+- <item> ATTRIBUTE-NAMES </item>
+- <item> ATTR-SPACE </item>
+- <item> AUTO-COMPLETION </item>
+- <item> AUTO-DELETE </item>
+- <item> AUTO-END-KEY </item>
+- <item> AUTO-GO </item>
+- <item> AUTO-INDENT </item>
+- <item> AUTO-RESIZE </item>
+- <item> AUTO-RETURN </item>
+- <item> AUTO-VALIDATE </item>
+- <item> AUTO-ZAP </item>
+- <item> AVAILABLE </item>
+- <item> AVAILABLE-FORMATS </item>
+- <item> BACKGROUND </item>
+- <item> BASE-ADE </item>
+- <item> BASIC-LOGGING </item>
+- <item> BATCH-MODE </item>
+- <item> BEFORE-BUFFER </item>
+- <item> BEFORE-ROWID </item>
+- <item> BEFORE-TABLE </item>
+- <item> BGCOLOR </item>
+- <item> BLANK </item>
+- <item> BLOCK-ITERATION-DISPLAY </item>
+- <item> BORDER-BOTTOM-CHARS </item>
+- <item> BORDER-BOTTOM-PIXELS </item>
+- <item> BORDER-LEFT-CHARS </item>
+- <item> BORDER-LEFT-PIXELS </item>
+- <item> BORDER-RIGHT-CHARS </item>
+- <item> BORDER-RIGHT-PIXELS </item>
+- <item> BORDER-TOP-CHARS </item>
+- <item> BORDER-TOP-PIXELS </item>
+- <item> BOX </item>
+- <item> BOX-SELECTABLE </item>
+- <item> BUFFER-CHARS </item>
+- <item> BUFFER-VALUE </item>
+- <item> BYTES-READ </item>
+- <item> BYTES-WRITTEN </item>
+- <item> CACHE </item>
+- <item> CALL-NAME </item>
+- <item> CALL-TYPE </item>
+- <item> BUFFER-FIELD </item>
+- <item> BUFFER-HANDLE </item>
+- <item> BUFFER-LINES </item>
+- <item> BUFFER-NAME </item>
+- <item> CANCEL-BUTTON </item>
+- <item> CANCELLED </item>
+- <item> CAN-CREATE </item>
+- <item> CAN-DELETE </item>
+- <item> CAN-READ </item>
+- <item> CAN-WRITE </item>
+- <item> CAREFUL-PAINT </item>
+- <item> CASE-SENSITIVE </item>
+- <item> CENTERED </item>
+- <item> CHARSET </item>
+- <item> CHECKED </item>
+- <item> CHILD-BUFFER </item>
+- <item> CHILD-NUM </item>
+- <item> CLIENT-CONNECTION-ID </item>
+- <item> CLIENT-TYPE </item>
+- <item> CODE </item>
+- <item> CODEPAGE </item>
+- <item> COLUMN </item>
+- <item> COLUMN-BGCOLOR </item>
+- <item> COLUMN-DCOLOR </item>
+- <item> COLUMN-FGCOLOR </item>
+- <item> COLUMN-FONT </item>
+- <item> COLUMN-LABEL </item>
+- <item> COLUMN-MOVABLE </item>
+- <item> COLUMN-PFCOLOR </item>
+- <item> COLUMN-READ-ONLY </item>
+- <item> COLUMN-RESIZABLE </item>
+- <item> COLUMN-SCROLLING </item>
+- <item> COM-HANDLE </item>
+- <item> COMPLETE </item>
+- <item> CONTEXT-HELP </item>
+- <item> CONTEXT-HELP-FILE </item>
+- <item> CONTEXT-HELP-ID </item>
+- <item> CONTROL-BOX </item>
+- <item> CONVERT-D-COLORS </item>
+- <item> CPCASE </item>
+- <item> CPCOLL </item>
+- <item> CPINTERNAL </item>
+- <item> CPLOG </item>
+- <item> CPPRINT </item>
+- <item> CPRCODEIN </item>
+- <item> CPRCODEOUT </item>
+- <item> CPSTREAM </item>
+- <item> CPTERM </item>
+- <item> CRC-VALUE </item>
+- <item> CURRENT-CHANGED </item>
+- <item> CURRENT-COLUMN </item>
+- <item> CURRENT-ITERATION </item>
+- <item> CURRENT-RESULT-ROW </item>
+- <item> CURRENT-ROW-MODIFIED </item>
+- <item> CURRENT-WINDOW </item>
+- <item> CURSOR-CHAR </item>
+- <item> CURSOR-LINE </item>
+- <item> CURSOR-OFFSET </item>
+- <item> DATA-ENTRY-RETURN </item>
+- <item> DATA-SOURCE </item>
+- <item> DATA-TYPE </item>
+- <item> DATASET </item>
+- <item> DATE-FORMAT </item>
+- <item> DBNAME </item>
+- <item> DB-REFERENCES </item>
+- <item> DCOLOR </item>
+- <item> DDE-ERROR </item>
+- <item> DDE-ID </item>
+- <item> DDE-ITEM </item>
+- <item> DDE-NAME </item>
+- <item> DDE-TOPIC </item>
+- <item> DEBLANK </item>
+- <item> DEBUG-ALERT </item>
+- <item> DECIMALS </item>
+- <item> DEFAULT </item>
+- <item> DEFAULT-BUFFER-HANDLE </item>
+- <item> DEFAULT-BUTTON </item>
+- <item> DEFAULT-COMMIT </item>
+- <item> DELIMITER </item>
+- <item> DISABLE-AUTO-ZAP </item>
+- <item> DISPLAY-TIMEZONE </item>
+- <item> DISPLAY-TYPE </item>
+- <item> DOWN </item>
+- <item> DRAG-ENABLED </item>
+- <item> DROP-TARGET </item>
+- <item> DYNAMIC </item>
+- <item> EDGE-CHARS </item>
+- <item> EDGE-PIXELS </item>
+- <item> EDIT-CAN-PASTE </item>
+- <item> EDIT-CAN-UNDO </item>
+- <item> EMPTY </item>
+- <item> ENCODING </item>
+- <item> END-USER-PROMPT </item>
+- <item> ENTRY-TYPES-LIST </item>
+- <item> ERROR </item>
+- <item> ERROR-COLUMN </item>
+- <item> ERROR-OBJECT-DETAIL </item>
+- <item> ERROR-ROW </item>
+- <item> ERROR-STRING </item>
+- <item> EVENT-PROCEDURE </item>
+- <item> EVENT-PROCEDURE-CONTEXT </item>
+- <item> EVENT-TYPE </item>
+- <item> EXPAND </item>
+- <item> EXPANDABLE </item>
+- <item> EXTENT </item>
+- <item> FGCOLOR </item>
+- <item> FILE-CREATE-DATE </item>
+- <item> FILE-CREATE-TIME </item>
+- <item> FILE-MOD-DATE </item>
+- <item> FILE-MOD-TIME </item>
+- <item> FILE-NAME </item>
+- <item> FILE-OFFSET </item>
+- <item> FILE-SIZE </item>
+- <item> FILE-TYPE </item>
+- <item> FILLED </item>
+- <item> FILL-MODE </item>
+- <item> FILL-WHERE-STRING </item>
+- <item> FIRST-ASYNC-REQUEST </item>
+- <item> FIRST-BUFFER </item>
+- <item> FIRST-CHILD </item>
+- <item> FIRST-COLUMN </item>
+- <item> FIRST-DATASET </item>
+- <item> FIRST-DATA-SOURCE </item>
+- <item> FIRST-PROCEDURE </item>
+- <item> FIRST-QUERY </item>
+- <item> FIRST-SERVER </item>
+- <item> FIRST-SERVER-SOCKET </item>
+- <item> FIRST-SOCKET </item>
+- <item> FIRST-TAB-ITEM </item>
+- <item> FIT-LAST-COLUMN </item>
+- <item> FLAT-BUTTON </item>
+- <item> FOCUSED-ROW </item>
+- <item> FOCUSED-ROW-SELECTED </item>
+- <item> FONT </item>
+- <item> FOREGROUND </item>
+- <item> FORMAT </item>
+- <item> FORWARD-ONLY </item>
+- <item> FRAME </item>
+- <item> FRAME-COL </item>
+- <item> FRAME-NAME </item>
+- <item> FRAME-ROW </item>
+- <item> FRAME-SPACING </item>
+- <item> FRAME-X </item>
+- <item> FRAME-Y </item>
+- <item> FREQUENCY </item>
+- <item> FULL-HEIGHT-CHARS </item>
+- <item> FULL-HEIGHT-PIXELS </item>
+- <item> FULL-PATHNAME </item>
+- <item> FULL-WIDTH-CHARS </item>
+- <item> FULL-WIDTH-PIXELS </item>
+- <item> FUNCTION </item>
+- <item> GRAPHIC-EDGE </item>
+- <item> GRID-FACTOR-HORIZONTAL </item>
+- <item> GRID-FACTOR-VERTICAL </item>
+- <item> GRID-SNAP </item>
+- <item> GRID-UNIT-HEIGHT-CHARS </item>
+- <item> GRID-UNIT-HEIGHT-PIXELS </item>
+- <item> GRID-UNIT-WIDTH-CHARS </item>
+- <item> GRID-UNIT-WIDTH-PIXELS </item>
+- <item> GRID-VISIBLE </item>
+- <item> HANDLER </item>
+- <item> HAS-LOBS </item>
+- <item> HAS-RECORDS </item>
+- <item> HEIGHT-CHARS </item>
+- <item> HEIGHT-PIXELS </item>
+- <item> HELP </item>
+- <item> HIDDEN </item>
+- <item> HORIZONTAL </item>
+- <item> HTML-CHARSET </item>
+- <item> HWND </item>
+- <item> ICFPARAMETER </item>
+- <item> ICON </item>
+- <item> IGNORE-CURRENT-MODIFIED </item>
+- <item> IMAGE </item>
+- <item> IMAGE-DOWN </item>
+- <item> IMAGE-INSENSITIVE </item>
+- <item> IMAGE-UP </item>
+- <item> IMMEDIATE-DISPLAY </item>
+- <item> INDEX </item>
+- <item> INDEX-INFORMATION </item>
+- <item> INITIAL </item>
+- <item> INNER-CHARS </item>
+- <item> INNER-LINES </item>
+- <item> INPUT-VALUE </item>
+- <item> INSTANTIATING-PROCEDURE </item>
+- <item> INTERNAL-ENTRIES </item>
+- <item> IN-HANDLE </item>
+- <item> IS-OPEN </item>
+- <item> IS-PARAMETER-SET </item>
+- <item> ITEMS-PER-ROW </item>
+- <item> KEEP-CONNECTION-OPEN </item>
+- <item> KEEP-FRAME-Z-ORDER </item>
+- <item> KEEP-SECURITY-CACHE </item>
+- <item> KEY </item>
+- <item> LABEL </item>
+- <item> LABEL-BGCOLOR </item>
+- <item> LABEL-DCOLOR </item>
+- <item> LABEL-FGCOLOR </item>
+- <item> LABEL-FONT </item>
+- <item> LABELS </item>
+- <item> LANGUAGES </item>
+- <item> LARGE </item>
+- <item> LARGE-TO-SMALL </item>
+- <item> LAST-ASYNC-REQUEST </item>
+- <item> LAST-CHILD </item>
+- <item> LAST-PROCEDURE </item>
+- <item> LAST-SERVER </item>
+- <item> LAST-SERVER-SOCKET </item>
+- <item> LAST-SOCKET </item>
+- <item> LAST-TAB-ITEM </item>
+- <item> LENGTH </item>
+- <item> LINE </item>
+- <item> LIST-ITEM-PAIRS </item>
+- <item> LIST-ITEMS </item>
+- <item> LITERAL-QUESTION </item>
+- <item> LOCAL-HOST </item>
+- <item> LOCAL-NAME </item>
+- <item> LOCAL-PORT </item>
+- <item> LOCATOR-COLUMN-NUMBER </item>
+- <item> LOCATOR-LINE-NUMBER </item>
+- <item> LOCATOR-PUBLIC-ID </item>
+- <item> LOCATOR-SYSTEM-ID </item>
+- <item> LOCATOR-TYPE </item>
+- <item> LOCKED </item>
+- <item> LOG-ENTRY-TYPES </item>
+- <item> LOG-THRESHOLD </item>
+- <item> LOGFILE-NAME </item>
+- <item> LOGGING-LEVEL </item>
+- <item> MANDATORY </item>
+- <item> MANUAL-HIGHLIGHT </item>
+- <item> MAX-BUTTON </item>
+- <item> MAX-CHARS </item>
+- <item> MAX-DATA-GUESS </item>
+- <item> MAX-HEIGHT-CHARS </item>
+- <item> MAX-HEIGHT-PIXELS </item>
+- <item> MAX-VALUE </item>
+- <item> MAX-WIDTH-CHARS </item>
+- <item> MAX-WIDTH-PIXELS </item>
+- <item> MD-VALUE </item>
+- <item> MENU-BAR </item>
+- <item> MENU-KEY </item>
+- <item> MENU-MOUSE </item>
+- <item> MESSAGE-AREA </item>
+- <item> MESSAGE-AREA-FONT </item>
+- <item> MIN-BUTTON </item>
+- <item> MIN-COLUMN-WIDTH-CHARS </item>
+- <item> MIN-COLUMN-WIDTH-PIXELS </item>
+- <item> MIN-HEIGHT-CHARS </item>
+- <item> MIN-HEIGHT-PIXELS </item>
+- <item> MIN-SCHEMA-MARSHAL </item>
+- <item> MIN-VALUE </item>
+- <item> MIN-WIDTH-CHARS </item>
+- <item> MIN-WIDTH-PIXELS </item>
+- <item> MODIFIED </item>
+- <item> MOUSE-POINTER </item>
+- <item> MOVABLE </item>
+- <item> MULTIPLE </item>
+- <item> MULTITASKING-INTERVAL </item>
+- <item> MUST-UNDERSTAND </item>
+- <item> NAME </item>
+- <item> NAMESPACE-PREFIX </item>
+- <item> NAMESPACE-URI </item>
+- <item> NEEDS-APPSERVER-PROMPT </item>
+- <item> NEEDS-PROMPT </item>
+- <item> NEW </item>
+- <item> NEW-ROW </item>
+- <item> NEXT-COLUMN </item>
+- <item> NEXT-SIBLING </item>
+- <item> NEXT-TAB-ITEM </item>
+- <item> NO-CURRENT-VALUE </item>
+- <item> NO-EMPTY-SPACE </item>
+- <item> NO-FOCUS </item>
+- <item> NO-SCHEMA-MARSHAL </item>
+- <item> NO-VALIDATE </item>
+- <item> NODE-VALUE </item>
+- <item> NUM-BUFFERS </item>
+- <item> NUM-BUTTONS </item>
+- <item> NUM-CHILD-RELATIONS </item>
+- <item> NUM-CHILDREN </item>
+- <item> NUM-COLUMNS </item>
+- <item> NUM-DROPPED-FILES </item>
+- <item> NUM-ENTRIES </item>
+- <item> NUM-FIELDS </item>
+- <item> NUM-FORMATS </item>
+- <item> NUM-HEADER-ENTRIES </item>
+- <item> NUM-ITEMS </item>
+- <item> NUM-ITERATIONS </item>
+- <item> NUM-LINES </item>
+- <item> NUM-LOCKED-COLUMNS </item>
+- <item> NUM-LOG-FILES </item>
+- <item> NUM-MESSAGES </item>
+- <item> NUM-PARAMETERS </item>
+- <item> NUM-RELATIONS </item>
+- <item> NUM-REPLACED </item>
+- <item> NUM-RESULTS </item>
+- <item> NUM-SELECTED-ROWS </item>
+- <item> NUM-SELECTED-WIDGETS </item>
+- <item> NUM-SOURCE-BUFFERS </item>
+- <item> NUM-TABS </item>
+- <item> NUM-TO-RETAIN </item>
+- <item> NUM-TOP-BUFFERS </item>
+- <item> NUM-VISIBLE-COLUMNS </item>
+- <item> NUMERIC-DECIMAL-POINT </item>
+- <item> NUMERIC-FORMAT </item>
+- <item> NUMERIC-SEPARATOR </item>
+- <item> ON-FRAME-BORDER </item>
+- <item> ORIGIN-HANDLE </item>
+- <item> ORIGIN-ROWID </item>
+- <item> OVERLAY </item>
+- <item> OWNER </item>
+- <item> OWNER-DOCUMENT </item>
+- <item> PAGE-BOTTOM </item>
+- <item> PAGE-TOP </item>
+- <item> PARAMETER </item>
+- <item> PARENT </item>
+- <item> PARENT-BUFFER </item>
+- <item> PARENT-RELATION </item>
+- <item> PARSE-STATUS </item>
+- <item> PASSWORD-FIELD </item>
+- <item> PATHNAME </item>
+- <item> PERSISTENT </item>
+- <item> PERSISTENT-CACHE-DISABLED </item>
+- <item> PERSISTENT-PROCEDURE </item>
+- <item> PFCOLOR </item>
+- <item> PIXELS-PER-COLUMN </item>
+- <item> PIXELS-PER-ROW </item>
+- <item> POPUP-MENU </item>
+- <item> POPUP-ONLY </item>
+- <item> POSITION </item>
+- <item> PREPARED </item>
+- <item> PREPARE-STRING </item>
+- <item> PREV-COLUMN </item>
+- <item> PREV-SIBLING </item>
+- <item> PREV-TAB-ITEM </item>
+- <item> PRIMARY </item>
+- <item> PRINTER-CONTROL-HANDLE </item>
+- <item> PRINTER-HDC </item>
+- <item> PRINTER-NAME </item>
+- <item> PRINTER-PORT </item>
+- <item> PRIVATE-DATA </item>
+- <item> PROCEDURE-NAME </item>
+- <item> PROGRESS-SOURCE </item>
+- <item> PROXY </item>
+- <item> PROXY-PASSWORD </item>
+- <item> PROXY-USERID </item>
+- <item> PUBLIC-ID </item>
+- <item> PUBLISHED-EVENTS </item>
+- <item> QUERY </item>
+- <item> QUERY-OFF-END </item>
+- <item> QUIT </item>
+- <item> RADIO-BUTTONS </item>
+- <item> READ-ONLY </item>
+- <item> RECID </item>
+- <item> RECORD-LENGTH </item>
+- <item> REFRESHABLE </item>
+- <item> REJECTED </item>
+- <item> RELATION-FIELDS </item>
+- <item> RELATIONS-ACTIVE </item>
+- <item> REMOTE </item>
+- <item> REMOTE-HOST </item>
+- <item> REMOTE-PORT </item>
+- <item> REPOSITION </item>
+- <item> RESIZABLE </item>
+- <item> RESIZE </item>
+- <item> RETAIN-SHAPE </item>
+- <item> RETURN-INSERTED </item>
+- <item> RETURN-VALUE </item>
+- <item> RETURN-VALUE-DATA-TYPE </item>
+- <item> ROW </item>
+- <item> ROW-HEIGHT-CHARS </item>
+- <item> ROW-HEIGHT-PIXELS </item>
+- <item> ROW-STATE </item>
+- <item> ROWID </item>
+- <item> ROW-MARKERS </item>
+- <item> ROW-RESIZABLE </item>
+- <item> SAVE-WHERE-STRING </item>
+- <item> SCHEMA-CHANGE </item>
+- <item> SCHEMA-PATH </item>
+- <item> SCREEN-LINES </item>
+- <item> SCREEN-VALUE </item>
+- <item> SCROLL-BARS </item>
+- <item> SCROLLABLE </item>
+- <item> SCROLLBAR-HORIZONTAL </item>
+- <item> SCROLLBAR-VERTICAL </item>
+- <item> SELECTABLE </item>
+- <item> SELECTED </item>
+- <item> SELECTION-END </item>
+- <item> SELECTION-START </item>
+- <item> SELECTION-TEXT </item>
+- <item> SENSITIVE </item>
+- <item> SEPARATORS </item>
+- <item> SEPARATOR-FGCOLOR </item>
+- <item> SERVER </item>
+- <item> SERVER-CONNECTION-BOUND </item>
+- <item> SERVER-CONNECTION-BOUND-REQUEST </item>
+- <item> SERVER-CONNECTION-CONTEXT </item>
+- <item> SERVER-CONNECTION-ID </item>
+- <item> SERVER-OPERATING-MODE </item>
+- <item> SHOW-IN-TASKBAR </item>
+- <item> SIDE-LABEL-HANDLE </item>
+- <item> SIDE-LABELS </item>
+- <item> SKIP-DELETED-RECORD </item>
+- <item> SMALL-ICON </item>
+- <item> SMALL-TITLE </item>
+- <item> SOAP-FAULT-ACTOR </item>
+- <item> SOAP-FAULT-CODE </item>
+- <item> SOAP-FAULT-DETAIL </item>
+- <item> SOAP-FAULT-STRING </item>
+- <item> SORT </item>
+- <item> STARTUP-PARAMETERS </item>
+- <item> STATUS-AREA </item>
+- <item> STATUS-AREA-FONT </item>
+- <item> STOP </item>
+- <item> STOPPED </item>
+- <item> STREAM </item>
+- <item> STRETCH-TO-FIT </item>
+- <item> STRING-VALUE </item>
+- <item> SUBTYPE </item>
+- <item> SUPER-PROCEDURES </item>
+- <item> SUPPRESS-NAMESPACE-PROCESSING </item>
+- <item> SUPPRESS-WARNINGS </item>
+- <item> SYSTEM-ALERT-BOXES </item>
+- <item> SYSTEM-ID </item>
+- <item> TAB-POSITION </item>
+- <item> TAB-STOP </item>
+- <item> TABLE </item>
+- <item> TABLE-CRC-LIST </item>
+- <item> TABLE-HANDLE </item>
+- <item> TABLE-LIST </item>
+- <item> TABLE-NUMBER </item>
+- <item> TEMP-DIRECTORY </item>
+- <item> TEXT-SELECTED </item>
+- <item> THREE-D </item>
+- <item> TIC-MARKS </item>
+- <item> TIME-SOURCE </item>
+- <item> TITLE </item>
+- <item> TITLE-BGCOLOR </item>
+- <item> TITLE-DCOLOR </item>
+- <item> TITLE-FGCOLOR </item>
+- <item> TITLE-FONT </item>
+- <item> TOGGLE-BOX </item>
+- <item> TOOLTIP </item>
+- <item> TOOLTIPS </item>
+- <item> TOP-ONLY </item>
+- <item> TRACKING-CHANGES </item>
+- <item> TRANSACTION </item>
+- <item> TRANSPARENT </item>
+- <item> TRANS-INIT-PROCEDURE </item>
+- <item> TYPE </item>
+- <item> UNDO </item>
+- <item> UNIQUE-ID </item>
+- <item> UNIQUE-MATCH </item>
+- <item> URL </item>
+- <item> URL-PASSWORD </item>
+- <item> URL-USERID </item>
+- <item> DISPLAY </item>
+- <item> VALIDATE-EXPRESSION </item>
+- <item> VALIDATE-MESSAGE </item>
+- <item> VALIDATION-ENABLED </item>
+- <item> VALUE </item>
+- <item> VIEW-FIRST-COLUMN-ON-REOPEN </item>
+- <item> VIRTUAL-HEIGHT-CHARS </item>
+- <item> VIRTUAL-HEIGHT-PIXELS </item>
+- <item> VIRTUAL-WIDTH-CHARS </item>
+- <item> VIRTUAL-WIDTH-PIXELS </item>
+- <item> VISIBLE </item>
+- <item> WARNING </item>
+- <item> WHERE-STRING </item>
+- <item> WIDGET-ENTER </item>
+- <item> WIDGET-LEAVE </item>
+- <item> WIDTH-CHARS </item>
+- <item> WIDTH-PIXELS </item>
+- <item> WINDOW </item>
+- <item> WINDOW-STATE </item>
+- <item> WINDOW-SYSTEM </item>
+- <item> WORD-WRAP </item>
+- <item> WORK-AREA-HEIGHT-PIXELS </item>
+- <item> WORK-AREA-WIDTH-PIXELS </item>
+- <item> WORK-AREA-X </item>
+- <item> WORK-AREA-Y </item>
+- <item> X </item>
+- <item> XML-SCHEMA-PATH </item>
+- <item> XML-SUPPRESS-NAMESPACE-PROCESSING </item>
+- <item> Y </item>
+- <item> YEAR-OFFSET </item>
++ <item> ACCELERATOR </item>
++ <item> ACTIVE </item>
++ <item> ACTOR </item>
++ <item> ADM-DATA </item>
++ <item> AFTER-BUFFER </item>
++ <item> AFTER-ROWID </item>
++ <item> AFTER-TABLE </item>
++ <item> ALLOW-COLUMN-SEARCHING </item>
++ <item> ALWAYS-ON-TOP </item>
++ <item> AMBIGUOUS </item>
++ <item> APPL-ALERT-BOXES </item>
++ <item> APPSERVER-INFO </item>
++ <item> APPSERVER-PASSWORD </item>
++ <item> APPSERVER-USERID </item>
++ <item> ASYNCHRONOUS </item>
++ <item> ASYNC-REQUEST-COUNT </item>
++ <item> ASYNC-REQUEST-HANDLE </item>
++ <item> ATTRIBUTE-NAMES </item>
++ <item> ATTR-SPACE </item>
++ <item> AUTO-COMPLETION </item>
++ <item> AUTO-DELETE </item>
++ <item> AUTO-ENDKEY </item>
++ <item> AUTO-GO </item>
++ <item> AUTO-INDENT </item>
++ <item> AUTO-RESIZE </item>
++ <item> AUTO-RETURN </item>
++ <item> AUTO-VALIDATE </item>
++ <item> AUTO-ZAP </item>
++ <item> AVAILABLE </item>
++ <item> AVAILABLE-FORMATS </item>
++ <item> BACKGROUND </item>
++ <item> BASE-ADE </item>
++ <item> BASIC-LOGGING </item>
++ <item> BATCH-MODE </item>
++ <item> BEFORE-BUFFER </item>
++ <item> BEFORE-ROWID </item>
++ <item> BEFORE-TABLE </item>
++ <item> BGCOLOR </item>
++ <item> BLANK </item>
++ <item> BLOCK-ITERATION-DISPLAY </item>
++ <item> BORDER-BOTTOM-CHARS </item>
++ <item> BORDER-BOTTOM-PIXELS </item>
++ <item> BORDER-LEFT-CHARS </item>
++ <item> BORDER-LEFT-PIXELS </item>
++ <item> BORDER-RIGHT-CHARS </item>
++ <item> BORDER-RIGHT-PIXELS </item>
++ <item> BORDER-TOP-CHARS </item>
++ <item> BORDER-TOP-PIXELS </item>
++ <item> BOX </item>
++ <item> BOX-SELECTABLE </item>
++ <item> BUFFER-CHARS </item>
++ <item> BUFFER-VALUE </item>
++ <item> BYTES-READ </item>
++ <item> BYTES-WRITTEN </item>
++ <item> CACHE </item>
++ <item> CALL-NAME </item>
++ <item> CALL-TYPE </item>
++ <item> BUFFER-FIELD </item>
++ <item> BUFFER-HANDLE </item>
++ <item> BUFFER-LINES </item>
++ <item> BUFFER-NAME </item>
++ <item> CANCEL-BUTTON </item>
++ <item> CANCELLED </item>
++ <item> CAN-CREATE </item>
++ <item> CAN-DELETE </item>
++ <item> CAN-READ </item>
++ <item> CAN-WRITE </item>
++ <item> CAREFUL-PAINT </item>
++ <item> CASE-SENSITIVE </item>
++ <item> CENTERED </item>
++ <item> CHARSET </item>
++ <item> CHECKED </item>
++ <item> CHILD-BUFFER </item>
++ <item> CHILD-NUM </item>
++ <item> CLIENT-CONNECTION-ID </item>
++ <item> CLIENT-TYPE </item>
++ <item> CODE </item>
++ <item> CODEPAGE </item>
++ <item> COLUMN </item>
++ <item> COLUMN-BGCOLOR </item>
++ <item> COLUMN-DCOLOR </item>
++ <item> COLUMN-FGCOLOR </item>
++ <item> COLUMN-FONT </item>
++ <item> COLUMN-LABEL </item>
++ <item> COLUMN-MOVABLE </item>
++ <item> COLUMN-PFCOLOR </item>
++ <item> COLUMN-READ-ONLY </item>
++ <item> COLUMN-RESIZABLE </item>
++ <item> COLUMN-SCROLLING </item>
++ <item> COM-HANDLE </item>
++ <item> COMPLETE </item>
++ <item> CONTEXT-HELP </item>
++ <item> CONTEXT-HELP-FILE </item>
++ <item> CONTEXT-HELP-ID </item>
++ <item> CONTROL-BOX </item>
++ <item> CONVERT-D-COLORS </item>
++ <item> CPCASE </item>
++ <item> CPCOLL </item>
++ <item> CPINTERNAL </item>
++ <item> CPLOG </item>
++ <item> CPPRINT </item>
++ <item> CPRCODEIN </item>
++ <item> CPRCODEOUT </item>
++ <item> CPSTREAM </item>
++ <item> CPTERM </item>
++ <item> CRC-VALUE </item>
++ <item> CURRENT-CHANGED </item>
++ <item> CURRENT-COLUMN </item>
++ <item> CURRENT-ITERATION </item>
++ <item> CURRENT-RESULT-ROW </item>
++ <item> CURRENT-ROW-MODIFIED </item>
++ <item> CURRENT-WINDOW </item>
++ <item> CURSOR-CHAR </item>
++ <item> CURSOR-LINE </item>
++ <item> CURSOR-OFFSET </item>
++ <item> DATA-ENTRY-RETURN </item>
++ <item> DATA-SOURCE </item>
++ <item> DATA-TYPE </item>
++ <item> DATASET </item>
++ <item> DATE-FORMAT </item>
++ <item> DBNAME </item>
++ <item> DB-REFERENCES </item>
++ <item> DCOLOR </item>
++ <item> DDE-ERROR </item>
++ <item> DDE-ID </item>
++ <item> DDE-ITEM </item>
++ <item> DDE-NAME </item>
++ <item> DDE-TOPIC </item>
++ <item> DEBLANK </item>
++ <item> DEBUG-ALERT </item>
++ <item> DECIMALS </item>
++ <item> DEFAULT </item>
++ <item> DEFAULT-BUFFER-HANDLE </item>
++ <item> DEFAULT-BUTTON </item>
++ <item> DEFAULT-COMMIT </item>
++ <item> DELIMITER </item>
++ <item> DISABLE-AUTO-ZAP </item>
++ <item> DISPLAY-TIMEZONE </item>
++ <item> DISPLAY-TYPE </item>
++ <item> DOWN </item>
++ <item> DRAG-ENABLED </item>
++ <item> DROP-TARGET </item>
++ <item> DYNAMIC </item>
++ <item> EDGE-CHARS </item>
++ <item> EDGE-PIXELS </item>
++ <item> EDIT-CAN-PASTE </item>
++ <item> EDIT-CAN-UNDO </item>
++ <item> EMPTY </item>
++ <item> ENCODING </item>
++ <item> END-USER-PROMPT </item>
++ <item> ENTRY-TYPES-LIST </item>
++ <item> ERROR </item>
++ <item> ERROR-COLUMN </item>
++ <item> ERROR-OBJECT-DETAIL </item>
++ <item> ERROR-ROW </item>
++ <item> ERROR-STRING </item>
++ <item> EVENT-PROCEDURE </item>
++ <item> EVENT-PROCEDURE-CONTEXT </item>
++ <item> EVENT-TYPE </item>
++ <item> EXPAND </item>
++ <item> EXPANDABLE </item>
++ <item> EXTENT </item>
++ <item> FGCOLOR </item>
++ <item> FILE-CREATE-DATE </item>
++ <item> FILE-CREATE-TIME </item>
++ <item> FILE-MOD-DATE </item>
++ <item> FILE-MOD-TIME </item>
++ <item> FILE-NAME </item>
++ <item> FILE-OFFSET </item>
++ <item> FILE-SIZE </item>
++ <item> FILE-TYPE </item>
++ <item> FILLED </item>
++ <item> FILL-MODE </item>
++ <item> FILL-WHERE-STRING </item>
++ <item> FIRST-ASYNC-REQUEST </item>
++ <item> FIRST-BUFFER </item>
++ <item> FIRST-CHILD </item>
++ <item> FIRST-COLUMN </item>
++ <item> FIRST-DATASET </item>
++ <item> FIRST-DATA-SOURCE </item>
++ <item> FIRST-PROCEDURE </item>
++ <item> FIRST-QUERY </item>
++ <item> FIRST-SERVER </item>
++ <item> FIRST-SERVER-SOCKET </item>
++ <item> FIRST-SOCKET </item>
++ <item> FIRST-TAB-ITEM </item>
++ <item> FIT-LAST-COLUMN </item>
++ <item> FLAT-BUTTON </item>
++ <item> FOCUSED-ROW </item>
++ <item> FOCUSED-ROW-SELECTED </item>
++ <item> FONT </item>
++ <item> FOREGROUND </item>
++ <item> FORMAT </item>
++ <item> FORWARD-ONLY </item>
++ <item> FRAME </item>
++ <item> FRAME-COL </item>
++ <item> FRAME-NAME </item>
++ <item> FRAME-ROW </item>
++ <item> FRAME-SPACING </item>
++ <item> FRAME-X </item>
++ <item> FRAME-Y </item>
++ <item> FREQUENCY </item>
++ <item> FULL-HEIGHT-CHARS </item>
++ <item> FULL-HEIGHT-PIXELS </item>
++ <item> FULL-PATHNAME </item>
++ <item> FULL-WIDTH-CHARS </item>
++ <item> FULL-WIDTH-PIXELS </item>
++ <item> GRAPHIC-EDGE </item>
++ <item> GRID-FACTOR-HORIZONTAL </item>
++ <item> GRID-FACTOR-VERTICAL </item>
++ <item> GRID-SNAP </item>
++ <item> GRID-UNIT-HEIGHT-CHARS </item>
++ <item> GRID-UNIT-HEIGHT-PIXELS </item>
++ <item> GRID-UNIT-WIDTH-CHARS </item>
++ <item> GRID-UNIT-WIDTH-PIXELS </item>
++ <item> GRID-VISIBLE </item>
++ <item> HANDLER </item>
++ <item> HAS-LOBS </item>
++ <item> HAS-RECORDS </item>
++ <item> HEIGHT-CHARS </item>
++ <item> HEIGHT-PIXELS </item>
++ <item> HELP </item>
++ <item> HIDDEN </item>
++ <item> HORIZONTAL </item>
++ <item> HTML-CHARSET </item>
++ <item> HWND </item>
++ <item> ICFPARAMETER </item>
++ <item> ICON </item>
++ <item> IGNORE-CURRENT-MODIFIED </item>
++ <item> IMAGE </item>
++ <item> IMAGE-DOWN </item>
++ <item> IMAGE-INSENSITIVE </item>
++ <item> IMAGE-UP </item>
++ <item> IMMEDIATE-DISPLAY </item>
++ <item> INDEX </item>
++ <item> INDEX-INFORMATION </item>
++ <item> INIT </item>
++ <item> INITIAL </item>
++ <item> INNER-CHARS </item>
++ <item> INNER-LINES </item>
++ <item> INPUT-VALUE </item>
++ <item> INSTANTIATING-PROCEDURE </item>
++ <item> INTERNAL-ENTRIES </item>
++ <item> IN-HANDLE </item>
++ <item> IS-OPEN </item>
++ <item> IS-PARAMETER-SET </item>
++ <item> ITEMS-PER-ROW </item>
++ <item> KEEP-CONNECTION-OPEN </item>
++ <item> KEEP-FRAME-Z-ORDER </item>
++ <item> KEEP-SECURITY-CACHE </item>
++ <item> KEY </item>
++ <item> LABEL </item>
++ <item> LABEL-BGCOLOR </item>
++ <item> LABEL-DCOLOR </item>
++ <item> LABEL-FGCOLOR </item>
++ <item> LABEL-FONT </item>
++ <item> LABELS </item>
++ <item> LANGUAGES </item>
++ <item> LARGE </item>
++ <item> LARGE-TO-SMALL </item>
++ <item> LAST-ASYNC-REQUEST </item>
++ <item> LAST-CHILD </item>
++ <item> LAST-PROCEDURE </item>
++ <item> LAST-SERVER </item>
++ <item> LAST-SERVER-SOCKET </item>
++ <item> LAST-SOCKET </item>
++ <item> LAST-TAB-ITEM </item>
++ <item> LENGTH </item>
++ <item> LINE </item>
++ <item> LIST-ITEM-PAIRS </item>
++ <item> LIST-ITEMS </item>
++ <item> LITERAL-QUESTION </item>
++ <item> LOCAL-HOST </item>
++ <item> LOCAL-NAME </item>
++ <item> LOCAL-PORT </item>
++ <item> LOCATOR-COLUMN-NUMBER </item>
++ <item> LOCATOR-LINE-NUMBER </item>
++ <item> LOCATOR-PUBLIC-ID </item>
++ <item> LOCATOR-SYSTEM-ID </item>
++ <item> LOCATOR-TYPE </item>
++ <item> LOCKED </item>
++ <item> LOG-ENTRY-TYPES </item>
++ <item> LOG-THRESHOLD </item>
++ <item> LOGFILE-NAME </item>
++ <item> LOGGING-LEVEL </item>
++ <item> MANDATORY </item>
++ <item> MANUAL-HIGHLIGHT </item>
++ <item> MAX-BUTTON </item>
++ <item> MAX-CHARS </item>
++ <item> MAX-DATA-GUESS </item>
++ <item> MAX-HEIGHT-CHARS </item>
++ <item> MAX-HEIGHT-PIXELS </item>
++ <item> MAX-VALUE </item>
++ <item> MAX-WIDTH-CHARS </item>
++ <item> MAX-WIDTH-PIXELS </item>
++ <item> MD-VALUE </item>
++ <item> MENU-BAR </item>
++ <item> MENU-KEY </item>
++ <item> MENU-MOUSE </item>
++ <item> MESSAGE-AREA </item>
++ <item> MESSAGE-AREA-FONT </item>
++ <item> MIN-BUTTON </item>
++ <item> MIN-COLUMN-WIDTH-CHARS </item>
++ <item> MIN-COLUMN-WIDTH-PIXELS </item>
++ <item> MIN-HEIGHT-CHARS </item>
++ <item> MIN-HEIGHT-PIXELS </item>
++ <item> MIN-SCHEMA-MARSHAL </item>
++ <item> MIN-VALUE </item>
++ <item> MIN-WIDTH-CHARS </item>
++ <item> MIN-WIDTH-PIXELS </item>
++ <item> MODIFIED </item>
++ <item> MOUSE-POINTER </item>
++ <item> MOVABLE </item>
++ <item> MULTIPLE </item>
++ <item> MULTITASKING-INTERVAL </item>
++ <item> MUST-UNDERSTAND </item>
++ <item> NAME </item>
++ <item> NAMESPACE-PREFIX </item>
++ <item> NAMESPACE-URI </item>
++ <item> NEEDS-APPSERVER-PROMPT </item>
++ <item> NEEDS-PROMPT </item>
++ <item> NEW </item>
++ <item> NEW-ROW </item>
++ <item> NEXT-COLUMN </item>
++ <item> NEXT-SIBLING </item>
++ <item> NEXT-TAB-ITEM </item>
++ <item> NO-CURRENT-VALUE </item>
++ <item> NO-EMPTY-SPACE </item>
++ <item> NO-FOCUS </item>
++ <item> NO-SCHEMA-MARSHAL </item>
++ <item> NO-VALIDATE </item>
++ <item> NODE-VALUE </item>
++ <item> NUM-BUFFERS </item>
++ <item> NUM-BUTTONS </item>
++ <item> NUM-CHILD-RELATIONS </item>
++ <item> NUM-CHILDREN </item>
++ <item> NUM-COLUMNS </item>
++ <item> NUM-DROPPED-FILES </item>
++ <item> NUM-ENTRIES </item>
++ <item> NUM-FIELDS </item>
++ <item> NUM-FORMATS </item>
++ <item> NUM-HEADER-ENTRIES </item>
++ <item> NUM-ITEMS </item>
++ <item> NUM-ITERATIONS </item>
++ <item> NUM-LINES </item>
++ <item> NUM-LOCKED-COLUMNS </item>
++ <item> NUM-LOG-FILES </item>
++ <item> NUM-MESSAGES </item>
++ <item> NUM-PARAMETERS </item>
++ <item> NUM-RELATIONS </item>
++ <item> NUM-REPLACED </item>
++ <item> NUM-RESULTS </item>
++ <item> NUM-SELECTED-ROWS </item>
++ <item> NUM-SELECTED-WIDGETS </item>
++ <item> NUM-SOURCE-BUFFERS </item>
++ <item> NUM-TABS </item>
++ <item> NUM-TO-RETAIN </item>
++ <item> NUM-TOP-BUFFERS </item>
++ <item> NUM-VISIBLE-COLUMNS </item>
++ <item> NUMERIC-DECIMAL-POINT </item>
++ <item> NUMERIC-FORMAT </item>
++ <item> NUMERIC-SEPARATOR </item>
++ <item> ON-FRAME-BORDER </item>
++ <item> ORIGIN-HANDLE </item>
++ <item> ORIGIN-ROWID </item>
++ <item> OVERLAY </item>
++ <item> OWNER </item>
++ <item> OWNER-DOCUMENT </item>
++ <item> PAGE-BOTTOM </item>
++ <item> PAGE-TOP </item>
++ <item> PARAMETER </item>
++ <item> PARENT </item>
++ <item> PARENT-BUFFER </item>
++ <item> PARENT-RELATION </item>
++ <item> PARSE-STATUS </item>
++ <item> PASSWORD-FIELD </item>
++ <item> PATHNAME </item>
++ <item> PERSISTENT </item>
++ <item> PERSISTENT-CACHE-DISABLED </item>
++ <item> PERSISTENT-PROCEDURE </item>
++ <item> PFCOLOR </item>
++ <item> PIXELS-PER-COLUMN </item>
++ <item> PIXELS-PER-ROW </item>
++ <item> POPUP-MENU </item>
++ <item> POPUP-ONLY </item>
++ <item> POSITION </item>
++ <item> PREPARED </item>
++ <item> PREPARE-STRING </item>
++ <item> PREV-COLUMN </item>
++ <item> PREV-SIBLING </item>
++ <item> PREV-TAB-ITEM </item>
++ <item> PRIMARY </item>
++ <item> PRINTER-CONTROL-HANDLE </item>
++ <item> PRINTER-HDC </item>
++ <item> PRINTER-NAME </item>
++ <item> PRINTER-PORT </item>
++ <item> PRIVATE-DATA </item>
++ <item> PROCEDURE-NAME </item>
++ <item> PROGRESS-SOURCE </item>
++ <item> PROXY </item>
++ <item> PROXY-PASSWORD </item>
++ <item> PROXY-USERID </item>
++ <item> PUBLIC-ID </item>
++ <item> PUBLISHED-EVENTS </item>
++ <item> QUERY </item>
++ <item> QUERY-OFF-END </item>
++ <item> QUIT </item>
++ <item> RADIO-BUTTONS </item>
++ <item> READ-ONLY </item>
++ <item> RECID </item>
++ <item> RECORD-LENGTH </item>
++ <item> REFRESHABLE </item>
++ <item> REJECTED </item>
++ <item> RELATION-FIELDS </item>
++ <item> RELATIONS-ACTIVE </item>
++ <item> REMOTE </item>
++ <item> REMOTE-HOST </item>
++ <item> REMOTE-PORT </item>
++ <item> REPOSITION </item>
++ <item> RESIZABLE </item>
++ <item> RESIZE </item>
++ <item> RETAIN-SHAPE </item>
++ <item> RETURN-INSERTED </item>
++ <item> RETURN-VALUE </item>
++ <item> RETURN-VALUE-DATA-TYPE </item>
++ <item> ROW </item>
++ <item> COL </item>
++ <item> ROW-HEIGHT-CHARS </item>
++ <item> ROW-HEIGHT-PIXELS </item>
++ <item> ROW-STATE </item>
++ <item> ROWID </item>
++ <item> ROW-MARKERS </item>
++ <item> ROW-RESIZABLE </item>
++ <item> SAVE-WHERE-STRING </item>
++ <item> SCHEMA-CHANGE </item>
++ <item> SCHEMA-PATH </item>
++ <item> SCREEN-LINES </item>
++ <item> SCREEN-VALUE </item>
++ <item> SCROLL-BARS </item>
++ <item> SCROLLABLE </item>
++ <item> SCROLLBAR-HORIZONTAL </item>
++ <item> SCROLLBAR-VERTICAL </item>
++ <item> SELECTABLE </item>
++ <item> SELECTED </item>
++ <item> SELECTION-END </item>
++ <item> SELECTION-START </item>
++ <item> SELECTION-TEXT </item>
++ <item> SENSITIVE </item>
++ <item> SEPARATORS </item>
++ <item> SEPARATOR-FGCOLOR </item>
++ <item> SERVER </item>
++ <item> SERVER-CONNECTION-BOUND </item>
++ <item> SERVER-CONNECTION-BOUND-REQUEST </item>
++ <item> SERVER-CONNECTION-CONTEXT </item>
++ <item> SERVER-CONNECTION-ID </item>
++ <item> SERVER-OPERATING-MODE </item>
++ <item> SHOW-IN-TASKBAR </item>
++ <item> SIDE-LABEL-HANDLE </item>
++ <item> SIDE-LABELS </item>
++ <item> SKIP-DELETED-RECORD </item>
++ <item> SMALL-ICON </item>
++ <item> SMALL-TITLE </item>
++ <item> SOAP-FAULT-ACTOR </item>
++ <item> SOAP-FAULT-CODE </item>
++ <item> SOAP-FAULT-DETAIL </item>
++ <item> SOAP-FAULT-STRING </item>
++ <item> SORT </item>
++ <item> STARTUP-PARAMETERS </item>
++ <item> STATUS-AREA </item>
++ <item> STATUS-AREA-FONT </item>
++ <item> STOP </item>
++ <item> STOPPED </item>
++ <item> STREAM </item>
++ <item> STRETCH-TO-FIT </item>
++ <item> STRING-VALUE </item>
++ <item> SUBTYPE </item>
++ <item> SUPER-PROCEDURES </item>
++ <item> SUPPRESS-NAMESPACE-PROCESSING </item>
++ <item> SUPPRESS-WARNINGS </item>
++ <item> SYSTEM-ALERT-BOXES </item>
++ <item> SYSTEM-ID </item>
++ <item> TAB-POSITION </item>
++ <item> TAB-STOP </item>
++ <item> TABLE </item>
++ <item> TABLE-CRC-LIST </item>
++ <item> TABLE-HANDLE </item>
++ <item> TABLE-LIST </item>
++ <item> TABLE-NUMBER </item>
++ <item> TEMP-DIRECTORY </item>
++ <item> TEXT-SELECTED </item>
++ <item> THREE-D </item>
++ <item> TIC-MARKS </item>
++ <item> TIME-SOURCE </item>
++ <item> TITLE </item>
++ <item> TITLE-BGCOLOR </item>
++ <item> TITLE-DCOLOR </item>
++ <item> TITLE-FGCOLOR </item>
++ <item> TITLE-FONT </item>
++ <item> TOGGLE-BOX </item>
++ <item> TOOLTIP </item>
++ <item> TOOLTIPS </item>
++ <item> TOP-ONLY </item>
++ <item> TRACKING-CHANGES </item>
++ <item> TRANSACTION </item>
++ <item> TRANSPARENT </item>
++ <item> TRANS-INIT-PROCEDURE </item>
++ <item> TYPE </item>
++ <item> UNDO </item>
++ <item> UNIQUE-ID </item>
++ <item> UNIQUE-MATCH </item>
++ <item> URL </item>
++ <item> URL-PASSWORD </item>
++ <item> URL-USERID </item>
++ <item> DISPLAY </item>
++ <item> VALIDATE-EXPRESSION </item>
++ <item> VALIDATE-MESSAGE </item>
++ <item> VALIDATION-ENABLED </item>
++ <item> VALUE </item>
++ <item> VIEW-FIRST-COLUMN-ON-REOPEN </item>
++ <item> VIRTUAL-HEIGHT </item>
++ <item> VIRTUAL-WIDTH </item>
++ <item> VIRTUAL-HEIGHT-CHARS </item>
++ <item> VIRTUAL-HEIGHT-PIXELS </item>
++ <item> VIRTUAL-WIDTH-CHARS </item>
++ <item> VIRTUAL-WIDTH-PIXELS </item>
++ <item> VISIBLE </item>
++ <item> WARNING </item>
++ <item> WHERE-STRING </item>
++ <item> WIDGET-ENTER </item>
++ <item> WIDGET-LEAVE </item>
++ <item> WIDTH-CHARS </item>
++ <item> WIDTH-PIXELS </item>
++ <item> WINDOW </item>
++ <item> WINDOW-STATE </item>
++ <item> WINDOW-SYSTEM </item>
++ <item> WORD-WRAP </item>
++ <item> WORK-AREA-HEIGHT-PIXELS </item>
++ <item> WORK-AREA-WIDTH-PIXELS </item>
++ <item> WORK-AREA-X </item>
++ <item> WORK-AREA-Y </item>
++ <item> X </item>
++ <item> XML-SCHEMA-PATH </item>
++ <item> XML-SUPPRESS-NAMESPACE-PROCESSING </item>
++ <item> Y </item>
++ <item> YEAR-OFFSET </item>
+ </list>
+
+ <list name="methods">
+- <item> ACCEPT-CHANGES </item>
+- <item> ACCEPT-ROW-CHANGES </item>
+- <item> ADD-BUFFER </item>
+- <item> ADD-CALC-COLUMN </item>
+- <item> ADD-COLUMNS-FROM </item>
+- <item> ADD-EVENTS-PROCEDURE </item>
+- <item> ADD-FIELDS-FROM </item>
+- <item> ADD-FIRST </item>
+- <item> ADD-HEADER-ENTRY </item>
+- <item> ADD-INDEX-FIELD </item>
+- <item> ADD-LAST </item>
+- <item> ADD-LIKE-COLUMN </item>
+- <item> ADD-LIKE-FIELD </item>
+- <item> ADD-LIKE-INDEX </item>
+- <item> ADD-NEW-FIELD </item>
+- <item> ADD-NEW-INDEX </item>
+- <item> ADD-RELATION </item>
+- <item> ADD-SOURCE-BUFFER </item>
+- <item> ADD-SUPER-PROCEDURE </item>
+- <item> APPEND-CHILD </item>
+- <item> APPLY-CALLBACK </item>
+- <item> ATTACH-DATA-SOURCE </item>
+- <item> BUFFER-COMPARE </item>
+- <item> BUFFER-COPY </item>
+- <item> BUFFER-CREATE </item>
+- <item> BUFFER-DELETE </item>
+- <item> BUFFER-FIELD </item>
+- <item> BUFFER-RELEASE </item>
+- <item> BUFFER-VALIDATE </item>
+- <item> CANCEL-BREAK </item>
+- <item> CANCEL-REQUESTS </item>
+- <item> CLEAR </item>
+- <item> CLEAR-SELECTION </item>
+- <item> CLONE-NODE </item>
+- <item> CONNECT </item>
+- <item> CONNECTED </item>
+- <item> CONVERT-TO-OFFSET </item>
+- <item> CREATE-LIKE </item>
+- <item> CREATE-NODE </item>
+- <item> CREATE-NODE-NAMESPACE </item>
+- <item> CREATE-RESULT-LIST-ENTRY </item>
+- <item> DEBUG </item>
+- <item> DELETE </item>
+- <item> DELETE-CHAR </item>
+- <item> DELETE-CURRENT-ROW </item>
+- <item> DELETE-HEADER-ENTRY </item>
+- <item> DELETE-LINE </item>
+- <item> DELETE-NODE </item>
+- <item> DELETE-RESULT-LIST-ENTRY </item>
+- <item> DELETE-SELECTED-ROW </item>
+- <item> DELETE-SELECTED-ROWS </item>
+- <item> DESELECT-FOCUSED-ROW </item>
+- <item> DESELECT-ROWS </item>
+- <item> DESELECT-SELECTED-ROW </item>
+- <item> DETACH-DATA-SOURCE </item>
+- <item> DISABLE </item>
+- <item> DISABLE-CONNECTIONS </item>
+- <item> DISABLE-DUMP-TRIGGERS </item>
+- <item> DISABLE-LOAD-TRIGGERS </item>
+- <item> DISCONNECT </item>
+- <item> DISPLAY-MESSAGE </item>
+- <item> DUMP-LOGGING-NOW </item>
+- <item> EDIT-CLEAR </item>
+- <item> EDIT-COPY </item>
+- <item> EDIT-CUT </item>
+- <item> EDIT-PASTE </item>
+- <item> EDIT-UNDO </item>
+- <item> EMPTY-DATASET </item>
+- <item> EMPTY-TEMP-TABLE </item>
+- <item> ENABLE </item>
+- <item> ENABLE-CONNECTIONS </item>
+- <item> ENABLE-EVENTS </item>
+- <item> END-FILE-DROP </item>
+- <item> ENTRY </item>
+- <item> EXPORT </item>
+- <item> FETCH-SELECTED-ROW </item>
+- <item> FILL </item>
+- <item> FIND-BY-ROWID </item>
+- <item> FIND-CURRENT </item>
+- <item> FIND-FIRST </item>
+- <item> FIND-LAST </item>
+- <item> FIND-UNIQUE </item>
+- <item> GET-ATTRIBUTE </item>
+- <item> GET-ATTRIBUTE-NODE </item>
+- <item> GET-BLUE-VALUE </item>
+- <item> GET-BROWSE-COLUMN </item>
+- <item> GET-BUFFER-HANDLE </item>
+- <item> GET-BYTES-AVAILABLE </item>
+- <item> GET-CHANGES </item>
+- <item> GET-CHILD </item>
+- <item> GET-CHILD-RELATION </item>
+- <item> GET-CURRENT </item>
+- <item> GET-DATASET-BUFFER </item>
+- <item> GET-DOCUMENT-ELEMENT </item>
+- <item> GET-DROPPED-FILE </item>
+- <item> GET-DYNAMIC </item>
+- <item> GET-FIRST </item>
+- <item> GET-GREEN-VALUE </item>
+- <item> GET-HEADER-ENTRY </item>
+- <item> GET-INDEX-BY-NAMESPACE-NAME </item>
+- <item> GET-INDEX-BY-QNAME </item>
+- <item> GET-ITERATION </item>
+- <item> GET-LAST </item>
+- <item> GET-LOCALNAME-BY-INDEX </item>
+- <item> GET-MESSAGE </item>
+- <item> GET-NEXT </item>
+- <item> GET-NODE </item>
+- <item> GET-NUMBER </item>
+- <item> GET-PARENT </item>
+- <item> GET-PREV </item>
+- <item> GET-PRINTERS </item>
+- <item> GET-QNAME-BY-INDEX </item>
+- <item> GET-RED-VALUE </item>
+- <item> GET-RELATION </item>
+- <item> GET-REPOSITIONED-ROW </item>
+- <item> GET-RGB-VALUE </item>
+- <item> GET-SELECTED-WIDGET </item>
+- <item> GET-SERIALIZED </item>
+- <item> GET-SIGNATURE </item>
+- <item> GET-SOCKET-OPTION </item>
+- <item> GET-SOURCE-BUFFER </item>
+- <item> GET-TAB-ITEM </item>
+- <item> GET-TEXT-HEIGHT-CHARS </item>
+- <item> GET-TEXT-HEIGHT-PIXELS </item>
+- <item> GET-TEXT-WIDTH-CHARS </item>
+- <item> GET-TEXT-WIDTH-PIXELS </item>
+- <item> GET-TOP-BUFFER </item>
+- <item> GET-TYPE-BY-INDEX </item>
+- <item> GET-TYPE-BY-NAMESPACE-NAME </item>
+- <item> GET-TYPE-BY-QNAME </item>
+- <item> GET-URI-BY-INDEX </item>
+- <item> GET-VALUE-BY-INDEX </item>
+- <item> GET-VALUE-BY-NAMESPACE-NAME </item>
+- <item> GET-VALUE-BY-QNAME </item>
+- <item> GET-WAIT-STATE </item>
+- <item> IMPORT-NODE </item>
+- <item> INDEX-INFORMATION </item>
+- <item> INITIALIZE-DOCUMENT-TYPE </item>
+- <item> INITIATE </item>
+- <item> INSERT </item>
+- <item> INSERT-BACKTAB </item>
+- <item> INSERT-BEFORE </item>
+- <item> INSERT-FILE </item>
+- <item> INSERT-ROW </item>
+- <item> INSERT-STRING </item>
+- <item> INSERT-TAB </item>
+- <item> INVOKE </item>
+- <item> IS-ROW-SELECTED </item>
+- <item> IS-SELECTED </item>
+- <item> LOAD </item>
+- <item> LoadControls </item>
+- <item> LOAD-ICON </item>
+- <item> LOAD-IMAGE </item>
+- <item> LOAD-IMAGE-DOWN </item>
+- <item> LOAD-IMAGE-INSENSITIVE </item>
+- <item> LOAD-IMAGE-UP </item>
+- <item> LOAD-MOUSE-POINTER </item>
+- <item> LOAD-SMALL-ICON </item>
+- <item> LONGCHAR-TO-NODE-VALUE </item>
+- <item> LOOKUP </item>
+- <item> MEMPTR-TO-NODE-VALUE </item>
+- <item> MERGE-CHANGES </item>
+- <item> MERGE-ROW-CHANGES </item>
+- <item> MOVE-AFTER-TAB-ITEM </item>
+- <item> MOVE-BEFORE-TAB-ITEM </item>
+- <item> MOVE-COLUMN </item>
+- <item> MOVE-TO-BOTTOM </item>
+- <item> MOVE-TO-EOF </item>
+- <item> MOVE-TO-TOP </item>
+- <item> NODE-VALUE-TO-LONGCHAR </item>
+- <item> NODE-VALUE-TO-MEMPTR </item>
+- <item> NORMALIZE </item>
+- <item> QUERY-CLOSE </item>
+- <item> QUERY-OPEN </item>
+- <item> QUERY-PREPARE </item>
+- <item> RAW-TRANSFER </item>
+- <item> READ </item>
+- <item> READ-FILE </item>
+- <item> REFRESH </item>
+- <item> REJECT-CHANGES </item>
+- <item> REJECT-ROW-CHANGES </item>
+- <item> REMOVE-ATTRIBUTE </item>
+- <item> REMOVE-CHILD </item>
+- <item> REMOVE-EVENTS-PROCEDURE </item>
+- <item> REMOVE-SUPER-PROCEDURE </item>
+- <item> REPLACE </item>
+- <item> REPLACE-CHILD </item>
+- <item> REPLACE-SELECTION-TEXT </item>
+- <item> REPOSITION-BACKWARD </item>
+- <item> REPOSITION-FORWARD </item>
+- <item> REPOSITION-TO-ROW </item>
+- <item> REPOSITION-TO-ROWID </item>
+- <item> SAVE </item>
+- <item> SAVE-FILE </item>
+- <item> SAVE-ROW-CHANGES </item>
+- <item> SAX-PARSE </item>
+- <item> SAX-PARSE-FIRST </item>
+- <item> SAX-PARSE-NEXT </item>
+- <item> SCROLL-TO-CURRENT-ROW </item>
+- <item> SCROLL-TO-ITEM </item>
+- <item> SCROLL-TO-SELECTED-ROW </item>
+- <item> SEARCH </item>
+- <item> SELECT-ALL </item>
+- <item> SELECT-FOCUSED-ROW </item>
+- <item> SELECT-NEXT-ROW </item>
+- <item> SELECT-PREV-ROW </item>
+- <item> SELECT-ROW </item>
+- <item> SET-ACTOR </item>
+- <item> SET-ATTRIBUTE </item>
+- <item> SET-ATTRIBUTE-NODE </item>
+- <item> SET-BLUE-VALUE </item>
+- <item> SET-BREAK </item>
+- <item> SET-BUFFERS </item>
+- <item> SET-CALLBACK-PROCEDURE </item>
+- <item> SET-COMMIT </item>
+- <item> SET-CONNECT-PROCEDURE </item>
+- <item> SET-DYNAMIC </item>
+- <item> SET-GREEN-VALUE </item>
+- <item> SET-INPUT-SOURCE </item>
+- <item> SET-MUST-UNDERSTAND </item>
+- <item> SET-NODE </item>
+- <item> SET-NUMERIC-FORMAT </item>
+- <item> SET-PARAMETER </item>
+- <item> SET-READ-RESPONSE-PROCEDURE </item>
+- <item> SET-RED-VALUE </item>
+- <item> SET-REPOSITIONED-ROW </item>
+- <item> SET-RGB-VALUE </item>
+- <item> SET-ROLLBACK </item>
+- <item> SET-SELECTION </item>
+- <item> SET-SERIALIZED </item>
+- <item> SET-SOCKET-OPTION </item>
+- <item> SET-WAIT-STATE </item>
+- <item> STOP-PARSING </item>
+- <item> SYNCHRONIZE </item>
+- <item> TEMP-TABLE-PREPARE </item>
+- <item> VALIDATE </item>
+- <item> WRITE </item>
++ <item> ACCEPT-CHANGES </item>
++ <item> ACCEPT-ROW-CHANGES </item>
++ <item> ADD-BUFFER </item>
++ <item> ADD-CALC-COLUMN </item>
++ <item> ADD-COLUMNS-FROM </item>
++ <item> ADD-EVENTS-PROCEDURE </item>
++ <item> ADD-FIELDS-FROM </item>
++ <item> ADD-FIRST </item>
++ <item> ADD-HEADER-ENTRY </item>
++ <item> ADD-INDEX-FIELD </item>
++ <item> ADD-LAST </item>
++ <item> ADD-LIKE-COLUMN </item>
++ <item> ADD-LIKE-FIELD </item>
++ <item> ADD-LIKE-INDEX </item>
++ <item> ADD-NEW-FIELD </item>
++ <item> ADD-NEW-INDEX </item>
++ <item> ADD-RELATION </item>
++ <item> ADD-SOURCE-BUFFER </item>
++ <item> ADD-SUPER-PROCEDURE </item>
++ <item> APPEND-CHILD </item>
++ <item> APPLY-CALLBACK </item>
++ <item> ATTACH-DATA-SOURCE </item>
++ <item> BUFFER-COMPARE </item>
++ <item> BUFFER-COPY </item>
++ <item> BUFFER-CREATE </item>
++ <item> BUFFER-DELETE </item>
++ <item> BUFFER-FIELD </item>
++ <item> BUFFER-RELEASE </item>
++ <item> BUFFER-VALIDATE </item>
++ <item> CANCEL-BREAK </item>
++ <item> CANCEL-REQUESTS </item>
++ <item> CLEAR </item>
++ <item> CLEAR-SELECTION </item>
++ <item> CLONE-NODE </item>
++ <item> CONNECT </item>
++ <item> CONNECTED </item>
++ <item> CONVERT-TO-OFFSET </item>
++ <item> CREATE-LIKE </item>
++ <item> CREATE-NODE </item>
++ <item> CREATE-NODE-NAMESPACE </item>
++ <item> CREATE-RESULT-LIST-ENTRY </item>
++ <item> DEBUG </item>
++ <item> DELETE </item>
++ <item> DELETE-CHAR </item>
++ <item> DELETE-CURRENT-ROW </item>
++ <item> DELETE-HEADER-ENTRY </item>
++ <item> DELETE-LINE </item>
++ <item> DELETE-NODE </item>
++ <item> DELETE-RESULT-LIST-ENTRY </item>
++ <item> DELETE-SELECTED-ROW </item>
++ <item> DELETE-SELECTED-ROWS </item>
++ <item> DESELECT-FOCUSED-ROW </item>
++ <item> DESELECT-ROWS </item>
++ <item> DESELECT-SELECTED-ROW </item>
++ <item> DETACH-DATA-SOURCE </item>
++ <item> DISABLE </item>
++ <item> DISABLE-CONNECTIONS </item>
++ <item> DISABLE-DUMP-TRIGGERS </item>
++ <item> DISABLE-LOAD-TRIGGERS </item>
++ <item> DISCONNECT </item>
++ <item> DISPLAY-MESSAGE </item>
++ <item> DUMP-LOGGING-NOW </item>
++ <item> EDIT-CLEAR </item>
++ <item> EDIT-COPY </item>
++ <item> EDIT-CUT </item>
++ <item> EDIT-PASTE </item>
++ <item> EDIT-UNDO </item>
++ <item> EMPTY-DATASET </item>
++ <item> EMPTY-TEMP-TABLE </item>
++ <item> ENABLE </item>
++ <item> ENABLE-CONNECTIONS </item>
++ <item> ENABLE-EVENTS </item>
++ <item> END-FILE-DROP </item>
++ <item> ENTRY </item>
++ <item> EXPORT </item>
++ <item> FETCH-SELECTED-ROW </item>
++ <item> FILL </item>
++ <item> FIND-BY-ROWID </item>
++ <item> FIND-CURRENT </item>
++ <item> FIND-FIRST </item>
++ <item> FIND-LAST </item>
++ <item> FIND-UNIQUE </item>
++ <item> GET-ATTRIBUTE </item>
++ <item> GET-ATTRIBUTE-NODE </item>
++ <item> GET-BLUE-VALUE </item>
++ <item> GET-BROWSE-COLUMN </item>
++ <item> GET-BUFFER-HANDLE </item>
++ <item> GET-BYTES-AVAILABLE </item>
++ <item> GET-CHANGES </item>
++ <item> GET-CHILD </item>
++ <item> GET-CHILD-RELATION </item>
++ <item> GET-CURRENT </item>
++ <item> GET-DATASET-BUFFER </item>
++ <item> GET-DOCUMENT-ELEMENT </item>
++ <item> GET-DROPPED-FILE </item>
++ <item> GET-DYNAMIC </item>
++ <item> GET-FIRST </item>
++ <item> GET-GREEN-VALUE </item>
++ <item> GET-HEADER-ENTRY </item>
++ <item> GET-INDEX-BY-NAMESPACE-NAME </item>
++ <item> GET-INDEX-BY-QNAME </item>
++ <item> GET-ITERATION </item>
++ <item> GET-LAST </item>
++ <item> GET-LOCALNAME-BY-INDEX </item>
++ <item> GET-MESSAGE </item>
++ <item> GET-NEXT </item>
++ <item> GET-NODE </item>
++ <item> GET-NUMBER </item>
++ <item> GET-PARENT </item>
++ <item> GET-PREV </item>
++ <item> GET-PRINTERS </item>
++ <item> GET-QNAME-BY-INDEX </item>
++ <item> GET-RED-VALUE </item>
++ <item> GET-RELATION </item>
++ <item> GET-REPOSITIONED-ROW </item>
++ <item> GET-RGB-VALUE </item>
++ <item> GET-SELECTED-WIDGET </item>
++ <item> GET-SERIALIZED </item>
++ <item> GET-SIGNATURE </item>
++ <item> GET-SOCKET-OPTION </item>
++ <item> GET-SOURCE-BUFFER </item>
++ <item> GET-TAB-ITEM </item>
++ <item> GET-TEXT-HEIGHT-CHARS </item>
++ <item> GET-TEXT-HEIGHT-PIXELS </item>
++ <item> GET-TEXT-WIDTH-CHARS </item>
++ <item> GET-TEXT-WIDTH-PIXELS </item>
++ <item> GET-TOP-BUFFER </item>
++ <item> GET-TYPE-BY-INDEX </item>
++ <item> GET-TYPE-BY-NAMESPACE-NAME </item>
++ <item> GET-TYPE-BY-QNAME </item>
++ <item> GET-URI-BY-INDEX </item>
++ <item> GET-VALUE-BY-INDEX </item>
++ <item> GET-VALUE-BY-NAMESPACE-NAME </item>
++ <item> GET-VALUE-BY-QNAME </item>
++ <item> GET-WAIT-STATE </item>
++ <item> IMPORT-NODE </item>
++ <item> INDEX-INFORMATION </item>
++ <item> INITIALIZE-DOCUMENT-TYPE </item>
++ <item> INITIATE </item>
++ <item> INSERT </item>
++ <item> INSERT-BACKTAB </item>
++ <item> INSERT-BEFORE </item>
++ <item> INSERT-FILE </item>
++ <item> INSERT-ROW </item>
++ <item> INSERT-STRING </item>
++ <item> INSERT-TAB </item>
++ <item> INVOKE </item>
++ <item> IS-ROW-SELECTED </item>
++ <item> IS-SELECTED </item>
++ <item> LOAD </item>
++ <item> LoadControls </item>
++ <item> LOAD-ICON </item>
++ <item> LOAD-IMAGE </item>
++ <item> LOAD-IMAGE-DOWN </item>
++ <item> LOAD-IMAGE-INSENSITIVE </item>
++ <item> LOAD-IMAGE-UP </item>
++ <item> LOAD-MOUSE-POINTER </item>
++ <item> LOAD-SMALL-ICON </item>
++ <item> LONGCHAR-TO-NODE-VALUE </item>
++ <item> LOOKUP </item>
++ <item> MEMPTR-TO-NODE-VALUE </item>
++ <item> MERGE-CHANGES </item>
++ <item> MERGE-ROW-CHANGES </item>
++ <item> MOVE-AFTER-TAB-ITEM </item>
++ <item> MOVE-BEFORE-TAB-ITEM </item>
++ <item> MOVE-COLUMN </item>
++ <item> MOVE-TO-BOTTOM </item>
++ <item> MOVE-TO-EOF </item>
++ <item> MOVE-TO-TOP </item>
++ <item> NODE-VALUE-TO-LONGCHAR </item>
++ <item> NODE-VALUE-TO-MEMPTR </item>
++ <item> NORMALIZE </item>
++ <item> QUERY-CLOSE </item>
++ <item> QUERY-OPEN </item>
++ <item> QUERY-PREPARE </item>
++ <item> RAW-TRANSFER </item>
++ <item> READ </item>
++ <item> READ-FILE </item>
++ <item> REFRESH </item>
++ <item> REJECT-CHANGES </item>
++ <item> REJECT-ROW-CHANGES </item>
++ <item> REMOVE-ATTRIBUTE </item>
++ <item> REMOVE-CHILD </item>
++ <item> REMOVE-EVENTS-PROCEDURE </item>
++ <item> REMOVE-SUPER-PROCEDURE </item>
++ <item> REPLACE </item>
++ <item> REPLACE-CHILD </item>
++ <item> REPLACE-SELECTION-TEXT </item>
++ <item> REPOSITION-BACKWARD </item>
++ <item> REPOSITION-FORWARD </item>
++ <item> REPOSITION-TO-ROW </item>
++ <item> REPOSITION-TO-ROWID </item>
++ <item> SAVE </item>
++ <item> SAVE-FILE </item>
++ <item> SAVE-ROW-CHANGES </item>
++ <item> SAX-PARSE </item>
++ <item> SAX-PARSE-FIRST </item>
++ <item> SAX-PARSE-NEXT </item>
++ <item> SCROLL-TO-CURRENT-ROW </item>
++ <item> SCROLL-TO-ITEM </item>
++ <item> SCROLL-TO-SELECTED-ROW </item>
++ <item> SEARCH </item>
++ <item> SELECT-ALL </item>
++ <item> SELECT-FOCUSED-ROW </item>
++ <item> SELECT-NEXT-ROW </item>
++ <item> SELECT-PREV-ROW </item>
++ <item> SELECT-ROW </item>
++ <item> SET-ACTOR </item>
++ <item> SET-ATTRIBUTE </item>
++ <item> SET-ATTRIBUTE-NODE </item>
++ <item> SET-BLUE-VALUE </item>
++ <item> SET-BREAK </item>
++ <item> SET-BUFFERS </item>
++ <item> SET-CALLBACK-PROCEDURE </item>
++ <item> SET-COMMIT </item>
++ <item> SET-CONNECT-PROCEDURE </item>
++ <item> SET-DYNAMIC </item>
++ <item> SET-GREEN-VALUE </item>
++ <item> SET-INPUT-SOURCE </item>
++ <item> SET-MUST-UNDERSTAND </item>
++ <item> SET-NODE </item>
++ <item> SET-NUMERIC-FORMAT </item>
++ <item> SET-PARAMETER </item>
++ <item> SET-READ-RESPONSE-PROCEDURE </item>
++ <item> SET-RED-VALUE </item>
++ <item> SET-REPOSITIONED-ROW </item>
++ <item> SET-RGB-VALUE </item>
++ <item> SET-ROLLBACK </item>
++ <item> SET-SELECTION </item>
++ <item> SET-SERIALIZED </item>
++ <item> SET-SOCKET-OPTION </item>
++ <item> SET-WAIT-STATE </item>
++ <item> STOP-PARSING </item>
++ <item> SYNCHRONIZE </item>
++ <item> TEMP-TABLE-PREPARE </item>
++ <item> VALIDATE </item>
++ <item> WRITE </item>
++ <item> MAX-HEIGHT </item>
++ <item> MAX-WIDTH </item>
++
++</list>
++
++<list name="envvariables">
++ <item> CLASSPATH </item>
++ <item> DLC </item>
++ <item> EVTLEVEL </item>
++ <item> JDKCP </item>
++ <item> JDKHOME </item>
++ <item> JFCCP </item>
++ <item> JFHOME </item>
++ <item> JIT </item>
++ <item> JRECP </item>
++ <item> JREHOME </item>
++ <item> JVMEXE </item>
++ <item> PATH </item>
++ <item> PROCFG </item>
++ <item> PROCONV </item>
++ <item> PROEXE </item>
++ <item> PROGRESSCP </item>
++ <item> PROLOAD </item>
++ <item> PROMSGS </item>
++ <item> PROPATH </item>
++ <item> PROSRV </item>
++ <item> PROSTARTUP </item>
++ <item> PROTERMCAP </item>
++ <item> TERM </item>
++ <item> TERMINAL </item>
++ <item> GATEWAY_INTERFACE </item>
++ <item> SERVER_SOFTWARE </item>
++ <item> SERVER_PROTOCOL </item>
++ <item> SERVER_NAME </item>
++ <item> SERVER_PORT </item>
++ <item> REQUEST_METHOD </item>
++ <item> SCRIPT_NAME </item>
++ <item> PATH_INFO </item>
++ <item> PATH_TRANSLATED </item>
++ <item> QUERY_STRING </item>
++ <item> REMOTE_ADDR </item>
++ <item> REMOTE_IDENT </item>
++ <item> REMOTE_USER </item>
++ <item> AUTH_TYPE </item>
++ <item> REMOTE_HOST </item>
++ <item> CONTENT_TYPE </item>
++ <item> CONTENT_LENGTH </item>
++ <item> HTTP_ACCEPT </item>
++ <item> HTTP_COOKIE </item>
++ <item> HTTP_REFERER </item>
++ <item> HTTP_USER_AGENT </item>
++ <item> HTTP_REFERER </item>
++ <item> HTTPS </item>
++ <item> HTTP_REFERER </item>
++ <item> HOSTURL </item>
++ <item> SELFURL </item>
++ <item> APPPROGRAM </item>
++ <item> APPURL </item>
++ <item> APPPROGRAM </item>
++ <item> OUTPUT-CONTENT-TYPE </item>
++ <item> WEB_SRC_PATH </item>
++
+ </list>
+
+
+- <contexts>
+-
+- <context name="Normal" attribute="Normal Text" lineEndContext="#stay">
+-
+- <keyword attribute="Data_Type" context="#stay" String="mytypes"/>
+- <keyword attribute="Operators" context="#stay" String="operators"/>
+- <keyword attribute="Preprocvar" context="#stay" String="preprocvar"/>
+- <keyword attribute="Phrases" context="#stay" String="phrases"/>
+- <keyword attribute="Functions" context="#stay" String="functions"/>
+- <keyword attribute="Statements" context="#stay" String="statements"/>
+- <keyword attribute="Widgets" context="#stay" String="widgets"/>
+- <keyword attribute="Handles" context="#stay" String="handles"/>
+- <keyword attribute="Properties" context="#stay" String="properties"/>
+- <keyword attribute="Attributes" context="#stay" String="attributes"/>
+- <keyword attribute="Methods" context="#stay" String="methods"/>
+-
+- <Int attribute="Integer" context="#stay"/>
+- <Int attribute="Decimal" context="#stay"/>
+- <DetectChar attribute="String" context="String" char="'"/>
+- <Detect2Chars attribute="Comment" context="MultiLineComment" char="/" char1="*" beginRegion="Comment"/>
+- <RegExpr attribute="Comment" context="SingleLineComment" String="[Rr][Ee][Mm]\b" column="0"/>
+- <DetectChar attribute="Comment" context="Identifier" char="""/>
+- <AnyChar attribute="Symbol" context="#stay" String=":&"/>
+- <RegExpr attribute="Symbol" context="#stay" String="/$" column="0"/>
+- <DetectChar attribute="String" context="#stay" char="""/>
+- <DetectChar attribute="String" context="#stay" char="'"/>
+- <DetectChar attribute="Symbol" context="#stay" char="{"/>
+- <DetectChar attribute="Symbol" context="#stay" char="}"/>
+-
+- </context>
+-
+- <context name="String" attribute="String" lineEndContext="#stay">
+-
+- <LineContinue attribute="String" context="#pop"/>
+- <HlCStringChar attribute="String Char" context="#stay"/>
+- <DetectChar attribute="Symbol" context="#stay" char="&"/>
+- <DetectChar attribute="String" context="#pop" char="'"/>
+-
+- </context>
+- <context name="SingleLineComment" attribute="Comment" lineEndContext="#pop"/>
+- <context name="MultiLineComment" attribute="Comment" lineEndContext="#stay">
+- <LineContinue attribute="Comment" context="#pop"/>
+- <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment"/>
+- </context>
+- <context name="Identifier" attribute="Identifier" lineEndContext="#pop">
+- <DetectChar attribute="Identifier" context="#pop" char="""/>
+- </context>
+- </contexts>
+- <itemDatas>
+- <itemData name="Phrases" defStyleNum="dsKeyword" />
+- <itemData name="Statements" defStyleNum="dsKeyword"/>
+- <itemData name="Widgets" defStyleNum="dsKeyword"/>
+- <itemData name="Handles" defStyleNum="dsDecVal"/>
+- <itemData name="Properties" defStyleNum="dsOthers"/>
+- <itemData name="Attributes" defStyleNum="dsDataType"/>
+- <itemData name="Methods" defStyleNum="dsOthers"/>
+- <itemData name="Functions" defStyleNum="dsFunction"/>
+-
+- <itemData name="Normal Text" defStyleNum="dsNormal"/>
+- <itemData name="Decimal" defStyleNum="dsDecVal"/>
+- <itemData name="Integer" defStyleNum="dsBaseN"/>
+- <itemData name="String" defStyleNum="dsString"/>
+- <itemData name="String Char" defStyleNum="dsChar"/>
+- <itemData name="Comment" defStyleNum="dsComment"/>
+- <itemData name="Identifier" defStyleNum="dsOthers"/>
+- <itemData name="Symbol" defStyleNum="dsChar"/>
+- <itemData name="Data_Type" defStyleNum="dsDataType"/>
+- <itemData name="Preprocvar" defStyleNum="dsChar"/>
+- <itemData name="Operators" defStyleNum="dsString"/>
+- </itemDatas>
+-
++<contexts>
++ <context name="Normal" attribute="Normal Text" lineEndContext="#stay">
++ <keyword attribute="Preprocvar" context="#stay" String="envvariables"/>
++ <keyword attribute="Data_Type" context="#stay" String="mytypes"/>
++ <keyword attribute="Operators" context="#stay" String="operators"/>
++ <keyword attribute="Preprocvar" context="#stay" String="preprocvar"/>
++ <keyword attribute="Phrases" context="#stay" String="phrases"/>
++ <keyword attribute="Function" context="#stay" String="functions"/>
++ <keyword attribute="Statements" context="#stay" String="statements"/>
++ <keyword attribute="Widgets" context="#stay" String="widgets"/>
++ <keyword attribute="Handles" context="#stay" String="handles"/>
++ <keyword attribute="Properties" context="#stay" String="properties"/>
++ <keyword attribute="Attributes" context="#stay" String="attributes"/>
++ <keyword attribute="Methods" context="#stay" String="methods"/>
++ <Int attribute="Integer" context="#stay"/>
++ <DetectChar attribute="String" context="String" char="'"/>
++ <Detect2Chars attribute="Comment" context="MultiLineComment"
++ char="/" char1="*" beginRegion="Comment"/>
++ <DetectChar attribute="Comment" context="Identifier" char='"'/>
++ <DetectChar attribute="String" context="#stay" char='"'/>
++ <DetectChar attribute="String" context="#stay" char="'"/>
++ <AnyChar attribute="Symbol" context="#stay" String="{}[]()~:"/>
++
++ <StringDetect attribute="Region Marker" context="#stay"
++ String="PROCEDURE" insensitive="TRUE"
++ beginRegion="P1" firstNonSpace="TRUE"/>
++ <StringDetect attribute="Region Marker" context="#stay"
++ String="END PROCEDURE" insensitive="TRUE"
++ endRegion="P1" firstNonSpace="TRUE"/>
++
++ <StringDetect attribute="Region Marker" context="#stay"
++ String="FUNCTION" insensitive="TRUE"
++ beginRegion="F1" firstNonSpace="TRUE"/>
++ <StringDetect attribute="Region Marker" context="#stay"
++ String="END FUNCTION" insensitive="TRUE"
++ endRegion="F1" firstNonSpace="TRUE"/>
++
++ <StringDetect attribute="Function" context="#stay"
++ String="DO:" insensitive="TRUE"
++ beginRegion="L1" firstNonSpace="FALSE"/>
++ <StringDetect attribute="Function" context="#stay"
++ String="REPEAT" insensitive="TRUE"
++ beginRegion="L1" firstNonSpace="TRUE"/>
++ <StringDetect attribute="Function" context="#stay"
++ String="FOR" insensitive="TRUE"
++ beginRegion="L1" firstNonSpace="TRUE"/>
++ <StringDetect attribute="Function" context="#stay"
++ String="CASE" insensitive="TRUE"
++ beginRegion="L1" firstNonSpace="TRUE"/>
++ <StringDetect attribute="Function" context="#stay"
++ String="END" insensitive="TRUE"
++ endRegion="L1" firstNonSpace="TRUE"/>
++
++ </context>
++ <context name="String" attribute="String" lineEndContext="#stay">
++ <LineContinue attribute="String" context="#pop"/>
++ <HlCStringChar attribute="String Char" context="#stay"/>
++ <DetectChar attribute="String" context="#pop" char="'"/>
++ </context>
++ <context name="MultiLineComment" attribute="Comment"
++ lineEndContext="#stay">
++ <LineContinue attribute="Comment" context="#pop"/>
++ <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/"
++ endRegion="Comment"/>
++ <IncludeRules context="##Alerts" />
++ </context>
++ <context name="Identifier" attribute="Identifier" lineEndContext="#pop">
++ <DetectChar attribute="Identifier" context="#pop" char='"'/>
++ </context>
++</contexts>
++ <itemDatas>
++ <itemData name="Phrases" defStyleNum="dsKeyword"/>
++ <itemData name="Statements" defStyleNum="dsKeyword"/>
++ <itemData name="Widgets" defStyleNum="dsKeyword"/>
++ <itemData name="Handles" defStyleNum="dsDecVal"/>
++ <itemData name="Properties" defStyleNum="dsOthers"/>
++ <itemData name="Attributes" defStyleNum="dsDataType"/>
++ <itemData name="Methods" defStyleNum="dsOthers"/>
++ <itemData name="Function" defStyleNum="dsFunction"/>
++ <itemData name="Normal Text" defStyleNum="dsNormal"/>
++ <itemData name="Decimal" defStyleNum="dsDecVal"/>
++ <itemData name="Integer" defStyleNum="dsBaseN"/>
++ <itemData name="String" defStyleNum="dsString"/>
++ <itemData name="String Char" defStyleNum="dsChar"/>
++ <itemData name="Comment" defStyleNum="dsComment"/>
++ <itemData name="Identifier" defStyleNum="dsOthers"/>
++ <itemData name="Symbol" defStyleNum="dsChar"/>
++ <itemData name="Data_Type" defStyleNum="dsDataType"/>
++ <itemData name="Preprocvar" defStyleNum="dsChar"/>
++ <itemData name="Operators" defStyleNum="dsDecVal"/>
++ <itemData name="Alert" defStyleNum="dsAlert"/>
++ <itemData name="Region Marker" defStyleNum="dsRegionMarker"/>
++ </itemDatas>
+ </highlighting>
+-
+ <general>
+ <comments>
+- <comment name="singleLine" start="/*" end="*/"/>
+ <comment name="multiLine" start="/*" end="*/"/>
+ </comments>
+-
+- <keywords casesensitive="1" weakDeliminator="+-*/=<>" />
+-
++ <keywords casesensitive="0" weakDeliminator="-" />
+ </general>
+-
+ </language>
+diff -Nru kdelibs-release-3.4.0/kate/data/sql.xml kdelibs-branch-3.4/kate/data/sql.xml
+--- kdelibs-release-3.4.0/kate/data/sql.xml 2005-02-13 18:22:57.000000000 -0500
++++ kdelibs-branch-3.4/kate/data/sql.xml 2005-04-04 04:08:31.000000000 -0400
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE language SYSTEM "language.dtd">
+-<!-- Oracle9i SQL and PL/SQL syntax - ANSI SQL superset -->
+-<language name="SQL" version="1.09" kateversion="2.4" section="Database" extensions="*.sql;*.SQL" mimetype="text/x-sql" casesensitive="0" author="Yury Lebedev (yurylebedev@mail.ru)" license="">
++<!-- Oracle10g SQL and PL/SQL syntax - ANSI SQL92 superset -->
++<language name="SQL" version="1.10" kateversion="2.4" section="Database" extensions="*.sql;*.SQL" mimetype="text/x-sql" casesensitive="0" author="Yury Lebedev (yurylebedev@mail.ru)" license="LGPL">
+ <highlighting>
+ <list name="keywords">
+ <item> ACCESS </item>
+@@ -117,7 +117,6 @@
+ <item> DATABASE </item>
+ <item> DATAFILE </item>
+ <item> DATAFILES </item>
+- <item> DAY </item>
+ <item> DBA </item>
+ <item> DDL </item>
+ <item> DEALLOCATE </item>
+@@ -138,6 +137,7 @@
+ <item> DISABLE </item>
+ <item> DISASSOCIATE </item>
+ <item> DISCONNECT </item>
++ <item> DISKGROUP </item>
+ <item> DISMOUNT </item>
+ <item> DISTINCT </item>
+ <item> DISTRIBUTED </item>
+@@ -146,6 +146,7 @@
+ <item> DYNAMIC </item>
+ <item> EACH </item>
+ <item> ELSE </item>
++ <item> EMPTY </item>
+ <item> ENABLE </item>
+ <item> END </item>
+ <item> ENFORCE </item>
+@@ -176,6 +177,7 @@
+ <item> FILTER </item>
+ <item> FIRST_ROWS </item>
+ <item> FLAGGER </item>
++ <item> FLASHBACK </item>
+ <item> FLUSH </item>
+ <item> FOLLOWING </item>
+ <item> FOR </item>
+@@ -230,7 +232,6 @@
+ <item> INSTEAD </item>
+ <item> INTERMEDIATE </item>
+ <item> INTERSECT </item>
+- <item> INTERVAL </item>
+ <item> INTO </item>
+ <item> INVALIDATE </item>
+ <item> IS </item>
+@@ -289,7 +290,6 @@
+ <item> MODE </item>
+ <item> MODIFY </item>
+ <item> MONITORING </item>
+- <item> MONTH </item>
+ <item> MOUNT </item>
+ <item> MOVE </item>
+ <item> MOVEMENT </item>
+@@ -401,7 +401,9 @@
+ <item> PREBUILT </item>
+ <item> PRECEDING </item>
+ <item> PREPARE </item>
++ <item> PRESENT </item>
+ <item> PRESERVE </item>
++ <item> PREVIOUS </item>
+ <item> PRIMARY </item>
+ <item> PRIOR </item>
+ <item> PRIVATE </item>
+@@ -432,6 +434,7 @@
+ <item> REFRESH </item>
+ <item> RELY </item>
+ <item> RENAME </item>
++ <item> REPLACE </item>
+ <item> RESET </item>
+ <item> RESETLOGS </item>
+ <item> RESIZE </item>
+@@ -466,7 +469,6 @@
+ <item> SD_ALL </item>
+ <item> SD_INHIBIT </item>
+ <item> SD_SHOW </item>
+- <item> SECOND </item>
+ <item> SEGMENT </item>
+ <item> SEG_BLOCK </item>
+ <item> SEG_FILE </item>
+@@ -505,6 +507,7 @@
+ <item> STORAGE </item>
+ <item> STORE </item>
+ <item> STRUCTURE </item>
++ <item> SUBMULTISET </item>
+ <item> SUBPARTITION </item>
+ <item> SUBPARTITIONS </item>
+ <item> SUCCESSFUL </item>
+@@ -581,8 +584,6 @@
+ <item> WITHOUT </item>
+ <item> WORK </item>
+ <item> WRITE </item>
+- <item> YEAR </item>
+- <item> ZONE </item>
+ </list>
+ <list name="operators">
+ <item> + </item>
+@@ -617,15 +618,18 @@
+ <item> BFILENAME </item>
+ <item> BIN_TO_NUM </item>
+ <item> BITAND </item>
++ <item> CARDINALITY </item>
+ <item> CAST </item>
+ <item> CEIL </item>
+ <item> CHARTOROWID </item>
+ <item> CHR </item>
+ <item> COALESCE </item>
++ <item> COLLECT </item>
+ <item> COMPOSE </item>
+ <item> CONCAT </item>
+ <item> CONVERT </item>
+- <item> CORR </item>
++ <item> CORR_K </item>
++ <item> CORR_S </item>
+ <item> COS </item>
+ <item> COSH </item>
+ <item> COUNT </item>
+@@ -634,6 +638,7 @@
+ <item> CUME_DIST </item>
+ <item> CURRENT_DATE </item>
+ <item> CURRENT_TIMESTAMP </item>
++ <item> CV </item>
+ <item> DBTIMEZONE </item>
+ <item> DECODE </item>
+ <item> DECOMPOSE </item>
+@@ -671,11 +676,13 @@
+ <item> LOWER </item>
+ <item> LPAD </item>
+ <item> LTRIM </item>
++ <item> MEDIAN </item>
+ <item> MAKE_REF </item>
+ <item> MAX </item>
+ <item> MIN </item>
+ <item> MOD </item>
+ <item> MONTHS_BETWEEN </item>
++ <item> NANVL </item>
+ <item> NCHR </item>
+ <item> NEW_TIME </item>
+ <item> NEXT_DAY </item>
+@@ -692,15 +699,25 @@
+ <item> NUMTOYMINTERVAL </item>
+ <item> NVL </item>
+ <item> NVL2 </item>
++ <item> ORA_HASH </item>
++ <item> ORA_ROWSCN </item>
+ <item> PERCENT_RANK </item>
+ <item> PERCENTILE_CONT </item>
+ <item> PERCENTILE_DISC </item>
++ <item> POWERMULTISET </item>
++ <item> POWERMULTISET_BY_CARDINALITY </item>
+ <item> POWER </item>
++ <item> PRESENTNNV </item>
++ <item> PRESENTV </item>
+ <item> RANK </item>
+ <item> RATIO_TO_REPORT </item>
+ <item> RAWTOHEX </item>
+ <item> REF </item>
+ <item> REFTOHEX </item>
++ <item> REGEXP_INSTR </item>
++ <item> REGEXP_LIKE </item>
++ <item> REGEXP_REPLACE </item>
++ <item> REGEXP_SUBSTR </item>
+ <item> REGR_SLOPE </item>
+ <item> REGR_INTERCEPT </item>
+ <item> REGR_COUNT </item>
+@@ -710,7 +727,7 @@
+ <item> REGR_SXX </item>
+ <item> REGR_SYY </item>
+ <item> REGR_SXY </item>
+- <item> REPLACE </item>
++ <item> REMAINDER </item>
+ <item> ROUND </item>
+ <item> ROW_NUMBER </item>
+ <item> ROWIDTOCHAR </item>
+@@ -722,6 +739,18 @@
+ <item> SIN </item>
+ <item> SINH </item>
+ <item> SOUNDEX </item>
++ <item> STATS_BINOMIAL_TEST </item>
++ <item> STATS_CROSSTAB </item>
++ <item> STATS_F_TEST </item>
++ <item> STATS_KS_TEST </item>
++ <item> STATS_MODE </item>
++ <item> STATS_MW_TEST </item>
++ <item> STATS_ONE_WAY_ANOVA </item>
++ <item> STATS_T_TEST_ONE </item>
++ <item> STATS_T_TEST_PAIRED </item>
++ <item> STATS_T_TEST_INDEP </item>
++ <item> STATS_T_TEST_INDEPU </item>
++ <item> STATS_WSR_TEST </item>
+ <item> SUBSTR </item>
+ <item> SQRT </item>
+ <item> STDDEV </item>
+@@ -742,6 +771,8 @@
+ <item> SYSTIMESTAMP </item>
+ <item> TAN </item>
+ <item> TANH </item>
++ <item> TO_BINARY_DOUBLE </item>
++ <item> TO_BINARY_FLOAT </item>
+ <item> TO_CHAR </item>
+ <item> TO_CLOB </item>
+ <item> TO_DATE </item>
+@@ -778,6 +809,8 @@
+ <item> ANYTYPE </item>
+ <item> ARRAY </item>
+ <item> BFILE </item>
++ <item> BINARY_DOUBLE </item>
++ <item> BINARY_FLOAT </item>
+ <item> BINARY_INTEGER </item>
+ <item> BLOB </item>
+ <item> BOOLEAN </item>
+@@ -786,6 +819,7 @@
+ <item> CHARACTER </item>
+ <item> CLOB </item>
+ <item> DATE </item>
++ <item> DAY </item>
+ <item> DBURITYPE </item>
+ <item> DEC </item>
+ <item> DECIMAL </item>
+@@ -795,16 +829,17 @@
+ <item> HTTPURITYPE </item>
+ <item> INT </item>
+ <item> INTEGER </item>
++ <item> INTERVAL </item>
+ <item> LOB </item>
+ <item> LONG </item>
+ <item> MLSLABEL </item>
++ <item> MONTH </item>
+ <item> NATIONAL </item>
+ <item> NCHAR </item>
+ <item> NCLOB </item>
+ <item> NUMBER </item>
+ <item> NUMERIC </item>
+ <item> NVARCHAR </item>
+- <item> NVARCHAR2 </item>
+ <item> OBJECT </item>
+ <item> PLS_INTEGER </item>
+ <item> PRECISION </item>
+@@ -812,10 +847,11 @@
+ <item> RECORD </item>
+ <item> REAL </item>
+ <item> ROWID </item>
++ <item> SECOND </item>
+ <item> SINGLE </item>
+ <item> SMALLINT </item>
+- <item> TIMESTAMP </item>
+ <item> TIME </item>
++ <item> TIMESTAMP </item>
+ <item> URIFACTORYTYPE </item>
+ <item> URITYPE </item>
+ <item> UROWID </item>
+@@ -824,6 +860,8 @@
+ <item> VARYING </item>
+ <item> VARRAY </item>
+ <item> XMLTYPE </item>
++ <item> YEAR </item>
++ <item> ZONE </item>
+ </list>
+ <contexts>
+ <context name="Normal" attribute="Normal Text" lineEndContext="#stay">
+@@ -832,23 +870,23 @@
+ <keyword attribute="Function" String="functions" context="#stay"/>
+ <keyword attribute="Data Type" String="types" context="#stay"/>
+ <RegExpr attribute="Data Type" String="%bulk_exceptions\b" insensitive="true" context="#stay"/>
+- <RegExpr attribute="Data Type" String="%bulk_rowcount\b" insensitive="true" context="#stay"/>
+- <RegExpr attribute="Data Type" String="%found\b" insensitive="true" context="#stay"/>
+- <RegExpr attribute="Data Type" String="%isopen\b" insensitive="true" context="#stay"/>
+- <RegExpr attribute="Data Type" String="%notfound\b" insensitive="true" context="#stay"/>
+- <RegExpr attribute="Data Type" String="%rowcount\b" insensitive="true" context="#stay"/>
+- <RegExpr attribute="Data Type" String="%rowtype\b" insensitive="true" context="#stay"/>
+- <RegExpr attribute="Data Type" String="%type\b" insensitive="true" context="#stay"/>
++ <RegExpr attribute="Data Type" String="%bulk_rowcount\b" insensitive="true" context="#stay"/>
++ <RegExpr attribute="Data Type" String="%found\b" insensitive="true" context="#stay"/>
++ <RegExpr attribute="Data Type" String="%isopen\b" insensitive="true" context="#stay"/>
++ <RegExpr attribute="Data Type" String="%notfound\b" insensitive="true" context="#stay"/>
++ <RegExpr attribute="Data Type" String="%rowcount\b" insensitive="true" context="#stay"/>
++ <RegExpr attribute="Data Type" String="%rowtype\b" insensitive="true" context="#stay"/>
++ <RegExpr attribute="Data Type" String="%type\b" insensitive="true" context="#stay"/>
+ <Float attribute="Float" context="#stay"/>
+ <Int attribute="Decimal" context="#stay"/>
+ <DetectChar attribute="String" context="String literal" char="'"/>
+ <Detect2Chars attribute="Comment" context="Singleline PL/SQL-style comment" char="-" char1="-"/>
+ <Detect2Chars attribute="Comment" context="Multiline C-style comment" char="/" char1="*"/>
+- <RegExpr attribute="Comment" context="SQL*Plus remark directive" String="rem\b" insensitive="true" column="0"/>
++ <RegExpr attribute="Comment" context="SQL*Plus remark directive" String="^rem\b" insensitive="true" column="0"/>
+ <DetectChar attribute="Identifier" context="User-defined identifier" char="""/>
+ <RegExpr attribute="External Variable" context="#stay" String="(:|&&?)\w+"/>
+- <RegExpr attribute="Symbol" context="#stay" String="/$" column="0"/>
+- <RegExpr attribute="Preprocessor" context="SQL*Plus directive to include file" String="@@?[^@ \t\r\n]" column="0"/>
++ <RegExpr attribute="Symbol" context="#stay" String="^/$" column="0"/>
++ <RegExpr attribute="Preprocessor" context="SQL*Plus directive to include file" String="^@@?[^@ \t\r\n]" column="0"/>
+ </context>
+ <context name="String literal" attribute="String" lineEndContext="#stay">
+ <HlCStringChar attribute="String Char" context="#stay"/>
+diff -Nru kdelibs-release-3.4.0/kate/part/kateautoindent.cpp kdelibs-branch-3.4/kate/part/kateautoindent.cpp
+--- kdelibs-release-3.4.0/kate/part/kateautoindent.cpp 2005-02-22 10:05:50.000000000 -0500
++++ kdelibs-branch-3.4/kate/part/kateautoindent.cpp 2005-04-04 15:10:27.000000000 -0400
+@@ -521,7 +521,7 @@
+ bool insideDoxygen = false;
+ if (textLine->attribute(first) == doxyCommentAttrib || textLine->attribute(textLine->lastChar()) == doxyCommentAttrib)
+ {
+- if (!textLine->endingWith("*/"))
++ if (!textLine->stringAtPos(textLine->lastChar()-1, "*/"))
+ insideDoxygen = true;
+ }
+
+@@ -599,9 +599,23 @@
+ return;
+ }
+
+- // anders: don't change the indent of doxygen lines here.
+ if ( textLine->attribute( begin.col() ) == doxyCommentAttrib )
+- return;
++ {
++ // dominik: if line is "* /", change it to "*/"
++ if ( c == '/' )
++ {
++ int first = textLine->firstChar();
++ // if the first char exists and is a '*', and the next non-space-char
++ // is already the just typed '/', concatenate it to "*/".
++ if ( first != -1
++ && textLine->getChar( first ) == '*'
++ && textLine->nextNonSpaceChar( first+1 ) == view->cursorColumn()-1 )
++ doc->removeText( view->cursorLine(), first+1, view->cursorLine(), view->cursorColumn()-1);
++ }
++
++ // anders: don't change the indent of doxygen lines here.
++ return;
++ }
+
+ processLine(begin);
+ }
+@@ -1898,9 +1912,23 @@
+ return;
+ }
+
+- // anders: don't change the indent of doxygen lines here.
+ if ( textLine->attribute( begin.col() ) == doxyCommentAttrib )
++ {
++ // dominik: if line is "* /", change it to "*/"
++ if ( c == '/' )
++ {
++ int first = textLine->firstChar();
++ // if the first char exists and is a '*', and the next non-space-char
++ // is already the just typed '/', concatenate it to "*/".
++ if ( first != -1
++ && textLine->getChar( first ) == '*'
++ && textLine->nextNonSpaceChar( first+1 ) == view->cursorColumn()-1 )
++ doc->removeText( view->cursorLine(), first+1, view->cursorLine(), view->cursorColumn()-1);
++ }
++
++ // anders: don't change the indent of doxygen lines here.
+ return;
++ }
+
+ processLine(begin);
+ }
+diff -Nru kdelibs-release-3.4.0/kate/part/katebuffer.cpp kdelibs-branch-3.4/kate/part/katebuffer.cpp
+--- kdelibs-release-3.4.0/kate/part/katebuffer.cpp 2004-11-21 18:05:32.000000000 -0500
++++ kdelibs-branch-3.4/kate/part/katebuffer.cpp 2005-03-05 17:03:43.000000000 -0500
+@@ -87,7 +87,8 @@
+ KateFileLoader (const QString &filename, QTextCodec *codec)
+ : m_file (filename)
+ , m_buffer (KMIN (m_file.size(), KATE_FILE_LOADER_BS))
+- , m_decoder (codec->makeDecoder())
++ , m_codec (codec)
++ , m_decoder (m_codec->makeDecoder())
+ , m_position (0)
+ , m_lastLineStart (0)
+ , m_eof (false) // default to not eof
+@@ -115,6 +116,14 @@
+
+ if (c > 0)
+ {
++ // fix utf16 LE, stolen from khtml ;)
++ if ((c >= 2) && (m_codec->mibEnum() == 1000) && (m_buffer[1] == 0x00))
++ {
++ // utf16LE, we need to put the decoder in LE mode
++ char reverseUtf16[3] = {0xFF, 0xFE, 0x00};
++ m_decoder->toUnicode(reverseUtf16, 2);
++ }
++
+ processNull (c);
+ m_text = m_decoder->toUnicode (m_buffer, c);
+ }
+@@ -289,6 +298,7 @@
+ private:
+ QFile m_file;
+ QByteArray m_buffer;
++ QTextCodec *m_codec;
+ QTextDecoder *m_decoder;
+ QString m_text;
+ uint m_position;
+diff -Nru kdelibs-release-3.4.0/kate/part/kateconfig.cpp kdelibs-branch-3.4/kate/part/kateconfig.cpp
+--- kdelibs-release-3.4.0/kate/part/kateconfig.cpp 2005-01-24 10:32:18.000000000 -0500
++++ kdelibs-branch-3.4/kate/part/kateconfig.cpp 2005-03-09 14:07:37.000000000 -0500
+@@ -1234,13 +1234,17 @@
+
+ const QColor& KateRendererConfig::lineMarkerColor(KTextEditor::MarkInterface::MarkTypes type) const
+ {
+- int index = static_cast<int>( log(static_cast<double>(type)) / log(2.0) );
+- Q_ASSERT( index >= 0 && index < KTextEditor::MarkInterface::reservedMarkersCount() );
++ int index = 0;
++ if (type > 0) { while((type >> index++) ^ 1) {} }
++ index -= 1;
++
++ if ( index < 0 || index >= KTextEditor::MarkInterface::reservedMarkersCount() )
++ return QColor();
+
+ if (m_lineMarkerColorSet[index] || isGlobal())
+ return m_lineMarkerColor[index];
+
+- return s_global->lineMarkerColor();
++ return s_global->lineMarkerColor( type );
+ }
+
+ void KateRendererConfig::setLineMarkerColor (const QColor &col, KTextEditor::MarkInterface::MarkTypes type)
+diff -Nru kdelibs-release-3.4.0/kate/part/katedocument.cpp kdelibs-branch-3.4/kate/part/katedocument.cpp
+--- kdelibs-release-3.4.0/kate/part/katedocument.cpp 2005-02-28 16:12:51.000000000 -0500
++++ kdelibs-branch-3.4/kate/part/katedocument.cpp 2005-03-27 13:58:17.000000000 -0500
+@@ -3241,6 +3241,11 @@
+ if (m_indenter->canProcessNewLine ())
+ {
+ int pos = textLine->firstChar();
++
++ // length should do the job better
++ if (pos < 0)
++ pos = textLine->length();
++
+ if (c.col() < pos)
+ c.setCol(pos); // place cursor on first char if before
+
+@@ -3316,8 +3321,12 @@
+ else
+ {
+ // backspace indents: erase to next indent position
+-
+ KateTextLine::Ptr textLine = m_buffer->plainLine(line);
++
++ // don't forget this check!!!! really!!!!
++ if (!textLine)
++ return;
++
+ int colX = textLine->cursorX(col, config()->tabWidth());
+ int pos = textLine->firstChar();
+ if (pos > 0)
+@@ -3330,7 +3339,9 @@
+ int y = line;
+ while (--y >= 0)
+ {
++ // this is save, y <= line, and line was already success
+ textLine = m_buffer->plainLine(y);
++
+ pos = textLine->firstChar();
+
+ if (pos >= 0)
+@@ -3358,6 +3369,11 @@
+ if (line >= 1)
+ {
+ KateTextLine::Ptr textLine = m_buffer->plainLine(line-1);
++
++ // don't forget this check!!!! really!!!!
++ if (!textLine)
++ return;
++
+ if (config()->wordWrap() && textLine->endingWith(QString::fromLatin1(" ")))
+ {
+ // gg: in hard wordwrap mode, backspace must also eat the trailing space
+@@ -5249,7 +5265,7 @@
+ else if ( var == "auto-insert-doxygen" && checkBoolValue( val, &state) )
+ m_config->setConfigFlags( KateDocumentConfig::cfDoxygenAutoTyping, state);
+ else if ( var == "mixed-indent" && checkBoolValue( val, &state ) )
+- m_config->setConfigFlags( KateDocumentConfig::cfMixedIndent, &state );
++ m_config->setConfigFlags( KateDocumentConfig::cfMixedIndent, state );
+
+ // INTEGER SETTINGS
+ else if ( var == "tab-width" && checkIntValue( val, &n ) )
+diff -Nru kdelibs-release-3.4.0/kate/part/katerenderer.cpp kdelibs-branch-3.4/kate/part/katerenderer.cpp
+--- kdelibs-release-3.4.0/kate/part/katerenderer.cpp 2005-01-23 15:49:01.000000000 -0500
++++ kdelibs-branch-3.4/kate/part/katerenderer.cpp 2005-04-04 15:10:27.000000000 -0400
+@@ -158,19 +158,12 @@
+ uint mrk = m_doc->mark( line );
+ if (mrk)
+ {
+- // don't try to get colors for non-reserved mark types from the config
+- uint reserved = (0x1 << KTextEditor::MarkInterface::reservedMarkersCount()) - 1;
+-
+ for (uint bit = 0; bit < 32; bit++)
+ {
+ KTextEditor::MarkInterface::MarkTypes markType = (KTextEditor::MarkInterface::MarkTypes)(1<<bit);
+ if (mrk & markType)
+ {
+- QColor markColor;
+- if ( (uint)markType <= reserved)
+- markColor = config()->lineMarkerColor(markType);
+- else
+- markColor = m_doc->markColor( markType );
++ QColor markColor = config()->lineMarkerColor(markType);
+
+ if (markColor.isValid()) {
+ markCount++;
+@@ -234,6 +227,7 @@
+ startend.setCol(startend.col()+1);
+ bracketStartRange = new KateArbitraryHighlightRange(m_doc, bracketmark->start(), startend);
+ bracketStartRange->setBGColor(config()->highlightedBracketColor());
++ bracketStartRange->setBold(true);
+ superRanges.append(bracketStartRange);
+ }
+
+@@ -242,6 +236,7 @@
+ endend.setCol(endend.col()+1);
+ bracketEndRange = new KateArbitraryHighlightRange(m_doc, bracketmark->end(), endend);
+ bracketEndRange->setBGColor(config()->highlightedBracketColor());
++ bracketEndRange->setBold(true);
+ superRanges.append(bracketEndRange);
+ }
+ }
+diff -Nru kdelibs-release-3.4.0/kate/part/katesearch.cpp kdelibs-branch-3.4/kate/part/katesearch.cpp
+--- kdelibs-release-3.4.0/kate/part/katesearch.cpp 2005-02-14 07:04:52.000000000 -0500
++++ kdelibs-branch-3.4/kate/part/katesearch.cpp 2005-03-21 12:58:10.000000000 -0500
+@@ -102,7 +102,8 @@
+
+ if( findDialog->exec() == QDialog::Accepted ) {
+ s_searchList = findDialog->findHistory () ;
+- find( s_searchList.first(), findDialog->options(), true, true );
++ // Do *not* remove the QString() wrapping, it fixes a nasty crash
++ find( QString(s_searchList.first()), findDialog->options(), true, true );
+ }
+
+ delete findDialog;
+@@ -166,7 +167,8 @@
+ s_searchList = replaceDialog->findHistory () ;
+ s_replaceList = replaceDialog->replacementHistory () ;
+
+- replace( s_searchList.first(), s_replaceList.first(), opts );
++ // Do *not* remove the QString() wrapping, it fixes a nasty crash
++ replace( QString(s_searchList.first()), m_replacement, opts );
+ }
+
+ delete replaceDialog;
+diff -Nru kdelibs-release-3.4.0/kate/part/katetextline.h kdelibs-branch-3.4/kate/part/katetextline.h
+--- kdelibs-release-3.4.0/kate/part/katetextline.h 2005-02-17 16:43:38.000000000 -0500
++++ kdelibs-branch-3.4/kate/part/katetextline.h 2005-03-18 05:00:20.000000000 -0500
+@@ -29,6 +29,7 @@
+ #include <qstring.h>
+
+ class KateRenderer;
++class QTextStream;
+
+ /**
+ * The KateTextLine represents a line of text. A text line that contains the
+diff -Nru kdelibs-release-3.4.0/kate/part/kateviewinternal.cpp kdelibs-branch-3.4/kate/part/kateviewinternal.cpp
+--- kdelibs-release-3.4.0/kate/part/kateviewinternal.cpp 2005-02-21 05:35:36.000000000 -0500
++++ kdelibs-branch-3.4/kate/part/kateviewinternal.cpp 2005-03-08 05:36:48.000000000 -0500
+@@ -67,6 +67,7 @@
+ , m_columnScrollDisplayed(false)
+ , m_selChangedByUser (false)
+ , selectAnchor (-1, -1)
++ , m_selectionMode( Default )
+ , m_preserveMaxX(false)
+ , m_currentMaxX(0)
+ , m_usePlainLines(false)
+diff -Nru kdelibs-release-3.4.0/kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop kdelibs-branch-3.4/kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop
+--- kdelibs-release-3.4.0/kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop 2005-02-23 00:04:21.000000000 -0500
++++ kdelibs-branch-3.4/kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop 2005-03-27 02:28:40.000000000 -0500
+@@ -1,8 +1,10 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=KTextEditor Autobookmarker
++Name[af]=KTextEditor OutoBoekmerker
+ Name[be]=Дапаўненьне "Аўтаматычныя закладкі" K Тэкставага рэдактара
+ Name[bn]=কে-টেক্সট-এডিটর অটো-মুকমার্কার
++Name[br]=Sinedoù emgefreek evit KTextEditor
+ Name[bs]=KTextEditor automatske zabilješke
+ Name[ca]=Punts automàtics per al KTextEditor
+ Name[de]=KTextEditor: Autom. Lesezeichenmarkierung
+@@ -14,7 +16,7 @@
+ Name[fi]=KTextEditorin automaattinen kirjanmerkkien tekijä
+ Name[fr]=Signets automatiques KTextEditor
+ Name[fy]=Automatyske Blêdwizer foar de KTekstbewurker
+-Name[he]= תוסף סימיות אוטומטיות של KTextEditor
++Name[he]= תוסף סימניות אוטומטיות של KTextEditor
+ Name[hi]=के-टेक्स्ट-एडिटर ऑटोबुकमार्कर
+ Name[hr]=KTextEditor umetak za automatske bilješke
+ Name[hu]=KTextEditor automatikus könyvjelzők
+@@ -38,15 +40,15 @@
+ Name[sk]=Automatické záložky pre KTextEditor
+ Name[sl]=Samodejni zaznamki za KTextEditor
+ Name[sr]=KTextEditor-ов аутомаркер
+-Name[sr@Latn]=KTextEditor-ов аутомаркер
++Name[sr@Latn]=KTextEditor-ov automarker
+ Name[sv]=Automatiska bokmärken för Ktexteditor
+ Name[ta]=கேஉரைதொகுப்பாளர் தானியக்க புத்தக உருவாக்கி
+ Name[tg]=Замимакунандаи худкори KTextEditor
+ Name[tr]=KTextEditor Otomatik Sıkkullanılanlar Ekleyici
+ Name[uk]=Втулок автоматичних закладок KTextEditor
+-Name[xx]=xxKTextEditor Autobookmarkerxx
+ 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[bg]=Установяване на отметки на редовете, които отговарят на зададен шаблон по време на зареждане на файла
+ Comment[bn]=ডকুমেন্ট লোড করাকালীন প্রদত্ত নকশার সাথে মেলে এমন সমস্ত লাইন বুকমার্ক করে
+ Comment[bs]=Podešava zabilješke na linijama koje odgovaraju uzorku pri učitavanju dokumenta
+@@ -86,12 +88,11 @@
+ Comment[sk]=Nastavuje záložky pri načítaní dokumentu na riadky zodpovedajúce vzorke
+ Comment[sl]=Nastavi zaznamke v vrsticah, ki se ujemajo vzorcu, ko so dokumenti naloženi
+ Comment[sr]=Поставља маркере на линијама које се уклапају у узорак када се учитавају документи
+-Comment[sr@Latn]=Поставља маркере на линијама које се уклапају у узорак када се учитавају документи
++Comment[sr@Latn]=Postavlja markere na linijama koje se uklapaju u uzorak kada se učitavaju dokumenti
+ Comment[sv]=Lägg till bokmärken på rader som motsvarar ett mönster när dokument laddas
+ Comment[ta]= ஆவணங்கள் பதிவாகும் போது அமைப்பு புத்தகக்குறிப்பு கோடுகள் பொருத்தும் மாதிரி
+ Comment[tg]=Аз рӯи қолиб сабт намудани замимаҳо дар ҳуҷҷат
+ Comment[uk]=Встановлює закладки на рядках, що відповідають взірцю, при завантаженні документів
+-Comment[xx]=xxSet bookmarks on lines matching a pattern when documents are loadedxx
+ Comment[zh_CN]=文档装入时根据匹配模式自动设置书签
+ X-KDE-Library=ktexteditor_autobookmarker
+ ServiceTypes=KTextEditor/Plugin
+diff -Nru kdelibs-release-3.4.0/kate/plugins/insertfile/ktexteditor_insertfile.desktop kdelibs-branch-3.4/kate/plugins/insertfile/ktexteditor_insertfile.desktop
+--- kdelibs-release-3.4.0/kate/plugins/insertfile/ktexteditor_insertfile.desktop 2005-02-23 00:04:21.000000000 -0500
++++ kdelibs-branch-3.4/kate/plugins/insertfile/ktexteditor_insertfile.desktop 2005-03-26 02:37:24.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=KTextEditor Insert File Plugin
++Name[af]=KTextEditor Voeg Lêer In Inprop Module
+ Name[ar]=ملحق إدراج ملف لمحرر النصوص
+ Name[az]=KTextEditor Fayl Əlavəsi Daxil El
+ Name[be]=Дапаўненьне "Уставіць файл" K Тэкставага рэдактара
+@@ -19,7 +20,7 @@
+ Name[fa]=متصلکنندهی پروندهی ورود KTextEditor
+ Name[fi]=KTextEditorin 'Lisää tiedosto'-laajennus
+ Name[fr]=Module externe du fichier d'insertion de KTextEditor
+-Name[fy]=KTextEditor-plugin foar it ynfoegjen fan triems
++Name[fy]=KTextEditor-plugin foar it ynfoegjen fan triemen
+ Name[ga]=Breiseán KTextEditor chun comhad a ionsá
+ Name[gl]=Plugin de Inserción de Ficheiro KTextEditor
+ Name[he]=תוסף הוספת קובץ ל־KTextEditor
+@@ -52,7 +53,7 @@
+ Name[sl]=Vstavek KTextEditor za vstavljanje datotek
+ Name[sq]=KTextEditor Shtojca: Fute skedën
+ Name[sr]=KTextEditor прикључак за уметање фајла
+-Name[sr@Latn]=KTextEditor dodatak za umetanje fajla.
++Name[sr@Latn]=KTextEditor priključak za umetanje fajla
+ Name[ss]=I-KTextEditor yingenisa i-plugin yelifayela
+ Name[sv]=Ktexteditor-insticksprogram för att infoga filer
+ Name[ta]=கேஉரைதொகுப்பாளர் கோப்பு உள்ளீட்டுச் சொருகுப்பொருள்
+@@ -63,11 +64,11 @@
+ Name[ven]=Musengulusi wa manwalwa K i dzhenisa pulagini ya faela
+ Name[wa]=Tchôke-divins di KTextEditor po stitchî des fitchîs
+ Name[xh]=KTextEditor Faka Ifayile ye Plagi efakiweyo
+-Name[xx]=xxKTextEditor Insert File Pluginxx
+ Name[zh_CN]=KTextEditor 插入文件插件
+ Name[zh_TW]=文字編輯器插入檔案外掛程式
+ Name[zu]=Faka Ifayela Lokungena ngaphakathi le-KTextEditor
+ Comment=Insert any readable file at cursor position
++Comment[af]=Voeg enige leesbare lêer in by die merker posisie
+ Comment[bg]=Вмъкване на файл от мястото на курсора
+ Comment[bn]=কার্সার অবস্থানে যে কোনো (পাঠযোগ্য) ফাইল অন্তর্ভুক্ত করতে পারে
+ Comment[bs]=Ubacuje bilo koju čitljivu datoteku na poziciju kursora
+@@ -79,6 +80,7 @@
+ Comment[eo]=Enmetu iun legeblan dosieron je ĉi tiu posicio
+ Comment[es]=Insertar cualquier archivo legible en la posición del cursor
+ Comment[et]=Suvalise loetava faili lisamine kursori asukohta
++Comment[eu]=Kurtsorearen kokapenean fitxategi irakurgarri bat txertatzen du
+ Comment[fi]=Lisää mikä tahansa luettava tiedosto kursorin kohdalle
+ Comment[fr]=Insérer tout fichier lisible à la position du curseur
+ Comment[fy]=Els lêsber Triem by it rinnerke ynfoegje
+@@ -105,14 +107,13 @@
+ Comment[sk]=Vloží ľubovoľný súbor na pozíciu kurzora
+ Comment[sl]=Vstavi katerokoli berljivo datoteko na položaju kazalca
+ Comment[sr]=Убаците било који читљиви фајл на положају курсора
+-Comment[sr@Latn]=Убаците било који читљиви фајл на положају курсора
++Comment[sr@Latn]=Ubacite bilo koji čitljivi fajl na položaju kursora
+ Comment[sv]=Infoga vilken läsbar fil som helst vid markörens plats
+ Comment[ta]=சுட்டும் இடத்தில் படிக்கக்கூடிய கோப்பினை உள்ளிடு
+ Comment[tg]=Гузоштани ягон файли хондашаванда дар мавқеъи курсор
+ Comment[tr]=İmleç konumunda herhangi bir dosyanın içeriğini ekle
+ Comment[uk]=Вставляє зміст будь-якого файлу, який можна прочитати, у позицію курсору
+ Comment[uz]=Ҳар қандай ўқиб бўладиган файлни курсорнинг жойидан қўйиш
+-Comment[xx]=xxInsert any readable file at cursor positionxx
+ Comment[zh_CN]=在光标位置插入任何可读文件
+ X-KDE-Library=ktexteditor_insertfile
+ ServiceTypes=KTextEditor/Plugin
+diff -Nru kdelibs-release-3.4.0/kate/plugins/isearch/ktexteditor_isearch.desktop kdelibs-branch-3.4/kate/plugins/isearch/ktexteditor_isearch.desktop
+--- kdelibs-release-3.4.0/kate/plugins/isearch/ktexteditor_isearch.desktop 2005-02-23 00:04:22.000000000 -0500
++++ kdelibs-branch-3.4/kate/plugins/isearch/ktexteditor_isearch.desktop 2005-03-10 11:04:45.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=KTextEditor Incremental Search Plugin
++Name[af]=KTextEditor Inkrementele Soektog Inprop Module
+ Name[ar]=ملحق بحث تزايدي لمحرر نصوص كيدي
+ Name[az]=KTextEditor Artan Axtarış Əlavəsi
+ Name[bn]=কে-টেক্সট-এডিটর ধারাবাহিক সন্ধান প্লাগ-ইন
+@@ -50,7 +51,7 @@
+ Name[sl]=Vstavek KTextEditor za postopno iskanje
+ Name[sq]=KTextEditor Shtojca: Kërkim përmes Numrimit
+ Name[sr]=KTextEditor прикључак за инкрементално претраживање
+-Name[sr@Latn]=KTextEditor dodatak za inkrementalno pretraživanje.
++Name[sr@Latn]=KTextEditor priključak za inkrementalno pretraživanje
+ Name[ss]=I-plugin yekusesha lokungetekako kwe KTextEditor
+ Name[sv]=Ktexteditor-insticksprogram för inkrementell sökning
+ Name[ta]=கேஉரை தொகுப்பாளர் படிப்படியான தேடற் சொருகுப்பொருள்
+@@ -60,11 +61,11 @@
+ Name[uz]=KTextEditor кетма-кет қидириш плагини
+ Name[ven]=Pulagini yau toda yo engedzeaho ya musengulusi wa manwalwa a K
+ Name[xh]=KTextEditor Iplagi yangaphakathi Yokuphendla Ngokunyukayo
+-Name[xx]=xxKTextEditor Incremental Search Pluginxx
+ Name[zh_CN]=KTextEditor 增量搜索插件
+ Name[zh_TW]=KTextEditor 漸進式搜尋外掛程式
+ 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[bg]=Последователно търсене, известно още като търсене по време на въвеждане на низа
+ Comment[bn]="টাইপ করাকালীন সন্ধান" হিসাবেও পরিচিত
+ Comment[bs]=Takođe poznat kao "Pretraga dok kucate"
+@@ -105,13 +106,12 @@
+ Comment[sk]=Známe aj ako "Hľadanie podľa napísaného textu"
+ Comment[sl]=Znano tudi kot »Iskanje med tipkanjem«
+ Comment[sr]=Познато и као „претрага док куцате“
+-Comment[sr@Latn]=Познато и као „претрага док куцате“
++Comment[sr@Latn]=Poznato i kao „pretraga dok kucate“
+ Comment[sv]=Också känt som "Sök medan du skriver"
+ Comment[ta]="தேடு என்று தட்டச்சிட்டவுடன்" என்றும் அழைக்கப்படும்
+ Comment[tg]=Ҷустуҷӯӣ аз рӯи маҷмӯи ишораҳо
+ Comment[tr]=Ayrıca "Yazarken ararsın" olarak da bilinir
+ Comment[uk]=Також відомий як "Пошук за вводом"
+-Comment[xx]=xxAlso known as "As you type search"xx
+ Comment[zh_CN]=也称为“即输即搜”
+ X-KDE-Library=ktexteditor_isearch
+ ServiceTypes=KTextEditor/Plugin
+diff -Nru kdelibs-release-3.4.0/kate/plugins/kdatatool/ktexteditor_kdatatool.desktop kdelibs-branch-3.4/kate/plugins/kdatatool/ktexteditor_kdatatool.desktop
+--- kdelibs-release-3.4.0/kate/plugins/kdatatool/ktexteditor_kdatatool.desktop 2005-02-23 00:04:22.000000000 -0500
++++ kdelibs-branch-3.4/kate/plugins/kdatatool/ktexteditor_kdatatool.desktop 2005-03-27 02:28:41.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=KTextEditor KDataTool Plugin
++Name[af]=KTextEditor KDataTool Inprop Module
+ Name[ar]=ملحق KDataTool لـ KTextEditor
+ Name[az]=KTextEditor KDataVasitəsi Əlavəsi
+ Name[bn]=কে-টেক্সট-এডিটর কে-ডেটা-টুল প্লাগ-ইন
+@@ -50,7 +51,7 @@
+ Name[sl]=Vstavek KTextEditor KDataTool
+ Name[sq]=KTextEditor Shtojca: KDataTool
+ Name[sr]=KTextEditor KDataTool прикључак
+-Name[sr@Latn]=KTextEditor KDataTool dodatak
++Name[sr@Latn]=KTextEditor KDataTool priključak
+ Name[ss]=I-plugin KDataTool ku KTextEditor
+ Name[sv]=Ktexteditor-insticksprogram med dataverktyg
+ Name[ta]=கேஉரைதொகுப்பாளர் கேதகவல் கருவி சொருகுப்பொருள்
+@@ -61,7 +62,6 @@
+ Name[ven]=Pulagini ya tshishumiswa tsha data ya K ya musengulusi wa manwalwa a K
+ Name[wa]=Tchôke-divins KDataTool po KTextEditor
+ Name[xh]=KTextEditor KDataTool Iplagi yangaphakathi
+-Name[xx]=xxKTextEditor KDataTool Pluginxx
+ Name[zh_CN]=KTextEditor KDataTool 插件
+ Name[zh_TW]=KTextEditor KDataTool 外排程式
+ Name[zu]=I-Plugin ye-KDataTool ye-KTextEditor
+@@ -88,7 +88,7 @@
+ Comment[fy]=Aktivearjen fan dataprogramma's, lykas de tesaurus en stavering (wannear't dy ynstallearre binne)
+ Comment[ga]=Cumasaigh uirlisí mar litreoir agus foclóir (má tá siad ar fáil)
+ Comment[gl]=Habilitar ferramentas de datos coma thesaurus e a corrección ortográfica (se están instalados)
+-Comment[he]=אפשר שימוש בכלי נתונים כגון אגרון ובדיקת איות (אם מותקנים כלים כאלה)
++Comment[he]=אפשר שימוש בכלי נתונים כגון איגרון ובדיקת איות (אם מותקנים כלים כאלה)
+ Comment[hi]= डाटा टूल्स जैसे शब्दकोश व वर्तनी जांच को सक्षम करें(यदि स्थापित हों)
+ Comment[hr]=Uključiti podatkovne alate kao što su tezaurus i ispravak pravopisa (ako su instalirani)
+ Comment[hsb]=Staja graty kaž tezawrus abo prawopisnu kontrolu k dispoziciji (jeli instalowane)
+@@ -128,7 +128,6 @@
+ Comment[ven]=U konisa zwishumiswa zwa data sa bugu nau sedza ha tshipelini (arali zwo dzheniswa)
+ Comment[wa]=Mete en alaedje les usteyes po manaedjî les dnêyes, come les diccionaires ou les coridjreces (si astalés)
+ Comment[xh]=Yenza izixhobo ze data ezinjenge thesaurus nomkhangeli wopelo (ukuba ifakelwe)
+-Comment[xx]=xxEnable data tools like thesaurus and spell check (if installed)xx
+ Comment[zh_CN]=启用像辞典(thesaurus)和拼写检查(spell check)这样的数据工具(如果安装了的话)
+ Comment[zh_TW]=打開資料工具如同義字典與拼字檢查 (如果有安裝的話)
+ Comment[zu]=Nika amandla amathuluzi edata anjenge thesaurus kanye nokubheka ukubhalwa kwamagama (uma kufakiwe)
+diff -Nru kdelibs-release-3.4.0/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop kdelibs-branch-3.4/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
+--- kdelibs-release-3.4.0/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop 2005-02-23 00:04:22.000000000 -0500
++++ kdelibs-branch-3.4/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop 2005-03-10 11:04:45.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=KTextEditor Word Completion Plugin
++Name[af]=KTextEditor Woord Voltooiïng Inprop Module
+ Name[bn]=কে-টেক্সট-এডিটর শব্দ পরিপূরণ প্লাগ-ইন
+ Name[bs]=KTextEditor dodatak za dovršavanje riječi
+ Name[ca]=Endollable de completar paraules del KTextEditor
+@@ -40,15 +41,15 @@
+ Name[sk]=Modul pre doplnenie slov pre KTextEditor
+ Name[sl]=Vstavek KTextEditor za dopolnjevanje besed
+ Name[sr]=KTextEditor прикључак за довршаванје речи
+-Name[sr@Latn]=KTextEditor прикључак за довршаванје речи
++Name[sr@Latn]=KTextEditor priključak za dovršavanje reči
+ Name[sv]=Ktexteditor-insticksprogram för att komplettera ord
+ Name[ta]=கேஉரைதொகுப்பாளர் கோப்பு உள்ளீட்டுச் சொருகுப்பொருள்
+ Name[tg]=Модули худиловакунандаи калимаҳои KTextEditor
+ Name[tr]=KTextEditor Kelime Tamamlama Eklentisi
+ Name[uk]=Втулок KTextEditor для завершення слів
+-Name[xx]=xxKTextEditor Word Completion Pluginxx
+ 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[bg]=Автоматично завършване на думи, базирано на използваните вече думи в документа
+ Comment[bn]=ডকুমেন্ট-এর অন্যান্য শব্দের উপর ভিত্তি করে পরিপূরণ
+ Comment[bs]=Direkcionalno ili popup-bazirano dovršavanje za riječi u dokumentu
+@@ -85,13 +86,12 @@
+ Comment[sk]=Dopĺňanie slov v dokumente priame alebo pomocou dialógu
+ Comment[sl]=Neposredno ali pojavno dopolnjevanje iz besed v dokumentu
+ Comment[sr]=Директна или искачућа допуна од речи у документу
+-Comment[sr@Latn]=Директна или искачућа допуна од речи у документу
++Comment[sr@Latn]=Direktna ili iskačuća dopuna od reči u dokumentu
+ Comment[sv]=Komplettering av ord i dokumentet baserad på ordlista eller dialogruta
+ Comment[ta]=ஆவணத்திலுள்ள வார்த்தைகளிலிருந்து திசைகள் அல்லது மேல்விரி-சார்ந்த நிறைவு
+ Comment[tg]=Худиловакунандаи калима дар ҳуҷҷат
+ Comment[tr]=Doğrusal veya açılır-kuttu abanlı kelime tamamlama
+ Comment[uk]=Завершення слів у документі. Пряме або на основі вигулькного меню
+-Comment[xx]=xxDirectional or popup-based completion from words in the documentxx
+ Comment[zh_CN]=在文档中基于方向或弹出补全单词
+ X-KDE-Library=ktexteditor_docwordcompletion
+ ServiceTypes=KTextEditor/Plugin
+diff -Nru kdelibs-release-3.4.0/kcert/kcertpart.desktop kdelibs-branch-3.4/kcert/kcertpart.desktop
+--- kdelibs-release-3.4.0/kcert/kcertpart.desktop 2005-02-23 00:04:23.000000000 -0500
++++ kdelibs-branch-3.4/kcert/kcertpart.desktop 2005-03-27 02:28:41.000000000 -0500
+@@ -24,7 +24,7 @@
+ Comment[fy]=Yn te sluten Persoanlik-sertifikaatbehearder
+ Comment[ga]=Bainisteoir Teastas Pearsanta Inleabaithe
+ Comment[gl]=Xestor Persoal de Certificados Incrustábel
+-Comment[he]=מנהל תעודות אישי בר-הטבעה
++Comment[he]=מנהל תעודות אישי בר־הטבעה
+ Comment[hi]=अंतर्निहित निजी सर्टिफिकेट प्रबंधक
+ Comment[hr]=Ugradivi upravitelj osobnim certifikatima
+ Comment[hsb]=Integrujomny Personal Certificate Manager
+@@ -55,7 +55,7 @@
+ Comment[sl]=Vgradljivi osebni upravljalnik certifikatov
+ Comment[sq]=Menagjer për diplomë personale
+ Comment[sr]=Уградиви менаџер личних сертификата
+-Comment[sr@Latn]=Ugradivi menadžer ličnih sertifikata.
++Comment[sr@Latn]=Ugradivi menadžer ličnih sertifikata
+ Comment[ss]=Siphatsi sesithifikethi samuntfu sicu lesinamatselekako
+ Comment[sv]=Inbäddningsbar personlig certifikatshanterare
+ Comment[ta]=உட்பொதிந்த சொந்தச் சான்றிதழ் மேலாளர்
+@@ -67,7 +67,6 @@
+ Comment[ven]=Mulanguli wa sethifikheithi ya vhune
+ Comment[vi]=Embeđable Personal Certificate Manager
+ Comment[xh]=Umphathi Wesiqinisekiso Sobuntu bakho Obulungiselelweyo
+-Comment[xx]=xxEmbeddable Personal Certificate Managerxx
+ Comment[zh_CN]=可嵌入的个人证书管理器
+ Comment[zh_TW]=可嵌入的個人認證管理工具
+ Comment[zu]=Imeneja Yesitifiketi Sobunini Oshuthekiwe
+@@ -82,7 +81,6 @@
+ Name[sv]=Kcertpart
+ Name[ta]=கேசான்றிதழ்பகுதி
+ Name[ven]=Tshipida tsha cert ya K
+-Name[xx]=xxKCertPartxx
+ ServiceTypes=KParts/ReadWritePart
+ X-KDE-Library=libkcertpart
+ InitialPreference=15
+diff -Nru kdelibs-release-3.4.0/kconf_update/kconf_update.cpp kdelibs-branch-3.4/kconf_update/kconf_update.cpp
+--- kdelibs-release-3.4.0/kconf_update/kconf_update.cpp 2005-01-21 07:21:54.000000000 -0500
++++ kdelibs-branch-3.4/kconf_update/kconf_update.cpp 2005-03-09 12:40:04.000000000 -0500
+@@ -3,7 +3,7 @@
+ * This file is part of the KDE libraries
+ * Copyright (c) 2001 Waldo Bastian <bastian@kde.org>
+ *
+- * $Id: kconf_update.cpp,v 1.34 2005/01/21 12:21:54 waba Exp $
++ * $Id: kconf_update.cpp,v 1.34.2.1 2005/03/09 17:40:04 waba Exp $
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+@@ -188,7 +188,7 @@
+ {
+ if (!m_textStream)
+ {
+- QString file = locateLocal("data", "kconf_update/update.log");
++ QString file = locateLocal("data", "kconf_update/log/update.log");
+ m_file = new QFile(file);
+ if (m_file->open(IO_WriteOnly | IO_Append))
+ {
+diff -Nru kdelibs-release-3.4.0/kdecore/all_languages.desktop kdelibs-branch-3.4/kdecore/all_languages.desktop
+--- kdelibs-release-3.4.0/kdecore/all_languages.desktop 2005-02-23 00:04:23.000000000 -0500
++++ kdelibs-branch-3.4/kdecore/all_languages.desktop 2005-03-30 01:47:18.000000000 -0500
+@@ -31,7 +31,6 @@
+ Name[tg]=Афарӣ
+ Name[uk]=Афар
+ Name[uz]=Афар
+-Name[xx]=xxAfarxx
+ Name[zh_CN]=阿法尔语
+ Name[zh_TW]=阿發爾
+ Name[zu]=Okude kakhulu
+@@ -89,7 +88,6 @@
+ Name[uk]=Абхазька
+ Name[uz]=Абхазча
+ Name[wa]=Abxhaze
+-Name[xx]=xxAbkhazianxx
+ Name[zh_CN]=阿布哈西亚语
+ Name[zh_TW]=阿布哈西亞語
+ Name[zu]=I-Abkhazian
+@@ -137,7 +135,6 @@
+ Name[tg]=Авастоӣ
+ Name[uk]=Авестан
+ Name[uz]=Авеста
+-Name[xx]=xxAvestanxx
+ Name[zh_CN]=阿维斯陀语
+ Name[zh_TW]=阿維斯陀語
+ Name[zu]=Isi-Avestan
+@@ -192,7 +189,6 @@
+ Name[uz]=Африканча
+ Name[ven]=Tshivhuru
+ Name[xh]=Isibhulu
+-Name[xx]=xxAfrikaansxx
+ Name[zh_CN]=南非荷兰语
+ Name[zh_TW]=南非荷蘭語
+ Name[zu]=Isi-Bhunu
+@@ -202,6 +198,7 @@
+ Name[az]=Amharikcə
+ Name[bg]=Амхарски
+ Name[bn]=আমহারিক
++Name[br]=Amhareg
+ Name[bs]=Amharski
+ Name[ca]=Amaric
+ Name[cs]=Amharský
+@@ -250,13 +247,12 @@
+ Name[tg]=Амхарикӣ
+ Name[uk]=Амхарська
+ Name[uz]=Амхарик
+-Name[xx]=xxAmharicxx
+ Name[zh_CN]=阿姆哈拉语
+ Name[zh_TW]=衣索比亞官方語
+ Name[zu]=isi-Amharic
+ [ar]
+ Name=Arabic
+-Name[af]=Arabiese
++Name[af]=Arabies
+ Name[ar]=العربية
+ Name[az]=Ərabcə
+ Name[be]=Арабская
+@@ -326,7 +322,6 @@
+ Name[ven]=Tshiarabiki
+ Name[vi]=Arabic (A? Rập)
+ Name[wa]=Arabe
+-Name[xx]=xxArabicxx
+ Name[zh_CN]=阿拉伯语
+ Name[zh_TW]=阿拉伯語
+ Name[zu]=Isi-Arabhu
+@@ -378,7 +373,6 @@
+ Name[tg]=Ассамӣ
+ Name[uk]=Асамійська
+ Name[uz]=Ассамесе
+-Name[xx]=xxAssamesexx
+ Name[zh_CN]=阿萨姆语
+ Name[zh_TW]=阿薩姆語
+ Name[zu]=Isi-Assamese
+@@ -418,7 +412,6 @@
+ Name[tg]=Аймарагӣ
+ Name[uk]=Аймарська
+ Name[uz]=Аймара
+-Name[xx]=xxAymaraxx
+ Name[zh_CN]=艾马拉语
+ Name[zh_TW]=愛瑪拉語
+ Name[zu]=Isi-Aymara
+@@ -490,7 +483,6 @@
+ Name[uz]=Озарбайжонча
+ Name[vi]=Agiecbaigiăng
+ Name[wa]=Azeri
+-Name[xx]=xxAzerbaijanixx
+ Name[zh_CN]=阿塞拜疆语
+ Name[zh_TW]=亞塞拜然語
+ Name[zu]=Isi-Azerbaijani
+@@ -539,7 +531,6 @@
+ Name[tg]=Бошқирдӣ
+ Name[uk]=Башкирська
+ Name[uz]=Бошқирча
+-Name[xx]=xxBashkirxx
+ Name[zh_CN]=巴什基尔语
+ Name[zh_TW]=Bashkir語
+ Name[zu]=Isi-Bashkir
+@@ -611,7 +602,6 @@
+ Name[uz]=Белорусча
+ Name[vi]=SBelarusian
+ Name[wa]=Bielorûsse
+-Name[xx]=xxBelarusianxx
+ Name[zh_CN]=白俄罗斯语
+ Name[zh_TW]=白俄羅斯語
+ Name[zu]=Isi-Belarusian
+@@ -686,7 +676,6 @@
+ Name[uz]=Болгарча
+ Name[vi]=Tiếng Bungari
+ Name[wa]=Bulgåre
+-Name[xx]=xxBulgarianxx
+ Name[zh_CN]=保加利亚语
+ Name[zh_TW]=保加利亞語
+ Name[zu]=Isi-Bulgarian
+@@ -722,7 +711,6 @@
+ Name[tg]=Бихарӣ
+ Name[uk]=Біхарі
+ Name[uz]=Бихари
+-Name[xx]=xxBiharixx
+ Name[zh_CN]=比哈里语
+ Name[zh_TW]=比哈爾語
+ Name[zu]=Isi-Bihari
+@@ -757,7 +745,6 @@
+ Name[tg]=Бислама
+ Name[uk]=Біслама
+ Name[uz]=Бислама
+-Name[xx]=xxBislamaxx
+ Name[zh_CN]=比斯拉马语
+ Name[zh_TW]=Bislama語
+ Name[zu]=Isi-Bislama
+@@ -807,7 +794,6 @@
+ Name[tr]=Bengal
+ Name[uk]=Бенгальська
+ Name[uz]=Бенгалча
+-Name[xx]=xxBengalixx
+ Name[zh_CN]=孟加拉语
+ Name[zh_TW]=孟加拉語
+ Name[zu]=Isi-Bengali
+@@ -873,7 +859,6 @@
+ Name[uk]=Тибетська
+ Name[uz]=Тибетча
+ Name[wa]=Tibetyin
+-Name[xx]=xxTibetanxx
+ Name[zh_CN]=藏语
+ Name[zh_TW]=藏語
+ Name[zu]=Isi-Tibetan
+@@ -941,13 +926,12 @@
+ Name[uk]=Бретонська
+ Name[uz]=Бретонча
+ Name[wa]=Burton
+-Name[xx]=xxBretonxx
+ Name[zh_CN]=布里多尼语
+ Name[zh_TW]=不列塔尼語
+ Name[zu]=Isi-Breton
+ [bs]
+ Name=Bosnian
+-Name[af]=Bosnise
++Name[af]=Bosnies
+ Name[ar]=البوسنية
+ Name[az]=Bosnakca
+ Name[be]=Басьнійская
+@@ -1014,7 +998,6 @@
+ Name[uz]=Боснияча
+ Name[ven]=Mubosinia
+ Name[wa]=Bosnyin
+-Name[xx]=xxBosnianxx
+ Name[zh_CN]=波斯尼亚语
+ Name[zh_TW]=波士尼亞語
+ Name[zu]=Isi-Bosnian
+@@ -1084,7 +1067,6 @@
+ Name[uk]=Каталонська
+ Name[uz]=Каталанча
+ Name[vi]=Tiếng Catalăng
+-Name[xx]=xxCatalanxx
+ Name[zh_CN]=加泰罗尼亚语
+ Name[zh_TW]=嘉泰羅尼亞語
+ Name[zu]=Isi-Catalan
+@@ -1147,7 +1129,6 @@
+ Name[uk]=Чеченська
+ Name[uz]=Чеченча
+ Name[wa]=Tchetchene
+-Name[xx]=xxChechenxx
+ Name[zh_CN]=车臣语
+ Name[zh_TW]=Chechen語
+ Name[zu]=Isi-Chechen
+@@ -1183,7 +1164,6 @@
+ Name[tg]=Чаморроӣ
+ Name[uk]=Чаморо
+ Name[uz]=Чаморро
+-Name[xx]=xxChamorroxx
+ Name[zh_CN]=查莫罗语
+ Name[zh_TW]=查摩洛語
+ Name[zu]=Isi-Chamorro
+@@ -1246,7 +1226,6 @@
+ Name[uk]=Корсиканська
+ Name[uz]=Корсиканча
+ Name[wa]=Corse
+-Name[xx]=xxCorsicanxx
+ Name[zh_CN]=科西嘉语
+ Name[zh_TW]=科西嘉語
+ Name[zu]=Isi-Corsican
+@@ -1319,7 +1298,6 @@
+ Name[uz]=Чехча
+ Name[vi]=Tiếng Séc
+ Name[wa]=Tcheke
+-Name[xx]=xxCzechxx
+ Name[zh_CN]=捷克语
+ Name[zh_TW]=捷克語
+ Name[zu]=Isi-Czech
+@@ -1382,7 +1360,6 @@
+ Name[uz]=Черков-словянча
+ Name[ven]=Slavic Zwakereke
+ Name[wa]=Eslave d' eglijhe
+-Name[xx]=xxChurch Slavicxx
+ Name[zh_CN]=宗教斯拉夫语(古代俄语)
+ Name[zh_TW]=教堂斯拉夫語
+ Name[zu]=Isi-Church Slavic
+@@ -1393,6 +1370,7 @@
+ Name[be]=Чувашская
+ Name[bg]=Чувашки
+ Name[bn]=চুভাশ
++Name[br]=Tchuvasheg
+ Name[bs]=Čuvaš
+ Name[cs]=Čuvašský
+ Name[cy]=Chuvasheg
+@@ -1432,7 +1410,6 @@
+ Name[uk]=Чуваська
+ Name[uz]=Чувашча
+ Name[wa]=Tchouvache
+-Name[xx]=xxChuvashxx
+ Name[zh_CN]=楚瓦什语
+ Name[zh_TW]=楚瓦士語
+ Name[zu]=Isi-Chuvash
+@@ -1500,7 +1477,6 @@
+ Name[uk]=Уельська
+ Name[uz]=Уэлсча
+ Name[wa]=Walès
+-Name[xx]=xxWelshxx
+ Name[zh_CN]=威尔士
+ Name[zh_TW]=威爾斯語
+ Name[zu]=Isi-Welsh
+@@ -1574,7 +1550,6 @@
+ Name[uz]=Данияча
+ Name[vi]=Tiếng Đan Mạch
+ Name[wa]=Daenwès
+-Name[xx]=xxDanishxx
+ Name[zh_CN]=丹麦语
+ Name[zh_TW]=丹麥語
+ Name[zu]=Isi-Danishi
+@@ -1651,7 +1626,6 @@
+ Name[vi]=Tiếng Đức
+ Name[wa]=Almand
+ Name[xh]=Isijamani
+-Name[xx]=xxGermanxx
+ Name[zh_CN]=德语
+ Name[zh_TW]=德語
+ Name[zu]=Isi-Jalimani
+@@ -1684,7 +1658,6 @@
+ Name[uk]=Дзонгка
+ Name[uz]=Дзонгха
+ Name[wa]=Boutanès
+-Name[xx]=xxDzongkhaxx
+ Name[zh_CN]=不丹宗卡语
+ Name[zh_TW]=Dzongkha語
+ Name[zu]=Isi-Dzongkha
+@@ -1760,7 +1733,6 @@
+ Name[vi]=Tiếng Hy Lạp
+ Name[wa]=Grek
+ Name[xh]=isigrike
+-Name[xx]=xxGreekxx
+ Name[zh_CN]=希腊语
+ Name[zh_TW]=希臘語
+ Name[zu]=Isi-Grike
+@@ -1837,7 +1809,6 @@
+ Name[vi]=English(Anh)
+ Name[wa]=Inglès
+ Name[xh]=Isingesi
+-Name[xx]=xxEnglishxx
+ Name[zh_CN]=英语
+ Name[zh_TW]=英語
+ Name[zu]=Isi-Ngisi
+@@ -1846,17 +1817,22 @@
+ Name[bg]=Британски английски
+ Name[bn]=বৃটিশ ইংরেজি
+ Name[br]=Saozneg eus Bro Saoz
++Name[bs]=Britanski engleski
+ Name[ca]=Anglès britànic
+ Name[cs]=Britská angličtina
+ Name[cy]=Saesneg Prydain
+ Name[da]=Britisk engelsk
+ Name[de]=Britisches Englisch
++Name[el]=Αγγλικά (Μ. Βρετανίας)
+ Name[es]=Inglés británico
+ Name[et]=Briti inglise
+ Name[eu]=Ingeles britainiarra
++Name[fi]=Brittienglanti
+ Name[fr]=Anglais britannique
+ Name[fy]=Britsk Ingelsk
+ Name[ga]=Béarla na Sasanach
++Name[he]=אנגלית בריטית
++Name[hi]=ब्रितानी अंग्रेज़ी
+ Name[hsb]=Jendźelsce (WB)
+ Name[hu]=Angol (brit)
+ Name[is]=Bresk enska
+@@ -1875,26 +1851,31 @@
+ Name[sk]=Britský anglický
+ Name[sl]=britansko angleško
+ Name[sr]=Британски енглески
+-Name[sr@Latn]=Британски енглески
++Name[sr@Latn]=Britanski engleski
+ Name[sv]=Brittisk engelska
+ Name[tr]=İngiliz İngilizcesi
+ Name[uk]=Англійська (Великобританія)
+-Name[xx]=xxBritish Englishxx
+ Name[zh_CN]=英国英语
+ [en_US]
+ Name=American English
+ Name[bg]=Американски английски
+ Name[bn]=মার্কিন ইংরেজি
+ Name[br]=Saozneg eus SUA
++Name[bs]=Američki engleski
+ Name[ca]=Anglès americà
+ Name[cs]=Americká angličtina
+ Name[da]=Amerikansk engelsk
+ Name[de]=Amerikanisches Englisch
++Name[el]=Αγγλικά (Αμερικής)
+ Name[es]=Inglés americano
+ Name[et]=Ameerika inglise
++Name[eu]=Ingeles amerikarra
++Name[fi]=Amerikanenglanti
+ Name[fr]=Anglais américain
+ Name[fy]=Amerikaansk Ingelsk
+ Name[ga]=Béarla Mheiriceá
++Name[he]=אנגלית אמרקאית
++Name[hi]=अमेरिकी अंग्रेज़ी
+ Name[hsb]=Jendźelsce (USA)
+ Name[hu]=Angol (amerikai)
+ Name[is]=Bandarísk enska
+@@ -1913,10 +1894,9 @@
+ Name[sk]=Americký anglický
+ Name[sl]=ameriško angleško
+ Name[sr]=Амерички енглески
+-Name[sr@Latn]=Амерички енглески
++Name[sr@Latn]=Američki engleski
+ Name[sv]=Amerikansk engelska
+ Name[uk]=Англійська (США)
+-Name[xx]=xxAmerican Englishxx
+ Name[zh_CN]=美国英语
+ [eo]
+ Name=Esperanto
+@@ -1949,13 +1929,12 @@
+ Name[uk]=Есперанто
+ Name[uz]=Эсперанто
+ Name[vi]=Tiếng Etpêrantô
+-Name[xx]=xxEsperantoxx
+ Name[zh_CN]=世界语
+ Name[zh_TW]=世界語
+ Name[zu]=Isi-Esperanto
+ [es]
+ Name=Spanish
+-Name[af]=Spaanse
++Name[af]=Spaans
+ Name[ar]=الأسبانية
+ Name[az]=İspanca
+ Name[be]=Гішпанская
+@@ -2025,7 +2004,6 @@
+ Name[vi]=Tiếng Tây Ban Nha
+ Name[wa]=Castiyan
+ Name[xh]=Isipanishi
+-Name[xx]=xxSpanishxx
+ Name[zh_CN]=西班牙语
+ Name[zh_TW]=西班牙語
+ Name[zu]=Isi-Penishi
+@@ -2099,7 +2077,6 @@
+ Name[uz]=Эстонча
+ Name[vi]=Tiếng Estonian
+ Name[wa]=Estonyin
+-Name[xx]=xxEstonianxx
+ Name[zh_CN]=爱沙尼亚语
+ Name[zh_TW]=愛沙尼亞語
+ Name[zu]=Isi-Estonian
+@@ -2169,16 +2146,17 @@
+ Name[uz]=Баскча
+ Name[vi]=Tiếng Baxcơ
+ Name[wa]=Basse
+-Name[xx]=xxBasquexx
+ Name[zh_CN]=巴斯克语
+ Name[zh_TW]=巴斯克語
+ Name[zu]=Isi-Basque
+ [fa]
+ Name=Farsi (Persian)
++Name[af]=Farsi (Persies)
+ Name[ar]=فارسي
+ Name[be]=Пэрсыдзкая
+ Name[bg]=Фарси
+ Name[bn]=ফার্সি (পার্সিয়ান)
++Name[br]=Farsieg (Persieg)
+ Name[bs]=Farsi (Perzijski)
+ Name[ca]=Farsi (Persa)
+ Name[cs]=Farsi (Perský)
+@@ -2230,7 +2208,6 @@
+ Name[uk]=Фризійська (Перська)
+ Name[uz]=Форсча (Персча)
+ Name[wa]=Farsi
+-Name[xx]=xxFarsi (Persian)xx
+ Name[zh_CN]=波斯语
+ [fi]
+ Name=Finnish
+@@ -2302,7 +2279,6 @@
+ Name[uz]=Финча
+ Name[vi]=Tiếng Phần Lan
+ Name[wa]=Finwès
+-Name[xx]=xxFinnishxx
+ Name[zh_CN]=芬兰语
+ Name[zh_TW]=芬蘭語
+ Name[zu]=Isi-Finishi
+@@ -2364,7 +2340,6 @@
+ Name[uk]=Фіджійська
+ Name[uz]=Фижича
+ Name[wa]=Fidjyin
+-Name[xx]=xxFijianxx
+ Name[zh_CN]=斐济语
+ Name[zh_TW]=斐濟語
+ Name[zu]=Isi-Fijiyani
+@@ -2375,6 +2350,7 @@
+ Name[be]=Фарэрская
+ Name[bg]=Фарьорски
+ Name[bn]=ফারোইস
++Name[br]=Faroeseg
+ Name[bs]=Farski
+ Name[ca]=Feroès
+ Name[cs]=Faerský
+@@ -2422,7 +2398,6 @@
+ Name[uk]=Фарерська
+ Name[uz]=Фарерча
+ Name[wa]=Faeroyès
+-Name[xx]=xxFaroesexx
+ Name[zh_CN]=法罗群岛语
+ Name[zh_TW]=法羅語
+ Name[zu]=Isi-Faroese
+@@ -2499,7 +2474,6 @@
+ Name[vi]=Pháp
+ Name[wa]=Francès
+ Name[xh]=Isifrentshi
+-Name[xx]=xxFrenchxx
+ Name[zh_CN]=法语
+ Name[zh_TW]=法語
+ Name[zu]=Isi-Frentshi
+@@ -2563,7 +2537,6 @@
+ Name[uk]=Фризійська
+ Name[uz]=Фризча
+ Name[wa]=Frizon
+-Name[xx]=xxFrisianxx
+ Name[zh_CN]=弗里斯兰语
+ Name[zh_TW]=弗利然語
+ Name[zu]=Isi-Frisiyani
+@@ -2572,6 +2545,7 @@
+ Name[bg]=Ирландски
+ Name[bn]=আইরিশ গেলিক
+ Name[br]=Iwerzhoneg eus Bro Iwerzhon
++Name[bs]=Irski Gaelic
+ Name[ca]=Irlandès gaèlic
+ Name[cs]=Galský (irština)
+ Name[da]=Irsk gælisk
+@@ -2579,9 +2553,12 @@
+ Name[es]=Gaélico irlandés
+ Name[et]=Iiri gaeli
+ Name[eu]=Irlandar gaelikoa
++Name[fi]=Irlannin gael
+ Name[fr]=Gaélique irlandais
+ Name[fy]=Iersk Gaelic
+ Name[ga]=Gaeilge
++Name[he]=גאלית אירית
++Name[hi]=आइरिश गैलिक
+ Name[hsb]=Gaelisce (Irska)
+ Name[hu]=Gall (ír)
+ Name[is]=Írsk gelíska
+@@ -2599,11 +2576,10 @@
+ Name[sk]=Írsky galský
+ Name[sl]=irsko galsko
+ Name[sr]=Ирски галски
+-Name[sr@Latn]=Ирски галски
++Name[sr@Latn]=Irski galski
+ Name[sv]=Irländsk galiciska
+ Name[tr]=İrlanda Galik
+ Name[uk]=Гальська (Ірландія)
+-Name[xx]=xxIrish Gaelicxx
+ Name[zh_CN]=爱尔兰盖尔语
+ [gd]
+ Name=Gaelic
+@@ -2613,7 +2589,6 @@
+ Name[bg]=Гаелски
+ Name[bn]=গেলিক
+ Name[br]=Iwerzhoneg
+-Name[bs]=Galski
+ Name[ca]=Gaèlic
+ Name[cs]=Galský
+ Name[cy]=Gaeleg
+@@ -2624,7 +2599,7 @@
+ Name[et]=Gaeli
+ Name[eu]=Gaelikoa
+ Name[fa]=گالیی
+-Name[fi]=Skotti
++Name[fi]=Gael
+ Name[fr]=Gaélique
+ Name[ga]=Gàidhlig
+ Name[gl]=Gaélico
+@@ -2663,7 +2638,6 @@
+ Name[uk]=Гальська
+ Name[uz]=Галикча
+ Name[wa]=Gayel
+-Name[xx]=xxGaelicxx
+ Name[zh_CN]=盖尔语
+ Name[zh_TW]=蓋爾語
+ Name[zu]=Isi-Gayelikhi
+@@ -2672,6 +2646,7 @@
+ Name[bg]=Галисийски
+ Name[bn]=গেলিসিয়ান
+ Name[br]=Galiseg
++Name[bs]=Galicijski
+ Name[ca]=Gallec
+ Name[cs]=Haličský
+ Name[cy]=Galiseg
+@@ -2680,10 +2655,13 @@
+ Name[es]=Gallego
+ Name[et]=Galeegi
+ Name[eu]=Galiziera
++Name[fi]=Gallicia
+ Name[fr]=Gaélicien
+ Name[fy]=Galiciaansk
+ Name[ga]=Gailísis
+ Name[gl]=Galego
++Name[he]=גאלית
++Name[hi]=गैलिक
+ Name[hsb]=Galicisce
+ Name[hu]=Galíciai
+ Name[is]=Gelíska
+@@ -2704,14 +2682,13 @@
+ Name[sk]=Galský
+ Name[sl]=galicijsko
+ Name[sr]=Галицијски
+-Name[sr@Latn]=Галицијски
++Name[sr@Latn]=Galicijski
+ Name[sv]=Galiciska
+ Name[tr]=Galce
+ Name[uk]=Галісійська
+ Name[ven]=Mugalata
+ Name[vi]=Tiếng Galician
+ Name[xh]=isiGalacian
+-Name[xx]=xxGalicianxx
+ Name[zh_CN]=加利西亚语
+ Name[zu]=Isi-Galashiyani
+ [gn]
+@@ -2752,7 +2729,6 @@
+ Name[uk]=Гуарані
+ Name[uz]=Гуарани
+ Name[wa]=Gwarani
+-Name[xx]=xxGuaranixx
+ Name[zh_CN]=瓜拉尼语
+ Name[zh_TW]=瓜拉尼語
+ Name[zu]=Isi-Guarani
+@@ -2762,6 +2738,7 @@
+ Name[az]=Qujaraticə
+ Name[bg]=Гуджарати
+ Name[bn]=গুজরাতী
++Name[br]=Gujaratieg
+ Name[eo]= Guĝarata
+ Name[eu]=Gujeratiera
+ Name[fa]=گوراجاتی
+@@ -2792,7 +2769,6 @@
+ Name[uk]=Гуяраті
+ Name[uz]=Гужарати
+ Name[wa]=Goudjarati
+-Name[xx]=xxGujaratixx
+ Name[zh_CN]=古吉拉特语
+ Name[zh_TW]=古吉拉特語
+ Name[zu]=Isi-Gujarati
+@@ -2834,7 +2810,6 @@
+ Name[uk]=Манкс
+ Name[uz]=Манкс
+ Name[wa]=Gayel del Iye di Man
+-Name[xx]=xxManxxx
+ Name[zh_CN]=马恩岛语
+ Name[zh_TW]=曼島語
+ Name[zu]=Isi-Manx
+@@ -2843,6 +2818,7 @@
+ Name[ar]=الهاوسا
+ Name[bg]=Хауса
+ Name[bn]=হাউসা
++Name[br]=Haousa
+ Name[de]=Haussa-Sprache
+ Name[eo]=Haŭsa
+ Name[fa]=هاوسایی
+@@ -2866,13 +2842,12 @@
+ Name[tg]=Хаусагӣ
+ Name[uk]=Гауса
+ Name[uz]=Хауса
+-Name[xx]=xxHausaxx
+ Name[zh_CN]=豪撒语
+ Name[zh_TW]=豪薩語
+ Name[zu]=Isi-Hausa
+ [he]
+ Name=Hebrew
+-Name[af]=Hibreüse
++Name[af]=Hibreüs
+ Name[ar]=العبرية
+ Name[az]=Yəhudicə
+ Name[be]=Іўрыт
+@@ -2941,7 +2916,6 @@
+ Name[vi]=Tiếng Do Thái
+ Name[wa]=Ebreu
+ Name[xh]=Isihebhere
+-Name[xx]=xxHebrewxx
+ Name[zh_CN]=希伯来语
+ Name[zh_TW]=希伯來語
+ Name[zu]=Isi-Hebheru
+@@ -2982,7 +2956,6 @@
+ Name[tg]=Ҳиндӣ
+ Name[uk]=Хінді
+ Name[uz]=Ҳиндча
+-Name[xx]=xxHindixx
+ Name[zh_CN]=北印度语
+ Name[zh_TW]=北印度語
+ Name[zu]=Isi-Hindi
+@@ -3019,7 +2992,6 @@
+ Name[tg]=Хири Моту
+ Name[uk]=Хірі Моту
+ Name[uz]=Хири Моту
+-Name[xx]=xxHiri Motuxx
+ Name[zh_CN]=新里木托语
+ Name[zh_TW]=Hiri Motu語
+ Name[zu]=Isi-Hiri Motu
+@@ -3094,7 +3066,6 @@
+ Name[uz]=Хорватча
+ Name[vi]=Tiếng Crô-át
+ Name[wa]=Crowåte
+-Name[xx]=xxCroatianxx
+ Name[zh_CN]=克罗地亚语
+ Name[zh_TW]=克羅埃西亞語
+ Name[zu]=Isi-Croatian
+@@ -3102,6 +3073,8 @@
+ Name=Upper Sorbian
+ Name[bg]=Горносорбийски
+ Name[bn]=উচ্চ সার্বীয়
++Name[br]=Sorab uhel
++Name[bs]=Gornji lužičkosrpski
+ Name[ca]=Alt sòrab
+ Name[cs]=Hornolužicko srbský
+ Name[cy]=Sorbieg Uchaf
+@@ -3110,6 +3083,7 @@
+ Name[es]=Serbio superior
+ Name[et]=Ülemsorbi
+ Name[eu]=Serbiera
++Name[fi]=Yläserbia
+ Name[fr]=Haut Sorabe
+ Name[fy]=Heech Sorbisch
+ Name[ga]=Sorbais Uachtarach
+@@ -3133,17 +3107,16 @@
+ Name[sk]=Lužickosrbský
+ Name[sl]=zgornjesorbijsko
+ Name[sr]=Горње лужичко српски
+-Name[sr@Latn]=Горње лужичко српски
++Name[sr@Latn]=Gornje lužičko srpski
+ Name[sv]=Högsorbiska
+ Name[ta]=அப்பர் செர்பியன்
+ Name[tg]=Лужасагии болоӣ
+ Name[tr]=Yukarı Sırpça
+ Name[uk]=Верхньо-лужицька
+-Name[xx]=xxUpper Sorbianxx
+ Name[zh_CN]=索布语
+ [hu]
+ Name=Hungarian
+-Name[af]=Hongaarse
++Name[af]=Hongaars
+ Name[ar]=الهنغارية (المجرية)
+ Name[az]=Macarca
+ Name[be]=Вугорская
+@@ -3212,13 +3185,12 @@
+ Name[uz]=Венгрча
+ Name[vi]=Tiếng Hung-ga-ri
+ Name[wa]=Hongrwès
+-Name[xx]=xxHungarianxx
+ Name[zh_CN]=匈牙利语
+ Name[zh_TW]=匈牙利語
+ Name[zu]=Isi-Hangariyani
+ [hy]
+ Name=Armenian
+-Name[af]=Armeense
++Name[af]=Armeens
+ Name[ar]=أرمني
+ Name[az]=Ermənicə
+ Name[be]=Армянская
+@@ -3282,7 +3254,6 @@
+ Name[uk]=Вірменська
+ Name[uz]=Арманча
+ Name[wa]=Årmenyin
+-Name[xx]=xxArmenianxx
+ Name[zh_CN]=亚美尼亚语
+ Name[zh_TW]=亞美尼亞語
+ Name[zu]=Isi-Armenian
+@@ -3316,7 +3287,6 @@
+ Name[tg]=Херэро
+ Name[uk]=Гереро
+ Name[uz]=Хереро
+-Name[xx]=xxHereroxx
+ Name[zh_CN]=赫雷罗语
+ Name[zh_TW]=Herero語
+ Name[zu]=Isi-Herero
+@@ -3348,7 +3318,6 @@
+ Name[uz]=Интерлингуа
+ Name[ven]=Luambo lwa hothe
+ Name[wa]=Interlingua (noû latén)
+-Name[xx]=xxInterlinguaxx
+ Name[zh_CN]=拉丁国际语(国际辅助语)
+ Name[zh_TW]=科技共通語
+ Name[zu]=Ulimi olufanayo
+@@ -3420,7 +3389,6 @@
+ Name[uk]=Індонезійська
+ Name[uz]=Индонезча
+ Name[wa]=Indonezyin
+-Name[xx]=xxIndonesianxx
+ Name[zh_CN]=印度尼西亚语
+ Name[zh_TW]=印尼語
+ Name[zu]=Indoneshiya
+@@ -3453,7 +3421,6 @@
+ Name[uk]=Інтерлінгва
+ Name[uz]=Интерлингуе
+ Name[ven]=Luambo lwa hothe
+-Name[xx]=xxInterlinguexx
+ Name[zh_CN]=语际语
+ Name[zh_TW]=Interlingue語
+ Name[zu]=Izilimi ezifanayo
+@@ -3493,7 +3460,6 @@
+ Name[uk]=Інупіак
+ Name[uz]=Инупиак
+ Name[wa]=Inyupiak
+-Name[xx]=xxInupiaqxx
+ Name[zh_CN]=因纽佩特语
+ Name[zh_TW]=Inupiaq語
+ Name[zu]=Isi-Inupiaq
+@@ -3523,13 +3489,12 @@
+ Name[tg]=Идо
+ Name[uk]=Ідо
+ Name[uz]=Идо
+-Name[xx]=xxIdoxx
+ Name[zh_CN]=伊多语
+ Name[zh_TW]=伊多語
+ Name[zu]=Isi-Ido
+ [is]
+ Name=Icelandic
+-Name[af]=Yslandiese
++Name[af]=Yslandies
+ Name[ar]=الآيسلندية
+ Name[az]=İslandiyaca
+ Name[be]=Ісьляндзкая
+@@ -3597,13 +3562,12 @@
+ Name[uz]=Исландча
+ Name[vi]=Tiếng Ai-xơ-len
+ Name[wa]=Izlandès
+-Name[xx]=xxIcelandicxx
+ Name[zh_CN]=冰岛语
+ Name[zh_TW]=冰島語
+ Name[zu]=isi-Icelandic
+ [it]
+ Name=Italian
+-Name[af]=Italiaanse
++Name[af]=Italiaans
+ Name[ar]=الإيطالية
+ Name[az]=İtalyanca
+ Name[be]=Італьянская
+@@ -3672,7 +3636,6 @@
+ Name[vi]=Tiếng Italia
+ Name[wa]=Itålyin
+ Name[xh]=isitaliyane
+-Name[xx]=xxItalianxx
+ Name[zh_CN]=意大利语
+ Name[zh_TW]=義大利語
+ Name[zu]=Isi-Ntaliyane
+@@ -3705,12 +3668,12 @@
+ Name[tg]=Инуктитут
+ Name[uk]=Інуктітут
+ Name[uz]=Инуктитут
+-Name[xx]=xxInuktitutxx
+ Name[zh_CN]=因纽特语
+ Name[zh_TW]=Inuktitut語
+ Name[zu]=Isi-Inuktitut
+ [ja]
+ Name=Japanese
++Name[af]=Japanees
+ Name[ar]=اليابانية
+ Name[az]=Yaponca
+ Name[be]=Японская
+@@ -3781,17 +3744,18 @@
+ Name[vi]=Tiếng Nhật
+ Name[wa]=Djaponès
+ Name[xh]=Isijapani
+-Name[xx]=xxJapanesexx
+ Name[zh_CN]=日语
+ Name[zh_TW]=日語
+ Name[zu]=Isi-Jaliphani
+ [jv]
+ Name=Javanese
++Name[af]=Javanees
+ Name[ar]=جاويه
+ Name[az]=Yavonca
+ Name[be]=Японская
+ Name[bg]=Явайски
+ Name[bn]=জাভানিস
++Name[br]=Javaneg
+ Name[bs]=Javanski
+ Name[ca]=Javanès
+ Name[cs]=Jávský
+@@ -3843,7 +3807,6 @@
+ Name[uk]=Яванська
+ Name[uz]=Яаванез
+ Name[wa]=Djavanès
+-Name[xx]=xxJavanesexx
+ Name[zh_CN]=爪哇语
+ Name[zh_TW]=爪哇語
+ Name[zu]=Isi-Javanisi
+@@ -3911,7 +3874,6 @@
+ Name[uk]=Грузинська
+ Name[uz]=Грузинча
+ Name[wa]=Djeyordjyin
+-Name[xx]=xxGeorgianxx
+ Name[zh_CN]=乔治亚语
+ Name[zh_TW]=喬治亞語
+ Name[zu]=Isi-Jojiyani
+@@ -3947,7 +3909,6 @@
+ Name[tg]=Кикуягӣ
+ Name[uk]=Кікую
+ Name[uz]=Кикуйу
+-Name[xx]=xxKikuyuxx
+ Name[zh_CN]=基库尤语
+ Name[zh_TW]=吉庫猶語
+ Name[zu]=Isi-Kikuyu
+@@ -4000,7 +3961,6 @@
+ Name[uk]=Казахська
+ Name[uz]=Қозоқча
+ Name[wa]=Kazaxh
+-Name[xx]=xxKazakhxx
+ Name[zh_CN]=哈萨克语
+ Name[zh_TW]=哈薩克語
+ Name[zu]=Isi-Kazakhi
+@@ -4036,7 +3996,6 @@
+ Name[tg]=Калаалисутӣ
+ Name[uk]=Калаалісут
+ Name[uz]=Калааллисут
+-Name[xx]=xxKalaallisutxx
+ Name[zh_CN]=格陵兰语
+ Name[zh_TW]=Kalaallisut語
+ Name[zu]=Isi-Kalaallisut
+@@ -4080,12 +4039,12 @@
+ Name[uk]=Кхмерська
+ Name[uz]=Кхмерча
+ Name[wa]=Xhmer
+-Name[xx]=xxKhmerxx
+ Name[zh_CN]=高棉语
+ Name[zh_TW]=高棉語
+ Name[zu]=Isi-Khmer
+ [kn]
+ Name=Kannada
++Name[af]=Kanadees
+ Name[ar]=الكانادا
+ Name[az]=Kannadaca
+ Name[be]=Каннада
+@@ -4115,7 +4074,6 @@
+ Name[tg]=Каннадӣ
+ Name[uk]=Каннада
+ Name[uz]=Каннада
+-Name[xx]=xxKannadaxx
+ Name[zh_CN]=坎纳德语
+ Name[zh_TW]=坎那達語
+ Name[zu]=Isi-Khanada
+@@ -4189,7 +4147,6 @@
+ Name[vi]=Tiếng Hàn Quốc
+ Name[wa]=Coreyin
+ Name[xh]=Isikorea
+-Name[xx]=xxKoreanxx
+ Name[zh_CN]=朝鲜语
+ Name[zh_TW]=韓國語
+ Name[zu]=Isi-Korean
+@@ -4239,7 +4196,6 @@
+ Name[uk]=Кашмірська
+ Name[uz]=Кашмирча
+ Name[wa]=Cachmiri
+-Name[xx]=xxKashmirixx
+ Name[zh_CN]=克什米尔语
+ Name[zh_TW]=喀什米爾語
+ Name[zu]=Isi-Kashimiri
+@@ -4309,7 +4265,6 @@
+ Name[uk]=Курдська
+ Name[uz]=Курдча
+ Name[wa]=Kurdi
+-Name[xx]=xxKurdishxx
+ Name[zh_CN]=库尔德语
+ Name[zh_TW]=庫德語
+ Name[zu]=isi-Kurdish
+@@ -4344,7 +4299,6 @@
+ Name[tg]=Коми
+ Name[uk]=Комі
+ Name[uz]=Коми
+-Name[xx]=xxKomixx
+ Name[zh_CN]=科米语
+ Name[zh_TW]=Komi語
+ Name[zu]=Isi-Komi
+@@ -4402,7 +4356,6 @@
+ Name[uk]=Корнійська
+ Name[uz]=Корн
+ Name[wa]=Cornike
+-Name[xx]=xxCornishxx
+ Name[zh_CN]=康瓦尔郡语
+ Name[zh_TW]=康瓦耳語
+ Name[zu]=Isi-Khonishi
+@@ -4461,7 +4414,6 @@
+ Name[uk]=Киргизька
+ Name[uz]=Қирғизча
+ Name[wa]=Kirguize
+-Name[xx]=xxKirghizxx
+ Name[zh_CN]=吉尔吉斯语
+ Name[zh_TW]=吉爾吉斯語
+ Name[zu]=Isi-Kirghizi
+@@ -4521,7 +4473,6 @@
+ Name[uk]=Латинська
+ Name[uz]=Лотинча
+ Name[wa]=Latén
+-Name[xx]=xxLatinxx
+ Name[zh_CN]=拉丁语
+ Name[zh_TW]=拉丁語
+ Name[zu]=Isi-Lathini
+@@ -4585,7 +4536,6 @@
+ Name[uk]=Люксембурзька
+ Name[uz]=Люксембургча
+ Name[wa]=Lussimbordjwès
+-Name[xx]=xxLuxembourgishxx
+ Name[zh_CN]=卢森堡语
+ Name[zh_TW]=盧森堡語
+ Name[zu]=Isi-Luxembourgish
+@@ -4595,6 +4545,7 @@
+ Name[az]=Limburqca
+ Name[bg]=Лимбургански
+ Name[bn]=লিমবার্গান
++Name[br]=Limburgeg
+ Name[bs]=Limburški
+ Name[ca]=Limburgà
+ Name[cy]=Limbwrgeg
+@@ -4639,7 +4590,6 @@
+ Name[uk]=Лімбурганська
+ Name[uz]=Лимбурган
+ Name[wa]=Limbordjwès
+-Name[xx]=xxLimburganxx
+ Name[zh_CN]=林堡语
+ Name[zh_TW]=Limburgan語
+ Name[zu]=Isi-Lumburgan
+@@ -4671,7 +4621,6 @@
+ Name[tg]=Лингалӣ
+ Name[uk]=Лінгала
+ Name[uz]=Лингала
+-Name[xx]=xxLingalaxx
+ Name[zh_CN]=林加拉语
+ Name[zh_TW]=Lingala語
+ Name[zu]=Isi-Lingala
+@@ -4713,7 +4662,6 @@
+ Name[uk]=Лаоська
+ Name[uz]=Лаосча
+ Name[wa]=Lawocyin
+-Name[xx]=xxLaoxx
+ Name[zh_CN]=老挝语
+ Name[zh_TW]=寮國語
+ Name[zu]=Isi-Lao
+@@ -4787,7 +4735,6 @@
+ Name[uz]=Литвача
+ Name[vi]=Lithuanian
+ Name[wa]=Litwanyin
+-Name[xx]=xxLithuanianxx
+ Name[zh_CN]=立陶宛语
+ Name[zh_TW]=立陶宛語
+ Name[zu]=Isi-Lithuanian
+@@ -4859,7 +4806,6 @@
+ Name[vi]=Tiếng Latvia
+ Name[wa]=Letonyin
+ Name[xh]=Isilatvian
+-Name[xx]=xxLatvianxx
+ Name[zh_CN]=拉脱维亚语
+ Name[zh_TW]=拉脫維亞語
+ Name[zu]=Isi-Latvian
+@@ -4868,6 +4814,7 @@
+ Name[az]=Malaqasicə
+ Name[bg]=Малагашки
+ Name[bn]=মালাগাসি
++Name[br]=Malagacheg
+ Name[ca]=Malgaix
+ Name[de]=Madagassisch
+ Name[el]=Μαλγασικά
+@@ -4910,7 +4857,6 @@
+ Name[uk]=Малагська
+ Name[uz]=Малагаси
+ Name[wa]=Malgache
+-Name[xx]=xxMalagasyxx
+ Name[zh_CN]=马尔加什语
+ Name[zh_TW]=馬拉加西語
+ Name[zu]=Isi-Malagasy
+@@ -4921,6 +4867,7 @@
+ Name[be]=Маршальская
+ Name[bg]=Ебон
+ Name[bn]=মার্শালিস
++Name[br]=Yezh an enez Marshall
+ Name[bs]=Maršalski
+ Name[cs]=Marshallský
+ Name[cy]=Marshalleg
+@@ -4968,13 +4915,11 @@
+ Name[uk]=Маршальська
+ Name[uz]=Маршаллез
+ Name[wa]=Marshalès
+-Name[xx]=xxMarshallesexx
+ Name[zh_CN]=马绍尔语
+ Name[zh_TW]=馬紹爾語
+ Name[zu]=Isi-Marshallese
+ [mi]
+ Name=Maori
+-Name[af]=Maoriese
+ Name[ar]=الموري
+ Name[az]=Maoricə
+ Name[be]=Маоры
+@@ -5024,13 +4969,11 @@
+ Name[uz]=Маори
+ Name[vi]=Tiếng Maori
+ Name[wa]=Mawori
+-Name[xx]=xxMaorixx
+ Name[zh_CN]=毛利语
+ Name[zh_TW]=毛利語
+ Name[zu]=Isi-Maori
+ [mk]
+ Name=Macedonian
+-Name[af]=Makedoniese
+ Name[ar]=المقدونية
+ Name[az]=Makedonca
+ Name[be]=Македонская
+@@ -5098,7 +5041,6 @@
+ Name[uz]=Македонияча
+ Name[vi]=Tiếng Macedonian
+ Name[wa]=Macedonyin
+-Name[xx]=xxMacedonianxx
+ Name[zh_CN]=马其顿语
+ Name[zh_TW]=馬其頓語
+ Name[zu]=Isi-Makhedoniya
+@@ -5140,7 +5082,6 @@
+ Name[tg]=Малаямӣ
+ Name[uk]=Малайська
+ Name[uz]=Малайалам
+-Name[xx]=xxMalayalamxx
+ Name[zh_CN]=德拉维族语
+ Name[zh_TW]=馬來亞拉姆語
+ Name[zu]=Isi-Malayalam
+@@ -5209,7 +5150,6 @@
+ Name[uk]=Монгольська
+ Name[uz]=Муғулча
+ Name[wa]=Mongol
+-Name[xx]=xxMongolianxx
+ Name[zh_CN]=蒙古语
+ Name[zh_TW]=蒙古語
+ Name[zu]=Isi-Mongolian
+@@ -5277,7 +5217,6 @@
+ Name[uk]=Молдовська
+ Name[uz]=Молдавча
+ Name[wa]=Moldåve
+-Name[xx]=xxMoldavianxx
+ Name[zh_CN]=摩尔多瓦
+ Name[zh_TW]=摩爾達維亞語
+ Name[zu]=Isi-Moldavian
+@@ -5287,6 +5226,7 @@
+ Name[az]=Maraticə
+ Name[bg]=Маратхи
+ Name[bn]=মরাঠী
++Name[br]=Marateg
+ Name[eo]=Marata
+ Name[es]=Maratí
+ Name[fa]=مراتی
+@@ -5316,7 +5256,6 @@
+ Name[uk]=Мараті
+ Name[uz]=Марати
+ Name[wa]=Marati
+-Name[xx]=xxMarathixx
+ Name[zh_CN]=马拉地语
+ Name[zh_TW]=馬拉地語
+ Name[zu]=Isi-Marathi
+@@ -5375,7 +5314,6 @@
+ Name[tg]=Малайӣ
+ Name[uk]=Малайська
+ Name[uz]=Малайча
+-Name[xx]=xxMalayxx
+ Name[zh_CN]=马来西亚语
+ Name[zh_TW]=馬來語
+ Name[zu]=Isi-Malay
+@@ -5446,7 +5384,6 @@
+ Name[uz]=Малтача
+ Name[vi]=Tiếng Mantơ
+ Name[wa]=Maltès
+-Name[xx]=xxMaltesexx
+ Name[zh_CN]=马耳他语
+ Name[zh_TW]=馬爾他語
+ Name[zu]=Isi-Maltase
+@@ -5457,6 +5394,7 @@
+ Name[az]=Burmaca
+ Name[bg]=Бирмански
+ Name[bn]=বর্মী
++Name[br]=Birmaneg
+ Name[bs]=Burmanski
+ Name[ca]=Burmès
+ Name[cs]=Burmský
+@@ -5507,7 +5445,6 @@
+ Name[tg]=Бурмезӣ
+ Name[uk]=Бірманська
+ Name[uz]=Бурмезча
+-Name[xx]=xxBurmesexx
+ Name[zh_CN]=缅甸语
+ Name[zh_TW]=緬甸語
+ Name[zu]=Isi-Burmese
+@@ -5518,6 +5455,7 @@
+ Name[be]=Науру
+ Name[bg]=Науру
+ Name[bn]=নাউরু
++Name[br]=Naurueg
+ Name[de]=Nauruisch
+ Name[el]=Ναουρού
+ Name[eo]=Naura
+@@ -5546,7 +5484,6 @@
+ Name[tg]=Науру
+ Name[uk]=Науру
+ Name[uz]=Науру
+-Name[xx]=xxNauruxx
+ Name[zh_CN]=瑙鲁语
+ Name[zh_TW]=諾魯語
+ Name[zu]=Isi-Nauru
+@@ -5610,15 +5547,16 @@
+ Name[uk]=Норвезька (Bokmål)
+ Name[uz]=Норвегча (Бокмаал)
+ Name[wa]=Norvedjyin (Bokmål)
+-Name[xx]=xxNorwegian Bokmålxx
+ Name[zh_CN]=挪威语 (博克马尔语)
+ Name[zu]=Isi-Norwegian Bokmaal
+ [nd]
+ Name=Ndebele, North
++Name[af]=Ndebele, Noord
+ Name[ar]=النديبيلي الشمالية
+ Name[az]=Ndebele, Şimal
+ Name[bg]=Северен Ндебеле
+ Name[bn]=ন্দেবেলে, উত্তর
++Name[br]=Ndebele, Norzh
+ Name[bs]=Ndebele, Sjeverni
+ Name[ca]=Ndebele, Nord
+ Name[cs]=Ndebele, Severní
+@@ -5672,7 +5610,6 @@
+ Name[ven]=Ndebele, Devhula
+ Name[wa]=Ndebele (bijhe)
+ Name[xh]=Isindebele, Emntla
+-Name[xx]=xxNdebele, Northxx
+ Name[zh_CN]=Ndebele，北部
+ Name[zh_TW]=Ndebele語，北部
+ Name[zu]=Isi-Ndebele, Sase-Ntshonalanga
+@@ -5680,6 +5617,8 @@
+ Name=Low Saxon
+ Name[bg]=Долносаксонски
+ Name[bn]=নিম্ন স্যাক্সন
++Name[br]=Saozeg izel
++Name[bs]=Niži saksonski
+ Name[ca]=Baix saxó
+ Name[cs]=Dolnosaský
+ Name[cy]=Sacsoneg Isel
+@@ -5688,6 +5627,7 @@
+ Name[es]=Sajón bajo
+ Name[et]=Alamsaksi
+ Name[eu]=Behe saxoniera
++Name[fi]=Alasaxon
+ Name[fr]=Bas saxon (ou francique, ou plattdeutsch)
+ Name[fy]=Neder Saksisch
+ Name[ga]=Sacsanais Íochtarach
+@@ -5711,13 +5651,12 @@
+ Name[sk]=Dolnosaský
+ Name[sl]=spodnjesaško
+ Name[sr]=Доњи саксонски
+-Name[sr@Latn]=Доњи саксонски
++Name[sr@Latn]=Donji saksonski
+ Name[sv]=Lågsaxiska
+ Name[ta]=லோ சாக்ஸான்
+ Name[tg]=Саксон
+ Name[tr]=Aşağı Sakson
+ Name[uk]=Ніжньо-Саксонська
+-Name[xx]=xxLow Saxonxx
+ Name[zh_CN]=撒克逊语
+ [ne]
+ Name=Nepali
+@@ -5774,7 +5713,6 @@
+ Name[uk]=Непальська
+ Name[uz]=Непалча
+ Name[wa]=Nepalès
+-Name[xx]=xxNepalixx
+ Name[zh_CN]=尼泊尔语
+ Name[zh_TW]=尼泊爾語
+ Name[zu]=Isi-Nepali
+@@ -5801,7 +5739,6 @@
+ Name[tg]=Ндонга
+ Name[uk]=Ндонга
+ Name[uz]=Ндонга
+-Name[xx]=xxNdongaxx
+ Name[zh_TW]=Ndonga語
+ Name[zu]=Isi-Ndonga
+ [nl]
+@@ -5876,7 +5813,6 @@
+ Name[vi]=Tiếng Hà Lan
+ Name[wa]=Neyerlandès
+ Name[xh]=Isidatshi
+-Name[xx]=xxDutchxx
+ Name[zh_CN]=荷兰语
+ Name[zh_TW]=荷蘭語
+ Name[zu]=Isi-Danishi
+@@ -5943,16 +5879,17 @@
+ Name[uk]=Норвезька (Nynorsk)
+ Name[uz]=Норвегияча (Нйнорск)
+ Name[wa]=Noû-Norvedjyin (Nynorsk)
+-Name[xx]=xxNorwegian Nynorskxx
+ Name[zh_CN]=挪威语 (尼诺斯克语)
+ Name[zh_TW]=挪威 Nynorsk 語
+ Name[zu]=Isi-Norwegian Nynorsk
+ [nr]
+ Name=Ndebele, South
++Name[af]=Ndebele, Suid
+ Name[ar]=النديبيلي الجنوبية
+ Name[az]=Ndebele, Cənub
+ Name[bg]=Южен Ндебеле
+ Name[bn]=ন্দেবেলে, দক্ষিণ
++Name[br]=Ndebele, Su
+ Name[bs]=Ndebele, Južni
+ Name[ca]=Ndebele, Sud
+ Name[cs]=Ndebele, Jižní
+@@ -6006,16 +5943,17 @@
+ Name[ven]=Ndebele, Tshipembe
+ Name[wa]=Ndebele (nonne)
+ Name[xh]=Isindebele, Emazantsi
+-Name[xx]=xxNdebele, Southxx
+ Name[zh_CN]=Ndebele，南部
+ Name[zh_TW]=Ndebele語，南部
+ Name[zu]=Isi-Ndebele, Sase-Mzansi
+ [nso]
+ Name=Northern Sotho
++Name[af]=Noord Sotho
+ Name[ar]=السوتو الشمالية
+ Name[az]=Şimali Sotho
+ Name[bg]=Северен Сото
+ Name[bn]=উত্তর সোথো
++Name[br]=Soto, Norzh
+ Name[bs]=Sjeverni Soto
+ Name[ca]=Sotho del nord
+ Name[cs]=Severní Sotho
+@@ -6065,7 +6003,6 @@
+ Name[uk]=Північне Сото
+ Name[uz]=Шимолий Соточа
+ Name[wa]=Soto (bijhe)
+-Name[xx]=xxNorthern Sothoxx
+ Name[zh_CN]=北部梭托语
+ [nv]
+ Name=Navajo
+@@ -6103,7 +6040,6 @@
+ Name[uk]=Навахо
+ Name[uz]=Наважо
+ Name[wa]=Navaxho
+-Name[xx]=xxNavajoxx
+ Name[zh_CN]=纳瓦霍语
+ Name[zh_TW]=納瓦伙語
+ Name[zu]=Isi-Navajo
+@@ -6140,7 +6076,6 @@
+ Name[uk]=Чічеванська
+ Name[uz]=Чичева
+ Name[wa]=Tchitchewa
+-Name[xx]=xxChichewaxx
+ Name[zh_CN]=齐切瓦语
+ Name[zh_TW]=Chichewa語
+ Name[zu]=Isi-Chichewa
+@@ -6201,7 +6136,6 @@
+ Name[tr]=Oksitan dili
+ Name[uk]=Оксітанська
+ Name[uz]=Французча (Осситан шеваси)
+-Name[xx]=xxOccitanxx
+ Name[zh_CN]=奥西坦语
+ Name[zh_TW]=Occitan語
+ Name[zu]=Isi-Osithani
+@@ -6234,7 +6168,6 @@
+ Name[tg]=Оромо
+ Name[uk]=Оромо
+ Name[uz]=Оромо
+-Name[xx]=xxOromoxx
+ Name[zh_CN]=阿曼语
+ Name[zh_TW]=Oromo語
+ Name[zu]=Isi-Oromo
+@@ -6271,7 +6204,6 @@
+ Name[tg]=Ориёӣ
+ Name[uk]=Орія
+ Name[uz]=Ория
+-Name[xx]=xxOriyaxx
+ Name[zh_CN]=欧里亚语
+ Name[zh_TW]=Oriya語
+ Name[zu]=Isi-Oriya
+@@ -6282,6 +6214,7 @@
+ Name[be]=Асецінская
+ Name[bg]=Осетински
+ Name[bn]=ওসেটিয়ান
++Name[br]=Ossetieg
+ Name[bs]=Osetski
+ Name[ca]=Oseti
+ Name[cs]=Osetský
+@@ -6328,7 +6261,6 @@
+ Name[uk]=Осетійська
+ Name[uz]=Оссетинча
+ Name[wa]=Ossete
+-Name[xx]=xxOssetianxx
+ Name[zh_CN]=奥塞梯语
+ Name[zh_TW]=Ossetian語
+ Name[zu]=Isi-Ossethiyani
+@@ -6339,6 +6271,7 @@
+ Name[be]=Панджабі
+ Name[bg]=Панджаби
+ Name[bn]=পাঞ্জাবী
++Name[br]=Pendjabieg
+ Name[cs]=Pandžábský
+ Name[de]=Pandschabi-Sprache
+ Name[eo]=Panĝaba
+@@ -6376,7 +6309,6 @@
+ Name[uk]=Панджабська
+ Name[uz]=Панжабча
+ Name[wa]=Pundjabi
+-Name[xx]=xxPanjabixx
+ Name[zh_CN]=旁遮普语
+ Name[zh_TW]=Panjabi語
+ Name[zu]=Isi-Phanjabi
+@@ -6386,6 +6318,7 @@
+ Name[az]=Palicə
+ Name[bg]=Пали
+ Name[bn]=পালি
++Name[br]=Palieg
+ Name[eo]=Palio
+ Name[es]=Palí
+ Name[et]=Paali
+@@ -6410,7 +6343,6 @@
+ Name[uk]=Палі
+ Name[uz]=Пали
+ Name[wa]=Pâli
+-Name[xx]=xxPalixx
+ Name[zh_CN]=巴利语
+ Name[zh_TW]=巴利語
+ Name[zu]=Isi-Phali
+@@ -6484,7 +6416,6 @@
+ Name[uz]=Полякча
+ Name[vi]=Tiếng Ba Lan
+ Name[wa]=Polonès
+-Name[xx]=xxPolishxx
+ Name[zh_CN]=波兰语
+ Name[zh_TW]=波蘭語
+ Name[zu]=Isi-Pholishi
+@@ -6527,7 +6458,6 @@
+ Name[uk]=Пуштунська
+ Name[uz]=Пуштунча
+ Name[wa]=Pashto
+-Name[xx]=xxPushtoxx
+ Name[zh_CN]=普什图语
+ Name[zh_TW]=普什圖語
+ Name[zu]=Dudula ku
+@@ -6602,7 +6532,6 @@
+ Name[uz]=Португалча
+ Name[vi]=Tiếng BềEĐào Nha
+ Name[wa]=Portuguès
+-Name[xx]=xxPortuguesexx
+ Name[zh_CN]=葡萄牙语
+ Name[zh_TW]=葡萄牙語
+ Name[zu]=Isi-Phuthukesi
+@@ -6668,7 +6597,6 @@
+ Name[uk]=Бразильська португальська
+ Name[uz]=Португалча (Бразилия)
+ Name[wa]=Portuguès do Braezi
+-Name[xx]=xxBrazilian Portuguesexx
+ Name[zh_CN]=巴西葡萄牙语
+ [qu]
+ Name=Quechua
+@@ -6705,7 +6633,6 @@
+ Name[uk]=Кечуа
+ Name[uz]=Квечуа
+ Name[wa]=Kitchwa
+-Name[xx]=xxQuechuaxx
+ Name[zh_CN]=盖丘亚语
+ Name[zh_TW]=蓋楚瓦語
+ Name[zu]=Isi-Quechua
+@@ -6739,13 +6666,12 @@
+ Name[uk]=Рунді
+ Name[uz]=Рунди
+ Name[wa]=Kirundi
+-Name[xx]=xxRundixx
+ Name[zh_CN]=基隆迪语
+ Name[zh_TW]=Rundi語
+ Name[zu]=Isi-Rundi
+ [ro]
+ Name=Romanian
+-Name[af]=Romeense
++Name[af]=Romeens
+ Name[ar]=الرومانية
+ Name[az]=Rumınca
+ Name[be]=Румынская
+@@ -6813,13 +6739,12 @@
+ Name[uz]=Руминча
+ Name[vi]=Tiếng BềEĐào Nha
+ Name[wa]=Roumin
+-Name[xx]=xxRomanianxx
+ Name[zh_CN]=罗马尼亚语
+ Name[zh_TW]=羅馬尼亞語
+ Name[zu]=Isi-Romania
+ [ru]
+ Name=Russian
+-Name[af]=Russiese
++Name[af]=Russies
+ Name[ar]=الروسية
+ Name[az]=Rusca
+ Name[be]=Расейская
+@@ -6889,7 +6814,6 @@
+ Name[vi]=Tiếng Nga
+ Name[wa]=Rûsse
+ Name[xh]=Isirashiya
+-Name[xx]=xxRussianxx
+ Name[zh_CN]=俄语
+ Name[zh_TW]=俄語
+ Name[zu]=Isi-Rashiya
+@@ -6926,7 +6850,6 @@
+ Name[uk]=Кіньярванда
+ Name[uz]=Кинярванда
+ Name[wa]=Kiniarwanda
+-Name[xx]=xxKinyarwandaxx
+ Name[zh_CN]=卢旺达语
+ Name[zh_TW]=Kinyarwanda語
+ Name[zu]=Isi-Kinyarwanda
+@@ -6971,7 +6894,6 @@
+ Name[tg]=Санскрит
+ Name[uk]=Санскрит
+ Name[uz]=Санскрит
+-Name[xx]=xxSanskritxx
+ Name[zh_CN]=梵语
+ Name[zh_TW]=梵語
+ Name[zu]=Isi-Sanskrit
+@@ -7032,7 +6954,6 @@
+ Name[uk]=Сардинська
+ Name[uz]=Сардинча
+ Name[wa]=Sardinyin
+-Name[xx]=xxSardinianxx
+ Name[zh_CN]=撒丁语
+ Name[zh_TW]=薩丁尼亞語
+ Name[zu]=Isi-Sardinian
+@@ -7041,6 +6962,7 @@
+ Name[ar]=سندي
+ Name[bg]=Синдхи
+ Name[bn]=সিন্ধি
++Name[br]=Sindhieg
+ Name[de]=Sindhi-Sprache
+ Name[eo]=Sinda
+ Name[fa]=سیندهی
+@@ -7068,16 +6990,17 @@
+ Name[uk]=Сіндхі
+ Name[uz]=Синдхи
+ Name[wa]=Sindi
+-Name[xx]=xxSindhixx
+ Name[zh_TW]=Sindhi語
+ Name[zu]=Isi-Sindi
+ [se]
+ Name=Northern Sami
++Name[af]=Noordelike Sami
+ Name[ar]=السامي الشمالية
+ Name[az]=Şimali Sami
+ Name[be]=Паўночная Саамская
+ Name[bg]=Северен Сами
+ Name[bn]=উত্তর সামি
++Name[br]=Sami, Norzh
+ Name[bs]=Sjeverni Sami
+ Name[ca]=Sami del nord
+ Name[cs]=Severní Sami
+@@ -7132,7 +7055,6 @@
+ Name[ven]=Sami ya Devhula
+ Name[wa]=Bijhe såmi
+ Name[xh]=Sami Yasemntla
+-Name[xx]=xxNorthern Samixx
+ Name[zh_CN]=北部沙米语
+ Name[zh_TW]=北薩米語
+ Name[zu]=Isi-Sami Sase-Ntshonalanga
+@@ -7164,7 +7086,6 @@
+ Name[tg]=Санго
+ Name[uk]=Санго
+ Name[uz]=Санго
+-Name[xx]=xxSangoxx
+ Name[zh_CN]=桑戈语
+ Name[zh_TW]=Sango語
+ Name[zu]=Isi-Sango
+@@ -7174,6 +7095,7 @@
+ Name[az]=Sinhalca
+ Name[bg]=Сингалски
+ Name[bn]=সিংহলী
++Name[br]=Singaleg
+ Name[bs]=Sinhaleški
+ Name[ca]=Sinhalès
+ Name[cs]=Sinhalský
+@@ -7222,12 +7144,12 @@
+ Name[uk]=Сингалійська
+ Name[uz]=Синхалесе
+ Name[wa]=Sinhalès
+-Name[xx]=xxSinhalesexx
+ Name[zh_CN]=僧伽罗语
+ Name[zh_TW]=錫蘭語
+ Name[zu]=Isi-Sinhalese
+ [sk]
+ Name=Slovak
++Name[af]=Slovakies
+ Name[ar]=السلوفاكية
+ Name[az]=Slovakca
+ Name[be]=Славацкая
+@@ -7294,7 +7216,6 @@
+ Name[vi]=Tiếng Slô-vác
+ Name[wa]=Eslovake
+ Name[xh]=isiSlovak
+-Name[xx]=xxSlovakxx
+ Name[zh_CN]=斯洛伐克语
+ Name[zu]=Isi-Silovaki
+ [sl]
+@@ -7366,7 +7287,6 @@
+ Name[uk]=Словенська
+ Name[uz]=Словенианча
+ Name[wa]=Eslovenyin
+-Name[xx]=xxSlovenianxx
+ Name[zh_CN]=斯洛文尼亚语
+ Name[zh_TW]=斯洛維尼亞語
+ Name[zu]=Isi-Slovenian
+@@ -7427,7 +7347,6 @@
+ Name[uk]=Самойська
+ Name[uz]=Самоача
+ Name[wa]=Samowan
+-Name[xx]=xxSamoanxx
+ Name[zh_CN]=萨摩亚语
+ Name[zh_TW]=薩摩牙語
+ Name[zu]=Isi-Samoan
+@@ -7460,7 +7379,6 @@
+ Name[uk]=Шона
+ Name[uz]=Шона
+ Name[xh]=Isishona
+-Name[xx]=xxShonaxx
+ Name[zh_CN]=修纳语
+ Name[zh_TW]=Shona語
+ Name[zu]=Isi-Shona
+@@ -7515,7 +7433,6 @@
+ Name[uk]=Сомалійська
+ Name[uz]=Сомалича
+ Name[wa]=Somalyin
+-Name[xx]=xxSomalixx
+ Name[zh_CN]=索马里语
+ Name[zh_TW]=索馬利語
+ Name[zu]=Isi-Somali
+@@ -7583,7 +7500,6 @@
+ Name[uk]=Албанська
+ Name[uz]=Албанча
+ Name[wa]=Albanyin
+-Name[xx]=xxAlbanianxx
+ Name[zh_CN]=阿尔巴尼亚语
+ Name[zh_TW]=阿爾巴尼亞語
+ Name[zu]=Isi-Albanian
+@@ -7656,7 +7572,6 @@
+ Name[uz]=Сербча
+ Name[vi]=Tiếng Séc bi
+ Name[wa]=Serbe
+-Name[xx]=xxSerbianxx
+ Name[zh_CN]=塞尔维亚语
+ Name[zh_TW]=塞爾維亞語
+ Name[zu]=Isi-Serbian
+@@ -7694,16 +7609,17 @@
+ Name[uz]=Свати
+ Name[wa]=Suwati
+ Name[xh]=Isiswati
+-Name[xx]=xxSwatixx
+ Name[zh_CN]=斯瓦特语
+ Name[zh_TW]=Swati語
+ Name[zu]=Isi-Swati
+ [st]
+ Name=Sotho, Southern
++Name[af]=Sotho, Suid
+ Name[ar]=السوتو الشمالية
+ Name[az]=Sotho, Cənubi
+ Name[bg]=Южен Сото
+ Name[bn]=সোথো, দক্ষিণ
++Name[br]=Soto, Su
+ Name[bs]=Soto, Južni
+ Name[ca]=Sotho del sud
+ Name[cs]=Sotho, Jižní
+@@ -7757,7 +7673,6 @@
+ Name[ven]=Sotho, Tshipembe
+ Name[wa]=Soto (nonne)
+ Name[xh]=Isisuthu, Sasemzantsi
+-Name[xx]=xxSotho, Southernxx
+ Name[zh_CN]=索托，南部
+ Name[zh_TW]=梭托語，南部
+ Name[zu]=Isi-Suthu, Sase-Mzantsi
+@@ -7767,6 +7682,7 @@
+ Name[az]=Sundanca
+ Name[bg]=Сундански
+ Name[bn]=সুন্দানিজ
++Name[br]=Soudaneg
+ Name[bs]=Sundaneški
+ Name[ca]=Sundanès
+ Name[cs]=Sundanský
+@@ -7817,13 +7733,12 @@
+ Name[uk]=Сунданійська
+ Name[uz]=Сунданча
+ Name[wa]=Soudanès
+-Name[xx]=xxSundanesexx
+ Name[zh_CN]=巽他语
+ Name[zh_TW]=Sundanese語
+ Name[zu]=Isi-Sundanese
+ [sv]
+ Name=Swedish
+-Name[af]=Sweedse
++Name[af]=Sweeds
+ Name[ar]=السويدية
+ Name[az]=İsveçcə
+ Name[be]=Швэдзкая
+@@ -7891,7 +7806,6 @@
+ Name[uz]=Шведча
+ Name[vi]=Tiếng Thuỵ Điển
+ Name[wa]=Suwedwès
+-Name[xx]=xxSwedishxx
+ Name[zh_CN]=瑞典语
+ Name[zh_TW]=瑞典語
+ Name[zu]=Isi-Swidishi
+@@ -7936,13 +7850,12 @@
+ Name[uk]=Суахілі
+ Name[uz]=Свахили
+ Name[wa]=Suwahili
+-Name[xx]=xxSwahilixx
+ Name[zh_CN]=斯瓦希里语
+ Name[zh_TW]=斯華西里語
+ Name[zu]=Isi-Swahili
+ [ta]
+ Name=Tamil
+-Name[af]=Tamiliese
++Name[af]=Tamilies
+ Name[ar]=التاميلية
+ Name[az]=Tamil Dili
+ Name[be]=Тамільская
+@@ -7993,7 +7906,6 @@
+ Name[uz]=Тамилча
+ Name[vi]=Tiếng Tamil
+ Name[wa]=Tamoul
+-Name[xx]=xxTamilxx
+ Name[zh_CN]=泰米尔语
+ Name[zh_TW]=坦米爾語
+ Name[zu]=Isi-Tamili
+@@ -8032,7 +7944,6 @@
+ Name[uk]=Телугу
+ Name[uz]=Телугу
+ Name[wa]=Telougou
+-Name[xx]=xxTeluguxx
+ Name[zh_CN]=泰卢固语
+ Name[zh_TW]=特拉古語
+ Name[zu]=Isi-Telugu
+@@ -8091,13 +8002,12 @@
+ Name[uk]=Таджицька
+ Name[uz]=Тожикча
+ Name[wa]=Tadjik
+-Name[xx]=xxTajikxx
+ Name[zh_CN]=塔吉克语
+ Name[zh_TW]=塔吉克語
+ Name[zu]=Isi-Tajik
+ [th]
+ Name=Thai
+-Name[af]=Thaise
++Name[af]=Thaïs
+ Name[ar]=التايلاندية
+ Name[az]=Tayca
+ Name[be]=Тайская
+@@ -8154,7 +8064,6 @@
+ Name[uz]=Тайча
+ Name[vi]=Tiếng Thái Lan
+ Name[wa]=Taylandès
+-Name[xx]=xxThaixx
+ Name[zh_CN]=泰语
+ Name[zh_TW]=泰國語
+ Name[zu]=Isi-Thayi
+@@ -8198,7 +8107,6 @@
+ Name[uk]=Тигринійська
+ Name[uz]=Тигриня
+ Name[wa]=Tigrinia
+-Name[xx]=xxTigrinyaxx
+ Name[zh_CN]=提格里尼亚语
+ Name[zh_TW]=提格利尼亞語
+ Name[zu]=Isi-Tigrinya
+@@ -8260,7 +8168,6 @@
+ Name[uz]=Туркманча
+ Name[ven]=Munna wa Turkey
+ Name[wa]=Turkmene
+-Name[xx]=xxTurkmenxx
+ Name[zh_CN]=土库曼语
+ Name[zh_TW]=土庫曼語
+ Name[zu]=Amadoda Ase-Thekishi
+@@ -8298,7 +8205,6 @@
+ Name[uk]=Тсвана
+ Name[uz]=Тсвана
+ Name[xh]=Isitswana
+-Name[xx]=xxTswanaxx
+ Name[zh_CN]=茨瓦纳语
+ Name[zh_TW]=班圖語
+ Name[zu]=Isi-Tswana
+@@ -8334,13 +8240,12 @@
+ Name[tg]=Тонгаӣ
+ Name[uk]=Тонга
+ Name[uz]=Тонга
+-Name[xx]=xxTongaxx
+ Name[zh_CN]=汤加语
+ Name[zh_TW]=東加語
+ Name[zu]=Isi-Tonga
+ [tr]
+ Name=Turkish
+-Name[af]=Turkse
++Name[af]=Turks
+ Name[ar]=التركية
+ Name[az]=Türkcə
+ Name[be]=Турэцкая
+@@ -8408,7 +8313,6 @@
+ Name[uz]=Туркча
+ Name[vi]=Tiếng ThềENhĩ Kì
+ Name[wa]=Turk
+-Name[xx]=xxTurkishxx
+ Name[zh_CN]=土耳其语
+ Name[zh_TW]=土耳其語
+ Name[zu]=Isi-Thekishi
+@@ -8441,7 +8345,6 @@
+ Name[tg]=Сонгавӣ
+ Name[uk]=Цонґа
+ Name[uz]=Цонга
+-Name[xx]=xxTsongaxx
+ Name[zh_CN]=特松加语
+ Name[zh_TW]=Tsonga語
+ Name[zu]=Isi-Tsonga
+@@ -8494,7 +8397,6 @@
+ Name[uk]=Татарська
+ Name[uz]=Тотарча
+ Name[wa]=Tatår
+-Name[xx]=xxTatarxx
+ Name[zh_CN]=鞑靼语
+ Name[zh_TW]=韃靼語
+ Name[zu]=Isi-Tatar
+@@ -8525,7 +8427,6 @@
+ Name[tg]=Твиягӣ
+ Name[uk]=Тві
+ Name[uz]=Тви
+-Name[xx]=xxTwixx
+ Name[zh_CN]=契维语
+ Name[zh_TW]=契維語
+ Name[zu]=Isi-Twi
+@@ -8588,7 +8489,6 @@
+ Name[uk]=Таїтянська
+ Name[uz]=Тахитиан
+ Name[wa]=Tahityin
+-Name[xx]=xxTahitianxx
+ Name[zh_CN]=塔希提语
+ Name[zh_TW]=大溪地語
+ Name[zu]=Isi-Tahitian
+@@ -8634,13 +8534,12 @@
+ Name[uk]=Уйгур
+ Name[uz]=Уйғурча
+ Name[wa]=Ouygour
+-Name[xx]=xxUighurxx
+ Name[zh_CN]=维吾尔语
+ Name[zh_TW]=維吾爾語
+ Name[zu]=Isi-Uighur
+ [uk]
+ Name=Ukrainian
+-Name[af]=Ukraïniese
++Name[af]=Ukraïnies
+ Name[ar]=الأوكرانية
+ Name[az]=Ukrayna Dili
+ Name[be]=Украінская
+@@ -8709,7 +8608,6 @@
+ Name[vi]=Tiếng Ukraina
+ Name[wa]=Oucrinnyin
+ Name[xh]=Ukranian
+-Name[xx]=xxUkrainianxx
+ Name[zh_CN]=乌克兰语
+ Name[zh_TW]=烏克蘭語
+ Name[zu]=Isi-Ukraniyani
+@@ -8745,7 +8643,6 @@
+ Name[uk]=Урду
+ Name[uz]=Урду
+ Name[wa]=Ourdou
+-Name[xx]=xxUrduxx
+ Name[zh_CN]=乌尔都语
+ Name[zh_TW]=烏都語
+ Name[zu]=Isi-Urdu
+@@ -8805,7 +8702,6 @@
+ Name[uk]=Узбецька
+ Name[uz]=Ўзбекча
+ Name[wa]=Ouzbeke
+-Name[xx]=xxUzbekxx
+ Name[zh_CN]=乌兹别克语
+ Name[zh_TW]=烏茲別克語
+ Name[zu]=Isi-Uzbek
+@@ -8831,11 +8727,10 @@
+ Name[th]=เวนดา
+ Name[uk]=Венда
+ Name[uz]=Венда
+-Name[xx]=xxVendaxx
+ Name[zh_CN]=闻达语
+ [vi]
+ Name=Vietnamese
+-Name[af]=Viëtnamese
++Name[af]=Viëtnamees
+ Name[ar]=الفييتنامية
+ Name[az]=Vyetnamca
+ Name[be]=Віетнамская
+@@ -8901,7 +8796,6 @@
+ Name[uz]=Ветнамча
+ Name[vi]=Tiếng Việt
+ Name[wa]=Vietnamyin
+-Name[xx]=xxVietnamesexx
+ Name[zh_CN]=越南语
+ Name[zh_TW]=越南語
+ Name[zu]=Isi-Vietnamese
+@@ -8936,12 +8830,10 @@
+ Name[tg]=Волапёкӣ
+ Name[uk]=Волап'юк
+ Name[uz]=Волапук
+-Name[xx]=xxVolapükxx
+ Name[zh_CN]=沃拉普克语
+ Name[zu]=Isi-Volapük
+ [wa]
+ Name=Walloon
+-Name[af]=Walloonse
+ Name[ar]=الوالون
+ Name[az]=Valonca
+ Name[be]=Валонская
+@@ -9002,7 +8894,6 @@
+ Name[uz]=Валлонча
+ Name[vi]=Tiếng Wallon
+ Name[wa]=Walon
+-Name[xx]=xxWalloonxx
+ Name[zh_CN]=瓦龙语
+ Name[zh_TW]=華隆語
+ Name[zu]=Isi-Walloon
+@@ -9040,7 +8931,6 @@
+ Name[tg]=Волофӣ
+ Name[uk]=Волоф
+ Name[uz]=Волоф
+-Name[xx]=xxWolofxx
+ Name[zh_CN]=沃洛夫语
+ Name[zh_TW]=Wolof語
+ Name[zu]=Isi-Wolof
+@@ -9076,7 +8966,6 @@
+ Name[vi]=Xhosa
+ Name[wa]=Xhossa
+ Name[xh]=isixhosa
+-Name[xx]=xxXhosaxx
+ Name[zh_CN]=科萨语
+ Name[zh_TW]=科薩語
+ Name[zu]=Isi-Xhosa
+@@ -9126,7 +9015,6 @@
+ Name[uk]=Ідиш
+ Name[uz]=Йиддиш
+ Name[wa]=Yidish
+-Name[xx]=xxYiddishxx
+ Name[zh_CN]=依地语
+ Name[zh_TW]=意第緒語
+ Name[zu]=Isi-Yidishi
+@@ -9164,7 +9052,6 @@
+ Name[uk]=Йоруба
+ Name[uz]=Ёруба
+ Name[wa]=Yorouba
+-Name[xx]=xxYorubaxx
+ Name[zh_CN]=约鲁巴语
+ Name[zh_TW]=優魯巴語
+ Name[zu]=Isi-Yoruba
+@@ -9194,7 +9081,6 @@
+ Name[tg]=Жуанг
+ Name[uk]=Жуан
+ Name[uz]=Зхуанг
+-Name[xx]=xxZhuangxx
+ Name[zh_CN]=壮语
+ Name[zh_TW]=Zhuang語
+ Name[zu]=Isi-Zhuang
+@@ -9271,7 +9157,6 @@
+ Name[vi]=Tiếng Trung Quốc
+ Name[wa]=Chinwès
+ Name[xh]=Isitshayina
+-Name[xx]=xxChinesexx
+ Name[zh_CN]=中文
+ Name[zh_TW]=中文
+ Name[zu]=Isi-Shayina
+@@ -9280,17 +9165,22 @@
+ Name[bg]=Китайски опростен
+ Name[bn]=সরলীকৃত চৈনিক
+ Name[br]=Sineg eeun
++Name[bs]=Kineski pojednostavljeni
+ Name[ca]=Xinès simplificat
+ Name[cs]=Čínský (zjednodušená)
+ Name[cy]=Tseineeg Syml
+ Name[da]=Kinesisk simplificeret
+ Name[de]=Vereinfachtes Chinesisch
++Name[el]=Κινέζικα απλά
+ Name[es]=Chino simplificado
+ Name[et]=Hiina (lihtsustatud)
+ Name[eu]=Txinera xehea
++Name[fi]=Yksinkertaistettu kiina
+ Name[fr]=Chinois simplifié
+ Name[fy]=Sjineesk (ynfaldich)
+ Name[ga]=Sínis Simplithe
++Name[he]=סינית מופשטת
++Name[hi]=चीनी सरल
+ Name[hsb]=Chinsce (zjednorjene)
+ Name[hu]=Kínai (egyszerűsített)
+ Name[is]=Einfölduð kínverska
+@@ -9309,28 +9199,32 @@
+ Name[sk]=Zjednodušený čínsky
+ Name[sl]=poenostavljeno kitajsko
+ Name[sr]=Поједностављени кинески
+-Name[sr@Latn]=Поједностављени кинески
++Name[sr@Latn]=Pojednostavljeni kineski
+ Name[sv]=Förenklad kinesiska
+ Name[tr]=Basitleştirilmiş Çince
+ Name[uk]=Китайська (спрощена)
+-Name[xx]=xxChinese Simplifiedxx
+ Name[zh_CN]=简体中文
+ [zh_TW]
+ Name=Chinese Traditional
+ Name[bg]=Китайски традиционен
+ Name[bn]=পারম্পরিক চৈনিক
+ Name[br]=Sinaeg da gustum
++Name[bs]=Kineski tradicionalni
+ Name[ca]=Xinès tradicional
+ Name[cs]=Čínský (tradiční)
+ Name[cy]=Tsieineeg Traddodiadol
+ Name[da]=Kinesisk traditionel
+ Name[de]=Traditionelles Chinesisch
++Name[el]=Κινέζικα παραδοσιακά
+ Name[es]=Chino tradicional
+ Name[et]=Hiina (traditsiooniline)
+ Name[eu]=Txinera tradizionala
++Name[fi]=Perinteinen kiina
+ Name[fr]=Chinois traditionnel
+ Name[fy]=Sjineesk (tradisjoniel)
+ Name[ga]=Sínis Traidisiúnta
++Name[he]=סינית מסורתית
++Name[hi]=पारंपरिक चीनी
+ Name[hsb]=Chinsce (tradicionalnje)
+ Name[hu]=Kínai (hagyományos)
+ Name[is]=Hefðbundin kínverska
+@@ -9349,11 +9243,10 @@
+ Name[sk]=Tradičný čínsky
+ Name[sl]=tradicionalno kitajsko
+ Name[sr]=Традиционални кинески
+-Name[sr@Latn]=Традиционални кинески
++Name[sr@Latn]=Tradicionalni kineski
+ Name[sv]=Traditionell kinesiska
+ Name[tr]=Geleneksel Çince
+ Name[uk]=Китайська (традиційна)
+-Name[xx]=xxChinese Traditionalxx
+ Name[zh_CN]=繁体中文
+ [zu]
+ Name=Zulu
+@@ -9394,7 +9287,6 @@
+ Name[ven]=Muzulu
+ Name[wa]=Zoulou
+ Name[xh]=Isizulu
+-Name[xx]=xxZuluxx
+ Name[zh_CN]=祖鲁语
+ Name[zh_TW]=袓魯語
+ Name[zu]=Isi-Zulu
+diff -Nru kdelibs-release-3.4.0/kdecore/eventsrc kdelibs-branch-3.4/kdecore/eventsrc
+--- kdelibs-release-3.4.0/kdecore/eventsrc 2005-02-23 00:04:24.000000000 -0500
++++ kdelibs-branch-3.4/kdecore/eventsrc 2005-03-30 01:47:18.000000000 -0500
+@@ -2,7 +2,7 @@
+ # go = The K-icon from kicker
+ IconName=go
+ Comment=KDE System Notifications
+-Comment[af]=Kde Stelsel Inkennistelling
++Comment[af]=KDE Stelsel Inkennistelling
+ Comment[ar]=تنبيهات كيدي
+ Comment[az]=KDE Sistem Bildirişləri
+ Comment[bg]=Системни съобщения
+@@ -71,7 +71,6 @@
+ Comment[vi]=Thông báo hềEthống của KDE
+ Comment[wa]=Notifiaedjes sistinme di KDE
+ Comment[xh]=Izaziso Zendlela ye KDE
+-Comment[xx]=xxKDE System Notificationsxx
+ Comment[zh_CN]=KDE 系统通知
+ Comment[zh_TW]=KDE 系統通知
+ Comment[zu]=Izaziso Zesistimu ye-KDE
+@@ -81,16 +80,22 @@
+ Name[bg]=Кошчето е изтрито
+ Name[bn]=আবর্জনা: ফাঁকা
+ Name[br]=Pod-lastez : goullonderet
++Name[bs]=Smeće: ispražnjeno
+ Name[ca]=Paperera: buida
+ Name[cs]=Koš vyprázdněn
+ Name[da]=Affald: tømt
+ Name[de]=Mülleimer: geleert
++Name[el]=Ο Κάδος Σκουπιδιών άδειασε
+ Name[en_GB]=Wastebin: emptied
+ Name[es]=Papelera: vaciada
+ Name[et]=Prügikast: tühjendatud
++Name[eu]=Zakarontzia: hustuta
++Name[fi]=Roskakori: tyhjennetty
+ Name[fr]=Corbeille : vidée
+ Name[fy]=Jiskefet: leech makke
+ Name[ga]=Bruscar: folmhaithe
++Name[he]=אשפה: רוקן
++Name[hi]=रद्दी ख़ाली
+ Name[hsb]=Papjernik: wuprózdnjeny
+ Name[hu]=Szemétkosár: kiürítve
+ Name[is]=Rusl: tæmt
+@@ -108,24 +113,29 @@
+ Name[sk]=Koš: vyprázdnený
+ Name[sl]=Smeti: izpraznjeno
+ Name[sr]=Смеће: испражњено
+-Name[sr@Latn]=Смеће: испражњено
++Name[sr@Latn]=Smeće: ispražnjeno
+ Name[sv]=Papperskorg: tömd
+ Name[uk]=Смітник: спорожнено
+-Name[xx]=xxTrash: emptiedxx
+ Name[zh_CN]=回收站：已清空
+ Comment=The trash has been emptied
+ Comment[bg]=Съдържанието а кошчето е изтрито
+ Comment[bn]=আবর্জনার বাক্স ফাঁকা করা হয়েছে
+ Comment[br]=Goullonderet e oa ar pod-lastez
++Comment[bs]=Smeće je ispražnjeno
+ Comment[ca]=S'ha buidat la paperera
+ Comment[cs]=Koš byl vyprázdněn
+ Comment[da]=Affaldet er blevet tømt ud
+ Comment[de]=Der Mülleimer wurde geleert
++Comment[el]=Ο Κάδος Σκουπιδιών άδειασε
+ Comment[en_GB]=The wastebin has been emptied
+ Comment[es]=La papelera se ha vaciado
+ Comment[et]=Prügikast on tühjendatud
++Comment[eu]=Zakarontzia hustu da
++Comment[fi]=Roskakori on tyhjennetty
+ Comment[fr]=La corbeille a été vidée
+ Comment[fy]=It jiskefet is leech makke
++Comment[he]=פה האשפה רוקן
++Comment[hi]=रद्दी ख़ाली किया गया
+ Comment[hsb]=sym papjernik wuprózdnił
+ Comment[hu]=A szemétkosár kiürült
+ Comment[is]=Ruslafatan hefur verið tæmd
+@@ -143,10 +153,9 @@
+ Comment[sk]=Kôš bol vyprázdnený
+ Comment[sl]=Smeti so spraznjene
+ Comment[sr]=Смеће је испражњено
+-Comment[sr@Latn]=Смеће је испражњено
++Comment[sr@Latn]=Smeće je ispražnjeno
+ Comment[sv]=Papperskorgen har tömts
+ Comment[uk]=Смітник було спорожнено
+-Comment[xx]=xxThe trash has been emptiedxx
+ Comment[zh_CN]=回收站已被清空
+ default_presentation=1
+
+@@ -220,13 +229,14 @@
+ Name[ven]=U fhela ha manwalwa: U mona
+ Name[vi]=Textcompletion:Quay
+ Name[xh]=Textcompletion: ujikeleziso
+-Name[xx]=xxTextcompletion: rotationxx
+ Name[zh_CN]=文字补齐：轮转
+ Name[zh_TW]=文字補齊：旋轉
+ 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[bg]=Достигнат е края на списъка от съвпадения
+ Comment[bn]=মিলের তালিকার শেষে উপস্থিত
++Comment[br]=Tizhet eo diwezh roll ar gendoareoù
+ Comment[bs]=Došao sam do kraja liste pogodaka
+ Comment[ca]=S'ha arribat al final de la llista de coincidències
+ Comment[cs]=Dosaženo konce seznamu odpovídajících položek
+@@ -262,13 +272,12 @@
+ Comment[sk]=Bol dosiahnutý koniec zoznamu nájdených položiek
+ Comment[sl]=To je konec seznama zadetkov
+ Comment[sr]=Достигнут је крај листе подударања
+-Comment[sr@Latn]=Достигнут је крај листе подударања
++Comment[sr@Latn]=Dostignut je kraj liste podudaranja
+ Comment[sv]=Slutet på listan med träffar har nåtts
+ Comment[ta]=பொருத்தப் பட்டியலின் முடிவை அடைந்தாயிற்று.
+ Comment[tg]=Охири рӯйхати мувофиқат расид
+ Comment[tr]=Eşleşme listesinin sonuna gelindi
+ Comment[uk]=Досягнуто кінець списку співпадань
+-Comment[xx]=xxThe end of the list of matches has been reachedxx
+ Comment[zh_CN]=已到达匹配项列表的最后
+ default_presentation=1
+
+@@ -342,18 +351,20 @@
+ Name[ven]=U fhela ha manwalwa: A huna u fanyisa
+ Name[vi]=Textcompletion: Không phù hợp
+ Name[xh]=Textcompletion: akukho ntelekiso
+-Name[xx]=xxTextcompletion: no matchxx
+ Name[zh_CN]=文字补齐：没有匹配
+ Name[zh_TW]=文字補齊：沒有匹配
+ Name[zu]=Ukuqedwa kokumbhalo: akukho okufanayo
+ Comment=No matching completion was found
++Comment[af]=Geen ooreenstemming was gevind
+ Comment[bg]=Не е намерено съвпадение
+ Comment[bn]=কোনো যুতসই পরিপূরক পাওয়া যায় নি
++Comment[br]=Kendoare ebet na voe kavet
+ Comment[bs]=Nijedno dovršavanje nije pronađeno
+ Comment[ca]=No s'ha trobat cap coincidència completable
+ Comment[cs]=Nenalezeno žádné vhodné doplnění
+ Comment[da]=Ingen passende komplettering blev fundet
+ Comment[de]=Keine passende Ergänzung gefunden
++Comment[el]=Δε βρέθηκε συμπλήρωση που να ταιριάζει
+ Comment[es]=No se encontró ningún completado concordante
+ Comment[et]=Kokkulangevat lõppu ei leitud
+ Comment[eu]=Ez da bat datorren osaketarik aurkitu
+@@ -384,13 +395,12 @@
+ Comment[sk]=Žiadna zhoda nebola nájdená
+ Comment[sl]=Ni najti ujemajočih se zadetkov
+ Comment[sr]=Подударна допуна није пронађена
+-Comment[sr@Latn]=Подударна допуна није пронађена
++Comment[sr@Latn]=Podudarna dopuna nije pronađena
+ Comment[sv]=Ingen matchande komplettering hittades
+ Comment[ta]=பொருத்தமான நிறைவு ஏதுமில்லை.
+ Comment[tg]=Ягон мувофиқат ёфт нашуд.
+ Comment[tr]=Eşleşme bulunamadı
+ Comment[uk]=Відповідного завершення не знайдено
+-Comment[xx]=xxNo matching completion was foundxx
+ Comment[zh_CN]=没有找到匹配的补全项
+ default_presentation=1
+
+@@ -464,18 +474,20 @@
+ Name[ven]=U fhela ha manwalwa: U elana hu tukunyana
+ Name[vi]=Textcompletion: Phù hợp một phần
+ Name[xh]=Ugqibeko lokubhaliweyo: intelekiso engaphelelanga
+-Name[xx]=xxTextcompletion: partial matchxx
+ Name[zh_CN]=文字补齐：部分匹配
+ Name[zh_TW]=文字補齊︰部分匹配
+ Name[zu]=Ukuqedwa kokubhaliweyo: ukufaniswa kwesikhashana
+ Comment=There is more than one possible match
++Comment[af]=Daar is meer as een moontlik ooreenkoms
+ Comment[bg]=Повече от едно съвпадение са намерени
+ Comment[bn]=একাধিক সম্ভাব্য পরিপূরক বর্তমান
++Comment[br]=Tremen ur c'hendoare a zo
+ Comment[bs]=Postoji više od jednog mogućeg pogotka
+ Comment[ca]=Hi ha més d'una possible coincidència
+ Comment[cs]=Existuje více vhodných odpovídajících položek
+ Comment[da]=Der er mere end en mulighed
+ Comment[de]=Mehr als eine mögliche Ergänzung vorhanden
++Comment[el]=Υπάρχουν περισσότερες από μία δυνατές συμπληρώσεις
+ Comment[es]=Hay más de una posible concordancia
+ Comment[et]=Võimalike variante on rohkem kui üks
+ Comment[eu]=Parekatze posible bat baino gehiago dago
+@@ -506,13 +518,12 @@
+ Comment[sk]=Existuje viac ako jedna zhoda
+ Comment[sl]=Mogoč je več kakor en zadetek
+ Comment[sr]=Постоји више од једног могућег подударања
+-Comment[sr@Latn]=Постоји више од једног могућег подударања
++Comment[sr@Latn]=Postoji više od jednog mogućeg podudaranja
+ Comment[sv]=Det finns mer än en möjlig träff
+ Comment[ta]=ஒன்றுக்கு மேற்பட்ட பொருத்தங்கள் உள்ளன.
+ Comment[tg]=Зиёд аз як мувофиқат ёфт шуд.
+ Comment[tr]=Birden fazla muhtemel eşleşme var
+ Comment[uk]=Більше одного відповідного значення
+-Comment[xx]=xxThere is more than one possible matchxx
+ Comment[zh_CN]=有多于一个的可能匹配项
+ default_presentation=1
+
+@@ -590,7 +601,6 @@
+ Name[vi]=Không thềEmềEfile
+ Name[wa]=Dji n' sai drovi l' fitchî
+ Name[xh]=Ayinakuyivula Ifayile
+-Name[xx]=xxCannot Open Filexx
+ Name[zh_CN]=无法打开文件
+ Name[zh_TW]=無法打開檔案
+ Name[zu]=Ifayela Alivulekile
+@@ -651,7 +661,7 @@
+ Comment[sl]=Izbrane datoteke ni bilo moč odpreti za branje ali pisanje.
+ Comment[sq]=Skedari i zgjedhur nuk mund të hapet për lexim apo editim
+ Comment[sr]=Изабрани фајл је немогуће отворити ради читања или писања
+-Comment[sr@Latn]=Izabrani fajl je nemoguće otvoriti radi čitanja ili pisanja.
++Comment[sr@Latn]=Izabrani fajl je nemoguće otvoriti radi čitanja ili pisanja
+ Comment[ss]=lifayela lelikhetsiwe akukhonakali kutsi livulwe kutsi lifundvwe kumbe libhalwe
+ Comment[sv]=Den valda filen kan inte öppnas för läsning eller skrivning
+ Comment[ta]=தேர்வு செய்த கோப்பை வாசிக்கவோ எழுதவோ திறக்க முடியாது
+@@ -663,7 +673,6 @@
+ Comment[ven]=Faela yo nangwaho ingasi vulwe u vhala kana u nwala
+ Comment[vi]=File được chọn không thềEmềEđược đềEđọc hay viết
+ Comment[xh]=Ifayile ekhethiweyo ayinakuvulelwa ukufunda okanye ukubhala
+-Comment[xx]=xxThe selected file cannot be opened for reading or writingxx
+ Comment[zh_CN]=选中的文件不能打开来读或写
+ Comment[zh_TW]=所選取的檔案無法開啟進行讀取或者是寫入
+ Comment[zu]=Ifayela elikhethiwe alingeke livulwe ukuze lifundwe ukufundwa noma ukubhalwa
+@@ -741,18 +750,20 @@
+ Name[vi]=Lỗi nghiêm trọng
+ Name[wa]=Aroke moirt
+ Name[xh]=Imposiso Enengozi
+-Name[xx]=xxFatal Errorxx
+ Name[zh_CN]=致命错误
+ Name[zh_TW]=嚴重錯誤
+ 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[bg]=Появи се сериозна грешка, която предизвика прекъсване на програмата
+ Comment[bn]=একটি গুরুতর ত্রুটির দরুণ প্রোগ্রামটি থেমে গেছে
++Comment[br]=Ur fazi grevus a voe pennabeg mont er-maez ar goulev.
+ Comment[bs]=Program je morao završiti zbog ozbiljne greške
+ Comment[ca]=Hi ha hagut un error seriós que ha fet que el programa acabi
+ Comment[cs]=Nastala závažná chyba, která způsobila ukončení programu
+ Comment[da]=Der var et alvorligt problem som fik programmet til at afslutte
+ Comment[de]=Es ist ein schwerer Fehler aufgetreten, und das Programm wurde beendet.
++Comment[el]=Συνέβη ένα σοβαρό σφάλμα που έκανε το πρόγραμμα να τερματίσει
+ Comment[es]=Hubo un error serio que ha causado el cierre del programa
+ Comment[et]=Ilmnes tõsine viga, mis sundis programmi tööd lõpetama
+ Comment[eu]=Errore larria gertatu da eta programa itxiarazi du.
+@@ -783,13 +794,12 @@
+ Comment[sk]=Vyskytla sa vážna chyba, ktorá spôsobila ukončenie programu
+ Comment[sl]=Program se je končal zaradi resne napake
+ Comment[sr]=Десила се озбиљна грешка, која је изазвала да се програм затвори
+-Comment[sr@Latn]=Десила се озбиљна грешка, која је изазвала да се програм затвори
++Comment[sr@Latn]=Desila se ozbiljna greška, koja je izazvala da se program zatvori
+ Comment[sv]=Ett allvarligt fel uppstod vilket fick programmet att avslutas
+ Comment[ta]=நிரலை வெளியேறச் செய்கிற அளவில் ஒரு பெரிய தவறுண்டு.
+ Comment[tg]=Нуқсони ҷиддие, ки ба баромадан аз барнома расонид.
+ Comment[tr]=Programın kapanmasına neden olan ciddi bir hata oluştu
+ Comment[uk]=Серйозна помилка стала причиною виходу програми
+-Comment[xx]=xxThere was a serious error causing the program to exitxx
+ Comment[zh_CN]=有一个严重的错误导致程序退出
+ default_presentation=2
+ level=4
+@@ -865,18 +875,20 @@
+ Name[vi]=Thông báo
+ Name[wa]=Notifiaedje
+ Name[xh]=Isaziso
+-Name[xx]=xxNotificationxx
+ Name[zh_CN]=通知
+ Name[zh_TW]=通知
+ Name[zu]=Isaziso
+ Comment=Something special happened in the program
++Comment[af]=Iets spesiaal het met die program gebeur
+ Comment[bg]=В програмата се случи нещо неочаквано
+ Comment[bn]=প্রোগ্রামে বিশেষ কিছু একটা ঘটেছে
++Comment[br]=Un dra bennak dibar a c'hoarvezas gant ar goulev
+ Comment[bs]=Nešto posebno se desilo u programu
+ Comment[ca]=Ha passat quelcom d'especial al programa
+ Comment[cs]=Něco zvláštního se stalo s programem
+ Comment[da]=Der skete noget specielt i programmet
+ Comment[de]=Es ist eine besondere Programmsituation aufgetreten.
++Comment[el]=Κάτι εξαιρετικό συνέβη στο πρόγραμμα
+ Comment[es]=Ocurrió algo especial en el programa
+ Comment[et]=Programmis juhtus midagi erilist
+ Comment[eu]=Gertakari bereziren bat gertadu da programan
+@@ -907,13 +919,12 @@
+ Comment[sk]=V programe sa udialo niečo neočakávané
+ Comment[sl]=V programu se je zgodilo nekaj izrednega
+ Comment[sr]=Нешто посебно се десило у програму
+-Comment[sr@Latn]=Нешто посебно се десило у програму
++Comment[sr@Latn]=Nešto posebno se desilo u programu
+ Comment[sv]=Någonting speciellt inträffade i programmet
+ Comment[ta]=நிரலில் ஏதோ விசேடம் நிகழ்ந்துள்ளது
+ Comment[tg]=Дар барнома ҳолати ногаҳонӣ рӯй дод
+ Comment[tr]=Programda özel bir durum meydana geldi
+ Comment[uk]=Щось особливе сталось у програмі
+-Comment[xx]=xxSomething special happened in the programxx
+ Comment[zh_CN]=程序中发生了特殊情况
+ default_presentation=1
+ default_sound=KDE_Beep.ogg
+@@ -992,18 +1003,20 @@
+ Name[vi]=Cảnh cáo
+ Name[wa]=Adviertixhmint
+ Name[xh]=Isilumkiso
+-Name[xx]=xxWarningxx
+ Name[zh_CN]=警告
+ Name[zh_TW]=警告
+ 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[bg]=Появи се грешка, която може да предизвика проблеми
+ Comment[bn]=প্রোগ্রামে একটি ত্রুটি ছিল যার ফলে সমস্যা হতে পারে
++Comment[br]=Ur fazi a voe er goulev a c'hellfe bezañ pennabeg kudennoù.
+ Comment[bs]=Postoji greška u programu koja možda uzrokuje probleme.
+ Comment[ca]=Hi ha hagut un error en el programa que podria causar problemes
+ Comment[cs]=Nastala chyba v programu, která může způsobit problémy
+ Comment[da]=Der opstod en alvorlig fejl som kan forårsage problemer
+ Comment[de]=Es ist ein Fehler aufgetreten, der Probleme verursachen könnte.
++Comment[el]=Υπήρξε ένα σφάλμα στο πρόγραμμα που ίσως να προκαλέσει προβλήματα
+ Comment[es]=Hubo un error en el programa que puede causar problemas
+ Comment[et]=Programmis ilmnes viga, mis võib tekitada probleeme
+ Comment[eu]=Arazoak sor ditzakeen errorea gertatu da programan
+@@ -1034,13 +1047,12 @@
+ Comment[sk]=V programe sa vyskytla chyba, ktorá môže spôsobiť problémy
+ Comment[sl]=V programu je nastala napaka, ki lahko povzroči težave
+ Comment[sr]=Десила се грешка у програму која може изазвати проблеме
+-Comment[sr@Latn]=Десила се грешка у програму која може изазвати проблеме
++Comment[sr@Latn]=Desila se greška u programu koja može izazvati probleme
+ Comment[sv]=Det uppstod ett fel i programmet vilket kan orsaka problem
+ Comment[ta]=பிரச்னைகளை ஏற்படுத்தும் அளவிற்கு நிரலில் ஒரு தவறு இருந்தது.
+ Comment[tg]=Хатои барнома, ки метавон ба масъалаҳое оварад
+ Comment[tr]=Programda ciddi bir hata oluştu
+ Comment[uk]=Сталася серйозна помилка, яка може викликати проблеми
+-Comment[xx]=xxThere was an error in the program which may cause problemsxx
+ Comment[zh_CN]=程序中发生了可能导致问题的错误
+ default_presentation=2
+ level=2
+@@ -1114,15 +1126,16 @@
+ Name[ven]=Mutshinyalo
+ Name[vi]=Thảm hoạ
+ Name[xh]=Ingozi enkulu
+-Name[xx]=xxCatastrophexx
+ Name[zh_CN]=严重问题
+ Name[zh_TW]=嚴重問題
+ Name[zu]=Inhlekelele
+ Comment=A very serious error occurred, at least causing the program to exit
++Comment[af]='n baie ernstige fout het voorgekom. Dit het veroorsaak dat ten minste die program beëindig is
+ Comment[ar]=حدث خطأ كبير سيؤدي على الأقل الى ايقاف البرنامج
+ Comment[az]=Çox ciddi bir xəta yarandə və proqramı çıxmağa məcbur etdi
+ Comment[bg]=Появи се сериозна грешка, която предизвика прекъсване на програмата
+ Comment[bn]=একটি গম্ভীর ত্রুটির ফলে প্রোগ্রামটি থেমে গেছে
++Comment[br]=Ur fazi grevus-tre a c'hoarvezas, a lakas d'an nebeutañ ar goulev da vont er-maez
+ Comment[bs]=Došlo je do vrlo ozbiljne greške koja je uzrokovala najmanje prekid programa
+ Comment[ca]=Hi ha hagut un error molt seriós, com a mínim ha causat la finalitzaciódel programa
+ Comment[cs]=Nastala velmi závažná chyba, která přinejmenším způsobila ukončení programu.
+@@ -1169,7 +1182,7 @@
+ Comment[sl]=Nastala je tako resna napaka, da se bo končal program.
+ Comment[sq]=Një gabim serioz ka ndodhur, së paku do të shkaktoj mbylljen e programit
+ Comment[sr]=Десила се веома озбиљна грешка, која ће у најмању руку проузроковати затварање програма
+-Comment[sr@Latn]=Desila se veoma ozbiljna greška, koja će u najmanju ruku prouzrokovati zatvaranje programa.
++Comment[sr@Latn]=Desila se veoma ozbiljna greška, koja će u najmanju ruku prouzrokovati zatvaranje programa
+ Comment[sv]=Ett väldigt allvarligt fel uppstod som åtminstone fick programmet att avslutas
+ Comment[ta]=நிரலை வெளியேறச் செய்யும் அளவில் ஒரு பெரிய தவறு ஏற்பட்டது
+ Comment[tg]=Нуқсони ҷиддӣ рӯй дод, ки чун минимум ба аз барнома баромадан расонид
+@@ -1177,7 +1190,6 @@
+ Comment[tr]=Programın kapanmasına neden olan ciddi bir hata oluştu ve programdan çıkıldı.
+ Comment[uk]=Сталася дуже серйозна помилка, яка, щонайменше, стала причиною виходу програми
+ Comment[uz]=Дастурнинг ишини якунланишига сабабчи бўлган жиддий хато рўй берди
+-Comment[xx]=xxA very serious error occurred, at least causing the program to exitxx
+ Comment[zh_CN]=出现了一个非常严重的错误，至少使程序退出
+ default_presentation=2
+ level=8
+@@ -1248,18 +1260,20 @@
+ Name[vi]=Đăng nhập
+ Name[wa]=Elodjaedje
+ Name[xh]=Igama elithile
+-Name[xx]=xxLoginxx
+ Name[zh_CN]=登录
+ Name[zh_TW]=登入
+ Name[zu]=Ukungena ngaphakathi
+ Comment=KDE is starting up
++Comment[af]=Begin KDE Laai
+ Comment[bg]=Стартиране на системата
+ Comment[bn]=কে.ডি.ই. চালু হচ্ছে
++Comment[br]=Emañ o loc'hañ KDE
+ Comment[bs]=KDE se pokreće
+ Comment[ca]=S'està engegant el KDE
+ Comment[cs]=Spouští se prostředí KDE
+ Comment[da]=KDE er ved at starte
+ Comment[de]=KDE startet
++Comment[el]=Το KDE ξεκινά
+ Comment[es]=KDE está arrancando
+ Comment[et]=KDE käivitub
+ Comment[eu]=KDE abiarazten ari da
+@@ -1291,14 +1305,13 @@
+ Comment[sk]=KDE sa spúšťa
+ Comment[sl]=KDE se zaganja
+ Comment[sr]=KDE се покреће
+-Comment[sr@Latn]=KDE се покреће
++Comment[sr@Latn]=KDE se pokreće
+ Comment[sv]=KDE startas
+ Comment[ta]=கேடிஇ ஆரம்பிக்கிறது
+ Comment[tg]=Оғози KDE
+ Comment[tr]=KDE masaüstü başlıyor
+ Comment[uk]=Триває запуск KDE
+ Comment[uz]=KDE ишга тушмоқда
+-Comment[xx]=xxKDE is starting upxx
+ Comment[zh_CN]=KDE 正在启动
+ default_presentation=1
+ default_sound=KDE_Startup_1.ogg
+@@ -1371,18 +1384,20 @@
+ Name[ven]=U litsha u shumisa khomupwutha
+ Name[wa]=Dislodjaedje
+ Name[xh]=Phuma ngaphandle
+-Name[xx]=xxLogoutxx
+ Name[zh_CN]=注消
+ Name[zh_TW]=登出
+ Name[zu]=Phumela ngaphandle
+ Comment=KDE is exiting
++Comment[af]=KDE is besig om toe te maak
+ Comment[bg]=Спиране на системата
+ Comment[bn]=কে.ডি.ই. বন্ধ করা হচ্ছে
++Comment[br]=Emañ o kuitaat KDE
+ Comment[bs]=KDE se zatvara
+ Comment[ca]=S'està aturant el KDE
+ Comment[cs]=Ukončuje se prostředí KDE
+ Comment[da]=KDE er ved at afslutte
+ Comment[de]=KDE wird beendet
++Comment[el]=Το KDE τερματίζει
+ Comment[es]=KDE está terminando
+ Comment[et]=KDE lõpetab töö
+ Comment[eu]=KDE bukatzen ari da
+@@ -1414,14 +1429,13 @@
+ Comment[sk]=KDE sa ukončuje
+ Comment[sl]=KDE se končuje
+ Comment[sr]=KDE се завршава
+-Comment[sr@Latn]=KDE се завршава
++Comment[sr@Latn]=KDE se završava
+ Comment[sv]=KDE avslutas
+ Comment[ta]=கேடிஇ வெளிச்செல்கிறது
+ Comment[tg]=Баромад аз KDE
+ Comment[tr]=KDE'den çıkılıyor
+ Comment[uk]=Триває завершення роботи KDE
+ Comment[uz]=KDE ишини якунламоқда
+-Comment[xx]=xxKDE is exitingxx
+ Comment[zh_CN]=KDE 正在退出
+ default_presentation=1
+ default_sound=KDE_Logout_3.ogg
+@@ -1497,15 +1511,16 @@
+ Name[vi]=Lỗi khi in
+ Name[wa]=Aroke d' imprimaedje
+ Name[xh]=Imposiso yoshicilelo
+-Name[xx]=xxPrint errorxx
+ Name[zh_CN]=打印错误
+ Name[zh_TW]=列印錯誤
+ Name[zu]=Iphutha lokushicelela
+ Comment=A print error has occurred
++Comment[af]='n Druk fout het voorgekom
+ Comment[ar]=حدث خطأ في الطباعة
+ Comment[az]=Çap xətası baş verdi
+ Comment[bg]=Грешка при печат
+ Comment[bn]=ছাপানোয় সমস্যা দেখা দিয়েছে
++Comment[br]=Degouezhet ez eus ar fazi gant ar voullerez
+ Comment[bs]=Došlo je do greške pri štampanju
+ Comment[ca]=Hi ha hagut un error d'impressió
+ Comment[cs]=Došlo k chybě tisku
+@@ -1561,7 +1576,6 @@
+ Comment[uk]=Сталася помилка друку
+ Comment[uz]=Босиб чиқариш хатоси рўй берди
+ Comment[wa]=Åk n' a nén stî tot-z imprimant
+-Comment[xx]=xxA print error has occurredxx
+ Comment[zh_CN]=发生了打印错误
+ Comment[zh_TW]=列印時發生錯誤
+ default_presentation=2
+@@ -1569,6 +1583,7 @@
+
+ [messageInformation]
+ Name=Information message
++Name[af]=Inligting boodskap
+ Name[ar]=رسالة المعلومات
+ Name[az]=Mə'lumat ismarışı
+ Name[be]=Інфармацыйнае паведамленьне
+@@ -1629,9 +1644,9 @@
+ Name[uk]=Інформаційне повідомлення
+ Name[uz]=Маълумот хабари
+ Name[wa]=Messaedje d' informåcion
+-Name[xx]=xxInformation messagexx
+ Name[zh_CN]=信息性消息
+ Comment=An information message is being shown
++Comment[af]='n Informasie boodskap word vertoon
+ Comment[ar]=تظهر الآن رسالة معلوماتية
+ Comment[az]=Mə'lumat ismarışı göstərilir
+ Comment[bg]=Показване на уведомително съобщение (Информация)
+@@ -1691,7 +1706,6 @@
+ Comment[uk]=Показується інформативне повідомлення
+ Comment[uz]=Маълумот хабари кўрсатилди
+ Comment[wa]=On messaedje d' informåcion est håyné
+-Comment[xx]=xxAn information message is being shownxx
+ Comment[zh_CN]=正在显示信息性消息
+ default_sound=KDE_Chimes_2.ogg
+ default_presentation=65
+@@ -1699,6 +1713,7 @@
+
+ [messageWarning]
+ Name=Warning message
++Name[af]=Waarskuwing boodskap
+ Name[ar]=رسالة تحذيرية
+ Name[az]=Xəbərdarlıq ismarışı
+ Name[be]=Папярэджаньне
+@@ -1759,9 +1774,9 @@
+ Name[uk]=Попередження
+ Name[uz]=Огоҳнома хабари
+ Name[wa]=Messaedje d' adviertixhmint
+-Name[xx]=xxWarning messagexx
+ Name[zh_CN]=警告消息
+ Comment=A warning message is being shown
++Comment[af]='n Waarskuwing boodskap word vertoon
+ Comment[ar]=تظهر الآن رسالة تحذيرية
+ Comment[az]=Xəbərdarlıq ismarışı göstərilir
+ Comment[bg]=Показване на предупредително съобщение (Предупреждение)
+@@ -1820,7 +1835,6 @@
+ Comment[uk]=Показується повідомлення з попередженням
+ Comment[uz]=Огоҳнома хабари кўрсатилди
+ Comment[wa]=On messaedje d' adviertixhmint est håyné
+-Comment[xx]=xxA warning message is being shownxx
+ Comment[zh_CN]=正在显示警告消息
+ Comment[zh_TW]=警告訊息已顯示
+ default_sound=KDE_Error_1.ogg
+@@ -1830,6 +1844,7 @@
+
+ [messageCritical]
+ Name=Critical message
++Name[af]=Kritiese boodskap
+ Name[ar]=رسالة هامَة
+ Name[az]=Kritik ismarış
+ Name[bg]=Грешка
+@@ -1887,9 +1902,9 @@
+ Name[uk]=Критична помилка
+ Name[uz]=Муаммо хабари
+ Name[wa]=Messaedje critike
+-Name[xx]=xxCritical messagexx
+ Name[zh_CN]=关键消息
+ Comment=A critical message is being shown
++Comment[af]='n Kritiese boodskap word vertoon
+ Comment[ar]=تظهر الآن رسالة مهمَة
+ Comment[az]=Kritik ismarış göstərilir
+ Comment[bg]=Показване на съобщение за грешка (Грешка)
+@@ -1947,7 +1962,6 @@
+ Comment[uk]=Показується повідомлення про критичну помилку
+ Comment[uz]=Муаммо хабари кўрсатилди
+ Comment[wa]=On messaedje critike est håyné
+-Comment[xx]=xxA critical message is being shownxx
+ Comment[zh_CN]=正在显示关键消息
+ Comment[zh_TW]=嚴重的警告訊息已顯示
+ default_sound=KDE_Glass_Break.ogg
+@@ -1957,6 +1971,7 @@
+
+ [messageboxQuestion]
+ Name=Question
++Name[af]=Vraag
+ Name[ar]=سؤال
+ Name[az]=Sual
+ Name[be]=Пытаньне
+@@ -2017,13 +2032,14 @@
+ Name[uk]=Запитання
+ Name[uz]=Савол
+ Name[wa]=Kesse
+-Name[xx]=xxQuestionxx
+ Name[zh_CN]=问题
+ Comment=A question is being asked
++Comment[af]='n Vraag word gevra
+ Comment[ar]=هناك سؤال يتم سؤاله
+ Comment[az]=Sual ismarışı göstərilir
+ Comment[bg]=Показване на въпросително съобщение (Въпрос)
+ Comment[bn]=একটি প্রশ্ন করা হচ্ছে
++Comment[br]=Emañ o c'houlleniñ ur goulenn
+ Comment[bs]=Postavljeno je pitanje
+ Comment[ca]=Farà una pregunta
+ Comment[cs]=Je položena otázka
+@@ -2079,7 +2095,6 @@
+ Comment[uk]=Показується запитання
+ Comment[uz]=Савол берилди
+ Comment[wa]=Ene kesse est dmandêye
+-Comment[xx]=xxA question is being askedxx
+ Comment[zh_CN]=正在提问
+ Comment[zh_TW]=問題已經在詢問中
+ default_sound=KDE_Vox_Ahem.ogg
+diff -Nru kdelibs-release-3.4.0/kdecore/kapplication.cpp kdelibs-branch-3.4/kdecore/kapplication.cpp
+--- kdelibs-release-3.4.0/kdecore/kapplication.cpp 2005-02-21 19:48:26.000000000 -0500
++++ kdelibs-branch-3.4/kdecore/kapplication.cpp 2005-03-22 11:22:59.000000000 -0500
+@@ -2882,6 +2882,11 @@
+
+ void KApplication::setStartupId( const QCString& startup_id )
+ {
++ if( startup_id == d->startup_id )
++ return;
++#if defined Q_WS_X11
++ KStartupInfo::handleAutoAppStartedSending(); // finish old startup notification if needed
++#endif
+ if( startup_id.isEmpty())
+ d->startup_id = "0";
+ else
+diff -Nru kdelibs-release-3.4.0/kdecore/kapplication.h kdelibs-branch-3.4/kdecore/kapplication.h
+--- kdelibs-release-3.4.0/kdecore/kapplication.h 2005-02-22 04:06:46.000000000 -0500
++++ kdelibs-branch-3.4/kdecore/kapplication.h 2005-03-10 16:02:32.000000000 -0500
+@@ -169,7 +169,7 @@
+ #endif
+
+ /**
+- * @deprecated do not use it at all, it will make your application crash, use KCmdineArgs
++ * @deprecated do not use it at all, it will make your application crash, use KCmdLineArgs
+ *
+ * Constructor. Parses command-line arguments.
+ *
+diff -Nru kdelibs-release-3.4.0/kdecore/kcheckaccelerators.cpp kdelibs-branch-3.4/kdecore/kcheckaccelerators.cpp
+--- kdelibs-release-3.4.0/kdecore/kcheckaccelerators.cpp 2005-01-16 08:29:21.000000000 -0500
++++ kdelibs-branch-3.4/kdecore/kcheckaccelerators.cpp 2005-03-24 07:47:03.000000000 -0500
+@@ -18,7 +18,7 @@
+ Boston, MA 02111-1307, USA.
+ */
+
+-// $Id: kcheckaccelerators.cpp,v 1.14 2005/01/16 13:29:21 coolo Exp $
++// $Id: kcheckaccelerators.cpp,v 1.14.2.1 2005/03/24 12:47:03 coolo Exp $
+
+ #define INCLUDE_MENUITEM_DEF
+ #include <qmenudata.h>
+@@ -92,10 +92,13 @@
+ connect( &autoCheckTimer, SIGNAL( timeout()), SLOT( autoCheckSlot()));
+ }
+
+-bool KCheckAccelerators::eventFilter( QObject * , QEvent * e) {
++bool KCheckAccelerators::eventFilter( QObject * , QEvent * e)
++{
+ if ( block )
+ return false;
+- if ( e->type() == QEvent::Accel ) {
++
++ switch ( e->type() ) { // just simplify debuggin
++ case QEvent::Accel:
+ if ( key && (static_cast<QKeyEvent *>(e)->key() == key) ) {
+ block = true;
+ checkAccelerators( false );
+@@ -103,12 +106,23 @@
+ static_cast<QKeyEvent *>(e)->accept();
+ return true;
+ }
+- }
+- if( autoCheck
+- && ( e->type() == QEvent::ChildInserted ||
+- e->type() == QEvent::ChildRemoved ) )
+- {
+- autoCheckTimer.start( 20, true ); // 20 ms
++ break;
++ case QEvent::ChildInserted:
++ case QEvent::ChildRemoved:
++ case QEvent::Resize:
++ case QEvent::LayoutHint:
++ case QEvent::WindowActivate:
++ case QEvent::WindowDeactivate:
++ if( autoCheck )
++ autoCheckTimer.start( 20, true ); // 20 ms
++ break;
++ case QEvent::Timer:
++ case QEvent::MouseMove:
++ case QEvent::Paint:
++ return false;
++ default:
++ // kdDebug(125) << "KCheckAccelerators::eventFilter " << e->type() << " " << autoCheck << endl;
++ break;
+ }
+ return false;
+ }
+diff -Nru kdelibs-release-3.4.0/kdecore/kcmdlineargs.cpp kdelibs-branch-3.4/kdecore/kcmdlineargs.cpp
+--- kdelibs-release-3.4.0/kdecore/kcmdlineargs.cpp 2005-02-15 16:41:02.000000000 -0500
++++ kdelibs-branch-3.4/kdecore/kcmdlineargs.cpp 2005-03-23 15:50:10.000000000 -0500
+@@ -302,6 +302,7 @@
+ }
+ }
+ }
++ parsed = true;
+ }
+
+ KCmdLineArgs *KCmdLineArgs::parsedArgs(const char *id)
+diff -Nru kdelibs-release-3.4.0/kdecore/kglobalaccel_x11.cpp kdelibs-branch-3.4/kdecore/kglobalaccel_x11.cpp
+--- kdelibs-release-3.4.0/kdecore/kglobalaccel_x11.cpp 2005-01-25 05:23:34.000000000 -0500
++++ kdelibs-branch-3.4/kdecore/kglobalaccel_x11.cpp 2005-03-29 09:27:10.000000000 -0500
+@@ -68,7 +68,8 @@
+ g_keyModMaskXOnOrOff =
+ KKeyServer::modXLock() |
+ KKeyServer::modXNumLock() |
+- KKeyServer::modXScrollLock();
++ KKeyServer::modXScrollLock() |
++ KKeyServer::modXModeSwitch();
+ //kdDebug() << "g_keyModMaskXAccel = " << g_keyModMaskXAccel
+ // << "g_keyModMaskXOnOrOff = " << g_keyModMaskXOnOrOff << endl;
+ }
+diff -Nru kdelibs-release-3.4.0/kdecore/kkeynative.h kdelibs-branch-3.4/kdecore/kkeynative.h
+--- kdelibs-release-3.4.0/kdecore/kkeynative.h 2004-09-07 07:42:17.000000000 -0400
++++ kdelibs-branch-3.4/kdecore/kkeynative.h 2005-03-29 09:27:10.000000000 -0500
+@@ -240,6 +240,14 @@
+ * @see accelModMaskX()
+ */
+ static uint modXScrollLock();
++
++ /**
++ * Returns the X11 Mode_switch modifier mask/flag.
++ * @return the X11 Mode_switch modifier mask/flag.
++ * @see accelModMaskX()
++ * @since 3.5
++ */
++ static uint modXModeSwitch();
+ #endif
+
+ private:
+diff -Nru kdelibs-release-3.4.0/kdecore/kkeynative_x11.cpp kdelibs-branch-3.4/kdecore/kkeynative_x11.cpp
+--- kdelibs-release-3.4.0/kdecore/kkeynative_x11.cpp 2005-02-11 15:48:51.000000000 -0500
++++ kdelibs-branch-3.4/kdecore/kkeynative_x11.cpp 2005-03-29 09:27:10.000000000 -0500
+@@ -79,9 +79,11 @@
+ #ifdef Q_WS_X11
+ bool KKeyNative::init( const XEvent* pEvent )
+ {
++ KeySym keySym;
+ m_code = pEvent->xkey.keycode;
+ m_mod = pEvent->xkey.state;
+- XLookupString( (XKeyEvent*) pEvent, 0, 0, (KeySym*) &m_sym, 0 );
++ XLookupString( (XKeyEvent*) pEvent, 0, 0, &keySym, 0 );
++ m_sym = (uint) keySym;
+ return true;
+ }
+ #endif
+@@ -190,6 +192,7 @@
+ uint KKeyNative::modXNumLock() { return KKeyServer::modXNumLock(); }
+ uint KKeyNative::modXLock() { return KKeyServer::modXLock(); }
+ uint KKeyNative::modXScrollLock() { return KKeyServer::modXScrollLock(); }
++uint KKeyNative::modXModeSwitch() { return KKeyServer::modXModeSwitch(); }
+ #endif
+
+ #endif // Q_WS_X11
+diff -Nru kdelibs-release-3.4.0/kdecore/kkeyserver_x11.cpp kdelibs-branch-3.4/kdecore/kkeyserver_x11.cpp
+--- kdelibs-release-3.4.0/kdecore/kkeyserver_x11.cpp 2005-02-10 12:33:01.000000000 -0500
++++ kdelibs-branch-3.4/kdecore/kkeyserver_x11.cpp 2005-03-29 09:27:10.000000000 -0500
+@@ -324,13 +324,13 @@
+ static bool g_bInitializedMods, g_bInitializedVariations, g_bInitializedKKeyLabels;
+ static bool g_bMacLabels;
+ #ifdef Q_WS_X11
+-static uint g_modXNumLock, g_modXScrollLock;
++static uint g_modXNumLock, g_modXScrollLock, g_modXModeSwitch;
+
+ bool initializeMods()
+ {
+ XModifierKeymap* xmk = XGetModifierMapping( qt_xdisplay() );
+
+- g_rgModInfo[3].modX = g_modXNumLock = g_modXScrollLock = 0;
++ g_rgModInfo[3].modX = g_modXNumLock = g_modXScrollLock = g_modXModeSwitch = 0;
+
+ int min_keycode, max_keycode;
+ int keysyms_per_keycode = 0;
+@@ -354,6 +354,7 @@
+ case XK_Meta_L:
+ case XK_Meta_R: if( !g_rgModInfo[3].modX ) g_rgModInfo[3].modX = mask; break; // Win alternate
+ case XK_Scroll_Lock: g_modXScrollLock = mask; break; // Normally Mod5Mask
++ case XK_Mode_switch: g_modXModeSwitch = mask; break;
+ }
+ }
+
+@@ -609,6 +610,7 @@
+ uint modXNumLock() { if( !g_bInitializedMods ) { initializeMods(); } return g_modXNumLock; }
+ uint modXWin() { if( !g_bInitializedMods ) { initializeMods(); } return g_rgModInfo[3].modX; }
+ uint modXScrollLock() { if( !g_bInitializedMods ) { initializeMods(); } return g_modXScrollLock; }
++uint modXModeSwitch() { if( !g_bInitializedMods ) { initializeMods(); } return g_modXModeSwitch; }
+
+ uint accelModMaskX()
+ {
+@@ -756,6 +758,7 @@
+
+ bool codeXToSym( uchar codeX, uint modX, uint& sym )
+ {
++ KeySym keySym;
+ XKeyPressedEvent event;
+
+ event.type = KeyPress;
+@@ -763,7 +766,8 @@
+ event.state = modX;
+ event.keycode = codeX;
+
+- XLookupString( &event, 0, 0, (KeySym*) &sym, 0 );
++ XLookupString( &event, 0, 0, &keySym, 0 );
++ sym = (uint) keySym;
+ return true;
+ }
+ #endif //!Q_WS_WIN
+diff -Nru kdelibs-release-3.4.0/kdecore/kkeyserver_x11.h kdelibs-branch-3.4/kdecore/kkeyserver_x11.h
+--- kdelibs-release-3.4.0/kdecore/kkeyserver_x11.h 2004-09-07 07:42:17.000000000 -0400
++++ kdelibs-branch-3.4/kdecore/kkeyserver_x11.h 2005-03-29 09:27:10.000000000 -0500
+@@ -325,6 +325,14 @@
+ KDECORE_EXPORT uint modXScrollLock();
+
+ /**
++ * Returns the X11 Mode_switch modifier mask/flag.
++ * @return the X11 Mode_switch modifier mask/flag.
++ * @see accelModMaskX()
++ * @since 3.5
++ */
++ KDECORE_EXPORT uint modXModeSwitch();
++
++ /**
+ * Returns bitwise OR'ed mask containing Shift, Ctrl, Alt, and
+ * Win (if available).
+ * @see modXShift()
+diff -Nru kdelibs-release-3.4.0/kdecore/kmultipledrag.h kdelibs-branch-3.4/kdecore/kmultipledrag.h
+--- kdelibs-release-3.4.0/kdecore/kmultipledrag.h 2004-09-09 11:23:51.000000000 -0400
++++ kdelibs-branch-3.4/kdecore/kmultipledrag.h 2005-03-30 09:43:42.000000000 -0500
+@@ -42,7 +42,7 @@
+ * \code
+ * KMultipleDrag *drag = new KMultipleDrag( parentWidget );
+ * drag->addDragObject( new QImageDrag( someQImage, 0L ) );
+- * drag->addDragObject( KURLDrag::newDrag( someKURL, 0L ) );
++ * drag->addDragObject( new KURLDrag( someKURL, 0L ) );
+ * drag->drag();
+ * \endcode
+ *
+diff -Nru kdelibs-release-3.4.0/kdecore/kwin.cpp kdelibs-branch-3.4/kdecore/kwin.cpp
+--- kdelibs-release-3.4.0/kdecore/kwin.cpp 2005-02-01 07:44:02.000000000 -0500
++++ kdelibs-branch-3.4/kdecore/kwin.cpp 2005-03-29 07:23:43.000000000 -0500
+@@ -1,7 +1,7 @@
+ /* This file is part of the KDE libraries
+ Copyright (C) 1999 Matthias Ettrich (ettrich@kde.org)
+
+- $Id: kwin.cpp,v 1.114 2005/02/01 12:44:02 lunakl Exp $
++ $Id: kwin.cpp,v 1.114.2.1 2005/03/29 12:23:43 lunakl Exp $
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+@@ -545,6 +545,7 @@
+ void KWin::setOpacity( WId win, uint percent )
+ {
+ #ifdef Q_WS_X11
++ kwin_net_create_atoms();
+ if (percent > 99)
+ XDeleteProperty (qt_xdisplay(), win, kde_wm_window_opacity);
+ else
+@@ -558,6 +559,7 @@
+ void KWin::setShadowSize( WId win, uint percent )
+ {
+ #ifdef Q_WS_X11
++ kwin_net_create_atoms();
+ long shadowSize = long(0xFFFFFFFF/100.0*percent);
+ XChangeProperty(qt_xdisplay(), win, kde_wm_window_shadow, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &shadowSize, 1L);
+ #endif
+diff -Nru kdelibs-release-3.4.0/kdecore/kwin.h kdelibs-branch-3.4/kdecore/kwin.h
+--- kdelibs-release-3.4.0/kdecore/kwin.h 2005-01-27 02:33:21.000000000 -0500
++++ kdelibs-branch-3.4/kdecore/kwin.h 2005-03-11 01:58:53.000000000 -0500
+@@ -63,7 +63,7 @@
+ public:
+
+ /**
+- * Requests that window @p is activated.
++ * Requests that window @p win is activated.
+ *
+ * There are two ways how to activate a window, by calling
+ * activateWindow() and forceActiveWindow(). Generally,
+@@ -84,7 +84,7 @@
+ * package (kdebase/kwin/README), or ask on the kwin@kde.org
+ * mailing list.
+ *
+- * @param win the if of the window to make active
++ * @param win the id of the window to make active
+ * @param time X server timestamp of the user activity that
+ * caused this request
+ * @since 3.2
+@@ -99,7 +99,7 @@
+ * and similar tools. See the explanation in description
+ * of activateWindow().
+ *
+- * @param win the if of the window to make active
++ * @param win the id of the window to make active
+ * @param time X server timestamp of the user activity that
+ * caused this request
+ *
+diff -Nru kdelibs-release-3.4.0/kdecore/network/kresolver.cpp kdelibs-branch-3.4/kdecore/network/kresolver.cpp
+--- kdelibs-release-3.4.0/kdecore/network/kresolver.cpp 2005-03-03 07:28:16.000000000 -0500
++++ kdelibs-branch-3.4/kdecore/network/kresolver.cpp 2005-04-04 22:06:49.000000000 -0400
+@@ -894,7 +894,7 @@
+
+ // Do we allow IDN names for this TLD?
+ if (input.count() && !idnDomains->contains(input[input.count()-1].lower()))
+- return unicodeDomain.latin1(); // No IDN allowed for this TLD
++ return input.join(".").lower().latin1(); // No IDN allowed for this TLD
+
+ // 3) decide whether to enforce the STD3 rules for chars < 0x7F
+ // we don't enforce
+@@ -942,7 +942,7 @@
+
+ // Do we allow IDN names for this TLD?
+ if (input.count() && !idnDomains->contains(input[input.count()-1].lower()))
+- return asciiDomain; // No TLDs allowed
++ return asciiDomain.lower(); // No TLDs allowed
+
+ // 3) decide whether to enforce the STD3 rules for chars < 0x7F
+ // we don't enforce
+diff -Nru kdelibs-release-3.4.0/kdecore/network/kresolverstandardworkers.cpp kdelibs-branch-3.4/kdecore/network/kresolverstandardworkers.cpp
+--- kdelibs-release-3.4.0/kdecore/network/kresolverstandardworkers.cpp 2005-02-27 23:26:34.000000000 -0500
++++ kdelibs-branch-3.4/kdecore/network/kresolverstandardworkers.cpp 2005-03-17 22:24:57.000000000 -0500
+@@ -76,18 +76,29 @@
+ }
+
+ // blacklist management
++static QMutex blacklistMutex; // KDE4: change to a QReadWriteLock
+ QStringList KBlacklistWorker::blacklist;
+
+ void KBlacklistWorker::init()
+ {
++ // HACK!
++ // FIXME KDE4: How do I detect there is an instance, without triggering
++ // its creation or an assertion fault?
++ if (!KGlobal::_instance)
++ return;
++
++ static bool beenhere = false;
++
++ if (beenhere)
++ return;
++
++ beenhere = true;
+ loadBlacklist();
+ }
+
+ void KBlacklistWorker::loadBlacklist()
+ {
+- if (!kapp)
+- return;
+-
++ QMutexLocker locker(&blacklistMutex);
+ QStringList filelist = KGlobal::dirs()->findAllResources("config", "ipv6blacklist");
+
+ QStringList::ConstIterator it = filelist.constBegin(),
+@@ -122,6 +133,8 @@
+ // it matches the domain ending part
+ bool KBlacklistWorker::isBlacklisted(const QString& host)
+ {
++ KBlacklistWorker::init();
++
+ // empty hostnames cannot be blacklisted
+ if (host.isEmpty())
+ return false;
+@@ -129,6 +142,8 @@
+ // KDE4: QLatin1String
+ QString ascii = QString::fromLatin1(KResolver::domainToAscii(host));
+
++ QMutexLocker locker(&blacklistMutex);
++
+ // now find out if this hostname is present
+ QStringList::ConstIterator it = blacklist.constBegin(),
+ end = blacklist.constEnd();
+@@ -1004,8 +1019,6 @@
+
+ void KNetwork::Internal::initStandardWorkers()
+ {
+- KBlacklistWorker::init();
+-
+ //KResolverWorkerFactoryBase::registerNewWorker(new KResolverWorkerFactory<KBlacklistWorker>);
+ KResolverWorkerFactoryBase::registerNewWorker(new KResolverWorkerFactory<KStandardWorker>);
+
+diff -Nru kdelibs-release-3.4.0/kdecore/network/ksockssocketdevice.cpp kdelibs-branch-3.4/kdecore/network/ksockssocketdevice.cpp
+--- kdelibs-release-3.4.0/kdecore/network/ksockssocketdevice.cpp 2004-09-22 11:30:59.000000000 -0400
++++ kdelibs-branch-3.4/kdecore/network/ksockssocketdevice.cpp 2005-03-04 21:30:40.000000000 -0500
+@@ -118,7 +118,23 @@
+ if (m_sockfd == -1 && !create(address))
+ return false; // failed creating!
+
+- if (KSocks::self()->connect(m_sockfd, address.address(), address.length()) == -1)
++ int retval;
++ if (KSocks::self()->hasWorkingAsyncConnect())
++ retval = KSocks::self()->connect(m_sockfd, address.address(),
++ address.length());
++ else
++ {
++ // work around some SOCKS implementation bugs
++ // we will do a *synchronous* connection here!
++ // FIXME: KDE4, write a proper SOCKS implementation
++ bool isBlocking = blocking();
++ setBlocking(true);
++ retval = KSocks::self()->connect(m_sockfd, address.address(),
++ address.length());
++ setBlocking(isBlocking);
++ }
++
++ if (retval == -1)
+ {
+ if (errno == EISCONN)
+ return true; // we're already connected
+diff -Nru kdelibs-release-3.4.0/kded/kdedmodule.desktop kdelibs-branch-3.4/kded/kdedmodule.desktop
+--- kdelibs-release-3.4.0/kded/kdedmodule.desktop 2005-02-23 00:04:25.000000000 -0500
++++ kdelibs-branch-3.4/kded/kdedmodule.desktop 2005-03-10 11:04:47.000000000 -0500
+@@ -3,7 +3,6 @@
+ Type=ServiceType
+ X-KDE-ServiceType=KDEDModule
+ Comment=KDED Module
+-Comment[af]=Kded Module
+ Comment[ar]=وحدة KDED
+ Comment[az]=KDED Modulu
+ Comment[be]=Модуль KDED
+@@ -70,7 +69,6 @@
+ Comment[ven]=Modulu wa KDED
+ Comment[vi]=Mô đun KDED
+ Comment[xh]=KDED Isichatshulwa
+-Comment[xx]=xxKDED Modulexx
+ Comment[zh_CN]=KDED 模块
+ Comment[zh_TW]=KDED 模組
+ Comment[zu]=Ingxenye ye-KDED
+diff -Nru kdelibs-release-3.4.0/kded/test/test.desktop kdelibs-branch-3.4/kded/test/test.desktop
+--- kdelibs-release-3.4.0/kded/test/test.desktop 2005-02-23 00:04:26.000000000 -0500
++++ kdelibs-branch-3.4/kded/test/test.desktop 2005-03-07 09:13:21.000000000 -0500
+@@ -75,7 +75,6 @@
+ Name[ven]=Modulu ya mulingo wa KDED
+ Name[vi]=Mô đun thử nghiệm KDED
+ Name[xh]=Isichatshulwa Sovavanyo lwe KDED
+-Name[xx]=xxKDED Test Modulexx
+ Name[zh_CN]=KDED 测试模块
+ Name[zh_TW]=KDED 測試模組
+ Name[zu]=Ingxenye Yokuvivinya ye-KDED
+@@ -146,7 +145,6 @@
+ Comment[ven]=Modulu ya mulingo ya KDED
+ Comment[vi]=Mô đun thử nghiệm cho KDED
+ Comment[xh]=Isichatshulwa Sovavavanyo lwe KDED
+-Comment[xx]=xxA Test Module for KDEDxx
+ Comment[zh_CN]=KDED 的测试模块
+ Comment[zh_TW]=KDED 的測試模組
+ Comment[zu]=Ingxenye Yokuvivinya ye-KDED
+diff -Nru kdelibs-release-3.4.0/kdeprint/cups/cups.print kdelibs-branch-3.4/kdeprint/cups/cups.print
+--- kdelibs-release-3.4.0/kdeprint/cups/cups.print 2005-02-23 00:04:29.000000000 -0500
++++ kdelibs-branch-3.4/kdeprint/cups/cups.print 2005-03-07 09:13:22.000000000 -0500
+@@ -49,7 +49,6 @@
+ Comment[ven]=CUPS (Maitele au phirintha a UNIX zwao)
+ Comment[wa]=CUPS (Comon Sistinme d' Imprimaedje po UNIX)
+ Comment[xh]=CUPS (Indlela Elula Yoshicilelo lwe UNIX)
+-Comment[xx]=xxCUPS (Common UNIX Print System)xx
+ Comment[zh_CN]=CUPS (通用 Unix 打印系统)
+ Comment[zh_TW]=CUPS (通用 Unix 列印系統)
+ Comment[zu]=CUPS (Isistimu Yokushicilela ye-Unix Eyejwayelekile)
+diff -Nru kdelibs-release-3.4.0/kdeprint/ext/ext.print kdelibs-branch-3.4/kdeprint/ext/ext.print
+--- kdelibs-release-3.4.0/kdeprint/ext/ext.print 2005-02-23 00:04:29.000000000 -0500
++++ kdelibs-branch-3.4/kdeprint/ext/ext.print 2005-03-07 09:13:22.000000000 -0500
+@@ -65,7 +65,6 @@
+ Comment[ven]=Phirinthani nga Mbekanyamushumo yanga nnda (tshigwada)
+ Comment[wa]=Imprimer åd truviè d' on dfoûtrin programe (djenerike)
+ Comment[xh]=Shicilela Ngapha Kodweliso lwenkqubo olungaphandle (ngokubanzi)
+-Comment[xx]=xxPrint Through an External Program (generic)xx
+ Comment[zh_CN]=通过外部程序打印(通用)
+ Comment[zh_TW]=使用外部程式進行列印 (一般)
+ Comment[zu]=Shicilela Ngokwedlulela Kuhlelo lwemisebenzi Langaphandle (okukawonke wonke)
+diff -Nru kdelibs-release-3.4.0/kdeprint/filters/enscript.desktop kdelibs-branch-3.4/kdeprint/filters/enscript.desktop
+--- kdelibs-release-3.4.0/kdeprint/filters/enscript.desktop 2005-02-23 00:04:29.000000000 -0500
++++ kdelibs-branch-3.4/kdeprint/filters/enscript.desktop 2005-03-07 09:13:22.000000000 -0500
+@@ -15,13 +15,13 @@
+ Name[sv]=Enscript
+ Name[ta]=என்ஸ்கிரிப்ட்
+ Name[xh]=okushicilelwe phantsi kuyo
+-Name[xx]=xxenscriptxx
+ Require=exec:/enscript
+ Comment=Enscript Text Filter
+ Comment[af]=Gravering Teks Filter
+ Comment[ar]=مرشح نصوص Enscript
+ Comment[az]=Enscript Mətn Filtri
+ Comment[bn]=enscript টেক্সট ফিল্টার
++Comment[br]=Sil skrid Enscript
+ Comment[bs]=Enscript tekst filter
+ Comment[ca]=Filtre de texts enscript
+ Comment[cs]=Textový filtr Enscript
+@@ -80,7 +80,6 @@
+ Comment[ven]=Nwalani ya filithara ya manwalwa
+ Comment[wa]=Passete po-z imprimer do peur tecse avou enscript
+ Comment[xh]=Enscript Uhluzo Lombhalo
+-Comment[xx]=xxEnscript Text Filterxx
+ Comment[zh_CN]=Enscript 文本过滤程序
+ Comment[zh_TW]=Enscript 文字過濾器
+ Comment[zu]=Qopha Ihluzo Lombhalo
+diff -Nru kdelibs-release-3.4.0/kdeprint/filters/imagetops.desktop kdelibs-branch-3.4/kdeprint/filters/imagetops.desktop
+--- kdelibs-release-3.4.0/kdeprint/filters/imagetops.desktop 2005-02-23 00:04:29.000000000 -0500
++++ kdelibs-branch-3.4/kdeprint/filters/imagetops.desktop 2005-03-07 09:13:22.000000000 -0500
+@@ -17,7 +17,6 @@
+ Name[sv]=Bildtoppar
+ Name[ta]=மேல்பிம்பங்கள்
+ Name[ven]=Zwa ntha zwa zwifanyiso
+-Name[xx]=xximagetopsxx
+ Name[zu]=uphahla lwesithombe
+ Require=exec:/imagetops
+ Comment=Generic Image to PS Filter
+@@ -85,7 +84,6 @@
+ Comment[ven]=Tshifanyiso kha tshigwada kha filithara ya PS
+ Comment[wa]=Passete djenerike imådjes viè PostScript
+ Comment[xh]=Umfanekiso ngokubanzi kwicebo lokucoca ulwelo le PS
+-Comment[xx]=xxGeneric Image to PS Filterxx
+ Comment[zh_CN]=通用图像到 PS 过滤程序
+ Comment[zh_TW]=一般圖檔轉成 PS 的過濾器
+ Comment[zu]=Isithombe Sawowonke Sehluzo le-PS
+diff -Nru kdelibs-release-3.4.0/kdeprint/filters/pdfwrite.desktop kdelibs-branch-3.4/kdeprint/filters/pdfwrite.desktop
+--- kdelibs-release-3.4.0/kdeprint/filters/pdfwrite.desktop 2005-02-23 00:04:29.000000000 -0500
++++ kdelibs-branch-3.4/kdeprint/filters/pdfwrite.desktop 2005-03-27 02:28:42.000000000 -0500
+@@ -12,7 +12,6 @@
+ Name[ta]=பிடிஎஃப் எழுதி
+ Name[tr]=pdfyaz
+ Name[ven]=pdfnwala
+-Name[xx]=xxpdfwritexx
+ Name[zu]=bhala kwe-pdf
+ Require=exec:/gs
+ Comment=PDF Writer (needs Ghostscript)
+@@ -20,6 +19,7 @@
+ Comment[ar]=كاتب ملفات PDF (يحتاج الى غوست سكريبت)
+ Comment[az]=PDF Yazıcı (Ghostscript-ə ehtiyacı var)
+ Comment[bn]=পি-ডি-এফ (PDF) Writer (ঘোস্টস্ক্রিপ্ট লাগে)
++Comment[br]=Skriver PDF (red eo da endevout Ghostscript)
+ Comment[bs]=Pravljenje PDFa (potreban je GhostScript)
+ Comment[ca]=Escriptor de PDF (necessita Ghostscript)
+ Comment[cs]=PDF writer (vyžaduje GhostScript)
+@@ -37,7 +37,7 @@
+ Comment[fy]=PDF Writer (hat Ghostskript nedich)
+ Comment[ga]=Scríbhneoir PDF (Ghostscript de dhíth)
+ Comment[gl]=Escritor de PDF (precisa Ghostscript)
+-Comment[he]=כתבן ה-PDF (זקוק ל־Ghostscript)
++Comment[he]=כתבן ה־PDF (זקוק ל־Ghostscript)
+ Comment[hi]=पीडीएफ राइटर (घोस्टस्क्रिप्ट आवश्यक है)
+ Comment[hr]=PDF Writer (zahtjeva GhostScript)
+ Comment[hsb]=PDF pisanje (trjeba ghostscript)
+@@ -80,7 +80,6 @@
+ Comment[ven]=Munwali wa PDF (I toda bammbiri la tshipuku)
+ Comment[wa]=Fijheu di fitchîs PDF (a mezåjhe di Ghostscript)
+ Comment[xh]=Umbhali we PDF (ufuna i Ghostscript)
+-Comment[xx]=xxPDF Writer (needs Ghostscript)xx
+ Comment[zh_CN]=PDF 书写器 (需要 GhostScript)
+ Comment[zh_TW]=PDF 產生器 (需要 GhostScript)
+ Comment[zu]=Umbhali we-PDF (idinga i-Ghostscript)
+diff -Nru kdelibs-release-3.4.0/kdeprint/filters/poster.desktop kdelibs-branch-3.4/kdeprint/filters/poster.desktop
+--- kdelibs-release-3.4.0/kdeprint/filters/poster.desktop 2005-02-23 00:04:29.000000000 -0500
++++ kdelibs-branch-3.4/kdeprint/filters/poster.desktop 2005-03-10 11:04:48.000000000 -0500
+@@ -62,11 +62,11 @@
+ Comment[ven]=Phirinthani ya phosithara
+ Comment[wa]=Imprimaedje poster
+ Comment[xh]=Ushicilelo Lwephepha elinomyalezo
+-Comment[xx]=xxPoster Printingxx
+ Comment[zh_CN]=海报打印
+ Comment[zh_TW]=海報列印
+ Comment[zu]=Ukushicilela Kwebhodi lezithombe
+ Description=Utility to print large posters on multiple small paper sheets. To use this command, the <b>poster</b> executable must be accessible in your <tt>PATH</tt>. Source code for this utility can be on the <a href="http://printing.kde.org/downloads">KDEPrint web site</a>. <p><b><u>WARNING:</u></b> The package found on the KDEPrint web site is a modified version of the original one that can be found on any CTAN archive mirror, but the original package will <b>not</b> work with KDE. You <b>must</b> use the package found on the <a href="http://printing.kde.org/downloads">KDEPrint web site</a>.
++Description[af]=Program wat jou toelaat om groot plakate op veelvuldige kleiner blaaie te druk. Om hierdie opdrag te gebruik moet die <b>poster</b> program in jou <tt>soekpad</tt> beskikbaar wees. Bronkode vir hierdie program is beskikbaar vanaf die <a href="http://printing.kde.org/downloads">KDEPrint web bediener</a>.
+ Description[ar]=أداة لطباعة ملصقات عريضة على أوراق صغيرة عديدة. لإستعمال هذا الأمر، يجب أن يكون البرنامج <b>poster</b> في ال<tt>PATH</tt>. الشفرة المصدرية لهذه الأداة توجد على <a href="http://printing.kde.org/downloads">موقع ويب KDEPrint</a>. <p><b><u>تحذير:</u></b> الحزمة الموجودة على موقع ويب KDEPrint هي نسخة مغيرة من النسخة الأصلية و التي يمكن أن تجدها في أي مرآة ارشيف CTAN، لكن الحزمة الأصلية <b>لن </b> تعمل مع كيدي. يجب استعمال الحزمة الموجودة على <a href="http://printing.kde.org/downloads">موقع ويب KDEPrint</a>.
+ Description[az]=Böyük posterləri kiçik kağızlara çap etməyə yardım edən vasitə.
+ Description[bg]=Програма за печат на големи постери (плакати) на няколко малки листа. За да използвате командата <b>poster</b>, тя трябва да е в директория описана от системната променлива <tt>PATH</tt>. Изходният код на тази програма може да бъде намерен на страницата на <a href="http://printing.kde.org/downloads">системата за печат в КДЕ</a>. <p><b><u>ВНИМАНИЕ:</u></b> Програмата, която се намира на сайта на КДЕ, е модифицирана версия на оригиналната програма, която може да бъде намерена на в архивите на CTAN. Оригиналната програма <b>НЕ</b> работи със системата за печат в КДЕ. Така, че трябва да използвате модифицираната версия на програмата, която се намира на страницата на <a href="http://printing.kde.org/downloads">системата за печат в КДЕ</a>.
+@@ -114,7 +114,7 @@
+ Description[sl]=Orodje za tiskanje velikih posterjev na majhnih listih papirja. Za uporabo tega ukaza mora biti izvedljiva datoteka <b>poster</b> v vaši poti <tt>PATH</tt>. Izvirna koda za to orodje je na voljo na <a href="http://printing.kde.org/downloads">spletni strani KDEPrint</a>. <p><b><u>OPOZORILO:</u></b> Paket, ki je na strani KDEPrint je spremenjena različica originalne, ki je na voljo na vsakem zrcalnem strežniku arhivov CTAN, vendar pa ta <b>ne</b> dela s KDE. Uporabiti <b>morate</b> paket s <a href="http://printing.kde.org/downloads">spletne strani KDEPrint</a>.
+ Description[sq]=Vegël për shtypjen edhe ndarjen e pllakatave në letra të vogla. Për ta përdorur këtë komandë, <b>pllakata</b> ekzekutuese duhet të jetë e arrijshme në <tt>PATH</tt> e juaj. Kodi burimor për këtë vegël mund të gjindet në <a href="http://printing.kde.org/downloads">Web Faqën KDEPrint</a>. <p><b><u>VËREJTJE:</u></b> Pako e gjetur në web faqën e KDEPrint është verzion i ndryshuar nga origjinali, ky verzion mund të gjindet në çdo web faqe arkivore të CTAN pasqyrave, por verzioni origjinal <b>nuk punon</b> me sistemin KDE. Ju <b>duheni</b> ta përdorni pakon që gjendet në këtë web faqe: <a href="http://printing.kde.org/downloads">Web Faqja KDEPrint</a>.
+ Description[sr]=Алатка за штампање великих постера на више малих папира. Да би сте користили ову наредбу, извршни фајл <b>poster</b> мора бити приступачан кроз ваш <tt>PATH(путању)</tt>. Изворни код овог алата можете наћи на <a href="http=://printing.kde.org/downloads">KDEPrint веб сајту</a>. <p><b><u>Упозорење:</u></b> Пакет који се налази на KDE Print веб сајту је измењена верзија оригинала који се може наћи на било ком CTAN огледалу, али оригинални пакет <b>неће</b> радити са KDE-ом. <b>Морате</b> користити пакет са <a href="http://printing.kde.org/downloads">KDEPrint веб сајта</a>.
+-Description[sr@Latn]=Alatka za štampanje velikih postera na više malih papira. Da bi ste koristili ovu naredbu, <b>poster</b> izvršni fajl mora biti pristupačan kroz vaš <tt>PATH(putanju)</tt>. Izvorni kod ovog alata možete naći na <a href=" http=://printing.kde.org/downloads">KDEPrint veb sajtu</a>. <p><b><u>Upozorenje:</u></b> Paket koji se nalazi na KDE Print veb sajtu je izmenjena verzija originala koji se može naći na bilo kom CTAN ogledalu, ali originalni paket <b>neće</b> raditi sa KDE-om. <b>Morate</b> koristiti paket sa <a href="http://printing.kde.org/downloads">KDEPrint veb sajta</a>.
++Description[sr@Latn]=Alatka za štampanje velikih postera na više malih papira. Da bi ste koristili ovu naredbu, izvršni fajl <b>poster</b> mora biti pristupačan kroz vaš <tt>PATH(putanju)</tt>. Izvorni kod ovog alata možete naći na <a href="http=://printing.kde.org/downloads">KDEPrint veb sajtu</a>. <p><b><u>Upozorenje:</u></b> Paket koji se nalazi na KDE Print veb sajtu je izmenjena verzija originala koji se može naći na bilo kom CTAN ogledalu, ali originalni paket <b>neće</b> raditi sa KDE-om. <b>Morate</b> koristiti paket sa <a href="http://printing.kde.org/downloads">KDEPrint veb sajta</a>.
+ Description[sv]=Verktyg för att skriva ut stora affischer på flera små blad. För att använda kommandot måste det körbara programmet <b>poster</b> vara tillgängligt i <tt>PATH</tt>. Källkod för detta verktyg kan finnas på <a href="http://printing.kde.org/downloads">KDEPrints webbplats</a>. <p><b><u>Varning:</u></b> Paketet som finns på KDEPrints webbplats är en ändrad version av originalet som finns på alla CTAN-arkivplatser. Men originalpaketet fungerar <b>inte</b> med KDE, man <b>måste</b> använda paketet som finns på <a href="http://printing.kde.org/downloads">KDEPrints webbplats</a>.
+ Description[ta]=பலவித சிறிய தாள்களில் பெரிய போஸ்டர்களை அச்சிப்பதற்கான பயன்பாடு. இந்த கட்டளையை பயன்படுத்த <b>போஸ்டர் </b>நிறுவல் அணுகக்கூடியதாக <tt>உங்கள் பாதை இருக்க வேண்டும்</tt>. இந்த பயன்பாட்டுக்கான மூல குறியீடு கேடிஇஅச்சு வலைதளத்தில் <a href="http://printing.kde.org/downloads">இருக்கும்</a>. <p><b><u>எச்சரிக்கை:</u></b>கேடிஇ அச்சு வலைத்தளத்தில் காணப்படும் தொகுப்பு மாற்றப்பட்டுள்ளது. இது எல்லா CTAN காப்பத்திலும் காணப்படும்.ஆனால் அசல் தொகுப்பு கேடிஇயுடன் இயங்காது.நீங்கள் <b></b> <a href="http://printing.kde.org/downloads">கேடிஇஅச்சு வலைதளத்தில்</a> உள்ள தொகுப்பைத்தான் பயன்படுத்த வேண்டும்</a>.
+ Description[tg]=Барномаҳои барои чопи сатроҳои бузург барои сафҳоти коғаз купак барои истифода аз ин дастури<b>poster</b> бояд дар<tt>PATH-и</tt> шумо кобали дастурӣ бошад . Коди марҷа ин обзор метавонад дар<a href="http://printing.kde.org/downloads"> KDEPrint сйти Вэб ёфта шавад.</a>. <p><b><u>Огоҳӣ:</u></b> Пакете, ки нусхаи таъғиршуда буд, дар Вэби KDEPrint ёфта шуд , ва он дар ягон CTAN archive mirror мумкин аст ки ёбад ,лекин нусхаи аслиаш <b>дар KDE</b> кор намекунад. Шумо<b>бояд</b> пакети ёфташударо истифода кунед дар<a href="http://printing.kde.org/downloads">KDEPrint web site</a>.
+@@ -123,7 +123,6 @@
+ Description[ven]=Tshitikedzi khau phirintha dziphosithara khulwane kha ma bammbiri matuku manzhi. U shumisa muthetho uyu, <b>Phosithara</b> zwinotumulea zwi fanela u dzhenea kha <tt>PATH</tt>. Khoudu ya vhubvo ya tshitikedzi itshi ingavha kha <a href="http://printing.kde.org/downloads">KDEPrint web site</a>. <p><b><u>WARNING:</u></b> Tshiputo tshi wanalaho kha KDEPrint web site ndi tshivhumbeo tsho dzudzanywaho tsha vhukuma tshine tshinga wanala kha tshivhoni, fhedzi tshiputo tsha tshavhukuma tshinga <b>si</b> shume nga KDE. Ni <b>u</b> shumisa tshiputo tsho wanalaho kha <a href="http://printing.kde.org/downloads">KDEPrint web site</a>.
+ Description[wa]=Usteye po-z imprimer des lådjes posters so sacwantès foyes pus ptites et les poleur mete eshonne po-z aveur li grand poster. Po-z eployî l' comande, li programe <b>poster</b> doet esse dins vosse tchimin (<tt>PATH</tt>). Li côde sourdant po ciste usteye si trove sol <a href="http://printing.kde.org/downloads">waibe di KDEPrint</a>. <p><b><u>ASTEME:</u></b> Li pacaedje ki s' trove sol waibe da KDEPrint est ene modêye ene miete candjeye di l' oridjinå (ki s' pout trover so tot l' minme li ké muroe d' årtchives do CTAN), ca l' oridjinå n' rote <b>nén</b> avou KDE. Vos <b>dvoz</b> eployî li pacaedje k' est sol <a href="http://printing.kde.org/downloads">waibe di KDEPrint</a>.
+ Description[xh]=Uncedo lokushicilela izazisi eszinkulu kumakhasi amaphepha amaninzi. Ukusebenzisa lomyalelo, <b>isazisi</b> esiphumezekayo kufuneka sikwazi ukufumaneka kowakho <tt>UMENDO<tt>. Ikhowudi yemvelaphi yalento eluncedo inga kwi <a href="http://printing.kde.org/downloads">web site ye KDEPrint</a>. <p><b><u>ISILUMKISO:</u></b> Impahla efumaneke kwi we site ye KDEPrint iluguqulelo kancincane lomsesebenzi woqobo enokwazi ukufumaneka kuso nayiphi indawo yogcino yesipili se CTAN, kodwa impahla yoqobo ayizukusebenzelana ne KDE. Kufuneka usebenzise impahla ifumanwe <a href="http://printing.kde.org/downloads">kwi web site ye KDEPrint</a>.
+-Description[xx]=xxUtility to print large posters on multiple small paper sheets. To use this command, the <b>poster</b> executable must be accessible in your <tt>PATH</tt>. Source code for this utility can be on the <a href="http://printing.kde.org/downloads">KDEPrint web site</a>. <p><b><u>WARNING:</u></b> The package found on the KDEPrint web site is a modified version of the original one that can be found on any CTAN archive mirror, but the original package will <b>not</b> work with KDE. You <b>must</b> use the package found on the <a href="http://printing.kde.org/downloads">KDEPrint web site</a>.xx
+ Description[zh_CN]=此工具用于在多张纸上打印大型的海报。要使用此命令，<b>poster</b> 可执行文件必须可在您的 <tt>PATH</tt> 中访问到。此工具的源代码位于<a href="http://printing.kde.org/downloads">KDEPrint 网站</a>。<p><b><u>警告：</u></b>您虽然可以在任何 CTAN 归档镜像找到的原始版本，但是在 KDEPrint 网站上找到的包对其进行了修改，原因是原始的包<b>无法</b>用于 KDE。您<b>必须</b>使用在 <a href="http://printing.kde.org/downloads">KDEPrint 网站</a>上找到的包。
+ Description[zh_TW]=將大型海報列印在多張小型紙張上的公用程式。要使用這個命令，可執行檔<b>poster</b>必須在您的<tt>PATH</tt>中。這個公用程式的原始碼可以在<a href="http://printing.kde.org/downloads"KDEPrint 網站</a>。<p><b><u>警告：</u></b>在 KDEPrint 網站上找到的套件是修改過的版本，而非在任何 CTAN 檔案庫鏡射站中可以找到的原始版本，其原始套件<b>無法</b>在 KDE 下運作。您<b>必須</b>使用在<a href="http://printing.kde.org/downloads">KDEPrint 網站</a>上的套件。
+ Description[zu]=Insebenziso yokushicicela amabhodi emiyalezo emikhulu kumapheshana ekhasi eliningana elincane. Ukusebenzisa lomyalelo, ibhodi <b> lomyalezo</b> eliphumelelisekayo kumele lingeniswe ngokunemvume kweyakho <tt>Indlela</tt>. Ikhodi lemvelaphi lalokhu k kusebenzisa kungaba kwi <a href="http://printing.kde.org/downloads"> kwindawo yeweb ye KDEPrint</a>. <p><b><u>Isexwayiso:</u></b> Iphakethe elitholakala kwindawo yeweb ye-KDEPrint inguguqulelo olushintshiweyo lwasekuqaleni lolo olungatholakala kunoma yisiphi isibuko somqulu we CTAN, kodwa iphakethe lasekuqaleni <b>angeke </b> lisebenze nge-KDE. Wena<b>kumele</b> usebenzise iphakethe elitholakala e <a href="http://printing.kde.org/downloads">kwindawo yeweb ye-KDEPrint</a>.
+diff -Nru kdelibs-release-3.4.0/kdeprint/filters/ps2pdf.desktop kdelibs-branch-3.4/kdeprint/filters/ps2pdf.desktop
+--- kdelibs-release-3.4.0/kdeprint/filters/ps2pdf.desktop 2005-02-23 00:04:30.000000000 -0500
++++ kdelibs-branch-3.4/kdeprint/filters/ps2pdf.desktop 2005-03-07 09:13:23.000000000 -0500
+@@ -4,7 +4,6 @@
+ Name[pl]=Konwersja PS do PDF
+ Name[pt_BR]=Conversão de PS para PDF
+ Name[sv]=Ps2pdf
+-Name[xx]=xxps2pdfxx
+ Require=exec:/gs
+ Comment=PostScript to PDF Converter
+ Comment[af]=Postscript na Pdf Omskakelaar
+@@ -71,7 +70,6 @@
+ Comment[ven]=Bammbiri la poso uya kha mushandukisi wa PDF
+ Comment[wa]=Covierseu di PostScript viè PDF
+ Comment[xh]=PostScript Kumguqili we PDF
+-Comment[xx]=xxPostScript to PDF Converterxx
+ Comment[zh_CN]=PostScript 到 PDF 的转换器
+ Comment[zh_TW]=PostScript 至 PDF 轉換器
+ Comment[zu]=Umguquli we-PostScript se-DPF
+diff -Nru kdelibs-release-3.4.0/kdeprint/filters/psbook.desktop kdelibs-branch-3.4/kdeprint/filters/psbook.desktop
+--- kdelibs-release-3.4.0/kdeprint/filters/psbook.desktop 2005-02-23 00:04:30.000000000 -0500
++++ kdelibs-branch-3.4/kdeprint/filters/psbook.desktop 2005-03-27 02:28:42.000000000 -0500
+@@ -10,7 +10,6 @@
+ Name[sv]=broschyr
+ Name[ta]=psபுத்தகம்
+ Name[ven]=Bugu ya ps
+-Name[xx]=xxpsbookxx
+ Name[zu]=incwadi ye-ps
+ Require=exec:/psbook,exec:/psnup
+ Comment=Pamphlet Printing (use with small side duplex printing)
+@@ -33,7 +32,7 @@
+ Comment[fi]=Lentolehtistulostus (käytä lyhyen sivun kaksipuoleistulostusta)
+ Comment[fr]=Impression au format livret (à utiliser avec l'impression duplex de petits feuillets)
+ Comment[fy]=Pamflet ôfdrukke (te brûken mei smelle kant fan dupleksôfdruk)
+-Comment[he]=הדפסת חוברות (לשימוש עם הדפסה דו-כיוונית בצד הקטן)
++Comment[he]=הדפסת חוברות (לשימוש עם הדפסה דו־כיוונית בצד הקטן)
+ Comment[hi]=पेम्फलेट छपाई(small side duplex printing के साथ ईस्तमाल करें)
+ Comment[hr]=Ispis pamfleta (koristi dupleks ispis za mele stranice)
+ Comment[hu]=Szórólapnyomtatás (kisalakú duplex nyomtatáshoz)
+@@ -70,7 +69,6 @@
+ Comment[uz]=Памфлет босиб чиқариш (кичик тарафлама варақнинг иккита томонига босиб чиқариш)
+ Comment[ven]=U phirintha ha tshibugwana (shumisa na lurumbu lutuku lwa u phirintha a duplex)
+ Comment[xh]=Ushicilelo Lwephetshana (sebenzisa ngoshicilelo oluncinane olusecaleni oluphindwe kabini)
+-Comment[xx]=xxPamphlet Printing (use with small side duplex printing)xx
+ Comment[zh_CN]=打印小册 (使用小张双面打印)
+ Comment[zh_TW]=列印小冊 (使用小張雙面列印)
+ Comment[zu]=Ibhukwana Lokushicilela (sebenzisa ngecala elincane lukushicilela okuphindwe kabili)
+diff -Nru kdelibs-release-3.4.0/kdeprint/filters/psbook1.desktop kdelibs-branch-3.4/kdeprint/filters/psbook1.desktop
+--- kdelibs-release-3.4.0/kdeprint/filters/psbook1.desktop 2005-02-23 00:04:30.000000000 -0500
++++ kdelibs-branch-3.4/kdeprint/filters/psbook1.desktop 2005-03-07 09:13:23.000000000 -0500
+@@ -11,7 +11,6 @@
+ Name[sv]=broschyr 1
+ Name[ta]=psபுத்தகம்1
+ Name[ven]=Bugu ya ps yau thoma
+-Name[xx]=xxpsbook1xx
+ Name[zu]=incwadi ye ps yokuqala
+ Require=exec:/psbook,exec:/psnup,exec:/psselect
+ Comment=Pamphlet Printing - Even Pages (step 1)
+@@ -72,7 +71,6 @@
+ Comment[uz]=Памфлет босиб чиқариш - Жуфт бетлар (қадам 1)
+ Comment[ven]=U phirintha ha tshibugwana - masiatari (tshitepe tshau thoma)
+ Comment[xh]=Ushicilelo Lwephetshana - Amaphepha Alinganayo (inyathelo 1)
+-Comment[xx]=xxPamphlet Printing - Even Pages (step 1)xx
+ Comment[zh_CN]=打印小册 - 偶数页(第一步)
+ Comment[zh_TW]=列印小冊 - 偶數頁(第一步)
+ Comment[zu]=Ukushicilela Ibhukwana - Amaphepha Alinganayo (isiqendu 1)
+diff -Nru kdelibs-release-3.4.0/kdeprint/filters/psbook2.desktop kdelibs-branch-3.4/kdeprint/filters/psbook2.desktop
+--- kdelibs-release-3.4.0/kdeprint/filters/psbook2.desktop 2005-02-23 00:04:30.000000000 -0500
++++ kdelibs-branch-3.4/kdeprint/filters/psbook2.desktop 2005-03-27 02:28:42.000000000 -0500
+@@ -11,7 +11,6 @@
+ Name[sv]=broschyr 2
+ Name[ta]=psபுத்தகம்2
+ Name[ven]=Bugu ya ps ya vhuvhili
+-Name[xx]=xxpsbook2xx
+ Name[zu]=incwadi ye ps yesibili
+ Require=exec:/psbook,exec:/psnup,exec:/psselect
+ Comment=Pamphlet Printing - Odd Pages (step 2)
+@@ -35,7 +34,7 @@
+ Comment[fi]=Lentolehtistulostus - parittomat sivut (vaihe 2)
+ Comment[fr]=Impression au format livret - Pages impaires (étape 2)
+ Comment[fy]=Pamflet ôfdrukke - ûneven bledsiden (stap 2)
+-Comment[he]=הדפסת חוברות - עמודים אי-זוגיים (שלב 2)
++Comment[he]=הדפסת חוברות - עמודים אי־זוגיים (שלב 2)
+ Comment[hi]=पेम्फलेट छपाई विषम पृष्ठ (स्टेप 2)
+ Comment[hr]=Ispis pamfleta - neparne stranice (korak 2)
+ Comment[hsb]=Pamphlet Printing - njerune strony (prěnja kročel)
+@@ -73,7 +72,6 @@
+ Comment[uz]=Памфлет босиб чиқариш - Тоқ бетлар (қадам 2)
+ Comment[ven]=U phirintha tshibugwana - masaitari (tshitepe tsha vhuvhili)
+ Comment[xh]=Ushicilelo Lwephetshana - Amaphepha Amnqakathi (inyathelo 2)
+-Comment[xx]=xxPamphlet Printing - Odd Pages (step 2)xx
+ Comment[zh_CN]=打印小册 - 奇数页(第二步)
+ Comment[zh_TW]=列印小冊 - 奇數頁(第二步)
+ Comment[zu]=Ukushicilela Kwebhukwana - Amaphepha Angalingani (isiqendu 2)
+diff -Nru kdelibs-release-3.4.0/kdeprint/filters/psnup.desktop kdelibs-branch-3.4/kdeprint/filters/psnup.desktop
+--- kdelibs-release-3.4.0/kdeprint/filters/psnup.desktop 2005-02-23 00:04:30.000000000 -0500
++++ kdelibs-branch-3.4/kdeprint/filters/psnup.desktop 2005-03-07 09:13:23.000000000 -0500
+@@ -1,7 +1,6 @@
+ [KDE Print Filter Entry]
+ Name=psnup
+ Name[sv]=Psnup
+-Name[xx]=xxpsnupxx
+ Require=exec:/psnup
+ Comment=Multiple Pages per Sheet Filter
+ Comment[af]=Veelvuldige Bladsye per Staat Filter
+@@ -66,7 +65,6 @@
+ Comment[ven]=Masiatari manzhi kha filithara ya bammbiri
+ Comment[wa]=Passete pus d' ene pådje par foye
+ Comment[xh]=Amaphepha Amaninzi Ngekhasi Lesihluzi ngasinye
+-Comment[xx]=xxMultiple Pages per Sheet Filterxx
+ Comment[zh_CN]=每张多页过滤程序
+ Comment[zh_TW]=單張多頁過濾器
+ Comment[zu]=Amakhasi Amaningana Kumhlaziyi Wepheshana ngamunye
+diff -Nru kdelibs-release-3.4.0/kdeprint/filters/psresize.desktop kdelibs-branch-3.4/kdeprint/filters/psresize.desktop
+--- kdelibs-release-3.4.0/kdeprint/filters/psresize.desktop 2005-02-23 00:04:30.000000000 -0500
++++ kdelibs-branch-3.4/kdeprint/filters/psresize.desktop 2005-03-07 09:13:23.000000000 -0500
+@@ -10,7 +10,6 @@
+ Name[ta]=psஅளவு மாற்று
+ Name[ven]=U linganisela ps
+ Name[xh]=psresiza
+-Name[xx]=xxpsresizexx
+ Name[zu]=psphinda ushintshe usayizi
+ Require=exec:/psresize
+ Comment=Scale Print Content to Fit on Another Paper Size
+@@ -75,7 +74,6 @@
+ Comment[ven]=Zwirengomu ha tshikeili tshau phirintha uitela u dzhena kha saizi inwe ya siatari
+ Comment[wa]=Mete al schåle çou ki va esse imprimer po k' ça rimplixhe ene pådje d' ene ôte grandeu di papî
+ Comment[xh]=Isikali Soshicelela Somphakati esinokungena Kwelinye Uhlobo Lephepa
+-Comment[xx]=xxScale Print Content to Fit on Another Paper Sizexx
+ Comment[zh_CN]=缩放打印内容以适合其它纸张大小
+ Comment[zh_TW]=調整列印內容以符合其它的紙張大小
+ Comment[zu]=Kala Okuphakathi Kokushicilela Ukugcwalisa Omunye Usayizi Wephepha
+diff -Nru kdelibs-release-3.4.0/kdeprint/filters/psselect.desktop kdelibs-branch-3.4/kdeprint/filters/psselect.desktop
+--- kdelibs-release-3.4.0/kdeprint/filters/psselect.desktop 2005-02-23 00:04:30.000000000 -0500
++++ kdelibs-branch-3.4/kdeprint/filters/psselect.desktop 2005-03-07 09:13:23.000000000 -0500
+@@ -8,7 +8,6 @@
+ Name[sv]=Psselect
+ Name[ta]=psதேர்ந்தெடு
+ Name[ven]=U nanga ha ps
+-Name[xx]=xxpsselectxx
+ Name[zu]=pskhetha
+ Require=exec:/psselect
+ Comment=Page Selection/Ordering Filter
+@@ -74,7 +73,6 @@
+ Comment[uz]=Бетларни танлаш/тартиблаш филтери
+ Comment[ven]=U nanga ha siatari/u vhekanya filithara
+ Comment[xh]=Ukhetho Lwephepha/Isihluzi Sokulungisa kakuhle
+-Comment[xx]=xxPage Selection/Ordering Filterxx
+ Comment[zh_CN]=页面选择/排序过滤程序
+ Comment[zh_TW]=紙張選擇/排序過濾器
+ Comment[zu]=Ukhetho Lwephepha/Ukuthumela Isihlaziya samafayela
+diff -Nru kdelibs-release-3.4.0/kdeprint/foomatic/foomatic.print kdelibs-branch-3.4/kdeprint/foomatic/foomatic.print
+--- kdelibs-release-3.4.0/kdeprint/foomatic/foomatic.print 2004-10-25 22:42:18.000000000 -0400
++++ kdelibs-branch-3.4/kdeprint/foomatic/foomatic.print 2005-03-07 09:13:23.000000000 -0500
+@@ -10,6 +10,5 @@
+ Comment[hi]=फूमेटिक (CUPS, LPRng, PDQ)
+ Comment[sq]=Foomatik (CUPS, LPRng, PDQ)
+ Comment[sv]=Foomatic (Cups, LPRng, PDQ)
+-Comment[xx]=xxFoomatic (CUPS, LPRng, PDQ)xx
+ DetectUris=exec:/foomatic-configure,config:/foomatic/
+ DetectPrecedence=0
+diff -Nru kdelibs-release-3.4.0/kdeprint/kdeprintd.desktop kdelibs-branch-3.4/kdeprint/kdeprintd.desktop
+--- kdelibs-release-3.4.0/kdeprint/kdeprintd.desktop 2005-02-23 00:04:27.000000000 -0500
++++ kdelibs-branch-3.4/kdeprint/kdeprintd.desktop 2005-03-30 01:47:19.000000000 -0500
+@@ -73,18 +73,20 @@
+ Name[ven]=Daemon yau phirintha ya KDE
+ Name[wa]=Démon d' imprimaedje di KDE
+ Name[xh]=Daemon Yoshicilelo lwe KDE
+-Name[xx]=xxKDE Print Daemonxx
+ Name[zh_CN]=KDE 打印守护进程
+ Name[zh_TW]=KDE 列印伺服程式
+ Name[zu]= I-Daemon Yokushicilela kwe-KDE
+ Comment=Print daemon for KDE
++Comment[af]=Druk Bediener vir KDE
+ Comment[bg]=Демон за печат в КДЕ
+ Comment[bn]=কে.ডি.ই-র মুদ্রণ ডিমন
++Comment[br]=Diaoul moulañ evit KDE
+ Comment[bs]=Demon za štampu za KDE
+ Comment[ca]=Dimoni d'impressió per al KDE
+ Comment[cs]=Tiskový démon KDE
+ Comment[da]=Udskriftsdæmon for KDE
+ Comment[de]=Druck-Dämon für KDE
++Comment[el]=Ένας δαίμονας εκτυπώσεων για το KDE
+ Comment[es]=Demonio de impresión para KDE
+ Comment[et]=KDE trükkimise deemon
+ Comment[eu]=KDEren inprimaketa daemon-a
+@@ -116,12 +118,11 @@
+ Comment[sk]=Démon tlače pre KDE
+ Comment[sl]=Tiskalniški strežnik za KDE
+ Comment[sr]=KDE-ов демон за штампање
+-Comment[sr@Latn]=KDE-ов демон за штампање
++Comment[sr@Latn]=KDE-ov demon za štampanje
+ Comment[sv]=Skrivardemon för KDE
+ Comment[ta]=கேடிஇக்கான ஒரு அச்ச் டெமான்
+ Comment[tg]=Демони чопи KDE
+ Comment[tr]=KDE için bir yazdırma programı
+ Comment[uk]=Демон друку KDE
+ Comment[uz]=KDE учун босиб чиқариш хизмати
+-Comment[xx]=xxPrint daemon for KDExx
+ Comment[zh_CN]=KDE 的打印守护进程
+diff -Nru kdelibs-release-3.4.0/kdeprint/kprinter.cpp kdelibs-branch-3.4/kdeprint/kprinter.cpp
+--- kdelibs-release-3.4.0/kdeprint/kprinter.cpp 2005-01-19 10:30:01.000000000 -0500
++++ kdelibs-branch-3.4/kdeprint/kprinter.cpp 2005-03-23 03:53:21.000000000 -0500
+@@ -484,8 +484,6 @@
+ if (!option("kde-range").isEmpty())
+ {
+ QStringList ranges = QStringList::split(',',option("kde-range"),false);
+- // use a temporary map to insure uniqueness of pages.
+- QMap<int,int> pages;
+ for (QStringList::ConstIterator it=ranges.begin();it!=ranges.end();++it)
+ {
+ int p = (*it).find('-');
+@@ -494,7 +492,7 @@
+ {
+ int pp = (*it).toInt(&ok);
+ if (ok && pp >= mp && pp <= MP)
+- pages[pp] = 1;
++ list.append(pp);
+ }
+ else
+ {
+@@ -507,15 +505,10 @@
+ p1 = QMAX(mp,p1);
+ p2 = QMIN(MP,p2);
+ for (int i=p1;i<=p2;i++)
+- pages[i] = 1;
++ list.append(i);
+ }
+ }
+ }
+- // translate the map into the list
+- for (QMap<int,int>::ConstIterator it=pages.begin();it!=pages.end();++it)
+- list.append(it.key());
+- // sort the list
+- qHeapSort(list);
+ }
+ else
+ { // add all pages between min and max
+@@ -694,7 +687,7 @@
+
+ void reportError(KPrinter *p)
+ {
+- if (!KNotifyClient::event("printerror",i18n("<p><nobr>A print error occurred. Error message received from system:</nobr></p><br>%1").arg(p->errorMessage())))
++ if (!KNotifyClient::event(0,"printerror",i18n("<p><nobr>A print error occurred. Error message received from system:</nobr></p><br>%1").arg(p->errorMessage())))
+ kdDebug(500) << "could not send notify event" << endl;
+ }
+
+diff -Nru kdelibs-release-3.4.0/kdeprint/lpd/lpd.print kdelibs-branch-3.4/kdeprint/lpd/lpd.print
+--- kdelibs-release-3.4.0/kdeprint/lpd/lpd.print 2005-02-23 00:04:32.000000000 -0500
++++ kdelibs-branch-3.4/kdeprint/lpd/lpd.print 2005-03-07 09:13:23.000000000 -0500
+@@ -6,6 +6,7 @@
+ Comment[az]=LPR (Standard BSD çap sistemi)
+ Comment[be]=LPR (стандартная сыстэма друку BSD)
+ Comment[bn]=এল-পি-আর (স্ট্যাণ্ডার্ড বি-এস-ডি মুদ্রণ ব্যবস্থা)
++Comment[br]=LPR (Reizhiad moulañ reoliek evit BSD)
+ Comment[bs]=LPR (standardni BSD sistem štampe)
+ Comment[ca]=LPR (sistema d'impressió estàndard de BSD)
+ Comment[cs]=LPR (Standardní tiskový systém na BSD)
+@@ -67,7 +68,6 @@
+ Comment[vi]=LPR (Hệ thống chuẩn BSD)
+ Comment[wa]=LPR (Sistinme d' imprimaedje BSD standård)
+ Comment[xh]=LPR (Indlela esezantsi yoshicilelo lwe BSD)
+-Comment[xx]=xxLPR (Standard BSD print system)xx
+ Comment[zh_CN]=LPR (标准 BSD 打印系统)
+ Comment[zh_TW]=LPR (標準 BSD 列印系統)
+ Comment[zu]=LPR (Isistimu yokushicelela evamile ye-BSD)
+diff -Nru kdelibs-release-3.4.0/kdeprint/lpdunix/lpdunix.print kdelibs-branch-3.4/kdeprint/lpdunix/lpdunix.print
+--- kdelibs-release-3.4.0/kdeprint/lpdunix/lpdunix.print 2005-02-23 00:04:34.000000000 -0500
++++ kdelibs-branch-3.4/kdeprint/lpdunix/lpdunix.print 2005-03-07 09:13:24.000000000 -0500
+@@ -64,7 +64,6 @@
+ Comment[ven]=Maitele au phirintha a UNIX (default)
+ Comment[wa]=Sistinme d' imprimaedje djenerike LPD po UNIX (prémetou)
+ Comment[xh]=Indlela Yoshicilelo Ngokubanzi ye UNIX LPD (edaliweyo)
+-Comment[xx]=xxGeneric UNIX LPD Print System (default)xx
+ Comment[zh_CN]=通用 UNIX LPD 打印系统(默认)
+ Comment[zh_TW]=通用 UNIX LPD 列印系統(預設)
+ Comment[zu]=Isistimu Yokushicilela ye-UNIX LPD Kawonke wonke (yokwendalo)
+diff -Nru kdelibs-release-3.4.0/kdeprint/lpr/lpr.print kdelibs-branch-3.4/kdeprint/lpr/lpr.print
+--- kdelibs-release-3.4.0/kdeprint/lpr/lpr.print 2005-02-23 00:04:34.000000000 -0500
++++ kdelibs-branch-3.4/kdeprint/lpr/lpr.print 2005-03-07 09:13:24.000000000 -0500
+@@ -6,6 +6,7 @@
+ Comment[az]=LPR/LPRng Çap Sistemi
+ Comment[be]=LPR/LPRng сыстэма друку
+ Comment[bn]=এল-পি-আর/এল-পি-আর-এন-জি মুদ্রণ ব্যবস্থা
++Comment[br]=Reizhiad moulañ LPR/LPRng
+ Comment[bs]=LPR/LPRng sistem štampe
+ Comment[ca]=Sistema d'impressió LPR/LPRng
+ Comment[cs]=Tiskový systém LPR/LPRng
+@@ -64,7 +65,6 @@
+ Comment[ven]=LPR/Maitele au phirintha a LPRng
+ Comment[wa]=Sistinme d' imprimaedje LPR/LPRng
+ Comment[xh]=LPR/LPRng Indlela Yokushicilela
+-Comment[xx]=xxLPR/LPRng Print Systemxx
+ Comment[zh_CN]=LPR/LPRng 打印系统
+ Comment[zh_TW]=LPR/LPRng 列印系統
+ Comment[zu]=Isistimu Yokushicilela ye-LPR/LRng
+diff -Nru kdelibs-release-3.4.0/kdeprint/management/kmdriverdbwidget.cpp kdelibs-branch-3.4/kdeprint/management/kmdriverdbwidget.cpp
+--- kdelibs-release-3.4.0/kdeprint/management/kmdriverdbwidget.cpp 2004-03-15 05:27:47.000000000 -0500
++++ kdelibs-branch-3.4/kdeprint/management/kmdriverdbwidget.cpp 2005-03-04 07:48:27.000000000 -0500
+@@ -26,7 +26,7 @@
+ #include <klistbox.h>
+ #include <kpushbutton.h>
+ #include <qcheckbox.h>
+-#include <qcursor.h>
++#include <kcursor.h>
+ #include <qapplication.h>
+ #include <kmessagebox.h>
+ #include <qlayout.h>
+@@ -151,7 +151,7 @@
+ {
+ if (!m_valid)
+ {
+- QApplication::setOverrideCursor(waitCursor);
++ QApplication::setOverrideCursor(KCursor::waitCursor());
+ m_manu->clear();
+ m_model->clear();
+ m_manu->insertItem(i18n("Loading..."));
+diff -Nru kdelibs-release-3.4.0/kdeprint/management/smbview.cpp kdelibs-branch-3.4/kdeprint/management/smbview.cpp
+--- kdelibs-release-3.4.0/kdeprint/management/smbview.cpp 2004-03-15 05:27:48.000000000 -0500
++++ kdelibs-branch-3.4/kdeprint/management/smbview.cpp 2005-03-04 07:48:27.000000000 -0500
+@@ -28,6 +28,7 @@
+ #include <klocale.h>
+ #include <kdebug.h>
+ #include <kmessagebox.h>
++#include <kcursor.h>
+
+ //*********************************************************************************************
+
+@@ -84,7 +85,7 @@
+ {
+ m_buffer = QString::null;
+ m_state = state;
+- QApplication::setOverrideCursor(waitCursor);
++ QApplication::setOverrideCursor(KCursor::waitCursor());
+ m_proc->start(KProcess::NotifyOnExit,KProcess::Stdout);
+ emit running(true);
+ }
+diff -Nru kdelibs-release-3.4.0/kdeprint/marginpreview.cpp kdelibs-branch-3.4/kdeprint/marginpreview.cpp
+--- kdelibs-release-3.4.0/kdeprint/marginpreview.cpp 2004-03-15 05:27:39.000000000 -0500
++++ kdelibs-branch-3.4/kdeprint/marginpreview.cpp 2005-03-04 07:48:27.000000000 -0500
+@@ -22,7 +22,7 @@
+ #include <klocale.h>
+ #include <kdebug.h>
+ #include <qpainter.h>
+-#include <qcursor.h>
++#include <kcursor.h>
+
+ #define A4_WIDTH 595
+ #define A4_HEIGHT 842
+@@ -195,14 +195,14 @@
+ {
+ case 1:
+ case 2:
+- setCursor(Qt::SplitHCursor);
++ setCursor(KCursor::sizeVerCursor());
+ break;
+ case 3:
+ case 4:
+- setCursor(Qt::SplitVCursor);
++ setCursor(KCursor::sizeHorCursor());
+ break;
+ default:
+- setCursor(Qt::ArrowCursor);
++ setCursor(KCursor::arrowCursor());
+ break;
+ }
+ }
+diff -Nru kdelibs-release-3.4.0/kdeprint/rlpr/rlpr.print kdelibs-branch-3.4/kdeprint/rlpr/rlpr.print
+--- kdelibs-release-3.4.0/kdeprint/rlpr/rlpr.print 2005-02-23 00:04:34.000000000 -0500
++++ kdelibs-branch-3.4/kdeprint/rlpr/rlpr.print 2005-03-26 02:37:24.000000000 -0500
+@@ -18,7 +18,7 @@
+ Comment[fa]=محیط RLPR (کارگزار LPD از راه دور)
+ Comment[fi]=RLPR-tulostus (LPD-palvelin)
+ Comment[fr]=Environnement RLPR (serveurs LPD distants)
+-Comment[fy]=RLPR-fermidden (LPD-servers op ôfstân)
++Comment[fy]=RLPR-fermidden (LPD-tsjinners op ôfstân)
+ Comment[ga]=Timpeallach RLPR (Cianfhreastalaithe LPD)
+ Comment[gl]=Entorno RLPR (Servidores Remotos LPD)
+ Comment[he]=סביבת RLPR (שרתי LPD מרוחקים)
+@@ -62,7 +62,6 @@
+ Comment[ven]=Vhupo ha RLPR (dzisiva dza LPD)
+ Comment[wa]=Evironmint d' imprimaedje RLPR (sierveus LPD å lon)
+ Comment[xh]=RLPR Imeko-bume ye RLPR (Abancedisi be LPD ababeka kude)
+-Comment[xx]=xxRLPR Environment (Remote LPD servers)xx
+ Comment[zh_CN]=RLPR 环境(远程 LPD 服务器)
+ Comment[zh_TW]=RLPR 環境(遠端 LPD 伺服器)
+ Comment[zu]=Ezendalo ze-RLPR (abalekeleli abakude be-LPD)
+diff -Nru kdelibs-release-3.4.0/kdeprint/specials.desktop kdelibs-branch-3.4/kdeprint/specials.desktop
+--- kdelibs-release-3.4.0/kdeprint/specials.desktop 2005-02-23 00:04:27.000000000 -0500
++++ kdelibs-branch-3.4/kdeprint/specials.desktop 2005-03-30 01:47:19.000000000 -0500
+@@ -69,7 +69,6 @@
+ Name[ven]=Phirinthani kha faela (Bammbiri la poso)
+ Name[wa]=Imprimer en on fitchî (PostScript)
+ Name[xh]=Shicilela Kwifayile (PostScript)
+-Name[xx]=xxPrint to File (PostScript)xx
+ Name[zh_CN]=打印到文件(PostScript)
+ Name[zh_TW]=列印到檔案(PostScript)
+ Name[zu]=Shicilela Efayeleni (PostScript)
+@@ -80,6 +79,7 @@
+ Description[be]=Запісаць у PostScript файл
+ Description[bg]=Запис във файл PostScript
+ Description[bn]=পোস্টস্ক্রিপ্ট ফাইল লেখা হবে
++Description[br]=Moulañ en ur restr PostScript
+ Description[bs]=Piši u PostScript datoteku
+ Description[ca]=Escriure en un fitxer PostScript
+ Description[cs]=Zapisuje do PostScriptového souboru
+@@ -141,7 +141,6 @@
+ Description[vi]=Viết ra file PostScript
+ Description[wa]=Fé on fitchî PostScript
+ Description[xh]=Bhala ifayile ye PostScript
+-Description[xx]=xxWrite PostScript filexx
+ Description[zh_CN]=写入 PostScript 文件
+ Description[zh_TW]=寫成 PostScript 檔案
+ Description[zu]=Bhala ifayile le-PosrtScript
+@@ -214,7 +213,6 @@
+ Comment[vi]=File địa phương
+ Comment[wa]=Fitchî locål
+ Comment[xh]=Ifayile yobulali
+-Comment[xx]=xxLocal filexx
+ Comment[zh_CN]=本地文件
+ Comment[zh_TW]=本地檔案
+ Comment[zu]=Ifayela laseduze
+@@ -271,7 +269,7 @@
+ Name[nso]=Gatisetsa go Faele (PDF)
+ Name[pa]=ਫਾਇਲ਼ ਵਿੱਚ ਛਾਪਣਾ(PDF)
+ Name[pl]=Wydruk do pliku (PDF)
+-Name[pt]=Imprimir para um Ficheiro (PDF/Acrobat)
++Name[pt]=Imprimir para um Ficheiro (PDF)
+ Name[pt_BR]=Imprimir para o Arquivo (PDF)
+ Name[ro]=Tipărire în fişier (PDF)
+ Name[ru]=Печать в файл (PDF)
+@@ -292,7 +290,6 @@
+ Name[ven]=Phirinthani ni kone u faela (PDF)
+ Name[wa]=Imprimer en on fitchî (PDF)
+ Name[xh]=Shicilela Kwifayile (PDF)
+-Name[xx]=xxPrint to File (PDF)xx
+ Name[zh_CN]=打印到文件(PDF)
+ Name[zh_TW]=列印到文件(PDF)
+ Name[zu]=Shicilela Efayeleni (PDF)
+@@ -303,6 +300,7 @@
+ Description[be]=Запісаць у PDF файл
+ Description[bg]=Запис във файл PDF/Acrobat
+ Description[bn]=পি-ডি-এফ/অ্যাক্রোব্যাট ফাইল লেখা হবে
++Description[br]=Moulañ en ur restr PDF/Acrobat
+ Description[bs]=Piši u PDF/Acrobat datoteku
+ Description[ca]=Escriure en un fitxer PDF/Acrobat
+ Description[cs]=Zapisuje do PDF souboru
+@@ -364,7 +362,6 @@
+ Description[vi]=Viết ra file PDF/Acrobat
+ Description[wa]=Fé on fitchî PDF/Acrobat
+ Description[xh]=Bhala PDF/Ifayile ye Acrobat
+-Description[xx]=xxWrite PDF/Acrobat filexx
+ Description[zh_CN]=写入 PDF/Acrobat 文件
+ Description[zh_TW]=寫成 PDF/Acrobat 檔案
+ Description[zu]=Bhala ifayela le-IPDF/Acrobat
+@@ -437,7 +434,6 @@
+ Comment[vi]=File địa phương
+ Comment[wa]=Fitchî locål
+ Comment[xh]=Ifayile yobulali
+-Comment[xx]=xxLocal filexx
+ Comment[zh_CN]=本地文件
+ Comment[zh_TW]=本地檔案
+ Comment[zu]=Ifayela laseduze
+@@ -516,7 +512,6 @@
+ Name[ven]=Rumela kha fekisi
+ Name[wa]=Evoyî so on facs
+ Name[xh]=Thumela kwi Fax
+-Name[xx]=xxSend to Faxxx
+ Name[zh_CN]=发送至传真
+ Name[zh_TW]=發送至傳真
+ Name[zu]=Thumela kwi-fax
+@@ -586,7 +581,6 @@
+ Description[vi]=Gửi tới hềEthống fax ềEbên ngoài (external)
+ Description[wa]=Evoyî so on dfoûtrin sistinme di facs
+ Description[xh]=Thumela kwindlela engaphandle ye fax
+-Description[xx]=xxSend to external fax systemxx
+ Description[zh_CN]=发至外部传真系统
+ Description[zh_TW]=發送到外部傳真系統
+ Description[zu]=Thumela kwisistimu yangaphandle ye-fax
+@@ -596,6 +590,7 @@
+ Comment[az]=Xarici
+ Comment[bg]=Външен файл
+ Comment[bn]=বহিঃস্থ
++Comment[br]=Diavaez
+ Comment[bs]=Vanjski
+ Comment[ca]=Extern
+ Comment[cs]=Externí
+@@ -657,7 +652,6 @@
+ Comment[vi]=Bên ngoài(external)
+ Comment[wa]=Difoûtrin
+ Comment[xh]=Ngaphandle
+-Comment[xx]=xxExternalxx
+ Comment[zh_CN]=外部
+ Comment[zh_TW]=外部
+ Comment[zu]=Ngaphandle
+@@ -733,7 +727,6 @@
+ Comment[ven]=U tangana na mubveledzi wa meili wa K
+ Comment[vi]=Đính vào trình soạn Kmail
+ Comment[xh]=Ufakelo Lomqhambi we KMail
+-Comment[xx]=xxAttachment for KMail Composerxx
+ Comment[zh_CN]=KMail 编写器的附件
+ Comment[zh_TW]=當作 KMail 郵件編輯器的附件
+ Comment[zu]=Ukunamathisela Komsunguli we-KMail
+@@ -804,7 +797,6 @@
+ Description[vi]=Tạo file PDF/Acrobat dưới dạng file đính
+ Description[wa]=Fé des fitchîs PDF/Acrobat come atatchmints po KMail
+ Description[xh]=Yenza PDF/Ifayile yomenzi womthambo njengofakelelo lwe KMail
+-Description[xx]=xxCreates PDF/Acrobat file as attachment for KMailxx
+ Description[zh_CN]=创建 PDF/Acrobat 文件作为 KMail 附件
+ Description[zh_TW]=建立 PDF/Acrobat 文件作為 KMail 附件
+ Description[zu]=Idala ifayela le-PDF/Acrobat libe njengokunamathisela kwe-KMail
+@@ -813,6 +805,7 @@
+ File=1
+ Icon=kmail
+ Name=Mail PDF File
++Name[af]=Pos PDF Lêer
+ Name[be]=Даслаць PDF файл
+ Name[bg]=Изпращане на файл PDF по е-поща
+ Name[bn]=পি-ডি-এফ ফাইল মেইল করো
+@@ -821,6 +814,7 @@
+ Name[cs]=Odeslat PDF soubor emailem
+ Name[da]=Send PDF-fil som e-mail
+ Name[de]=PDF-Datei versenden
++Name[el]=Αποστολή αρχείου PDF μέσω mail
+ Name[eo]=Sendu PDF-dosieron
+ Name[es]=Enviar archivo PDF por correo
+ Name[et]=PDF faili meiliga saatmine
+@@ -851,14 +845,13 @@
+ Name[sk]=Poslať súbor PDF
+ Name[sl]=Pošlji datoteko PDF po pošti
+ Name[sr]=Слање PDF фајла поштом
+-Name[sr@Latn]=Слање PDF фајла поштом
++Name[sr@Latn]=Slanje PDF fajla poštom
+ Name[sv]=Skicka PDF-fil
+ Name[ta]=PDF கோப்பை அஞ்சல் அனுப்பு
+ Name[tg]=Файли почтавии PDF
+ Name[tr]=PDF Dosyasını Postala
+ Name[uk]=Відсилання файлу PDF поштою
+ Name[uz]=PDF-файли сифатида хат орқали жўнатиш
+-Name[xx]=xxMail PDF Filexx
+ Name[zh_CN]=邮寄 PDF 文件
+ Require=exec:/ps2pdf,exec:/kmail
+
+@@ -880,12 +873,13 @@
+ Comment[th]=ส่งโทรสาร K
+ Comment[uz]=Факс жўнатиш
+ Comment[ven]=K i rumela Fekisi
+-Comment[xx]=xxKSendFaxxx
+ Description=Use ksendfax to fax the current document
++Description[af]=Gebruik ksendfax om die huidige dokument te faks
+ Description[ar]=استخدم ksendfax ﻹرسال المستند الحالي بالفاكس
+ Description[az]=Hazırkı sənədi fakslamaq üçün ksendfax vasitəsini işlədin
+ Description[bg]=Изпращане по факс на документа
+ Description[bn]=বর্তমানে নথীটি ksendfax ব্যবহার করে ফ্যাক্স করো
++Description[br]=Implij ksendfax da gas an teul red
+ Description[bs]=Koristite ksendfax za slanje trenutnog dokumenta na fax
+ Description[ca]=Empra el ksendfax per a enviar per fax l'actual document
+ Description[cs]=Použít ksendfax k odfaxování současného dokumentu
+@@ -931,7 +925,7 @@
+ Description[sl]=Uporabite kdsendfax za faksiranje trenutnega dokumenta
+ Description[sq]=Përdor ksendfax për ta dërguar dokumentin aktual me faks
+ Description[sr]=Користите ksendfax да пошаљте текући документ на факс
+-Description[sr@Latn]=Koristi ksendfax da pošalje tekući dokument na faks.
++Description[sr@Latn]=Koristite ksendfax da pošaljte tekući dokument na faks
+ Description[ss]=Sebentisa i-ksendfax kutfumela ngefax kwelidokhumente lanyalo
+ Description[sv]=Använd Ksendfax för att faxa aktuellt dokument
+ Description[ta]=கேஃபாக்ஸ்அனுப்பு மூலம் நடப்பு ஆவணத்தை தொலைநகலிடு
+@@ -942,7 +936,6 @@
+ Description[ven]=Shumisani fekisi yau rumele kha k u fekisa manwalwa a zwino
+ Description[wa]=Eploye ksendfax po-z evoyî pa facs li documint do moumint
+ Description[xh]=Sebenzisa i ksendfax ukuthumela i fax yoxwebhu lwangoku
+-Description[xx]=xxUse ksendfax to fax the current documentxx
+ Description[zh_CN]=使用 ksendfax 发送当前文档
+ Description[zh_TW]=使用 ksendfax 將目前文件傳真出去
+ Description[zu]=Sebenzisa i-ksendfax ukuthumela i-fax yohlu lwamafayela amanje
+@@ -950,10 +943,12 @@
+ File=0
+ Icon=kdeprintfax
+ Name=Advanced Faxing Tool (ksendfax)
++Name[af]=Gevorderde Faks Program (ksendfax)
+ Name[ar]=أداة إرسال فاكس متقدمة (ksendfax)
+ Name[az]=Təkmilləşmiş Faks Vasitəsi (ksendfax)
+ Name[bg]=Разширена факс програма (ksendfax)
+ Name[bn]=উন্নত ফ্যাক্স ব্যবস্থা (ksendfax)
++Name[br]=Ostilh faks barek (ksendfax)
+ Name[bs]=Napredni alat za slanje faxova (ksendfax)
+ Name[ca]=Eina avançada per a enviar per fax (ksendfax)
+ Name[cs]=Pokročilý faxovací nástroj (ksendfax)
+@@ -1010,7 +1005,6 @@
+ Name[uz]=Факс жўнатиш учун кенгайтирилган восита (ksendfax)
+ Name[ven]=Tshishumiswa tsha fekisi ya khwinesa (ksendfax)
+ Name[xh]=Isixhobo se Fax Esibhekisa phambili (ksendfax)
+-Name[xx]=xxAdvanced Faxing Tool (ksendfax)xx
+ Name[zh_CN]=高级传真工具(ksendfax)
+ Name[zh_TW]=高階傳真工具 (ksendfax)
+ Name[zu]=Ithuluz Lezinga eliphezulu lokuthumela i-fax (ksendfax)
+diff -Nru kdelibs-release-3.4.0/kdeprint/tools/escputil/escputil.desktop kdelibs-branch-3.4/kdeprint/tools/escputil/escputil.desktop
+--- kdelibs-release-3.4.0/kdeprint/tools/escputil/escputil.desktop 2004-10-25 22:42:21.000000000 -0400
++++ kdelibs-branch-3.4/kdeprint/tools/escputil/escputil.desktop 2005-03-07 09:13:25.000000000 -0500
+@@ -24,7 +24,6 @@
+ Name[pt]=Jacto de Tinta da EPSON
+ Name[ta]=EPSON இங்க்ஜெட்
+ Name[th]=เครื่องพิมพ์อิงค์เจตเอปสัน
+-Name[xx]=xxEPSON InkJetxx
+ Name[zh_TW]=EPSON 噴墨印表機
+ Type=Service
+
+diff -Nru kdelibs-release-3.4.0/kdeprint/tools/escputil/escpwidget.cpp kdelibs-branch-3.4/kdeprint/tools/escputil/escpwidget.cpp
+--- kdelibs-release-3.4.0/kdeprint/tools/escputil/escpwidget.cpp 2004-03-15 05:27:51.000000000 -0500
++++ kdelibs-branch-3.4/kdeprint/tools/escputil/escpwidget.cpp 2005-04-03 12:30:35.000000000 -0400
+@@ -24,6 +24,7 @@
+ #include <qlabel.h>
+ #include <qcheckbox.h>
+ #include <qaccel.h>
++#include <kdemacros.h>
+ #include <klocale.h>
+ #include <kmessagebox.h>
+ #include <kstandarddirs.h>
+@@ -53,6 +54,7 @@
+
+ extern "C"
+ {
++ void* init_kdeprint_tool_escputil() KDE_EXPORT;
+ void* init_kdeprint_tool_escputil()
+ {
+ return new EscpFactory;
+diff -Nru kdelibs-release-3.4.0/kdeui/kactioncollection.h kdelibs-branch-3.4/kdeui/kactioncollection.h
+--- kdelibs-release-3.4.0/kdeui/kactioncollection.h 2005-01-29 14:20:07.000000000 -0500
++++ kdelibs-branch-3.4/kdeui/kactioncollection.h 2005-03-18 02:17:11.000000000 -0500
+@@ -54,6 +54,7 @@
+ class KActionCollection;
+ class KPopupMenu;
+ class KMainWindow;
++class KXMLGUIClient;
+
+ typedef QValueList<KAction *> KActionPtrList;
+
+diff -Nru kdelibs-release-3.4.0/kdeui/kcompletionbox.cpp kdelibs-branch-3.4/kdeui/kcompletionbox.cpp
+--- kdelibs-release-3.4.0/kdeui/kcompletionbox.cpp 2005-01-08 11:20:44.000000000 -0500
++++ kdelibs-branch-3.4/kdeui/kcompletionbox.cpp 2005-03-20 13:03:30.000000000 -0500
+@@ -2,7 +2,7 @@
+
+ Copyright (c) 2000,2001,2002 Carsten Pfeiffer <pfeiffer@kde.org>
+ Copyright (c) 2000 Stefan Schimanski <1Stein@gmx.de>
+- Copyright (c) 2000,2001 Dawit Alemayehu <adawit@kde.org>
++ Copyright (c) 2000,2001,2002,2003,2004 Dawit Alemayehu <adawit@kde.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+@@ -41,6 +41,7 @@
+ bool tabHandling;
+ bool down_workaround;
+ bool upwardBox;
++ bool emitSelected;
+ };
+
+ KCompletionBox::KCompletionBox( QWidget *parent, const char *name )
+@@ -51,6 +52,7 @@
+ d->tabHandling = true;
+ d->down_workaround = false;
+ d->upwardBox = false;
++ d->emitSelected = true;
+
+ setColumnMode( 1 );
+ setLineWidth( 1 );
+@@ -132,17 +134,14 @@
+ ev->accept();
+ return true;
+ case Key_Up:
+-
+ // If there is no selected item and we've popped up above
+ // our parent, select the first item when they press up.
+-
+- if ( selectedItem() ||
++ if ( selectedItem() ||
+ mapToGlobal( QPoint( 0, 0 ) ).y() >
+ d->m_parent->mapToGlobal( QPoint( 0, 0 ) ).y() )
+ up();
+ else
+ down();
+-
+ ev->accept();
+ return true;
+ case Key_Prior:
+@@ -234,6 +233,14 @@
+ QMouseEvent *ev = static_cast<QMouseEvent *>( e );
+ if ( !rect().contains( ev->pos() )) // this widget
+ hide();
++
++ if ( !d->emitSelected && currentItem() )
++ {
++ emit highlighted( currentText() );
++ hide();
++ ev->accept(); // Consume the mouse click event...
++ return true;
++ }
+ }
+
+ return KListBox::eventFilter( o, e );
+@@ -539,6 +546,16 @@
+ }
+ }
+
++void KCompletionBox::setActivateOnSelect(bool state)
++{
++ d->emitSelected = state;
++}
++
++bool KCompletionBox::activateOnSelect() const
++{
++ return d->emitSelected;
++}
++
+ void KCompletionBox::virtual_hook( int id, void* data )
+ { KListBox::virtual_hook( id, data ); }
+
+diff -Nru kdelibs-release-3.4.0/kdeui/kcompletionbox.h kdelibs-branch-3.4/kdeui/kcompletionbox.h
+--- kdelibs-release-3.4.0/kdeui/kcompletionbox.h 2004-11-11 09:34:06.000000000 -0500
++++ kdelibs-branch-3.4/kdeui/kcompletionbox.h 2005-03-07 20:23:10.000000000 -0500
+@@ -2,6 +2,7 @@
+
+ Copyright (c) 2000 Carsten Pfeiffer <pfeiffer@kde.org>
+ 2000 Stefan Schimanski <1Stein@gmx.de>
++ 2000,2001,2002,2003,2004 Dawit Alemayehu <adawit@kde.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+@@ -44,6 +45,7 @@
+ Q_OBJECT
+ Q_PROPERTY( bool isTabHandling READ isTabHandling WRITE setTabHandling )
+ Q_PROPERTY(QString cancelledText READ cancelledText WRITE setCancelledText)
++ Q_PROPERTY( bool activateOnSelect READ activateOnSelect WRITE setActivateOnSelect )
+
+ public:
+ /**
+@@ -61,6 +63,13 @@
+
+ virtual QSize sizeHint() const;
+
++ /**
++ * @returns true if selecting an item results in the emition of the @ref selected signal.
++ *
++ * @since 3.4.1
++ */
++ bool activateOnSelect() const;
++
+ public slots:
+ /**
+ * Returns a list of all items currently in the box.
+@@ -131,6 +140,16 @@
+ QString cancelledText() const;
+
+ /**
++ * Set whether or not the selected signal should be emitted when an
++ * item is selected. By default the @ref selevted signal is emitted.
++ *
++ * @param state false if the signal should not be emitted.
++ * @since 3.4.1
++ */
++ void setActivateOnSelect(bool state);
++
++
++ /**
+ * Moves the selection one line down or select the first item if nothing is selected yet.
+ */
+ void down();
+diff -Nru kdelibs-release-3.4.0/kdeui/kdetrayproxy/kdetrayproxy.desktop kdelibs-branch-3.4/kdeui/kdetrayproxy/kdetrayproxy.desktop
+--- kdelibs-release-3.4.0/kdeui/kdetrayproxy/kdetrayproxy.desktop 2005-02-23 00:04:35.000000000 -0500
++++ kdelibs-branch-3.4/kdeui/kdetrayproxy/kdetrayproxy.desktop 2005-03-10 11:04:48.000000000 -0500
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=KDE Tray Proxy Module
++Name[af]=KDE Skinkbord Proksie Module
+ Name[bn]=কে.ডি.ই. ট্রে প্রক্সি মডিউল
+ Name[bs]=KDE proxy modul za tray
+ Name[ca]=Mòdul de safata d'intermediari del KDE
+@@ -36,15 +37,15 @@
+ Name[sk]=Modul pre proxy lišty KDE
+ Name[sl]=Modul posrednika sistemske vrstice KDE
+ Name[sr]=Прокси модул KDE-ове касете
+-Name[sr@Latn]=Прокси модул KDE-ове касете
++Name[sr@Latn]=Proksi modul KDE-ove kasete
+ Name[sv]=KDE-proxymodul för systembricka
+ Name[ta]=KDE தட்டு மாற்று பதிலாள் கூறு
+ Name[tg]=Новаи KDE-и модули прокси
+ Name[tr]=KDE Görev Çubuğu Vekil Birimi
+ Name[uk]=Модуль посередника для програм в системному лотку
+-Name[xx]=xxKDE Tray Proxy Modulexx
+ 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[bg]=Модул, който позволява на програмите от КДЕ да работят в системния поднос с други мениджъри на прозорци
+ Comment[bn]=কে.ডি.ই. সিস-ট্রে অ্যাপলিকেশন কে-উইন ছাড়াই কাজ করাবার জন্য প্রক্সি
+ Comment[bs]=Proxy koji omogućuje KDE systray programima da rade izvan KWin-a
+@@ -80,13 +81,12 @@
+ Comment[sk]=Proxy pre aplikácie z lišty KDE, aby nevyžadovali KWin
+ Comment[sl]=Posrednik, ki omogoča programom sistemske vrstice KDE, da delujejo brez KWin
+ Comment[sr]=Прокси који омогућава KDE програмима за системску касету да раде без KWin-а
+-Comment[sr@Latn]=Прокси који омогућава KDE програмима за системску касету да раде без KWin-а
++Comment[sr@Latn]=Proksi koji omogućava KDE programima za sistemsku kasetu da rade bez KWin-a
+ Comment[sv]=Proxymodul som gör det möjligt för KDE:s program i systembrickan att fungera utan Kwin
+ Comment[ta]=மாற்று பதிலாள் KDE அமைப்பு தட்டு பயன்பாட்டை KWin இல்லாமல் வேலை செய்ய செயல்படுத்துகிறது
+ Comment[tg]=Proxy барномаҳои KDE systray-ро барои корнамоӣ, бидуни KWin фаъол месозад
+ Comment[tr]=Vekil sunucu etkinleştirme KDE sistem çubuğu uygulamalarının KWin olmadan çalıştırır.
+ Comment[uk]=Програма посередник яка дозволяє працювати програмам для KDE, що використовують системний лоток без працюючого KWin
+-Comment[xx]=xxProxy enabling KDE systray applications to work without KWinxx
+ Comment[zh_CN]=允许 KDE 系统托盘应用程序在没有 KWin 的情况下工作
+ ServiceTypes=KDEDModule
+ X-KDE-ModuleType=Library
+diff -Nru kdelibs-release-3.4.0/kdeui/kdockwidget.cpp kdelibs-branch-3.4/kdeui/kdockwidget.cpp
+--- kdelibs-release-3.4.0/kdeui/kdockwidget.cpp 2004-12-10 18:11:55.000000000 -0500
++++ kdelibs-branch-3.4/kdeui/kdockwidget.cpp 2005-03-04 13:47:19.000000000 -0500
+@@ -1245,6 +1245,7 @@
+ void KDockWidget::restoreFromForcedFixedSize()
+ {
+ d->forcedWidth=-1;
++ d->forcedHeight=-1;
+ setMinimumWidth(0);
+ setMaximumWidth(32000);
+ setMinimumHeight(0);
+@@ -2021,17 +2022,54 @@
+ currentDragWidget->move( QCursor::pos() - d->dragOffset );
+ }
+ else {
++ // curPos is the current target DockPosition.
++ // currentDragWidget->prevSideDockPosBeforeDrag is where the dockwidget comes from.
++ // currentDragWidget->formerDockPos is the position *before* the dockwidget was in
++ // position currentDragWidget->prevSideDockPosBeforeDrag.
+ int splitPos = currentDragWidget->d->splitPosInPercent;
+- // do we have to calculate 100%-splitPosInPercent?
+- if( (curPos != currentDragWidget->prevSideDockPosBeforeDrag) && (curPos != KDockWidget::DockCenter) && (curPos != KDockWidget::DockDesktop)) {
+- switch( currentDragWidget->prevSideDockPosBeforeDrag) {
+- case KDockWidget::DockLeft: if(curPos != KDockWidget::DockTop) splitPos = 100-splitPos; break;
+- case KDockWidget::DockRight: if(curPos != KDockWidget::DockBottom) splitPos = 100-splitPos; break;
+- case KDockWidget::DockTop: if(curPos != KDockWidget::DockLeft) splitPos = 100-splitPos; break;
+- case KDockWidget::DockBottom: if(curPos != KDockWidget::DockRight) splitPos = 100-splitPos; break;
++ KDockWidget::DockPosition previousPosition = currentDragWidget->prevSideDockPosBeforeDrag;
++
++// kdDebug() << splitPos << endl;
++// kdDebug() << "curPos: " << curPos << endl;
++// kdDebug() << "formerDockPos: " << currentDragWidget->formerDockPos<< endl;
++// kdDebug() << "prevSideDockPosBeforeDrag: " << currentDragWidget->prevSideDockPosBeforeDrag<< endl;
++
++ // Now we *need* to "invert" the procentual value, if the dockwidget moves from top/left
++ // to bottom/right or vice versa. This keeps the dockwidget's size on its new position.
++ // A special case is, when the dock position was DockNone, then we have to look for the
++ // formerDockPos to get things right.
++ if( (curPos != previousPosition)
++ && (curPos != KDockWidget::DockCenter) && (curPos != KDockWidget::DockDesktop)) {
++
++ if (previousPosition == KDockWidget::DockNone)
++ previousPosition = currentDragWidget->formerDockPos;
++
++ switch( previousPosition ) {
++ case KDockWidget::DockLeft:
++ if(curPos != KDockWidget::DockTop && curPos != KDockWidget::DockLeft)
++ splitPos = 100 - splitPos;
++ break;
++
++ case KDockWidget::DockRight:
++ if(curPos != KDockWidget::DockBottom && curPos != KDockWidget::DockRight)
++ splitPos = 100 - splitPos;
++ break;
++
++ case KDockWidget::DockTop:
++ if(curPos != KDockWidget::DockLeft && curPos != KDockWidget::DockTop )
++ splitPos = 100 - splitPos;
++ break;
++
++ case KDockWidget::DockBottom:
++ if(curPos != KDockWidget::DockRight && curPos != KDockWidget::DockBottom )
++ splitPos = 100 - splitPos;
++ break;
++
+ default: break;
+ }
+ }
++ // set new prevSideDockPosBeforeDrag
++ currentDragWidget->prevSideDockPosBeforeDrag = curPos;
+ currentDragWidget->manualDock( currentMoveWidget, curPos , splitPos, QCursor::pos() - d->dragOffset );
+ currentDragWidget->makeDockVisible();
+ }
+diff -Nru kdelibs-release-3.4.0/kdeui/kdockwidget_private.cpp kdelibs-branch-3.4/kdeui/kdockwidget_private.cpp
+--- kdelibs-release-3.4.0/kdeui/kdockwidget_private.cpp 2005-01-19 11:46:07.000000000 -0500
++++ kdelibs-branch-3.4/kdeui/kdockwidget_private.cpp 2005-03-04 18:00:16.000000000 -0500
+@@ -71,8 +71,8 @@
+ updateName();
+ divider->show();
+ resizeEvent(0);
+- if (fixedWidth0!=-1) restoreFromForcedFixedSize((KDockWidget*)child0);
+- if (fixedWidth1!=-1) restoreFromForcedFixedSize((KDockWidget*)child1);
++ if (fixedWidth0!=-1 || fixedHeight0!=-1) restoreFromForcedFixedSize((KDockWidget*)child0);
++ if (fixedWidth1!=-1 || fixedHeight1!=-1) restoreFromForcedFixedSize((KDockWidget*)child1);
+ if (((KDockWidget*)child0)->forcedFixedWidth()!=-1)
+ {
+ setForcedFixedWidth(((KDockWidget*)child0),((KDockWidget*)child0)->forcedFixedWidth());
+diff -Nru kdelibs-release-3.4.0/kdeui/kedittoolbar.cpp kdelibs-branch-3.4/kdeui/kedittoolbar.cpp
+--- kdelibs-release-3.4.0/kdeui/kedittoolbar.cpp 2005-03-02 10:03:49.000000000 -0500
++++ kdelibs-branch-3.4/kdeui/kedittoolbar.cpp 2005-03-18 08:09:25.000000000 -0500
+@@ -1082,9 +1082,7 @@
+ // we're modified, so let this change
+ emit enableOk(true);
+
+- //slotToolbarSelected( m_toolbarCombo->currentText() ); causes #97572
+- delete item;
+- // TODO loadActionList( ... , ActiveListOnly );
++ slotToolbarSelected( m_toolbarCombo->currentText() );
+ }
+
+ void KEditToolbarWidget::slotRemoveButton()
+@@ -1095,10 +1093,7 @@
+ // we're modified, so let this change
+ emit enableOk(true);
+
+- //slotToolbarSelected( m_toolbarCombo->currentText() );
+- delete item;
+- // TODO loadActionList ( ..., InactiveListOnly )
+- // or just add it to the left again.
++ slotToolbarSelected( m_toolbarCombo->currentText() );
+ }
+
+ void KEditToolbarWidget::insertActive(ToolbarItem *item, QListViewItem *before, bool prepend)
+diff -Nru kdelibs-release-3.4.0/kdeui/kkeydialog.cpp kdelibs-branch-3.4/kdeui/kkeydialog.cpp
+--- kdelibs-release-3.4.0/kdeui/kkeydialog.cpp 2005-02-17 19:33:21.000000000 -0500
++++ kdelibs-branch-3.4/kdeui/kkeydialog.cpp 2005-03-30 15:03:59.000000000 -0500
+@@ -948,6 +948,8 @@
+
+ bool KKeyChooser::promptForReassign( const KKeySequence& cut, const QString& sAction, ActionType type, QWidget* parent )
+ {
++ if(cut.isNull())
++ return true;
+ QString sTitle;
+ QString s;
+ if( type == Standard ) {
+diff -Nru kdelibs-release-3.4.0/kdeui/klineedit.cpp kdelibs-branch-3.4/kdeui/klineedit.cpp
+--- kdelibs-release-3.4.0/kdeui/klineedit.cpp 2005-02-01 06:27:30.000000000 -0500
++++ kdelibs-branch-3.4/kdeui/klineedit.cpp 2005-03-08 08:20:19.000000000 -0500
+@@ -1176,6 +1176,14 @@
+ const QString currentSelection = d->completionBox->currentText();
+ d->completionBox->setItems( items );
+ QListBoxItem* item = d->completionBox->findItem( currentSelection, Qt::ExactMatch );
++ // If no item is selected, that means the listbox hasn't been manipulated by the user yet,
++ // because it's not possible otherwise to have no selected item. In such case make
++ // always the first item current and unselected, so that the current item doesn't jump.
++ if( !item || !wasSelected )
++ {
++ wasSelected = false;
++ item = d->completionBox->item( 0 );
++ }
+ if ( item )
+ {
+ d->completionBox->blockSignals( true );
+diff -Nru kdelibs-release-3.4.0/kdeui/klistviewsearchline.cpp kdelibs-branch-3.4/kdeui/klistviewsearchline.cpp
+--- kdelibs-release-3.4.0/kdeui/klistviewsearchline.cpp 2005-02-08 08:07:32.000000000 -0500
++++ kdelibs-branch-3.4/kdeui/klistviewsearchline.cpp 2005-03-26 06:14:20.000000000 -0500
+@@ -19,13 +19,13 @@
+ #include "klistviewsearchline.h"
+
+ #include <klistview.h>
+-#include <kapplication.h>
+ #include <kiconloader.h>
+ #include <ktoolbar.h>
+ #include <ktoolbarbutton.h>
+ #include <kdebug.h>
+ #include <klocale.h>
+
++#include <qapplication.h>
+ #include <qtimer.h>
+ #include <qpopupmenu.h>
+ #include <qlabel.h>
+@@ -413,7 +413,7 @@
+
+ if(!d->clearButton) {
+ d->clearButton = new QToolButton(this);
+- QIconSet icon = SmallIconSet(KApplication::reverseLayout() ? "clear_left" : "locationbar_erase");
++ QIconSet icon = SmallIconSet(QApplication::reverseLayout() ? "clear_left" : "locationbar_erase");
+ d->clearButton->setIconSet(icon);
+ }
+
+@@ -452,7 +452,7 @@
+ if(toolBar->getWidget(id) == this) {
+ toolBar->setItemAutoSized(id);
+ if(!d->clearButton) {
+- QString icon = KApplication::reverseLayout() ? "clear_left" : "locationbar_erase";
++ QString icon = QApplication::reverseLayout() ? "clear_left" : "locationbar_erase";
+ d->clearButton = new KToolBarButton(icon, 2005, toolBar);
+ }
+ toolBar->insertWidget(2005, d->clearButton->width(), d->clearButton, index);
+diff -Nru kdelibs-release-3.4.0/kdeui/kmainwindow.h kdelibs-branch-3.4/kdeui/kmainwindow.h
+--- kdelibs-release-3.4.0/kdeui/kmainwindow.h 2005-01-29 14:20:08.000000000 -0500
++++ kdelibs-branch-3.4/kdeui/kmainwindow.h 2005-03-07 06:25:12.000000000 -0500
+@@ -1037,7 +1037,7 @@
+ const char * classNames[3];
+ classNames[0] = T0::staticMetaObject()->className();
+ classNames[1] = T1::staticMetaObject()->className();
+- classNames[2] = T1::staticMetaObject()->className();
++ classNames[2] = T2::staticMetaObject()->className();
+ for ( int n = 1 ; KMainWindow::canBeRestored( n ) ; ++n ) {
+ const QString className = KMainWindow::classNameOfToplevel( n );
+ if ( className == QString::fromLatin1( classNames[0] ) )
+diff -Nru kdelibs-release-3.4.0/kdeui/kpopupmenu.h kdelibs-branch-3.4/kdeui/kpopupmenu.h
+--- kdelibs-release-3.4.0/kdeui/kpopupmenu.h 2004-12-19 06:05:29.000000000 -0500
++++ kdelibs-branch-3.4/kdeui/kpopupmenu.h 2005-03-10 15:21:20.000000000 -0500
+@@ -16,7 +16,7 @@
+ Boston, MA 02111-1307, USA.
+ */
+ #ifndef _KPOPUP_H
+-#define _KPOPUP_H "$Id: kpopupmenu.h,v 1.35 2004/12/19 11:05:29 faure Exp $"
++#define _KPOPUP_H "$Id: kpopupmenu.h,v 1.35.2.1 2005/03/10 20:21:20 adridg Exp $"
+
+ #define INCLUDE_MENUITEM_DEF
+
+@@ -64,7 +64,7 @@
+ *
+ * You will want to call this before inserting into a menu.
+ */
+- void setTitle(const QString &text, const QPixmap *icon=NULL);
++ void setTitle(const QString &text, const QPixmap *icon=0);
+ /**
+ * Returns the current title.
+ */
+diff -Nru kdelibs-release-3.4.0/kdeui/ksconfig.cpp kdelibs-branch-3.4/kdeui/ksconfig.cpp
+--- kdelibs-release-3.4.0/kdeui/ksconfig.cpp 2005-01-31 13:07:49.000000000 -0500
++++ kdelibs-branch-3.4/kdeui/ksconfig.cpp 2005-03-17 12:23:17.000000000 -0500
+@@ -647,6 +647,8 @@
+ // FIXME: use "aspell dump config" to find out the dict-dir
+ QFileInfo dir ("/usr/lib/aspell");
+ if (!dir.exists() || !dir.isDir())
++ dir.setFile ("/usr/lib/aspell-0.60");
++ if (!dir.exists() || !dir.isDir())
+ dir.setFile ("/usr/local/lib/aspell");
+ if (!dir.exists() || !dir.isDir())
+ dir.setFile ("/usr/share/aspell");
+diff -Nru kdelibs-release-3.4.0/kdeui/kspell.cpp kdelibs-branch-3.4/kdeui/kspell.cpp
+--- kdelibs-release-3.4.0/kdeui/kspell.cpp 2005-02-25 08:15:50.000000000 -0500
++++ kdelibs-branch-3.4/kdeui/kspell.cpp 2005-03-15 04:54:41.000000000 -0500
+@@ -1094,14 +1094,18 @@
+
+ } while( tempe>0 );
+
+- proc->ackRead();
+-
+-
+ if ( tempe == -1 ) { //we were called, but no data seems to be ready...
++ // Make sure we don't get called directly again and make sure we do get
++ // called when new data arrives.
++ NOOUTPUT( check2 );
++ proc->enableReadSignals(true);
++ OUTPUT( check2 );
+ recursive = false;
+ return;
+ }
+
++ proc->ackRead();
++
+ //If there is more to check, then send another line to ISpell.
+ if ( (unsigned int)lastline < origbuffer.length() )
+ {
+diff -Nru kdelibs-release-3.4.0/kdeui/ktoolbarbutton.cpp kdelibs-branch-3.4/kdeui/ktoolbarbutton.cpp
+--- kdelibs-release-3.4.0/kdeui/ktoolbarbutton.cpp 2005-02-17 13:32:37.000000000 -0500
++++ kdelibs-branch-3.4/kdeui/ktoolbarbutton.cpp 2005-03-29 11:59:58.000000000 -0500
+@@ -655,7 +655,7 @@
+ emit clicked( d->m_id );
+
+ // emit buttonClicked when the button was clicked while being in an extension popupmenu
+- if ( !d->m_parent->rect().contains( geometry() ) ) {
++ if ( d->m_parent && !d->m_parent->rect().contains( geometry() ) ) {
+ ButtonState state = KApplication::keyboardMouseState();
+ if ( ( state & MouseButtonMask ) == NoButton )
+ state = ButtonState( LeftButton | state );
+diff -Nru kdelibs-release-3.4.0/kdeui/qxembed.cpp kdelibs-branch-3.4/kdeui/qxembed.cpp
+--- kdelibs-release-3.4.0/kdeui/qxembed.cpp 2004-11-02 10:59:02.000000000 -0500
++++ kdelibs-branch-3.4/kdeui/qxembed.cpp 2005-03-23 03:37:24.000000000 -0500
+@@ -616,8 +616,11 @@
+ // whole embedding application. They compete between themselves and
+ // against Qt (L0690, L0914, L1040, L1310, L1510, L1580).
+ // This would be much simpler if implemented within Qt.
+- d->focusProxy = new QWidget( this, "xembed_focus" );
++ d->focusProxy = new QWidget( topLevelWidget(), "xembed_focus" );
+ d->focusProxy->setGeometry( -1, -1, 1, 1 );
++ d->focusProxy->show();
++ // make sure it's shown - for XSetInputFocus
++ QApplication::sendPostedEvents( d->focusProxy, 0 );
+ // L0903: Install the client side event filters
+ // because they also provide services for the embedder side
+ // See L0660, L0671, L0685.
+diff -Nru kdelibs-release-3.4.0/kdoctools/customization/ca/catalog kdelibs-branch-3.4/kdoctools/customization/ca/catalog
+--- kdelibs-release-3.4.0/kdoctools/customization/ca/catalog 2002-11-28 15:16:12.000000000 -0500
++++ kdelibs-branch-3.4/kdoctools/customization/ca/catalog 2005-03-31 14:04:37.000000000 -0500
+@@ -15,7 +15,9 @@
+ PUBLIC "-//GNU//DOCUMENT GNU Free Documentation License V1.1//CA"
+ "common/fdl-translated"
+ PUBLIC "-//KDE//DOCUMENT GPL Licence Declaration//CA"
+- "entities/underGPL.docbook"
++ "entities/underGPL.docbook"
++PUBLIC "-//KDE//DOCUMENT LGPL Licence Declaration//CA"
++ "entities/underLGPL.docbook"
+ PUBLIC "-//KDE//DOCUMENT FDL Licence Declaration//CA"
+ "entities/underFDL.docbook"
+ PUBLIC "-//KDE//DOCUMENT BSD Licence Declaration//CA"
+diff -Nru kdelibs-release-3.4.0/kdoctools/customization/ca/lang.entities kdelibs-branch-3.4/kdoctools/customization/ca/lang.entities
+--- kdelibs-release-3.4.0/kdoctools/customization/ca/lang.entities 2002-09-29 11:07:25.000000000 -0400
++++ kdelibs-branch-3.4/kdoctools/customization/ca/lang.entities 2005-03-31 14:04:37.000000000 -0500
+@@ -12,6 +12,8 @@
+ <!-- Licence links -->
+ <!ENTITY underGPL PUBLIC "-//KDE//DOCUMENT GPL Licence Declaration//CA"
+ "entities/underGPL.docbook" ><!-- level: para -->
++<!ENTITY underLGPL PUBLIC "-//KDE//DOCUMENT LGPL Licence Declaration//CA"
++ "entities/underLGPL.docbook" ><!-- level: para -->
+ <!ENTITY underFDL PUBLIC "-//KDE//DOCUMENT FDL Licence Declaration//CA"
+ "entities/underFDL.docbook" ><!-- level: para -->
+ <!ENTITY underBSDLicense PUBLIC "-//KDE//DOCUMENT BSD Licence Declaration//CA"
+diff -Nru kdelibs-release-3.4.0/kdoctools/customization/ca/user.entities kdelibs-branch-3.4/kdoctools/customization/ca/user.entities
+--- kdelibs-release-3.4.0/kdoctools/customization/ca/user.entities 2002-12-26 04:52:41.000000000 -0500
++++ kdelibs-branch-3.4/kdoctools/customization/ca/user.entities 2005-03-31 14:04:37.000000000 -0500
+@@ -7,29 +7,30 @@
+ -->
+ <!ENTITY Alt "<keycap>Alt</keycap>">
+ <!ENTITY Retro "<keycap>Retrocés</keycap>"><!-- English: &Backspace; -->
+-<!ENTITY cdrom '<hardware>unitat lectora de CD-ROM</hardware>'>
++<!ENTITY cdrom "<hardware>unitat lectora de CD-ROM</hardware>">
+ <!ENTITY Ctrl "<keycap>Ctrl</keycap>">
+-<!ENTITY ppp '<acronym>ppp</acronym>'><!-- English: &dpi; -->
+-<!ENTITY pex "<abbrev>p.ex.</abbrev>"><!-- English: ⪚ -->
++<!ENTITY ppp "<acronym>ppp</acronym>"><!-- English: &dpi; -->
++<!ENTITY pex "<abbrev>p.ex.</abbrev>"><!-- English: ⪚ -->
+ <!ENTITY Intro "<keycap>Intro</keycap>"><!-- English: &Enter; -->
+ <!ENTITY Esc "<keycap>Esc</keycap>">
+-<!ENTITY etc "<abbrev>etc.</abbrev>">
+-<!ENTITY PMF '<acronym>PMF</acronym>'>
+-<!ENTITY ead "<abbrev>és a dir</abbrev>"><!-- English: &ie; -->
++<!ENTITY etc "<abbrev>etc.</abbrev>">
++<!ENTITY PMF "<acronym>PMF</acronym>"><!-- English: &FAQ; -->
++<!ENTITY ead "<abbrev>és a dir</abbrev>"><!-- English: &ie; -->
+ <!ENTITY centreinfo "<application>Centre d'informació</application>"><!-- English: &infocenter; -->
+ <!ENTITY centrecontrol "<application>Centre de control del &kde;</application>"><!-- English: &kcontrolcenter; -->
+-<!ENTITY BER "botó <mousebutton>esquerra</mousebutton> del ratolí"><!-- English: &LMB; -->
+-<!ENTITY BMR "botó <mousebutton>mig</mousebutton> del ratolí"><!-- English: &MMB; -->
+-<!ENTITY BDR "botó <mousebutton>dret</mousebutton> del ratolí"><!-- English: &RMB; -->
+-<!ENTITY SO "sistema operatiu"><!-- English: &OS; -->
+-<!ENTITY Maj "<keycap>Majús.</keycap>"><!-- English: &Shift; -->
+-<!ENTITY Tab "<keycap>Tabulador</keycap>">
+ <!ENTITY kicon "<guiicon>
+ <inlinemediaobject>
+ <objectinfo><title>Les icones del &kde;</title></objectinfo>
+ <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject>
+ <textobject><phrase>K</phrase></textobject>
+ </inlinemediaobject>
+-</guiicon> icon"><!-- if image is localised, then entityref should be used
++</guiicon> icon"><!-- if image is localised, then entityref should be used
+ instead of fileref -->
+-<!ENTITY kmenu "Menú <guimenu>K</guimenu>">
++<!ENTITY kmenu "Menú <guimenu>K</guimenu>">
++<!ENTITY BER "botó <mousebutton>esquerra</mousebutton> del ratolí"><!-- English: &LMB; -->
++<!ENTITY BMR "botó <mousebutton>mig</mousebutton> del ratolí"><!-- English: &MMB; -->
++<!ENTITY SO "sistema operatiu"><!-- English: &OS; -->
++<!ENTITY BDR "botó <mousebutton>dret</mousebutton> del ratolí"><!-- English: &RMB; -->
++<!ENTITY Maj "<keycap>Majús.</keycap>"><!-- English: &Shift; -->
++<!ENTITY safatasistema "<application>safata del sistema</application>"><!-- English: &systemtray; -->
++<!ENTITY Tab "<keycap>Tabulador</keycap>">
+diff -Nru kdelibs-release-3.4.0/kdoctools/customization/pt-BR/lang.entities kdelibs-branch-3.4/kdoctools/customization/pt-BR/lang.entities
+--- kdelibs-release-3.4.0/kdoctools/customization/pt-BR/lang.entities 2005-01-29 17:11:21.000000000 -0500
++++ kdelibs-branch-3.4/kdoctools/customization/pt-BR/lang.entities 2005-02-26 12:42:01.000000000 -0500
+@@ -1,3 +1,5 @@
++<!-- Do NOT change this file: it provides important defaults -->
++
+ <!ENTITY language "pt-BR">
+
+ <!-- These entities should be translated, should therefore be stored
+diff -Nru kdelibs-release-3.4.0/kdoctools/customization/pt-BR/user.entities kdelibs-branch-3.4/kdoctools/customization/pt-BR/user.entities
+--- kdelibs-release-3.4.0/kdoctools/customization/pt-BR/user.entities 2005-01-29 17:11:21.000000000 -0500
++++ kdelibs-branch-3.4/kdoctools/customization/pt-BR/user.entities 2005-02-26 12:42:01.000000000 -0500
+@@ -7,7 +7,6 @@
+ -->
+
+ <!ENTITY Alt "<keycap>Alt</keycap>">
+-<!ENTITY artsbuilder "construtor arts">
+ <!ENTITY Backspace "<keycap>Esc</keycap>">
+ <!ENTITY cdrom "<hardware>CD-ROM</hardware>">
+ <!ENTITY Ctrl "<keycap>Ctrl</keycap>">
+@@ -16,9 +15,7 @@
+ <!ENTITY Enter "<keycap>Enter</keycap>">
+ <!ENTITY Esc "<keycap>Esc</keycap>">
+ <!ENTITY etc "<abbrev>etc</abbrev>">
+-<!ENTITY ex "<abbrev>por exemplo</abbrev>">
+ <!ENTITY FAQ "Perguntas Mais Freqüentes (do inglês <acronym>FAQ</acronym>)">
+-<!ENTITY HTML '<acronym>HTML</acronym>'>
+ <!ENTITY ie "isto é">
+ <!ENTITY infocenter "<application>Centro de Informações</application>">
+ <!ENTITY kcontrolcenter "<application>Centro de Controle do &kde;</application>">
+diff -Nru kdelibs-release-3.4.0/kdoctools/main_ghelp.cpp kdelibs-branch-3.4/kdoctools/main_ghelp.cpp
+--- kdelibs-release-3.4.0/kdoctools/main_ghelp.cpp 2003-04-04 08:36:37.000000000 -0500
++++ kdelibs-branch-3.4/kdoctools/main_ghelp.cpp 2005-03-25 04:10:27.000000000 -0500
+@@ -23,7 +23,7 @@
+
+ extern "C"
+ {
+- int kdemain( int argc, char **argv )
++ KDE_EXPORT int kdemain( int argc, char **argv )
+ {
+ KInstance instance( "kio_ghelp" );
+ fillInstance(instance);
+diff -Nru kdelibs-release-3.4.0/khtml/css/cssparser.cpp kdelibs-branch-3.4/khtml/css/cssparser.cpp
+--- kdelibs-release-3.4.0/khtml/css/cssparser.cpp 2005-02-15 10:45:09.000000000 -0500
++++ kdelibs-branch-3.4/khtml/css/cssparser.cpp 2005-03-18 11:29:47.000000000 -0500
+@@ -1313,7 +1313,7 @@
+ inParseShortHand = true;
+
+ bool found = false;
+- bool oldPropIndex = numParsedProperties;
++ int oldPropIndex = numParsedProperties;
+ bool fnd[6]; //Trust me ;)
+ for( int i = 0; i < numProperties; i++ )
+ fnd[i] = false;
+diff -Nru kdelibs-release-3.4.0/khtml/ecma/kjs_dom.cpp kdelibs-branch-3.4/khtml/ecma/kjs_dom.cpp
+--- kdelibs-release-3.4.0/khtml/ecma/kjs_dom.cpp 2005-02-13 17:31:38.000000000 -0500
++++ kdelibs-branch-3.4/khtml/ecma/kjs_dom.cpp 2005-03-18 11:26:45.000000000 -0500
+@@ -292,9 +292,19 @@
+ case ScrollHeight:
+ return rend ? static_cast<Value>( Number(rend->scrollHeight()) ) : Undefined();
+ case ScrollLeft:
+- return Number( rend && rend->layer() ? rend->layer()->scrollXOffset() : 0 );
++ if (rend && rend->layer()) {
++ if (rend->isRoot() && !rend->style()->hidesOverflow())
++ return Number( node.ownerDocument().view() ? node.ownerDocument().view()->contentsX() : 0);
++ return Number( rend->layer()->scrollXOffset() );
++ }
++ return Number( 0 );
+ case ScrollTop:
+- return Number( rend && rend->layer() ? rend->layer()->scrollYOffset() : 0 );
++ if (rend && rend->layer()) {
++ if (rend->isRoot() && !rend->style()->hidesOverflow())
++ return Number( node.ownerDocument().view() ? node.ownerDocument().view()->contentsY() : 0);
++ return Number( rend->layer()->scrollYOffset() );
++ }
++ return Number( 0 );
+ default:
+ kdDebug(6070) << "WARNING: Unhandled token in DOMNode::getValueProperty : " << token << endl;
+ break;
+@@ -393,14 +403,28 @@
+ break;
+ case ScrollTop: {
+ khtml::RenderObject *rend = node.handle() ? node.handle()->renderer() : 0L;
+- if (rend && rend->layer() && rend->style()->hidesOverflow())
+- rend->layer()->scrollToYOffset(value.toInt32(exec));
++ if (rend && rend->layer()) {
++ if (rend->style()->hidesOverflow())
++ rend->layer()->scrollToYOffset(value.toInt32(exec));
++ else if (rend->isRoot()) {
++ QScrollView* sview = node.ownerDocument().view();
++ if (sview)
++ sview->setContentsPos(sview->contentsX(), value.toInt32(exec));
++ }
++ }
+ break;
+ }
+ case ScrollLeft: {
+ khtml::RenderObject *rend = node.handle() ? node.handle()->renderer() : 0L;
+- if (rend && rend->layer() && rend->style()->hidesOverflow())
+- rend->layer()->scrollToXOffset(value.toInt32(exec));
++ if (rend && rend->layer()) {
++ if (rend->style()->hidesOverflow())
++ rend->layer()->scrollToXOffset(value.toInt32(exec));
++ else if (rend->isRoot()) {
++ QScrollView* sview = node.ownerDocument().view();
++ if (sview)
++ sview->setContentsPos(value.toInt32(exec), sview->contentsY());
++ }
++ }
+ break;
+ }
+ default:
+diff -Nru kdelibs-release-3.4.0/khtml/ecma/kjs_window.cpp kdelibs-branch-3.4/khtml/ecma/kjs_window.cpp
+--- kdelibs-release-3.4.0/khtml/ecma/kjs_window.cpp 2005-02-02 13:27:49.000000000 -0500
++++ kdelibs-branch-3.4/khtml/ecma/kjs_window.cpp 2005-03-09 13:06:54.000000000 -0500
+@@ -1751,11 +1751,11 @@
+ timerId = _timerId;
+ }
+
+-void ScheduledAction::execute(Window *window)
++bool ScheduledAction::execute(Window *window)
+ {
+ KHTMLPart *part = ::qt_cast<KHTMLPart *>(window->m_frame->m_part);
+- if (!part)
+- return;
++ if (!part || !part->jScriptEnabled())
++ return false;
+ ScriptInterpreter *interpreter = static_cast<ScriptInterpreter *>(part->jScript()->interpreter());
+
+ interpreter->setProcessingTimerCallback(true);
+@@ -1785,6 +1785,7 @@
+ }
+
+ interpreter->setProcessingTimerCallback(false);
++ return true;
+ }
+
+ void ScheduledAction::mark()
+@@ -1910,8 +1911,11 @@
+
+ if (action->singleShot)
+ scheduledActions.removeRef(action);
+- if (parent->part())
+- action->execute(parent);
++ if (parent->part()) {
++ bool ok = action->execute(parent);
++ if ( !ok ) // e.g. JS disabled
++ scheduledActions.removeRef( action );
++ }
+
+ action->executing = false;
+
+diff -Nru kdelibs-release-3.4.0/khtml/ecma/kjs_window.h kdelibs-branch-3.4/khtml/ecma/kjs_window.h
+--- kdelibs-release-3.4.0/khtml/ecma/kjs_window.h 2004-09-02 17:07:09.000000000 -0400
++++ kdelibs-branch-3.4/khtml/ecma/kjs_window.h 2005-03-09 13:06:54.000000000 -0500
+@@ -179,7 +179,7 @@
+ ScheduledAction(Object _func, List _args, QTime _nextTime, int _interval, bool _singleShot, int _timerId);
+ ScheduledAction(QString _code, QTime _nextTime, int _interval, bool _singleShot, int _timerId);
+ ~ScheduledAction();
+- void execute(Window *window);
++ bool execute(Window *window);
+ void mark();
+
+ ObjectImp *func;
+diff -Nru kdelibs-release-3.4.0/khtml/html/html_baseimpl.cpp kdelibs-branch-3.4/khtml/html/html_baseimpl.cpp
+--- kdelibs-release-3.4.0/khtml/html/html_baseimpl.cpp 2004-12-21 10:31:18.000000000 -0500
++++ kdelibs-branch-3.4/khtml/html/html_baseimpl.cpp 2005-03-18 11:31:07.000000000 -0500
+@@ -206,7 +206,11 @@
+ RenderStyle* style = getDocument()->styleSelector()->styleForElement(this);
+ style->ref();
+ if (parentNode()->renderer() && style->display() != NONE) {
+- m_render = new (getDocument()->renderArena()) RenderBody(this);
++ if (style->display() == BLOCK)
++ // only use the quirky class for block display
++ m_render = new (getDocument()->renderArena()) RenderBody(this);
++ else
++ m_render = RenderObject::createObject(this, style);
+ m_render->setStyle(style);
+ parentNode()->renderer()->addChild(m_render, nextRenderer());
+ }
+diff -Nru kdelibs-release-3.4.0/khtml/html/html_formimpl.cpp kdelibs-branch-3.4/khtml/html/html_formimpl.cpp
+--- kdelibs-release-3.4.0/khtml/html/html_formimpl.cpp 2005-02-20 12:36:46.000000000 -0500
++++ kdelibs-branch-3.4/khtml/html/html_formimpl.cpp 2005-03-08 06:07:51.000000000 -0500
+@@ -1604,6 +1604,11 @@
+ m_render->absolutePosition(offsetX,offsetY);
+ xPos = me->clientX()-offsetX;
+ yPos = me->clientY()-offsetY;
++ KHTMLView* v = getDocument()->view();
++ if ( v ) {
++ xPos += v->contentsX();
++ yPos += v->contentsY();
++ }
+ }
+ }
+
+@@ -2463,13 +2468,13 @@
+ if ( m_render && m_initialized ) {
+ RenderTextArea* renderArea = static_cast<RenderTextArea*>( m_render );
+ m_value = renderArea->text();
++ m_dirtyvalue = false; // before onChange (#100963)
+ onChange();
+ } else {
+ m_value = defaultValue().string();
+ m_initialized = true;
++ m_dirtyvalue = false;
+ }
+-
+- m_dirtyvalue = false;
+ }
+
+ if ( m_value.isNull() ) return "";
+diff -Nru kdelibs-release-3.4.0/khtml/html/html_imageimpl.cpp kdelibs-branch-3.4/khtml/html/html_imageimpl.cpp
+--- kdelibs-release-3.4.0/khtml/html/html_imageimpl.cpp 2004-12-31 16:42:24.000000000 -0500
++++ kdelibs-branch-3.4/khtml/html/html_imageimpl.cpp 2005-03-18 11:23:31.000000000 -0500
+@@ -181,13 +181,13 @@
+ _style->display() != NONE)
+ {
+ m_render = new (getDocument()->renderArena()) RenderImage(this);
+- m_render->setStyle(getDocument()->styleSelector()->styleForElement(this));
++ m_render->setStyle(_style);
+ parentNode()->renderer()->addChild(m_render, nextRenderer());
+- m_render->updateFromElement();
+ }
+ _style->deref();
+-
+ NodeBaseImpl::attach();
++ if (m_render)
++ m_render->updateFromElement();
+ }
+
+ long HTMLImageElementImpl::width() const
+@@ -201,7 +201,8 @@
+ getDocument()->view()->layout();
+ }
+
+- return m_render->contentWidth();
++ return m_render ? m_render->contentWidth() :
++ getAttribute(ATTR_WIDTH).toInt();
+ }
+
+ long HTMLImageElementImpl::height() const
+@@ -215,7 +216,8 @@
+ getDocument()->view()->layout();
+ }
+
+- return m_render->contentHeight();
++ return m_render ? m_render->contentHeight() :
++ getAttribute(ATTR_HEIGHT).toInt();
+ }
+
+ QImage HTMLImageElementImpl::currentImage() const
+diff -Nru kdelibs-release-3.4.0/khtml/java/kjavaappletviewer.desktop kdelibs-branch-3.4/khtml/java/kjavaappletviewer.desktop
+--- kdelibs-release-3.4.0/khtml/java/kjavaappletviewer.desktop 2005-02-21 04:17:19.000000000 -0500
++++ kdelibs-branch-3.4/khtml/java/kjavaappletviewer.desktop 2005-03-10 11:04:49.000000000 -0500
+@@ -1,10 +1,12 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Embedded Java Applet Viewer
++Name[af]=Ingelegde Java Program Bekyker
+ Name[ar]=عارض بريمجات جافا المدمج
+ Name[az]=Daxili Java Applet Nümayişçisi
+ Name[bg]=Вграден визуализатор на аплети Java
+ Name[bn]=অভ্যন্তরীণ জাভা অ্যাপলেট প্রদর্শক
++Name[br]=Lenner enframmet eus arloadigoù Java
+ Name[ca]=Applet encastable del visor Java
+ Name[cs]=Zabudovaný prohlížeč Java appletů
+ Name[cy]=Gwelydd Rhaglennig Java Mewnadeiladedig
+@@ -57,7 +59,6 @@
+ Name[uk]=Вмонтований переглядач аплетів Java
+ Name[uz]=Ички Java апплетини кўрувчи
+ Name[wa]=Ravalé håyneu d' apliketes Java
+-Name[xx]=xxEmbedded Java Applet Viewerxx
+ Name[zh_CN]=嵌入的 Java 小程序查看器
+ Name[zh_TW]=Embedded Java Applet 檢視器
+ X-KDE-Library=kjavaappletviewer
+diff -Nru kdelibs-release-3.4.0/khtml/khtml.desktop kdelibs-branch-3.4/khtml/khtml.desktop
+--- kdelibs-release-3.4.0/khtml/khtml.desktop 2005-01-20 23:24:08.000000000 -0500
++++ kdelibs-branch-3.4/khtml/khtml.desktop 2005-03-27 02:28:42.000000000 -0500
+@@ -25,7 +25,7 @@
+ Comment[fy]=Yn te sluten HTML-werjeftekomponint
+ Comment[ga]=Comhpháirt inleabaithe amharctha HTML
+ Comment[gl]=Compoñente embebible de visualización de HTML
+-Comment[he]=רכיב בר-הטבעה לתצוגת HTML
++Comment[he]=רכיב בר־הטבעה לתצוגת HTML
+ Comment[hi]=अंतर्निहित योग्य HTML दर्शक घटक
+ Comment[hr]=HTML komponenta koja se može umetnuti
+ Comment[hu]=Beágyazható HTML-néző komponens
+@@ -69,16 +69,13 @@
+ Comment[ven]=Khomphonente ya HTML yau vhona
+ Comment[vi]=Component đềExem HTML có thềEembeđ được
+ Comment[xh]=Inxenye yemboniselo elungisiweyo ye HTML
+-Comment[xx]=xxEmbeddable HTML viewing componentxx
+ Comment[zh_CN]=可嵌入的 HTML 查看部件
+ Comment[zh_TW]=可嵌入的 HTML 檢視元件
+ Comment[zu]= Ilunga lokubuka le-HTML Eshuthekiwe
+ MimeType=text/html;text/xml;application/xhtml+xml;
+ Icon=konqueror
+ Name=KHTML
+-Name[af]=Khtml
+ Name[hi]=केएचटीएमएल (KHTML)
+-Name[xx]=xxKHTMLxx
+ ServiceTypes=KParts/ReadOnlyPart,Browser/View
+ X-KDE-Library=libkhtmlpart
+ InitialPreference=10
+diff -Nru kdelibs-release-3.4.0/khtml/khtmlimage.desktop kdelibs-branch-3.4/khtml/khtmlimage.desktop
+--- kdelibs-release-3.4.0/khtml/khtmlimage.desktop 2005-02-23 16:32:44.000000000 -0500
++++ kdelibs-branch-3.4/khtml/khtmlimage.desktop 2005-03-27 02:28:42.000000000 -0500
+@@ -7,6 +7,7 @@
+ Comment[az]=Daxili Rəsm Nümayiş Vasitəsi
+ Comment[bg]=Компонент за вграждане за преглед на изображения
+ Comment[bn]=অভ্যন্তরীণ চিত্র প্রদর্শক উপাদান
++Comment[br]=Parzh skeudenn gweler enframmus
+ Comment[bs]=Umetljiva komponenta za pregled slika
+ Comment[ca]=Component encastable per a visualitzar imatges
+ Comment[cs]=Komponenta pro zobrazování obrázků
+@@ -24,7 +25,7 @@
+ Comment[fy]=Yn te sluten komponint foar byldwerjefte
+ Comment[ga]=Comhpháirt inleabaithe amharctha íomhá
+ Comment[gl]=Compoñente de visualización de imaxes embebible
+-Comment[he]=רכיב בר-הטבעה להצגת תמונות
++Comment[he]=רכיב בר־הטבעה להצגת תמונות
+ Comment[hi]=अंतर्निहित योग्य छवि दर्शक घटक
+ Comment[hr]=Ugradiva komponenta za pregled slika
+ Comment[hu]=Beágyazható képnéző komponens
+@@ -67,7 +68,6 @@
+ Comment[ven]=Khomphonente yau vhona tshifanyiso
+ Comment[vi]=Component đềExem ảnh có thềEembeđ được
+ Comment[xh]=Ingxenye Yemboniselo Yomfanekiso Olungisiweyo
+-Comment[xx]=xxEmbeddable Image Viewing Componentxx
+ Comment[zh_CN]=可嵌入的图像查看部件
+ Comment[zh_TW]=可嵌入的影像檢視元件
+ Comment[zu]=Ilunga Lokubukisa Isithombe Elishuthekayo
+@@ -95,7 +95,7 @@
+ Name[fy]=Yn te sluten byldwerjefte
+ Name[ga]=Amharcán Íomhánna Inleabaithe
+ Name[gl]=Visualizador de Imaxes Embebible
+-Name[he]=מציג תמונות בר-הטבעה
++Name[he]=מציג תמונות בר־הטבעה
+ Name[hi]=अंतर्निहित छवि दर्शक
+ Name[hr]=Ugradivi preglednik slika
+ Name[hu]=Beágyazható képnézegető
+@@ -139,7 +139,6 @@
+ Name[vi]=Trình xem ảnh có thềEembeđ được
+ Name[wa]=Ravalé håyneu d' imådjes
+ Name[xh]=Umboniseli Womfanekiso Olungisiweyo
+-Name[xx]=xxEmbeddable Image Viewerxx
+ Name[zh_CN]=可嵌入的图像查看器
+ Name[zh_TW]=可嵌入的影像檢視器
+ Name[zu]=Isithombe Sombukisi Oshuthisekayo
+diff -Nru kdelibs-release-3.4.0/khtml/khtmlview.cpp kdelibs-branch-3.4/khtml/khtmlview.cpp
+--- kdelibs-release-3.4.0/khtml/khtmlview.cpp 2005-02-22 13:12:36.000000000 -0500
++++ kdelibs-branch-3.4/khtml/khtmlview.cpp 2005-03-29 06:55:13.000000000 -0500
+@@ -1211,35 +1211,37 @@
+
+ void KHTMLView::viewportMouseReleaseEvent( QMouseEvent * _mouse )
+ {
+- if ( !m_part->xmlDocImpl() ) return;
+-
++ bool swallowEvent = false;
+ int xm, ym;
+ viewportToContents(_mouse->x(), _mouse->y(), xm, ym);
+-
+ DOM::NodeImpl::MouseEvent mev( _mouse->stateAfter(), DOM::NodeImpl::MouseRelease );
+- m_part->xmlDocImpl()->prepareMouseEvent( false, xm, ym, &mev );
+
+- bool swallowEvent = dispatchMouseEvent(EventImpl::MOUSEUP_EVENT,mev.innerNode.handle(),mev.innerNonSharedNode.handle(),true,
+- d->clickCount,_mouse,false,DOM::NodeImpl::MouseRelease);
++ if ( m_part->xmlDocImpl() )
++ {
++ m_part->xmlDocImpl()->prepareMouseEvent( false, xm, ym, &mev );
+
+- if (d->clickCount > 0 &&
+- QPoint(d->clickX-xm,d->clickY-ym).manhattanLength() <= QApplication::startDragDistance()) {
+- QMouseEvent me(d->isDoubleClick ? QEvent::MouseButtonDblClick : QEvent::MouseButtonRelease,
+- _mouse->pos(), _mouse->button(), _mouse->state());
+- dispatchMouseEvent(EventImpl::CLICK_EVENT, mev.innerNode.handle(),mev.innerNonSharedNode.handle(),true,
+- d->clickCount, &me, true, DOM::NodeImpl::MouseRelease);
+- }
++ swallowEvent = dispatchMouseEvent(EventImpl::MOUSEUP_EVENT,mev.innerNode.handle(),mev.innerNonSharedNode.handle(),true,
++ d->clickCount,_mouse,false,DOM::NodeImpl::MouseRelease);
+
+- DOM::NodeImpl* fn = m_part->xmlDocImpl()->focusNode();
+- if (fn && fn != mev.innerNode.handle() &&
+- fn->renderer() && fn->renderer()->isWidget() &&
+- _mouse->button() != MidButton) {
+- forwardPeripheralEvent(static_cast<khtml::RenderWidget*>(fn->renderer()), _mouse, xm, ym);
+- }
++ if (d->clickCount > 0 &&
++ QPoint(d->clickX-xm,d->clickY-ym).manhattanLength() <= QApplication::startDragDistance()) {
++ QMouseEvent me(d->isDoubleClick ? QEvent::MouseButtonDblClick : QEvent::MouseButtonRelease,
++ _mouse->pos(), _mouse->button(), _mouse->state());
++ dispatchMouseEvent(EventImpl::CLICK_EVENT, mev.innerNode.handle(),mev.innerNonSharedNode.handle(),true,
++ d->clickCount, &me, true, DOM::NodeImpl::MouseRelease);
++ }
+
+- khtml::RenderObject* r = mev.innerNode.handle() ? mev.innerNode.handle()->renderer() : 0;
+- if (r && r->isWidget())
+- _mouse->ignore();
++ DOM::NodeImpl* fn = m_part->xmlDocImpl()->focusNode();
++ if (fn && fn != mev.innerNode.handle() &&
++ fn->renderer() && fn->renderer()->isWidget() &&
++ _mouse->button() != MidButton) {
++ forwardPeripheralEvent(static_cast<khtml::RenderWidget*>(fn->renderer()), _mouse, xm, ym);
++ }
++
++ khtml::RenderObject* r = mev.innerNode.handle() ? mev.innerNode.handle()->renderer() : 0;
++ if (r && r->isWidget())
++ _mouse->ignore();
++ }
+
+ if (!swallowEvent) {
+ khtml::MouseReleaseEvent event( _mouse, xm, ym, mev.url, mev.target, mev.innerNode );
+diff -Nru kdelibs-release-3.4.0/khtml/kmultipart/kmultipart.cpp kdelibs-branch-3.4/khtml/kmultipart/kmultipart.cpp
+--- kdelibs-release-3.4.0/khtml/kmultipart/kmultipart.cpp 2004-04-29 17:31:24.000000000 -0400
++++ kdelibs-branch-3.4/khtml/kmultipart/kmultipart.cpp 2005-03-16 10:52:26.000000000 -0500
+@@ -109,6 +109,7 @@
+ // We probably need to use m_extension to get the urlArgs in openURL...
+
+ m_part = 0L;
++ m_isHTMLPart = false;
+ m_job = 0L;
+ m_lineParser = new KLineParser;
+ m_tempFile = 0L;
+@@ -242,6 +243,9 @@
+ {
+ Q_ASSERT( m_nextMimeType.isNull() );
+ m_nextMimeType = QString::fromLatin1( line.data() + 14 ).stripWhiteSpace();
++ int semicolon = m_nextMimeType.find( ';' );
++ if ( semicolon != -1 )
++ m_nextMimeType = m_nextMimeType.left( semicolon );
+ kdDebug() << "m_nextMimeType=" << m_nextMimeType << endl;
+ }
+ // Empty line, end of headers (if we had any header line before)
+diff -Nru kdelibs-release-3.4.0/khtml/kmultipart/kmultipart.desktop kdelibs-branch-3.4/khtml/kmultipart/kmultipart.desktop
+--- kdelibs-release-3.4.0/khtml/kmultipart/kmultipart.desktop 2005-02-23 00:04:35.000000000 -0500
++++ kdelibs-branch-3.4/khtml/kmultipart/kmultipart.desktop 2005-03-30 01:47:19.000000000 -0500
+@@ -3,6 +3,7 @@
+ Type=Service
+ MimeType=multipart/mixed;multipart/x-mixed-replace
+ Name=Embeddable Component for multipart/mixed
++Name[af]=Inlegbare Komponent vir multideel/gemeng
+ Name[bg]=Компонент за вграждане за преглед на съобщения multipart/mixed
+ Name[bn]=multipart/mixed-এর জন্য অভ্যন্তরীণ উপাদান
+ Name[bs]=Ugradiva komponenta za multipart/mixed
+@@ -10,6 +11,7 @@
+ Name[cs]=Pohltitelné komponenty pro 'multipart/mixed'
+ Name[da]=Indlejrbar komponent for multipart/mixed
+ Name[de]=Einbettungsfähige Komponente für MIME-Typ multipart/mixed
++Name[el]=Στοιχείο που μπορεί να ενσωματωθεί για multipart/mixed
+ Name[eo]=Enplantebla komponanto por plurparto/mikso
+ Name[es]=Componente empotrado para multiparte/mezcla
+ Name[et]=Multipart/mixed põimitav komponent
+@@ -17,7 +19,7 @@
+ Name[fi]=Upotettava komponentti multipart/mixed-hallintaan
+ Name[fr]=Composant intégrable pour le type multipart / mixed
+ Name[fy]=Yn te sluten komponint foar mulipart/mixed
+-Name[he]=רכיב בר-הטבעה עבור מרובה חלקים\מעורב
++Name[he]=רכיב בר־הטבעה עבור מרובה חלקים\מעורב
+ Name[hi]=मल्टीपार्ट/मिक्स्ड के लिए अंतर्निहित करने योग्य घटक
+ Name[hu]=Beágyazható komponens a multipart/mixed adattípushoz
+ Name[is]=Ívefjanleg eining fyrir MIME multipart/mixed
+@@ -40,13 +42,12 @@
+ Name[sk]=Vložiteľný komponent pre multipart/mixed
+ Name[sl]=Vgradljiva komponenta za multipart/mixed
+ Name[sr]=Уградива компонента за „multipart/mixed“
+-Name[sr@Latn]=Уградива компонента за „multipart/mixed“
++Name[sr@Latn]=Ugradiva komponenta za „multipart/mixed“
+ Name[sv]=Inbyggbar komponent för multipart/mixed
+ Name[ta]=பலப்பகுதி/கலக்கப்பட்ட பகுதிக்குரிய உட்பொதிந்த பகுதி
+ Name[tg]=Компоненти дарунсохт барои қисматҳои зиёд/омезишшуда
+ Name[tr]=Çok parçalı/karışık için Gömülebilir Bileşen
+ Name[uk]=Вбудовна компонента для повідомлень multipart/mixed
+-Name[xx]=xxEmbeddable Component for multipart/mixedxx
+ Name[zh_CN]=可嵌入的 multipart/mixed 组件
+ ServiceTypes=KParts/ReadOnlyPart
+ X-KDE-Library=libkmultipart
+diff -Nru kdelibs-release-3.4.0/khtml/rendering/break_lines.cpp kdelibs-branch-3.4/khtml/rendering/break_lines.cpp
+--- kdelibs-release-3.4.0/khtml/rendering/break_lines.cpp 2004-11-16 09:12:46.000000000 -0500
++++ kdelibs-branch-3.4/khtml/rendering/break_lines.cpp 2005-03-30 22:54:14.000000000 -0500
+@@ -50,6 +50,10 @@
+ void cleanup_thaibreaks()
+ {
+ delete cache;
++ cache = 0;
++#ifndef HAVE_LIBTHAI
++ th_brk = 0;
++#endif
+ }
+
+ bool isBreakableThai( const QChar *string, const int pos, const int len)
+diff -Nru kdelibs-release-3.4.0/khtml/rendering/render_box.cpp kdelibs-branch-3.4/khtml/rendering/render_box.cpp
+--- kdelibs-release-3.4.0/khtml/rendering/render_box.cpp 2005-02-18 17:52:51.000000000 -0500
++++ kdelibs-branch-3.4/khtml/rendering/render_box.cpp 2005-03-18 11:28:02.000000000 -0500
+@@ -200,6 +200,8 @@
+
+ InlineBox* RenderBox::createInlineBox(bool /*makePlaceHolderBox*/, bool /*isRootLineBox*/)
+ {
++ if (m_placeHolderBox)
++ m_placeHolderBox->detach(renderArena());
+ return (m_placeHolderBox = new (renderArena()) InlineBox(this));
+ }
+
+diff -Nru kdelibs-release-3.4.0/khtml/rendering/render_flow.cpp kdelibs-branch-3.4/khtml/rendering/render_flow.cpp
+--- kdelibs-release-3.4.0/khtml/rendering/render_flow.cpp 2005-02-14 17:13:39.000000000 -0500
++++ kdelibs-branch-3.4/khtml/rendering/render_flow.cpp 2005-03-24 12:15:00.000000000 -0500
+@@ -140,7 +140,6 @@
+ m_firstLineBox = 0;
+ m_lastLineBox = 0;
+ }
+- RenderBox::deleteInlineBoxes(arena);
+ }
+
+ InlineBox* RenderFlow::createInlineBox(bool makePlaceHolderBox, bool isRootLineBox)
+@@ -241,7 +240,7 @@
+ RootInlineBox *lastRoot = lastLineBox() && !needsLayout() ? lastLineBox()->root() : 0;
+ containingBlock()->repaintRectangle(-ow+left, -ow+top,
+ width()+ow*2,
+- (lastRoot ? lastRoot->bottomOverflow() : height())+ow*2,
++ (lastRoot ? lastRoot->bottomOverflow() - top : height())+ow*2,
+ immediate);
+ }
+ else {
+diff -Nru kdelibs-release-3.4.0/khtml/rendering/render_object.cpp kdelibs-branch-3.4/khtml/rendering/render_object.cpp
+--- kdelibs-release-3.4.0/khtml/rendering/render_object.cpp 2005-02-15 10:45:10.000000000 -0500
++++ kdelibs-branch-3.4/khtml/rendering/render_object.cpp 2005-03-30 22:56:16.000000000 -0500
+@@ -1476,10 +1476,13 @@
+
+ if (isFloating()) {
+ RenderBlock* outermostBlock = containingBlock();
+- for (RenderBlock* p = outermostBlock;
+- p && !p->isCanvas() && p->containsFloat(this) && !p->isFloatingOrPositioned();
+- outermostBlock = p, p = p->containingBlock())
+- ;
++ for (RenderBlock* p = outermostBlock; p && !p->isCanvas() && p->containsFloat(this);) {
++ outermostBlock = p;
++ if (p->isFloatingOrPositioned())
++ break;
++ p = p->containingBlock();
++ }
++
+ if (outermostBlock)
+ outermostBlock->markAllDescendantsWithFloatsForLayout(this);
+ }
+diff -Nru kdelibs-release-3.4.0/khtml/rendering/render_table.cpp kdelibs-branch-3.4/khtml/rendering/render_table.cpp
+--- kdelibs-release-3.4.0/khtml/rendering/render_table.cpp 2005-02-18 17:52:51.000000000 -0500
++++ kdelibs-branch-3.4/khtml/rendering/render_table.cpp 2005-03-24 12:15:00.000000000 -0500
+@@ -352,6 +352,7 @@
+ m_height += tCaption->height() + tCaption->marginTop() + tCaption->marginBottom();
+ }
+
++ m_overflowHeight = m_height;
+ //kdDebug(0) << "table height: " << m_height << endl;
+
+ // table can be containing block of positioned elements.
+diff -Nru kdelibs-release-3.4.0/khtml/xml/dom_nodeimpl.cpp kdelibs-branch-3.4/khtml/xml/dom_nodeimpl.cpp
+--- kdelibs-release-3.4.0/khtml/xml/dom_nodeimpl.cpp 2005-02-14 17:32:07.000000000 -0500
++++ kdelibs-branch-3.4/khtml/xml/dom_nodeimpl.cpp 2005-03-30 22:59:04.000000000 -0500
+@@ -682,7 +682,7 @@
+
+ NodeImpl *NodeImpl::traverseNextNode(NodeImpl *stayWithin) const
+ {
+- if (firstChild())
++ if (firstChild() || stayWithin == this)
+ return firstChild();
+ else if (nextSibling())
+ return nextSibling();
+@@ -690,7 +690,7 @@
+ const NodeImpl *n = this;
+ while (n && !n->nextSibling() && (!stayWithin || n->parentNode() != stayWithin))
+ n = n->parentNode();
+- if (n && (!stayWithin || n->parentNode() != stayWithin))
++ if (n)
+ return n->nextSibling();
+ }
+ return 0;
+diff -Nru kdelibs-release-3.4.0/kimgio/bmp.kimgio kdelibs-branch-3.4/kimgio/bmp.kimgio
+--- kdelibs-release-3.4.0/kimgio/bmp.kimgio 2005-01-20 23:24:09.000000000 -0500
++++ kdelibs-branch-3.4/kimgio/bmp.kimgio 2005-03-10 11:04:49.000000000 -0500
+@@ -2,6 +2,7 @@
+ Type=BMP
+ Header=
+ Name=BMP Image
++Name[af]=BMP Beeld
+ Name[ar]=صورة من نوع BMP
+ Name[az]=BMP Rəsmi
+ Name[be]=Выява BMP
+@@ -62,7 +63,6 @@
+ Name[uk]=Зображення BMP
+ Name[uz]=BMP-расм
+ Name[wa]=Imådje BMP
+-Name[xx]=xxBMP Imagexx
+ Name[zh_CN]=BMP 图像
+ Read=true
+ Write=true
+diff -Nru kdelibs-release-3.4.0/kimgio/dds.kimgio kdelibs-branch-3.4/kimgio/dds.kimgio
+--- kdelibs-release-3.4.0/kimgio/dds.kimgio 2005-02-23 00:04:36.000000000 -0500
++++ kdelibs-branch-3.4/kimgio/dds.kimgio 2005-03-10 11:04:49.000000000 -0500
+@@ -2,6 +2,7 @@
+ Type=DDS
+ Header=^DDS
+ Name=Direct Draw Surface
++Name[af]=Direct Draw Oppervlakte
+ Name[be]=Паверхня Draw Surface
+ Name[bg]=Област с директно изчертаване
+ Name[bn]=ডাইরেক্ট ড্র সারফেস
+@@ -32,13 +33,12 @@
+ Name[sk]=Povrch Direct Draw
+ Name[sl]=Površina Direct Draw
+ Name[sr]=Површина за директно цртање
+-Name[sr@Latn]=Површина за директно цртање
++Name[sr@Latn]=Površina za direktno crtanje
+ Name[sv]=Direktrityta
+ Name[ta]=நேரடியாக வரையும் சூழல்
+ Name[tg]=Кашидани сатҳи мустақим
+ Name[tr]=Doğrudan Çizim Yüzeyi
+ Name[uk]=Поверхня Direct Draw
+-Name[xx]=xxDirect Draw Surfacexx
+ Name[zh_CN]=DirectDraw 表面
+ Read=true
+ Write=false
+diff -Nru kdelibs-release-3.4.0/kimgio/eps.kimgio kdelibs-branch-3.4/kimgio/eps.kimgio
+--- kdelibs-release-3.4.0/kimgio/eps.kimgio 2005-01-28 22:58:13.000000000 -0500
++++ kdelibs-branch-3.4/kimgio/eps.kimgio 2005-03-10 11:04:49.000000000 -0500
+@@ -2,6 +2,7 @@
+ Type=EPS
+ Header=^(?:%c5%d0%d3%c6|%!PS-Adobe)
+ Name=Encapsulated PostScript Image
++Name[af]=Geënkapsuleerde Postscript Beeld
+ Name[ar]=Encapsulated PostScript صورة
+ Name[az]=Encapsulated PostScript Rəsmi
+ Name[be]=Выява Encapsulated PostScript
+@@ -61,7 +62,6 @@
+ Name[uk]=Вбудоване зображення PostScript
+ Name[uz]=EPS-расм
+ Name[wa]=Imådje PostScript ecapsulêye
+-Name[xx]=xxEncapsulated PostScript Imagexx
+ Name[zh_CN]=封装后的 Postscript 图像
+ Name[zh_TW]=Ensapsulated Postscript 影像
+ Read=true
+diff -Nru kdelibs-release-3.4.0/kimgio/exr.kimgio kdelibs-branch-3.4/kimgio/exr.kimgio
+--- kdelibs-release-3.4.0/kimgio/exr.kimgio 2005-02-23 00:04:36.000000000 -0500
++++ kdelibs-branch-3.4/kimgio/exr.kimgio 2005-03-10 11:04:49.000000000 -0500
+@@ -2,7 +2,9 @@
+ Type=EXR
+ Header=^\x76\x2f\x31\01
+ Name=ILM EXR Image Kimgio
++Name[af]=ILM EXR Beeld Kimgio
+ Name[bg]=Изображение ILM EXR Kimgio
++Name[br]=Skeudenn Kimgio ILM EXR
+ Name[ca]=Imatge ILM EXR pel Kimgio
+ Name[da]=ILM EXR billede Kimgio
+ Name[de]=ILM-EXR-Bild
+@@ -37,13 +39,12 @@
+ Name[sk]=Obrázok ILM EXR KImgio
+ Name[sl]=Slika ILM EXR Kimgio
+ Name[sr]=ILM EXR Kimgio слика
+-Name[sr@Latn]=ILM EXR Kimgio слика
++Name[sr@Latn]=ILM EXR Kimgio slika
+ Name[sv]=ILM EXR-bild Kimgio
+ Name[ta]=ILM EXR பிம்ப கிம்ஜியோ
+ Name[tg]=Тасвири ILM EXR Kimgio
+ Name[tr]=ILM EXR Resim Kimgio
+ Name[uk]=Ввід/Вивід для зображень ILM EXR
+-Name[xx]=xxILM EXR Image Kimgioxx
+ Name[zh_CN]=ILM EXR 图像 Kimgio
+ Read=true
+ Write=false
+diff -Nru kdelibs-release-3.4.0/kimgio/g3.kimgio kdelibs-branch-3.4/kimgio/g3.kimgio
+--- kdelibs-release-3.4.0/kimgio/g3.kimgio 2005-01-31 03:34:48.000000000 -0500
++++ kdelibs-branch-3.4/kimgio/g3.kimgio 2005-03-10 11:04:49.000000000 -0500
+@@ -2,6 +2,7 @@
+ Type=G3
+ Header=II
+ Name=CCITT G3 Fax
++Name[af]=CCITT G3 Faks
+ Name[ar]=فاكس CCITT G3
+ Name[az]=CCITT G3 Faks
+ Name[be]=CCITT G3 факс
+@@ -55,7 +56,6 @@
+ Name[uk]=Факс CCITT G3
+ Name[uz]=CCITT G3 факс-файли
+ Name[wa]=Facs CCITT G3
+-Name[xx]=xxCCITT G3 Faxxx
+ Name[zh_CN]=CCITT G3 传真
+ Name[zh_TW]=CCITT G3 傳真
+ Read=true
+diff -Nru kdelibs-release-3.4.0/kimgio/gif.kimgio kdelibs-branch-3.4/kimgio/gif.kimgio
+--- kdelibs-release-3.4.0/kimgio/gif.kimgio 2005-01-20 23:24:09.000000000 -0500
++++ kdelibs-branch-3.4/kimgio/gif.kimgio 2005-03-10 11:04:49.000000000 -0500
+@@ -2,6 +2,7 @@
+ Type=GIF
+ Header=
+ Name=GIF Image
++Name[af]=GIF Beeld
+ Name[ar]=صورة من نوع GIF
+ Name[az]=GIF Rəsmi
+ Name[be]=Выява GIF
+@@ -62,7 +63,6 @@
+ Name[uk]=Зображення GIF
+ Name[uz]=GIF-расм
+ Name[wa]=Imådje GIF
+-Name[xx]=xxGIF Imagexx
+ Name[zh_CN]=GIF 图像
+ Name[zh_TW]=GIF 影像
+ Read=true
+diff -Nru kdelibs-release-3.4.0/kimgio/ico.kimgio kdelibs-branch-3.4/kimgio/ico.kimgio
+--- kdelibs-release-3.4.0/kimgio/ico.kimgio 2005-01-20 23:24:09.000000000 -0500
++++ kdelibs-branch-3.4/kimgio/ico.kimgio 2005-03-10 11:04:49.000000000 -0500
+@@ -2,6 +2,7 @@
+ Type=ICO
+ Header=^\001\001[\001|\002]\001
+ Name=Windows Icon
++Name[af]=Windows Ikoon
+ Name[ar]=أيقونة ويندوز
+ Name[az]=Windows Timsalı
+ Name[be]=Піктаграма Windows
+@@ -62,7 +63,6 @@
+ Name[uk]=Піктограма Windows
+ Name[uz]=Windows нишончаси
+ Name[wa]=Imådjete MS-Windows
+-Name[xx]=xxWindows Iconxx
+ Name[zh_CN]=Windows 图标
+ Name[zh_TW]=Windows 圖示
+ Read=true
+diff -Nru kdelibs-release-3.4.0/kimgio/jp2.kimgio kdelibs-branch-3.4/kimgio/jp2.kimgio
+--- kdelibs-release-3.4.0/kimgio/jp2.kimgio 2005-01-20 23:24:09.000000000 -0500
++++ kdelibs-branch-3.4/kimgio/jp2.kimgio 2005-03-10 11:04:49.000000000 -0500
+@@ -2,6 +2,7 @@
+ Type=jp2
+ Header=^\x01\x01\x01\x0C\x6A\x50
+ Name=JPEG 2000 Image
++Name[af]=JPEG 2000 Beeld
+ Name[ar]=صورة من نوع JPEG
+ Name[az]=JPEG 2000 Rəsmi
+ Name[be]=Выява JPEG 2000
+@@ -62,7 +63,6 @@
+ Name[uk]=Зображення JPEG 2000
+ Name[uz]=JPEG 2000-расм
+ Name[wa]=Imådje JPEG 2000
+-Name[xx]=xxJPEG 2000 Imagexx
+ Name[zh_CN]=JPEG 2000 图像
+ Name[zh_TW]=JPEG 2000 影像
+ Read=true
+diff -Nru kdelibs-release-3.4.0/kimgio/jpeg.kimgio kdelibs-branch-3.4/kimgio/jpeg.kimgio
+--- kdelibs-release-3.4.0/kimgio/jpeg.kimgio 2005-01-20 23:24:09.000000000 -0500
++++ kdelibs-branch-3.4/kimgio/jpeg.kimgio 2005-03-10 11:04:49.000000000 -0500
+@@ -2,6 +2,7 @@
+ Type=JPEG
+ Header=
+ Name=JPEG Image
++Name[af]=JPEG Beeld
+ Name[ar]=صورة من نوع JPEG
+ Name[az]=JPEG Rəsmi
+ Name[be]=Выява JPEG
+@@ -62,7 +63,6 @@
+ Name[uk]=Зображення JPEG
+ Name[uz]=JPEG-расм
+ Name[wa]=Imådje JPEG
+-Name[xx]=xxJPEG Imagexx
+ Name[zh_CN]=JPEG 图像
+ Name[zh_TW]=JPEG 影像
+ Read=true
+diff -Nru kdelibs-release-3.4.0/kimgio/mng.kimgio kdelibs-branch-3.4/kimgio/mng.kimgio
+--- kdelibs-release-3.4.0/kimgio/mng.kimgio 2005-02-23 06:55:40.000000000 -0500
++++ kdelibs-branch-3.4/kimgio/mng.kimgio 2005-03-30 01:47:19.000000000 -0500
+@@ -5,14 +5,17 @@
+ Name[bg]=Изображение MNG
+ Name[bn]=এম-এন-জি চিত্র
+ Name[br]=Skeudenn MNG
++Name[bs]=MNG slika
+ Name[ca]=Imatge MNG
+ Name[cs]=Obrázek ve formátu MNG
+ Name[cy]=Delwedd MNG
+ Name[da]=MNG-billede
+ Name[de]=MNG-Bild
++Name[el]=Εικόνα MNG
+ Name[es]=Imagen MNG
+ Name[et]=MNG pildifail
+ Name[eu]=MNG irudia
++Name[fi]=MNG-kuva
+ Name[fr]=Image MNG
+ Name[fy]=MNG-ôfbylding
+ Name[ga]=Íomhá MNG
+@@ -37,13 +40,12 @@
+ Name[sk]=MNG obrázok
+ Name[sl]=Slika MNG
+ Name[sr]=MNG слика
+-Name[sr@Latn]=MNG слика
++Name[sr@Latn]=MNG slika
+ Name[sv]=MNG-bild
+ Name[ta]=MNG பிம்பம்
+ Name[tg]=Тасвири MNG
+ Name[tr]=MNG Resmi
+ Name[uk]=Зображення MNG
+-Name[xx]=xxMNG Imagexx
+ Name[zh_CN]=MNG 图像
+ Read=true
+ Write=false
+diff -Nru kdelibs-release-3.4.0/kimgio/pbm.kimgio kdelibs-branch-3.4/kimgio/pbm.kimgio
+--- kdelibs-release-3.4.0/kimgio/pbm.kimgio 2005-01-20 23:24:09.000000000 -0500
++++ kdelibs-branch-3.4/kimgio/pbm.kimgio 2005-03-10 11:04:49.000000000 -0500
+@@ -2,10 +2,12 @@
+ Type=PBM
+ Header=
+ Name=Portable Bitmap Image
++Name[af]='Portable Bitmap' Beeld
+ Name[ar]=صورة قابلة للنقل PNG
+ Name[az]=Portable Bitmap Rəsmi
+ Name[bg]=Изображение Portable Bitmap Image
+ Name[bn]=পোর্টেবল বিটম্যাপ চিত্র
++Name[br]=Skeudenn Portable Bitmap
+ Name[bs]=Portable Bitmap slika
+ Name[ca]=Imatge portable Bitmap
+ Name[cy]=Delwedd Ddidfap Gludadwy
+@@ -59,7 +61,6 @@
+ Name[uk]=Двокольорове зображення у портативному форматі
+ Name[uz]=PBMP-расм
+ Name[wa]=Imådje PBM
+-Name[xx]=xxPortable Bitmap Imagexx
+ Name[zh_CN]=便携位图图像
+ Name[zh_TW]=可攜式點陣影像 (PNG)
+ Read=true
+diff -Nru kdelibs-release-3.4.0/kimgio/pcx.kimgio kdelibs-branch-3.4/kimgio/pcx.kimgio
+--- kdelibs-release-3.4.0/kimgio/pcx.kimgio 2005-01-20 23:24:09.000000000 -0500
++++ kdelibs-branch-3.4/kimgio/pcx.kimgio 2005-03-10 11:04:49.000000000 -0500
+@@ -2,6 +2,7 @@
+ Type=PCX
+ Header=^\012
+ Name=PCX Image
++Name[af]='PCX' Beeld
+ Name[ar]=صورة من نوع PCX
+ Name[az]=PCX Rəsmi
+ Name[be]=Выява PCX
+@@ -62,7 +63,6 @@
+ Name[uk]=Зображення PCX
+ Name[uz]=PCX-расм
+ Name[wa]=Imådje PCX
+-Name[xx]=xxPCX Imagexx
+ Name[zh_CN]=PCX 图像
+ Name[zh_TW]=PCX 影像
+ Read=true
+diff -Nru kdelibs-release-3.4.0/kimgio/pgm.kimgio kdelibs-branch-3.4/kimgio/pgm.kimgio
+--- kdelibs-release-3.4.0/kimgio/pgm.kimgio 2005-01-20 23:24:09.000000000 -0500
++++ kdelibs-branch-3.4/kimgio/pgm.kimgio 2005-03-10 11:04:49.000000000 -0500
+@@ -2,6 +2,7 @@
+ Type=PGM
+ Header=
+ Name=Portable Graymap Image
++Name[af]='Portable Graymap' Beeld
+ Name[ar]=صورة ثنائية اللون قابلة للنقل
+ Name[az]=Portable Graymap Rəsmi
+ Name[bg]=Изображение Portable Graymap Image
+@@ -60,7 +61,6 @@
+ Name[uk]=Чорно-біле зображення у портативному форматі
+ Name[uz]=PGM-расм
+ Name[wa]=Imådje PGM
+-Name[xx]=xxPortable Graymap Imagexx
+ Name[zh_CN]=便携灰度图像
+ Read=true
+ Write=true
+diff -Nru kdelibs-release-3.4.0/kimgio/png.kimgio kdelibs-branch-3.4/kimgio/png.kimgio
+--- kdelibs-release-3.4.0/kimgio/png.kimgio 2005-01-20 23:24:09.000000000 -0500
++++ kdelibs-branch-3.4/kimgio/png.kimgio 2005-03-10 11:04:49.000000000 -0500
+@@ -2,6 +2,7 @@
+ Type=PNG
+ Header=
+ Name=PNG Image
++Name[af]=Png Beeld
+ Name[ar]=صورة من نوع PNG
+ Name[az]=PNG Rəsmi
+ Name[be]=Выява PNG
+@@ -62,7 +63,6 @@
+ Name[uk]=Зображення PNG
+ Name[uz]=PNG-расм
+ Name[wa]=Imådje PNG
+-Name[xx]=xxPNG Imagexx
+ Name[zh_CN]=PNG 图像
+ Name[zh_TW]=PNG 影像
+ Read=true
+diff -Nru kdelibs-release-3.4.0/kimgio/ppm.kimgio kdelibs-branch-3.4/kimgio/ppm.kimgio
+--- kdelibs-release-3.4.0/kimgio/ppm.kimgio 2005-01-20 23:24:09.000000000 -0500
++++ kdelibs-branch-3.4/kimgio/ppm.kimgio 2005-03-10 11:04:49.000000000 -0500
+@@ -2,10 +2,12 @@
+ Type=PPM
+ Header=
+ Name=Portable Pixmap Image
++Name[af]='Portable Pixmap' Beeld
+ Name[ar]=صورة Pixmap قابلة للنقل
+ Name[az]=Portable Pixmap Rəsmi
+ Name[bg]=Изображение Portable Pixmap Image
+ Name[bn]=পোর্টেবল পিক্সম্যাপ চিত্র
++Name[br]=Skeudenn Portable Pixmap
+ Name[bs]=Portable Pixmap slika
+ Name[ca]=Imatge portable mapa de píxels
+ Name[cs]=Obrázek ve formátu "Portable Pixmap"
+@@ -60,7 +62,6 @@
+ Name[uk]=Растрове зображення у портативному форматі
+ Name[uz]=PPMP-расм
+ Name[wa]=Imådje PPM
+-Name[xx]=xxPortable Pixmap Imagexx
+ Name[zh_CN]=便携像素图图像
+ Name[zh_TW]=可攜式像素影像
+ Read=true
+diff -Nru kdelibs-release-3.4.0/kimgio/psd.kimgio kdelibs-branch-3.4/kimgio/psd.kimgio
+--- kdelibs-release-3.4.0/kimgio/psd.kimgio 2005-02-23 00:04:36.000000000 -0500
++++ kdelibs-branch-3.4/kimgio/psd.kimgio 2005-03-30 01:47:19.000000000 -0500
+@@ -5,15 +5,20 @@
+ Name[bg]=Документ PhotoShop
+ Name[bn]=ফোটোশপ নথী
+ Name[br]=Teul PhotoShop
++Name[bs]=PhotoShop dokument
+ Name[ca]=Document PhotoShop
+ Name[cs]=Dokument Photoshopu
+ Name[da]=PhotoShop-dokument
+ Name[de]=PhotoShop-Dokument
++Name[el]=Έγγραφο PhotoShop
+ Name[es]=Documento de PhotoShop
+ Name[et]=PhotoShopi dokument
++Name[eu]=PostScript dokumentua
++Name[fi]=Postscript-asiakirja
+ Name[fr]=Document PhotoShop
+ Name[fy]=PhotoShop-dokumint
+ Name[ga]=Cáipéis PhotoShop
++Name[he]=מסמך PhotoShop
+ Name[hi]=फ़ोटोशॉप दस्तावेज़
+ Name[hu]=PhotoShop-dokumentum
+ Name[is]=PhotoShop skjal
+@@ -26,17 +31,17 @@
+ Name[pl]=Dokument programu PhotoShop
+ Name[pt]=Documento do PhotoShop
+ Name[pt_BR]=Documento do PhotoShop
++Name[ro]=Document PhotoShop
+ Name[ru]=Файл PhotoShop
+ Name[se]=PhotoShop-dokumeanta
+ Name[sk]=PhotoShop dokument
+ Name[sl]=Dokument PhotoShop
+ Name[sr]=PhotoShop-ов документ
+-Name[sr@Latn]=PhotoShop-ов документ
++Name[sr@Latn]=PhotoShop-ov dokument
+ Name[sv]=Photoshop-dokument
+ Name[ta]=போட்டோஷாப் ஆவணம்
+ Name[tg]=Хуҷҷати PhotoShop
+ Name[uk]=Документ PhotoShop
+-Name[xx]=xxPhotoShop Documentxx
+ Name[zh_CN]=PhotoShop 文档
+ Read=true
+ Write=false
+diff -Nru kdelibs-release-3.4.0/kimgio/rgb.kimgio kdelibs-branch-3.4/kimgio/rgb.kimgio
+--- kdelibs-release-3.4.0/kimgio/rgb.kimgio 2005-02-23 00:04:36.000000000 -0500
++++ kdelibs-branch-3.4/kimgio/rgb.kimgio 2005-03-10 11:04:49.000000000 -0500
+@@ -2,6 +2,7 @@
+ Type=RGB
+ Header=^\x01\xda\x01[\x01\x02]
+ Name=SGI Image (RGB)
++Name[af]=SGI Beeld (RGB)
+ Name[be]=Выява SGI (RGB)
+ Name[bg]=Изображение SGI (RGB)
+ Name[bn]=এস-জি-আই চিত্র (RGB)
+@@ -46,7 +47,7 @@
+ Name[sk]=SGI obrázok (RGB)
+ Name[sl]=Slika SGI (RGB)
+ Name[sr]=SGI слика (RGB)
+-Name[sr@Latn]=SGI слика (RGB)
++Name[sr@Latn]=SGI slika (RGB)
+ Name[sv]=SGI-bild (RGB)
+ Name[ta]=GIF பிம்பம்
+ Name[tg]=Тасвири SGI (RGB)
+@@ -54,7 +55,6 @@
+ Name[tr]=SGI Resmi (KYM)
+ Name[uk]=Зображення SGI (RGB)
+ Name[uz]=SGI-расм (RGB)
+-Name[xx]=xxSGI Image (RGB)xx
+ Name[zh_CN]=SGI 图像(RGB)
+ Read=true
+ Write=true
+diff -Nru kdelibs-release-3.4.0/kimgio/tga.kimgio kdelibs-branch-3.4/kimgio/tga.kimgio
+--- kdelibs-release-3.4.0/kimgio/tga.kimgio 2005-01-20 23:24:09.000000000 -0500
++++ kdelibs-branch-3.4/kimgio/tga.kimgio 2005-03-10 11:04:49.000000000 -0500
+@@ -2,6 +2,7 @@
+ Type=TGA
+ Header=^.\x01[\x01-\x03\x09-\x0b]\x01{3}.[\x01\x18]
+ Name=Truevision Targa Image
++Name[af]='Truevision Targa' Beeld
+ Name[ar]=صورة Truevision Targa
+ Name[az]=Truevision Targa Rəsmi
+ Name[be]=Выява Truevision Targa
+@@ -61,7 +62,6 @@
+ Name[uk]=Зображення Truevision Targa
+ Name[uz]=TGA-расм
+ Name[wa]=Imådje Targa
+-Name[xx]=xxTruevision Targa Imagexx
+ Name[zh_CN]=Truevision Targa 图像
+ Name[zh_TW]=Truevision Targa 圖形
+ Read=true
+diff -Nru kdelibs-release-3.4.0/kimgio/tiff.kimgio kdelibs-branch-3.4/kimgio/tiff.kimgio
+--- kdelibs-release-3.4.0/kimgio/tiff.kimgio 2005-01-11 23:28:35.000000000 -0500
++++ kdelibs-branch-3.4/kimgio/tiff.kimgio 2005-03-10 11:04:49.000000000 -0500
+@@ -2,6 +2,7 @@
+ Type=TIFF
+ Header=[MI][MI]
+ Name=TIFF Image
++Name[af]=TIFF Beeld
+ Name[ar]=صورة من نوع TIFF
+ Name[az]=TIFF Rəsmi
+ Name[be]=Выява TIFF
+@@ -62,7 +63,6 @@
+ Name[uk]=Зображення TIFF
+ Name[uz]=TIFF-расм
+ Name[wa]=Imådje TIFF
+-Name[xx]=xxTIFF Imagexx
+ Name[zh_CN]=TIFF 图像
+ Name[zh_TW]=TIFF 影像
+ Read=true
+diff -Nru kdelibs-release-3.4.0/kimgio/xbm.kimgio kdelibs-branch-3.4/kimgio/xbm.kimgio
+--- kdelibs-release-3.4.0/kimgio/xbm.kimgio 2005-01-20 23:24:09.000000000 -0500
++++ kdelibs-branch-3.4/kimgio/xbm.kimgio 2005-03-10 11:04:49.000000000 -0500
+@@ -2,6 +2,7 @@
+ Type=XBM
+ Header=
+ Name=X BitMap Image
++Name[af]='X BitMap' Beeld
+ Name[ar]=صورة من نوع XBitMap
+ Name[az]=X BitMap Rəsmi
+ Name[be]=Выява X BitMap
+@@ -62,7 +63,6 @@
+ Name[uk]=Двокольорове зображення для X
+ Name[uz]=X BMP-расм
+ Name[wa]=Imådje XBM
+-Name[xx]=xxX BitMap Imagexx
+ Name[zh_CN]=X 位图图像
+ Name[zh_TW]=X 點陣影像
+ Read=true
+diff -Nru kdelibs-release-3.4.0/kimgio/xcf.kimgio kdelibs-branch-3.4/kimgio/xcf.kimgio
+--- kdelibs-release-3.4.0/kimgio/xcf.kimgio 2005-02-23 00:04:36.000000000 -0500
++++ kdelibs-branch-3.4/kimgio/xcf.kimgio 2005-03-30 01:47:19.000000000 -0500
+@@ -5,13 +5,16 @@
+ Name[bg]=Изображение GIMP
+ Name[bn]=জিম্প চিত্র
+ Name[br]=Skeudenn GIMP
++Name[bs]=GIMP slika
+ Name[ca]=Imatge GIMP
+ Name[cs]=Obrázek GIMP
+ Name[da]=GIMP-billede
+ Name[de]=GIMP-Bild
++Name[el]=Εικόνα GIMP
+ Name[es]=Imagen GIMP
+ Name[et]=GIMP pildifail
+ Name[eu]=GIMP irudia
++Name[fi]=GIMP-kuva
+ Name[fr]=Image GIMP
+ Name[fy]=GIMP-ôfbylding
+ Name[ga]=Íomhá GIMP
+@@ -37,13 +40,12 @@
+ Name[sk]=GIMP obrázok
+ Name[sl]=Slika GIMP
+ Name[sr]=GIMP-ова слика
+-Name[sr@Latn]=GIMP-ова слика
++Name[sr@Latn]=GIMP-ova slika
+ Name[sv]=GIMP-bild
+ Name[ta]=GIMP பிம்பம்
+ Name[tg]=Тасвири GIMP
+ Name[tr]=GIMP Resmi
+ Name[uk]=Зображення GIMP
+-Name[xx]=xxGIMP Imagexx
+ Name[zh_CN]=GIMP 图像
+ Read=true
+ Write=false
+diff -Nru kdelibs-release-3.4.0/kimgio/xpm.kimgio kdelibs-branch-3.4/kimgio/xpm.kimgio
+--- kdelibs-release-3.4.0/kimgio/xpm.kimgio 2005-01-20 23:24:09.000000000 -0500
++++ kdelibs-branch-3.4/kimgio/xpm.kimgio 2005-03-10 11:04:49.000000000 -0500
+@@ -2,6 +2,7 @@
+ Type=XPM
+ Header=
+ Name=X PixMap Image
++Name[af]='X PixMap' Beeld
+ Name[ar]=صورة من نوع X PixMap
+ Name[az]=X PixMap Rəsmi
+ Name[be]=Выява X PixMap
+@@ -62,7 +63,6 @@
+ Name[uk]=Растрове зображення для X
+ Name[uz]=X PMP-расм
+ Name[wa]=Imådje XPM
+-Name[xx]=xxX PixMap Imagexx
+ Name[zh_CN]=X 像素图图像
+ Name[zh_TW]=X 像素影像
+ Read=true
+diff -Nru kdelibs-release-3.4.0/kimgio/xv.kimgio kdelibs-branch-3.4/kimgio/xv.kimgio
+--- kdelibs-release-3.4.0/kimgio/xv.kimgio 2005-01-20 23:24:09.000000000 -0500
++++ kdelibs-branch-3.4/kimgio/xv.kimgio 2005-03-10 11:04:49.000000000 -0500
+@@ -3,6 +3,7 @@
+ Header=^P7 332
+ Flags=T
+ Name=XView Image
++Name[af]=XView Beeld
+ Name[ar]=صورة من نوع XView
+ Name[az]=XView Rəsmi
+ Name[be]=Выява XView
+@@ -63,7 +64,6 @@
+ Name[uk]=Зображення XView
+ Name[uz]=XView-расм
+ Name[wa]=Imådje XView
+-Name[xx]=xxXView Imagexx
+ Name[zh_CN]=XView 图像
+ Name[zh_TW]=XView 影像
+ Read=true
+diff -Nru kdelibs-release-3.4.0/kinit/kinit.cpp kdelibs-branch-3.4/kinit/kinit.cpp
+--- kdelibs-release-3.4.0/kinit/kinit.cpp 2005-02-10 12:33:02.000000000 -0500
++++ kdelibs-branch-3.4/kinit/kinit.cpp 2005-03-07 07:17:58.000000000 -0500
+@@ -4,7 +4,7 @@
+ * (c) 1999 Mario Weilguni <mweilguni@sime.com>
+ * (c) 2001 Lubos Lunak <l.lunak@kde.org>
+ *
+- * $Id: kinit.cpp,v 1.147 2005/02/10 17:33:02 harald Exp $
++ * $Id: kinit.cpp,v 1.147.2.1 2005/03/07 12:17:58 mueller Exp $
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+@@ -509,7 +509,7 @@
+ #endif
+ {
+ int r;
+- QCString procTitle( name );
++ QCString procTitle;
+ d.argv = (char **) malloc(sizeof(char *) * (argc+1));
+ d.argv[0] = (char *) _name;
+ for (int i = 1; i < argc; i++)
+@@ -527,11 +527,11 @@
+ /* set the process name, so that killall works like intended */
+ r = prctl(PR_SET_NAME, (unsigned long) name.data(), 0, 0, 0);
+ if ( r == 0 )
+- kdeinit_setproctitle( "%s [kdeinit] %s", name.data(), procTitle.data() );
++ kdeinit_setproctitle( "%s [kdeinit]%s", name.data(), procTitle.data() ? procTitle.data() : "" );
+ else
+- kdeinit_setproctitle( "kdeinit: %s", procTitle.data() );
++ kdeinit_setproctitle( "kdeinit: %s%s", name.data(), procTitle.data() ? procTitle.data() : "" );
+ #else
+- kdeinit_setproctitle( "kdeinit: %s", procTitle.data() );
++ kdeinit_setproctitle( "kdeinit: %s%s", name.data(), procTitle.data() ? procTitle.data() : "" );
+ #endif
+ }
+
+diff -Nru kdelibs-release-3.4.0/kinit/klauncher.cpp kdelibs-branch-3.4/kinit/klauncher.cpp
+--- kdelibs-release-3.4.0/kinit/klauncher.cpp 2005-02-10 12:33:02.000000000 -0500
++++ kdelibs-branch-3.4/kinit/klauncher.cpp 2005-03-21 09:16:44.000000000 -0500
+@@ -1005,9 +1005,7 @@
+ request->dcop_name = v.toString().utf8();
+ if (request->dcop_name.isEmpty())
+ {
+- request->dcop_name = request->name;
+- // Strip directory
+- request->dcop_name = request->dcop_name.mid(request->dcop_name.findRev('/')+1);
++ request->dcop_name = QFile::encodeName(KRun::binaryName(service->exec(), true));
+ }
+ }
+
+diff -Nru kdelibs-release-3.4.0/kinit/setproctitle.cpp kdelibs-branch-3.4/kinit/setproctitle.cpp
+--- kdelibs-release-3.4.0/kinit/setproctitle.cpp 2004-11-12 19:01:44.000000000 -0500
++++ kdelibs-branch-3.4/kinit/setproctitle.cpp 2005-03-10 10:49:29.000000000 -0500
+@@ -76,7 +76,9 @@
+ # endif
+ # if SPT_TYPE == SPT_PSSTRINGS
+ # include <machine/vmparam.h>
+-# include <sys/exec.h>
++# ifdef HAVE_SYS_EXEC_H
++# include <sys/exec.h>
++# endif
+ # ifndef PS_STRINGS /* hmmmm.... apparently not available after all */
+ # undef SPT_TYPE
+ # define SPT_TYPE SPT_REUSEARGV
+diff -Nru kdelibs-release-3.4.0/kio/Mainpage.dox kdelibs-branch-3.4/kio/Mainpage.dox
+--- kdelibs-release-3.4.0/kio/Mainpage.dox 2002-08-02 04:35:37.000000000 -0400
++++ kdelibs-branch-3.4/kio/Mainpage.dox 2005-03-05 05:02:21.000000000 -0500
+@@ -1,5 +1,5 @@
+ /**
+- * @libdoc A network-enabled file management system in a library.
++ * \mainpage A network-enabled file management system in a library
+ *
+ * This library implements almost all the file management functions you
+ * will ever need. In fact, the KDE file manager, Konqueror also uses
+@@ -11,28 +11,28 @@
+ *
+ * This library also implements the System Configuration Cache (KSycoca).
+ *
+- * @ref KMimeType :
++ * @ref KMimeType:
+ * The notion of a file type, already existing in KDE-1.x
+ *
+- * @ref KService :
++ * @ref KService:
+ * To a mimetype are bound one or more applications, now called services.
+ * Services can be applications, but also libraries, dynamically opened.
+ *
+- * @ref KServiceType :
++ * @ref KServiceType:
+ * A service type allows the same mechanism to be extended to components.
+ * For instance : the question "what are the koffice plugins" is solved by
+ * a service type called KOfficePlugin, and by every plugin providing
+ * a .desktop file stating that it is a service that implements the servicetype
+ * KOfficePlugin.
+ *
+- * @ref KServiceTypeProfile :
++ * @ref KServiceTypeProfile:
+ * Stores the user's preferences for services bound to mimetypes/servicetypes.
+ *
+- * @ref KTrader :
++ * @ref KTrader:
+ * Use it to query for which services implement a given mimetype/servicetype.
+ * Has its own language, in order to allow complex queries.
+ *
+-
++ *
+ * \section KDE Filedialog widget and associated classes.
+ *
+ * This library also provides the KDE file selector widget,
+@@ -75,45 +75,45 @@
+ * with.
+ *
+ *
+- * @ref KFileDialog :
++ * @ref KFileDialog:
+ * The class providing the file selector dialog. It combines a KDirOperator,
+ * KURLBar and several other widgets.
+ *
+- * @ref KDirOperator :
++ * @ref KDirOperator:
+ * The class encapsulating different KFileViews, offering file browsing and
+ * file selection. Asynchronous, network transparent reading of directories
+ * is performed via the @ref KIO library.
+ *
+- * @ref KURLRequester :
++ * @ref KURLRequester:
+ * A widget to be used for asking for a filename/path/URL. It consists of a
+ * @ref KLineEdit (or @ref KComboBox) and a button. Activating the button
+ * will open a @ref KFileDialog. Typing in the lineedit is aided with
+ * filename completion.
+ *
+- * @ref KURLRequesterDlg :
++ * @ref KURLRequesterDlg:
+ * A dialog to ask for a filename/path/URL, using KURLRequester.
+ *
+- * @ref KFileView :
++ * @ref KFileView:
+ * The base class for all views to be used with KDirOperator.
+ *
+- * @ref KFileIconView :
++ * @ref KFileIconView:
+ * The KFileView based on KIconView.
+ *
+- * @ref KFileDetailView :
++ * @ref KFileDetailView:
+ * The KFileView based on KListView.
+ *
+- * @ref KFilePreview :
++ * @ref KFilePreview:
+ * The KFileView, combining a widget showing preview for a selected file
+ * and another KFileView for browsing.
+ *
+- * @ref KURLBar :
++ * @ref KURLBar:
+ * A widget offering a number of clickable entries which represent a URL,
+ * aligned horizontally or vertically. The entries are customizable by the
+ * user both on a per application basis or for all applications (URLs, their
+ * icon and the description can be added, removed or edited by the user).
+ * This is the widget used as "sidebar" in the @ref KFileDialog.
+ *
+- * @ref KFileMetaInfoWidget :
++ * @ref KFileMetaInfoWidget:
+ * A widget that allows viewing and editing of meta data of a file, utilizing
+ * @ref KFileMetaInfo.
+ *
+diff -Nru kdelibs-release-3.4.0/kio/application.desktop kdelibs-branch-3.4/kio/application.desktop
+--- kdelibs-release-3.4.0/kio/application.desktop 2005-01-19 23:59:26.000000000 -0500
++++ kdelibs-branch-3.4/kio/application.desktop 2005-03-10 11:04:50.000000000 -0500
+@@ -3,7 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=Application
+ Name=Application
+-Name[af]=Aansoek
++Name[af]=Program
+ Name[ar]=تطبيق
+ Name[az]=Proqram
+ Name[be]=Дастасаваньне
+@@ -72,7 +72,6 @@
+ Name[vi]=Chương trình
+ Name[wa]=Programe
+ Name[xh]=Isicelo
+-Name[xx]=xxApplicationxx
+ Name[zh_CN]=应用程序
+ Name[zh_TW]=應用程式
+ Name[zu]=Umyaleli
+diff -Nru kdelibs-release-3.4.0/kio/bookmarks/kbookmarkmenu.cc kdelibs-branch-3.4/kio/bookmarks/kbookmarkmenu.cc
+--- kdelibs-release-3.4.0/kio/bookmarks/kbookmarkmenu.cc 2005-01-18 15:39:16.000000000 -0500
++++ kdelibs-branch-3.4/kio/bookmarks/kbookmarkmenu.cc 2005-03-18 05:51:47.000000000 -0500
+@@ -609,7 +609,7 @@
+ new KBookmarkMenu( m_pManager, m_pOwner, actionMenu->popupMenu(),
+ m_actionCollection, false,
+ m_bAddBookmark, QString::null );
+- connect( subMenu, SIGNAL( openBookmark( const QString &, Qt::Buttonstate ) ),
++ connect( subMenu, SIGNAL( openBookmark( const QString &, Qt::ButtonState ) ),
+ this, SIGNAL( openBookmark( const QString &, Qt::ButtonState ) ));
+ m_lstSubMenus.append(subMenu);
+
+diff -Nru kdelibs-release-3.4.0/kio/data.protocol kdelibs-branch-3.4/kio/data.protocol
+--- kdelibs-release-3.4.0/kio/data.protocol 2005-02-23 00:04:37.000000000 -0500
++++ kdelibs-branch-3.4/kio/data.protocol 2005-03-30 01:47:20.000000000 -0500
+@@ -6,12 +6,16 @@
+ Icon=www
+ Class=:internet
+ Description=A kioslave for data URIs (rfc2397)
++Description[br]=Ur kioslave evit an URIoù roadoù (rfc2397)
++Description[bs]=Kioslave za data URIs (rfc2397)
+ Description[ca]=Un kioslave per a URIs de dades (rfc2397)
+ Description[da]=En kioslave for data-URI'er (rfc2397)
+ Description[de]=Ein kioslave für Daten-URIs (rfc2397)
++Description[el]=Ένα kioslave για URI δεδομένων (rfc2397)
+ Description[es]=Un kioslave para datos URIs (rfc2397)
+ Description[et]=Andme-URI-de I/O-moodul (rfc2397)
+ Description[eu]=Datu URLen (rfc2397) kioslave-a
++Description[fi]=kioslave data URI:lle (rfc2397)
+ Description[fr]=Un module d'entrée / sortie pour les URI de données (rfc2397)
+ Description[fy]=In kioslave foar data-URI-adresse (rfc2397)
+ Description[hi]=डाटा यूआरआई (आरएफसी2397) के लिए एक के-आई-ओ-स्लेव
+@@ -33,12 +37,11 @@
+ Description[sk]=IO klient pre dátové URI (rfc2397)
+ Description[sl]=kioslave za podatkovne URI-je (rfc2397)
+ Description[sr]=kioslave за URI-ије података (rfc2397)
+-Description[sr@Latn]=kioslave за URI-ије података (rfc2397)
++Description[sr@Latn]=kioslave za URI-ije podataka (rfc2397)
+ Description[sv]=En I/O-slav för datawebbadresser (RFC 2397)
+ Description[ta]=தரவு வலைமனைகளுக்கான ஒரு kioslave (rfc2397)
+ Description[tg]=kioslave барои URIs (rfc2397)
+ Description[uk]=Підлеглий В/В для адрес (URI) даних (rfc2397)
+-Description[xx]=xxA kioslave for data URIs (rfc2397)xx
+ Description[zh_CN]=data URI(rfc2397) 的 kioslave
+ DocPath=kioslave/data.html
+ URIMode=rawuri
+diff -Nru kdelibs-release-3.4.0/kio/kcmodule.desktop kdelibs-branch-3.4/kio/kcmodule.desktop
+--- kdelibs-release-3.4.0/kio/kcmodule.desktop 2005-01-20 23:24:10.000000000 -0500
++++ kdelibs-branch-3.4/kio/kcmodule.desktop 2005-03-10 11:04:50.000000000 -0500
+@@ -3,6 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=KCModule
+ Name=KDE Control Module
++Name[af]=KDE Beheer Module
+ Name[ar]=وحدة تحكم كيدي
+ Name[az]=KDE İdarə Modulu
+ Name[be]=Модуль кіраваньня KDED
+@@ -67,7 +68,6 @@
+ Name[ven]=Phanele ndangula ya phirinthara
+ Name[wa]=Module di contrôle KDE
+ Name[xh]=Ulawulo Lwesicatshulwa we KDE
+-Name[xx]=xxKDE Control Modulexx
+ Name[zh_CN]=KDE 控制模块
+ Name[zh_TW]=KDE 控制模組
+ Name[zu]=Ingxenye ye-KDE Control
+diff -Nru kdelibs-release-3.4.0/kio/kcomprfilter.desktop kdelibs-branch-3.4/kio/kcomprfilter.desktop
+--- kdelibs-release-3.4.0/kio/kcomprfilter.desktop 2005-01-20 23:24:10.000000000 -0500
++++ kdelibs-branch-3.4/kio/kcomprfilter.desktop 2005-03-10 11:04:50.000000000 -0500
+@@ -3,7 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=KDECompressionFilter
+ Name=KDE Compression Filter
+-Name[af]=Kde Saampersing Filter
++Name[af]=KDE Kompakteer Filter
+ Name[ar]=فلتر ضغط الملفات لكيدي
+ Name[az]=KDE Sıxışdırma Filtri
+ Name[bg]=Компресиращ филтър
+@@ -68,7 +68,6 @@
+ Name[ven]=Filithara yau tsikeledza ya KDE
+ Name[vi]=Trình lọc nén của KDE
+ Name[xh]=Isihluzi Sodibaniso se KDE
+-Name[xx]=xxKDE Compression Filterxx
+ Name[zh_CN]=KDE 压缩过滤程序
+ Name[zh_TW]=KDE 壓縮過濾器
+ Name[zu]=Ihluzo Lokunciphisa le-KDE
+diff -Nru kdelibs-release-3.4.0/kio/kdatatool.desktop kdelibs-branch-3.4/kio/kdatatool.desktop
+--- kdelibs-release-3.4.0/kio/kdatatool.desktop 2005-01-20 23:24:10.000000000 -0500
++++ kdelibs-branch-3.4/kio/kdatatool.desktop 2005-03-10 11:04:50.000000000 -0500
+@@ -3,10 +3,11 @@
+ Type=ServiceType
+ X-KDE-ServiceType=KDataTool
+ Comment=KDE Data Tool
+-Comment[af]=Kde Data Program
++Comment[af]=KDE Data Program
+ Comment[ar]=أداة كيدي للبيانات
+ Comment[az]=KDE Verilənlər Vasitəsi
+ Comment[bn]=কে.ডি.ই তথ্য টুল
++Comment[br]=Ostilh roadoù evit KDE
+ Comment[bs]=KDE alat za podatke
+ Comment[ca]=Eina per a la gestió de dades per al KDE
+ Comment[cs]=Datový nástroj KDE
+@@ -67,7 +68,6 @@
+ Comment[ven]=Tshishumiswa tsha data tsha KDE
+ Comment[vi]=Công cụ KDE Data
+ Comment[xh]=Isihluzi se Data ye KDE
+-Comment[xx]=xxKDE Data Toolxx
+ Comment[zh_CN]=KDE 数据工具
+ Comment[zh_TW]=KDE 資料工具
+ Comment[zu]=Ithuluzi Ledata le-KDE
+diff -Nru kdelibs-release-3.4.0/kio/kfile/kdiroperator.cpp kdelibs-branch-3.4/kio/kfile/kdiroperator.cpp
+--- kdelibs-release-3.4.0/kio/kfile/kdiroperator.cpp 2005-02-08 05:55:18.000000000 -0500
++++ kdelibs-branch-3.4/kio/kfile/kdiroperator.cpp 2005-04-05 11:13:54.000000000 -0400
+@@ -1372,11 +1372,12 @@
+ if (whichActions & FileActions)
+ {
+ actionMenu->insert( mkdirAction );
+- if (currUrl.isLocalFile())
++ if (currUrl.isLocalFile() && !(KApplication::keyboardMouseState() & Qt::ShiftButton))
+ actionMenu->insert( myActionCollection->action( "trash" ) );
+ KConfig *globalconfig = KGlobal::config();
+ KConfigGroupSaver cs( globalconfig, QString::fromLatin1("KDE") );
+- if (!currUrl.isLocalFile() || globalconfig->readBoolEntry("ShowDeleteCommand", false))
++ if (!currUrl.isLocalFile() || (KApplication::keyboardMouseState() & Qt::ShiftButton) ||
++ globalconfig->readBoolEntry("ShowDeleteCommand", false))
+ actionMenu->insert( myActionCollection->action( "delete" ) );
+ actionMenu->insert( actionSeparator );
+ }
+diff -Nru kdelibs-release-3.4.0/kio/kfile/kdirsize.cpp kdelibs-branch-3.4/kio/kfile/kdirsize.cpp
+--- kdelibs-release-3.4.0/kio/kfile/kdirsize.cpp 2004-05-10 07:00:08.000000000 -0400
++++ kdelibs-branch-3.4/kio/kfile/kdirsize.cpp 2005-03-17 11:11:27.000000000 -0500
+@@ -75,11 +75,11 @@
+ SLOT( slotEntries( KIO::Job*,
+ const KIO::UDSEntryList& )));
+ addSubjob( listJob );
+- m_totalSubdirs--; //decrement 1 to account for current directory
+ }
+
+ void KDirSize::slotEntries( KIO::Job*, const KIO::UDSEntryList & list )
+ {
++ static const QString& dot = KGlobal::staticQString( "." );
+ static const QString& dotdot = KGlobal::staticQString( ".." );
+ KIO::UDSEntryListConstIterator it = list.begin();
+ KIO::UDSEntryListConstIterator end = list.end();
+@@ -107,7 +107,9 @@
+ break;
+ }
+ }
+- if ( name != dotdot ) // i.e. name != ".."
++ if ( name == dot )
++ m_totalSize += size;
++ else if ( name != dotdot )
+ {
+ if (!isLink)
+ m_totalSize += size;
+diff -Nru kdelibs-release-3.4.0/kio/kfile/kpropsdlgplugin.desktop kdelibs-branch-3.4/kio/kfile/kpropsdlgplugin.desktop
+--- kdelibs-release-3.4.0/kio/kfile/kpropsdlgplugin.desktop 2005-02-23 00:04:38.000000000 -0500
++++ kdelibs-branch-3.4/kio/kfile/kpropsdlgplugin.desktop 2005-03-27 02:28:44.000000000 -0500
+@@ -3,7 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=KPropsDlg/Plugin
+ Comment=Plugin for the Properties Dialog
+-Comment[af]=Inplak vir die Eienskappe Dialoog
++Comment[af]=Inprop module vir die Eienskappe Dialoog
+ Comment[ar]=ملحق لمربع حوار خصائص
+ Comment[az]=Seçənəklər Rabitə Qutusu Üçün Əlavə
+ Comment[bg]=Приставка за диалога Информация
+@@ -26,7 +26,7 @@
+ Comment[fr]=Module externe pour la boîte de dialogue des propriétés
+ Comment[fy]=Plugin foar de 'Eigenskippen'-dialooch
+ Comment[gl]=Plugin para o Diálogo de Propiedades
+-Comment[he]=תוסף לדו-שיח המאפיינים
++Comment[he]=תוסף לדו־שיח המאפיינים
+ Comment[hi]=विशेषता संवाद के लिए प्लगइन
+ Comment[hr]=Dodatak za dijalog "Vrijednosti"
+ Comment[hu]=Beépülő modul a tulajdonságok párbeszédablakhoz
+@@ -58,7 +58,7 @@
+ Comment[sl]=Vstavek za pogovorno okno z lastnostmi
+ Comment[sq]=Shtojcë për Dialogun e Rekuizitave
+ Comment[sr]=Прикључак за дијалог са својствима
+-Comment[sr@Latn]=Dodatak za dijalog sa svojstvima
++Comment[sr@Latn]=Priključak za dijalog sa svojstvima
+ Comment[sv]=Insticksprogram för egenskapsdialogen
+ Comment[ta]=பண்புகள் உரையாடலுக்கான சொருகுப்பொருள்
+ Comment[tg]=Штепсели барои Хусусиятҳои Тирезаи Диалогӣ Андохтан
+@@ -69,7 +69,6 @@
+ Comment[ven]=U pulaga ha zwishumiswa zwa nyambedzano
+ Comment[vi]=Plugin cho tính chất của hộp thoại
+ Comment[xh]=Iplagi yangaphakathi Yezinto zobumnini Zencoko yababini
+-Comment[xx]=xxPlugin for the Properties Dialogxx
+ Comment[zh_CN]=属性对话的插件
+ Comment[zh_TW]=屬性對話盒的外掛程式
+ Comment[zu]=I-plugin Yengxoxo Yezinkomba zobunini
+diff -Nru kdelibs-release-3.4.0/kio/kfile/kurlbar.cpp kdelibs-branch-3.4/kio/kfile/kurlbar.cpp
+--- kdelibs-release-3.4.0/kio/kfile/kurlbar.cpp 2005-02-17 14:19:07.000000000 -0500
++++ kdelibs-branch-3.4/kio/kfile/kurlbar.cpp 2005-04-03 16:55:09.000000000 -0400
+@@ -703,15 +703,9 @@
+
+ KURL::List::Iterator it = urls.begin();
+ for ( ; it != urls.end(); ++it ) {
+- url = *it;
+- if ( KURLBarItemDialog::getInformation( m_useGlobal,
+- url, description, icon,
+- appLocal, m_iconSize,
+- this ) ) {
+- (void) insertItem( url, description, appLocal, icon );
+- m_isModified = true;
+- updateGeometry();
+- }
++ (void) insertItem( *it, description, appLocal, icon );
++ m_isModified = true;
++ updateGeometry();
+ }
+ }
+ }
+diff -Nru kdelibs-release-3.4.0/kio/kfileplugin.desktop kdelibs-branch-3.4/kio/kfileplugin.desktop
+--- kdelibs-release-3.4.0/kio/kfileplugin.desktop 2005-02-23 00:04:37.000000000 -0500
++++ kdelibs-branch-3.4/kio/kfileplugin.desktop 2005-03-27 02:28:43.000000000 -0500
+@@ -3,7 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=KFilePlugin
+ Name=KFile Meta Data Plugin
+-Name[af]=Klêer Meta Data Inplak
++Name[af]=Klêer Meta Data Inprop module
+ Name[ar]=ملحق KFile Meta Data
+ Name[az]=KFile Meta Data Əlavəsi
+ Name[bg]=Приставка за мета данни
+@@ -24,7 +24,7 @@
+ Name[fr]=Module externe de métadonnées KFile
+ Name[ga]=Breiseán meiteasonraí do KFile
+ Name[gl]=Plugin para Datos Meta de KFile
+-Name[he]=תוסף מטא-נתונים ל־KFile
++Name[he]=תוסף מטא־נתונים עבור KFile
+ Name[hi]=KFile मेटा ङाटा प्लगइन
+ Name[hr]=KFile dodatak za meta-podatke
+ Name[hu]=KFile metaadat-modul
+@@ -54,7 +54,7 @@
+ Name[sl]=Vstavek za meta podatke pri KFile
+ Name[sq]=Shtojca KFile Meta Data
+ Name[sr]=KFile прикључак за мета податке
+-Name[sr@Latn]=KFile dodatak za meta podatke
++Name[sr@Latn]=KFile priključak za meta podatke
+ Name[sv]=Kfil-metadatainsticksprogram
+ Name[ta]=கேகோப்பு மெட்டா தகவல் சொருகுப்பொருள்
+ Name[tg]=KФайли Модули Meta Сана
+@@ -63,7 +63,6 @@
+ Name[uz]=KFile мета маълумот учун плагин
+ Name[ven]=Meta data pulagini ya faela ya K
+ Name[xh]=Iplagi yangaphakathi ye KFile Meta Data
+-Name[xx]=xxKFile Meta Data Pluginxx
+ Name[zh_CN]=KFile 元数据插件
+ Name[zh_TW]=KFile 資料定義外掛程式
+
+diff -Nru kdelibs-release-3.4.0/kio/kio/job.cpp kdelibs-branch-3.4/kio/kio/job.cpp
+--- kdelibs-release-3.4.0/kio/kio/job.cpp 2005-02-18 12:50:19.000000000 -0500
++++ kdelibs-branch-3.4/kio/kio/job.cpp 2005-04-04 06:59:27.000000000 -0400
+@@ -81,11 +81,12 @@
+ class Job::JobPrivate
+ {
+ public:
+- JobPrivate() : m_autoErrorHandling( false ), m_parentJob( 0L ), m_extraFlags(0),
++ JobPrivate() : m_autoErrorHandling( false ), m_interactive( true ), m_parentJob( 0L ), m_extraFlags(0),
+ m_processedSize(0)
+ {}
+
+ bool m_autoErrorHandling;
++ bool m_interactive;
+ QGuardedPtr<QWidget> m_errorParentWidget;
+ // Maybe we could use the QObject parent/child mechanism instead
+ // (requires a new ctor, and moving the ctor code to some init()).
+@@ -311,6 +312,16 @@
+ return d->m_autoErrorHandling;
+ }
+
++void Job::setInteractive(bool enable)
++{
++ d->m_interactive = enable;
++}
++
++bool Job::isInteractive() const
++{
++ return d->m_interactive;
++}
++
+ void Job::setWindow(QWidget *window)
+ {
+ m_window = window;
+@@ -549,6 +560,8 @@
+
+ void SimpleJob::slotWarning( const QString & errorText )
+ {
++ if (!isInteractive()) return;
++
+ static uint msgBoxDisplayed = 0;
+ if ( msgBoxDisplayed == 0 ) // don't bomb the user with message boxes, only one at a time
+ {
+@@ -625,10 +638,10 @@
+
+ void MkdirJob::start(Slave *slave)
+ {
+- SimpleJob::start(slave);
+-
+ connect( slave, SIGNAL( redirection(const KURL &) ),
+ SLOT( slotRedirection(const KURL &) ) );
++
++ SimpleJob::start(slave);
+ }
+
+ // Slave got a redirection request
+@@ -752,12 +765,12 @@
+ m_outgoingMetaData.replace( "statSide", m_bSource ? "source" : "dest" );
+ m_outgoingMetaData.replace( "details", QString::number(m_details) );
+
+- SimpleJob::start(slave);
+-
+- connect( m_slave, SIGNAL( statEntry( const KIO::UDSEntry& ) ),
++ connect( slave, SIGNAL( statEntry( const KIO::UDSEntry& ) ),
+ SLOT( slotStatEntry( const KIO::UDSEntry & ) ) );
+ connect( slave, SIGNAL( redirection(const KURL &) ),
+ SLOT( slotRedirection(const KURL &) ) );
++
++ SimpleJob::start(slave);
+ }
+
+ void StatJob::slotStatEntry( const KIO::UDSEntry & entry )
+@@ -1565,12 +1578,14 @@
+ void FileCopyJob::setSourceSize( off_t size )
+ {
+ d->m_sourceSize = size;
++ if (size != (off_t) -1)
+ m_totalSize = size;
+ }
+
+ void FileCopyJob::setSourceSize64( KIO::filesize_t size )
+ {
+ d->m_sourceSize = size;
++ if (size != (KIO::filesize_t) -1)
+ m_totalSize = size;
+ }
+
+@@ -2590,7 +2605,8 @@
+ // if the file system doesn't support deleting, we do not even stat
+ if (m_mode == Move && !KProtocolInfo::supportsDeleting(m_currentSrcURL)) {
+ QGuardedPtr<CopyJob> that = this;
+- KMessageBox::information( 0, buildErrorString(ERR_CANNOT_DELETE, m_currentSrcURL.prettyURL()));
++ if (isInteractive())
++ KMessageBox::information( 0, buildErrorString(ERR_CANNOT_DELETE, m_currentSrcURL.prettyURL()));
+ if (that)
+ statNextSrc(); // we could use a loop instead of a recursive call :)
+ return;
+@@ -3908,7 +3924,8 @@
+ if (!KProtocolInfo::supportsDeleting(m_currentURL)) {
+ QGuardedPtr<DeleteJob> that = this;
+ ++m_currentStat;
+- KMessageBox::information( 0, buildErrorString(ERR_CANNOT_DELETE, m_currentURL.prettyURL()));
++ if (isInteractive())
++ KMessageBox::information( 0, buildErrorString(ERR_CANNOT_DELETE, m_currentURL.prettyURL()));
+ if (that)
+ statNextSrc();
+ return;
+diff -Nru kdelibs-release-3.4.0/kio/kio/jobclasses.h kdelibs-branch-3.4/kio/kio/jobclasses.h
+--- kdelibs-release-3.4.0/kio/kio/jobclasses.h 2005-02-27 14:12:48.000000000 -0500
++++ kdelibs-branch-3.4/kio/kio/jobclasses.h 2005-04-04 06:59:27.000000000 -0400
+@@ -178,6 +178,23 @@
+ bool isAutoErrorHandlingEnabled() const;
+
+ /**
++ * Enable or disable the message display from the job.
++ *
++ * The default is true.
++ * @param enable enable or disable message display
++ * @since 3.4.1
++ */
++ void setInteractive(bool enable);
++
++ /**
++ * Returns whether message display is enabled or disabled.
++ * See also setInteractive .
++ * @return true if message display is enabled
++ * @see setInteractive()
++ * @since 3.4.1
++ */
++ bool isInteractive() const;
++ /**
+ * Associate this job with a window given by @p window.
+ * @param window the window to associate to
+ * @see window()
+@@ -299,7 +316,7 @@
+ * @param msg the info message
+ */
+ void infoMessage( KIO::Job *job, const QString & msg );
+- // KDE 3.0: Separate rich-text string from plain-text string, for different widgets.
++ // KDE4: Separate rich-text string from plain-text string, for different widgets.
+
+ /**
+ * Emitted when the slave successfully connected to the host.
+@@ -1336,6 +1353,14 @@
+ virtual void start( Slave *slave );
+
+ /**
++ * Returns the ListJob's redirection URL. This will be invalid if there
++ * was no redirection.
++ * @return the redirection url
++ * @since 3.4.1
++ */
++ const KURL& redirectionURL() const { return m_redirectionURL; }
++
++ /**
+ * Do not apply any KIOSK restrictions to this job.
+ * @since 3.2
+ */
+@@ -1478,6 +1503,8 @@
+ * rename dialog is shown.
+ * If the program doesn't want CopyJob to show dialogs, but to simply fail on error,
+ * call setInteractive( false ).
++ *
++ * KDE4: remove, already in Job
+ * @since 3.4
+ */
+ void setInteractive( bool b );
+diff -Nru kdelibs-release-3.4.0/kio/kio/kdirlister.cpp kdelibs-branch-3.4/kio/kio/kdirlister.cpp
+--- kdelibs-release-3.4.0/kio/kio/kdirlister.cpp 2005-02-13 10:43:47.000000000 -0500
++++ kdelibs-branch-3.4/kio/kio/kdirlister.cpp 2005-03-27 10:43:28.000000000 -0500
+@@ -223,14 +223,14 @@
+ if ( lister->d->url == _url )
+ lister->d->rootFileItem = 0;
+
+- lister->d->complete = false;
+-
+ KIO::ListJob* job = KIO::listDir( _url, false /* no default GUI */ );
+- lister->jobStarted(job);
+ jobs.insert( job, QValueList<KIO::UDSEntry>() );
+
+- if (lister->d->window)
+- job->setWindow(lister->d->window);
++ lister->jobStarted( job );
++ lister->connectJob( job );
++
++ if ( lister->d->window )
++ job->setWindow( lister->d->window );
+
+ connect( job, SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList & ) ),
+ this, SLOT( slotEntries( KIO::Job *, const KIO::UDSEntryList & ) ) );
+@@ -239,17 +239,6 @@
+ connect( job, SIGNAL( redirection( KIO::Job *, const KURL & ) ),
+ this, SLOT( slotRedirection( KIO::Job *, const KURL & ) ) );
+
+- connect( job, SIGNAL( infoMessage( KIO::Job *, const QString& ) ),
+- lister, SLOT( slotInfoMessage( KIO::Job *, const QString& ) ) );
+- connect( job, SIGNAL( percent( KIO::Job *, unsigned long ) ),
+- lister, SLOT( slotPercent( KIO::Job *, unsigned long ) ) );
+- connect( job, SIGNAL( totalSize( KIO::Job *, KIO::filesize_t ) ),
+- lister, SLOT( slotTotalSize( KIO::Job *, KIO::filesize_t ) ) );
+- connect( job, SIGNAL( processedSize( KIO::Job *, KIO::filesize_t ) ),
+- lister, SLOT( slotProcessedSize( KIO::Job *, KIO::filesize_t ) ) );
+- connect( job, SIGNAL( speed( KIO::Job *, unsigned long ) ),
+- lister, SLOT( slotSpeed( KIO::Job *, unsigned long ) ) );
+-
+ emit lister->started( _url );
+
+ // }
+@@ -257,27 +246,17 @@
+ }
+ else
+ {
+- kdDebug(7004) << k_funcinfo << "Entry currently being listed: " << _url << endl;
++ kdDebug(7004) << "listDir: Entry currently being listed: " << _url << endl;
+
+ emit lister->started( _url );
+
+- lister->d->complete = false;
+ urlsCurrentlyListed[urlStr]->append( lister );
+
+- KIO::ListJob *job = jobForUrl(urlStr);
+- Q_ASSERT(job);
++ KIO::ListJob *job = jobForUrl( urlStr );
++ Q_ASSERT( job );
+
+- lister->jobStarted(job);
+- connect( job, SIGNAL( infoMessage( KIO::Job *, const QString& ) ),
+- lister, SLOT( slotInfoMessage( KIO::Job *, const QString& ) ) );
+- connect( job, SIGNAL( percent( KIO::Job *, unsigned long ) ),
+- lister, SLOT( slotPercent( KIO::Job *, unsigned long ) ) );
+- connect( job, SIGNAL( totalSize( KIO::Job *, KIO::filesize_t ) ),
+- lister, SLOT( slotTotalSize( KIO::Job *, KIO::filesize_t ) ) );
+- connect( job, SIGNAL( processedSize( KIO::Job *, KIO::filesize_t ) ),
+- lister, SLOT( slotProcessedSize( KIO::Job *, KIO::filesize_t ) ) );
+- connect( job, SIGNAL( speed( KIO::Job *, unsigned long ) ),
+- lister, SLOT( slotSpeed( KIO::Job *, unsigned long ) ) );
++ lister->jobStarted( job );
++ lister->connectJob( job );
+
+ Q_ASSERT( itemU );
+
+@@ -312,28 +291,32 @@
+
+ //kdDebug(7004) << k_funcinfo << " found lister in list - for " << url << endl;
+ bool ret = listers->removeRef( lister );
+- Q_ASSERT(ret);
+- KIO::ListJob *job = jobForUrl(url);
+- lister->jobDone(job);
++ Q_ASSERT( ret );
++
++ KIO::ListJob *job = jobForUrl( url );
++ if ( job )
++ lister->jobDone( job );
+
+ // move lister to urlsCurrentlyHeld
+ QPtrList<KDirLister> *holders = urlsCurrentlyHeld[url];
+ if ( !holders )
+ {
+ holders = new QPtrList<KDirLister>;
+- holders->append( lister );
+ urlsCurrentlyHeld.insert( url, holders );
+ }
+- else
+- holders->append( lister );
++
++ holders->append( lister );
+
+ emit lister->canceled( KURL( url ) );
+
+- //kdDebug(7004) << "KDirListerCache::stop(lister) remaining list: " << listers->count() << " listers" << endl;
+- //kill the job if it isn't used any more
++ //kdDebug(7004) << k_funcinfo << "remaining list: " << listers->count() << " listers" << endl;
++
+ if ( listers->isEmpty() )
+ {
+- killJob( job );
++ // kill the job since it isn't used any more
++ if ( job )
++ killJob( job );
++
+ urlsCurrentlyListed.remove( url );
+ }
+
+@@ -370,19 +353,24 @@
+ if ( !holders )
+ {
+ holders = new QPtrList<KDirLister>;
+- holders->append( lister );
+ urlsCurrentlyHeld.insert( urlStr, holders );
+ }
+- else
+- holders->append( lister );
+
+- KIO::ListJob *job = jobForUrl(urlStr);
+- lister->jobDone(job);
++ holders->append( lister );
++
++
++ KIO::ListJob *job = jobForUrl( urlStr );
++ if ( job )
++ lister->jobDone( job );
++
+ emit lister->canceled( _url );
+
+- if ( listers->isEmpty() ) // kill the job
++ if ( listers->isEmpty() )
+ {
+- killJob( job );
++ // kill the job since it isn't used any more
++ if ( job )
++ killJob( job );
++
+ urlsCurrentlyListed.remove( urlStr );
+ }
+
+@@ -451,10 +439,10 @@
+ itemsInUse.remove( urlStr );
+
+ // this job is a running update
+- KIO::ListJob *job = jobForUrl(urlStr);
++ KIO::ListJob *job = jobForUrl( urlStr );
+ if ( job )
+ {
+- lister->jobDone(job);
++ lister->jobDone( job );
+ killJob( job );
+ kdDebug(7004) << k_funcinfo << "Killing update job for " << urlStr << endl;
+
+@@ -483,7 +471,8 @@
+ const bool isLocal = item->url.isLocalFile();
+ const bool isManuallyMounted = isLocal && KIO::manually_mounted( item->url.path() );
+ bool containsManuallyMounted = false;
+- if ( !isManuallyMounted && item->lstItems && isLocal ) {
++ if ( !isManuallyMounted && item->lstItems && isLocal )
++ {
+ // Look for a manually-mounted directory inside
+ // If there's one, we can't keep a watch either, FAM would prevent unmounting the CDROM
+ // I hope this isn't too slow (manually_mounted caches the last device so most
+@@ -493,10 +482,11 @@
+ if ( (*kit)->isDir() && KIO::manually_mounted( (*kit)->url().path() ) )
+ containsManuallyMounted = true;
+ }
+- if ( isManuallyMounted || containsManuallyMounted ) {
++
++ if ( isManuallyMounted || containsManuallyMounted )
++ {
+ kdDebug(7004) << "Not adding a watch on " << item->url << " because it " <<
+- ( isManuallyMounted ? "is manually mounted" : "contains a manually mounted subdir" )
+- << endl;
++ ( isManuallyMounted ? "is manually mounted" : "contains a manually mounted subdir" ) << endl;
+ item->complete = false; // set to "dirty"
+ }
+ else
+@@ -525,25 +515,30 @@
+ // A job can be running to
+ // - only list a new directory: the listers are in urlsCurrentlyListed
+ // - only update a directory: the listers are in urlsCurrentlyHeld
+- // - update a currently running listing: the listers are in urlsCurrently
++ // - update a currently running listing: the listers are in urlsCurrentlyListed
++ // and urlsCurrentlyHeld
+
+ QPtrList<KDirLister> *listers = urlsCurrentlyListed[urlStr];
+ QPtrList<KDirLister> *holders = urlsCurrentlyHeld[urlStr];
+
+ // restart the job for _dir if it is running already
+ bool killed = false;
++ QWidget *window = 0;
+ KIO::ListJob *job = jobForUrl( urlStr );
+ if ( job )
+ {
+- killed = true;
++ window = job->window();
++
+ killJob( job );
++ killed = true;
++
+ if ( listers )
+ for ( KDirLister *kdl = listers->first(); kdl; kdl = listers->next() )
+- kdl->jobDone(job);
++ kdl->jobDone( job );
+
+ if ( holders )
+ for ( KDirLister *kdl = holders->first(); kdl; kdl = holders->next() )
+- kdl->jobDone(job);
++ kdl->jobDone( job );
+ }
+ kdDebug(7004) << k_funcinfo << "Killed = " << killed << endl;
+
+@@ -568,13 +563,12 @@
+
+ if ( holders )
+ {
+- if ( killed )
++ if ( !killed )
+ {
+ bool first = true;
+ for ( KDirLister *kdl = holders->first(); kdl; kdl = holders->next() )
+ {
+ kdl->jobStarted( job );
+- kdl->d->complete = false;
+ if ( first && kdl->d->window )
+ {
+ first = false;
+@@ -585,6 +579,8 @@
+ }
+ else
+ {
++ job->setWindow( window );
++
+ for ( KDirLister *kdl = holders->first(); kdl; kdl = holders->next() )
+ kdl->jobStarted( job );
+ }
+@@ -894,7 +890,7 @@
+
+ void KDirListerCache::slotEntries( KIO::Job *job, const KIO::UDSEntryList &entries )
+ {
+- KURL url = static_cast<KIO::ListJob *>(job)->url();
++ KURL url = joburl( static_cast<KIO::ListJob *>(job) );
+ url.adjustPath(-1);
+ QString urlStr = url.url();
+
+@@ -962,13 +958,13 @@
+ kdl->emitItems();
+ }
+
+-void KDirListerCache::slotResult( KIO::Job* j )
++void KDirListerCache::slotResult( KIO::Job *j )
+ {
+ Q_ASSERT( j );
+ KIO::ListJob *job = static_cast<KIO::ListJob *>( j );
+ jobs.remove( job );
+
+- KURL jobUrl = job->url();
++ KURL jobUrl = joburl( job );
+ jobUrl.adjustPath(-1); // need remove trailing slashes again, in case of redirections
+ QString jobUrlStr = jobUrl.url();
+
+@@ -992,7 +988,7 @@
+ {
+ for ( kdl = listers->first(); kdl; kdl = listers->next() )
+ {
+- kdl->jobDone(job);
++ kdl->jobDone( job );
+ kdl->handleError( job );
+ emit kdl->canceled( jobUrl );
+ if ( kdl->numJobs() == 0 )
+@@ -1010,7 +1006,7 @@
+
+ for ( kdl = listers->first(); kdl; kdl = listers->next() )
+ {
+- kdl->jobDone(job);
++ kdl->jobDone( job );
+ emit kdl->completed( jobUrl );
+ if ( kdl->numJobs() == 0 )
+ {
+@@ -1029,22 +1025,29 @@
+ #endif
+ }
+
+-void KDirListerCache::slotRedirection( KIO::Job *job, const KURL &url )
++void KDirListerCache::slotRedirection( KIO::Job *j, const KURL& url )
+ {
+- Q_ASSERT( job );
+- KURL oldUrl = static_cast<KIO::ListJob *>( job )->url();
++ Q_ASSERT( j );
++ KIO::ListJob *job = static_cast<KIO::ListJob *>( j );
++
++ KURL oldUrl = job->url(); // here we really need the old url!
++ KURL newUrl = url;
+
+ // strip trailing slashes
+ oldUrl.adjustPath(-1);
+- KURL newUrl = url;
+ newUrl.adjustPath(-1);
+
+ kdDebug(7004) << k_funcinfo << oldUrl.prettyURL() << " -> " << newUrl.prettyURL() << endl;
+
++#ifdef DEBUG_CACHE
++ printDebug();
++#endif
++
+ // I don't think there can be dirItems that are childs of oldUrl.
+ // Am I wrong here? And even if so, we don't need to delete them, right?
+ // DF: redirection happens before listDir emits any item. Makes little sense otherwise.
+
++ // oldUrl cannot be in itemsCached because only completed items are moved there
+ DirItem *dir = itemsInUse.take( oldUrl.url() );
+ Q_ASSERT( dir );
+
+@@ -1054,6 +1057,7 @@
+
+ for ( KDirLister *kdl = listers->first(); kdl; kdl = listers->next() )
+ {
++ // TODO: put in own method?
+ if ( kdl->d->url.equals( oldUrl, true ) )
+ {
+ kdl->d->rootFileItem = 0;
+@@ -1075,12 +1079,191 @@
+ }
+ }
+
+- delete dir->rootItem;
+- dir->rootItem = 0;
+- dir->lstItems->clear();
+- dir->redirect( newUrl );
+- itemsInUse.insert( newUrl.url(), dir );
+- urlsCurrentlyListed.insert( newUrl.url(), listers );
++ // when a lister was stopped before the job emits the redirection signal, the old url will
++ // also be in urlsCurrentlyHeld
++ QPtrList<KDirLister> *holders = urlsCurrentlyHeld.take( oldUrl.url() );
++ if ( holders )
++ {
++ Q_ASSERT( !holders->isEmpty() );
++
++ for ( KDirLister *kdl = holders->first(); kdl; kdl = holders->next() )
++ {
++ kdl->jobStarted( job );
++
++ // do it like when starting a new list-job that will redirect later
++ emit kdl->started( oldUrl );
++
++ // TODO: maybe don't emit started if there's an update running for newUrl already?
++
++ if ( kdl->d->url.equals( oldUrl, true ) )
++ {
++ kdl->d->rootFileItem = 0;
++ kdl->d->url = newUrl;
++ }
++
++ *kdl->d->lstDirs.find( oldUrl ) = newUrl;
++
++ if ( kdl->d->lstDirs.count() == 1 )
++ {
++ emit kdl->clear();
++ emit kdl->redirection( newUrl );
++ emit kdl->redirection( oldUrl, newUrl );
++ }
++ else
++ {
++ emit kdl->clear( oldUrl );
++ emit kdl->redirection( oldUrl, newUrl );
++ }
++ }
++ }
++
++ DirItem *newDir = itemsInUse[newUrl.url()];
++ if ( newDir )
++ {
++ kdDebug(7004) << "slotRedirection: " << newUrl.url() << " already in use" << endl;
++
++ // only in this case there can newUrl already be in urlsCurrentlyListed or urlsCurrentlyHeld
++ delete dir;
++
++ // get the job if one's running for newUrl already (can be a list-job or an update-job), but
++ // do not return this 'job', which would happen because of the use of redirectionURL()
++ KIO::ListJob *oldJob = jobForUrl( newUrl.url(), job );
++
++ // listers of newUrl with oldJob: forget about the oldJob and use the already running one
++ // which will be converted to an updateJob
++ QPtrList<KDirLister> *curListers = urlsCurrentlyListed[newUrl.url()];
++ if ( curListers )
++ {
++ kdDebug(7004) << "slotRedirection: and it is currently listed" << endl;
++
++ Q_ASSERT( oldJob ); // ?!
++
++ for ( KDirLister *kdl = curListers->first(); kdl; kdl = curListers->next() ) // listers of newUrl
++ {
++ kdl->jobDone( oldJob );
++
++ kdl->jobStarted( job );
++ kdl->connectJob( job );
++ }
++
++ // append listers of oldUrl with newJob to listers of newUrl with oldJob
++ for ( KDirLister *kdl = listers->first(); kdl; kdl = listers->next() )
++ curListers->append( kdl );
++ }
++ else
++ urlsCurrentlyListed.insert( newUrl.url(), listers );
++
++ if ( oldJob ) // kill the old job, be it a list-job or an update-job
++ killJob( oldJob );
++
++ // holders of newUrl: use the already running job which will be converted to an updateJob
++ QPtrList<KDirLister> *curHolders = urlsCurrentlyHeld[newUrl.url()];
++ if ( curHolders )
++ {
++ kdDebug(7004) << "slotRedirection: and it is currently held." << endl;
++
++ for ( KDirLister *kdl = curHolders->first(); kdl; kdl = curHolders->next() ) // holders of newUrl
++ {
++ kdl->jobStarted( job );
++ emit kdl->started( newUrl );
++ }
++
++ // append holders of oldUrl to holders of newUrl
++ if ( holders )
++ for ( KDirLister *kdl = holders->first(); kdl; kdl = holders->next() )
++ curHolders->append( kdl );
++ }
++ else if ( holders )
++ urlsCurrentlyHeld.insert( newUrl.url(), holders );
++
++
++ // emit old items: listers, holders. NOT: newUrlListers/newUrlHolders, they already have them listed
++ // TODO: make this a separate method?
++ for ( KDirLister *kdl = listers->first(); kdl; kdl = listers->next() )
++ {
++ if ( !kdl->d->rootFileItem && kdl->d->url == newUrl )
++ kdl->d->rootFileItem = newDir->rootItem;
++
++ kdl->addNewItems( *(newDir->lstItems) );
++ kdl->emitItems();
++ }
++
++ if ( holders )
++ {
++ for ( KDirLister *kdl = holders->first(); kdl; kdl = holders->next() )
++ {
++ if ( !kdl->d->rootFileItem && kdl->d->url == newUrl )
++ kdl->d->rootFileItem = newDir->rootItem;
++
++ kdl->addNewItems( *(newDir->lstItems) );
++ kdl->emitItems();
++ }
++ }
++ }
++ else if ( (newDir = itemsCached.take( newUrl.url() )) )
++ {
++ kdDebug(7004) << "slotRedirection: " << newUrl.url() << " is unused, but already in the cache." << endl;
++
++ delete dir;
++ itemsInUse.insert( newUrl.url(), newDir );
++
++ // emit old items: listers, holders
++ for ( KDirLister *kdl = listers->first(); kdl; kdl = listers->next() )
++ {
++ if ( !kdl->d->rootFileItem && kdl->d->url == newUrl )
++ kdl->d->rootFileItem = newDir->rootItem;
++
++ kdl->addNewItems( *(newDir->lstItems) );
++ kdl->emitItems();
++ }
++
++ if ( holders )
++ {
++ for ( KDirLister *kdl = holders->first(); kdl; kdl = holders->next() )
++ {
++ if ( !kdl->d->rootFileItem && kdl->d->url == newUrl )
++ kdl->d->rootFileItem = newDir->rootItem;
++
++ kdl->addNewItems( *(newDir->lstItems) );
++ kdl->emitItems();
++ }
++ }
++ }
++ else
++ {
++ kdDebug(7004) << "slotRedirection: " << newUrl.url() << " has not been listed yet." << endl;
++
++ delete dir->rootItem;
++ dir->rootItem = 0;
++ dir->lstItems->clear();
++ dir->redirect( newUrl );
++ itemsInUse.insert( newUrl.url(), dir );
++ urlsCurrentlyListed.insert( newUrl.url(), listers );
++
++ if ( holders )
++ urlsCurrentlyHeld.insert( newUrl.url(), holders );
++ else
++ {
++#ifdef DEBUG_CACHE
++ printDebug();
++#endif
++ return; // only in this case the job doesn't need to be converted,
++ }
++ }
++
++ // make the job an update job
++ job->disconnect( this );
++
++ connect( job, SIGNAL(entries( KIO::Job *, const KIO::UDSEntryList & )),
++ this, SLOT(slotUpdateEntries( KIO::Job *, const KIO::UDSEntryList & )) );
++ connect( job, SIGNAL(result( KIO::Job * )),
++ this, SLOT(slotUpdateResult( KIO::Job * )) );
++
++ // FIXME: autoUpdate-Counts!!
++
++#ifdef DEBUG_CACHE
++ printDebug();
++#endif
+ }
+
+ void KDirListerCache::renameDir( const KURL &oldUrl, const KURL &newUrl )
+@@ -1135,7 +1318,7 @@
+ }
+ emitRedirections( oldDirUrl, newDirUrl );
+ }
+- if (goNext)
++ if ( goNext )
+ ++itu;
+ }
+
+@@ -1151,9 +1334,9 @@
+ QString oldUrlStr = oldUrl.url(-1);
+ QString urlStr = url.url(-1);
+
+- KIO::ListJob *job = jobForUrl(oldUrlStr);
+- if (job)
+- killJob( job );
++ KIO::ListJob *job = jobForUrl( oldUrlStr );
++ if ( job )
++ killJob( job );
+
+ // Check if we were listing this dir. Need to abort and restart with new name in that case.
+ QPtrList<KDirLister> *listers = urlsCurrentlyListed.take( oldUrlStr );
+@@ -1162,8 +1345,10 @@
+ // Tell the world that the job listing the old url is dead.
+ for ( KDirLister *kdl = listers->first(); kdl; kdl = listers->next() )
+ {
+- kdl->jobDone(job);
+- emit kdl->canceled( oldUrl );
++ if ( job )
++ kdl->jobDone( job );
++
++ emit kdl->canceled( oldUrl );
+ }
+
+ urlsCurrentlyListed.insert( urlStr, listers );
+@@ -1174,13 +1359,14 @@
+ QPtrList<KDirLister> *holders = urlsCurrentlyHeld.take( oldUrlStr );
+ if ( holders )
+ {
+- for ( KDirLister *kdl = holders->first(); kdl; kdl = holders->next() )
+- kdl->jobDone(job);
++ if ( job )
++ for ( KDirLister *kdl = holders->first(); kdl; kdl = holders->next() )
++ kdl->jobDone( job );
+
+ urlsCurrentlyHeld.insert( urlStr, holders );
+ }
+
+- if (listers)
++ if ( listers )
+ {
+ updateDirectory( url );
+
+@@ -1189,7 +1375,7 @@
+ emit kdl->started( url );
+ }
+
+- if (holders)
++ if ( holders )
+ {
+ // And notify the dirlisters of the redirection
+ for ( KDirLister *kdl = holders->first(); kdl; kdl = holders->next() )
+@@ -1224,11 +1410,10 @@
+
+ void KDirListerCache::slotUpdateResult( KIO::Job * j )
+ {
+-
+ Q_ASSERT( j );
+ KIO::ListJob *job = static_cast<KIO::ListJob *>( j );
+
+- KURL jobUrl = job->url();
++ KURL jobUrl = joburl( job );
+ jobUrl.adjustPath(-1); // need remove trailing slashes again, in case of redirections
+ QString jobUrlStr = jobUrl.url();
+
+@@ -1261,7 +1446,7 @@
+ {
+ for ( kdl = listers->first(); kdl; kdl = listers->next() )
+ {
+- kdl->jobDone(job);
++ kdl->jobDone( job );
+
+ //don't bother the user
+ //kdl->handleError( job );
+@@ -1306,23 +1491,20 @@
+ static const QString& dot = KGlobal::staticQString(".");
+ static const QString& dotdot = KGlobal::staticQString("..");
+
+- KFileItem *item, *tmp;
++ KFileItem *item = 0, *tmp;
+
+ QValueList<KIO::UDSEntry> buf = jobs[job];
+ QValueListIterator<KIO::UDSEntry> it = buf.begin();
+ for ( ; it != buf.end(); ++it )
+ {
+- QString name;
++ // Form the complete url
++ if ( !item )
++ item = new KFileItem( *it, jobUrl, delayedMimeTypes, true );
++ else
++ item->setUDSEntry( *it, jobUrl, delayedMimeTypes, true );
+
+ // Find out about the name
+- KIO::UDSEntry::Iterator it2 = (*it).begin();
+- for ( ; it2 != (*it).end(); it2++ )
+- if ( (*it2).m_uds == KIO::UDS_NAME )
+- {
+- name = (*it2).m_str;
+- break;
+- }
+-
++ QString name = item->name();
+ Q_ASSERT( !name.isEmpty() );
+
+ // we duplicate the check for dotdot here, to avoid iterating over
+@@ -1336,7 +1518,8 @@
+ // there is no root item yet
+ if ( !dir->rootItem )
+ {
+- dir->rootItem = new KFileItem( *it, jobUrl, delayedMimeTypes, true );
++ dir->rootItem = item;
++ item = 0;
+
+ for ( KDirLister *kdl = listers->first(); kdl; kdl = listers->next() )
+ if ( !kdl->d->rootFileItem && kdl->d->url == jobUrl )
+@@ -1346,14 +1529,8 @@
+ continue;
+ }
+
+- // Form the complete url
+- item = new KFileItem( *it, jobUrl, delayedMimeTypes, true );
+-
+- QString url = item->url().url();
+- //kdDebug(7004) << "slotUpdateResult : look for " << url << endl;
+-
+ // Find this item
+- if ( (tmp = fileItems[url]) )
++ if ( (tmp = fileItems[item->url().url()]) )
+ {
+ tmp->mark();
+
+@@ -1369,7 +1546,6 @@
+ for ( kdl = listers->first(); kdl; kdl = listers->next() )
+ kdl->addRefreshItem( tmp );
+ }
+- delete item; // gmbl, this is the most often case... IMPORTANT TODO: speed it up somehow!
+ }
+ else // this is a new file
+ {
+@@ -1380,9 +1556,15 @@
+
+ for ( kdl = listers->first(); kdl; kdl = listers->next() )
+ kdl->addNewItem( item );
++
++ // item used, we need a new one for the next iteration
++ item = 0;
+ }
+ }
+
++ if ( item )
++ delete item;
++
+ jobs.remove( job );
+
+ deleteUnmarkedItems( listers, dir->lstItems );
+@@ -1391,7 +1573,7 @@
+ {
+ kdl->emitItems();
+
+- kdl->jobDone(job);
++ kdl->jobDone( job );
+
+ emit kdl->completed( jobUrl );
+ if ( kdl->numJobs() == 0 )
+@@ -1408,22 +1590,28 @@
+
+ // private
+
+-KIO::ListJob *KDirListerCache::jobForUrl(const QString& _url)
++KIO::ListJob *KDirListerCache::jobForUrl( const QString& url, KIO::ListJob *not_job )
+ {
+ KIO::ListJob *job;
+ QMap< KIO::ListJob *, QValueList<KIO::UDSEntry> >::Iterator it = jobs.begin();
+ while ( it != jobs.end() )
+ {
+ job = it.key();
+- if ( job->url().url(-1) == _url )
+- {
++ if ( joburl( job ).url(-1) == url && job != not_job )
+ return job;
+- }
+ ++it;
+ }
+ return 0;
+ }
+
++const KURL& KDirListerCache::joburl( KIO::ListJob *job )
++{
++ if ( job->redirectionURL().isValid() )
++ return job->redirectionURL();
++ else
++ return job->url();
++}
++
+ void KDirListerCache::killJob( KIO::ListJob *job )
+ {
+ jobs.remove( job );
+@@ -1575,7 +1763,7 @@
+ QMap< KIO::ListJob *, QValueList<KIO::UDSEntry> >::Iterator jit = jobs.begin();
+ kdDebug(7004) << "Jobs: " << endl;
+ for ( ; jit != jobs.end() ; ++jit )
+- kdDebug(7004) << " " << jit.key() << " listing " << jit.key()->url().prettyURL() << ": " << (*jit).count() << " entries." << endl;
++ kdDebug(7004) << " " << jit.key() << " listing " << joburl( jit.key() ).prettyURL() << ": " << (*jit).count() << " entries." << endl;
+
+ kdDebug(7004) << "Items in cache: " << endl;
+ QCacheIterator<DirItem> itc( itemsCached );
+@@ -2211,13 +2399,12 @@
+ return d->jobData.count();
+ }
+
+-void KDirLister::jobDone(KIO::ListJob *job)
++void KDirLister::jobDone( KIO::ListJob *job )
+ {
+- if (job)
+- d->jobData.remove(job);
++ d->jobData.remove( job );
+ }
+
+-void KDirLister::jobStarted(KIO::ListJob *job)
++void KDirLister::jobStarted( KIO::ListJob *job )
+ {
+ KDirListerPrivate::JobData jobData;
+ jobData.speed = 0;
+@@ -2225,10 +2412,25 @@
+ jobData.processedSize = 0;
+ jobData.totalSize = 0;
+
+- d->jobData.insert(job, jobData);
++ d->jobData.insert( job, jobData );
++ d->complete = false;
+ }
+
+-void KDirLister::setMainWindow(QWidget *window)
++void KDirLister::connectJob( KIO::ListJob *job )
++{
++ connect( job, SIGNAL(infoMessage( KIO::Job *, const QString& )),
++ this, SLOT(slotInfoMessage( KIO::Job *, const QString& )) );
++ connect( job, SIGNAL(percent( KIO::Job *, unsigned long )),
++ this, SLOT(slotPercent( KIO::Job *, unsigned long )) );
++ connect( job, SIGNAL(totalSize( KIO::Job *, KIO::filesize_t )),
++ this, SLOT(slotTotalSize( KIO::Job *, KIO::filesize_t )) );
++ connect( job, SIGNAL(processedSize( KIO::Job *, KIO::filesize_t )),
++ this, SLOT(slotProcessedSize( KIO::Job *, KIO::filesize_t )) );
++ connect( job, SIGNAL(speed( KIO::Job *, unsigned long )),
++ this, SLOT(slotSpeed( KIO::Job *, unsigned long )) );
++}
++
++void KDirLister::setMainWindow( QWidget *window )
+ {
+ d->window = window;
+ }
+@@ -2243,7 +2445,7 @@
+ return itemsForDir( url(), which );
+ }
+
+-KFileItemList KDirLister::itemsForDir( const KURL &dir, WhichItems which) const
++KFileItemList KDirLister::itemsForDir( const KURL& dir, WhichItems which ) const
+ {
+ KFileItemList result;
+ KFileItemList *allItems = s_pCache->itemsForDir( dir );
+@@ -2252,7 +2454,6 @@
+
+ if ( which == AllItems )
+ result = *allItems; // shallow copy
+-
+ else // only items passing the filters
+ {
+ for ( KFileItemListIterator kit( *allItems ); kit.current(); ++kit )
+diff -Nru kdelibs-release-3.4.0/kio/kio/kdirlister.h kdelibs-branch-3.4/kio/kio/kdirlister.h
+--- kdelibs-release-3.4.0/kio/kio/kdirlister.h 2005-02-13 10:43:47.000000000 -0500
++++ kdelibs-branch-3.4/kio/kio/kdirlister.h 2005-03-27 10:43:28.000000000 -0500
+@@ -1,6 +1,6 @@
+ /* This file is part of the KDE project
+ Copyright (C) 1999 David Faure <faure@kde.org>
+- 2001, 2002, 2004 Michael Brade <brade@kde.org>
++ 2001, 2002, 2004, 2005 Michael Brade <brade@kde.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+@@ -50,6 +50,7 @@
+ * without forgetting the ones previously read (e.g. for a tree view)
+ *
+ * @short Helper class for the kiojob used to list and update a directory.
++ * @author Michael Brade <brade@kde.org>
+ */
+ class KIO_EXPORT KDirLister : public QObject
+ {
+@@ -490,7 +491,7 @@
+ *
+ * ATTENTION: if @p _fileItem == rootItem() the directory this lister
+ * is holding was deleted and you HAVE to release especially the
+- * rootItem() of this lister, otherwise your app will CRASH!!
++ * rootItem() of this lister, otherwise your app will CRASH!!
+ * The clear() signals have been emitted already.
+ * @param _fileItem the fileItem to delete
+ */
+@@ -612,8 +613,10 @@
+ void slotSpeed( KIO::Job *, unsigned long );
+
+ private:
+- void jobDone( KIO::ListJob * );
+ void jobStarted( KIO::ListJob * );
++ void connectJob( KIO::ListJob * );
++ void jobDone( KIO::ListJob * );
++
+ uint numJobs();
+
+ private:
+diff -Nru kdelibs-release-3.4.0/kio/kio/kdirlister_p.h kdelibs-branch-3.4/kio/kio/kdirlister_p.h
+--- kdelibs-release-3.4.0/kio/kio/kdirlister_p.h 2005-02-13 10:43:47.000000000 -0500
++++ kdelibs-branch-3.4/kio/kio/kdirlister_p.h 2005-03-27 10:43:28.000000000 -0500
+@@ -196,7 +196,9 @@
+ void slotUpdateResult( KIO::Job *job );
+
+ private:
+- KIO::ListJob *jobForUrl(const QString& _url);
++ KIO::ListJob *jobForUrl( const QString& url, KIO::ListJob *not_job = 0 );
++ const KURL& joburl( KIO::ListJob *job );
++
+ void killJob( KIO::ListJob *job );
+
+ // check if _url is held by some lister and return true,
+diff -Nru kdelibs-release-3.4.0/kio/kio/kfileitem.cpp kdelibs-branch-3.4/kio/kio/kfileitem.cpp
+--- kdelibs-release-3.4.0/kio/kio/kfileitem.cpp 2005-02-25 10:38:10.000000000 -0500
++++ kdelibs-branch-3.4/kio/kio/kfileitem.cpp 2005-03-27 10:44:52.000000000 -0500
+@@ -17,7 +17,7 @@
+ the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+-// $Id: kfileitem.cpp,v 1.176.2.1 2005/02/25 15:38:10 faure Exp $
++// $Id: kfileitem.cpp,v 1.176.2.2 2005/03/27 15:44:52 brade Exp $
+
+ #include <sys/time.h>
+ #include <pwd.h>
+@@ -62,63 +62,9 @@
+ m_bLink( false ),
+ m_bIsLocalURL( _url.isLocalFile() ),
+ m_bMimeTypeKnown( false ),
+- d(0L)
++ d(0)
+ {
+- bool UDS_URL_seen = false;
+- // extract the mode and the filename from the KIO::UDS Entry
+- KIO::UDSEntry::ConstIterator it = m_entry.begin();
+- for( ; it != m_entry.end(); ++it ) {
+- switch ((*it).m_uds) {
+-
+- case KIO::UDS_FILE_TYPE:
+- m_fileMode = (mode_t)((*it).m_long);
+- break;
+-
+- case KIO::UDS_ACCESS:
+- m_permissions = (mode_t)((*it).m_long);
+- break;
+-
+- case KIO::UDS_USER:
+- m_user = ((*it).m_str);
+- break;
+-
+- case KIO::UDS_GROUP:
+- m_group = ((*it).m_str);
+- break;
+-
+- case KIO::UDS_NAME:
+- m_strName = (*it).m_str;
+- m_strText = KIO::decodeFileName( m_strName );
+- break;
+-
+- case KIO::UDS_URL:
+- UDS_URL_seen = true;
+- m_url = KURL((*it).m_str);
+- if (m_url.isLocalFile()) m_bIsLocalURL = true;
+- break;
+-
+- case KIO::UDS_MIME_TYPE:
+- m_pMimeType = KMimeType::mimeType((*it).m_str);
+- m_bMimeTypeKnown = true;
+- break;
+-
+- case KIO::UDS_GUESSED_MIME_TYPE:
+- m_guessedMimeType = (*it).m_str;
+- break;
+-
+- case KIO::UDS_LINK_DEST:
+- m_bLink = !(*it).m_str.isEmpty(); // we don't store the link dest
+- break;
+- case KIO::UDS_ICON_NAME:
+- d=new KFileItemPrivate();
+- d->iconName=(*it).m_str;
+- break;
+- }
+- }
+- // avoid creating these QStrings again and again
+- static const QString& dot = KGlobal::staticQString(".");
+- if ( _urlIsDirectory && !UDS_URL_seen && !m_strName.isEmpty() && m_strName != dot )
+- m_url.addPath( m_strName );
++ readUDSEntry( _urlIsDirectory );
+ init( _determineMimeTypeOnDemand );
+ }
+
+@@ -134,7 +80,7 @@
+ m_bLink( false ),
+ m_bIsLocalURL( _url.isLocalFile() ),
+ m_bMimeTypeKnown( false ),
+- d(0L)
++ d(0)
+ {
+ init( _determineMimeTypeOnDemand );
+ }
+@@ -150,7 +96,7 @@
+ m_bLink( false ),
+ m_bIsLocalURL( url.isLocalFile() ),
+ m_bMimeTypeKnown( !mimeType.isEmpty() ),
+- d(0L)
++ d(0)
+ {
+ if (m_bMimeTypeKnown)
+ m_pMimeType = KMimeType::mimeType( mimeType );
+@@ -159,11 +105,17 @@
+ }
+
+ KFileItem::KFileItem( const KFileItem & item ) :
+- d(0L)
++ d(0)
+ {
+ assign( item );
+ }
+
++KFileItem& KFileItem::operator=( const KFileItem & item )
++{
++ assign( item );
++ return *this;
++}
++
+ KFileItem::~KFileItem()
+ {
+ delete d;
+@@ -229,7 +181,70 @@
+ // otherwise, determineMimeType will be able to do better.
+ m_bMimeTypeKnown = (!_determineMimeTypeOnDemand) || accurate;
+ }
++}
++
++void KFileItem::readUDSEntry( bool _urlIsDirectory )
++{
++ // extract the mode and the filename from the KIO::UDS Entry
++ bool UDS_URL_seen = false;
+
++ KIO::UDSEntry::ConstIterator it = m_entry.begin();
++ for( ; it != m_entry.end(); ++it ) {
++ switch ((*it).m_uds) {
++
++ case KIO::UDS_FILE_TYPE:
++ m_fileMode = (mode_t)((*it).m_long);
++ break;
++
++ case KIO::UDS_ACCESS:
++ m_permissions = (mode_t)((*it).m_long);
++ break;
++
++ case KIO::UDS_USER:
++ m_user = ((*it).m_str);
++ break;
++
++ case KIO::UDS_GROUP:
++ m_group = ((*it).m_str);
++ break;
++
++ case KIO::UDS_NAME:
++ m_strName = (*it).m_str;
++ m_strText = KIO::decodeFileName( m_strName );
++ break;
++
++ case KIO::UDS_URL:
++ UDS_URL_seen = true;
++ m_url = KURL((*it).m_str);
++ if ( m_url.isLocalFile() )
++ m_bIsLocalURL = true;
++ break;
++
++ case KIO::UDS_MIME_TYPE:
++ m_pMimeType = KMimeType::mimeType((*it).m_str);
++ m_bMimeTypeKnown = true;
++ break;
++
++ case KIO::UDS_GUESSED_MIME_TYPE:
++ m_guessedMimeType = (*it).m_str;
++ break;
++
++ case KIO::UDS_LINK_DEST:
++ m_bLink = !(*it).m_str.isEmpty(); // we don't store the link dest
++ break;
++
++ case KIO::UDS_ICON_NAME:
++ if ( !d )
++ d = new KFileItemPrivate();
++ d->iconName = (*it).m_str;
++ break;
++ }
++ }
++
++ // avoid creating these QStrings again and again
++ static const QString& dot = KGlobal::staticQString(".");
++ if ( _urlIsDirectory && !UDS_URL_seen && !m_strName.isEmpty() && m_strName != dot )
++ m_url.addPath( m_strName );
+ }
+
+ void KFileItem::refresh()
+@@ -239,11 +254,7 @@
+ m_pMimeType = 0L;
+ m_user = QString::null;
+ m_group = QString::null;
+- m_access = QString::null;
+- m_size = (KIO::filesize_t) -1;
+ m_metaInfo = KFileMetaInfo();
+- for ( int i = 0; i < NumFlags; i++ )
+- m_time[i] = (time_t) -1;
+
+ // Basically, we can't trust any information we got while listing.
+ // Everything could have changed...
+@@ -797,15 +808,46 @@
+ // note: m_extra is NOT copied, as we'd have no control over who is
+ // deleting the data or not.
+
+- delete d; d = 0;
+ // We had a mimetype previously (probably), so we need to re-determine it
+ determineMimeType();
+- if (item.d) {
+- d=new KFileItemPrivate;
+- d->iconName=item.d->iconName;
++
++ if ( item.d ) {
++ if ( !d )
++ d = new KFileItemPrivate;
++ d->iconName = item.d->iconName;
++ } else {
++ delete d;
++ d = 0;
+ }
+ }
+
++void KFileItem::setUDSEntry( const KIO::UDSEntry& _entry, const KURL& _url,
++ bool _determineMimeTypeOnDemand, bool _urlIsDirectory )
++{
++ m_entry = _entry;
++ m_url = _url;
++ m_strName = QString::null;
++ m_strText = QString::null;
++ m_user = QString::null;
++ m_group = QString::null;
++ m_strLowerCaseName = QString::null;
++ m_pMimeType = 0;
++ m_fileMode = KFileItem::Unknown;
++ m_permissions = KFileItem::Unknown;
++ m_bMarked = false;
++ m_bLink = false;
++ m_bIsLocalURL = _url.isLocalFile();
++ m_bMimeTypeKnown = false;
++ m_guessedMimeType = QString::null;
++ m_metaInfo = KFileMetaInfo();
++
++ if ( d )
++ d->iconName = QString::null;
++
++ readUDSEntry( _urlIsDirectory );
++ init( _determineMimeTypeOnDemand );
++}
++
+ void KFileItem::setExtraData( const void *key, void *value )
+ {
+ if ( !key )
+diff -Nru kdelibs-release-3.4.0/kio/kio/kfileitem.h kdelibs-branch-3.4/kio/kio/kfileitem.h
+--- kdelibs-release-3.4.0/kio/kio/kfileitem.h 2004-12-20 13:34:16.000000000 -0500
++++ kdelibs-branch-3.4/kio/kio/kfileitem.h 2005-03-27 10:44:52.000000000 -0500
+@@ -458,13 +458,38 @@
+ * Somewhat like an assignment operator, but more explicit.
+ * Note: extra-data set with setExtraData() is not copied, so be careful
+ * what you do!
+- *
+- * I.e. KDirLister uses it to update existing items from a fresh item.
++ *
+ * @param item the item to copy
+ */
+ void assign( const KFileItem & item );
+
+ /**
++ * Reinitialize KFileItem with a new UDSEntry.
++ *
++ * Note: extra-data set with setExtraData() is not changed or deleted, so
++ * be careful what you do!
++ *
++ * KDirListerCache uses it to save new/delete calls by updating existing
++ * items that are otherwise not needed anymore.
++ *
++ * @param entry the UDSEntry to assign to this KFileItem
++ * @param url the file url
++ * @param determineMimeTypeOnDemand specifies if the mimetype of the given
++ * URL should be determined immediately or on demand
++ * @param urlIsDirectory specifies if the url is just the directory of the
++ * fileitem and the filename from the UDSEntry should be used.
++ * @since 3.4.1
++ */
++ void setUDSEntry( const KIO::UDSEntry& entry, const KURL& url,
++ bool determineMimeTypeOnDemand = false,
++ bool urlIsDirectory = false );
++
++ /**
++ * Assignment operator, calls assign()
++ */
++ KFileItem& operator=( const KFileItem& );
++
++ /**
+ * Tries to give a local URL for this file item if possible.
+ * The given boolean indicates if the returned url is local or not.
+ */
+@@ -480,6 +505,13 @@
+ void init( bool _determineMimeTypeOnDemand );
+
+ /**
++ * Extracts the data from the UDSEntry member and updates the KFileItem
++ * accordingly.
++ * @since 3.4.1
++ */
++ void readUDSEntry( bool _urlIsDirectory );
++
++ /**
+ * Parses the given permission set and provides it for access()
+ */
+ QString parsePermissions( mode_t perm ) const;
+diff -Nru kdelibs-release-3.4.0/kio/kio/kprotocolmanager.cpp kdelibs-branch-3.4/kio/kio/kprotocolmanager.cpp
+--- kdelibs-release-3.4.0/kio/kio/kprotocolmanager.cpp 2005-02-17 06:18:43.000000000 -0500
++++ kdelibs-branch-3.4/kio/kio/kprotocolmanager.cpp 2005-03-07 20:07:36.000000000 -0500
+@@ -246,9 +246,24 @@
+ case WPADProxy:
+ if (!url.host().isEmpty())
+ {
+- QString p = url.protocol();
+- if ( p.startsWith( "http" ) || p == "ftp" || p == "gopher" )
+- DCOPRef( "kded", "proxyscout" ).call( "proxyForURL", url ).get( proxy );
++ KURL u (url);
++ QString p = u.protocol().lower();
++
++ // webdav is a KDE specific protocol. Look up proxy
++ // information using HTTP instead...
++ if ( p == "webdav" )
++ {
++ p = "http";
++ u.setProtocol( p );
++ }
++ else if ( p == "webdavs" )
++ {
++ p = "https";
++ u.setProtocol( p );
++ }
++
++ if ( p.startsWith("http") || p == "ftp" || p == "gopher" )
++ DCOPRef( "kded", "proxyscout" ).call( "proxyForURL", u ).get( proxy );
+ }
+ break;
+ case EnvVarProxy:
+@@ -267,7 +282,7 @@
+
+ void KProtocolManager::badProxy( const QString &proxy )
+ {
+- DCOPRef( "kded", "proxyscout" ).send( "blackListProxy", proxy );
++ DCOPRef( "kded", "proxyscout" ).send( "blackListProxy", proxy );
+ }
+
+ /*
+diff -Nru kdelibs-release-3.4.0/kio/kio/krun.cpp kdelibs-branch-3.4/kio/kio/krun.cpp
+--- kdelibs-release-3.4.0/kio/kio/krun.cpp 2005-01-29 19:34:33.000000000 -0500
++++ kdelibs-branch-3.4/kio/kio/krun.cpp 2005-04-04 18:05:13.000000000 -0400
+@@ -464,7 +464,7 @@
+ else
+ result << "kdesu" << "-u";
+ result << _service.username() << "-c";
+- KShell::splitArgs(exec, KShell::AbortOnMeta, &err);
++ KShell::splitArgs(exec, KShell::AbortOnMeta | KShell::TildeExpand, &err);
+ if (err == KShell::FoundMeta) {
+ shellQuote( exec );
+ exec.prepend( "/bin/sh -c " );
+@@ -476,7 +476,7 @@
+ } else {
+ if (has_shell) {
+ if (_service.terminal()) {
+- KShell::splitArgs(exec, KShell::AbortOnMeta, &err);
++ KShell::splitArgs(exec, KShell::AbortOnMeta | KShell::TildeExpand, &err);
+ if (err == KShell::FoundMeta) {
+ shellQuote( exec );
+ exec.prepend( "/bin/sh -c " );
+@@ -485,7 +485,7 @@
+ }
+ result << exec;
+ } else {
+- result += KShell::splitArgs(exec, KShell::AbortOnMeta, &err);
++ result += KShell::splitArgs(exec, KShell::AbortOnMeta | KShell::TildeExpand, &err);
+ if (err == KShell::FoundMeta)
+ result << "/bin/sh" << "-c" << exec;
+ else if (err != KShell::NoError)
+@@ -958,13 +958,14 @@
+ return;
+ }
+
+- if ( m_bFault ){
++ if ( m_bFault ) {
+ emit error();
+ }
+- if ( m_bFinished ){
++ if ( m_bFinished ) {
+ emit finished();
+ }
+-
++ else
++ {
+ if ( m_bScanFile )
+ {
+ m_bScanFile = false;
+@@ -977,6 +978,7 @@
+ foundMimeType( "inode/directory" );
+ return;
+ }
++ }
+
+ if ( m_bAutoDelete )
+ {
+@@ -1017,7 +1019,11 @@
+ m_bIsDirectory = true; // it's a dir
+ else
+ m_bScanFile = true; // it's a file
+- break;
++ }
++ else if ( (*it).m_uds == KIO::UDS_MIME_TYPE ) // mimetype already known? (e.g. print:/manager)
++ {
++ foundMimeType( (*it).m_str );
++ m_bFinished = true;
+ }
+ }
+ // We should have found something
+diff -Nru kdelibs-release-3.4.0/kio/kio/kzip.cpp kdelibs-branch-3.4/kio/kio/kzip.cpp
+--- kdelibs-release-3.4.0/kio/kio/kzip.cpp 2005-02-18 14:36:22.000000000 -0500
++++ kdelibs-branch-3.4/kio/kio/kzip.cpp 2005-03-31 06:50:53.000000000 -0500
+@@ -381,6 +381,7 @@
+ if ( d->m_saveFile->status() != 0 ) {
+ kdWarning(7040) << "KSaveFile creation for " << m_filename << " failed, " << strerror( d->m_saveFile->status() ) << endl;
+ delete d->m_saveFile;
++ d->m_saveFile = 0;
+ return false;
+ }
+ Q_ASSERT( d->m_saveFile->file() );
+@@ -438,7 +439,7 @@
+ kdDebug(7040) << "PK56 found end of archive" << endl;
+ break;
+ }
+-
++
+ if ( !memcmp( buffer, "PK\3\4", 4 ) ) // local file header
+ {
+ kdDebug(7040) << "PK34 found local file header" << endl;
+@@ -455,14 +456,14 @@
+ int gpf = (uchar)buffer[0]; // "general purpose flag" not "general protection fault" ;-)
+ int compression_mode = (uchar)buffer[2] | (uchar)buffer[3] << 8;
+ time_t mtime = transformFromMsDos( buffer+4 );
+-
++
+ Q_LONG compr_size = (uchar)buffer[12] | (uchar)buffer[13] << 8
+ | (uchar)buffer[14] << 16 | (uchar)buffer[15] << 24;
+ Q_LONG uncomp_size = (uchar)buffer[16] | (uchar)buffer[17] << 8
+ | (uchar)buffer[18] << 16 | (uchar)buffer[19] << 24;
+ int namelen = (uchar)buffer[20] | (uchar)buffer[21] << 8;
+ int extralen = (uchar)buffer[22] | (uchar)buffer[23] << 8;
+-
++
+ kdDebug(7040) << "general purpose bit flag: " << gpf << endl;
+ kdDebug(7040) << "compressed size: " << compr_size << endl;
+ kdDebug(7040) << "uncompressed size: " << uncomp_size << endl;
+@@ -487,9 +488,9 @@
+ unsigned int extraFieldEnd = dev->at() + extralen;
+ pfi->extralen = extralen;
+ int handledextralen = QMIN(extralen, (int)sizeof buffer);
+-
++
+ kdDebug(7040) << "handledextralen: " << handledextralen << endl;
+-
++
+ n = dev->readBlock(buffer, handledextralen);
+ // no error msg necessary as we deliberately truncate the extra field
+ if (!parseExtraField(buffer, handledextralen, true, *pfi))
+@@ -534,20 +535,20 @@
+ // PK34 for the next local header in case there is no data descriptor
+ // PK12 for the central header in case there is no data descriptor
+ // PK78 for the data descriptor in case it is following the compressed data
+-
++
+ if ( buffer[0] == 'K' && buffer[1] == 7 && buffer[2] == 8 )
+ {
+ foundSignature = true;
+ dev->at( dev->at() + 12 ); // skip the 'data_descriptor'
+ }
+-
++
+ if ( ( buffer[0] == 'K' && buffer[1] == 1 && buffer[2] == 2 )
+ || ( buffer[0] == 'K' && buffer[1] == 3 && buffer[2] == 4 ) )
+ {
+ foundSignature = true;
+ dev->at( dev->at() - 4 ); // go back 4 bytes, so that the magic bytes can be found...
+ }
+-
++
+ }
+ }
+ else
+@@ -573,7 +574,7 @@
+ // here we cannot trust the compressed size, so scan through the compressed
+ // data to find the next header
+ bool foundSignature = false;
+-
++
+ while (!foundSignature)
+ {
+ n = dev->readBlock( buffer, 1 );
+@@ -582,33 +583,33 @@
+ kdWarning(7040) << "Invalid ZIP file. Unexpected end of file. (#2)" << endl;
+ return false;
+ }
+-
++
+ if ( buffer[0] != 'P' )
+ continue;
+-
++
+ n = dev->readBlock( buffer, 3 );
+ if (n < 3)
+ {
+ kdWarning(7040) << "Invalid ZIP file. Unexpected end of file. (#3)" << endl;
+ return false;
+ }
+-
++
+ // we have to detect three magic tokens here:
+ // PK34 for the next local header in case there is no data descriptor
+ // PK12 for the central header in case there is no data descriptor
+ // PK78 for the data descriptor in case it is following the compressed data
+-
++
+ if ( buffer[0] == 'K' && buffer[1] == 7 && buffer[2] == 8 )
+ {
+ foundSignature = true;
+ dev->at( dev->at() + 12 ); // skip the 'data_descriptor'
+ }
+-
++
+ if ( ( buffer[0] == 'K' && buffer[1] == 1 && buffer[2] == 2 )
+ || ( buffer[0] == 'K' && buffer[1] == 3 && buffer[2] == 4 ) )
+ {
+ foundSignature = true;
+- dev->at( dev->at() - 4 );
++ dev->at( dev->at() - 4 );
+ // go back 4 bytes, so that the magic bytes can be found
+ // in the next cycle...
+ }
+@@ -625,7 +626,7 @@
+ else
+ kdDebug(7040) << "dev->at failed... " << endl;*/
+ }
+-
++
+ }
+
+ // not needed any more
+@@ -640,18 +641,21 @@
+ kdDebug(7040) << "PK12 found central block" << endl;
+
+ // so we reached the central header at the end of the zip file
+- // here we get all interesting data out of the central header
++ // here we get all interesting data out of the central header
+ // of a file
+ offset = dev->at() - 4;
+
+ //set offset for appending new files
+ if ( d->m_offset == 0L ) d->m_offset = offset;
+
+- n = dev->readBlock( buffer + 4, 42 );
++ n = dev->readBlock( buffer + 4, 42 );
+ if (n < 42) {
+ kdWarning(7040) << "Invalid ZIP file, central entry too short" << endl; // not long enough for valid entry
+ return false;
+ }
++
++ //int gpf = (uchar)buffer[9] << 8 | (uchar)buffer[10];
++ //kdDebug() << "general purpose flag=" << gpf << endl;
+ // length of the filename (well, pathname indeed)
+ int namelen = (uchar)buffer[29] << 8 | (uchar)buffer[28];
+ QCString bufferName( namelen + 1 );
+diff -Nru kdelibs-release-3.4.0/kio/kpasswdserver.desktop kdelibs-branch-3.4/kio/kpasswdserver.desktop
+--- kdelibs-release-3.4.0/kio/kpasswdserver.desktop 2005-02-23 00:04:37.000000000 -0500
++++ kdelibs-branch-3.4/kio/kpasswdserver.desktop 2005-03-30 01:47:20.000000000 -0500
+@@ -2,12 +2,13 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=KDED Password Module
+-Name[af]=Kded Wagwoord Module
++Name[af]=KDED Wagwoord Module
+ Name[ar]=وحدة كلمة سر KDED
+ Name[az]=KDED Şifrə Modulu
+ Name[be]=Модуль пароляў KDED
+ Name[bg]=Модул за пароли KDED
+ Name[bn]=KDED পাসওয়ার্ড মডিউল
++Name[br]=Mollad tremenger KDED
+ Name[bs]=KDED šifra modul
+ Name[ca]=Mòdul de contrasenya KDED
+ Name[cs]=KDED modul pro hesla
+@@ -65,11 +66,11 @@
+ Name[ven]=Modulu wa phasewede ya KDED
+ Name[wa]=Module di screts po KDE
+ Name[xh]=Igama lokugqitha le Sicatshulwa se KDED
+-Name[xx]=xxKDED Password Modulexx
+ Name[zh_CN]=KDED 密码模块
+ Name[zh_TW]=KDED 密碼模組
+ Name[zu]=Ingxenye Yegama lokudlula le-KDED
+ Comment=Password caching support
++Comment[af]=Wagwoord Kasberging ondersteuning
+ Comment[bg]=Кеширане на пароли
+ Comment[bn]=পাসওয়ার্ড ক্যাশ-এ রাখা সমর্থন করে
+ Comment[bs]=Podrška za keširanje šifre
+@@ -77,6 +78,7 @@
+ Comment[cs]=Podpora pro kešování hesel
+ Comment[da]=Understøttelse for caching af kodeord
+ Comment[de]=Unterstützung für die Zwischenspeicherung von Passwörtern
++Comment[el]=Υποστήριξη προσωρινής αποθήκευσης κωδικού πρόσβασης
+ Comment[es]=Soporte de caché de contraseñas
+ Comment[et]=Parooli meelespidamise toetus
+ Comment[eu]=Pasahitzen cache euskarria
+@@ -106,13 +108,12 @@
+ Comment[sk]=Podpora ukladania hesiel
+ Comment[sl]=Podpora prepomnjenju gesel
+ Comment[sr]=Подршка за кеширање лозинки
+-Comment[sr@Latn]=Подршка за кеширање лозинки
++Comment[sr@Latn]=Podrška za keširanje lozinki
+ Comment[sv]=Stöd för lösenordscache
+ Comment[ta]=கடவுச்சொல் சேமிக்க ஆதரவு
+ Comment[tg]=Дастгирии Ҳофизаи Гузарвожа
+ Comment[tr]=Parola önbellekleme desteği
+ Comment[uk]=Підтримка кешування паролів
+-Comment[xx]=xxPassword caching supportxx
+ Comment[zh_CN]=密码缓存支持
+ ServiceTypes=KDEDModule
+ X-KDE-ModuleType=Library
+diff -Nru kdelibs-release-3.4.0/kio/kscan.desktop kdelibs-branch-3.4/kio/kscan.desktop
+--- kdelibs-release-3.4.0/kio/kscan.desktop 2004-10-25 22:42:24.000000000 -0400
++++ kdelibs-branch-3.4/kio/kscan.desktop 2005-03-10 11:04:50.000000000 -0500
+@@ -3,7 +3,6 @@
+ Type=ServiceType
+ X-KDE-ServiceType=KScan/KScanDialog
+ Name=KScan
+-Name[af]=Kskandeer
+ Name[bn]=কে-স্ক্যান
+ Name[cy]=KSgan
+ Name[eo]=Bildciferecigo
+@@ -16,4 +15,3 @@
+ Name[ta]=Kவருடல்
+ Name[th]=สแกนภาพ - K
+ Name[ven]=U nanga ha K
+-Name[xx]=xxKScanxx
+diff -Nru kdelibs-release-3.4.0/kio/kurifilterplugin.desktop kdelibs-branch-3.4/kio/kurifilterplugin.desktop
+--- kdelibs-release-3.4.0/kio/kurifilterplugin.desktop 2005-02-23 00:04:37.000000000 -0500
++++ kdelibs-branch-3.4/kio/kurifilterplugin.desktop 2005-03-10 11:04:50.000000000 -0500
+@@ -3,7 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=KURIFilter/Plugin
+ Name=Enhanced Browsing Plugin
+-Name[af]=Verbeterde Blaaiïng Inplak
++Name[af]=Verbeterde Blaaiïng Inprop module
+ Name[ar]=ملحقات التصفح المحسن
+ Name[az]=Təkmilləşmiş Səyyah Əlavəsi
+ Name[bg]=Разширена приставка за преглед
+@@ -57,7 +57,7 @@
+ Name[sl]=Vstavek za izboljšano brskanje
+ Name[sq]=Shtojcë e Përmirësuar për Shfletim
+ Name[sr]=Прикључак за побољшано претраживање
+-Name[sr@Latn]=Dodatak za poboljšano pretraživanje
++Name[sr@Latn]=Priključak za poboljšano pretraživanje
+ Name[sv]=Utökad webbläsning
+ Name[ta]=மேம்படுத்திய உலாவும் சொருகுப்பொருள்
+ Name[tg]=Баланд Кардан
+@@ -68,7 +68,6 @@
+ Name[ven]=Pulagini ya burausu yo engedzhwaho
+ Name[vi]=Các plugin đềEtănt cường duyệt
+ Name[xh]=Iplagi yangaphakathi Ekhangela iincwadi Enyusiweyo
+-Name[xx]=xxEnhanced Browsing Pluginxx
+ Name[zh_CN]=增强的浏览插件
+ Name[zh_TW]=增強的瀏覽外掛程式
+ Name[zu]=I-plugin Yomcingi Weqophela eliphezulu
+diff -Nru kdelibs-release-3.4.0/kio/magic kdelibs-branch-3.4/kio/magic
+--- kdelibs-release-3.4.0/kio/magic 2004-07-21 05:29:11.000000000 -0400
++++ kdelibs-branch-3.4/kio/magic 2005-03-17 19:03:59.000000000 -0500
+@@ -67,6 +67,7 @@
+ >28 string \x80theora video/x-theora
+ >28 string Speex\ \ audio/x-speex
+ >29 string video video/x-ogm
++>29 string FLAC audio/x-oggflac
+
+ # FLAC files
+ 0 string fLaC audio/x-flac
+@@ -313,7 +314,7 @@
+
+ # OpenOffice.org 1.1 puts the mimetype into the header too
+ 0 string PK\003\004 application/x-zip
+->30 string mimetype
++>30 string mimetype
+ >>38 string application/vnd.sun.xml.calc application/vnd.sun.xml.calc
+ >>38 string application/vnd.sun.xml.calc.template application/vnd.sun.xml.calc.template
+ >>38 string application/vnd.sun.xml.draw application/vnd.sun.xml.draw
+diff -Nru kdelibs-release-3.4.0/kio/misc/kio_uiserver.desktop kdelibs-branch-3.4/kio/misc/kio_uiserver.desktop
+--- kdelibs-release-3.4.0/kio/misc/kio_uiserver.desktop 2005-01-20 23:24:11.000000000 -0500
++++ kdelibs-branch-3.4/kio/misc/kio_uiserver.desktop 2005-03-10 11:04:51.000000000 -0500
+@@ -12,9 +12,9 @@
+ Name[ro]=Kio_uiserver
+ Name[sv]=Kio-gränssnittsserver
+ Name[ta]=kio_uiசேவையகம்
+-Name[xx]=xxkio_uiserverxx
+ Exec=kio_uiserver
+ Comment=KDE's Progress Info UI server
++Comment[af]=KDE se vordering inligting UI bediener
+ Comment[ar]=خادم معلومات تقدم واجهة كيدي
+ Comment[az]=KDE'nin İrəliləmə Bilgisi İstifadaçi Ara Üz Vericisi
+ Comment[bg]=Сървър за отчитане на прогреса (KDE's Progress Info UI server)
+@@ -79,7 +79,6 @@
+ Comment[ven]=UI siva ya mafhungo a mwelaphanda a KDE
+ Comment[vi]=Máy chủ xem tiến trình các thông tin vềEUI của KDE
+ Comment[xh]=Umcedisi we UI Wenqubela Yenkcukacha we KDE
+-Comment[xx]=xxKDE's Progress Info UI serverxx
+ Comment[zh_CN]=KDE 的进度信息用户界面服务器
+ Comment[zh_TW]=KDE 的進度資訊使用者介面伺服器
+ Comment[zu]=Umlekeleli we-UI Yolwazi Lwenqubo lwe-KDE
+diff -Nru kdelibs-release-3.4.0/kio/misc/kpac/eventsrc kdelibs-branch-3.4/kio/misc/kpac/eventsrc
+--- kdelibs-release-3.4.0/kio/misc/kpac/eventsrc 2005-02-21 04:17:20.000000000 -0500
++++ kdelibs-branch-3.4/kio/misc/kpac/eventsrc 2005-03-10 11:04:51.000000000 -0500
+@@ -1,10 +1,12 @@
+ [!Global!]
+ IconName=proxy
+ Comment=Automatic Proxy Configuration
++Comment[af]=Outomatiese Proksie Opstelling
+ Comment[ar]=تهيئة آلية للخادم الوكيل
+ Comment[az]=Avtomatik Vəkil Quraşdırılması
+ Comment[bg]=Автоматично конфигуриране на прокси сървъра
+ Comment[bn]=স্বয়ংক্রিয় প্রক্সি কনফিগারেশন
++Comment[br]=Kefluniadur emgefreekh ar proksi
+ Comment[bs]=Automatsko podešavanje proxy-ja
+ Comment[ca]=Configuració automàtica del servidor d'intercanvi
+ Comment[cs]=Automatické nastavení proxy
+@@ -57,16 +59,17 @@
+ Comment[uk]=Автоматичне визначення проксі сервера
+ Comment[uz]=Проксини автоматик равишда мослаш
+ Comment[wa]=Apontiaedje otomatike do procsi
+-Comment[xx]=xxAutomatic Proxy Configurationxx
+ Comment[zh_CN]=自动代理配置
+ Comment[zh_TW]=自動代理組態
+
+ [script-error]
+ Name=Invalid proxy script
++Name[af]=Ongeldige proksie skrip
+ Name[ar]=نص برمجي غير صالح
+ Name[az]=Hökmsüz vəkil skripti
+ Name[bg]=Невалиден скрипт за прокси сървъра
+ Name[bn]=অবৈধ প্রক্সি স্ক্রিপ্ট
++Name[br]=N'eo ket mat an urzhiaoug proksi
+ Name[bs]=Neispravna proxy skripta
+ Name[ca]=Script del servidor intermedi no vàlid
+ Name[cs]=Neplatný proxy skript
+@@ -118,14 +121,15 @@
+ Name[tr]=Geçersiz vekil sunucu betiği
+ Name[uk]=Неправильний скрипт для проксі
+ Name[uz]=Прокси скрипти ҳақиқий эмас
+-Name[xx]=xxInvalid proxy scriptxx
+ Name[zh_CN]=无效的代理脚本
+ Name[zh_TW]=不合法 proxy 命令稿檔案
+ Comment=The downloaded proxy configuration script is invalid
++Comment[af]=Die proksie skipt wat afgelaai was is foutief.
+ Comment[ar]=النص البرمجي الذي تم تنزيله غير صالح
+ Comment[az]=Endirilən vəkil quraşdırma skripti kökmsüzdür
+ Comment[bg]=Изтегленият скрипт за конфигуриране на прокси сървъра е невалиден
+ Comment[bn]=ডাউনলোড করা প্রক্সি কনফিগারেশন স্ক্রিপ্টটি অবৈধ
++Comment[br]=N'eo ket mat urzhiaoug kefluniadur ar proksi
+ Comment[bs]=Downloadovana skripta za podešavanje proxy-ja je neispravna
+ Comment[ca]=L'script de configuració del servidor intermedi descarregat no és vàlid
+ Comment[cs]=Stažený konfigurační skript pro proxy je neplatný
+@@ -176,17 +180,18 @@
+ Comment[tr]=Vekil sunucu yapılandırma dosyası geçersiz
+ Comment[uk]=Звантажений скрипт для визначення проксі сервера неправильний
+ Comment[uz]=Проксини мослаш учун ёзиб олинган скрипт ҳақиқий эмас
+-Comment[xx]=xxThe downloaded proxy configuration script is invalidxx
+ Comment[zh_CN]=下载的代理配置脚本是无效的
+ Comment[zh_TW]=代理組態的 script 檔案語法有誤
+ default_presentation=16
+
+ [download-error]
+ Name=Script download error
++Name[af]=Skrip aflaai fout
+ Name[ar]=خطأ أثناء تنزيل النص البرمجي
+ Name[az]=Skript endirmə xətası
+ Name[bg]=Грешка при изтегляне на скрипта
+ Name[bn]=স্ক্রিপ্ট ডাউনলোডে সমস্যা
++Name[br]=Fazi en ur enkargañ an urzhiaoug
+ Name[bs]=Greška pri downloadu skripte
+ Name[ca]=Error descàrrega de l'script
+ Name[cs]=Chyba ve stažení skriptu
+@@ -238,14 +243,15 @@
+ Name[tr]=Betik indirme hatası
+ Name[uk]=Помилка звантаження скрипту
+ Name[uz]=Скриптни ёзиб олишда хато рўй берди
+-Name[xx]=xxScript download errorxx
+ Name[zh_CN]=脚本下载错误
+ Name[zh_TW]=Script 下載錯誤
+ Comment=The proxy configuration script could not be downloaded
++Comment[af]=Die proksie opstelling skrip kon nie afgelaai word nie
+ Comment[ar]=تعذر تنزيل النص البرمجي لإعداد الخادم الوكيل
+ Comment[az]=VƏkil qurğuları skripti endirilə bilmədi
+ Comment[bg]=Скриптът за конфигуриране на прокси сървъра не може да бъде изтеглен
+ Comment[bn]=প্রক্সি কনফিগারেশন স্ক্রিপ্ট ডাউনলোড করা যায়নি
++Comment[br]=Ne m'eus ket enkargañ urzhiaoug kefluniadur ar proksi
+ Comment[bs]=Nisam mogao downloadovati skriptu za podešavanje proxy-ja
+ Comment[ca]=L'script de configuració del servidor intermedi no es pot descarregar
+ Comment[cs]=Nelze stáhnout konfigurační skript pro proxy
+@@ -296,13 +302,13 @@
+ Comment[tr]=Vekil sunucu yapılandırma dosyası indirilemedi
+ Comment[uk]=Не вдається звантажити скрипт для визначення проксі сервера
+ Comment[uz]=Проксини мослаш учун скриптни ёзиб олиб бўлмади
+-Comment[xx]=xxThe proxy configuration script could not be downloadedxx
+ Comment[zh_CN]=代理配置脚本无法下载
+ Comment[zh_TW]=無法取得代理組態 script 檔案
+ default_presentation=16
+
+ [evaluation-error]
+ Name=Script evaluation error
++Name[af]=Skrip evaluasie fout
+ Name[ar]=خطأ في تقييم النص البرمجي
+ Name[az]=Skript icra xətası
+ Name[bg]=Грешка при обработка на скрипта
+@@ -357,14 +363,15 @@
+ Name[tr]=Betik çalıştırma hatası
+ Name[uk]=Помилка виконання скрипту
+ Name[uz]=Скриптни текширишда хато рўй берди
+-Name[xx]=xxScript evaluation errorxx
+ Name[zh_CN]=脚本求值错误
+ Name[zh_TW]=Script 執行錯誤
+ Comment=There was an error executing the proxy configuration script
++Comment[af]=Daar was 'n fout met die uitvoer van die proksie opstell skrip
+ Comment[ar]=لقد حصل خطأ كبير أدى الى خروج البرنامج
+ Comment[az]=Vəkil qurğuları skripti işə salınırkən xəta baş verdi
+ Comment[bg]=Грешка по време на изпълнение на скрипта за конфигуриране на прокси сървъра
+ Comment[bn]=প্রক্সি কনফিগারেশন স্ক্রিপ্ট চালাতে সমস্যা দেখা দিয়েছে
++Comment[br]=Degouezhet ez eus ur fazi en ur seveniñ urzhiaoug kefluniadur ar proksi
+ Comment[bs]=Došlo je do greške pri izvršavanju skripte za podešavanje proxy-ja
+ Comment[ca]=Hi ha hagut un error executant l'script de configuració del servidor intermedi
+ Comment[cs]=Nastala chyba při spouštění konfiguračního skriptu proxy
+@@ -415,7 +422,6 @@
+ Comment[tr]=Vekil sunucu yapılandırma dosyası çalıştırılamadı
+ Comment[uk]=Виникла помилка при спробі виконати скрипт для визначення проксі сервера
+ Comment[uz]=Проксини мослаш учун скриптни ишга туширишда хато рўй берди
+-Comment[xx]=xxThere was an error executing the proxy configuration scriptxx
+ Comment[zh_CN]=执行代理配置脚本出现错误
+ Comment[zh_TW]=proxy 代理組態檔案執行錯誤
+ default_presentation=0
+diff -Nru kdelibs-release-3.4.0/kio/misc/kpac/proxyscout.desktop kdelibs-branch-3.4/kio/misc/kpac/proxyscout.desktop
+--- kdelibs-release-3.4.0/kio/misc/kpac/proxyscout.desktop 2005-02-23 00:04:40.000000000 -0500
++++ kdelibs-branch-3.4/kio/misc/kpac/proxyscout.desktop 2005-03-30 01:47:20.000000000 -0500
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=Proxy Scout
++Name[af]=Proksie Verkenner
+ Name[az]=Vəkil Skout
+ Name[bg]=Проучване на прокси сървъри
+ Name[bn]=প্রক্সি স্কাউট
+@@ -38,17 +39,19 @@
+ Name[tr]=Vekil Sunucu
+ Name[uk]=Розвідник проксі сервера
+ Name[uz]=Прокси скаут
+-Name[xx]=xxProxy Scoutxx
+ Name[zh_CN]=代理搜索
+ Comment=Automatic proxy configuration
++Comment[af]=Outomatiese proksie opstelling
+ Comment[bg]=Автоматично конфигуриране на прокси сървъра
+ Comment[bn]=স্বয়ংক্রিয় প্রক্সি কনফিগারেশন
++Comment[br]=Kefluniadur emgefreekh ar proksi
+ Comment[bs]=Automatsko podešavanje proxy-ja
+ Comment[ca]=Configuració automàtica de l'intermediari
+ Comment[cs]=Automatické nastavení proxy
+ Comment[cy]=Ffurweddiad Awtomatig o'r Dirprwy
+ Comment[da]=Automatisk proxy-indstilling
+ Comment[de]=Autom. Proxy-Einrichtung
++Comment[el]=Αυτόματη ρύθμιση διαμεσολαβητή
+ Comment[es]=Configuración automática del Proxy
+ Comment[et]=Automaatne proxy konfigureerimine
+ Comment[eu]=Proxy-aren konfigurazio automatikoa
+@@ -78,13 +81,12 @@
+ Comment[sk]=Automatická konfigurácia proxy
+ Comment[sl]=Samodejne nastavitve posrednika
+ Comment[sr]=Аутоматско подешавање проксија
+-Comment[sr@Latn]=Аутоматско подешавање проксија
++Comment[sr@Latn]=Automatsko podešavanje proksija
+ Comment[sv]=Automatisk proxyinställning
+ Comment[ta]=தானியக்க பதிலாள் வடிவமைப்பு
+ Comment[tg]=Танзими прокси бо автоматикӣ
+ Comment[tr]=Otomatik vekil sunucu yapılandırması
+ Comment[uk]=Автоматичне визначення проксі сервера
+-Comment[xx]=xxAutomatic proxy configurationxx
+ Comment[zh_CN]=自动代理配置
+ ServiceTypes=KDEDModule
+ X-KDE-ModuleType=Library
+diff -Nru kdelibs-release-3.4.0/kio/misc/kssld/kssld.desktop kdelibs-branch-3.4/kio/misc/kssld/kssld.desktop
+--- kdelibs-release-3.4.0/kio/misc/kssld/kssld.desktop 2005-02-23 00:04:41.000000000 -0500
++++ kdelibs-branch-3.4/kio/misc/kssld/kssld.desktop 2005-03-30 01:47:21.000000000 -0500
+@@ -13,6 +13,7 @@
+ Name[az]=KSSL Demon Modulu
+ Name[bg]=Демон KSSL
+ Name[bn]=KSSL ডিমন মডিউল
++Name[br]=Mollad an diaoul KSSL
+ Name[ca]=Mòdul del dimoni KSSL
+ Name[cs]=Modul démona KSSL
+ Name[cy]=Modiwl Daemon KSSL
+@@ -67,24 +68,27 @@
+ Name[uz]=KSSL хизматининг модули
+ Name[ven]=Modulu wa Daemon wa KSSL
+ Name[xh]=Isicatshulwa se KSSL Daemon
+-Name[xx]=xxKSSL Daemon Modulexx
+ Name[zh_CN]=KSSL 守护进程模块
+ Name[zh_TW]=KSSL 伺服程式模組
+ Name[zu]=Ingxenye ye-daemon ye-KSSL
+ Comment=KSSL daemon module for KDED
++Comment[af]=KSSL bediener module vir KDED
+ Comment[bg]=Модул демон за KSSL за KDED
+ Comment[bn]=KDED-র জন্য KSSL ডিমন মডিউল
++Comment[br]=Mollad an diaoul KSSL evit KDED
+ Comment[bs]=KSSL Daemon Module za KDED
+ Comment[ca]=Mòdul del dimoni KSSL per a KDED
+ Comment[cs]=Modul démona KSSL pro KDED
+ Comment[da]=KSSL Dæmonmodul for KDED
+ Comment[de]=KSSL-Dämon für KDED
++Comment[el]=Άρθρωμα δαίμονα KSSL για το KDED
+ Comment[es]=Módulo de demonio KSSL para KDED
+ Comment[et]=KDED KSSL deemoni moodul
+ Comment[eu]=KSSL daemon modulua KDEDrako
+ Comment[fi]=KSSL-palvelinmoduuli KDED:lle
+ Comment[fr]=Module démon KSSL pour KDED
+ Comment[fy]=KSSL daemon module foar KDED
++Comment[he]=מודול תהליך רקע של SSL עבור KDED
+ Comment[hi]=केडीईडी के लिए केएसएसएल डेमन मॉड्यूल
+ Comment[hu]=KSSL szolgáltatásmodul a KDED-hez
+ Comment[is]=KSSL þjónseining fyrir KDED
+@@ -107,11 +111,10 @@
+ Comment[sk]=Modul démona KSSL pre KDED
+ Comment[sl]=Strežniški modul KSSL za KDED
+ Comment[sr]=KSSL демон модул за KDED
+-Comment[sr@Latn]=KSSL демон модул за KDED
++Comment[sr@Latn]=KSSL demon modul za KDED
+ Comment[sv]=KSSL-demonmodul för KDED
+ Comment[ta]=KDEDக்கான KSSL டெமான் பகுதி
+ Comment[tg]=Модули Демон KSSL брои KDED
+ Comment[tr]=KDED için KSSL program biirmi
+ Comment[uk]=Модуль демону KSSL для KDED
+-Comment[xx]=xxKSSL daemon module for KDEDxx
+ Comment[zh_CN]=KDED 的 KSSL 守护进程模块
+diff -Nru kdelibs-release-3.4.0/kio/misc/kwalletd/kwalletd.desktop kdelibs-branch-3.4/kio/misc/kwalletd/kwalletd.desktop
+--- kdelibs-release-3.4.0/kio/misc/kwalletd/kwalletd.desktop 2005-02-23 00:04:41.000000000 -0500
++++ kdelibs-branch-3.4/kio/misc/kwalletd/kwalletd.desktop 2005-03-30 01:47:21.000000000 -0500
+@@ -8,10 +8,12 @@
+ X-KDE-Kded-autoload=false
+ X-KDE-Kded-load-on-demand=true
+ Name=KWallet Daemon Module
++Name[af]=KBeursie Bediener Module
+ Name[ar]=مراقب وحدة KWallet
+ Name[az]=KWallet Demon Modulu
+ Name[bg]=Демон Портфейл
+ Name[bn]=কে-ওয়ালেট ডিমন মডিউল
++Name[br]=Mollad an diaoul KWallet
+ Name[ca]=Mòdul del dimoni KWallet
+ Name[cs]=Modul démona KWallet
+ Name[cy]=Modiwl Daemon KWaled
+@@ -60,23 +62,26 @@
+ Name[tr]=KWallet Program Modülü
+ Name[uk]=Модуль демону KWallet
+ Name[uz]=KWallet хизматининг модули
+-Name[xx]=xxKWallet Daemon Modulexx
+ Name[zh_CN]=KWallet 守护进程模块
+ Name[zh_TW]=KWAllet 服務程式模組
+ Comment=KWallet daemon module for KDED
++Comment[af]=KBeursie bediener bodule vir KDED
+ Comment[bg]=Модул демон за системата Портфейл за KDED
+ Comment[bn]=KDED-র জন্য কে-ওয়ালেট ডিমন মডিউল
++Comment[br]=Mollad an diaoul KWallet evit KDED
+ Comment[bs]=KWallet daemon modul za KDED
+ Comment[ca]=Mòdul del dimoni KWallet per a KDED
+ Comment[cs]=Modul démona KWallet pro KDED
+ Comment[da]=KWallet Dæmonmodul for KDED
+ Comment[de]=KWallet-Dämon für KDED
++Comment[el]=Άρθρωμα δαίμονα KWallet για το KDED
+ Comment[es]=Módulo de demonio KWallet para KDED
+ Comment[et]=KDED KWalleti deemoni moodul
+ Comment[eu]=KWallet daemon modulua KDEDrako
+ Comment[fi]=KWallet palvelinmoduuli KDED:lle
+ Comment[fr]=Module démon KWallet pour KDED
+ Comment[fy]=KWallet daemon module foar KDED
++Comment[he]=מודול תהליך רקע של KWallet עבור KDED
+ Comment[hi]=केडीईडी के लिए के-वॉलेट डेमन मॉड्यूल
+ Comment[hu]=KWallet szolgáltatásmodul a KDED-hez
+ Comment[is]=KWallet þjónseining fyrir KDED
+@@ -99,11 +104,10 @@
+ Comment[sk]=Modul démona KWallet pre KDED
+ Comment[sl]=Modul KWallet demon za KDED
+ Comment[sr]=KWallet демон модул за KDED
+-Comment[sr@Latn]=KWallet демон модул за KDED
++Comment[sr@Latn]=KWallet demon modul za KDED
+ Comment[sv]=Kwallet-demonmodul för KDED
+ Comment[ta]=KDEDக்கான KWallet Daemon தொகுதி
+ Comment[tg]=Модули Демон KWallet барои KDED
+ Comment[tr]=KDED için KWallet program modülü
+ Comment[uk]=Модуль демону торбинок KWallet для KDED
+-Comment[xx]=xxKWallet daemon module for KDEDxx
+ Comment[zh_CN]=KDED 的 KWallet 守护进程模块
+diff -Nru kdelibs-release-3.4.0/kio/misc/mms.protocol kdelibs-branch-3.4/kio/misc/mms.protocol
+--- kdelibs-release-3.4.0/kio/misc/mms.protocol 2005-02-23 00:04:40.000000000 -0500
++++ kdelibs-branch-3.4/kio/misc/mms.protocol 2005-03-30 01:47:20.000000000 -0500
+@@ -10,13 +10,16 @@
+ Class=:internet
+ Description=Microsoft Media Server Protocol
+ Description[bn]=মাইক্রোসফ্ট মিডিয়া সার্ভার প্রোটোকল
++Description[bs]=Microsoft Media Server protokol
+ Description[ca]=Protocol Microsoft Media Server
+ Description[cs]=Microsoft Media Server protokol
+ Description[da]=Microsoft Mediaserver-protokol
+ Description[de]=Microsoft Media Server Protokoll
++Description[el]=Προτόκολο Microsoft Media Server
+ Description[es]=Protocolo Microsoft Media Server
+ Description[et]=Microsoft Media Server protokoll
+ Description[eu]=Microsoft Media Server protokoloa
++Description[fi]=Microsoft Media -palvelinprotokolla
+ Description[fr]=Protocole Microsoft Media Server
+ Description[hi]=माइक्रोसॉफ़्ट मीडिया सर्वर प्रोटोकॉल
+ Description[hu]=MMS protokoll
+@@ -36,11 +39,10 @@
+ Description[sk]=Protokol pre Microsoft Media Server
+ Description[sl]=Protokol Microsoft Media Server
+ Description[sr]=Microsoft Media Server протокол
+-Description[sr@Latn]=Microsoft Media Server протокол
++Description[sr@Latn]=Microsoft Media Server protokol
+ Description[sv]=Microsoft mediaserver-protokoll
+ Description[ta]=மைக்ரோசாப்ட் ஊடக சேவக நெறிமுறை
+ Description[tg]=Протоколи медиа сервер барои Microsoft
+ Description[uk]=Протокол медіа сервера Microsoft
+-Description[xx]=xxMicrosoft Media Server Protocolxx
+ Description[zh_CN]=Microsoft 媒体服务器协议
+ URIMode=url
+diff -Nru kdelibs-release-3.4.0/kio/renamedlgplugin.desktop kdelibs-branch-3.4/kio/renamedlgplugin.desktop
+--- kdelibs-release-3.4.0/kio/renamedlgplugin.desktop 2005-02-23 00:04:37.000000000 -0500
++++ kdelibs-branch-3.4/kio/renamedlgplugin.desktop 2005-03-27 02:28:43.000000000 -0500
+@@ -25,7 +25,7 @@
+ Comment[fr]=Module externe pour la boîte de dialogue de renommage
+ Comment[fy]=Plugin foar it 'Herneamen'-dialooch
+ Comment[gl]=Plugin para o Diálogo de Renomeamento
+-Comment[he]=תוסף לדו-שיח שינוי השם
++Comment[he]=תוסף לדו־שיח שינוי השם
+ Comment[hi]=रीनेम डायलॉग के लिए प्लगइन
+ Comment[hr]=Dodatak za dijalog za promjenu imena
+ Comment[hu]=Bővítőmodul az átnevezési párbeszédablakhoz
+@@ -56,7 +56,7 @@
+ Comment[sl]=Vstavek za pogovorno okno za preimenovanje
+ Comment[sq]=Shtojca për Dialogun Riemrim
+ Comment[sr]=Прикључак за дијалог за преименовање
+-Comment[sr@Latn]=Dodatak za dijalog za preimenovanje
++Comment[sr@Latn]=Priključak za dijalog za preimenovanje
+ Comment[sv]=Insticksprogram för Byt namn-dialogrutan
+ Comment[ta]=மறுபெயரிடல் உரையாடலுக்கான சொருகுப்பொருள்
+ Comment[tg]=Барои Тирезаи Диалогӣ Номи Нав Гузоштани Пайвастан
+@@ -68,7 +68,6 @@
+ Comment[vi]=Plugin cho Rename Dialog
+ Comment[wa]=Tchôke-divins pol purnea di rlomaedje
+ Comment[xh]=Iplagi yangaphakathi Yencoko yababini Yokunika igama elitsha
+-Comment[xx]=xxPlugin for the Rename Dialogxx
+ Comment[zh_CN]=重命名对话的插件
+ Comment[zh_TW]=更名對話盒的外掛程式
+ Comment[zu]=I-plugin Yengxoxo Yokuqamba kabusha
+diff -Nru kdelibs-release-3.4.0/kio/tests/dummymeta.desktop kdelibs-branch-3.4/kio/tests/dummymeta.desktop
+--- kdelibs-release-3.4.0/kio/tests/dummymeta.desktop 2005-02-23 00:04:42.000000000 -0500
++++ kdelibs-branch-3.4/kio/tests/dummymeta.desktop 2005-03-07 09:13:30.000000000 -0500
+@@ -36,7 +36,6 @@
+ Name[uk]=Макет метаданих
+ Name[uz]=Маъносиз мета
+ Name[ven]=Meta isa tshili
+-Name[xx]=xxDummy Metaxx
+ Name[zh_CN]=哑元
+ Name[zh_TW]=空的資料定義
+ ServiceTypes=KFilePlugin
+diff -Nru kdelibs-release-3.4.0/kioslave/bzip2/kbzip2filter.desktop kdelibs-branch-3.4/kioslave/bzip2/kbzip2filter.desktop
+--- kdelibs-release-3.4.0/kioslave/bzip2/kbzip2filter.desktop 2005-01-20 23:24:12.000000000 -0500
++++ kdelibs-branch-3.4/kioslave/bzip2/kbzip2filter.desktop 2005-03-07 09:13:31.000000000 -0500
+@@ -68,7 +68,6 @@
+ Name[vi]=Trình lọc BZip2
+ Name[wa]=Passete BZip2
+ Name[xh]=Isihluzi se BZip2
+-Name[xx]=xxBZip2 Filterxx
+ Name[zh_CN]=BZip2 过滤程序
+ Name[zh_TW]=BZip2 過濾器
+ Name[zu]=Ihluzo le-BZip2
+diff -Nru kdelibs-release-3.4.0/kioslave/ftp/ftp.cc kdelibs-branch-3.4/kioslave/ftp/ftp.cc
+--- kdelibs-release-3.4.0/kioslave/ftp/ftp.cc 2005-02-18 12:20:19.000000000 -0500
++++ kdelibs-branch-3.4/kioslave/ftp/ftp.cc 2005-03-24 05:30:24.000000000 -0500
+@@ -896,6 +896,7 @@
+ // now connect the data socket ...
+ m_data = new FtpSocket("PASV");
+ m_data->setAddress(host, port);
++ kdDebug(7102) << "Connecting to " << host << " on port " << port << endl;
+ return m_data->connectSocket(connectTimeout(), false);
+ }
+
+@@ -1003,40 +1004,45 @@
+ assert( m_bLoggedOn );
+ ftpCloseDataConnection();
+
+- int iErrCode = 0; // ERR_INTERNAL : try another mode
++ int iErrCode = 0;
++ int iErrCodePASV = 0; // Remember error code from PASV
+
+ // First try passive (EPSV & PASV) modes
+ if( !config()->readBoolEntry("DisablePassiveMode", false) )
+ {
+ iErrCode = ftpOpenPASVDataConnection();
+- if(iErrCode != ERR_INTERNAL)
+- return iErrCode;
++ if(iErrCode == 0)
++ return 0; // success
++ iErrCodePASV = iErrCode;
+ ftpCloseDataConnection();
+
+ if( !config()->readBoolEntry("DisableEPSV", false) )
+ {
+ iErrCode = ftpOpenEPSVDataConnection();
+- if(iErrCode != ERR_INTERNAL)
+- return iErrCode;
++ if(iErrCode == 0)
++ return 0; // success
+ ftpCloseDataConnection();
+ }
+
+ // if we sent EPSV ALL already and it was accepted, then we can't
+ // use active connections any more
+ if (m_extControl & epsvAllSent)
+- return ERR_INTERNAL;
++ return iErrCodePASV ? iErrCodePASV : iErrCode;
+ }
+
+ iErrCode = ftpOpenEPRTDataConnection();
+- if(iErrCode != ERR_INTERNAL)
+- return iErrCode;
++ if(iErrCode == 0)
++ return 0; // success
+ ftpCloseDataConnection();
+
+ // fall back to port mode
+ iErrCode = ftpOpenPortDataConnection();
+- if(iErrCode != 0)
+- ftpCloseDataConnection();
+- return iErrCode;
++ if(iErrCode == 0)
++ return 0; // success
++
++ ftpCloseDataConnection();
++ // prefer to return the error code from PASV if any, since that's what should have worked in the first place
++ return iErrCodePASV ? iErrCodePASV : iErrCode;
+ }
+
+ /*
+@@ -1059,7 +1065,7 @@
+
+ // yes, we are sure this is a KInetSocketAddress
+ const KInetSocketAddress* pAddr = static_cast<const KInetSocketAddress*>(m_control->localAddress());
+- m_data->setAddress(pAddr->nodeName(), pAddr->serviceName());
++ m_data->setAddress(pAddr->nodeName(), "0");
+ m_data->setAddressReusable(true);
+
+ if(m_data->listen(1) < 0)
+@@ -1748,6 +1754,11 @@
+ const char* buffer = m_data->textLine();
+ kdDebug(7102) << "dir > " << buffer << endl;
+
++ //Normally the listing looks like
++ // -rw-r--r-- 1 dfaure dfaure 102 Nov 9 12:30 log
++ // but on Netware servers like ftp://ci-1.ci.pwr.wroc.pl/ it looks like (#76442)
++ // d [RWCEAFMS] Admin 512 Oct 13 2004 PSI
++
+ // we should always get the following 5 fields ...
+ const char *p_access, *p_junk, *p_owner, *p_group, *p_size;
+ if( (p_access = strtok((char*)buffer," ")) == 0) continue;
+@@ -1756,180 +1767,182 @@
+ if( (p_group = strtok(NULL," ")) == 0) continue;
+ if( (p_size = strtok(NULL," ")) == 0) continue;
+
+- // try to parse it as a directory entry ...
++ //kdDebug(7102) << "p_access=" << p_access << " p_junk=" << p_junk << " p_owner=" << p_owner << " p_group=" << p_group << " p_size=" << p_size << endl;
++
++ de.access = 0;
++ if ( strlen( p_access ) == 1 && p_junk[0] == '[' ) { // Netware
++ de.access = S_IRWXU | S_IRWXG | S_IRWXO; // unknown -> give all permissions
++ }
++
+ const char *p_date_1, *p_date_2, *p_date_3, *p_name;
+
+- // A special hack for "/dev". A listing may look like this:
+- // crw-rw-rw- 1 root root 1, 5 Jun 29 1997 zero
+- // So we just ignore the number in front of the ",". Ok, its a hack :-)
+- if ( strchr( p_size, ',' ) != 0L )
+- {
+- //kdDebug(7102) << "Size contains a ',' -> reading size again (/dev hack)" << endl;
+- if ((p_size = strtok(NULL," ")) == 0)
+- continue;
+- }
++ // A special hack for "/dev". A listing may look like this:
++ // crw-rw-rw- 1 root root 1, 5 Jun 29 1997 zero
++ // So we just ignore the number in front of the ",". Ok, its a hack :-)
++ if ( strchr( p_size, ',' ) != 0L )
++ {
++ //kdDebug(7102) << "Size contains a ',' -> reading size again (/dev hack)" << endl;
++ if ((p_size = strtok(NULL," ")) == 0)
++ continue;
++ }
+
+- // Check whether the size we just read was really the size
+- // or a month (this happens when the server lists no group)
+- // Test on sunsite.uio.no, for instance
+- if ( !isdigit( *p_size ) )
+- {
+- p_date_1 = p_size;
+- p_size = p_group;
+- p_group = 0;
+- //kdDebug(7102) << "Size didn't have a digit -> size=" << p_size << " date_1=" << p_date_1 << endl;
+- }
+- else
+- {
+- p_date_1 = strtok(NULL," ");
+- //kdDebug(7102) << "Size has a digit -> ok. p_date_1=" << p_date_1 << endl;
+- }
++ // Check whether the size we just read was really the size
++ // or a month (this happens when the server lists no group)
++ // Used to be the case on sunsite.uio.no, but not anymore
++ // This is needed for the Netware case, too.
++ if ( !isdigit( *p_size ) )
++ {
++ p_date_1 = p_size;
++ p_size = p_group;
++ p_group = 0;
++ //kdDebug(7102) << "Size didn't have a digit -> size=" << p_size << " date_1=" << p_date_1 << endl;
++ }
++ else
++ {
++ p_date_1 = strtok(NULL," ");
++ //kdDebug(7102) << "Size has a digit -> ok. p_date_1=" << p_date_1 << endl;
++ }
+
+- if ( p_date_1 != 0 )
+- if ((p_date_2 = strtok(NULL," ")) != 0)
+- if ((p_date_3 = strtok(NULL," ")) != 0)
+- if ((p_name = strtok(NULL,"\r\n")) != 0)
+- {
+-
+- {
+- QCString tmp( p_name );
+- if ( p_access[0] == 'l' )
+- {
+- int i = tmp.findRev( " -> " );
+- if ( i != -1 ) {
+- de.link = remoteEncoding()->decode(p_name + i + 4);
+- tmp.truncate( i );
+- }
+- else
+- de.link = QString::null;
+- }
+- else
+- de.link = QString::null;
+-
+- if ( tmp[0] == '/' ) // listing on ftp://ftp.gnupg.org/ starts with '/'
+- tmp.remove( 0, 1 );
+-
+- if (tmp.find('/') != -1)
+- continue; // Don't trick us!
+- // Some sites put more than one space between the date and the name
+- // e.g. ftp://ftp.uni-marburg.de/mirror/
+- de.name = remoteEncoding()->decode(tmp.stripWhiteSpace());
+- }
+-
+- de.access = 0;
+- de.type = S_IFREG;
+- switch ( p_access[0] ) {
+- case 'd':
+- de.type = S_IFDIR;
+- break;
+- case 's':
+- de.type = S_IFSOCK;
+- break;
+- case 'b':
+- de.type = S_IFBLK;
+- break;
+- case 'c':
+- de.type = S_IFCHR;
+- break;
+- case 'l':
+- de.type = S_IFREG;
+- // we don't set S_IFLNK here. de.link says it.
+- break;
+- default:
+- break;
+- }
+-
+- if ( p_access[1] == 'r' )
+- de.access |= S_IRUSR;
+- if ( p_access[2] == 'w' )
+- de.access |= S_IWUSR;
+- if ( p_access[3] == 'x' || p_access[3] == 's' )
+- de.access |= S_IXUSR;
+- if ( p_access[4] == 'r' )
+- de.access |= S_IRGRP;
+- if ( p_access[5] == 'w' )
+- de.access |= S_IWGRP;
+- if ( p_access[6] == 'x' || p_access[6] == 's' )
+- de.access |= S_IXGRP;
+- if ( p_access[7] == 'r' )
+- de.access |= S_IROTH;
+- if ( p_access[8] == 'w' )
+- de.access |= S_IWOTH;
+- if ( p_access[9] == 'x' || p_access[9] == 't' )
+- de.access |= S_IXOTH;
+- if ( p_access[3] == 's' || p_access[3] == 'S' )
+- de.access |= S_ISUID;
+- if ( p_access[6] == 's' || p_access[6] == 'S' )
+- de.access |= S_ISGID;
+- if ( p_access[9] == 't' || p_access[9] == 'T' )
+- de.access |= S_ISVTX;
+-
+- // maybe fromLocal8Bit would be better in some cases,
+- // but what proves that the ftp server is in the same encoding
+- // than the user ??
+- de.owner = remoteEncoding()->decode(p_owner);
+- de.group = remoteEncoding()->decode(p_group);
+- de.size = charToLongLong(p_size);
+-
+- // Parsing the date is somewhat tricky
+- // Examples : "Oct 6 22:49", "May 13 1999"
+-
+- // First get current time - we need the current month and year
+- time_t currentTime = time( 0L );
+- struct tm * tmptr = gmtime( ¤tTime );
+- int currentMonth = tmptr->tm_mon;
+- //kdDebug(7102) << "Current time :" << asctime( tmptr ) << endl;
+- // Reset time fields
+- tmptr->tm_sec = 0;
+- tmptr->tm_min = 0;
+- tmptr->tm_hour = 0;
+- // Get day number (always second field)
+- tmptr->tm_mday = atoi( p_date_2 );
+- // Get month from first field
+- // NOTE : no, we don't want to use KLocale here
+- // It seems all FTP servers use the English way
+- //kdDebug(7102) << "Looking for month " << p_date_1 << endl;
+- static const char * s_months[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+- "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
+- for ( int c = 0 ; c < 12 ; c ++ )
+- if ( !strcmp( p_date_1, s_months[c]) )
+- {
+- //kdDebug(7102) << "Found month " << c << " for " << p_date_1 << endl;
+- tmptr->tm_mon = c;
+- break;
+- }
+-
+- // Parse third field
+- if ( strlen( p_date_3 ) == 4 ) // 4 digits, looks like a year
+- tmptr->tm_year = atoi( p_date_3 ) - 1900;
+- else
+- {
+- // otherwise, the year is implicit
+- // according to man ls, this happens when it is between than 6 months
+- // old and 1 hour in the future.
+- // So the year is : current year if tm_mon <= currentMonth+1
+- // otherwise current year minus one
+- // (The +1 is a security for the "+1 hour" at the end of the month issue)
+- if ( tmptr->tm_mon > currentMonth + 1 )
+- tmptr->tm_year--;
+-
+- // and p_date_3 contains probably a time
+- char * semicolon;
+- if ( ( semicolon = (char*)strchr( p_date_3, ':' ) ) )
+- {
+- *semicolon = '\0';
+- tmptr->tm_min = atoi( semicolon + 1 );
+- tmptr->tm_hour = atoi( p_date_3 );
+- }
+- else
+- kdWarning(7102) << "Can't parse third field " << p_date_3 << endl;
+- }
+-
+- //kdDebug(7102) << asctime( tmptr ) << endl;
+- de.date = mktime( tmptr );
+- return true;
+- }
+- }
++ if ( p_date_1 != 0 &&
++ (p_date_2 = strtok(NULL," ")) != 0 &&
++ (p_date_3 = strtok(NULL," ")) != 0 &&
++ (p_name = strtok(NULL,"\r\n")) != 0 )
++ {
++ {
++ QCString tmp( p_name );
++ if ( p_access[0] == 'l' )
++ {
++ int i = tmp.findRev( " -> " );
++ if ( i != -1 ) {
++ de.link = remoteEncoding()->decode(p_name + i + 4);
++ tmp.truncate( i );
++ }
++ else
++ de.link = QString::null;
++ }
++ else
++ de.link = QString::null;
++
++ if ( tmp[0] == '/' ) // listing on ftp://ftp.gnupg.org/ starts with '/'
++ tmp.remove( 0, 1 );
++
++ if (tmp.find('/') != -1)
++ continue; // Don't trick us!
++ // Some sites put more than one space between the date and the name
++ // e.g. ftp://ftp.uni-marburg.de/mirror/
++ de.name = remoteEncoding()->decode(tmp.stripWhiteSpace());
++ }
++
++ de.type = S_IFREG;
++ switch ( p_access[0] ) {
++ case 'd':
++ de.type = S_IFDIR;
++ break;
++ case 's':
++ de.type = S_IFSOCK;
++ break;
++ case 'b':
++ de.type = S_IFBLK;
++ break;
++ case 'c':
++ de.type = S_IFCHR;
++ break;
++ case 'l':
++ de.type = S_IFREG;
++ // we don't set S_IFLNK here. de.link says it.
++ break;
++ default:
++ break;
++ }
++
++ if ( p_access[1] == 'r' )
++ de.access |= S_IRUSR;
++ if ( p_access[2] == 'w' )
++ de.access |= S_IWUSR;
++ if ( p_access[3] == 'x' || p_access[3] == 's' )
++ de.access |= S_IXUSR;
++ if ( p_access[4] == 'r' )
++ de.access |= S_IRGRP;
++ if ( p_access[5] == 'w' )
++ de.access |= S_IWGRP;
++ if ( p_access[6] == 'x' || p_access[6] == 's' )
++ de.access |= S_IXGRP;
++ if ( p_access[7] == 'r' )
++ de.access |= S_IROTH;
++ if ( p_access[8] == 'w' )
++ de.access |= S_IWOTH;
++ if ( p_access[9] == 'x' || p_access[9] == 't' )
++ de.access |= S_IXOTH;
++ if ( p_access[3] == 's' || p_access[3] == 'S' )
++ de.access |= S_ISUID;
++ if ( p_access[6] == 's' || p_access[6] == 'S' )
++ de.access |= S_ISGID;
++ if ( p_access[9] == 't' || p_access[9] == 'T' )
++ de.access |= S_ISVTX;
++
++ de.owner = remoteEncoding()->decode(p_owner);
++ de.group = remoteEncoding()->decode(p_group);
++ de.size = charToLongLong(p_size);
++
++ // Parsing the date is somewhat tricky
++ // Examples : "Oct 6 22:49", "May 13 1999"
++
++ // First get current time - we need the current month and year
++ time_t currentTime = time( 0L );
++ struct tm * tmptr = gmtime( ¤tTime );
++ int currentMonth = tmptr->tm_mon;
++ //kdDebug(7102) << "Current time :" << asctime( tmptr ) << endl;
++ // Reset time fields
++ tmptr->tm_sec = 0;
++ tmptr->tm_min = 0;
++ tmptr->tm_hour = 0;
++ // Get day number (always second field)
++ tmptr->tm_mday = atoi( p_date_2 );
++ // Get month from first field
++ // NOTE : no, we don't want to use KLocale here
++ // It seems all FTP servers use the English way
++ //kdDebug(7102) << "Looking for month " << p_date_1 << endl;
++ static const char * s_months[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
++ "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
++ for ( int c = 0 ; c < 12 ; c ++ )
++ if ( !strcmp( p_date_1, s_months[c]) )
++ {
++ //kdDebug(7102) << "Found month " << c << " for " << p_date_1 << endl;
++ tmptr->tm_mon = c;
++ break;
++ }
++
++ // Parse third field
++ if ( strlen( p_date_3 ) == 4 ) // 4 digits, looks like a year
++ tmptr->tm_year = atoi( p_date_3 ) - 1900;
++ else
++ {
++ // otherwise, the year is implicit
++ // according to man ls, this happens when it is between than 6 months
++ // old and 1 hour in the future.
++ // So the year is : current year if tm_mon <= currentMonth+1
++ // otherwise current year minus one
++ // (The +1 is a security for the "+1 hour" at the end of the month issue)
++ if ( tmptr->tm_mon > currentMonth + 1 )
++ tmptr->tm_year--;
++
++ // and p_date_3 contains probably a time
++ char * semicolon;
++ if ( ( semicolon = (char*)strchr( p_date_3, ':' ) ) )
++ {
++ *semicolon = '\0';
++ tmptr->tm_min = atoi( semicolon + 1 );
++ tmptr->tm_hour = atoi( p_date_3 );
++ }
++ else
++ kdWarning(7102) << "Can't parse third field " << p_date_3 << endl;
++ }
++
++ //kdDebug(7102) << asctime( tmptr ) << endl;
++ de.date = mktime( tmptr );
++ return true;
++ }
++ } // line invalid, loop to get another line
+ return false;
+ }
+
+diff -Nru kdelibs-release-3.4.0/kioslave/gzip/kgzipfilter.desktop kdelibs-branch-3.4/kioslave/gzip/kgzipfilter.desktop
+--- kdelibs-release-3.4.0/kioslave/gzip/kgzipfilter.desktop 2005-01-20 23:24:12.000000000 -0500
++++ kdelibs-branch-3.4/kioslave/gzip/kgzipfilter.desktop 2005-03-07 09:13:31.000000000 -0500
+@@ -68,7 +68,6 @@
+ Name[vi]=Trình lọc Gzip
+ Name[wa]=Passete GZip
+ Name[xh]=Isihluzi se GZip
+-Name[xx]=xxGZip Filterxx
+ Name[zh_CN]=GZip 过滤程序
+ Name[zh_TW]=GZip 過濾器
+ Name[zu]=Ihluzo le-GZip
+diff -Nru kdelibs-release-3.4.0/kioslave/http/configure.in.in kdelibs-branch-3.4/kioslave/http/configure.in.in
+--- kdelibs-release-3.4.0/kioslave/http/configure.in.in 2004-11-04 16:05:13.000000000 -0500
++++ kdelibs-branch-3.4/kioslave/http/configure.in.in 2005-03-10 10:50:58.000000000 -0500
+@@ -69,7 +69,7 @@
+ case "$with_gssapi" in
+ no) AC_MSG_RESULT(no) ;;
+ framework)
+- GSSAPI_LIBS="-Xlinker -framework -Xlinker GSSAPI"
++ GSSAPI_LIBS="-Xlinker -framework -Xlinker Kerberos"
+ AC_DEFINE_UNQUOTED(HAVE_LIBGSSAPI, 1, [Define if you have GSSAPI libraries])
+ GSSAPI_SUBDIR="gssapi"
+ AC_MSG_RESULT(Apple framework)
+diff -Nru kdelibs-release-3.4.0/kioslave/http/http.cc kdelibs-branch-3.4/kioslave/http/http.cc
+--- kdelibs-release-3.4.0/kioslave/http/http.cc 2005-02-25 10:48:22.000000000 -0500
++++ kdelibs-branch-3.4/kioslave/http/http.cc 2005-03-31 08:48:16.000000000 -0500
+@@ -1950,6 +1950,8 @@
+ kdDebug(7113) << "(" << m_pid << ") HTTPProtocol::httpOpenConnection" << endl;
+
+ setBlockConnection( true );
++ // kio_http uses its own proxying:
++ KSocks::self()->disableSocks();
+
+ if ( m_state.doProxy )
+ {
+@@ -3398,11 +3400,6 @@
+ }
+ }
+
+- // Do not do a keep-alive connection if the size of the
+- // response is not known and the response is not Chunked.
+- if (!m_bChunked && m_iSize == NO_SIZE)
+- m_bKeepAlive = false;
+-
+ if (m_request.bMustRevalidate)
+ {
+ m_request.bMustRevalidate = false; // Reset just in case.
+@@ -3438,6 +3435,12 @@
+ {
+ return readHeader();
+ }
++
++ // Do not do a keep-alive connection if the size of the
++ // response is not known and the response is not Chunked.
++ if (!m_bChunked && (m_iSize == NO_SIZE))
++ m_bKeepAlive = false;
++
+ if ( m_responseCode == 204 )
+ {
+ return true;
+diff -Nru kdelibs-release-3.4.0/kioslave/http/http_cache_cleaner.desktop kdelibs-branch-3.4/kioslave/http/http_cache_cleaner.desktop
+--- kdelibs-release-3.4.0/kioslave/http/http_cache_cleaner.desktop 2005-01-20 23:24:12.000000000 -0500
++++ kdelibs-branch-3.4/kioslave/http/http_cache_cleaner.desktop 2005-03-27 02:28:45.000000000 -0500
+@@ -25,7 +25,7 @@
+ Name[fy]=HTTP Cache oprommer
+ Name[ga]=Glantóir Taisce HTTP
+ Name[gl]=Limpador da caché de HTTP
+-Name[he]=מנקה מטמון ה-HTTP
++Name[he]=מנקה מטמון ה־HTTP
+ Name[hi]=HTTP कैश साफ करने वाला
+ Name[hr]=Čistač HTTP cache-a
+ Name[hu]=HTTP gyorstártisztító
+@@ -68,7 +68,6 @@
+ Name[ven]=Tshikulumagi tsha HTTP Cache
+ Name[vi]=Trình xoá HTTP cache
+ Name[xh]=Umcoci wendawo efihlakeleyo yokugcina we HTTP
+-Name[xx]=xxHTTP Cache Cleanerxx
+ Name[zh_CN]=HTTP 缓存清除程序
+ Name[zh_TW]=HTTP 快取清除程式
+ Name[zu]=Umhlanzi we-Cache ye-HTTP
+@@ -97,7 +96,7 @@
+ Comment[fy]=Ferwidert âlde items út de HTTP-cache
+ Comment[ga]=Glanann seaniontrálaithe ón thaisce HTTP
+ Comment[gl]=Elimina as entradas antigas da caché de HTTP
+-Comment[he]=מנקה רשומות ישנות ממטמון ה-HTTP
++Comment[he]=מנקה רשומות ישנות ממטמון ה־HTTP
+ Comment[hi]=HTTP कैश से पुरानी प्रविष्टि साफ करे
+ Comment[hr]=Čisti stare datoteke iz HTTP cache-a
+ Comment[hu]=Kitörli a régi bejegyzéseket a HTTP gyorstárból
+@@ -140,7 +139,6 @@
+ Comment[ven]=I kulumaga zwithu zwakale u bva kha HTTP cache
+ Comment[vi]=Xoá các danh mục cũ trong HTTP cache
+ Comment[xh]=Icoca amangeno amadala asuka kwindawo efihlakeleyo yokugcina ye HTTP
+-Comment[xx]=xxCleans up old entries from the HTTP cachexx
+ Comment[zh_CN]=从 HTTP 缓存中清除旧条目
+ Comment[zh_TW]=從 HTTP 快取中清除舊的項目
+ Comment[zu]=Ihlanza izingeniso ezindalam ezisuka kwi-cache ye-HTTP
+diff -Nru kdelibs-release-3.4.0/kioslave/http/kcookiejar/kcookiejar.cpp kdelibs-branch-3.4/kioslave/http/kcookiejar/kcookiejar.cpp
+--- kdelibs-release-3.4.0/kioslave/http/kcookiejar/kcookiejar.cpp 2005-02-28 18:14:49.000000000 -0500
++++ kdelibs-branch-3.4/kioslave/http/kcookiejar/kcookiejar.cpp 2005-03-06 11:04:34.000000000 -0500
+@@ -23,7 +23,7 @@
+ //----------------------------------------------------------------------------
+ //
+ // KDE File Manager -- HTTP Cookies
+-// $Id: kcookiejar.cpp,v 1.121.2.1 2005/02/28 23:14:49 waba Exp $
++// $Id: kcookiejar.cpp,v 1.121.2.2 2005/03/06 16:04:34 adawit Exp $
+
+ //
+ // The cookie protocol is a mess. RFC2109 is a joke since nobody seems to
+@@ -1526,7 +1526,7 @@
+ {
+ const QString &value = *it++;
+
+- int sepPos = value.find(':');
++ int sepPos = value.findRev(':');
+
+ if (sepPos <= 0)
+ continue;
+diff -Nru kdelibs-release-3.4.0/kioslave/http/kcookiejar/kcookiejar.desktop kdelibs-branch-3.4/kioslave/http/kcookiejar/kcookiejar.desktop
+--- kdelibs-release-3.4.0/kioslave/http/kcookiejar/kcookiejar.desktop 2005-02-23 00:04:43.000000000 -0500
++++ kdelibs-branch-3.4/kioslave/http/kcookiejar/kcookiejar.desktop 2005-03-30 01:47:21.000000000 -0500
+@@ -59,11 +59,11 @@
+ Name[uz]=KDED куки идиш модули
+ Name[ven]=Modulu wa Jar wa Cookie ya KDED
+ Name[xh]=Isicatshulwa se KDED Cookie Jar
+-Name[xx]=xxKDED Cookie Jar Modulexx
+ Name[zh_CN]=KDED Cookie Jar 模块
+ Name[zh_TW]=KDED Cookie Jar 模組
+ 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[bg]=Контрол над всички кукита в системата
+ Comment[bn]=সিস্টেমে সমস্ত কুকি-র খোঁজখবর রাখে
+ Comment[bs]=Prati sve kolačiće (cookije) na sistemu
+@@ -71,6 +71,7 @@
+ Comment[cs]=Spravuje Cookies v počítači
+ Comment[da]=Holder styr på alle Cookier på systemet
+ Comment[de]=Überwacht alle Cookies im System
++Comment[el]=Κρατάει αρχείο από όλα τα cookies στο σύστημα
+ Comment[es]=Mantiene registro todas las cookies en el sistema
+ Comment[et]=Hoiab silma peal kõigil süsteemi küpsistel
+ Comment[eu]=Sistemaren cookie guztien jarraipena egiten du
+@@ -100,13 +101,12 @@
+ Comment[sk]=Sleduje všetky cookie v systéme
+ Comment[sl]=Opazuje vse piškotke v sistemu
+ Comment[sr]=Води евиденцију о свим колачићима на систему
+-Comment[sr@Latn]=Води евиденцију о свим колачићима на систему
++Comment[sr@Latn]=Vodi evidenciju o svim kolačićima na sistemu
+ Comment[sv]=Håller ordning på alla kakor i systemet
+ Comment[ta]=கணினியின் எல்லா தற்காலிக நினைவகங்களையும் கண்காணிக்கிறது
+ Comment[tg]=Гузаргоҳи ҳамаша Cookies дар система муҳофизат кунед
+ Comment[tr]=Sistemdeki tüm çerezleri izler
+ Comment[uk]=Стежить за всіма куками в системі
+-Comment[xx]=xxKeeps track of all cookies in the systemxx
+ Comment[zh_CN]=将全部 cookies 的记录保存在系统中
+ ServiceTypes=KDEDModule
+ Exec=kcookiejar
+diff -Nru kdelibs-release-3.4.0/kioslave/http/kcookiejar/kcookiewin.cpp kdelibs-branch-3.4/kioslave/http/kcookiejar/kcookiewin.cpp
+--- kdelibs-release-3.4.0/kioslave/http/kcookiejar/kcookiewin.cpp 2005-02-15 16:27:16.000000000 -0500
++++ kdelibs-branch-3.4/kioslave/http/kcookiejar/kcookiewin.cpp 2005-03-06 09:47:13.000000000 -0500
+@@ -24,7 +24,7 @@
+ //----------------------------------------------------------------------------
+ //
+ // KDE File Manager -- HTTP Cookie Dialogs
+-// $Id: kcookiewin.cpp,v 1.58 2005/02/15 21:27:16 waba Exp $
++// $Id: kcookiewin.cpp,v 1.58.2.1 2005/03/06 14:47:13 waba Exp $
+
+ // The purpose of the QT_NO_TOOLTIP and QT_NO_WHATSTHIS ifdefs is because
+ // this file is also used in Konqueror/Embedded. One of the aims of
+@@ -113,7 +113,18 @@
+ QLabel* lbl = new QLabel( txt, vBox );
+ lbl->setAlignment( Qt::AlignCenter );
+ KHttpCookiePtr cookie = cookieList.first();
+- txt = i18n("<b>%1</b>").arg( KIDNA::toUnicode(cookie->host()) );
++
++ QString host (cookie->host());
++ int pos = host.find(':');
++ if ( pos > 0 )
++ {
++ QString portNum = host.left(pos);
++ host.remove(0, pos+1);
++ host += ':';
++ host += portNum;
++ }
++
++ txt = QString("<b>%1</b>").arg( KIDNA::toUnicode(host) );
+ if (cookie->isCrossDomain())
+ txt += i18n(" <b>[Cross Domain!]</b>");
+ lbl = new QLabel( txt, vBox );
+diff -Nru kdelibs-release-3.4.0/kioslave/http/kcookiejar/tests/cookie_settings.test kdelibs-branch-3.4/kioslave/http/kcookiejar/tests/cookie_settings.test
+--- kdelibs-release-3.4.0/kioslave/http/kcookiejar/tests/cookie_settings.test 2005-02-23 10:31:54.000000000 -0500
++++ kdelibs-branch-3.4/kioslave/http/kcookiejar/tests/cookie_settings.test 2005-03-06 11:04:34.000000000 -0500
+@@ -114,3 +114,12 @@
+ COOKIE REJECT http://d.b.c/ Set-Cookie2: some_value=value10; Version=1; Path="/"; max-age="600"
+ COOKIE ACCEPT http://d.b.c/ Set-Cookie: some_value=value11; Path="/"
+ COOKIE ACCEPT http://d.b.c/ Set-Cookie2: some_value=value12; Version=1; Path="/"
++## Check domain policies that contain port numbers
++CONFIG AcceptSessionCookies true
++CONFIG CookieGlobalAdvice Reject
++CONFIG CookieDomainAdvice .8080:localhost:Accept
++COOKIE ACCEPT http://localhost:8080/systems Set-Cookie: some_value=value100; Path="/"
++COOKIE ACCEPT http://localhost:3128/ Set-Cookie: some_value=value200; Path="/"
++CONFIG AcceptSessionCookies false
++COOKIE ACCEPT http://localhost:8080/systems Set-Cookie: some_value=value100; Path="/"
++COOKIE REJECT http://localhost:3128/ Set-Cookie: some_value=value200; Path="/"
+diff -Nru kdelibs-release-3.4.0/kmdi/kmdi/dockcontainer.cpp kdelibs-branch-3.4/kmdi/kmdi/dockcontainer.cpp
+--- kdelibs-release-3.4.0/kmdi/kmdi/dockcontainer.cpp 2004-10-27 01:07:10.000000000 -0400
++++ kdelibs-branch-3.4/kmdi/kmdi/dockcontainer.cpp 2005-03-06 14:37:13.000000000 -0500
+@@ -131,6 +131,7 @@
+
+ void DockContainer::init()
+ {
++ bool overlap = isOverlapMode();
+ if (m_vertical)
+ {
+ parentDockWidget()->setForcedFixedWidth(m_tb->width());
+@@ -142,6 +143,8 @@
+ activateOverlapMode(m_tb->height());
+ }
+
++ if (!overlap) deactivateOverlapMode();
++
+ // try to restore splitter size
+ if ( parentDockWidget() && parentDockWidget()->parent() )
+ {
+@@ -509,7 +512,7 @@
+ cfg->setGroup(group_or_prefix+QString("::%1").arg(parent()->name()));
+
+ if (cfg->readBoolEntry("overlapMode"))
+- activateOverlapMode(m_tb->width());
++ activateOverlapMode( m_vertical?m_tb->width():m_tb->height() );
+ else
+ deactivateOverlapMode();
+
+diff -Nru kdelibs-release-3.4.0/kmdi/kmdi/mainwindow.cpp kdelibs-branch-3.4/kmdi/kmdi/mainwindow.cpp
+--- kdelibs-release-3.4.0/kmdi/kmdi/mainwindow.cpp 2004-09-11 17:58:43.000000000 -0400
++++ kdelibs-branch-3.4/kmdi/kmdi/mainwindow.cpp 2005-03-12 14:22:40.000000000 -0500
+@@ -244,11 +244,6 @@
+ connect(m_guiClient,SIGNAL(toggleLeft()),this,SIGNAL(toggleLeft()));
+ connect(m_guiClient,SIGNAL(toggleRight()),this,SIGNAL(toggleRight()));
+ connect(m_guiClient,SIGNAL(toggleBottom()),this,SIGNAL(toggleBottom()));
+-
+- connect(this,SIGNAL(toggleTop()),m_topContainer->getWidget(),SLOT(toggle()));
+- connect(this,SIGNAL(toggleLeft()),m_leftContainer->getWidget(),SLOT(toggle()));
+- connect(this,SIGNAL(toggleRight()),m_rightContainer->getWidget(),SLOT(toggle()));
+- connect(this,SIGNAL(toggleBottom()),m_bottomContainer->getWidget(),SLOT(toggle()));
+ }
+
+ TabWidget *MainWindow::tabWidget ()
+diff -Nru kdelibs-release-3.4.0/kmdi/kmdi/mainwindow.h kdelibs-branch-3.4/kmdi/kmdi/mainwindow.h
+--- kdelibs-release-3.4.0/kmdi/kmdi/mainwindow.h 2004-11-15 09:50:35.000000000 -0500
++++ kdelibs-branch-3.4/kmdi/kmdi/mainwindow.h 2005-03-25 14:58:55.000000000 -0500
+@@ -159,8 +159,8 @@
+ void setupGUIClient ();
+
+ private slots:
+- void setActiveToolDock(KMDI::DockContainer*);
+- void removeFromActiveDockList(KMDI::DockContainer*);
++ void setActiveToolDock(DockContainer*);
++ void removeFromActiveDockList(DockContainer*);
+
+ #define protected public
+ signals:
+diff -Nru kdelibs-release-3.4.0/kmdi/kmdidockcontainer.cpp kdelibs-branch-3.4/kmdi/kmdidockcontainer.cpp
+--- kdelibs-release-3.4.0/kmdi/kmdidockcontainer.cpp 2004-12-30 00:25:49.000000000 -0500
++++ kdelibs-branch-3.4/kmdi/kmdidockcontainer.cpp 2005-03-06 14:37:13.000000000 -0500
+@@ -152,6 +152,7 @@
+
+ void KMdiDockContainer::init()
+ {
++ bool overlap = isOverlapMode();
+ kdDebug( 760 ) << k_funcinfo << endl;
+ if ( !m_horizontal )
+ {
+@@ -166,6 +167,8 @@
+ activateOverlapMode( m_tb->height() );
+ }
+
++ if (!overlap) deactivateOverlapMode();
++
+ // try to restore splitter size
+ if ( parentDockWidget() && parentDockWidget()->parent() )
+ {
+@@ -563,7 +566,7 @@
+ if ( el.tagName() == "overlapMode" )
+ {
+ if ( el.attribute( "overlapMode" ) != "false" )
+- activateOverlapMode( m_tb->width() );
++ activateOverlapMode( m_horizontal?m_tb->height():m_tb->width() );
+ else
+ deactivateOverlapMode();
+ }
+@@ -675,7 +678,7 @@
+ cfg->setGroup( group_or_prefix + QString( "::%1" ).arg( parent() ->name() ) );
+
+ if ( cfg->readEntry( "overlapMode" ) != "false" )
+- activateOverlapMode( m_tb->width() );
++ activateOverlapMode( m_horizontal?m_tb->height():m_tb->width() );
+ else
+ deactivateOverlapMode();
+
+diff -Nru kdelibs-release-3.4.0/kmdi/kmdimainfrm.cpp kdelibs-branch-3.4/kmdi/kmdimainfrm.cpp
+--- kdelibs-release-3.4.0/kmdi/kmdimainfrm.cpp 2005-02-05 20:15:57.000000000 -0500
++++ kdelibs-branch-3.4/kmdi/kmdimainfrm.cpp 2005-03-07 10:50:00.000000000 -0500
+@@ -1188,7 +1188,7 @@
+ if ( m_pMdi )
+ {
+ static bool focusTCIsPending = false;
+- if ( !focusTCIsPending )
++ if ( !focusTCIsPending && m_mdiMode == KMdi::ChildframeMode )
+ {
+ focusTCIsPending = true;
+ m_pMdi->focusTopChild();
+diff -Nru kdelibs-release-3.4.0/knewstuff/downloaddialog.cpp kdelibs-branch-3.4/knewstuff/downloaddialog.cpp
+--- kdelibs-release-3.4.0/knewstuff/downloaddialog.cpp 2005-02-28 22:26:33.000000000 -0500
++++ kdelibs-branch-3.4/knewstuff/downloaddialog.cpp 2005-03-23 03:39:54.000000000 -0500
+@@ -56,14 +56,13 @@
+ {
+ public:
+ NumSortListViewItem( QListView * parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null ) :
+- KListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8 )
++ KListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8 )
+ {
+ }
+
+ QString key(int col, bool asc) const {
+ if (col == 2)
+ {
+-
+ QString s;
+ s.sprintf("%08d", text(col).toInt());
+ return s;
+@@ -72,6 +71,26 @@
+ }
+ };
+
++class DateSortListViewItem : public KListViewItem
++{
++ public:
++ DateSortListViewItem( QListView * parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null ) :
++ KListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8 )
++ {
++ }
++
++ QString key(int col, bool asc) const {
++ if (col == 2)
++ {
++ QString s;
++ QDate date = KGlobal::locale()->readDate(text(col));
++ s.sprintf("%08d", date.year() * 366 + date.dayOfYear());
++ return s;
++ }
++ return KListViewItem::key( col, asc );
++ }
++};
++
+ // BEGIN deprecated for KDE 4
+ DownloadDialog::DownloadDialog(Engine *engine, QWidget *)
+ : KDialogBase(KDialogBase::IconList, i18n("Get Hot New Stuff"),
+@@ -371,11 +390,11 @@
+ else if(installed < 0) pix = KGlobal::iconLoader()->loadIcon("history", KIcon::Small);
+ else pix = QPixmap();
+
+- KListViewItem *tmp_r = new KListViewItem(lv_r,
++ KListViewItem *tmp_r = new NumSortListViewItem(lv_r,
+ entry->name(), entry->version(), QString("%1").arg(entry->rating()));
+ KListViewItem *tmp_d = new NumSortListViewItem(lv_d,
+ entry->name(), entry->version(), QString("%1").arg(entry->downloads()));
+- KListViewItem *tmp_l = new KListViewItem(lv_l,
++ KListViewItem *tmp_l = new DateSortListViewItem(lv_l,
+ entry->name(), entry->version(), KGlobal::locale()->formatDate(entry->releaseDate()));
+
+ tmp_r->setPixmap(0, pix);
+diff -Nru kdelibs-release-3.4.0/knewstuff/engine.cpp kdelibs-branch-3.4/knewstuff/engine.cpp
+--- kdelibs-release-3.4.0/knewstuff/engine.cpp 2005-02-28 22:26:33.000000000 -0500
++++ kdelibs-branch-3.4/knewstuff/engine.cpp 2005-03-05 07:16:54.000000000 -0500
+@@ -411,8 +411,9 @@
+
+ void Engine::slotUploadMetaJobResult( KIO::Job *job )
+ {
++ mUploadMetaFile = QString::null;
+ if ( job->error() ) {
+- kdDebug(5850) << "Error uploading new stuff payload." << endl;
++ kdDebug(5850) << "Error uploading new stuff metadata." << endl;
+ job->showErrorDialog( mParentWidget );
+ emit uploadFinished( false );
+ return;
+diff -Nru kdelibs-release-3.4.0/knewstuff/knewstuffsecure.cpp kdelibs-branch-3.4/knewstuff/knewstuffsecure.cpp
+--- kdelibs-release-3.4.0/knewstuff/knewstuffsecure.cpp 2005-02-08 04:47:41.000000000 -0500
++++ kdelibs-branch-3.4/knewstuff/knewstuffsecure.cpp 2005-03-05 07:16:54.000000000 -0500
+@@ -74,6 +74,7 @@
+ else
+ {
+ m_tarName.prepend(m_tempDir->name());
++ connect(Security::ref(), SIGNAL(validityResult(int)), this, SLOT(slotValidated(int)));
+ Security::ref()->checkValidity(m_tarName);
+ }
+ } else
+@@ -158,7 +159,6 @@
+
+ void KNewStuffSecure::downloadResource()
+ {
+- connect(Security::ref(), SIGNAL(validityResult(int)), this, SLOT(slotValidated(int)));
+ KConfig *cfg = KGlobal::config();
+ m_installedResources = cfg->entryMap("KNewStuffStatus");
+ engine()->ignoreInstallResult(true);
+diff -Nru kdelibs-release-3.4.0/kparts/browserview.desktop kdelibs-branch-3.4/kparts/browserview.desktop
+--- kdelibs-release-3.4.0/kparts/browserview.desktop 2005-01-20 23:24:13.000000000 -0500
++++ kdelibs-branch-3.4/kparts/browserview.desktop 2005-03-07 09:13:32.000000000 -0500
+@@ -66,7 +66,6 @@
+ Name[ven]=U vhona ha Burausu
+ Name[vi]=Xem trình duyệt
+ Name[xh]=Imboniselo Yomkhangeli zincwadi
+-Name[xx]=xxBrowser Viewxx
+ Name[zh_CN]=浏览器视图
+ Name[zh_TW]=瀏覽器視圖
+ Name[zu]=Umbonisi Womgcingi
+diff -Nru kdelibs-release-3.4.0/kparts/kpart.desktop kdelibs-branch-3.4/kparts/kpart.desktop
+--- kdelibs-release-3.4.0/kparts/kpart.desktop 2005-01-20 23:24:13.000000000 -0500
++++ kdelibs-branch-3.4/kparts/kpart.desktop 2005-03-07 09:13:32.000000000 -0500
+@@ -70,7 +70,6 @@
+ Comment[ven]=Khomphonente ya KDE
+ Comment[vi]=KDE Component
+ Comment[xh]=Ingxenye ye KDE
+-Comment[xx]=xxKDE Componentxx
+ Comment[zh_CN]=KDE 部件
+ Comment[zh_TW]=KDE 元件
+ Comment[zu]=Ingxenye ye-KDE
+diff -Nru kdelibs-release-3.4.0/kparts/krop.desktop kdelibs-branch-3.4/kparts/krop.desktop
+--- kdelibs-release-3.4.0/kparts/krop.desktop 2005-01-20 23:24:13.000000000 -0500
++++ kdelibs-branch-3.4/kparts/krop.desktop 2005-03-07 09:13:32.000000000 -0500
+@@ -71,7 +71,6 @@
+ Comment[ven]=Khomphonente ya KDE
+ Comment[vi]=KDE Component
+ Comment[xh]=Ingxenye ye KDE
+-Comment[xx]=xxKDE Componentxx
+ Comment[zh_CN]=KDE 部件
+ Comment[zh_TW]=KDE 元件
+ Comment[zu]=Ingxenye ye-KDE
+diff -Nru kdelibs-release-3.4.0/kparts/krwp.desktop kdelibs-branch-3.4/kparts/krwp.desktop
+--- kdelibs-release-3.4.0/kparts/krwp.desktop 2005-01-20 23:24:13.000000000 -0500
++++ kdelibs-branch-3.4/kparts/krwp.desktop 2005-03-07 09:13:32.000000000 -0500
+@@ -71,7 +71,6 @@
+ Comment[ven]=Khomphonente ya KDE
+ Comment[vi]=KDE Component
+ Comment[xh]=Ingxenye ye KDE
+-Comment[xx]=xxKDE Componentxx
+ Comment[zh_CN]=KDE 部件
+ Comment[zh_TW]=KDE 元件
+ Comment[zu]=Ingxenye ye-KDE
+diff -Nru kdelibs-release-3.4.0/kparts/tests/notepad.desktop kdelibs-branch-3.4/kparts/tests/notepad.desktop
+--- kdelibs-release-3.4.0/kparts/tests/notepad.desktop 2005-02-23 00:04:43.000000000 -0500
++++ kdelibs-branch-3.4/kparts/tests/notepad.desktop 2005-03-07 09:13:32.000000000 -0500
+@@ -66,7 +66,6 @@
+ Name[ven]=Hau nwalela notsi (Tsumbo)
+ Name[vi]=notepad(ví dụ)
+ Name[xh]=Iphetshan lokubhala (umzekelo)
+-Name[xx]=xxNotepad (example)xx
+ Name[zh_CN]=记事本(例子)
+ Name[zh_TW]=記事本(範例)
+ Name[zu]=Incwadi yokubhala (umfanekiso)
+diff -Nru kdelibs-release-3.4.0/kresources/kresources.desktop kdelibs-branch-3.4/kresources/kresources.desktop
+--- kdelibs-release-3.4.0/kresources/kresources.desktop 2005-02-23 00:04:44.000000000 -0500
++++ kdelibs-branch-3.4/kresources/kresources.desktop 2005-03-30 01:47:21.000000000 -0500
+@@ -13,15 +13,21 @@
+ Name=KDE Resources
+ Name[bg]=Системни ресурси
+ Name[bn]=কে.ডি.ই রিসোর্সসমূহ
++Name[bs]=KDE resursi
+ Name[ca]=Recursos KDE
+ Name[cs]=Zdroje KDE
+ Name[da]=KDE Ressourcer
+ Name[de]=KDE-Ressourcen
++Name[el]=Πόροι του KDE
+ Name[es]=Recursos de KDE
+ Name[et]=KDE ressursid
++Name[eu]=KDEren baliabideak
++Name[fi]=KDE:n resurssiasetukset
+ Name[fr]=Ressources de KDE
+ Name[fy]=KDE Helpboarnen
+ Name[ga]=Acmhainní KDE
++Name[he]=משאבים של KDE
++Name[hi]=केडीई संसाधन
+ Name[hu]=KDE-erőforrások
+ Name[is]=KDE auðlindir
+ Name[it]=Risorse di KDE
+@@ -38,13 +44,13 @@
+ Name[sk]=Zdroje KDE
+ Name[sl]=Viri KDE
+ Name[sr]=KDE-ови ресурси
+-Name[sr@Latn]=KDE-ови ресурси
++Name[sr@Latn]=KDE-ovi resursi
+ Name[sv]=KDE-resurser
+ Name[uk]=Ресурси KDE
+-Name[xx]=xxKDE Resourcesxx
+ Name[zh_CN]=KDE 资源
+
+ Comment=Configure KDE Resources
++Comment[af]=Stel KDE Hulpbronne op
+ Comment[be]=Настроіць рэсурсы KDE
+ Comment[bg]=Настройки на системните ресурсите
+ Comment[bn]=কে.ডি.ই. রিসোর্সসমূহ কনফিগার করো
+@@ -53,6 +59,7 @@
+ Comment[cs]=Nastavení zdrojů KDE
+ Comment[da]=Indstil KDE's ressourcer
+ Comment[de]=KDE-Ressourcen einrichten
++Comment[el]=Ρύθμιση πόρων του KDE
+ Comment[eo]=Agordu KDEajn risurcojn
+ Comment[es]=Configurar recursos de KDE
+ Comment[et]=KDE ressurside seadistamine
+@@ -84,17 +91,17 @@
+ Comment[sk]=Nastavenie zdrojov KDE
+ Comment[sl]=Nastavi vire KDE
+ Comment[sr]=Подешавање KDE-ових ресурса
+-Comment[sr@Latn]=Подешавање KDE-ових ресурса
++Comment[sr@Latn]=Podešavanje KDE-ovih resursa
+ Comment[sv]=Anpassa KDE-resurser
+ Comment[ta]=KDE மூலங்களை கட்டமை
+ Comment[tg]=Танзими манбаъи истифодашуда тавассути китоби адрес
+ Comment[tr]=KDE Kaynaklarını Yapılandır
+ Comment[uk]=Налаштування ресурсів KDE
+ Comment[uz]=KDE манбаларини мослаш
+-Comment[xx]=xxConfigure KDE Resourcesxx
+ Comment[zh_CN]=配置 KDE 资源
+
+ Keywords=resources,konnector resource,contact resource,calendar resource,notes resource,imap
++Keywords[af]=hulpbronne,konnector hulpbron,kontak hulpbron,kalender hulpbron, notas hulpbron, imap
+ Keywords[bg]=ресурс, ресурси, настройки, бележки, адресна, адресник, книга, календар, resources, konnector resource, contact resource, calendar resource, notes resource, imap
+ Keywords[bs]=resources,konnector resource,contact resource,calendar resource,notes resource,imap,resursi,konektor resurs,kontakt resurs,kalendar resurs,bilješke resurs
+ Keywords[ca]=recursos,recurs konnector,recurs de contacte,recurs de calendari,recurs de notes,imap
+@@ -127,12 +134,11 @@
+ Keywords[sk]=zdroje,zdroj pre konnector,zdroj kontaktov,zdroj kalendára,zdroj poznámok,imap
+ Keywords[sl]=resurs,vir,stikov vir,koledarski vir,imap,
+ Keywords[sr]=resources,konnector resource,contact resource,calendar resource,notes resource,imap,ресурси,ресурс,повезивач,контакт ресурс, календарски ресурс
+-Keywords[sr@Latn]=resources,konnector resource,contact resource,calendar resource,notes resource,imap,ресурси,ресурс,повезивач,контакт ресурс, календарски ресурс
++Keywords[sr@Latn]=resources,konnector resource,contact resource,calendar resource,notes resource,imap,resursi,resurs,povezivač,kontakt resurs, kalendarski resurs
+ Keywords[sv]=resurser,konnector-resurs,kontaktresurs,kalenderresurs,anteckningsresurs,IMAP
+ Keywords[ta]=மூலங்கள்,இணைப்பு மூலம்,தொடர்பு மூலம்,நாள்காட்டி மூலம்,குறிப்புகள் மூலம்e,imap
+ Keywords[tr]=kaynaklar,bağlantı kaynağı,iletiişm kaynağı,takvim kaynak,not kaynağı,imap
+ Keywords[uk]=ресурси,ресурс для konnector,ресурс контактів,ресурс календаря,ресурс приміток,imap
+-Keywords[xx]=xxresources,konnector resource,contact resource,calendar resource,notes resource,imapxx
+ Keywords[zh_CN]=resources,konnector resource,contact resource,calendar resource,notes resource,imap资源,konnector 资源,联系人资源,日历资源,备忘资源
+
+ Categories=Qt;KDE;X-KDE-settings-components;
+diff -Nru kdelibs-release-3.4.0/kresources/kresources_manager.desktop kdelibs-branch-3.4/kresources/kresources_manager.desktop
+--- kdelibs-release-3.4.0/kresources/kresources_manager.desktop 2005-02-23 00:04:44.000000000 -0500
++++ kdelibs-branch-3.4/kresources/kresources_manager.desktop 2005-03-27 02:28:45.000000000 -0500
+@@ -6,6 +6,7 @@
+ Comment[bg]=Мениджър на KResource
+ Comment[bn]=কে-রিসোর্স ম্যানেজার
+ Comment[br]=Merour KResource
++Comment[bs]=K Upravitelj resursima
+ Comment[ca]=Gestor KResource
+ Comment[cs]=Správce zdrojů
+ Comment[da]=KResource-håndtering
+@@ -13,8 +14,10 @@
+ Comment[es]=Administrador de KResource
+ Comment[et]=KResource'i haldur
+ Comment[eu]=KResource kudeatzailea
++Comment[fi]=KResource hallinta
+ Comment[fr]=Gestionnaire de KResource
+ Comment[fy]=KResource-behearder
++Comment[he]=מנהל משאבים KResource
+ Comment[hi]=के-रीसोर्स प्रबंधक
+ Comment[hu]=KResource-kezelőprogram
+ Comment[is]=KResource stjóri
+@@ -33,13 +36,12 @@
+ Comment[sk]=Správca KResource
+ Comment[sl]=Upravitelj virov KResource
+ Comment[sr]=KResource менаџер
+-Comment[sr@Latn]=KResource менаџер
++Comment[sr@Latn]=KResource menadžer
+ Comment[sv]=KDE-resurshantering
+ Comment[ta]=கேமூல மேலாளர்
+ Comment[tg]=Менеҷери KResource
+ Comment[tr]=KResource Yöneticisi
+ Comment[uk]=Менеджер KResource
+-Comment[xx]=xxKResource Managerxx
+ Comment[zh_CN]=KResource 管理器
+
+ [PropertyDef::X-KDE-ResourceFamily]
+diff -Nru kdelibs-release-3.4.0/kresources/kresources_plugin.desktop kdelibs-branch-3.4/kresources/kresources_plugin.desktop
+--- kdelibs-release-3.4.0/kresources/kresources_plugin.desktop 2005-02-23 00:04:44.000000000 -0500
++++ kdelibs-branch-3.4/kresources/kresources_plugin.desktop 2005-03-10 11:04:52.000000000 -0500
+@@ -3,6 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=KResources/Plugin
+ Comment=KResource Framework Plugin
++Comment[af]=KHulpbron Raamwerk Inprop module
+ Comment[az]=KResource Əlavəsi
+ Comment[bg]=Приставка за ресурсната системата KResource Framework
+ Comment[bn]=কে-রিসোর্স ফ্রেম-ওয়ার্ক প্লাগ-ইন
+@@ -46,14 +47,13 @@
+ Comment[sl]=Vstavek za ogrodje KResource
+ Comment[sq]=Shtojca KResource Framework
+ Comment[sr]=Прикључак KResource Framework-а
+-Comment[sr@Latn]=Dodatak KResource Framework-a
++Comment[sr@Latn]=Priključak KResource Framework-a
+ Comment[sv]=Insticksprogram för resursramverk
+ Comment[ta]=கேவழிமுறை கட்டமைப்பு சொருகுபொருள்
+ Comment[tg]=Мутассалкунандаи қолабгар барои KResource
+ Comment[tr]=KResource Eklentisi
+ Comment[uk]=Втулок структури KResource
+ Comment[uz]=KResource тўплам плагини
+-Comment[xx]=xxKResource Framework Pluginxx
+ Comment[zh_CN]=KResource 框架插件
+ Comment[zh_TW]=KRsource Framework 外掛程式
+
+diff -Nru kdelibs-release-3.4.0/kspell2/kspellclient.desktop kdelibs-branch-3.4/kspell2/kspellclient.desktop
+--- kdelibs-release-3.4.0/kspell2/kspellclient.desktop 2005-02-23 00:04:46.000000000 -0500
++++ kdelibs-branch-3.4/kspell2/kspellclient.desktop 2005-03-30 01:47:22.000000000 -0500
+@@ -4,15 +4,17 @@
+ X-KDE-ServiceType=KSpell/Client
+ X-KDE-Derived=KPluginInfo
+ Comment=KSpell Client
++Comment[af]=KSpel Klient
+ Comment[be]=Кліент KSpell
+ Comment[bg]=Клиент на KSpell
+ Comment[bn]=কে-স্পেল ক্লায়েন্ট
+-Comment[br]=Arval KSpell
++Comment[br]=Kliant KSpell
+ Comment[bs]=KSpell klijent
+ Comment[ca]=Client de KSpell
+ Comment[cs]=KSpell klient
+ Comment[da]=KSpell-klient
+ Comment[de]=KSpell-Dienstprogramm
++Comment[el]=Πελάτης KSpell
+ Comment[eo]=KSpell-Kliento
+ Comment[es]=Cliente KSpell
+ Comment[et]=KSpelli klient
+@@ -43,12 +45,11 @@
+ Comment[sk]=Klient KSpell
+ Comment[sl]=Odjemnik KSpell
+ Comment[sr]=KSpell-ов клијент
+-Comment[sr@Latn]=KSpell-ов клијент
++Comment[sr@Latn]=KSpell-ov klijent
+ Comment[sv]=Kspell-klient
+ Comment[ta]=ஓட்டு எழுத்தாக்கம்
+ Comment[tg]=Клиенти KSpell
+ Comment[tr]=KSpell Programcığı
+ Comment[uk]=Клієнт KSpell
+ Comment[uz]=KSpell клиенти
+-Comment[xx]=xxKSpell Clientxx
+ Comment[zh_CN]=KSpell 客户
+diff -Nru kdelibs-release-3.4.0/kspell2/plugins/aspell/kspell_aspell.desktop kdelibs-branch-3.4/kspell2/plugins/aspell/kspell_aspell.desktop
+--- kdelibs-release-3.4.0/kspell2/plugins/aspell/kspell_aspell.desktop 2005-02-23 00:04:47.000000000 -0500
++++ kdelibs-branch-3.4/kspell2/plugins/aspell/kspell_aspell.desktop 2005-03-07 09:13:33.000000000 -0500
+@@ -18,4 +18,3 @@
+ Name[it]=Aspell
+ Name[sv]=Aspell
+ Name[ta]=psதேர்ந்தெடு
+-Name[xx]=xxASpellxx
+diff -Nru kdelibs-release-3.4.0/kspell2/plugins/ispell/kspell_ispell.desktop kdelibs-branch-3.4/kspell2/plugins/ispell/kspell_ispell.desktop
+--- kdelibs-release-3.4.0/kspell2/plugins/ispell/kspell_ispell.desktop 2005-02-23 00:04:48.000000000 -0500
++++ kdelibs-branch-3.4/kspell2/plugins/ispell/kspell_ispell.desktop 2005-03-07 09:13:34.000000000 -0500
+@@ -19,4 +19,3 @@
+ Name[sv]=Ispell
+ Name[ta]=psதேர்ந்தெடு
+ Name[tg]=psselect
+-Name[xx]=xxISpellxx
+diff -Nru kdelibs-release-3.4.0/kstyles/highcontrast/highcontrast.themerc kdelibs-branch-3.4/kstyles/highcontrast/highcontrast.themerc
+--- kdelibs-release-3.4.0/kstyles/highcontrast/highcontrast.themerc 2005-02-23 00:04:49.000000000 -0500
++++ kdelibs-branch-3.4/kstyles/highcontrast/highcontrast.themerc 2005-03-30 01:47:22.000000000 -0500
+@@ -1,14 +1,20 @@
+ [Misc]
+ Name=HighContrast
+ Name[bn]=হাই কনট্রাস্ট
++Name[br]=Dargemm uhel
+ Name[ca]=Contrast alt
+ Name[cs]=Vysoký kontrast
+ Name[da]=Høj kontrast
+ Name[de]=HoherKontrast
++Name[el]=Υψηλή φωτεινότητα
+ Name[es]=ContrasteAlto
+ Name[et]=Tugev kontrast
++Name[eu]=Kontraste handia
++Name[fi]=KorkeaKontrasti
+ Name[fr]=Contraste fort
+ Name[fy]=Heechkontrast
++Name[he]=ניגודיות גבוהה
++Name[hi]=उच्च विरोधाभास
+ Name[hu]=Erősen kontrasztos
+ Name[is]=Há birtuskil
+ Name[it]=Contrasto elevato
+@@ -25,21 +31,25 @@
+ Name[se]=AllaVuostálasvuohta
+ Name[sl]=VisokKontrast
+ Name[sr]=Високи контраст
+-Name[sr@Latn]=Високи контраст
++Name[sr@Latn]=Visoki kontrast
+ Name[sv]=Hög kontrast
+ Name[uk]=Висока контрастність
+-Name[xx]=xxHighContrastxx
+ Name[zh_CN]=高对比度
+ Comment=A style that works well with high contrast color schemes
+ Comment[bg]=Стил за схеми с висок контраст
++Comment[bs]=Stil koji izgleda dobro sa šemama boja visokog kontrasta
+ Comment[ca]=Un estil que funciona bé amb esquemes de color de contrast alt
+ Comment[cs]=Styl vhodný pro barevná schémata s vysokým kontrastem
+ Comment[da]=En stil der virker godt med farvesammensætninger med høj kontrast
+ Comment[de]=Ein Stil, der gut zu kontrastreichen Farbschemas passt
++Comment[el]=Ένα στυλ που δουλεύει καλά με σχήματα υψηλής φωτεινότητας
+ Comment[en_GB]=A style that works well with high contrast colour schemes
+ Comment[es]=Un estilo que funciona con esquemas de color de contraste alto
+ Comment[et]=Stiil, mis sobib hästi tugeva kontrastiga värviskeemidele
++Comment[eu]=Kontraste handiko temekin ongi moldatzen den estiloa
++Comment[fi]=Tyyli joka toimii hyvin korkeakontrastisien väriteemojen kanssa
+ Comment[fr]=Un style se combinant bien avec les modèles de couleurs à fort contraste
++Comment[hi]=उच्च विरोधाभासी रंग योजना के साथ कार्य करने वाली शैली
+ Comment[hu]=Erősen kontrasztos színsémákhoz jól illeszkedő stílus
+ Comment[is]=Stíll sem passar vel við litaskemu sem nota há birtuskil
+ Comment[it]=Uno stile che funziona bene con combinazioni di colori ad alto contrasto
+@@ -57,10 +67,9 @@
+ Comment[sk]=Štýl, ktorý funguje dobre pri schémach s vysokým kontrastom
+ Comment[sl]=Slog, ki se dobro obnese z visokokontrastnimi shemami
+ Comment[sr]=Стил који ради са високо контрастним шемама боја
+-Comment[sr@Latn]=Стил који ради са високо контрастним шемама боја
++Comment[sr@Latn]=Stil koji radi sa visoko kontrastnim šemama boja
+ Comment[sv]=En stil som fungerar bra med färgscheman för hög kontrast
+ Comment[uk]=Стиль, який підходить до схем кольорів з високою контрастністю
+-Comment[xx]=xxA style that works well with high contrast color schemesxx
+ Comment[zh_CN]=在高对比度配色方案中适用的样式
+ [KDE]
+ WidgetStyle=HighContrast
+diff -Nru kdelibs-release-3.4.0/kstyles/plastik/plastik.themerc kdelibs-branch-3.4/kstyles/plastik/plastik.themerc
+--- kdelibs-release-3.4.0/kstyles/plastik/plastik.themerc 2005-02-23 00:04:50.000000000 -0500
++++ kdelibs-branch-3.4/kstyles/plastik/plastik.themerc 2005-03-30 01:47:22.000000000 -0500
+@@ -11,25 +11,27 @@
+ Name[pa]=ਪਲਾਸਟਿਕ
+ Name[ru]=Пластик
+ Name[sr]=Пластика
+-Name[sr@Latn]=Пластика
++Name[sr@Latn]=Plastika
+ Name[ta]=ப்ளாஸ்டிக்
+ Name[tg]=Пластик
+ Name[uk]=Пластик
+-Name[xx]=xxPlastikxx
+ Name[zh_CN]=白金
+ ConfigPage=kstyle_plastik_config
+ Comment=A simple and clean style
+ Comment[bg]=Семпъл и изчистен стил
+ Comment[bn]=একটি সরল এবং পরিচ্ছন্ন স্টাইল
+ Comment[br]=Un arloadig panell eeun
++Comment[bs]=Jednostavan i čist stil
+ Comment[ca]=Un estil simple i net
+ Comment[cs]=Jednoduchý a čistý styl
+ Comment[cy]=Arddull syml a glan
+ Comment[da]=En simpel og ren stil
+ Comment[de]=Ein einfacher und schlichter Stil
++Comment[el]=Ένα απλό και καθαρό στυλ
+ Comment[es]=Un estilo sencillo y terso
+ Comment[et]=Lihtne ja klaar stiil
+ Comment[eu]=Estilo xehe eta gardena
++Comment[fi]=Yksinkertainen ja siisti tyyli
+ Comment[fr]=Un style simple et propre
+ Comment[fy]=In ienfâldich en skjinne styl
+ Comment[he]=סגנון נקי ופשוט
+@@ -53,13 +55,12 @@
+ Comment[sk]=Jednoduchý a čistý štýl
+ Comment[sl]=Preprost in čist slog
+ Comment[sr]=Једноставан и чист стил
+-Comment[sr@Latn]=Једноставан и чист стил
++Comment[sr@Latn]=Jednostavan i čist stil
+ Comment[sv]=En enkel och ren stil
+ Comment[ta]=ஒரு சுலபமானதும் தெளிவானதுமான பாணி
+ Comment[tg]=Услуби осон ва тоза
+ Comment[tr]=Basit ve temiz stil
+ Comment[uk]=Простий та чистий стиль
+-Comment[xx]=xxA simple and clean stylexx
+ Comment[zh_CN]=简洁清爽的样式
+ [KDE]
+ WidgetStyle=Plastik
+diff -Nru kdelibs-release-3.4.0/kstyles/riscos/riscos.themerc kdelibs-branch-3.4/kstyles/riscos/riscos.themerc
+--- kdelibs-release-3.4.0/kstyles/riscos/riscos.themerc 2005-01-20 23:24:14.000000000 -0500
++++ kdelibs-branch-3.4/kstyles/riscos/riscos.themerc 2005-03-27 02:28:46.000000000 -0500
+@@ -243,7 +243,6 @@
+ Name[th]=ระบบปฏิบัติการบนชิพ RISC
+ Name[uk]=RISC ОС
+ Name[uz]=RISC ОС
+-Name[xx]=xxRISC OSxx
+ Name[zu]=IRISC OS
+ Comment=RISC OS-like theme
+ Comment[af]=Risc OS-like tema
+@@ -252,6 +251,7 @@
+ Comment[be]=Стыль падобны на RISC OS
+ Comment[bg]=Тема, подобна на RISC OS
+ Comment[bn]=রিস্ক ও.এস.-এর মতন থিম
++Comment[br]=Giz doare ISC OS
+ Comment[bs]=Tema nalik na RISC OS
+ Comment[ca]=Tema tipus RISC OS
+ Comment[cs]=Motiv jako RISC OS
+@@ -269,6 +269,7 @@
+ Comment[fy]=RISC OS-eftich tema
+ Comment[ga]=Téama cosúil le RISC OS
+ Comment[gl]=Tema do estilo de RISC OS
++Comment[he]=ערכת נושא דמויית RISC OS
+ Comment[hi]=रिस्क ओएस(RISC OS)-जैसा थीम
+ Comment[hr]=Tema nalik na RISC-OS
+ Comment[hu]=RISC OS-szerű téma
+@@ -311,7 +312,6 @@
+ Comment[vi]=Theme kiểu RISC OS
+ Comment[wa]=Tinme rishonnant al rivnance do sistinme RISC OS
+ Comment[xh]=RISC OS-Njengo mxholo
+-Comment[xx]=xxRISC OS-like themexx
+ Comment[zh_CN]=类似 RISC OS 的主题
+ Comment[zh_TW]=類似 RISC 的風格
+ Comment[zu]=I-RISC OS-enjenge thimu
+diff -Nru kdelibs-release-3.4.0/kstyles/themes/b3.themerc kdelibs-branch-3.4/kstyles/themes/b3.themerc
+--- kdelibs-release-3.4.0/kstyles/themes/b3.themerc 2005-01-20 23:24:15.000000000 -0500
++++ kdelibs-branch-3.4/kstyles/themes/b3.themerc 2005-03-07 09:13:35.000000000 -0500
+@@ -5,7 +5,6 @@
+ Name[fr]=B3 / KDE
+ Name[hi]=B3/केडीई
+ Name[ta]=B3/கேடிஇ
+-Name[xx]=xxB3/KDExx
+ Comment=B3/Modification of B2
+ Comment[af]=B3/Verandering van B2
+ Comment[ar]=B3/تعديل من B2
+@@ -72,7 +71,6 @@
+ Comment[vi]=B3/Modification của B2
+ Comment[wa]=B3/Modifiadje do B2
+ Comment[xh]=B3/Uguqulelo kancinane lwe B2
+-Comment[xx]=xxB3/Modification of B2xx
+ Comment[zh_CN]=B3/修正的 B2
+ Comment[zh_TW]=B3/B2 改良版
+ Comment[zu]=B3/Ukulungisa kwe-B2
+diff -Nru kdelibs-release-3.4.0/kstyles/themes/beos.themerc kdelibs-branch-3.4/kstyles/themes/beos.themerc
+--- kdelibs-release-3.4.0/kstyles/themes/beos.themerc 2005-01-20 23:24:15.000000000 -0500
++++ kdelibs-branch-3.4/kstyles/themes/beos.themerc 2005-03-10 11:04:53.000000000 -0500
+@@ -3,8 +3,8 @@
+ Name[af]=Beos
+ Name[hi]=बीईओएस (BeOS)
+ Name[th]=ระบบปฏิบัติการ BeOS
+-Name[xx]=xxBeOSxx
+ Comment=Unthemed BeOS-like style
++Comment[af]=Onbenoemde BeOS-tipe styl
+ Comment[ar]=مظهر مشابه لBeOS
+ Comment[az]=Örtüksüz BeOS bənzəri tərz
+ Comment[be]=Стыль падобны на BeOS (бяз тэм)
+@@ -62,7 +62,6 @@
+ Comment[uk]=Стиль схожий на BeOS без встановленої теми
+ Comment[uz]=BeOS'га ўхшаш мавзусиз услуб
+ Comment[wa]=Tinme rishonnant al rivnance do sistinme BeOS
+-Comment[xx]=xxUnthemed BeOS-like stylexx
+ Comment[zh_CN]=无主题的类似 Beos 的风格
+ Comment[zh_TW]=沒有主題的 BeOS 的風格
+ [KDE]
+diff -Nru kdelibs-release-3.4.0/kstyles/themes/default.themerc kdelibs-branch-3.4/kstyles/themes/default.themerc
+--- kdelibs-release-3.4.0/kstyles/themes/default.themerc 2004-12-29 12:52:07.000000000 -0500
++++ kdelibs-branch-3.4/kstyles/themes/default.themerc 2005-03-10 11:04:53.000000000 -0500
+@@ -1,9 +1,11 @@
+ [Misc]
+ Name=KDE Classic
++Name[af]=KDE Klassiek
+ Name[ar]=كيدي كلاسيكي
+ Name[az]=KDE Klassik
+ Name[be]=Клясычны KDE
+ Name[bn]=কে.ডি.ই. ক্লাসিক
++Name[br]=KDE da gustum
+ Name[bs]=KDE klasični
+ Name[ca]=KDE clàssic
+ Name[cs]=Klasické KDE
+@@ -52,10 +54,10 @@
+ Name[tr]=Klasik KDE
+ Name[uk]=Типовий для KDE
+ Name[wa]=KDE Classike
+-Name[xx]=xxKDE Classicxx
+ Name[zh_CN]=KDE 经典
+ Name[zh_TW]=KDE 預設
+ Comment=Classic KDE style
++Comment[af]=Klassieke KDE styl
+ Comment[ar]=مظهر كيدي الكلاسيكي
+ Comment[az]=Klassik KDE tərzi
+ Comment[be]=Клясычны стыль KDE
+@@ -116,7 +118,6 @@
+ Comment[uk]=Класичний стиль KDE
+ Comment[uz]=Классик KDE услуби
+ Comment[wa]=Tinme avou l' rivnance «classike» di KDE
+-Comment[xx]=xxClassic KDE stylexx
+ Comment[zh_CN]=经典的 KDE 风格
+ Comment[zh_TW]=預設的 KDE 風格
+ Highcolor=hcstyle.la
+diff -Nru kdelibs-release-3.4.0/kstyles/themes/highcolor.themerc kdelibs-branch-3.4/kstyles/themes/highcolor.themerc
+--- kdelibs-release-3.4.0/kstyles/themes/highcolor.themerc 2005-01-20 23:24:15.000000000 -0500
++++ kdelibs-branch-3.4/kstyles/themes/highcolor.themerc 2005-03-10 11:04:53.000000000 -0500
+@@ -1,5 +1,6 @@
+ [Misc]
+ Name=HighColor Classic
++Name[af]=Hoë-kontras Klassiek
+ Name[ar]=كلاسيكي عالي الألوان
+ Name[az]=Zəngin Rəngli Klassik
+ Name[bn]=হাই-কালার ক্লাসিক
+@@ -53,10 +54,10 @@
+ Name[th]=รูปแบบปริยาย ความละเอียดสีสูง
+ Name[tr]=Klasik Yüksek Renk
+ Name[uk]=Типовий (64K кольорів)
+-Name[xx]=xxHighColor Classicxx
+ Name[zh_CN]=高色彩经典
+ Name[zh_TW]=預設的高彩
+ Comment=Highcolor version of the classic style
++Comment[af]=Hoë-kontras weergawe van die klassieke styl
+ Comment[ar]=نسخة عالية الألوان من المظهر الكلاسيكي
+ Comment[az]=Klassik tərzin zəngin rəngli buraxılışı
+ Comment[bg]=Класически стил на КДЕ с високо качество на цветовете
+@@ -115,7 +116,6 @@
+ Comment[tr]=Klasik stilin yüksek renk versiyonu
+ Comment[uk]=Версія типового стилю для 64К кольорів та більше
+ Comment[uz]=Классик услубининг юқори рангли нусхаси
+-Comment[xx]=xxHighcolor version of the classic stylexx
+ Comment[zh_CN]=经典风格的高色彩版本
+ Comment[zh_TW]=預設風格的高彩版本
+ [KDE]
+diff -Nru kdelibs-release-3.4.0/kstyles/themes/keramik.themerc kdelibs-branch-3.4/kstyles/themes/keramik.themerc
+--- kdelibs-release-3.4.0/kstyles/themes/keramik.themerc 2005-01-20 23:24:15.000000000 -0500
++++ kdelibs-branch-3.4/kstyles/themes/keramik.themerc 2005-03-27 02:28:46.000000000 -0500
+@@ -7,6 +7,7 @@
+ Name[fa]=کرامیک
+ Name[fy]=Keramyk
+ Name[gl]=Keramic
++Name[he]=קרמיק
+ Name[hi]=केरमिक
+ Name[ko]=K세라믹
+ Name[lv]=Keramika
+@@ -23,9 +24,9 @@
+ Name[tg]=Сафолӣ
+ Name[th]=เครามิก - K
+ Name[uz]=Керамика
+-Name[xx]=xxKeramikxx
+ ConfigPage=kstyle_keramik_config
+ Comment=The default style using alphablending
++Comment[af]=Die standaard styl wat alfa vermenging gebruik
+ Comment[ar]=المظهر الإفتراضي باستعمال alphablending
+ Comment[az]=Alfa şəffaflıq işlədən ön qurğulu tərz
+ Comment[bg]=Стандартния стил, използващ алфа сливане
+@@ -82,7 +83,6 @@
+ Comment[tr]=Alpha karışımı kullanan öntanımlı stil
+ Comment[uk]=Стиль з використанням плавного переходу кольорів
+ Comment[uz]=Alphablending'ли андоза услуб
+-Comment[xx]=xxThe default style using alphablendingxx
+ Comment[zh_CN]=使用 alpha 混和的默认风格
+ Comment[zh_TW]=使用 alphablending 的預設風格
+
+diff -Nru kdelibs-release-3.4.0/kstyles/themes/kstep.themerc kdelibs-branch-3.4/kstyles/themes/kstep.themerc
+--- kdelibs-release-3.4.0/kstyles/themes/kstep.themerc 2004-12-29 12:52:07.000000000 -0500
++++ kdelibs-branch-3.4/kstyles/themes/kstep.themerc 2005-03-07 09:13:35.000000000 -0500
+@@ -22,7 +22,6 @@
+ Name[th]=KDE สเต็ป
+ Name[ven]=Tshitaela tsha KDE
+ Name[xh]=Inyathelo le KDE
+-Name[xx]=xxKDE Stepxx
+ Name[zu]=Isigaba se-KDE
+ Comment=Unthemed Next-like style
+ Comment[af]=Ongetemade Next-tipe styl
+@@ -89,7 +88,6 @@
+ Comment[ven]=Hu songo newaho thero-sa tshitaela
+ Comment[vi]=Kiểu Next chưa dùng theme
+ Comment[xh]=Okulandelayo Okungenamxholo-njengo hlobo
+-Comment[xx]=xxUnthemed Next-like stylexx
+ Comment[zh_CN]=无主题的类似 Next 的风格
+ Comment[zh_TW]=沒有主題的類似 Nextstep 的風格
+ Comment[zu]=Okulandelayo Okungenangqikithi-okunjengesitayela
+diff -Nru kdelibs-release-3.4.0/kstyles/themes/light-v2.themerc kdelibs-branch-3.4/kstyles/themes/light-v2.themerc
+--- kdelibs-release-3.4.0/kstyles/themes/light-v2.themerc 2004-12-29 12:52:08.000000000 -0500
++++ kdelibs-branch-3.4/kstyles/themes/light-v2.themerc 2005-03-27 02:28:46.000000000 -0500
+@@ -21,6 +21,7 @@
+ Name[fy]=Light Style, 2e revyzje
+ Name[ga]=An Stíl Éadrom, 2ú leagan
+ Name[gl]=Estilo Light, 2ª revisión
++Name[he]=גרסה קלילה, גרסה שנייה
+ Name[hi]=लाइट शैली, 2रा संशोधन
+ Name[hr]=Lagani stil, druga revizija
+ Name[hu]=Light stílus, 2. verzió
+@@ -60,7 +61,6 @@
+ Name[ven]=Tshitaela tshisi tshau konda, ndulamiso ya vhuvhili
+ Name[vi]=Light Style, revision thứ 2
+ Name[xh]=Uhlobo Olukhanyayo, 2nd ukhumbuzo kwakhona
+-Name[xx]=xxLight Style, 2nd revisionxx
+ Name[zh_CN]=Light 风格，第二版
+ Name[zh_TW]=輕靈風格，第二版
+ Name[zu]=Ukubuyekezwa oku-2nd, Kwesitayela Esilula
+@@ -85,6 +85,7 @@
+ Comment[fr]=Deuxième version du style graphique « Lumière », simple et élégant.
+ Comment[fy]=Twadde revyzje fan de ienfâldige en elegante widgetstyl 'Light'
+ Comment[gl]=Segunda revisión do simple e elegante estilo de widgets 'Light'.
++Comment[he]=גרסה שנייה של הערכה הפשוטה האלגנטית וה"קלילה".
+ Comment[hi]=सादा और सुरूचिकर 'लाइट' विजेट शैली का दूसरा संशोधन.
+ Comment[hr]=Druga revizija jednostavnog i elegantnog Laganog widget stila.
+ Comment[hu]=A nemesen egyszerű 'Light' elemstílus második változata.
+@@ -124,7 +125,6 @@
+ Comment[ven]=Ndulamiso ya vhuvhili isa kondi na tshitaela tshileluwaho
+ Comment[vi]=Revision thứ 2 của kiểu widget đơn giản
+ Comment[xh]=Ukhumbuzo kwakhona lwesibini lokulula nokubukekayo kwe hlobo lwe widget 'Ekhaphu-khaphu.
+-Comment[xx]=xxSecond revision of the simple and elegant 'Light' widget style.xx
+ Comment[zh_CN]=简约雅致的“Light”风格，第二版。
+ Comment[zh_TW]=簡單高雅的“輕靈”界面工具風格的第二版。
+ Comment[zu]=Ukubuyekezwa kwesibili kwesitayela se-widget 'Esilula' kanye nesiphucuzekile.
+diff -Nru kdelibs-release-3.4.0/kstyles/themes/light-v3.themerc kdelibs-branch-3.4/kstyles/themes/light-v3.themerc
+--- kdelibs-release-3.4.0/kstyles/themes/light-v3.themerc 2004-12-29 12:52:08.000000000 -0500
++++ kdelibs-branch-3.4/kstyles/themes/light-v3.themerc 2005-03-27 02:28:46.000000000 -0500
+@@ -21,6 +21,7 @@
+ Name[fy]=Light Style, 3e revyzje
+ Name[ga]=An Stíl Éadrom, 3ú leagan
+ Name[gl]=Estilo Light, 3ª revisión
++Name[he]=גרסה קלילה, גרסה שלישית.
+ Name[hi]=लाइट शैली, 3रा संशोधन
+ Name[hr]=Lagani stil, treća revizija
+ Name[hu]=Light stílus, 3. verzió
+@@ -60,7 +61,6 @@
+ Name[ven]=Tshitaela tshisa kondi, ndovhololo ya vhuraru
+ Name[vi]=Light Style, revision 3
+ Name[xh]=Uhlobo Olukhanyayo, 3rd ukhumbuzo kwakhona
+-Name[xx]=xxLight Style, 3rd revisionxx
+ Name[zh_CN]=Light 风格，第三版
+ Name[zh_TW]=輕靈風格，第三版
+ Name[zu]=Isitayela Esilula, ukubuyekezwa kwesithathu
+@@ -85,6 +85,7 @@
+ Comment[fr]=Troisième version du style graphique « Lumière », simple et élégant.
+ Comment[fy]=Tredde revyzje fan de ienfâldige en elegante widgetstyl 'Light'
+ Comment[gl]=Terceira revisión do estilo elegante e simple de widgets 'Light'.
++Comment[he]=גרסה שלישית של הערכה הפשוטה האלגנטית וה"קלילה".
+ Comment[hi]=सादा और सुरूचिकर 'लाइट' विजेट शैली का तीसरा संशोधन.
+ Comment[hr]=Druga revizija jednostavnog i elegantnog Laganog widget stila.
+ Comment[hu]=A nemesen egyszerű 'Light' elemstílus harmadik változata.
+@@ -125,7 +126,6 @@
+ Comment[ven]=Ndovhololo ya vhuraru isa kondi na tshitaela tshisa kondi.
+ Comment[vi]=Revision thứ ba của kiểu widget 'Light' đơn giản và thông minh
+ Comment[xh]=Ukhumbuzo kwakhona lwesithathu lokulula kunye nokubukekayo kohlobo lwe widget 'Ekhaphu-khaphu'.
+-Comment[xx]=xxThird revision of the simple and elegant 'Light' widget style.xx
+ Comment[zh_CN]=简约雅致的“Light”风格，第三版。
+ Comment[zh_TW]=簡單高雅的“輕靈”界面工具風格的第三版。
+ Comment[zu]=Ukubuyekezwa kwesithathu kwesitayela se-widget 'Esilula' kanye nokuphucuzekile.
+diff -Nru kdelibs-release-3.4.0/kstyles/themes/mega.themerc kdelibs-branch-3.4/kstyles/themes/mega.themerc
+--- kdelibs-release-3.4.0/kstyles/themes/mega.themerc 2005-02-21 04:17:21.000000000 -0500
++++ kdelibs-branch-3.4/kstyles/themes/mega.themerc 2005-03-07 09:13:35.000000000 -0500
+@@ -57,7 +57,6 @@
+ Name[ven]=Tshitaela tsha muvhala wa ntha wa MegaGradient
+ Name[vi]=Kiểu màu sáng Megagradient
+ Name[xh]=Uhlobo lombala ophezulu we MegaGradient
+-Name[xx]=xxMegaGradient highcolor stylexx
+ Name[zh_CN]=MegaGradient 高色彩风格
+ Name[zh_TW]=MegaGradient 高彩風格
+ Name[zu]=Isitayela sombala ophezulu se-MegaGradient
+diff -Nru kdelibs-release-3.4.0/kstyles/themes/qtcde.themerc kdelibs-branch-3.4/kstyles/themes/qtcde.themerc
+--- kdelibs-release-3.4.0/kstyles/themes/qtcde.themerc 2004-12-29 12:52:08.000000000 -0500
++++ kdelibs-branch-3.4/kstyles/themes/qtcde.themerc 2005-03-27 02:28:46.000000000 -0500
+@@ -3,7 +3,6 @@
+ Name[bn]=সি-ডি-ই
+ Name[hi]=सीडीई
+ Name[th]=รูปแบบ CDE
+-Name[xx]=xxCDExx
+ Comment=Built-in unthemed CDE style
+ Comment[af]=Ingeboude ongetemade Cde styl
+ Comment[ar]=مظهر مضمن مشابه لCDE
+@@ -28,6 +27,7 @@
+ Comment[fy]=Ynboude, temaleaze CDE-styl
+ Comment[ga]=Stíl inmheánach gan téama, cosúil le CDE
+ Comment[gl]=Estilo incorporado CDE sen tema
++Comment[he]=ערכה פנימית תואמת CDE
+ Comment[hi]=अंतर्निर्मित अनथीम्ड सीडीई शैली
+ Comment[hr]=Bez teme, Ugrađeni CDE stil
+ Comment[hu]=Beépített CDE-stílus
+@@ -69,7 +69,6 @@
+ Comment[ven]=Tshitaela tsha CDE tsho fhatelwaho ngomu
+ Comment[vi]=Kiểu CDE chưa dùng theme có sẵn
+ Comment[xh]=Uhlobo olungenamxholo olakhelwe-ngaphakathi lwe CDE
+-Comment[xx]=xxBuilt-in unthemed CDE stylexx
+ Comment[zh_CN]=内建的无主题 CDE 风格
+ Comment[zh_TW]=內建的無主題 CDE 風格
+ Comment[zu]=Isitayela Sokwakheka-ngaphakathi okungenagqikithi
+diff -Nru kdelibs-release-3.4.0/kstyles/themes/qtmotif.themerc kdelibs-branch-3.4/kstyles/themes/qtmotif.themerc
+--- kdelibs-release-3.4.0/kstyles/themes/qtmotif.themerc 2004-12-29 12:52:08.000000000 -0500
++++ kdelibs-branch-3.4/kstyles/themes/qtmotif.themerc 2005-03-27 02:28:46.000000000 -0500
+@@ -7,7 +7,6 @@
+ Name[pa]=ਮੋਟੀਫ
+ Name[ta]=மோடிஃப்
+ Name[th]=โมทีฟ
+-Name[xx]=xxMotifxx
+ Comment=Built-in unthemed Motif style
+ Comment[af]=Ingeboude ongetemade Motif styl
+ Comment[ar]=مظهر مضمن مشابه لMotif
+@@ -32,6 +31,7 @@
+ Comment[fy]=Ynboude, temaleaze Motif-styl
+ Comment[ga]=Stíl inmheánach gan téama, cosúil le Motif
+ Comment[gl]=Estilo incorporado Motif sen tema
++Comment[he]=ערכת נושא פנימית תואמת Motif
+ Comment[hi]=अंतर्निर्मित अनथीम्ड मोटिफ शैली
+ Comment[hr]=Ugrađeni napredni Motif stil
+ Comment[hu]=Beépített Motif-stílus
+@@ -73,7 +73,6 @@
+ Comment[ven]=Tshitaela tsha mothifi tsho fhatelwaho ngomu
+ Comment[vi]=Kiểu Motif chưa dùng theme có sẵn
+ Comment[xh]=Uhlobo lwe Motir olungenamxholo olakhelwe-ngaphakathi
+-Comment[xx]=xxBuilt-in unthemed Motif stylexx
+ Comment[zh_CN]=内建的无主题 Motif 风格
+ Comment[zh_TW]=內建的無主題 Motif 風格
+ Comment[zu]=Ukwakekha-ngaphakathi okungenagqikithi sesitayela se-Motif
+diff -Nru kdelibs-release-3.4.0/kstyles/themes/qtmotifplus.themerc kdelibs-branch-3.4/kstyles/themes/qtmotifplus.themerc
+--- kdelibs-release-3.4.0/kstyles/themes/qtmotifplus.themerc 2005-01-20 23:24:15.000000000 -0500
++++ kdelibs-branch-3.4/kstyles/themes/qtmotifplus.themerc 2005-03-27 02:28:46.000000000 -0500
+@@ -13,7 +13,6 @@
+ Name[pa]=ਮੋਟੀਫ ਨਵਾਂ
+ Name[ta]=மோடிஃப் ப்ளஸ்
+ Name[th]=โมทีฟพลัส
+-Name[xx]=xxMotif Plusxx
+ Comment=Built-in enhanced Motif style
+ Comment[af]=Ingeboude verbeterde Motif styl
+ Comment[ar]=مظهر مضمن محسّن مشابه لMotif
+@@ -37,6 +36,7 @@
+ Comment[fy]=Ynboude, ferbettere Motif-styl
+ Comment[ga]=Stíl inmheánach méadaithe, cosúil le Motif
+ Comment[gl]=Estilo incorporado Motif mellorado sen tema
++Comment[he]=ערכת נושא פנימית תואמת Motif משופרת
+ Comment[hi]=अंतर्निर्मित एनहेंस्ड मोटिफ शैली
+ Comment[hr]=Ugrađeni napredni Motif stil
+ Comment[hu]=Beépített továbbfejlesztett Motif-stílus
+@@ -78,7 +78,6 @@
+ Comment[ven]=Tshitaela tsho fhatelwaho nga ngomu
+ Comment[vi]=Kiểu Motif cao cấp có sẵn
+ Comment[xh]=Uhlobo lwe Motif olunyusiweyo olwakhelwe-ngaphakathi
+-Comment[xx]=xxBuilt-in enhanced Motif stylexx
+ Comment[zh_CN]=内建的增强的 Motif 风格
+ Comment[zh_TW]=內建的增強的 Motif 風格
+ Comment[zu]=Isitayela se-Mofit esenziwe ngcono
+diff -Nru kdelibs-release-3.4.0/kstyles/themes/qtplatinum.themerc kdelibs-branch-3.4/kstyles/themes/qtplatinum.themerc
+--- kdelibs-release-3.4.0/kstyles/themes/qtplatinum.themerc 2004-12-29 12:52:08.000000000 -0500
++++ kdelibs-branch-3.4/kstyles/themes/qtplatinum.themerc 2005-03-27 02:28:46.000000000 -0500
+@@ -19,7 +19,6 @@
+ Name[th]=แพลตตินัม
+ Name[tr]=Platin
+ Name[wa]=Platene
+-Name[xx]=xxPlatinumxx
+ Name[zh_CN]=白金
+ Comment=Built-in unthemed Platinum style
+ Comment[af]=Ingeboude ongetemade Platinum styl
+@@ -45,6 +44,7 @@
+ Comment[fy]=Ynboude, temaleaze Platinum-styl
+ Comment[ga]=Platinum - Stíl inmheánach gan téama
+ Comment[gl]=Estilo incorporado Platinum sen tema
++Comment[he]=ערכת נושא פנימית תואמת Platinum
+ Comment[hi]=अंतर्निर्मित अनथीम्ड प्लेटिनम शैली
+ Comment[hr]=Bez teme, ugrađeni Platinum stil
+ Comment[hu]=Beépített Platinum stílus
+@@ -86,7 +86,6 @@
+ Comment[ven]=Tshitale tsha pulathinamu tsho fhatelwaho nga ngomu
+ Comment[vi]=Kiểu Platinum chưa dùng theme có sẵn
+ Comment[xh]=Uhloboa lwe Platinum olungenamxholo olwakhelwe-ngaphakathi
+-Comment[xx]=xxBuilt-in unthemed Platinum stylexx
+ Comment[zh_CN]=内建的无主题白金风格
+ Comment[zh_TW]=內建的無主題 Platinum 風格
+ Comment[zu]=Yakhelwe-kuhlobo lwesingenabizogama isitayelaPlatinum
+diff -Nru kdelibs-release-3.4.0/kstyles/themes/qtsgi.themerc kdelibs-branch-3.4/kstyles/themes/qtsgi.themerc
+--- kdelibs-release-3.4.0/kstyles/themes/qtsgi.themerc 2005-01-20 23:24:15.000000000 -0500
++++ kdelibs-branch-3.4/kstyles/themes/qtsgi.themerc 2005-03-27 02:28:46.000000000 -0500
+@@ -4,7 +4,6 @@
+ Name[hi]=एसजीआई
+ Name[nl]=SIG
+ Name[th]=รูปแบบ SGI
+-Name[xx]=xxSGIxx
+ Comment=Built-in SGI style
+ Comment[af]=Ingeboude Sgi styl
+ Comment[ar]=مظهر مضمن مشابه لSGI
+@@ -29,6 +28,7 @@
+ Comment[fy]=Ynboude SGI-styl
+ Comment[ga]=Stíl inmheánach SGI
+ Comment[gl]=Estilo incorporado SGI
++Comment[he]=ערכת נושא פנימית תואמת SGI
+ Comment[hi]=अंतर्निर्मित एसजीआई शैली
+ Comment[hr]=Ugrađeni SGI stil
+ Comment[hu]=Beépített SGI stílus
+@@ -71,7 +71,6 @@
+ Comment[ven]=Tshitaela tsha SGI tsho fhatelwaho nga ngomu
+ Comment[vi]=Kiểu SGI có sẵn
+ Comment[xh]=Uhlobo lwe SGI olwakhelwe-ngaphakathi
+-Comment[xx]=xxBuilt-in SGI stylexx
+ Comment[zh_CN]=内建的 SGI 风格
+ Comment[zh_TW]=內建的 SGI 風格
+ Comment[zu]=Yakhelwe-kwisitayela se SGI
+diff -Nru kdelibs-release-3.4.0/kstyles/themes/qtwindows.themerc kdelibs-branch-3.4/kstyles/themes/qtwindows.themerc
+--- kdelibs-release-3.4.0/kstyles/themes/qtwindows.themerc 2005-02-23 00:04:50.000000000 -0500
++++ kdelibs-branch-3.4/kstyles/themes/qtwindows.themerc 2005-03-27 02:28:46.000000000 -0500
+@@ -9,7 +9,6 @@
+ Name[lt]=MSWindows 9x
+ Name[se]=Windows
+ Name[th]=วินโดว์ส 9x
+-Name[xx]=xxMS Windows 9xxx
+ Comment=Built-in unthemed Windows 9x style
+ Comment[af]=Ingeboude ongetemade Vensters 9x styl
+ Comment[ar]=مظهر مضمن مشابه لويندوز
+@@ -34,6 +33,7 @@
+ Comment[fy]=Ynboude, temaleaze Windows 9x-styl
+ Comment[ga]=Stíl inmheánach gan téama, cosúil le Windows 9x
+ Comment[gl]=Estilo incorporado Windows 9x sen tema
++Comment[he]=ערכת נושא פנימית תואמת Windows 9x
+ Comment[hi]=अंतर्निर्मित विंडोज़ 9x शैली
+ Comment[hr]=Bez teme, ugrađeni Windows 9x stil
+ Comment[hu]=Beépített Windows 9x-stílus
+@@ -75,7 +75,6 @@
+ Comment[ven]=Tshitaela tsha 9x tsha windo i songo bulwaho tsho fhatelwaho nga ngomu
+ Comment[vi]=Kiểu Windows 9x chưa dùng theme có sẵn
+ Comment[xh]=Uhlobo lwe Windows 9x olungenamxholo olwakhelwe-ngaphakathi
+-Comment[xx]=xxBuilt-in unthemed Windows 9x stylexx
+ Comment[zh_CN]=内建的无主题 Windows 9x 风格
+ Comment[zh_TW]=內建的無主題 Windows 9x 風格
+ Comment[zu]=Yakhelwe-kuhlobo kwisitayela samawindi 9x
+diff -Nru kdelibs-release-3.4.0/kstyles/web/web.themerc kdelibs-branch-3.4/kstyles/web/web.themerc
+--- kdelibs-release-3.4.0/kstyles/web/web.themerc 2005-02-23 00:04:52.000000000 -0500
++++ kdelibs-branch-3.4/kstyles/web/web.themerc 2005-03-27 02:28:47.000000000 -0500
+@@ -21,6 +21,7 @@
+ Name[fr]=Style web
+ Name[fy]=Webstyl
+ Name[gl]=Estilo Web
++Name[he]=סגנון רשת
+ Name[hi]=वेब शैली
+ Name[hr]=Web stil
+ Name[hu]=Webes stílus
+@@ -62,7 +63,6 @@
+ Name[ven]=Tshitaela tsha webu
+ Name[vi]=Kiểu Web
+ Name[xh]=Uhlobo lwe Web
+-Name[xx]=xxWeb stylexx
+ Name[zh_CN]=网络风格
+ Name[zh_TW]=網站風格
+ Name[zu]=Uhlobo lwe-web
+@@ -88,6 +88,7 @@
+ Comment[fr]=Style web
+ Comment[fy]=Web-widgetstyl
+ Comment[gl]=Estilo de widgets Web
++Comment[he]=ערכנת נושא המושפעת מהרשת
+ Comment[hi]=वेब विज़ेट शैली
+ Comment[hr]=Web widget stil
+ Comment[hu]=Webes elemstílus
+@@ -128,7 +129,6 @@
+ Comment[ven]=Tshitaela tsha webe ya Widget
+ Comment[vi]=Kiểu Wed widget
+ Comment[xh]=Uhlobo lwe widget ye Web
+-Comment[xx]=xxWeb widget stylexx
+ Comment[zh_CN]=网络部件风格
+ Comment[zh_TW]=Web 元件風格
+ Comment[zu]=Uhlobo lwe-widget ye-web
+diff -Nru kdelibs-release-3.4.0/kutils/kcmoduleproxy.cpp kdelibs-branch-3.4/kutils/kcmoduleproxy.cpp
+--- kdelibs-release-3.4.0/kutils/kcmoduleproxy.cpp 2005-01-31 23:47:23.000000000 -0500
++++ kdelibs-branch-3.4/kutils/kcmoduleproxy.cpp 2005-03-08 07:28:01.000000000 -0500
+@@ -80,13 +80,13 @@
+
+ ~KCModuleProxyPrivate()
+ {
++ delete rootInfo; // Delete before embedWidget!
++ delete embedWidget; // Delete before embedFrame!
+ delete embedFrame;
+ delete dcopClient;
+ delete dcopObject;
+- delete embedWidget;
+ delete rootCommunicator;
+ delete rootProcess;
+- delete rootInfo;
+ delete kcm;
+ }
+
+@@ -386,11 +386,10 @@
+ }
+
+ /* Clean up in case of failure */
+- delete d->embedFrame;
+- d->embedFrame = 0;
+ delete d->embedWidget;
+ d->embedWidget = 0;
+- delete lblBusy;
++ delete d->embedFrame;
++ d->embedFrame = 0;
+
+ QApplication::restoreOverrideCursor();
+ }
+diff -Nru kdelibs-release-3.4.0/kutils/kplugininfo.desktop kdelibs-branch-3.4/kutils/kplugininfo.desktop
+--- kdelibs-release-3.4.0/kutils/kplugininfo.desktop 2005-02-23 00:04:53.000000000 -0500
++++ kdelibs-branch-3.4/kutils/kplugininfo.desktop 2005-03-10 11:04:53.000000000 -0500
+@@ -3,11 +3,13 @@
+ Type=ServiceType
+ X-KDE-ServiceType=KPluginInfo
+ Name=KDE Plugin Information
++Name[af]=KDE Inprop module Informasie
+ Name[ar]=معلومات ملحقات كيدي
+ Name[az]=KDE Əlavə Mə'lumatı
+ Name[be]=Інфармацыя аб дапаўненьні KDE
+ Name[bg]=Информация за приставките в КДЕ
+ Name[bn]=কে.ডি.ই. প্লাগ-ইন তথ্য
++Name[br]=Titouroù al lugent KDE
+ Name[bs]=KDE informacije o dodatku
+ Name[ca]=Connector informatiu de KDE
+ Name[cs]=Informace o pluginu KDE
+@@ -61,7 +63,6 @@
+ Name[uk]=Інформація про втулок KDE
+ Name[uz]=KDE плагин ҳақида маълумот
+ Name[wa]=Informåcion sol tchôke-divins di KDE
+-Name[xx]=xxKDE Plugin Informationxx
+ Name[zh_CN]=KDE 打印信息
+ Name[zh_TW]=KDE 外掛資訊
+
+diff -Nru kdelibs-release-3.4.0/kutils/ksettings/README.dox kdelibs-branch-3.4/kutils/ksettings/README.dox
+--- kdelibs-release-3.4.0/kutils/ksettings/README.dox 2004-08-09 15:20:35.000000000 -0400
++++ kdelibs-branch-3.4/kutils/ksettings/README.dox 2005-03-10 17:21:04.000000000 -0500
+@@ -1,6 +1,9 @@
+ /**
+
+-\page KSettings The KSettings classes
++\namespace KSettings
++
++\short A collection of classes to create configuration dialogs that work over
++component boundaries
+
+ <h2>How to use KSettings::Dialog in your application.</h2>
+
+@@ -166,8 +169,14 @@
+ - The group name (id) is the name you use in the .desktop file of the page:
+ If your page's .desktop file says "X-KDE-CfgDlgHierarchy=id" then it will be
+ inserted as a child of this entry.
+-- The Name
+-
++- \p Name: The name of the section. It will appear in the listview.
++- \p Comment: A description of what the modules in this section are. It will
++ appear in the place where the KCMs are placed when the user clicks on the item
++ in the listview.
++- \p Icon: An icon for the item.
++- \p Weight: Defines the position in the listview. See X-KDE-Weight above.
++- \p Parent: If this group should be a child of another group write the parent's
++ group id here.
+
+ <hr>
+ <h3>5. The Pluginselector</h3>
+@@ -217,42 +226,50 @@
+ \verbatim
+ [Desktop Entry]
+ Encoding=UTF-8
+-Icon=myplugin
+ Type=Service
++Icon=<iconname>
+ ServiceTypes=KPluginInfo
+
++Name=MyPlugin
++Comment=My plugin is cool and does foo and bar.
++
++X-KDE-PluginInfo-Name=myplugin
++
+ X-KDE-PluginInfo-Author=<your name>
+ X-KDE-PluginInfo-Email=<your email>
+ X-KDE-PluginInfo-Website=http://www.myplugin.org/
+-X-KDE-PluginInfo-Name=myplugin
+ X-KDE-PluginInfo-Category=CoolPlugins
+ X-KDE-PluginInfo-Version=0.1
+ X-KDE-PluginInfo-License=GPL
+ X-KDE-PluginInfo-EnabledByDefault=true
+ X-KDE-PluginInfo-Depends=myotherplugin
+-
+-Name=MyPlugin
+-Comment=My plugin is cool and does foo and bar.
++X-KDE-CfgDlgHierarchy=GroupID
+ \endverbatim
+
+-
+ Explanation:
+ mandatory entries:
+-- Name
+-- Comment
+-- X-KDE-PluginInfo-Name is the "internal name" of the plugin.
+-- You need to have KPluginInfo in ServiceTypes but of course you may have more
++- leave \p Type and \p Encoding like in the example
++- \p Name
++- \p Comment
++- \p X-KDE-PluginInfo-Name is the "internal name" of the plugin.
++- You need to have \p KPluginInfo in \p ServiceTypes but of course you may have more
+ entries in there.
+-- leave Type and Encoding like in the example
+
+ optional entries:
+-- Icon is the icon used for your plugin (it's shown in the pluginselector if you
+- set one)
+-- Author and Email is some information about the author of the plugin.
+-- Website is the address for a webpage for this plugin
+-- Category is used if your application has different categories of plugins.
+-- Depends can be used to tell the application that you need to have
++- \p Icon is the icon used for your plugin (it's shown in the pluginselector if you
++ set one).
++- \p X-KDE-PluginInfo-Author and \p X-KDE-PluginInfo-Email is some information about the author of the plugin.
++- \p X-KDE-PluginInfo-Website is the address for a webpage for this plugin.
++- \p X-KDE-PluginInfo-Category is used if your application has different categories of plugins.
++- \p X-KDE-PluginInfo-Version is the version of this plugin.
++- \p X-KDE-PluginInfo-License is the license of this plugin.
++- \p X-KDE-PluginInfo-EnabledByDefault tells the program whether the plugin
++ should be enabled on first startup or not.
++- \p X-KDE-PluginInfo-Depends can be used to tell the application that you need to have
+ myotherplugin enabled for your plugin to work.
++- \p X-KDE-CfgDlgHierarchy is used if you use a \p KSettings::Dialog::ConfigurableInline
++ KSettings::Dialog to put the plugin checkbox into the group with the GroupID
++ you set here.
+
+ If you have questions contact Matthias Kretz <kretz@kde.org>.
+ */
+diff -Nru kdelibs-release-3.4.0/mimetypes/all.desktop kdelibs-branch-3.4/mimetypes/all.desktop
+--- kdelibs-release-3.4.0/mimetypes/all.desktop 2005-02-23 00:04:54.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/all.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -3,6 +3,7 @@
+ Type=MimeType
+ MimeType=all/all
+ Comment=All Files and Folders
++Comment[af]=Alle Lêers en Gidse
+ Comment[ar]=كل الملفات واﻷدلة
+ Comment[az]=Bütün Fayl və Qovluqlar
+ Comment[be]=Усе файлы і тэчкі
+@@ -62,6 +63,5 @@
+ Comment[uk]=Всі файли та теки
+ Comment[uz]=Ҳамма файл ва жилдлар
+ Comment[wa]=Tos les fitchîs et tos les ridants
+-Comment[xx]=xxAll Files and Foldersxx
+ Comment[zh_CN]=全部文件和文件夹
+ Comment[zh_TW]=所有的檔案與目錄目錄
+diff -Nru kdelibs-release-3.4.0/mimetypes/allfiles.desktop kdelibs-branch-3.4/mimetypes/allfiles.desktop
+--- kdelibs-release-3.4.0/mimetypes/allfiles.desktop 2005-02-23 00:04:54.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/allfiles.desktop 2005-03-26 02:37:25.000000000 -0500
+@@ -24,7 +24,7 @@
+ Comment[fa]=تمام پروندهها
+ Comment[fi]=Kaikki tiedostot
+ Comment[fr]=Tous les fichiers
+-Comment[fy]=Alle triems
++Comment[fy]=Alle triemen
+ Comment[ga]=Gach Comhad
+ Comment[gl]=Tódolos Ficheiros
+ Comment[he]=כל הקבצים
+@@ -68,7 +68,6 @@
+ Comment[ven]=Faela dzothe
+ Comment[wa]=Tos les fitchîs
+ Comment[xh]=Zonke IifayiIe
+-Comment[xx]=xxAll Filesxx
+ Comment[zh_CN]=全部文件
+ Comment[zh_TW]=所有的檔案
+ Comment[zu]=Wonke Amafayela
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/illustrator.desktop kdelibs-branch-3.4/mimetypes/application/illustrator.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/illustrator.desktop 2005-01-20 23:24:16.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/illustrator.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -71,7 +71,6 @@
+ Comment[vi]=Tài liệu Adobe Illustrator
+ Comment[wa]=Documint Adobe Illustrator
+ Comment[xh]=Uxwebhu lwe Adobe Illustrator
+-Comment[xx]=xxAdobe Illustrator Documentxx
+ Comment[zh_CN]=Adobe Illustrator 文档
+ Comment[zh_TW]=Adobe Illustrator 文件
+ Comment[zu]=Umkhombisi Wohlu lwamafayela e-Adobe
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/java.desktop kdelibs-branch-3.4/mimetypes/application/java.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/java.desktop 2005-01-20 23:24:16.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/java.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -10,6 +10,7 @@
+ Comment[be]=Кляса Java
+ Comment[bg]=Клас на Java
+ Comment[bn]=জাভা ক্লাস
++Comment[br]=Renkad Java
+ Comment[bs]=Java klasa
+ Comment[ca]=Classe Java
+ Comment[cs]=Java třída
+@@ -71,7 +72,6 @@
+ Comment[vi]=Lớp Java
+ Comment[wa]=Classe Java
+ Comment[xh]=Uhlobo lwe Java
+-Comment[xx]=xxJava Classxx
+ Comment[zh_CN]=Java 类
+ Comment[zu]=Ikilasi lwe-Java
+ X-KDE-IsAlso=application/x-java
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/mathml+xml.desktop kdelibs-branch-3.4/mimetypes/application/mathml+xml.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/mathml+xml.desktop 2005-01-20 23:24:16.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/mathml+xml.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -6,6 +6,7 @@
+ Hidden=false
+ X-KDE-IsAlso=text/xml
+ Comment=MathML Document
++Comment[af]=MathML Dokument
+ Comment[ar]=مستند MathML
+ Comment[az]=MathML Sənədi
+ Comment[be]=Дакумэнт MathML
+@@ -65,6 +66,5 @@
+ Comment[uk]=Документ MathML (математичні формули)
+ Comment[uz]=MathML ҳужжати
+ Comment[wa]=Documint MathML
+-Comment[xx]=xxMathML Documentxx
+ Comment[zh_CN]=MathML 文档
+ Comment[zh_TW]=MathML 文件
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/msexcel.desktop kdelibs-branch-3.4/mimetypes/application/msexcel.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/msexcel.desktop 2005-01-27 23:03:18.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/msexcel.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -68,7 +68,6 @@
+ Comment[uz]=Microsoft Excel электрон жадвали
+ Comment[ven]=Bammbiri lo navhaho la microsoft Excel
+ Comment[wa]=Fitchî tåvleu Microsoft Excel
+-Comment[xx]=xxMicrosoft Excel Spreadsheetxx
+ Comment[zh_CN]=Microsoft Excel 电子表格
+ Comment[zh_TW]=微軟 Excel 表格
+ Comment[zu]= Ipheshana lesitayela le-Microsoft Excel
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/mspowerpoint.desktop kdelibs-branch-3.4/mimetypes/application/mspowerpoint.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/mspowerpoint.desktop 2005-01-20 23:24:16.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/mspowerpoint.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=presentation
+ Patterns=*.ppz;*.PPZ;*.ppt;*.PPT;*.pps;*.PPS;
+ Comment=Microsoft PowerPoint Presentation
++Comment[af]=Microsoft Powerpoint Voorlegging
+ Comment[ar]=مستند مايكروسوفت باوربوينت
+ Comment[az]=Microsoft PowerPoint Sənədi
+ Comment[be]=Прэзэнтацыя Microsoft PowerPoint
+@@ -62,6 +63,5 @@
+ Comment[uk]=Презентація MS PowerPoint
+ Comment[uz]=Microsoft PowerPoint намунаси
+ Comment[wa]=Prezintaedje Microsoft PowerPoint
+-Comment[xx]=xxMicrosoft PowerPoint Presentationxx
+ Comment[zh_CN]=Microsoft PowerPoint 演示文稿
+ Comment[zh_TW]=微軟 PowerPoint 文件
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/msword.desktop kdelibs-branch-3.4/mimetypes/application/msword.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/msword.desktop 2005-01-20 23:24:16.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/msword.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -70,7 +70,6 @@
+ Comment[ven]=Manwalwa a Microsoft Word
+ Comment[wa]=Documint Microsoft Word
+ Comment[xh]=Uxwebhhu LweMicrosoft Word
+-Comment[xx]=xxMicrosoft Word Documentxx
+ Comment[zh_CN]=Microsoft Word 文档
+ Comment[zh_TW]=微軟 Word 文件
+ Comment[zu]=Uhlu Lwamafayela lwe-Microsoft Word
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/octet-stream.desktop kdelibs-branch-3.4/mimetypes/application/octet-stream.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/octet-stream.desktop 2005-02-23 00:04:54.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/octet-stream.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -73,7 +73,6 @@
+ Comment[vi]=Không biết
+ Comment[wa]=Nén cnoxhou
+ Comment[xh]=Engaziwayo
+-Comment[xx]=xxUnknownxx
+ Comment[zh_CN]=未知
+ Comment[zh_TW]=未知
+ Comment[zu]=Okungaziwa
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/ogg.desktop kdelibs-branch-3.4/mimetypes/application/ogg.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/ogg.desktop 2005-01-28 22:58:14.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/ogg.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -66,7 +66,6 @@
+ Comment[uz]=Ogg мултимедиа
+ Comment[ven]=Zwavhukwamani ha Ogg
+ Comment[wa]=Fitchî multimedia Ogg
+-Comment[xx]=xxOgg Multimediaxx
+ Comment[zh_CN]=Ogg 多媒体
+ Comment[zh_TW]=Ogg 多媒體
+ Comment[zu]=Onozindaba be-Ogg
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/pdf.desktop kdelibs-branch-3.4/mimetypes/application/pdf.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/pdf.desktop 2005-01-20 23:24:16.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/pdf.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -70,7 +70,6 @@
+ Comment[ven]=Manwalwa a pdf
+ Comment[wa]=Documint PDF
+ Comment[xh]=Uxwebhu lwe PDF
+-Comment[xx]=xxPDF Documentxx
+ Comment[zh_CN]=PDF 文档
+ Comment[zh_TW]=PDF 文件
+ Comment[zu]=Uhlu lwamafayela e-PDF
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/pgp-encrypted.desktop kdelibs-branch-3.4/mimetypes/application/pgp-encrypted.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/pgp-encrypted.desktop 2005-01-20 23:24:16.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/pgp-encrypted.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -66,7 +66,6 @@
+ Comment[ven]=Thoho ya mulaedza ya PGP/MIME
+ Comment[wa]=Tiestire d' on messaedje ecripté avou PGP/MIME
+ Comment[xh]=PGP/MIME Umbhalo ophezulu ephepheni Womyalezo Ofihliweyo
+-Comment[xx]=xxPGP/MIME Encrypted Message Headerxx
+ Comment[zh_CN]=PGP/MIME 加密邮件头
+ Comment[zh_TW]=PGP/MIME 加密的郵件檔頭
+ Comment[zu]=Umyalezo Wenhloko Wolwazi olungaqondakali lwe-PGP/MIME
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/pgp-keys.desktop kdelibs-branch-3.4/mimetypes/application/pgp-keys.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/pgp-keys.desktop 2005-02-23 00:04:54.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/pgp-keys.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -5,9 +5,11 @@
+ Icon=certificate
+ Patterns=*.pgp;*.gpg;*.asc
+ Comment=OpenPGP Key Bundle
++Comment[af]=OpenPGP Sleutel Bundel
+ Comment[az]=OpenPGP Açar Düyünü
+ Comment[bg]=Пакет с ключове за OpenPGP
+ Comment[bn]=ওপেন-পি.জি.পি কী (Key) সংকলন
++Comment[br]=Dastumad alc'hwezioù OpenPGP
+ Comment[bs]=OpenPGP skup ključeva
+ Comment[ca]=Paquet de claus OpenPGP
+ Comment[cs]=Svazek OpenPGP klíčů
+@@ -55,7 +57,6 @@
+ Comment[tr]=OpenPGP Anahtar Çifti
+ Comment[uk]=Клунок ключа OpenPGP
+ Comment[uz]=OpenPGP калитлар тўплами
+-Comment[xx]=xxOpenPGP Key Bundlexx
+ Comment[zh_CN]=OpenPGP 秘钥束
+ X-KDE-AutoEmbed=true
+
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/pgp-signature.desktop kdelibs-branch-3.4/mimetypes/application/pgp-signature.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/pgp-signature.desktop 2005-01-28 22:58:14.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/pgp-signature.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -65,7 +65,6 @@
+ Comment[ven]=Tsaino ya tumanywaho na PGP yo vuleaho
+ Comment[wa]=Sinateure OpenPGP distaetcheye
+ Comment[xh]=Utyikityo lwe OpenPGP Olusikiweyo
+-Comment[xx]=xxDetached OpenPGP Signaturexx
+ Comment[zh_CN]=分离的 OpenPGP 签名
+ Comment[zh_TW]=分離的 OpenPGP 簽名
+ Comment[zu]=Uphawu lokusayina lwe-OpenPGP Oluxebukile
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/pgp.desktop kdelibs-branch-3.4/mimetypes/application/pgp.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/pgp.desktop 2005-01-20 23:24:16.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/pgp.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -4,6 +4,7 @@
+ MimeType=application/pgp
+ Icon=encrypted
+ Comment=PGP Encrypted or Signed Message
++Comment[af]=PGP Geënkripteerde of Getekende Boodskap
+ Comment[az]=PGP ilə Şifrələnmiş ya da İmzalanmış İsmarış
+ Comment[be]=Зашыфраванае PGP ці падпісанае паведамленьне
+ Comment[bg]=Шифровано или подписано съобщение PGP
+@@ -59,6 +60,5 @@
+ Comment[uk]=Повідомлення зашифроване або підписане PGP
+ Comment[uz]=PGP билан кодланган ёки имзоланган хабар
+ Comment[wa]=Messaedje ecripté ou siné avou PGP
+-Comment[xx]=xxPGP Encrypted or Signed Messagexx
+ Comment[zh_CN]=PGP 加密或签名的信件
+ Comment[zh_TW]=PGP 加密或簽名的訊息
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/pkcs10.desktop kdelibs-branch-3.4/mimetypes/application/pkcs10.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/pkcs10.desktop 2005-01-20 23:24:16.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/pkcs10.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=certificate
+ Patterns=*.p10;*.P10
+ Comment=S/MIME Certification Request
++Comment[af]=S/MIME Sertifikaat Aanvraag
+ Comment[ar]=طلب شهادة S/MIME
+ Comment[az]=S/MIME Vəsiqələndirmə İstəyi
+ Comment[bg]=Заявка за удостоверение S/MIME
+@@ -64,7 +65,6 @@
+ Comment[ven]=Khumbelo ya sethifikheithi tsha PKCS#12
+ Comment[wa]=Dimande d' acertinaedje S/MIME
+ Comment[xh]=S/MIME Isicelo Soqinisekiso
+-Comment[xx]=xxS/MIME Certification Requestxx
+ Comment[zh_CN]=S/MIME 认证请求
+ Comment[zh_TW]=S/MIME 認證請求
+ Comment[zu]=Isitifiketi Sesicelo se-S/MIME
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/pkcs7-mime.desktop kdelibs-branch-3.4/mimetypes/application/pkcs7-mime.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/pkcs7-mime.desktop 2005-01-20 23:24:16.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/pkcs7-mime.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -64,7 +64,6 @@
+ Comment[uz]=PKCS#7 (S/MIME) форматланган маълумот
+ Comment[ven]=PKCS#7 (S/MIME) Data yo vhumbeaho
+ Comment[xh]=PKCS#7 (S/MIME) Data Efomatiweyo
+-Comment[xx]=xxPKCS#7 (S/MIME) Formatted Dataxx
+ Comment[zh_CN]=PKCS#7 (S/MIME) 格式化数据
+ Comment[zh_TW]=PKCS#7 (S/MIME) 格式資料
+ Comment[zu]=Idata Efakwe kwisakhelo ye-PKCS#7 (S/MIME)
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/pkcs7-signature.desktop kdelibs-branch-3.4/mimetypes/application/pkcs7-signature.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/pkcs7-signature.desktop 2005-01-28 22:58:14.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/pkcs7-signature.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -66,7 +66,6 @@
+ Comment[ven]=Tsaino yo tumanywaho ya S/MIME
+ Comment[wa]=Sinateure S/MIME distaetcheye
+ Comment[xh]=Utyikityo lwe S/MIME Esikiweyo
+-Comment[xx]=xxDetached S/MIME Signaturexx
+ Comment[zh_CN]=分离的 S/MIME 签名
+ Comment[zh_TW]=分離的 S/MIME 簽名
+ Comment[zu]=Uphawu lokusayina lwe-S/MIME Oluxebukile
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/postscript.desktop kdelibs-branch-3.4/mimetypes/application/postscript.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/postscript.desktop 2005-01-20 23:24:16.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/postscript.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -75,7 +75,6 @@
+ Comment[vi]=Tài liệu PostScript
+ Comment[wa]=Documint PostScript
+ Comment[xh]=Uxwebhu lwe PostScript
+-Comment[xx]=xxPostScript Documentxx
+ Comment[zh_CN]=PostScript 文档
+ Comment[zh_TW]=PostScript 文件
+ Comment[zu]=Uhlu lwamafayela lwe-PostScript
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/relaxng.desktop kdelibs-branch-3.4/mimetypes/application/relaxng.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/relaxng.desktop 2005-02-23 00:04:54.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/relaxng.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -2,7 +2,6 @@
+ Encoding=UTF-8
+ Comment=RELAX NG
+ Comment[hi]=रीलेक्स एनजी
+-Comment[xx]=xxRELAX NGxx
+ Icon=html
+ Type=MimeType
+ MimeType=application/xml
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/sieve.desktop kdelibs-branch-3.4/mimetypes/application/sieve.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/sieve.desktop 2005-02-21 04:17:21.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/sieve.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -4,6 +4,7 @@
+ MimeType=application/sieve
+ Patterns=*.sieve;*.siv
+ Comment=SIEVE Mail Filter Script
++Comment[af]=SIEVE Pos Filter Skrip
+ Comment[ar]=نص برمجي لمرشح بريد SIEVE
+ Comment[az]=SIEVE Poçt Filtr Skripti
+ Comment[bg]=Скрипт за филтриране на е-поща SIEVE
+@@ -62,7 +63,6 @@
+ Comment[uz]=SIEVE хатни филтерлаш скрипти
+ Comment[ven]=Tshikiputi tsha filithara ya meili ya SIEVE
+ Comment[xh]=Isihluzi Sombhalo oshicilwe phantsi Seposi se SIEVE
+-Comment[xx]=xxSIEVE Mail Filter Scriptxx
+ Comment[zh_CN]=SIEVE 邮件过滤脚本
+ Comment[zh_TW]=SIEVE 郵件過濾程式
+ Comment[zu]=Isikripti Sohluzo Lweposi le-SIEVE
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/smil.desktop kdelibs-branch-3.4/mimetypes/application/smil.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/smil.desktop 2005-01-31 03:34:52.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/smil.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -61,7 +61,6 @@
+ Comment[ven]=Luambo lwo tangananaho lwa zwishumiswa zwa vhudavhidzani
+ Comment[vi]=Ngôn ngữ giải tích đa phương tiện đồng bềEhoá
+ Comment[xh]=Ulwimi oluhamba ngendlela enye lodityaniso lwe Multimedia
+-Comment[xx]=xxSynchronized Multimedia Integration Languagexx
+ Comment[zh_CN]=同步多媒体集成语言
+ Comment[zh_TW]=同步多媒體整合式語言
+ Comment[zu]=Ukuqoqelwa ndawonye Kolimi Lwabasiki bebunda Abahambiswa ndawonye
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.mozilla.xul+xml.desktop kdelibs-branch-3.4/mimetypes/application/vnd.mozilla.xul+xml.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.mozilla.xul+xml.desktop 2005-02-23 00:04:54.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.mozilla.xul+xml.desktop 2005-03-30 01:47:22.000000000 -0500
+@@ -6,6 +6,7 @@
+ Icon=netscape_doc
+ Patterns=*.xul;*.XUL;
+ Comment=Mozilla XUL File
++Comment[af]=Mozilla XUL Lêer
+ Comment[be]=Файл Mozilla XUL
+ Comment[bg]=Файл XUL на Мозила
+ Comment[bn]=মোজিলা এক্স-ইউ-এল ফাইল
+@@ -15,6 +16,7 @@
+ Comment[cs]=Soubor Mozilla XUL
+ Comment[da]=Mozilla XUL-fil
+ Comment[de]=Mozilla XUL-Datei
++Comment[el]=Αρχείο Mozilla XUL
+ Comment[es]=Archivo XUL de Mozilla
+ Comment[et]=Mozilla XUL fail
+ Comment[eu]=Mozilla XUL fitxategia
+@@ -22,6 +24,7 @@
+ Comment[fr]=Fichier XUL Mozilla
+ Comment[fy]=Mozilla XUL Triem
+ Comment[ga]=Comhad Mozilla XUL
++Comment[he]=קובץ XUL של מוזילה
+ Comment[hi]=मोज़िला एक्सयूएल फ़ाइल
+ Comment[hu]=Mozilla XUL-fájl
+ Comment[is]=Mozilla XUL skrá
+@@ -44,12 +47,11 @@
+ Comment[sk]=Súbor Mozilla XUL
+ Comment[sl]=Datoteka Mozilla XUL
+ Comment[sr]=Mozilla XUL фајл
+-Comment[sr@Latn]=Mozilla XUL фајл
++Comment[sr@Latn]=Mozilla XUL fajl
+ Comment[sv]=Mozilla XUL-fil
+ Comment[ta]=மோசில்லா XUL ஆவணம்
+ Comment[tg]=Файли Mozilla XUL
+ Comment[tr]=Mozilla XUL Dosyası
+ Comment[uk]=Файл Mozilla XUL
+ Comment[uz]=Mozilla XUL-файли
+-Comment[xx]=xxMozilla XUL Filexx
+ Comment[zh_CN]=Mozilla XUL 文件
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.ms-asf.desktop kdelibs-branch-3.4/mimetypes/application/vnd.ms-asf.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.ms-asf.desktop 2005-01-20 23:24:16.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.ms-asf.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -59,7 +59,6 @@
+ Comment[tr]=ASF dosyası
+ Comment[uk]=Носій ASF
+ Comment[uz]=ASF медиа-файли
+-Comment[xx]=xxASF Mediaxx
+ Comment[zh_CN]=ASF 媒体
+ Comment[zh_TW]=ASF 媒體
+ Comment[zu]=Abasiki bebunda be-ASF
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.ms-excel.desktop kdelibs-branch-3.4/mimetypes/application/vnd.ms-excel.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.ms-excel.desktop 2005-01-27 23:03:18.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.ms-excel.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -66,7 +66,6 @@
+ Comment[uz]=Microsoft Excel электрон жадвали
+ Comment[ven]=Bammbiri lo navhaho la microsoft Excel
+ Comment[wa]=Fitchî tåvleu Microsoft Excel
+-Comment[xx]=xxMicrosoft Excel Spreadsheetxx
+ Comment[zh_CN]=Microsoft Excel 电子表格
+ Comment[zh_TW]=微軟 Excel 表格
+ Comment[zu]= Ipheshana lesitayela le-Microsoft Excel
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.ms-word.desktop kdelibs-branch-3.4/mimetypes/application/vnd.ms-word.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.ms-word.desktop 2005-01-20 23:24:16.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.ms-word.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -67,7 +67,6 @@
+ Comment[ven]=Manwalwa a Microsoft Word
+ Comment[wa]=Documint Microsoft Word
+ Comment[xh]=Uxwebhhu LweMicrosoft Word
+-Comment[xx]=xxMicrosoft Word Documentxx
+ Comment[zh_CN]=Microsoft Word 文档
+ Comment[zh_TW]=微軟 Word 文件
+ Comment[zu]=Uhlu Lwamafayela lwe-Microsoft Word
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.oasis.opendocument.chart.desktop kdelibs-branch-3.4/mimetypes/application/vnd.oasis.opendocument.chart.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.oasis.opendocument.chart.desktop 2005-02-23 00:04:54.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.oasis.opendocument.chart.desktop 2005-03-27 02:28:47.000000000 -0500
+@@ -7,12 +7,15 @@
+ Comment=OASIS OpenDocument Chart
+ Comment[bg]=Диаграма на OASIS OpenDocument
+ Comment[bn]=OASIS ওপেন-ডকুমেন্ট চার্ট
++Comment[br]=Treser grafoù OpenDocument OASIS
++Comment[bs]=OASIS OpenDocument grafikon
+ Comment[ca]=Gràfic OASIS OpenDocument
+ Comment[cs]=OASIS OpenDocument graf
+ Comment[da]=OASIS OpenDocument diagram
+ Comment[es]=Carta de OpenDocument OASIS
+ Comment[et]=OASIS-e OpenDocument diagramm
+ Comment[eu]=OASIS OpenDocument diagrama
++Comment[fi]=OASIS OpenDocument -taulukko
+ Comment[fr]=Diagramme OASIS OpenDocument
+ Comment[fy]=OASIS OpenDocument Grafyk
+ Comment[hi]=ओएसिस ओपनडाकुमेंट चार्ट
+@@ -34,13 +37,12 @@
+ Comment[sk]=Graf OASIS OpenDocument
+ Comment[sl]=Graf OASIS OpenDocument
+ Comment[sr]=OASIS OpenDocument карта
+-Comment[sr@Latn]=OASIS OpenDocument карта
++Comment[sr@Latn]=OASIS OpenDocument karta
+ Comment[sv]=OASIS OpenDocument diagram
+ Comment[ta]=OASIS திறந்த ஆவண வரைபடம்
+ Comment[tg]=ХуҷҷатиКушод OASIS
+ Comment[tr]=OASIS OpenDocument Çizelgesi
+ Comment[uk]=Діаграма OASIS OpenDocument
+-Comment[xx]=xxOASIS OpenDocument Chartxx
+ Comment[zh_CN]=OASIS OpenDocument 图表
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.oasis.opendocument.formula.desktop kdelibs-branch-3.4/mimetypes/application/vnd.oasis.opendocument.formula.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.oasis.opendocument.formula.desktop 2005-02-23 00:04:54.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.oasis.opendocument.formula.desktop 2005-03-27 02:28:47.000000000 -0500
+@@ -8,6 +8,7 @@
+ Comment[bg]=Формула на OASIS OpenDocument
+ Comment[bn]=OASIS ওপেন-ডকুমেন্ট ফর্মুলা
+ Comment[br]=Formulenn OpenDocument OASIS
++Comment[bs]=OASIS OpenDocument formula
+ Comment[ca]=Fòrmula OASIS OpenDocument
+ Comment[cs]=OASIS OpenDocument vzorec
+ Comment[da]=OASIS OpenDocument formel
+@@ -15,6 +16,7 @@
+ Comment[es]=Fórmula de OpenDocument OASIS
+ Comment[et]=OASIS-e OpenDocument valem
+ Comment[eu]=OASIS OpenDocument formula
++Comment[fi]=OASIS OpenDocument -kaava
+ Comment[fr]=Formule OASIS OpenDocument
+ Comment[fy]=OASIS OpenDocument Formule
+ Comment[hi]=ओएसिस ओपनडाकुमेंट फ़ॉर्मूला
+@@ -36,13 +38,12 @@
+ Comment[sk]=Vzorec OASIS OpenDocument
+ Comment[sl]=Formula OASIS OpenDocument
+ Comment[sr]=OASIS OpenDocument формула
+-Comment[sr@Latn]=OASIS OpenDocument формула
++Comment[sr@Latn]=OASIS OpenDocument formula
+ Comment[sv]=OASIS OpenDocument formel
+ Comment[ta]=OASIS திறந்த ஆவண சமன்பாடு
+ Comment[tg]=Формулаи Хуҷҷати OASIS
+ Comment[tr]=OASIS OpenDocument Formülü
+ Comment[uk]=Формула OASIS OpenDocument
+-Comment[xx]=xxOASIS OpenDocument Formulaxx
+ Comment[zh_CN]=OASIS OpenDocument 公式
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop kdelibs-branch-3.4/mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop 2005-02-23 00:04:54.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop 2005-03-27 02:28:47.000000000 -0500
+@@ -7,6 +7,8 @@
+ Comment=OASIS OpenDocument Graphics Template
+ Comment[bg]=Шаблон за графика на OASIS OpenDocument
+ Comment[bn]=OASIS ওপেন-ডকুমেন্ট গ্রাফিক্স টেমপ্লেট
++Comment[br]=Patrom skeudenn OpenOffice.org OASIS
++Comment[bs]=OASIS OpenDocument šablon za crtež
+ Comment[ca]=Plantilla de gràfic OASIS OpenDocument
+ Comment[cs]=OASIS OpenDocument šablona obrázku
+ Comment[da]=OASIS OpenDocument grafikskabelon
+@@ -14,6 +16,7 @@
+ Comment[es]=Plantilla de documento gráfico de OpenDocument OASIS
+ Comment[et]=OASIS-e OpenDocument joonistusemall
+ Comment[eu]=OASIS OpenDocument grafiko txantiloia
++Comment[fi]=OASIS OpenDocument -piirrospohja
+ Comment[fr]=Modèle de graphiques OASIS OpenDocument
+ Comment[hi]=ओएसिस ओपनडाकुमेंट ग्राफ़िक्स टैम्प्लेट
+ Comment[hu]=OASIS-ábrasablon
+@@ -34,13 +37,12 @@
+ Comment[sk]=Šablóna grafiky OASIS OpenDocument
+ Comment[sl]=Predloga grafike OASIS OpenDocument
+ Comment[sr]=OASIS OpenDocument графички шаблон
+-Comment[sr@Latn]=OASIS OpenDocument графички шаблон
++Comment[sr@Latn]=OASIS OpenDocument grafički šablon
+ Comment[sv]=OASIS OpenDocument grafikmall
+ Comment[ta]=OASIS திறந்த ஆவண சித்திரங்கள் வார்ப்புரு
+ Comment[tg]=Санади Ҳуҷҷати OASIS
+ Comment[tr]=OASIS OpenDocument Grafik Şablonu
+ Comment[uk]=Шаблон графічного зображення OASIS OpenDocument
+-Comment[xx]=xxOASIS OpenDocument Graphics Templatexx
+ Comment[zh_CN]=OASIS OpenDocument 图形模板
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.oasis.opendocument.graphics.desktop kdelibs-branch-3.4/mimetypes/application/vnd.oasis.opendocument.graphics.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.oasis.opendocument.graphics.desktop 2005-02-23 00:04:54.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.oasis.opendocument.graphics.desktop 2005-03-27 02:28:47.000000000 -0500
+@@ -7,6 +7,8 @@
+ Comment=OASIS OpenDocument Graphics
+ Comment[bg]=Графика на OASIS OpenDocument
+ Comment[bn]=OASIS ওপেন-ডকুমেন্ট গ্রাফিক্স
++Comment[br]=Skeudenn OpenOffice.org OASIS
++Comment[bs]=OASIS OpenDocument crtež
+ Comment[ca]=Gràfic OASIS OpenDocument
+ Comment[cs]=OASIS OpenDocument kresba
+ Comment[da]=OASIS OpenDocument-grafik
+@@ -14,6 +16,7 @@
+ Comment[es]=Gráfico de OpenDocument OASIS
+ Comment[et]=OASIS-e OpenDocument joonistus
+ Comment[eu]=OASIS OpenDocument grafikoak
++Comment[fi]=OASIS OpenDocument -piirros
+ Comment[fr]=Graphiques OASIS OpenDocument
+ Comment[hi]=ओएसिस ओपनडाकुमेंट ग्राफ़िक्स
+ Comment[hu]=OASIS-ábra
+@@ -34,13 +37,12 @@
+ Comment[sk]=Grafika OASIS OpenDocument
+ Comment[sl]=Grafika OASIS OpenDocument
+ Comment[sr]=OASIS OpenDocument графика
+-Comment[sr@Latn]=OASIS OpenDocument графика
++Comment[sr@Latn]=OASIS OpenDocument grafika
+ Comment[sv]=OASIS OpenDocument grafik
+ Comment[ta]=OASIS திறந்த ஆவண சித்திரங்கள்
+ Comment[tg]=Хуҷҷати графикии OASIS
+ Comment[tr]=OASIS OpenDocument Grafik
+ Comment[uk]=Графічне зображення OASIS OpenDocument
+-Comment[xx]=xxOASIS OpenDocument Graphicsxx
+ Comment[zh_CN]=OASIS OpenDocument 图形
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.oasis.opendocument.image.desktop kdelibs-branch-3.4/mimetypes/application/vnd.oasis.opendocument.image.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.oasis.opendocument.image.desktop 2005-02-23 00:04:54.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.oasis.opendocument.image.desktop 2005-03-27 02:28:47.000000000 -0500
+@@ -8,6 +8,7 @@
+ Comment[bg]=Изображение на OASIS OpenDocument
+ Comment[bn]=OASIS ওপেন-ডকুমেন্ট চিত্র
+ Comment[br]=Skeudenn OpenDocument OASIS
++Comment[bs]=OASIS OpenDocument slika
+ Comment[ca]=Imatge OASIS OpenDocument
+ Comment[cs]=OASIS OpenDocument obrázek
+ Comment[da]=OASIS OpenDocument-billede
+@@ -15,6 +16,7 @@
+ Comment[es]=Imagen de OpenDocument OASIS
+ Comment[et]=OASIS-e OpenDocument pilt
+ Comment[eu]=OASIS OpenDocument irudia
++Comment[fi]=OASIS OpenDocument -kuva
+ Comment[fr]=Image OASIS OpenDocument
+ Comment[hi]=ओएसिस ओपनडाकुमेंट छवि
+ Comment[hu]=OASIS-kép
+@@ -35,13 +37,12 @@
+ Comment[sk]=Obrázok OASIS OpenDocument
+ Comment[sl]=Slika OASIS OpenDocument
+ Comment[sr]=OASIS OpenDocument слика
+-Comment[sr@Latn]=OASIS OpenDocument слика
++Comment[sr@Latn]=OASIS OpenDocument slika
+ Comment[sv]=OASIS OpenDocument bild
+ Comment[ta]=OASIS திறந்த ஆவண பிம்பம்
+ Comment[tg]=Хуҷҷати тасвирии OASIS
+ Comment[tr]=OASIS OpenDocument Resim
+ Comment[uk]=Зображення OASIS OpenDocument
+-Comment[xx]=xxOASIS OpenDocument Imagexx
+ Comment[zh_CN]=OASIS OpenDocument 图像
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.oasis.opendocument.presentation-template.desktop kdelibs-branch-3.4/mimetypes/application/vnd.oasis.opendocument.presentation-template.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.oasis.opendocument.presentation-template.desktop 2005-02-23 00:04:54.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.oasis.opendocument.presentation-template.desktop 2005-03-27 02:28:47.000000000 -0500
+@@ -7,6 +7,7 @@
+ Comment=OASIS OpenDocument Presentation Template
+ Comment[bg]=Шаблон за презентация на OASIS OpenDocument
+ Comment[bn]=OASIS ওপেন-ডকুমেন্ট প্রেসেন্টেশন টেম্প্লেট
++Comment[bs]=OASIS OpenDocument šablon za prezentaciju
+ Comment[ca]=Plantilla de presentació OASIS OpenDocument
+ Comment[cs]=OASIS OpenDocument šablona prezentace
+ Comment[da]=OASIS OpenDocument Præsentaionsskabelon
+@@ -14,6 +15,7 @@
+ Comment[es]=Plantilla de presentación de OpenDocument OASIS
+ Comment[et]=OASIS-e OpenDocument esitlusemall
+ Comment[eu]=OASIS OpenDocument aurkezpen txantiloia
++Comment[fi]=OASIS OpenDocument -esityspohja
+ Comment[fr]=Modèle de présentation OASIS OpenDocument
+ Comment[hi]=ओएसिस ओपनडाकुमेंट प्रेजेंटेशन टैम्प्लेट
+ Comment[hu]=OASIS-bemutatósablon
+@@ -34,13 +36,12 @@
+ Comment[sk]=Šablóna prezentácie OASIS OpenDocument
+ Comment[sl]=Predloga predstavitve OASIS OpenDocument
+ Comment[sr]=OASIS OpenDocument шаблон презентације
+-Comment[sr@Latn]=OASIS OpenDocument шаблон презентације
++Comment[sr@Latn]=OASIS OpenDocument šablon prezentacije
+ Comment[sv]=OASIS OpenDocument presentationsmall
+ Comment[ta]=OASIS திறந்த ஆவண முன்வைப்பு வார்ப்புரு
+ Comment[tg]=Ҳуҷҷати Тақдимоти OASIS
+ Comment[tr]=OASIS OpenDocument Sunum Şablonu
+ Comment[uk]=Шаблон презентації OASIS OpenDocument
+-Comment[xx]=xxOASIS OpenDocument Presentation Templatexx
+ Comment[zh_CN]=OASIS OpenDocument 演示文稿模板
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.oasis.opendocument.presentation.desktop kdelibs-branch-3.4/mimetypes/application/vnd.oasis.opendocument.presentation.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.oasis.opendocument.presentation.desktop 2005-02-23 00:04:54.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.oasis.opendocument.presentation.desktop 2005-03-27 02:28:47.000000000 -0500
+@@ -7,6 +7,7 @@
+ Comment=OASIS OpenDocument Presentation
+ Comment[bg]=Презентация на OASIS OpenDocument
+ Comment[bn]=OASIS ওপেন-ডকুমেন্ট প্রেসেন্টেশন
++Comment[bs]=OASIS OpenDocument prezentacija
+ Comment[ca]=Presentació OASIS OpenDocument
+ Comment[cs]=OASIS OpenDocument prezentace
+ Comment[da]=OASIS OpenDocument præsentation
+@@ -14,6 +15,7 @@
+ Comment[es]=Presentación de OpenDocument OASIS
+ Comment[et]=OASIS-e OpenDocument esitlus
+ Comment[eu]=OASIS OpenDocument aurkezpena
++Comment[fi]=OASIS OpenDocument -esitys
+ Comment[fr]=Présentation OASIS OpenDocument
+ Comment[hi]=ओएसिस ओपनडाकुमेंट प्रेजेंटेशन
+ Comment[hu]=OASIS-bemutató
+@@ -34,13 +36,12 @@
+ Comment[sk]=Prezentácia OASIS OpenDocument
+ Comment[sl]=Predstavitev OASIS OpenDocument
+ Comment[sr]=OASIS OpenDocument презентација
+-Comment[sr@Latn]=OASIS OpenDocument презентација
++Comment[sr@Latn]=OASIS OpenDocument prezentacija
+ Comment[sv]=OASIS OpenDocument presentation
+ Comment[ta]=OASIS திறந்த ஆவண முன்வைப்பு
+ Comment[tg]=Ҳуҷҷати Тақдимоти OASIS
+ Comment[tr]=OASIS OpenDocument Sunum
+ Comment[uk]=Презентація OASIS OpenDocument
+-Comment[xx]=xxOASIS OpenDocument Presentationxx
+ Comment[zh_CN]=OASIS OpenDocument 演示文稿
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.oasis.opendocument.spreadsheet-template.desktop kdelibs-branch-3.4/mimetypes/application/vnd.oasis.opendocument.spreadsheet-template.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.oasis.opendocument.spreadsheet-template.desktop 2005-02-23 00:04:54.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.oasis.opendocument.spreadsheet-template.desktop 2005-03-27 02:28:47.000000000 -0500
+@@ -7,6 +7,8 @@
+ Comment=OASIS OpenDocument SpreadSheet Template
+ Comment[bg]=Шаблон за електронна таблица на OASIS OpenDocument
+ Comment[bn]=OASIS ওপেন-ডকুমেন্ট স্প্রেডশিট টেম্প্লেট
++Comment[br]=Patrom loger OpenOffice.org OASIS
++Comment[bs]=OASIS OpenDocument šablon za proračunsku tablicu
+ Comment[ca]=Plantilla de full de càlcul OASIS OpenDocument
+ Comment[cs]=OASIS OpenDocument šablona tabulky
+ Comment[da]=OASIS OpenDocument regnearkskabelon
+@@ -14,6 +16,7 @@
+ Comment[es]=Plantilla de hoja de cálculo de OpenDocument OASIS
+ Comment[et]=OASIS-e OpenDocument arvutustabeli mall
+ Comment[eu]=OASIS OpenDocument kalkulu-orri txantiloia
++Comment[fi]=OASIS OpenDocument -taulukkopohja
+ Comment[fr]=Modèle de feuille de calcul OASIS OpenDocument
+ Comment[hi]=ओएसिस ओपनडाकुमेंट स्प्रेडशीट टैम्प्लेट
+ Comment[hu]=OASIS-munkafüzet-sablon
+@@ -34,13 +37,12 @@
+ Comment[sk]=Šablóna tabuľky OASIS OpenDocument
+ Comment[sl]=Predloga preglednice OASIS OpenDocument
+ Comment[sr]=OASIS OpenDocument шаблон табеле
+-Comment[sr@Latn]=OASIS OpenDocument шаблон табеле
++Comment[sr@Latn]=OASIS OpenDocument šablon tabele
+ Comment[sv]=OASIS OpenDocument kalkylarksmall
+ Comment[ta]=OASIS திறந்த ஆவண விரிதாள் வார்ப்புரு
+ Comment[tg]=Ҷадвали электронии OASIS
+ Comment[tr]=OASIS OpenDocument Hesap Tablosu Şablonu
+ Comment[uk]=Шаблон електронної таблиці OASIS OpenDocument
+-Comment[xx]=xxOASIS OpenDocument SpreadSheet Templatexx
+ Comment[zh_CN]=OASIS OpenDocument 电子表格模板
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.oasis.opendocument.spreadsheet.desktop kdelibs-branch-3.4/mimetypes/application/vnd.oasis.opendocument.spreadsheet.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.oasis.opendocument.spreadsheet.desktop 2005-02-23 00:04:54.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.oasis.opendocument.spreadsheet.desktop 2005-03-27 02:28:47.000000000 -0500
+@@ -7,6 +7,8 @@
+ Comment=OASIS OpenDocument SpreadSheet
+ Comment[bg]=Електронна таблица на OASIS OpenDocument
+ Comment[bn]=OASIS ওপেন-ডকুমেন্ট স্প্রেডশিট
++Comment[br]=Loger OpenOffice.org OASIS
++Comment[bs]=OASIS OpenDocument proračunska tablica
+ Comment[ca]=Full de càlcul OASIS OpenDocument
+ Comment[cs]=OASIS OpenDocument tabulka
+ Comment[da]=OASIS OpenDocument regneark
+@@ -14,6 +16,7 @@
+ Comment[es]=Hoja de cálculo de OpenDocument OASIS
+ Comment[et]=OASIS-e OpenDocument arvutustabel
+ Comment[eu]=OASIS OpenDocument kalkulu-orria
++Comment[fi]=OASIS OpenDocument -taulukko
+ Comment[fr]=Feuille de calcul OASIS OpenDocument
+ Comment[hi]=ओएसिस ओपनडाकुमेंट स्प्रेडशीट
+ Comment[hu]=OASIS-munkafüzet
+@@ -34,13 +37,12 @@
+ Comment[sk]=Tabuľka OASIS OpenDocument
+ Comment[sl]=Preglednica OASIS OpenDocument
+ Comment[sr]=OASIS OpenDocument табела
+-Comment[sr@Latn]=OASIS OpenDocument табела
++Comment[sr@Latn]=OASIS OpenDocument tabela
+ Comment[sv]=OASIS OpenDocument kalkylark
+ Comment[ta]=OASIS திறந்த ஆவண விரிதாள்
+ Comment[tg]=Ҷадвали Электронии OASIS
+ Comment[tr]=OASIS OpenDocument Hesap Tablosu
+ Comment[uk]=Електронна таблиця OASIS OpenDocument
+-Comment[xx]=xxOASIS OpenDocument SpreadSheetxx
+ Comment[zh_CN]=OASIS OpenDocument 电子表格
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.oasis.opendocument.text-template.desktop kdelibs-branch-3.4/mimetypes/application/vnd.oasis.opendocument.text-template.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.oasis.opendocument.text-template.desktop 2005-02-23 00:04:54.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.oasis.opendocument.text-template.desktop 2005-03-27 02:28:47.000000000 -0500
+@@ -7,6 +7,8 @@
+ Comment=OASIS OpenDocument Text Template
+ Comment[bg]=Шаблон за текстов документ на OASIS OpenDocument
+ Comment[bn]=OASIS ওপেন-ডকুমেন্ট টেক্সট নথী টেম্প্লেট
++Comment[br]=Patrom skrid OpenOffice.org OASIS
++Comment[bs]=OASIS OpenDocument šablon za tekstualni dokument
+ Comment[ca]=Plantilla de text OASIS OpenDocument
+ Comment[cs]=OASIS OpenDocument šablona textu
+ Comment[da]=OASIS OpenDocument tekstskabelon
+@@ -14,6 +16,7 @@
+ Comment[es]=Plantilla de documento de texto de OpenDocument OASIS
+ Comment[et]=OASIS-e OpenDocument tekstidokumendi mall
+ Comment[eu]=OASIS OpenDocument testu txantiloia
++Comment[fi]=OASIS OpenDocument -tekstiasiakirjapohja
+ Comment[fr]=Modèle de document texte OASIS OpenDocument
+ Comment[hi]=ओएसिस ओपनडाकुमेंट पाठ टैम्प्लेट
+ Comment[hu]=OASIS-dokumentumsablon
+@@ -34,13 +37,12 @@
+ Comment[sk]=Šablóna textového dokumentu OASIS OpenDocument
+ Comment[sl]=Predloga besedilnega dokumenta OASIS OpenDocument
+ Comment[sr]=OASIS OpenDocument шаблон текста
+-Comment[sr@Latn]=OASIS OpenDocument шаблон текста
++Comment[sr@Latn]=OASIS OpenDocument šablon teksta
+ Comment[sv]=OASIS OpenDocument textmall
+ Comment[ta]=OASIS திறந்த ஆவண உரை வார்ப்புரு
+ Comment[tg]=Ҳуҷҷати Матнии OASIS
+ Comment[tr]=OASIS OpenDocument Metin Şablonu
+ Comment[uk]=Шаблон текстового документу OASIS OpenDocument
+-Comment[xx]=xxOASIS OpenDocument Text Templatexx
+ Comment[zh_CN]=OASIS OpenDocument 文本文档模板
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.oasis.opendocument.text.desktop kdelibs-branch-3.4/mimetypes/application/vnd.oasis.opendocument.text.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.oasis.opendocument.text.desktop 2005-02-23 00:04:54.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.oasis.opendocument.text.desktop 2005-03-27 02:28:47.000000000 -0500
+@@ -8,12 +8,14 @@
+ Comment[bg]=Текстов документ на OASIS OpenDocument
+ Comment[bn]=OASIS ওপেন-ডকুমেন্ট টেক্সট নথী
+ Comment[br]=Skrid OpenDocument OASIS
++Comment[bs]=OASIS OpenDocument tekstualni dokument
+ Comment[ca]=Text OASIS OpenDocument
+ Comment[cs]=OASIS OpenDocument text
+ Comment[da]=OASIS OpenDocument tekst
+ Comment[es]=texto de OpenDocument OASIS
+ Comment[et]=OASIS-e OpenDocument tekstidokument
+ Comment[eu]=OASIS OpenDocument testua
++Comment[fi]=OASIS OpenDocument -teksti
+ Comment[fr]=Document texte OASIS OpenDocument
+ Comment[hi]=ओएसिस ओपनडाकुमेंट पाठ
+ Comment[hu]=OASIS-dokumentum
+@@ -34,13 +36,12 @@
+ Comment[sk]=Textový dokument OASIS OpenDocument
+ Comment[sl]=Dokument OASIS OpenDocument
+ Comment[sr]=OASIS OpenDocument текст
+-Comment[sr@Latn]=OASIS OpenDocument текст
++Comment[sr@Latn]=OASIS OpenDocument tekst
+ Comment[sv]=OASIS OpenDocument text
+ Comment[ta]=OASIS திறந்த ஆவண உரை
+ Comment[tg]=Хуҷҷати Матнии OASIS
+ Comment[tr]=OASIS OpenDocument Metin
+ Comment[uk]=Текстовий документ OASIS OpenDocument
+-Comment[xx]=xxOASIS OpenDocument Textxx
+ Comment[zh_CN]=OASIS OpenDocument 文本
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.palm.desktop kdelibs-branch-3.4/mimetypes/application/vnd.palm.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.palm.desktop 2005-01-20 23:24:16.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.palm.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -4,6 +4,7 @@
+ Icon=wordprocessing
+ Patterns=*.pdb;*.PDB;*.prc;*.PRC;
+ Comment=Palm Document
++Comment[af]=Palm Dokument
+ Comment[ar]=مستند Palm
+ Comment[az]=Palm Sənədi
+ Comment[be]=Дакумэнт Palm
+@@ -63,6 +64,5 @@
+ Comment[uk]=Документ Palm
+ Comment[uz]=Palm ҳужжати
+ Comment[wa]=Documint Palm
+-Comment[xx]=xxPalm Documentxx
+ Comment[zh_CN]=Palm 文档
+ Comment[zh_TW]=Palm 文件
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.rn-realmedia.desktop kdelibs-branch-3.4/mimetypes/application/vnd.rn-realmedia.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.rn-realmedia.desktop 2005-01-05 22:45:44.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.rn-realmedia.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=video
+ Patterns=*.rm;*.RM;
+ Comment=RealMedia File
++Comment[af]=RealMedia Lêer
+ Comment[ar]=وسيط RealMedia
+ Comment[az]=RealMedia Faylı
+ Comment[be]=Файл RealMedia
+@@ -64,6 +65,5 @@
+ Comment[uk]=Файл RealMedia
+ Comment[uz]=RealMedia-файли
+ Comment[wa]=Fitchî RealMedia
+-Comment[xx]=xxRealMedia Filexx
+ Comment[zh_CN]=RealMedia 文件
+ Comment[zh_TW]=RealMedia 檔案
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.stardivision.calc.desktop kdelibs-branch-3.4/mimetypes/application/vnd.stardivision.calc.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.stardivision.calc.desktop 2005-02-02 00:14:06.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.stardivision.calc.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -5,6 +5,7 @@
+ Patterns=*.sdc;*.SDC;
+ Icon=spreadsheet
+ Comment=StarOffice Calc Spreadsheet
++Comment[af]=StarOffice Calc Spreiblad
+ Comment[ar]=مستند StarOffice Calc
+ Comment[az]=StarOffice Calc Sənədi
+ Comment[be]=Электронная табліца StarOffice Calc
+@@ -63,7 +64,6 @@
+ Comment[uk]=Електронна таблиця StarOffice Calc
+ Comment[uz]=StarOffice Calc электрон жадвали
+ Comment[ven]=U phadaladza ha bammbiri la Calc ya StarOffice
+-Comment[xx]=xxStarOffice Calc Spreadsheetxx
+ Comment[zh_CN]=StarOffice Calc 电子表格
+ Comment[zh_TW]=StarOffice Calc 電子表格
+ [Property::X-KDE-NativeExtension]
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.stardivision.chart.desktop kdelibs-branch-3.4/mimetypes/application/vnd.stardivision.chart.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.stardivision.chart.desktop 2005-02-23 00:04:54.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.stardivision.chart.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -5,8 +5,10 @@
+ Patterns=*.sds;*.SDS;
+ Icon=kchart_chrt
+ Comment=StarOffice Chart
++Comment[af]=StarOffice Kaart
+ Comment[bg]=Документ на StarOffice Chart
+ Comment[bn]=স্টার-অফিস চার্ট
++Comment[br]=Treser grafoù StarOffice
+ Comment[bs]=StarOffice grafikon
+ Comment[ca]=Gràfic de StarOffice
+ Comment[cs]=Graf aplikace StarOffice
+@@ -41,12 +43,11 @@
+ Comment[sk]=Graf StarOffice
+ Comment[sl]=Preglednica StarOffice
+ Comment[sr]=StarOffice-ов графикон
+-Comment[sr@Latn]=StarOffice-ов графикон
++Comment[sr@Latn]=StarOffice-ov grafikon
+ Comment[sv]=StarOffice diagram
+ Comment[ta]=ஸ்டார்ஆபீஸ் வரைபடம்
+ Comment[tr]=StarOffice Hesap Tablosu
+ Comment[uk]=Діаграма StarOffice
+-Comment[xx]=xxStarOffice Chartxx
+ Comment[zh_CN]=StarOffice 图表
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.stardivision.draw.desktop kdelibs-branch-3.4/mimetypes/application/vnd.stardivision.draw.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.stardivision.draw.desktop 2005-02-23 00:04:55.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.stardivision.draw.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -5,6 +5,7 @@
+ Patterns=*.sda;*.SDA;
+ Icon=image
+ Comment=StarOffice Drawing
++Comment[af]=StarOffice Tekening
+ Comment[be]=Малюнак StarOffice
+ Comment[bg]=Изображение на StarOffice Drawing
+ Comment[bn]=স্টার-অফিস ড্রয়িং
+@@ -44,14 +45,13 @@
+ Comment[sk]=Kresba StarOffice
+ Comment[sl]=Risanje StarOffice
+ Comment[sr]=StarOffice-ов цртеж
+-Comment[sr@Latn]=StarOffice-ов цртеж
++Comment[sr@Latn]=StarOffice-ov crtež
+ Comment[sv]=StarOffice teckning
+ Comment[ta]=மைக்ரோசாப்ட் ஆபிஸ் சித்திரம்
+ Comment[tg]=Расмкашӣ Microsoft Office
+ Comment[tr]=StarOffice Çizimi
+ Comment[uk]=Малюнок StarOffice
+ Comment[uz]=StarOffice чизмаси
+-Comment[xx]=xxStarOffice Drawingxx
+ Comment[zh_CN]=StarOffice 绘图
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.stardivision.impress.desktop kdelibs-branch-3.4/mimetypes/application/vnd.stardivision.impress.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.stardivision.impress.desktop 2005-02-02 00:14:06.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.stardivision.impress.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -5,6 +5,7 @@
+ Patterns=*.sdd;*.SDD;
+ Icon=presentation
+ Comment=StarOffice Impress Presentation
++Comment[af]=StarOffice Impress Voorlegging
+ Comment[ar]=عرض StarOffice Impress
+ Comment[az]=StarOffice Impress Sənədi
+ Comment[be]=Прэзэнтацыя StarOffice Impress
+@@ -60,7 +61,6 @@
+ Comment[uk]=Презентація StarOffice Impress
+ Comment[uz]=StarOffice Impress намойиши
+ Comment[xh]=Umboniso Wokuphawula we StarOffice
+-Comment[xx]=xxStarOffice Impress Presentationxx
+ Comment[zh_CN]=StarOffice Impress 演示文稿
+ Comment[zh_TW]=StarOffice Impress 簡報
+ Comment[zu]=Ukunikezwa kwe-StarOffice Impress
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.stardivision.math.desktop kdelibs-branch-3.4/mimetypes/application/vnd.stardivision.math.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.stardivision.math.desktop 2005-02-23 00:04:55.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.stardivision.math.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -5,6 +5,7 @@
+ Patterns=*.sdf;*.SDF;
+ Icon=kformula_kfo
+ Comment=StarOffice Math Document
++Comment[af]=StarOffice Wiskunde Dokument
+ Comment[be]=Дакумэнт StarOffice Math
+ Comment[bg]=Документ на StarOffice Math
+ Comment[bn]=স্টার-অফিস ম্যাথ নথী
+@@ -45,14 +46,13 @@
+ Comment[sk]=Dokument StarOffice Math
+ Comment[sl]=Dokument StarOffice Math
+ Comment[sr]=StarOffice-ов математички документ
+-Comment[sr@Latn]=StarOffice-ов математички документ
++Comment[sr@Latn]=StarOffice-ov matematički dokument
+ Comment[sv]=StarOffice matematikdokument
+ Comment[ta]=ஸ்டார்ஆபீஸ் ரைட்டர் ஆவணம்
+ Comment[tg]=Санади математикии StarOffice
+ Comment[tr]=StarOffice Math Belgesi
+ Comment[uk]=Документ StarOffice Math
+ Comment[uz]=StarOffice Math ҳужжати
+-Comment[xx]=xxStarOffice Math Documentxx
+ Comment[zh_CN]=StarOffice Math 文档
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.stardivision.writer-global.desktop kdelibs-branch-3.4/mimetypes/application/vnd.stardivision.writer-global.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.stardivision.writer-global.desktop 2005-02-23 00:04:55.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.stardivision.writer-global.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -5,6 +5,7 @@
+ Patterns=*.sgl;*.SGL;
+ Icon=wordprocessing
+ Comment=StarOffice Writer Master Document
++Comment[af]=StarOffice Writer Meester Dokument
+ Comment[bg]=Главен документ на StarOffice Writer
+ Comment[bn]=স্টার-অফিস রাইটার মাস্টার নথী
+ Comment[bs]=StarOffice Writer glavni dokument
+@@ -44,14 +45,13 @@
+ Comment[sk]=Hlavný dokument StarOffice Writer
+ Comment[sl]=Glavni dokument StarOffice Writer
+ Comment[sr]=StarOffice Writer-ов главни документ
+-Comment[sr@Latn]=StarOffice Writer-ов главни документ
++Comment[sr@Latn]=StarOffice Writer-ov glavni dokument
+ Comment[sv]=StarOffice Writer-huvuddokument
+ Comment[ta]=ஸ்டார்ஆபீஸ் ரைட்டர் மூல ஆவணம்
+ Comment[tg]=Санади устоди нависаи StarOffice
+ Comment[tr]=StarOffice Writer Ana Belgesi
+ Comment[uk]=Головний документ StarOffice Writer
+ Comment[uz]=StarOffice Writer бош ҳужжати
+-Comment[xx]=xxStarOffice Writer Master Documentxx
+ Comment[zh_CN]=StarOffice Writer 主文档
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.stardivision.writer.desktop kdelibs-branch-3.4/mimetypes/application/vnd.stardivision.writer.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.stardivision.writer.desktop 2005-02-02 00:14:06.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.stardivision.writer.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -5,6 +5,7 @@
+ Patterns=*.sdw;*.SDW;
+ Icon=wordprocessing
+ Comment=StarOffice Writer Document
++Comment[af]=StarOffice Writer Dokument
+ Comment[ar]=مستند StarOffice Writer
+ Comment[az]=StarOffice Writer Sənədi
+ Comment[be]=Дакумэнт StarOffice Writer
+@@ -65,7 +66,6 @@
+ Comment[uz]=StarOffice Writer ҳужжати
+ Comment[ven]=Manwalwa a munwali wa StarOffice
+ Comment[xh]=Umbhali Woxwebhhu lwe StarOffice
+-Comment[xx]=xxStarOffice Writer Documentxx
+ Comment[zh_CN]=StarOffice Writer 文档
+ Comment[zh_TW]=StarOffice Writer 文件
+ Comment[zu]=Umbhali Wohlu lwamafayela e-StarOffice
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.sun.xml.calc.desktop kdelibs-branch-3.4/mimetypes/application/vnd.sun.xml.calc.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.sun.xml.calc.desktop 2005-02-02 00:14:06.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.sun.xml.calc.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=OpenOffice.org Spreadsheet
++Comment[af]=OpenOffice.org Spreiblad
+ Comment[ar]=مستند OpenOffice.org Spreasheet
+ Comment[az]=OpenOffice.org Hesab Cədvəli
+ Comment[be]=Электронная табліца OpenOffice.org
+@@ -57,7 +58,6 @@
+ Comment[uk]=Електронна таблиця OpenOffice.org
+ Comment[uz]=OpenOffice.org электрон жадвали
+ Comment[wa]=Foye di tåvleu OpenOffice.org
+-Comment[xx]=xxOpenOffice.org Spreadsheetxx
+ Comment[zh_CN]=OpenOffice.org 电子表格
+ Comment[zh_TW]=OpenOffice.org 試算表
+ Icon=spreadsheet
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.sun.xml.calc.template.desktop kdelibs-branch-3.4/mimetypes/application/vnd.sun.xml.calc.template.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.sun.xml.calc.template.desktop 2005-02-23 00:04:55.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.sun.xml.calc.template.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -1,9 +1,11 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=OpenOffice.org Spreadsheet Template
++Comment[af]=OpenOffice.org Spreiblad Voorbeeld
+ Comment[be]=Шаблён электроннай табліцы OpenOffice.org
+ Comment[bg]=Шаблон на OpenOffice.org Spreadsheet
+ Comment[bn]=ওপেন-অফিস.অর্গ স্প্রেডশিট টেম্প্লেট
++Comment[br]=Patrom loger OpenOffice.org
+ Comment[bs]=OpenOffice.org šablon za proračunsku tablicu
+ Comment[ca]=Plantilla de full de càlcul d'OpenOffice.org
+ Comment[cs]=Šablona tabulky aplikace OpenOffice.org
+@@ -41,14 +43,13 @@
+ Comment[sk]=Šablóna tabuľky OpenOffice.org
+ Comment[sl]=Predloga preglednice OpenOffice.org
+ Comment[sr]=OpenOffice.org-ов шаблон табеле
+-Comment[sr@Latn]=OpenOffice.org-ов шаблон табеле
++Comment[sr@Latn]=OpenOffice.org-ov šablon tabele
+ Comment[sv]=OpenOffice.org kalkylarksmall
+ Comment[ta]=ழ-ஓப்பன்ஆபீஸ் விரிதாள்
+ Comment[tg]=Ҷадвали OpenOffice.org
+ Comment[tr]=OpenOffice.org Hesap Şablonu
+ Comment[uk]=Шаблон електронної таблиці OpenOffice.org
+ Comment[uz]=OpenOffice.org электрон жадвал намунаси
+-Comment[xx]=xxOpenOffice.org Spreadsheet Templatexx
+ Comment[zh_CN]=OpenOffice.org 电子表格模板
+ Icon=spreadsheet
+ Type=MimeType
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.sun.xml.draw.desktop kdelibs-branch-3.4/mimetypes/application/vnd.sun.xml.draw.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.sun.xml.draw.desktop 2005-02-02 00:14:06.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.sun.xml.draw.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -1,11 +1,13 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=OpenOffice.org Drawing
++Comment[af]=OpenOffice.org Tekening
+ Comment[ar]=مستند OpenOffice.org Drawing
+ Comment[az]=OpenOffice.org Rəsmi
+ Comment[be]=Малюнак OpenOffice.org
+ Comment[bg]=Изображение на OpenOffice.org Drawing
+ Comment[bn]=ওপেন-অফিস.অর্গ ড্রয়িং
++Comment[br]=Tresaner OpenOffice.org
+ Comment[bs]=OpenOffice.org crtež
+ Comment[ca]=Dibuix d'OpenOffice.org
+ Comment[cs]=Kresba OpenOffice.org
+@@ -55,7 +57,6 @@
+ Comment[uk]=Малюнок OpenOffice.org
+ Comment[uz]=OpenOffice.org чизма
+ Comment[wa]=Documint di dessinaedje OpenOffice.org
+-Comment[xx]=xxOpenOffice.org Drawingxx
+ Comment[zh_CN]=OpenOffice.org 绘图
+ Comment[zh_TW]=StarOffice.org 繪圖
+ MimeType=application/vnd.sun.xml.draw
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.sun.xml.draw.template.desktop kdelibs-branch-3.4/mimetypes/application/vnd.sun.xml.draw.template.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.sun.xml.draw.template.desktop 2005-02-23 00:04:55.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.sun.xml.draw.template.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -1,9 +1,11 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=OpenOffice.org Drawing Template
++Comment[af]=OpenOffice.org Tekening Voorbeeld
+ Comment[be]=Шаблён малюнку OpenOffice.org
+ Comment[bg]=Шаблон на OpenOffice.org Drawing
+ Comment[bn]=ওপেন-অফিস.অর্গ ড্রয়িং টেম্প্লেট
++Comment[br]=Patrom tresaner OpenOffice.org
+ Comment[bs]=OpenOffice.org šablon za crtež
+ Comment[ca]=Plantilla de dibuix d'OpenOffice.org
+ Comment[cs]=Šablona kresby aplikace OpenOffice.org
+@@ -41,14 +43,13 @@
+ Comment[sk]=Šablóna kresby OpenOffice.org
+ Comment[sl]=Predloga risanja OpenOffice.org
+ Comment[sr]=OpenOffice.org-ов шаблон цртежа
+-Comment[sr@Latn]=OpenOffice.org-ов шаблон цртежа
++Comment[sr@Latn]=OpenOffice.org-ov šablon crteža
+ Comment[sv]=OpenOffice.org teckningsmall
+ Comment[ta]=ழ-ஓப்பன்ஆபீஸ் வரைபடம்
+ Comment[tg]=Нақши OpenOffice.org
+ Comment[tr]=OpenOffice.org Çizim Şablonu
+ Comment[uk]=Шаблон малюнка OpenOffice.org
+ Comment[uz]=OpenOffice.org чизма намунаси
+-Comment[xx]=xxOpenOffice.org Drawing Templatexx
+ Comment[zh_CN]=OpenOffice.org 绘图模板
+ MimeType=application/vnd.sun.xml.draw.template
+ Type=MimeType
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.sun.xml.impress.desktop kdelibs-branch-3.4/mimetypes/application/vnd.sun.xml.impress.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.sun.xml.impress.desktop 2005-02-02 00:14:06.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.sun.xml.impress.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=OpenOffice.org Presentation
++Comment[af]=OpenOffice.org Voorlegging
+ Comment[ar]=مستند OpenOffice.org Presentation
+ Comment[az]=OpenOffice.org Təqdimatı
+ Comment[be]=Прэзэнтацыя OpenOffice.org
+@@ -56,7 +57,6 @@
+ Comment[uk]=Презентація OpenOffice.org
+ Comment[uz]=OpenOffice.org Намойиш
+ Comment[wa]=Documint di prezintaedje OpenOffice.org
+-Comment[xx]=xxOpenOffice.org Presentationxx
+ Comment[zh_CN]=OpenOffice.org 演示文稿
+ MimeType=application/vnd.sun.xml.impress
+ Type=MimeType
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.sun.xml.impress.template.desktop kdelibs-branch-3.4/mimetypes/application/vnd.sun.xml.impress.template.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.sun.xml.impress.template.desktop 2005-02-23 00:04:55.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.sun.xml.impress.template.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=OpenOffice.org Presentation Template
++Comment[af]=OpenOffice.org Voorlegging
+ Comment[be]=Шаблён прэзэнтацыі OpenOffice.org
+ Comment[bg]=Шаблон на OpenOffice.org Presentation
+ Comment[bn]=ওপেন-অফিস.অর্গ প্রেসেন্টেশন টেম্প্লেট
+@@ -41,14 +42,13 @@
+ Comment[sk]=Šablóna prezentácie OpenOffice.org
+ Comment[sl]=Predloga predstavitve OpenOffice.org
+ Comment[sr]=OpenOffice.org-ов шаблон презентације
+-Comment[sr@Latn]=OpenOffice.org-ов шаблон презентације
++Comment[sr@Latn]=OpenOffice.org-ov šablon prezentacije
+ Comment[sv]=OpenOffice.org presentationsmall
+ Comment[ta]=ழ-ஓப்பன்ஆபீஸ் அளிக்கை
+ Comment[tg]=Тақдимоти OpenOffice.org
+ Comment[tr]=OpenOffice.org Sunum Şablonu
+ Comment[uk]=Шаблон презентації OpenOffice.org
+ Comment[uz]=OpenOffice.org намойиш намунаси
+-Comment[xx]=xxOpenOffice.org Presentation Templatexx
+ Comment[zh_CN]=OpenOffice.org 演示文稿模板
+ MimeType=application/vnd.sun.xml.impress.template
+ Type=MimeType
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.sun.xml.writer.desktop kdelibs-branch-3.4/mimetypes/application/vnd.sun.xml.writer.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.sun.xml.writer.desktop 2005-02-02 00:14:06.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.sun.xml.writer.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=OpenOffice.org Text Document
++Comment[af]=OpenOffice.org Teks Dokument
+ Comment[ar]=مستند نصَي OpenOffice.org
+ Comment[az]=OpenOffice.org Mətn Sənədi
+ Comment[be]=Тэкставы дакумэнт OpenOffice.org
+@@ -59,7 +60,6 @@
+ Comment[uk]=Текстовий документ OpenOffice.org
+ Comment[uz]=OpenOffice.org матн ҳужжати
+ Comment[wa]=Documint tecse OpenOffice.org
+-Comment[xx]=xxOpenOffice.org Text Documentxx
+ Comment[zh_CN]=OpenOffice.org 文本文档
+ Comment[zh_TW]=OpenOffice.org Text 文件
+ MimeType=application/vnd.sun.xml.writer
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.sun.xml.writer.master.desktop kdelibs-branch-3.4/mimetypes/application/vnd.sun.xml.writer.master.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.sun.xml.writer.master.desktop 2005-02-23 00:04:55.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.sun.xml.writer.master.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=OpenOffice.org Master Text Document
++Comment[af]=OpenOffice.org Meester Teks Dokument
+ Comment[bg]=Главен документ на OpenOffice.org Writer
+ Comment[bn]=ওপেন-অফিস.অর্গ মাস্টার টেক্সট নথী
+ Comment[bs]=OpenOffice.org glavni tekst dokument
+@@ -39,14 +40,13 @@
+ Comment[sk]=Hlavný textový dokument OpenOffice.org
+ Comment[sl]=Glavni besedilni dokument OpenOffice.org
+ Comment[sr]=OpenOffice.org-ов главни текстуални документ
+-Comment[sr@Latn]=OpenOffice.org-ов главни текстуални документ
++Comment[sr@Latn]=OpenOffice.org-ov glavni tekstualni dokument
+ Comment[sv]=OpenOffice.org huvudtextdokument
+ Comment[ta]=OpenOffice.org ஆசிரியர் உரை ஆவணம்
+ Comment[tg]=Устоди санади OpenOffice.org
+ Comment[tr]=OpenOffice.org Ana Metin Belgesi
+ Comment[uk]=Головний текстовий документ OpenOffice.org
+ Comment[uz]=OpenOffice.org бош матн ҳужжати
+-Comment[xx]=xxOpenOffice.org Master Text Documentxx
+ Comment[zh_CN]=OpenOffice.org 主文本文档
+ MimeType=application/vnd.sun.xml.writer.master
+ Type=MimeType
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/vnd.sun.xml.writer.template.desktop kdelibs-branch-3.4/mimetypes/application/vnd.sun.xml.writer.template.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/vnd.sun.xml.writer.template.desktop 2005-02-23 00:04:55.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/vnd.sun.xml.writer.template.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -1,9 +1,11 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=OpenOffice.org Text Document Template
++Comment[af]=OpenOffice.org Teks Dokument Voorbeeld
+ Comment[be]=Шаблён тэкставы дакумэнт OpenOffice.org
+ Comment[bg]=Шаблон на OpenOffice.org Text Document
+ Comment[bn]=ওপেন-অফিস.অর্গ টেক্সট নথী টেম্প্লেট
++Comment[br]=Patrom teul skrid OpenOffice.org
+ Comment[bs]=OpenOffice.org šablon za tekst dokument
+ Comment[ca]=Plantilla de document de text d'OpenOffice.org
+ Comment[cs]=Šablona textového dokumentu aplikace OpenOffice.org
+@@ -41,14 +43,13 @@
+ Comment[sk]=Šablóna textového dokumentu OpenOffice.org
+ Comment[sl]=Predloga besedilnega dokumenta OpenOffice.org
+ Comment[sr]=OpenOffice.org-ов шаблон текстуалног документа
+-Comment[sr@Latn]=OpenOffice.org-ов шаблон текстуалног документа
++Comment[sr@Latn]=OpenOffice.org-ov šablon tekstualnog dokumenta
+ Comment[sv]=OpenOffice.org textdokumentmall
+ Comment[ta]=ழ-ஓப்பன்ஆபீஸ் உரை ஆவணம்
+ Comment[tg]=Санади OpenOffice.org
+ Comment[tr]=OpenOffice.org Metin Belgesi Şablonu
+ Comment[uk]=Шаблон текстового документу OpenOffice.org
+ Comment[uz]=OpenOffice.org матн ҳужжати намунаси
+-Comment[xx]=xxOpenOffice.org Text Document Templatexx
+ Comment[zh_CN]=OpenOffice.org 文本文档模板
+ MimeType=application/vnd.sun.xml.writer.template
+ Type=MimeType
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/wordperfect.desktop kdelibs-branch-3.4/mimetypes/application/wordperfect.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/wordperfect.desktop 2005-01-20 23:24:16.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/wordperfect.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -5,7 +5,7 @@
+ Icon=wordprocessing
+ Patterns=*.wpd;*.WPD;
+ Comment=WordPerfect Document
+-Comment[af]=Wordperfect Dokument
++Comment[af]=WordPerfect Dokument
+ Comment[ar]=مستند Word Perfect
+ Comment[az]=WordPerfect Sənədi
+ Comment[be]=Дакумэнт WordPerfect
+@@ -70,7 +70,6 @@
+ Comment[ven]=Manwalwa a fhungo vhukuma
+ Comment[wa]=Documint WordPerfect
+ Comment[xh]=Uxwebhu lwe WordPerfect
+-Comment[xx]=xxWordPerfect Documentxx
+ Comment[zh_CN]=WordPerfect 文档
+ Comment[zh_TW]=WordPerfect 文件
+ Comment[zu]=Uhlu lwmafayela lwe-S/MIME
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-7z.desktop kdelibs-branch-3.4/mimetypes/application/x-7z.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-7z.desktop 2005-02-23 00:04:55.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-7z.desktop 2005-03-30 01:47:22.000000000 -0500
+@@ -8,15 +8,19 @@
+ Comment[bg]=Архив 7-Zip
+ Comment[bn]=7-জিপ (zip) আর্কাইভ
+ Comment[br]=Diell 7-Zip
++Comment[bs]=7-Zip arhiva
+ Comment[ca]=Arxiu 7-Zip
+ Comment[cs]=7-Zip archív
+ Comment[de]=7-Zip-Archiv
++Comment[el]=Αρχειοθήκη 7-Zip
+ Comment[es]=Archivo Zip-7
+ Comment[et]=7-Zip arhiiv
+ Comment[eu]=7-Zip fitxategia
++Comment[fi]=7-Zip-paketti
+ Comment[fr]=Archive 7-Zip
+ Comment[fy]=7-zip-Argyf
+ Comment[ga]=Cartlann 7-Zip
++Comment[he]=ארכיון 7-Zip
+ Comment[hi]=7ज़िप अभिलेख
+ Comment[hu]=7-Zip-archívum
+ Comment[is]=7-Zip safnskrá
+@@ -37,11 +41,10 @@
+ Comment[sk]=7-Zip archív
+ Comment[sl]=Arhiv 7-Zip
+ Comment[sr]=7-Zip архива
+-Comment[sr@Latn]=7-Zip архива
++Comment[sr@Latn]=7-Zip arhiva
+ Comment[sv]=7-zip-arkiv
+ Comment[ta]=7-Zip பின்காப்பு
+ Comment[tg]=Архиви 7-Zip
+ Comment[tr]=7-Zip Arşivi
+ Comment[uk]=Архів 7-Zip
+-Comment[xx]=xx7-Zip Archivexx
+ Comment[zh_CN]=7-Zip 归档
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-abiword.desktop kdelibs-branch-3.4/mimetypes/application/x-abiword.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-abiword.desktop 2005-02-12 09:20:41.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-abiword.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -3,7 +3,7 @@
+ Type=MimeType
+ MimeType=application/x-abiword
+ Comment=AbiWord Document
+-Comment[af]=Abiword Dokument
++Comment[af]=AbiWord Dokument
+ Comment[ar]=مستند AbiWord
+ Comment[az]=AbiWord Sənədi
+ Comment[be]=Дакумэнт AbiWord
+@@ -71,7 +71,6 @@
+ Comment[vi]=Tài liệu AbiWord
+ Comment[wa]=Documint Abiword
+ Comment[xh]=Uxwebhu lwe AbiWord
+-Comment[xx]=xxAbiWord Documentxx
+ Comment[zh_CN]=AbiWord 文档
+ Comment[zh_TW]=AbiWord 文件
+ Comment[zu]=Uhlu lwamafayela e-AbiWord
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-ace.desktop kdelibs-branch-3.4/mimetypes/application/x-ace.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-ace.desktop 2004-12-29 12:52:10.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-ace.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=tgz
+ Patterns=*.ace;*.ACE;
+ Comment=ACE Archive
++Comment[af]=ACE Argief
+ Comment[ar]=أرشيف ACE
+ Comment[az]=ACE Arxivi
+ Comment[be]=Архіў ACE
+@@ -64,6 +65,5 @@
+ Comment[uk]=Архіви ACE
+ Comment[uz]=ACE архиви
+ Comment[wa]=Årtchive «ACE»
+-Comment[xx]=xxACE Archivexx
+ Comment[zh_CN]=ACE 归档
+ Comment[zh_TW]=Arc 壓縮檔案
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-afm.desktop kdelibs-branch-3.4/mimetypes/application/x-afm.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-afm.desktop 2005-01-20 23:24:16.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-afm.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=PostScript Font Metrics
++Comment[af]=PostScript Skrif tipe Afmetings
+ Comment[ar]=قياسات خط بوستسكريبت
+ Comment[az]=PostScript Yazı Növü Metrikləri
+ Comment[be]=Мэтрыкі шрыфту PostScript
+@@ -56,7 +57,6 @@
+ Comment[tr]=PostScript Yazıtipi Ölçütleri
+ Comment[uk]=Метрика шрифту PostScript
+ Comment[wa]=Metrikes di fonte PostScript
+-Comment[xx]=xxPostScript Font Metricsxx
+ Comment[zh_CN]=PostScript 字型
+ Comment[zh_TW]=PostScript 字體 Merics
+ Icon=font_type1
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-amipro.desktop kdelibs-branch-3.4/mimetypes/application/x-amipro.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-amipro.desktop 2005-01-20 23:24:16.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-amipro.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -70,7 +70,6 @@
+ Comment[ven]=Manwalwa a Lotus AmiPro
+ Comment[wa]=Documint Lotus AmiPro
+ Comment[xh]=Uxwebhu lwe Lotus AmiPro
+-Comment[xx]=xxLotus AmiPro Documentxx
+ Comment[zh_CN]=Lotus AmiPro 文档
+ Comment[zh_TW]=Lotus AmiPro 文件
+ Comment[zu]=Uhlu lwamafayela lwe-Lotus AmiPro
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-applixgraphics.desktop kdelibs-branch-3.4/mimetypes/application/x-applixgraphics.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-applixgraphics.desktop 2005-01-20 23:24:16.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-applixgraphics.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -70,7 +70,6 @@
+ Comment[ven]=Manwalwa a Applix Graphics
+ Comment[wa]=Documint grafike Applix
+ Comment[xh]=Uxwebhu Lwemizobo ye Applix
+-Comment[xx]=xxApplix Graphics Documentxx
+ Comment[zh_CN]=Applix 图形文档
+ Comment[zh_TW]=Applix 影像文件
+ Comment[zu]=Uhlu lwamafayela Lwemidwebo ye-Applix
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-applixspread.desktop kdelibs-branch-3.4/mimetypes/application/x-applixspread.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-applixspread.desktop 2005-01-27 23:03:18.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-applixspread.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -70,7 +70,6 @@
+ Comment[ven]=Manwalwa a Applix Spreadsheets
+ Comment[wa]=Documint tåvleu Applix
+ Comment[xh]=Uxwebhu lwe Applix Spreadsheets
+-Comment[xx]=xxApplix Spreadsheets Documentxx
+ Comment[zh_CN]=Applix 电子表格文档
+ Comment[zh_TW]=Applix 電子表格文件
+ Comment[zu]=Uhlu lwamafayela Lwamapheshana anwebekayo e-Applix
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-applixword.desktop kdelibs-branch-3.4/mimetypes/application/x-applixword.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-applixword.desktop 2005-01-20 23:24:16.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-applixword.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -70,7 +70,6 @@
+ Comment[ven]=Manwalwa a maipfi a Applix
+ Comment[wa]=Documint tecse Applix
+ Comment[xh]=Uxwebhu Lwamagama lwe Applix
+-Comment[xx]=xxApplix Words Documentxx
+ Comment[zh_CN]=Applix 文字处理文档
+ Comment[zh_TW]=Applix 文書處理文件
+ Comment[zu]=Uhlu lwamafayela Lamagama lwe-Applix
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-arc.desktop kdelibs-branch-3.4/mimetypes/application/x-arc.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-arc.desktop 2005-01-20 23:24:16.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-arc.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=tgz
+ Patterns=*.arc;*.ARC;
+ Comment=ARC Archive
++Comment[af]=ARC Argief
+ Comment[ar]=أرشيف ARC
+ Comment[az]=ARC Arxivi
+ Comment[be]=Архіў ARC
+@@ -64,6 +65,5 @@
+ Comment[uk]=Архів ARC
+ Comment[uz]=ARC архиви
+ Comment[wa]=Årtchive ARC
+-Comment[xx]=xxARC Archivexx
+ Comment[zh_CN]=ARC 归档
+ Comment[zh_TW]=ARC 壓縮檔案
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-archive.desktop kdelibs-branch-3.4/mimetypes/application/x-archive.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-archive.desktop 2005-01-20 23:24:16.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-archive.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -66,7 +66,6 @@
+ Comment[ven]=Fhethu huno vhulungwa hone zwithu zwa kale ha Ar
+ Comment[wa]=Årtchive «ar»
+ Comment[xh]=Ar Indawo yokugcina
+-Comment[xx]=xxAr Archivexx
+ Comment[zh_CN]=Ar 归档
+ Comment[zh_TW]=Ar 壓縮文件
+ Comment[zu]=Umqulu we-Ar
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-arj.desktop kdelibs-branch-3.4/mimetypes/application/x-arj.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-arj.desktop 2005-01-20 23:24:16.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-arj.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -70,7 +70,6 @@
+ Comment[ven]=Fhethu huno vhulungwa hone zwithu zwa kale ha ARJ
+ Comment[wa]=Årtchive ARJ
+ Comment[xh]=ARJ Indawo yokugcina
+-Comment[xx]=xxARJ Archivexx
+ Comment[zh_CN]=ARJ 归档
+ Comment[zh_TW]=ARJ 壓縮檔案
+ Comment[zu]=Umqulu we-ARJ
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-awk.desktop kdelibs-branch-3.4/mimetypes/application/x-awk.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-awk.desktop 2005-02-21 04:17:21.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-awk.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -66,7 +66,6 @@
+ Comment[ven]=Bammbiri la AWK
+ Comment[wa]=Sicripe AWK
+ Comment[xh]=Ushicilelo phantsi lwe AWK
+-Comment[xx]=xxAWK Scriptxx
+ Comment[zh_CN]=AWK 脚本
+ Comment[zh_TW]=AWK 程式
+ Comment[zu]=Isikripti se-AWK
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-bittorrent.desktop kdelibs-branch-3.4/mimetypes/application/x-bittorrent.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-bittorrent.desktop 2004-12-29 12:52:10.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-bittorrent.desktop 2005-03-10 11:04:54.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=BitTorrent Download
++Comment[af]=BitTorrent Aflaai
+ Comment[ar]=ملف تنزيل BitTorrent
+ Comment[az]=BitTorrent Faylı
+ Comment[bg]=Изтеглен файл на BitTorrent
+@@ -53,7 +54,6 @@
+ Comment[uk]=Звантаження BitTorrent
+ Comment[uz]=BitTorrent олиш
+ Comment[wa]=Aberwetaedje avou BitTorrent
+-Comment[xx]=xxBitTorrent Downloadxx
+ Comment[zh_CN]=BitTorrent 下载
+ Comment[zh_TW]=BitTorrent 下載
+ Hidden=false
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-bz2dvi.desktop kdelibs-branch-3.4/mimetypes/application/x-bz2dvi.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-bz2dvi.desktop 2005-02-23 00:04:55.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-bz2dvi.desktop 2005-03-30 01:47:22.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=Bzip2 Compressed DVI File
++Comment[af]=Bzip2 gekompakteerde DVI Lêer
+ Comment[bg]=Компресиран файл DVI с bzip2
+ Comment[bn]=বি-জিপ-২ (Bzip2) কম্প্রেসকৃত ডি-ভি-আই ফাইল
+ Comment[br]=Restr DVI moustret gant bzip2
+@@ -9,6 +10,7 @@
+ Comment[cs]=DVI soubor komprimovaný BZIP2
+ Comment[da]=Bzip2-komprimeret DVI-fil
+ Comment[de]=Bzip2-komprimierte DVI-Datei
++Comment[el]=Αρχείο DVI συμπιεσμένο με bzip2
+ Comment[es]=Archivo DVI comprimido con Bzip2
+ Comment[et]=Bzip2 tihendusega DVI fail
+ Comment[eu]=Bzip2-ek konprimitutako DVI fitxategia
+@@ -16,6 +18,7 @@
+ Comment[fr]=Fichier DVI compacté avec Bzip2
+ Comment[fy]=Bzip2 komprimeard DVI Triem
+ Comment[ga]=Comhad DVI comhbhrúite le bzip2
++Comment[he]=קובץ DVI דחוס באמצעות Bzip2
+ Comment[hi]=बीजिप2 संपीडित डीवीआई फ़ाइल
+ Comment[hu]=Bzip2-vel tömörített DVI-fájl
+ Comment[is]=Bzip2 þjöppuð DVI skrá
+@@ -38,14 +41,13 @@
+ Comment[sk]=Komprimovaný súbor DVI pomocou bzip2
+ Comment[sl]=Datoteka DVI, stisnjena s bzip2
+ Comment[sr]=Bzip2 компресовани DVI фајл
+-Comment[sr@Latn]=Bzip2 компресовани DVI фајл
++Comment[sr@Latn]=Bzip2 kompresovani DVI fajl
+ Comment[sv]=Bzip2-komprimerad DVI-fil
+ Comment[ta]=Bzip2 அழுத்திய DVI கோப்பு
+ Comment[tg]=Bzip2 Файли DVI фушурдашуда
+ Comment[tr]=Bzip2 Sıkıştırılmış DVI Dosyası
+ Comment[uk]=Файл DVI, стиснутий bzip2
+ Comment[uz]=Bzip2 билан қисилган DVI-файли
+-Comment[xx]=xxBzip2 Compressed DVI Filexx
+ Comment[zh_CN]=Bzip2 压缩的 DVI 文件
+ Hidden=false
+ Icon=tgz
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-bzip.desktop kdelibs-branch-3.4/mimetypes/application/x-bzip.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-bzip.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-bzip.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -67,7 +67,6 @@
+ Comment[ven]=Faela ya Bzip
+ Comment[wa]=Fitchî bzip
+ Comment[xh]=Ifayile ye Bzip
+-Comment[xx]=xxBzip Filexx
+ Comment[zh_CN]=Bzip 文件
+ Comment[zh_TW]=Bzip 檔案
+ Comment[zu]=Ifayela le-Bzip
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-bzip2.desktop kdelibs-branch-3.4/mimetypes/application/x-bzip2.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-bzip2.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-bzip2.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -67,7 +67,6 @@
+ Comment[ven]=Faela ya Bzip2
+ Comment[wa]=Fitchî bzip2
+ Comment[xh]=Ifayile ye Bzip2
+-Comment[xx]=xxBzip2 Filexx
+ Comment[zh_CN]=Bzip2 文件
+ Comment[zh_TW]=Bzip2 檔案
+ Comment[zu]=Ifayela le-Bzip2
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-cda.desktop kdelibs-branch-3.4/mimetypes/application/x-cda.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-cda.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-cda.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -59,7 +59,6 @@
+ Comment[uz]=Аудио компакт-диск
+ Comment[ven]=Zwinopfiwa zwa CD
+ Comment[wa]=CD odio
+-Comment[xx]=xxCD Audioxx
+ Comment[zh_CN]=CD 音频
+ Comment[zh_TW]=CD 音效
+ Comment[zu]=Umsindo we-CD
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-compress.desktop kdelibs-branch-3.4/mimetypes/application/x-compress.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-compress.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-compress.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -68,7 +68,6 @@
+ Comment[uz]=UNIX қисилган файли
+ Comment[ven]=Faela yo tsikeledzwaho ya UNIX
+ Comment[xh]=Ifayile Edityaniswe ndawonye ye UNIX
+-Comment[xx]=xxUNIX Compressed Filexx
+ Comment[zh_CN]=UNIX 压缩文件
+ Comment[zh_TW]=UNIX 壓縮檔案
+ Comment[zu]=Ifayela Elicindezelwe lwe-Unix
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-core.desktop kdelibs-branch-3.4/mimetypes/application/x-core.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-core.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-core.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -67,7 +67,6 @@
+ Comment[uz]=Дастурдаги носозликлар ҳақида маълумот
+ Comment[ven]=Data ya mbekanyamushumo yo kwashekanaho
+ Comment[xh]=Data Yongqubano lodweliso lwenkqubo
+-Comment[xx]=xxProgram Crash Dataxx
+ Comment[zh_CN]=程序崩溃数据
+ Comment[zh_TW]=程式 crash 資料
+ Comment[zu]=Idata Yohlelo lwendlela Ephahlazekile
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-cpio.desktop kdelibs-branch-3.4/mimetypes/application/x-cpio.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-cpio.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-cpio.desktop 2005-03-07 09:13:37.000000000 -0500
+@@ -70,7 +70,6 @@
+ Comment[ven]=Fhethu hau vhulunga hone zwithu zwa kale ha CPIO
+ Comment[wa]=Årtchive cpio
+ Comment[xh]=Indawo yokugcina ye CPIO
+-Comment[xx]=xxCPIO Archivexx
+ Comment[zh_CN]=CPIO 归档
+ Comment[zh_TW]=CPIO 壓縮檔案
+ Comment[zu]=Umqulu we-CPIO
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-cue.desktop kdelibs-branch-3.4/mimetypes/application/x-cue.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-cue.desktop 2005-02-23 00:04:55.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-cue.desktop 2005-03-10 11:04:55.000000000 -0500
+@@ -4,6 +4,7 @@
+ MimeType=application/x-cue
+ Icon=cdimage
+ Comment=CDRWIN Cue-Sheet
++Comment[af]=CDRWIN Cue-Bladsy
+ Comment[bg]=Документ CDRWIN
+ Comment[bn]=CDRWIN কিউ-শিট
+ Comment[bs]=CDRWIN cue-sheet
+@@ -41,4 +42,3 @@
+ Comment[ta]=CRDWIN முன்னோடித்தாள்
+ Comment[tg]=Феҳристи CDRWIN
+ Comment[uk]=Файл диску CDRWIN
+-Comment[xx]=xxCDRWIN Cue-Sheetxx
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-dbase.desktop kdelibs-branch-3.4/mimetypes/application/x-dbase.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-dbase.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-dbase.desktop 2005-03-10 11:04:55.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=database
+ Patterns=*.dbf;*.DBF;
+ Comment=dBASE Document
++Comment[af]=dBASE Dokument
+ Comment[ar]=مستند dBASE
+ Comment[az]=dBASE Sənədi
+ Comment[be]=Дакумэнт dBASE
+@@ -69,7 +70,6 @@
+ Comment[ven]=Manwalwa a dBASE
+ Comment[wa]=Documint dBASE
+ Comment[xh]=Uxwebhu lwe dBASE
+-Comment[xx]=xxdBASE Documentxx
+ Comment[zh_CN]=dBASE 文档
+ Comment[zh_TW]=dBASE 文件
+ Comment[zu]=Uhlu lwamafayela dBASE
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-deb.desktop kdelibs-branch-3.4/mimetypes/application/x-deb.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-deb.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-deb.desktop 2005-03-10 11:04:55.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=deb
+ Patterns=*.deb;*.DEB;
+ Comment=Debian Package
++Comment[af]=Debian Pakkie
+ Comment[ar]=حزمة ديبيان
+ Comment[az]=Debian Paketi
+ Comment[bg]=Пакет на Дебиан
+@@ -63,6 +64,5 @@
+ Comment[uk]=Пакунок Debian
+ Comment[uz]=Debian пакети
+ Comment[wa]=Fitchî pacaedje Debian
+-Comment[xx]=xxDebian Packagexx
+ Comment[zh_CN]=Debian 包
+ Comment[zh_TW]=Debian 軟體包
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-designer.desktop kdelibs-branch-3.4/mimetypes/application/x-designer.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-designer.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-designer.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -67,7 +67,6 @@
+ Comment[ven]=Faela yau khavhisedza ya Qt
+ Comment[vi]=File Qt Designer
+ Comment[xh]=Ifayile yo Mzobi we Qt
+-Comment[xx]=xxQt Designer Filexx
+ Comment[zh_CN]=Qt Designer 文件
+ Comment[zh_TW]=Qt Designer 檔案
+ Comment[zu]=Ifayela Lomdwebi lwe-Qt
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-desktop.desktop kdelibs-branch-3.4/mimetypes/application/x-desktop.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-desktop.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-desktop.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -64,7 +64,6 @@
+ Comment[ven]=Faela yau lugisela desikithopo
+ Comment[wa]=Fitchî d' apontiaedje pol sicribanne
+ Comment[xh]=Ifayile Yoqwalaselo ye Desktop
+-Comment[xx]=xxDesktop Config Filexx
+ Comment[zh_CN]=桌面配置文件
+ Comment[zh_TW]=桌面設定檔
+ Comment[zu]=Ifayela Lokuhlanganisela Ledesktop
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-dvi.desktop kdelibs-branch-3.4/mimetypes/application/x-dvi.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-dvi.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-dvi.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -63,7 +63,6 @@
+ Comment[ven]=Faela ya di imisaho nga yothe ya maano a TeX
+ Comment[wa]=Fitchî DVI
+ Comment[xh]=Ifayile Ezimeleyo Yecebo le TeX
+-Comment[xx]=xxTeX Device Independent Filexx
+ Comment[zh_CN]=TeX 设备无关文件
+ Comment[zh_TW]=與裝置無關的 Tex 檔案
+ Comment[zu]=Ifayela Lethuluzi lokusebenza Elizimele le-TeX
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-egon.desktop kdelibs-branch-3.4/mimetypes/application/x-egon.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-egon.desktop 2005-01-28 22:58:14.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-egon.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -51,4 +51,3 @@
+ Comment[ven]=Zwipuka zwa Egon
+ Comment[vi]=Hoạt hoạ Egon
+ Comment[xh]=Umphilisi we Egon
+-Comment[xx]=xxEgon Animatorxx
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-executable-script.desktop kdelibs-branch-3.4/mimetypes/application/x-executable-script.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-executable-script.desktop 2005-02-23 00:04:55.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-executable-script.desktop 2005-03-30 01:47:22.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=Script (possibly executable)
++Comment[af]=Skrip (moointlik uitvoerbaar)
+ Comment[bg]=Скрипт (вероятно изпълним)
+ Comment[bn]=স্ক্রিপ্ট (সম্ভবত এক্সিকিউটেবল)
+ Comment[bs]=Skripta (možda izvršiva)
+@@ -8,6 +9,7 @@
+ Comment[cs]=Pravděpodobně spustitelný skript
+ Comment[da]=Script der muligvis kan udføres.
+ Comment[de]=Skript (eventuell ausführbar)
++Comment[el]=Αρχείο εντολών κελύφους (πιθανόν εκτελέσιμο)
+ Comment[es]=Procedimiento (probablemente ejecutable)
+ Comment[et]=Käivitatav skript
+ Comment[eu]=Script (exekutagarria seguru aski)
+@@ -15,6 +17,7 @@
+ Comment[fr]=Script (peut-être exécutable)
+ Comment[fy]=Skript (Wierskynlik útfierber)
+ Comment[ga]=Script (b'fhéidir inrite)
++Comment[he]=תסריט (כנראה כניתן להרצה)
+ Comment[hi]=स्क्रिप्ट (संभवतया चलाने योग्य)
+ Comment[hu]=Szkript (általában futtatható)
+ Comment[is]=Skeljaforrit (sem er ef til vill keyranlegt)
+@@ -37,14 +40,13 @@
+ Comment[sk]=Skript (možno spustiteľný)
+ Comment[sl]=Skript (verjetno izvedljiv)
+ Comment[sr]=Скрипта (можда извршна)
+-Comment[sr@Latn]=Скрипта (можда извршна)
++Comment[sr@Latn]=Skripta (možda izvršna)
+ Comment[sv]=Skript (möjligen körbart)
+ Comment[ta]=சிறுநிரல் (இயக்க முடிந்த)
+ Comment[tg]=Скрипт (мумкин аст, ки ба кор бурда бошад)
+ Comment[tr]=Betik (çalıştırılabilir)
+ Comment[uk]=Скрипт, який, можливо, можна виконати
+ Comment[uz]=Эҳтимол ишга тушириб бўладиган скрипт
+-Comment[xx]=xxScript (possibly executable)xx
+ Comment[zh_CN]=脚本(可能可执行)
+ Icon=exec
+ Type=MimeType
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-executable.desktop kdelibs-branch-3.4/mimetypes/application/x-executable.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-executable.desktop 2004-12-29 12:52:10.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-executable.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -63,7 +63,6 @@
+ Comment[ven]=Faela ino tumulea
+ Comment[wa]=Fitchî enondåve
+ Comment[xh]=Ifayile Ephumezekayo
+-Comment[xx]=xxExecutable Filexx
+ Comment[zh_CN]=可执行文件
+ Comment[zh_TW]=可執行檔
+ Comment[zu]=Ifayela Eliphumelelisekayo
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-font-bdf.desktop kdelibs-branch-3.4/mimetypes/application/x-font-bdf.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-font-bdf.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-font-bdf.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -10,6 +10,7 @@
+ Comment[az]=BDF Bitmap Yazı Növü
+ Comment[bg]=Шрифт BDF Bitmap
+ Comment[bn]=বি-ডি-এফ বিটম্যাপ ফন্ট
++Comment[br]=Nodrezh Bitmap BDF
+ Comment[bs]=BDF bitmap font
+ Comment[ca]=Font bitmap BDF
+ Comment[cs]=Bitmapové písmo BDF
+@@ -67,7 +68,6 @@
+ Comment[ven]=Fontu ya Bitmap BDF
+ Comment[wa]=Fonte bitmap BDF
+ Comment[xh]=Uhlobo lwamagama lwe BDF Bitmap
+-Comment[xx]=xxBDF Bitmap Fontxx
+ Comment[zh_CN]=BDF 位图字体
+ Comment[zh_TW]=BDF 點陣字形
+ Comment[zu]=Uhlobo lwamagama Lwe-Bitmap ye-BDF
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-font-ghostscript.desktop kdelibs-branch-3.4/mimetypes/application/x-font-ghostscript.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-font-ghostscript.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-font-ghostscript.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -68,7 +68,6 @@
+ Comment[ven]=Fontu ya tshikiriputi tsha poso
+ Comment[wa]=Fonte Ghostscript
+ Comment[xh]=Uhlobo lwamagama lwe Ghostscript
+-Comment[xx]=xxGhostscript Fontxx
+ Comment[zh_CN]=Ghostscript 字体
+ Comment[zh_TW]=Ghostscript 字形
+ Comment[zu]=Uhlobo lwamagama lwama-Ghostscripts
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-font-otf.desktop kdelibs-branch-3.4/mimetypes/application/x-font-otf.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-font-otf.desktop 2004-12-29 12:52:10.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-font-otf.desktop 2005-03-10 11:04:55.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=OpenType Font
++Comment[af]=OpenType Skrif tipe
+ Comment[ar]=خط OpenType
+ Comment[az]=OpenType Yazı Növü
+ Comment[be]=Шрыфт OpenType
+@@ -60,7 +61,6 @@
+ Comment[uk]=Шрифт OpenType
+ Comment[uz]=OpenType шрифти
+ Comment[wa]=Fonte OpenType
+-Comment[xx]=xxOpenType Fontxx
+ Comment[zh_CN]=OpenType 字体
+ Comment[zh_TW]=OpenType 字型
+ Icon=font_truetype
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-font-pcf.desktop kdelibs-branch-3.4/mimetypes/application/x-font-pcf.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-font-pcf.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-font-pcf.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -10,6 +10,7 @@
+ Comment[az]=PCF Bitmap Yazı Növü
+ Comment[bg]=Шрифт PCF
+ Comment[bn]=পি-সি-এফ (PCF) বিটম্যাপ ফন্ট
++Comment[br]=Nodrezh Bitmap PCF
+ Comment[bs]=PCF bitmap font
+ Comment[ca]=Font bitmap PCF
+ Comment[cs]=Bitmapové písmo PCF
+@@ -67,7 +68,6 @@
+ Comment[ven]=Vhuhulu ha mafhungo ha Bitmap ya PCF
+ Comment[wa]=Fonte bitmap PCF
+ Comment[xh]=Uhlobo lwamagama lwe PCF Bitmap
+-Comment[xx]=xxPCF Bitmap Fontxx
+ Comment[zh_CN]=PCF 位图字体
+ Comment[zh_TW]=PCF 點陣字形
+ Comment[zu]=Uhlobo lwamagama lwe-Bitmap ye-PCF
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-font-snf.desktop kdelibs-branch-3.4/mimetypes/application/x-font-snf.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-font-snf.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-font-snf.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -10,6 +10,7 @@
+ Comment[az]=SNF Bitmap Yazı Növü
+ Comment[bg]=Шрифт SNF Bitmap
+ Comment[bn]=SNF বিটম্যাপ ফন্ট
++Comment[br]=Nodrezh Bitmap SNF
+ Comment[bs]=SNF bitmap font
+ Comment[ca]=Font bitmap SNF
+ Comment[cs]=Bitmapové písmo SNF
+@@ -67,7 +68,6 @@
+ Comment[ven]=Fontu ya Bitmap ya SNF
+ Comment[wa]=Fonte bitmap SNF
+ Comment[xh]=Uhlobo lwamagama lwe SNF Bitmap
+-Comment[xx]=xxSNF Bitmap Fontxx
+ Comment[zh_CN]=SNF 位图字体
+ Comment[zh_TW]=SNF 點陣字形
+ Comment[zu]=Uhlobo lwamagama lwe-Bitmap ye-SNF
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-font-speedo.desktop kdelibs-branch-3.4/mimetypes/application/x-font-speedo.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-font-speedo.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-font-speedo.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -68,7 +68,6 @@
+ Comment[ven]=Fontu ya luvhilo
+ Comment[wa]=Fonte Speedo
+ Comment[xh]=Uhlobo lwamagama lwe Speedo
+-Comment[xx]=xxSpeedo Fontxx
+ Comment[zh_CN]=Speedo 字体
+ Comment[zh_TW]=Speedo 字形
+ Comment[zu]=Uhlobo lwamagama lwe-Speedo
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-font-ttc.desktop kdelibs-branch-3.4/mimetypes/application/x-font-ttc.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-font-ttc.desktop 2004-12-29 12:52:10.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-font-ttc.desktop 2005-03-10 11:04:55.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=TrueType Font Collection
++Comment[af]=Truetype Skrif Versameling
+ Comment[ar]=مجموعة خطوط TrueType
+ Comment[az]=TrueType Yazı Növü Kolleksiyası
+ Comment[be]=Калекцыя шрыфтоў TrueType
+@@ -59,7 +60,6 @@
+ Comment[uk]=Колекція шрифтів Truetype
+ Comment[uz]=TrueType шрифт тўплами
+ Comment[wa]=Ramexhnêye di fontes TrueType
+-Comment[xx]=xxTrueType Font Collectionxx
+ Comment[zh_CN]=Truetype 字体集合
+ Comment[zh_TW]=Truetype 字型集合
+ Icon=font_truetype
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-font-ttf.desktop kdelibs-branch-3.4/mimetypes/application/x-font-ttf.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-font-ttf.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-font-ttf.desktop 2005-03-10 11:04:55.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=TrueType Font
++Comment[af]=Truetype Skrif tipe
+ Comment[ar]=خط TrueType
+ Comment[az]=TrueType Yazı Növü
+ Comment[be]=Шрыфт TrueType
+@@ -60,7 +61,6 @@
+ Comment[uk]=Шрифт TrueType
+ Comment[uz]=TrueType шрифти
+ Comment[wa]=Fonte TrueType
+-Comment[xx]=xxTrueType Fontxx
+ Comment[zh_CN]=TrueType 字体
+ Comment[zh_TW]=Truetype 字型
+ Icon=font_truetype
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-font-type1.desktop kdelibs-branch-3.4/mimetypes/application/x-font-type1.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-font-type1.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-font-type1.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -69,7 +69,6 @@
+ Comment[ven]=Fontu ya lushaka lwau thoma ya tshikiriputi tsha poso
+ Comment[wa]=Fonte PostScript Type1
+ Comment[xh]=Uhlobo lwamagama lwe PostScritp Type1
+-Comment[xx]=xxPostScript Type1 Fontxx
+ Comment[zh_CN]=PostScript Type1 字体
+ Comment[zh_TW]=PostScript Type1 字形
+ Comment[zu]=Uhlobo lwamagama 1 lwe-PostScript Esidlulile Sohlobo
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-gettext.desktop kdelibs-branch-3.4/mimetypes/application/x-gettext.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-gettext.desktop 2005-02-06 23:54:44.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-gettext.desktop 2005-03-10 11:04:55.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=GNU Gettext Message Catalog
++Comment[af]=GNU Gettext Boodskap Katalogus
+ Comment[ar]=ملف ترجمة
+ Comment[az]=GNU Gettext İsmarış Kataloqu
+ Comment[bg]=Съобщения за превод (GNU Gettext)
+@@ -58,7 +59,6 @@
+ Comment[uk]=Каталог повідомлень GNU Gettext
+ Comment[uz]=GNU Gettext хабарлар каталоги
+ Comment[wa]=Catalogue di messaedjes po GNU gettext
+-Comment[xx]=xxGNU Gettext Message Catalogxx
+ Comment[zh_CN]=GNU Gettext 消息编目
+ Comment[zh_TW]=GNU Gettext 訊息型錄
+ Icon=gettext
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-gnumeric.desktop kdelibs-branch-3.4/mimetypes/application/x-gnumeric.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-gnumeric.desktop 2005-01-27 23:03:18.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-gnumeric.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -68,7 +68,6 @@
+ Comment[uz]=GNUmeric электрон жадвали
+ Comment[ven]=U phadaladza ha siatari ha GNUmeric
+ Comment[wa]=Documint tåvleu GNUmeric
+-Comment[xx]=xxGNUmeric Spreadsheetxx
+ Comment[zh_CN]=GNUmeric 电子表格
+ Comment[zh_TW]=GNUmeric 試算表
+ Comment[zu]=Iphephashana elinwebekayo le-GNUmeric
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-graphite.desktop kdelibs-branch-3.4/mimetypes/application/x-graphite.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-graphite.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-graphite.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -66,7 +66,6 @@
+ Comment[ven]=Girafaiti - Girafu ya zwa dzi santsi
+ Comment[wa]=Grafikes syintifikes di Graphite
+ Comment[xh]=Imizobo Yobunzulu Lwazi ye Graphite
+-Comment[xx]=xxGraphite Scientific Graphxx
+ Comment[zh_CN]=Graphite 科学图表
+ Comment[zh_TW]=Graphite - 科學繪圖
+ Comment[zu]=Umdwebo Wezesayensi Womdwebo
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-gzdvi.desktop kdelibs-branch-3.4/mimetypes/application/x-gzdvi.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-gzdvi.desktop 2005-02-23 00:04:55.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-gzdvi.desktop 2005-03-30 01:47:22.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=Gzip Compressed DVI File
++Comment[af]=Gzip Gekompakteerde DVI Lêer
+ Comment[bg]=Компресиран файл DVI с gzip
+ Comment[bn]=জি-জিপকৃত (gzipped) ডি-ভি-আই ফাইল
+ Comment[br]=Restr DVI moustret gant gzip
+@@ -9,6 +10,7 @@
+ Comment[cs]=DVI soubor komprimovaný GZIP
+ Comment[da]=Gzip-komprimeret DVI-fil
+ Comment[de]=Gzip-komprimierte DVI-Datei
++Comment[el]=Αρχείο DVI συμπιεσμένο με gzip
+ Comment[es]=Archivo DVI comprimido con Gzip
+ Comment[et]=Gzip tihendusega DVI fail
+ Comment[eu]=Gzip-ek konprimitutako DVI fitxategia
+@@ -16,6 +18,7 @@
+ Comment[fr]=Fichier DVI compacté avec Gzip
+ Comment[fy]=Gzip komprimeard DVI Triem
+ Comment[ga]=Comhad DVI comhbhrúite le gzip
++Comment[he]=קובץ DVI דחוס של באמצעות Gzip
+ Comment[hi]=गजिप संपीडित डीवीआई फ़ाइल
+ Comment[hu]=Gzippel tömörített DVI-fájl
+ Comment[is]=Gzip þjöppuð DVI skrá
+@@ -38,14 +41,13 @@
+ Comment[sk]=Komprimovaný súbor DVI pomocou gzip
+ Comment[sl]=Datoteka DVI, stisnjena s gzip-om
+ Comment[sr]=Gzip компресовани DVI фајл
+-Comment[sr@Latn]=Gzip компресовани DVI фајл
++Comment[sr@Latn]=Gzip kompresovani DVI fajl
+ Comment[sv]=Gzip-komprimerad DVI-fil
+ Comment[ta]=Gzip அழுத்திய கோப்பு
+ Comment[tg]=Gzip Файли DVI фушурдашуда
+ Comment[tr]=Gzip Sıkıştırılmış DVI Dosyası
+ Comment[uk]=Файл DVI, стиснутий gzip
+ Comment[uz]=Gzip билан қисилган DVI-файли
+-Comment[xx]=xxGzip Compressed DVI Filexx
+ Comment[zh_CN]=Gzip 压缩的 DVI 文件
+ Hidden=false
+ Icon=tgz
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-gzip.desktop kdelibs-branch-3.4/mimetypes/application/x-gzip.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-gzip.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-gzip.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -67,7 +67,6 @@
+ Comment[ven]=Faela ya Gzip
+ Comment[wa]=Fitchî gzip
+ Comment[xh]=Ifayile ye Gzip
+-Comment[xx]=xxGzip Filexx
+ Comment[zh_CN]=Gzip 文件
+ Comment[zh_TW]=Gzip 檔案
+ Comment[zu]=Ifayela le-Gzip
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-gzpostscript.desktop kdelibs-branch-3.4/mimetypes/application/x-gzpostscript.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-gzpostscript.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-gzpostscript.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -64,7 +64,6 @@
+ Comment[ven]=Faela ya tshikiriputi tsha poso ya Gzipped
+ Comment[wa]=Fitchî Postscript gzip-rastrindou
+ Comment[xh]=Ifayile ye PostScript Gzipped
+-Comment[xx]=xxGzipped PostScript Filexx
+ Comment[zh_CN]=Gzip 压缩的 Postscript 文件
+ Comment[zh_TW]=Gzip 壓縮的 Postscript 檔案
+ Comment[zu]=Ifayela le-PostScript ye-Gzipped
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-hancomword.desktop kdelibs-branch-3.4/mimetypes/application/x-hancomword.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-hancomword.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-hancomword.desktop 2005-03-10 11:04:55.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=wordprocessing
+ Patterns=*.hwp;*.HWP;
+ Comment=HancomWord Document
++Comment[af]=HancomWord Dokument
+ Comment[ar]=مستند هانكوم وورد
+ Comment[az]=HancomWord Sənədi
+ Comment[be]=Дакумэнт HancomWord
+@@ -67,7 +68,6 @@
+ Comment[ven]=Manwalwa a fhungo la Hamcon
+ Comment[wa]=Documint HancomWord
+ Comment[xh]=Uxwebhu lwe HancomWord
+-Comment[xx]=xxHancomWord Documentxx
+ Comment[zh_CN]=HancomWord 文档
+ Comment[zh_TW]=HancomWord 文件
+ Comment[zu]=Uhlu lwamafayela lwe-HancomWord
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-ica.desktop kdelibs-branch-3.4/mimetypes/application/x-ica.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-ica.desktop 2005-02-23 00:04:55.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-ica.desktop 2005-03-16 03:32:31.000000000 -0500
+@@ -2,8 +2,10 @@
+ Encoding=UTF-8
+ MimeType=application/x-ica
+ Comment=Citrix ICA Client Configuration
++Comment[af]=Citrix ICA Klient Opstelling
+ Comment[bg]=Конфигурация на клиент Citrix ICA
+ Comment[bn]=সাইট্রিক্স ICA ক্লায়েন্ট কনফিগারেশন
++Comment[br]=Kefluniadur ar c'hliant Citrix ICA
+ Comment[bs]=Citrix ICA Client postavke
+ Comment[ca]=Configuració de client Citrix ICA
+ Comment[cs]=Nastavení Citrix ICA klienta
+@@ -41,13 +43,12 @@
+ Comment[sk]=Konfigurácia klienta Citrix ICA
+ Comment[sl]=Nastavitve vmesnika Citrix ICA
+ Comment[sr]=Подешавање Citrix-овог ICA клијента
+-Comment[sr@Latn]=Подешавање Citrix-овог ICA клијента
++Comment[sr@Latn]=Podešavanje Citrix-ovog ICA klijenta
+ Comment[sv]=Citrix ICA-klientanpassning
+ Comment[ta]=Citrix ICA உறுப்பினம் வடிவமைப்பு
+ Comment[tg]=Танзимоти коргири Citrix ICA
+ Comment[tr]=Citrix ICA Yapılandırması
+ Comment[uk]=Конфігурація клієнта Citrix ICA
+-Comment[xx]=xxCitrix ICA Client Configurationxx
+ Comment[zh_CN]=Citrix ICA 客户配置
+ Icon=wordprocessing
+ Type=MimeType
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-iso.desktop kdelibs-branch-3.4/mimetypes/application/x-iso.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-iso.desktop 2005-02-23 00:04:56.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-iso.desktop 2005-03-30 01:47:22.000000000 -0500
+@@ -4,6 +4,7 @@
+ MimeType=application/x-iso
+ Icon=cdtrack
+ Comment=ISO9660 Image File
++Comment[af]=ISO9660 CD-Beeld Leêr
+ Comment[be]=Файл вобразу ISO9660
+ Comment[bg]=Файл снимка ISO9660
+ Comment[bn]=ISO9660 ইমেজ ফাইল
+@@ -13,12 +14,14 @@
+ Comment[cs]=Soubor s ISO9660 obrazem
+ Comment[da]=ISO9660 billedfil
+ Comment[de]=ISO9660-Bilddatei
++Comment[el]=Αρχείο εικόνας ISO9660
+ Comment[es]=Archivo de imagen ISO9660
+ Comment[et]=ISO9660 tõmmisefail
+ Comment[eu]=ISO9660 irudi fitxategia
+ Comment[fi]=ISO9660 binäärikuva
+ Comment[fr]=Fichier image ISO9660
+ Comment[fy]=ISO9660 ôfbylding Triem
++Comment[he]=קובץ מראה של ISO9660
+ Comment[hi]=आईएसओ9660 इमेज़ फ़ाइल
+ Comment[hu]=ISO9660-képmásfájl
+ Comment[is]=ISO9660 diskmynd
+@@ -41,12 +44,11 @@
+ Comment[sk]=Obraz disku ISO9660
+ Comment[sl]=Podoba plošče ISO9660
+ Comment[sr]=Фајл ISO9660 слике
+-Comment[sr@Latn]=Фајл ISO9660 слике
++Comment[sr@Latn]=Fajl ISO9660 slike
+ Comment[sv]=ISO9660-avbildsfil
+ Comment[ta]=ISO9660 பிம்பக் கோப்பு
+ Comment[tg]=Файли тасвири ISO9660
+ Comment[tr]=ISO9660 Resim Dosyası
+ Comment[uk]=Файл штампа ISO9660
+ Comment[uz]=ISO9660-тасвир файли
+-Comment[xx]=xxISO9660 Image Filexx
+ Comment[zh_CN]=ISO9660 映像文件
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-jar.desktop kdelibs-branch-3.4/mimetypes/application/x-jar.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-jar.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-jar.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -75,7 +75,6 @@
+ Comment[vi]=Nén Java
+ Comment[wa]=Årtchive Java
+ Comment[xh]=Indawo efihlakeleyo ye Java
+-Comment[xx]=xxJava Archivexx
+ Comment[zh_CN]=Java 归档
+ Comment[zh_TW]=Java 壓縮檔案
+ Comment[zu]=Umqulu we-Java
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-java-applet.desktop kdelibs-branch-3.4/mimetypes/application/x-java-applet.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-java-applet.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-java-applet.desktop 2005-03-10 11:04:55.000000000 -0500
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=MimeType
+ Comment=Java Applet
++Comment[af]=Java Program
+ Comment[ar]=بريمج جافا
+ Comment[az]=Java Appleti
+ Comment[bg]=Аплет на Java
+@@ -55,7 +56,6 @@
+ Comment[uk]=Аплет Java
+ Comment[uz]=Java апплети
+ Comment[wa]=Aplikete Java
+-Comment[xx]=xxJava Appletxx
+ Comment[zh_CN]=Java 小程序
+ MimeType=application/x-java-applet
+ Icon=exec
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-java.desktop kdelibs-branch-3.4/mimetypes/application/x-java.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-java.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-java.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -11,6 +11,7 @@
+ Comment[be]=Кляса Java
+ Comment[bg]=Клас на Java
+ Comment[bn]=জাভা ক্লাস
++Comment[br]=Renkad Java
+ Comment[bs]=Java klasa
+ Comment[ca]=Classe Java
+ Comment[cs]=Java třída
+@@ -72,6 +73,5 @@
+ Comment[vi]=Lớp Java
+ Comment[wa]=Classe Java
+ Comment[xh]=Uhlobo lwe Java
+-Comment[xx]=xxJava Classxx
+ Comment[zh_CN]=Java 类
+ Comment[zu]=Ikilasi lwe-Java
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-javascript.desktop kdelibs-branch-3.4/mimetypes/application/x-javascript.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-javascript.desktop 2005-02-23 00:04:56.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-javascript.desktop 2005-03-30 01:47:22.000000000 -0500
+@@ -4,6 +4,7 @@
+ Icon=Script
+ Patterns=*.js;
+ Comment=JavaScript File
++Comment[af]=JavaScript Lêer
+ Comment[be]=Файл JavaScript
+ Comment[bg]=Изходен код на JavaScript
+ Comment[bn]=জাভাস্ক্রিপ্ট ফাইল
+@@ -13,6 +14,7 @@
+ Comment[cs]=JavaScript soubor
+ Comment[da]=JavaScript-fil
+ Comment[de]=JavaScript-Datei
++Comment[el]=Αρχείο κώδικα JavaScript
+ Comment[eo]=Javskripta dosiero
+ Comment[es]=Archivo JavaScipt
+ Comment[et]=JavaScripti fail
+@@ -44,13 +46,12 @@
+ Comment[sk]=Zdrojový kód JavaScript
+ Comment[sl]=Datoteka JavaScript
+ Comment[sr]=JavaScript фајл
+-Comment[sr@Latn]=JavaScript фајл
++Comment[sr@Latn]=JavaScript fajl
+ Comment[sv]=Javaskript-fil
+ Comment[ta]=ஜாவா மூலக் கோப்பு
+ Comment[tg]=Файли барномавии Java
+ Comment[tr]=JavaScript Dosyası
+ Comment[uk]=Файл JavaScript
+ Comment[uz]=JavaScript-файли
+-Comment[xx]=xxJavaScript Filexx
+ Comment[zh_CN]=JavaScript 文件
+ X-KDE-IsAlso=application/x-executable-script
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-karbon.desktop kdelibs-branch-3.4/mimetypes/application/x-karbon.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-karbon.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-karbon.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -71,7 +71,6 @@
+ Comment[ven]=Manwalwa a Karbon14
+ Comment[wa]=Documint Karbon14
+ Comment[xh]=Uxwebhu lwe Karbon14
+-Comment[xx]=xxKarbon14 Documentxx
+ Comment[zh_CN]=Karbon14 文档
+ Comment[zh_TW]=Karbon14 文件
+ Comment[zu]=Uhlu lwamafayela lwe-Karbon14
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-kchart.desktop kdelibs-branch-3.4/mimetypes/application/x-kchart.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-kchart.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-kchart.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -69,7 +69,6 @@
+ Comment[ven]=Manwalwa a KChart
+ Comment[wa]=Documint KChart
+ Comment[xh]=Uxwebhu lwe KChart
+-Comment[xx]=xxKChart Documentxx
+ Comment[zh_CN]=KChart 文档
+ Comment[zh_TW]=KChart 文件
+ Comment[zu]=Uhlu lwamafayela ye-KChart
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-kcsrc.desktop kdelibs-branch-3.4/mimetypes/application/x-kcsrc.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-kcsrc.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-kcsrc.desktop 2005-03-10 11:04:55.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=colorscm
+ Patterns=*.kcsrc;*.KCSRC
+ Comment=KDE Color Theme
++Comment[af]=KDE Kleur Tema
+ Comment[ar]=سمة الألوان لKDE
+ Comment[az]=KDE Rəng Örtüyü
+ Comment[be]=Тэма колераў KDE
+@@ -64,6 +65,5 @@
+ Comment[uk]=Тема кольорів KDE
+ Comment[uz]=KDE ранг мавзуси
+ Comment[wa]=Tinme di coleurs KDE
+-Comment[xx]=xxKDE Color Themexx
+ Comment[zh_CN]=KDE 色彩主题
+ Comment[zh_TW]=KDE 色彩佈景
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-kde-wallet.desktop kdelibs-branch-3.4/mimetypes/application/x-kde-wallet.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-kde-wallet.desktop 2005-01-04 22:58:39.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-kde-wallet.desktop 2005-03-10 11:04:55.000000000 -0500
+@@ -3,6 +3,7 @@
+ Type=MimeType
+ MimeType=application/x-kde-wallet
+ Comment=KDE Wallet File
++Comment[af]=KDE Beursie Lêer
+ Comment[ar]=ملف محفظة KDE
+ Comment[az]=KDE Wallet Faylı
+ Comment[bg]=Файл на системата Портфейл
+@@ -58,7 +59,6 @@
+ Comment[tr]=KDE Cüzdan Dosyası
+ Comment[uk]=Файл торбинки KDE
+ Comment[uz]=KDE Wallet-файли
+-Comment[xx]=xxKDE Wallet Filexx
+ Comment[zh_CN]=KDE 钱包文件
+ Comment[zh_TW]=KDE 公事包檔案
+ Patterns=*.kwl
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-kformula.desktop kdelibs-branch-3.4/mimetypes/application/x-kformula.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-kformula.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-kformula.desktop 2005-03-10 11:04:55.000000000 -0500
+@@ -5,7 +5,7 @@
+ Icon=kformula_kfo
+ Patterns=*.kfo;
+ Comment=KFormula Document
+-Comment[af]=Kformula Dokument
++Comment[af]=KFormula Dokument
+ Comment[ar]=مستند KFormula
+ Comment[az]=KFormula Sənədi
+ Comment[be]=Дакумэнт KFormula
+@@ -69,7 +69,6 @@
+ Comment[ven]=Manwalwa a tshivhumbeo tsha K
+ Comment[wa]=Documint KFormula
+ Comment[xh]=Uxwebhu lwe KFormula
+-Comment[xx]=xxKFormula Documentxx
+ Comment[zh_CN]=KFormula 文档
+ Comment[zh_TW]=KFormula 文件
+ Comment[zu]=Uhlu lwamafayela ye-KFormula
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-kivio.desktop kdelibs-branch-3.4/mimetypes/application/x-kivio.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-kivio.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-kivio.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -70,7 +70,6 @@
+ Comment[ven]=Manwalwa a Kivio
+ Comment[wa]=Documint Kivio
+ Comment[xh]=Uxwebhu lwe Kivio
+-Comment[xx]=xxKivio Documentxx
+ Comment[zh_CN]=Kivio 文档
+ Comment[zh_TW]=Kivio 文件
+ Comment[zu]=Uhlu lwamafayela lwe-Kivio
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-kontour.desktop kdelibs-branch-3.4/mimetypes/application/x-kontour.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-kontour.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-kontour.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -66,7 +66,6 @@
+ Comment[ven]=Manwalwa a Kontour
+ Comment[wa]=Documint Kontour
+ Comment[xh]=Uxwebhu lwe Kontour
+-Comment[xx]=xxKontour Documentxx
+ Comment[zh_CN]=Kontour 文档
+ Comment[zh_TW]=Kontour 文件
+ Comment[zu]=Uhlu lwamafayela lwe-Kontour
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-kpovmodeler.desktop kdelibs-branch-3.4/mimetypes/application/x-kpovmodeler.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-kpovmodeler.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-kpovmodeler.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -65,7 +65,6 @@
+ Comment[ven]=Faela ya KPovModeler
+ Comment[vi]=File KPovModeler
+ Comment[xh]=Ifayile ye KPovModeler
+-Comment[xx]=xxKPovModeler Filexx
+ Comment[zh_CN]=KPovModeler 文件
+ Comment[zh_TW]=KPovModeler 檔案
+ Comment[zu]=Ifayela le-KPovModeler
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-kpresenter.desktop kdelibs-branch-3.4/mimetypes/application/x-kpresenter.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-kpresenter.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-kpresenter.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -69,7 +69,6 @@
+ Comment[ven]=Manwalwa a Muimeleli wa K
+ Comment[wa]=Documint di prezintaedje KPresenter
+ Comment[xh]=Uxwebhu lwe KPresenter
+-Comment[xx]=xxKPresenter Documentxx
+ Comment[zh_CN]=KPresenter 文档
+ Comment[zh_TW]=KPresenter 文件
+ Comment[zu]=Uhlu lwamafayela lwe-KPresenter
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-krita.desktop kdelibs-branch-3.4/mimetypes/application/x-krita.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-krita.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-krita.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -69,7 +69,6 @@
+ Comment[ven]=Manwalwa a Krita
+ Comment[wa]=Documint Krita
+ Comment[xh]=Uxwebhu lwe Krita
+-Comment[xx]=xxKrita Documentxx
+ Comment[zh_CN]=Krita 文档
+ Comment[zh_TW]=Krita 文件
+ Comment[zu]=Uhlu lwamafayela lwer-Krita
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-kspread.desktop kdelibs-branch-3.4/mimetypes/application/x-kspread.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-kspread.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-kspread.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -69,7 +69,6 @@
+ Comment[ven]=Manwalwa a phathaladzo ya K
+ Comment[wa]=Documint tåvleu KSpread
+ Comment[xh]=Uxwebhu lwe KSpread
+-Comment[xx]=xxKSpread Documentxx
+ Comment[zh_CN]=KSpread 文档
+ Comment[zh_TW]=KSpread 文件
+ Comment[zu]=Uhlu lwamafayela lwe-KSpread
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-kudesigner.desktop kdelibs-branch-3.4/mimetypes/application/x-kudesigner.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-kudesigner.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-kudesigner.desktop 2005-03-10 11:04:55.000000000 -0500
+@@ -3,6 +3,7 @@
+ Encoding=UTF-8
+ MimeType=application/x-kudesigner
+ Comment=Kugar Report Template
++Comment[af]=Kugar Raport Voorbeeld
+ Comment[ar]=قالب تقارير كوغار
+ Comment[az]=Kugar Report Sənədi
+ Comment[be]=Шаблён справаздачы Kugar
+@@ -58,7 +59,6 @@
+ Comment[tr]=Kugar Rapor Şablonu
+ Comment[uk]=Шаблон звіту Kugar
+ Comment[uz]=Kugar ҳисобот намунаси
+-Comment[xx]=xxKugar Report Templatexx
+ Comment[zh_CN]=Kugar 报告模板
+ Comment[zh_TW]=Kugar 報表樣本
+ Icon=kugardata
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-kugar.desktop kdelibs-branch-3.4/mimetypes/application/x-kugar.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-kugar.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-kugar.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -69,7 +69,6 @@
+ Comment[ven]=Data ya faela ya Kugar
+ Comment[vi]=File dữ liệu Kugar
+ Comment[xh]=Ifayile ye Data ye Kugar
+-Comment[xx]=xxKugar Data Filexx
+ Comment[zh_CN]=Kugar 数据文件
+ Comment[zh_TW]=Kugar 資料檔案
+ Comment[zu]=Ifayela Ledata ye-Kugar
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-kword.desktop kdelibs-branch-3.4/mimetypes/application/x-kword.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-kword.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-kword.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -70,7 +70,6 @@
+ Comment[ven]=Manwalwa fhungo la K
+ Comment[wa]=Documint KWord
+ Comment[xh]=Uxwebhu lwe KWord
+-Comment[xx]=xxKWord Documentxx
+ Comment[zh_CN]=KWord 文档
+ Comment[zh_TW]=KWord 文件
+ Comment[zu]=Uhlu lwamafayela lwe-KWord
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-lha.desktop kdelibs-branch-3.4/mimetypes/application/x-lha.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-lha.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-lha.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -66,7 +66,6 @@
+ Comment[ven]=Fhethu hau vhulungela hone zwithu zwa kale ha Lha
+ Comment[wa]=Årtchive LHA
+ Comment[xh]=Lha Indawo yogcino
+-Comment[xx]=xxLha Archivexx
+ Comment[zh_CN]=Lha 归档
+ Comment[zh_TW]=Lha 壓縮檔案
+ Comment[zu]=Umqulu we-Lha
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-linguist.desktop kdelibs-branch-3.4/mimetypes/application/x-linguist.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-linguist.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-linguist.desktop 2005-03-10 11:04:55.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=gettext
+ Patterns=*.ts;
+ Comment=Qt Translation Source File
++Comment[af]=Qt Vertaal Bronlêer
+ Comment[ar]=ملف ترجمة QT مصدري
+ Comment[az]=Qt Tərcümə Mənbəsi Faylı
+ Comment[bg]=Съобщения за превод (Qt)
+@@ -60,6 +61,5 @@
+ Comment[tr]=Qt Çeviri Kaynak Dosyası
+ Comment[uk]=Вихідний файл перекладу зовнішнього вигляду для Qt
+ Comment[uz]=Qt таржима қилишнинг коди
+-Comment[xx]=xxQt Translation Source Filexx
+ Comment[zh_CN]=Qt 翻译源文件
+ Comment[zh_TW]=QT Translation 原始檔案
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-lyx.desktop kdelibs-branch-3.4/mimetypes/application/x-lyx.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-lyx.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-lyx.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -68,7 +68,6 @@
+ Comment[vi]=Tài liệu LYX
+ Comment[wa]=Documint LyX
+ Comment[xh]=Uxwebhu lwe LyX
+-Comment[xx]=xxLyX Documentxx
+ Comment[zh_CN]=LyX 文档
+ Comment[zh_TW]=LyX 文件
+ Comment[zu]=Uhlu lwamafayela lwe-LyX
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-lzop.desktop kdelibs-branch-3.4/mimetypes/application/x-lzop.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-lzop.desktop 2005-02-03 00:06:48.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-lzop.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -73,7 +73,6 @@
+ Comment[ven]=Faela ya Lzopped
+ Comment[vi]=File Lzopped
+ Comment[xh]=Ifayile ye Lzopped
+-Comment[xx]=xxLzopped Filexx
+ Comment[zh_CN]=Lzopped 文件
+ Comment[zh_TW]=Lzopped 檔案
+ Comment[zu]=Ifayela le-Lzopped
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-magicpoint.desktop kdelibs-branch-3.4/mimetypes/application/x-magicpoint.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-magicpoint.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-magicpoint.desktop 2005-03-10 11:04:55.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=presentation
+ Patterns=*.mgp;*.MGP;
+ Comment=MagicPoint Presentation
++Comment[af]=MagicPoint Voorlegging
+ Comment[ar]=مستند MagicPoint
+ Comment[az]=MagicPoint Sənədi
+ Comment[be]=Прэзэнтацыя MagicPoint
+@@ -61,5 +62,4 @@
+ Comment[uk]=Презентація MagicPoint
+ Comment[uz]=MagicPoint намойиши
+ Comment[wa]=Documint di prezintaedje Magicpoint
+-Comment[xx]=xxMagicPoint Presentationxx
+ Comment[zh_CN]=MagicPoint 演示文稿
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-mimearchive.desktop kdelibs-branch-3.4/mimetypes/application/x-mimearchive.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-mimearchive.desktop 2005-02-23 00:04:56.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-mimearchive.desktop 2005-03-27 02:28:47.000000000 -0500
+@@ -6,6 +6,7 @@
+ Patterns=*.mhtml;*.MHTML;*.mht;*.MHT;*.eml;*.EML
+ Comment=Mime Encapsulated Web Archive
+ Comment[bg]=Капсулиран уеб архив
++Comment[bs]=MIME enkapsulirana web arhiva
+ Comment[ca]=Arxiu web encapsulat mime
+ Comment[cs]=Webový archív (MIME)
+ Comment[da]=Mime-indkapslet www-arkiv
+@@ -13,6 +14,7 @@
+ Comment[es]=Archivo web MIME encapsulado
+ Comment[et]=MIME kapselduses veebiarhiiv
+ Comment[eu]=Encaptsulatutako Mime-a duen web fitxategia
++Comment[fi]=Mime pakattu www-paketti
+ Comment[fr]=Archive Web encapsulé MIME
+ Comment[fy]=Mime Ynsletten webargyf
+ Comment[hi]=माइम एनकेप्सुलेटेड वेब अभिलेख
+@@ -33,12 +35,11 @@
+ Comment[sk]=Zabalený webový archív
+ Comment[sl]=MIME za enkapsuliran spletni arhiv
+ Comment[sr]=МИМЕ учаурена веб архива
+-Comment[sr@Latn]=МИМЕ учаурена веб архива
++Comment[sr@Latn]=MIME učaurena veb arhiva
+ Comment[sv]=MIME-inbäddat webbarkiv
+ Comment[ta]=மைம் என்காப்சுலேட்டட் வலை காப்பகம்
+ Comment[tg]=Архиви Веб Tar Фушурдашуда
+ Comment[uk]=Архів Тенет з інформацією про mine
+-Comment[xx]=xxMime Encapsulated Web Archivexx
+ Comment[zh_CN]=MIME 封装的 Web 归档
+
+ [Property::X-KDE-LocalProtocol]
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-msaccess.desktop kdelibs-branch-3.4/mimetypes/application/x-msaccess.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-msaccess.desktop 2004-12-29 12:52:10.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-msaccess.desktop 2005-03-10 11:04:55.000000000 -0500
+@@ -5,11 +5,13 @@
+ Icon=database
+ Patterns=*.mdb;*.MDB;*.mda;*.MDA;*.mde;*.MDE;
+ Comment=Microsoft Access Database
++Comment[af]=Microsoft Access Databasis
+ Comment[ar]=قاعدة بيانات مايكروسوفت أكسيس
+ Comment[az]=Microsoft Access Databeyzi
+ Comment[be]=База дадзеных Microsoft Access
+ Comment[bg]=Документ на Microsoft Access
+ Comment[bn]=মাইক্রোসফট অ্যাকসেস ডেটাবেস
++Comment[br]=Stlennvon Microsoft Access
+ Comment[bs]=Microsoft Access baza podataka
+ Comment[ca]=Base de dades de Microsoft Access
+ Comment[cs]=Databáze Microsoft Access
+@@ -61,6 +63,5 @@
+ Comment[uk]=База даних Microsoft Access
+ Comment[uz]=Microsoft Access маълумот базаси
+ Comment[wa]=Båze di dnêyes Microsoft Access
+-Comment[xx]=xxMicrosoft Access Databasexx
+ Comment[zh_CN]=Microsoft Access 数据库
+ Comment[zh_TW]=Microsoft Access 資料庫
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-msdos-program.desktop kdelibs-branch-3.4/mimetypes/application/x-msdos-program.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-msdos-program.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-msdos-program.desktop 2005-03-10 11:04:55.000000000 -0500
+@@ -1,10 +1,11 @@
+ [KDE Desktop Entry]
+ Comment=Windows Executable
+-Comment[af]=Vensters Uitvoerbare
++Comment[af]=Windows Uitvoerbare
+ Comment[ar]=ملف وندوز تشغيلي
+ Comment[az]=Windows İcraçısı
+ Comment[bg]=Изпълним файл на Windows
+ Comment[bn]=উইন্ডোস এক্সিকিউটেবল
++Comment[br]=Goulev Windows
+ Comment[bs]=Windows izvršna datoteka
+ Comment[ca]=Executable Windows
+ Comment[cs]=Spustitelný soubor z Windows
+@@ -61,7 +62,6 @@
+ Comment[ven]=U tumulea ha dziwindo
+ Comment[wa]=Fitchî enondåve po MS-Windows
+ Comment[xh]=Windows Eziphumezekayo
+-Comment[xx]=xxWindows Executablexx
+ Comment[zh_CN]=Windows 可执行文件
+ Comment[zh_TW]=Windows 可執行檔
+ Comment[zu]=Ama-window Aphumelelanga
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-mswrite.desktop kdelibs-branch-3.4/mimetypes/application/x-mswrite.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-mswrite.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-mswrite.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -69,7 +69,6 @@
+ Comment[ven]=Manwalwa a microsoft au nwala
+ Comment[wa]=Documint Microsoft Write
+ Comment[xh]=Uxwebhhu Lokubhala le Microsoft
+-Comment[xx]=xxMicrosoft Write Documentxx
+ Comment[zh_CN]=Microsoft 书写器文档
+ Comment[zh_TW]=微軟小作家文件
+ Comment[zu]=Uhlu lwamafayela Lokubhala lwe-Microsoft
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-object.desktop kdelibs-branch-3.4/mimetypes/application/x-object.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-object.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-object.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -71,7 +71,6 @@
+ Comment[ven]=Khoudu ya tshithu
+ Comment[vi]=Mã đối tượng
+ Comment[xh]=Ikhowudi yento
+-Comment[xx]=xxObject Codexx
+ Comment[zh_CN]=目标代码
+ Comment[zh_TW]=目標代碼
+ Comment[zu]=Ikhodi Yenhloso
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-ogg.desktop kdelibs-branch-3.4/mimetypes/application/x-ogg.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-ogg.desktop 2005-01-28 22:58:14.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-ogg.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -65,7 +65,6 @@
+ Comment[uz]=Ogg мултимедиа
+ Comment[ven]=Zwavhukwamani ha Ogg
+ Comment[wa]=Fitchî multimedia Ogg
+-Comment[xx]=xxOgg Multimediaxx
+ Comment[zh_CN]=Ogg 多媒体
+ Comment[zh_TW]=Ogg 多媒體
+ Comment[zu]=Onozindaba be-Ogg
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-pak.desktop kdelibs-branch-3.4/mimetypes/application/x-pak.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-pak.desktop 2005-02-23 00:04:57.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-pak.desktop 2005-03-27 02:28:47.000000000 -0500
+@@ -5,9 +5,11 @@
+ Icon=tgz
+ Patterns=*.pak;*.PAK;
+ Comment=PAK File Archive
++Comment[af]=PAK Argief
+ Comment[be]=Архіў PAK
+ Comment[bg]=Архив PAK
+ Comment[bn]=PAK ফাইল আর্কাইভ
++Comment[br]=Restr diell PAK
+ Comment[bs]=PAK arhiva
+ Comment[ca]=Arxiu de fitxers PAK
+ Comment[cs]=Archív souborů PAK
+@@ -19,6 +21,7 @@
+ Comment[fi]=PAK-paketti
+ Comment[fr]=Fichier archive PAK
+ Comment[fy]=PAK Triem Argyf
++Comment[he]=ארכיון PAK
+ Comment[hi]=पीएके फ़ाइल अभिलेख
+ Comment[hu]=PAK-archívum
+ Comment[is]=PAK safnskrá
+@@ -41,12 +44,11 @@
+ Comment[sk]=Archív PAK
+ Comment[sl]=Datotečni arhiv PAK
+ Comment[sr]=Фајл PAK архиве
+-Comment[sr@Latn]=Фајл PAK архиве
++Comment[sr@Latn]=Fajl PAK arhive
+ Comment[sv]=PAK-filarkiv
+ Comment[ta]=PAK கோப்பு காப்பகம்
+ Comment[tg]=Файли архивии PAK
+ Comment[tr]=PAK Dosya Arşivi
+ Comment[uk]=Файл архіву PAK
+ Comment[uz]=PAK архиви
+-Comment[xx]=xxPAK File Archivexx
+ Comment[zh_CN]=PAK 文件归档
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-perl-module.desktop kdelibs-branch-3.4/mimetypes/application/x-perl-module.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-perl-module.desktop 2005-02-23 00:04:57.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-perl-module.desktop 2005-03-30 01:47:22.000000000 -0500
+@@ -4,16 +4,20 @@
+ Comment[bg]=Модул на Perl
+ Comment[bn]=পার্ল মডিউল
+ Comment[br]=Mollad Perl
++Comment[bs]=Perl modul
+ Comment[ca]=Mòdul Perl
+ Comment[cs]=Modul jazyka Perl
+ Comment[da]=Perl-modul
+ Comment[de]=Perl-Modul
++Comment[el]=Άρθρωμα Perl
+ Comment[es]=Módulo Perl
+ Comment[et]=Perli moodul
+ Comment[eu]=PERL modulua
++Comment[fi]=PERL-moduuli
+ Comment[fr]=Module Perl
+ Comment[fy]=Perl-module
+ Comment[ga]=Modúl Perl
++Comment[he]=מודול של Perl
+ Comment[hi]=पर्ल मॉड्यूल
+ Comment[hu]=Perl-modul
+ Comment[is]=Perl eining
+@@ -33,13 +37,12 @@
+ Comment[sk]=Perl modul
+ Comment[sl]=Modul Perl
+ Comment[sr]=Perl модул
+-Comment[sr@Latn]=Perl модул
++Comment[sr@Latn]=Perl modul
+ Comment[sv]=Perl-modul
+ Comment[ta]=Perl கூறு
+ Comment[tg]=Модули Perl
+ Comment[tr]=Perl Modülü
+ Comment[uk]=Модуль мови програмування Perl
+-Comment[xx]=xxPerl Modulexx
+ Comment[zh_CN]=Perl 模块
+ Icon=source_pl
+ Type=MimeType
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-perl.desktop kdelibs-branch-3.4/mimetypes/application/x-perl.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-perl.desktop 2005-02-23 00:04:57.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-perl.desktop 2005-03-30 01:47:22.000000000 -0500
+@@ -4,16 +4,20 @@
+ Comment[bg]=Програма на Perl
+ Comment[bn]=পার্ল প্রোগ্রাম
+ Comment[br]=Goulev Perl
++Comment[bs]=Perl program
+ Comment[ca]=Programa Perl
+ Comment[cs]=Program v jazyce Perl
+ Comment[da]=Perl-program
+ Comment[de]=Perl-Programm
++Comment[el]=Πρόγραμμα Perl
+ Comment[es]=Programa en Perl
+ Comment[et]=Perli rakendus
+ Comment[eu]=PERL programa
++Comment[fi]=PERL-ohjelma
+ Comment[fr]=Programme Perl
+ Comment[fy]=Perl-programma
+ Comment[ga]=Clár Perl
++Comment[he]=תוכנית PERL
+ Comment[hi]=पर्ल प्रोग्राम
+ Comment[hu]=Perl-program
+ Comment[is]=Perl forrit
+@@ -33,13 +37,12 @@
+ Comment[sk]=Perl program
+ Comment[sl]=Program v perlu
+ Comment[sr]=Perl програм
+-Comment[sr@Latn]=Perl програм
++Comment[sr@Latn]=Perl program
+ Comment[sv]=Perl-program
+ Comment[ta]=Perl நிரல்
+ Comment[tg]=Программаи Perl
+ Comment[tr]=Perl Programı
+ Comment[uk]=Програма PERL
+-Comment[xx]=xxPerl Programxx
+ Comment[zh_CN]=Perl 程序
+ Icon=source_pl
+ Type=MimeType
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-php.desktop kdelibs-branch-3.4/mimetypes/application/x-php.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-php.desktop 2005-02-21 04:17:21.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-php.desktop 2005-03-10 11:04:55.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=PHP Script
++Comment[af]=PHP Skrip
+ Comment[ar]=ملف PHP
+ Comment[az]=PHP Skripti
+ Comment[be]=Скрыпт PHP
+@@ -60,7 +61,6 @@
+ Comment[uk]=Скрипт мови програмування PHP
+ Comment[uz]=PHP скрипти
+ Comment[wa]=Sicripe PHP
+-Comment[xx]=xxPHP Scriptxx
+ Comment[zh_CN]=PHP 脚本
+
+ Icon=source_php
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-pkcs12.desktop kdelibs-branch-3.4/mimetypes/application/x-pkcs12.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-pkcs12.desktop 2005-02-23 00:04:57.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-pkcs12.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -62,7 +62,6 @@
+ Comment[uz]=PKCS#12 сертификатлар тўплами
+ Comment[ven]=Nanda ya sethifikheithi tsha PKCS#12
+ Comment[xh]=PKCS#12 Uqokelelo lwe Siqinisekiso
+-Comment[xx]=xxPKCS#12 Certificate Bundlexx
+ Comment[zh_CN]=PKCS#12 证书束
+ Comment[zh_TW]=PKCS#12 認證
+ Comment[zu]=Isigaxa Sezitifiketi se-PKCS#12
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-pw.desktop kdelibs-branch-3.4/mimetypes/application/x-pw.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-pw.desktop 2004-12-29 12:52:10.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-pw.desktop 2005-03-10 11:04:55.000000000 -0500
+@@ -2,11 +2,13 @@
+ Encoding=UTF-8
+ MimeType=application/x-pw
+ Comment=Pathetic Writer Document
++Comment[af]='Pathetic Writer' Dokument
+ Comment[ar]=مستند Pathetic Writer
+ Comment[az]=Pathetic Writer Sənədi
+ Comment[be]=Дакумэнт Pathetic Writer
+ Comment[bg]=Документ на Pathetic Writer
+ Comment[bn]=প্যাথেটিক রাইটার নথী
++Comment[br]=Teul Pathetic Writer
+ Comment[bs]=Pathetic Writer dokument
+ Comment[ca]=Document de Pathetic Writer
+ Comment[cs]=Dokument aplikace Pathetic Writer
+@@ -59,7 +61,6 @@
+ Comment[uk]=Документ Pathetic Writer
+ Comment[uz]=Pathetic Writer ҳужжати
+ Comment[wa]=Documint «Pathetic Writer»
+-Comment[xx]=xxPathetic Writer Documentxx
+ Comment[zh_CN]=Pathetic Writer 文档
+ Comment[zh_TW]=Pathetic Writer 文件
+ Icon=wordprocessing
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-python-bytecode.desktop kdelibs-branch-3.4/mimetypes/application/x-python-bytecode.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-python-bytecode.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-python-bytecode.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -67,7 +67,6 @@
+ Comment[uz]=Python байт-коди
+ Comment[ven]=Python bytecode
+ Comment[wa]=Programe e python (bytecode)
+-Comment[xx]=xxPython Bytecodexx
+ Comment[zh_CN]=Python 字节码
+ Comment[zh_TW]=Python 位元碼
+ Comment[zu]=Ikhodi le-byte le-Python
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-python.desktop kdelibs-branch-3.4/mimetypes/application/x-python.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-python.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-python.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -65,7 +65,6 @@
+ Comment[ven]=Mbekanyamushumo ya Python
+ Comment[wa]=Programe e python
+ Comment[xh]=Udweliso lwenkqubo lwe Python
+-Comment[xx]=xxPython Programxx
+ Comment[zh_CN]=Python 程序
+ Comment[zh_TW]=Python 程式
+ Comment[zu]=Uhlelo lwamafayela lwe-Python
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-quattropro.desktop kdelibs-branch-3.4/mimetypes/application/x-quattropro.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-quattropro.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-quattropro.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -70,7 +70,6 @@
+ Comment[ven]=Faela ya Quattro Pro
+ Comment[wa]=Documint Quattro Pro
+ Comment[xh]=Uxwebhu lwe Quattro Pro
+-Comment[xx]=xxQuattro Pro Documentxx
+ Comment[zh_CN]=Quattro Pro 文件
+ Comment[zh_TW]=Quattro Pro 文件
+ Comment[zu]=Uhlu lwamafayela lwe-Quattro Pro
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-rar.desktop kdelibs-branch-3.4/mimetypes/application/x-rar.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-rar.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-rar.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -70,7 +70,6 @@
+ Comment[ven]=Fhethu ha u vhulunga zwithu zwa kale ha Rar
+ Comment[wa]=Årtchive RAR
+ Comment[xh]=Indawo yogcino ye Rar
+-Comment[xx]=xxRar Archivexx
+ Comment[zh_CN]=Rar 归档
+ Comment[zh_TW]=Rar 壓縮檔案
+ Comment[zu]=Umqulu we-Rar
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-rpm.desktop kdelibs-branch-3.4/mimetypes/application/x-rpm.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-rpm.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-rpm.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -68,7 +68,6 @@
+ Comment[ven]=Faela ya zwiputa zwa RPM
+ Comment[wa]=Fitchî pacaedje RPM
+ Comment[xh]=Ifayile Yempahla ye RPM
+-Comment[xx]=xxRPM Package Filexx
+ Comment[zh_CN]=RPM 包文件
+ Comment[zh_TW]=RPM 套件檔案
+ Comment[zu]=Ifayela Lephakethe le-RPM
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-ruby.desktop kdelibs-branch-3.4/mimetypes/application/x-ruby.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-ruby.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-ruby.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -59,7 +59,6 @@
+ Comment[uk]=Програма на мові програмування Ruby
+ Comment[uz]=Ruby'да тузилган дастур
+ Comment[wa]=Programe Ruby
+-Comment[xx]=xxRuby Programxx
+ Comment[zh_CN]=Ruby 程序
+ Comment[zh_TW]=Ruby 程式
+ # A source_rb icon is missing...
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-sharedlib.desktop kdelibs-branch-3.4/mimetypes/application/x-sharedlib.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-sharedlib.desktop 2005-02-23 00:04:57.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-sharedlib.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -64,7 +64,6 @@
+ Comment[ven]=Laiburari yo kovhiwaho
+ Comment[wa]=Pårteye livreye
+ Comment[xh]=Ilayibrari Eyahluliweyo
+-Comment[xx]=xxShared Libraryxx
+ Comment[zh_CN]=共享库
+ Comment[zh_TW]=共用程式庫
+ Comment[zu]=Umtapo wolwazi Osetshenziswa ngokuhlanganyela
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-shellscript.desktop kdelibs-branch-3.4/mimetypes/application/x-shellscript.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-shellscript.desktop 2005-02-21 04:17:21.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-shellscript.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -64,7 +64,6 @@
+ Comment[ven]=Tshikiriputi tsha shell
+ Comment[wa]=Sicripe shell
+ Comment[xh]=Ushicilelo phantsi Lweqokobhe
+-Comment[xx]=xxShell Scriptxx
+ Comment[zh_CN]=Shell 脚本
+ Comment[zh_TW]=Shell 程式
+ Comment[zu]=Isikripti Segobolondo
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-shockwave-flash.desktop kdelibs-branch-3.4/mimetypes/application/x-shockwave-flash.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-shockwave-flash.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-shockwave-flash.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -47,7 +47,6 @@
+ Comment[uz]=Shockwave Flash медиа-файли
+ Comment[ven]=Lupenyo lwa media lua khamadzaho
+ Comment[vi]=Shockwave Flash
+-Comment[xx]=xxShockwave Flash Mediaxx
+ Comment[zh_CN]=Shockwave Flash 媒体文件
+ Comment[zh_TW]=Shockwave Flash 媒體檔案
+ Comment[zu]=Igagasi lokuthuka le-Flash Media
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-siag.desktop kdelibs-branch-3.4/mimetypes/application/x-siag.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-siag.desktop 2005-01-27 23:03:18.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-siag.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -66,7 +66,6 @@
+ Comment[uz]=Siag электрон жадвали
+ Comment[ven]=U phadaladza ha bammbiri ha Siag
+ Comment[wa]=Documint tåvleu Siag
+-Comment[xx]=xxSiag Spreadsheetxx
+ Comment[zh_CN]=Siag 电子表格
+ Comment[zh_TW]=Siag 電子表格
+ Icon=spreadsheet
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-tar.desktop kdelibs-branch-3.4/mimetypes/application/x-tar.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-tar.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-tar.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -70,7 +70,6 @@
+ Comment[ven]=Fhethu hau vhulungela zwithu zwa kale ha Tar
+ Comment[wa]=Årtchive TAR
+ Comment[xh]=Indawo yogcino ye Tar
+-Comment[xx]=xxTar Archivexx
+ Comment[zh_CN]=Tar 归档
+ Comment[zh_TW]=Tar 壓縮文件
+ Comment[zu]=Umqulu we-Tar
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-tarz.desktop kdelibs-branch-3.4/mimetypes/application/x-tarz.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-tarz.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-tarz.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -70,7 +70,6 @@
+ Comment[vi]=File nén compressed tar
+ Comment[wa]=Årtchive TAR rastrindowe
+ Comment[xh]=Indawo yokugcina ye Tar Edityanisiweyo
+-Comment[xx]=xxCompressed Tar Archivexx
+ Comment[zh_CN]=压缩的 Tar 归档
+ Comment[zh_TW]=壓縮的 Tar 壓縮文件
+ Comment[zu]=Umqulu we-Tar Elicindezelwe
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-tbz.desktop kdelibs-branch-3.4/mimetypes/application/x-tbz.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-tbz.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-tbz.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -65,7 +65,6 @@
+ Comment[ven]=Fhethu hau vhulungela zwithu zwa kale ha Tar ya Bzipped
+ Comment[wa]=Årtchive TAR rastrindowe avou bzip
+ Comment[xh]=Indawo yogcino ye Tar Bzipped
+-Comment[xx]=xxBzipped Tar Archivexx
+ Comment[zh_CN]=Bzip 压缩的 Tar 归档
+ Comment[zh_TW]=Bzip 壓縮的 Tar 壓縮文件
+ Comment[zu]=Umqulu we-Tar lwe-Bzipped
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-tex-gf.desktop kdelibs-branch-3.4/mimetypes/application/x-tex-gf.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-tex-gf.desktop 2005-01-20 23:24:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-tex-gf.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -64,7 +64,6 @@
+ Comment[ven]=Fontu ya vhukuma
+ Comment[wa]=Fonte djenerike
+ Comment[xh]=Uhlobo lwamagama Elisetyenziswa ngumntu wonke
+-Comment[xx]=xxGeneric Fontxx
+ Comment[zh_CN]=普通字体文件
+ Comment[zh_TW]=一般字型檔案
+ Comment[zu]=Uhlobo lwamagama Lawonke wonke
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-tex-pk.desktop kdelibs-branch-3.4/mimetypes/application/x-tex-pk.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-tex-pk.desktop 2005-01-20 23:24:19.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-tex-pk.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -64,7 +64,6 @@
+ Comment[ven]=Fontu yo dzudzanywaho
+ Comment[wa]=Fontes PK po TeX
+ Comment[xh]=Umgca Opakishiweyo
+-Comment[xx]=xxPacked Fontxx
+ Comment[zh_CN]=打包的字体
+ Comment[zh_TW]=壓縮的字型檔案
+ Comment[zu]=Uhlobo lwamafayela Olupakishiwe
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-tgif.desktop kdelibs-branch-3.4/mimetypes/application/x-tgif.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-tgif.desktop 2005-01-20 23:24:19.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-tgif.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -68,7 +68,6 @@
+ Comment[vi]=Tài liệu TGIF
+ Comment[wa]=Documint TGIF
+ Comment[xh]=TGIF Uxwebhu
+-Comment[xx]=xxTGIF Documentxx
+ Comment[zh_CN]=TGIF 文档
+ Comment[zh_TW]=TGIF 文件
+ Comment[zu]=Uhlu lwamafayela lwe-TGIF
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-tgz.desktop kdelibs-branch-3.4/mimetypes/application/x-tgz.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-tgz.desktop 2005-01-20 23:24:19.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-tgz.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -74,7 +74,6 @@
+ Comment[vi]=File nén gzipped tar
+ Comment[wa]=Årtchive TAR rastrindowe avou gzip
+ Comment[xh]=Indawo yogcino ye Gzipped Tar
+-Comment[xx]=xxGzipped Tar Archivexx
+ Comment[zh_CN]=Gzip 压缩的 Tar 归档
+ Comment[zh_TW]=Gzip 壓縮的 Tar 壓縮文件
+ Comment[zu]=Umqulu we-Gzipped Tar
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-trash.desktop kdelibs-branch-3.4/mimetypes/application/x-trash.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-trash.desktop 2005-01-20 23:24:19.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-trash.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -68,7 +68,6 @@
+ Comment[ven]=Faela yau tikedza
+ Comment[wa]=Fitchî copeye di såvrité
+ Comment[xh]=Ifayile Yogcino lwasemva
+-Comment[xx]=xxBackup Filexx
+ Comment[zh_CN]=备份文件
+ Comment[zh_TW]=備份檔案
+ Comment[zu]=Ifayela Lokugcina okwesibili
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-troff-man.desktop kdelibs-branch-3.4/mimetypes/application/x-troff-man.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-troff-man.desktop 2005-01-20 23:24:19.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-troff-man.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -63,7 +63,6 @@
+ Comment[ven]=Manwalwa a Troff a rena siatari la macros
+ Comment[wa]=Documint troff (pådje di man)
+ Comment[xh]=Uxwebhu lwe Troff ene Manpage Macros
+-Comment[xx]=xxTroff Document with Manpage Macrosxx
+ Comment[zh_CN]=带有 Manpage 宏的 Troff 文档
+ Comment[zh_TW]=帶有 Manpage 巨集 Troff 文件
+ Comment[zu]=Faka kuhlu lwamafayela lwe-Troff nge-Manpage Macros
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-troff.desktop kdelibs-branch-3.4/mimetypes/application/x-troff.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-troff.desktop 2005-01-20 23:24:19.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-troff.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -66,7 +66,6 @@
+ Comment[ven]=Manwalwa a Troff
+ Comment[wa]=Documint troff
+ Comment[xh]=Uxwebhu lwe Troff
+-Comment[xx]=xxTroff Documentxx
+ Comment[zh_CN]=Troff 文档
+ Comment[zh_TW]=Troff 文件
+ Comment[zu]=Uhlu lwamafayela lwe-Troff
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-tzo.desktop kdelibs-branch-3.4/mimetypes/application/x-tzo.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-tzo.desktop 2005-01-20 23:24:19.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-tzo.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -71,7 +71,6 @@
+ Comment[vi]=File nén Lzopped Tar
+ Comment[wa]=Årtchive TAR rastrindowe avou lzop
+ Comment[xh]=Ugcino lwasecaleni lwe Tar Lzopped
+-Comment[xx]=xxLzopped Tar Archivexx
+ Comment[zh_CN]=Lzopped 压缩的 Tar 归档
+ Comment[zh_TW]=Lzop 壓縮的 Tar 壓縮文件
+ Comment[zu]=Umquu lwe-Lzopped Tar
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-vnd.kde.kexi.desktop kdelibs-branch-3.4/mimetypes/application/x-vnd.kde.kexi.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-vnd.kde.kexi.desktop 2005-01-25 23:15:07.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-vnd.kde.kexi.desktop 2005-03-10 11:04:55.000000000 -0500
+@@ -6,6 +6,7 @@
+ Patterns=*.kexi;
+ X-KDE-AutoEmbed=false
+ Comment=Kexi Project File
++Comment[af]=Kexi Projek Lêer
+ Comment[ar]=ملف مشروع Kexi
+ Comment[az]=Kexi Layihə Faylı
+ Comment[be]=Файл праекту Kexi
+@@ -63,7 +64,6 @@
+ Comment[uk]=Файл проекту Kexi
+ Comment[uz]=Kexi лойиҳа файли
+ Comment[wa]=Fitchî di prodjet Kexi
+-Comment[xx]=xxKexi Project Filexx
+ Comment[zh_CN]=Kexi 项目文件
+ Comment[zh_TW]=Kexi 專案檔案
+ [Property::X-KDE-NativeExtension]
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-vnd.kde.kplato.desktop kdelibs-branch-3.4/mimetypes/application/x-vnd.kde.kplato.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-vnd.kde.kplato.desktop 2005-02-23 00:04:58.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-vnd.kde.kplato.desktop 2005-03-10 11:04:55.000000000 -0500
+@@ -3,6 +3,7 @@
+ Encoding=UTF-8
+ MimeType=application/x-vnd.kde.kplato
+ Comment=KPlato Project Management Document
++Comment[af]=KPlato Projek Bestuur Dokument
+ Comment[bg]=Документ на KPlato Project Management
+ Comment[bn]=কে-প্লেটো প্রোজেক্ট ম্যানেজমেন্ট নথী
+ Comment[bs]=KPlato Menadžment projektima dokument
+@@ -41,14 +42,13 @@
+ Comment[sk]=KPlato dokument pre správu projektov
+ Comment[sl]=Dokument za projektno upravljanje KPlato
+ Comment[sr]=KPlato-ов документ пројекта управљања
+-Comment[sr@Latn]=KPlato-ов документ пројекта управљања
++Comment[sr@Latn]=KPlato-ov dokument projekta upravljanja
+ Comment[sv]=Kplato projekthanteringsdokument
+ Comment[ta]=கேப்ளாட்டோ திட்ட மேலாண்மை ஆவணம்
+ Comment[tg]=Сохти идоракунии санади KPlato
+ Comment[tr]=KPlato Proje Yönetim Dökümanı
+ Comment[uk]=Документ керування проектом KPlato
+ Comment[uz]=KPlato ҳужжати
+-Comment[xx]=xxKPlato Project Management Documentxx
+ Comment[zh_CN]=KPlato 项目管理文档
+ Type=MimeType
+ Patterns=*.kplato;*.kplatot;
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-vnd.kde.kugar.mixed.desktop kdelibs-branch-3.4/mimetypes/application/x-vnd.kde.kugar.mixed.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-vnd.kde.kugar.mixed.desktop 2005-01-20 23:24:19.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-vnd.kde.kugar.mixed.desktop 2005-03-10 11:04:55.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=kugar_kud
+ Patterns=*.kug
+ Comment=Kugar Archive File
++Comment[af]=Kugar Argief Lêer
+ Comment[ar]=ملف أرشيف كوغار
+ Comment[az]=Kugar Arxiv Faylı
+ Comment[be]=Архіўны файл Kugar
+@@ -62,7 +63,6 @@
+ Comment[uk]=Архів Kugar
+ Comment[uz]=Kugar архив файли
+ Comment[wa]=Fitchî årtchive Kugar
+-Comment[xx]=xxKugar Archive Filexx
+ Comment[zh_CN]=Kugar 归档文件
+ Comment[zh_TW]=Kugar 壓縮檔案
+ [Property::X-KDE-NativeExtension]
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-webarchive.desktop kdelibs-branch-3.4/mimetypes/application/x-webarchive.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-webarchive.desktop 2005-02-23 00:04:58.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-webarchive.desktop 2005-03-30 01:47:23.000000000 -0500
+@@ -4,17 +4,21 @@
+ Comment[bg]=Уеб архив
+ Comment[bn]=ওয়েব আর্কাইভ
+ Comment[br]=Diell ar gwiad
++Comment[bs]=Web arhiva
+ Comment[ca]=Arxiu web
+ Comment[cs]=Webový archív
+ Comment[cy]=Archif o Wefannau
+ Comment[da]=Www-arkiv
+ Comment[de]=Web-Archiv
++Comment[el]=Αρχειοθήκη Ιστού
+ Comment[es]=Archivo web
+ Comment[et]=Veebiarhiiv
+ Comment[eu]=Web fitxategia
++Comment[fi]=www-paketti
+ Comment[fr]=Archive Web
+ Comment[fy]=Webargyf
+ Comment[ga]=Cartlann Lín
++Comment[he]=ארכיון Web
+ Comment[hi]=वेब अभिलेख
+ Comment[hu]=Webarchívum
+ Comment[is]=Vef safnskrá
+@@ -36,7 +40,7 @@
+ Comment[sk]=Webový archív
+ Comment[sl]=Spletni arhiv
+ Comment[sr]=Веб архива
+-Comment[sr@Latn]=Веб архива
++Comment[sr@Latn]=Veb arhiva
+ Comment[sv]=Webbarkiv
+ Comment[ta]=வலைக் காப்பகம்
+ Comment[tg]=Архиви Web
+@@ -45,7 +49,6 @@
+ Comment[ven]=Webu yau vhulunga zwakale
+ Comment[vi]=Lưu trữ web
+ Comment[xh]=Ushicilelo lukawonke-wonke kunye nexwebhu leMbali
+-Comment[xx]=xxWeb Archivexx
+ Comment[zh_CN]=Web 归档
+ Comment[zu]=Ushicilelo layoyonke imiqulu ye Web
+ Icon=www
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-x509-ca-cert.desktop kdelibs-branch-3.4/mimetypes/application/x-x509-ca-cert.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-x509-ca-cert.desktop 2005-01-20 23:24:19.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-x509-ca-cert.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -65,7 +65,6 @@
+ Comment[ven]=DER, PEM, kana Netscape encoded X.509 Sethifikheithi
+ Comment[wa]=Acertineure X.509 DER, PEM ou ecôdêye pa Netscape
+ Comment[xh]=DER, PEM, okanye Netscape Esikhowudiweyo Isiqinisekiso se X.509
+-Comment[xx]=xxDER, PEM, or Netscape Encoded X.509 Certificatexx
+ Comment[zh_CN]=DER，PEM 或 Netscape 编码的 X.509 证书
+ Comment[zh_TW]=DER、PEM、或 Netscape 編碼的 X.509 認證
+ Comment[zu]=DER, PEM, noma Isitifiketi Esifakwe ikhodi se X.509
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-xliff.desktop kdelibs-branch-3.4/mimetypes/application/x-xliff.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-xliff.desktop 2005-02-23 00:04:58.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-xliff.desktop 2005-03-30 01:47:23.000000000 -0500
+@@ -7,15 +7,19 @@
+ Comment=XLIFF Translation File
+ Comment[bg]=Съобщения за превод (XLIFF)
+ Comment[br]=Restr troidigezh XLIFF
++Comment[bs]=XLIFF datoteka za prijevod
+ Comment[ca]=Fitxer de traducció XLIFF
+ Comment[cs]=Zdrojový kód překladu XLIFF
+ Comment[da]=XLIFF oversættelsesfil
+ Comment[de]=XLIFF-Übersetzungsdatei
++Comment[el]=Αρχείο μεταφράσεων XLIFF
+ Comment[es]=Archivo de traducción XLIFF
+ Comment[et]=XLIFF tõlkefail
+ Comment[eu]=XLIFF itzulpen fitxategia
++Comment[fi]=XLIFF-käännöstiedosto
+ Comment[fr]=Fichier de traduction XLIFF
+ Comment[fy]=XLIFF-FertalingsTriem
++Comment[he]=קובץ תרגום של XLIFF
+ Comment[hi]=एक्सएलआईएफ़एफ़ अनुवाद फ़ाइल
+ Comment[hu]=XLIFF fordítási fájl
+ Comment[is]=XLIFF þýðingarskrá
+@@ -36,11 +40,10 @@
+ Comment[sk]=Prekladový súbor XLIFF
+ Comment[sl]=Datoteka s prevodi XLIFF
+ Comment[sr]=XLIFF фајл са преводима
+-Comment[sr@Latn]=XLIFF фајл са преводима
++Comment[sr@Latn]=XLIFF fajl sa prevodima
+ Comment[sv]=XLIFF-översättningsfil
+ Comment[ta]=XLIFF மொழிப்பெயர்ப்பு கோப்பு
+ Comment[tg]=Файли Тарҷумаи XLIFF
+ Comment[tr]=XLIFF Çeviri Dosyası
+ Comment[uk]=Файл перекладу XLIFF
+-Comment[xx]=xxXLIFF Translation Filexx
+ Comment[zh_CN]=XLIFF 翻译文件
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-zerosize.desktop kdelibs-branch-3.4/mimetypes/application/x-zerosize.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-zerosize.desktop 2005-01-20 23:24:19.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-zerosize.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -68,7 +68,6 @@
+ Comment[vi]=Tài liệu trống
+ Comment[wa]=Documint vude
+ Comment[xh]=Uxwebh Olungenanto
+-Comment[xx]=xxEmpty Documentxx
+ Comment[zh_CN]=空文档
+ Comment[zh_TW]=空的文件
+ Comment[zu]=Uhlu lwamafayela Olungenalutho
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-zip-compressed.desktop kdelibs-branch-3.4/mimetypes/application/x-zip-compressed.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-zip-compressed.desktop 2005-01-20 23:24:19.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-zip-compressed.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -69,7 +69,6 @@
+ Comment[ven]=Fhethu hau vhulungela zwithu zwa kale ha Zip
+ Comment[wa]=Årtchive ZIP
+ Comment[xh]=Indawo yogcino ye Zip
+-Comment[xx]=xxZip Archivexx
+ Comment[zh_CN]=Zip 归档
+ Comment[zh_TW]=Zip 壓縮文件
+ Comment[zu]=Umqulu we-Zip
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-zip.desktop kdelibs-branch-3.4/mimetypes/application/x-zip.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-zip.desktop 2005-01-20 23:24:19.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-zip.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -70,7 +70,6 @@
+ Comment[ven]=Fhethu hau vhulungela zwithu zwa kale ha Zip
+ Comment[wa]=Årtchive ZIP
+ Comment[xh]=Indawo yogcino ye Zip
+-Comment[xx]=xxZip Archivexx
+ Comment[zh_CN]=Zip 归档
+ Comment[zh_TW]=Zip 壓縮文件
+ Comment[zu]=Umqulu we-Zip
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/x-zoo.desktop kdelibs-branch-3.4/mimetypes/application/x-zoo.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/x-zoo.desktop 2005-01-20 23:24:19.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/x-zoo.desktop 2005-03-07 09:13:38.000000000 -0500
+@@ -70,7 +70,6 @@
+ Comment[ven]=Fhethu hau vhulungela zwithu zwa kale ho vhewaho zwipuka
+ Comment[wa]=Årtchive ZOO
+ Comment[xh]=Indawo yogcino ye Zoo
+-Comment[xx]=xxZoo Archivexx
+ Comment[zh_CN]=Zoo 归档
+ Comment[zh_TW]=Zoo 壓縮文件
+ Comment[zu]=Umqulu We-zoo
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/xhtml+xml.desktop kdelibs-branch-3.4/mimetypes/application/xhtml+xml.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/xhtml+xml.desktop 2005-01-20 23:24:19.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/xhtml+xml.desktop 2005-03-10 11:04:55.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=XHTML Family Document
++Comment[af]=XHTML Familie Dokument
+ Comment[ar]=مستند XHTML
+ Comment[az]=XHTML Ailəsi Sənədi
+ Comment[be]=Дакумэнт XHTML
+@@ -60,7 +61,6 @@
+ Comment[uk]=Документ XHTML
+ Comment[uz]=XHTML оиласига оид ҳужжат
+ Comment[wa]=Documint XHTML
+-Comment[xx]=xxXHTML Family Documentxx
+ Comment[zh_CN]=XHTML 及类似文档
+ Comment[zh_TW]=XHTML Family 文件
+ Type=MimeType
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/xml.desktop kdelibs-branch-3.4/mimetypes/application/xml.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/xml.desktop 2004-12-29 12:52:10.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/xml.desktop 2005-03-10 11:04:55.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=XML Document
++Comment[af]=XML Dokument
+ Comment[ar]=مستند XML
+ Comment[az]=XML Sənədi
+ Comment[be]=Дакумэнт XML
+@@ -60,7 +61,6 @@
+ Comment[uk]=Документ XML
+ Comment[uz]=XML ҳужжати
+ Comment[wa]=Documint XML
+-Comment[xx]=xxXML Documentxx
+ Comment[zh_CN]=XML 文档
+ Comment[zh_TW]=XML 文件
+ Icon=html
+diff -Nru kdelibs-release-3.4.0/mimetypes/application/xsd.desktop kdelibs-branch-3.4/mimetypes/application/xsd.desktop
+--- kdelibs-release-3.4.0/mimetypes/application/xsd.desktop 2005-02-23 00:04:58.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/application/xsd.desktop 2005-03-30 01:47:23.000000000 -0500
+@@ -2,15 +2,19 @@
+ Encoding=UTF-8
+ Comment=W3C XML Schema
+ Comment[bg]=Схема W3C XML
++Comment[bs]=W3C XML šema
+ Comment[ca]=Esquema XML W3C
+ Comment[cs]=W3C XML schéma
+ Comment[da]=W3C XML Sammensætning
+ Comment[de]=W3C XML-Schema
++Comment[el]=Σχήμα W3C XML
+ Comment[es]=Schema XML de W3C
+ Comment[eu]=W3C XML eskema
++Comment[fi]=W3C XML skema
+ Comment[fr]=Schéma XML du W3C
+ Comment[fy]=W3C XML-skema
+ Comment[ga]=Scéimre W3C XML
++Comment[he]=סכימת XML של W3C
+ Comment[hi]=डबल्यू3सी एक्सएमएल स्कीमा
+ Comment[hu]=W3C XML-séma
+ Comment[is]=W3C XML skema
+@@ -30,13 +34,12 @@
+ Comment[sk]=XML schéma W3C
+ Comment[sl]=Shema W3C XML
+ Comment[sr]=W3C XML шема
+-Comment[sr@Latn]=W3C XML шема
++Comment[sr@Latn]=W3C XML šema
+ Comment[sv]=W3C XML-schema
+ Comment[ta]=W3C XML திட்டம்
+ Comment[tg]=Нақшаи W3C XML
+ Comment[tr]=W3C XML Şeması
+ Comment[uk]=Схема W3C XML
+-Comment[xx]=xxW3C XML Schemaxx
+ Comment[zh_CN]=W3C WML 大纲
+ Icon=html
+ Type=MimeType
+diff -Nru kdelibs-release-3.4.0/mimetypes/audio/aac.desktop kdelibs-branch-3.4/mimetypes/audio/aac.desktop
+--- kdelibs-release-3.4.0/mimetypes/audio/aac.desktop 2004-12-29 12:52:16.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/audio/aac.desktop 2005-03-10 11:04:57.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=sound
+ Patterns=*.aac;*.AAC;
+ Comment=AAC Sound
++Comment[af]=AAC Klank
+ Comment[ar]=ملف AAC صوتي
+ Comment[az]=AAC Səsi
+ Comment[be]=AAC аўдыё
+@@ -63,6 +64,5 @@
+ Comment[uk]=Аудіо AAC
+ Comment[uz]=AAC аудио
+ Comment[wa]=Son AAC
+-Comment[xx]=xxAAC Soundxx
+ Comment[zh_CN]=AAC 声音
+ Comment[zh_TW]=AAC 音效
+diff -Nru kdelibs-release-3.4.0/mimetypes/audio/ac3.desktop kdelibs-branch-3.4/mimetypes/audio/ac3.desktop
+--- kdelibs-release-3.4.0/mimetypes/audio/ac3.desktop 2005-01-20 23:24:24.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/audio/ac3.desktop 2005-03-10 11:04:57.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=sound
+ Patterns=*.ac3;*.AC3;
+ Comment=Dolby AC3 Sound
++Comment[af]=Dolby AC3 Klank
+ Comment[ar]=ملف صوتي Dolby AC3
+ Comment[az]=Dolby AC3 Səsi
+ Comment[be]=Dolby AC3 аўдыё
+@@ -62,6 +63,5 @@
+ Comment[uk]=Аудіо Dolby AC3
+ Comment[uz]=Dolby AC3 аудио
+ Comment[wa]=Son AC3 Dolby
+-Comment[xx]=xxDolby AC3 Soundxx
+ Comment[zh_CN]=杜比 AC3 声音
+ Comment[zh_TW]=Dolby AC3 音效
+diff -Nru kdelibs-release-3.4.0/mimetypes/audio/basic.desktop kdelibs-branch-3.4/mimetypes/audio/basic.desktop
+--- kdelibs-release-3.4.0/mimetypes/audio/basic.desktop 2005-01-20 23:24:24.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/audio/basic.desktop 2005-03-07 09:13:44.000000000 -0500
+@@ -62,7 +62,6 @@
+ Comment[ven]=ULAW (Duvha) Zwinopfiwa
+ Comment[wa]=Son ULAW (Sun)
+ Comment[xh]=ULAW (Sun) Evakalayo
+-Comment[xx]=xxULAW (Sun) Audioxx
+ Comment[zh_CN]=ULAW (Sun) 音频
+ Comment[zh_TW]=ULAW (Sun) 聲音文件
+ Comment[zu]=Okuzwakalayo kwe-ULAW (Ilanga)
+diff -Nru kdelibs-release-3.4.0/mimetypes/audio/mp4.desktop kdelibs-branch-3.4/mimetypes/audio/mp4.desktop
+--- kdelibs-release-3.4.0/mimetypes/audio/mp4.desktop 2005-01-20 23:24:24.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/audio/mp4.desktop 2005-03-10 11:04:57.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=sound
+ Patterns=*.m4a;*.M4A;
+ Comment=MPEG-4 Audio
++Comment[af]=MPEG-4 Klank
+ Comment[ar]=صوت MPEG-4
+ Comment[be]=MPEG-4 аўдыё
+ Comment[bg]=Аудио файл MPEG-4
+@@ -60,6 +61,5 @@
+ Comment[uk]=Аудіо MPEG-4
+ Comment[uz]=MPEG-4 аудио
+ Comment[wa]=Fitchî odio MPEG-4
+-Comment[xx]=xxMPEG-4 Audioxx
+ Comment[zh_CN]=MPEG4 音频
+ X-KDE-IsAlso=video/quicktime
+diff -Nru kdelibs-release-3.4.0/mimetypes/audio/mpeg.desktop kdelibs-branch-3.4/mimetypes/audio/mpeg.desktop
+--- kdelibs-release-3.4.0/mimetypes/audio/mpeg.desktop 2005-02-23 00:05:02.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/audio/mpeg.desktop 2005-03-10 11:04:57.000000000 -0500
+@@ -7,6 +7,7 @@
+ MimeType=audio/mpeg
+ Icon=sound
+ Comment=MPEG Audio
++Comment[af]=MPEG Klank
+ Comment[be]=MPEG аўдыё
+ Comment[bg]=Аудио файл MPEG
+ Comment[bn]=এমপেগ অডিও
+@@ -48,12 +49,11 @@
+ Comment[sk]=Zvuk MPEG
+ Comment[sl]=Zvok MPEG
+ Comment[sr]=MPEG аудио
+-Comment[sr@Latn]=MPEG аудио
++Comment[sr@Latn]=MPEG audio
+ Comment[sv]=MPEG-ljud
+ Comment[ta]=MPEG கேட்பொலி
+ Comment[th]=แฟ้มเสียง MPEG
+ Comment[tr]=MPEG Sesi
+ Comment[uk]=Аудіо запис MPEG
+ Comment[uz]=MPEG аудио
+-Comment[xx]=xxMPEG Audioxx
+ Comment[zh_CN]=MPEG 音频
+diff -Nru kdelibs-release-3.4.0/mimetypes/audio/mpegurl.desktop kdelibs-branch-3.4/mimetypes/audio/mpegurl.desktop
+--- kdelibs-release-3.4.0/mimetypes/audio/mpegurl.desktop 2005-02-21 04:17:21.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/audio/mpegurl.desktop 2005-03-29 01:24:25.000000000 -0500
+@@ -47,7 +47,7 @@
+ Comment[nn]=MPEG lag 3-lydstraum
+ Comment[nso]=Latelanya Kwagalo ya Peo 3 ya MPEG
+ Comment[pa]=Streaming MPEG ਪਰਤ ੩ ਆਡੀਓ
+-Comment[pl]=Dzwięk w formacie strumieniowego MPEG warstwa 3
++Comment[pl]=Dźwięk w formacie strumieniowym MPEG warstwa 3
+ Comment[pt]=Sequência de áudio MPEG Layer 3
+ Comment[pt_BR]=Áudio MP3 streaming
+ Comment[ro]=Flux audio MPEG Layer 3
+@@ -67,7 +67,6 @@
+ Comment[uz]=Streaming MPEG Layer 3 аудио
+ Comment[ven]=Mbemba tharu dzi elelaho dza MPEG dzino pfiwa
+ Comment[xh]=Ulwaleko Lwesithathu Oluqukuqelayo lwe MPEG
+-Comment[xx]=xxStreaming MPEG Layer 3 Audioxx
+ Comment[zh_CN]=流式 MP3 音频文件
+ Comment[zh_TW]=串流 MP3 音樂
+ Comment[zu]=Ontantayo Ozwakalayo Ugqinsi 3 we-MPEG
+diff -Nru kdelibs-release-3.4.0/mimetypes/audio/prs.sid.desktop kdelibs-branch-3.4/mimetypes/audio/prs.sid.desktop
+--- kdelibs-release-3.4.0/mimetypes/audio/prs.sid.desktop 2005-02-23 00:05:02.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/audio/prs.sid.desktop 2005-03-30 01:47:23.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=sound
+ Patterns=*.sid;*.SID;*.psid;*.PSID
+ Comment=C64 SID Music
++Comment[af]=C64 SID Musiek
+ Comment[be]=Музыка C64 SID
+ Comment[bg]=Аудио файл C64 SID
+ Comment[bn]=C64 SID মিউসিক
+@@ -14,6 +15,7 @@
+ Comment[cs]=Hudba C64 SID
+ Comment[da]=C64 SID Musik
+ Comment[de]=C64-SID-Musikdatei
++Comment[el]=Μουσική C64 SID
+ Comment[eo]=C64-SID-sono
+ Comment[es]=Música C64 SID
+ Comment[et]=C64 SID muusikafail
+@@ -44,12 +46,11 @@
+ Comment[sk]=Zvuk C64 SID
+ Comment[sl]=Glasba C64 SID
+ Comment[sr]=C64 SID музика
+-Comment[sr@Latn]=C64 SID музика
++Comment[sr@Latn]=C64 SID muzika
+ Comment[sv]=C64 SID-musik
+ Comment[ta]=குறுந்தட்டு ஒலி
+ Comment[tg]=Мусиқии C64 SID
+ Comment[tr]=C64 SID Müziği
+ Comment[uk]=Аудіо C64 SID
+ Comment[uz]=C64 SID мусиқа
+-Comment[xx]=xxC64 SID Musicxx
+ Comment[zh_CN]=C64 SID 音频
+diff -Nru kdelibs-release-3.4.0/mimetypes/audio/vnd.rn-realaudio.desktop kdelibs-branch-3.4/mimetypes/audio/vnd.rn-realaudio.desktop
+--- kdelibs-release-3.4.0/mimetypes/audio/vnd.rn-realaudio.desktop 2005-01-04 22:58:40.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/audio/vnd.rn-realaudio.desktop 2005-03-10 11:04:57.000000000 -0500
+@@ -6,6 +6,7 @@
+ Patterns=*.ra;*.ram;*.RA;*.RAM;
+ X-KDE-IsAlso=audio/x-pn-realaudio
+ Comment=RealAudio File
++Comment[af]=RealAudio Lêer
+ Comment[ar]=ملف Real Audio
+ Comment[az]=RealAudio Faylı
+ Comment[be]=Файл RealAudio
+@@ -65,7 +66,6 @@
+ Comment[uk]=Файл RealAudio
+ Comment[uz]=RealAudio-файли
+ Comment[wa]=Fitchî RealAudio
+-Comment[xx]=xxRealAudio Filexx
+ Comment[zh_CN]=RealAudio 文件
+ Comment[zh_TW]=RealAudio 檔案
+ [Property::X-KDE-NativeExtension]
+diff -Nru kdelibs-release-3.4.0/mimetypes/audio/vorbis.desktop kdelibs-branch-3.4/mimetypes/audio/vorbis.desktop
+--- kdelibs-release-3.4.0/mimetypes/audio/vorbis.desktop 2005-01-20 23:24:24.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/audio/vorbis.desktop 2005-03-10 11:04:57.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=sound
+ X-KDE-IsAlso=audio/x-vorbis
+ Comment=Ogg Vorbis Audio
++Comment[af]=Ogg Vorbis Klank
+ Comment[ar]=ملف Ogg Vorbis صوتي
+ Comment[be]=Ogg Vorbis аўдыё
+ Comment[bg]=Аудио файл Ogg Vorbis
+@@ -62,6 +63,5 @@
+ Comment[uk]=Аудіо Ogg Vorbis
+ Comment[uz]=Ogg Vorbis аудио
+ Comment[wa]=Fitchî odio Ogg Vorbis
+-Comment[xx]=xxOgg Vorbis Audioxx
+ Comment[zh_CN]=Ogg Vorbis 音频
+ Comment[zh_TW]=Ogg Vorbis 音效
+diff -Nru kdelibs-release-3.4.0/mimetypes/audio/x-adpcm.desktop kdelibs-branch-3.4/mimetypes/audio/x-adpcm.desktop
+--- kdelibs-release-3.4.0/mimetypes/audio/x-adpcm.desktop 2005-01-20 23:24:24.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/audio/x-adpcm.desktop 2005-03-10 11:04:57.000000000 -0500
+@@ -2,7 +2,7 @@
+ Encoding=UTF-8
+ Type=MimeType
+ Comment=PCM Audio
+-Comment[af]=Pcm Audio
++Comment[af]=PCM Klank
+ Comment[ar]=صوت PCM
+ Comment[be]=PCM аўдыё
+ Comment[bg]=Аудио файл PCM
+@@ -64,7 +64,6 @@
+ Comment[ven]=Zwinopfiwa zwa PCM
+ Comment[wa]=Son PCM
+ Comment[xh]=PCM Evakalayo
+-Comment[xx]=xxPCM Audioxx
+ Comment[zh_CN]=PCM 音频文件
+ Comment[zh_TW]=PCM 聲音文件
+ Comment[zu]=Okuzwakalayo kwe-PCM
+diff -Nru kdelibs-release-3.4.0/mimetypes/audio/x-aiff.desktop kdelibs-branch-3.4/mimetypes/audio/x-aiff.desktop
+--- kdelibs-release-3.4.0/mimetypes/audio/x-aiff.desktop 2005-01-20 23:24:24.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/audio/x-aiff.desktop 2005-03-10 11:04:57.000000000 -0500
+@@ -2,7 +2,7 @@
+ Encoding=UTF-8
+ Type=MimeType
+ Comment=AIFF/Amiga Audio
+-Comment[af]=Aiff/Amiga Audio
++Comment[af]=Aiff/Amiga Klank
+ Comment[ar]=صوت AIFF/Amiga
+ Comment[be]=AIFF/Amiga аўдыё
+ Comment[bg]=Аудио файл AIFF/Amiga
+@@ -64,7 +64,6 @@
+ Comment[ven]=Zwinopfiwa zwa AIFF/Amiga
+ Comment[wa]=Son AIFF/Amiga
+ Comment[xh]=AIFF/Amiga Evakalayo
+-Comment[xx]=xxAIFF/Amiga Audioxx
+ Comment[zh_CN]=AIFF/Amiga 音频
+ Comment[zh_TW]=AIFF/Amiga 聲音文件
+ Comment[zu]=Okuzwakalayo kwe-AIFF/Amiga
+diff -Nru kdelibs-release-3.4.0/mimetypes/audio/x-flac.desktop kdelibs-branch-3.4/mimetypes/audio/x-flac.desktop
+--- kdelibs-release-3.4.0/mimetypes/audio/x-flac.desktop 2005-01-20 23:24:24.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/audio/x-flac.desktop 2005-03-10 11:04:57.000000000 -0500
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=MimeType
+ Comment=FLAC Audio
++Comment[af]=FLAC Klank
+ Comment[ar]=ملف FLAC صوتي
+ Comment[be]=FLAC аўдыё
+ Comment[bg]=Аудио файл FLAC
+@@ -58,7 +59,6 @@
+ Comment[uk]=Аудіо FLAC
+ Comment[uz]=FLAC аудио
+ Comment[wa]=Fitchî odio FLAC
+-Comment[xx]=xxFLAC Audioxx
+ Comment[zh_CN]=FLAC 音频
+ Comment[zh_TW]=FLAC 聲音
+ MimeType=audio/x-flac
+diff -Nru kdelibs-release-3.4.0/mimetypes/audio/x-matroska.desktop kdelibs-branch-3.4/mimetypes/audio/x-matroska.desktop
+--- kdelibs-release-3.4.0/mimetypes/audio/x-matroska.desktop 2005-01-20 23:24:24.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/audio/x-matroska.desktop 2005-03-10 11:04:57.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=sound
+ Patterns=*.mka;*.MKA;
+ Comment=Matroska Audio
++Comment[af]=Matroska Klank
+ Comment[ar]=ملف ماتروسكا صوتي
+ Comment[be]=Матрошка аўдыё
+ Comment[bg]=Аудио файл Matroska
+@@ -59,6 +60,5 @@
+ Comment[uk]=Аудіо Матрьошка
+ Comment[uz]=Matroska аудио
+ Comment[wa]=Fitchî odio Matroska
+-Comment[xx]=xxMatroska Audioxx
+ Comment[zh_CN]=Matroska 音频
+ Comment[zh_TW]=Matroska 聲音
+diff -Nru kdelibs-release-3.4.0/mimetypes/audio/x-midi.desktop kdelibs-branch-3.4/mimetypes/audio/x-midi.desktop
+--- kdelibs-release-3.4.0/mimetypes/audio/x-midi.desktop 2005-01-20 23:24:24.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/audio/x-midi.desktop 2005-03-10 11:04:57.000000000 -0500
+@@ -5,7 +5,7 @@
+ Icon=midi
+ Patterns=*.mid;*.MID;
+ Comment=MIDI Audio
+-Comment[af]=Midi Audio
++Comment[af]=MIDI Klank
+ Comment[ar]=صوت MIDI
+ Comment[be]=MIDI аўдыё
+ Comment[bg]=Аудио файл MIDI
+@@ -67,7 +67,6 @@
+ Comment[ven]=Zwinopfiwa zwa MIDI
+ Comment[wa]=Son MIDI
+ Comment[xh]=MIDI Evakalayo
+-Comment[xx]=xxMIDI Audioxx
+ Comment[zh_CN]=MIDI 音频
+ Comment[zh_TW]=MIDI 聲音文件
+ Comment[zu]=Okuzwakalayo kwe-MIDI
+diff -Nru kdelibs-release-3.4.0/mimetypes/audio/x-mod.desktop kdelibs-branch-3.4/mimetypes/audio/x-mod.desktop
+--- kdelibs-release-3.4.0/mimetypes/audio/x-mod.desktop 2005-01-20 23:24:24.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/audio/x-mod.desktop 2005-03-07 09:13:45.000000000 -0500
+@@ -64,7 +64,6 @@
+ Comment[uk]=Amiga Soundtracker-аудіо
+ Comment[uz]=Amiga Soundtracker аудио
+ Comment[ven]=Zwinopfiwa zwa mubvumo ya luimbo zwa Amiga
+-Comment[xx]=xxAmiga Soundtracker Audioxx
+ Comment[zh_CN]=Amiga soundtracker 音频文件
+ Comment[zh_TW]=Amiga 聲軌聲音文件
+ Comment[zu]=Ozwakalayo Umlandeli womsindo we-Amiga
+diff -Nru kdelibs-release-3.4.0/mimetypes/audio/x-mp2.desktop kdelibs-branch-3.4/mimetypes/audio/x-mp2.desktop
+--- kdelibs-release-3.4.0/mimetypes/audio/x-mp2.desktop 2005-02-23 00:05:02.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/audio/x-mp2.desktop 2005-03-30 01:47:23.000000000 -0500
+@@ -6,6 +6,7 @@
+ Patterns=*.mp2;*.MP2;
+ X-KDE-IsAlso=audio/mpeg
+ Comment=MPEG Layer 2 Audio
++Comment[af]=MPEG Vlak 2 Klank
+ Comment[be]=MPEG Layer 2 аўдыё
+ Comment[bg]=Аудио файл MP2
+ Comment[bn]=এমপেগ লেয়ার ২ অডিও
+@@ -15,6 +16,7 @@
+ Comment[cs]=Zvuk MPEG layer 2
+ Comment[da]=MPEG Layer 2-audio
+ Comment[de]=MPEG Layer 2-Audiodatei
++Comment[el]=Ήχος MPEG Layer 2
+ Comment[eo]=MPEG-2-sondosiero
+ Comment[es]=Audio MPEG capa 2
+ Comment[et]=MPEG layer 2 audiofail
+@@ -44,12 +46,11 @@
+ Comment[sk]=Zvuk MPEG layer 2
+ Comment[sl]=Zvok oblike MPEG layer 2
+ Comment[sr]=MPEG ниво 2 аудио
+-Comment[sr@Latn]=MPEG ниво 2 аудио
++Comment[sr@Latn]=MPEG nivo 2 audio
+ Comment[sv]=MPEG lager 2-ljud
+ Comment[ta]=MPEG அடுக்கு 3 கேட்பொலி
+ Comment[tg]=Файли садои лояи 2 барои MPEG
+ Comment[tr]=MPEG Seviye 2 Ses
+ Comment[uk]=Аудіо запис MPEG Layer 2
+ Comment[uz]=MPEG Layer 2 аудио
+-Comment[xx]=xxMPEG Layer 2 Audioxx
+ Comment[zh_CN]=MP2 音频文件
+diff -Nru kdelibs-release-3.4.0/mimetypes/audio/x-mp3.desktop kdelibs-branch-3.4/mimetypes/audio/x-mp3.desktop
+--- kdelibs-release-3.4.0/mimetypes/audio/x-mp3.desktop 2005-01-20 23:24:24.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/audio/x-mp3.desktop 2005-03-10 11:04:57.000000000 -0500
+@@ -6,7 +6,7 @@
+ Patterns=*.mp3;*.MP3;*.Mp3;
+ X-KDE-IsAlso=audio/mpeg
+ Comment=MPEG Layer 3 Audio
+-Comment[af]=Mpeg Laag 3 Audio
++Comment[af]=MPEG Vlak 3 Klank
+ Comment[ar]=صوت MPEG الطبقة 3
+ Comment[be]=MPEG Layer 3 аўдыё
+ Comment[bg]=Аудио файл MP3
+@@ -68,7 +68,6 @@
+ Comment[ven]=Zwinopfiwa zwa mbemba tharu zwa MPEG
+ Comment[wa]=Son MP3
+ Comment[xh]=MPEG Ulwaleko 3 Evakalayo
+-Comment[xx]=xxMPEG Layer 3 Audioxx
+ Comment[zh_CN]=MP3 音频文件
+ Comment[zh_TW]=MP3 音樂
+ Comment[zu]=Ozwakalayo Ugqinsi 3 we-MPEG
+diff -Nru kdelibs-release-3.4.0/mimetypes/audio/x-mpegurl.desktop kdelibs-branch-3.4/mimetypes/audio/x-mpegurl.desktop
+--- kdelibs-release-3.4.0/mimetypes/audio/x-mpegurl.desktop 2005-02-21 04:17:21.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/audio/x-mpegurl.desktop 2005-03-29 01:24:25.000000000 -0500
+@@ -45,7 +45,7 @@
+ Comment[nn]=MPEG lag 3-lydstraum
+ Comment[nso]=Latelanya Kwagalo ya Peo 3 ya MPEG
+ Comment[pa]=Streaming MPEG ਪਰਤ ੩ ਆਡੀਓ
+-Comment[pl]=Dzwięk w formacie strumieniowego MPEG warstwa 3
++Comment[pl]=Dźwięk w formacie strumieniowym MPEG warstwa 3
+ Comment[pt]=Sequência de áudio MPEG Layer 3
+ Comment[pt_BR]=Áudio MP3 streaming
+ Comment[ro]=Flux audio MPEG Layer 3
+@@ -65,7 +65,6 @@
+ Comment[uz]=Streaming MPEG Layer 3 аудио
+ Comment[ven]=Mbemba tharu dzi elelaho dza MPEG dzino pfiwa
+ Comment[xh]=Ulwaleko Lwesithathu Oluqukuqelayo lwe MPEG
+-Comment[xx]=xxStreaming MPEG Layer 3 Audioxx
+ Comment[zh_CN]=流式 MP3 音频文件
+ Comment[zh_TW]=串流 MP3 音樂
+ Comment[zu]=Ontantayo Ozwakalayo Ugqinsi 3 we-MPEG
+diff -Nru kdelibs-release-3.4.0/mimetypes/audio/x-ms-wma.desktop kdelibs-branch-3.4/mimetypes/audio/x-ms-wma.desktop
+--- kdelibs-release-3.4.0/mimetypes/audio/x-ms-wma.desktop 2005-02-23 00:05:02.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/audio/x-ms-wma.desktop 2005-03-10 11:04:57.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=audio
+ Patterns=*.wma;*.WMA
+ Comment=Windows Media Audio
++Comment[af]=Windows Media Klank
+ Comment[be]=Windows Media аўдыё
+ Comment[bg]=Аудио файл Windows Media
+ Comment[bn]=উইন্ডোস মিডিয়া অডিও
+@@ -41,12 +42,11 @@
+ Comment[se]=Windows Media-jietna
+ Comment[sl]=Avdio Windows Media
+ Comment[sr]=Windows медија аудио
+-Comment[sr@Latn]=Windows медија аудио
++Comment[sr@Latn]=Windows medija audio
+ Comment[sv]=Windows-medialjud
+ Comment[ta]=சாளரங்களின் ஊடக கேட்பொலி
+ Comment[tg]=Аудиофайли Windows Media
+ Comment[tr]=Windows Çoklu Ortam Sesi
+ Comment[uk]=Аудіо запис Windows Media
+ Comment[uz]=Windows Media аудио
+-Comment[xx]=xxWindows Media Audioxx
+ Comment[zh_CN]=Windows Media 音频
+diff -Nru kdelibs-release-3.4.0/mimetypes/audio/x-musepack.desktop kdelibs-branch-3.4/mimetypes/audio/x-musepack.desktop
+--- kdelibs-release-3.4.0/mimetypes/audio/x-musepack.desktop 2005-02-23 00:05:02.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/audio/x-musepack.desktop 2005-03-30 01:47:23.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=sound
+ Patterns=*.mpc;*.MPC;*.mp+;*.MP+
+ Comment=Musepack Audio
++Comment[af]=Musepack Klank
+ Comment[be]=Musepack аўдыё
+ Comment[bg]=Аудио файл Musepack
+ Comment[bn]=মিউস-প্যাক অডিও
+@@ -14,6 +15,7 @@
+ Comment[cs]=Zvuk Musepack
+ Comment[da]=Musepack lyd
+ Comment[de]=Musepack-Audiodatei
++Comment[el]=Ήχος Musepack
+ Comment[eo]=Musepack-sondosiero
+ Comment[et]=Musepack audiofail
+ Comment[eu]=Musepack audioa
+@@ -42,12 +44,11 @@
+ Comment[sk]=Zvuk Musepack
+ Comment[sl]=Zvok Musepack
+ Comment[sr]=Musepack аудио
+-Comment[sr@Latn]=Musepack аудио
++Comment[sr@Latn]=Musepack audio
+ Comment[sv]=Musepack-ljud
+ Comment[ta]= மியுஸ்பேக் ஒலி
+ Comment[tg]=Файли садоии Musepack
+ Comment[tr]=Musepack Sesi
+ Comment[uk]=Аудіо запис Musepack
+ Comment[uz]=Musepack аудио
+-Comment[xx]=xxMusepack Audioxx
+ Comment[zh_CN]=Musepack 音频
+diff -Nru kdelibs-release-3.4.0/mimetypes/audio/x-oggflac.desktop kdelibs-branch-3.4/mimetypes/audio/x-oggflac.desktop
+--- kdelibs-release-3.4.0/mimetypes/audio/x-oggflac.desktop 2005-01-20 23:24:24.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/audio/x-oggflac.desktop 2005-03-10 11:04:57.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=sound
+ X-KDE-IsAlso=application/ogg
+ Comment=Ogg FLAC Audio
++Comment[af]=Ogg FLAC Klank
+ Comment[ar]=ملف Ogg FLAC صوتي
+ Comment[be]=Ogg FLAC аўдыё
+ Comment[bg]=Аудио файл Ogg FLAC
+@@ -60,6 +61,5 @@
+ Comment[uk]=Аудіо Ogg FLAC
+ Comment[uz]=Ogg FLAC аудио
+ Comment[wa]=Fitchî odio Ogg FLAC
+-Comment[xx]=xxOgg FLAC Audioxx
+ Comment[zh_CN]=Ogg FLAC 音频
+ Comment[zh_TW]=Ogg FLAC 聲音
+diff -Nru kdelibs-release-3.4.0/mimetypes/audio/x-pn-realaudio.desktop kdelibs-branch-3.4/mimetypes/audio/x-pn-realaudio.desktop
+--- kdelibs-release-3.4.0/mimetypes/audio/x-pn-realaudio.desktop 2005-01-04 22:58:40.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/audio/x-pn-realaudio.desktop 2005-03-10 11:04:57.000000000 -0500
+@@ -4,6 +4,7 @@
+ MimeType=audio/x-pn-realaudio
+ Icon=sound
+ Comment=RealAudio File
++Comment[af]=RealAudio Lêer
+ Comment[ar]=ملف Real Audio
+ Comment[az]=RealAudio Faylı
+ Comment[be]=Файл RealAudio
+@@ -63,6 +64,5 @@
+ Comment[uk]=Файл RealAudio
+ Comment[uz]=RealAudio-файли
+ Comment[wa]=Fitchî RealAudio
+-Comment[xx]=xxRealAudio Filexx
+ Comment[zh_CN]=RealAudio 文件
+ Comment[zh_TW]=RealAudio 檔案
+diff -Nru kdelibs-release-3.4.0/mimetypes/audio/x-scpls.desktop kdelibs-branch-3.4/mimetypes/audio/x-scpls.desktop
+--- kdelibs-release-3.4.0/mimetypes/audio/x-scpls.desktop 2005-01-20 23:24:24.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/audio/x-scpls.desktop 2005-03-07 09:13:45.000000000 -0500
+@@ -68,7 +68,6 @@
+ Comment[ven]=Mutevhe uno tambiwa wa MP3
+ Comment[vi]=Danh sách MP3 ShoutCast
+ Comment[xh]=MP3 Uluhlu lokudlala lwe ShoutCast
+-Comment[xx]=xxMP3 ShoutCast Playlistxx
+ Comment[zh_CN]=MP3 ShoutCast 播放列表
+ Comment[zh_TW]=MP3 ShoutCast 播放列表
+ Patterns=*.pls;*.PLS;
+diff -Nru kdelibs-release-3.4.0/mimetypes/audio/x-speex.desktop kdelibs-branch-3.4/mimetypes/audio/x-speex.desktop
+--- kdelibs-release-3.4.0/mimetypes/audio/x-speex.desktop 2005-01-20 23:24:24.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/audio/x-speex.desktop 2005-03-10 11:04:57.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=sound
+ Patterns=*.spx;*.SPX;
+ Comment=Speex Audio
++Comment[af]=Speex Klank
+ Comment[ar]=ملف Speex صوتي
+ Comment[be]=Speex аўдыё
+ Comment[bg]=Аудио файл Speex
+@@ -59,6 +60,5 @@
+ Comment[uk]=Аудіо Speex
+ Comment[uz]=Speex аудио
+ Comment[wa]=Fitchî odio speex
+-Comment[xx]=xxSpeex Audioxx
+ Comment[zh_CN]=Speex 音频
+ Comment[zh_TW]=Speex 聲音
+diff -Nru kdelibs-release-3.4.0/mimetypes/audio/x-vorbis.desktop kdelibs-branch-3.4/mimetypes/audio/x-vorbis.desktop
+--- kdelibs-release-3.4.0/mimetypes/audio/x-vorbis.desktop 2005-01-20 23:24:24.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/audio/x-vorbis.desktop 2005-03-10 11:04:57.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=sound
+ X-KDE-IsAlso=application/ogg
+ Comment=Ogg Vorbis Audio
++Comment[af]=Ogg Vorbis Klank
+ Comment[ar]=ملف Ogg Vorbis صوتي
+ Comment[be]=Ogg Vorbis аўдыё
+ Comment[bg]=Аудио файл Ogg Vorbis
+@@ -62,6 +63,5 @@
+ Comment[uk]=Аудіо Ogg Vorbis
+ Comment[uz]=Ogg Vorbis аудио
+ Comment[wa]=Fitchî odio Ogg Vorbis
+-Comment[xx]=xxOgg Vorbis Audioxx
+ Comment[zh_CN]=Ogg Vorbis 音频
+ Comment[zh_TW]=Ogg Vorbis 音效
+diff -Nru kdelibs-release-3.4.0/mimetypes/audio/x-wav.desktop kdelibs-branch-3.4/mimetypes/audio/x-wav.desktop
+--- kdelibs-release-3.4.0/mimetypes/audio/x-wav.desktop 2005-01-20 23:24:24.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/audio/x-wav.desktop 2005-03-07 09:13:45.000000000 -0500
+@@ -67,7 +67,6 @@
+ Comment[ven]=Zwinopfiwa zwa WAV
+ Comment[wa]=Son WAV
+ Comment[xh]=WAV Evakalayo
+-Comment[xx]=xxWAV Audioxx
+ Comment[zh_CN]=WAV 音频文件
+ Comment[zh_TW]=WAV 聲音文件
+ Comment[zu]=Okuzwakalayo kwe-WAV
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/cgm.desktop kdelibs-branch-3.4/mimetypes/image/cgm.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/cgm.desktop 2005-01-20 23:24:25.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/cgm.desktop 2005-03-27 02:28:48.000000000 -0500
+@@ -25,7 +25,7 @@
+ Comment[fr]=Métafichier graphique
+ Comment[fy]=Computer Graphics Meta-triem
+ Comment[ga]=Computer Graphics Metafile (CGM)
+-Comment[he]=מטא-קובץ גרפיקת מחשב
++Comment[he]=מטא־קובץ גרפיקת מחשב
+ Comment[hi]=कम्प्यूटर ग्राफिक्स मेटाफ़ाइल
+ Comment[hr]=Metadatoteka s kompjuterskom grafikom
+ Comment[hu]=CGM-fájl
+@@ -60,7 +60,6 @@
+ Comment[ven]=Faela ya khompwutha Graphics
+ Comment[vi]=Metafile của đềEhoạ máy tính
+ Comment[xh]=Ifayile ye Meta Yemizobo ye Khompyutha
+-Comment[xx]=xxComputer Graphics Metafilexx
+ Comment[zh_CN]=计算机图形元文件
+ Comment[zh_TW]=電腦繪圖檔案
+ Comment[zu]=Ifayela leMeta Lemidwebo Yekhomputha
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/fax-g3.desktop kdelibs-branch-3.4/mimetypes/image/fax-g3.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/fax-g3.desktop 2005-01-20 23:24:25.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/fax-g3.desktop 2005-03-07 09:13:46.000000000 -0500
+@@ -66,7 +66,6 @@
+ Comment[uz]=CCITT G3 факс-файли
+ Comment[ven]=Fekisi ya CCITT G3
+ Comment[wa]=Facs CCITT G3
+-Comment[xx]=xxCCITT G3 Faxxx
+ Comment[zh_CN]=CCITT G3 传真
+ Comment[zh_TW]=CCITT G3 傳真
+ Comment[zu]=I-fax le-CCITT
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/gif.desktop kdelibs-branch-3.4/mimetypes/image/gif.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/gif.desktop 2005-01-20 23:24:25.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/gif.desktop 2005-03-07 09:13:46.000000000 -0500
+@@ -69,7 +69,6 @@
+ Comment[ven]=Tshifanyiso tsha GIF
+ Comment[wa]=Imådje GIF
+ Comment[xh]=Umfanekiso we GIF
+-Comment[xx]=xxGIF Imagexx
+ Comment[zh_CN]=GIF 图像
+ Comment[zh_TW]=GIF 影像
+ Comment[zu]=Isithombe se-GIF
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/jp2.desktop kdelibs-branch-3.4/mimetypes/image/jp2.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/jp2.desktop 2005-01-20 23:24:25.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/jp2.desktop 2005-03-10 11:04:58.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=image
+ Patterns=*.jp2;*.JP2
+ Comment=JPEG 2000 Image
++Comment[af]=JPEG 2000 Beeld
+ Comment[ar]=صورة JPEG 2000
+ Comment[az]=JPEG 2000 Rəsmi
+ Comment[be]=Выява JPEG 2000
+@@ -63,6 +64,5 @@
+ Comment[uk]=Зображення JPEG 2000
+ Comment[uz]=JPEG 2000-расм
+ Comment[wa]=Imådje JPEG 2000
+-Comment[xx]=xxJPEG 2000 Imagexx
+ Comment[zh_CN]=JPEG 2000 图像
+ Comment[zh_TW]=JPEG 200 影像
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/jpeg.desktop kdelibs-branch-3.4/mimetypes/image/jpeg.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/jpeg.desktop 2005-01-20 23:24:25.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/jpeg.desktop 2005-03-10 11:04:58.000000000 -0500
+@@ -5,7 +5,7 @@
+ Icon=image
+ Patterns=*.jpg;*.JPG;*.jpeg;*.JPEG;
+ Comment=JPEG Image
+-Comment[af]=Jpeg Beeld
++Comment[af]=JPEG Beeld
+ Comment[ar]=صورة JPEG
+ Comment[az]=JPEG Rəsmi
+ Comment[be]=Выява JPEG
+@@ -69,7 +69,6 @@
+ Comment[ven]=Tshifanyiso tsha JPEG
+ Comment[wa]=Imådje JPEG
+ Comment[xh]=Umfanekiso we JPEG
+-Comment[xx]=xxJPEG Imagexx
+ Comment[zh_CN]=JPEG 图像
+ Comment[zh_TW]=JPEG 影像
+ Comment[zu]=Isithombe se-JPEG
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/pjpeg.desktop kdelibs-branch-3.4/mimetypes/image/pjpeg.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/pjpeg.desktop 2005-01-20 23:24:25.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/pjpeg.desktop 2005-03-10 11:04:58.000000000 -0500
+@@ -6,7 +6,7 @@
+ Icon=image
+ X-KDE-IsAlso=image/jpeg
+ Comment=JPEG Image
+-Comment[af]=Jpeg Beeld
++Comment[af]=JPEG Beeld
+ Comment[ar]=صورة JPEG
+ Comment[az]=JPEG Rəsmi
+ Comment[be]=Выява JPEG
+@@ -70,7 +70,6 @@
+ Comment[ven]=Tshifanyiso tsha JPEG
+ Comment[wa]=Imådje JPEG
+ Comment[xh]=Umfanekiso we JPEG
+-Comment[xx]=xxJPEG Imagexx
+ Comment[zh_CN]=JPEG 图像
+ Comment[zh_TW]=JPEG 影像
+ Comment[zu]=Isithombe se-JPEG
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/png.desktop kdelibs-branch-3.4/mimetypes/image/png.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/png.desktop 2005-01-20 23:24:25.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/png.desktop 2005-03-07 09:13:46.000000000 -0500
+@@ -69,7 +69,6 @@
+ Comment[ven]=Tshifanyiso tsha PNG
+ Comment[wa]=Imådje PNG
+ Comment[xh]=Umfanekiso we PNG
+-Comment[xx]=xxPNG Imagexx
+ Comment[zh_CN]=PNG 图像
+ Comment[zh_TW]=PNG 影像
+ Comment[zu]=Isithombe se-PNG
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/svg+xml.desktop kdelibs-branch-3.4/mimetypes/image/svg+xml.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/svg+xml.desktop 2005-01-20 23:24:25.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/svg+xml.desktop 2005-03-07 09:13:46.000000000 -0500
+@@ -57,7 +57,6 @@
+ Comment[ven]=Zwadzigirafu zwi kaliwaho zwa Vekitha
+ Comment[vi]=ĐềEhoạ véc-tơ tềElềEđược (scalable)
+ Comment[xh]=Imizobo Elinganiselekayo Enesalathisi
+-Comment[xx]=xxScalable Vector Graphicsxx
+ Comment[zh_CN]=可缩放向量图
+ Comment[zh_TW]=可縮放向量圖
+ Comment[zu]=Imidwebo ekalekayo ye-Vector
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/tiff.desktop kdelibs-branch-3.4/mimetypes/image/tiff.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/tiff.desktop 2004-12-29 12:52:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/tiff.desktop 2005-03-07 09:13:46.000000000 -0500
+@@ -74,7 +74,6 @@
+ Comment[vi]=A?nh TIFF
+ Comment[wa]=Imådje TIFF
+ Comment[xh]=Umfanekiso we TIFF
+-Comment[xx]=xxTIFF Imagexx
+ Comment[zh_CN]=TIFF 图像
+ Comment[zh_TW]=TIFF 影像
+ Comment[zu]=Isithombe se-TIFF
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/x-bmp.desktop kdelibs-branch-3.4/mimetypes/image/x-bmp.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/x-bmp.desktop 2004-12-29 12:52:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/x-bmp.desktop 2005-03-10 11:04:58.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=image
+ Patterns=*.bmp;*.BMP;
+ Comment=BMP Image
++Comment[af]=BMP Beeld
+ Comment[ar]=صورة BMP
+ Comment[az]=BMP Rəsmi
+ Comment[be]=Выява BMP
+@@ -63,6 +64,5 @@
+ Comment[uk]=Зображення BMP
+ Comment[uz]=BMP-расм
+ Comment[wa]=Imådje BMP
+-Comment[xx]=xxBMP Imagexx
+ Comment[zh_CN]=BMP 图像
+ Comment[zh_TW]=BMP 影像
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/x-dds.desktop kdelibs-branch-3.4/mimetypes/image/x-dds.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/x-dds.desktop 2005-02-23 00:05:03.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/x-dds.desktop 2005-03-10 11:04:58.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=image
+ Patterns=*.dds;*.DDS;
+ Comment=DirectDraw Surface
++Comment[af]=DirectDraw Oppervlakte
+ Comment[be]=Паверхня DirectDraw
+ Comment[bg]=Област с директно изчертаване
+ Comment[bn]=ডায়রেক্ট-ড্র সারফেস
+@@ -34,11 +35,10 @@
+ Comment[sk]=Povrch DirectDraw
+ Comment[sl]=Površina DirectDraw
+ Comment[sr]=Површина за директно цртање
+-Comment[sr@Latn]=Површина за директно цртање
++Comment[sr@Latn]=Površina za direktno crtanje
+ Comment[sv]=Direktrityta
+ Comment[ta]=நேரடி வரையும் சூழல்
+ Comment[tg]=Кашидани сатҳи мустақим
+ Comment[tr]=DirectDraw Yüzeyi
+ Comment[uk]=Поверхня DirectDraw
+-Comment[xx]=xxDirectDraw Surfacexx
+ Comment[zh_CN]=DirectDraw 表面
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/x-eps.desktop kdelibs-branch-3.4/mimetypes/image/x-eps.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/x-eps.desktop 2005-01-20 23:24:25.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/x-eps.desktop 2005-03-07 09:13:46.000000000 -0500
+@@ -66,7 +66,6 @@
+ Comment[ven]=Tshifanyiso tsha tshikiriputi tsha poso
+ Comment[wa]=Imådje PostScript ecapsulêye
+ Comment[xh]=Umfanekiso we PostScript Wokuvalelweyo
+-Comment[xx]=xxEncapsulated PostScript Imagexx
+ Comment[zh_CN]=封装的 PostScript 图像
+ Comment[zh_TW]=封裝的 PostScript 影像
+ Comment[zu]=Isithombe Esifakwe ephaketheni Lesithombe Sesikripti Esidlulele
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/x-exr.desktop kdelibs-branch-3.4/mimetypes/image/x-exr.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/x-exr.desktop 2005-02-23 00:05:03.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/x-exr.desktop 2005-03-10 11:04:58.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=image
+ Patterns=*.exr;*.EXR;
+ Comment=ILM EXR Image
++Comment[af]=ILM EXR Beeld
+ Comment[be]=Выява ILM EXR
+ Comment[bg]=Изображение ILM EXR
+ Comment[bn]=ILM EXR ইমেজ
+@@ -48,13 +49,12 @@
+ Comment[sk]=ILM EXR obrázok
+ Comment[sl]=Slika ILM EXR
+ Comment[sr]=ILM EXR слика
+-Comment[sr@Latn]=ILM EXR слика
++Comment[sr@Latn]=ILM EXR slika
+ Comment[sv]=ILM EXR-bild
+ Comment[ta]=ILM EXR பிம்பம்
+ Comment[tg]=Тасвири ILM EXR
+ Comment[tr]=ILM EXR Resmi
+ Comment[uk]=Зображення ILM EXR
+ Comment[uz]=ILM EXR-расм
+-Comment[xx]=xxILM EXR Imagexx
+ Comment[zh_CN]=ILM EXR 图像
+
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/x-ico.desktop kdelibs-branch-3.4/mimetypes/image/x-ico.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/x-ico.desktop 2005-01-20 23:24:25.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/x-ico.desktop 2005-03-07 09:13:46.000000000 -0500
+@@ -68,7 +68,6 @@
+ Comment[uz]=Windows нишончаси
+ Comment[ven]=Dziaikhono dza Dziwindo
+ Comment[wa]=Imådjete MS-Windows
+-Comment[xx]=xxWindows Iconxx
+ Comment[zh_CN]=Windows 图标
+ Comment[zh_TW]=MSWindows 圖示
+ Comment[zu]=Uphawu lwesithombe Lama-window
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/x-jng.desktop kdelibs-branch-3.4/mimetypes/image/x-jng.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/x-jng.desktop 2005-01-20 23:24:25.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/x-jng.desktop 2005-03-07 09:13:46.000000000 -0500
+@@ -69,7 +69,6 @@
+ Comment[ven]=Tshifanyiso tsha JNG
+ Comment[wa]=Imådje JNG
+ Comment[xh]=Umfanekiso we JNG
+-Comment[xx]=xxJNG Imagexx
+ Comment[zh_CN]=JNG 图像
+ Comment[zh_TW]=JNG 影像
+ Comment[zu]=Isithombe se-JNG
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/x-msod.desktop kdelibs-branch-3.4/mimetypes/image/x-msod.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/x-msod.desktop 2005-02-21 04:17:22.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/x-msod.desktop 2005-03-07 09:13:46.000000000 -0500
+@@ -11,6 +11,7 @@
+ Comment[be]=Малюнак Microsoft Office
+ Comment[bg]=Изображение на Microsoft Office Drawing
+ Comment[bn]=মাইক্রোসফট অফিস ড্রয়িং
++Comment[br]=Tresaner Microsoft Office
+ Comment[bs]=Microsoft Office crtež
+ Comment[ca]=Dibuix de Microsoft Office
+ Comment[cs]=Kreslení MS Office
+@@ -64,7 +65,6 @@
+ Comment[ven]=Miolo ya ofisi ya MS
+ Comment[wa]=Documint MS-Office
+ Comment[xh]=Umzobo we Microsoft Office
+-Comment[xx]=xxMicrosoft Office Drawingxx
+ Comment[zh_CN]=Microsoft Office 绘图
+ Comment[zh_TW]=MS Office 圖片
+ Comment[zu]=Umdwebo we-Microsoft Office
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/x-pcx.desktop kdelibs-branch-3.4/mimetypes/image/x-pcx.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/x-pcx.desktop 2005-01-20 23:24:25.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/x-pcx.desktop 2005-03-10 11:04:58.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=image
+ Patterns=*.pcx;*.PCX;
+ Comment=PCX Image
++Comment[af]=PCX Beeld
+ Comment[ar]=صورة PNG
+ Comment[az]=PCX Rəsmi
+ Comment[be]=Выява PCX
+@@ -68,7 +69,6 @@
+ Comment[ven]=Tshifanyiso tsha PNG
+ Comment[wa]=Imådje PCX
+ Comment[xh]=Umfanekiso we PCX
+-Comment[xx]=xxPCX Imagexx
+ Comment[zh_CN]=PCX 图像
+ Comment[zh_TW]=PCX 影像
+ Comment[zu]=Isithombe se-PCX
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/x-photo-cd.desktop kdelibs-branch-3.4/mimetypes/image/x-photo-cd.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/x-photo-cd.desktop 2005-01-20 23:24:25.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/x-photo-cd.desktop 2005-03-07 09:13:46.000000000 -0500
+@@ -69,7 +69,6 @@
+ Comment[ven]=Tshifanyiso tsha tshinepe tsha CD
+ Comment[wa]=Imådje PhotoCD
+ Comment[xh]=Umfanekiso we PhotoCD
+-Comment[xx]=xxPhotoCD Imagexx
+ Comment[zh_CN]=PhotoCD 图像
+ Comment[zh_TW]=PhotoCD 影像
+ Comment[zu]=Isithombe Sesithombe se-CD
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/x-portable-bitmap.desktop kdelibs-branch-3.4/mimetypes/image/x-portable-bitmap.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/x-portable-bitmap.desktop 2005-01-20 23:24:25.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/x-portable-bitmap.desktop 2005-03-07 09:13:46.000000000 -0500
+@@ -10,6 +10,7 @@
+ Comment[az]=Portable Bitmap Rəsmi
+ Comment[bg]=Изображение Portable Bitmap
+ Comment[bn]=পোর্টেবল বিটম্যাপ চিত্র
++Comment[br]=Skeudenn Portable Bitmap
+ Comment[bs]=Portable Bitmap slika
+ Comment[ca]=Imatge portable mapa de píxels
+ Comment[cs]= Formát "Portable Bitmap"
+@@ -66,7 +67,6 @@
+ Comment[ven]=Tshifanyiso tsha Bitmap i fareaho
+ Comment[wa]=Imådje PBM
+ Comment[xh]=Umfaneksio Ophathekayo we Bitmap
+-Comment[xx]=xxPortable Bitmap Imagexx
+ Comment[zh_CN]=便携位图图像
+ Comment[zh_TW]=可攜式點陣檔案格式
+ Comment[zu]=Isithombe Semephu yebit Esiphathekayo
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/x-portable-greymap.desktop kdelibs-branch-3.4/mimetypes/image/x-portable-greymap.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/x-portable-greymap.desktop 2005-01-20 23:24:25.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/x-portable-greymap.desktop 2005-03-07 09:13:46.000000000 -0500
+@@ -66,7 +66,6 @@
+ Comment[ven]=Tshifanyiso Graymap i farea
+ Comment[wa]=Imådje PPM
+ Comment[xh]=Umfanekiso Ophathekayo we Graymap
+-Comment[xx]=xxPortable Graymap Imagexx
+ Comment[zh_CN]=便携灰度图图像
+ Comment[zh_TW]=可攜式灰階檔案格式
+ Comment[zu]=Isithombe se-Graymap Esiphathekayo
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/x-portable-pixmap.desktop kdelibs-branch-3.4/mimetypes/image/x-portable-pixmap.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/x-portable-pixmap.desktop 2005-01-20 23:24:25.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/x-portable-pixmap.desktop 2005-03-07 09:13:46.000000000 -0500
+@@ -10,6 +10,7 @@
+ Comment[az]=Portable Pixmap Rəsmi
+ Comment[bg]=Изображение Portable Pixmap
+ Comment[bn]=পোর্টেবল পিক্সম্যাপ চিত্র
++Comment[br]=Skeudenn Portable Pixmap
+ Comment[bs]=Portable Pixmap slika
+ Comment[ca]=Imatge portable mapa de píxels
+ Comment[cs]=Formát "Portable Pixmap"
+@@ -66,7 +67,6 @@
+ Comment[ven]=Tshifanyiso tsha Pixmap yau farea
+ Comment[wa]=Imådje XPM
+ Comment[xh]=Umfanekiso Ophathekayo we Pixmap
+-Comment[xx]=xxPortable Pixmap Imagexx
+ Comment[zh_CN]=便携像素图图像
+ Comment[zh_TW]=可攜式像素檔案格式
+ Comment[zu]=Isithombe se-Pixmap Esiphathekayo
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/x-rgb.desktop kdelibs-branch-3.4/mimetypes/image/x-rgb.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/x-rgb.desktop 2005-02-23 00:05:03.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/x-rgb.desktop 2005-03-10 11:04:58.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=image
+ Patterns=*.rgb;*.RGB;*.rgba;*.RGBA;*.bw;*.BW;*.sgi;*.SGI
+ Comment=SGI Image (RGB)
++Comment[af]=SGI Beeld (RGB)
+ Comment[be]=Выява SGI (RGB)
+ Comment[bg]=Изображение SGI (RGB)
+ Comment[bn]=এস-জি-আই চিত্র (RGB)
+@@ -49,7 +50,7 @@
+ Comment[sk]=Obrázok SGI (RGB)
+ Comment[sl]=Slika SGI (RGB)
+ Comment[sr]=SGI слика (RGB)
+-Comment[sr@Latn]=SGI слика (RGB)
++Comment[sr@Latn]=SGI slika (RGB)
+ Comment[sv]=SGI-bild (RGB)
+ Comment[ta]=GIF பிம்பம்
+ Comment[tg]=Тасвири SGI (RGB)
+@@ -57,5 +58,4 @@
+ Comment[tr]=SGI Resmi (KYM)
+ Comment[uk]=Зображення SGI (RGB)
+ Comment[uz]=SGI-расм (RGB)
+-Comment[xx]=xxSGI Image (RGB)xx
+ Comment[zh_CN]=SGI 图像(RGB)
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/x-targa.desktop kdelibs-branch-3.4/mimetypes/image/x-targa.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/x-targa.desktop 2005-01-20 23:24:25.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/x-targa.desktop 2005-03-10 11:04:58.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=image
+ Patterns=*.tga;*.TGA;
+ Comment=Truevision Targa Image
++Comment[af]=Truevision Targa Beeld
+ Comment[ar]=صورة Truevision Targa
+ Comment[az]=Truevision Targa Rəsmi
+ Comment[be]=Выява Truevision Targa
+@@ -66,7 +67,6 @@
+ Comment[ven]=Tshifanyiso tsha Targa tsha mbonalelo ya vhukuma ya TIFF
+ Comment[wa]=Imådje Targa
+ Comment[xh]=Umfanekiso we Truevision Targa
+-Comment[xx]=xxTruevision Targa Imagexx
+ Comment[zh_CN]=Truevision Targa 图像
+ Comment[zh_TW]=Truevision Targa 圖形
+ Comment[zu]=Isithombe Sombono wangempela we-Targa
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/x-vnd.adobe.photoshop.desktop kdelibs-branch-3.4/mimetypes/image/x-vnd.adobe.photoshop.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/x-vnd.adobe.photoshop.desktop 2005-01-20 23:24:25.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/x-vnd.adobe.photoshop.desktop 2005-03-10 11:04:58.000000000 -0500
+@@ -5,6 +5,7 @@
+ MimeType=image/x-vnd.adobe.photoshop
+ Patterns=*.psd;*.PSD;
+ Comment=Adobe Photoshop Image
++Comment[af]=Adobe Photoshop Beeld
+ Comment[ar]=صورة أدوبي فوتوشوب
+ Comment[az]=Adobe Photoshop Rəsmi
+ Comment[be]=Выява Adobe Photoshop
+@@ -63,6 +64,5 @@
+ Comment[uk]=Зображення Adobe Photoshop
+ Comment[uz]=Adobe Photoshop-расм
+ Comment[wa]=Imådje Adobe Photoshop
+-Comment[xx]=xxAdobe Photoshop Imagexx
+ Comment[zh_CN]=Adobe Photoshop 图像
+ Comment[zh_TW]=Adobe Photoshop 影像
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/x-vnd.trolltech.qpicture.desktop kdelibs-branch-3.4/mimetypes/image/x-vnd.trolltech.qpicture.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/x-vnd.trolltech.qpicture.desktop 2005-01-20 23:24:25.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/x-vnd.trolltech.qpicture.desktop 2005-03-27 02:28:48.000000000 -0500
+@@ -5,10 +5,12 @@
+ MimeType=image/x-vnd.trolltech.qpicture
+ Patterns=*.qpic;
+ Comment=QPicture Metafile
++Comment[af]=QPicture Meta-Lêer
+ Comment[ar]=ملف QPicture
+ Comment[az]=QPicture Meta Faylı
+ Comment[bg]=Мета файл на QPicture
+ Comment[bn]=কিউ-পিকচার মেটা-ফাইল
++Comment[br]=Meta-restr QPicture
+ Comment[bs]=QPicture metadatoteka
+ Comment[ca]=Metafitxer de QPicture
+ Comment[cs]=Meta soubor QPicture
+@@ -26,7 +28,7 @@
+ Comment[fy]=QPicture Metatriem
+ Comment[ga]=Meiteachomhad QPicture
+ Comment[gl]=Metaficheiro de QPicture
+-Comment[he]=מטא-קובץ של QPicture
++Comment[he]=מטא־קובץ של QPicture
+ Comment[hi]=क्यूपिक्चर मेटाफ़ाइल
+ Comment[hr]=QPicture metadatoteka
+ Comment[hu]=QPicture-metafájl
+@@ -58,6 +60,5 @@
+ Comment[tr]=QPicture Meta Dosyası
+ Comment[uk]=Мета-файл QPicture (дані що містять опис даних)
+ Comment[uz]=QPicture мета-файли
+-Comment[xx]=xxQPicture Metafilexx
+ Comment[zh_CN]=QPicture 元文件
+ Comment[zh_TW]=QPicture Meta 檔案
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/x-wmf.desktop kdelibs-branch-3.4/mimetypes/image/x-wmf.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/x-wmf.desktop 2005-01-20 23:24:25.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/x-wmf.desktop 2005-03-27 02:28:48.000000000 -0500
+@@ -8,6 +8,7 @@
+ Comment[af]=Vensters Metaleêr
+ Comment[bg]=Мета файл на Windows
+ Comment[bn]=উইন্ডোস মেটাফাইল
++Comment[br]=Meta-restr Windows
+ Comment[ca]=Metafitxer de Windows
+ Comment[cs]=Metasoubor Windows
+ Comment[cy]=Metafile Windows
+@@ -22,7 +23,7 @@
+ Comment[fy]=Windows Metatriem
+ Comment[ga]=Windows MetaFile (WMF)
+ Comment[gl]=MetaFicheiro de Window
+-Comment[he]=מטא-קובץ של Windows
++Comment[he]=מטא־קובץ של Windows
+ Comment[hi]=विंडोज़ मेटाफ़ाइल
+ Comment[hu]=Windows-metafájl
+ Comment[id]=Berkas meta Windows
+@@ -57,6 +58,5 @@
+ Comment[uz]=Windows мета-файли
+ Comment[ven]=Matafaela ya dziwindo
+ Comment[xh]=Ifayile ye Meta ye Windows
+-Comment[xx]=xxWindows MetaFilexx
+ Comment[zh_CN]=Windows 元文件
+ Comment[zu]=Ama-window eMetaFayela
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/x-xbm.desktop kdelibs-branch-3.4/mimetypes/image/x-xbm.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/x-xbm.desktop 2005-02-16 23:18:43.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/x-xbm.desktop 2005-03-07 09:13:46.000000000 -0500
+@@ -69,7 +69,6 @@
+ Comment[ven]=Tshifanyiso tsha Bitmap tsha X
+ Comment[wa]=Imådje XBM
+ Comment[xh]=Umfanekiso we X BitMap
+-Comment[xx]=xxX BitMap Imagexx
+ Comment[zh_CN]=X 位图图像
+ Comment[zh_TW]=X 點陣影像
+ Comment[zu]=Isithombe se-X BitMap
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/x-xcf-gimp.desktop kdelibs-branch-3.4/mimetypes/image/x-xcf-gimp.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/x-xcf-gimp.desktop 2005-02-21 04:17:22.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/x-xcf-gimp.desktop 2005-03-07 09:13:46.000000000 -0500
+@@ -61,7 +61,6 @@
+ Comment[ven]=Tshivhumbeo tsha tshifanyiso tsha henefho tsha GIMP
+ Comment[wa]=Imådje native GIMP
+ Comment[xh]=Ufomato Lomfanekiso Wendawo ye GIMP
+-Comment[xx]=xxGIMP Native Image Formatxx
+ Comment[zh_CN]=GIMP 本地图像格式
+ Comment[zh_TW]=GIMP 原聲影像格式
+ Comment[zu]=Isakhiwo Sesithombe Sasendulo se-GIMP
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/x-xcursor.desktop kdelibs-branch-3.4/mimetypes/image/x-xcursor.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/x-xcursor.desktop 2004-12-29 12:52:17.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/x-xcursor.desktop 2005-03-10 11:04:58.000000000 -0500
+@@ -4,6 +4,7 @@
+ MimeType=image/x-xcursor
+ Icon=cursor
+ Comment=X11 Mouse Cursor
++Comment[af]=X11 Muis Wyser
+ Comment[ar]=مؤشر فأرة
+ Comment[az]=X11 Siçan Kursoru
+ Comment[bg]=Показалец на мишката
+@@ -61,7 +62,6 @@
+ Comment[uk]=Курсор мишки для X11
+ Comment[uz]=X11 сичқонча курсори
+ Comment[wa]=Cursoe X11 pol sori
+-Comment[xx]=xxX11 Mouse Cursorxx
+ Comment[zh_CN]=X11 鼠标光标
+ Comment[zh_TW]=X11 滑鼠游標
+
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/x-xfig.desktop kdelibs-branch-3.4/mimetypes/image/x-xfig.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/x-xfig.desktop 2005-01-20 23:24:25.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/x-xfig.desktop 2005-03-07 09:13:46.000000000 -0500
+@@ -72,7 +72,6 @@
+ Comment[vi]=File XFig
+ Comment[wa]=Fitchî XFig
+ Comment[xh]=Ifayile ye XFig
+-Comment[xx]=xxXFig Filexx
+ Comment[zh_CN]=XFig 文件
+ Comment[zh_TW]=XFig 檔案
+ Comment[zu]=Ifayela le-XFig
+diff -Nru kdelibs-release-3.4.0/mimetypes/image/x-xpm.desktop kdelibs-branch-3.4/mimetypes/image/x-xpm.desktop
+--- kdelibs-release-3.4.0/mimetypes/image/x-xpm.desktop 2005-02-16 23:18:43.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/image/x-xpm.desktop 2005-03-07 09:13:46.000000000 -0500
+@@ -69,7 +69,6 @@
+ Comment[ven]=Tshifanyiso tsha Pixmap tsha X
+ Comment[wa]=Imådje XPM
+ Comment[xh]=Umfanekiso we X PixMap
+-Comment[xx]=xxX PixMap Imagexx
+ Comment[zh_CN]=X 象素图图像
+ Comment[zh_TW]=X 像素影像
+ Comment[zu]=Isithombe se-XPixMap
+diff -Nru kdelibs-release-3.4.0/mimetypes/inode/block.desktop kdelibs-branch-3.4/mimetypes/inode/block.desktop
+--- kdelibs-release-3.4.0/mimetypes/inode/block.desktop 2005-01-20 23:24:26.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/inode/block.desktop 2005-03-07 09:13:47.000000000 -0500
+@@ -69,7 +69,6 @@
+ Comment[ven]=Maano a Buloko
+ Comment[vi]=Thiết bềEkhối(block device)
+ Comment[wa]=Éndjin blok
+-Comment[xx]=xxBlock Devicexx
+ Comment[zh_CN]=块设备
+ Comment[zh_TW]=區塊設備
+ Comment[zu]=Ithuluzi Lebhulogo
+diff -Nru kdelibs-release-3.4.0/mimetypes/inode/chardevice.desktop kdelibs-branch-3.4/mimetypes/inode/chardevice.desktop
+--- kdelibs-release-3.4.0/mimetypes/inode/chardevice.desktop 2005-01-20 23:24:26.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/inode/chardevice.desktop 2005-03-07 09:13:47.000000000 -0500
+@@ -68,7 +68,6 @@
+ Comment[vi]=Thiết bềEđặc tính(character device)
+ Comment[wa]=Éndjin caractere
+ Comment[xh]=Icebo Lophawu
+-Comment[xx]=xxCharacter Devicexx
+ Comment[zh_CN]=字符设备
+ Comment[zh_TW]=字元設備
+ Comment[zu]=Ithuluzi Lophawu
+diff -Nru kdelibs-release-3.4.0/mimetypes/inode/directory-locked.desktop kdelibs-branch-3.4/mimetypes/inode/directory-locked.desktop
+--- kdelibs-release-3.4.0/mimetypes/inode/directory-locked.desktop 2005-02-21 04:17:22.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/inode/directory-locked.desktop 2005-03-10 11:04:58.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=Locked Folder
++Comment[af]=Toegesluitte Gids
+ Comment[ar]=مجلد مقفل
+ Comment[az]=Qıfıllanmış Qovluq
+ Comment[bg]=Заключена директория
+@@ -59,7 +60,6 @@
+ Comment[uk]=Заблокована тека
+ Comment[uz]=Қулфланган жилд
+ Comment[wa]=Resseré ridant
+-Comment[xx]=xxLocked Folderxx
+ Comment[zh_CN]=锁定的文件夹
+ Comment[zh_TW]=鎖住的資料夾
+ Icon=folder_locked
+diff -Nru kdelibs-release-3.4.0/mimetypes/inode/directory.desktop kdelibs-branch-3.4/mimetypes/inode/directory.desktop
+--- kdelibs-release-3.4.0/mimetypes/inode/directory.desktop 2004-12-29 12:52:18.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/inode/directory.desktop 2005-03-10 11:04:58.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=Folder
++Comment[af]=Gids
+ Comment[ar]=مجلد
+ Comment[az]=Qovluq
+ Comment[be]=Тэчка
+@@ -58,7 +59,6 @@
+ Comment[uk]=Тека
+ Comment[uz]=Жилд
+ Comment[wa]=Ridant
+-Comment[xx]=xxFolderxx
+ Comment[zh_CN]=文件夹
+ Comment[zh_TW]=資料夾
+ Icon=folder
+diff -Nru kdelibs-release-3.4.0/mimetypes/inode/fifo.desktop kdelibs-branch-3.4/mimetypes/inode/fifo.desktop
+--- kdelibs-release-3.4.0/mimetypes/inode/fifo.desktop 2005-01-20 23:24:26.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/inode/fifo.desktop 2005-03-07 09:13:47.000000000 -0500
+@@ -64,7 +64,6 @@
+ Comment[vi]=Ô'ng dẫn (pipe)
+ Comment[wa]=Buze
+ Comment[xh]=Umbhobho
+-Comment[xx]=xxPipexx
+ Comment[zh_CN]=管道
+ Comment[zh_TW]=管線
+ Comment[zu]=Ipayipi
+diff -Nru kdelibs-release-3.4.0/mimetypes/inode/socket.desktop kdelibs-branch-3.4/mimetypes/inode/socket.desktop
+--- kdelibs-release-3.4.0/mimetypes/inode/socket.desktop 2005-01-20 23:24:26.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/inode/socket.desktop 2005-03-07 09:13:47.000000000 -0500
+@@ -54,7 +54,6 @@
+ Comment[vi]=Socket
+ Comment[wa]=Soket
+ Comment[xh]=Umngxunya
+-Comment[xx]=xxSocketxx
+ Comment[zh_CN]=套接字
+ Comment[zu]=Isokethi
+ Icon=socket
+diff -Nru kdelibs-release-3.4.0/mimetypes/message/news.desktop kdelibs-branch-3.4/mimetypes/message/news.desktop
+--- kdelibs-release-3.4.0/mimetypes/message/news.desktop 2005-02-23 00:05:04.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/message/news.desktop 2005-03-07 09:13:48.000000000 -0500
+@@ -65,7 +65,6 @@
+ Comment[uz]=Usenet янгиликлар хабари
+ Comment[ven]=Mulaedza wa mafhungo a vhukwamani hau shumisa
+ Comment[xh]=Umyalezo Weendaba we Usenet
+-Comment[xx]=xxUsenet News Messagexx
+ Comment[zh_CN]=新闻组新闻消息
+ Comment[zh_TW]=Usenet 新聞訊息
+ Comment[zu]=Umyalezo Wezindaba Zoxhumano lokusebenzisa
+diff -Nru kdelibs-release-3.4.0/mimetypes/message/rfc822.desktop kdelibs-branch-3.4/mimetypes/message/rfc822.desktop
+--- kdelibs-release-3.4.0/mimetypes/message/rfc822.desktop 2005-01-31 03:34:54.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/message/rfc822.desktop 2005-03-07 09:13:48.000000000 -0500
+@@ -70,7 +70,6 @@
+ Comment[ven]=Mulaedza wa Email
+ Comment[wa]=Emilaedje
+ Comment[xh]=Umyalezo we Email
+-Comment[xx]=xxEmail Messagexx
+ Comment[zh_CN]=电子邮件消息
+ Comment[zh_TW]=電子郵件
+ Comment[zu]=Umyalezo Weposi lekhomputha
+diff -Nru kdelibs-release-3.4.0/mimetypes/model/vrml.desktop kdelibs-branch-3.4/mimetypes/model/vrml.desktop
+--- kdelibs-release-3.4.0/mimetypes/model/vrml.desktop 2004-12-11 22:49:07.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/model/vrml.desktop 2005-03-10 11:04:59.000000000 -0500
+@@ -3,6 +3,7 @@
+ Type=MimeType
+ MimeType=model/vrml
+ Comment=VRML Model
++Comment[af]=VRML Module
+ Comment[ar]=نمودج VRML
+ Comment[az]=VRML Modeli
+ Comment[be]=VRML мадэль
+@@ -59,7 +60,6 @@
+ Comment[uk]=Модель VRML (тривимірні моделі)
+ Comment[uz]=VRML модели
+ Comment[wa]=Modele VRML
+-Comment[xx]=xxVRML Modelxx
+ Comment[zh_CN]=VRML 模块
+ Comment[zh_TW]=VRML 模型
+ Patterns=*.wrl;*.wrl.gz
+diff -Nru kdelibs-release-3.4.0/mimetypes/multipart/mixed.desktop kdelibs-branch-3.4/mimetypes/multipart/mixed.desktop
+--- kdelibs-release-3.4.0/mimetypes/multipart/mixed.desktop 2005-01-20 23:24:27.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/multipart/mixed.desktop 2005-03-07 09:13:48.000000000 -0500
+@@ -63,7 +63,6 @@
+ Comment[uz]=Compound ҳужжати
+ Comment[ven]=Manwalwa a Tshigwada
+ Comment[xh]=Uxwebhu Lwembumba
+-Comment[xx]=xxCompound Documentxx
+ Comment[zh_CN]=复合文档
+ Comment[zh_TW]=複合文件
+ Comment[zu]=Uhlu lwamafayela Eliphindwe kabili
+diff -Nru kdelibs-release-3.4.0/mimetypes/multipart/x-mixed-replace.desktop kdelibs-branch-3.4/mimetypes/multipart/x-mixed-replace.desktop
+--- kdelibs-release-3.4.0/mimetypes/multipart/x-mixed-replace.desktop 2005-02-21 04:17:23.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/multipart/x-mixed-replace.desktop 2005-03-07 09:13:48.000000000 -0500
+@@ -61,7 +61,6 @@
+ Comment[uz]=Маълумот оқими (Server Push)
+ Comment[ven]=Milambo ya data (U phusha ha data)
+ Comment[xh]=Umpompozo lwe Data (Utyilizo Lomncedisi)
+-Comment[xx]=xxStream of Data (Server Push)xx
+ Comment[zh_CN]=数据流(服务器推送)
+ Comment[zh_TW]=資料串流（伺服器推送）
+ Comment[zu]=Ukutanta kwe-Data (Ukududula Komlekeleli)
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/calendar.desktop kdelibs-branch-3.4/mimetypes/text/calendar.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/calendar.desktop 2005-01-20 23:24:27.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/calendar.desktop 2005-03-07 09:13:49.000000000 -0500
+@@ -65,7 +65,6 @@
+ Comment[ven]=Faela ya Khalenda
+ Comment[wa]=Fitchî calindrî iCalendar
+ Comment[xh]=Ifayile ye iCalendar
+-Comment[xx]=xxiCalendar Filexx
+ Comment[zh_CN]=iCalendar 文件
+ Comment[zh_TW]=iCalendar 文件
+ Comment[zu]=Ifayela Lekhalenda
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/css.desktop kdelibs-branch-3.4/mimetypes/text/css.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/css.desktop 2005-01-27 23:03:18.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/css.desktop 2005-03-07 09:13:49.000000000 -0500
+@@ -52,7 +52,6 @@
+ Comment[ven]=Tshitaela tshau peta kana u khavhisa bammbiri
+ Comment[vi]=CSS(Cascading Style Sheet)
+ Comment[xh]=Uhlobo lwekhasi Elingxangxazayo
+-Comment[xx]=xxCascading Style Sheetxx
+ Comment[zh_CN]=层叠样式表单
+ Comment[zu]=Iphepha Lesitayela Lokulandelanisa
+ Icon=txt
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/docbook.desktop kdelibs-branch-3.4/mimetypes/text/docbook.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/docbook.desktop 2005-01-20 23:24:27.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/docbook.desktop 2005-03-10 11:04:59.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=DocBook Document
++Comment[af]=DocBook Dokument
+ Comment[ar]=مستند DocBook
+ Comment[az]=DocBook Sənədi
+ Comment[be]=Дакумэнт DocBook
+@@ -60,7 +61,6 @@
+ Comment[uk]=Документ DocBook
+ Comment[uz]=DocBook ҳужжати
+ Comment[wa]=Documint DocBook
+-Comment[xx]=xxDocBook Documentxx
+ Comment[zh_CN]=DocBook 文档
+ Comment[zh_TW]=DocBook 文件
+ Icon=wordprocessing
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/enriched.desktop kdelibs-branch-3.4/mimetypes/text/enriched.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/enriched.desktop 2005-01-20 23:24:27.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/enriched.desktop 2005-03-10 11:04:59.000000000 -0500
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ MimeType=text/enriched
+ Comment=Lightly Enriched Text Document
++Comment[af]='Lightly Enriched' Teks Dokument
+ Comment[az]=Həfifcə Zənginləşdirilmiş Mətn Sənədi
+ Comment[bg]=Леко разширен текстов файл (Lightly Enriched)
+ Comment[bs]=Lightly Enriched tekst dokument
+@@ -52,7 +53,6 @@
+ Comment[tr]=Biraz Zenginleştirilmiş Metin Dosyası
+ Comment[uk]=Злегка збагачений текстовий документ
+ Comment[wa]=Documint tecse ledjirmint eritchî
+-Comment[xx]=xxLightly Enriched Text Documentxx
+ Comment[zh_CN]=轻装的丰富文本文档
+ Comment[zh_TW]=Lightly Enriched 文件檔案
+ Icon=txt
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/html.desktop kdelibs-branch-3.4/mimetypes/text/html.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/html.desktop 2004-12-29 12:52:19.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/html.desktop 2005-03-10 11:04:59.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=HTML Document
++Comment[af]=HTML Dokument
+ Comment[ar]=مستند HTML
+ Comment[az]=HTML Sənədi
+ Comment[be]=Дакумэнт HTML
+@@ -60,7 +61,6 @@
+ Comment[uk]=Документ HTML
+ Comment[uz]=HTML ҳужжати
+ Comment[wa]=Documint HTML
+-Comment[xx]=xxHTML Documentxx
+ Comment[zh_CN]=HTML 文档
+ Comment[zh_TW]=HTML 文件
+ Icon=html
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/javascript.desktop kdelibs-branch-3.4/mimetypes/text/javascript.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/javascript.desktop 2005-02-23 00:05:05.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/javascript.desktop 2005-03-30 01:47:23.000000000 -0500
+@@ -3,6 +3,7 @@
+ MimeType=text/javascript
+ Icon=Script
+ Comment=JavaScript File
++Comment[af]=JavaScript Lêer
+ Comment[be]=Файл JavaScript
+ Comment[bg]=Изходен код на JavaScript
+ Comment[bn]=জাভাস্ক্রিপ্ট ফাইল
+@@ -12,6 +13,7 @@
+ Comment[cs]=JavaScript soubor
+ Comment[da]=JavaScript-fil
+ Comment[de]=JavaScript-Datei
++Comment[el]=Αρχείο κώδικα JavaScript
+ Comment[eo]=Javskripta dosiero
+ Comment[es]=Archivo JavaScipt
+ Comment[et]=JavaScripti fail
+@@ -43,13 +45,12 @@
+ Comment[sk]=Zdrojový kód JavaScript
+ Comment[sl]=Datoteka JavaScript
+ Comment[sr]=JavaScript фајл
+-Comment[sr@Latn]=JavaScript фајл
++Comment[sr@Latn]=JavaScript fajl
+ Comment[sv]=Javaskript-fil
+ Comment[ta]=ஜாவா மூலக் கோப்பு
+ Comment[tg]=Файли барномавии Java
+ Comment[tr]=JavaScript Dosyası
+ Comment[uk]=Файл JavaScript
+ Comment[uz]=JavaScript-файли
+-Comment[xx]=xxJavaScript Filexx
+ Comment[zh_CN]=JavaScript 文件
+ X-KDE-IsAlso=application/x-javascript
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/plain.desktop kdelibs-branch-3.4/mimetypes/text/plain.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/plain.desktop 2005-01-20 23:24:27.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/plain.desktop 2005-03-10 11:04:59.000000000 -0500
+@@ -2,10 +2,12 @@
+ Encoding=UTF-8
+ MimeType=text/plain
+ Comment=Plain Text Document
++Comment[af]=Eenvoudig Teks Dokument
+ Comment[ar]=مستند نصي
+ Comment[az]=Xam Mətn Sənədi
+ Comment[bg]=Текстов файл
+ Comment[bn]=প্লেইন টেক্সট নথী
++Comment[br]=Teul skrid eeun
+ Comment[bs]=Dokument sa čistim tekstom
+ Comment[ca]=Document de text pla
+ Comment[cs]=Prostý text
+@@ -59,7 +61,6 @@
+ Comment[uk]=Звичайний текст
+ Comment[uz]=Оддий матн файли
+ Comment[wa]=Documint e peur tecse
+-Comment[xx]=xxPlain Text Documentxx
+ Comment[zh_CN]=纯文本文档
+ Comment[zh_TW]=純文字檔案
+ Icon=txt
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/rdf.desktop kdelibs-branch-3.4/mimetypes/text/rdf.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/rdf.desktop 2005-01-26 23:09:27.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/rdf.desktop 2005-03-10 11:04:59.000000000 -0500
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ MimeType=text/rdf
+ Comment=Resource Description Framework File
++Comment[af]=Hulpbron Beskrywing Raamwerk Lêer
+ Comment[ar]=ملف إطار عمل لوصف الموارد
+ Comment[az]=Ehtiyat İzahatı Faylı
+ Comment[bg]=Файл за описание на ресурси (RDF)
+@@ -53,7 +54,6 @@
+ Comment[tr]=Kaynak Tanımlı Çerçeve Çalışma Dosyası
+ Comment[uk]=Файл структури опису ресурсів
+ Comment[uz]=RDF-файли
+-Comment[xx]=xxResource Description Framework Filexx
+ Comment[zh_CN]=资源描述框架文件
+ Comment[zh_TW]=資源描述框架 (RDF) 檔案
+ Icon=news
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/rss.desktop kdelibs-branch-3.4/mimetypes/text/rss.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/rss.desktop 2005-01-20 23:24:27.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/rss.desktop 2005-03-07 09:13:49.000000000 -0500
+@@ -61,7 +61,6 @@
+ Comment[ven]=Fhethu ha samari ha RDF
+ Comment[vi]=Tổng kết site RDF
+ Comment[xh]=Isishwankathelo Senxuwa le RDF
+-Comment[xx]=xxRDF Site Summaryxx
+ Comment[zh_CN]=RDF 站点摘要
+ Comment[zh_TW]=RDF 站台摘要
+ Comment[zu]=Ukubuyekezwa Sokubuyekezwa kwe-RDF
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/rtf.desktop kdelibs-branch-3.4/mimetypes/text/rtf.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/rtf.desktop 2004-12-29 12:52:19.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/rtf.desktop 2005-03-10 11:04:59.000000000 -0500
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ MimeType=text/rtf
+ Comment=RTF Document
++Comment[af]=RTF Dokument
+ Comment[ar]=مستند RTF
+ Comment[az]=RTF Sənədi
+ Comment[be]=Дакумэнт RTF
+@@ -61,7 +62,6 @@
+ Comment[uk]=Документ RTF
+ Comment[uz]=RTF ҳужжати
+ Comment[wa]=Documint RTF
+-Comment[xx]=xxRTF Documentxx
+ Comment[zh_CN]=RTF 文档
+ Comment[zh_TW]=RTF 文件
+ Icon=wordprocessing
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/sgml.desktop kdelibs-branch-3.4/mimetypes/text/sgml.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/sgml.desktop 2005-01-20 23:24:27.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/sgml.desktop 2005-03-07 09:13:49.000000000 -0500
+@@ -67,7 +67,6 @@
+ Comment[ven]=Manwalwa a SGML
+ Comment[wa]=Documint SGML
+ Comment[xh]=Uxwebhu lwe SGML
+-Comment[xx]=xxSGML Documentxx
+ Comment[zh_CN]=SGML 文档
+ Comment[zh_TW]=SGML 文件
+ Comment[zu]=Uhlu lwamafayela lwe-SGML
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/vnd.abc.desktop kdelibs-branch-3.4/mimetypes/text/vnd.abc.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/vnd.abc.desktop 2005-02-23 00:05:05.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/vnd.abc.desktop 2005-03-30 01:47:23.000000000 -0500
+@@ -4,15 +4,19 @@
+ Comment[bg]=Аудио файл ABC
+ Comment[bn]=এ-বি-সি মিউজিক ফাইল
+ Comment[br]=Restr ar sonerezh ABC
++Comment[bs]=ABC muzička datoteka
+ Comment[ca]=Fitxer de música ABC
+ Comment[cs]=Hudební soubor ABC
+ Comment[da]=ABC Musikfil
+ Comment[de]=ABC-Musikdatei
++Comment[el]=Αρχείο ήχου ABC
+ Comment[es]=Archivo de música ABC
+ Comment[et]=ABC muusikafail
+ Comment[eu]=ABC musika fitxategia
++Comment[fi]=ABC-musiikkitiedosto
+ Comment[fr]=Fichier musique ABC
+ Comment[fy]=ABC-Muzyktriem
++Comment[he]=קובץ מוסיקה של ABC
+ Comment[hi]=एबीसी संगीत फ़ाइल
+ Comment[hu]=ABC-zenefájl
+ Comment[is]=ABC tónlistarskrá
+@@ -33,13 +37,12 @@
+ Comment[sk]=Hudobný súbor ABC
+ Comment[sl]=Glasbena datoteka ABC
+ Comment[sr]=ABC музички фајл
+-Comment[sr@Latn]=ABC музички фајл
++Comment[sr@Latn]=ABC muzički fajl
+ Comment[sv]=ABC-musikfil
+ Comment[ta]=ஏபிசி இசை கோப்பு
+ Comment[tg]=Файли Мусикии ABC
+ Comment[tr]=ABC Müzik Dosyası
+ Comment[uk]=Файл музики ABC
+-Comment[xx]=xxABC Music Filexx
+ Comment[zh_CN]=ABC 音乐文件
+ Icon=sound
+ Type=MimeType
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/vnd.wap.wml.desktop kdelibs-branch-3.4/mimetypes/text/vnd.wap.wml.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/vnd.wap.wml.desktop 2005-01-20 23:24:27.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/vnd.wap.wml.desktop 2005-03-10 11:04:59.000000000 -0500
+@@ -5,6 +5,7 @@
+ MimeType=text/vnd.wap.wml
+ Patterns=*.wml;*.WML;
+ Comment=WML Document
++Comment[af]=WML Dokument
+ Comment[ar]=مستند WML
+ Comment[az]=WML Sənədi
+ Comment[be]=Дакумэнт WML
+@@ -69,7 +70,6 @@
+ Comment[ven]=Manwalwa a WML
+ Comment[wa]=Documint WML
+ Comment[xh]=Uxwebhu lwe WML
+-Comment[xx]=xxWML Documentxx
+ Comment[zh_CN]=WML 文档
+ Comment[zh_TW]=WML 文件
+ Comment[zu]=Uhlu lwamafayela lwe-WML
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/x-adasrc.desktop kdelibs-branch-3.4/mimetypes/text/x-adasrc.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/x-adasrc.desktop 2005-01-20 23:24:27.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/x-adasrc.desktop 2005-03-07 09:13:49.000000000 -0500
+@@ -65,7 +65,6 @@
+ Comment[ven]=Faela ya vhubvo ha Ada
+ Comment[wa]=Fitchî sourdant Ada
+ Comment[xh]=Ifayile Yemvelaphi ye Ada
+-Comment[xx]=xxAda Source Filexx
+ Comment[zh_CN]=Ada 源文件
+ Comment[zh_TW]=Ada 原始檔
+ Comment[zu]=Ifayela Lemvelaphi le-Ada
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/x-bibtex.desktop kdelibs-branch-3.4/mimetypes/text/x-bibtex.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/x-bibtex.desktop 2005-01-20 23:24:27.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/x-bibtex.desktop 2005-03-07 09:13:49.000000000 -0500
+@@ -63,7 +63,6 @@
+ Comment[ven]=Data yau talutshedza he wa wana hone zwishumiswa (bibtex)
+ Comment[wa]=Dinêyes bibiografikes (Bibtex)
+ Comment[xh]=Idata Yoluhlu lweencwadi zombhali nawuphi na (Bibtex)
+-Comment[xx]=xxBibliographic Data (Bibtex)xx
+ Comment[zh_CN]=书目数据(Bibtex)
+ Comment[zh_TW]=作者資料 (bibtex)
+ Comment[zu]=Idata Yokuqukethwe umlando (Bibtex)
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/x-c++hdr.desktop kdelibs-branch-3.4/mimetypes/text/x-c++hdr.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/x-c++hdr.desktop 2005-01-20 23:24:27.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/x-c++hdr.desktop 2005-03-07 09:13:49.000000000 -0500
+@@ -64,7 +64,6 @@
+ Comment[ven]=C++ Faela ya thoho
+ Comment[wa]=Fitchî di tiestire C++
+ Comment[xh]=C++ Ifayile Yokubhaliweyo okuphezulu kwephepa
+-Comment[xx]=xxC++ Header Filexx
+ Comment[zh_CN]=C++ 头文件
+ Comment[zh_TW]=C++ 標頭檔
+ Comment[zu]=Ifayela Lenhloko le-C++
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/x-c++src.desktop kdelibs-branch-3.4/mimetypes/text/x-c++src.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/x-c++src.desktop 2005-01-20 23:24:27.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/x-c++src.desktop 2005-03-07 09:13:49.000000000 -0500
+@@ -64,7 +64,6 @@
+ Comment[ven]=C++ Faela ya vhubvo
+ Comment[wa]=Fitchî sourdant C++
+ Comment[xh]=C++ Ifayile Yemvelaphi
+-Comment[xx]=xxC++ Source Filexx
+ Comment[zh_CN]=C++ 源文件
+ Comment[zh_TW]=C++ 原始檔
+ Comment[zu]=Ifayela Lemvelaphi le-C++
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/x-chdr.desktop kdelibs-branch-3.4/mimetypes/text/x-chdr.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/x-chdr.desktop 2005-01-20 23:24:27.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/x-chdr.desktop 2005-03-07 09:13:49.000000000 -0500
+@@ -64,7 +64,6 @@
+ Comment[ven]=C Faela ya Thoho
+ Comment[wa]=Fitchî tiestire C
+ Comment[xh]=C Ifayile Yokubhaliweyo okuphezulu kwephepha
+-Comment[xx]=xxC Header Filexx
+ Comment[zh_CN]=C 头文件
+ Comment[zh_TW]=C 標頭檔
+ Comment[zu]=Ifayela Lenhloko le-C
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/x-csrc.desktop kdelibs-branch-3.4/mimetypes/text/x-csrc.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/x-csrc.desktop 2005-01-20 23:24:27.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/x-csrc.desktop 2005-03-07 09:13:49.000000000 -0500
+@@ -64,7 +64,6 @@
+ Comment[ven]=C Faela ya Vhubvo
+ Comment[wa]=Fitchî sourdant C
+ Comment[xh]=C Ifayile Yemvelaphi
+-Comment[xx]=xxC Source Filexx
+ Comment[zh_CN]=C 源文件
+ Comment[zh_TW]=C 原始程式
+ Comment[zu]=Ifayela Lemvelaphi le-C
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/x-csv.desktop kdelibs-branch-3.4/mimetypes/text/x-csv.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/x-csv.desktop 2005-01-20 23:24:27.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/x-csv.desktop 2005-03-07 09:13:49.000000000 -0500
+@@ -68,7 +68,6 @@
+ Comment[ven]=Manwalwa a faela arena khoma yo fhandekanywaho nga maitele
+ Comment[wa]=Fitchî tecse avou les valixhances separêyes pa des comas
+ Comment[xh]=Ifayile Yombhalo Enamaxabiso Ohlulwe Ngesiphumlisi
+-Comment[xx]=xxText File with Comma Separated Valuesxx
+ Comment[zh_CN]=用逗号分隔值的文本文件
+ Comment[zh_TW]=用逗號分隔值的文字文件
+ Comment[zu]=Ifayela lombhalo ngamanani ahlukaniswe ngokhefane
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/x-diff.desktop kdelibs-branch-3.4/mimetypes/text/x-diff.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/x-diff.desktop 2005-01-20 23:24:27.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/x-diff.desktop 2005-03-26 02:37:25.000000000 -0500
+@@ -22,7 +22,7 @@
+ Comment[fa]=اختلافهای میان پروندهها
+ Comment[fi]=Tiedostojen väliset erot
+ Comment[fr]=Différences entre fichiers
+-Comment[fy]=Ferskil tusken triems
++Comment[fy]=Ferskil tusken triemen
+ Comment[ga]=Difríochtaí idir chomhaid
+ Comment[gl]=Diferencias Entre Ficheiros
+ Comment[he]=הבדלים בין קבצים
+@@ -65,7 +65,6 @@
+ Comment[ven]=Phambano vhukati ha dzifaela
+ Comment[wa]=Diferinces etur des fitchîs
+ Comment[xh]=Iyantlukwano Phakathi Kweefayile
+-Comment[xx]=xxDifferences Between Filesxx
+ Comment[zh_CN]=文件的差异
+ Comment[zh_TW]=在檔案間的差異
+ Comment[zu]=Amafayela phakathi komehluko
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/x-hex.desktop kdelibs-branch-3.4/mimetypes/text/x-hex.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/x-hex.desktop 2005-02-23 00:05:05.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/x-hex.desktop 2005-03-10 11:04:59.000000000 -0500
+@@ -6,6 +6,7 @@
+ X-KDE-IsAlso=text/plain
+ Patterns=*.HEX;*.hex;
+ Comment=Intel® Hexadecimal Object File Format
++Comment[af]=Intel® Heksadesimale Voorwerp Lêer Formaat
+ Comment[bg]=Шестнадесетичен обектен файлов формат на Intel®
+ Comment[bn]=ইনটেল® হেক্সাডেসিমাল অবজেক্ট ফাইল ফর্ম্যাট
+ Comment[ca]=Format de fitxer objecte hexadecimal Intel®
+@@ -40,11 +41,10 @@
+ Comment[sk]=Intel® hexadecimalný objektový súbor
+ Comment[sl]=Datotečna vrsta Intel® Hexadecimal Object
+ Comment[sr]=Intel® хексадецимални формат објектног фајла
+-Comment[sr@Latn]=Intel® хексадецимални формат објектног фајла
++Comment[sr@Latn]=Intel® heksadecimalni format objektnog fajla
+ Comment[sv]=Intel® hexadecimalt objektfilformat
+ Comment[ta]=Qt மெடா பொருள் கோப்பு
+ Comment[tg]=Андозаи Файли Объекти Intel® Hexadecimal
+ Comment[tr]=Intel® Onaltılık Nesne Dosya Biçimi
+ Comment[uk]=Файл в форматі Intel® Hexadecimal Object
+-Comment[xx]=xxIntel® Hexadecimal Object File Formatxx
+ Comment[zh_CN]=Intel® 十六进制目标文件
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/x-java.desktop kdelibs-branch-3.4/mimetypes/text/x-java.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/x-java.desktop 2005-01-20 23:24:27.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/x-java.desktop 2005-03-07 09:13:49.000000000 -0500
+@@ -64,7 +64,6 @@
+ Comment[ven]=Faela ya Vhubvo ha Java
+ Comment[wa]=Fitchî sourdant Java
+ Comment[xh]=Ifayile Yemvelaphi ye Java
+-Comment[xx]=xxJava Source Filexx
+ Comment[zh_CN]=Java 源文件
+ Comment[zh_TW]=Java 原始程式
+ Comment[zu]=Ifayela Lemvelaphi ye-Java
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/x-katefilelist.desktop kdelibs-branch-3.4/mimetypes/text/x-katefilelist.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/x-katefilelist.desktop 2005-02-23 00:05:05.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/x-katefilelist.desktop 2005-03-26 02:37:25.000000000 -0500
+@@ -20,7 +20,7 @@
+ Comment[fa]=سیاههی پرونده (برای متصلکنندهی بارکنندهی سیاههی پروندهی Kate)
+ Comment[fi]=Tiedostolista (Kate-tiedostolistalisäosalle)
+ Comment[fr]=Liste de fichiers (pour le chargeur de listes de fichiers de Kate)
+-Comment[fy]=Triemslist (foar de Kate-triemsplugin)
++Comment[fy]=Triemenlist (foar de Kate-triemenplugin)
+ Comment[gl]=Lista de Ficheiros (para o Plugin Cargador de Lista de Ficheiros de Kate)
+ Comment[he]=רשימת קבצים (עבור תוסף טעינת רשימות הקבצים של Kate)
+ Comment[hi]=फ़ाइल सूची(के-एटीई फ़ाइल लिस्ट लोडर प्लगिन के लिए)
+@@ -51,7 +51,7 @@
+ Comment[sl]=Seznam datotek (za vstavek seznama datotek Kate)
+ Comment[sq]=Lista e Skedarëve (për Shtojcën Kate File List Loader)
+ Comment[sr]=Листа фајлова (за Kate-ов прикључак за учитавање листе фајлова)
+-Comment[sr@Latn]=Lista fajlova (za Kate-ov dodatak za učitavanje liste fajlova)
++Comment[sr@Latn]=Lista fajlova (za Kate-ov priključak za učitavanje liste fajlova)
+ Comment[sv]=Fillista för (insticksprogram för Kates fillistladdare)
+ Comment[ta]=கோப்புப் பட்டியல் (கேட் கோப்புப் பட்டியல் ஏற்றச் செருகுப்பொருளுக்கு)
+ Comment[tg]=Рӯйхати Файл ( барои Файли Kate Модули Пурборкуни)
+@@ -61,7 +61,6 @@
+ Comment[ven]=Mutevhe wa Faela (Uitela pulagini ya tshihwesi tsha mutevhe wa faela wa Kate)
+ Comment[wa]=Djivêye di fitchîs (pol tchôke-divins tcherdjeu d' fitchî di Kate)
+ Comment[xh]=Uluhlu Lwefayile (zoluhlu Yomlayishi Weplagi efakwayo Yefayile ka Kate)
+-Comment[xx]=xxFile List (for the Kate File List Loader Plugin)xx
+ Comment[zh_CN]=文件列表(用于 Kate 文件列表装入器插件)
+ Comment[zh_TW]=檔案清單 (供 Kate 檔案清單載入器)
+ Comment[zu]=Uhlu Lwamafayela (Ukungena ngaphakathi Komlayishi Kwefayela Lohlu)
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/x-latex.desktop kdelibs-branch-3.4/mimetypes/text/x-latex.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/x-latex.desktop 2004-12-29 12:52:19.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/x-latex.desktop 2005-03-10 11:04:59.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=LaTeX Document
++Comment[af]=LaTeX Dokument
+ Comment[ar]=مستند LaTeX
+ Comment[az]=LaTeX Sənədi
+ Comment[be]=Дакумэнт LaTeX
+@@ -60,7 +61,6 @@
+ Comment[uk]=Документ LaTeX
+ Comment[uz]=LaTeX ҳужжати
+ Comment[wa]=Documint LaTeX
+-Comment[xx]=xxLaTeX Documentxx
+ Comment[zh_CN]=LaTeX 文档
+ Comment[zh_TW]=LaTex 文件
+ Icon=tex
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/x-ldif.desktop kdelibs-branch-3.4/mimetypes/text/x-ldif.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/x-ldif.desktop 2004-12-29 12:52:19.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/x-ldif.desktop 2005-03-10 11:04:59.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=LDAP Addressbook
++Comment[af]=LDAP Adresboek
+ Comment[ar]=دفتر عناوين LDAP
+ Comment[az]=LDAP Ünvan Kitabçası
+ Comment[be]=Адрасная кніга LDAP
+@@ -60,7 +61,6 @@
+ Comment[uk]=Адресна книга LDAP
+ Comment[uz]=LDAP манзиллар дафтари
+ Comment[wa]=Calpin d' adresses LDAP
+-Comment[xx]=xxLDAP Addressbookxx
+ Comment[zh_CN]=LDAP 地址簿
+ Comment[zh_TW]=LDAP 地址簿
+ Icon=vcard
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/x-log.desktop kdelibs-branch-3.4/mimetypes/text/x-log.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/x-log.desktop 2005-01-20 23:24:27.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/x-log.desktop 2005-03-07 09:13:49.000000000 -0500
+@@ -63,7 +63,6 @@
+ Comment[ven]=Faela yau apulifikhesheni yau loga
+ Comment[wa]=Fitchî djournå d' on programe
+ Comment[xh]=Isicelo Sefayile Yokungena
+-Comment[xx]=xxApplication Log Filexx
+ Comment[zh_CN]=应用程序日志文件
+ Comment[zh_TW]=應用程式日誌檔案
+ Comment[zu]=Ifayela Lokungena Lomyaleli
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/x-makefile.desktop kdelibs-branch-3.4/mimetypes/text/x-makefile.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/x-makefile.desktop 2004-12-29 12:52:19.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/x-makefile.desktop 2005-03-07 09:13:49.000000000 -0500
+@@ -26,7 +26,6 @@
+ Comment[uk]=Файл Makefile
+ Comment[ven]=Itanifaela
+ Comment[xh]=Yenza ifayile
+-Comment[xx]=xxMakefilexx
+ Comment[zu]=Yenza ifayela
+ Type=MimeType
+ Patterns=GNUmakefile;Makefile;makefile;Makefile.*;makefile.*
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/x-moc.desktop kdelibs-branch-3.4/mimetypes/text/x-moc.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/x-moc.desktop 2005-01-20 23:24:27.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/x-moc.desktop 2005-03-27 02:28:48.000000000 -0500
+@@ -24,7 +24,7 @@
+ Comment[fr]=Fichier Méta-objet pour Qt
+ Comment[fy]=Qt-Meta-Objekt-triem
+ Comment[gl]=Ficheiro Meta-Obxecto de Qt
+-Comment[he]=קובץ מטא-אובייקט של Qt
++Comment[he]=קובץ מטא־אובייקט של Qt
+ Comment[hi]=क्यूटी मेटा ओबजेक्ट फ़ाइल
+ Comment[hr]=Qt Meta objektna datoteka
+ Comment[hu]=Qt metaobjektum-fájl
+@@ -65,7 +65,6 @@
+ Comment[ven]=Meta faela ya tshithu ya Qt
+ Comment[vi]=File siêu đối tượng của Qt(meta object file)
+ Comment[xh]=Qt Meta Ifayile Yenjongo
+-Comment[xx]=xxQt Meta Object Filexx
+ Comment[zh_CN]=Qt 元目标文件
+ Comment[zh_TW]=Qt Meta 目標文件
+ Comment[zu]=Ifayela Lento ye-Meta lwe-Qt
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/x-mswinurl.desktop kdelibs-branch-3.4/mimetypes/text/x-mswinurl.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/x-mswinurl.desktop 2005-01-20 23:24:27.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/x-mswinurl.desktop 2005-03-07 09:13:49.000000000 -0500
+@@ -65,7 +65,6 @@
+ Comment[uz]=Интернет қисқартмаси
+ Comment[ven]=Tshikhau tsha Inithanete
+ Comment[xh]=Indlela ezimfutshane ze Internet
+-Comment[xx]=xxInternet Shortcutxx
+ Comment[zh_CN]=Internet 快捷方式
+ Comment[zh_TW]=網路捷徑
+ Comment[zu]=Indlela emfushane ye-Internet
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/x-objchdr.desktop kdelibs-branch-3.4/mimetypes/text/x-objchdr.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/x-objchdr.desktop 2005-02-23 00:05:05.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/x-objchdr.desktop 2005-03-30 01:47:23.000000000 -0500
+@@ -5,15 +5,19 @@
+ Comment[bg]=Заглавен файл на Objective-C
+ Comment[bn]=অবজেক্টিভ-সি হেডার ফাইল
+ Comment[br]=Restr reollin Objective-C
++Comment[bs]=Objective-C header datoteka
+ Comment[ca]=Fitxer de capçalera Objective-C
+ Comment[cs]=Hlavičkový soubor jazyka Objective C
+ Comment[da]=Objective-C Header-fil
+ Comment[de]=Objective C-Headerdatei
++Comment[el]=Αρχείο κεφαλίδας Objective-C
+ Comment[es]=Archivo de cabecera de Objective-C
+ Comment[et]=Objective-C päisefail
+ Comment[eu]=Objective-C goi-buruko fitxategia
++Comment[fi]=Objective-C -otsikko
+ Comment[fr]=Fichier en-tête Objective-C
+ Comment[fy]=Objektive-C koptekst-bestand
++Comment[he]=קובץ כותר של Objective-C
+ Comment[hi]=ऑब्जेक्टिव-सी हेडर फ़ाइल
+ Comment[hu]=Objective-C header fájl
+ Comment[is]=Objective-C header skrá
+@@ -33,13 +37,12 @@
+ Comment[sk]=Hlavičkový súbor Objective-C
+ Comment[sl]=Datoteka z glavo v Objective-C
+ Comment[sr]=Заглавље Objective-C-а
+-Comment[sr@Latn]=Заглавље Objective-C-а
++Comment[sr@Latn]=Zaglavlje Objective-C-a
+ Comment[sv]=Objective-C-deklarationsfil
+ Comment[ta]=Objective-C தலைப்பு கோப்பு
+ Comment[tg]=Сармояи Файли Objective-C
+ Comment[tr]=Objective-C Başlık Dosyası
+ Comment[uk]=Файл заголовків Objective-C
+-Comment[xx]=xxObjective-C Header Filexx
+ Comment[zh_CN]=Objective-C 头文件
+ Icon=source_h
+ Type=MimeType
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/x-objcsrc.desktop kdelibs-branch-3.4/mimetypes/text/x-objcsrc.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/x-objcsrc.desktop 2005-02-16 23:18:43.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/x-objcsrc.desktop 2005-03-07 09:13:49.000000000 -0500
+@@ -65,7 +65,6 @@
+ Comment[ven]=Faela ya Vhubvo ha C ha vhudi
+ Comment[wa]=Fitchî sourdant Objective C
+ Comment[xh]=Ifayile Yemvelaphi Yenjongo-C
+-Comment[xx]=xxObjective-C Source Filexx
+ Comment[zh_CN]=Objective-C 源文件
+ Comment[zh_TW]=Objective-C 原始碼
+ Comment[zu]=Ifayela lemvelaphi Lenhloso ka-C
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/x-pascal.desktop kdelibs-branch-3.4/mimetypes/text/x-pascal.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/x-pascal.desktop 2005-01-20 23:24:27.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/x-pascal.desktop 2005-03-07 09:13:49.000000000 -0500
+@@ -64,7 +64,6 @@
+ Comment[ven]=Faela ya Vhubvo ha Pascal
+ Comment[wa]=Fitchî sourdant Pascal
+ Comment[xh]=Ifayile Zemvelaphi ze Pascal
+-Comment[xx]=xxPascal Source Filexx
+ Comment[zh_CN]=Pascal 源文件
+ Comment[zh_TW]=Pascal 源碼
+ Comment[zu]=Ifayela Lemvelaphi ye-Pascal
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/x-tcl.desktop kdelibs-branch-3.4/mimetypes/text/x-tcl.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/x-tcl.desktop 2005-01-20 23:24:27.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/x-tcl.desktop 2005-03-07 09:13:49.000000000 -0500
+@@ -66,7 +66,6 @@
+ Comment[ven]=Faela ya Tcl
+ Comment[wa]=Fitchî Tcl
+ Comment[xh]=Ifayile ye Tcl
+-Comment[xx]=xxTcl Filexx
+ Comment[zh_CN]=Tcl 文件
+ Comment[zh_TW]=Tcl 檔案
+ Comment[zu]=Ifayela le-Tcl
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/x-tex.desktop kdelibs-branch-3.4/mimetypes/text/x-tex.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/x-tex.desktop 2005-01-20 23:24:27.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/x-tex.desktop 2005-03-07 09:13:49.000000000 -0500
+@@ -66,7 +66,6 @@
+ Comment[ven]=Faela ya TeX
+ Comment[wa]=Fitchî TeX
+ Comment[xh]=Ifayile ye TeX
+-Comment[xx]=xxTeX Filexx
+ Comment[zh_CN]=TeX 文件
+ Comment[zh_TW]=TeX 檔案
+ Comment[zu]=Ifayela le-TeX
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/x-vcalendar.desktop kdelibs-branch-3.4/mimetypes/text/x-vcalendar.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/x-vcalendar.desktop 2005-01-20 23:24:27.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/x-vcalendar.desktop 2005-03-11 03:25:15.000000000 -0500
+@@ -6,6 +6,7 @@
+ Comment[az]=vCalendar Dəyişdirmə Faylı
+ Comment[bg]=Файл за обмяна на vCalendar
+ Comment[bn]=vCalendar ইন্টারচেঞ্জ ফাইল
++Comment[br]=Restr eskemm vCalendar
+ Comment[bs]=vCalendar datoteka za razmjenu
+ Comment[ca]=Fitxer d'intercanvi del vCalendar
+ Comment[cs]=Výměnný soubor vCalendar
+@@ -59,7 +60,6 @@
+ Comment[uz]=vCalendar-файли
+ Comment[ven]=Faela ya shandukea ya khalenda ya v
+ Comment[xh]=Ifayile Etshintsha ngaphakathi ye vCalendar
+-Comment[xx]=xxvCalendar Interchange Filexx
+ Comment[zh_CN]=vCalendar 交换文件
+ Comment[zh_TW]=vCalendar 交換檔案
+ Comment[zu]=Ifayela Elinokushintsha ngaphakathi le-vCalendar
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/x-vcard.desktop kdelibs-branch-3.4/mimetypes/text/x-vcard.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/x-vcard.desktop 2005-01-20 23:24:27.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/x-vcard.desktop 2005-03-07 09:13:49.000000000 -0500
+@@ -67,7 +67,6 @@
+ Comment[ven]=Garata ya vhubindudzi ya Elekithironiki
+ Comment[vi]=Thẻ tín dụng điện tử (EBC)
+ Comment[xh]=Ikhadi Leshishini Lombane
+-Comment[xx]=xxElectronic Business Cardxx
+ Comment[zh_CN]=电子商业卡片
+ Comment[zh_TW]=電子商業卡片
+ Comment[zu]= Ikhadi Lebhizinisi Likagesi
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/x-xslfo.desktop kdelibs-branch-3.4/mimetypes/text/x-xslfo.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/x-xslfo.desktop 2005-01-20 23:24:27.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/x-xslfo.desktop 2005-03-07 09:13:49.000000000 -0500
+@@ -58,7 +58,6 @@
+ Comment[uz]=XSL формат қилиш объект файли
+ Comment[ven]=XSL yau vhumba tshithu tshga faela
+ Comment[xh]=XSL Ifomata Injongo Yefayile
+-Comment[xx]=xxXSL Formating Object Filexx
+ Comment[zh_CN]=XSL 格式对象文件
+ Comment[zh_TW]=XSL 格式物件檔案
+ Comment[zu]=Ifayela Lokubonisa Lesakhiwo se-XSL
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/x-xslt.desktop kdelibs-branch-3.4/mimetypes/text/x-xslt.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/x-xslt.desktop 2005-01-27 23:03:18.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/x-xslt.desktop 2005-03-07 09:13:49.000000000 -0500
+@@ -61,7 +61,6 @@
+ Comment[uz]=XSLT Stylesheet-файли
+ Comment[ven]=Faela ya tshitaela tsha bammbiri ya XSLT
+ Comment[xh]=XSLT Ifayile Yohlobo lwekhasi
+-Comment[xx]=xxXSLT Stylesheet Filexx
+ Comment[zh_CN]=XSLT 样式表文件
+ Comment[zh_TW]=XSLT 樣式表格檔案
+ Comment[zu]=Ifayela Lepheshana lesitayela lika-XSLT
+diff -Nru kdelibs-release-3.4.0/mimetypes/text/xml.desktop kdelibs-branch-3.4/mimetypes/text/xml.desktop
+--- kdelibs-release-3.4.0/mimetypes/text/xml.desktop 2004-12-29 12:52:19.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/text/xml.desktop 2005-03-10 11:04:59.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=XML Document
++Comment[af]=XML Dokument
+ Comment[ar]=مستند XML
+ Comment[az]=XML Sənədi
+ Comment[be]=Дакумэнт XML
+@@ -60,7 +61,6 @@
+ Comment[uk]=Документ XML
+ Comment[uz]=XML ҳужжати
+ Comment[wa]=Documint XML
+-Comment[xx]=xxXML Documentxx
+ Comment[zh_CN]=XML 文档
+ Comment[zh_TW]=XML 文件
+ Icon=html
+diff -Nru kdelibs-release-3.4.0/mimetypes/uri/mms.desktop kdelibs-branch-3.4/mimetypes/uri/mms.desktop
+--- kdelibs-release-3.4.0/mimetypes/uri/mms.desktop 2005-02-21 13:17:36.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/uri/mms.desktop 2005-03-27 02:28:49.000000000 -0500
+@@ -4,9 +4,13 @@
+ MimeType=uri/mms
+ Icon=video
+ Comment=mms: URIs
++Comment[br]=URIoù mms:
++Comment[bs]=mms: URI
+ Comment[cs]=mms: URI
+ Comment[da]=mms: URI'er
+ Comment[et]=mms: URI-d
++Comment[eu]=mms: URIak
++Comment[fi]=mms: URI
+ Comment[fr]=URIs mms:
+ Comment[fy]=mms: URI-adresse
+ Comment[hu]=mms: URI-k
+@@ -25,8 +29,7 @@
+ Comment[sk]=URI typu mms:
+ Comment[sl]=mms: URI-ji
+ Comment[sr]=mms: URI-ји
+-Comment[sr@Latn]=mms: URI-ји
++Comment[sr@Latn]=mms: URI-ji
+ Comment[sv]=mms: webbadresser
+ Comment[uk]=mms: URI
+-Comment[xx]=xxmms: URIsxx
+ Comment[zh_CN]=mms: URI
+diff -Nru kdelibs-release-3.4.0/mimetypes/uri/mmst.desktop kdelibs-branch-3.4/mimetypes/uri/mmst.desktop
+--- kdelibs-release-3.4.0/mimetypes/uri/mmst.desktop 2005-02-21 13:17:36.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/uri/mmst.desktop 2005-03-27 02:28:49.000000000 -0500
+@@ -4,9 +4,13 @@
+ MimeType=uri/mmst
+ Icon=video
+ Comment=mmst: URIs
++Comment[br]=URIoù mmst:
++Comment[bs]=mmst: URI
+ Comment[cs]=mmst: URI
+ Comment[da]=mmst: URI'er
+ Comment[et]=mmst: URI-d
++Comment[eu]=mmst: URIak
++Comment[fi]=mmst: URI
+ Comment[fr]=URIs mmst:
+ Comment[fy]=mmst: URI-adresse
+ Comment[hu]=mmst: URI-k
+@@ -25,8 +29,7 @@
+ Comment[sk]=URI typu mmst:
+ Comment[sl]=mmst: URI-ji
+ Comment[sr]=mmst: URI-ји
+-Comment[sr@Latn]=mmst: URI-ји
++Comment[sr@Latn]=mmst: URI-ji
+ Comment[sv]=mmst: webbadresser
+ Comment[uk]=mmst: URI
+-Comment[xx]=xxmmst: URIsxx
+ Comment[zh_CN]=mmst: URI
+diff -Nru kdelibs-release-3.4.0/mimetypes/uri/mmsu.desktop kdelibs-branch-3.4/mimetypes/uri/mmsu.desktop
+--- kdelibs-release-3.4.0/mimetypes/uri/mmsu.desktop 2005-02-21 13:17:36.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/uri/mmsu.desktop 2005-03-27 02:28:49.000000000 -0500
+@@ -4,9 +4,13 @@
+ MimeType=uri/mmsu
+ Icon=video
+ Comment=mmsu: URIs
++Comment[br]=URIoù mmsu:
++Comment[bs]=mmsu: URI
+ Comment[cs]=mmsu: URI
+ Comment[da]=mmsu: URI'er
+ Comment[et]=mmsu: URI-d
++Comment[eu]=mmsu: URIak
++Comment[fi]=mmsu: URI
+ Comment[fr]=URIs mmsu:
+ Comment[fy]=mmsu: URI-adresse
+ Comment[hu]=mmsu: URI-k
+@@ -25,8 +29,7 @@
+ Comment[sk]=URI typu mmsu:
+ Comment[sl]=mmsu: URI-ji
+ Comment[sr]=mmsu: URI-ји
+-Comment[sr@Latn]=mmsu: URI-ји
++Comment[sr@Latn]=mmsu: URI-ji
+ Comment[sv]=mmsu: webbadresser
+ Comment[uk]=mmsu: URI
+-Comment[xx]=xxmmsu: URIsxx
+ Comment[zh_CN]=mmsu: URI
+diff -Nru kdelibs-release-3.4.0/mimetypes/uri/pnm.desktop kdelibs-branch-3.4/mimetypes/uri/pnm.desktop
+--- kdelibs-release-3.4.0/mimetypes/uri/pnm.desktop 2005-02-21 13:17:36.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/uri/pnm.desktop 2005-03-27 02:28:49.000000000 -0500
+@@ -4,9 +4,13 @@
+ MimeType=uri/pnm
+ Icon=video
+ Comment=pnm: URIs
++Comment[br]=URIoù pnm:
++Comment[bs]=pnm: URI
+ Comment[cs]=pnm: URI
+ Comment[da]=pnm: URI'er
+ Comment[et]=pnm: URI-d
++Comment[eu]=pnm: URIak
++Comment[fi]=pnm: URI
+ Comment[fr]=URIs pnm:
+ Comment[fy]=pnm: URI-adresse
+ Comment[hu]=pnm: URI-k
+@@ -24,8 +28,7 @@
+ Comment[sk]=URI typu pnm:
+ Comment[sl]=pnm: URI-ji
+ Comment[sr]=pnm: URI-ији
+-Comment[sr@Latn]=pnm: URI-ији
++Comment[sr@Latn]=pnm: URI-iji
+ Comment[sv]=pnm: webbadresser
+ Comment[uk]=pnm: URI
+-Comment[xx]=xxpnm: URIsxx
+ Comment[zh_CN]=pnm: URI
+diff -Nru kdelibs-release-3.4.0/mimetypes/uri/rtspt.desktop kdelibs-branch-3.4/mimetypes/uri/rtspt.desktop
+--- kdelibs-release-3.4.0/mimetypes/uri/rtspt.desktop 2005-02-21 13:17:36.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/uri/rtspt.desktop 2005-03-27 02:28:49.000000000 -0500
+@@ -4,9 +4,13 @@
+ MimeType=uri/rtspt
+ Icon=video
+ Comment=rtspt: URIs
++Comment[br]=URIoù rtspt:
++Comment[bs]=rtspt: URI
+ Comment[cs]=rtspt: URI
+ Comment[da]=rtspt: URI'er
+ Comment[et]=rtspt: URI-d
++Comment[eu]=rtspt: URIak
++Comment[fi]=rtspt: URI
+ Comment[fr]=URIs rtspt:
+ Comment[fy]=rtspt: URI-adresse
+ Comment[hu]=rtspt: URI-k
+@@ -25,8 +29,7 @@
+ Comment[sk]=URI typu rtspt:
+ Comment[sl]=rtspt: URI-ji
+ Comment[sr]=rtspt: URI-ији
+-Comment[sr@Latn]=rtspt: URI-ији
++Comment[sr@Latn]=rtspt: URI-iji
+ Comment[sv]=rtspt: webbadresser
+ Comment[uk]=rtspt: URI
+-Comment[xx]=xxrtspt: URIsxx
+ Comment[zh_CN]=rtspt: URI
+diff -Nru kdelibs-release-3.4.0/mimetypes/uri/rtspu.desktop kdelibs-branch-3.4/mimetypes/uri/rtspu.desktop
+--- kdelibs-release-3.4.0/mimetypes/uri/rtspu.desktop 2005-02-21 13:17:36.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/uri/rtspu.desktop 2005-03-27 02:28:49.000000000 -0500
+@@ -4,9 +4,13 @@
+ MimeType=uri/rtspu
+ Icon=video
+ Comment=rtspu: URIs
++Comment[br]=URIoù rtspu:
++Comment[bs]=rtspu: URI
+ Comment[cs]=rtspu: URI
+ Comment[da]=rtspu: URI'er
+ Comment[et]=rtspu: URI-d
++Comment[eu]=rtspu: URIak
++Comment[fi]=rtspu: URI
+ Comment[fr]=URIs rtspu:
+ Comment[fy]=rtspu: URI-adresse
+ Comment[hu]=rtspu: URI-k
+@@ -25,8 +29,7 @@
+ Comment[sk]=URI typu rtspu:
+ Comment[sl]=rtspu: URI-ji
+ Comment[sr]=rtspu: URI-ији
+-Comment[sr@Latn]=rtspu: URI-ији
++Comment[sr@Latn]=rtspu: URI-iji
+ Comment[sv]=rtspu: webbadresser
+ Comment[uk]=rtspu: URI
+-Comment[xx]=xxrtspu: URIsxx
+ Comment[zh_CN]=rtspu: URI
+diff -Nru kdelibs-release-3.4.0/mimetypes/video/avi.desktop kdelibs-branch-3.4/mimetypes/video/avi.desktop
+--- kdelibs-release-3.4.0/mimetypes/video/avi.desktop 2005-01-20 23:24:29.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/video/avi.desktop 2005-03-07 09:13:51.000000000 -0500
+@@ -67,7 +67,6 @@
+ Comment[ven]=Vidio ya AVI ya microsoft
+ Comment[vi]=Video AVI của Microsoft
+ Comment[wa]=Videyo AVI
+-Comment[xx]=xxMicrosoft AVI Videoxx
+ Comment[zh_CN]=Microsoft AVI 视频
+ Comment[zh_TW]=微軟 AVI 視頻文件
+ Comment[zu]=Ividiyo le-Microsoft AVI
+diff -Nru kdelibs-release-3.4.0/mimetypes/video/mp4.desktop kdelibs-branch-3.4/mimetypes/video/mp4.desktop
+--- kdelibs-release-3.4.0/mimetypes/video/mp4.desktop 2005-02-02 00:14:07.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/video/mp4.desktop 2005-03-07 09:13:51.000000000 -0500
+@@ -60,7 +60,6 @@
+ Comment[uk]=Відео MPEG-4
+ Comment[uz]=MPEG-4 видео
+ Comment[wa]=Videyo MPEG-4
+-Comment[xx]=xxMPEG-4 Videoxx
+ Comment[zh_CN]=MPEG4 视频
+ Comment[zh_TW]=MPEG 視頻檔案
+ X-KDE-IsAlso=video/quicktime
+diff -Nru kdelibs-release-3.4.0/mimetypes/video/mpeg.desktop kdelibs-branch-3.4/mimetypes/video/mpeg.desktop
+--- kdelibs-release-3.4.0/mimetypes/video/mpeg.desktop 2005-02-02 00:14:07.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/video/mpeg.desktop 2005-03-07 09:13:51.000000000 -0500
+@@ -65,7 +65,6 @@
+ Comment[ven]=Vidio ya MPEG
+ Comment[vi]=Video MPEG
+ Comment[wa]=Videyo MPEG
+-Comment[xx]=xxMPEG Videoxx
+ Comment[zh_CN]=MPEG 视频
+ Comment[zh_TW]=MPEG 視頻文件
+ Comment[zu]=Ividiyo lwe-MPEG
+diff -Nru kdelibs-release-3.4.0/mimetypes/video/quicktime.desktop kdelibs-branch-3.4/mimetypes/video/quicktime.desktop
+--- kdelibs-release-3.4.0/mimetypes/video/quicktime.desktop 2005-02-02 00:14:07.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/video/quicktime.desktop 2005-03-07 09:13:51.000000000 -0500
+@@ -63,7 +63,6 @@
+ Comment[ven]=Vidio ya Tshifhinga tshau tavhanya
+ Comment[vi]=Video QuickTime
+ Comment[wa]=Videyo Quicktime
+-Comment[xx]=xxQuicktime Videoxx
+ Comment[zh_CN]=Quicktime 视频
+ Comment[zh_TW]=Quicktime 視頻文件
+ Comment[zu]=Ividiyo Yesikhathi Esheshayo
+diff -Nru kdelibs-release-3.4.0/mimetypes/video/vnd.rn-realvideo.desktop kdelibs-branch-3.4/mimetypes/video/vnd.rn-realvideo.desktop
+--- kdelibs-release-3.4.0/mimetypes/video/vnd.rn-realvideo.desktop 2005-01-04 22:58:40.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/video/vnd.rn-realvideo.desktop 2005-03-10 11:05:00.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=video
+ Patterns=*.rv;*.RV;
+ Comment=RealVideo File
++Comment[af]=RealVideo Lêer
+ Comment[ar]=ملف RealVideo
+ Comment[az]=RealVideo Faylı
+ Comment[be]=Файл RealAudio
+@@ -64,7 +65,6 @@
+ Comment[uk]=Файл RealVideo
+ Comment[uz]=RealVideo-файли
+ Comment[wa]=Fitchî RealVideo
+-Comment[xx]=xxRealVideo Filexx
+ Comment[zh_CN]=RealVideo 文件
+ Comment[zh_TW]=RealVideo 檔案
+
+diff -Nru kdelibs-release-3.4.0/mimetypes/video/x-flic.desktop kdelibs-branch-3.4/mimetypes/video/x-flic.desktop
+--- kdelibs-release-3.4.0/mimetypes/video/x-flic.desktop 2005-01-20 23:24:29.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/video/x-flic.desktop 2005-03-10 11:05:00.000000000 -0500
+@@ -5,6 +5,7 @@
+ Icon=video
+ Patterns=*.fli;*.flc;*.FLI;*.FLC;
+ Comment=Autodesk's FLIC File
++Comment[af]=Autodesk se FLIC Lêer
+ Comment[ar]=ملف FLIC لأوتوديسك
+ Comment[az]=Autodesk FLIC Faylı
+ Comment[be]=Autodesk FLIC файл
+@@ -67,7 +68,6 @@
+ Comment[ven]=Faela ya FLIC Autodesk
+ Comment[wa]=Fitchî FLIC d' Autodesk
+ Comment[xh]=Iifayile ezenzekelayo ye FLIC
+-Comment[xx]=xxAutodesk's FLIC Filexx
+ Comment[zh_CN]=Autodesk FLIC 文件
+ Comment[zh_TW]=Autodesk 的 FLIC 文件
+ Comment[zu]=Ifayela Ledeski elizenzekelayo le-FLIC
+diff -Nru kdelibs-release-3.4.0/mimetypes/video/x-matroska.desktop kdelibs-branch-3.4/mimetypes/video/x-matroska.desktop
+--- kdelibs-release-3.4.0/mimetypes/video/x-matroska.desktop 2005-02-02 00:14:07.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/video/x-matroska.desktop 2005-03-07 09:13:51.000000000 -0500
+@@ -58,6 +58,5 @@
+ Comment[uk]=Відео "Матрьошка"
+ Comment[uz]=Matroska видео
+ Comment[wa]=Videyo Matroska
+-Comment[xx]=xxMatroska Videoxx
+ Comment[zh_CN]=Matroska 视频
+ Comment[zh_TW]=Matroska 視頻檔案
+diff -Nru kdelibs-release-3.4.0/mimetypes/video/x-mng.desktop kdelibs-branch-3.4/mimetypes/video/x-mng.desktop
+--- kdelibs-release-3.4.0/mimetypes/video/x-mng.desktop 2005-01-20 23:24:29.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/video/x-mng.desktop 2005-03-07 09:13:51.000000000 -0500
+@@ -70,7 +70,6 @@
+ Comment[ven]=Tshifanyiso tsha MNG
+ Comment[wa]=Imådje MNG
+ Comment[xh]=Umfanekiso we MNG
+-Comment[xx]=xxMNG Imagexx
+ Comment[zh_CN]=MNG 图像
+ Comment[zh_TW]=MNG 影像
+ Comment[zu]=Isithombe se-MNG
+diff -Nru kdelibs-release-3.4.0/mimetypes/video/x-ms-asf.desktop kdelibs-branch-3.4/mimetypes/video/x-ms-asf.desktop
+--- kdelibs-release-3.4.0/mimetypes/video/x-ms-asf.desktop 2005-01-20 23:24:29.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/video/x-ms-asf.desktop 2005-03-07 09:13:51.000000000 -0500
+@@ -61,7 +61,6 @@
+ Comment[tr]=ASF dosyası
+ Comment[uk]=Носій ASF
+ Comment[uz]=ASF медиа-файли
+-Comment[xx]=xxASF Mediaxx
+ Comment[zh_CN]=ASF 媒体
+ Comment[zh_TW]=ASF 媒體
+ Comment[zu]=Abasiki bebunda be-ASF
+diff -Nru kdelibs-release-3.4.0/mimetypes/video/x-ms-wmv.desktop kdelibs-branch-3.4/mimetypes/video/x-ms-wmv.desktop
+--- kdelibs-release-3.4.0/mimetypes/video/x-ms-wmv.desktop 2005-02-02 00:14:08.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/video/x-ms-wmv.desktop 2005-03-10 11:05:00.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=Windows Media Video
++Comment[af]=Windows Media Lêer
+ Comment[ar]=ملف فيديو Windows Media
+ Comment[az]=Windows Mediya Video Faylı
+ Comment[be]=Windows Media відэа
+@@ -57,7 +58,6 @@
+ Comment[uk]=Відео кліп Windows Media
+ Comment[uz]=Windows Media видео
+ Comment[wa]=Videyo Windows Media
+-Comment[xx]=xxWindows Media Videoxx
+ Comment[zh_CN]=Windows Media 视频
+ Comment[zh_TW]=WIndows Media 視頻檔案
+ Hidden=false
+diff -Nru kdelibs-release-3.4.0/mimetypes/video/x-msvideo.desktop kdelibs-branch-3.4/mimetypes/video/x-msvideo.desktop
+--- kdelibs-release-3.4.0/mimetypes/video/x-msvideo.desktop 2005-01-20 23:24:29.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/video/x-msvideo.desktop 2005-03-07 09:13:51.000000000 -0500
+@@ -66,7 +66,6 @@
+ Comment[ven]=Vidio ya AVI ya microsoft
+ Comment[vi]=Video AVI của Microsoft
+ Comment[wa]=Videyo AVI
+-Comment[xx]=xxMicrosoft AVI Videoxx
+ Comment[zh_CN]=Microsoft AVI 视频
+ Comment[zh_TW]=微軟 AVI 視頻文件
+ Comment[zu]=Ividiyo le-Microsoft AVI
+diff -Nru kdelibs-release-3.4.0/mimetypes/video/x-ogm.desktop kdelibs-branch-3.4/mimetypes/video/x-ogm.desktop
+--- kdelibs-release-3.4.0/mimetypes/video/x-ogm.desktop 2005-02-02 00:14:08.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/video/x-ogm.desktop 2005-03-07 09:13:51.000000000 -0500
+@@ -61,6 +61,5 @@
+ Comment[uk]=Відео Ogg/Ogm
+ Comment[uz]=Ogg/Ogm видео
+ Comment[wa]=Videyo Ogg/Ogm
+-Comment[xx]=xxOgg/Ogm Videoxx
+ Comment[zh_CN]=Ogg/Ogm 视频
+ Comment[zh_TW]=Ogg/Ogm 視頻檔案
+diff -Nru kdelibs-release-3.4.0/mimetypes/video/x-theora.desktop kdelibs-branch-3.4/mimetypes/video/x-theora.desktop
+--- kdelibs-release-3.4.0/mimetypes/video/x-theora.desktop 2005-02-02 00:14:08.000000000 -0500
++++ kdelibs-branch-3.4/mimetypes/video/x-theora.desktop 2005-03-07 09:13:51.000000000 -0500
+@@ -59,6 +59,5 @@
+ Comment[uk]=Відео Theora
+ Comment[uz]=Theora видео
+ Comment[wa]=Videyo Theora
+-Comment[xx]=xxTheora Videoxx
+ Comment[zh_CN]=Theora 文件
+ Comment[zh_TW]=Theora 視頻檔案
+diff -Nru kdelibs-release-3.4.0/pics/crystalsvg/index.theme kdelibs-branch-3.4/pics/crystalsvg/index.theme
+--- kdelibs-release-3.4.0/pics/crystalsvg/index.theme 2005-02-23 00:05:06.000000000 -0500
++++ kdelibs-branch-3.4/pics/crystalsvg/index.theme 2005-03-10 11:05:00.000000000 -0500
+@@ -8,15 +8,16 @@
+ Name[ro]=Cristal SVG
+ Name[ru]=Изображение Crystal SVG
+ Name[sr]=Кристалl СВГ
+-Name[sr@Latn]=Кристалl СВГ
++Name[sr@Latn]=Kristall SVG
+ Name[sv]=Kristall SVG
+ Name[ta]=க்ரிஸ்டல் எஸ்விஜி
+-Name[xx]=xxCrystal SVGxx
+ Name[zh_CN]=水晶 SVG
+ Comment=Icon Theme by Everaldo.com Design Studio
++Comment[af]=Ikoon Tema deur Everaldo.com Design Studio
+ Comment[be]=Тэма піктаграмаў ад студыі дызайну Everaldo.com
+ Comment[bg]=Тема с икони от Евералдо (www.everaldo.com)
+ Comment[bn]=এভারাল্ডোর (www.everaldo.com) তৈরি আইকন থিম
++Comment[br]=Giz arlun gant Everaldo.com Design Studio
+ Comment[bs]=Tema ikona, pravio Everaldo.com dizajn studio
+ Comment[ca]=Tema d'icones de l'estudi de disseny Everaldo.com
+ Comment[cs]=Motiv ikon studia Everaldo.com
+@@ -55,14 +56,13 @@
+ Comment[sk]=Téma ikon od Everaldo.com Design Studio
+ Comment[sl]=Ikonska tema od oblikovalskega sutida Everaldo.com
+ Comment[sr]=Тема икона Everaldo.com дизајнерског студија
+-Comment[sr@Latn]=Тема икона Everaldo.com дизајнерског студија
++Comment[sr@Latn]=Tema ikona Everaldo.com dizajnerskog studija
+ Comment[sv]=Ikontema av Everaldo.com designstudio
+ Comment[ta]=எவரால்டோ.காம் வடிவமைப்பு படப்பிடிப்பகத்தின் சின்னம்
+ Comment[tg]=Мавзӯъҳои нишонаҳо аз Эвералдо мебошад (www.everaldo.com)
+ Comment[tr]=Simge Teması: Everaldo.com Tasarım Stüdyosu
+ Comment[uk]=Тема піктограм від студії дизайну Everaldo.com
+ Comment[uz]=Everaldo.com дизайн студиоси томонидан нишончалар мавзуси
+-Comment[xx]=xxIcon Theme by Everaldo.com Design Studioxx
+ Comment[zh_CN]=Everaldo 设计工作室制作的图标主题
+ DisplayDepth=32
+
+diff -Nru kdelibs-release-3.4.0/pics/hicolor/index.theme kdelibs-branch-3.4/pics/hicolor/index.theme
+--- kdelibs-release-3.4.0/pics/hicolor/index.theme 2005-02-23 00:05:07.000000000 -0500
++++ kdelibs-branch-3.4/pics/hicolor/index.theme 2005-03-27 02:28:49.000000000 -0500
+@@ -43,12 +43,12 @@
+ Name[uk]=Багатокольорова KDE
+ Name[ven]=Muvhala wa ntha wa-KDE
+ Name[wa]=KDE-HôtèsColeurs
+-Name[xx]=xxKDE-HiColorxx
+ Name[zh_CN]=KDE 高色彩
+ Name[zh_TW]=KDE 高彩
+ Name[zu]=Umbala Ophezulu lwe-KDE
+ Comment=Fallback icon theme
+ Comment[bg]=Тема с икони с висококачествени цветове (24, 32 бита)
++Comment[bs]=Standardna tema ikona
+ Comment[ca]=Tema d'icona de reserva
+ Comment[cs]=Záložní motiv ikon
+ Comment[da]=Ikontema at falde tilbage til
+@@ -56,8 +56,10 @@
+ Comment[es]=Tema de iconos de respaldo
+ Comment[et]=Vaikimisi ikooniteema
+ Comment[eu]=Fallback icono gaia
++Comment[fi]=Varmistuskuvaketeema
+ Comment[fr]=Revenir au thème d'icônes
+ Comment[fy]=Standert Ikoan tema
++Comment[he]=ערכת סמלים לגיבוי
+ Comment[hi]=फालबैक प्रतीक प्रसंग
+ Comment[hu]=Másodlagos ikontéma
+ Comment[is]=Sjálfgefin táknmyndaþema
+@@ -76,12 +78,11 @@
+ Comment[sk]=Náhradná téma ikon
+ Comment[sl]=Ikonska tema Fallback
+ Comment[sr]=Резервна тема икона
+-Comment[sr@Latn]=Резервна тема икона
++Comment[sr@Latn]=Rezervna tema ikona
+ Comment[sv]=Reservikontema
+ Comment[ta]=பின்விழும் சின்ன தலைப்பு
+ Comment[tg]=Мавзӯъи рангбаландии нишонаҳо
+ Comment[uk]=Основна тема піктограм
+-Comment[xx]=xxFallback icon themexx
+ Comment[zh_CN]=默认图标主题
+ DisplayDepth=32
+ Example=exec
Added: branches/kde-3.4.0/packages/kdelibs/debian/patches/16_default_fonts.diff
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/patches/16_default_fonts.diff 2005-04-05 22:31:25 UTC (rev 976)
+++ branches/kde-3.4.0/packages/kdelibs/debian/patches/16_default_fonts.diff 2005-04-06 22:56:40 UTC (rev 977)
@@ -0,0 +1,67 @@
+diff -Nrua kde.orig/kdecore/kglobalsettings.cpp kde.patched/kdecore/kglobalsettings.cpp
+--- kde.orig/kdecore/kglobalsettings.cpp 2005-02-23 06:56:40.000000000 -0500
++++ kde.patched/kdecore/kglobalsettings.cpp 2005-04-05 07:57:44.000000000 -0400
+@@ -321,8 +321,8 @@
+ return *_generalFont;
+
+ // Sync default with kdebase/kcontrol/fonts/fonts.cpp
+- _generalFont = new QFont("helvetica", 12);
+- _generalFont->setPointSize(12);
++ _generalFont = new QFont("sans serif", 10);
++ _generalFont->setPointSize(10);
+ _generalFont->setStyleHint(QFont::SansSerif);
+
+ KConfigGroup g( KGlobal::config(), "General" );
+@@ -337,8 +337,8 @@
+ return *_fixedFont;
+
+ // Sync default with kdebase/kcontrol/fonts/fonts.cpp
+- _fixedFont = new QFont("courier", 12);
+- _fixedFont->setPointSize(12);
++ _fixedFont = new QFont("monospace", 10);
++ _fixedFont->setPointSize(10);
+ _fixedFont->setStyleHint(QFont::TypeWriter);
+
+ KConfigGroup g( KGlobal::config(), "General" );
+@@ -353,7 +353,7 @@
+ return *_toolBarFont;
+
+ // Sync default with kdebase/kcontrol/fonts/fonts.cpp
+- _toolBarFont = new QFont("helvetica", 10);
++ _toolBarFont = new QFont("sans serif", 10);
+ _toolBarFont->setPointSize(10);
+ _toolBarFont->setStyleHint(QFont::SansSerif);
+
+@@ -369,8 +369,8 @@
+ return *_menuFont;
+
+ // Sync default with kdebase/kcontrol/fonts/fonts.cpp
+- _menuFont = new QFont("helvetica", 12);
+- _menuFont->setPointSize(12);
++ _menuFont = new QFont("sans serif", 10);
++ _menuFont->setPointSize(10);
+ _menuFont->setStyleHint(QFont::SansSerif);
+
+ KConfigGroup g( KGlobal::config(), "General" );
+@@ -385,8 +385,8 @@
+ return *_windowTitleFont;
+
+ // Sync default with kdebase/kcontrol/fonts/fonts.cpp
+- _windowTitleFont = new QFont("helvetica", 12, QFont::Bold);
+- _windowTitleFont->setPointSize(12);
++ _windowTitleFont = new QFont("sans serif", 10, QFont::Bold);
++ _windowTitleFont->setPointSize(10);
+ _windowTitleFont->setStyleHint(QFont::SansSerif);
+
+ KConfigGroup g( KGlobal::config(), "WM" );
+@@ -401,8 +401,8 @@
+ return *_taskbarFont;
+
+ // Sync default with kdebase/kcontrol/fonts/fonts.cpp
+- _taskbarFont = new QFont("helvetica", 11);
+- _taskbarFont->setPointSize(11);
++ _taskbarFont = new QFont("sans serif", 10);
++ _taskbarFont->setPointSize(10);
+ _taskbarFont->setStyleHint(QFont::SansSerif);
+
+ KConfigGroup g( KGlobal::config(), "General" );
Modified: branches/kde-3.4.0/packages/kdelibs/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/patches/98_buildprep.diff 2005-04-05 22:31:25 UTC (rev 976)
+++ branches/kde-3.4.0/packages/kdelibs/debian/patches/98_buildprep.diff 2005-04-06 22:56:40 UTC (rev 977)
@@ -1,12 +1,12 @@
#DPATCHLEVEL=1
-diff -Nrua kdelibs-3.4.0.orig/Makefile.in kdelibs-3.4.0/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/Makefile.in kdelibs-3.4.0/Makefile.in
--- kdelibs-3.4.0.orig/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/Makefile.in 2005-03-18 16:04:58.000000000 -0500
++++ kdelibs-3.4.0/Makefile.in 2005-04-06 13:01:26.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -124,10 +124,27 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/acinclude.m4 kdelibs-3.4.0/acinclude.m4
+diff -Nru kdelibs-3.4.0.orig/acinclude.m4 kdelibs-3.4.0/acinclude.m4
--- kdelibs-3.4.0.orig/acinclude.m4 2005-03-04 08:20:24.000000000 -0500
-+++ kdelibs-3.4.0/acinclude.m4 2005-03-18 16:00:47.000000000 -0500
-@@ -1682,15 +1682,6 @@
++++ kdelibs-3.4.0/acinclude.m4 2005-04-06 12:56:22.000000000 -0400
+@@ -1644,7 +1644,15 @@
+
+ AC_MSG_RESULT([$kde_cv_uic_plugins])
+ if test "$kde_cv_uic_plugins" != yes; then
+- AC_MSG_ERROR([you need to install kdelibs first.])
++ AC_MSG_ERROR([
++you need to install kdelibs first.
++
++If you did install kdelibs, then the Qt version that is picked up by
++this configure is not the same version you used to compile kdelibs.
++The Qt Plugin installed by kdelibs is *ONLY* loadable if its the
++same Qt version, compiled with the same compiler and the same Qt
++configuration settings.
++])
+ fi
+ fi
+ ])
+@@ -1682,15 +1690,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -143,7 +160,7 @@
fi
AC_SUBST(KDE_USE_CLOSURE_TRUE)
AC_SUBST(KDE_USE_CLOSURE_FALSE)
-@@ -2131,9 +2122,6 @@
+@@ -2131,9 +2130,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -153,7 +170,17 @@
AC_TRY_COMPILE([
$2
],
-@@ -3194,6 +3182,51 @@
+@@ -3104,8 +3100,8 @@
+ fi
+ rm -f conftest.h conftest.h.gch
+ fi
+- AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
+ fi
++ AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
+ if test "$CXX" = "KCC"; then
+ dnl unfortunately we currently cannot disable exception support in KCC
+ dnl because doing so is binary incompatible and Qt by default links with exceptions :-(
+@@ -3194,6 +3190,51 @@
ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
])
@@ -205,7 +232,7 @@
AC_DEFUN([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY],
[
if test "$GXX" = "yes"; then
-@@ -3202,7 +3235,9 @@
+@@ -3202,7 +3243,9 @@
KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
[
@@ -216,7 +243,7 @@
HAVE_GCC_VISIBILITY=1
AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
])
-@@ -5686,6 +5721,7 @@
+@@ -5686,6 +5729,7 @@
## the same distribution terms that you use for the rest of that program.
# serial 47 AC_PROG_LIBTOOL
@@ -224,7 +251,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5745,7 +5781,7 @@
+@@ -5745,7 +5789,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -233,7 +260,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6159,12 +6195,11 @@
+@@ -6159,12 +6203,11 @@
if AC_TRY_EVAL(ac_compile); then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
@@ -247,7 +274,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6176,7 +6211,6 @@
+@@ -6176,7 +6219,6 @@
esac
;;
*64-bit*)
@@ -255,7 +282,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6306,7 +6340,7 @@
+@@ -6306,7 +6348,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -264,7 +291,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6335,20 +6369,26 @@
+@@ -6335,20 +6377,26 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -296,7 +323,7 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -6498,7 +6538,7 @@
+@@ -6498,7 +6546,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -305,7 +332,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6587,13 +6627,6 @@
+@@ -6587,13 +6635,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -319,7 +346,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -6617,8 +6650,11 @@
+@@ -6617,8 +6658,11 @@
fi
fi
chmod u+w .
@@ -333,7 +360,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6735,7 +6771,7 @@
+@@ -6735,7 +6779,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -342,7 +369,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -6748,7 +6784,7 @@
+@@ -6748,7 +6792,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -351,7 +378,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -6758,7 +6794,20 @@
+@@ -6758,7 +6802,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -373,7 +400,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -6823,7 +6872,7 @@
+@@ -6823,7 +6880,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -382,7 +409,7 @@
;;
beos*)
-@@ -6848,7 +6897,7 @@
+@@ -6848,7 +6905,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -391,7 +418,7 @@
need_version=no
need_lib_prefix=no
-@@ -6913,7 +6962,7 @@
+@@ -6913,7 +6970,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -400,7 +427,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -6936,7 +6985,7 @@
+@@ -6936,7 +6993,7 @@
dynamic_linker=no
;;
@@ -409,7 +436,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -6996,7 +7045,7 @@
+@@ -6996,7 +7053,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -418,7 +445,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7011,7 +7060,7 @@
+@@ -7011,7 +7068,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -427,7 +454,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7022,7 +7071,7 @@
+@@ -7022,7 +7079,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -436,7 +463,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7084,22 +7133,19 @@
+@@ -7084,22 +7141,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -465,7 +492,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -7109,6 +7155,30 @@
+@@ -7109,6 +7163,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -496,7 +523,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7118,7 +7188,7 @@
+@@ -7118,7 +7196,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -505,7 +532,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7147,7 +7217,7 @@
+@@ -7147,7 +7225,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -514,7 +541,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -7167,7 +7237,7 @@
+@@ -7167,7 +7245,7 @@
os2*)
libname_spec='$name'
@@ -523,7 +550,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7758,31 +7828,23 @@
+@@ -7758,31 +7836,23 @@
;;
cygwin*)
@@ -564,7 +591,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -7821,42 +7883,21 @@
+@@ -7821,42 +7891,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -614,7 +641,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -7885,9 +7926,6 @@
+@@ -7885,9 +7934,6 @@
;;
osf3* | osf4* | osf5*)
@@ -624,7 +651,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7897,7 +7935,6 @@
+@@ -7897,7 +7943,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -632,7 +659,7 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8163,7 +8200,7 @@
+@@ -8163,7 +8208,7 @@
fi
if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
@@ -641,7 +668,7 @@
else
AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
_LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-@@ -8213,7 +8250,7 @@
+@@ -8213,7 +8258,7 @@
fi
;;
@@ -650,7 +677,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -8223,29 +8260,29 @@
+@@ -8223,29 +8268,29 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -694,7 +721,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8253,8 +8290,8 @@
+@@ -8253,8 +8298,8 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -705,7 +732,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8362,8 +8399,8 @@
+@@ -8362,8 +8407,8 @@
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -716,7 +743,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8389,7 +8426,7 @@
+@@ -8389,7 +8434,7 @@
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
@@ -725,7 +752,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8419,8 +8456,22 @@
+@@ -8419,8 +8464,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -750,7 +777,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8466,15 +8517,16 @@
+@@ -8466,15 +8525,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -771,7 +798,7 @@
if test "$aix_use_runtimelinking" = yes; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
-@@ -8483,13 +8535,12 @@
+@@ -8483,13 +8543,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -787,7 +814,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8504,7 +8555,7 @@
+@@ -8504,7 +8563,7 @@
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -796,7 +823,7 @@
fi
fi
;;
-@@ -8521,12 +8572,12 @@
+@@ -8521,12 +8580,12 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -811,7 +838,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -8535,7 +8586,7 @@
+@@ -8535,7 +8594,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -820,7 +847,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -8546,20 +8597,20 @@
+@@ -8546,20 +8605,20 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -851,7 +878,7 @@
fi
;;
esac
-@@ -8569,19 +8620,19 @@
+@@ -8569,19 +8628,19 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -877,7 +904,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8616,7 +8667,7 @@
+@@ -8616,7 +8675,7 @@
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
@@ -886,7 +913,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8638,7 +8689,7 @@
+@@ -8638,7 +8697,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
aCC)
@@ -895,7 +922,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8647,11 +8698,11 @@
+@@ -8647,11 +8706,11 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -909,7 +936,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8708,7 +8759,7 @@
+@@ -8708,7 +8767,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -918,7 +945,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -8729,7 +8780,7 @@
+@@ -8729,7 +8788,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -927,7 +954,7 @@
;;
esac
fi
-@@ -8744,7 +8795,7 @@
+@@ -8744,7 +8803,7 @@
case $cc_basename in
CC)
# SGI C++
@@ -936,7 +963,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -8755,9 +8806,9 @@
+@@ -8755,9 +8814,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -948,7 +975,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -8774,8 +8825,8 @@
+@@ -8774,8 +8833,8 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -959,7 +986,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8797,16 +8848,16 @@
+@@ -8797,16 +8856,16 @@
# Intel C++
with_gnu_ld=yes
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -980,7 +1007,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8844,7 +8895,7 @@
+@@ -8844,7 +8903,7 @@
;;
esac
;;
@@ -989,7 +1016,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -8863,7 +8914,7 @@
+@@ -8863,7 +8922,7 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -998,7 +1025,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8880,7 +8931,7 @@
+@@ -8880,7 +8939,7 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1007,7 +1034,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8898,7 +8949,7 @@
+@@ -8898,7 +8957,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1016,7 +1043,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8923,7 +8974,7 @@
+@@ -8923,7 +8982,7 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -1025,7 +1052,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8939,10 +8990,10 @@
+@@ -8939,10 +8998,10 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
@@ -1038,7 +1065,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8961,7 +9012,7 @@
+@@ -8961,7 +9020,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1047,7 +1074,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9018,9 +9069,9 @@
+@@ -9018,9 +9077,9 @@
CC)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -1059,7 +1086,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -9054,7 +9105,7 @@
+@@ -9054,7 +9113,7 @@
;;
gcx)
# Green Hills C++ Compiler
@@ -1068,7 +1095,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9064,9 +9115,9 @@
+@@ -9064,9 +9123,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -1080,7 +1107,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9075,9 +9126,9 @@
+@@ -9075,9 +9134,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -1092,7 +1119,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9245,7 +9296,7 @@
+@@ -9245,7 +9304,7 @@
fi
;;
@@ -1101,7 +1128,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9354,7 +9405,7 @@
+@@ -9354,7 +9413,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -1110,7 +1137,7 @@
test "$enable_shared" = yes && enable_static=no
;;
esac
-@@ -9496,11 +9547,12 @@
+@@ -9496,11 +9555,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -1125,7 +1152,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -9550,7 +9602,7 @@
+@@ -9550,7 +9610,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1134,7 +1161,7 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9681,7 +9733,7 @@
+@@ -9681,7 +9741,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -1143,7 +1170,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -9712,7 +9764,7 @@
+@@ -9712,7 +9772,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -1152,7 +1179,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -9956,7 +10008,10 @@
+@@ -9956,7 +10016,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -1164,7 +1191,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10029,7 +10084,7 @@
+@@ -10029,7 +10092,7 @@
symcode='[[BCDEGQRST]]'
;;
solaris* | sysv5*)
@@ -1173,7 +1200,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10047,7 +10102,7 @@
+@@ -10047,7 +10110,7 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -1182,7 +1209,7 @@
esac
# Try without a prefix undercore, then with it.
-@@ -10262,7 +10317,7 @@
+@@ -10262,7 +10325,7 @@
;;
esac
;;
@@ -1191,7 +1218,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -10313,7 +10368,7 @@
+@@ -10313,7 +10376,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
@@ -1200,7 +1227,7 @@
cxx)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -10338,7 +10393,7 @@
+@@ -10338,7 +10401,7 @@
;;
esac
;;
@@ -1209,7 +1236,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -10649,6 +10704,9 @@
+@@ -10649,6 +10712,9 @@
cygwin* | mingw*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -1219,7 +1246,7 @@
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -10673,7 +10731,7 @@
+@@ -10673,7 +10739,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -1228,7 +1255,7 @@
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
# include_expsyms should be a list of space-separated symbols to be *always*
-@@ -10747,7 +10805,7 @@
+@@ -10747,7 +10813,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -1237,7 +1264,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10757,13 +10815,13 @@
+@@ -10757,13 +10823,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1253,7 +1280,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -10772,19 +10830,19 @@
+@@ -10772,19 +10838,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1277,7 +1304,7 @@
fi
;;
-@@ -10802,8 +10860,8 @@
+@@ -10802,8 +10868,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1288,7 +1315,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10816,10 +10874,36 @@
+@@ -10816,10 +10882,36 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -1327,7 +1354,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10869,9 +10953,20 @@
+@@ -10869,9 +10961,20 @@
else
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
fi
@@ -1350,7 +1377,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -10917,29 +11012,29 @@
+@@ -10917,29 +11020,29 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1389,7 +1416,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -10954,7 +11049,7 @@
+@@ -10954,7 +11057,7 @@
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -1398,7 +1425,7 @@
fi
fi
;;
-@@ -10977,13 +11072,13 @@
+@@ -10977,13 +11080,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -1415,7 +1442,7 @@
# The linker will automatically build a .lib file if we build a DLL.
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
-@@ -10997,21 +11092,21 @@
+@@ -10997,21 +11100,21 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -1450,7 +1477,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -11020,26 +11115,26 @@
+@@ -11020,26 +11123,26 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -1485,7 +1512,7 @@
;;
dgux*)
-@@ -11072,8 +11167,8 @@
+@@ -11072,8 +11175,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1496,7 +1523,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11081,7 +11176,7 @@
+@@ -11081,7 +11184,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -1505,7 +1532,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -11099,10 +11194,10 @@
+@@ -11099,10 +11202,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -1518,7 +1545,7 @@
;;
esac
else
-@@ -11149,7 +11244,7 @@
+@@ -11149,7 +11252,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -1527,7 +1554,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-@@ -11159,7 +11254,7 @@
+@@ -11159,7 +11262,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1536,7 +1563,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11182,7 +11277,7 @@
+@@ -11182,7 +11285,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -1545,7 +1572,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -11192,7 +11287,7 @@
+@@ -11192,7 +11295,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -1554,7 +1581,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11203,14 +11298,14 @@
+@@ -11203,14 +11306,14 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -1571,7 +1598,7 @@
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11222,7 +11317,7 @@
+@@ -11222,7 +11325,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1580,7 +1607,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-@@ -11247,9 +11342,9 @@
+@@ -11247,9 +11350,9 @@
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
@@ -1592,7 +1619,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -11269,7 +11364,7 @@
+@@ -11269,7 +11372,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -1601,7 +1628,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11329,9 +11424,9 @@
+@@ -11329,9 +11432,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -1613,7 +1640,7 @@
fi
runpath_var='LD_RUN_PATH'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11389,7 +11484,7 @@
+@@ -11389,7 +11492,7 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1622,7 +1649,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -11548,8 +11643,8 @@
+@@ -11548,8 +11651,8 @@
fi
done
done
@@ -1632,9 +1659,9 @@
AC_MSG_RESULT([$SED])
])
-diff -Nrua kdelibs-3.4.0.orig/aclocal.m4 kdelibs-3.4.0/aclocal.m4
+diff -Nru kdelibs-3.4.0.orig/aclocal.m4 kdelibs-3.4.0/aclocal.m4
--- kdelibs-3.4.0.orig/aclocal.m4 2005-03-04 08:20:52.000000000 -0500
-+++ kdelibs-3.4.0/aclocal.m4 2005-03-18 16:01:21.000000000 -0500
++++ kdelibs-3.4.0/aclocal.m4 2005-04-06 12:57:05.000000000 -0400
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
@@ -2224,14 +2251,14 @@
# _AM_PROG_TAR(FORMAT)
# --------------------
-diff -Nrua kdelibs-3.4.0.orig/arts/Makefile.in kdelibs-3.4.0/arts/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/arts/Makefile.in kdelibs-3.4.0/arts/Makefile.in
--- kdelibs-3.4.0.orig/arts/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/arts/Makefile.in 2005-03-18 16:04:58.000000000 -0500
++++ kdelibs-3.4.0/arts/Makefile.in 2005-04-06 13:01:26.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -2337,14 +2364,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/arts/kde/Makefile.in kdelibs-3.4.0/arts/kde/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/arts/kde/Makefile.in kdelibs-3.4.0/arts/kde/Makefile.in
--- kdelibs-3.4.0.orig/arts/kde/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/arts/kde/Makefile.in 2005-03-18 16:04:59.000000000 -0500
++++ kdelibs-3.4.0/arts/kde/Makefile.in 2005-04-06 13:01:26.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -2534,14 +2561,14 @@
@echo 'creating libartskde_la.all_cpp.cpp ...'; \
rm -f libartskde_la.all_cpp.files libartskde_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libartskde_la.all_cpp.final; \
-diff -Nrua kdelibs-3.4.0.orig/arts/kde/mcop-dcop/Makefile.in kdelibs-3.4.0/arts/kde/mcop-dcop/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/arts/kde/mcop-dcop/Makefile.in kdelibs-3.4.0/arts/kde/mcop-dcop/Makefile.in
--- kdelibs-3.4.0.orig/arts/kde/mcop-dcop/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/arts/kde/mcop-dcop/Makefile.in 2005-03-18 16:04:59.000000000 -0500
++++ kdelibs-3.4.0/arts/kde/mcop-dcop/Makefile.in 2005-04-06 13:01:26.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -2604,14 +2631,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/arts/knotify/Makefile.in kdelibs-3.4.0/arts/knotify/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/arts/knotify/Makefile.in kdelibs-3.4.0/arts/knotify/Makefile.in
--- kdelibs-3.4.0.orig/arts/knotify/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/arts/knotify/Makefile.in 2005-03-18 16:04:59.000000000 -0500
++++ kdelibs-3.4.0/arts/knotify/Makefile.in 2005-04-06 13:01:26.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -2674,14 +2701,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/arts/message/Makefile.in kdelibs-3.4.0/arts/message/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/arts/message/Makefile.in kdelibs-3.4.0/arts/message/Makefile.in
--- kdelibs-3.4.0.orig/arts/message/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/arts/message/Makefile.in 2005-03-18 16:04:59.000000000 -0500
++++ kdelibs-3.4.0/arts/message/Makefile.in 2005-04-06 13:01:26.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -2744,9 +2771,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/configure kdelibs-3.4.0/configure
+diff -Nru kdelibs-3.4.0.orig/configure kdelibs-3.4.0/configure
--- kdelibs-3.4.0.orig/configure 2005-03-04 08:23:41.000000000 -0500
-+++ kdelibs-3.4.0/configure 2005-03-18 16:05:39.000000000 -0500
++++ kdelibs-3.4.0/configure 2005-04-06 13:02:19.000000000 -0400
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
@@ -3026,6 +3053,22 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
+@@ -5279,6 +5284,7 @@
+ fi
+ rm -f conftest.h conftest.h.gch
+ fi
++ fi
+
+
+ if test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes"; then
+@@ -5289,7 +5295,6 @@
+ unsermake_enable_pch_FALSE=
+ fi
+
+- fi
+ if test "$CXX" = "KCC"; then
+
+ if test "$kde_use_pch" = "yes"; then
@@ -5338,8 +5343,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3272,10 +3315,10 @@
- esac
- fi
-
+
-
-
-
--
- # Check whether --enable-nmcheck or --disable-nmcheck was given.
-if test "${enable_nmcheck+set}" = set; then
- enableval="$enable_nmcheck"
@@ -3292,12 +3335,12 @@
- KDE_USE_NMCHECK_FALSE=""
- fi
-
-
-
-
-
-
-
+-
- if test "$GXX" = "yes"; then
-
-echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5
@@ -3419,11 +3462,11 @@
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- :
+-
+-fi
--fi
+ CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
--
-echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
-echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6
-kde_cache=`echo fvisibility=hidden | sed 'y% .=/+-,%____p__%'`
@@ -8304,16 +8347,43 @@
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -36277,7 +36263,7 @@
+@@ -34954,8 +34940,24 @@
+ echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
+ echo "${ECHO_T}$kde_cv_uic_plugins" >&6
+ if test "$kde_cv_uic_plugins" != yes; then
+- { { echo "$as_me:$LINENO: error: you need to install kdelibs first." >&5
+-echo "$as_me: error: you need to install kdelibs first." >&2;}
++ { { echo "$as_me:$LINENO: error:
++you need to install kdelibs first.
++
++If you did install kdelibs, then the Qt version that is picked up by
++this configure is not the same version you used to compile kdelibs.
++The Qt Plugin installed by kdelibs is *ONLY* loadable if its the
++same Qt version, compiled with the same compiler and the same Qt
++configuration settings.
++" >&5
++echo "$as_me: error:
++you need to install kdelibs first.
++
++If you did install kdelibs, then the Qt version that is picked up by
++this configure is not the same version you used to compile kdelibs.
++The Qt Plugin installed by kdelibs is *ONLY* loadable if its the
++same Qt version, compiled with the same compiler and the same Qt
++configuration settings.
++" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+@@ -36277,7 +36279,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
- echo "configure: 36280: $i/$j" >&5
-+ echo "configure: 36266: $i/$j" >&5
++ echo "configure: 36282: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -36506,8 +36492,7 @@
+@@ -36506,8 +36508,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8323,7 +8393,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36591,8 +36576,7 @@
+@@ -36591,8 +36592,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8333,7 +8403,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36685,8 +36669,7 @@
+@@ -36685,8 +36685,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8343,7 +8413,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36853,8 +36836,7 @@
+@@ -36853,8 +36852,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8353,7 +8423,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37009,8 +36991,7 @@
+@@ -37009,8 +37007,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8363,7 +8433,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37085,8 +37066,7 @@
+@@ -37085,8 +37082,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8373,7 +8443,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37128,8 +37108,7 @@
+@@ -37128,8 +37124,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8383,7 +8453,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37186,8 +37165,7 @@
+@@ -37186,8 +37181,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8393,7 +8463,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37317,9 +37295,6 @@
+@@ -37317,9 +37311,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8403,7 +8473,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37350,8 +37325,7 @@
+@@ -37350,8 +37341,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8413,7 +8483,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37452,8 +37426,7 @@
+@@ -37452,8 +37442,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8423,7 +8493,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37532,9 +37505,6 @@
+@@ -37532,9 +37521,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8433,7 +8503,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37565,8 +37535,7 @@
+@@ -37565,8 +37551,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8443,7 +8513,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37667,8 +37636,7 @@
+@@ -37667,8 +37652,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8453,7 +8523,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37747,9 +37715,6 @@
+@@ -37747,9 +37731,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8463,7 +8533,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37782,8 +37747,7 @@
+@@ -37782,8 +37763,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8473,7 +8543,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37886,8 +37850,7 @@
+@@ -37886,8 +37866,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8483,7 +8553,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37965,9 +37928,6 @@
+@@ -37965,9 +37944,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8493,7 +8563,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38000,8 +37960,7 @@
+@@ -38000,8 +37976,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8503,7 +8573,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38104,8 +38063,7 @@
+@@ -38104,8 +38079,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8513,7 +8583,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38185,9 +38143,6 @@
+@@ -38185,9 +38159,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8523,7 +8593,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38221,8 +38176,7 @@
+@@ -38221,8 +38192,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8533,7 +8603,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38326,8 +38280,7 @@
+@@ -38326,8 +38296,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8543,7 +8613,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38406,9 +38359,6 @@
+@@ -38406,9 +38375,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8553,7 +8623,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38442,8 +38392,7 @@
+@@ -38442,8 +38408,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8563,7 +8633,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38547,8 +38496,7 @@
+@@ -38547,8 +38512,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8573,7 +8643,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38627,9 +38575,6 @@
+@@ -38627,9 +38591,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8583,7 +8653,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38663,8 +38608,7 @@
+@@ -38663,8 +38624,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8593,7 +8663,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38768,8 +38712,7 @@
+@@ -38768,8 +38728,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8603,7 +8673,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38901,8 +38844,7 @@
+@@ -38901,8 +38860,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8613,7 +8683,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38960,9 +38902,6 @@
+@@ -38960,9 +38918,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8623,7 +8693,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38995,8 +38934,7 @@
+@@ -38995,8 +38950,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8633,7 +8703,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39099,8 +39037,7 @@
+@@ -39099,8 +39053,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8643,7 +8713,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39179,9 +39116,6 @@
+@@ -39179,9 +39132,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8653,7 +8723,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39216,8 +39150,7 @@
+@@ -39216,8 +39166,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8663,7 +8733,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39322,8 +39255,7 @@
+@@ -39322,8 +39271,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8673,7 +8743,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39402,9 +39334,6 @@
+@@ -39402,9 +39350,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8683,7 +8753,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39437,8 +39366,7 @@
+@@ -39437,8 +39382,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8693,7 +8763,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39541,8 +39469,7 @@
+@@ -39541,8 +39485,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8703,7 +8773,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39620,9 +39547,6 @@
+@@ -39620,9 +39563,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8713,7 +8783,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39655,8 +39579,7 @@
+@@ -39655,8 +39595,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8723,7 +8793,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39759,8 +39682,7 @@
+@@ -39759,8 +39698,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8733,7 +8803,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39854,8 +39776,7 @@
+@@ -39854,8 +39792,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8743,7 +8813,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39915,9 +39836,6 @@
+@@ -39915,9 +39852,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8753,7 +8823,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39953,8 +39871,7 @@
+@@ -39953,8 +39887,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8763,7 +8833,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40060,8 +39977,7 @@
+@@ -40060,8 +39993,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8773,7 +8843,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40333,8 +40249,7 @@
+@@ -40333,8 +40265,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8783,7 +8853,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40506,8 +40421,7 @@
+@@ -40506,8 +40437,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8793,16 +8863,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40561,7 +40475,7 @@
+@@ -40561,7 +40491,7 @@
do
for j in qsql.html;
do
- echo "configure: 40564: $i/$j" >&5
-+ echo "configure: 40478: $i/$j" >&5
++ echo "configure: 40494: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -40756,8 +40670,7 @@
+@@ -40756,8 +40686,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8812,7 +8882,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40956,7 +40869,11 @@
+@@ -40956,7 +40885,11 @@
save_dnssdtest_CPPFLAGS="$CPPFLAGS"
LDFLAGS="$all_libraries $LDFLAGS"
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -8825,7 +8895,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40986,8 +40903,7 @@
+@@ -40986,8 +40919,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8835,7 +8905,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41005,7 +40921,11 @@
+@@ -41005,7 +40937,11 @@
#define HAVE_DNSSD 1
_ACEOF
@@ -8848,7 +8918,7 @@
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
-@@ -41028,7 +40948,7 @@
+@@ -41028,7 +40964,7 @@
@@ -8857,7 +8927,7 @@
HAVE_DNSSD_TRUE=
HAVE_DNSSD_FALSE='#'
else
-@@ -41179,8 +41099,7 @@
+@@ -41179,8 +41115,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8867,7 +8937,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41254,8 +41173,7 @@
+@@ -41254,8 +41189,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8877,7 +8947,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41459,8 +41377,7 @@
+@@ -41459,8 +41393,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8887,7 +8957,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41529,8 +41446,7 @@
+@@ -41529,8 +41462,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8897,7 +8967,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41618,8 +41534,7 @@
+@@ -41618,8 +41550,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8907,7 +8977,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41709,8 +41624,7 @@
+@@ -41709,8 +41640,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8917,7 +8987,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41903,8 +41817,7 @@
+@@ -41903,8 +41833,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8927,7 +8997,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41970,8 +41883,7 @@
+@@ -41970,8 +41899,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8937,7 +9007,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42075,8 +41987,7 @@
+@@ -42075,8 +42003,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8947,7 +9017,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42177,8 +42088,7 @@
+@@ -42177,8 +42104,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8957,7 +9027,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42333,8 +42243,7 @@
+@@ -42333,8 +42259,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8967,7 +9037,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42378,8 +42287,7 @@
+@@ -42378,8 +42303,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8977,7 +9047,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42447,8 +42355,7 @@
+@@ -42447,8 +42371,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8987,7 +9057,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42509,8 +42416,7 @@
+@@ -42509,8 +42432,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8997,7 +9067,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42554,8 +42460,7 @@
+@@ -42554,8 +42476,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9007,7 +9077,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42623,8 +42528,7 @@
+@@ -42623,8 +42544,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9017,7 +9087,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42690,8 +42594,7 @@
+@@ -42690,8 +42610,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9027,7 +9097,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42961,8 +42864,7 @@
+@@ -42961,8 +42880,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9037,7 +9107,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43107,8 +43009,7 @@
+@@ -43107,8 +43025,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9047,7 +9117,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43242,8 +43143,7 @@
+@@ -43242,8 +43159,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9057,7 +9127,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43389,8 +43289,7 @@
+@@ -43389,8 +43305,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9067,7 +9137,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43481,8 +43380,7 @@
+@@ -43481,8 +43396,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9077,7 +9147,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43651,8 +43549,7 @@
+@@ -43651,8 +43565,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9087,7 +9157,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43723,8 +43620,7 @@
+@@ -43723,8 +43636,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9097,7 +9167,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43776,8 +43672,7 @@
+@@ -43776,8 +43688,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9107,7 +9177,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43829,8 +43724,7 @@
+@@ -43829,8 +43740,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9117,7 +9187,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43882,8 +43776,7 @@
+@@ -43882,8 +43792,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9127,7 +9197,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43939,8 +43832,7 @@
+@@ -43939,8 +43848,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9137,7 +9207,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44085,8 +43977,7 @@
+@@ -44085,8 +43993,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9147,7 +9217,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44157,8 +44048,7 @@
+@@ -44157,8 +44064,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9157,7 +9227,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44497,8 +44387,7 @@
+@@ -44497,8 +44403,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9167,7 +9237,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44601,8 +44490,7 @@
+@@ -44601,8 +44506,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9177,7 +9247,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44671,8 +44559,7 @@
+@@ -44671,8 +44575,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9187,7 +9257,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44825,8 +44712,7 @@
+@@ -44825,8 +44728,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9197,7 +9267,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44936,8 +44822,7 @@
+@@ -44936,8 +44838,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9207,7 +9277,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45042,8 +44927,7 @@
+@@ -45042,8 +44943,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9217,7 +9287,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45110,8 +44994,7 @@
+@@ -45110,8 +45010,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9227,7 +9297,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45213,8 +45096,7 @@
+@@ -45213,8 +45112,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9237,7 +9307,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45547,8 +45429,7 @@
+@@ -45547,8 +45445,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9247,7 +9317,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45637,8 +45518,7 @@
+@@ -45637,8 +45534,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9257,7 +9327,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45727,8 +45607,7 @@
+@@ -45727,8 +45623,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9267,7 +9337,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45822,8 +45701,7 @@
+@@ -45822,8 +45717,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9277,7 +9347,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45997,8 +45875,7 @@
+@@ -45997,8 +45891,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9287,7 +9357,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46130,8 +46007,7 @@
+@@ -46130,8 +46023,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9297,7 +9367,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46227,8 +46103,7 @@
+@@ -46227,8 +46119,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9307,7 +9377,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46352,8 +46227,7 @@
+@@ -46352,8 +46243,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9317,7 +9387,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46436,8 +46310,7 @@
+@@ -46436,8 +46326,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9327,16 +9397,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46490,7 +46363,7 @@
+@@ -46490,7 +46379,7 @@
do
for j in jpeglib.h;
do
- echo "configure: 46493: $i/$j" >&5
-+ echo "configure: 46366: $i/$j" >&5
++ echo "configure: 46382: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -46583,8 +46456,7 @@
+@@ -46583,8 +46472,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9346,7 +9416,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46680,8 +46552,7 @@
+@@ -46680,8 +46568,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9356,7 +9426,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46857,8 +46728,7 @@
+@@ -46857,8 +46744,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9366,7 +9436,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46993,8 +46863,7 @@
+@@ -46993,8 +46879,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9376,7 +9446,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47286,8 +47155,7 @@
+@@ -47286,8 +47171,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9386,7 +9456,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47496,8 +47364,7 @@
+@@ -47496,8 +47380,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9396,7 +9466,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47592,8 +47459,7 @@
+@@ -47592,8 +47475,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9406,7 +9476,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47683,8 +47549,7 @@
+@@ -47683,8 +47565,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9416,7 +9486,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47869,8 +47734,7 @@
+@@ -47869,8 +47750,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9426,7 +9496,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47945,8 +47809,7 @@
+@@ -47945,8 +47825,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9436,7 +9506,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48083,8 +47946,7 @@
+@@ -48083,8 +47962,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9446,16 +9516,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48170,7 +48032,7 @@
+@@ -48170,7 +48048,7 @@
do
for j in openssl/ssl.h;
do
- echo "configure: 48173: $i/$j" >&5
-+ echo "configure: 48035: $i/$j" >&5
++ echo "configure: 48051: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -48225,8 +48087,7 @@
+@@ -48225,8 +48103,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9465,7 +9535,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48527,8 +48388,7 @@
+@@ -48527,8 +48404,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9475,7 +9545,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48749,8 +48609,7 @@
+@@ -48749,8 +48625,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9485,25 +9555,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48904,7 +48763,7 @@
+@@ -48904,7 +48779,7 @@
do
for j in gssapi.h;
do
- echo "configure: 48907: $i/$j" >&5
-+ echo "configure: 48766: $i/$j" >&5
++ echo "configure: 48782: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
gssapi_incdir=$i
-@@ -48926,7 +48785,7 @@
+@@ -48926,7 +48801,7 @@
do
for j in libgssapi.$ext;
do
- echo "configure: 48929: $i/$j" >&5
-+ echo "configure: 48788: $i/$j" >&5
++ echo "configure: 48804: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
gssapi_libdir=$i
-@@ -48954,7 +48813,7 @@
+@@ -48954,7 +48829,7 @@
no) echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6 ;;
framework)
@@ -9512,7 +9582,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGSSAPI 1
-@@ -49045,8 +48904,7 @@
+@@ -49045,8 +48920,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9522,7 +9592,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49199,8 +49057,7 @@
+@@ -49199,8 +49073,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9532,7 +9602,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49273,8 +49130,7 @@
+@@ -49273,8 +49146,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9542,7 +9612,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49347,8 +49203,7 @@
+@@ -49347,8 +49219,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9552,7 +9622,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49421,8 +49276,7 @@
+@@ -49421,8 +49292,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9562,7 +9632,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49572,8 +49426,7 @@
+@@ -49572,8 +49442,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9572,7 +9642,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49691,8 +49544,7 @@
+@@ -49691,8 +49560,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9582,7 +9652,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49768,8 +49620,7 @@
+@@ -49768,8 +49636,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9592,7 +9662,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49989,8 +49840,7 @@
+@@ -49989,8 +49856,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9602,7 +9672,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50157,8 +50007,7 @@
+@@ -50157,8 +50023,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9612,7 +9682,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50323,8 +50172,7 @@
+@@ -50323,8 +50188,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9622,7 +9692,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50385,8 +50233,7 @@
+@@ -50385,8 +50249,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9632,7 +9702,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50453,8 +50300,7 @@
+@@ -50453,8 +50316,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9642,7 +9712,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50534,8 +50380,7 @@
+@@ -50534,8 +50396,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9652,7 +9722,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51519,6 +51364,13 @@
+@@ -51519,6 +51380,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -9666,7 +9736,7 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -52699,6 +52551,9 @@
+@@ -52699,6 +52567,9 @@
s,@AMTAR@,$AMTAR,;t t
s,@am__tar@,$am__tar,;t t
s,@am__untar@,$am__untar,;t t
@@ -9676,7 +9746,7 @@
s,@CC@,$CC,;t t
s,@CFLAGS@,$CFLAGS,;t t
s,@LDFLAGS@,$LDFLAGS,;t t
-@@ -53191,11 +53046,6 @@
+@@ -53191,11 +53062,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -9688,7 +9758,7 @@
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
-@@ -53234,6 +53084,12 @@
+@@ -53234,6 +53100,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -9701,7 +9771,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
-@@ -53745,7 +53601,7 @@
+@@ -53745,7 +53617,7 @@
$ac_cs_success || { (exit 1); exit 1; }
fi
@@ -9710,9 +9780,9 @@
echo ""
echo "You're missing Apple mDNSResponder 85 or later, therefore"
echo "dnssd will be compiled as stub, without any real functionality."
-diff -Nrua kdelibs-3.4.0.orig/configure.in kdelibs-3.4.0/configure.in
+diff -Nru kdelibs-3.4.0.orig/configure.in kdelibs-3.4.0/configure.in
--- kdelibs-3.4.0.orig/configure.in 2005-03-04 08:20:29.000000000 -0500
-+++ kdelibs-3.4.0/configure.in 2005-03-18 16:00:51.000000000 -0500
++++ kdelibs-3.4.0/configure.in 2005-04-06 12:56:24.000000000 -0400
@@ -23,6 +23,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(kdelibs, "3.4.0") dnl searches for some needed programs
@@ -9775,14 +9845,14 @@
echo ""
echo "You're missing Apple mDNSResponder 85 or later, therefore"
echo "dnssd will be compiled as stub, without any real functionality."
-diff -Nrua kdelibs-3.4.0.orig/dcop/KDE-ICE/Makefile.in kdelibs-3.4.0/dcop/KDE-ICE/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/dcop/KDE-ICE/Makefile.in kdelibs-3.4.0/dcop/KDE-ICE/Makefile.in
--- kdelibs-3.4.0.orig/dcop/KDE-ICE/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/dcop/KDE-ICE/Makefile.in 2005-03-18 16:04:59.000000000 -0500
++++ kdelibs-3.4.0/dcop/KDE-ICE/Makefile.in 2005-04-06 13:01:26.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -9845,14 +9915,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/dcop/Makefile.in kdelibs-3.4.0/dcop/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/dcop/Makefile.in kdelibs-3.4.0/dcop/Makefile.in
--- kdelibs-3.4.0.orig/dcop/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/dcop/Makefile.in 2005-03-18 16:04:59.000000000 -0500
++++ kdelibs-3.4.0/dcop/Makefile.in 2005-04-06 13:01:27.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10029,14 +10099,14 @@
libkdeinit_dcopserver.la: $(libkdeinit_dcopserver_la_OBJECTS) $(libkdeinit_dcopserver_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(libkdeinit_dcopserver_la_LDFLAGS) $(libkdeinit_dcopserver_la_OBJECTS) $(libkdeinit_dcopserver_la_LIBADD) $(LIBS)
-diff -Nrua kdelibs-3.4.0.orig/dcop/client/Makefile.in kdelibs-3.4.0/dcop/client/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/dcop/client/Makefile.in kdelibs-3.4.0/dcop/client/Makefile.in
--- kdelibs-3.4.0.orig/dcop/client/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/dcop/client/Makefile.in 2005-03-18 16:04:59.000000000 -0500
++++ kdelibs-3.4.0/dcop/client/Makefile.in 2005-04-06 13:01:27.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10112,14 +10182,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/dcop/dcopidl/Makefile.in kdelibs-3.4.0/dcop/dcopidl/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/dcop/dcopidl/Makefile.in kdelibs-3.4.0/dcop/dcopidl/Makefile.in
--- kdelibs-3.4.0.orig/dcop/dcopidl/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/dcop/dcopidl/Makefile.in 2005-03-18 16:04:59.000000000 -0500
++++ kdelibs-3.4.0/dcop/dcopidl/Makefile.in 2005-04-06 13:01:27.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10182,14 +10252,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/dcop/dcopidl2cpp/Makefile.in kdelibs-3.4.0/dcop/dcopidl2cpp/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/dcop/dcopidl2cpp/Makefile.in kdelibs-3.4.0/dcop/dcopidl2cpp/Makefile.in
--- kdelibs-3.4.0.orig/dcop/dcopidl2cpp/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/dcop/dcopidl2cpp/Makefile.in 2005-03-18 16:04:59.000000000 -0500
++++ kdelibs-3.4.0/dcop/dcopidl2cpp/Makefile.in 2005-04-06 13:01:27.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10252,14 +10322,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/dcop/dcopidlng/Makefile.in kdelibs-3.4.0/dcop/dcopidlng/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/dcop/dcopidlng/Makefile.in kdelibs-3.4.0/dcop/dcopidlng/Makefile.in
--- kdelibs-3.4.0.orig/dcop/dcopidlng/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/dcop/dcopidlng/Makefile.in 2005-03-18 16:04:59.000000000 -0500
++++ kdelibs-3.4.0/dcop/dcopidlng/Makefile.in 2005-04-06 13:01:27.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10317,14 +10387,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/dcop/tests/Makefile.in kdelibs-3.4.0/dcop/tests/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/dcop/tests/Makefile.in kdelibs-3.4.0/dcop/tests/Makefile.in
--- kdelibs-3.4.0.orig/dcop/tests/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/dcop/tests/Makefile.in 2005-03-18 16:04:59.000000000 -0500
++++ kdelibs-3.4.0/dcop/tests/Makefile.in 2005-04-06 13:01:27.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10387,14 +10457,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-diff -Nrua kdelibs-3.4.0.orig/dnssd/Makefile.in kdelibs-3.4.0/dnssd/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/dnssd/Makefile.in kdelibs-3.4.0/dnssd/Makefile.in
--- kdelibs-3.4.0.orig/dnssd/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/dnssd/Makefile.in 2005-03-18 16:04:59.000000000 -0500
++++ kdelibs-3.4.0/dnssd/Makefile.in 2005-04-06 13:01:27.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10503,14 +10573,14 @@
@echo 'creating libkdnssd_la.all_cpp.cpp ...'; \
rm -f libkdnssd_la.all_cpp.files libkdnssd_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkdnssd_la.all_cpp.final; \
-diff -Nrua kdelibs-3.4.0.orig/doc/Makefile.in kdelibs-3.4.0/doc/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/doc/Makefile.in kdelibs-3.4.0/doc/Makefile.in
--- kdelibs-3.4.0.orig/doc/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/doc/Makefile.in 2005-03-18 16:04:59.000000000 -0500
++++ kdelibs-3.4.0/doc/Makefile.in 2005-04-06 13:01:27.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10607,14 +10677,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/doc/common/Makefile.in kdelibs-3.4.0/doc/common/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/doc/common/Makefile.in kdelibs-3.4.0/doc/common/Makefile.in
--- kdelibs-3.4.0.orig/doc/common/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/doc/common/Makefile.in 2005-03-18 16:04:59.000000000 -0500
++++ kdelibs-3.4.0/doc/common/Makefile.in 2005-04-06 13:01:27.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10672,14 +10742,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/doc/kdelibs/Makefile.in kdelibs-3.4.0/doc/kdelibs/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/doc/kdelibs/Makefile.in kdelibs-3.4.0/doc/kdelibs/Makefile.in
--- kdelibs-3.4.0.orig/doc/kdelibs/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/doc/kdelibs/Makefile.in 2005-03-18 16:04:59.000000000 -0500
++++ kdelibs-3.4.0/doc/kdelibs/Makefile.in 2005-04-06 13:01:27.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10728,14 +10798,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/doc/kspell/Makefile.in kdelibs-3.4.0/doc/kspell/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/doc/kspell/Makefile.in kdelibs-3.4.0/doc/kspell/Makefile.in
--- kdelibs-3.4.0.orig/doc/kspell/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/doc/kspell/Makefile.in 2005-03-18 16:05:00.000000000 -0500
++++ kdelibs-3.4.0/doc/kspell/Makefile.in 2005-04-06 13:01:27.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10784,14 +10854,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/interfaces/Makefile.in kdelibs-3.4.0/interfaces/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/interfaces/Makefile.in kdelibs-3.4.0/interfaces/Makefile.in
--- kdelibs-3.4.0.orig/interfaces/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/Makefile.in 2005-03-18 16:05:00.000000000 -0500
++++ kdelibs-3.4.0/interfaces/Makefile.in 2005-04-06 13:01:27.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10888,14 +10958,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/interfaces/khexedit/Makefile.in kdelibs-3.4.0/interfaces/khexedit/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/interfaces/khexedit/Makefile.in kdelibs-3.4.0/interfaces/khexedit/Makefile.in
--- kdelibs-3.4.0.orig/interfaces/khexedit/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/khexedit/Makefile.in 2005-03-18 16:05:00.000000000 -0500
++++ kdelibs-3.4.0/interfaces/khexedit/Makefile.in 2005-04-06 13:01:27.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10944,14 +11014,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/interfaces/kimproxy/Makefile.in kdelibs-3.4.0/interfaces/kimproxy/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/interfaces/kimproxy/Makefile.in kdelibs-3.4.0/interfaces/kimproxy/Makefile.in
--- kdelibs-3.4.0.orig/interfaces/kimproxy/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/kimproxy/Makefile.in 2005-03-18 16:05:00.000000000 -0500
++++ kdelibs-3.4.0/interfaces/kimproxy/Makefile.in 2005-04-06 13:01:27.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11048,14 +11118,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/interfaces/kimproxy/interface/Makefile.in kdelibs-3.4.0/interfaces/kimproxy/interface/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/interfaces/kimproxy/interface/Makefile.in kdelibs-3.4.0/interfaces/kimproxy/interface/Makefile.in
--- kdelibs-3.4.0.orig/interfaces/kimproxy/interface/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/kimproxy/interface/Makefile.in 2005-03-18 16:05:00.000000000 -0500
++++ kdelibs-3.4.0/interfaces/kimproxy/interface/Makefile.in 2005-04-06 13:01:27.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11104,14 +11174,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/interfaces/kimproxy/library/Makefile.in kdelibs-3.4.0/interfaces/kimproxy/library/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/interfaces/kimproxy/library/Makefile.in kdelibs-3.4.0/interfaces/kimproxy/library/Makefile.in
--- kdelibs-3.4.0.orig/interfaces/kimproxy/library/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/kimproxy/library/Makefile.in 2005-03-18 16:05:00.000000000 -0500
++++ kdelibs-3.4.0/interfaces/kimproxy/library/Makefile.in 2005-04-06 13:01:28.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11222,14 +11292,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdelibs-3.4.0.orig/interfaces/kimproxy/library/icons/Makefile.in kdelibs-3.4.0/interfaces/kimproxy/library/icons/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/interfaces/kimproxy/library/icons/Makefile.in kdelibs-3.4.0/interfaces/kimproxy/library/icons/Makefile.in
--- kdelibs-3.4.0.orig/interfaces/kimproxy/library/icons/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/kimproxy/library/icons/Makefile.in 2005-03-18 16:05:00.000000000 -0500
++++ kdelibs-3.4.0/interfaces/kimproxy/library/icons/Makefile.in 2005-04-06 13:01:28.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11336,14 +11406,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/interfaces/kio/Makefile.in kdelibs-3.4.0/interfaces/kio/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/interfaces/kio/Makefile.in kdelibs-3.4.0/interfaces/kio/Makefile.in
--- kdelibs-3.4.0.orig/interfaces/kio/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/kio/Makefile.in 2005-03-18 16:05:00.000000000 -0500
++++ kdelibs-3.4.0/interfaces/kio/Makefile.in 2005-04-06 13:01:28.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11392,14 +11462,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/interfaces/kmediaplayer/Makefile.in kdelibs-3.4.0/interfaces/kmediaplayer/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/interfaces/kmediaplayer/Makefile.in kdelibs-3.4.0/interfaces/kmediaplayer/Makefile.in
--- kdelibs-3.4.0.orig/interfaces/kmediaplayer/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/kmediaplayer/Makefile.in 2005-03-18 16:05:00.000000000 -0500
++++ kdelibs-3.4.0/interfaces/kmediaplayer/Makefile.in 2005-04-06 13:01:28.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11510,14 +11580,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdelibs-3.4.0.orig/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in kdelibs-3.4.0/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in kdelibs-3.4.0/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in
--- kdelibs-3.4.0.orig/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in 2005-03-18 16:05:00.000000000 -0500
++++ kdelibs-3.4.0/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in 2005-04-06 13:01:28.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11580,14 +11650,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/interfaces/kregexpeditor/Makefile.in kdelibs-3.4.0/interfaces/kregexpeditor/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/interfaces/kregexpeditor/Makefile.in kdelibs-3.4.0/interfaces/kregexpeditor/Makefile.in
--- kdelibs-3.4.0.orig/interfaces/kregexpeditor/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/kregexpeditor/Makefile.in 2005-03-18 16:05:00.000000000 -0500
++++ kdelibs-3.4.0/interfaces/kregexpeditor/Makefile.in 2005-04-06 13:01:28.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11636,14 +11706,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/interfaces/kscript/Makefile.in kdelibs-3.4.0/interfaces/kscript/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/interfaces/kscript/Makefile.in kdelibs-3.4.0/interfaces/kscript/Makefile.in
--- kdelibs-3.4.0.orig/interfaces/kscript/Makefile.in 2005-03-04 08:23:07.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/kscript/Makefile.in 2005-03-18 16:05:00.000000000 -0500
++++ kdelibs-3.4.0/interfaces/kscript/Makefile.in 2005-04-06 13:01:28.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11754,14 +11824,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdelibs-3.4.0.orig/interfaces/kscript/sample/Makefile.in kdelibs-3.4.0/interfaces/kscript/sample/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/interfaces/kscript/sample/Makefile.in kdelibs-3.4.0/interfaces/kscript/sample/Makefile.in
--- kdelibs-3.4.0.orig/interfaces/kscript/sample/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/kscript/sample/Makefile.in 2005-03-18 16:05:00.000000000 -0500
++++ kdelibs-3.4.0/interfaces/kscript/sample/Makefile.in 2005-04-06 13:01:28.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11824,14 +11894,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/interfaces/kspeech/Makefile.in kdelibs-3.4.0/interfaces/kspeech/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/interfaces/kspeech/Makefile.in kdelibs-3.4.0/interfaces/kspeech/Makefile.in
--- kdelibs-3.4.0.orig/interfaces/kspeech/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/kspeech/Makefile.in 2005-03-18 16:05:00.000000000 -0500
++++ kdelibs-3.4.0/interfaces/kspeech/Makefile.in 2005-04-06 13:01:28.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11880,14 +11950,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/interfaces/ktexteditor/Makefile.in kdelibs-3.4.0/interfaces/ktexteditor/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/interfaces/ktexteditor/Makefile.in kdelibs-3.4.0/interfaces/ktexteditor/Makefile.in
--- kdelibs-3.4.0.orig/interfaces/ktexteditor/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/ktexteditor/Makefile.in 2005-03-18 16:05:00.000000000 -0500
++++ kdelibs-3.4.0/interfaces/ktexteditor/Makefile.in 2005-04-06 13:01:28.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11950,14 +12020,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/interfaces/terminal/Makefile.in kdelibs-3.4.0/interfaces/terminal/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/interfaces/terminal/Makefile.in kdelibs-3.4.0/interfaces/terminal/Makefile.in
--- kdelibs-3.4.0.orig/interfaces/terminal/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/terminal/Makefile.in 2005-03-18 16:05:00.000000000 -0500
++++ kdelibs-3.4.0/interfaces/terminal/Makefile.in 2005-04-06 13:01:28.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12006,14 +12076,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/interfaces/terminal/test/Makefile.in kdelibs-3.4.0/interfaces/terminal/test/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/interfaces/terminal/test/Makefile.in kdelibs-3.4.0/interfaces/terminal/test/Makefile.in
--- kdelibs-3.4.0.orig/interfaces/terminal/test/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/interfaces/terminal/test/Makefile.in 2005-03-18 16:05:00.000000000 -0500
++++ kdelibs-3.4.0/interfaces/terminal/test/Makefile.in 2005-04-06 13:01:28.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12076,14 +12146,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -Nrua kdelibs-3.4.0.orig/kab/Makefile.in kdelibs-3.4.0/kab/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kab/Makefile.in kdelibs-3.4.0/kab/Makefile.in
--- kdelibs-3.4.0.orig/kab/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kab/Makefile.in 2005-03-18 16:05:00.000000000 -0500
++++ kdelibs-3.4.0/kab/Makefile.in 2005-04-06 13:01:29.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12146,14 +12216,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nrua kdelibs-3.4.0.orig/kabc/Makefile.in kdelibs-3.4.0/kabc/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kabc/Makefile.in kdelibs-3.4.0/kabc/Makefile.in
--- kdelibs-3.4.0.orig/kabc/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kabc/Makefile.in 2005-03-18 16:05:01.000000000 -0500
++++ kdelibs-3.4.0/kabc/Makefile.in 2005-04-06 13:01:29.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12340,14 +12410,14 @@
@echo 'creating libkabc_la.all_cpp.cpp ...'; \
rm -f libkabc_la.all_cpp.files libkabc_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkabc_la.all_cpp.final; \
-diff -Nrua kdelibs-3.4.0.orig/kabc/formats/Makefile.in kdelibs-3.4.0/kabc/formats/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kabc/formats/Makefile.in kdelibs-3.4.0/kabc/formats/Makefile.in
--- kdelibs-3.4.0.orig/kabc/formats/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kabc/formats/Makefile.in 2005-03-18 16:05:01.000000000 -0500
++++ kdelibs-3.4.0/kabc/formats/Makefile.in 2005-04-06 13:01:29.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12410,14 +12480,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kabc/plugins/Makefile.in kdelibs-3.4.0/kabc/plugins/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kabc/plugins/Makefile.in kdelibs-3.4.0/kabc/plugins/Makefile.in
--- kdelibs-3.4.0.orig/kabc/plugins/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kabc/plugins/Makefile.in 2005-03-18 16:05:01.000000000 -0500
++++ kdelibs-3.4.0/kabc/plugins/Makefile.in 2005-04-06 13:01:29.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12514,14 +12584,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/kabc/plugins/dir/Makefile.in kdelibs-3.4.0/kabc/plugins/dir/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kabc/plugins/dir/Makefile.in kdelibs-3.4.0/kabc/plugins/dir/Makefile.in
--- kdelibs-3.4.0.orig/kabc/plugins/dir/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kabc/plugins/dir/Makefile.in 2005-03-18 16:05:01.000000000 -0500
++++ kdelibs-3.4.0/kabc/plugins/dir/Makefile.in 2005-04-06 13:01:29.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12584,14 +12654,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kabc/plugins/evolution/Makefile.in kdelibs-3.4.0/kabc/plugins/evolution/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kabc/plugins/evolution/Makefile.in kdelibs-3.4.0/kabc/plugins/evolution/Makefile.in
--- kdelibs-3.4.0.orig/kabc/plugins/evolution/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kabc/plugins/evolution/Makefile.in 2005-03-18 16:05:01.000000000 -0500
++++ kdelibs-3.4.0/kabc/plugins/evolution/Makefile.in 2005-04-06 13:01:29.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12654,14 +12724,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kabc/plugins/file/Makefile.in kdelibs-3.4.0/kabc/plugins/file/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kabc/plugins/file/Makefile.in kdelibs-3.4.0/kabc/plugins/file/Makefile.in
--- kdelibs-3.4.0.orig/kabc/plugins/file/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kabc/plugins/file/Makefile.in 2005-03-18 16:05:01.000000000 -0500
++++ kdelibs-3.4.0/kabc/plugins/file/Makefile.in 2005-04-06 13:01:29.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12767,14 +12837,14 @@
@echo 'creating libkabc_file_la.all_cpp.cpp ...'; \
rm -f libkabc_file_la.all_cpp.files libkabc_file_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkabc_file_la.all_cpp.final; \
-diff -Nrua kdelibs-3.4.0.orig/kabc/plugins/ldapkio/Makefile.in kdelibs-3.4.0/kabc/plugins/ldapkio/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kabc/plugins/ldapkio/Makefile.in kdelibs-3.4.0/kabc/plugins/ldapkio/Makefile.in
--- kdelibs-3.4.0.orig/kabc/plugins/ldapkio/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kabc/plugins/ldapkio/Makefile.in 2005-03-18 16:05:01.000000000 -0500
++++ kdelibs-3.4.0/kabc/plugins/ldapkio/Makefile.in 2005-04-06 13:01:30.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12837,14 +12907,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kabc/plugins/net/Makefile.in kdelibs-3.4.0/kabc/plugins/net/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kabc/plugins/net/Makefile.in kdelibs-3.4.0/kabc/plugins/net/Makefile.in
--- kdelibs-3.4.0.orig/kabc/plugins/net/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kabc/plugins/net/Makefile.in 2005-03-18 16:05:01.000000000 -0500
++++ kdelibs-3.4.0/kabc/plugins/net/Makefile.in 2005-04-06 13:01:30.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12950,14 +13020,14 @@
@echo 'creating libkabc_net_la.all_cpp.cpp ...'; \
rm -f libkabc_net_la.all_cpp.files libkabc_net_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkabc_net_la.all_cpp.final; \
-diff -Nrua kdelibs-3.4.0.orig/kabc/plugins/sql/Makefile.in kdelibs-3.4.0/kabc/plugins/sql/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kabc/plugins/sql/Makefile.in kdelibs-3.4.0/kabc/plugins/sql/Makefile.in
--- kdelibs-3.4.0.orig/kabc/plugins/sql/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kabc/plugins/sql/Makefile.in 2005-03-18 16:05:01.000000000 -0500
++++ kdelibs-3.4.0/kabc/plugins/sql/Makefile.in 2005-04-06 13:01:30.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13029,14 +13099,14 @@
#>+ 3
clean-closures:
-diff -Nrua kdelibs-3.4.0.orig/kabc/scripts/Makefile.in kdelibs-3.4.0/kabc/scripts/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kabc/scripts/Makefile.in kdelibs-3.4.0/kabc/scripts/Makefile.in
--- kdelibs-3.4.0.orig/kabc/scripts/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kabc/scripts/Makefile.in 2005-03-18 16:05:01.000000000 -0500
++++ kdelibs-3.4.0/kabc/scripts/Makefile.in 2005-04-06 13:01:30.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13085,14 +13155,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/kabc/vcard/Makefile.in kdelibs-3.4.0/kabc/vcard/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kabc/vcard/Makefile.in kdelibs-3.4.0/kabc/vcard/Makefile.in
--- kdelibs-3.4.0.orig/kabc/vcard/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kabc/vcard/Makefile.in 2005-03-18 16:05:01.000000000 -0500
++++ kdelibs-3.4.0/kabc/vcard/Makefile.in 2005-04-06 13:01:30.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13164,14 +13234,14 @@
#>+ 2
docs-am:
-diff -Nrua kdelibs-3.4.0.orig/kabc/vcardparser/Makefile.in kdelibs-3.4.0/kabc/vcardparser/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kabc/vcardparser/Makefile.in kdelibs-3.4.0/kabc/vcardparser/Makefile.in
--- kdelibs-3.4.0.orig/kabc/vcardparser/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kabc/vcardparser/Makefile.in 2005-03-18 16:05:01.000000000 -0500
++++ kdelibs-3.4.0/kabc/vcardparser/Makefile.in 2005-04-06 13:01:30.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13234,14 +13304,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nrua kdelibs-3.4.0.orig/kate/Makefile.in kdelibs-3.4.0/kate/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kate/Makefile.in kdelibs-3.4.0/kate/Makefile.in
--- kdelibs-3.4.0.orig/kate/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kate/Makefile.in 2005-03-18 16:05:01.000000000 -0500
++++ kdelibs-3.4.0/kate/Makefile.in 2005-04-06 13:01:30.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13338,14 +13408,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/kate/data/Makefile.in kdelibs-3.4.0/kate/data/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kate/data/Makefile.in kdelibs-3.4.0/kate/data/Makefile.in
--- kdelibs-3.4.0.orig/kate/data/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kate/data/Makefile.in 2005-03-18 16:05:01.000000000 -0500
++++ kdelibs-3.4.0/kate/data/Makefile.in 2005-04-06 13:01:30.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13403,14 +13473,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/kate/interfaces/Makefile.in kdelibs-3.4.0/kate/interfaces/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kate/interfaces/Makefile.in kdelibs-3.4.0/kate/interfaces/Makefile.in
--- kdelibs-3.4.0.orig/kate/interfaces/Makefile.in 2005-03-04 08:23:08.000000000 -0500
-+++ kdelibs-3.4.0/kate/interfaces/Makefile.in 2005-03-18 16:05:01.000000000 -0500
++++ kdelibs-3.4.0/kate/interfaces/Makefile.in 2005-04-06 13:01:30.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13473,14 +13543,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kate/part/Makefile.in kdelibs-3.4.0/kate/part/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kate/part/Makefile.in kdelibs-3.4.0/kate/part/Makefile.in
--- kdelibs-3.4.0.orig/kate/part/Makefile.in 2005-03-04 08:23:09.000000000 -0500
-+++ kdelibs-3.4.0/kate/part/Makefile.in 2005-03-18 16:05:02.000000000 -0500
++++ kdelibs-3.4.0/kate/part/Makefile.in 2005-04-06 13:01:32.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13640,14 +13710,14 @@
@echo 'creating libkatepart_la.all_cpp.cpp ...'; \
rm -f libkatepart_la.all_cpp.files libkatepart_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkatepart_la.all_cpp.final; \
-diff -Nrua kdelibs-3.4.0.orig/kate/plugins/Makefile.in kdelibs-3.4.0/kate/plugins/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kate/plugins/Makefile.in kdelibs-3.4.0/kate/plugins/Makefile.in
--- kdelibs-3.4.0.orig/kate/plugins/Makefile.in 2005-03-04 08:23:09.000000000 -0500
-+++ kdelibs-3.4.0/kate/plugins/Makefile.in 2005-03-18 16:05:02.000000000 -0500
++++ kdelibs-3.4.0/kate/plugins/Makefile.in 2005-04-06 13:01:32.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13744,14 +13814,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/kate/plugins/autobookmarker/Makefile.in kdelibs-3.4.0/kate/plugins/autobookmarker/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kate/plugins/autobookmarker/Makefile.in kdelibs-3.4.0/kate/plugins/autobookmarker/Makefile.in
--- kdelibs-3.4.0.orig/kate/plugins/autobookmarker/Makefile.in 2005-03-04 08:23:09.000000000 -0500
-+++ kdelibs-3.4.0/kate/plugins/autobookmarker/Makefile.in 2005-03-18 16:05:02.000000000 -0500
++++ kdelibs-3.4.0/kate/plugins/autobookmarker/Makefile.in 2005-04-06 13:01:33.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13814,14 +13884,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kate/plugins/insertfile/Makefile.in kdelibs-3.4.0/kate/plugins/insertfile/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kate/plugins/insertfile/Makefile.in kdelibs-3.4.0/kate/plugins/insertfile/Makefile.in
--- kdelibs-3.4.0.orig/kate/plugins/insertfile/Makefile.in 2005-03-04 08:23:09.000000000 -0500
-+++ kdelibs-3.4.0/kate/plugins/insertfile/Makefile.in 2005-03-18 16:05:02.000000000 -0500
++++ kdelibs-3.4.0/kate/plugins/insertfile/Makefile.in 2005-04-06 13:01:33.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13884,14 +13954,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kate/plugins/isearch/Makefile.in kdelibs-3.4.0/kate/plugins/isearch/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kate/plugins/isearch/Makefile.in kdelibs-3.4.0/kate/plugins/isearch/Makefile.in
--- kdelibs-3.4.0.orig/kate/plugins/isearch/Makefile.in 2005-03-04 08:23:09.000000000 -0500
-+++ kdelibs-3.4.0/kate/plugins/isearch/Makefile.in 2005-03-18 16:05:02.000000000 -0500
++++ kdelibs-3.4.0/kate/plugins/isearch/Makefile.in 2005-04-06 13:01:33.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13954,14 +14024,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kate/plugins/kdatatool/Makefile.in kdelibs-3.4.0/kate/plugins/kdatatool/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kate/plugins/kdatatool/Makefile.in kdelibs-3.4.0/kate/plugins/kdatatool/Makefile.in
--- kdelibs-3.4.0.orig/kate/plugins/kdatatool/Makefile.in 2005-03-04 08:23:09.000000000 -0500
-+++ kdelibs-3.4.0/kate/plugins/kdatatool/Makefile.in 2005-03-18 16:05:02.000000000 -0500
++++ kdelibs-3.4.0/kate/plugins/kdatatool/Makefile.in 2005-04-06 13:01:33.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14024,14 +14094,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kate/plugins/wordcompletion/Makefile.in kdelibs-3.4.0/kate/plugins/wordcompletion/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kate/plugins/wordcompletion/Makefile.in kdelibs-3.4.0/kate/plugins/wordcompletion/Makefile.in
--- kdelibs-3.4.0.orig/kate/plugins/wordcompletion/Makefile.in 2005-03-04 08:23:09.000000000 -0500
-+++ kdelibs-3.4.0/kate/plugins/wordcompletion/Makefile.in 2005-03-18 16:05:02.000000000 -0500
++++ kdelibs-3.4.0/kate/plugins/wordcompletion/Makefile.in 2005-04-06 13:01:33.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14094,14 +14164,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kcert/Makefile.in kdelibs-3.4.0/kcert/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kcert/Makefile.in kdelibs-3.4.0/kcert/Makefile.in
--- kdelibs-3.4.0.orig/kcert/Makefile.in 2005-03-04 08:23:09.000000000 -0500
-+++ kdelibs-3.4.0/kcert/Makefile.in 2005-03-18 16:05:02.000000000 -0500
++++ kdelibs-3.4.0/kcert/Makefile.in 2005-04-06 13:01:33.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14164,14 +14234,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kcmshell/Makefile.in kdelibs-3.4.0/kcmshell/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kcmshell/Makefile.in kdelibs-3.4.0/kcmshell/Makefile.in
--- kdelibs-3.4.0.orig/kcmshell/Makefile.in 2005-03-04 08:23:09.000000000 -0500
-+++ kdelibs-3.4.0/kcmshell/Makefile.in 2005-03-18 16:05:02.000000000 -0500
++++ kdelibs-3.4.0/kcmshell/Makefile.in 2005-04-06 13:01:33.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14234,14 +14304,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kconf_update/Makefile.in kdelibs-3.4.0/kconf_update/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kconf_update/Makefile.in kdelibs-3.4.0/kconf_update/Makefile.in
--- kdelibs-3.4.0.orig/kconf_update/Makefile.in 2005-03-04 08:23:09.000000000 -0500
-+++ kdelibs-3.4.0/kconf_update/Makefile.in 2005-03-18 16:05:02.000000000 -0500
++++ kdelibs-3.4.0/kconf_update/Makefile.in 2005-04-06 13:01:33.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14304,14 +14374,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kdecore/Makefile.in kdelibs-3.4.0/kdecore/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdecore/Makefile.in kdelibs-3.4.0/kdecore/Makefile.in
--- kdelibs-3.4.0.orig/kdecore/Makefile.in 2005-03-04 08:23:11.000000000 -0500
-+++ kdelibs-3.4.0/kdecore/Makefile.in 2005-03-18 16:05:06.000000000 -0500
++++ kdelibs-3.4.0/kdecore/Makefile.in 2005-04-06 13:01:36.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14512,14 +14582,14 @@
@echo 'creating libkdecore_la.all_cpp.cpp ...'; \
rm -f libkdecore_la.all_cpp.files libkdecore_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkdecore_la.all_cpp.final; \
-diff -Nrua kdelibs-3.4.0.orig/kdecore/kconfig_compiler/Makefile.in kdelibs-3.4.0/kdecore/kconfig_compiler/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdecore/kconfig_compiler/Makefile.in kdelibs-3.4.0/kdecore/kconfig_compiler/Makefile.in
--- kdelibs-3.4.0.orig/kdecore/kconfig_compiler/Makefile.in 2005-03-04 08:23:11.000000000 -0500
-+++ kdelibs-3.4.0/kdecore/kconfig_compiler/Makefile.in 2005-03-18 16:05:06.000000000 -0500
++++ kdelibs-3.4.0/kdecore/kconfig_compiler/Makefile.in 2005-04-06 13:01:36.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14630,14 +14700,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdelibs-3.4.0.orig/kdecore/kconfig_compiler/tests/Makefile.in kdelibs-3.4.0/kdecore/kconfig_compiler/tests/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdecore/kconfig_compiler/tests/Makefile.in kdelibs-3.4.0/kdecore/kconfig_compiler/tests/Makefile.in
--- kdelibs-3.4.0.orig/kdecore/kconfig_compiler/tests/Makefile.in 2005-03-04 08:23:11.000000000 -0500
-+++ kdelibs-3.4.0/kdecore/kconfig_compiler/tests/Makefile.in 2005-03-18 16:05:06.000000000 -0500
++++ kdelibs-3.4.0/kdecore/kconfig_compiler/tests/Makefile.in 2005-04-06 13:01:36.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14709,14 +14779,14 @@
#>+ 2
docs-am:
-diff -Nrua kdelibs-3.4.0.orig/kdecore/malloc/Makefile.in kdelibs-3.4.0/kdecore/malloc/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdecore/malloc/Makefile.in kdelibs-3.4.0/kdecore/malloc/Makefile.in
--- kdelibs-3.4.0.orig/kdecore/malloc/Makefile.in 2005-03-04 08:23:11.000000000 -0500
-+++ kdelibs-3.4.0/kdecore/malloc/Makefile.in 2005-03-18 16:05:06.000000000 -0500
++++ kdelibs-3.4.0/kdecore/malloc/Makefile.in 2005-04-06 13:01:36.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14779,14 +14849,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/kdecore/network/Makefile.in kdelibs-3.4.0/kdecore/network/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdecore/network/Makefile.in kdelibs-3.4.0/kdecore/network/Makefile.in
--- kdelibs-3.4.0.orig/kdecore/network/Makefile.in 2005-03-04 08:23:11.000000000 -0500
-+++ kdelibs-3.4.0/kdecore/network/Makefile.in 2005-03-18 16:05:06.000000000 -0500
++++ kdelibs-3.4.0/kdecore/network/Makefile.in 2005-04-06 13:01:36.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14927,14 +14997,14 @@
+kdatagramsocket.lo: kdatagramsocket.moc
kresolver.o: kresolver.moc
kclientsocketbase.lo: kclientsocketbase.moc
-diff -Nrua kdelibs-3.4.0.orig/kdecore/svgicons/Makefile.in kdelibs-3.4.0/kdecore/svgicons/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdecore/svgicons/Makefile.in kdelibs-3.4.0/kdecore/svgicons/Makefile.in
--- kdelibs-3.4.0.orig/kdecore/svgicons/Makefile.in 2005-03-04 08:23:11.000000000 -0500
-+++ kdelibs-3.4.0/kdecore/svgicons/Makefile.in 2005-03-18 16:05:06.000000000 -0500
++++ kdelibs-3.4.0/kdecore/svgicons/Makefile.in 2005-04-06 13:01:36.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14997,14 +15067,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nrua kdelibs-3.4.0.orig/kdecore/tests/Makefile.in kdelibs-3.4.0/kdecore/tests/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdecore/tests/Makefile.in kdelibs-3.4.0/kdecore/tests/Makefile.in
--- kdelibs-3.4.0.orig/kdecore/tests/Makefile.in 2005-03-04 08:23:12.000000000 -0500
-+++ kdelibs-3.4.0/kdecore/tests/Makefile.in 2005-03-18 16:05:07.000000000 -0500
++++ kdelibs-3.4.0/kdecore/tests/Makefile.in 2005-04-06 13:01:37.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15101,14 +15171,14 @@
#>+ 2
KDE_DIST=Makefile.in Makefile.am
-diff -Nrua kdelibs-3.4.0.orig/kded/Makefile.in kdelibs-3.4.0/kded/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kded/Makefile.in kdelibs-3.4.0/kded/Makefile.in
--- kdelibs-3.4.0.orig/kded/Makefile.in 2005-03-04 08:23:12.000000000 -0500
-+++ kdelibs-3.4.0/kded/Makefile.in 2005-03-18 16:05:07.000000000 -0500
++++ kdelibs-3.4.0/kded/Makefile.in 2005-04-06 13:01:38.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15205,14 +15275,14 @@
#>+ 2
KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am
-diff -Nrua kdelibs-3.4.0.orig/kded/test/Makefile.in kdelibs-3.4.0/kded/test/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kded/test/Makefile.in kdelibs-3.4.0/kded/test/Makefile.in
--- kdelibs-3.4.0.orig/kded/test/Makefile.in 2005-03-04 08:23:12.000000000 -0500
-+++ kdelibs-3.4.0/kded/test/Makefile.in 2005-03-18 16:05:07.000000000 -0500
++++ kdelibs-3.4.0/kded/test/Makefile.in 2005-04-06 13:01:38.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15275,14 +15345,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kdefx/Makefile.in kdelibs-3.4.0/kdefx/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdefx/Makefile.in kdelibs-3.4.0/kdefx/Makefile.in
--- kdelibs-3.4.0.orig/kdefx/Makefile.in 2005-03-04 08:23:12.000000000 -0500
-+++ kdelibs-3.4.0/kdefx/Makefile.in 2005-03-18 16:05:07.000000000 -0500
++++ kdelibs-3.4.0/kdefx/Makefile.in 2005-04-06 13:01:38.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15345,14 +15415,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kdeprint/Makefile.in kdelibs-3.4.0/kdeprint/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdeprint/Makefile.in kdelibs-3.4.0/kdeprint/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/Makefile.in 2005-03-04 08:23:13.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/Makefile.in 2005-03-18 16:05:07.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/Makefile.in 2005-04-06 13:01:39.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15585,14 +15655,14 @@
#>+ 2
KDE_DIST=ppdparser.y testprint.ps kdeprintrc.upd Makefile.in specials.desktop fooparser.cpp.h kdeprintrc configure.in.in kdeprintd.desktop signal_proc.c ppdscanner.l ppdparser.cpp.h Makefile.am
-diff -Nrua kdelibs-3.4.0.orig/kdeprint/cups/Makefile.in kdelibs-3.4.0/kdeprint/cups/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdeprint/cups/Makefile.in kdelibs-3.4.0/kdeprint/cups/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/cups/Makefile.in 2005-03-04 08:23:14.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/cups/Makefile.in 2005-03-18 16:05:08.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/cups/Makefile.in 2005-04-06 13:01:40.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15794,14 +15864,14 @@
kmwippprinter.o: kmwippprinter.moc
kptextpage.lo: kptextpage.moc
kmwippprinter.lo: kmwippprinter.moc
-diff -Nrua kdelibs-3.4.0.orig/kdeprint/cups/cupsdconf/Makefile.in kdelibs-3.4.0/kdeprint/cups/cupsdconf/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdeprint/cups/cupsdconf/Makefile.in kdelibs-3.4.0/kdeprint/cups/cupsdconf/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/cups/cupsdconf/Makefile.in 2005-03-04 08:23:14.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/cups/cupsdconf/Makefile.in 2005-03-18 16:05:08.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/cups/cupsdconf/Makefile.in 2005-04-06 13:01:40.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15922,14 +15992,14 @@
#>+ 2
KDE_DIST=kde_logo.png Makefile.in cupsd.conf.template cups_logo.png findnewopts.sh Makefile.am
-diff -Nrua kdelibs-3.4.0.orig/kdeprint/cups/cupsdconf2/Makefile.in kdelibs-3.4.0/kdeprint/cups/cupsdconf2/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdeprint/cups/cupsdconf2/Makefile.in kdelibs-3.4.0/kdeprint/cups/cupsdconf2/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/cups/cupsdconf2/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/cups/cupsdconf2/Makefile.in 2005-03-18 16:05:08.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/cups/cupsdconf2/Makefile.in 2005-04-06 13:01:41.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16114,14 +16184,14 @@
-cupsdserverpage.o: cupsdserverpage.moc
cupsdnetworkpage.lo: cupsdnetworkpage.moc
+cupsdserverpage.o: cupsdserverpage.moc
-diff -Nrua kdelibs-3.4.0.orig/kdeprint/ext/Makefile.in kdelibs-3.4.0/kdeprint/ext/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdeprint/ext/Makefile.in kdelibs-3.4.0/kdeprint/ext/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/ext/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/ext/Makefile.in 2005-03-18 16:05:08.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/ext/Makefile.in 2005-04-06 13:01:41.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16184,14 +16254,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kdeprint/filters/Makefile.in kdelibs-3.4.0/kdeprint/filters/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdeprint/filters/Makefile.in kdelibs-3.4.0/kdeprint/filters/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/filters/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/filters/Makefile.in 2005-03-18 16:05:08.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/filters/Makefile.in 2005-04-06 13:01:41.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16240,14 +16310,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/kdeprint/foomatic/Makefile.in kdelibs-3.4.0/kdeprint/foomatic/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdeprint/foomatic/Makefile.in kdelibs-3.4.0/kdeprint/foomatic/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/foomatic/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/foomatic/Makefile.in 2005-03-18 16:05:08.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/foomatic/Makefile.in 2005-04-06 13:01:41.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16323,14 +16393,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kdeprint/lpd/Makefile.in kdelibs-3.4.0/kdeprint/lpd/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdeprint/lpd/Makefile.in kdelibs-3.4.0/kdeprint/lpd/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/lpd/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/lpd/Makefile.in 2005-03-18 16:05:08.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/lpd/Makefile.in 2005-04-06 13:01:41.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16406,14 +16476,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kdeprint/lpdunix/Makefile.in kdelibs-3.4.0/kdeprint/lpdunix/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdeprint/lpdunix/Makefile.in kdelibs-3.4.0/kdeprint/lpdunix/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/lpdunix/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/lpdunix/Makefile.in 2005-03-18 16:05:08.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/lpdunix/Makefile.in 2005-04-06 13:01:41.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16476,14 +16546,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kdeprint/lpr/Makefile.in kdelibs-3.4.0/kdeprint/lpr/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdeprint/lpr/Makefile.in kdelibs-3.4.0/kdeprint/lpr/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/lpr/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/lpr/Makefile.in 2005-03-18 16:05:08.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/lpr/Makefile.in 2005-04-06 13:01:41.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16559,14 +16629,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kdeprint/management/Makefile.in kdelibs-3.4.0/kdeprint/management/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdeprint/management/Makefile.in kdelibs-3.4.0/kdeprint/management/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/management/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/management/Makefile.in 2005-03-18 16:05:09.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/management/Makefile.in 2005-04-06 13:01:42.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16864,14 +16934,14 @@
kmjobviewer.o: kmjobviewer.moc
kmpropcontainer.lo: kmpropcontainer.moc
kmwclass.o: kmwclass.moc
-diff -Nrua kdelibs-3.4.0.orig/kdeprint/pics/Makefile.in kdelibs-3.4.0/kdeprint/pics/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdeprint/pics/Makefile.in kdelibs-3.4.0/kdeprint/pics/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/pics/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/pics/Makefile.in 2005-03-18 16:05:09.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/pics/Makefile.in 2005-04-06 13:01:42.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17148,14 +17218,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/kdeprint/rlpr/Makefile.in kdelibs-3.4.0/kdeprint/rlpr/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdeprint/rlpr/Makefile.in kdelibs-3.4.0/kdeprint/rlpr/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/rlpr/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/rlpr/Makefile.in 2005-03-18 16:05:09.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/rlpr/Makefile.in 2005-04-06 13:01:42.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17218,14 +17288,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kdeprint/tests/Makefile.in kdelibs-3.4.0/kdeprint/tests/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdeprint/tests/Makefile.in kdelibs-3.4.0/kdeprint/tests/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/tests/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/tests/Makefile.in 2005-03-18 16:05:09.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/tests/Makefile.in 2005-04-06 13:01:42.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17288,14 +17358,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -Nrua kdelibs-3.4.0.orig/kdeprint/tools/Makefile.in kdelibs-3.4.0/kdeprint/tools/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdeprint/tools/Makefile.in kdelibs-3.4.0/kdeprint/tools/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/tools/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/tools/Makefile.in 2005-03-18 16:05:09.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/tools/Makefile.in 2005-04-06 13:01:42.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17392,14 +17462,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/kdeprint/tools/escputil/Makefile.in kdelibs-3.4.0/kdeprint/tools/escputil/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdeprint/tools/escputil/Makefile.in kdelibs-3.4.0/kdeprint/tools/escputil/Makefile.in
--- kdelibs-3.4.0.orig/kdeprint/tools/escputil/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdeprint/tools/escputil/Makefile.in 2005-03-18 16:05:09.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/tools/escputil/Makefile.in 2005-04-06 13:01:42.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17462,14 +17532,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kdesu/Makefile.in kdelibs-3.4.0/kdesu/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdesu/Makefile.in kdelibs-3.4.0/kdesu/Makefile.in
--- kdelibs-3.4.0.orig/kdesu/Makefile.in 2005-03-04 08:23:15.000000000 -0500
-+++ kdelibs-3.4.0/kdesu/Makefile.in 2005-03-18 16:05:09.000000000 -0500
++++ kdelibs-3.4.0/kdesu/Makefile.in 2005-04-06 13:01:42.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17545,14 +17615,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kdeui/Makefile.in kdelibs-3.4.0/kdeui/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdeui/Makefile.in kdelibs-3.4.0/kdeui/Makefile.in
--- kdelibs-3.4.0.orig/kdeui/Makefile.in 2005-03-04 08:23:20.000000000 -0500
-+++ kdelibs-3.4.0/kdeui/Makefile.in 2005-03-18 16:05:13.000000000 -0500
++++ kdelibs-3.4.0/kdeui/Makefile.in 2005-04-06 13:01:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18041,14 +18111,14 @@
@echo 'creating libkdeui_la.all_cpp.cpp ...'; \
rm -f libkdeui_la.all_cpp.files libkdeui_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkdeui_la.all_cpp.final; \
-diff -Nrua kdelibs-3.4.0.orig/kdeui/about/Makefile.in kdelibs-3.4.0/kdeui/about/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdeui/about/Makefile.in kdelibs-3.4.0/kdeui/about/Makefile.in
--- kdelibs-3.4.0.orig/kdeui/about/Makefile.in 2005-03-04 08:23:20.000000000 -0500
-+++ kdelibs-3.4.0/kdeui/about/Makefile.in 2005-03-18 16:05:13.000000000 -0500
++++ kdelibs-3.4.0/kdeui/about/Makefile.in 2005-04-06 13:01:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18097,14 +18167,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/kdeui/colors/Makefile.in kdelibs-3.4.0/kdeui/colors/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdeui/colors/Makefile.in kdelibs-3.4.0/kdeui/colors/Makefile.in
--- kdelibs-3.4.0.orig/kdeui/colors/Makefile.in 2005-03-04 08:23:20.000000000 -0500
-+++ kdelibs-3.4.0/kdeui/colors/Makefile.in 2005-03-18 16:05:13.000000000 -0500
++++ kdelibs-3.4.0/kdeui/colors/Makefile.in 2005-04-06 13:01:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18153,14 +18223,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/kdeui/kdetrayproxy/Makefile.in kdelibs-3.4.0/kdeui/kdetrayproxy/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdeui/kdetrayproxy/Makefile.in kdelibs-3.4.0/kdeui/kdetrayproxy/Makefile.in
--- kdelibs-3.4.0.orig/kdeui/kdetrayproxy/Makefile.in 2005-03-04 08:23:21.000000000 -0500
-+++ kdelibs-3.4.0/kdeui/kdetrayproxy/Makefile.in 2005-03-18 16:05:13.000000000 -0500
++++ kdelibs-3.4.0/kdeui/kdetrayproxy/Makefile.in 2005-04-06 13:01:47.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18223,14 +18293,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kdeui/tests/Makefile.in kdelibs-3.4.0/kdeui/tests/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdeui/tests/Makefile.in kdelibs-3.4.0/kdeui/tests/Makefile.in
--- kdelibs-3.4.0.orig/kdeui/tests/Makefile.in 2005-03-04 08:23:21.000000000 -0500
-+++ kdelibs-3.4.0/kdeui/tests/Makefile.in 2005-03-18 16:05:14.000000000 -0500
++++ kdelibs-3.4.0/kdeui/tests/Makefile.in 2005-04-06 13:01:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18390,14 +18460,14 @@
kdesattest.lo: kdesattest.moc
kunbalancedgrdtest.lo: kunbalancedgrdtest.moc
kdocktest.o: kdocktest.moc
-diff -Nrua kdelibs-3.4.0.orig/kdewidgets/Makefile.in kdelibs-3.4.0/kdewidgets/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdewidgets/Makefile.in kdelibs-3.4.0/kdewidgets/Makefile.in
--- kdelibs-3.4.0.orig/kdewidgets/Makefile.in 2005-03-04 08:23:21.000000000 -0500
-+++ kdelibs-3.4.0/kdewidgets/Makefile.in 2005-03-18 16:05:14.000000000 -0500
++++ kdelibs-3.4.0/kdewidgets/Makefile.in 2005-04-06 13:01:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18508,14 +18578,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdelibs-3.4.0.orig/kdewidgets/pics/Makefile.in kdelibs-3.4.0/kdewidgets/pics/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdewidgets/pics/Makefile.in kdelibs-3.4.0/kdewidgets/pics/Makefile.in
--- kdelibs-3.4.0.orig/kdewidgets/pics/Makefile.in 2005-03-04 08:23:21.000000000 -0500
-+++ kdelibs-3.4.0/kdewidgets/pics/Makefile.in 2005-03-18 16:05:14.000000000 -0500
++++ kdelibs-3.4.0/kdewidgets/pics/Makefile.in 2005-04-06 13:01:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18573,14 +18643,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/kdewidgets/tests/Makefile.in kdelibs-3.4.0/kdewidgets/tests/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdewidgets/tests/Makefile.in kdelibs-3.4.0/kdewidgets/tests/Makefile.in
--- kdelibs-3.4.0.orig/kdewidgets/tests/Makefile.in 2005-03-04 08:23:21.000000000 -0500
-+++ kdelibs-3.4.0/kdewidgets/tests/Makefile.in 2005-03-18 16:05:14.000000000 -0500
++++ kdelibs-3.4.0/kdewidgets/tests/Makefile.in 2005-04-06 13:01:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18629,14 +18699,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/kdoctools/Makefile.in kdelibs-3.4.0/kdoctools/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kdoctools/Makefile.in kdelibs-3.4.0/kdoctools/Makefile.in
--- kdelibs-3.4.0.orig/kdoctools/Makefile.in 2005-03-04 08:23:21.000000000 -0500
-+++ kdelibs-3.4.0/kdoctools/Makefile.in 2005-03-18 16:05:14.000000000 -0500
++++ kdelibs-3.4.0/kdoctools/Makefile.in 2005-04-06 13:01:48.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18699,14 +18769,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
checkXML: $(top_builddir)/config.status $(srcdir)/checkXML.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-diff -Nrua kdelibs-3.4.0.orig/khtml/Makefile.in kdelibs-3.4.0/khtml/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/khtml/Makefile.in kdelibs-3.4.0/khtml/Makefile.in
--- kdelibs-3.4.0.orig/khtml/Makefile.in 2005-03-04 08:23:24.000000000 -0500
-+++ kdelibs-3.4.0/khtml/Makefile.in 2005-03-18 16:05:17.000000000 -0500
++++ kdelibs-3.4.0/khtml/Makefile.in 2005-04-06 13:01:51.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18817,14 +18887,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdelibs-3.4.0.orig/khtml/css/Makefile.in kdelibs-3.4.0/khtml/css/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/khtml/css/Makefile.in kdelibs-3.4.0/khtml/css/Makefile.in
--- kdelibs-3.4.0.orig/khtml/css/Makefile.in 2005-03-04 08:23:24.000000000 -0500
-+++ kdelibs-3.4.0/khtml/css/Makefile.in 2005-03-18 16:05:17.000000000 -0500
++++ kdelibs-3.4.0/khtml/css/Makefile.in 2005-04-06 13:01:51.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18896,14 +18966,14 @@
#>+ 2
docs-am:
-diff -Nrua kdelibs-3.4.0.orig/khtml/dom/Makefile.in kdelibs-3.4.0/khtml/dom/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/khtml/dom/Makefile.in kdelibs-3.4.0/khtml/dom/Makefile.in
--- kdelibs-3.4.0.orig/khtml/dom/Makefile.in 2005-03-04 08:23:24.000000000 -0500
-+++ kdelibs-3.4.0/khtml/dom/Makefile.in 2005-03-18 16:05:17.000000000 -0500
++++ kdelibs-3.4.0/khtml/dom/Makefile.in 2005-04-06 13:01:53.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18966,14 +19036,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nrua kdelibs-3.4.0.orig/khtml/ecma/Makefile.in kdelibs-3.4.0/khtml/ecma/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/khtml/ecma/Makefile.in kdelibs-3.4.0/khtml/ecma/Makefile.in
--- kdelibs-3.4.0.orig/khtml/ecma/Makefile.in 2005-03-04 08:23:26.000000000 -0500
-+++ kdelibs-3.4.0/khtml/ecma/Makefile.in 2005-03-18 16:05:17.000000000 -0500
++++ kdelibs-3.4.0/khtml/ecma/Makefile.in 2005-04-06 13:01:54.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19036,14 +19106,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nrua kdelibs-3.4.0.orig/khtml/html/Makefile.in kdelibs-3.4.0/khtml/html/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/khtml/html/Makefile.in kdelibs-3.4.0/khtml/html/Makefile.in
--- kdelibs-3.4.0.orig/khtml/html/Makefile.in 2005-03-04 08:23:27.000000000 -0500
-+++ kdelibs-3.4.0/khtml/html/Makefile.in 2005-03-18 16:05:18.000000000 -0500
++++ kdelibs-3.4.0/khtml/html/Makefile.in 2005-04-06 13:01:54.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19106,14 +19176,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nrua kdelibs-3.4.0.orig/khtml/java/Makefile.in kdelibs-3.4.0/khtml/java/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/khtml/java/Makefile.in kdelibs-3.4.0/khtml/java/Makefile.in
--- kdelibs-3.4.0.orig/khtml/java/Makefile.in 2005-03-04 08:23:27.000000000 -0500
-+++ kdelibs-3.4.0/khtml/java/Makefile.in 2005-03-18 16:05:18.000000000 -0500
++++ kdelibs-3.4.0/khtml/java/Makefile.in 2005-04-06 13:01:54.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19276,14 +19346,14 @@
@echo 'creating libkjava_la.all_cpp.cpp ...'; \
rm -f libkjava_la.all_cpp.files libkjava_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkjava_la.all_cpp.final; \
-diff -Nrua kdelibs-3.4.0.orig/khtml/java/dummy/Makefile.in kdelibs-3.4.0/khtml/java/dummy/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/khtml/java/dummy/Makefile.in kdelibs-3.4.0/khtml/java/dummy/Makefile.in
--- kdelibs-3.4.0.orig/khtml/java/dummy/Makefile.in 2005-03-04 08:23:27.000000000 -0500
-+++ kdelibs-3.4.0/khtml/java/dummy/Makefile.in 2005-03-18 16:05:18.000000000 -0500
++++ kdelibs-3.4.0/khtml/java/dummy/Makefile.in 2005-04-06 13:01:54.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19346,14 +19416,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/khtml/java/tests/Makefile.in kdelibs-3.4.0/khtml/java/tests/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/khtml/java/tests/Makefile.in kdelibs-3.4.0/khtml/java/tests/Makefile.in
--- kdelibs-3.4.0.orig/khtml/java/tests/Makefile.in 2005-03-04 08:23:27.000000000 -0500
-+++ kdelibs-3.4.0/khtml/java/tests/Makefile.in 2005-03-18 16:05:18.000000000 -0500
++++ kdelibs-3.4.0/khtml/java/tests/Makefile.in 2005-04-06 13:01:54.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19416,14 +19486,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -Nrua kdelibs-3.4.0.orig/khtml/kmultipart/Makefile.in kdelibs-3.4.0/khtml/kmultipart/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/khtml/kmultipart/Makefile.in kdelibs-3.4.0/khtml/kmultipart/Makefile.in
--- kdelibs-3.4.0.orig/khtml/kmultipart/Makefile.in 2005-03-04 08:23:27.000000000 -0500
-+++ kdelibs-3.4.0/khtml/kmultipart/Makefile.in 2005-03-18 16:05:18.000000000 -0500
++++ kdelibs-3.4.0/khtml/kmultipart/Makefile.in 2005-04-06 13:01:54.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19486,14 +19556,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/khtml/misc/Makefile.in kdelibs-3.4.0/khtml/misc/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/khtml/misc/Makefile.in kdelibs-3.4.0/khtml/misc/Makefile.in
--- kdelibs-3.4.0.orig/khtml/misc/Makefile.in 2005-03-04 08:23:27.000000000 -0500
-+++ kdelibs-3.4.0/khtml/misc/Makefile.in 2005-03-18 16:05:18.000000000 -0500
++++ kdelibs-3.4.0/khtml/misc/Makefile.in 2005-04-06 13:01:54.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19556,14 +19626,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nrua kdelibs-3.4.0.orig/khtml/pics/Makefile.in kdelibs-3.4.0/khtml/pics/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/khtml/pics/Makefile.in kdelibs-3.4.0/khtml/pics/Makefile.in
--- kdelibs-3.4.0.orig/khtml/pics/Makefile.in 2005-03-04 08:23:27.000000000 -0500
-+++ kdelibs-3.4.0/khtml/pics/Makefile.in 2005-03-18 16:05:18.000000000 -0500
++++ kdelibs-3.4.0/khtml/pics/Makefile.in 2005-04-06 13:01:55.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19675,14 +19745,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/khtml/rendering/Makefile.in kdelibs-3.4.0/khtml/rendering/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/khtml/rendering/Makefile.in kdelibs-3.4.0/khtml/rendering/Makefile.in
--- kdelibs-3.4.0.orig/khtml/rendering/Makefile.in 2005-03-04 08:23:28.000000000 -0500
-+++ kdelibs-3.4.0/khtml/rendering/Makefile.in 2005-03-18 16:05:19.000000000 -0500
++++ kdelibs-3.4.0/khtml/rendering/Makefile.in 2005-04-06 13:01:55.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19797,14 +19867,14 @@
+render_form.lo: render_form.moc
render_frames.lo: render_frames.moc
render_layer.lo: render_layer.moc
-diff -Nrua kdelibs-3.4.0.orig/khtml/xml/Makefile.in kdelibs-3.4.0/khtml/xml/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/khtml/xml/Makefile.in kdelibs-3.4.0/khtml/xml/Makefile.in
--- kdelibs-3.4.0.orig/khtml/xml/Makefile.in 2005-03-04 08:23:28.000000000 -0500
-+++ kdelibs-3.4.0/khtml/xml/Makefile.in 2005-03-18 16:05:19.000000000 -0500
++++ kdelibs-3.4.0/khtml/xml/Makefile.in 2005-04-06 13:01:56.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19867,14 +19937,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nrua kdelibs-3.4.0.orig/kimgio/Makefile.in kdelibs-3.4.0/kimgio/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kimgio/Makefile.in kdelibs-3.4.0/kimgio/Makefile.in
--- kdelibs-3.4.0.orig/kimgio/Makefile.in 2005-03-04 08:23:28.000000000 -0500
-+++ kdelibs-3.4.0/kimgio/Makefile.in 2005-03-18 16:05:19.000000000 -0500
++++ kdelibs-3.4.0/kimgio/Makefile.in 2005-04-06 13:01:56.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19937,14 +20007,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kinit/Makefile.in kdelibs-3.4.0/kinit/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kinit/Makefile.in kdelibs-3.4.0/kinit/Makefile.in
--- kdelibs-3.4.0.orig/kinit/Makefile.in 2005-03-04 08:23:28.000000000 -0500
-+++ kdelibs-3.4.0/kinit/Makefile.in 2005-03-18 16:05:19.000000000 -0500
++++ kdelibs-3.4.0/kinit/Makefile.in 2005-04-06 13:01:56.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20068,14 +20138,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdelibs-3.4.0.orig/kinit/tests/Makefile.in kdelibs-3.4.0/kinit/tests/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kinit/tests/Makefile.in kdelibs-3.4.0/kinit/tests/Makefile.in
--- kdelibs-3.4.0.orig/kinit/tests/Makefile.in 2005-03-04 08:23:28.000000000 -0500
-+++ kdelibs-3.4.0/kinit/tests/Makefile.in 2005-03-18 16:05:19.000000000 -0500
++++ kdelibs-3.4.0/kinit/tests/Makefile.in 2005-04-06 13:01:56.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20138,14 +20208,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -Nrua kdelibs-3.4.0.orig/kio/Makefile.in kdelibs-3.4.0/kio/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kio/Makefile.in kdelibs-3.4.0/kio/Makefile.in
--- kdelibs-3.4.0.orig/kio/Makefile.in 2005-03-04 08:23:28.000000000 -0500
-+++ kdelibs-3.4.0/kio/Makefile.in 2005-03-18 16:05:19.000000000 -0500
++++ kdelibs-3.4.0/kio/Makefile.in 2005-04-06 13:01:56.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20256,14 +20326,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdelibs-3.4.0.orig/kio/bookmarks/Makefile.in kdelibs-3.4.0/kio/bookmarks/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kio/bookmarks/Makefile.in kdelibs-3.4.0/kio/bookmarks/Makefile.in
--- kdelibs-3.4.0.orig/kio/bookmarks/Makefile.in 2005-03-04 08:23:28.000000000 -0500
-+++ kdelibs-3.4.0/kio/bookmarks/Makefile.in 2005-03-18 16:05:20.000000000 -0500
++++ kdelibs-3.4.0/kio/bookmarks/Makefile.in 2005-04-06 13:01:56.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20326,14 +20396,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nrua kdelibs-3.4.0.orig/kio/httpfilter/Makefile.in kdelibs-3.4.0/kio/httpfilter/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kio/httpfilter/Makefile.in kdelibs-3.4.0/kio/httpfilter/Makefile.in
--- kdelibs-3.4.0.orig/kio/httpfilter/Makefile.in 2005-03-04 08:23:29.000000000 -0500
-+++ kdelibs-3.4.0/kio/httpfilter/Makefile.in 2005-03-18 16:05:20.000000000 -0500
++++ kdelibs-3.4.0/kio/httpfilter/Makefile.in 2005-04-06 13:01:56.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20396,14 +20466,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nrua kdelibs-3.4.0.orig/kio/kfile/Makefile.in kdelibs-3.4.0/kio/kfile/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kio/kfile/Makefile.in kdelibs-3.4.0/kio/kfile/Makefile.in
--- kdelibs-3.4.0.orig/kio/kfile/Makefile.in 2005-03-04 08:23:31.000000000 -0500
-+++ kdelibs-3.4.0/kio/kfile/Makefile.in 2005-03-18 16:05:21.000000000 -0500
++++ kdelibs-3.4.0/kio/kfile/Makefile.in 2005-04-06 13:01:58.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20628,14 +20698,14 @@
@echo 'creating libkfile_la.all_cpp.cpp ...'; \
rm -f libkfile_la.all_cpp.files libkfile_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkfile_la.all_cpp.final; \
-diff -Nrua kdelibs-3.4.0.orig/kio/kfile/tests/Makefile.in kdelibs-3.4.0/kio/kfile/tests/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kio/kfile/tests/Makefile.in kdelibs-3.4.0/kio/kfile/tests/Makefile.in
--- kdelibs-3.4.0.orig/kio/kfile/tests/Makefile.in 2005-03-04 08:23:31.000000000 -0500
-+++ kdelibs-3.4.0/kio/kfile/tests/Makefile.in 2005-03-18 16:05:22.000000000 -0500
++++ kdelibs-3.4.0/kio/kfile/tests/Makefile.in 2005-04-06 13:01:59.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20698,14 +20768,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -Nrua kdelibs-3.4.0.orig/kio/kio/Makefile.in kdelibs-3.4.0/kio/kio/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kio/kio/Makefile.in kdelibs-3.4.0/kio/kio/Makefile.in
--- kdelibs-3.4.0.orig/kio/kio/Makefile.in 2005-03-04 08:23:33.000000000 -0500
-+++ kdelibs-3.4.0/kio/kio/Makefile.in 2005-03-18 16:05:24.000000000 -0500
++++ kdelibs-3.4.0/kio/kio/Makefile.in 2005-04-06 13:02:03.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21018,14 +21088,14 @@
kshellcompletion.o: kshellcompletion.moc
dataslave.lo: dataslave.moc
$(srcdir)/tcpslavebase.cpp: observer_stub.h uiserver_stub.h
-diff -Nrua kdelibs-3.4.0.orig/kio/kioexec/Makefile.in kdelibs-3.4.0/kio/kioexec/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kio/kioexec/Makefile.in kdelibs-3.4.0/kio/kioexec/Makefile.in
--- kdelibs-3.4.0.orig/kio/kioexec/Makefile.in 2005-03-04 08:23:33.000000000 -0500
-+++ kdelibs-3.4.0/kio/kioexec/Makefile.in 2005-03-18 16:05:24.000000000 -0500
++++ kdelibs-3.4.0/kio/kioexec/Makefile.in 2005-04-06 13:02:03.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21088,14 +21158,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kio/kpasswdserver/Makefile.in kdelibs-3.4.0/kio/kpasswdserver/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kio/kpasswdserver/Makefile.in kdelibs-3.4.0/kio/kpasswdserver/Makefile.in
--- kdelibs-3.4.0.orig/kio/kpasswdserver/Makefile.in 2005-03-04 08:23:33.000000000 -0500
-+++ kdelibs-3.4.0/kio/kpasswdserver/Makefile.in 2005-03-18 16:05:24.000000000 -0500
++++ kdelibs-3.4.0/kio/kpasswdserver/Makefile.in 2005-04-06 13:02:03.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21158,14 +21228,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kio/kssl/Makefile.in kdelibs-3.4.0/kio/kssl/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kio/kssl/Makefile.in kdelibs-3.4.0/kio/kssl/Makefile.in
--- kdelibs-3.4.0.orig/kio/kssl/Makefile.in 2005-03-04 08:23:33.000000000 -0500
-+++ kdelibs-3.4.0/kio/kssl/Makefile.in 2005-03-18 16:05:24.000000000 -0500
++++ kdelibs-3.4.0/kio/kssl/Makefile.in 2005-04-06 13:02:03.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21207,15 +21277,6 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -527,7 +530,7 @@
- # somewhere else. Another option for the future (needs testing) would be to
- # change SSL_INCLUDES to .../include/openssl and make the source use #include <foo.h>
- # instead of #include <openssl/foo.h>
--INCLUDES = -I$(top_srcdir)/kwallet/client $(all_includes) $(SSL_INCLUDES)
-+INCLUDES = -I$(top_srcdir)/kdecore/network -I$(top_srcdir)/kwallet/client $(all_includes) $(SSL_INCLUDES)
- noinst_LTLIBRARIES = libkssl.la
- KSSLVERSION = 3.0.0
- KSSLPATCH = 0
@@ -621,7 +624,7 @@
.SUFFIXES:
@@ -21294,14 +21355,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdelibs-3.4.0.orig/kio/kssl/kssl/Makefile.in kdelibs-3.4.0/kio/kssl/kssl/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kio/kssl/kssl/Makefile.in kdelibs-3.4.0/kio/kssl/kssl/Makefile.in
--- kdelibs-3.4.0.orig/kio/kssl/kssl/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kio/kssl/kssl/Makefile.in 2005-03-18 16:05:24.000000000 -0500
++++ kdelibs-3.4.0/kio/kssl/kssl/Makefile.in 2005-04-06 13:02:03.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21398,14 +21459,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/kio/kssl/kssl/caroot/Makefile.in kdelibs-3.4.0/kio/kssl/kssl/caroot/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kio/kssl/kssl/caroot/Makefile.in kdelibs-3.4.0/kio/kssl/kssl/caroot/Makefile.in
--- kdelibs-3.4.0.orig/kio/kssl/kssl/caroot/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kio/kssl/kssl/caroot/Makefile.in 2005-03-18 16:05:24.000000000 -0500
++++ kdelibs-3.4.0/kio/kssl/kssl/caroot/Makefile.in 2005-04-06 13:02:03.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21454,14 +21515,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/kio/misc/Makefile.in kdelibs-3.4.0/kio/misc/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kio/misc/Makefile.in kdelibs-3.4.0/kio/misc/Makefile.in
--- kdelibs-3.4.0.orig/kio/misc/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kio/misc/Makefile.in 2005-03-18 16:05:24.000000000 -0500
++++ kdelibs-3.4.0/kio/misc/Makefile.in 2005-04-06 13:02:03.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21572,14 +21633,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdelibs-3.4.0.orig/kio/misc/kdesasl/Makefile.in kdelibs-3.4.0/kio/misc/kdesasl/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kio/misc/kdesasl/Makefile.in kdelibs-3.4.0/kio/misc/kdesasl/Makefile.in
--- kdelibs-3.4.0.orig/kio/misc/kdesasl/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kio/misc/kdesasl/Makefile.in 2005-03-18 16:05:24.000000000 -0500
++++ kdelibs-3.4.0/kio/misc/kdesasl/Makefile.in 2005-04-06 13:02:03.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21642,14 +21703,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kio/misc/kfile/Makefile.in kdelibs-3.4.0/kio/misc/kfile/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kio/misc/kfile/Makefile.in kdelibs-3.4.0/kio/misc/kfile/Makefile.in
--- kdelibs-3.4.0.orig/kio/misc/kfile/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kio/misc/kfile/Makefile.in 2005-03-18 16:05:24.000000000 -0500
++++ kdelibs-3.4.0/kio/misc/kfile/Makefile.in 2005-04-06 13:02:04.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21712,14 +21773,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kio/misc/kntlm/Makefile.in kdelibs-3.4.0/kio/misc/kntlm/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kio/misc/kntlm/Makefile.in kdelibs-3.4.0/kio/misc/kntlm/Makefile.in
--- kdelibs-3.4.0.orig/kio/misc/kntlm/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kio/misc/kntlm/Makefile.in 2005-03-18 16:05:24.000000000 -0500
++++ kdelibs-3.4.0/kio/misc/kntlm/Makefile.in 2005-04-06 13:02:04.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21782,14 +21843,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kio/misc/kpac/Makefile.in kdelibs-3.4.0/kio/misc/kpac/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kio/misc/kpac/Makefile.in kdelibs-3.4.0/kio/misc/kpac/Makefile.in
--- kdelibs-3.4.0.orig/kio/misc/kpac/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kio/misc/kpac/Makefile.in 2005-03-18 16:05:24.000000000 -0500
++++ kdelibs-3.4.0/kio/misc/kpac/Makefile.in 2005-04-06 13:02:04.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21904,14 +21965,14 @@
@echo 'creating kded_proxyscout_la.all_cpp.cpp ...'; \
rm -f kded_proxyscout_la.all_cpp.files kded_proxyscout_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kded_proxyscout_la.all_cpp.final; \
-diff -Nrua kdelibs-3.4.0.orig/kio/misc/ksendbugmail/Makefile.in kdelibs-3.4.0/kio/misc/ksendbugmail/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kio/misc/ksendbugmail/Makefile.in kdelibs-3.4.0/kio/misc/ksendbugmail/Makefile.in
--- kdelibs-3.4.0.orig/kio/misc/ksendbugmail/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kio/misc/ksendbugmail/Makefile.in 2005-03-18 16:05:24.000000000 -0500
++++ kdelibs-3.4.0/kio/misc/ksendbugmail/Makefile.in 2005-04-06 13:02:04.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21974,14 +22035,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kio/misc/kssld/Makefile.in kdelibs-3.4.0/kio/misc/kssld/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kio/misc/kssld/Makefile.in kdelibs-3.4.0/kio/misc/kssld/Makefile.in
--- kdelibs-3.4.0.orig/kio/misc/kssld/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kio/misc/kssld/Makefile.in 2005-03-18 16:05:24.000000000 -0500
++++ kdelibs-3.4.0/kio/misc/kssld/Makefile.in 2005-04-06 13:02:04.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22044,14 +22105,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kio/misc/kwalletd/Makefile.in kdelibs-3.4.0/kio/misc/kwalletd/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kio/misc/kwalletd/Makefile.in kdelibs-3.4.0/kio/misc/kwalletd/Makefile.in
--- kdelibs-3.4.0.orig/kio/misc/kwalletd/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kio/misc/kwalletd/Makefile.in 2005-03-18 16:05:25.000000000 -0500
++++ kdelibs-3.4.0/kio/misc/kwalletd/Makefile.in 2005-04-06 13:02:04.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22114,14 +22175,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kio/pics/Makefile.in kdelibs-3.4.0/kio/pics/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kio/pics/Makefile.in kdelibs-3.4.0/kio/pics/Makefile.in
--- kdelibs-3.4.0.orig/kio/pics/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kio/pics/Makefile.in 2005-03-18 16:05:25.000000000 -0500
++++ kdelibs-3.4.0/kio/pics/Makefile.in 2005-04-06 13:02:04.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22170,14 +22231,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/kio/tests/Makefile.in kdelibs-3.4.0/kio/tests/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kio/tests/Makefile.in kdelibs-3.4.0/kio/tests/Makefile.in
--- kdelibs-3.4.0.orig/kio/tests/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kio/tests/Makefile.in 2005-03-18 16:05:25.000000000 -0500
++++ kdelibs-3.4.0/kio/tests/Makefile.in 2005-04-06 13:02:04.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22240,14 +22301,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kioslave/Makefile.in kdelibs-3.4.0/kioslave/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kioslave/Makefile.in kdelibs-3.4.0/kioslave/Makefile.in
--- kdelibs-3.4.0.orig/kioslave/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kioslave/Makefile.in 2005-03-18 16:05:25.000000000 -0500
++++ kdelibs-3.4.0/kioslave/Makefile.in 2005-04-06 13:02:04.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22344,14 +22405,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/kioslave/bzip2/Makefile.in kdelibs-3.4.0/kioslave/bzip2/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kioslave/bzip2/Makefile.in kdelibs-3.4.0/kioslave/bzip2/Makefile.in
--- kdelibs-3.4.0.orig/kioslave/bzip2/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kioslave/bzip2/Makefile.in 2005-03-18 16:05:25.000000000 -0500
++++ kdelibs-3.4.0/kioslave/bzip2/Makefile.in 2005-04-06 13:02:04.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22414,14 +22475,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kioslave/file/Makefile.in kdelibs-3.4.0/kioslave/file/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kioslave/file/Makefile.in kdelibs-3.4.0/kioslave/file/Makefile.in
--- kdelibs-3.4.0.orig/kioslave/file/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kioslave/file/Makefile.in 2005-03-18 16:05:25.000000000 -0500
++++ kdelibs-3.4.0/kioslave/file/Makefile.in 2005-04-06 13:02:04.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22484,14 +22545,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kioslave/ftp/Makefile.in kdelibs-3.4.0/kioslave/ftp/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kioslave/ftp/Makefile.in kdelibs-3.4.0/kioslave/ftp/Makefile.in
--- kdelibs-3.4.0.orig/kioslave/ftp/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kioslave/ftp/Makefile.in 2005-03-18 16:05:25.000000000 -0500
++++ kdelibs-3.4.0/kioslave/ftp/Makefile.in 2005-04-06 13:02:04.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22554,14 +22615,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kioslave/gzip/Makefile.in kdelibs-3.4.0/kioslave/gzip/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kioslave/gzip/Makefile.in kdelibs-3.4.0/kioslave/gzip/Makefile.in
--- kdelibs-3.4.0.orig/kioslave/gzip/Makefile.in 2005-03-04 08:23:34.000000000 -0500
-+++ kdelibs-3.4.0/kioslave/gzip/Makefile.in 2005-03-18 16:05:25.000000000 -0500
++++ kdelibs-3.4.0/kioslave/gzip/Makefile.in 2005-04-06 13:02:04.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22624,14 +22685,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kioslave/http/Makefile.in kdelibs-3.4.0/kioslave/http/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kioslave/http/Makefile.in kdelibs-3.4.0/kioslave/http/Makefile.in
--- kdelibs-3.4.0.orig/kioslave/http/Makefile.in 2005-03-04 08:23:35.000000000 -0500
-+++ kdelibs-3.4.0/kioslave/http/Makefile.in 2005-03-18 16:05:26.000000000 -0500
++++ kdelibs-3.4.0/kioslave/http/Makefile.in 2005-04-06 13:02:06.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22742,14 +22803,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdelibs-3.4.0.orig/kioslave/http/kcookiejar/Makefile.in kdelibs-3.4.0/kioslave/http/kcookiejar/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kioslave/http/kcookiejar/Makefile.in kdelibs-3.4.0/kioslave/http/kcookiejar/Makefile.in
--- kdelibs-3.4.0.orig/kioslave/http/kcookiejar/Makefile.in 2005-03-04 08:23:35.000000000 -0500
-+++ kdelibs-3.4.0/kioslave/http/kcookiejar/Makefile.in 2005-03-18 16:05:26.000000000 -0500
++++ kdelibs-3.4.0/kioslave/http/kcookiejar/Makefile.in 2005-04-06 13:02:06.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22910,14 +22971,14 @@
-kcookiewin.o: kcookiewin.moc
kcookieserver.o: kcookieserver.moc
+kcookiewin.o: kcookiewin.moc
-diff -Nrua kdelibs-3.4.0.orig/kioslave/http/kcookiejar/tests/Makefile.in kdelibs-3.4.0/kioslave/http/kcookiejar/tests/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kioslave/http/kcookiejar/tests/Makefile.in kdelibs-3.4.0/kioslave/http/kcookiejar/tests/Makefile.in
--- kdelibs-3.4.0.orig/kioslave/http/kcookiejar/tests/Makefile.in 2005-03-04 08:23:35.000000000 -0500
-+++ kdelibs-3.4.0/kioslave/http/kcookiejar/tests/Makefile.in 2005-03-18 16:05:26.000000000 -0500
++++ kdelibs-3.4.0/kioslave/http/kcookiejar/tests/Makefile.in 2005-04-06 13:02:06.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22980,14 +23041,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -Nrua kdelibs-3.4.0.orig/kioslave/metainfo/Makefile.in kdelibs-3.4.0/kioslave/metainfo/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kioslave/metainfo/Makefile.in kdelibs-3.4.0/kioslave/metainfo/Makefile.in
--- kdelibs-3.4.0.orig/kioslave/metainfo/Makefile.in 2005-03-04 08:23:35.000000000 -0500
-+++ kdelibs-3.4.0/kioslave/metainfo/Makefile.in 2005-03-18 16:05:27.000000000 -0500
++++ kdelibs-3.4.0/kioslave/metainfo/Makefile.in 2005-04-06 13:02:06.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23050,14 +23111,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kjs/Makefile.in kdelibs-3.4.0/kjs/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kjs/Makefile.in kdelibs-3.4.0/kjs/Makefile.in
--- kdelibs-3.4.0.orig/kjs/Makefile.in 2005-03-04 08:23:35.000000000 -0500
-+++ kdelibs-3.4.0/kjs/Makefile.in 2005-03-18 16:05:27.000000000 -0500
++++ kdelibs-3.4.0/kjs/Makefile.in 2005-04-06 13:02:06.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23120,14 +23181,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
global.h: $(top_builddir)/config.status $(srcdir)/global.h.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-diff -Nrua kdelibs-3.4.0.orig/kmdi/Makefile.in kdelibs-3.4.0/kmdi/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kmdi/Makefile.in kdelibs-3.4.0/kmdi/Makefile.in
--- kdelibs-3.4.0.orig/kmdi/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kmdi/Makefile.in 2005-03-18 16:05:27.000000000 -0500
++++ kdelibs-3.4.0/kmdi/Makefile.in 2005-04-06 13:02:07.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23277,14 +23338,14 @@
@echo 'creating libkmdi_la.all_cpp.cpp ...'; \
rm -f libkmdi_la.all_cpp.files libkmdi_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkmdi_la.all_cpp.final; \
-diff -Nrua kdelibs-3.4.0.orig/kmdi/kmdi/Makefile.in kdelibs-3.4.0/kmdi/kmdi/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kmdi/kmdi/Makefile.in kdelibs-3.4.0/kmdi/kmdi/Makefile.in
--- kdelibs-3.4.0.orig/kmdi/kmdi/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kmdi/kmdi/Makefile.in 2005-03-18 16:05:27.000000000 -0500
++++ kdelibs-3.4.0/kmdi/kmdi/Makefile.in 2005-04-06 13:02:07.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23347,14 +23408,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kmdi/test/Makefile.in kdelibs-3.4.0/kmdi/test/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kmdi/test/Makefile.in kdelibs-3.4.0/kmdi/test/Makefile.in
--- kdelibs-3.4.0.orig/kmdi/test/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kmdi/test/Makefile.in 2005-03-18 16:05:27.000000000 -0500
++++ kdelibs-3.4.0/kmdi/test/Makefile.in 2005-04-06 13:02:07.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23417,14 +23478,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -Nrua kdelibs-3.4.0.orig/knewstuff/Makefile.in kdelibs-3.4.0/knewstuff/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/knewstuff/Makefile.in kdelibs-3.4.0/knewstuff/Makefile.in
--- kdelibs-3.4.0.orig/knewstuff/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/knewstuff/Makefile.in 2005-03-18 16:05:27.000000000 -0500
++++ kdelibs-3.4.0/knewstuff/Makefile.in 2005-04-06 13:02:07.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23550,14 +23611,14 @@
@echo 'creating libknewstuff_la.all_cpp.cpp ...'; \
rm -f libknewstuff_la.all_cpp.files libknewstuff_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libknewstuff_la.all_cpp.final; \
-diff -Nrua kdelibs-3.4.0.orig/kparts/Makefile.in kdelibs-3.4.0/kparts/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kparts/Makefile.in kdelibs-3.4.0/kparts/Makefile.in
--- kdelibs-3.4.0.orig/kparts/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kparts/Makefile.in 2005-03-18 16:05:28.000000000 -0500
++++ kdelibs-3.4.0/kparts/Makefile.in 2005-04-06 13:02:07.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23663,14 +23724,14 @@
@echo 'creating libkparts_la.all_cpp.cpp ...'; \
rm -f libkparts_la.all_cpp.files libkparts_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkparts_la.all_cpp.final; \
-diff -Nrua kdelibs-3.4.0.orig/kparts/tests/Makefile.in kdelibs-3.4.0/kparts/tests/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kparts/tests/Makefile.in kdelibs-3.4.0/kparts/tests/Makefile.in
--- kdelibs-3.4.0.orig/kparts/tests/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kparts/tests/Makefile.in 2005-03-18 16:05:28.000000000 -0500
++++ kdelibs-3.4.0/kparts/tests/Makefile.in 2005-04-06 13:02:07.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23733,14 +23794,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kresources/Makefile.in kdelibs-3.4.0/kresources/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kresources/Makefile.in kdelibs-3.4.0/kresources/Makefile.in
--- kdelibs-3.4.0.orig/kresources/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kresources/Makefile.in 2005-03-18 16:05:28.000000000 -0500
++++ kdelibs-3.4.0/kresources/Makefile.in 2005-04-06 13:02:07.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23837,14 +23898,14 @@
#>+ 2
KDE_DIST=kcmkresources.h Makefile.in kresources.desktop kresources_manager.desktop README.design kresources_plugin.desktop Makefile.am
-diff -Nrua kdelibs-3.4.0.orig/kspell2/Makefile.in kdelibs-3.4.0/kspell2/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kspell2/Makefile.in kdelibs-3.4.0/kspell2/Makefile.in
--- kdelibs-3.4.0.orig/kspell2/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kspell2/Makefile.in 2005-03-18 16:05:28.000000000 -0500
++++ kdelibs-3.4.0/kspell2/Makefile.in 2005-04-06 13:02:07.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24008,14 +24069,14 @@
backgroundengine.lo: backgroundengine.moc
client.o: client.moc
backgroundchecker.lo: backgroundchecker.moc
-diff -Nrua kdelibs-3.4.0.orig/kspell2/plugins/Makefile.in kdelibs-3.4.0/kspell2/plugins/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kspell2/plugins/Makefile.in kdelibs-3.4.0/kspell2/plugins/Makefile.in
--- kdelibs-3.4.0.orig/kspell2/plugins/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kspell2/plugins/Makefile.in 2005-03-18 16:05:28.000000000 -0500
++++ kdelibs-3.4.0/kspell2/plugins/Makefile.in 2005-04-06 13:02:07.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24112,14 +24173,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/kspell2/plugins/aspell/Makefile.in kdelibs-3.4.0/kspell2/plugins/aspell/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kspell2/plugins/aspell/Makefile.in kdelibs-3.4.0/kspell2/plugins/aspell/Makefile.in
--- kdelibs-3.4.0.orig/kspell2/plugins/aspell/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kspell2/plugins/aspell/Makefile.in 2005-03-18 16:05:28.000000000 -0500
++++ kdelibs-3.4.0/kspell2/plugins/aspell/Makefile.in 2005-04-06 13:02:07.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24182,14 +24243,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kspell2/plugins/ispell/Makefile.in kdelibs-3.4.0/kspell2/plugins/ispell/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kspell2/plugins/ispell/Makefile.in kdelibs-3.4.0/kspell2/plugins/ispell/Makefile.in
--- kdelibs-3.4.0.orig/kspell2/plugins/ispell/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kspell2/plugins/ispell/Makefile.in 2005-03-18 16:05:28.000000000 -0500
++++ kdelibs-3.4.0/kspell2/plugins/ispell/Makefile.in 2005-04-06 13:02:08.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24252,14 +24313,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kspell2/tests/Makefile.in kdelibs-3.4.0/kspell2/tests/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kspell2/tests/Makefile.in kdelibs-3.4.0/kspell2/tests/Makefile.in
--- kdelibs-3.4.0.orig/kspell2/tests/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kspell2/tests/Makefile.in 2005-03-18 16:05:28.000000000 -0500
++++ kdelibs-3.4.0/kspell2/tests/Makefile.in 2005-04-06 13:02:08.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24322,14 +24383,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -Nrua kdelibs-3.4.0.orig/kspell2/ui/Makefile.in kdelibs-3.4.0/kspell2/ui/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kspell2/ui/Makefile.in kdelibs-3.4.0/kspell2/ui/Makefile.in
--- kdelibs-3.4.0.orig/kspell2/ui/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kspell2/ui/Makefile.in 2005-03-18 16:05:28.000000000 -0500
++++ kdelibs-3.4.0/kspell2/ui/Makefile.in 2005-04-06 13:02:08.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24392,14 +24453,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kstyles/Makefile.in kdelibs-3.4.0/kstyles/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kstyles/Makefile.in kdelibs-3.4.0/kstyles/Makefile.in
--- kdelibs-3.4.0.orig/kstyles/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/Makefile.in 2005-03-18 16:05:28.000000000 -0500
++++ kdelibs-3.4.0/kstyles/Makefile.in 2005-04-06 13:02:08.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24496,14 +24557,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/kstyles/highcolor/Makefile.in kdelibs-3.4.0/kstyles/highcolor/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kstyles/highcolor/Makefile.in kdelibs-3.4.0/kstyles/highcolor/Makefile.in
--- kdelibs-3.4.0.orig/kstyles/highcolor/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/highcolor/Makefile.in 2005-03-18 16:05:28.000000000 -0500
++++ kdelibs-3.4.0/kstyles/highcolor/Makefile.in 2005-04-06 13:02:08.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24566,14 +24627,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kstyles/highcontrast/Makefile.in kdelibs-3.4.0/kstyles/highcontrast/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kstyles/highcontrast/Makefile.in kdelibs-3.4.0/kstyles/highcontrast/Makefile.in
--- kdelibs-3.4.0.orig/kstyles/highcontrast/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/highcontrast/Makefile.in 2005-03-18 16:05:28.000000000 -0500
++++ kdelibs-3.4.0/kstyles/highcontrast/Makefile.in 2005-04-06 13:02:08.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24636,14 +24697,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kstyles/keramik/Makefile.in kdelibs-3.4.0/kstyles/keramik/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kstyles/keramik/Makefile.in kdelibs-3.4.0/kstyles/keramik/Makefile.in
--- kdelibs-3.4.0.orig/kstyles/keramik/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/keramik/Makefile.in 2005-03-18 16:05:29.000000000 -0500
++++ kdelibs-3.4.0/kstyles/keramik/Makefile.in 2005-04-06 13:02:09.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24706,14 +24767,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kstyles/klegacy/Makefile.in kdelibs-3.4.0/kstyles/klegacy/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kstyles/klegacy/Makefile.in kdelibs-3.4.0/kstyles/klegacy/Makefile.in
--- kdelibs-3.4.0.orig/kstyles/klegacy/Makefile.in 2005-03-04 08:23:36.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/klegacy/Makefile.in 2005-03-18 16:05:29.000000000 -0500
++++ kdelibs-3.4.0/kstyles/klegacy/Makefile.in 2005-04-06 13:02:09.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24776,14 +24837,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kstyles/kthemestyle/Makefile.in kdelibs-3.4.0/kstyles/kthemestyle/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kstyles/kthemestyle/Makefile.in kdelibs-3.4.0/kstyles/kthemestyle/Makefile.in
--- kdelibs-3.4.0.orig/kstyles/kthemestyle/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/kthemestyle/Makefile.in 2005-03-18 16:05:29.000000000 -0500
++++ kdelibs-3.4.0/kstyles/kthemestyle/Makefile.in 2005-04-06 13:02:09.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24846,14 +24907,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kstyles/light/Makefile.in kdelibs-3.4.0/kstyles/light/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kstyles/light/Makefile.in kdelibs-3.4.0/kstyles/light/Makefile.in
--- kdelibs-3.4.0.orig/kstyles/light/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/light/Makefile.in 2005-03-18 16:05:29.000000000 -0500
++++ kdelibs-3.4.0/kstyles/light/Makefile.in 2005-04-06 13:02:09.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24916,14 +24977,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kstyles/plastik/Makefile.in kdelibs-3.4.0/kstyles/plastik/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kstyles/plastik/Makefile.in kdelibs-3.4.0/kstyles/plastik/Makefile.in
--- kdelibs-3.4.0.orig/kstyles/plastik/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/plastik/Makefile.in 2005-03-18 16:05:29.000000000 -0500
++++ kdelibs-3.4.0/kstyles/plastik/Makefile.in 2005-04-06 13:02:10.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25034,14 +25095,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdelibs-3.4.0.orig/kstyles/plastik/config/Makefile.in kdelibs-3.4.0/kstyles/plastik/config/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kstyles/plastik/config/Makefile.in kdelibs-3.4.0/kstyles/plastik/config/Makefile.in
--- kdelibs-3.4.0.orig/kstyles/plastik/config/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/plastik/config/Makefile.in 2005-03-18 16:05:29.000000000 -0500
++++ kdelibs-3.4.0/kstyles/plastik/config/Makefile.in 2005-04-06 13:02:10.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25104,14 +25165,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kstyles/riscos/Makefile.in kdelibs-3.4.0/kstyles/riscos/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kstyles/riscos/Makefile.in kdelibs-3.4.0/kstyles/riscos/Makefile.in
--- kdelibs-3.4.0.orig/kstyles/riscos/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/riscos/Makefile.in 2005-03-18 16:05:29.000000000 -0500
++++ kdelibs-3.4.0/kstyles/riscos/Makefile.in 2005-04-06 13:02:10.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25160,14 +25221,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/kstyles/themes/Makefile.in kdelibs-3.4.0/kstyles/themes/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kstyles/themes/Makefile.in kdelibs-3.4.0/kstyles/themes/Makefile.in
--- kdelibs-3.4.0.orig/kstyles/themes/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/themes/Makefile.in 2005-03-18 16:05:29.000000000 -0500
++++ kdelibs-3.4.0/kstyles/themes/Makefile.in 2005-04-06 13:02:10.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25216,14 +25277,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/kstyles/utils/Makefile.in kdelibs-3.4.0/kstyles/utils/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kstyles/utils/Makefile.in kdelibs-3.4.0/kstyles/utils/Makefile.in
--- kdelibs-3.4.0.orig/kstyles/utils/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/utils/Makefile.in 2005-03-18 16:05:29.000000000 -0500
++++ kdelibs-3.4.0/kstyles/utils/Makefile.in 2005-04-06 13:02:10.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25320,14 +25381,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/kstyles/utils/installtheme/Makefile.in kdelibs-3.4.0/kstyles/utils/installtheme/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kstyles/utils/installtheme/Makefile.in kdelibs-3.4.0/kstyles/utils/installtheme/Makefile.in
--- kdelibs-3.4.0.orig/kstyles/utils/installtheme/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/utils/installtheme/Makefile.in 2005-03-18 16:05:30.000000000 -0500
++++ kdelibs-3.4.0/kstyles/utils/installtheme/Makefile.in 2005-04-06 13:02:10.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25390,14 +25451,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kstyles/web/Makefile.in kdelibs-3.4.0/kstyles/web/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kstyles/web/Makefile.in kdelibs-3.4.0/kstyles/web/Makefile.in
--- kdelibs-3.4.0.orig/kstyles/web/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kstyles/web/Makefile.in 2005-03-18 16:05:30.000000000 -0500
++++ kdelibs-3.4.0/kstyles/web/Makefile.in 2005-04-06 13:02:10.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25460,14 +25521,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kutils/Makefile.in kdelibs-3.4.0/kutils/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kutils/Makefile.in kdelibs-3.4.0/kutils/Makefile.in
--- kdelibs-3.4.0.orig/kutils/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kutils/Makefile.in 2005-03-18 16:05:30.000000000 -0500
++++ kdelibs-3.4.0/kutils/Makefile.in 2005-04-06 13:02:10.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25621,14 +25682,14 @@
@echo 'creating libkutils_la.all_cpp.cpp ...'; \
rm -f libkutils_la.all_cpp.files libkutils_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkutils_la.all_cpp.final; \
-diff -Nrua kdelibs-3.4.0.orig/kutils/ksettings/Makefile.in kdelibs-3.4.0/kutils/ksettings/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kutils/ksettings/Makefile.in kdelibs-3.4.0/kutils/ksettings/Makefile.in
--- kdelibs-3.4.0.orig/kutils/ksettings/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kutils/ksettings/Makefile.in 2005-03-18 16:05:30.000000000 -0500
++++ kdelibs-3.4.0/kutils/ksettings/Makefile.in 2005-04-06 13:02:10.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25691,14 +25752,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nrua kdelibs-3.4.0.orig/kutils/tests/Makefile.in kdelibs-3.4.0/kutils/tests/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kutils/tests/Makefile.in kdelibs-3.4.0/kutils/tests/Makefile.in
--- kdelibs-3.4.0.orig/kutils/tests/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kutils/tests/Makefile.in 2005-03-18 16:05:30.000000000 -0500
++++ kdelibs-3.4.0/kutils/tests/Makefile.in 2005-04-06 13:02:10.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25761,14 +25822,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -Nrua kdelibs-3.4.0.orig/kwallet/Makefile.in kdelibs-3.4.0/kwallet/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kwallet/Makefile.in kdelibs-3.4.0/kwallet/Makefile.in
--- kdelibs-3.4.0.orig/kwallet/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kwallet/Makefile.in 2005-03-18 16:05:30.000000000 -0500
++++ kdelibs-3.4.0/kwallet/Makefile.in 2005-04-06 13:02:10.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25865,14 +25926,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/kwallet/backend/Makefile.in kdelibs-3.4.0/kwallet/backend/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kwallet/backend/Makefile.in kdelibs-3.4.0/kwallet/backend/Makefile.in
--- kdelibs-3.4.0.orig/kwallet/backend/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kwallet/backend/Makefile.in 2005-03-18 16:05:30.000000000 -0500
++++ kdelibs-3.4.0/kwallet/backend/Makefile.in 2005-04-06 13:02:10.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25935,14 +25996,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kwallet/backend/tests/Makefile.in kdelibs-3.4.0/kwallet/backend/tests/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kwallet/backend/tests/Makefile.in kdelibs-3.4.0/kwallet/backend/tests/Makefile.in
--- kdelibs-3.4.0.orig/kwallet/backend/tests/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kwallet/backend/tests/Makefile.in 2005-03-18 16:05:30.000000000 -0500
++++ kdelibs-3.4.0/kwallet/backend/tests/Makefile.in 2005-04-06 13:02:10.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26005,14 +26066,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -Nrua kdelibs-3.4.0.orig/kwallet/client/Makefile.in kdelibs-3.4.0/kwallet/client/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kwallet/client/Makefile.in kdelibs-3.4.0/kwallet/client/Makefile.in
--- kdelibs-3.4.0.orig/kwallet/client/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kwallet/client/Makefile.in 2005-03-18 16:05:30.000000000 -0500
++++ kdelibs-3.4.0/kwallet/client/Makefile.in 2005-04-06 13:02:10.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26075,14 +26136,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/kwallet/tests/Makefile.in kdelibs-3.4.0/kwallet/tests/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/kwallet/tests/Makefile.in kdelibs-3.4.0/kwallet/tests/Makefile.in
--- kdelibs-3.4.0.orig/kwallet/tests/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/kwallet/tests/Makefile.in 2005-03-18 16:05:30.000000000 -0500
++++ kdelibs-3.4.0/kwallet/tests/Makefile.in 2005-04-06 13:02:10.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26145,14 +26206,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -Nrua kdelibs-3.4.0.orig/libkmid/Makefile.in kdelibs-3.4.0/libkmid/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/libkmid/Makefile.in kdelibs-3.4.0/libkmid/Makefile.in
--- kdelibs-3.4.0.orig/libkmid/Makefile.in 2005-03-04 08:23:37.000000000 -0500
-+++ kdelibs-3.4.0/libkmid/Makefile.in 2005-03-18 16:05:30.000000000 -0500
++++ kdelibs-3.4.0/libkmid/Makefile.in 2005-04-06 13:02:11.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26215,14 +26276,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/libkmid/tests/Makefile.in kdelibs-3.4.0/libkmid/tests/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/libkmid/tests/Makefile.in kdelibs-3.4.0/libkmid/tests/Makefile.in
--- kdelibs-3.4.0.orig/libkmid/tests/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/libkmid/tests/Makefile.in 2005-03-18 16:05:30.000000000 -0500
++++ kdelibs-3.4.0/libkmid/tests/Makefile.in 2005-04-06 13:02:11.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26298,14 +26359,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-diff -Nrua kdelibs-3.4.0.orig/libkscreensaver/Makefile.in kdelibs-3.4.0/libkscreensaver/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/libkscreensaver/Makefile.in kdelibs-3.4.0/libkscreensaver/Makefile.in
--- kdelibs-3.4.0.orig/libkscreensaver/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/libkscreensaver/Makefile.in 2005-03-18 16:05:30.000000000 -0500
++++ kdelibs-3.4.0/libkscreensaver/Makefile.in 2005-04-06 13:02:11.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26368,14 +26429,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdelibs-3.4.0.orig/libltdl/Makefile.in kdelibs-3.4.0/libltdl/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/libltdl/Makefile.in kdelibs-3.4.0/libltdl/Makefile.in
--- kdelibs-3.4.0.orig/libltdl/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/libltdl/Makefile.in 2005-03-18 16:05:30.000000000 -0500
++++ kdelibs-3.4.0/libltdl/Makefile.in 2005-04-06 13:02:11.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26438,14 +26499,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/licenses/Makefile.in kdelibs-3.4.0/licenses/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/licenses/Makefile.in kdelibs-3.4.0/licenses/Makefile.in
--- kdelibs-3.4.0.orig/licenses/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/licenses/Makefile.in 2005-03-18 16:05:30.000000000 -0500
++++ kdelibs-3.4.0/licenses/Makefile.in 2005-04-06 13:02:11.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26494,14 +26555,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/mimetypes/Makefile.in kdelibs-3.4.0/mimetypes/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/mimetypes/Makefile.in kdelibs-3.4.0/mimetypes/Makefile.in
--- kdelibs-3.4.0.orig/mimetypes/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/mimetypes/Makefile.in 2005-03-18 16:05:30.000000000 -0500
++++ kdelibs-3.4.0/mimetypes/Makefile.in 2005-04-06 13:02:11.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26598,14 +26659,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/mimetypes/application/Makefile.in kdelibs-3.4.0/mimetypes/application/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/mimetypes/application/Makefile.in kdelibs-3.4.0/mimetypes/application/Makefile.in
--- kdelibs-3.4.0.orig/mimetypes/application/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/mimetypes/application/Makefile.in 2005-03-18 16:05:30.000000000 -0500
++++ kdelibs-3.4.0/mimetypes/application/Makefile.in 2005-04-06 13:02:11.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26663,14 +26724,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/mimetypes/audio/Makefile.in kdelibs-3.4.0/mimetypes/audio/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/mimetypes/audio/Makefile.in kdelibs-3.4.0/mimetypes/audio/Makefile.in
--- kdelibs-3.4.0.orig/mimetypes/audio/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/mimetypes/audio/Makefile.in 2005-03-18 16:05:30.000000000 -0500
++++ kdelibs-3.4.0/mimetypes/audio/Makefile.in 2005-04-06 13:02:11.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26719,14 +26780,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/mimetypes/image/Makefile.in kdelibs-3.4.0/mimetypes/image/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/mimetypes/image/Makefile.in kdelibs-3.4.0/mimetypes/image/Makefile.in
--- kdelibs-3.4.0.orig/mimetypes/image/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/mimetypes/image/Makefile.in 2005-03-18 16:05:30.000000000 -0500
++++ kdelibs-3.4.0/mimetypes/image/Makefile.in 2005-04-06 13:02:11.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26775,14 +26836,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/mimetypes/inode/Makefile.in kdelibs-3.4.0/mimetypes/inode/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/mimetypes/inode/Makefile.in kdelibs-3.4.0/mimetypes/inode/Makefile.in
--- kdelibs-3.4.0.orig/mimetypes/inode/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/mimetypes/inode/Makefile.in 2005-03-18 16:05:30.000000000 -0500
++++ kdelibs-3.4.0/mimetypes/inode/Makefile.in 2005-04-06 13:02:11.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26831,14 +26892,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/mimetypes/message/Makefile.in kdelibs-3.4.0/mimetypes/message/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/mimetypes/message/Makefile.in kdelibs-3.4.0/mimetypes/message/Makefile.in
--- kdelibs-3.4.0.orig/mimetypes/message/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/mimetypes/message/Makefile.in 2005-03-18 16:05:30.000000000 -0500
++++ kdelibs-3.4.0/mimetypes/message/Makefile.in 2005-04-06 13:02:11.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26887,14 +26948,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/mimetypes/model/Makefile.in kdelibs-3.4.0/mimetypes/model/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/mimetypes/model/Makefile.in kdelibs-3.4.0/mimetypes/model/Makefile.in
--- kdelibs-3.4.0.orig/mimetypes/model/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/mimetypes/model/Makefile.in 2005-03-18 16:05:30.000000000 -0500
++++ kdelibs-3.4.0/mimetypes/model/Makefile.in 2005-04-06 13:02:11.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26943,14 +27004,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/mimetypes/multipart/Makefile.in kdelibs-3.4.0/mimetypes/multipart/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/mimetypes/multipart/Makefile.in kdelibs-3.4.0/mimetypes/multipart/Makefile.in
--- kdelibs-3.4.0.orig/mimetypes/multipart/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/mimetypes/multipart/Makefile.in 2005-03-18 16:05:30.000000000 -0500
++++ kdelibs-3.4.0/mimetypes/multipart/Makefile.in 2005-04-06 13:02:11.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26999,14 +27060,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/mimetypes/text/Makefile.in kdelibs-3.4.0/mimetypes/text/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/mimetypes/text/Makefile.in kdelibs-3.4.0/mimetypes/text/Makefile.in
--- kdelibs-3.4.0.orig/mimetypes/text/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/mimetypes/text/Makefile.in 2005-03-18 16:05:31.000000000 -0500
++++ kdelibs-3.4.0/mimetypes/text/Makefile.in 2005-04-06 13:02:11.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -27064,14 +27125,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/mimetypes/uri/Makefile.in kdelibs-3.4.0/mimetypes/uri/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/mimetypes/uri/Makefile.in kdelibs-3.4.0/mimetypes/uri/Makefile.in
--- kdelibs-3.4.0.orig/mimetypes/uri/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/mimetypes/uri/Makefile.in 2005-03-18 16:05:31.000000000 -0500
++++ kdelibs-3.4.0/mimetypes/uri/Makefile.in 2005-04-06 13:02:11.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -27120,14 +27181,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/mimetypes/video/Makefile.in kdelibs-3.4.0/mimetypes/video/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/mimetypes/video/Makefile.in kdelibs-3.4.0/mimetypes/video/Makefile.in
--- kdelibs-3.4.0.orig/mimetypes/video/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/mimetypes/video/Makefile.in 2005-03-18 16:05:31.000000000 -0500
++++ kdelibs-3.4.0/mimetypes/video/Makefile.in 2005-04-06 13:02:11.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -27176,14 +27237,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/pics/Makefile.in kdelibs-3.4.0/pics/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/pics/Makefile.in kdelibs-3.4.0/pics/Makefile.in
--- kdelibs-3.4.0.orig/pics/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/pics/Makefile.in 2005-03-18 16:05:31.000000000 -0500
++++ kdelibs-3.4.0/pics/Makefile.in 2005-04-06 13:02:11.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -27303,14 +27364,14 @@
#>+ 2
docs-am:
-diff -Nrua kdelibs-3.4.0.orig/pics/crystalsvg/Makefile.in kdelibs-3.4.0/pics/crystalsvg/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/pics/crystalsvg/Makefile.in kdelibs-3.4.0/pics/crystalsvg/Makefile.in
--- kdelibs-3.4.0.orig/pics/crystalsvg/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/pics/crystalsvg/Makefile.in 2005-03-18 16:05:32.000000000 -0500
++++ kdelibs-3.4.0/pics/crystalsvg/Makefile.in 2005-04-06 13:02:12.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -34604,14 +34665,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/pics/crystalsvg/kde/Makefile.in kdelibs-3.4.0/pics/crystalsvg/kde/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/pics/crystalsvg/kde/Makefile.in kdelibs-3.4.0/pics/crystalsvg/kde/Makefile.in
--- kdelibs-3.4.0.orig/pics/crystalsvg/kde/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/pics/crystalsvg/kde/Makefile.in 2005-03-18 16:05:32.000000000 -0500
++++ kdelibs-3.4.0/pics/crystalsvg/kde/Makefile.in 2005-04-06 13:02:12.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -34669,14 +34730,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/pics/emoticons/Makefile.in kdelibs-3.4.0/pics/emoticons/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/pics/emoticons/Makefile.in kdelibs-3.4.0/pics/emoticons/Makefile.in
--- kdelibs-3.4.0.orig/pics/emoticons/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/pics/emoticons/Makefile.in 2005-03-18 16:05:32.000000000 -0500
++++ kdelibs-3.4.0/pics/emoticons/Makefile.in 2005-04-06 13:02:12.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -34725,14 +34786,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdelibs-3.4.0.orig/pics/hicolor/Makefile.in kdelibs-3.4.0/pics/hicolor/Makefile.in
+diff -Nru kdelibs-3.4.0.orig/pics/hicolor/Makefile.in kdelibs-3.4.0/pics/hicolor/Makefile.in
--- kdelibs-3.4.0.orig/pics/hicolor/Makefile.in 2005-03-04 08:23:38.000000000 -0500
-+++ kdelibs-3.4.0/pics/hicolor/Makefile.in 2005-03-18 16:05:32.000000000 -0500
++++ kdelibs-3.4.0/pics/hicolor/Makefile.in 2005-04-06 13:02:12.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,