[Pkg-kde-commits] rev 978 - in branches/kde-3.4.0/packages/kdebase/debian: . patches
Christopher Martin
chrsmrtn-guest@costa.debian.org
Wed, 06 Apr 2005 22:58:02 +0000
Author: chrsmrtn-guest
Date: 2005-04-06 22:57:49 +0000 (Wed, 06 Apr 2005)
New Revision: 978
Added:
branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_2005-04-06.diff
branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff
Removed:
branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_2005-03-18.diff
branches/kde-3.4.0/packages/kdebase/debian/patches/13_kdm_configure.diff
Modified:
branches/kde-3.4.0/packages/kdebase/debian/changelog
branches/kde-3.4.0/packages/kdebase/debian/patches/98_buildprep.diff
Log:
branch pull, and the main part of the new default font patch. Patch 13 now obsolete.
Modified: branches/kde-3.4.0/packages/kdebase/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/changelog 2005-04-06 22:56:40 UTC (rev 977)
+++ branches/kde-3.4.0/packages/kdebase/debian/changelog 2005-04-06 22:57:49 UTC (rev 978)
@@ -1,4 +1,4 @@
-kdebase (4:3.4.0-0pre2) experimental; urgency=low
+kdebase (4:3.4.0-0pre3) experimental; urgency=low
* New upstream release.
@@ -17,6 +17,9 @@
+++ Changes by Christopher Martin:
+ * Added a patch to set reasonable default fonts, using the fontconfig
+ defaults, for kpersonalizer, kcontrol, kdm, and the Plastik theme.
+
* KDM no longer shows the Custom session. When it works at all, it simply
duplicates Default's behaviour anyway. (Closes: #251602)
Deleted: branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_2005-03-18.diff
Added: branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_2005-04-06.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_2005-04-06.diff 2005-04-06 22:56:40 UTC (rev 977)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_2005-04-06.diff 2005-04-06 22:57:49 UTC (rev 978)
@@ -0,0 +1,30511 @@
+diff -Nru kdebase-release-3.4.0/admin/acinclude.m4.in kdebase-branch-3.4/admin/acinclude.m4.in
+--- kdebase-release-3.4.0/admin/acinclude.m4.in 2005-02-09 17:21:09.000000000 -0500
++++ kdebase-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 kdebase-release-3.4.0/admin/am_edit kdebase-branch-3.4/admin/am_edit
+--- kdebase-release-3.4.0/admin/am_edit 2004-12-17 15:18:28.000000000 -0500
++++ kdebase-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 kdebase-release-3.4.0/applnk/.directory kdebase-branch-3.4/applnk/.directory
+--- kdebase-release-3.4.0/applnk/.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/.directory 2005-03-10 11:05:06.000000000 -0500
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Name=Default
+-Name[af]=Verstek
++Name[af]=Standaard
+ Name[ar]=Ø§ÙØªØ±Ø§Ø¶ÙŠ
+ Name[az]=Ön Qurğulu
+ Name[be]=Па ўмаўчаньні
+@@ -56,7 +56,7 @@
+ Name[sk]=Štandardný
+ Name[sl]=Privzeto
+ Name[sr]=Подразумевано
+-Name[sr@Latn]=Predefinisano
++Name[sr@Latn]=Podrazumevano
+ Name[sv]=Förval
+ Name[ta]=à®®à¯à®©à¯à®©à®¿à®°à¯à®ªà¯à®ªà¯
+ Name[tg]=Пешфарзӣ
+@@ -67,7 +67,6 @@
+ Name[vi]=Mặc định
+ Name[wa]=Prémetou
+ Name[xh]=Okwendalo
+-Name[xx]=xxDefaultxx
+ Name[zh_CN]=默认
+ Name[zh_TW]=é è¨
+ Name[zu]=Okwendalo
+diff -Nru kdebase-release-3.4.0/applnk/compat/battery.desktop kdebase-branch-3.4/applnk/compat/battery.desktop
+--- kdebase-release-3.4.0/applnk/compat/battery.desktop 2005-02-23 00:05:26.000000000 -0500
++++ kdebase-branch-3.4/applnk/compat/battery.desktop 2005-03-07 09:14:43.000000000 -0500
+@@ -51,7 +51,6 @@
+ Name[ven]=Khomupwutha pfarwa
+ Name[wa]=Poirtåve
+ Name[xh]=Umphezulu osongiweyo
+-Name[xx]=xxLaptopxx
+ Name[zh_CN]=è†ä¸Šè®¡ç®—机
+ Name[zh_TW]=è†ä¸Šåž‹çš„電腦
+ Name[zu]=Ikhomputha ephathwayo eyisicaba
+diff -Nru kdebase-release-3.4.0/applnk/compat/bwarning.desktop kdebase-branch-3.4/applnk/compat/bwarning.desktop
+--- kdebase-release-3.4.0/applnk/compat/bwarning.desktop 2005-02-23 00:05:26.000000000 -0500
++++ kdebase-branch-3.4/applnk/compat/bwarning.desktop 2005-03-07 09:14:43.000000000 -0500
+@@ -51,7 +51,6 @@
+ Name[ven]=Khomupwutha pfarwa
+ Name[wa]=Poirtåve
+ Name[xh]=Umphezulu osongiweyo
+-Name[xx]=xxLaptopxx
+ Name[zh_CN]=è†ä¸Šè®¡ç®—机
+ Name[zh_TW]=è†ä¸Šåž‹çš„電腦
+ Name[zu]=Ikhomputha ephathwayo eyisicaba
+diff -Nru kdebase-release-3.4.0/applnk/compat/cwarning.desktop kdebase-branch-3.4/applnk/compat/cwarning.desktop
+--- kdebase-release-3.4.0/applnk/compat/cwarning.desktop 2005-02-23 00:05:26.000000000 -0500
++++ kdebase-branch-3.4/applnk/compat/cwarning.desktop 2005-03-07 09:14:43.000000000 -0500
+@@ -51,7 +51,6 @@
+ Name[ven]=Khomupwutha pfarwa
+ Name[wa]=Poirtåve
+ Name[xh]=Umphezulu osongiweyo
+-Name[xx]=xxLaptopxx
+ Name[zh_CN]=è†ä¸Šè®¡ç®—机
+ Name[zh_TW]=è†ä¸Šåž‹çš„電腦
+ Name[zu]=Ikhomputha ephathwayo eyisicaba
+diff -Nru kdebase-release-3.4.0/applnk/compat/email.desktop kdebase-branch-3.4/applnk/compat/email.desktop
+--- kdebase-release-3.4.0/applnk/compat/email.desktop 2005-02-23 00:05:26.000000000 -0500
++++ kdebase-branch-3.4/applnk/compat/email.desktop 2005-03-22 12:37:59.000000000 -0500
+@@ -68,7 +68,6 @@
+ Name[ven]=Imeili
+ Name[vi]=Thư Ä‘iện tá»
+ Name[wa]=Emilaedje
+-Name[xx]=xxEmailxx
+ Name[zh_CN]=电å邮件
+ Name[zh_TW]=é›»å郵件
+ Name[zu]=Iposi lekhomputha
+@@ -141,7 +140,6 @@
+ Comment[vi]=Cấu hình thông tin cá nhân, địa chỉ thư Ä‘iện tá», máy chá»§ thư, v.v...
+ Comment[wa]=Apontyî voste idintité, adresses emile, sierveus d' emilaedje, evnd.
+ Comment[xh]=Qwalasela isiqinisekiso sakho, iidilesi ze email, abancedisi beposi, njalo-njalo.
+-Comment[xx]=xxConfigure your identity, email addresses, mail servers, etc.xx
+ Comment[zh_CN]=é…置您的身份ã€ç”µå邮件地å€ã€é‚®ä»¶æœåŠ¡ç‰ã€‚
+ Comment[zh_TW]=è¨å®šæ‚¨çš„身份èªè‰ã€é›»å郵件地å€ã€éƒµä»¶ä¼ºæœå™¨ç‰ã€‚
+ Comment[zu]=Hlanganisa umazisi wakho,ikheli leposi lekhomputha,umlekeleli weposi,etc.
+@@ -174,7 +172,7 @@
+ Keywords[hsb]=EMail,Mail,E-Mail,Address,Email server,IMAP,POP3,Local mailbox,mailbox,User Information,Reply Address,Server information,User Name,Passwords,Host,Current Profile,Profile,Organization,Incoming Host,Outgoing Host,Email Client wužiwar, hesło, mailka, adresa, serwer, póštowy kašćik, póstowy kašćik
+ Keywords[hu]=email,e-mail,mail,üzenet,cÃm,levél,levelezési kiszolgáló,IMAP,POP3,helyi postaláda,postaláda,felhasználójellemzÅ‘k,válaszcÃm,kiszolgálóinformáció,felhasználónév,jelszavak,gépnév,jelenlegi profil,szervezet,bemeneti kiszolgáló,kimeneti kiszolgáló,e-mail kliens
+ Keywords[is]=Tölvupóstur,póstur,netfang,heimilisfang,póstþjónn,notendaupplKeywords=Tölvupóstur,póstur,netfang,heimilisfang,póstþjónn,notendaupplýsingar,svarpóstfang,addressa,póstforrit
+-Keywords[it]=email,mail,e-mail,posta,posta elettronica,indirizzo,server di posta elettronica,IMAP,POP3,casella di posta locale,casella di posta,informazioni utente,reply address,indirizzo di risposta,informazioni server,password,host,profilo attuale,profilo,organizzazione,posta in arrivo,server posta in arrivo,server posta in uscita,client di posta
++Keywords[it]=email,mail,e-mail,posta,posta elettronica,indirizzo,server di posta elettronica,IMAP,POP3,casella di posta locale,casella di posta,informazioni utente,reply address,indirizzo di risposta,informazioni server,password,host,profilo attuale,profilo,organizzazione,posta in arrivo,server posta in arrivo,server posta in uscita,client di posta,Reply Address
+ Keywords[ja]=Eメール,メール,E-メール,アドレス,Eメールサーãƒ,IMAP,POP3 ,ãƒãƒ¼ã‚«ãƒ«ãƒ¡ãƒ¼ãƒ«ãƒœãƒƒã‚¯ã‚¹,ãƒ¦ãƒ¼ã‚¶æƒ…å ±,返信アドレス,ã‚µãƒ¼ãƒæƒ…å ±,ユーザå,パスワード,ホスト,ç¾åœ¨ã®ãƒ—ãƒãƒ•ァイル,プãƒãƒ•ァイル,組織,ç€ä¿¡ãƒ›ã‚¹ãƒˆ,é€ä¿¡ãƒ›ã‚¹ãƒˆ,Eメールクライアント
+ Keywords[ko]=EMail,Mail,E-Mail,Address,Email server,IMAP,POP3,Local mailbox,mailbox,User Information,Reply Address,Server information,User Name,Passwords,Host,Current Profile,Profile,Organization,Incoming Host,Outgoing Host,Email Client,ì´ë©”ì¼,ë©”ì¼,편지,ì „ìžíŽ¸ì§€,ì „ìž íŽ¸ì§€,주소,ì‚¬ìš©ìž ì •ë³´,사용ìž,ì •ë³´,ê°œì¸ ì •ë³´,ê°œì¸,ê°œì¸ì •ë³´,회사,서버,서버 ì •ë³´
+ Keywords[lt]=EMail,Mail,E-Mail,Address,Email server,IMAP,POP3,Local mailbox,mailbox,User Information,Reply Address,Server information,User Name,Passwords,Host,Current Profile,Profile,Organization,Incoming Host,Outgoing Host,Email Client,e. paštas,paštas,el.paštas,e. pašto serveris,IMAP,POP3,pašto dėžutė,vartotojo informacija,vartotojo vardas,slaptaždžiai,mazgas,e. pašto klientas
+@@ -204,7 +202,6 @@
+ Keywords[uz]=Ðлектрон почта,Хат,Хат-хабар,Манзил,Хат-хабар Ñервери,Локал мейлбокÑ,мейлбокÑ,Фойдаланувчи ҳақида маълумот,Жавоб бериш манзили,Сервер ҳақида маълумот,Фойдаланувчининг иÑми,Махфий Ñўзлар,Компьютер,Жорий профил,Профил,Ташкилот,Хат-хабар клиенти,Incoming Host,Outgoing Host
+ Keywords[vi]=EMail,Mail,E-Mail,địa chỉ,Máy chá»§ thư Ä‘iện tá»,IMAP,POP3,Há»™p thư địa phương, há»™p thư,Thông Tin vá» ngưá»i dùng,Äịa chỉ Trả lá»i,Thồng tin vá» máy chá»§,Tên ngưá»i sá» dụng,mã số,Máy chá»§,Tiểu sá» hiện tại,Tiểu sá»,Tổ chức,Máy chá»§ Nháºn thư,Máy chá»§ gá»i thư,Trình quản lý thư Ä‘iện tá»
+ Keywords[xh]=EMail,Iposi,E-Mail,Idilesi,Umncedisi we Email,IMAP,POP3,Ibhokisi yobulali yeposi,ibhokisi yeposi,Umsebenzisi wolwazi,Idilesi yempendulo,Ulwazi lomncedisi,Igama lomsebenzisi, Igama eligqithisiweyo,Inginginya,Umxhasi we Email
+-Keywords[xx]=xxEMail,Mail,E-Mail,Address,Email server,IMAP,POP3,Local mailbox,mailbox,User Information,Reply Address,Server information,User Name,Passwords,Host,Current Profile,Profile,Organization,Incoming Host,Outgoing Host,Email Clientxx
+ Keywords[zh_CN]=EMail,Mail,E-Mail,Address,Email server,IMAP,POP3,Local mailbox,mailbox,User Information,Reply Address,Server information,User Name,Passwords,Host,Current Profile,Profile,Organization,Incoming Host,Outgoing Host,Email Client,电å邮件,邮件æœåС噍,本地邮箱,邮箱,用户信æ¯,回å¤åœ°å€,æœåŠ¡å™¨ä¿¡æ¯,用户å,密ç ,主机,组织,接收æœåС噍,å‘逿œåС噍,邮件程åº
+ Keywords[zh_TW]=EMail,Mail,E-Mail,Address,Email server,IMAP,POP3,Local mailbox,mailbox,User Information,Reply Address,Server information,User Name,Passwords,Host,Current Profile,Profile,Organization,Incoming Host,Outgoing Host,Email Client,é›»å郵件,ä¿¡ä»¶,ä½å€,郵件伺æœå™¨,本地信箱,ä¿¡ç®±,使用者資訊,回信ä½å€,郵件主機資訊,帳號,密碼,主機,組織,收信主機,é€ä¿¡ä¸»æ©Ÿ,郵件程å¼
+ Keywords[zu]=Iposi lekhomputha,Iposi,Iposi lekhomputha,Ikheli, Umlekeleli weposi lekhomputha,IMAP,POP3,Ibhokisi leposi eliseduze, ibhokisi leposi,Ulwazi lomsebenzisi,Ikheli Lokuphendula,Ulwazi lomlekeleli,Igama Lomsebenzisi,Amagama-okudlula,Isiteshi sekhomputha, Iprofayela lamanje,Iprofayela,Inhlangano,Isiteshi sekhomputha sokungenayo, Isiteshi sekhomputha sokuphumayo, Umxhasi weposi lekhomputha
+diff -Nru kdebase-release-3.4.0/applnk/compat/kcmkonq.desktop kdebase-branch-3.4/applnk/compat/kcmkonq.desktop
+--- kdebase-release-3.4.0/applnk/compat/kcmkonq.desktop 2005-02-04 23:14:29.000000000 -0500
++++ kdebase-branch-3.4/applnk/compat/kcmkonq.desktop 2005-03-07 09:14:43.000000000 -0500
+@@ -72,7 +72,6 @@
+ Name[vi]=Trình quản là file
+ Name[wa]=Manaedjeu di fitchîs
+ Name[xh]=Umphathi Wefayile
+-Name[xx]=xxFile Managerxx
+ Name[zh_CN]=文件管ç†å™¨
+ Name[zh_TW]=檔案管ç†ç¨‹å¼
+ Name[zu]=imenenja yamafayela
+diff -Nru kdebase-release-3.4.0/applnk/compat/kcmkxmlrpcd.desktop kdebase-branch-3.4/applnk/compat/kcmkxmlrpcd.desktop
+--- kdebase-release-3.4.0/applnk/compat/kcmkxmlrpcd.desktop 2005-02-23 00:05:26.000000000 -0500
++++ kdebase-branch-3.4/applnk/compat/kcmkxmlrpcd.desktop 2005-03-10 11:05:07.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=XML RPC Daemon
++Name[af]=XML RPC Bediener
+ Name[ar]=مراقب XML RPC
+ Name[az]=XML RPC Demonu
+ Name[bn]=à¦à¦•à§à¦¸-à¦à¦®-à¦à¦² আর-পি-সি ডিমন
+@@ -57,7 +58,6 @@
+ Name[uk]=Демон XML RPC
+ Name[uz]=XML RPC хизмати
+ Name[wa]=Demon XML RPC
+-Name[xx]=xxXML RPC Daemonxx
+ Name[zh_CN]=XML RPC 守护程åº
+ Name[zh_TW]=XML RPC 伺æœç¨‹å¼
+ Name[zu]=KDE XML RPC Daemon
+diff -Nru kdebase-release-3.4.0/applnk/compat/konqhtml.desktop kdebase-branch-3.4/applnk/compat/konqhtml.desktop
+--- kdebase-release-3.4.0/applnk/compat/konqhtml.desktop 2005-02-23 00:05:26.000000000 -0500
++++ kdebase-branch-3.4/applnk/compat/konqhtml.desktop 2005-03-10 11:05:07.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Konqueror Browser
++Name[af]=Konqueror Web Blaaier
+ Name[ar]=Ù…ØªØµÙØ كونكيورر
+ Name[az]=Konqueror Səyyahı
+ Name[bg]=Браузър Konqueror
+@@ -53,7 +54,7 @@
+ Name[sk]=Web priehliadaÄ Konqueror
+ Name[sl]=Brskalnik Konqueror
+ Name[sr]=Прегледач Konqueror
+-Name[sr@Latn]=Konqueror pretraživaÄ
++Name[sr@Latn]=PregledaÄ Konqueror
+ Name[sv]=Webbläsaren Konqueror
+ Name[ta]=கானà¯à®•ொரர௠வலை உலாவி
+ Name[tg]=Konqueror
+@@ -64,7 +65,6 @@
+ Name[ven]=Buronza ya Konqueror
+ Name[vi]=Trình duyệt Konqueror
+ Name[wa]=Betchteu Konqueror
+-Name[xx]=xxKonqueror Browserxx
+ Name[zh_CN]=Konqueror æµè§ˆå™¨
+ Name[zh_TW]=Konqueror ç¶²é ç€è¦½å™¨
+ Type=Application
+diff -Nru kdebase-release-3.4.0/applnk/compat/passwords.desktop kdebase-branch-3.4/applnk/compat/passwords.desktop
+--- kdebase-release-3.4.0/applnk/compat/passwords.desktop 2005-02-23 00:05:26.000000000 -0500
++++ kdebase-branch-3.4/applnk/compat/passwords.desktop 2005-03-26 02:37:38.000000000 -0500
+@@ -79,7 +79,6 @@
+ Name[vi]=Máºt khẩu
+ Name[wa]=Sicrets
+ Name[xh]=Amagama okugqitha
+-Name[xx]=xxPasswordsxx
+ Name[zh_CN]=密ç
+ Name[zh_TW]=密碼
+ Name[zu]=Amagama-okudlula
+@@ -106,7 +105,7 @@
+ Comment[fa]=تنظیمات واژه‌ی رمز
+ Comment[fi]=Salasanojen asetukset
+ Comment[fr]=Configurer les réglages des mots de passe
+-Comment[fy]=Hjirre kinne jo de wachtwurd ynstellingen ynstelle
++Comment[fy]=Hjirre kinne jo de wachtwurd ynstellings ynstelle
+ Comment[ga]=Cumraigh socruithe focail faire
+ Comment[gl]=Configuración das opcións dos contrasinais
+ Comment[he]=×©×™× ×•×™ הגדרות הססמ×ות
+@@ -150,7 +149,6 @@
+ Comment[vi]=Cấu hình các thiết láºp vá» máºt khẩu
+ Comment[wa]=Apontiaedjes po les screts
+ Comment[xh]=Qwalasela izicwangciso zegama lokugqitha
+-Comment[xx]=xxConfigure password settingsxx
+ Comment[zh_CN]=é…置密ç 设置
+ Comment[zh_TW]=è¨å®šå¯†ç¢¼
+ Comment[zu]=Hlanganisela izilungiselelo zamagama-okudlula
+@@ -212,7 +210,6 @@
+ Keywords[ven]=Phasiwede,kdesu,vhaanewa vha Echo,Humbula phasiwede,U fhela ha tshifhinga
+ Keywords[vi]=Máºt khẩu,kdesu,ký tá»± vá»ng,Nhá»› máºt khẩu,Hạn thá»i gian
+ Keywords[xh]=Amagama okugqitha,kdesu,iimpawu zesandi somkhwazo,Khumbula amagama okugqitha,Ixesha lokuphuma
+-Keywords[xx]=xxPasswords,kdesu,Echo characters,Remember passwords,Timeoutxx
+ Keywords[zh_CN]=Passwords,kdesu,Echo characters,Remember passwords,Timeout,密ç ,è¶…æ—¶,密ç ,回显å—符,è®°ä½å¯†ç
+ Keywords[zh_TW]=Passwords,kdesu,Echo characters,Remember passwords,Timeout,密碼,回應å—å…ƒ,記ä½å¯†ç¢¼,作æ¥é€¾æ™‚
+ Keywords[zu]=Amagama-okudlula,kdesu,Izimpawu zomsindo wokumemeza,Khumbula amagama-okudlula,Isikhathi sokuphuma
+diff -Nru kdebase-release-3.4.0/applnk/compat/power.desktop kdebase-branch-3.4/applnk/compat/power.desktop
+--- kdebase-release-3.4.0/applnk/compat/power.desktop 2005-02-23 00:05:26.000000000 -0500
++++ kdebase-branch-3.4/applnk/compat/power.desktop 2005-03-07 09:14:43.000000000 -0500
+@@ -51,7 +51,6 @@
+ Name[ven]=Khomupwutha pfarwa
+ Name[wa]=Poirtåve
+ Name[xh]=Umphezulu osongiweyo
+-Name[xx]=xxLaptopxx
+ Name[zh_CN]=è†ä¸Šè®¡ç®—机
+ Name[zh_TW]=è†ä¸Šåž‹çš„電腦
+ Name[zu]=Ikhomputha ephathwayo eyisicaba
+diff -Nru kdebase-release-3.4.0/applnk/compat/socks.desktop kdebase-branch-3.4/applnk/compat/socks.desktop
+--- kdebase-release-3.4.0/applnk/compat/socks.desktop 2005-02-23 00:05:26.000000000 -0500
++++ kdebase-branch-3.4/applnk/compat/socks.desktop 2005-03-10 11:05:07.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Socks
++Name[af]=Socks'
+ Name[bn]=সকস (Socks)
+ Name[da]=Sokler
+ Name[et]=Pesad
+@@ -12,7 +13,6 @@
+ Name[mn]=Ðүхнүүд
+ Name[pa]=ਸਾਕਸ
+ Name[ta]=தà¯à®³à¯ˆà®•ளà¯
+-Name[xx]=xxSocksxx
+ Type=Application
+ Icon=proxy
+ Exec=kcmshell proxy
+diff -Nru kdebase-release-3.4.0/applnk/compat/userinfo.desktop kdebase-branch-3.4/applnk/compat/userinfo.desktop
+--- kdebase-release-3.4.0/applnk/compat/userinfo.desktop 2005-02-23 00:05:26.000000000 -0500
++++ kdebase-branch-3.4/applnk/compat/userinfo.desktop 2005-03-10 11:05:07.000000000 -0500
+@@ -12,6 +12,7 @@
+ X-KDE-ParentApp=kcontrol
+
+ Name=User Account
++Name[af]=Gebruiker Rekening
+ Name[az]=İstifadəçi Hesabı
+ Name[be]=Рахунак карыÑтальніка(цы)
+ Name[bg]=Потребител
+@@ -60,7 +61,7 @@
+ Name[sk]=PoužÃvateľský úÄet
+ Name[sl]=UporabniÅ¡ki raÄun
+ Name[sr]=КориÑнички налог
+-Name[sr@Latn]=КориÑнички налог
++Name[sr@Latn]=KorisniÄki nalog
+ Name[sv]=Användarkonto
+ Name[ta]=பயனர௠கணகà¯à®•à¯
+ Name[tg]=Ðдади иÑтифодабарандагон
+@@ -69,14 +70,14 @@
+ Name[uk]=Рахунок кориÑтувача
+ Name[uz]=Фойдаланувчининг ҳиÑоби
+ Name[wa]=Conte uzeu
+-Name[xx]=xxUser Accountxx
+ Name[zh_CN]=用户账户
+ Comment=Change your account information
++Comment[af]=Verander jou rekening informasie
+ Comment[az]=İstifadəçi mə'lumatınızı dəyişdirin
+ Comment[be]=ЗьмÑніць інфармацыю аб Вашым рахунку
+ Comment[bg]=ÐаÑтройки на акаунта на потребителÑ
+ Comment[bn]=আপনার অà§à¦¯à¦¾à¦•াউনà§à¦Ÿ সংকà§à¦°à¦¾à¦¨à§à¦¤ তথà§à¦¯ পালà§à¦Ÿà¦¾à¦¨
+-Comment[br]=Kemmañ titouroù war ho gont
++Comment[br]=Kemmañ titouroù diwar-benn ho gont
+ Comment[bs]=Izmijenite informacije o vaÅ¡em raÄunu
+ Comment[ca]=Canvia la informació del vostre compte
+ Comment[cs]=ZmÄ›na informacà o uživatelském úÄtu
+@@ -120,7 +121,7 @@
+ Comment[sk]=Nastavenie informácià o vaÅ¡om úÄte
+ Comment[sl]=Spremenite podatke o vaÅ¡em raÄunu
+ Comment[sr]=Измена података о вашем налогу
+-Comment[sr@Latn]=Измена података о вашем налогу
++Comment[sr@Latn]=Izmena podataka o vašem nalogu
+ Comment[sv]=Ändra din kontoinformation
+ Comment[ta]=உஙà¯à®•ள௠கணகà¯à®•௠தகவலை மாறà¯à®±à¯
+ Comment[tg]=Тағйири адади иттилооти шумо
+@@ -129,7 +130,6 @@
+ Comment[uk]=Зміна інформації про ваш рахунок
+ Comment[uz]=ҲиÑобингиз ҳақида маълумотни ўзгартириш
+ Comment[wa]=Candjî l' informåcion do conte uzeu da vosse
+-Comment[xx]=xxChange your account informationxx
+ Comment[zh_CN]=更改您的账户信æ¯
+ Keywords=Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account
+ Keywords[az]=şifrələr,şifrə,dəyişdir,dəyişdirmək,timsal,şəkil,sifət,kdm,istifadəçi,ad,hesab
+@@ -173,12 +173,11 @@
+ Keywords[sk]=heslá,heslo,zmena hesla,ikona,obrázok,foto,kdm,použÃvateľ,meno,úÄet
+ Keywords[sl]=gesla,geslo,spremeni geslo,ikona,obraz,kdm,uporabniÅ¡ko ime, ime,raÄun
+ Keywords[sr]=Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account,Лозинке,Лозинка,Икона,лице,Име,Ðалог,КориÑнички налог
+-Keywords[sr@Latn]=Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account,Лозинке,Лозинка,Икона,лице,Име,Ðалог,КориÑнички налог
++Keywords[sr@Latn]=Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account,Lozinke,Lozinka,Ikona,lice,Ime,Nalog,KorisniÄki nalog
+ Keywords[sv]=lösenord,ändra lösenord,ikon,bild,KDM,användarnamn,namn,konto
+ Keywords[ta]=கடவà¯à®šà¯à®šà¯Šà®±à¯à®•ளà¯,கடவà¯à®šà¯à®šà¯Šà®²à¯,கடவà¯à®šà¯à®šà¯Šà®²à¯ˆ மாறà¯à®±à¯,சினà¯à®©à®®à¯,à®®à¯à®•à®®à¯,kdm,பயனர௠பெயரà¯,பெயரà¯,கணகà¯à®•à¯
+ Keywords[tr]=Parolalar,Parola,Parola Değişimi,Simge,yüz,kdm,Kullanıcı Adı,İsim,Ad,Hesap
+ Keywords[uk]=паролі,пароль,зміна паролÑ,піктограма,обличчÑ,kdm,ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача,ім'Ñ,рахунок
+ Keywords[uz]=Фойдаланувчининг иÑми,Махфий Ñўзлар,Махфий Ñўз,Махфий Ñўзни ўзгартириш,Ðишонча,Фойдаланувчи,ҲиÑоб,kdm
+ Keywords[wa]=Sicrets,Sicret,Candjî l' sicret,imådjete,kdm,No d' uzeu,No d' elodjaedje,No,Conte
+-Keywords[xx]=xxPasswords,Password,Change Password,Icon,face,kdm,User Name,Name,Accountxx
+ Keywords[zh_CN]=Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account,密ç ,更改密ç ,å›¾æ ‡,头åƒ,用户å,å§“å,账户
+diff -Nru kdebase-release-3.4.0/applnk/compat/virtualdesktops.desktop kdebase-branch-3.4/applnk/compat/virtualdesktops.desktop
+--- kdebase-release-3.4.0/applnk/compat/virtualdesktops.desktop 2005-02-23 00:05:26.000000000 -0500
++++ kdebase-branch-3.4/applnk/compat/virtualdesktops.desktop 2005-03-10 11:05:07.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Virtual Desktops
++Name[af]=Virtuele Werkskerms
+ Name[ar]=Ø£Ø³Ø·Ø Ø§Ù„Ù…ÙƒØªØ¨ التخيلية
+ Name[az]=Virtual Masa Üstləri
+ Name[be]=Ð’Ñ–Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ñ‹Ñ Ð¿Ñ€Ð°Ñ†Ð¾ÑžÐ½Ñ‹Ñ cталы
+@@ -62,7 +63,6 @@
+ Name[uz]=Виртуал иш Ñтоллари
+ Name[vi]=Desktop ảo
+ Name[wa]=Forveyous scribannes
+-Name[xx]=xxVirtual Desktopsxx
+ Name[zh_CN]=虚拟桌é¢
+ Name[zh_TW]=å¤šé‡æ¡Œé¢
+ Type=Application
+diff -Nru kdebase-release-3.4.0/applnk/hidden.directory kdebase-branch-3.4/applnk/hidden.directory
+--- kdebase-release-3.4.0/applnk/hidden.directory 2005-02-22 16:47:38.000000000 -0500
++++ kdebase-branch-3.4/applnk/hidden.directory 2005-03-28 02:02:16.000000000 -0500
+@@ -2,4 +2,29 @@
+ Encoding=UTF-8
+ Type=Directory
+ Name=Internal services
++Name[br]=Servijoù diabarzh
++Name[bs]=Interni servisi
++Name[ca]=Serveis interns
++Name[da]=Interne tjenester
++Name[de]=Interne Dienste
++Name[es]=Servicios internos
++Name[et]=Seesmised teenused
++Name[eu]=Barne zerbitzuak
++Name[fr]=Services internes
++Name[ga]=SeirbhÃsà inmheánacha
++Name[he]=×©×™×¨×•×ª×™× ×¤× ×™×ž×™×™×
++Name[hu]=Belső szolgáltatások
++Name[is]=Innri þjónustur
++Name[it]=Servizi interni
++Name[ja]=内部サービス
++Name[lt]=VidinÄ—s tarnybos
++Name[nl]=Interne diensten
++Name[pt]=Serviços internos
++Name[pt_BR]=Serviços Internos
++Name[ru]=Внутренние Ñлужбы
++Name[sl]=Notranje storitve
++Name[sr]=Унутрашњи ÑервиÑи
++Name[sr@Latn]=Unutrašnji servisi
++Name[sv]=Interna tjänster
++Name[uk]=Внутрішні Ñлужби
+ NoDisplay=true
+diff -Nru kdebase-release-3.4.0/applnk/kde-development.directory kdebase-branch-3.4/applnk/kde-development.directory
+--- kdebase-release-3.4.0/applnk/kde-development.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-development.directory 2005-03-07 09:14:41.000000000 -0500
+@@ -73,7 +73,6 @@
+ Name[vi]=Phát triển
+ Name[wa]=Programaedje
+ Name[xh]=Ubhekiso phambili
+-Name[xx]=xxDevelopmentxx
+ Name[zh_CN]=å¼€å‘
+ Name[zh_TW]=程å¼é–‹ç™¼
+ Name[zu]=Intuthuko
+diff -Nru kdebase-release-3.4.0/applnk/kde-editors.directory kdebase-branch-3.4/applnk/kde-editors.directory
+--- kdebase-release-3.4.0/applnk/kde-editors.directory 2005-02-22 16:47:38.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-editors.directory 2005-03-07 09:14:41.000000000 -0500
+@@ -70,7 +70,6 @@
+ Name[vi]=Trình biên táºp
+ Name[wa]=Aspougneus d'Â tecse
+ Name[xh]=Abahleli
+-Name[xx]=xxEditorsxx
+ Name[zh_CN]=编辑器
+ Name[zh_TW]=編輯器
+ Name[zu]=Abalungisi
+diff -Nru kdebase-release-3.4.0/applnk/kde-edutainment.directory kdebase-branch-3.4/applnk/kde-edutainment.directory
+--- kdebase-release-3.4.0/applnk/kde-edutainment.directory 2005-02-22 16:47:38.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-edutainment.directory 2005-03-07 09:14:41.000000000 -0500
+@@ -67,7 +67,6 @@
+ Name[uz]=Ўйнаб ўрганиш
+ Name[ven]=Pfunzotakadza
+ Name[xh]=Ufundiso
+-Name[xx]=xxEdutainmentxx
+ Name[zh_CN]=寓教于ä¹
+ Name[zh_TW]=教育和娛樂
+ Name[zu]=Ezemfundo
+diff -Nru kdebase-release-3.4.0/applnk/kde-games-arcade.directory kdebase-branch-3.4/applnk/kde-games-arcade.directory
+--- kdebase-release-3.4.0/applnk/kde-games-arcade.directory 2005-02-22 16:47:38.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-games-arcade.directory 2005-03-07 09:14:41.000000000 -0500
+@@ -58,7 +58,6 @@
+ Name[vi]=Mái vòm
+ Name[wa]=Årcåde
+ Name[xh]=Umqolo wesakhiwo esiphatha ubunzima bento
+-Name[xx]=xxArcadexx
+ Name[zh_CN]=街机
+ Name[zh_TW]=å¤§åž‹éŠæˆ²æ©ŸéŠæˆ²
+ Name[zu]=Umhhume
+diff -Nru kdebase-release-3.4.0/applnk/kde-games-board.directory kdebase-branch-3.4/applnk/kde-games-board.directory
+--- kdebase-release-3.4.0/applnk/kde-games-board.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-games-board.directory 2005-03-10 11:05:06.000000000 -0500
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Directory
+ Name=Board Games
++Name[af]=Bord Speletjies
+ Name[ar]=ألعاب الألواØ
+ Name[az]=Lüvhə Oyunları
+ Name[bg]=Игри на дъÑка
+@@ -61,7 +62,6 @@
+ Name[uz]=Стол ўйинлари
+ Name[vi]=Trò chơi bảng
+ Name[wa]=Djeus d'Â platea
+-Name[xx]=xxBoard Gamesxx
+ Name[zh_CN]=棋类游æˆ
+ Icon=package_games_board
+ X-KDE-SuppressGenericNames=Game,Board Game
+diff -Nru kdebase-release-3.4.0/applnk/kde-games-card.directory kdebase-branch-3.4/applnk/kde-games-card.directory
+--- kdebase-release-3.4.0/applnk/kde-games-card.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-games-card.directory 2005-03-10 11:05:06.000000000 -0500
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Directory
+ Name=Card Games
++Name[af]=Kaart Speletjies
+ Name[ar]=ألعاب ورقية
+ Name[az]=Kart Oyunları
+ Name[be]=ÐšÐ°Ñ€Ñ‚Ð°Ñ‡Ð½Ñ‹Ñ Ð³ÑƒÐ»ÑŒÐ½Ñ–
+@@ -62,7 +63,6 @@
+ Name[uz]=Қарта ўйинлари
+ Name[vi]=Trò chơi thẻ
+ Name[wa]=Cwårdjeus
+-Name[xx]=xxCard Gamesxx
+ Name[zh_CN]=牌类游æˆ
+ Icon=package_games_card
+ X-KDE-SuppressGenericNames=Game,Card Game
+diff -Nru kdebase-release-3.4.0/applnk/kde-games-kidsgames.directory kdebase-branch-3.4/applnk/kde-games-kidsgames.directory
+--- kdebase-release-3.4.0/applnk/kde-games-kidsgames.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-games-kidsgames.directory 2005-03-07 09:14:41.000000000 -0500
+@@ -70,7 +70,6 @@
+ Name[vi]=Trò chơi
+ Name[wa]=Djeus po ls efants
+ Name[xh]=Imidlalo Yabantwana
+-Name[xx]=xxGames for Kidsxx
+ Name[zh_CN]=儿童游æˆ
+ Name[zh_TW]=å°å©çš„éŠæˆ²
+ Name[zu]=Imidlalo yabantwana
+diff -Nru kdebase-release-3.4.0/applnk/kde-games-roguelikes.directory kdebase-branch-3.4/applnk/kde-games-roguelikes.directory
+--- kdebase-release-3.4.0/applnk/kde-games-roguelikes.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-games-roguelikes.directory 2005-03-30 01:47:39.000000000 -0500
+@@ -14,6 +14,7 @@
+ Name[cy]=Gemau sy'n debyg i Rogue
+ Name[da]=Rogue-lignende spil
+ Name[de]=Rogue-ähnliche Spiele
++Name[el]=Παιχνίδια Ï„Ïπου Rogue
+ Name[eo]=Filudoj
+ Name[es]=Juegos tipo Rogue
+ Name[et]=Rogue-laadsed mängud
+@@ -69,7 +70,6 @@
+ Name[vi]=Game giống Rogue
+ Name[wa]=Djeus ki rshonnèt-st a «rogue»
+ Name[xh]=Imidlalo efana ne Rogue
+-Name[xx]=xxRogue-like Gamesxx
+ Name[zh_CN]=æ¶ä½œå‰§æ¸¸æˆ
+ Name[zh_TW]=å†’éšªé¡žéŠæˆ²
+ Name[zu]=Imidlalo enjenge-Rogue
+diff -Nru kdebase-release-3.4.0/applnk/kde-games-strategy.directory kdebase-branch-3.4/applnk/kde-games-strategy.directory
+--- kdebase-release-3.4.0/applnk/kde-games-strategy.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-games-strategy.directory 2005-03-07 09:14:41.000000000 -0500
+@@ -70,7 +70,6 @@
+ Name[vi]=Chiến thuáºt và Chiến lược
+ Name[wa]=Tactike eyet stratedjeye
+ Name[xh]=Amacebo okufumana iinjongo & Amacebo okuzoba
+-Name[xx]=xxTactics & Strategyxx
+ Name[zh_CN]=ç–略游æˆ
+ Name[zh_TW]=戰略åŠç–ç•¥
+ Name[zu]=Amaqhinga & Iplani
+diff -Nru kdebase-release-3.4.0/applnk/kde-games.directory kdebase-branch-3.4/applnk/kde-games.directory
+--- kdebase-release-3.4.0/applnk/kde-games.directory 2005-02-22 16:47:39.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-games.directory 2005-03-07 09:14:41.000000000 -0500
+@@ -73,7 +73,6 @@
+ Name[vi]=Trò chơi
+ Name[wa]=Djeus
+ Name[xh]=Imidlalo
+-Name[xx]=xxGamesxx
+ Name[zh_CN]=游æˆ
+ Name[zh_TW]=éŠæˆ²
+ Name[zu]=Imidlalo
+diff -Nru kdebase-release-3.4.0/applnk/kde-graphics.directory kdebase-branch-3.4/applnk/kde-graphics.directory
+--- kdebase-release-3.4.0/applnk/kde-graphics.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-graphics.directory 2005-03-07 09:14:41.000000000 -0500
+@@ -73,7 +73,6 @@
+ Name[vi]=Äồ hoạ
+ Name[wa]=Grafikes
+ Name[xh]=Imizobo
+-Name[xx]=xxGraphicsxx
+ Name[zh_CN]=图åƒ
+ Name[zh_TW]=圖形
+ Name[zu]=Imidwebo
+diff -Nru kdebase-release-3.4.0/applnk/kde-information.directory kdebase-branch-3.4/applnk/kde-information.directory
+--- kdebase-release-3.4.0/applnk/kde-information.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-information.directory 2005-03-07 09:14:41.000000000 -0500
+@@ -70,7 +70,6 @@
+ Name[vi]=Thông tin
+ Name[wa]=Informåcions
+ Name[xh]=Ulwazi
+-Name[xx]=xxInformationxx
+ Name[zh_CN]=ä¿¡æ¯
+ Name[zh_TW]=資訊
+ Name[zu]=Ulwazi
+diff -Nru kdebase-release-3.4.0/applnk/kde-internet-terminal.directory kdebase-branch-3.4/applnk/kde-internet-terminal.directory
+--- kdebase-release-3.4.0/applnk/kde-internet-terminal.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-internet-terminal.directory 2005-03-22 12:37:59.000000000 -0500
+@@ -33,7 +33,7 @@
+ Name[hsb]=Programy za terminal
+ Name[hu]=Parancsértelmezők
+ Name[is]=Skjáhermiforrit
+-Name[it]=Applicazioni di terminale
++Name[it]=Applicazioni terminale
+ Name[ja]=ターミナルアプリケーション
+ Name[ko]=í„°ë¯¸ë„ ì‘ìš© 프로그램
+ Name[lo]=ໂປຣà»àºàº£àº¡à»€àº—ີມີນà»
+@@ -71,7 +71,6 @@
+ Name[vi]=Các trình đầu cuối
+ Name[wa]=Programes terminås
+ Name[xh]=Izicelo Zesiphelo sendlela
+-Name[xx]=xxTerminal Applicationsxx
+ Name[zh_CN]=终端应用程åº
+ Name[zh_TW]=終端機程å¼
+ Name[zu]=Abayaleli bangaphandle
+diff -Nru kdebase-release-3.4.0/applnk/kde-internet.directory kdebase-branch-3.4/applnk/kde-internet.directory
+--- kdebase-release-3.4.0/applnk/kde-internet.directory 2005-02-22 16:47:39.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-internet.directory 2005-03-07 09:14:41.000000000 -0500
+@@ -34,7 +34,6 @@
+ Name[uk]=Інтернет
+ Name[uz]=Интернет
+ Name[wa]=Daegntoele
+-Name[xx]=xxInternetxx
+ Name[zh_CN]=互连网
+ Icon=package_network
+
+diff -Nru kdebase-release-3.4.0/applnk/kde-main.directory kdebase-branch-3.4/applnk/kde-main.directory
+--- kdebase-release-3.4.0/applnk/kde-main.directory 2005-02-22 16:47:39.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-main.directory 2005-03-10 11:05:06.000000000 -0500
+@@ -3,6 +3,7 @@
+ Type=Directory
+ Icon=package
+ Name=KDE Menu
++Name[af]=KDE Kieslys
+ Name[ar]=قائمة كيدي
+ Name[az]=KDE Meyusu
+ Name[be]=МÑню KDE
+@@ -63,5 +64,4 @@
+ Name[uz]=KDE меню
+ Name[vi]=Thực đơn KDE
+ Name[wa]=Menu KDE
+-Name[xx]=xxKDE Menuxx
+ Name[zh_CN]=KDE èœå•
+diff -Nru kdebase-release-3.4.0/applnk/kde-more.directory kdebase-branch-3.4/applnk/kde-more.directory
+--- kdebase-release-3.4.0/applnk/kde-more.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-more.directory 2005-03-30 01:47:39.000000000 -0500
+@@ -3,6 +3,7 @@
+ Type=Directory
+ Icon=package
+ Name=More Applications
++Name[af]=Meer Programme
+ Name[az]=Daha Çox Proqram
+ Name[bg]=Повече програми
+ Name[bn]=আরো অà§à¦¯à¦¾à¦ªà¦²à¦¿à¦•েশন
+@@ -13,6 +14,7 @@
+ Name[cy]=Rhagor o Gymhwysiadau
+ Name[da]=Flere programmer
+ Name[de]=Weitere Programme
++Name[el]=ΠεÏισσότεÏες εφαÏμογÎÏ‚
+ Name[eo]=Pluaj aplikaĵoj
+ Name[es]=Más aplicaciones
+ Name[et]=Muud rakendused
+@@ -47,7 +49,7 @@
+ Name[sk]=Ďalšie aplikácie
+ Name[sl]=VeÄ programov
+ Name[sr]=Још програма
+-Name[sr@Latn]=Још програма
++Name[sr@Latn]=Još programa
+ Name[sv]=Fler program
+ Name[ta]=அதிக பயனà¯à®ªà®¾à®Ÿà¯à®•ளà¯
+ Name[tg]=Барномаҳои иловагӣ
+@@ -55,5 +57,4 @@
+ Name[uk]=Інші програми
+ Name[uz]=Бошқа даÑтурлар
+ Name[wa]=Co ds ôtes programes
+-Name[xx]=xxMore Applicationsxx
+ Name[zh_CN]=更多应用程åº
+diff -Nru kdebase-release-3.4.0/applnk/kde-multimedia.directory kdebase-branch-3.4/applnk/kde-multimedia.directory
+--- kdebase-release-3.4.0/applnk/kde-multimedia.directory 2005-02-22 16:47:39.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-multimedia.directory 2005-03-07 09:14:41.000000000 -0500
+@@ -50,7 +50,6 @@
+ Name[ven]=Zwimwumwusi
+ Name[vi]=Äa phương tiện
+ Name[xh]=Iindlela ezininzi zokwenza
+-Name[xx]=xxMultimediaxx
+ Name[zh_CN]=多媒体
+ Name[zh_TW]=多媒體
+ Name[zu]=Onozindaba abaningi
+diff -Nru kdebase-release-3.4.0/applnk/kde-office.directory kdebase-branch-3.4/applnk/kde-office.directory
+--- kdebase-release-3.4.0/applnk/kde-office.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-office.directory 2005-03-07 09:14:41.000000000 -0500
+@@ -67,7 +67,6 @@
+ Name[vi]=Văn phòng
+ Name[wa]=Buro
+ Name[xh]=Ofisi
+-Name[xx]=xxOfficexx
+ Name[zh_CN]=办公
+ Name[zh_TW]=辦公軟體
+ Name[zu]=Ihhofisi
+diff -Nru kdebase-release-3.4.0/applnk/kde-science.directory kdebase-branch-3.4/applnk/kde-science.directory
+--- kdebase-release-3.4.0/applnk/kde-science.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-science.directory 2005-03-10 11:05:06.000000000 -0500
+@@ -3,6 +3,7 @@
+ Type=Directory
+ Icon=kcmdf
+ Name=Science & Math
++Name[af]=Wetenskap & Wiskunde
+ Name[az]=Elm vÉ™ Riyaziyyat
+ Name[be]=Ðавука Ñ– матÑматыка
+ Name[bg]=Математика
+@@ -52,7 +53,7 @@
+ Name[sk]=Veda
+ Name[sl]=Znanost in matematika
+ Name[sr]=Ðаука и математика
+-Name[sr@Latn]=Ðаука и математика
++Name[sr@Latn]=Nauka i matematika
+ Name[sv]=Vetenskap och matematik
+ Name[ta]=அறிவியல௠& கணிதமà¯
+ Name[tg]=Илмӣ ва математикӣ
+@@ -61,5 +62,4 @@
+ Name[uk]=Ðаука та математика
+ Name[uz]=Фан ва Математика
+ Name[wa]=Siyinces et matematikes
+-Name[xx]=xxScience & Mathxx
+ Name[zh_CN]=ç§‘å¦å’Œæ•°å¦
+diff -Nru kdebase-release-3.4.0/applnk/kde-settings-accessibility.directory kdebase-branch-3.4/applnk/kde-settings-accessibility.directory
+--- kdebase-release-3.4.0/applnk/kde-settings-accessibility.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-settings-accessibility.directory 2005-03-07 09:14:41.000000000 -0500
+@@ -68,7 +68,6 @@
+ Name[vi]=Vùng & TÃnh gần gÅ©i
+ Name[wa]=Redjonå & Accessibilité
+ Name[xh]=Ummandla & Nofumaneko
+-Name[xx]=xxRegional & Accessibilityxx
+ Name[zh_CN]=区域和辅助功能
+ Name[zh_TW]=å€åŸŸæ€§ & 易用性
+ Name[zu]=Okwesifunda & Igunya lokungena
+diff -Nru kdebase-release-3.4.0/applnk/kde-settings-components.directory kdebase-branch-3.4/applnk/kde-settings-components.directory
+--- kdebase-release-3.4.0/applnk/kde-settings-components.directory 2005-02-22 16:47:39.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-settings-components.directory 2005-03-07 09:14:41.000000000 -0500
+@@ -68,7 +68,6 @@
+ Name[vi]=Thà nh phần của KDK
+ Name[wa]=Componints di KDE
+ Name[xh]=Izinto ze KDE
+-Name[xx]=xxKDE Componentsxx
+ Name[zh_CN]=KDE 组件
+ Name[zh_TW]=KDE 元件
+ Name[zu]= Amalunga e-KDE
+diff -Nru kdebase-release-3.4.0/applnk/kde-settings-desktop.directory kdebase-branch-3.4/applnk/kde-settings-desktop.directory
+--- kdebase-release-3.4.0/applnk/kde-settings-desktop.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-settings-desktop.directory 2005-03-07 09:14:41.000000000 -0500
+@@ -66,7 +66,6 @@
+ Name[uz]=Иш Ñтоли
+ Name[ven]=Desikithopo
+ Name[wa]=Sicribanne
+-Name[xx]=xxDesktopxx
+ Name[zh_CN]=桌é¢
+ Name[zh_TW]=桌é¢
+ Icon=desktop
+diff -Nru kdebase-release-3.4.0/applnk/kde-settings-hardware.directory kdebase-branch-3.4/applnk/kde-settings-hardware.directory
+--- kdebase-release-3.4.0/applnk/kde-settings-hardware.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-settings-hardware.directory 2005-03-30 01:47:40.000000000 -0500
+@@ -4,6 +4,8 @@
+ Name=Hardware
+ Name[bg]=Хардуер
+ Name[bn]=হারà§à¦¡à¦“à§Ÿà§à¦¯à¦¾à¦°
++Name[bs]=Hardver
++Name[el]=Υλικό
+ Name[et]=Riistvara
+ Name[fi]=Laitteisto
+ Name[fr]=Matériel
+@@ -11,6 +13,7 @@
+ Name[he]=חומרה
+ Name[hu]=Hardver
+ Name[is]=Vélbúnaður
++Name[ja]=ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢
+ Name[lt]=Aparatinė įranga
+ Name[nb]=Maskinvare
+ Name[nn]=Maskinvare
+@@ -18,13 +21,13 @@
+ Name[pl]=Sprzęt
+ Name[ru]=Оборудование
+ Name[se]=Mašiidnagálvu
++Name[sk]=Hardvér
+ Name[sl]=Strojna oprema
+ Name[sr]=Хардвер
+-Name[sr@Latn]=Хардвер
++Name[sr@Latn]=Hardver
+ Name[sv]=HÃ¥rdvara
+ Name[ta]=வனà¯à®ªà¯Šà®°à¯à®³à¯
+ Name[tr]=Donanım
+ Name[uk]=ОбладнаннÑ
+-Name[xx]=xxHardwarexx
+ Name[zh_CN]=硬件
+ Icon=input_devices_settings
+diff -Nru kdebase-release-3.4.0/applnk/kde-settings-looknfeel.directory kdebase-branch-3.4/applnk/kde-settings-looknfeel.directory
+--- kdebase-release-3.4.0/applnk/kde-settings-looknfeel.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-settings-looknfeel.directory 2005-03-07 09:14:41.000000000 -0500
+@@ -69,7 +69,6 @@
+ Name[vi]=Diện mạo & Chủ đỠthể hiện
+ Name[wa]=Rivnance & Tinmes
+ Name[xh]=Ubonakalo Nemixholo
+-Name[xx]=xxAppearance & Themesxx
+ Name[zh_CN]=外观和主题
+ Name[zh_TW]=外觀 & 主題
+ Name[zu]=Ukubukeka & Izingqikithi
+diff -Nru kdebase-release-3.4.0/applnk/kde-settings-network.directory kdebase-branch-3.4/applnk/kde-settings-network.directory
+--- kdebase-release-3.4.0/applnk/kde-settings-network.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-settings-network.directory 2005-03-07 09:14:41.000000000 -0500
+@@ -69,7 +69,6 @@
+ Name[vi]=Internet & Mạng
+ Name[wa]=Rantoele & Daegntoele
+ Name[xh]=Internet & Nomsebenzi womnatha
+-Name[xx]=xxInternet & Networkxx
+ Name[zh_CN]=Internet 和网络
+ Name[zh_TW]=網際網路 & 網路
+ Name[zu]=Internet & Uxhumano olusakazekile
+diff -Nru kdebase-release-3.4.0/applnk/kde-settings-peripherals.directory kdebase-branch-3.4/applnk/kde-settings-peripherals.directory
+--- kdebase-release-3.4.0/applnk/kde-settings-peripherals.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-settings-peripherals.directory 2005-03-07 09:14:41.000000000 -0500
+@@ -72,7 +72,6 @@
+ Name[vi]=Thiết bị ngoại vi
+ Name[wa]=Periferikes
+ Name[xh]=Iilayini zomda
+-Name[xx]=xxPeripheralsxx
+ Name[zh_CN]=外设
+ Name[zh_TW]=週邊è¨å‚™
+ Name[zu]=Imixhantela
+diff -Nru kdebase-release-3.4.0/applnk/kde-settings-power.directory kdebase-branch-3.4/applnk/kde-settings-power.directory
+--- kdebase-release-3.4.0/applnk/kde-settings-power.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-settings-power.directory 2005-03-07 09:14:41.000000000 -0500
+@@ -72,7 +72,6 @@
+ Name[vi]=Äiá»u khiển nguồn Ä‘iện
+ Name[wa]=Controle di l' alimintåcion
+ Name[xh]=Ulawulo Lwamandla
+-Name[xx]=xxPower Controlxx
+ Name[zh_CN]=ç”µæºæŽ§åˆ¶
+ Name[zh_TW]=é›»æºæŽ§åˆ¶
+ Name[zu]=Ukulawulwa kwamandla
+diff -Nru kdebase-release-3.4.0/applnk/kde-settings-security.directory kdebase-branch-3.4/applnk/kde-settings-security.directory
+--- kdebase-release-3.4.0/applnk/kde-settings-security.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-settings-security.directory 2005-03-28 02:02:16.000000000 -0500
+@@ -31,7 +31,7 @@
+ Name[hr]=Sigurnost i privatnost
+ Name[hsb]=Wěstosć & Anonymnosć
+ Name[hu]=Adatvédelem
+-Name[is]=Öryggi og Einkamál
++Name[is]=Öryggi og einkamál
+ Name[it]=Sicurezza e Privacy
+ Name[ja]=ã‚»ã‚ュリティ & プライãƒã‚·ãƒ¼
+ Name[ko]=보안과 사ìƒí™œ
+@@ -69,7 +69,6 @@
+ Name[vi]=Bảo máºt & TÃnh riêng tư
+ Name[wa]=Såvrité & Privaceye
+ Name[xh]=Ukhuseleko & Nobunikazi
+-Name[xx]=xxSecurity & Privacyxx
+ Name[zh_CN]=安全和éšç§
+ Name[zh_TW]=安全性 & ç§å¯†æ€§
+ Name[zu]=Ukuvikeleka & Ingasese
+diff -Nru kdebase-release-3.4.0/applnk/kde-settings-sound.directory kdebase-branch-3.4/applnk/kde-settings-sound.directory
+--- kdebase-release-3.4.0/applnk/kde-settings-sound.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-settings-sound.directory 2005-03-28 02:02:16.000000000 -0500
+@@ -29,7 +29,7 @@
+ Name[hr]=Zvuk i multimedija
+ Name[hsb]=Zwuk & Multimedia
+ Name[hu]=Hang, multimédia
+-Name[is]=Hljóð og Margmiðlun
++Name[is]=Hljóð og margmiðlun
+ Name[it]=Suono e Multimedia
+ Name[ja]=サウンド & マルãƒãƒ¡ãƒ‡ã‚£ã‚¢
+ Name[ko]=소리와 멀티미디어
+@@ -67,7 +67,6 @@
+ Name[vi]=Âm nhạc & Äa phương tiện
+ Name[wa]=Son & Multimedia
+ Name[xh]=Isandi & Multimedia
+-Name[xx]=xxSound & Multimediaxx
+ Name[zh_CN]=声音和多媒体
+ Name[zh_TW]=è²éŸ³ & 多媒體
+ Name[zu]=Umsindo & Onozindaba abaningi
+diff -Nru kdebase-release-3.4.0/applnk/kde-settings-system.directory kdebase-branch-3.4/applnk/kde-settings-system.directory
+--- kdebase-release-3.4.0/applnk/kde-settings-system.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-settings-system.directory 2005-03-10 11:05:06.000000000 -0500
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Directory
+ Name=System Administration
++Name[af]=Stelsel Administrasie
+ Name[ar]=إدارة النّظام
+ Name[az]=Sistem İdarəsi
+ Name[be]=СыÑÑ‚Ñмнае адмініÑтраваньне
+@@ -65,7 +66,6 @@
+ Name[vi]=Quản lý hệ thống
+ Name[wa]=Manaedjmint do sistinme
+ Name[xh]=Umphathi Wendlela yokusebenza
+-Name[xx]=xxSystem Administrationxx
+ Name[zh_CN]=系统管ç†
+ Name[zu]=Ukugcinwa kwe-sistimu
+ Icon=kcmsystem
+diff -Nru kdebase-release-3.4.0/applnk/kde-settings-webbrowsing.directory kdebase-branch-3.4/applnk/kde-settings-webbrowsing.directory
+--- kdebase-release-3.4.0/applnk/kde-settings-webbrowsing.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-settings-webbrowsing.directory 2005-03-28 02:02:16.000000000 -0500
+@@ -31,7 +31,7 @@
+ Name[hr]=Web pretraživaÄ
+ Name[hsb]=Web-browser
+ Name[hu]=Webböngésző
+-Name[is]=Vefskoðari
++Name[is]=Vafri
+ Name[it]=Navigazione Web
+ Name[ja]=Webブラウザ
+ Name[ko]=웹 íƒìƒ‰ê¸°
+@@ -55,7 +55,7 @@
+ Name[sk]=Webový prehliadaÄ
+ Name[sl]=Spletni brskalnik
+ Name[sr]=Веб прегледач
+-Name[sr@Latn]=Veb pretraživaÄ
++Name[sr@Latn]=Veb pregledaÄ
+ Name[ss]=Ibrawuza ye-Web
+ Name[sv]=Webbläsning
+ Name[ta]=வலை உலாவி
+@@ -68,7 +68,6 @@
+ Name[vi]=Trình duyệt Web
+ Name[wa]=Betchteu waibe
+ Name[xh]=Umkhangeli zincwadi we Web
+-Name[xx]=xxWeb Browserxx
+ Name[zh_CN]=Web æµè§ˆå™¨
+ Name[zh_TW]=ç¶²é ç€è¦½å™¨
+ Name[zu]=Umcingi we-Web
+diff -Nru kdebase-release-3.4.0/applnk/kde-settings.directory kdebase-branch-3.4/applnk/kde-settings.directory
+--- kdebase-release-3.4.0/applnk/kde-settings.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-settings.directory 2005-03-10 11:05:06.000000000 -0500
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Directory
+ Name=Settings-Modules
++Name[af]=Instel-Modules
+ Name[ar]=إعدادات-ÙˆØØ¯Ø§Øª
+ Name[az]=Qurğu Modulları
+ Name[be]=Модулі наÑтройкі
+@@ -69,7 +70,6 @@
+ Name[vi]=Thiết láºp - Module
+ Name[wa]=Apontiaedjes des modules
+ Name[xh]=Izicwangciso-Iminqongo wokulinganisela
+-Name[xx]=xxSettings-Modulesxx
+ Name[zh_CN]=设置模å—
+ Name[zh_TW]=è¨å®šæ¨¡çµ„
+ Name[zu]=Izingxenye-zezilungiselelo
+diff -Nru kdebase-release-3.4.0/applnk/kde-settingsmenu.directory kdebase-branch-3.4/applnk/kde-settingsmenu.directory
+--- kdebase-release-3.4.0/applnk/kde-settingsmenu.directory 2005-02-22 16:47:39.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-settingsmenu.directory 2005-03-26 02:37:38.000000000 -0500
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Directory
+ Name=Settings
++Name[af]=Instellings
+ Name[ar]=الإعدادات
+ Name[az]=QurÄŸular
+ Name[be]=ÐаÑтройкі
+@@ -21,7 +22,7 @@
+ Name[eu]=Ezarpenak
+ Name[fi]=Asetukset
+ Name[fr]=Configuration
+-Name[fy]=Ynstellingen
++Name[fy]=Ynstellings
+ Name[ga]=Socruithe
+ Name[gl]=Opcións
+ Name[he]=הגדרות
+@@ -61,6 +62,5 @@
+ Name[uz]=МоÑламалар
+ Name[vi]=Thiết láºp
+ Name[wa]=Apontiaedjes
+-Name[xx]=xxSettingsxx
+ Name[zh_CN]=设置
+ Icon=package_settings
+diff -Nru kdebase-release-3.4.0/applnk/kde-system-screensavers.directory kdebase-branch-3.4/applnk/kde-system-screensavers.directory
+--- kdebase-release-3.4.0/applnk/kde-system-screensavers.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-system-screensavers.directory 2005-03-07 09:14:41.000000000 -0500
+@@ -70,7 +70,6 @@
+ Name[vi]=Trình bảo vệ mà n hình
+ Name[wa]=Sipårgneus di waitroûle
+ Name[xh]=Abagcini Bekhusi
+-Name[xx]=xxScreen Saversxx
+ Name[zh_CN]=å±å¹•ä¿æŠ¤ç¨‹åº
+ Name[zh_TW]=螢幕ä¿è·ç¨‹å¼
+ Name[zu]=Abagcini Besikrini
+@@ -148,7 +147,6 @@
+ Comment[vi]=ThỠtrình bảo vệ mà n hình
+ Comment[wa]=Sipårgneus di waitroûle di saye
+ Comment[xh]=Demos zomgcini wekhusi
+-Comment[xx]=xxScreen saver demosxx
+ Comment[zh_CN]=å±å¹•ä¿æŠ¤ç¨‹åºæ¼”示
+ Comment[zh_TW]=螢幕ä¿è·ç¨‹å¼å±•示
+ Comment[zu]=Imiboniso yezigcini zikrini
+diff -Nru kdebase-release-3.4.0/applnk/kde-system-terminal.directory kdebase-branch-3.4/applnk/kde-system-terminal.directory
+--- kdebase-release-3.4.0/applnk/kde-system-terminal.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-system-terminal.directory 2005-03-22 12:37:59.000000000 -0500
+@@ -33,7 +33,7 @@
+ Name[hsb]=Programy za terminal
+ Name[hu]=Parancsértelmezők
+ Name[is]=Skjáhermiforrit
+-Name[it]=Applicazioni di terminale
++Name[it]=Applicazioni terminale
+ Name[ja]=ターミナルアプリケーション
+ Name[ko]=í„°ë¯¸ë„ ì‘ìš© 프로그램
+ Name[lo]=ໂປຣà»àºàº£àº¡à»€àº—ີມີນà»
+@@ -71,7 +71,6 @@
+ Name[vi]=Các trình đầu cuối
+ Name[wa]=Programes terminås
+ Name[xh]=Izicelo Zesiphelo sendlela
+-Name[xx]=xxTerminal Applicationsxx
+ Name[zh_CN]=终端应用程åº
+ Name[zh_TW]=終端機程å¼
+ Name[zu]=Abayaleli bangaphandle
+diff -Nru kdebase-release-3.4.0/applnk/kde-system.directory kdebase-branch-3.4/applnk/kde-system.directory
+--- kdebase-release-3.4.0/applnk/kde-system.directory 2005-02-22 16:47:39.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-system.directory 2005-03-07 09:14:41.000000000 -0500
+@@ -65,7 +65,6 @@
+ Name[vi]=Hệ Thống
+ Name[wa]=Sistinme
+ Name[xh]=Indlela esestyenziswayo
+-Name[xx]=xxSystemxx
+ Name[zh_CN]=系统
+ Name[zh_TW]=系統
+ Name[zu]=Isistimu
+diff -Nru kdebase-release-3.4.0/applnk/kde-toys.directory kdebase-branch-3.4/applnk/kde-toys.directory
+--- kdebase-release-3.4.0/applnk/kde-toys.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-toys.directory 2005-03-07 09:14:41.000000000 -0500
+@@ -73,7 +73,6 @@
+ Name[vi]=Äồ chÆ¡i
+ Name[wa]=Amuzmints
+ Name[xh]=Izinto zokudlala
+-Name[xx]=xxToysxx
+ Name[zh_CN]=玩具
+ Name[zh_TW]=玩具
+ Name[zu]=Amathoyizi
+diff -Nru kdebase-release-3.4.0/applnk/kde-unknown.directory kdebase-branch-3.4/applnk/kde-unknown.directory
+--- kdebase-release-3.4.0/applnk/kde-unknown.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-unknown.directory 2005-03-10 11:05:06.000000000 -0500
+@@ -2,11 +2,13 @@
+ Encoding=UTF-8
+ Type=Directory
+ Name=Lost & Found
++Name[af]=Verlore & Gevind
+ Name[ar]=ÙÙقد ÙˆÙˆÙØ¬Ø¯
+ Name[az]=İtirdim və Tapdım
+ Name[be]=Ð—Ð³ÑƒÐ±Ð»ÐµÐ½Ñ‹Ñ Ñ– знойдзеныÑ
+ Name[bg]=Разни
+ Name[bn]=হারানো পà§à¦°à¦¾à¦ªà§à¦¤à¦¿
++Name[br]=Kollet & kavet
+ Name[bs]=Izgubljeno/nađeno
+ Name[ca]=Perdut i trobat
+ Name[cs]=Ztráty a nálezy
+@@ -56,6 +58,5 @@
+ Name[uk]=Загублено та знайдено
+ Name[uz]=Ðомаълум
+ Name[wa]=Pierdous & rtrovés
+-Name[xx]=xxLost & Foundxx
+ Name[zh_CN]=æ‰è¿·è—
+ Icon=help
+diff -Nru kdebase-release-3.4.0/applnk/kde-utilities-xutils.directory kdebase-branch-3.4/applnk/kde-utilities-xutils.directory
+--- kdebase-release-3.4.0/applnk/kde-utilities-xutils.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-utilities-xutils.directory 2005-03-07 09:14:41.000000000 -0500
+@@ -67,7 +67,6 @@
+ Name[vi]=Tiện Ãch
+ Name[wa]=Usteyes X
+ Name[xh]=Izinto eziluncedo ze-X
+-Name[xx]=xxX-Utilitiesxx
+ Name[zh_CN]=X-实用工具
+ Name[zh_TW]=X-實用工具
+ Name[zu]=Izisebenzi ze-X
+@@ -141,7 +140,6 @@
+ Comment[vi]=Các tiện Ãch cá»§a X window
+ Comment[wa]=Usteyes pol sistinme grafike X11
+ Comment[xh]=X Windows Izinto eziluncedo
+-Comment[xx]=xxX Window Utilitiesxx
+ Comment[zh_CN]=X Window 实用工具
+ Comment[zh_TW]=X 視窗實用工具
+ Comment[zu]=Izisebenzi ze-X Window
+diff -Nru kdebase-release-3.4.0/applnk/kde-utilities.directory kdebase-branch-3.4/applnk/kde-utilities.directory
+--- kdebase-release-3.4.0/applnk/kde-utilities.directory 2005-02-23 00:05:24.000000000 -0500
++++ kdebase-branch-3.4/applnk/kde-utilities.directory 2005-03-07 09:14:41.000000000 -0500
+@@ -72,7 +72,6 @@
+ Name[vi]=Tiện Ãch
+ Name[wa]=Usteyes
+ Name[xh]=Izinto eziluncedo
+-Name[xx]=xxUtilitiesxx
+ Name[zh_CN]=实用工具
+ Name[zh_TW]=實用工具
+ Name[zu]=Izisebenzi
+@@ -148,7 +147,6 @@
+ Comment[vi]=Các tiện Ãch
+ Comment[wa]=Usteyes
+ Comment[xh]=Izinto eziluncedo
+-Comment[xx]=xxUtilitiesxx
+ Comment[zh_CN]=实用工具
+ Comment[zh_TW]=實用工具
+ Comment[zu]=Izisebenzi
+diff -Nru kdebase-release-3.4.0/drkonqi/debuggers/gdbrc kdebase-branch-3.4/drkonqi/debuggers/gdbrc
+--- kdebase-release-3.4.0/drkonqi/debuggers/gdbrc 2005-02-23 00:05:26.000000000 -0500
++++ kdebase-branch-3.4/drkonqi/debuggers/gdbrc 2005-03-07 09:14:44.000000000 -0500
+@@ -59,7 +59,6 @@
+ Name[uz]=GNU дебаггер
+ Name[vi]=Trình gỡ rối GNU
+ Name[wa]=Disbugueu GNU
+-Name[xx]=xxGNU Debuggerxx
+ Name[zh_CN]=GNU 调试器
+ Name[zh_TW]=GNU 除錯器
+ Name[zu]=Umcoshi wamaphutha we-GNU
+@@ -131,7 +130,6 @@
+ Comment[ven]=Manwalwa o di sendekaho nga dibaga i bvaho GNU kha Khontsolu
+ Comment[vi]=Trình gỡ rối kiểu text của GNU trên konsole
+ Comment[xh]=Text based debugger evela kwi GNU kwi konsole
+-Comment[xx]=xxText based debugger from GNU in a konsolexx
+ Comment[zh_CN]=在控制å°ä¸è¿è¡Œçš„æ–‡æœ¬ GNU 调试器
+ Comment[zh_TW]=在 Konsole ä¸åŸ·è¡Œçš„ GNU æ–‡å—型除錯器
+ Comment[zu]=Umcoshi wamaphutha osekelwe umbhalo osuka kwi-GNU kwikhonsoli
+diff -Nru kdebase-release-3.4.0/drkonqi/presets/developerrc kdebase-branch-3.4/drkonqi/presets/developerrc
+--- kdebase-release-3.4.0/drkonqi/presets/developerrc 2005-02-23 00:05:27.000000000 -0500
++++ kdebase-branch-3.4/drkonqi/presets/developerrc 2005-03-22 12:37:59.000000000 -0500
+@@ -1,6 +1,6 @@
+ [General]
+ Name=Developer
+-Name[af]=Ontwikkelaar
++Name[af]=Ontwikkeling
+ Name[ar]=المطور
+ Name[az]=İnkişafçı
+ Name[be]=РаÑпрацоўшчык
+@@ -32,7 +32,7 @@
+ Name[hu]=Fejlesztő
+ Name[id]=Pembangun
+ Name[is]=Forritari
+-Name[it]=Sviluppatore
++Name[it]=Sviluppatori
+ Name[ja]=開発者
+ Name[ko]=개발ìž
+ Name[lo]=ຜູ້ພັດທະນາ
+@@ -71,7 +71,6 @@
+ Name[vi]=Nhà phát triển
+ Name[wa]=Programeu
+ Name[xh]=Umbhekisi phambili
+-Name[xx]=xxDeveloperxx
+ Name[zh_CN]=å¼€å‘者
+ Name[zh_TW]=開發人員
+ Name[zu]=Umthuthukisi
+@@ -107,7 +106,7 @@
+ Comment[hu]=FejlesztÅ‘knek szánt beállÃtások
+ Comment[id]=Pengaturan aturan untuk developer
+ Comment[is]=Ráðlagðar stillingar fyrir forritara
+-Comment[it]=Impostazioni preferite per gli sviluppatori
++Comment[it]=Impostazione per gli sviluppatori
+ Comment[ja]=開発者用ã®è¨å®š
+ Comment[ko]=개발ìžë¥¼ 위한 ì„¤ì •
+ Comment[lo]=ປັບà»àº•່ງເພື່àºàºªàº°à»àº”ງຕົວເປັນຜູຸ້ພັດທະນາ
+@@ -145,7 +144,6 @@
+ Comment[ven]=U dzudzanya huno shumiseswa nga vhafhati
+ Comment[vi]=Các thiết láºp dà nh cho ngưá»i phát triển
+ Comment[xh]=Izicwangciso ezikhetiweyo zababhekisi phambili
+-Comment[xx]=xxSettings preferred for developersxx
+ Comment[zh_CN]=å¼€å‘人员å好的设置
+ Comment[zh_TW]=開發人員的å好è¨å®š
+ Comment[zu]=Izilungiselelo ezincanyelwayo zabathuthukisi
+@@ -224,7 +222,6 @@
+ Name[ven]=Apulifikhesheni ya %progdzina (%appdzina) pid %pid yo tshinyadzhwa ya dovha ya vhanga luswayo %signum (%sigdzina).
+ Name[vi]=Chương trình %progname (%appname), pid %pid bị vỡ và gây ra tÃn hiệu %signum (%signame).
+ Name[xh]=Isicelo %progname (%appname), pid %pid, ilalhekile kwaye ibangele uphawu %signum (%signame).
+-Name[xx]=xxThe application %progname (%appname), pid %pid, crashed and caused the signal %signum (%signame).xx
+ Name[zh_CN]=ç¨‹åº %progname (%appname)ï¼Œè¿›ç¨‹å· %pidï¼Œå´©æºƒå¹¶å¯¼è‡´ä¿¡å· %signum (%signame)。
+ Name[zh_TW]=æ¤æ‡‰ç”¨ç¨‹å¼ %progname (%appname), pid %pid 䏿£å¸¸çµæŸï¼Œç”¢ç”Ÿä¿¡è™Ÿ %signum (%signame)。
+ Name[zu]=I-%progname yomyaleli (%appname), pid %pid, iphahlazekile futhi yabanga uphawu %signum (%signame).
+@@ -296,7 +293,6 @@
+ Name[ven]=Ni nga di toda u lugisa mbekanyamushumo yanu. Lavhelesani kha dzi thebu dza murahu.
+ Name[vi]=Bạn có thể cần phải sá»a chương trình nà ỵ Xin xem qua backtrace tab.
+ Name[xh]=Ungafuna ukulungisa udweliso lwakho lwenkqubo. Thatha ujongo kukhangelo lwasemva lwesithuba.
+-Name[xx]=xxYou might want to fix your program. Take a look at the backtrace tab.xx
+ Name[zh_CN]=您应该改æ£ç¨‹åºã€‚请查看回溯跟踪部分。
+ Name[zh_TW]=或許您想è¦ä¿®æ£æ‚¨çš„程å¼ã€‚請查看一下回朔標籤裡的內容。
+ Name[zu]=Ungafuna ukulungisa uhlelo lwakho lwemisebenzi. Buka i-tab yokubuyela emuva.
+@@ -305,7 +301,6 @@
+ Name=SIGILL
+ Name[af]=Sigill
+ Name[vi]=SIGILL
+-Name[xx]=xxSIGILLxx
+ Comment=Illegal instruction.
+ Comment[af]=Onwettige instruksie.
+ Comment[ar]=تعليمة غير شرعية
+@@ -376,7 +371,6 @@
+ Comment[ven]=Muthetho u siho mulayoni.
+ Comment[vi]=Chỉ thị không hợp lệ
+ Comment[xh]=Engavumelekanga imiyalelo.
+-Comment[xx]=xxIllegal instruction.xx
+ Comment[zh_CN]=éžæ³•指令。
+ Comment[zh_TW]=ä¸åˆæ³•的指令。
+ Comment[zu]=Umyalelo ongekho emthethweni.
+@@ -385,7 +379,6 @@
+ Name=SIGABRT
+ Name[af]=Sigabrt
+ Name[vi]=SIGABRT
+-Name[xx]=xxSIGABRTxx
+ Comment=Aborted.
+ Comment[af]=Gekanselleer.
+ Comment[ar]=اجهضت
+@@ -456,7 +449,6 @@
+ Comment[ven]=Zwo latwa.
+ Comment[vi]=Bá» qua
+ Comment[xh]=Ayamkelekanga.
+-Comment[xx]=xxAborted.xx
+ Comment[zh_CN]=䏿¢ã€‚
+ Comment[zh_TW]=䏿¢ã€‚
+ Comment[zu]=Ihushuliwe.
+@@ -465,7 +457,6 @@
+ Name=SIGFPE
+ Name[af]=Sigfpe
+ Name[vi]=SIGFPE
+-Name[xx]=xxSIGFPExx
+ Comment=Floating point exception.
+ Comment[af]=Wissel punt uitsondering.
+ Comment[ar]=إعتراض ÙØ§ØµÙ„Ø© عشرية : Floating point exception.
+@@ -529,7 +520,6 @@
+ Comment[ven]=Fhethu hune havha khagala.
+ Comment[vi]=Dấu chấm động ngoại lệ
+ Comment[xh]=Amaxabiso okudada akhethekileyo.
+-Comment[xx]=xxFloating point exception.xx
+ Comment[zh_CN]=浮点计算异常。
+ Comment[zh_TW]=浮點計算異常。
+ Comment[zu]=Okwahlukile kwephuzu elintantayo.
+@@ -538,7 +528,6 @@
+ Name=SIGSEGV
+ Name[af]=Sigsegv
+ Name[vi]=SIGSEGV
+-Name[xx]=xxSIGSEGVxx
+ Comment=Invalid memory reference.
+ Comment[af]=Ongeldige geheue verwysing.
+ Comment[ar]=مرجع خاطئ للذاكرة : Invalid memory reference
+@@ -604,14 +593,13 @@
+ Comment[ven]=U humbula murahu husa shumi.
+ Comment[vi]=Tham khảo memory không hợp lệ
+ Comment[xh]=Uthelekiso lwenkumbulo engasebenziyo.
+-Comment[xx]=xxInvalid memory reference.xx
+ Comment[zh_CN]=æ— æ•ˆçš„å†…å˜å¼•用。
+ Comment[zh_TW]=無效的記憶體é•è¦ä½¿ç”¨
+ Comment[zu]=Okuqondiwe kwenkumbulo okungasebenzi.
+
+ [unknown]
+ Name=Unknown
+-Name[af]=Onbekende
++Name[af]=Onbekend
+ Name[ar]=غير معروÙ
+ Name[az]=NamÉ™'lum
+ Name[be]=ÐевÑдомы
+@@ -682,7 +670,6 @@
+ Name[vi]=Không biết
+ Name[wa]=Nén cnoxhou
+ Name[xh]=Engaziwayo
+-Name[xx]=xxUnknownxx
+ Name[zh_CN]=未知
+ Name[zh_TW]=未知
+ Name[zu]=Okungaziwa
+@@ -754,7 +741,6 @@
+ Comment[ven]=Luswayo ulu alu divhei.
+ Comment[vi]=Không biết tÃn hiệu nà y
+ Comment[xh]=Oluphawu olungaziwayo.
+-Comment[xx]=xxThis signal is unknown.xx
+ Comment[zh_CN]=æ¤ä¿¡å·æœªçŸ¥ã€‚
+ Comment[zh_TW]=未知的信號。
+ Comment[zu]=Lolu phawu alwaziwa
+diff -Nru kdebase-release-3.4.0/drkonqi/presets/enduserrc kdebase-branch-3.4/drkonqi/presets/enduserrc
+--- kdebase-release-3.4.0/drkonqi/presets/enduserrc 2005-02-23 00:05:27.000000000 -0500
++++ kdebase-branch-3.4/drkonqi/presets/enduserrc 2005-03-30 01:47:40.000000000 -0500
+@@ -68,7 +68,6 @@
+ Name[ven]=U fhedza ha Mushumisi
+ Name[vi]=Ngưá»i dùng cuối
+ Name[xh]=Umsebenzisi wokugqibela
+-Name[xx]=xxEnd userxx
+ Name[zh_CN]=普通用户
+ Name[zh_TW]=一般使用者
+ Name[zu]=Umsebenzisi wokugcina
+@@ -104,7 +103,7 @@
+ Comment[hu]=Végfelhasználók számára javasolt beállÃtások
+ Comment[id]=Pengaturan aturan untuk end user
+ Comment[is]=Ráðlagðar stillingar fyrir notendur
+-Comment[it]=Impostazioni preferite per l'utente finale
++Comment[it]=Impostazioni per l'utente finale
+ Comment[ja]=エンドユーザ用ã®è¨å®š
+ Comment[ko]=ì¼ë°˜ 사용ìžë¥¼ 위한 ì„¤ì •
+ Comment[lo]=àºàº²àº™àº›àº±àºšà»àº•່ງສຳຫລັບຜູ້ໃຊ້ລະດັບສູງ
+@@ -142,7 +141,6 @@
+ Comment[ven]=Dzudzanyo dzi shumisesiwaho nga Vhashumisi.
+ Comment[vi]=Thiết láºp ưa thÃch dà nh cho ngưá»i dùng
+ Comment[xh]=Izicwangciso ezikhethwayo zomsebenzisi osekugqhibeleni
+-Comment[xx]=xxSettings preferred for end usersxx
+ Comment[zh_CN]=最终用户的首选项
+ Comment[zh_TW]=一般使用者的å好è¨å®š
+ Comment[zu]=Izilungiselelo ezincanyelwayo zabasebenzisi bokugcina
+@@ -223,7 +221,6 @@
+ Name[ven]=Apulikhesheni ya %progdzina(%appdzina) yo tshinyadzhwa ya dovha ya vhanga luswayo %signum (%signame).
+ Name[vi]=Chương trình %progname (%appname) bị vỡ(crash) và gây ra tÃn hiệu %signum (%signame).
+ Name[xh]=Isicelo se %progname (%appname) ingqubekile yaze yabangela uphawu lwe %signum (%signame).
+-Name[xx]=xxThe application %progname (%appname) crashed and caused the signal %signum (%signame).xx
+ Name[zh_CN]=ç¨‹åº %progname (%appname) å·²å´©æºƒï¼Œå¯¼è‡´ä¿¡å· %signum (%signame)。
+ Name[zh_TW]=æ¤æ‡‰ç”¨ç¨‹å¼ %progname (%appname) 䏿£å¸¸çµæŸï¼Œç”¢ç”Ÿä¿¡è™Ÿ %signum (%signame)。
+ Name[zu]=I-%progname yomyaleli (%appname), iphahlazekile futhi yabanga uphawu %signum (%signame).
+@@ -239,6 +236,7 @@
+ Name[cy]=Efallai y dymunwch yrru adroddiad o'r nam i'r awdur. Cywirwch os mae o wedi'i restru ar http://bugs.kde.org, neu anfonwch ebost i'r awdur. Ceisiwch gynnwys cyn gymaint o wybodaeth â phosibl, ac efallai'r dogfennau gwreiddiol. Os oes modd i chi ail-greu'r gwall, cynhwyswch hwn hefyd.
+ Name[da]=Måske har du lyst til at sende en fejlrapport om dette program. Tjek om fejlen allerede er der på listen ihttp://bugs.kde.org, skriv ellers til forfatteren. Husk at inkludere så meget information som muligt, måske de oprindelige dokumenter. Hvis du er i stand til at reproducere fejlen, så husk også at nævne dette.
+ Name[de]=Vielleicht möchten Sie einen Problembericht (Bug Report) für dieses Programm erstellen? Bitte überprüfen Sie in diesem Fall, ob es unter http://bugs.kde.org aufgeführt ist, sonst schreiben Sie bitte eine Mail an den Autor (im Zweifelsfall auf Englisch). Geben Sie so viele Informationen wie möglich, die zur Reproduktion des Problems beitragen können, evtl. einschließlich der Dokumente, bei denen es auftritt.
++Name[el]=Ίσως θÎλετε να στείλετε μια αναφοÏά σφάλματος γι' αυτήν την εφαÏμογή. ΕλÎγξτε εάν είναι καταχωÏημÎνη στο http://bugs.kde.org αλλιώς στείλετε email στο συγγÏαφÎα. ΠαÏακαλώ συμπεÏιλάβετε τη μÎγιστη δυνατή πληÏοφοÏία, ίσως και τα αυθεντικά ÎγγÏαφα. Εάν Îχετε κάποιον Ï„Ïόπο να αναπαÏαχθεί το σφάλμα, συμπεÏιλάβετΠτον.
+ Name[eo]=Vi povus sendi eraroraporton pri ĉi tiu aplikaĵo. Kontrolu ĉu la listo ĉe http://bugs.kde.org jam enhavas Äin, alie sendu retpoÅton al la aÅtoro. Bonvolu kunsendi tiom da informoj, kiom eblas, laÅeble la originalajn dokumentojn. Se vi trovis manieron reprodukti la eraron, bonvolu krome aldoni Äin.
+ Name[es]=Puede que quiera enviar un informe de fallos de esta aplicación. Por favor, compruebe si aparece en http://bugs.kde.org, si no, envÃe un mensaje al autor. Por favor, incluya tanta información como pueda, tal vez incluso los documentos originales. Si hay una forma de reproducir el error, inclúyala también.
+ Name[et]=Kui soovid rakenduse kohta veateadet saata, kontrolli kõigepealt, ega sellest ei tea juba http://bugs.kde.org. Kui mitte, saada veateade autorile ja lisa palun nii palju infot, kui võimalik. Kui võimalik, siis ka originaaldokumendid. Kui tead, kuidas viga korrata, siis lisa ka see info.
+@@ -272,20 +270,18 @@
+ Name[sk]=Možno budete chcieÅ¥ poslaÅ¥ správu o chybe tejto aplikácie. Overte, Äi už nie je na http://bugs.kde.org, inak poÅ¡lite email autorovi. ProsÃm, pridajte Äo najviac informáciÃ, prÃpadne aj dokumenty, ktoré problém spôsobili. Ak viete, ako chybu zopakovaÅ¥, nezabudnite tejto postup tiež poslaÅ¥.
+ Name[sl]=Morda boste avtorju želeli poslati poroÄilo o hroÅ¡Äu. Preverite, Äe je naveden na http://bugs.kde.org, sicer obvestite avtorja. Prosim, vkljuÄite ÄimveÄ podatkov, morda tudi izvirne dokumente. ÄŒe lahko kako ponovite napako, vkljuÄite tudi to.
+ Name[sr]=Можда биÑте желели да пошаљете извештај о грешци за овај програм. Проверите да ли Ñе налази на http://bugs.kde.org, иначе пошаљите е-пошту аутору. Молим Ð²Ð°Ñ ÑƒÐºÑ™ÑƒÑ‡Ð¸Ñ‚Ðµ што је више података могуће, можда оригиналне документе. Ðко имате начин да поновите ову грешку укључите и то такође.
+-Name[sr@Latn]=Можда биÑте желели да пошаљете извештај о грешци за овај програм. Проверите да ли Ñе налази на http://bugs.kde.org, иначе пошаљите е-пошту аутору. Молим Ð²Ð°Ñ ÑƒÐºÑ™ÑƒÑ‡Ð¸Ñ‚Ðµ што је више података могуће, можда оригиналне документе. Ðко имате начин да поновите ову грешку укључите и то такође.
++Name[sr@Latn]=Možda biste želeli da poÅ¡aljete izveÅ¡taj o greÅ¡ci za ovaj program. Proverite da li se nalazi na http://bugs.kde.org, inaÄe poÅ¡aljite e-poÅ¡tu autoru. Molim vas ukljuÄite Å¡to je viÅ¡e podataka moguće, možda originalne dokumente. Ako imate naÄin da ponovite ovu greÅ¡ku ukljuÄite i to takoÄ‘e.
+ Name[sv]=Du kanske vill skicka en felrapport för det här programmet. Kontrollera om det finns listat på http://bugs.kde.org, skicka annars e-post till upphovsmannen. Bifoga så mycket information som möjligt, kanske originaldokumenten. Om du kan återupprepa felet, så beskriv även hur du gör det.
+ Name[ta]=இநà¯à®¤ பயனà¯à®ªà®¾à®Ÿà¯à®Ÿà¯à®•à¯à®•ான நீஙà¯à®•ள௠பிழை அறிகà¯à®•ையொனà¯à®±à¯ˆ அனà¯à®ªà¯à®ªà®²à®¾à®®à¯. http://bugs.kde.org,ல௠அத௠உளà¯à®³à®¤à®¾ எனà¯à®ªà®¤à¯ˆ சரிபாரà¯à®•à¯à®•வà¯à®®à¯ அலà¯à®²à®¤à¯ ஆசிரியரà¯à®•à¯à®•௠மினà¯à®©à®žà¯à®šà®²à¯ அனà¯à®ªà¯à®ªà®²à®¾à®®à¯. தயவà¯à®šà¯†à®¯à¯à®¤à¯ à®®à¯à®Ÿà®¿à®¨à¯à®¤ அளவிறà¯à®•௠தகவலà¯à®•ளை உளà¯à®³à®Ÿà®•à¯à®•வà¯à®®à¯. அவை மூல ஆவணஙà¯à®•ளாகவà¯à®®à¯ இரà¯à®•à¯à®•லாமà¯. இநà¯à®¤ தவறை திரà¯à®®à¯à®ª உரà¯à®µà®¾à®•à¯à®• à®à®¤à¯‡à®©à¯à®®à¯ வழியிரà¯à®ªà¯à®ªà®¿à®©à¯ அதனையà¯à®®à¯ கà¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà®µà¯à®®à¯.
+ Name[tg]= Мумкин аÑÑ‚ бихоҳед ишколе аз ин барномаро гузориш диҳед. http://bugs.kde.org-ро барраÑÓ£ кунед то уÑтувор шавед, ки ин ишқол қаблан гузориш нашуда бошад. агар нашуда бувад номаи ба навиÑандаи барнома бифириÑтед. Латифаи иттилоотро ҳар чӣ комилтар бифириÑтед. Ðгар роҳе медонед, ки ишқоли дубораи иттифоқ биафтанд, онро низ замима кунед.
+ Name[tr]=Bu uygulama için yazara bir hata raporu göndermek isterseniz, öncelikle hatanın http://bugs.kde.org adresinde yer alıp almadığını kontrol edin. Lütfen mümkün olduğunca fazla bilgi verin ve varsa orjinal belgeleri ekleyin. Eğer bu hatayı tekrar ortaya çıkarabilmenin bir yolu varsa, bunu da belirtin.
+ Name[uk]=Можливо, Ви захочете відіÑлати автору програми звіт про помилку. Будь лаÑка, перевірте що цю помилку ще не звітовано на http://bugs.kde.org, Ñ– лише потім відправлÑйте Ñ—Ñ— автору. Будь лаÑка, додайте Ñкомога більше інформації, можливо, вихідні документи. Якщо Ви можете повторити помилку, включіть це також.
+-Name[xx]=xxYou might want to send a bug report for this application. Check if it is listed on http://bugs.kde.org, otherwise mail the author. Please include as much information as possible, maybe the original documents. If you have a way to reproduce the error, include this also.xx
+ Name[zh_CN]=您å¯èƒ½æƒ³è¦ä¸ºæ¤ç¨‹åºå‘é€é”™è¯¯æŠ¥å‘Šã€‚请检查该错误是å¦å·²ç»åœ¨ http://bugs.kde.org 列出æ¥äº†ã€‚如果尚未列出æ¥çš„è¯ï¼Œå°±éœ€è¦è”系作者。请尽å¯èƒ½æä¾›è¯¦ç»†çš„ä¿¡æ¯ï¼Œæ¯”如当时程åºä½¿ç”¨çš„æ–‡æ¡£ã€‚如果您有办法é‡çŽ°é”™è¯¯ï¼Œè¯·åŒæ—¶æä¾›è¿™æ ·çš„æ–¹æ³•。
+
+ [4]
+ Name=SIGILL
+ Name[af]=Sigill
+ Name[vi]=SIGILL
+-Name[xx]=xxSIGILLxx
+ Comment=An application mostly receives the SIGILL signal due to a bug in the application. The application was asked to save its documents.
+ Comment[af]='n aansoek meestal ontvang die Sigill sein as gevolg na 'n fout in die aansoek. die aansoek was gevra na stoor sy dokumente.
+ Comment[ar]=إن استقبال برنامج ما لإشارة SIGILL ينتج ÙÙŠ معظم الأØÙŠØ§Ù† من خطأ ÙÙŠ البرنامج. تم إرسال طلب إلى البرنامج لتخزين Ø§Ù„Ù…Ù„ÙØ§Øª التي كان يتعامل معها.
+@@ -352,7 +348,6 @@
+ Comment[ven]=Apulikhesheni dzi anzela u wana luswayo lwa SIGILL nga mulandu wa baga kha apulikhesheni. Apulikhesheni i a vhudziswa u vhulunga manwalwa ayo.
+ Comment[vi]=Má»™t chương trình nháºn hầu hết các tÃn hiệu SIGILL vì có lá»—i trong chương trình. Chương trình nà y đòi há»i bạn phải luư trữ tà i liệu trước.
+ Comment[xh]=Isicelo esifumana i SIGILL uphawu enxa yegciwane kwi sicelo. Isicelo sicelwe ukuba sigcine amaxwebhu aso.
+-Comment[xx]=xxAn application mostly receives the SIGILL signal due to a bug in the application. The application was asked to save its documents.xx
+ Comment[zh_CN]=多数情况下,一个程åºç”±äºŽæœ¬èº«çš„错误会收到 SIGILL ä¿¡å·ã€‚程åºè¢«è¦æ±‚ä¿å˜å®ƒçš„æ–‡æ¡£ã€‚
+ Comment[zh_TW]=多數情æ³ä¸‹ï¼Œä¸€å€‹ç¨‹å¼ç”±æ–¼æœ¬èº«çš„錯誤會收到 SIGILL ä¿¡è™Ÿã€‚ç¨‹å¼æœƒè¢«è¦æ±‚ä¿å˜å®ƒçš„æ–‡ä»¶ã€‚
+ Comment[zu]=Umyaleli uthola kakhulu uphawu lwe-SIGILL ngenxa yegciwane elikumyaleli. Umyaleli ucelwe ukuba agcine ushicilelo lwakhe.
+@@ -361,7 +356,6 @@
+ Name=SIGABRT
+ Name[af]=Sigabrt
+ Name[vi]=SIGABRT
+-Name[xx]=xxSIGABRTxx
+ Comment=An application terminates with a SIGABRT signal when it detects an internal inconsistency caused by a bug in the program.
+ Comment[af]='n aansoek termineer met 'n Sigabrt sein wanneer dit bespeur 'n intern onkonsekwentheid veroorsaak deur 'n fout in die program.
+ Comment[ar]=عندما يكتش٠برنامج ما تناقض داخلي بسبب خطأ Ùيه، ÙØ¥Ù†Ù‡ ينهي عمله مع إرسال إشارة SIGABRT.
+@@ -426,7 +420,6 @@
+ Comment[ven]==Apulikhesheni i fhela nga luswayo lwa SIGABRT musi i tshi sedzulusa mifhirifhiri ya nga mgomu yo vhangwaho nga baga kha mbekanyamushumo.
+ Comment[vi]= Má»™t chương trình bị kết liá»…u bởi má»™t tÃn hiệu SIGABRT khi nó tìm ra má»™t mâu thuẩn ná»™i bá»™ gây ra bởi lá»—i trong má»™t chương trình nà o đó.
+ Comment[xh]=Isicelo sicinywa ngophawu lwe SIGABRT xa sibona ukungahambisalani kwangaphakathi okwenziwa ligciwane kwinkqubo.
+-Comment[xx]=xxAn application terminates with a SIGABRT signal when it detects an internal inconsistency caused by a bug in the program.xx
+ Comment[zh_CN]=程åºåœ¨æ£€æµ‹åˆ°ç¼ºé™·å¼•起的内部ä¸ä¸€è‡´æ—¶ï¼Œä»¥ SIGABRT ä¿¡å·ä¸æ¢ã€‚
+ Comment[zh_TW]=程å¼åµæ¸¬ç™¼ç”Ÿåˆ°å…§éƒ¨éŒ¯èª¤æ™‚,以 SIGABRT ä¿¡è™Ÿä¸æ¢ã€‚
+ Comment[zu]=Umyaleli wekhompyutha unqamuka ngophawu lwe-SIGABRT uma ecosha ukungahambisani kwangaphakathi okubangwe igciwane elisohlelweni lwemisebenzi.
+@@ -435,7 +428,6 @@
+ Name=SIGFPE
+ Name[af]=Sigfpe
+ Name[vi]=SIGFPE
+-Name[xx]=xxSIGFPExx
+ Comment=An application mostly receives the SIGFPE signal due to a bug in the application. The application was asked to save its documents.
+ Comment[af]='n aansoek meestal ontvang die Sigfpe sein as gevolg na 'n fout in die aansoek. die aansoek was gevra na stoor sy dokumente.
+ Comment[ar]=إن استقبال برنامج ما لإشارة SIGFPE ينتج ÙÙŠ معظم الأØÙŠØ§Ù† من خطأ ÙÙŠ البرنامج. تم إرسال طلب إلى البرنامج لتخزين Ø§Ù„Ù…Ù„ÙØ§Øª التي كان يتعامل معها.
+@@ -501,7 +493,6 @@
+ Comment[ven]=Apulikhesheni i anzela u wana luswayo lwa SIGFPE nga nthani ha baga kha apulifikhesheni. Apulifikhesheni yo vhudziswa u vhulunga manwalwa ayo.
+ Comment[vi]=Có má»™t chương trình nháºn hầu hết các tìn hiệu SIGFPE vì trong chương trình có lỗị Chương trình đòi há»i bạn phải sao luư tà i liệụ
+ Comment[xh]=Isicelo sifumana i SIGFPE uphawu ngenxa ye gciwane kwisicelo. Isicelo sicelwe ukuba sigcine amaxwebhu ayo.
+-Comment[xx]=xxAn application mostly receives the SIGFPE signal due to a bug in the application. The application was asked to save its documents.xx
+ Comment[zh_CN]=大多数情况下,接收到 SIGFPE ä¿¡å·æ˜¯ç”±äºŽç¨‹åºçš„缺陷。程åºè¢«è¦æ±‚ä¿å˜å®ƒçš„æ–‡æ¡£ã€‚
+ Comment[zh_TW]=大多數情æ³ä¸‹ï¼ŒæŽ¥æ”¶åˆ° SIGFPE 信號是由於程å¼çš„錯誤。程å¼è¢«è¦æ±‚ä¿å˜å®ƒçš„æ–‡ä»¶ã€‚
+ Comment[zu]=Umyaleli wekhompyutha uthola kakhulu uphawu lwe-SIGFPE ngenxa yegciwane elikumyaleli. Umyaleli ucelwe ukuba agcine ushicilelo lwakhe.
+@@ -510,7 +501,6 @@
+ Name=SIGSEGV
+ Name[af]=Sigsegv
+ Name[vi]=SIGSEGV
+-Name[xx]=xxSIGSEGVxx
+ Comment=An application mostly receives the SIGSEGV signal due to a bug in the application. The application was asked to save its documents.
+ Comment[af]='n aansoek meestal ontvang die Sigsegv sein as gevolg na 'n fout in die aansoek. die aansoek was gevra na stoor sy dokumente.
+ Comment[ar]=إن استقبال برنامج ما لإشارة SIGSEGV ينتج ÙÙŠ معظم الأØÙŠØ§Ù† من خطأ ÙÙŠ البرنامج. تم إرسال طلب إلى البرنامج لتخزين Ø§Ù„Ù…Ù„ÙØ§Øª التي كان يتعامل معها.
+@@ -576,14 +566,13 @@
+ Comment[ven]=Apulifikhesheni i anzela u wana luswayo lwa SIGSEGV nga nthani ha baga kha apulifikhesheni. Apulifikhesheni yo humbelwa u vhulunga manwalwa ayo.
+ Comment[vi]=Có má»™t chương trình nháºn hầu hết các tìn hiệu SIGSEGV vì trong chương trình có lỗị Chương trình đòi há»i bạn phải sao luư tà i liệụ
+ Comment[xh]=Isicelo esifumana i SIGSEGV uphawu ngenxa yegciwane. Isicelo siceliwe ukuba sigcine amaxwebhu aso.
+-Comment[xx]=xxAn application mostly receives the SIGSEGV signal due to a bug in the application. The application was asked to save its documents.xx
+ Comment[zh_CN]=大多数情况下,接收到 SIGSEGV ä¿¡å·æ˜¯ç”±äºŽç¨‹åºçš„缺陷。程åºè¢«è¦æ±‚ä¿å˜å®ƒçš„æ–‡æ¡£ã€‚
+ Comment[zh_TW]=大多數情æ³ä¸‹ï¼ŒæŽ¥æ”¶åˆ° SIGSEGV 信號是由於程å¼çš„錯誤。程å¼è¢«è¦æ±‚ä¿å˜å®ƒçš„æ–‡ä»¶ã€‚
+ Comment[zu]=Umyaleli ithola kakhulu uphawu lwe-SIGSEGV ngenxa yegciwane elikumyaleli. Umyaleli ucelwe ukuba agcine ushicilelo lwakhe.
+
+ [unknown]
+ Name=Unknown
+-Name[af]=Onbekende
++Name[af]=Onbekend
+ Name[ar]=غير معروÙ
+ Name[az]=NamÉ™'lum
+ Name[be]=ÐевÑдомы
+@@ -654,11 +643,11 @@
+ Name[vi]=Không biết
+ Name[wa]=Nén cnoxhou
+ Name[xh]=Engaziwayo
+-Name[xx]=xxUnknownxx
+ Name[zh_CN]=未知
+ Name[zh_TW]=未知
+ Name[zu]=Okungaziwa
+ Comment=Sorry, I do not know this signal.
++Comment[af]=Jammer, ek ken nie hierdie sein nie.
+ Comment[az]=Bağışlayın, bu siqnalı tanımıram.
+ Comment[be]=Прабачце, Ñ Ð½Ñ Ð²ÐµÐ´Ð°ÑŽ гÑты Ñыгнал.
+ Comment[bg]=ÐеизвеÑтен Ñигнал.
+@@ -670,6 +659,7 @@
+ Comment[cy]=Mae'n ddrwg gennym, ni wyddom yr arwydd yma.
+ Comment[da]=Jeg kender desværre ikke dette signal.
+ Comment[de]=Unbekanntes Signal
++Comment[el]=Λυπάμαι, δε γνωÏίζω αυτό το σήμα.
+ Comment[eo]=Pardonu, mi ne konas tiun signalon.
+ Comment[es]=Lo siento, se desconoce esta señal.
+ Comment[et]=Vabandust, ma ei tunne seda signaali.
+@@ -683,7 +673,7 @@
+ Comment[hi]=माफ करें, मैं इस सिगà¥à¤¨à¤² को नहीं जानता.
+ Comment[hu]=Nem ismerem ezt a szignált.
+ Comment[is]=Þvà miður, ég þekki ekki þetta boð.
+-Comment[it]=Spiacente, non conosco questo segnale.
++Comment[it]=Putroppo si tratta di un segnale non riconoscibile.
+ Comment[ja]=ã™ã¿ã¾ã›ã‚“ã€ã“ã®ã‚·ã‚°ãƒŠãƒ«ã¯ã‚ã‹ã‚Šã¾ã›ã‚“。
+ Comment[lt]=Apgailestauju, šito signalo aš nežinau.
+ Comment[mk]=Жалам, овој Ñигнал не ми е познат.
+@@ -703,12 +693,11 @@
+ Comment[sk]=Ľutujem, nepoznám tento signál.
+ Comment[sl]=Žal je ta signal neznan.
+ Comment[sr]=Извините, овај Ñигнал ми није познат.
+-Comment[sr@Latn]=Извините, овај Ñигнал ми није познат.
++Comment[sr@Latn]=Izvinite, ovaj signal mi nije poznat.
+ Comment[sv]=Känner tyvärr inte till den här signalen.
+ Comment[ta]=மனà¯à®©à®¿à®•à¯à®•வà¯à®®à¯, இநà¯à®¤ சினà¯à®©à®®à¯ எணகà¯à®•௠தெரியாதà¯.
+ Comment[tg]=МутаÑÑифона ин Ñигналро намешиноÑам.
+ Comment[tr]=Üzgünüm, bu sinyali tanımıyorum.
+ Comment[uk]=Вибачте, не знаю цього Ñигналу.
+ Comment[uz]=Узр, мен бу Ñигнални билмайман.
+-Comment[xx]=xxSorry, I do not know this signal.xx
+ Comment[zh_CN]=抱æ‰ï¼Œæˆ‘ä¸çŸ¥é“这个信å·ã€‚
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Development/Forte.desktop kdebase-branch-3.4/kappfinder/apps/Development/Forte.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Development/Forte.desktop 2005-02-04 23:14:31.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Development/Forte.desktop 2005-03-07 09:14:45.000000000 -0500
+@@ -45,7 +45,6 @@
+ GenericName[tr]=Java IDE(Tümleşik Geliştirme Ortamı)
+ GenericName[wa]=Evironmint di programaedje (IDE) po l'Â lingaedje Java
+ GenericName[xh]=IDE ye Java
+-GenericName[xx]=xxJava IDExx
+ GenericName[zh_CN]=Java 集æˆå¼€å‘环境
+ GenericName[zh_TW]=Java æ•´åˆé–‹ç™¼ç’°å¢ƒ
+ Exec=runide.sh
+@@ -62,7 +61,6 @@
+ Name[ta]=ஃபோரà¯à®Ÿà¯
+ Name[tg]=Форте
+ Name[ven]=Vhutsila
+-Name[xx]=xxFortexx
+ Path=
+ Terminal=false
+ Type=Application
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Development/assistant.desktop kdebase-branch-3.4/kappfinder/apps/Development/assistant.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Development/assistant.desktop 2005-02-23 00:05:27.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Development/assistant.desktop 2005-03-07 09:14:45.000000000 -0500
+@@ -50,7 +50,6 @@
+ Name[vi]=Trợ giúp Qt
+ Name[wa]=Macrea Qt
+ Name[xh]=Qt Umncedi
+-Name[xx]=xxQt Assistantxx
+ Name[zh_CN]=Qt 助手
+ Name[zh_TW]=Qt 助ç†
+ Name[zu]=Umsizi we-Qt
+@@ -108,7 +107,7 @@
+ GenericName[sk]=PrehliadaÄ dokumentácie
+ GenericName[sl]=Pregledovalnik dokumentov
+ GenericName[sr]=Прегледач докумената
+-GenericName[sr@Latn]=PretraživaÄ dokumenata
++GenericName[sr@Latn]=PregledaÄ dokumenata
+ GenericName[ss]=Ibrawuza yelidokhumente
+ GenericName[sv]=Dokumentbläddrare
+ GenericName[ta]=ஆவண உலாவி
+@@ -121,7 +120,6 @@
+ GenericName[vi]=Trình duyệt tà i liệu
+ GenericName[wa]=Foyteu di documints
+ GenericName[xh]=Umkhangeli Wencwadi Zoxwebhu
+-GenericName[xx]=xxDocument Browserxx
+ GenericName[zh_CN]=文档æµè§ˆå™¨
+ GenericName[zh_TW]=文件閱讀器
+ GenericName[zu]=Umcingi Woshicilelo
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Development/ddd.desktop kdebase-branch-3.4/kappfinder/apps/Development/ddd.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Development/ddd.desktop 2005-01-22 23:37:28.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Development/ddd.desktop 2005-03-07 09:14:45.000000000 -0500
+@@ -49,7 +49,6 @@
+ GenericName[vi]= Trình gỡ rối hiển tị dữ liệu
+ GenericName[wa]=Disbugueu DDD
+ GenericName[xh]=Umbonisi we Data ye Debugger
+-GenericName[xx]=xxData Display Debuggerxx
+ GenericName[zh_CN]=æ•°æ®æ˜¾ç¤ºè°ƒè¯•器
+ GenericName[zh_TW]=資料顯示除錯器
+ GenericName[zu]=Umcoshi wamaphutha womboniso wedata
+@@ -59,6 +58,5 @@
+ Name[de]=DDD (Debugger)
+ Name[hi]=डीडीडी
+ Name[mn]=DDD (Debugger)
+-Name[xx]=xxDDDxx
+ X-KDE-StartupNotify=true
+ Icon=xapp
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Development/designer.desktop kdebase-branch-3.4/kappfinder/apps/Development/designer.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Development/designer.desktop 2005-02-04 23:14:31.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Development/designer.desktop 2005-03-07 09:14:45.000000000 -0500
+@@ -42,7 +42,6 @@
+ Name[ven]=Qt Mufhati
+ Name[vi]=Trình thiết kế Qt
+ Name[xh]=Umyili we Qt
+-Name[xx]=xxQt Designerxx
+ Name[zh_CN]=Qt 设计器
+ Name[zh_TW]=Qt è¨è¨ˆå¸«
+ Name[zu]=Umakhi we-Qt
+@@ -113,7 +112,6 @@
+ GenericName[vi]=Trình thiết kế giao diện
+ GenericName[wa]=Dessineu d'Â eterfaces
+ GenericName[xh]=Umyili Wezojongongano
+-GenericName[xx]=xxInterface Designerxx
+ GenericName[zh_CN]=界é¢è®¾è®¡å™¨
+ GenericName[zh_TW]=界é¢è¨è¨ˆå¸«
+ GenericName[zu]=Umakhi Womxhumanisi
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Development/dlgedit.desktop kdebase-branch-3.4/kappfinder/apps/Development/dlgedit.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Development/dlgedit.desktop 2005-02-10 23:51:41.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Development/dlgedit.desktop 2005-03-07 09:14:45.000000000 -0500
+@@ -18,7 +18,6 @@
+ Name[ta]=Qt உரைதொகà¯à®ªà¯à®ªà¯
+ Name[th]=à¹à¸à¹‰à¹„ขà¸à¸¥à¹ˆà¸à¸‡à¹‚ต้ตà¸à¸šà¸ªà¸³à¸«à¸£à¸±à¸š Qt
+ Name[ven]=Qt Dlgsengulusa
+-Name[xx]=xxQt DlgEditxx
+ Name[zh_CN]=Qt å¯¹è¯æ¡†ç¼–辑器
+ Name[zh_TW]=Qt å°è©±ç›’編輯器
+ Name[zu]=i-DlgEdit ye-Qt
+@@ -91,7 +90,6 @@
+ GenericName[vi]= Trình biên soạn hộp thoại
+ GenericName[wa]=Aspougneu di purneas
+ GenericName[xh]=Umhleli Wencoko yababini
+-GenericName[xx]=xxDialog Editorxx
+ GenericName[zh_CN]=å¯¹è¯æ¡†ç¼–辑器
+ GenericName[zh_TW]=å°è©±ç›’編輯器
+ GenericName[zu]=Umlungisi Wengxoxo
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Development/eclipse.desktop kdebase-branch-3.4/kappfinder/apps/Development/eclipse.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Development/eclipse.desktop 2005-01-22 23:37:28.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Development/eclipse.desktop 2005-03-07 09:14:45.000000000 -0500
+@@ -19,7 +19,6 @@
+ Name[ven]=Ikilipusi
+ Name[wa]=Eclipe
+ Name[xh]=Ucimo lwelanga okanye inyanga
+-Name[xx]=xxEclipsexx
+ Name[zu]=Ukuphela lwelanga noma inyanga
+ GenericName=Eclipse IDE
+ GenericName[ar]=بيئة تطوير Eclipse
+@@ -52,7 +51,6 @@
+ GenericName[sv]=Eclipse integrerad utvecklingsmiljö
+ GenericName[ta]= à®’à®°à¯à®™à¯à®•ிணைநà¯à®¤ உரà¯à®µà®¾à®•à¯à®•கமà¯
+ GenericName[wa]=Evironmint di programaedje (IDE) «Eclipse» (eclipe)
+-GenericName[xx]=xxEclipse IDExx
+ GenericName[zh_CN]=Eclipse 集æˆå¼€å‘环境
+ X-KDE-StartupNotify=true
+ MimeType=application/x-designer
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Development/fdesign.desktop kdebase-branch-3.4/kappfinder/apps/Development/fdesign.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Development/fdesign.desktop 2005-01-24 23:03:58.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Development/fdesign.desktop 2005-03-07 09:14:45.000000000 -0500
+@@ -40,7 +40,6 @@
+ Name[uz]=Шакл тузувчи
+ Name[ven]=Mufhati wa Tshivhumbeo
+ Name[vi]=Thiết kễ khung
+-Name[xx]=xxFormDesignerxx
+ Name[zh_CN]=表å•设计器
+ Name[zh_TW]=表單è¨è¨ˆå¸«
+ Name[zu]=Umakhi we-fomu
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Development/j2mewtk.desktop kdebase-branch-3.4/kappfinder/apps/Development/j2mewtk.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Development/j2mewtk.desktop 2005-02-04 23:14:31.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Development/j2mewtk.desktop 2005-03-07 09:14:45.000000000 -0500
+@@ -59,7 +59,6 @@
+ GenericName[ven]=J2ME Zwishumiswa
+ GenericName[vi]=J2ME bộ công cụ
+ GenericName[xh]=J2ME Ibhokisi yesixhobo
+-GenericName[xx]=xxJ2ME Toolkitxx
+ GenericName[zh_CN]=J2ME 工具包
+ GenericName[zh_TW]=J2ME 工具組
+ GenericName[zu]=Ibhokisi lamathuluzi le-J2ME
+@@ -70,7 +69,6 @@
+ Name[ar]=جيتومي
+ Name[fa]=JÛ²ME
+ Name[sr]=Ј2ME
+-Name[xx]=xxJ2MExx
+ Path=
+ Terminal=false
+ Type=Application
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Development/linguist.desktop kdebase-branch-3.4/kappfinder/apps/Development/linguist.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Development/linguist.desktop 2005-02-04 23:14:31.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Development/linguist.desktop 2005-03-07 09:14:45.000000000 -0500
+@@ -38,7 +38,6 @@
+ Name[ven]=Qt Radzinyambo
+ Name[vi]=Nhà ngôn ngữ há»c Qt
+ Name[xh]=Usolwimi we Qt
+-Name[xx]=xxQt Linguistxx
+ Name[zh_CN]=Qt è¯è¨€å®¶
+ Name[zh_TW]=Qt 語言å¸å®¶
+ Name[zu]=Owozolimi we-Qt
+@@ -109,7 +108,6 @@
+ GenericName[vi]=Công cụ dịch
+ GenericName[wa]=Usteye di ratournaedje
+ GenericName[xh]=Isixhobo Soguqulelo lomsebenzi kolunye ulwimi
+-GenericName[xx]=xxTranslation Toolxx
+ GenericName[zh_CN]=翻译工具
+ GenericName[zh_TW]=ç¿»è¯å·¥å…·
+ GenericName[zu]=Ithuluzi Lokuguqulela
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Development/pose.desktop kdebase-branch-3.4/kappfinder/apps/Development/pose.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Development/pose.desktop 2005-02-04 23:14:31.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Development/pose.desktop 2005-03-07 09:14:45.000000000 -0500
+@@ -64,7 +64,6 @@
+ GenericName[ven]=Gundo/Mutevhedzeli wa zwisina ludarata
+ GenericName[vi]=Palm/Mô phá»ng không dây
+ GenericName[wa]=Emulateu Palm/Sins fyi
+-GenericName[xx]=xxPalm/Wireless Emulatorxx
+ GenericName[zh_CN]=Palm/æ— çº¿è®¾å¤‡æ¨¡æ‹Ÿå™¨
+ GenericName[zh_TW]=Palm/ç„¡ç·šè£ç½® 模擬器
+ GenericName[zu]=Umlingisi Wesandla/Ongenantambo
+@@ -82,7 +81,6 @@
+ Name[nso]=Hlagisa
+ Name[pa]=ਪੋਸ
+ Name[ven]=Vhekanya
+-Name[xx]=xxPosexx
+ Path=
+ Terminal=false
+ Type=Application
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Development/sced.desktop kdebase-branch-3.4/kappfinder/apps/Development/sced.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Development/sced.desktop 2005-02-04 23:14:31.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Development/sced.desktop 2005-03-07 09:14:45.000000000 -0500
+@@ -6,7 +6,6 @@
+ Name[fa]=اسکد
+ Name[hi]=सेड(Sced)
+ Name[ta]=ஓவியகà¯à®•à®°à¯à®µà®¿
+-Name[xx]=xxScedxx
+ GenericName=Scene Modeler
+ GenericName[af]=Beeld Moduleerder
+ GenericName[ar]=أداة لنمذجة المشاهد
+@@ -64,7 +63,6 @@
+ GenericName[uk]=Модельєр Ñцен
+ GenericName[ven]=Ramodele wa Henefho
+ GenericName[vi]=Trình tạo mẫu cảnh
+-GenericName[xx]=xxScene Modelerxx
+ GenericName[zh_CN]=场景生æˆå™¨
+ GenericName[zh_TW]=å ´æ™¯ç¹ªè£½ç¨‹å¼
+ GenericName[zu]=Umenzi wesiqephu
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Editors/emacs.desktop kdebase-branch-3.4/kappfinder/apps/Editors/emacs.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Editors/emacs.desktop 2005-02-04 23:14:32.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Editors/emacs.desktop 2005-03-07 09:14:46.000000000 -0500
+@@ -7,7 +7,6 @@
+ Name[fa]=ایمکس
+ Name[hi]=ईमेकà¥à¤¸
+ Name[ko]=ì´ë§¥ìФ
+-Name[xx]=xxEmacsxx
+ GenericName=Text Editor
+ GenericName[af]=Teks Redigeerder
+ GenericName[ar]=Ù…ØØ±Ø± نصوص
+@@ -78,7 +77,6 @@
+ GenericName[vi]=Trình soạn văn bản
+ GenericName[wa]=Aspougneu di tecse
+ GenericName[xh]=Umhleli Wombhalo
+-GenericName[xx]=xxText Editorxx
+ GenericName[zh_CN]=文本编辑器
+ GenericName[zh_TW]=æ–‡å—編輯器
+ GenericName[zu]=Umlungisi wombhalo
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Editors/gedit.desktop kdebase-branch-3.4/kappfinder/apps/Editors/gedit.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Editors/gedit.desktop 2005-02-04 23:14:32.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Editors/gedit.desktop 2005-03-07 09:14:46.000000000 -0500
+@@ -14,7 +14,6 @@
+ Name[ta]=gதொகà¯à®ªà¯à®ªà®¿
+ Name[tg]=gМуҳаррир
+ Name[ven]=Sengulusa ha g
+-Name[xx]=xxgEditxx
+ GenericName=Text Editor
+ GenericName[af]=Teks Redigeerder
+ GenericName[ar]=Ù…ØØ±Ø± نصوص
+@@ -85,7 +84,6 @@
+ GenericName[vi]=Trình soạn văn bản
+ GenericName[wa]=Aspougneu di tecse
+ GenericName[xh]=Umhleli Wombhalo
+-GenericName[xx]=xxText Editorxx
+ GenericName[zh_CN]=文本编辑器
+ GenericName[zh_TW]=æ–‡å—編輯器
+ GenericName[zu]=Umlungisi wombhalo
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Editors/gvim.desktop kdebase-branch-3.4/kappfinder/apps/Editors/gvim.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Editors/gvim.desktop 2005-02-04 23:14:32.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Editors/gvim.desktop 2005-03-07 09:14:46.000000000 -0500
+@@ -29,7 +29,6 @@
+ Name[ven]=Vi Khwinifhadzhwa
+ Name[vi]=Vi Cải tiến
+ Name[wa]=VIM
+-Name[xx]=xxVi IMprovedxx
+ Name[zh_CN]=改进的 VI (VIM)
+ Name[zh_TW]=VIM
+ Name[zu]=I-Vi yenziwe ngcono
+@@ -103,7 +102,6 @@
+ GenericName[vi]=Trình soạn văn bản
+ GenericName[wa]=Aspougneu di tecse
+ GenericName[xh]=Umhleli Wombhalo
+-GenericName[xx]=xxText Editorxx
+ GenericName[zh_CN]=文本编辑器
+ GenericName[zh_TW]=æ–‡å—編輯器
+ GenericName[zu]=Umlungisi wombhalo
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Editors/lemacs.desktop kdebase-branch-3.4/kappfinder/apps/Editors/lemacs.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Editors/lemacs.desktop 2005-02-04 23:14:32.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Editors/lemacs.desktop 2005-03-07 09:14:46.000000000 -0500
+@@ -10,7 +10,6 @@
+ Name[ko]=루시드 ì´ë§¥ìФ
+ Name[ss]=Ema-Emac lacacile
+ Name[ta]=லூசிட௠எமாகà¯à®¸à¯
+-Name[xx]=xxLucid Emacsxx
+ GenericName=Text Editor
+ GenericName[af]=Teks Redigeerder
+ GenericName[ar]=Ù…ØØ±Ø± نصوص
+@@ -81,7 +80,6 @@
+ GenericName[vi]=Trình soạn văn bản
+ GenericName[wa]=Aspougneu di tecse
+ GenericName[xh]=Umhleli Wombhalo
+-GenericName[xx]=xxText Editorxx
+ GenericName[zh_CN]=文本编辑器
+ GenericName[zh_TW]=æ–‡å—編輯器
+ GenericName[zu]=Umlungisi wombhalo
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Editors/nano.desktop kdebase-branch-3.4/kappfinder/apps/Editors/nano.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Editors/nano.desktop 2005-02-04 23:14:32.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Editors/nano.desktop 2005-03-07 09:14:46.000000000 -0500
+@@ -10,7 +10,6 @@
+ Name[lo]=ສຸ່ມ
+ Name[ta]=நானோ
+ Name[tg]=Ðано
+-Name[xx]=xxNanoxx
+ GenericName=Text Editor
+ GenericName[af]=Teks Redigeerder
+ GenericName[ar]=Ù…ØØ±Ø± نصوص
+@@ -81,7 +80,6 @@
+ GenericName[vi]=Trình soạn văn bản
+ GenericName[wa]=Aspougneu di tecse
+ GenericName[xh]=Umhleli Wombhalo
+-GenericName[xx]=xxText Editorxx
+ GenericName[zh_CN]=文本编辑器
+ GenericName[zh_TW]=æ–‡å—編輯器
+ GenericName[zu]=Umlungisi wombhalo
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Editors/nedit.desktop kdebase-branch-3.4/kappfinder/apps/Editors/nedit.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Editors/nedit.desktop 2005-02-04 23:14:32.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Editors/nedit.desktop 2005-03-07 09:14:46.000000000 -0500
+@@ -10,7 +10,6 @@
+ Name[ru]=NEdit
+ Name[ta]=Nதொகà¯à®ªà¯à®ªà¯
+ Name[tg]=Ðедит
+-Name[xx]=xxNeditxx
+ GenericName=Text Editor
+ GenericName[af]=Teks Redigeerder
+ GenericName[ar]=Ù…ØØ±Ø± نصوص
+@@ -81,7 +80,6 @@
+ GenericName[vi]=Trình soạn văn bản
+ GenericName[wa]=Aspougneu di tecse
+ GenericName[xh]=Umhleli Wombhalo
+-GenericName[xx]=xxText Editorxx
+ GenericName[zh_CN]=文本编辑器
+ GenericName[zh_TW]=æ–‡å—編輯器
+ GenericName[zu]=Umlungisi wombhalo
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Editors/pico.desktop kdebase-branch-3.4/kappfinder/apps/Editors/pico.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Editors/pico.desktop 2005-02-04 23:14:32.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Editors/pico.desktop 2005-03-07 09:14:46.000000000 -0500
+@@ -9,7 +9,6 @@
+ Name[ko]=피코
+ Name[ta]=பிகோ
+ Name[tg]=Пико
+-Name[xx]=xxPicoxx
+ Name[zu]=PIco
+ GenericName=Text Editor
+ GenericName[af]=Teks Redigeerder
+@@ -81,7 +80,6 @@
+ GenericName[vi]=Trình soạn văn bản
+ GenericName[wa]=Aspougneu di tecse
+ GenericName[xh]=Umhleli Wombhalo
+-GenericName[xx]=xxText Editorxx
+ GenericName[zh_CN]=文本编辑器
+ GenericName[zh_TW]=æ–‡å—編輯器
+ GenericName[zu]=Umlungisi wombhalo
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Editors/xedit.desktop kdebase-branch-3.4/kappfinder/apps/Editors/xedit.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Editors/xedit.desktop 2005-02-04 23:14:32.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Editors/xedit.desktop 2005-03-07 09:14:46.000000000 -0500
+@@ -46,7 +46,6 @@
+ Name[uz]=X таҳрирчи
+ Name[ven]=X Musengulusi
+ Name[xh]=Umhleli we X
+-Name[xx]=xxX Editorxx
+ Name[zh_CN]=X 编辑器
+ Name[zh_TW]=X 編輯器
+ GenericName=Text Editor
+@@ -119,7 +118,6 @@
+ GenericName[vi]=Trình soạn văn bản
+ GenericName[wa]=Aspougneu di tecse
+ GenericName[xh]=Umhleli Wombhalo
+-GenericName[xx]=xxText Editorxx
+ GenericName[zh_CN]=文本编辑器
+ GenericName[zh_TW]=æ–‡å—編輯器
+ GenericName[zu]=Umlungisi wombhalo
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Editors/xemacs.desktop kdebase-branch-3.4/kappfinder/apps/Editors/xemacs.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Editors/xemacs.desktop 2005-02-04 23:14:32.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Editors/xemacs.desktop 2005-03-07 09:14:46.000000000 -0500
+@@ -13,7 +13,6 @@
+ Name[nb]=X-Emacs
+ Name[pa]=X Eਮੈਕਸ
+ Name[ta]=X எமாகà¯à®¸à¯
+-Name[xx]=xxX Emacsxx
+ Name[zh_TW]=X Emacs 編輯器
+ GenericName=Text Editor
+ GenericName[af]=Teks Redigeerder
+@@ -85,7 +84,6 @@
+ GenericName[vi]=Trình soạn văn bản
+ GenericName[wa]=Aspougneu di tecse
+ GenericName[xh]=Umhleli Wombhalo
+-GenericName[xx]=xxText Editorxx
+ GenericName[zh_CN]=文本编辑器
+ GenericName[zh_TW]=æ–‡å—編輯器
+ GenericName[zu]=Umlungisi wombhalo
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/ClanBomber.desktop kdebase-branch-3.4/kappfinder/apps/Games/Arcade/ClanBomber.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/ClanBomber.desktop 2005-02-04 23:14:33.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Arcade/ClanBomber.desktop 2005-03-07 09:14:47.000000000 -0500
+@@ -15,7 +15,6 @@
+ Name[sl]=Clanbomber
+ Name[sv]=Klanbombare
+ Name[ta]=கà¯à®³à®¾à®©à¯à®ªà®¾à®®à¯à®ªà®°à¯
+-Name[xx]=xxClanBomberxx
+ Name[zh_CN]=çˆ†ç ´å…µ
+ Name[zh_TW]=ClanBomber 炸彈超人
+ Name[zu]=Umqhumisi wesigodi
+@@ -89,7 +88,6 @@
+ GenericName[vi]=Trò chơi mái vòm
+ GenericName[wa]=Djeu d' årcåde
+ GenericName[xh]=Umdlalo we Arcade
+-GenericName[xx]=xxArcade Gamexx
+ GenericName[zh_CN]=街机游æˆ
+ GenericName[zh_TW]=é›»åéŠæˆ²
+ GenericName[zu]=Umdlalo womhhume
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/FrozenBubble.desktop kdebase-branch-3.4/kappfinder/apps/Games/Arcade/FrozenBubble.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/FrozenBubble.desktop 2005-02-10 23:51:41.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Arcade/FrozenBubble.desktop 2005-03-10 11:05:08.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ GenericName=Tetris-Like Game
++GenericName[af]=Tetris tipe Speletjie
+ GenericName[ar]=لعبة شبيهة بتترس
+ GenericName[az]=Tetris Bənzəri Oyun
+ GenericName[be]=ÐŸÐ°Ð´Ð¾Ð±Ð½Ð°Ñ Ð½Ð° Tetris гульнÑ
+@@ -59,7 +60,6 @@
+ GenericName[uz]=ТетриÑга ўхшаган ўйин
+ GenericName[vi]=Trò chơi kiểu xếp hình
+ GenericName[wa]=Djeu rashonnant a tetrisse
+-GenericName[xx]=xxTetris-Like Gamexx
+ GenericName[zh_CN]=ç±»ä¿„ç½—æ–¯æ–¹å—æ¸¸æˆ
+ Exec=frozen-bubble
+ Icon=frozen_bubble
+@@ -89,7 +89,6 @@
+ Name[uz]=Яхлаган пуфакчалар
+ Name[vi]=Bong bóng đóng băng
+ Name[wa]=Djeu d' årcåde Frozen-Bubble
+-Name[xx]=xxFrozen Bubblexx
+ Name[zh_CN]=泡泡龙
+ Path=
+ Terminal=true
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/Gnibbles.desktop kdebase-branch-3.4/kappfinder/apps/Games/Arcade/Gnibbles.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/Gnibbles.desktop 2005-02-04 23:14:33.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Arcade/Gnibbles.desktop 2005-03-07 09:14:47.000000000 -0500
+@@ -12,7 +12,6 @@
+ Name[pa]=ਨਿਬੱਲ
+ Name[ta]=கà¯à®°à®¿à®ªà¯à®ªà®²à¯à®¸à¯
+ Name[ven]=GLumiwa
+-Name[xx]=xxGnibblesxx
+ Name[zh_TW]=貪食蛇
+ GenericName=GNOME Nibbles Game
+ GenericName[af]=Gnome Nibbles Speletjie
+@@ -78,7 +77,6 @@
+ GenericName[ven]=GNOME Mutambo wa u Lumiwa
+ GenericName[vi]=Trò GNOME Nibbles
+ GenericName[xh]=GNOME Umdlalo we Nibbles
+-GenericName[xx]=xxGNOME Nibbles Gamexx
+ GenericName[zh_CN]=GNOME Nibbles 游æˆ
+ GenericName[zh_TW]=GNOME è²ªé£Ÿè›‡éŠæˆ²
+ GenericName[zu]=Umdlalo Wokuququda we-GNOME
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/GnobotsII.desktop kdebase-branch-3.4/kappfinder/apps/Games/Arcade/GnobotsII.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/GnobotsII.desktop 2005-02-04 23:14:33.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Arcade/GnobotsII.desktop 2005-03-07 09:14:47.000000000 -0500
+@@ -9,7 +9,6 @@
+ Name[hi]=गनोबोटà¥à¤¸ II
+ Name[pa]=ਜੀ ਨੋਬੋਟਸ੨
+ Name[ta]=கà¯à®©à¯‹à®ªà®¾à®Ÿà¯à®¸à¯ II
+-Name[xx]=xxGnobots IIxx
+ Name[zh_TW]=GNOME 機器人二代
+ GenericName=Arcade Game
+ GenericName[af]=Arkade Speletjie
+@@ -81,7 +80,6 @@
+ GenericName[vi]=Trò chơi mái vòm
+ GenericName[wa]=Djeu d' årcåde
+ GenericName[xh]=Umdlalo we Arcade
+-GenericName[xx]=xxArcade Gamexx
+ GenericName[zh_CN]=街机游æˆ
+ GenericName[zh_TW]=é›»åéŠæˆ²
+ GenericName[zu]=Umdlalo womhhume
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/Mures.desktop kdebase-branch-3.4/kappfinder/apps/Games/Arcade/Mures.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/Mures.desktop 2005-02-04 23:14:33.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Arcade/Mures.desktop 2005-03-07 09:14:47.000000000 -0500
+@@ -10,7 +10,6 @@
+ Name[pl]=Mury obronne
+ Name[pt]=Muros
+ Name[ta]=Mures-விளையாடà¯à®Ÿà¯
+-Name[xx]=xxMuresxx
+ Name[zh_TW]=Mures 貓æ‰è€é¼
+ Name[zu]=Amagundanyana
+ GenericName=Arcade Game
+@@ -83,7 +82,6 @@
+ GenericName[vi]=Trò chơi mái vòm
+ GenericName[wa]=Djeu d' årcåde
+ GenericName[xh]=Umdlalo we Arcade
+-GenericName[xx]=xxArcade Gamexx
+ GenericName[zh_CN]=街机游æˆ
+ GenericName[zh_TW]=é›»åéŠæˆ²
+ GenericName[zu]=Umdlalo womhhume
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/SuperMethaneBrothers.desktop kdebase-branch-3.4/kappfinder/apps/Games/Arcade/SuperMethaneBrothers.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/SuperMethaneBrothers.desktop 2005-02-04 23:14:33.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Arcade/SuperMethaneBrothers.desktop 2005-03-07 09:14:47.000000000 -0500
+@@ -27,7 +27,6 @@
+ Name[uz]=Супер метан ака-укалар
+ Name[ven]=Vhakomana vhahulwane vha Ha-Methane
+ Name[vi]=Super Methane Brothers
+-Name[xx]=xxSuper Methane Brothersxx
+ Name[zh_CN]=超级 Methane 兄弟
+ Name[zh_TW]=超級瓦斯兄弟
+ Name[zu]=Obhuti be-Super Methane
+@@ -101,7 +100,6 @@
+ GenericName[vi]=Trò chơi mái vòm
+ GenericName[wa]=Djeu d' årcåde
+ GenericName[xh]=Umdlalo we Arcade
+-GenericName[xx]=xxArcade Gamexx
+ GenericName[zh_CN]=街机游æˆ
+ GenericName[zh_TW]=é›»åéŠæˆ²
+ GenericName[zu]=Umdlalo womhhume
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/Trophy.desktop kdebase-branch-3.4/kappfinder/apps/Games/Arcade/Trophy.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/Trophy.desktop 2005-02-04 23:14:33.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Arcade/Trophy.desktop 2005-03-07 09:14:47.000000000 -0500
+@@ -26,7 +26,6 @@
+ Name[ven]=Khaphu
+ Name[vi]=Cúp
+ Name[xh]=Indebe
+-Name[xx]=xxTrophyxx
+ Name[zu]=Inkomishi
+ GenericName=Arcade Game
+ GenericName[af]=Arkade Speletjie
+@@ -98,7 +97,6 @@
+ GenericName[vi]=Trò chơi mái vòm
+ GenericName[wa]=Djeu d' årcåde
+ GenericName[xh]=Umdlalo we Arcade
+-GenericName[xx]=xxArcade Gamexx
+ GenericName[zh_CN]=街机游æˆ
+ GenericName[zh_TW]=é›»åéŠæˆ²
+ GenericName[zu]=Umdlalo womhhume
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/TuxRacer.desktop kdebase-branch-3.4/kappfinder/apps/Games/Arcade/TuxRacer.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/TuxRacer.desktop 2005-02-10 23:51:41.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Arcade/TuxRacer.desktop 2005-03-22 12:38:00.000000000 -0500
+@@ -31,7 +31,7 @@
+ GenericName[hsb]=Napřemojězdźenja
+ GenericName[hu]=Verseny
+ GenericName[is]=Tux á fleygiferð
+-GenericName[it]=Gioco di corsa
++GenericName[it]=Gara di corsa
+ GenericName[ja]=レースゲーãƒ
+ GenericName[ko]=경주 놀ì´
+ GenericName[lo]=ເàºàº¡à»àº‚່ງຂັນຄວາມໄວ
+@@ -68,7 +68,6 @@
+ GenericName[vi]=Game đua
+ GenericName[wa]=Djeu d' coûsse
+ GenericName[xh]=Umdlalo Wogqatso
+-GenericName[xx]=xxRacing Gamexx
+ GenericName[zh_CN]=ä¼é¹…滑雪游æˆ
+ GenericName[zh_TW]=è³½è»ŠéŠæˆ²
+ GenericName[zu]=Umdlalo Womjaho
+@@ -94,7 +93,6 @@
+ Name[uz]=Ð¢Ð°ÐºÑ Ð¿Ð¾Ð¹Ð³Ð°Ñ‡Ð¸
+ Name[ven]=Ramutatisano wa Tux
+ Name[vi]=TuxRacer
+-Name[xx]=xxTuxRacerxx
+ Name[zh_TW]=ä¼éµè³½è»Š
+ Name[zu]=Umgijimi we-Tux
+ Path=
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/XKobo.desktop kdebase-branch-3.4/kappfinder/apps/Games/Arcade/XKobo.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/XKobo.desktop 2005-02-04 23:14:33.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Arcade/XKobo.desktop 2005-03-07 09:14:47.000000000 -0500
+@@ -13,7 +13,6 @@
+ Name[sv]=Xkobo
+ Name[ta]=Xகோபோ
+ Name[vi]=XKobo
+-Name[xx]=xxXKoboxx
+ Name[zh_TW]=XKobo é£›è¡Œå°„æ“ŠéŠæˆ²
+ Name[zu]=I-XKobo
+ GenericName=Arcade Game
+@@ -86,7 +85,6 @@
+ GenericName[vi]=Trò chơi mái vòm
+ GenericName[wa]=Djeu d' årcåde
+ GenericName[xh]=Umdlalo we Arcade
+-GenericName[xx]=xxArcade Gamexx
+ GenericName[zh_CN]=街机游æˆ
+ GenericName[zh_TW]=é›»åéŠæˆ²
+ GenericName[zu]=Umdlalo womhhume
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/XSoldier.desktop kdebase-branch-3.4/kappfinder/apps/Games/Arcade/XSoldier.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/XSoldier.desktop 2005-02-04 23:14:33.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Arcade/XSoldier.desktop 2005-03-07 09:14:47.000000000 -0500
+@@ -19,7 +19,6 @@
+ Name[ta]=Xசோலà¯à®œà®°à¯
+ Name[ven]=Xlisole
+ Name[vi]=XSoldier
+-Name[xx]=xxXSoldierxx
+ Name[zh_TW]=XSoldier é£›è¡Œå°„æ“ŠéŠæˆ²
+ Name[zu]=I-XSoldier
+ GenericName=Arcade Game
+@@ -92,7 +91,6 @@
+ GenericName[vi]=Trò chơi mái vòm
+ GenericName[wa]=Djeu d' årcåde
+ GenericName[xh]=Umdlalo we Arcade
+-GenericName[xx]=xxArcade Gamexx
+ GenericName[zh_CN]=街机游æˆ
+ GenericName[zh_TW]=é›»åéŠæˆ²
+ GenericName[zu]=Umdlalo womhhume
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/alephone-nogl.desktop kdebase-branch-3.4/kappfinder/apps/Games/Arcade/alephone-nogl.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/alephone-nogl.desktop 2005-02-10 23:51:41.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Arcade/alephone-nogl.desktop 2005-03-07 09:14:47.000000000 -0500
+@@ -13,7 +13,6 @@
+ Name[pl]=Alefon
+ Name[ta]=அலேபோனà¯
+ Name[wa]=Alef 1
+-Name[xx]=xxAlephonexx
+ Comment=An open source version of Marathon Infinity for SDL
+ Comment[ar]=نسخة Ù…ÙØªÙˆØØ© المصدر من ماراثون إنÙينيتي لـSDL.
+ Comment[az]=Marathon Infinity oyununun sərbəst buraxılışı
+@@ -74,7 +73,6 @@
+ Comment[ven]=Tshivhumbeo tsha vhubvo tsho vuleaho tsha zwau gidima tsha SDL
+ Comment[vi]=Phiên bản mã nguồn mở của Marathon Infinity dà nh cho SDL
+ Comment[xh]=Uguqulelo lwe open source lwe Marathon Infinity ye SDL
+-Comment[xx]=xxAn open source version of Marathon Infinity for SDLxx
+ Comment[zh_CN]=SDL çš„é©¬æ‹‰æ¾æ— é™å¤§çš„开呿ºä»£ç 版本
+ Comment[zh_TW]=給 SDL 用的 Marathon Infinity 的開放原始碼版本
+ Comment[zu]=Inguqulo yemvelaphi evulekile ye-Marathon Infinity ye-SDL
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/alephone.desktop kdebase-branch-3.4/kappfinder/apps/Games/Arcade/alephone.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/alephone.desktop 2005-02-10 23:51:41.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Arcade/alephone.desktop 2005-03-07 09:14:47.000000000 -0500
+@@ -59,7 +59,6 @@
+ Name[ven]=Alephone - A huna GL yo vuleaho
+ Name[wa]=Alef 1 - Sins OpenGL
+ Name[xh]=Alephone - Akukho OpenGL
+-Name[xx]=xxAlephone - No OpenGLxx
+ Name[zh_CN]=Alephone - æ— OpenGL
+ Name[zh_TW]=Alephone - ç„¡ OpenGL
+ Name[zu]=Alephone - Ayikho i-OpenGL
+@@ -122,7 +121,6 @@
+ Comment[ven]=Tshivhumbeo tsha vhubvo tsho vuleaho tsha zwau gidima zwa SDL zwine zwavhana GL yo vuleaho yo baleliswa
+ Comment[vi]=Phiên bản mã nguồn mở của Marathon Infinity dà nh cho SDL, và Open GL bị mất tác dụng
+ Comment[xh]=Uguqulelo lwe open source lwe Marathon Infinity lwe SDL ene Open GL ekhubaziweyo
+-Comment[xx]=xxAn open source version of Marathon Infinity for SDL that has Open GL disabledxx
+ Comment[zh_CN]=ç¦ç”¨ OpenGL çš„ SDL é©¬æ‹‰æ¾æ— é™å¤§çš„开呿ºä»£ç 版本
+ Comment[zh_TW]=給 SDL 用的 Marathon Infinity 的開放原始碼版本,但ä¸ä½¿ç”¨ Open GL
+ Comment[zu]=Inguqulo yemvelaphi evulekile ye-Marathon Infinity ye-SDL ene-OpenGL ekhubazekile
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/battalion.desktop kdebase-branch-3.4/kappfinder/apps/Games/Arcade/battalion.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/battalion.desktop 2005-02-04 23:14:33.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Arcade/battalion.desktop 2005-03-07 09:14:47.000000000 -0500
+@@ -26,7 +26,6 @@
+ Name[ven]=Mmbi
+ Name[vi]=Tiểu đoà n
+ Name[wa]=Batayon
+-Name[xx]=xxBatallionxx
+ GenericName=Arcade Game
+ GenericName[af]=Arkade Speletjie
+ GenericName[ar]=لعبة أركيد
+@@ -97,7 +96,6 @@
+ GenericName[vi]=Trò chơi mái vòm
+ GenericName[wa]=Djeu d' årcåde
+ GenericName[xh]=Umdlalo we Arcade
+-GenericName[xx]=xxArcade Gamexx
+ GenericName[zh_CN]=街机游æˆ
+ GenericName[zh_TW]=é›»åéŠæˆ²
+ GenericName[zu]=Umdlalo womhhume
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/battleball.desktop kdebase-branch-3.4/kappfinder/apps/Games/Arcade/battleball.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/battleball.desktop 2005-02-04 23:14:33.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Arcade/battleball.desktop 2005-03-07 09:14:47.000000000 -0500
+@@ -15,7 +15,6 @@
+ Name[pl]=Bojowa kulka
+ Name[ta]=போரà¯à®ªà®¨à¯à®¤à¯
+ Name[ven]=Bola ya Tsimbe
+-Name[xx]=xxBattleballxx
+ Name[zu]=Ibhola lempi
+ GenericName=Ball Game
+ GenericName[af]=Bal Speletjie
+@@ -86,7 +85,6 @@
+ GenericName[vi]=Game bóng
+ GenericName[wa]=Djeu d'Â bale
+ GenericName[xh]=Umdlalo Webhola
+-GenericName[xx]=xxBall Gamexx
+ GenericName[zh_CN]=çƒç±»æ¸¸æˆ
+ GenericName[zh_TW]=çƒé¡žéŠæˆ²
+ GenericName[zu]=Umdlalo webhola
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/cxhextris.desktop kdebase-branch-3.4/kappfinder/apps/Games/Arcade/cxhextris.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/cxhextris.desktop 2005-02-04 23:14:33.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Arcade/cxhextris.desktop 2005-03-07 09:14:47.000000000 -0500
+@@ -9,7 +9,6 @@
+ Name[sv]=Cxhextris
+ Name[ta]=cxஹெகà¯à®¸à¯à®Ÿà®¿à®°à®¿à®¸à¯
+ Name[vi]=cxhextris
+-Name[xx]=xxcxhextrisxx
+ Name[zh_TW]=cxhextris 俄羅斯方塊
+ GenericName=Arcade Game
+ GenericName[af]=Arkade Speletjie
+@@ -81,7 +80,6 @@
+ GenericName[vi]=Trò chơi mái vòm
+ GenericName[wa]=Djeu d' årcåde
+ GenericName[xh]=Umdlalo we Arcade
+-GenericName[xx]=xxArcade Gamexx
+ GenericName[zh_CN]=街机游æˆ
+ GenericName[zh_TW]=é›»åéŠæˆ²
+ GenericName[zu]=Umdlalo womhhume
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/rocksndiamonds.desktop kdebase-branch-3.4/kappfinder/apps/Games/Arcade/rocksndiamonds.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/rocksndiamonds.desktop 2005-02-10 23:51:41.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Arcade/rocksndiamonds.desktop 2005-03-07 09:14:47.000000000 -0500
+@@ -33,7 +33,6 @@
+ Name[uz]=Тошлар ва олмоÑлар
+ Name[ven]=Matombo na Musuku
+ Name[vi]=Rocks và Diamonds
+-Name[xx]=xxRocks n Diamondsxx
+ Name[zh_CN]=岩石和钻石
+ Name[zu]=Amatshe namadayimane
+ GenericName=Tactical Game
+@@ -108,7 +107,6 @@
+ GenericName[vi]=Trò chÆ¡i chiến thuáºt
+ GenericName[wa]=Djeu di tactike
+ GenericName[xh]=Umdlalo Wobunzululwazi
+-GenericName[xx]=xxTactical Gamexx
+ GenericName[zh_CN]=ç–略游æˆ
+ GenericName[zh_TW]=ç–ç•¥éŠæˆ²
+ GenericName[zu]=Umdlalo Wamaqhinga
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/scavenger.desktop kdebase-branch-3.4/kappfinder/apps/Games/Arcade/scavenger.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Arcade/scavenger.desktop 2005-02-04 23:14:33.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Arcade/scavenger.desktop 2005-03-07 09:14:47.000000000 -0500
+@@ -18,7 +18,6 @@
+ Name[uz]=Фаррош
+ Name[ven]=Mulazwosalaho
+ Name[vi]=Scavenger
+-Name[xx]=xxScavengerxx
+ Name[zh_CN]=清é“夫
+ Name[zu]=Okudla okufile
+ GenericName=Arcade Game
+@@ -91,7 +90,6 @@
+ GenericName[vi]=Trò chơi mái vòm
+ GenericName[wa]=Djeu d' årcåde
+ GenericName[xh]=Umdlalo we Arcade
+-GenericName[xx]=xxArcade Gamexx
+ GenericName[zh_CN]=街机游æˆ
+ GenericName[zh_TW]=é›»åéŠæˆ²
+ GenericName[zu]=Umdlalo womhhume
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Board/Gataxx.desktop kdebase-branch-3.4/kappfinder/apps/Games/Board/Gataxx.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Board/Gataxx.desktop 2005-02-04 23:14:33.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Board/Gataxx.desktop 2005-03-07 09:14:48.000000000 -0500
+@@ -9,7 +9,6 @@
+ Name[pa]=ਗਾਟਾà¨à¨•ਸ
+ Name[ta]=காடாகà¯à®¸à¯
+ Name[vi]=Gataxx
+-Name[xx]=xxGataxxxx
+ GenericName=Arcade Game
+ GenericName[af]=Arkade Speletjie
+ GenericName[ar]=لعبة أركيد
+@@ -80,7 +79,6 @@
+ GenericName[vi]=Trò chơi mái vòm
+ GenericName[wa]=Djeu d' årcåde
+ GenericName[xh]=Umdlalo we Arcade
+-GenericName[xx]=xxArcade Gamexx
+ GenericName[zh_CN]=街机游æˆ
+ GenericName[zh_TW]=é›»åéŠæˆ²
+ GenericName[zu]=Umdlalo womhhume
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Board/Gchess.desktop kdebase-branch-3.4/kappfinder/apps/Games/Board/Gchess.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Board/Gchess.desktop 2005-01-31 03:35:17.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Board/Gchess.desktop 2005-03-07 09:14:48.000000000 -0500
+@@ -55,7 +55,6 @@
+ Name[ven]=GNOME Tshese
+ Name[vi]=Cá» GNOME
+ Name[wa]=Djeu d'Â echeks di Gnome
+-Name[xx]=xxGNOME Chessxx
+ Name[zh_CN]=GNOME 国际象棋
+ Name[zh_TW]=GNOME 國際象棋
+ Name[zu]=I-Chess ye-GNOME
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Board/Glines.desktop kdebase-branch-3.4/kappfinder/apps/Games/Board/Glines.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Board/Glines.desktop 2005-02-10 23:51:42.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Board/Glines.desktop 2005-03-07 09:14:48.000000000 -0500
+@@ -18,7 +18,6 @@
+ Name[tr]=G çizgiler
+ Name[ven]=GMitalo
+ Name[wa]=Groyes
+-Name[xx]=xxGlinesxx
+ Name[zh_TW]=GNOME é¡è‰²æŽ’åˆ—éŠæˆ²
+ GenericName=Tactical Game
+ GenericName[af]=Taktiese Speletjie
+@@ -92,7 +91,6 @@
+ GenericName[vi]=Trò chÆ¡i chiến thuáºt
+ GenericName[wa]=Djeu di tactike
+ GenericName[xh]=Umdlalo Wobunzululwazi
+-GenericName[xx]=xxTactical Gamexx
+ GenericName[zh_CN]=ç–略游æˆ
+ GenericName[zh_TW]=ç–ç•¥éŠæˆ²
+ GenericName[zu]=Umdlalo Wamaqhinga
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Board/Gmahjongg.desktop kdebase-branch-3.4/kappfinder/apps/Games/Board/Gmahjongg.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Board/Gmahjongg.desktop 2005-02-04 23:14:33.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Board/Gmahjongg.desktop 2005-03-07 09:14:48.000000000 -0500
+@@ -29,7 +29,6 @@
+ Name[uk]=Махжонг Ð´Ð»Ñ GNOME
+ Name[vi]=GNOME Mahjongg
+ Name[wa]=Djeu di Mahjongg di Gnome
+-Name[xx]=xxGNOME Mahjonggxx
+ Name[zh_CN]=GNOME 上海麻将
+ Name[zh_TW]=GNOME 上海麻將
+ Name[zu]=I-Mahjongg ye-GNOME
+@@ -96,7 +95,6 @@
+ GenericName[ven]=Mutambo wa Thaili
+ GenericName[vi]=Tile Game
+ GenericName[xh]=Umdlalo Wethayile
+-GenericName[xx]=xxTile Gamexx
+ GenericName[zh_CN]=æ–¹å—æ¸¸æˆ
+ GenericName[zh_TW]=éº»å°‡éŠæˆ²
+ GenericName[zu]=Umdlalo Wamathayile
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Board/Gmines.desktop kdebase-branch-3.4/kappfinder/apps/Games/Board/Gmines.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Board/Gmines.desktop 2005-02-04 23:14:33.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Board/Gmines.desktop 2005-03-07 09:14:48.000000000 -0500
+@@ -49,7 +49,6 @@
+ Name[ven]=GNOME Migodi
+ Name[wa]=Dismineu di Gnome
+ Name[xh]=GNOME Iimayine
+-Name[xx]=xxGNOME Minesxx
+ Name[zh_CN]=GNOME 挖地雷
+ Name[zh_TW]=GNOME 踩地雷
+ Name[zu]=Izimayini ze-GNOME
+@@ -121,7 +120,6 @@
+ GenericName[ven]=Mitambo ya vhuronwane
+ GenericName[vi]=Trò chơi logic
+ GenericName[wa]=Djeu di lodjike
+-GenericName[xx]=xxLogic Gamexx
+ GenericName[zh_CN]=逻辑游æˆ
+ GenericName[zh_TW]=æ™ºåŠ›éŠæˆ²
+ GenericName[zu]=Umdlalo Wengqondo
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Board/Gnotravex.desktop kdebase-branch-3.4/kappfinder/apps/Games/Board/Gnotravex.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Board/Gnotravex.desktop 2005-02-04 23:14:33.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Board/Gnotravex.desktop 2005-03-07 09:14:48.000000000 -0500
+@@ -8,7 +8,6 @@
+ Name[pa]=ਗਨੋਟਰਾਵਕਸ
+ Name[ta]=Gnoடிராவெகà¯à®¸à¯
+ Name[vi]=Gnotravex
+-Name[xx]=xxGnotravexxx
+ Name[zh_TW]=æ•¸å—æ‹¼åœ–
+ GenericName=Arcade Game
+ GenericName[af]=Arkade Speletjie
+@@ -80,7 +79,6 @@
+ GenericName[vi]=Trò chơi mái vòm
+ GenericName[wa]=Djeu d' årcåde
+ GenericName[xh]=Umdlalo we Arcade
+-GenericName[xx]=xxArcade Gamexx
+ GenericName[zh_CN]=街机游æˆ
+ GenericName[zh_TW]=é›»åéŠæˆ²
+ GenericName[zu]=Umdlalo womhhume
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Board/Gnotski.desktop kdebase-branch-3.4/kappfinder/apps/Games/Board/Gnotski.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Board/Gnotski.desktop 2005-02-10 23:51:42.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Board/Gnotski.desktop 2005-03-07 09:14:48.000000000 -0500
+@@ -10,7 +10,6 @@
+ Name[lo]=Ganotski
+ Name[pa]=ਗਨੋਟਸਕੀ
+ Name[vi]=Gnotski
+-Name[xx]=xxGnotskixx
+ Name[zh_TW]=è¯å®¹é“
+ GenericName=GNOME Klotski Game
+ GenericName[af]=Gnome Klotski Speletjie
+@@ -75,7 +74,6 @@
+ GenericName[uz]=GNOME Klotski ўйини
+ GenericName[ven]=GNOME Klotski Mutambo
+ GenericName[vi]=GNOME Klotski Game
+-GenericName[xx]=xxGNOME Klotski Gamexx
+ GenericName[zh_CN]=GNOME Klotski 游æˆ
+ GenericName[zh_TW]=GNOME è¯å®¹é“
+ GenericName[zu]=Umdlalo we-Klotski we-GNOME
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Board/Gstones.desktop kdebase-branch-3.4/kappfinder/apps/Games/Board/Gstones.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Board/Gstones.desktop 2005-01-31 03:35:17.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Board/Gstones.desktop 2005-03-07 09:14:48.000000000 -0500
+@@ -37,7 +37,6 @@
+ Name[ven]=GNOME Matombo
+ Name[vi]=GNOME Stones
+ Name[xh]=GNOME Amatye
+-Name[xx]=xxGNOME Stonesxx
+ Name[zh_CN]=GNOME å®çŸ³
+ Name[zh_TW]=GNOME å¯¶çŸ³éŠæˆ²
+ Name[zu]=Amatshe e-GNOME
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Board/Iagno.desktop kdebase-branch-3.4/kappfinder/apps/Games/Board/Iagno.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Board/Iagno.desktop 2005-02-04 23:14:33.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Board/Iagno.desktop 2005-03-07 09:14:48.000000000 -0500
+@@ -8,7 +8,6 @@
+ Name[pa]=ਲਗਨੋ
+ Name[ta]=லாகà¯à®©à¯‹
+ Name[vi]=Iagno
+-Name[xx]=xxIagnoxx
+ Name[zh_TW]=黑白棋
+ GenericName=Board Game
+ GenericName[af]=Bord Speletjie
+@@ -79,7 +78,6 @@
+ GenericName[vi]=Game bà n
+ GenericName[wa]=Djeu d'Â platea
+ GenericName[xh]=Umdlalo Webhodi
+-GenericName[xx]=xxBoard Gamexx
+ GenericName[zh_CN]=棋类游æˆ
+ GenericName[zh_TW]=æ£‹é¡žéŠæˆ²
+ GenericName[zu]=Umdlalo Webhodi
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Board/SameGnome.desktop kdebase-branch-3.4/kappfinder/apps/Games/Board/SameGnome.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Board/SameGnome.desktop 2005-02-04 23:14:33.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Board/SameGnome.desktop 2005-03-07 09:14:48.000000000 -0500
+@@ -27,7 +27,6 @@
+ Name[tr]=Aynı GNOME
+ Name[ven]=Fana GNOME
+ Name[xh]=GNOME Efanayo
+-Name[xx]=xxSame GNOMExx
+ Name[zh_CN]=GNOME åŒè‰²å½©çƒ
+ Name[zu]= i-Gnome efanayo
+ GenericName=Board Game
+@@ -99,7 +98,6 @@
+ GenericName[vi]=Game bà n
+ GenericName[wa]=Djeu d'Â platea
+ GenericName[xh]=Umdlalo Webhodi
+-GenericName[xx]=xxBoard Gamexx
+ GenericName[zh_CN]=棋类游æˆ
+ GenericName[zh_TW]=æ£‹é¡žéŠæˆ²
+ GenericName[zu]=Umdlalo Webhodi
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Board/Xgammon.desktop kdebase-branch-3.4/kappfinder/apps/Games/Board/Xgammon.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Board/Xgammon.desktop 2005-02-04 23:14:33.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Board/Xgammon.desktop 2005-03-07 09:14:48.000000000 -0500
+@@ -12,7 +12,6 @@
+ Name[ta]=Xகாமà¯à®®à®¾à®©à¯
+ Name[tr]=Tavla
+ Name[vi]=Xgammon
+-Name[xx]=xxXgammonxx
+ Name[zh_TW]=Xgammon 西洋雙陸棋
+ Name[zu]=I-Xgammon
+ GenericName=Board Game
+@@ -84,7 +83,6 @@
+ GenericName[vi]=Game bà n
+ GenericName[wa]=Djeu d'Â platea
+ GenericName[xh]=Umdlalo Webhodi
+-GenericName[xx]=xxBoard Gamexx
+ GenericName[zh_CN]=棋类游æˆ
+ GenericName[zh_TW]=æ£‹é¡žéŠæˆ²
+ GenericName[zu]=Umdlalo Webhodi
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Board/xboard.desktop kdebase-branch-3.4/kappfinder/apps/Games/Board/xboard.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Board/xboard.desktop 2005-02-04 23:14:33.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Board/xboard.desktop 2005-03-07 09:14:48.000000000 -0500
+@@ -70,7 +70,6 @@
+ GenericName[vi]=Cá» vua
+ GenericName[wa]=Djeu d'Â echeks
+ GenericName[xh]=Umdlalo we Chess
+-GenericName[xx]=xxChess Gamexx
+ GenericName[zh_CN]=国际象棋游æˆ
+ GenericName[zh_TW]=æ£‹é¡žéŠæˆ²
+ GenericName[zu]=Umdlalo we-Chess
+@@ -94,7 +93,6 @@
+ Name[tr]=XBoard
+ Name[ven]=Bodo ya X
+ Name[vi]=XBoard
+-Name[xx]=xxXboardxx
+ Name[zh_CN]=X 国际象棋
+ Name[zh_TW]=Xboard 國際象棋
+ Name[zu]=I-Xboard
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Card/AisleRiot.desktop kdebase-branch-3.4/kappfinder/apps/Games/Card/AisleRiot.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Card/AisleRiot.desktop 2005-02-04 23:14:34.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Card/AisleRiot.desktop 2005-03-07 09:14:49.000000000 -0500
+@@ -13,7 +13,6 @@
+ Name[sv]=Kyrkouppror
+ Name[uk]=Заколот на човні
+ Name[vi]= AisleRiot
+-Name[xx]=xxAisleRiotxx
+ GenericName=Card Game
+ GenericName[af]=Kaart Speletjie
+ GenericName[ar]=لعبة ورق
+@@ -84,7 +83,6 @@
+ GenericName[vi]=Game thẻ
+ GenericName[wa]=Cwårdjeu
+ GenericName[xh]=Umdlalo Wekhadi
+-GenericName[xx]=xxCard Gamexx
+ GenericName[zh_CN]=牌类游æˆ
+ GenericName[zh_TW]=ç´™ç‰ŒéŠæˆ²
+ GenericName[zu]=Umdlalo Wamakhadi
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Card/FreeCell.desktop kdebase-branch-3.4/kappfinder/apps/Games/Card/FreeCell.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Card/FreeCell.desktop 2005-02-04 23:14:34.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Card/FreeCell.desktop 2005-03-07 09:14:49.000000000 -0500
+@@ -17,7 +17,6 @@
+ Name[ta]=ஃபà¯à®°à¯€ செலà¯
+ Name[ven]=Sele ya Mahala
+ Name[vi]=Free Cell
+-Name[xx]=xxFreeCellxx
+ GenericName=Card Game
+ GenericName[af]=Kaart Speletjie
+ GenericName[ar]=لعبة ورق
+@@ -88,7 +87,6 @@
+ GenericName[vi]=Game thẻ
+ GenericName[wa]=Cwårdjeu
+ GenericName[xh]=Umdlalo Wekhadi
+-GenericName[xx]=xxCard Gamexx
+ GenericName[zh_CN]=牌类游æˆ
+ GenericName[zh_TW]=ç´™ç‰ŒéŠæˆ²
+ GenericName[zu]=Umdlalo Wamakhadi
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Card/PySol.desktop kdebase-branch-3.4/kappfinder/apps/Games/Card/PySol.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Card/PySol.desktop 2005-02-04 23:14:34.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Card/PySol.desktop 2005-03-07 09:14:49.000000000 -0500
+@@ -70,7 +70,6 @@
+ GenericName[vi]=Game thẻ
+ GenericName[wa]=Cwårdjeu
+ GenericName[xh]=Umdlalo Wekhadi
+-GenericName[xx]=xxCard Gamexx
+ GenericName[zh_CN]=牌类游æˆ
+ GenericName[zh_TW]=ç´™ç‰ŒéŠæˆ²
+ GenericName[zu]=Umdlalo Wamakhadi
+@@ -87,6 +86,5 @@
+ Name[lo]=Pysol
+ Name[sv]=Pysol
+ Name[vi]=PySol
+-Name[xx]=xxPySolxx
+ Terminal=false
+ Type=Application
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Card/XPat2.desktop kdebase-branch-3.4/kappfinder/apps/Games/Card/XPat2.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Card/XPat2.desktop 2005-02-04 23:14:34.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Card/XPat2.desktop 2005-03-07 09:14:49.000000000 -0500
+@@ -11,7 +11,6 @@
+ Name[sv]=Xpat 2
+ Name[ta]=Xபாட௠2
+ Name[vi]=XPat 2
+-Name[xx]=xxXPat 2xx
+ Name[zu]=I-XPat 2
+ GenericName=Card Game
+ GenericName[af]=Kaart Speletjie
+@@ -83,7 +82,6 @@
+ GenericName[vi]=Game thẻ
+ GenericName[wa]=Cwårdjeu
+ GenericName[xh]=Umdlalo Wekhadi
+-GenericName[xx]=xxCard Gamexx
+ GenericName[zh_CN]=牌类游æˆ
+ GenericName[zh_TW]=ç´™ç‰ŒéŠæˆ²
+ GenericName[zu]=Umdlalo Wamakhadi
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Clanbomber.desktop kdebase-branch-3.4/kappfinder/apps/Games/Clanbomber.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Clanbomber.desktop 2005-01-22 23:37:29.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Clanbomber.desktop 2005-03-07 09:14:47.000000000 -0500
+@@ -17,7 +17,6 @@
+ Name[sv]=Klanbombare
+ Name[ta]=கà¯à®³à®¾à®©à¯à®ªà®¾à®®à¯à®ªà®°à¯
+ Name[vi]=Clanbomber
+-Name[xx]=xxClanbomberxx
+ Name[zh_CN]=炸弹人
+ Name[zh_TW]=Clanbomber 炸彈超人
+ Name[zu]=Umqhumisi wesigodi
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Emulators/cmail.desktop kdebase-branch-3.4/kappfinder/apps/Games/Emulators/cmail.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Emulators/cmail.desktop 2005-02-04 23:14:34.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Emulators/cmail.desktop 2005-03-07 09:14:49.000000000 -0500
+@@ -21,7 +21,6 @@
+ Name[tr]=Satranç Postası
+ Name[ven]=Diresi ya Tsheze
+ Name[vi]=Chess Mail
+-Name[xx]=xxChessMailxx
+ Name[zu]=Iposi le-Chess
+ GenericName=Email for Chess
+ GenericName[af]=E-pos vir Skaak
+@@ -87,7 +86,6 @@
+ GenericName[ven]=Emeili ya Tsheze
+ GenericName[vi]=Email cho cá»
+ GenericName[xh]=Email ye Chess
+-GenericName[xx]=xxEmail for Chessxx
+ GenericName[zh_CN]=电å邮件象棋
+ GenericName[zh_TW]=以電郵方å¼ä¸‹åœ‹éš›è±¡æ£‹
+ GenericName[zu]=Iposi lekhomputha le-Chess
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Emulators/qmamecat.desktop kdebase-branch-3.4/kappfinder/apps/Games/Emulators/qmamecat.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Emulators/qmamecat.desktop 2005-02-04 23:14:34.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Emulators/qmamecat.desktop 2005-03-07 09:14:49.000000000 -0500
+@@ -64,7 +64,6 @@
+ GenericName[vi]=Mô phá»ng arcade
+ GenericName[wa]=Djeu d' årcåde
+ GenericName[xh]=Umlinganisi we Emulator
+-GenericName[xx]=xxArcade Emulatorxx
+ GenericName[zh_CN]=街机模拟器
+ GenericName[zh_TW]=é›»åéŠæˆ²æ¨¡æ“¬å™¨
+ GenericName[zu]=Umlingisi womhhume
+@@ -81,7 +80,6 @@
+ Name[ven]=QmameTshimange
+ Name[vi]=Qmamecat
+ Name[xh]=Qmamekati
+-Name[xx]=xxQmamecatxx
+ Path=
+ Terminal=false
+ Type=Application
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/GTali.desktop kdebase-branch-3.4/kappfinder/apps/Games/GTali.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/GTali.desktop 2005-02-04 23:14:32.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/GTali.desktop 2005-03-07 09:14:47.000000000 -0500
+@@ -9,7 +9,6 @@
+ Name[hi]=जी-ताली
+ Name[pa]=G ਟਾਲੀ
+ Name[sv]=Gtali
+-Name[xx]=xxGTalixx
+ GenericName=Dice Game
+ GenericName[af]=Dobbelsteen Speletjie
+ GenericName[ar]=لعبة نرد
+@@ -77,7 +76,6 @@
+ GenericName[vi]=Game súc sắc
+ GenericName[wa]=Djeu d' dés
+ GenericName[xh]=Umdlalo we Dice
+-GenericName[xx]=xxDice Gamexx
+ GenericName[zh_CN]=éª°åæ¸¸æˆ
+ GenericName[zh_TW]=骰åéŠæˆ²
+ GenericName[zu]=Umdlalo Wamadayisi
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Roguelikes/angband.desktop kdebase-branch-3.4/kappfinder/apps/Games/Roguelikes/angband.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Roguelikes/angband.desktop 2005-02-10 23:51:42.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Roguelikes/angband.desktop 2005-03-07 09:14:49.000000000 -0500
+@@ -10,7 +10,6 @@
+ Name[ru]=Ðнгбанд
+ Name[tg]=Ðнгбанд
+ Name[uk]=Ðнгбанд
+-Name[xx]=xxAngbandxx
+ Comment=Dive into Angband and defeat Morgoth
+ Comment[af]=Duik binnein Angband en oorwin Morgoth
+ Comment[ar]=اندمج ÙÙŠ عالم أنجباند ÙˆØØ§ÙˆÙ„ أن تهزم مورجوث
+@@ -70,7 +69,6 @@
+ Comment[uz]=Ðнгбандга бориб Морготни енгиб чиқинг
+ Comment[ven]=Fhufhelani kha Angbennde ni fhenye Morgoth
+ Comment[vi]=Lặn xuống Angband và đánh bại Morgoth
+-Comment[xx]=xxDive into Angband and defeat Morgothxx
+ Comment[zh_CN]=潜入 Angband 并击败 Morgoth
+ Comment[zh_TW]=進入 Angband 並打敗 Morgoth
+ Comment[zu]=Gxumela kwi-Angband ebese uhlula i-Morgoth
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Roguelikes/moria.desktop kdebase-branch-3.4/kappfinder/apps/Games/Roguelikes/moria.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Roguelikes/moria.desktop 2005-02-10 23:51:42.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Roguelikes/moria.desktop 2005-03-07 09:14:49.000000000 -0500
+@@ -15,7 +15,6 @@
+ Name[ta]=மோரியா
+ Name[tg]=МориÑ
+ Name[uk]=МоріÑ
+-Name[xx]=xxMoriaxx
+ Comment=Dive into Moria and defeat the Balrog
+ Comment[af]=Duik binnein Moria en oorwin die Balrog
+ Comment[ar]=اندمج ÙÙŠ عالم موريا ÙˆØØ§ÙˆÙ„ أن تهزم بالروج
+@@ -76,7 +75,6 @@
+ Comment[uz]=Мориага бориб Балрогни енгиб чиқинг
+ Comment[ven]=Fhufhelani kha Moria ni fhenye Balrog
+ Comment[vi]=Lặn xuống Moria và đánh bại Balrog
+-Comment[xx]=xxDive into Moria and defeat the Balrogxx
+ Comment[zh_CN]=潜入 Moria 并击败 Balrog
+ Comment[zh_TW]=進入 Moria 並打敗 Balrog
+ Comment[zu]=Gxumela kwi-Moria ebese uhlula i-Balrog
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Roguelikes/nethack.desktop kdebase-branch-3.4/kappfinder/apps/Games/Roguelikes/nethack.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Roguelikes/nethack.desktop 2005-02-04 23:14:35.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Roguelikes/nethack.desktop 2005-03-07 09:14:49.000000000 -0500
+@@ -13,7 +13,6 @@
+ Name[sv]=Nethack
+ Name[ta]=நெடà¯à®¹à®¾à®•à¯
+ Name[ven]=Vhukwamani ho Netaho
+-Name[xx]=xxNetHackxx
+ GenericName=Quest Game
+ GenericName[af]=Avontuur Speletjie
+ GenericName[ar]=لعبة تنقيب
+@@ -74,7 +73,6 @@
+ GenericName[uz]=Қидирув ўйини
+ GenericName[ven]=Mutambo wa Mueni
+ GenericName[vi]=Game chinh phục
+-GenericName[xx]=xxQuest Gamexx
+ GenericName[zh_CN]=坻宿¸¸æˆ
+ GenericName[zh_TW]=å†’éšªéŠæˆ²
+ GenericName[zu]=Umdlalo Wokusesha
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Roguelikes/rogue.desktop kdebase-branch-3.4/kappfinder/apps/Games/Roguelikes/rogue.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Roguelikes/rogue.desktop 2005-02-04 23:14:35.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Roguelikes/rogue.desktop 2005-03-07 09:14:49.000000000 -0500
+@@ -13,7 +13,6 @@
+ Name[ta]=ரோகà¯
+ Name[uk]=Тать
+ Name[uz]=Шум бола
+-Name[xx]=xxRoguexx
+ Name[zh_CN]=æ¶ä½œå‰§
+ GenericName=The Original
+ GenericName[af]=Die Oorspronklike
+@@ -74,7 +73,6 @@
+ GenericName[ven]=Zwa vhukuma
+ GenericName[vi]=Gốc
+ GenericName[xh]=Eyoqobo
+-GenericName[xx]=xxThe Originalxx
+ GenericName[zh_CN]=原创
+ GenericName[zh_TW]=原創 Rogue éŠæˆ²
+ GenericName[zu]=Okokuqala
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Roguelikes/tome.desktop kdebase-branch-3.4/kappfinder/apps/Games/Roguelikes/tome.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Roguelikes/tome.desktop 2005-02-04 23:14:35.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Roguelikes/tome.desktop 2005-03-07 09:14:50.000000000 -0500
+@@ -10,7 +10,6 @@
+ Name[mn]=ÐадРУУ
+ Name[pa]=ਟੂਮੀ
+ Name[ta]=டூமீ
+-Name[xx]=xxToMExx
+ GenericName=Quest Game
+ GenericName[af]=Avontuur Speletjie
+ GenericName[ar]=لعبة تنقيب
+@@ -71,7 +70,6 @@
+ GenericName[uz]=Қидирув ўйини
+ GenericName[ven]=Mutambo wa Mueni
+ GenericName[vi]=Game chinh phục
+-GenericName[xx]=xxQuest Gamexx
+ GenericName[zh_CN]=坻宿¸¸æˆ
+ GenericName[zh_TW]=å†’éšªéŠæˆ²
+ GenericName[zu]=Umdlalo Wokusesha
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/Roguelikes/zangband.desktop kdebase-branch-3.4/kappfinder/apps/Games/Roguelikes/zangband.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/Roguelikes/zangband.desktop 2005-02-04 23:14:35.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/Roguelikes/zangband.desktop 2005-03-07 09:14:50.000000000 -0500
+@@ -11,7 +11,6 @@
+ Name[sl]=Zangband
+ Name[sv]=Zangband
+ Name[ta]=ஜாஙà¯à®ªà®¾à®©à¯à®Ÿà¯
+-Name[xx]=xxZAngbandxx
+ GenericName=Defeat the Serpent of Chaos
+ GenericName[af]=Oorwin die Duiwel van Chaos
+ GenericName[ar]=ØØ§ÙˆÙ„ أن تهزم ØÙŠØ© الÙوضى
+@@ -71,7 +70,6 @@
+ GenericName[ven]=Fhenyani Nowa ya Khakhathi
+ GenericName[vi]=Äánh bại Serpent of Chaos
+ GenericName[xh]=Yoyisa Inyoka Yomonakalo
+-GenericName[xx]=xxDefeat the Serpent of Chaosxx
+ GenericName[zh_CN]=击败 Chaos æ¶æ£
+ GenericName[zh_TW]=打敗 Serpent of Chaos
+ GenericName[zu]=Hlula Inyoka yenyakanyaka
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/TacticStrategy/freeciv.desktop kdebase-branch-3.4/kappfinder/apps/Games/TacticStrategy/freeciv.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/TacticStrategy/freeciv.desktop 2005-02-04 23:14:35.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/TacticStrategy/freeciv.desktop 2005-03-07 09:14:50.000000000 -0500
+@@ -14,7 +14,6 @@
+ Name[sv]=Friciv
+ Name[ta]=இலவச சிà®à®µà®¿
+ Name[ven]=civ ya Mahala
+-Name[xx]=xxFreecivxx
+ Name[zh_CN]=文明
+ Name[zh_TW]=Freeciv 仿「文明å¸åœ‹ã€éŠæˆ²
+ Type=Application
+@@ -88,7 +87,6 @@
+ GenericName[vi]=Game chiến thuáºt
+ GenericName[wa]=Djeu di stratedjeye
+ GenericName[xh]=Indlela ethile Yomdlalo
+-GenericName[xx]=xxStrategy Gamexx
+ GenericName[zh_CN]=ç–略游æˆ
+ GenericName[zh_TW]=ç–ç•¥éŠæˆ²
+ GenericName[zu]=Umdlalo weplani
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/TacticStrategy/freecivserver.desktop kdebase-branch-3.4/kappfinder/apps/Games/TacticStrategy/freecivserver.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/TacticStrategy/freecivserver.desktop 2005-02-10 23:51:42.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/TacticStrategy/freecivserver.desktop 2005-03-10 11:05:08.000000000 -0500
+@@ -61,12 +61,12 @@
+ Name[vi]=Freeciv chá»§
+ Name[wa]=Sierveu FreeCiv
+ Name[xh]=Umncedisi we FreeCiv
+-Name[xx]=xxFreeCiv Serverxx
+ Name[zh_CN]=文明æœåС噍
+ Name[zh_TW]=FreeCiv 伺æœå™¨
+ Name[zu]=Umlekeleli we-FreeCiv
+ Type=Application
+ Comment=A server for Free Civ
++Comment[af]=´n Bediener vir Free Civ
+ Comment[ar]=خادم للعبة ÙØ±ÙŠ Ø³ÙŠÙ
+ Comment[az]=Free Civ Vericisi
+ Comment[be]=СÑрвÑÑ€ Ð´Ð»Ñ Ñвабоднай Цывілізацыі
+@@ -128,7 +128,6 @@
+ Comment[ven]=Siva ya Civ ya mahala
+ Comment[vi]=Máy chủ cho FreeCiv
+ Comment[xh]=Umncedisi we Free Civ
+-Comment[xx]=xxA server for Free Civxx
+ Comment[zh_CN]=文明的æœåС噍
+ Comment[zh_TW]=給 Free Civ 使用的伺æœå™¨
+ Comment[zu]=Umlekeleli we-Free Civ
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/TacticStrategy/xscorch.desktop kdebase-branch-3.4/kappfinder/apps/Games/TacticStrategy/xscorch.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/TacticStrategy/xscorch.desktop 2005-02-10 23:51:42.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/TacticStrategy/xscorch.desktop 2005-03-22 12:38:01.000000000 -0500
+@@ -10,7 +10,6 @@
+ Name[pa]=X ਸਕੋਰਚ
+ Name[sv]=Xscorch
+ Name[ta]=Xஸà¯à®•ாரà¯à®šà¯
+-Name[xx]=xxXScorchxx
+ Name[zu]=I-XScorch
+ Type=Application
+ Comment=A free Scorched Earth clone for UNIX and X
+@@ -39,7 +38,7 @@
+ Comment[hr]=Slobodan Scorched Earth clone za UNIX i X-e
+ Comment[hu]=Egy ingyenes UNIX/X-alapú Scorched Earth változat
+ Comment[is]=Frjáls Scorched Earth klón fyrir UNIX og X
+-Comment[it]=Un clone per UNIX e X di Scorched Earth
++Comment[it]=Un clone per UNIX e X di Scorched Earth
+ Comment[ja]=Unix åŠã³ X用ã®ãƒ•リーã®Scorched Earthクãƒãƒ¼ãƒ³
+ Comment[lt]=Laisvas Scorched Earth klonas, skirtas UNIX ir X
+ Comment[mk]=Слободен клон на Scorched Earth за UNIX и X
+@@ -69,7 +68,6 @@
+ Comment[uz]=Scorched Earth ўйинининг UNIX ва X учун Ñркин нуÑхаÑи
+ Comment[vi]=Trò Scorched Earth nhái miễn phà cho UNIX và X
+ Comment[xh]=Eyasimahla i Scorched Earth clone ye UNIX ne X
+-Comment[xx]=xxA free Scorched Earth clone for UNIX and Xxx
+ Comment[zh_CN]=用于 Unix å’Œ X çš„å…费焦土克隆
+ Comment[zh_TW]=UNIX 與 X 上的å…è²» Scorched Earth ä»¿è£½éŠæˆ²
+ Comment[zu]=Iwele le-Scorched Earth le-Unix ne-X
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/defendguin.desktop kdebase-branch-3.4/kappfinder/apps/Games/defendguin.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/defendguin.desktop 2005-02-04 23:14:32.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/defendguin.desktop 2005-03-07 09:14:47.000000000 -0500
+@@ -15,7 +15,6 @@
+ Name[ta]=டிபெனà¯à®Ÿà¯à®•ினà¯
+ Name[ven]=Tsireledzaniguin
+ Name[vi]=Bảo vệ chim cánh cụt
+-Name[xx]=xxDefendguinxx
+ Name[zh_CN]=ä¿æŠ¤ä¼é¹…
+ Type=Application
+ GenericName=Game
+@@ -87,7 +86,6 @@
+ GenericName[vi]=Trò chơi
+ GenericName[wa]=Djeu
+ GenericName[xh]=Umdlalo
+-GenericName[xx]=xxGamexx
+ GenericName[zh_CN]=游æˆ
+ GenericName[zh_TW]=éŠæˆ²
+ GenericName[zu]=Umdlalo
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/penguin-command.desktop kdebase-branch-3.4/kappfinder/apps/Games/penguin-command.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/penguin-command.desktop 2005-02-04 23:14:32.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/penguin-command.desktop 2005-03-22 12:38:00.000000000 -0500
+@@ -5,7 +5,6 @@
+ Name[af]=Pikkewyn Opdrag
+ Name[ar]=بينجوين كوماند
+ Name[bn]=পেঙà§à¦—à§à¦‡à¦¨ কমানà§à¦¡
+-Name[bs]=Pingvin komanda
+ Name[ca]=Comand PingüÃ
+ Name[cy]=Rheolaeth Pengwyn
+ Name[da]=Pingvin-kommando
+@@ -28,7 +27,6 @@
+ Name[uk]=Команда пінгвінів
+ Name[ven]=Muthetho wa Penguin
+ Name[vi]=Lệnh chim cánh cụt
+-Name[xx]=xxPenguin Commandxx
+ Name[zh_CN]=ä¼é¹…指挥官
+ Name[zh_TW]=ä¼éµå‘½ä»¤
+ Name[zu]=Umyalelo Wamaphengwini
+@@ -103,7 +101,6 @@
+ GenericName[vi]=Trò chơi mái vòm
+ GenericName[wa]=Djeu d' årcåde
+ GenericName[xh]=Umdlalo we Arcade
+-GenericName[xx]=xxArcade Gamexx
+ GenericName[zh_CN]=街机游æˆ
+ GenericName[zh_TW]=é›»åéŠæˆ²
+ GenericName[zu]=Umdlalo womhhume
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Games/xshipwars.desktop kdebase-branch-3.4/kappfinder/apps/Games/xshipwars.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Games/xshipwars.desktop 2005-02-04 23:14:32.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Games/xshipwars.desktop 2005-03-07 09:14:47.000000000 -0500
+@@ -19,7 +19,6 @@
+ Name[sv]=Xshipwars
+ Name[ven]=Tshikepe tsha dzinnda tsha X
+ Name[vi]=XShipWars
+-Name[xx]=xxXShipWarsxx
+ Name[zu]=I-XShipWars
+ Type=Application
+ GenericName=Strategy Game
+@@ -92,7 +91,6 @@
+ GenericName[vi]=Game chiến thuáºt
+ GenericName[wa]=Djeu di stratedjeye
+ GenericName[xh]=Indlela ethile Yomdlalo
+-GenericName[xx]=xxStrategy Gamexx
+ GenericName[zh_CN]=ç–略游æˆ
+ GenericName[zh_TW]=ç–ç•¥éŠæˆ²
+ GenericName[zu]=Umdlalo weplani
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Graphics/ElectricEyes.desktop kdebase-branch-3.4/kappfinder/apps/Graphics/ElectricEyes.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Graphics/ElectricEyes.desktop 2005-02-04 23:14:35.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Graphics/ElectricEyes.desktop 2005-03-07 09:14:50.000000000 -0500
+@@ -30,7 +30,6 @@
+ Name[ven]=Mato a Mudagasi
+ Name[vi]=Mắt Ä‘iện tá»
+ Name[xh]=Amehlo Ombane
+-Name[xx]=xxElectric Eyesxx
+ Name[zh_CN]=电眼
+ Name[zh_TW]=電眼
+ Name[zu]=Amehlo Kagesi
+@@ -103,7 +102,6 @@
+ GenericName[vi]=Trình xem ảnh
+ GenericName[wa]=Håyneu d' imådjes
+ GenericName[xh]=Umboniseli Womfanekiso
+-GenericName[xx]=xxImage Viewerxx
+ GenericName[zh_CN]=图片查看程åº
+ GenericName[zh_TW]=å½±åƒæª¢è¦–程å¼
+ GenericName[zu]=Umbukisi wesithombe
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Graphics/GPhoto.desktop kdebase-branch-3.4/kappfinder/apps/Graphics/GPhoto.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Graphics/GPhoto.desktop 2005-02-04 23:14:35.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Graphics/GPhoto.desktop 2005-03-22 12:38:01.000000000 -0500
+@@ -16,7 +16,6 @@
+ Name[sv]=Gphoto
+ Name[ta]=Gபà¯à®•ைபà¯à®ªà®Ÿà®®à¯
+ Name[ven]=Tshifanyiso tsha G
+-Name[xx]=xxGPhotoxx
+ GenericName=Digital Camera Program
+ GenericName[af]=Digitaal Kamera Program
+ GenericName[ar]=برنامج أجهزة التصوير الرقمية
+@@ -46,7 +45,7 @@
+ GenericName[hsb]=Program za digitalny fotoaparat
+ GenericName[hu]=Kamerakezelő
+ GenericName[is]=Digital myndavélaforrit
+-GenericName[it]=Programma per le macchine fotografiche digitali
++GenericName[it]=Programma per macchine fotografiche digitali
+ GenericName[ja]=デジタルカメラプãƒã‚°ãƒ©ãƒ
+ GenericName[ko]=디지탈 ì¹´ë©”ë¼ í”„ë¡œê·¸ëž¨
+ GenericName[lo]=ໂປຣà»àºàº£àº¡àºà»‰àºàº‡àº”ີຈີຕàºàº™
+@@ -82,7 +81,6 @@
+ GenericName[ven]=Mbekanyamushumo wa Tshaudzhia Zwifanyiso zwa Maduvhaano
+ GenericName[vi]=Chương trình máy ảnh số
+ GenericName[xh]=Inkqubo ye Khamera Yamanani
+-GenericName[xx]=xxDigital Camera Programxx
+ GenericName[zh_CN]=æ•°å—相机程åº
+ GenericName[zh_TW]=數ä½ç…§ç›¸æ©Ÿç¨‹å¼
+ GenericName[zu]=Uhlelo lwemisebenzi lwe-Camera yezinombolo
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Graphics/GnomeColorSelector.desktop kdebase-branch-3.4/kappfinder/apps/Graphics/GnomeColorSelector.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Graphics/GnomeColorSelector.desktop 2005-02-04 23:14:35.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Graphics/GnomeColorSelector.desktop 2005-03-07 09:14:50.000000000 -0500
+@@ -63,7 +63,6 @@
+ Name[vi]=Trình chá»n mà u GNOME
+ Name[wa]=Tchoezixheu di coleurs di Gnome
+ Name[xh]=GNOME Umkhethi Wombala
+-Name[xx]=xxGNOME Color Selectorxx
+ Name[zh_CN]=GNOME 颜色选择器
+ Name[zh_TW]=GNOME è‰²å½©é¸æ“‡ç¨‹å¼
+ Name[zu]=Umkhethi wombala we-GNOME
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Graphics/GnomeIconEditor.desktop kdebase-branch-3.4/kappfinder/apps/Graphics/GnomeIconEditor.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Graphics/GnomeIconEditor.desktop 2005-02-04 23:14:35.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Graphics/GnomeIconEditor.desktop 2005-03-07 09:14:50.000000000 -0500
+@@ -63,7 +63,6 @@
+ Name[vi]=Trình biên soạn Icon GNOME
+ Name[wa]=Aspougneu d' imådjetes di Gnome
+ Name[xh]=GNOME Umkhethi we Icon
+-Name[xx]=xxGNOME Icon Editorxx
+ Name[zh_CN]=GNOME å›¾æ ‡ç¼–è¾‘å™¨
+ Name[zh_TW]=GNOME 圖示編輯器
+ Name[zu]=Umlungisi wophawu lwesithombe we-GNOME
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Graphics/Gqview.desktop kdebase-branch-3.4/kappfinder/apps/Graphics/Gqview.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Graphics/Gqview.desktop 2005-02-23 00:05:28.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Graphics/Gqview.desktop 2005-03-07 09:14:50.000000000 -0500
+@@ -11,7 +11,6 @@
+ Name[nso]=Gqpono
+ Name[pa]=ਜੀ ਕੀਵਿਊ
+ Name[ven]=Mbonalelo ya Gq
+-Name[xx]=xxGqviewxx
+ GenericName=Image Browser
+ GenericName[af]=Beeld Blaaier
+ GenericName[ar]=Ù…ØªØµÙØ الصور
+@@ -66,7 +65,7 @@
+ GenericName[sk]=PrehliadaÄ obrázkov
+ GenericName[sl]=Brskalnik slik
+ GenericName[sr]=Прегледач Ñлика
+-GenericName[sr@Latn]=PretraživaÄ slika
++GenericName[sr@Latn]=PregledaÄ slika
+ GenericName[ss]=Ibrawuza yemfanekiso
+ GenericName[sv]=Bildbläddrare
+ GenericName[ta]=பிமà¯à®ª உலாவி
+@@ -79,7 +78,6 @@
+ GenericName[vi]=Trình duyệt ảnh
+ GenericName[wa]=Foyteu d' imådjes
+ GenericName[xh]=Umkhangeli zincwadi Womfanekiso
+-GenericName[xx]=xxImage Browserxx
+ GenericName[zh_CN]=图片æµè§ˆå™¨
+ GenericName[zh_TW]=å½±åƒç€è¦½å™¨
+ GenericName[zu]=Umcingi wesithombe
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Graphics/Sketch.desktop kdebase-branch-3.4/kappfinder/apps/Graphics/Sketch.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Graphics/Sketch.desktop 2005-02-04 23:14:35.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Graphics/Sketch.desktop 2005-03-07 09:14:50.000000000 -0500
+@@ -17,7 +17,6 @@
+ Name[tr]=Taslak
+ Name[ven]=Tshiketshe
+ Name[xh]=Umzobo
+-Name[xx]=xxSketchxx
+ Name[zu]=Umdwebo
+ GenericName=Vector-based Drawing Program
+ GenericName[af]=Vector-based Teken Program
+@@ -82,7 +81,6 @@
+ GenericName[ven]=Mbekanyamushumo yo olwaho sa Vekitha
+ GenericName[vi]=Trình vẽ kiểu Vector
+ GenericName[xh]=Inkqubo Yomzobo Osekwe-Kwimitha Yovavanyo
+-GenericName[xx]=xxVector-based Drawing Programxx
+ GenericName[zh_CN]=矢é‡ç»˜å›¾ç¨‹åº
+ GenericName[zh_TW]=å‘é‡ç¹ªåœ–程å¼
+ GenericName[zu]=Uhlelo lwemisebenzi olusekelwe kwi-Vector
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Graphics/Xpcd.desktop kdebase-branch-3.4/kappfinder/apps/Graphics/Xpcd.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Graphics/Xpcd.desktop 2005-02-23 00:05:28.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Graphics/Xpcd.desktop 2005-03-10 11:05:09.000000000 -0500
+@@ -5,9 +5,9 @@
+ Name[fa]=پی‌سی‌دی X
+ Name[fr]=XPCD
+ Name[hi]=à¤à¤•à¥à¤¸à¤ªà¥€à¤¸à¥€à¤¡à¥€
+-Name[xx]=xxXpcdxx
+ Name[zu]=I-Xpcd
+ GenericName=PhotoCD Tools
++GenericName[af]=PhotoCD Nutsprogramme
+ GenericName[az]=PhotoCD vasitələri
+ GenericName[be]=ІнÑтрумÑнты PhotoCD
+ GenericName[bg]=ИнÑтрументи за PhotoCD
+@@ -53,7 +53,7 @@
+ GenericName[sk]=Nástroje PhotoCD
+ GenericName[sl]=Orodja za PhotoCD
+ GenericName[sr]=Фото CD алати
+-GenericName[sr@Latn]=Фото CD алати
++GenericName[sr@Latn]=Foto CD alati
+ GenericName[sv]=Foto-cd-verktyg
+ GenericName[ta]=பà¯à®•ைபà¯à®ªà®Ÿ கà¯à®±à¯à®¨à¯à®¤à®•ட௠கரà¯à®µà®¿à®•ளà¯
+ GenericName[tg]=Ðмали ФотоCD
+@@ -61,7 +61,6 @@
+ GenericName[uk]=ЗаÑоби Ð´Ð»Ñ Ð¤Ð¾Ñ‚Ð¾-КД
+ GenericName[uz]=PhotoCD воÑиталари
+ GenericName[wa]=Usteyes po fotos CD
+-GenericName[xx]=xxPhotoCD Toolsxx
+ GenericName[zh_CN]=PhotoCD 工具
+ Exec=xpcd
+ Terminal=false
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Graphics/Xwpick.desktop kdebase-branch-3.4/kappfinder/apps/Graphics/Xwpick.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Graphics/Xwpick.desktop 2005-02-10 23:51:42.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Graphics/Xwpick.desktop 2005-03-07 09:14:50.000000000 -0500
+@@ -6,7 +6,6 @@
+ Name[hi]=à¤à¤•à¥à¤¸à¤¡à¤¬à¥à¤²à¥à¤¯à¥‚पिक
+ Name[pa]=Xਪਿਕ
+ Name[ven]=Xwdoba
+-Name[xx]=xxXwpickxx
+ Name[zu]=I-Xwpick
+ GenericName=Screen Capture Program
+ GenericName[af]=Skerm Vang Program
+@@ -72,7 +71,6 @@
+ GenericName[vi]=Trình chụp mà hình
+ GenericName[wa]=Programe po fé des waitroûlêyes
+ GenericName[xh]=Iinkcazelo Ezigcina Ikhusi
+-GenericName[xx]=xxScreen Capture Programxx
+ GenericName[zh_CN]=å±å¹•截图程åº
+ GenericName[zh_TW]=ç•«é¢æ“·å–程å¼
+ GenericName[zu]=Uhlelo lwemisebenzi olubamba iskrini
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Graphics/bitmap.desktop kdebase-branch-3.4/kappfinder/apps/Graphics/bitmap.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Graphics/bitmap.desktop 2005-02-10 23:51:42.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Graphics/bitmap.desktop 2005-03-07 09:14:50.000000000 -0500
+@@ -19,7 +19,6 @@
+ Name[ta]=X பிட௠வரைபடமà¯
+ Name[tg]=Ðақшаи бити X
+ Name[ven]=Mepe wa X
+-Name[xx]=xxX Bitmapxx
+ Name[zh_CN]=X ä½å›¾
+ Name[zu]=X Bitmap
+ GenericName=Bitmap Creator
+@@ -87,7 +86,6 @@
+ GenericName[vi]=Trình tạo bitmap
+ GenericName[wa]=Fijheu di bitmaps
+ GenericName[xh]=Umenzi We Bitmap
+-GenericName[xx]=xxBitmap Creatorxx
+ GenericName[zh_CN]=ä½å›¾åˆ¶ä½œç¨‹åº
+ GenericName[zh_TW]=點陣圖製作程å¼
+ GenericName[zu]=Umdali we-Bitmap
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Graphics/blender.desktop kdebase-branch-3.4/kappfinder/apps/Graphics/blender.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Graphics/blender.desktop 2005-01-31 03:35:18.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Graphics/blender.desktop 2005-03-07 09:14:50.000000000 -0500
+@@ -12,7 +12,6 @@
+ Name[ta]=பà¯à®³à®©à¯à®Ÿà®°à¯
+ Name[tg]=Блендер
+ Name[th]=เบลนเดà¸à¸£à¹Œ
+-Name[xx]=xxBlenderxx
+ MimeType=
+ GenericName=3D Modeler/Renderer
+ GenericName[ar]=أداة نمذجة ثلاثية الأبعاد
+@@ -66,7 +65,6 @@
+ GenericName[tr]=3B Modelleme Programı
+ GenericName[uk]=Модельєр 3D
+ GenericName[vi]=Trình tạo mẫu và hỗ trợ 3D
+-GenericName[xx]=xx3D Modeler/Rendererxx
+ GenericName[zh_CN]=3D 建模/渲染器
+ GenericName[zh_TW]=3D å ´æ™¯ç¹ªè£½ç¨‹å¼
+ Exec=blender
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Graphics/ghostview.desktop kdebase-branch-3.4/kappfinder/apps/Graphics/ghostview.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Graphics/ghostview.desktop 2005-02-10 23:51:43.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Graphics/ghostview.desktop 2005-03-07 09:14:50.000000000 -0500
+@@ -17,7 +17,6 @@
+ Name[ta]=ஜிபà¯à®°à®µà®²à®°à¯à®•ாடà¯à®šà®¿
+ Name[tg]=Ðамоиши Ghost
+ Name[ven]=Mbonalelo ya Tshipuku
+-Name[xx]=xxGhostViewxx
+ MimeType=application/pdf;application/postscript;image/x-eps
+ GenericName=PostScript Viewer
+ GenericName[af]=Postscript Aansig
+@@ -85,7 +84,6 @@
+ GenericName[vi]=Trình xem file .ps
+ GenericName[wa]=HÃ¥yneu di documints PostScript
+ GenericName[xh]=Umboniseli we PostScript
+-GenericName[xx]=xxPostScript Viewerxx
+ GenericName[zh_CN]=PostScript 查看器
+ GenericName[zh_TW]=PostScript 檢視器
+ GenericName[zu]=Umbukisi we-PostScript
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Graphics/gimp.desktop kdebase-branch-3.4/kappfinder/apps/Graphics/gimp.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Graphics/gimp.desktop 2005-02-10 23:51:43.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Graphics/gimp.desktop 2005-03-07 09:14:50.000000000 -0500
+@@ -16,7 +16,6 @@
+ Name[th]=ตà¸à¹à¸•่งภาพ Gimp
+ Name[vi]=Gimp
+ Name[wa]=Li GIMP
+-Name[xx]=xxGimpxx
+ Exec=gimp %F
+ Icon=gimp
+ Type=Application
+@@ -84,7 +83,6 @@
+ GenericName[vi]=Trình thao tác ảnh
+ GenericName[wa]=Programe d' aspougnaedje d' imådjes
+ GenericName[xh]=Udweliso lwenkqubo Lomfanekiso Obekwe ngendlela
+-GenericName[xx]=xxImage Manipulation Programxx
+ GenericName[zh_CN]=图åƒå¤„ç†ç¨‹åº
+ GenericName[zh_TW]=å½±åƒè™•ç†ç¨‹å¼
+ GenericName[zu]=Uhlelo lwemisebenzi Oluphatha Isithombe
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Graphics/gv.desktop kdebase-branch-3.4/kappfinder/apps/Graphics/gv.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Graphics/gv.desktop 2005-02-10 23:51:43.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Graphics/gv.desktop 2005-03-07 09:14:51.000000000 -0500
+@@ -6,7 +6,6 @@
+ Name[fa]=جی‌وی
+ Name[fr]=Gv
+ Name[hi]=जीवी
+-Name[xx]=xxGVxx
+ MimeType=application/pdf;application/postscript;image/x-eps;application/illustrator
+ GenericName=Postscript Viewer
+ GenericName[af]=Postscript Aansig
+@@ -77,7 +76,6 @@
+ GenericName[vi]=Trình xem file .ps
+ GenericName[wa]=HÃ¥yneu di documints PostScript
+ GenericName[xh]=Umboniseli we Postcript
+-GenericName[xx]=xxPostscript Viewerxx
+ GenericName[zh_CN]=Postscript 查看器
+ GenericName[zh_TW]=Postscript 檢視器
+ GenericName[zu]=Umbukisi we-Postscript
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Graphics/inkscape.desktop kdebase-branch-3.4/kappfinder/apps/Graphics/inkscape.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Graphics/inkscape.desktop 2005-02-23 00:05:28.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Graphics/inkscape.desktop 2005-03-07 09:14:51.000000000 -0500
+@@ -6,7 +6,6 @@
+ Name[ta]=இஙà¯à®•à¯à®¸à¯à®•ேபà¯
+ Name[tg]=ИнкСкейп
+ Name[tr]=Mürekkep Seiyesi
+-Name[xx]=xxInkscapexx
+ MimeType=
+ GenericName=Vector Drawing
+ GenericName[af]=Vektor Teken
+@@ -58,7 +57,7 @@
+ GenericName[sk]=Vektorový kresliaci program
+ GenericName[sl]=Vektorsko risanje
+ GenericName[sr]=ВекторÑко цртање
+-GenericName[sr@Latn]=Vektorski crtež
++GenericName[sr@Latn]=Vektorsko crtanje
+ GenericName[ss]=Kudvweba kweVector
+ GenericName[sv]=Vektorritning
+ GenericName[ta]=வெகà¯à®Ÿà®¾à®°à¯ வரைதலà¯
+@@ -70,7 +69,6 @@
+ GenericName[ven]=Mbekanyomushumo ya u ola
+ GenericName[vi]=Vẽ Vector
+ GenericName[xh]=Inkqubo Yomzobo Osekwe-Kwimitha Yovavanyo
+-GenericName[xx]=xxVector Drawingxx
+ GenericName[zh_CN]=矢é‡ç»˜å›¾
+ GenericName[zh_TW]=å‘é‡ç¹ªåœ–
+ GenericName[zu]=Umdwebo we-Vector
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Graphics/sodipodi.desktop kdebase-branch-3.4/kappfinder/apps/Graphics/sodipodi.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Graphics/sodipodi.desktop 2005-02-23 00:05:28.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Graphics/sodipodi.desktop 2005-03-07 09:14:51.000000000 -0500
+@@ -8,7 +8,6 @@
+ Name[lo]=ລາàºà»„ມ້
+ Name[pa]=ਸੋਡੀਪੋਡੀ
+ Name[ta]=சோடிபோடி
+-Name[xx]=xxSodipodixx
+ MimeType=
+ GenericName=Vector Drawing
+ GenericName[af]=Vektor Teken
+@@ -60,7 +59,7 @@
+ GenericName[sk]=Vektorový kresliaci program
+ GenericName[sl]=Vektorsko risanje
+ GenericName[sr]=ВекторÑко цртање
+-GenericName[sr@Latn]=Vektorski crtež
++GenericName[sr@Latn]=Vektorsko crtanje
+ GenericName[ss]=Kudvweba kweVector
+ GenericName[sv]=Vektorritning
+ GenericName[ta]=வெகà¯à®Ÿà®¾à®°à¯ வரைதலà¯
+@@ -72,7 +71,6 @@
+ GenericName[ven]=Mbekanyomushumo ya u ola
+ GenericName[vi]=Vẽ Vector
+ GenericName[xh]=Inkqubo Yomzobo Osekwe-Kwimitha Yovavanyo
+-GenericName[xx]=xxVector Drawingxx
+ GenericName[zh_CN]=矢é‡ç»˜å›¾
+ GenericName[zh_TW]=å‘é‡ç¹ªåœ–
+ GenericName[zu]=Umdwebo we-Vector
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Graphics/tgif.desktop kdebase-branch-3.4/kappfinder/apps/Graphics/tgif.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Graphics/tgif.desktop 2005-02-04 23:14:35.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Graphics/tgif.desktop 2005-03-07 09:14:51.000000000 -0500
+@@ -8,7 +8,6 @@
+ Name[fa]=گی٠T
+ Name[hi]=टी-जिफ़
+ Name[sv]=Tgif
+-Name[xx]=xxTGifxx
+ GenericName=Drawing Program
+ GenericName[af]=Teken Program
+ GenericName[ar]=برنامج الرسم
+@@ -76,7 +75,6 @@
+ GenericName[vi]=Trình vẽ
+ GenericName[wa]=Programe di dessinaedje
+ GenericName[xh]= Inkqubo Yemizobo
+-GenericName[xx]=xxDrawing Programxx
+ GenericName[zh_CN]=绘图程åº
+ GenericName[zh_TW]=繪圖程å¼
+ GenericName[zu]=Uhlelo lwemisebenzi oludwebayo
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Graphics/xdvi.desktop kdebase-branch-3.4/kappfinder/apps/Graphics/xdvi.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Graphics/xdvi.desktop 2005-02-10 23:51:43.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Graphics/xdvi.desktop 2005-03-07 09:14:51.000000000 -0500
+@@ -15,7 +15,6 @@
+ Name[hi]=à¤à¤•à¥à¤¸ डीवीआई
+ Name[ko]=Xìš© DVI
+ Name[mn]=X-DVI
+-Name[xx]=xxX DVIxx
+ GenericName=DVI Viewer
+ GenericName[af]=Dvi Aansig
+ GenericName[ar]=عرض Ù…Ù„ÙØ§Øª DVI
+@@ -85,7 +84,6 @@
+ GenericName[vi]=Trình xem DVI
+ GenericName[wa]=Håyneu di fitchîs DVI
+ GenericName[xh]=Umboniseli we DVI
+-GenericName[xx]=xxDVI Viewerxx
+ GenericName[zh_CN]=DVI 查看器
+ GenericName[zh_TW]=DVI 檢視器
+ GenericName[zu]=Umbukisi we-DVI
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Graphics/xfig.desktop kdebase-branch-3.4/kappfinder/apps/Graphics/xfig.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Graphics/xfig.desktop 2005-02-04 23:14:35.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Graphics/xfig.desktop 2005-03-07 09:14:51.000000000 -0500
+@@ -11,7 +11,6 @@
+ Name[fr]=XFig
+ Name[hi]=à¤à¤•à¥à¤¸à¤«à¤¿à¤—
+ Name[vi]=Xfig
+-Name[xx]=xxXfigxx
+ Name[zh_TW]=Xfig 繪圖程å¼
+ Name[zu]=I-Xfig
+ GenericName=Drawing Program
+@@ -81,7 +80,6 @@
+ GenericName[vi]=Trình vẽ
+ GenericName[wa]=Programe di dessinaedje
+ GenericName[xh]= Inkqubo Yemizobo
+-GenericName[xx]=xxDrawing Programxx
+ GenericName[zh_CN]=绘图程åº
+ GenericName[zh_TW]=繪圖程å¼
+ GenericName[zu]=Uhlelo lwemisebenzi oludwebayo
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Graphics/xpaint.desktop kdebase-branch-3.4/kappfinder/apps/Graphics/xpaint.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Graphics/xpaint.desktop 2005-02-04 23:14:35.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Graphics/xpaint.desktop 2005-03-07 09:14:51.000000000 -0500
+@@ -21,7 +21,6 @@
+ Name[ven]=Pennde ya X
+ Name[vi]=X Paint
+ Name[xh]=Ipeyinti X
+-Name[xx]=xxX Paintxx
+ Name[zh_CN]=X 绘图
+ Name[zh_TW]=X å°ç•«å®¶
+ MimeType=
+@@ -92,7 +91,6 @@
+ GenericName[vi]=Chương trình vẽ
+ GenericName[wa]=Programe di dessinaedje
+ GenericName[xh]=Inkqubo yodweliso Lwepeyinti
+-GenericName[xx]=xxPaint Programxx
+ GenericName[zh_CN]=绘图程åº
+ GenericName[zh_TW]=繪圖程å¼
+ GenericName[zu]=Uhlelo lwemisebezi lukapende
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Graphics/xv.desktop kdebase-branch-3.4/kappfinder/apps/Graphics/xv.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Graphics/xv.desktop 2005-02-04 23:14:35.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Graphics/xv.desktop 2005-03-07 09:14:51.000000000 -0500
+@@ -7,7 +7,6 @@
+ Name[fr]=Xv
+ Name[hi]=à¤à¤•à¥à¤¸à¤µà¥€
+ Name[vi]=XV
+-Name[xx]=xxXVxx
+ MimeType=image/fax-g3;image/gif;image/jpeg;image/png;image/tiff;image/x-bmp;image/x-xbm;image/x-xpm
+ GenericName=Picture Viewer
+ GenericName[af]=Prent Aansig
+@@ -75,7 +74,6 @@
+ GenericName[vi]=Trình xem ảnh
+ GenericName[wa]=Håyneu d' imådjes
+ GenericName[xh]=Umbukeli Wemifanekiso
+-GenericName[xx]=xxPicture Viewerxx
+ GenericName[zh_CN]=图片查看器
+ GenericName[zh_TW]=圖片ç€è¦½ç¨‹å¼
+ GenericName[zu]=Umbukisi wesithombe
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/BlueFish.desktop kdebase-branch-3.4/kappfinder/apps/Internet/BlueFish.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/BlueFish.desktop 2005-02-04 23:14:36.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/BlueFish.desktop 2005-03-07 09:14:52.000000000 -0500
+@@ -14,7 +14,6 @@
+ Name[ta]=நீல மீனà¯
+ Name[tg]=Моҳии обӣ
+ Name[ven]=Khovhedala
+-Name[xx]=xxBlueFishxx
+ GenericName=HTML Editor
+ GenericName[af]=Html Redigeerder
+ GenericName[ar]=Ù…ØØ±Ø± HTML
+@@ -83,7 +82,6 @@
+ GenericName[vi]=Trình biên soạn HTML
+ GenericName[wa]=Aspougneu di pådjes HTML
+ GenericName[xh]=Umhleli we HTML
+-GenericName[xx]=xxHTML Editorxx
+ GenericName[zh_CN]=HTML 编辑器
+ GenericName[zh_TW]=HTML 編輯器
+ GenericName[zu]=Umlungisi we-HTML
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/Dpsftp.desktop kdebase-branch-3.4/kappfinder/apps/Internet/Dpsftp.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/Dpsftp.desktop 2005-02-23 00:05:28.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/Dpsftp.desktop 2005-03-30 01:47:40.000000000 -0500
+@@ -5,17 +5,19 @@
+ Name[eo]=DPS-FTP
+ Name[fr]=DpsFTP
+ Name[hi]=डीपीà¤à¤¸à¤à¤«à¤Ÿà¥€à¤ªà¥€
+-Name[xx]=xxDpsftpxx
+ GenericName=FTP Browser
+ GenericName[bg]=Браузър FTP
+ GenericName[bn]=à¦à¦«-টি-পি বà§à¦°à¦¾à¦‰à¦œà¦¾à¦°
+ GenericName[br]=Furcher FTP
++GenericName[bs]=FTP preglednik
+ GenericName[ca]=Fullejador FTP
+ GenericName[cs]=FTP prohlÞeÄ
+ GenericName[da]=FTP-Browser
+ GenericName[de]=FTP-Browser
++GenericName[el]=ΠεÏιηγητής FTP
+ GenericName[es]=Navegador FTP
+ GenericName[et]=FTP lehitseja
++GenericName[eu]=FTP arakatzailea
+ GenericName[fi]=FTP-selain
+ GenericName[fr]=Navigateur FTP
+ GenericName[fy]=FTP-blêdzjer
+@@ -24,6 +26,7 @@
+ GenericName[hu]=FTP-böngésző
+ GenericName[is]=FTP vafri
+ GenericName[it]=Browser FTP
++GenericName[ja]=FTPブラウザ
+ GenericName[lt]=FTP naršyklė
+ GenericName[nb]=FTP-leser
+ GenericName[nl]=FTP-browser
+@@ -33,13 +36,13 @@
+ GenericName[pt_BR]=Navegador FTP
+ GenericName[ru]=FTP-браузер
+ GenericName[se]=FTP-logan
++GenericName[sk]=FTP prehliadaÄ
+ GenericName[sl]=Brskalnik po FTP
+ GenericName[sr]=FTP прегледач
+-GenericName[sr@Latn]=FTP прегледач
++GenericName[sr@Latn]=FTP pregledaÄ
+ GenericName[sv]=FTP-bläddrare
+ GenericName[ta]=எஃபà¯à®Ÿà®¿à®ªà®¿ உலாவி
+ GenericName[uk]=Ðавігатор FTP
+-GenericName[xx]=xxFTP Browserxx
+ Exec=dpsftp
+ Terminal=false
+ Icon=dpsftp.xpm
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/DrakSync.desktop kdebase-branch-3.4/kappfinder/apps/Internet/DrakSync.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/DrakSync.desktop 2005-02-23 00:05:28.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/DrakSync.desktop 2005-03-30 01:47:40.000000000 -0500
+@@ -9,17 +9,19 @@
+ Name[lo]=DrkSync
+ Name[sv]=Draksync
+ Name[ta]=டà¯à®°à®¾à®•à¯à®šà®¿à®©à¯à®•à¯
+-Name[xx]=xxDrakSyncxx
+ GenericName=Folder Synchronization
+ GenericName[bg]=Синхронизиране на директории
+ GenericName[bn]=à¦à¦•াধিক ফোলà§à¦¡à¦¾à¦°à§‡à¦° বিষয়বসà§à¦¤à§ সামঞà§à¦œà¦¸à§à¦¯à§‡ আনা
++GenericName[bs]=Sinhroniziranje direktorija
+ GenericName[ca]=Sincronització de carpetes
+ GenericName[cs]=Synchronizace složek
+ GenericName[da]=Mappesynkronisering
+ GenericName[de]=Ordner abgleichen
++GenericName[el]=ΕÏγαλείο συγχÏÎ¿Î½Î¹ÏƒÎ¼Î¿Ï Ï†Î±ÎºÎλων
+ GenericName[en_GB]=Folder Synchronisation
+ GenericName[es]=Sincronizador de carpetas
+ GenericName[et]=Kataloogide sünkroniseerimine
++GenericName[eu]=Karpeta sinkronizatzea
+ GenericName[fi]=Kansioiden synkronointityökalu
+ GenericName[fr]=Synchronisation de dossiers
+ GenericName[fy]=Mappensyngronisaasje
+@@ -27,6 +29,7 @@
+ GenericName[hu]=Könyvtárszinkronizáló
+ GenericName[is]=Möppu samræming
+ GenericName[it]=Sincronizzazione cartelle
++GenericName[ja]=ãƒ•ã‚©ãƒ«ãƒ€åŒæœŸãƒ„ール
+ GenericName[lt]=Aplankų sinchronizacija
+ GenericName[nb]=Mappesynkronisering
+ GenericName[nl]=Mappensynchronisatie
+@@ -35,13 +38,13 @@
+ GenericName[pt]=Sincronização de Pastas
+ GenericName[pt_BR]=Sincronização de Pastas
+ GenericName[ru]=Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð¿Ð°Ð¿Ð¾Ðº
++GenericName[sk]=Nástroj pre synchronizáciu prieÄinkov
+ GenericName[sl]=Usklajevanje map
+ GenericName[sr]=Синхронизација директоријума
+-GenericName[sr@Latn]=Синхронизација директоријума
++GenericName[sr@Latn]=Sinhronizacija direktorijuma
+ GenericName[sv]=Katalogsynkronisering
+ GenericName[ta]=அடைவ௠ஒரà¯à®™à¯à®•ிணைபà¯à®ªà¯
+ GenericName[uk]=Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ñ–Ð·Ð°Ñ†Ñ–Ñ Ñ‚ÐµÐº
+-GenericName[xx]=xxFolder Synchronizationxx
+ Exec=draksync
+ Terminal=false
+ Icon=draksync.xpm
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/Evolution.desktop kdebase-branch-3.4/kappfinder/apps/Internet/Evolution.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/Evolution.desktop 2005-02-10 23:51:43.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/Evolution.desktop 2005-03-16 03:32:42.000000000 -0500
+@@ -14,7 +14,6 @@
+ Name[tg]=Тараққиёт
+ Name[ven]=Tsikoni
+ Name[wa]=Evolucion
+-Name[xx]=xxEvolutionxx
+ Name[zu]=Indabuko
+ GenericName=Mail Client
+ GenericName[af]=Pos Kliënt
+@@ -23,7 +22,7 @@
+ GenericName[be]=Паштовы кліент
+ GenericName[bg]=ПощенÑки клиент
+ GenericName[bn]=ইমেইল কà§à¦²à¦¾à§Ÿà§‡à¦¨à§à¦Ÿ
+-GenericName[br]=Arval postel
++GenericName[br]=Kliant postel
+ GenericName[bs]=Program za Äitanje elektronske poÅ¡te
+ GenericName[ca]=Client de correu electrònic
+ GenericName[cs]=Klient pro Ätenà elektronické poÅ¡ty
+@@ -85,7 +84,6 @@
+ GenericName[ven]=Mushumisani na poso
+ GenericName[wa]=Cliyint d'Â emilaedje
+ GenericName[xh]=Umxhasi Weposi
+-GenericName[xx]=xxMail Clientxx
+ GenericName[zh_CN]=邮件程åº
+ GenericName[zh_TW]=郵件處ç†ç¨‹å¼
+ GenericName[zu]=Umxhasi weposi
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/Faces.desktop kdebase-branch-3.4/kappfinder/apps/Internet/Faces.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/Faces.desktop 2005-02-10 23:51:43.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/Faces.desktop 2005-03-07 09:14:52.000000000 -0500
+@@ -20,7 +20,6 @@
+ Name[vi]=Các mặt
+ Name[wa]=Vizaedjes
+ Name[xh]=Ubuso
+-Name[xx]=xxFacesxx
+ Name[zu]=Ubuso
+ GenericName=Mail Alert
+ GenericName[af]=Pos Waarskuwing
+@@ -87,7 +86,6 @@
+ GenericName[vi]=Báo động Mail
+ GenericName[wa]=Abranle pa emile
+ GenericName[xh]=Ulumkiso Lweposi
+-GenericName[xx]=xxMail Alertxx
+ GenericName[zh_CN]=邮件æç¤ºç¨‹åº
+ GenericName[zh_TW]=郵件æç¤º
+ GenericName[zu]=Ukuqwashisa ngeposi
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/Fetchmailconf.desktop kdebase-branch-3.4/kappfinder/apps/Internet/Fetchmailconf.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/Fetchmailconf.desktop 2005-02-04 23:14:36.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/Fetchmailconf.desktop 2005-03-07 09:14:52.000000000 -0500
+@@ -12,7 +12,6 @@
+ Name[ta]=வரà¯à®®à¯ அஞà¯à®šà®²à¯ அமைபà¯à®ªà¯
+ Name[tg]=Танзимгари fetchmail
+ Name[ven]=U dzhia poso a conf
+-Name[xx]=xxFetchmailconfxx
+ GenericName=Fetchmail Configuration
+ GenericName[af]=Fetchmail Opstelling
+ GenericName[ar]=اعدادت Fetchmail
+@@ -80,7 +79,6 @@
+ GenericName[vi]=Cấu hình Fetchmail
+ GenericName[wa]=Apontiaedje di fetchmail
+ GenericName[xh]=Uqwalaselo lweFetchmail
+-GenericName[xx]=xxFetchmail Configurationxx
+ GenericName[zh_CN]=Fetchmail é…ç½®
+ GenericName[zh_TW]=Fetchmail 組態
+ GenericName[zu]=Inhlanganiselo Yokulanda Iposi
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/Gabber.desktop kdebase-branch-3.4/kappfinder/apps/Internet/Gabber.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/Gabber.desktop 2005-02-10 23:51:43.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/Gabber.desktop 2005-03-10 11:05:09.000000000 -0500
+@@ -10,8 +10,8 @@
+ Name[mn]=Габбер
+ Name[pa]=ਗਾਬੀਰ
+ Name[ta]=காபà¯à®ªà®°à¯
+-Name[xx]=xxGabberxx
+ GenericName=Instant Messenger
++GenericName[af]=Oombliklike Boodskapper
+ GenericName[ar]=مراسلة Ùورية
+ GenericName[az]=Canlı İsmarışlaşma Vasitəsi
+ GenericName[bg]=Програма за чат
+@@ -61,7 +61,6 @@
+ GenericName[uk]=Кур'єр повідомлень
+ GenericName[uz]=Хабар алмашиш воÑитаÑи
+ GenericName[vi]=Trình hội thoại trực tuyến
+-GenericName[xx]=xxInstant Messengerxx
+ GenericName[zh_CN]=峿—¶æ¶ˆæ¯ç¨‹åº
+ Exec=gabber
+ Terminal=false
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/Galeon.desktop kdebase-branch-3.4/kappfinder/apps/Internet/Galeon.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/Galeon.desktop 2005-02-23 00:05:28.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/Galeon.desktop 2005-03-07 09:14:52.000000000 -0500
+@@ -11,7 +11,6 @@
+ Name[pa]=ਗਲੀਓਨ
+ Name[ta]=காலியனà¯
+ Name[th]=à¹à¸à¹€à¸¥à¸µà¸¢à¸™
+-Name[xx]=xxGaleonxx
+ GenericName=Web Browser
+ GenericName[af]=Web Blaaier
+ GenericName[ar]=Ù…ØªØµÙØ ويب
+@@ -65,7 +64,7 @@
+ GenericName[sk]=Webový prehliadaÄ
+ GenericName[sl]=Spletni brskalnik
+ GenericName[sr]=Веб прегледач
+-GenericName[sr@Latn]=Veb pretraživaÄ
++GenericName[sr@Latn]=Veb pregledaÄ
+ GenericName[ss]=Ibrawuza yeWeb
+ GenericName[sv]=Webbläsare
+ GenericName[ta]=வலை உலாவி
+@@ -78,7 +77,6 @@
+ GenericName[vi]=Trình duyệt Web
+ GenericName[wa]=Betchteu waibe
+ GenericName[xh]=Umkhangeli zincwadi we Web
+-GenericName[xx]=xxWeb Browserxx
+ GenericName[zh_CN]=网页æµè§ˆå™¨
+ GenericName[zh_TW]=ç¶²é ç€è¦½å™¨
+ GenericName[zu]=Umcingi we-Web
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/GnomeICU.desktop kdebase-branch-3.4/kappfinder/apps/Internet/GnomeICU.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/GnomeICU.desktop 2005-02-23 00:05:28.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/GnomeICU.desktop 2005-03-22 12:38:01.000000000 -0500
+@@ -10,15 +10,16 @@
+ Name[hi]=गà¥à¤¨à¥‹à¤®à¤†à¤ˆà¤¸à¥€à¤¯à¥‚
+ Name[pl]=Gnome WidzęCie (ICU)
+ Name[sv]=Gnomeicu
+-Name[xx]=xxGNOMEICUxx
+ GenericName=ICQ Messenger
+ GenericName[bg]=Програма за чат (ICQ)
+ GenericName[bn]=আই-সি-কিউ মেসেঞà§à¦œà¦¾à¦°
++GenericName[bs]=ICQ instant poruke
+ GenericName[ca]=Missatgeria ICQ
+ GenericName[cs]=ICQ komunikátor
+ GenericName[da]=ICQ-Messenger
+ GenericName[de]=ICQ-Messenger
+ GenericName[es]=MensajerÃa instantánea ICQ
++GenericName[eu]=ICQ mezularitza
+ GenericName[fi]=ICQ-pikaviestintäohjelma
+ GenericName[fr]=Messagerie ICQ
+ GenericName[fy]=ICQ-messenger
+@@ -26,6 +27,7 @@
+ GenericName[hu]=ICQ üzenetküldő
+ GenericName[is]=ICQ spjallforrit
+ GenericName[it]=Messaggistica ICQ
++GenericName[ja]=ICQメッセンジャー
+ GenericName[lt]=ICQ žinuÄių klientas
+ GenericName[nb]=Prateprogrammet ICQ
+ GenericName[nl]=ICQ-messenger
+@@ -35,13 +37,13 @@
+ GenericName[pt_BR]=ICQ
+ GenericName[ru]=Клиент ICQ
+ GenericName[se]=ICQ-šleađgadiehti
++GenericName[sk]=ICQ
+ GenericName[sl]=SporoÄilnik ICQ
+ GenericName[sr]=ICQ глаÑник
+-GenericName[sr@Latn]=ICQ глаÑник
++GenericName[sr@Latn]=ICQ glasnik
+ GenericName[sv]=ICQ-meddelandeklient
+ GenericName[ta]=ICQ செயà¯à®¤à®¿à®¯à®¾à®³à®°à¯
+ GenericName[uk]=Кур'єр (messenger) ICQ
+-GenericName[xx]=xxICQ Messengerxx
+ Exec=gnomeicu -a
+ Terminal=false
+ Icon=gnomeicu.xpm
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/Netscapemessenger.desktop kdebase-branch-3.4/kappfinder/apps/Internet/Netscapemessenger.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/Netscapemessenger.desktop 2005-02-10 23:51:43.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/Netscapemessenger.desktop 2005-03-16 03:32:42.000000000 -0500
+@@ -22,7 +22,6 @@
+ Name[tg]=Иттилооти Netscape
+ Name[ven]=Thunwa ya Netscape
+ Name[xh]=Umthunywa we Netscape
+-Name[xx]=xxNetscape Messengerxx
+ Name[zh_TW]=網景傳訊者
+ Name[zu]=Isithunywa se-Netscape
+ GenericName=Mail Client
+@@ -32,7 +31,7 @@
+ GenericName[be]=Паштовы кліент
+ GenericName[bg]=ПощенÑки клиент
+ GenericName[bn]=ইমেইল কà§à¦²à¦¾à§Ÿà§‡à¦¨à§à¦Ÿ
+-GenericName[br]=Arval postel
++GenericName[br]=Kliant postel
+ GenericName[bs]=Program za Äitanje elektronske poÅ¡te
+ GenericName[ca]=Client de correu electrònic
+ GenericName[cs]=Klient pro Ätenà elektronické poÅ¡ty
+@@ -94,7 +93,6 @@
+ GenericName[ven]=Mushumisani na poso
+ GenericName[wa]=Cliyint d'Â emilaedje
+ GenericName[xh]=Umxhasi Weposi
+-GenericName[xx]=xxMail Clientxx
+ GenericName[zh_CN]=邮件程åº
+ GenericName[zh_TW]=郵件處ç†ç¨‹å¼
+ GenericName[zu]=Umxhasi weposi
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/Nmapfe.desktop kdebase-branch-3.4/kappfinder/apps/Internet/Nmapfe.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/Nmapfe.desktop 2005-02-04 23:14:36.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/Nmapfe.desktop 2005-03-07 09:14:52.000000000 -0500
+@@ -3,7 +3,6 @@
+ Name=Nmapfe
+ Name[eo]=Pordesplorilo
+ Name[hi]=à¤à¤¨-मैफे
+-Name[xx]=xxNmapfexx
+ GenericName=Port Scanner
+ GenericName[af]=Poort Skandeerder
+ GenericName[ar]=أداة Ù…Ø³Ø Ø§Ù„Ù…Ù†Ø§ÙØ°
+@@ -66,7 +65,6 @@
+ GenericName[uz]=Порт Ñканнер
+ GenericName[ven]=Tshisedzi tsha Vhuimazwikepe
+ GenericName[xh]=Umshicileli Wofako
+-GenericName[xx]=xxPort Scannerxx
+ GenericName[zh_CN]=ç«¯å£æ‰«æå™¨
+ GenericName[zh_TW]=é€£æŽ¥åŸ æŽƒæç¨‹å¼
+ GenericName[zu]=Umhloli wesikhumulo
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/Pan.desktop kdebase-branch-3.4/kappfinder/apps/Internet/Pan.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/Pan.desktop 2005-02-10 23:51:43.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/Pan.desktop 2005-03-07 09:14:52.000000000 -0500
+@@ -8,7 +8,6 @@
+ Name[ko]=íŒ
+ Name[ta]=பானà¯
+ Name[ven]=Sedzulusa
+-Name[xx]=xxPanxx
+ Name[zu]=Ipani
+ GenericName=Usenet News Reader
+ GenericName[af]=Usenet Nuus Leser
+@@ -76,7 +75,6 @@
+ GenericName[vi]=Trình Ä‘á»c News
+ GenericName[wa]=Lijheu d'Â copinreyes (usenet)
+ GenericName[xh]=Umfundi Weendaba we Usenet
+-GenericName[xx]=xxUsenet News Readerxx
+ GenericName[zh_CN]=新闻阅读程åº
+ GenericName[zh_TW]=æ–°èžç¾¤çµ„閱讀程å¼
+ GenericName[zu]=Umfundi wezindaba zokusebenza kwe-net
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/Sylpheed.desktop kdebase-branch-3.4/kappfinder/apps/Internet/Sylpheed.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/Sylpheed.desktop 2005-02-10 23:51:43.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/Sylpheed.desktop 2005-03-16 03:32:42.000000000 -0500
+@@ -7,7 +7,6 @@
+ Name[hi]=सिलफीड
+ Name[lv]=Silfīda
+ Name[pa]=ਸ਼ੀਲਫੀਡ
+-Name[xx]=xxSylpheedxx
+ GenericName=Mail Client
+ GenericName[af]=Pos Kliënt
+ GenericName[ar]=البريد الألكتروني
+@@ -15,7 +14,7 @@
+ GenericName[be]=Паштовы кліент
+ GenericName[bg]=ПощенÑки клиент
+ GenericName[bn]=ইমেইল কà§à¦²à¦¾à§Ÿà§‡à¦¨à§à¦Ÿ
+-GenericName[br]=Arval postel
++GenericName[br]=Kliant postel
+ GenericName[bs]=Program za Äitanje elektronske poÅ¡te
+ GenericName[ca]=Client de correu electrònic
+ GenericName[cs]=Klient pro Ätenà elektronické poÅ¡ty
+@@ -77,7 +76,6 @@
+ GenericName[ven]=Mushumisani na poso
+ GenericName[wa]=Cliyint d'Â emilaedje
+ GenericName[xh]=Umxhasi Weposi
+-GenericName[xx]=xxMail Clientxx
+ GenericName[zh_CN]=邮件程åº
+ GenericName[zh_TW]=郵件處ç†ç¨‹å¼
+ GenericName[zu]=Umxhasi weposi
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/Terminal/Links.desktop kdebase-branch-3.4/kappfinder/apps/Internet/Terminal/Links.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/Terminal/Links.desktop 2005-02-23 00:05:29.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/Terminal/Links.desktop 2005-03-07 09:14:54.000000000 -0500
+@@ -15,7 +15,6 @@
+ Name[ta]=இணைபà¯à®ªà¯à®•ளà¯
+ Name[ven]=Vhukwamani
+ Name[xh]=Amakhonkco
+-Name[xx]=xxLinksxx
+ Name[zu]=Izixhumanisi
+ GenericName=Web Browser
+ GenericName[af]=Web Blaaier
+@@ -70,7 +69,7 @@
+ GenericName[sk]=Webový prehliadaÄ
+ GenericName[sl]=Spletni brskalnik
+ GenericName[sr]=Веб прегледач
+-GenericName[sr@Latn]=Veb pretraživaÄ
++GenericName[sr@Latn]=Veb pregledaÄ
+ GenericName[ss]=Ibrawuza yeWeb
+ GenericName[sv]=Webbläsare
+ GenericName[ta]=வலை உலாவி
+@@ -83,7 +82,6 @@
+ GenericName[vi]=Trình duyệt Web
+ GenericName[wa]=Betchteu waibe
+ GenericName[xh]=Umkhangeli zincwadi we Web
+-GenericName[xx]=xxWeb Browserxx
+ GenericName[zh_CN]=网页æµè§ˆå™¨
+ GenericName[zh_TW]=ç¶²é ç€è¦½å™¨
+ GenericName[zu]=Umcingi we-Web
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/Terminal/Lynx.desktop kdebase-branch-3.4/kappfinder/apps/Internet/Terminal/Lynx.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/Terminal/Lynx.desktop 2005-02-23 00:05:29.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/Terminal/Lynx.desktop 2005-03-07 09:14:54.000000000 -0500
+@@ -5,7 +5,6 @@
+ Name[fa]=لینکس
+ Name[hi]=लायनकà¥à¤¸
+ Name[pa]=ਲੀਨੈਕਸ
+-Name[xx]=xxLynxxx
+ GenericName=Web Browser
+ GenericName[af]=Web Blaaier
+ GenericName[ar]=Ù…ØªØµÙØ ويب
+@@ -59,7 +58,7 @@
+ GenericName[sk]=Webový prehliadaÄ
+ GenericName[sl]=Spletni brskalnik
+ GenericName[sr]=Веб прегледач
+-GenericName[sr@Latn]=Veb pretraživaÄ
++GenericName[sr@Latn]=Veb pregledaÄ
+ GenericName[ss]=Ibrawuza yeWeb
+ GenericName[sv]=Webbläsare
+ GenericName[ta]=வலை உலாவி
+@@ -72,7 +71,6 @@
+ GenericName[vi]=Trình duyệt Web
+ GenericName[wa]=Betchteu waibe
+ GenericName[xh]=Umkhangeli zincwadi we Web
+-GenericName[xx]=xxWeb Browserxx
+ GenericName[zh_CN]=网页æµè§ˆå™¨
+ GenericName[zh_TW]=ç¶²é ç€è¦½å™¨
+ GenericName[zu]=Umcingi we-Web
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop kdebase-branch-3.4/kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop 2005-02-21 13:17:48.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop 2005-03-07 09:14:54.000000000 -0500
+@@ -35,7 +35,6 @@
+ GenericName[tr]=BitTorrent Arayüzü
+ GenericName[uz]=BitTorrent учун график интерфейÑ
+ GenericName[wa]=Eterface grafike po BitTorrent
+-GenericName[xx]=xxBitTorrent GUIxx
+ GenericName[zh_TW]=BitTorrent 圖型使用者介é¢
+ Icon=xapp
+ InitialPreference=1
+@@ -72,7 +71,6 @@
+ Name[tr]=BitTorrent Python Grafiksel Arayüzü
+ Name[uz]=BitTorrent учун Python Curses график интерфейÑ
+ Name[wa]=Eterface grafike e python po BitTorrent
+-Name[xx]=xxBitTorrent Python Curses GUIxx
+ Name[zh_TW]=BitTorrent Python Curses 圖型使用者介é¢
+ ServiceTypes=
+ Terminal=true
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/Terminal/lftp.desktop kdebase-branch-3.4/kappfinder/apps/Internet/Terminal/lftp.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/Terminal/lftp.desktop 2005-02-04 23:14:38.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/Terminal/lftp.desktop 2005-03-16 03:32:42.000000000 -0500
+@@ -7,7 +7,7 @@
+ GenericName[be]=Кліент FTP
+ GenericName[bg]=Клиент за FTP
+ GenericName[bn]=à¦à¦«-টি-পি কà§à¦²à¦¾à§Ÿà§‡à¦¨à§à¦Ÿ
+-GenericName[br]=Arval FTP
++GenericName[br]=Kliant FTP
+ GenericName[bs]=FTP klijent
+ GenericName[ca]=Client FTP
+ GenericName[cs]=FTP klient
+@@ -66,7 +66,6 @@
+ GenericName[ven]=Mushumisani wa FTP
+ GenericName[wa]=Cliyint FTP
+ GenericName[xh]=Umxhasi we FTP
+-GenericName[xx]=xxFTP Clientxx
+ GenericName[zh_CN]=FTP 客户端程åº
+ GenericName[zh_TW]=FTP 客戶端程å¼
+ GenericName[zu]=Umxhasi we-FTP
+@@ -76,7 +75,6 @@
+ Name[eo]=L-FTP
+ Name[fr]=LFTP
+ Name[hi]=à¤à¤²à¤à¤«à¤Ÿà¥€à¤ªà¥€
+-Name[xx]=xxLftpxx
+ Path=
+ Terminal=true
+ Type=Application
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/Terminal/mutt.desktop kdebase-branch-3.4/kappfinder/apps/Internet/Terminal/mutt.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/Terminal/mutt.desktop 2005-02-10 23:51:44.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/Terminal/mutt.desktop 2005-03-16 03:32:42.000000000 -0500
+@@ -11,7 +11,6 @@
+ Name[ko]=ë©‹
+ Name[ta]=மடà¯
+ Name[vi]=Mutt
+-Name[xx]=xxMuttxx
+ GenericName=Mail Client
+ GenericName[af]=Pos Kliënt
+ GenericName[ar]=البريد الألكتروني
+@@ -19,7 +18,7 @@
+ GenericName[be]=Паштовы кліент
+ GenericName[bg]=ПощенÑки клиент
+ GenericName[bn]=ইমেইল কà§à¦²à¦¾à§Ÿà§‡à¦¨à§à¦Ÿ
+-GenericName[br]=Arval postel
++GenericName[br]=Kliant postel
+ GenericName[bs]=Program za Äitanje elektronske poÅ¡te
+ GenericName[ca]=Client de correu electrònic
+ GenericName[cs]=Klient pro Ätenà elektronické poÅ¡ty
+@@ -81,7 +80,6 @@
+ GenericName[ven]=Mushumisani na poso
+ GenericName[wa]=Cliyint d'Â emilaedje
+ GenericName[xh]=Umxhasi Weposi
+-GenericName[xx]=xxMail Clientxx
+ GenericName[zh_CN]=邮件程åº
+ GenericName[zh_TW]=郵件處ç†ç¨‹å¼
+ GenericName[zu]=Umxhasi weposi
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/Terminal/ncftp.desktop kdebase-branch-3.4/kappfinder/apps/Internet/Terminal/ncftp.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/Terminal/ncftp.desktop 2005-02-04 23:14:38.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/Terminal/ncftp.desktop 2005-03-16 03:32:42.000000000 -0500
+@@ -9,7 +9,6 @@
+ Name[id]=Nc FTP
+ Name[lo]=Ncftp
+ Name[vi]=NcFTP
+-Name[xx]=xxNcFTPxx
+ GenericName=FTP Client
+ GenericName[af]=Ftp Kliënt
+ GenericName[ar]=عميل FTP
+@@ -17,7 +16,7 @@
+ GenericName[be]=Кліент FTP
+ GenericName[bg]=Клиент за FTP
+ GenericName[bn]=à¦à¦«-টি-পি কà§à¦²à¦¾à§Ÿà§‡à¦¨à§à¦Ÿ
+-GenericName[br]=Arval FTP
++GenericName[br]=Kliant FTP
+ GenericName[bs]=FTP klijent
+ GenericName[ca]=Client FTP
+ GenericName[cs]=FTP klient
+@@ -76,7 +75,6 @@
+ GenericName[ven]=Mushumisani wa FTP
+ GenericName[wa]=Cliyint FTP
+ GenericName[xh]=Umxhasi we FTP
+-GenericName[xx]=xxFTP Clientxx
+ GenericName[zh_CN]=FTP 客户端程åº
+ GenericName[zh_TW]=FTP 客戶端程å¼
+ GenericName[zu]=Umxhasi we-FTP
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/Terminal/pine.desktop kdebase-branch-3.4/kappfinder/apps/Internet/Terminal/pine.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/Terminal/pine.desktop 2005-02-10 23:51:44.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/Terminal/pine.desktop 2005-03-16 03:32:42.000000000 -0500
+@@ -15,7 +15,6 @@
+ Name[ta]=பைனà¯
+ Name[tg]=Поён
+ Name[vi]=Pine
+-Name[xx]=xxPinexx
+ GenericName=Mail Client
+ GenericName[af]=Pos Kliënt
+ GenericName[ar]=البريد الألكتروني
+@@ -23,7 +22,7 @@
+ GenericName[be]=Паштовы кліент
+ GenericName[bg]=ПощенÑки клиент
+ GenericName[bn]=ইমেইল কà§à¦²à¦¾à§Ÿà§‡à¦¨à§à¦Ÿ
+-GenericName[br]=Arval postel
++GenericName[br]=Kliant postel
+ GenericName[bs]=Program za Äitanje elektronske poÅ¡te
+ GenericName[ca]=Client de correu electrònic
+ GenericName[cs]=Klient pro Ätenà elektronické poÅ¡ty
+@@ -85,7 +84,6 @@
+ GenericName[ven]=Mushumisani na poso
+ GenericName[wa]=Cliyint d'Â emilaedje
+ GenericName[xh]=Umxhasi Weposi
+-GenericName[xx]=xxMail Clientxx
+ GenericName[zh_CN]=邮件程åº
+ GenericName[zh_TW]=郵件處ç†ç¨‹å¼
+ GenericName[zu]=Umxhasi weposi
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/Terminal/silc.desktop kdebase-branch-3.4/kappfinder/apps/Internet/Terminal/silc.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/Terminal/silc.desktop 2005-02-04 23:14:38.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/Terminal/silc.desktop 2005-03-16 03:32:42.000000000 -0500
+@@ -1,12 +1,13 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ GenericName=SILC Client
++GenericName[af]=SILC Kliënt
+ GenericName[ar]=عميل سيلك
+ GenericName[az]=SILC Alıcısı
+ GenericName[be]=Кліент SILC
+ GenericName[bg]=Клиент за SILC
+ GenericName[bn]=সিলà§à¦• কà§à¦²à¦¾à§Ÿà§‡à¦¨à§à¦Ÿ
+-GenericName[br]=Arval SILC
++GenericName[br]=Kliant SILC
+ GenericName[bs]=SILC klijent
+ GenericName[ca]=Client SILC
+ GenericName[cs]=SILC klient
+@@ -64,7 +65,6 @@
+ GenericName[vi]=Trình chát SILC
+ GenericName[wa]=Cliyint SILC
+ GenericName[xh]=Umxhasi we SILC
+-GenericName[xx]=xxSILC Clientxx
+ GenericName[zh_CN]=SILC 客户程åº
+ GenericName[zh_TW]=SILC 客戶端程å¼
+ GenericName[zu]=Umxhasi we-SILC
+@@ -79,6 +79,5 @@
+ Name[lo]=ນຳ້ວົນ
+ Name[mn]=SILC
+ Name[ta]=சிலà¯à®•à¯
+-Name[xx]=xxSilcxx
+ Terminal=true
+ Type=Application
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/Terminal/slrn.desktop kdebase-branch-3.4/kappfinder/apps/Internet/Terminal/slrn.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/Terminal/slrn.desktop 2005-02-10 23:51:44.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/Terminal/slrn.desktop 2005-03-07 09:14:54.000000000 -0500
+@@ -7,7 +7,6 @@
+ Name[eo]=Slrn-novaĵprezentilo
+ Name[hi]=à¤à¤¸à¤à¤²à¤†à¤°à¤à¤¨
+ Name[lo]=ຫນ້າຈà»
+-Name[xx]=xxSlrnxx
+ GenericName=News Reader
+ GenericName[af]=Nuus Leser
+ GenericName[ar]=قارئ أخبار
+@@ -76,7 +75,6 @@
+ GenericName[vi]=Trình Ä‘á»c News
+ GenericName[wa]=Lijheu d'Â copinreyes usenet
+ GenericName[xh]=Umfundi Weendaba
+-GenericName[xx]=xxNews Readerxx
+ GenericName[zh_CN]=新闻阅读程åº
+ GenericName[zh_TW]=æ–°èžé–±è®€ç¨‹å¼
+ GenericName[zu]=Umfundi wezindaba
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/Terminal/w3m.desktop kdebase-branch-3.4/kappfinder/apps/Internet/Terminal/w3m.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/Terminal/w3m.desktop 2005-02-23 00:05:29.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/Terminal/w3m.desktop 2005-03-07 09:14:54.000000000 -0500
+@@ -6,7 +6,6 @@
+ Name[hi]=डबà¥à¤²à¤¯à¥‚3à¤à¤®
+ Name[lo]=ຫນàºàº™à»€àºœàº´à»‰àº‡
+ Name[sv]=W3m
+-Name[xx]=xxw3mxx
+ GenericName=Web Browser
+ GenericName[af]=Web Blaaier
+ GenericName[ar]=Ù…ØªØµÙØ ويب
+@@ -60,7 +59,7 @@
+ GenericName[sk]=Webový prehliadaÄ
+ GenericName[sl]=Spletni brskalnik
+ GenericName[sr]=Веб прегледач
+-GenericName[sr@Latn]=Veb pretraživaÄ
++GenericName[sr@Latn]=Veb pregledaÄ
+ GenericName[ss]=Ibrawuza yeWeb
+ GenericName[sv]=Webbläsare
+ GenericName[ta]=வலை உலாவி
+@@ -73,7 +72,6 @@
+ GenericName[vi]=Trình duyệt Web
+ GenericName[wa]=Betchteu waibe
+ GenericName[xh]=Umkhangeli zincwadi we Web
+-GenericName[xx]=xxWeb Browserxx
+ GenericName[zh_CN]=网页æµè§ˆå™¨
+ GenericName[zh_TW]=ç¶²é ç€è¦½å™¨
+ GenericName[zu]=Umcingi we-Web
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/arena.desktop kdebase-branch-3.4/kappfinder/apps/Internet/arena.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/arena.desktop 2005-02-23 00:05:28.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/arena.desktop 2005-03-07 09:14:52.000000000 -0500
+@@ -18,7 +18,6 @@
+ Name[ven]=Luvhande
+ Name[vi]=Vũ đà i
+ Name[xh]=Umbindi webala lokudlala
+-Name[xx]=xxArenaxx
+ Name[zu]=Inkundla
+ GenericName=Web Browser
+ GenericName[af]=Web Blaaier
+@@ -73,7 +72,7 @@
+ GenericName[sk]=Webový prehliadaÄ
+ GenericName[sl]=Spletni brskalnik
+ GenericName[sr]=Веб прегледач
+-GenericName[sr@Latn]=Veb pretraživaÄ
++GenericName[sr@Latn]=Veb pregledaÄ
+ GenericName[ss]=Ibrawuza yeWeb
+ GenericName[sv]=Webbläsare
+ GenericName[ta]=வலை உலாவி
+@@ -86,7 +85,6 @@
+ GenericName[vi]=Trình duyệt Web
+ GenericName[wa]=Betchteu waibe
+ GenericName[xh]=Umkhangeli zincwadi we Web
+-GenericName[xx]=xxWeb Browserxx
+ GenericName[zh_CN]=网页æµè§ˆå™¨
+ GenericName[zh_TW]=ç¶²é ç€è¦½å™¨
+ GenericName[zu]=Umcingi we-Web
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/balsa.desktop kdebase-branch-3.4/kappfinder/apps/Internet/balsa.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/balsa.desktop 2005-02-10 23:51:43.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/balsa.desktop 2005-03-16 03:32:42.000000000 -0500
+@@ -9,7 +9,6 @@
+ Name[lo]=ບາຊາ
+ Name[pa]=ਬਾਲਸਾ
+ Name[ta]=பலà¯à®šà®¾
+-Name[xx]=xxBalsaxx
+ GenericName=Mail Client
+ GenericName[af]=Pos Kliënt
+ GenericName[ar]=البريد الألكتروني
+@@ -17,7 +16,7 @@
+ GenericName[be]=Паштовы кліент
+ GenericName[bg]=ПощенÑки клиент
+ GenericName[bn]=ইমেইল কà§à¦²à¦¾à§Ÿà§‡à¦¨à§à¦Ÿ
+-GenericName[br]=Arval postel
++GenericName[br]=Kliant postel
+ GenericName[bs]=Program za Äitanje elektronske poÅ¡te
+ GenericName[ca]=Client de correu electrònic
+ GenericName[cs]=Klient pro Ätenà elektronické poÅ¡ty
+@@ -79,7 +78,6 @@
+ GenericName[ven]=Mushumisani na poso
+ GenericName[wa]=Cliyint d'Â emilaedje
+ GenericName[xh]=Umxhasi Weposi
+-GenericName[xx]=xxMail Clientxx
+ GenericName[zh_CN]=邮件程åº
+ GenericName[zh_TW]=郵件處ç†ç¨‹å¼
+ GenericName[zu]=Umxhasi weposi
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/btdownloadgui.desktop kdebase-branch-3.4/kappfinder/apps/Internet/btdownloadgui.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/btdownloadgui.desktop 2005-02-21 13:17:47.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/btdownloadgui.desktop 2005-03-07 09:14:52.000000000 -0500
+@@ -35,7 +35,6 @@
+ GenericName[tr]=BitTorrent Arayüzü
+ GenericName[uz]=BitTorrent учун график интерфейÑ
+ GenericName[wa]=Eterface grafike po BitTorrent
+-GenericName[xx]=xxBitTorrent GUIxx
+ GenericName[zh_TW]=BitTorrent 圖型使用者介é¢
+ Icon=xapp
+ InitialPreference=2
+@@ -71,7 +70,6 @@
+ Name[uk]=Графічний Ñ–Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ BitTorrent Python wxGTK
+ Name[uz]=BitTorrent учун Python wxGTK график интерфейÑ
+ Name[wa]=Eterface grafike e python wxGTK po BitTorrent
+-Name[xx]=xxBitTorrent Python wxGTK GUIxx
+ Name[zh_TW]=BitTorrent Python wxGTK 圖型使用者介é¢
+ ServiceTypes=
+ Terminal=false
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/coolmail.desktop kdebase-branch-3.4/kappfinder/apps/Internet/coolmail.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/coolmail.desktop 2005-02-04 23:14:36.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/coolmail.desktop 2005-03-07 09:14:52.000000000 -0500
+@@ -15,7 +15,6 @@
+ Name[ta]=கூலà¯à®®à¯†à®¯à®¿à®²à¯
+ Name[tg]=Почтаи Cool
+ Name[ven]=Poso ya Vhudi
+-Name[xx]=xxCoolmailxx
+ Name[zu]=Iposi elipholile
+ GenericName=Mail Alert
+ GenericName[af]=Pos Waarskuwing
+@@ -82,7 +81,6 @@
+ GenericName[vi]=Báo động Mail
+ GenericName[wa]=Abranle pa emile
+ GenericName[xh]=Ulumkiso Lweposi
+-GenericName[xx]=xxMail Alertxx
+ GenericName[zh_CN]=邮件æç¤ºç¨‹åº
+ GenericName[zh_TW]=郵件æç¤º
+ GenericName[zu]=Ukuqwashisa ngeposi
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/dc_gui.desktop kdebase-branch-3.4/kappfinder/apps/Internet/dc_gui.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/dc_gui.desktop 2005-02-10 23:51:43.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/dc_gui.desktop 2005-03-07 09:14:52.000000000 -0500
+@@ -27,7 +27,6 @@
+ Name[uk]=Ð†Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð´Ð»Ñ DCTC
+ Name[uz]=DCTC учун график интерфейÑ
+ Name[wa]=Eterface grafike po DCTC
+-Name[xx]=xxDCTC GUIxx
+ Name[zh_TW]=DCTC 圖型使用者介é¢
+ Name[zu]=I-GUI ye-DCTC
+ GenericName=Direct Connect Clone
+@@ -85,7 +84,6 @@
+ GenericName[vi]=Kết nối trực tiếp
+ GenericName[wa]=Clône di «Direct Connect»
+ GenericName[xh]=Udibaniso Ngqo lwe Klone
+-GenericName[xx]=xxDirect Connect Clonexx
+ GenericName[zh_CN]=Direct Connect
+ GenericName[zh_TW]=直接連線仿製
+ GenericName[zu]=Xhumanisa Ngokuqondile Iwele
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/ed2k_gui.desktop kdebase-branch-3.4/kappfinder/apps/Internet/ed2k_gui.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/ed2k_gui.desktop 2005-02-10 23:51:43.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/ed2k_gui.desktop 2005-03-07 09:14:52.000000000 -0500
+@@ -40,7 +40,6 @@
+ Name[ven]=eDonngi2000 GTK+ Tshilanguli tshihulwane
+ Name[vi]=eDonkey2000 GTK+ lõi bá»™ Ä‘iá»u khiển
+ Name[xh]=eDonkey2000 GTK+ Nomlawuli Wangaphakathi
+-Name[xx]=xxeDonkey2000 GTK+ Core Controllerxx
+ Name[zh_CN]=eDonkey2000 GTK+ æ ¸å¿ƒæŽ§åˆ¶å™¨
+ Name[zh_TW]=eDonkey2000 GTK+ æ ¸å¿ƒæŽ§åˆ¶å™¨
+ GenericName=eDonkey2000 GUI
+@@ -83,7 +82,6 @@
+ GenericName[uz]=eDonkey2000 учун график интерфейÑ
+ GenericName[ven]=eDonngi2000 GUI
+ GenericName[wa]=Eterface grafike po eDonkey 2000
+-GenericName[xx]=xxeDonkey2000 GUIxx
+ GenericName[zh_TW]=eDonkey2000 圖型使用者介é¢
+ GenericName[zu]=I-GUI ye-eDonkey2000
+ Terminal=false
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/epiphany.desktop kdebase-branch-3.4/kappfinder/apps/Internet/epiphany.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/epiphany.desktop 2005-02-23 00:05:28.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/epiphany.desktop 2005-03-07 09:14:52.000000000 -0500
+@@ -10,7 +10,6 @@
+ Name[pa]=à¨à¨ªà©€à¨«à¨¾à¨¨à©€
+ Name[ta]=எபிபனி
+ Name[wa]=Betchteu waibe epiphany
+-Name[xx]=xxEpiphanyxx
+ GenericName=Web Browser
+ GenericName[af]=Web Blaaier
+ GenericName[ar]=Ù…ØªØµÙØ ويب
+@@ -64,7 +63,7 @@
+ GenericName[sk]=Webový prehliadaÄ
+ GenericName[sl]=Spletni brskalnik
+ GenericName[sr]=Веб прегледач
+-GenericName[sr@Latn]=Veb pretraživaÄ
++GenericName[sr@Latn]=Veb pregledaÄ
+ GenericName[ss]=Ibrawuza yeWeb
+ GenericName[sv]=Webbläsare
+ GenericName[ta]=வலை உலாவி
+@@ -77,7 +76,6 @@
+ GenericName[vi]=Trình duyệt Web
+ GenericName[wa]=Betchteu waibe
+ GenericName[xh]=Umkhangeli zincwadi we Web
+-GenericName[xx]=xxWeb Browserxx
+ GenericName[zh_CN]=网页æµè§ˆå™¨
+ GenericName[zh_TW]=ç¶²é ç€è¦½å™¨
+ GenericName[zu]=Umcingi we-Web
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/ethereal.desktop kdebase-branch-3.4/kappfinder/apps/Internet/ethereal.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/ethereal.desktop 2005-02-04 23:14:36.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/ethereal.desktop 2005-03-07 09:14:52.000000000 -0500
+@@ -9,7 +9,6 @@
+ Name[ta]=எதà¯à®°à®¿à®¯à®²à¯
+ Name[uk]=ЕфемерніÑть
+ Name[vi]=Ethereal
+-Name[xx]=xxEtherealxx
+ GenericName=Network Analyzer
+ GenericName[af]=Netwerk Analiseerder
+ GenericName[ar]=Ù…ØÙ„Ù„ الشبكة
+@@ -77,7 +76,6 @@
+ GenericName[vi]=Trình phân tÃch mạng
+ GenericName[wa]=Analijheu rantoele
+ GenericName[xh]=Umcukucezi Womsebenzi womnatha
+-GenericName[xx]=xxNetwork Analyzerxx
+ GenericName[zh_CN]=网络分æžç¨‹åº
+ GenericName[zh_TW]=網路分æžç¨‹å¼
+ GenericName[zu]=Umhloli Woxhumano olusakazekile
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/gFTP.desktop kdebase-branch-3.4/kappfinder/apps/Internet/gFTP.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/gFTP.desktop 2005-02-23 00:05:28.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/gFTP.desktop 2005-03-30 01:47:40.000000000 -0500
+@@ -6,17 +6,19 @@
+ Name[eo]=G-Ftp
+ Name[fr]=GFTP
+ Name[hi]=जीà¤à¤«à¤Ÿà¥€à¤ªà¥€
+-Name[xx]=xxgFTPxx
+ GenericName=FTP Browser
+ GenericName[bg]=Браузър FTP
+ GenericName[bn]=à¦à¦«-টি-পি বà§à¦°à¦¾à¦‰à¦œà¦¾à¦°
+ GenericName[br]=Furcher FTP
++GenericName[bs]=FTP preglednik
+ GenericName[ca]=Fullejador FTP
+ GenericName[cs]=FTP prohlÞeÄ
+ GenericName[da]=FTP-Browser
+ GenericName[de]=FTP-Browser
++GenericName[el]=ΠεÏιηγητής FTP
+ GenericName[es]=Navegador FTP
+ GenericName[et]=FTP lehitseja
++GenericName[eu]=FTP arakatzailea
+ GenericName[fi]=FTP-selain
+ GenericName[fr]=Navigateur FTP
+ GenericName[fy]=FTP-blêdzjer
+@@ -25,6 +27,7 @@
+ GenericName[hu]=FTP-böngésző
+ GenericName[is]=FTP vafri
+ GenericName[it]=Browser FTP
++GenericName[ja]=FTPブラウザ
+ GenericName[lt]=FTP naršyklė
+ GenericName[nb]=FTP-leser
+ GenericName[nl]=FTP-browser
+@@ -34,13 +37,13 @@
+ GenericName[pt_BR]=Navegador FTP
+ GenericName[ru]=FTP-браузер
+ GenericName[se]=FTP-logan
++GenericName[sk]=FTP prehliadaÄ
+ GenericName[sl]=Brskalnik po FTP
+ GenericName[sr]=FTP прегледач
+-GenericName[sr@Latn]=FTP прегледач
++GenericName[sr@Latn]=FTP pregledaÄ
+ GenericName[sv]=FTP-bläddrare
+ GenericName[ta]=எஃபà¯à®Ÿà®¿à®ªà®¿ உலாவி
+ GenericName[uk]=Ðавігатор FTP
+-GenericName[xx]=xxFTP Browserxx
+ Exec=gftp
+ Terminal=false
+ Icon=gftp.xpm
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/gaim.desktop kdebase-branch-3.4/kappfinder/apps/Internet/gaim.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/gaim.desktop 2005-02-10 23:51:43.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/gaim.desktop 2005-03-10 11:05:09.000000000 -0500
+@@ -7,8 +7,8 @@
+ Name[mn]=ГÐЙМ
+ Name[pa]=ਗਾਈਮ
+ Name[ta]=விளையாடà¯à®Ÿà¯à®•ளà¯
+-Name[xx]=xxGaimxx
+ GenericName=Instant Messenger
++GenericName[af]=Oombliklike Boodskapper
+ GenericName[ar]=مراسلة Ùورية
+ GenericName[az]=Canlı İsmarışlaşma Vasitəsi
+ GenericName[bg]=Програма за чат
+@@ -58,7 +58,6 @@
+ GenericName[uk]=Кур'єр повідомлень
+ GenericName[uz]=Хабар алмашиш воÑитаÑи
+ GenericName[vi]=Trình hội thoại trực tuyến
+-GenericName[xx]=xxInstant Messengerxx
+ GenericName[zh_CN]=峿—¶æ¶ˆæ¯ç¨‹åº
+ Exec=gaim
+ Terminal=false
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/gnomemeeting.desktop kdebase-branch-3.4/kappfinder/apps/Internet/gnomemeeting.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/gnomemeeting.desktop 2005-02-10 23:51:43.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/gnomemeeting.desktop 2005-03-07 09:14:52.000000000 -0500
+@@ -11,7 +11,6 @@
+ Name[ta]=தொலை மாநாடà¯
+ Name[tg]=Дидори Gnome
+ Name[ven]=Mutangano wa Gnome
+-Name[xx]=xxGnomeMeetingxx
+ Name[zu]=Umhlangano we-Gnome
+ GenericName=Video Conferencing
+ GenericName[ar]=مؤتمر Ùيديوي
+@@ -72,7 +71,6 @@
+ GenericName[ven]=Mutangano wa Vidio
+ GenericName[vi]=Trình há»™i há»p Video
+ GenericName[wa]=Conferince videyo
+-GenericName[xx]=xxVideo Conferencingxx
+ GenericName[zh_CN]=视频会议
+ GenericName[zh_TW]=視訊會è°
+ Exec=gnomemeeting
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/gnometalk.desktop kdebase-branch-3.4/kappfinder/apps/Internet/gnometalk.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/gnometalk.desktop 2004-12-29 12:52:33.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/gnometalk.desktop 2005-03-07 09:14:52.000000000 -0500
+@@ -27,7 +27,6 @@
+ Name[ven]=Nyambo ya GNOME
+ Name[wa]=Cliyint «talk» di GNOME
+ Name[xh]=Intetho yeGNOME
+-Name[xx]=xxGNOME Talkxx
+ Name[zu]=Inkulumo ye-GNOME
+ Exec=gtalk
+ Terminal=false
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/gtelnet.desktop kdebase-branch-3.4/kappfinder/apps/Internet/gtelnet.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/gtelnet.desktop 2005-02-23 00:05:28.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/gtelnet.desktop 2005-03-30 01:47:40.000000000 -0500
+@@ -28,16 +28,18 @@
+ Name[ven]=Vhukwamani ha GNOME
+ Name[wa]=Cliyint telnet di GNOME
+ Name[xh]=ITelnet yeGNOME
+-Name[xx]=xxGNOME Telnetxx
+ GenericName=Remote Access
+ GenericName[bg]=Отдалечен доÑтъп
+ GenericName[bn]=রিমোট অà§à¦¯à¦¾à¦•সেস
++GenericName[bs]=Udaljeni pristup
+ GenericName[ca]=Accés remot
+ GenericName[cs]=Vzdálený pÅ™Ãstup
+ GenericName[da]=Fjernadgang
+ GenericName[de]=Zugriff auf Fremdrechner
++GenericName[el]=ΕÏγαλείο απομακÏυσμÎνης Ï€Ïόσβασης
+ GenericName[es]=Acceso remoto
+ GenericName[et]=Kaugligipääs
++GenericName[eu]=Urruneko sarbidea
+ GenericName[fi]=Etäkäyttötyökalu
+ GenericName[fr]=Accès distant
+ GenericName[fy]=Eksterne tagong
+@@ -46,6 +48,7 @@
+ GenericName[hu]=Telnet-kliens
+ GenericName[is]=Fjarlægur aðgangur
+ GenericName[it]=Accesso remoto
++GenericName[ja]=リモートアクセスツール
+ GenericName[lt]=Nutolęs prisijungimas
+ GenericName[nb]=Ekstern innlogging
+ GenericName[nl]=Externe toegang
+@@ -55,13 +58,13 @@
+ GenericName[pt_BR]=Acesso Remoto
+ GenericName[ru]=Удаленный доÑтуп
+ GenericName[se]=Gáiddus beassan
++GenericName[sk]=Vzdialený prÃstup
+ GenericName[sl]=Oddaljeni dostop
+ GenericName[sr]=Удаљени приÑтуп
+-GenericName[sr@Latn]=Удаљени приÑтуп
++GenericName[sr@Latn]=Udaljeni pristup
+ GenericName[sv]=Fjärråtkomst
+ GenericName[ta]=தொலைதூர அணà¯à®•லà¯
+ GenericName[uk]=Віддалений доÑтуп
+-GenericName[xx]=xxRemote Accessxx
+ Exec=gnome-telnet
+ Terminal=false
+ Icon=gnome-telnet.xpm
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/ickle.desktop kdebase-branch-3.4/kappfinder/apps/Internet/ickle.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/ickle.desktop 2005-02-23 00:05:28.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/ickle.desktop 2005-03-30 01:47:40.000000000 -0500
+@@ -11,14 +11,15 @@
+ Name[sv]=Ickle
+ Name[ta]=à®à®šà®¿à®•லà¯
+ Name[vi]=icker
+-Name[xx]=xxicklexx
+ GenericName=ICQ2000 Chat
+ GenericName[bg]=Клиент за ICQ2000
+ GenericName[bn]=আই-সি-কিউ ২০০০ আডà§à¦¡à¦¾
++GenericName[bs]=ICQ2000 chat
+ GenericName[ca]=Xat ICQ2000
+ GenericName[cs]=ICQ2000 chat
+ GenericName[da]=ICQ2000-chat
+ GenericName[de]=ICQ2000-Programm
++GenericName[el]=Πελάτης συζήτησης ICQ2000
+ GenericName[es]=Cliente ICQ2000
+ GenericName[et]=ICQ2000 vestlus
+ GenericName[fi]=ICQ2000 chat-keskusteluohjelma
+@@ -28,6 +29,7 @@
+ GenericName[hu]=ICQ2000-kliens
+ GenericName[is]=ICQ2000 spjall
+ GenericName[it]=Chat ICQ2000
++GenericName[ja]=ICQ2000クライアント
+ GenericName[lt]=ICQ2000 pokalbiai
+ GenericName[nb]=Prateprogrammet ICQ2000
+ GenericName[nl]=ICQ2000-chat
+@@ -37,12 +39,12 @@
+ GenericName[pt_BR]=ICQ2000
+ GenericName[ru]=Клиент ICQ2000
+ GenericName[se]=ICQ2000-Äátta
++GenericName[sk]=ICQ2000 klient
+ GenericName[sl]=Klepet ICQ2000
+ GenericName[sr]=ICQ2000 ћаÑкање
+-GenericName[sr@Latn]=ICQ2000 ћаÑкање
++GenericName[sr@Latn]=ICQ2000 ćaskanje
+ GenericName[sv]=ICQ2000-chatt
+ GenericName[ta]=ICQ2000 அரடà¯à®Ÿà¯ˆ
+ GenericName[uk]=Балачка ICQ2000
+-GenericName[xx]=xxICQ2000 Chatxx
+ Terminal=false
+ Type=Application
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/knews.desktop kdebase-branch-3.4/kappfinder/apps/Internet/knews.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/knews.desktop 2005-02-10 23:51:43.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/knews.desktop 2005-03-07 09:14:52.000000000 -0500
+@@ -20,7 +20,6 @@
+ Name[th]=ข่าว - K
+ Name[ven]=Mafhungo a K
+ Name[wa]=Noveles di KDE
+-Name[xx]=xxKNewsxx
+ GenericName=Usenet News Reader
+ GenericName[af]=Usenet Nuus Leser
+ GenericName[ar]=قارئ أخبار Usenet
+@@ -87,7 +86,6 @@
+ GenericName[vi]=Trình Ä‘á»c News
+ GenericName[wa]=Lijheu d'Â copinreyes (usenet)
+ GenericName[xh]=Umfundi Weendaba we Usenet
+-GenericName[xx]=xxUsenet News Readerxx
+ GenericName[zh_CN]=新闻阅读程åº
+ GenericName[zh_TW]=æ–°èžç¾¤çµ„閱讀程å¼
+ GenericName[zu]=Umfundi wezindaba zokusebenza kwe-net
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/licq.desktop kdebase-branch-3.4/kappfinder/apps/Internet/licq.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/licq.desktop 2005-02-23 00:05:28.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/licq.desktop 2005-03-22 12:38:01.000000000 -0500
+@@ -7,15 +7,16 @@
+ Name[fa]=لیسک
+ Name[hi]=à¤à¤²à¤†à¤ˆà¤¸à¥€à¤•à¥à¤¯à¥‚
+ Name[pa]=ਲੀਕਿਉ
+-Name[xx]=xxLicqxx
+ GenericName=ICQ Messenger
+ GenericName[bg]=Програма за чат (ICQ)
+ GenericName[bn]=আই-সি-কিউ মেসেঞà§à¦œà¦¾à¦°
++GenericName[bs]=ICQ instant poruke
+ GenericName[ca]=Missatgeria ICQ
+ GenericName[cs]=ICQ komunikátor
+ GenericName[da]=ICQ-Messenger
+ GenericName[de]=ICQ-Messenger
+ GenericName[es]=MensajerÃa instantánea ICQ
++GenericName[eu]=ICQ mezularitza
+ GenericName[fi]=ICQ-pikaviestintäohjelma
+ GenericName[fr]=Messagerie ICQ
+ GenericName[fy]=ICQ-messenger
+@@ -23,6 +24,7 @@
+ GenericName[hu]=ICQ üzenetküldő
+ GenericName[is]=ICQ spjallforrit
+ GenericName[it]=Messaggistica ICQ
++GenericName[ja]=ICQメッセンジャー
+ GenericName[lt]=ICQ žinuÄių klientas
+ GenericName[nb]=Prateprogrammet ICQ
+ GenericName[nl]=ICQ-messenger
+@@ -32,13 +34,13 @@
+ GenericName[pt_BR]=ICQ
+ GenericName[ru]=Клиент ICQ
+ GenericName[se]=ICQ-šleađgadiehti
++GenericName[sk]=ICQ
+ GenericName[sl]=SporoÄilnik ICQ
+ GenericName[sr]=ICQ глаÑник
+-GenericName[sr@Latn]=ICQ глаÑник
++GenericName[sr@Latn]=ICQ glasnik
+ GenericName[sv]=ICQ-meddelandeklient
+ GenericName[ta]=ICQ செயà¯à®¤à®¿à®¯à®¾à®³à®°à¯
+ GenericName[uk]=Кур'єр (messenger) ICQ
+-GenericName[xx]=xxICQ Messengerxx
+ Path=
+ Terminal=false
+ Type=Application
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/mldonkey_gui.desktop kdebase-branch-3.4/kappfinder/apps/Internet/mldonkey_gui.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/mldonkey_gui.desktop 2005-02-10 23:51:43.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/mldonkey_gui.desktop 2005-03-22 12:38:01.000000000 -0500
+@@ -17,7 +17,7 @@
+ Name[hi]=à¤à¤®à¤à¤²à¤¡à¤‚की जीटीके+ कोर नियंतà¥à¤°à¤•
+ Name[hr]=MLDonkey GTK+ Središnji kontroler
+ Name[hu]=MLDonkey GTK+ vezérlőprogram
+-Name[it]=Controllo GTK+ di MLDonkey
++Name[it]=Controllo GTK+ di MLDonkey
+ Name[ja]=MLDonkey GTK+ コアコントãƒãƒ¼ãƒ©
+ Name[lt]=MLDonkey GTK+ pagrindinis kontroleris
+ Name[nds]=Karn-Kuntrull för MLDonkey/GTK+
+@@ -35,7 +35,6 @@
+ Name[tg]=MLDonkey GTK+ Контрол кунандаи аÑлӣ
+ Name[tr]=MLDonkey GTK+ Denetleyicisi
+ Name[vi]=MLDonkey GTK+ Lõi bộ điểu khiển
+-Name[xx]=xxMLDonkey GTK+ Core Controllerxx
+ Name[zh_CN]=MLDonkey GTK+ æ ¸å¿ƒæŽ§åˆ¶å™¨
+ Name[zh_TW]=MLDonkey GTK+ æ ¸å¿ƒæŽ§åˆ¶å™¨
+ GenericName=MLDonkey GUI
+@@ -72,7 +71,6 @@
+ GenericName[uk]=Ð†Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð´Ð»Ñ MLDonkey
+ GenericName[uz]=MLDonkey учун график интерфейÑ
+ GenericName[wa]=Eterface grafike po MLDonkey
+-GenericName[xx]=xxMLDonkey GUIxx
+ GenericName[zh_TW]=MLDonkey 圖型使用者介é¢
+ Terminal=false
+ Type=Application
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/mozilla-firebird.desktop kdebase-branch-3.4/kappfinder/apps/Internet/mozilla-firebird.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/mozilla-firebird.desktop 2005-02-23 00:05:28.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/mozilla-firebird.desktop 2005-03-07 09:14:52.000000000 -0500
+@@ -13,7 +13,6 @@
+ Name[pa]=ਮੌਜੀਲਾ ਫਾਇਰਬਰਡ
+ Name[ta]=மொசிலà¯à®²à®¾ ஃபயரà¯à®ªà¯‡à®°à¯à®Ÿà¯
+ Name[tg]=Мозиллаи паррандаи аловӣ
+-Name[xx]=xxMozilla Firebirdxx
+ GenericName=Web Browser
+ GenericName[af]=Web Blaaier
+ GenericName[ar]=Ù…ØªØµÙØ ويب
+@@ -67,7 +66,7 @@
+ GenericName[sk]=Webový prehliadaÄ
+ GenericName[sl]=Spletni brskalnik
+ GenericName[sr]=Веб прегледач
+-GenericName[sr@Latn]=Veb pretraživaÄ
++GenericName[sr@Latn]=Veb pregledaÄ
+ GenericName[ss]=Ibrawuza yeWeb
+ GenericName[sv]=Webbläsare
+ GenericName[ta]=வலை உலாவி
+@@ -80,7 +79,6 @@
+ GenericName[vi]=Trình duyệt Web
+ GenericName[wa]=Betchteu waibe
+ GenericName[xh]=Umkhangeli zincwadi we Web
+-GenericName[xx]=xxWeb Browserxx
+ GenericName[zh_CN]=网页æµè§ˆå™¨
+ GenericName[zh_TW]=ç¶²é ç€è¦½å™¨
+ GenericName[zu]=Umcingi we-Web
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/mozilla-firefox.desktop kdebase-branch-3.4/kappfinder/apps/Internet/mozilla-firefox.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/mozilla-firefox.desktop 2005-02-23 00:05:28.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/mozilla-firefox.desktop 2005-03-07 09:14:52.000000000 -0500
+@@ -9,7 +9,6 @@
+ Name[fi]=Mozilla Firefox
+ Name[hi]=फ़ायरफॉकà¥à¤¸
+ Name[pa]=ਫਾਇਰਫੋਕਸ
+-Name[xx]=xxFirefoxxx
+ GenericName=Web Browser
+ GenericName[af]=Web Blaaier
+ GenericName[ar]=Ù…ØªØµÙØ ويب
+@@ -63,7 +62,7 @@
+ GenericName[sk]=Webový prehliadaÄ
+ GenericName[sl]=Spletni brskalnik
+ GenericName[sr]=Веб прегледач
+-GenericName[sr@Latn]=Veb pretraživaÄ
++GenericName[sr@Latn]=Veb pregledaÄ
+ GenericName[ss]=Ibrawuza yeWeb
+ GenericName[sv]=Webbläsare
+ GenericName[ta]=வலை உலாவி
+@@ -76,7 +75,6 @@
+ GenericName[vi]=Trình duyệt Web
+ GenericName[wa]=Betchteu waibe
+ GenericName[xh]=Umkhangeli zincwadi we Web
+-GenericName[xx]=xxWeb Browserxx
+ GenericName[zh_CN]=网页æµè§ˆå™¨
+ GenericName[zh_TW]=ç¶²é ç€è¦½å™¨
+ GenericName[zu]=Umcingi we-Web
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/mozilla-thunderbird.desktop kdebase-branch-3.4/kappfinder/apps/Internet/mozilla-thunderbird.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/mozilla-thunderbird.desktop 2005-02-18 23:26:58.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/mozilla-thunderbird.desktop 2005-03-30 01:47:40.000000000 -0500
+@@ -5,11 +5,11 @@
+ Type=Application
+ Name=Thunderbird
+ Name[bn]=থাণà§à¦¡à¦¾à¦°à¦¬à¦¾à¦°à§à¦¡
++Name[el]=Mozilla Thunderbird
+ Name[eo]=Mozilo Tondrobirdo
+ Name[fi]=Mozilla Thunderbird
+ Name[hi]=थंडरबरà¥à¤¡
+ Name[pa]=ਥੰਡਰਬਰਡ
+-Name[xx]=xxThunderbirdxx
+ GenericName=Mail Client
+ GenericName[af]=Pos Kliënt
+ GenericName[ar]=البريد الألكتروني
+@@ -17,7 +17,7 @@
+ GenericName[be]=Паштовы кліент
+ GenericName[bg]=ПощенÑки клиент
+ GenericName[bn]=ইমেইল কà§à¦²à¦¾à§Ÿà§‡à¦¨à§à¦Ÿ
+-GenericName[br]=Arval postel
++GenericName[br]=Kliant postel
+ GenericName[bs]=Program za Äitanje elektronske poÅ¡te
+ GenericName[ca]=Client de correu electrònic
+ GenericName[cs]=Klient pro Ätenà elektronické poÅ¡ty
+@@ -79,7 +79,6 @@
+ GenericName[ven]=Mushumisani na poso
+ GenericName[wa]=Cliyint d'Â emilaedje
+ GenericName[xh]=Umxhasi Weposi
+-GenericName[xx]=xxMail Clientxx
+ GenericName[zh_CN]=邮件程åº
+ GenericName[zh_TW]=郵件處ç†ç¨‹å¼
+ GenericName[zu]=Umxhasi weposi
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/mozilla.desktop kdebase-branch-3.4/kappfinder/apps/Internet/mozilla.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/mozilla.desktop 2005-02-23 00:05:28.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/mozilla.desktop 2005-03-07 09:14:52.000000000 -0500
+@@ -57,7 +57,7 @@
+ GenericName[sk]=Webový prehliadaÄ
+ GenericName[sl]=Spletni brskalnik
+ GenericName[sr]=Веб прегледач
+-GenericName[sr@Latn]=Veb pretraživaÄ
++GenericName[sr@Latn]=Veb pregledaÄ
+ GenericName[ss]=Ibrawuza yeWeb
+ GenericName[sv]=Webbläsare
+ GenericName[ta]=வலை உலாவி
+@@ -70,7 +70,6 @@
+ GenericName[vi]=Trình duyệt Web
+ GenericName[wa]=Betchteu waibe
+ GenericName[xh]=Umkhangeli zincwadi we Web
+-GenericName[xx]=xxWeb Browserxx
+ GenericName[zh_CN]=网页æµè§ˆå™¨
+ GenericName[zh_TW]=ç¶²é ç€è¦½å™¨
+ GenericName[zu]=Umcingi we-Web
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/netscape.desktop kdebase-branch-3.4/kappfinder/apps/Internet/netscape.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/netscape.desktop 2005-02-23 00:05:28.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/netscape.desktop 2005-03-07 09:14:52.000000000 -0500
+@@ -15,7 +15,6 @@
+ Name[ta]=நெடà¯à®¸à¯à®•ேபà¯
+ Name[th]=เน็ตสเคป
+ Name[vi]=Netscape
+-Name[xx]=xxNetscapexx
+ GenericName=Web Browser
+ GenericName[af]=Web Blaaier
+ GenericName[ar]=Ù…ØªØµÙØ ويب
+@@ -69,7 +68,7 @@
+ GenericName[sk]=Webový prehliadaÄ
+ GenericName[sl]=Spletni brskalnik
+ GenericName[sr]=Веб прегледач
+-GenericName[sr@Latn]=Veb pretraživaÄ
++GenericName[sr@Latn]=Veb pregledaÄ
+ GenericName[ss]=Ibrawuza yeWeb
+ GenericName[sv]=Webbläsare
+ GenericName[ta]=வலை உலாவி
+@@ -82,7 +81,6 @@
+ GenericName[vi]=Trình duyệt Web
+ GenericName[wa]=Betchteu waibe
+ GenericName[xh]=Umkhangeli zincwadi we Web
+-GenericName[xx]=xxWeb Browserxx
+ GenericName[zh_CN]=网页æµè§ˆå™¨
+ GenericName[zh_TW]=ç¶²é ç€è¦½å™¨
+ GenericName[zu]=Umcingi we-Web
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/netscape6.desktop kdebase-branch-3.4/kappfinder/apps/Internet/netscape6.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/netscape6.desktop 2005-02-23 00:05:28.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/netscape6.desktop 2005-03-07 09:14:53.000000000 -0500
+@@ -27,7 +27,6 @@
+ Name[ta]=நெடà¯à®¸à¯à®•ேபà¯6
+ Name[th]=เน็ตสเคป 6
+ Name[wa]=Netscape 6
+-Name[xx]=xxNetscape6xx
+ GenericName=Web Browser
+ GenericName[af]=Web Blaaier
+ GenericName[ar]=Ù…ØªØµÙØ ويب
+@@ -81,7 +80,7 @@
+ GenericName[sk]=Webový prehliadaÄ
+ GenericName[sl]=Spletni brskalnik
+ GenericName[sr]=Веб прегледач
+-GenericName[sr@Latn]=Veb pretraživaÄ
++GenericName[sr@Latn]=Veb pregledaÄ
+ GenericName[ss]=Ibrawuza yeWeb
+ GenericName[sv]=Webbläsare
+ GenericName[ta]=வலை உலாவி
+@@ -94,7 +93,6 @@
+ GenericName[vi]=Trình duyệt Web
+ GenericName[wa]=Betchteu waibe
+ GenericName[xh]=Umkhangeli zincwadi we Web
+-GenericName[xx]=xxWeb Browserxx
+ GenericName[zh_CN]=网页æµè§ˆå™¨
+ GenericName[zh_TW]=ç¶²é ç€è¦½å™¨
+ GenericName[zu]=Umcingi we-Web
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/opera.desktop kdebase-branch-3.4/kappfinder/apps/Internet/opera.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/opera.desktop 2005-02-23 00:05:28.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/opera.desktop 2005-03-07 09:14:53.000000000 -0500
+@@ -11,7 +11,6 @@
+ Name[pa]=ਓਪਰਾ
+ Name[ta]=ஓபேரா
+ Name[th]=โà¸à¹€à¸›à¸£à¸²
+-Name[xx]=xxOperaxx
+ GenericName=Web Browser
+ GenericName[af]=Web Blaaier
+ GenericName[ar]=Ù…ØªØµÙØ ويب
+@@ -65,7 +64,7 @@
+ GenericName[sk]=Webový prehliadaÄ
+ GenericName[sl]=Spletni brskalnik
+ GenericName[sr]=Веб прегледач
+-GenericName[sr@Latn]=Veb pretraživaÄ
++GenericName[sr@Latn]=Veb pregledaÄ
+ GenericName[ss]=Ibrawuza yeWeb
+ GenericName[sv]=Webbläsare
+ GenericName[ta]=வலை உலாவி
+@@ -78,7 +77,6 @@
+ GenericName[vi]=Trình duyệt Web
+ GenericName[wa]=Betchteu waibe
+ GenericName[xh]=Umkhangeli zincwadi we Web
+-GenericName[xx]=xxWeb Browserxx
+ GenericName[zh_CN]=网页æµè§ˆå™¨
+ GenericName[zh_TW]=ç¶²é ç€è¦½å™¨
+ GenericName[zu]=Umcingi we-Web
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/xbiff.desktop kdebase-branch-3.4/kappfinder/apps/Internet/xbiff.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/xbiff.desktop 2005-02-04 23:14:37.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/xbiff.desktop 2005-03-07 09:14:53.000000000 -0500
+@@ -18,7 +18,6 @@
+ Name[ta]=X பிஃபà¯
+ Name[uk]=X-Biff
+ Name[vi]=X Biff
+-Name[xx]=xxX Biffxx
+ GenericName=Mail Alert
+ GenericName[af]=Pos Waarskuwing
+ GenericName[ar]=منبه للبريد الألكتروني
+@@ -84,7 +83,6 @@
+ GenericName[vi]=Báo động Mail
+ GenericName[wa]=Abranle pa emile
+ GenericName[xh]=Ulumkiso Lweposi
+-GenericName[xx]=xxMail Alertxx
+ GenericName[zh_CN]=邮件æç¤ºç¨‹åº
+ GenericName[zh_TW]=郵件æç¤º
+ GenericName[zu]=Ukuqwashisa ngeposi
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/xchat.desktop kdebase-branch-3.4/kappfinder/apps/Internet/xchat.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/xchat.desktop 2005-02-23 00:05:28.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/xchat.desktop 2005-03-30 01:47:40.000000000 -0500
+@@ -18,15 +18,16 @@
+ Name[tr]=XChart
+ Name[ven]=Nyambedzano ya X
+ Name[vi]=XChat
+-Name[xx]=xxXChatxx
+ Name[zu]=I-XChat
+ GenericName=IRC Chat
+ GenericName[bg]=Клиент за IRC
+ GenericName[bn]=আই-আর-সি আডà§à¦¡à¦¾
++GenericName[bs]=IRC chat
+ GenericName[ca]=Xat IRC
+ GenericName[cs]=IRC chat
+ GenericName[da]=IRC-chat
+ GenericName[de]=IRC-Chat
++GenericName[el]=Πελάτης συζήτησης IRC
+ GenericName[es]=Cliente IRC
+ GenericName[et]=IRC vestlus
+ GenericName[fi]=IRC-asiakasohjelma
+@@ -36,6 +37,7 @@
+ GenericName[hu]=IRC-kliens
+ GenericName[is]=IRC spjall
+ GenericName[it]=Chat IRC
++GenericName[ja]=IRCãƒãƒ£ãƒƒãƒˆ
+ GenericName[lt]=IRC pokalbiai
+ GenericName[nb]=Prateprogram
+ GenericName[nl]=IRC-chat
+@@ -45,11 +47,11 @@
+ GenericName[pt_BR]=Cliente IRC
+ GenericName[ru]=Клиент IRC
+ GenericName[se]=IRC-Äátta
++GenericName[sk]=IRC klient
+ GenericName[sl]=Klepet IRC
+ GenericName[sr]=IRC ћаÑкање
+-GenericName[sr@Latn]=IRC ћаÑкање
++GenericName[sr@Latn]=IRC ćaskanje
+ GenericName[sv]=IRC-chatt
+ GenericName[ta]=IRC அரடà¯à®Ÿà¯ˆ
+ GenericName[uk]=Балачка IRC
+-GenericName[xx]=xxIRC Chatxx
+
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/xfmail.desktop kdebase-branch-3.4/kappfinder/apps/Internet/xfmail.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/xfmail.desktop 2005-02-23 00:05:28.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/xfmail.desktop 2005-03-16 03:32:42.000000000 -0500
+@@ -18,7 +18,6 @@
+ Name[ta]=XFமினà¯à®©à®žà¯à®šà®²à¯
+ Name[ven]=Poso ya XF
+ Name[vi]=XFMail
+-Name[xx]=xxXFMailxx
+ Name[zu]=Iposi ye-XF
+ GenericName=Mail Client
+ GenericName[af]=Pos Kliënt
+@@ -27,7 +26,7 @@
+ GenericName[be]=Паштовы кліент
+ GenericName[bg]=ПощенÑки клиент
+ GenericName[bn]=ইমেইল কà§à¦²à¦¾à§Ÿà§‡à¦¨à§à¦Ÿ
+-GenericName[br]=Arval postel
++GenericName[br]=Kliant postel
+ GenericName[bs]=Program za Äitanje elektronske poÅ¡te
+ GenericName[ca]=Client de correu electrònic
+ GenericName[cs]=Klient pro Ätenà elektronické poÅ¡ty
+@@ -89,7 +88,6 @@
+ GenericName[ven]=Mushumisani na poso
+ GenericName[wa]=Cliyint d'Â emilaedje
+ GenericName[xh]=Umxhasi Weposi
+-GenericName[xx]=xxMail Clientxx
+ GenericName[zh_CN]=邮件程åº
+ GenericName[zh_TW]=郵件處ç†ç¨‹å¼
+ GenericName[zu]=Umxhasi weposi
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Internet/xftp.desktop kdebase-branch-3.4/kappfinder/apps/Internet/xftp.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Internet/xftp.desktop 2005-02-23 00:05:28.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Internet/xftp.desktop 2005-03-30 01:47:40.000000000 -0500
+@@ -14,18 +14,20 @@
+ Name[se]=X-FTP
+ Name[uk]=X-FTP
+ Name[vi]=X FTP
+-Name[xx]=xxX FTPxx
+ MimeType=
+ GenericName=FTP Browser
+ GenericName[bg]=Браузър FTP
+ GenericName[bn]=à¦à¦«-টি-পি বà§à¦°à¦¾à¦‰à¦œà¦¾à¦°
+ GenericName[br]=Furcher FTP
++GenericName[bs]=FTP preglednik
+ GenericName[ca]=Fullejador FTP
+ GenericName[cs]=FTP prohlÞeÄ
+ GenericName[da]=FTP-Browser
+ GenericName[de]=FTP-Browser
++GenericName[el]=ΠεÏιηγητής FTP
+ GenericName[es]=Navegador FTP
+ GenericName[et]=FTP lehitseja
++GenericName[eu]=FTP arakatzailea
+ GenericName[fi]=FTP-selain
+ GenericName[fr]=Navigateur FTP
+ GenericName[fy]=FTP-blêdzjer
+@@ -34,6 +36,7 @@
+ GenericName[hu]=FTP-böngésző
+ GenericName[is]=FTP vafri
+ GenericName[it]=Browser FTP
++GenericName[ja]=FTPブラウザ
+ GenericName[lt]=FTP naršyklė
+ GenericName[nb]=FTP-leser
+ GenericName[nl]=FTP-browser
+@@ -43,13 +46,13 @@
+ GenericName[pt_BR]=Navegador FTP
+ GenericName[ru]=FTP-браузер
+ GenericName[se]=FTP-logan
++GenericName[sk]=FTP prehliadaÄ
+ GenericName[sl]=Brskalnik po FTP
+ GenericName[sr]=FTP прегледач
+-GenericName[sr@Latn]=FTP прегледач
++GenericName[sr@Latn]=FTP pregledaÄ
+ GenericName[sv]=FTP-bläddrare
+ GenericName[ta]=எஃபà¯à®Ÿà®¿à®ªà®¿ உலாவி
+ GenericName[uk]=Ðавігатор FTP
+-GenericName[xx]=xxFTP Browserxx
+ Exec=xftp
+ Icon=xapp
+ Path=
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Multimedia/Aumix.desktop kdebase-branch-3.4/kappfinder/apps/Multimedia/Aumix.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Multimedia/Aumix.desktop 2005-02-23 00:05:29.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Multimedia/Aumix.desktop 2005-03-07 09:14:55.000000000 -0500
+@@ -7,7 +7,6 @@
+ Name[fa]=آیومیکس
+ Name[hi]=ऑमिकà¥à¤¸
+ Name[pa]=ਊਮਿਕਸ
+-Name[xx]=xxAumixxx
+ GenericName=Audio Mixer
+ GenericName[af]=Audio Menger
+ GenericName[ar]=مازج الصوت
+@@ -72,7 +71,6 @@
+ GenericName[vi]=Bộ hoà âm
+ GenericName[wa]=Maxheu d'Â son
+ GenericName[xh]=Umxubi Wokuvakalayo
+-GenericName[xx]=xxAudio Mixerxx
+ GenericName[zh_CN]=混音器
+ GenericName[zh_TW]=混音程å¼
+ GenericName[zu]=Umxubi Womsindo
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Multimedia/Grip.desktop kdebase-branch-3.4/kappfinder/apps/Multimedia/Grip.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Multimedia/Grip.desktop 2005-02-23 00:05:29.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Multimedia/Grip.desktop 2005-03-07 09:14:55.000000000 -0500
+@@ -11,7 +11,6 @@
+ Name[ta]=கிரà¯à®ªà¯
+ Name[tr]=CD Çalıcı ve Aktarıcı
+ Name[ven]=Ombelele
+-Name[xx]=xxGripxx
+ Name[zu]=Bamba
+ GenericName=CD Player/Ripper
+ GenericName[af]=Cd Speler/Ripper
+@@ -74,7 +73,6 @@
+ GenericName[vi]=Một trình chơi/rip đĩa CD
+ GenericName[wa]=Djouweu/copieu di plakes lazer
+ GenericName[xh]=Umdlali we CD/Umsiki
+-GenericName[xx]=xxCD Player/Ripperxx
+ GenericName[zh_CN]=CD æ’æ”¾/抓å–程åº
+ GenericName[zh_TW]=CD æ’æ”¾ç¨‹å¼/音軌擷å–程å¼
+ GenericName[zu]=Umdlali we-CD/Ripper
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Multimedia/MP3info.desktop kdebase-branch-3.4/kappfinder/apps/Multimedia/MP3info.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Multimedia/MP3info.desktop 2005-02-18 23:26:58.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Multimedia/MP3info.desktop 2005-03-30 01:47:41.000000000 -0500
+@@ -11,6 +11,7 @@
+ Name[cy]=Gwybodaeth MP3
+ Name[da]=MP3-info
+ Name[de]=MP3-Info
++Name[el]=ΠληÏοφοÏίες MP3
+ Name[eo]=MP3-informo
+ Name[es]=Información MP3
+ Name[et]=MP3 info
+@@ -36,14 +37,13 @@
+ Name[se]=MP3-dieđut
+ Name[sk]=MP3 info
+ Name[sr]=MP3 инфо
+-Name[sr@Latn]=MP3 инфо
++Name[sr@Latn]=MP3 info
+ Name[sv]=MP3 info
+ Name[tr]=MP3 Bilgisi
+ Name[uk]=Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ MP3
+ Name[uz]=MP3 ҳақида маълумот
+ Name[wa]=Informåcion MP3
+ Name[xh]=MP3 ulwazi
+-Name[xx]=xxMP3 Infoxx
+ Name[zh_CN]=MP3 ä¿¡æ¯
+ Name[zu]=Ulwazi lwe MP3
+ Exec=gmp3info
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Multimedia/XMovie.desktop kdebase-branch-3.4/kappfinder/apps/Multimedia/XMovie.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Multimedia/XMovie.desktop 2005-02-23 00:05:29.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Multimedia/XMovie.desktop 2005-03-07 09:14:55.000000000 -0500
+@@ -11,7 +11,6 @@
+ Name[sv]=Xmovie
+ Name[ta]=Xபடமà¯
+ Name[ven]=Muvi wa X
+-Name[xx]=xxXMoviexx
+ Name[zu]=I-XMovie
+ GenericName=Video Player
+ GenericName[af]=Video Speler
+@@ -81,7 +80,6 @@
+ GenericName[vi]=Trình xem Video
+ GenericName[wa]=Djouweu di fitchîs videyo
+ GenericName[xh]=Umdlali we Video
+-GenericName[xx]=xxVideo Playerxx
+ GenericName[zh_CN]=è§†é¢‘æ’æ”¾å™¨
+ GenericName[zh_TW]=è¦–åƒæª”æ’æ”¾ç¨‹å¼
+ GenericName[zu]=Umdlali we-Vidiyo
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Multimedia/alevt.desktop kdebase-branch-3.4/kappfinder/apps/Multimedia/alevt.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Multimedia/alevt.desktop 2005-02-23 00:05:29.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Multimedia/alevt.desktop 2005-03-07 09:14:55.000000000 -0500
+@@ -64,7 +64,6 @@
+ GenericName[vi]=Trình xem Video Text
+ GenericName[wa]=Håyneu di pådjes VideoText
+ GenericName[xh]=Umboniseli Wokubhaliweyo we Video
+-GenericName[xx]=xxVideoText Viewerxx
+ GenericName[zh_CN]=VideoText 查看程åº
+ GenericName[zh_TW]=VideoText 檢視器
+ GenericName[zu]=Umbukiisi Wombhalo we-Vidiyo
+@@ -74,5 +73,4 @@
+ Name[af]=Alevt
+ Name[hi]=à¤à¤à¤²à¤ˆà¤µà¥€à¤Ÿà¥€
+ Name[vi]=AleVT
+-Name[xx]=xxAleVTxx
+ Type=Application
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Multimedia/alsamixergui.desktop kdebase-branch-3.4/kappfinder/apps/Multimedia/alsamixergui.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Multimedia/alsamixergui.desktop 2005-02-23 00:05:29.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Multimedia/alsamixergui.desktop 2005-03-22 12:38:02.000000000 -0500
+@@ -9,7 +9,7 @@
+ Name[fr]=Console de mixage Alsa
+ Name[gl]=Mesturador Alsa
+ Name[hi]=अलà¥à¤¸à¤¾-मिकà¥à¤¸à¤°-जीयूआई
+-Name[it]=MixerAlsa
++Name[it]=GuiMixerAlsa
+ Name[lt]=AlsaMixer grafinÄ— vartotojo sÄ…saja
+ Name[nb]=AlsaMixer-grensesnitt
+ Name[nds]=ALSAMixer-Böversiet
+@@ -19,7 +19,6 @@
+ Name[sv]=Grafiskt gränssnitt till Alsa-mixer
+ Name[uk]=Ðудіомікшер Ð´Ð»Ñ ALSA
+ Name[wa]=Eterface grafike do maxheu d'Â son Alsa
+-Name[xx]=xxAlsaMixerGuixx
+ GenericName=Alsa Mixer Frontend
+ GenericName[az]=Alsa Mikser Ara Üzü
+ GenericName[bg]=Ðудио микÑер
+@@ -63,7 +62,7 @@
+ GenericName[sk]=Rozhranie pre zvukový mixér Alsa
+ GenericName[sl]=Vmesnik mešalnika Alsa
+ GenericName[sr]=Сучеље за Alsa микÑер
+-GenericName[sr@Latn]=Сучеље за Alsa микÑер
++GenericName[sr@Latn]=SuÄelje za Alsa mikser
+ GenericName[sv]=Gränssnitt till Alsa-mixer
+ GenericName[ta]=Alsa கலவை à®®à¯à®£à¯à®®à¯à®£à¯ˆ
+ GenericName[tg]=Ð˜Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð±Ð° микшери Alsa
+@@ -71,7 +70,6 @@
+ GenericName[uk]=Ð†Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð´Ð¾ аудіомікшеру Ð´Ð»Ñ ALSA
+ GenericName[uz]=ALSA микÑери учун график интерфейÑ
+ GenericName[wa]=Eterface do maxheu d'Â son Alsa
+-GenericName[xx]=xxAlsa Mixer Frontendxx
+ GenericName[zh_CN]=Alsa 混音器å‰ç«¯
+ StartupNotify=false
+ Type=Application
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Multimedia/audacity.desktop kdebase-branch-3.4/kappfinder/apps/Multimedia/audacity.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Multimedia/audacity.desktop 2005-02-23 00:05:29.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Multimedia/audacity.desktop 2005-03-07 09:14:55.000000000 -0500
+@@ -7,7 +7,6 @@
+ Name[eo]=AÅdaco
+ Name[hi]=आउडासिटी
+ Name[pa]=ਆਡੀਕਿਉਟੀ
+-Name[xx]=xxAudacityxx
+ GenericName=Audio Editor
+ GenericName[az]=Audio Editoru
+ GenericName[be]=Ð Ñдактар аўдыё
+@@ -55,7 +54,7 @@
+ GenericName[sk]=Zvukový editor
+ GenericName[sl]=Urejevalnik zvoka
+ GenericName[sr]=Ðудио уређивач
+-GenericName[sr@Latn]=Ðудио уређивач
++GenericName[sr@Latn]=Audio ureÄ‘ivaÄ
+ GenericName[sv]=Ljudeditor
+ GenericName[ta]=ஒலி திரà¯à®¤à¯à®¤à®¿
+ GenericName[tg]=Муҳаррири Ñадо
+@@ -63,7 +62,6 @@
+ GenericName[uk]=Редактор аудіо запиÑів
+ GenericName[uz]=Ðудио таҳрирчи
+ GenericName[wa]=Aspougneu d'Â sons
+-GenericName[xx]=xxAudio Editorxx
+ GenericName[zh_CN]=音频编辑器
+ StartupNotify=true
+ Type=Application
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Multimedia/aviplay.desktop kdebase-branch-3.4/kappfinder/apps/Multimedia/aviplay.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Multimedia/aviplay.desktop 2005-02-23 00:05:29.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Multimedia/aviplay.desktop 2005-03-07 09:14:55.000000000 -0500
+@@ -66,7 +66,6 @@
+ GenericName[vi]=Trình xem AVI
+ GenericName[wa]=Djouweu di videyos AVI
+ GenericName[xh]=Umdlali we Video AVI
+-GenericName[xx]=xxAVI Video Playerxx
+ GenericName[zh_CN]=AVI è§†é¢‘æ’æ”¾å™¨
+ GenericName[zh_TW]=AVI è¦–è¨Šæ’æ”¾ç¨‹å¼
+ GenericName[zu]=Umdlali we-Vidiyo ye-AVI
+@@ -83,7 +82,6 @@
+ Name[ven]=U tamba ha Avi
+ Name[vi]=Aviplay
+ Name[xh]=Umdlalo we Avi
+-Name[xx]=xxAviplayxx
+ Name[zu]=Umdlali we-Avi
+ ServiceTypes=
+ Type=Application
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Multimedia/bcast2000.desktop kdebase-branch-3.4/kappfinder/apps/Multimedia/bcast2000.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Multimedia/bcast2000.desktop 2005-02-23 00:05:29.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Multimedia/bcast2000.desktop 2005-03-07 09:14:55.000000000 -0500
+@@ -12,7 +12,6 @@
+ Name[ta]=ஒலிபரபà¯à®ªà¯ 2000
+ Name[ven]=Khasho ya 2000
+ Name[xh]=Usasazo 2000
+-Name[xx]=xxBroadcast 2000xx
+ Name[zh_TW]=廣撥 2000
+ Name[zu]=Ukusakaza 2000
+ GenericName=Audio and Video IDE
+@@ -80,7 +79,6 @@
+ GenericName[ven]=Zwauvhona na Zwaupfa zwa IDE
+ GenericName[vi]=Âm và Video IDE
+ GenericName[xh]=Isandi neVideo yeIDE
+-GenericName[xx]=xxAudio and Video IDExx
+ GenericName[zh_CN]=å½±éŸ³é›†æˆæ’放器
+ GenericName[zh_TW]=影音整åˆé–‹ç™¼ç’°å¢ƒ
+ GenericName[zu]=I-IDE Yokuzwakalayo kanye ne-Vidiyo ye IDE
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Multimedia/enjoympeg.desktop kdebase-branch-3.4/kappfinder/apps/Multimedia/enjoympeg.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Multimedia/enjoympeg.desktop 2005-02-23 00:05:29.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Multimedia/enjoympeg.desktop 2005-03-07 09:14:55.000000000 -0500
+@@ -12,7 +12,6 @@
+ Name[pa]=ਈਜੂਆà¨MPEG
+ Name[pl]=Ciesz siÄ™ MPEG
+ Name[ven]=Diphineni MPEG
+-Name[xx]=xxEnjoyMPEGxx
+ GenericName=MPEG Player
+ GenericName[af]=Mpeg Speler
+ GenericName[ar]=مشغل MPEG
+@@ -81,7 +80,6 @@
+ GenericName[vi]=Trình xem MPEG
+ GenericName[wa]=Djouweu di videyos MPEG
+ GenericName[xh]=Umdlali we MPEG
+-GenericName[xx]=xxMPEG Playerxx
+ GenericName[zh_CN]=MPEG æ’æ”¾å™¨
+ GenericName[zh_TW]=MPEG æ’æ”¾ç¨‹å¼
+ GenericName[zu]=Umdlali we-MPEG
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Multimedia/gtv.desktop kdebase-branch-3.4/kappfinder/apps/Multimedia/gtv.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Multimedia/gtv.desktop 2005-02-23 00:05:29.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Multimedia/gtv.desktop 2005-03-07 09:14:55.000000000 -0500
+@@ -68,7 +68,6 @@
+ GenericName[vi]=Trình xem MPEG
+ GenericName[wa]=Djouweu di videyos MPEG
+ GenericName[xh]=Umdlali we MPEG
+-GenericName[xx]=xxMPEG Playerxx
+ GenericName[zh_CN]=MPEG æ’æ”¾å™¨
+ GenericName[zh_TW]=MPEG æ’æ”¾ç¨‹å¼
+ GenericName[zu]=Umdlali we-MPEG
+@@ -80,6 +79,5 @@
+ Name[bn]=জিটিà¦à¦¿
+ Name[fa]=تلویزیون G
+ Name[hi]=जीटीवी
+-Name[xx]=xxGTVxx
+ ServiceTypes=
+ Type=Application
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Multimedia/jazz.desktop kdebase-branch-3.4/kappfinder/apps/Multimedia/jazz.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Multimedia/jazz.desktop 2005-02-04 23:14:39.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Multimedia/jazz.desktop 2005-03-07 09:14:55.000000000 -0500
+@@ -8,7 +8,6 @@
+ Name[ko]=재즈
+ Name[lv]=Džezs
+ Name[ta]=ஜாஸà¯
+-Name[xx]=xxJazzxx
+ Name[zu]=I-Jazz
+ GenericName=Sound Processor
+ GenericName[af]=Klank Verwerker
+@@ -75,7 +74,6 @@
+ GenericName[ven]=Tshiitimubvumo
+ GenericName[vi]=XỠlà âm thanh
+ GenericName[xh]=Umlugisi Wesandi
+-GenericName[xx]=xxSound Processorxx
+ GenericName[zh_CN]=声音处ç†ç¨‹åº
+ GenericName[zh_TW]=音效處ç†ç¨‹å¼
+ GenericName[zu]=Umqhubekisi womsindo
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Multimedia/mplayer.desktop kdebase-branch-3.4/kappfinder/apps/Multimedia/mplayer.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Multimedia/mplayer.desktop 2005-02-23 00:05:29.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Multimedia/mplayer.desktop 2005-03-07 09:14:55.000000000 -0500
+@@ -68,7 +68,6 @@
+ GenericName[vi]=Trình xem Video
+ GenericName[wa]=Djouweu di fitchîs videyo
+ GenericName[xh]=Umdlali we Video
+-GenericName[xx]=xxVideo Playerxx
+ GenericName[zh_CN]=è§†é¢‘æ’æ”¾å™¨
+ GenericName[zh_TW]=è¦–åƒæª”æ’æ”¾ç¨‹å¼
+ GenericName[zu]=Umdlali we-Vidiyo
+@@ -87,7 +86,6 @@
+ Name[sv]=Mplayer
+ Name[ta]=Mசாதனமà¯
+ Name[ven]=Tshitambisi tsha M
+-Name[xx]=xxMPlayerxx
+ ServiceTypes=
+ Type=Application
+
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Multimedia/mtv.desktop kdebase-branch-3.4/kappfinder/apps/Multimedia/mtv.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Multimedia/mtv.desktop 2005-02-23 00:05:29.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Multimedia/mtv.desktop 2005-03-07 09:14:55.000000000 -0500
+@@ -68,7 +68,6 @@
+ GenericName[vi]=Trình xem Video
+ GenericName[wa]=Djouweu di fitchîs videyo
+ GenericName[xh]=Umdlali we Video
+-GenericName[xx]=xxVideo Playerxx
+ GenericName[zh_CN]=è§†é¢‘æ’æ”¾å™¨
+ GenericName[zh_TW]=è¦–åƒæª”æ’æ”¾ç¨‹å¼
+ GenericName[zu]=Umdlali we-Vidiyo
+@@ -81,6 +80,5 @@
+ Name[fa]=تلویزیون Mpeg
+ Name[hi]=à¤à¤®à¤ªà¥€à¤ˆà¤œà¥€-टीवी
+ Name[is]=MpegTV spilari
+-Name[xx]=xxMpegTVxx
+ Type=Application
+ MimeType=video/mpeg
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Multimedia/ogle.desktop kdebase-branch-3.4/kappfinder/apps/Multimedia/ogle.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Multimedia/ogle.desktop 2005-02-04 23:14:39.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Multimedia/ogle.desktop 2005-03-07 09:14:55.000000000 -0500
+@@ -65,7 +65,6 @@
+ GenericName[vi]=Trình xem DVD
+ GenericName[wa]=Djouweu di plakes lazer DVD
+ GenericName[xh]=Umdlali we DVD
+-GenericName[xx]=xxDVD Playerxx
+ GenericName[zh_CN]=DVD æ’æ”¾å™¨
+ GenericName[zh_TW]=DVD æ’æ”¾å™¨
+ GenericName[zu]=Umdlali we-DVD
+@@ -80,7 +79,6 @@
+ Name[lo]=ຕົວດີບັàº
+ Name[ta]=ஓகலà¯
+ Name[ven]=Zondolola
+-Name[xx]=xxOglexx
+ ServiceTypes=
+ Type=Application
+ X-KDE-SubstituteUID=false
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Multimedia/oqtplayer.desktop kdebase-branch-3.4/kappfinder/apps/Multimedia/oqtplayer.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Multimedia/oqtplayer.desktop 2005-02-23 00:05:29.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Multimedia/oqtplayer.desktop 2005-03-07 09:14:55.000000000 -0500
+@@ -64,7 +64,6 @@
+ GenericName[vi]=Trình xem MOV
+ GenericName[wa]=Djouweu di videyos MOV
+ GenericName[xh]=Umdlali we Video MOV
+-GenericName[xx]=xxMOV Video Playerxx
+ GenericName[zh_CN]=MOV è§†é¢‘æ’æ”¾å™¨
+ GenericName[zh_TW]=MOV è¦–è¨Šæ’æ”¾ç¨‹å¼
+ GenericName[zu]=Umdlali we-MOV ye-Vidiyo
+@@ -84,7 +83,6 @@
+ Name[ta]=OQTசாதனமà¯
+ Name[ven]=Tshitambi tsha OQTP
+ Name[xh]=Umdlali we OQT
+-Name[xx]=xxOQTPlayerxx
+ Name[zh_TW]=OQT æ’æ”¾å™¨
+ Name[zu]=Umdlali we-OQT
+ ServiceTypes=
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Multimedia/realplayer.desktop kdebase-branch-3.4/kappfinder/apps/Multimedia/realplayer.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Multimedia/realplayer.desktop 2005-02-23 00:05:30.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Multimedia/realplayer.desktop 2005-03-07 09:14:55.000000000 -0500
+@@ -68,7 +68,6 @@
+ GenericName[vi]=Trình xem Video
+ GenericName[wa]=Djouweu di fitchîs videyo
+ GenericName[xh]=Umdlali we Video
+-GenericName[xx]=xxVideo Playerxx
+ GenericName[zh_CN]=è§†é¢‘æ’æ”¾å™¨
+ GenericName[zh_TW]=è¦–åƒæª”æ’æ”¾ç¨‹å¼
+ GenericName[zu]=Umdlali we-Vidiyo
+@@ -86,7 +85,6 @@
+ Name[nso]=Sebapadi sa Makgonthe
+ Name[ta]=ரியலà¯à®ªà¯à®³à¯‡à®¯à®°à¯
+ Name[ven]=Tshitambisi tsha Vhukuma
+-Name[xx]=xxRealPlayerxx
+ Name[zu]=Umdlali Wangempela
+ Path=
+ SwallowExec=
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Multimedia/rezound.desktop kdebase-branch-3.4/kappfinder/apps/Multimedia/rezound.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Multimedia/rezound.desktop 2005-02-23 00:05:30.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Multimedia/rezound.desktop 2005-03-07 09:14:55.000000000 -0500
+@@ -5,7 +5,6 @@
+ Name=reZound
+ Name[eo]=Sonoro
+ Name[hi]=री-जाउणà¥à¤¡
+-Name[xx]=xxreZoundxx
+ GenericName=Audio Editor
+ GenericName[az]=Audio Editoru
+ GenericName[be]=Ð Ñдактар аўдыё
+@@ -53,7 +52,7 @@
+ GenericName[sk]=Zvukový editor
+ GenericName[sl]=Urejevalnik zvoka
+ GenericName[sr]=Ðудио уређивач
+-GenericName[sr@Latn]=Ðудио уређивач
++GenericName[sr@Latn]=Audio ureÄ‘ivaÄ
+ GenericName[sv]=Ljudeditor
+ GenericName[ta]=ஒலி திரà¯à®¤à¯à®¤à®¿
+ GenericName[tg]=Муҳаррири Ñадо
+@@ -61,7 +60,6 @@
+ GenericName[uk]=Редактор аудіо запиÑів
+ GenericName[uz]=Ðудио таҳрирчи
+ GenericName[wa]=Aspougneu d'Â sons
+-GenericName[xx]=xxAudio Editorxx
+ GenericName[zh_CN]=音频编辑器
+ StartupNotify=true
+ Type=Application
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Multimedia/slab.desktop kdebase-branch-3.4/kappfinder/apps/Multimedia/slab.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Multimedia/slab.desktop 2005-02-23 00:05:30.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Multimedia/slab.desktop 2005-03-07 09:14:55.000000000 -0500
+@@ -7,7 +7,6 @@
+ Name[hi]=सà¥à¤²à¥ˆà¤¬
+ Name[ta]=ஸà¯à®²à®¾à®ªà¯
+ Name[ven]=Tshilebe
+-Name[xx]=xxSlabxx
+ Name[zu]=Ikhekheba
+ GenericName=Audio Recorder
+ GenericName[af]=Audio Opnemer
+@@ -72,7 +71,6 @@
+ GenericName[ven]=Tshirekhodi tsha Mubvumo
+ GenericName[vi]=Ghi âm
+ GenericName[xh]=Umxubi Wokuvakalayo
+-GenericName[xx]=xxAudio Recorderxx
+ GenericName[zh_CN]=录音程åº
+ GenericName[zh_TW]=錄音程å¼
+ GenericName[zu]=Umqophi Wokuzwakalayo
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Multimedia/sweep.desktop kdebase-branch-3.4/kappfinder/apps/Multimedia/sweep.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Multimedia/sweep.desktop 2005-02-23 00:05:30.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Multimedia/sweep.desktop 2005-03-07 09:14:55.000000000 -0500
+@@ -9,7 +9,6 @@
+ Name[nb]=Sveip
+ Name[nn]=Sveip
+ Name[pa]=ਸਵੀਪ
+-Name[xx]=xxSweepxx
+ GenericName=Audio Editor
+ GenericName[az]=Audio Editoru
+ GenericName[be]=Ð Ñдактар аўдыё
+@@ -57,7 +56,7 @@
+ GenericName[sk]=Zvukový editor
+ GenericName[sl]=Urejevalnik zvoka
+ GenericName[sr]=Ðудио уређивач
+-GenericName[sr@Latn]=Ðудио уређивач
++GenericName[sr@Latn]=Audio ureÄ‘ivaÄ
+ GenericName[sv]=Ljudeditor
+ GenericName[ta]=ஒலி திரà¯à®¤à¯à®¤à®¿
+ GenericName[tg]=Муҳаррири Ñадо
+@@ -65,7 +64,6 @@
+ GenericName[uk]=Редактор аудіо запиÑів
+ GenericName[uz]=Ðудио таҳрирчи
+ GenericName[wa]=Aspougneu d'Â sons
+-GenericName[xx]=xxAudio Editorxx
+ GenericName[zh_CN]=音频编辑器
+ StartupNotify=true
+ Type=Application
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Multimedia/xawtv.desktop kdebase-branch-3.4/kappfinder/apps/Multimedia/xawtv.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Multimedia/xawtv.desktop 2005-02-23 00:05:30.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Multimedia/xawtv.desktop 2005-03-07 09:14:55.000000000 -0500
+@@ -65,7 +65,6 @@
+ GenericName[vi]=Xem TV!
+ GenericName[wa]=Waitîz l' televuzion so vosse copiutrece
+ GenericName[xh]=Bukela Umabona-kude!
+-GenericName[xx]=xxWatch TV!xx
+ GenericName[zh_CN]=看电视ï¼
+ GenericName[zh_TW]=看電視ï¼
+ GenericName[zu]=Buka Umabonakude!
+@@ -80,7 +79,6 @@
+ Name[tr]=XawXV
+ Name[uk]=XawXV
+ Name[vi]=XawTV
+-Name[xx]=xxXawTVxx
+ Name[zu]=Umabonakude we-Xaw
+ Path=
+ Terminal=false
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Multimedia/xcam.desktop kdebase-branch-3.4/kappfinder/apps/Multimedia/xcam.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Multimedia/xcam.desktop 2005-02-23 00:05:30.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Multimedia/xcam.desktop 2005-03-07 09:14:55.000000000 -0500
+@@ -8,7 +8,6 @@
+ Name[hi]=à¤à¤•à¥à¤¸à¤•ैम
+ Name[lo]=Xcan
+ Name[sv]=Xcam
+-Name[xx]=xxXCamxx
+ Name[zu]=I-XCam
+ GenericName=Camera Program
+ GenericName[af]=Kamera Program
+@@ -75,7 +74,6 @@
+ GenericName[ven]=Mbekanyamushumo ya Tshidzhiatshifanyiso
+ GenericName[vi]=Chương trình camera
+ GenericName[xh]=Inkqubo yeKhamera
+-GenericName[xx]=xxCamera Programxx
+ GenericName[zh_CN]=æ‘„åƒå¤´ç¨‹åº
+ GenericName[zh_TW]=Camera 程å¼
+ GenericName[zu]=Uhlelo lwemisebenzi lwe-Camera
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Multimedia/xine.desktop kdebase-branch-3.4/kappfinder/apps/Multimedia/xine.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Multimedia/xine.desktop 2005-02-10 23:51:45.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Multimedia/xine.desktop 2005-03-07 09:14:55.000000000 -0500
+@@ -68,7 +68,6 @@
+ GenericName[vi]=Trình xem Video
+ GenericName[wa]=Djouweu di fitchîs videyo
+ GenericName[xh]=Umdlali we Video
+-GenericName[xx]=xxVideo Playerxx
+ GenericName[zh_CN]=è§†é¢‘æ’æ”¾å™¨
+ GenericName[zh_TW]=è¦–åƒæª”æ’æ”¾ç¨‹å¼
+ GenericName[zu]=Umdlali we-Vidiyo
+@@ -81,7 +80,6 @@
+ Name[hi]=à¤à¤•à¥à¤¸à¤¾à¤‡à¤¨
+ Name[lo]=ສຸວັນທàºàº‡
+ Name[vi]=Xine
+-Name[xx]=xxXinexx
+ ServiceTypes=
+ Type=Application
+
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Multimedia/xmms-enqueue.desktop kdebase-branch-3.4/kappfinder/apps/Multimedia/xmms-enqueue.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Multimedia/xmms-enqueue.desktop 2005-02-23 00:05:30.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Multimedia/xmms-enqueue.desktop 2005-03-07 09:14:55.000000000 -0500
+@@ -62,7 +62,6 @@
+ GenericName[ven]=Tshishumiswa tshau Tamba zwire kha Mutevhe
+ GenericName[vi]=Công cụ tạo danh sách bà i
+ GenericName[xh]=Isixhobo Soluhlu lokudlala
+-GenericName[xx]=xxPlaylist Toolxx
+ GenericName[zh_CN]=æ’æ”¾åˆ—表工具
+ GenericName[zh_TW]=æ’æ”¾åˆ—表工具
+ GenericName[zu]=Ithuluzi Loluhlu lokudlala
+@@ -124,7 +123,6 @@
+ Name[uk]=В чергу до XMMS
+ Name[vi]=Xếp và o XMMS
+ Name[xh]=Folisa kwi XMMS
+-Name[xx]=xxEnqueue in XMMSxx
+ Name[zh_CN]=åŠ å…¥ XMMS 队列
+ Name[zh_TW]=åŠ å…¥ XMMS æ’æ”¾åˆ—表
+ Name[zu]=Lindela kulayini we-XMMS
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Multimedia/xmms.desktop kdebase-branch-3.4/kappfinder/apps/Multimedia/xmms.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Multimedia/xmms.desktop 2005-02-23 00:05:30.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Multimedia/xmms.desktop 2005-03-07 09:14:55.000000000 -0500
+@@ -64,7 +64,6 @@
+ GenericName[vi]=Trình chơi nhạc đa phương tiện
+ GenericName[wa]=Djouweu multimedia
+ GenericName[xh]=Umdlali we Multimedia
+-GenericName[xx]=xxMultimedia Playerxx
+ GenericName[zh_CN]=å¤šåª’ä½“æ’æ”¾å™¨
+ GenericName[zh_TW]=å¤šåª’é«”æ’æ”¾ç¨‹å¼
+ GenericName[zu]=Umdlali wonozindaba abaningi
+@@ -76,7 +75,6 @@
+ Name[fa]=سیستم چندرسانه‌ای X
+ Name[hi]=à¤à¤•à¥à¤¸à¤à¤®à¤à¤®à¤à¤¸
+ Name[vi]=XMMS
+-Name[xx]=xxXMMSxx
+ Path=
+ SwallowExec=
+ SwallowTitle=
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Office/Applix.desktop kdebase-branch-3.4/kappfinder/apps/Office/Applix.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Office/Applix.desktop 2005-02-23 00:05:30.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Office/Applix.desktop 2005-03-07 09:14:56.000000000 -0500
+@@ -8,7 +8,6 @@
+ Name[ko]=어플ë¦ìФ
+ Name[pa]=ਅਪਲੀਕਸ
+ Name[vi]=Applix
+-Name[xx]=xxApplixxx
+ MimeType=
+ Exec=applix
+ Icon=applixware
+@@ -78,7 +77,6 @@
+ GenericName[uz]=Идора учун даÑтурлар
+ GenericName[ven]=Sutu ya Ofisini
+ GenericName[vi]=Bá»™ Office
+-GenericName[xx]=xxOffice Suitexx
+ GenericName[zh_CN]=办公套件
+ GenericName[zh_TW]=辦公軟體程å¼é›†
+ GenericName[zu]=Impahla yesehhovisi
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Office/Dia.desktop kdebase-branch-3.4/kappfinder/apps/Office/Dia.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Office/Dia.desktop 2005-02-04 23:14:40.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Office/Dia.desktop 2005-03-07 09:14:56.000000000 -0500
+@@ -7,7 +7,6 @@
+ Name[hi]=डाया
+ Name[pa]=ਡਾਈ
+ Name[ta]=டையா
+-Name[xx]=xxDiaxx
+ GenericName=Program for Diagrams
+ GenericName[af]=Program vir Diagramme
+ GenericName[ar]=بنامج رسوم بيانية
+@@ -70,7 +69,6 @@
+ GenericName[ven]=Miolo ya Mbekanyamushumo
+ GenericName[vi]=Chương trình tạo biểu đồ
+ GenericName[xh]=Inkqubo Yemizobo
+-GenericName[xx]=xxProgram for Diagramsxx
+ GenericName[zh_CN]=图表绘制程åº
+ GenericName[zh_TW]=圖表製作程å¼
+ GenericName[zu]=Uhlelo lwemisebenzi lwemidwebo
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Office/Gnome-Cal.desktop kdebase-branch-3.4/kappfinder/apps/Office/Gnome-Cal.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Office/Gnome-Cal.desktop 2005-02-23 00:05:30.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Office/Gnome-Cal.desktop 2005-03-07 09:14:56.000000000 -0500
+@@ -21,7 +21,6 @@
+ Name[ta]=GNOME-காலà¯à®•à¯à®²à¯‡à®Ÿà¯à®Ÿà®°à¯
+ Name[tg]=Тақвими GNOME
+ Name[th]=ปà¸à¸´à¸—ินขà¸à¸‡ GNOME
+-Name[xx]=xxGNOME-Calxx
+ Name[zh_TW]=GNOME 行事曆
+ Name[zu]=Gnome-Cal
+ GenericName=Personal Calendar
+@@ -90,7 +89,6 @@
+ GenericName[vi]=Lịch cá nhân
+ GenericName[wa]=Calindrî da vosse
+ GenericName[xh]=Ikhalenda Yobuqu
+-GenericName[xx]=xxPersonal Calendarxx
+ GenericName[zh_CN]=个人日程表
+ GenericName[zh_TW]=個人行事曆
+ GenericName[zu]=Ikhalenda Lomuntu siqu
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Office/Gnome-Card.desktop kdebase-branch-3.4/kappfinder/apps/Office/Gnome-Card.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Office/Gnome-Card.desktop 2005-02-04 23:14:40.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Office/Gnome-Card.desktop 2005-03-07 09:14:56.000000000 -0500
+@@ -27,7 +27,6 @@
+ Name[ven]=Garata-GNOME
+ Name[vi]=Thẻ-GNOME
+ Name[xh]=Ikhadi le-GNOME
+-Name[xx]=xxGNOME-Cardxx
+ Name[zh_TW]=GNOME å片管ç†
+ Name[zu]=Ikhadi ye-GNOME
+ GenericName=Contact Manager
+@@ -95,7 +94,6 @@
+ GenericName[ven]=Mulanguli ono Kwamiwa
+ GenericName[vi]=Trình quản là liên lạc
+ GenericName[xh]=Umphathi Wokuxhumanisa
+-GenericName[xx]=xxContact Managerxx
+ GenericName[zh_CN]=è”系人管ç†
+ GenericName[zh_TW]=å片管ç†ç¨‹å¼
+ GenericName[zu]=Thintana nemenenja
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Office/GnomeTimeTracker.desktop kdebase-branch-3.4/kappfinder/apps/Office/GnomeTimeTracker.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Office/GnomeTimeTracker.desktop 2005-01-22 23:37:39.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Office/GnomeTimeTracker.desktop 2005-03-07 09:14:56.000000000 -0500
+@@ -39,7 +39,6 @@
+ Name[ven]=Tshisedzulusi tsha Tshifhinga tsha GNOME
+ Name[vi]=Trình Ä‘o thá»i gian GNOME
+ Name[xh]=GNOME Umfundi Wexesha
+-Name[xx]=xxGNOME Time Trackerxx
+ Name[zh_CN]=GNOME 时间记录
+ Name[zh_TW]=個人時程記錄
+ Name[zu]=Umgcini Wesikhathi we-Gnome
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Office/Gnumeric.desktop kdebase-branch-3.4/kappfinder/apps/Office/Gnumeric.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Office/Gnumeric.desktop 2005-02-23 00:05:30.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Office/Gnumeric.desktop 2005-03-07 09:14:56.000000000 -0500
+@@ -7,7 +7,6 @@
+ Name[hi]=जीनà¥à¤¯à¥‚मेरिक
+ Name[pa]=ਜੀ-ਸਾਰਣੀਕਾਰ
+ Name[ta]=Gஎணà¯à®£à®¿à®¯à®²à¯
+-Name[xx]=xxGnumericxx
+ GenericName=Spread Sheet
+ GenericName[af]=Sprei Staat
+ GenericName[ar]=برنامج جداول الكترونية
+@@ -75,7 +74,6 @@
+ GenericName[ven]=Andaladza Siatari
+ GenericName[vi]=Trình xem file .xls (Spread Sheet)
+ GenericName[wa]=TÃ¥vleu
+-GenericName[xx]=xxSpread Sheetxx
+ GenericName[zh_CN]=电åè¡¨æ ¼
+ GenericName[zh_TW]=試算表
+ Exec=gnumeric
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Office/Guppi.desktop kdebase-branch-3.4/kappfinder/apps/Office/Guppi.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Office/Guppi.desktop 2005-02-04 23:14:40.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Office/Guppi.desktop 2005-03-07 09:14:56.000000000 -0500
+@@ -7,7 +7,6 @@
+ Name[hi]=गà¥à¤ªà¥à¤ªà¥€
+ Name[pa]=ਜੂਪੀ
+ Name[ta]=கà¯à®ªà¯à®ªà®¿
+-Name[xx]=xxGuppixx
+ GenericName=Program for Diagrams
+ GenericName[af]=Program vir Diagramme
+ GenericName[ar]=بنامج رسوم بيانية
+@@ -70,7 +69,6 @@
+ GenericName[ven]=Miolo ya Mbekanyamushumo
+ GenericName[vi]=Chương trình tạo biểu đồ
+ GenericName[xh]=Inkqubo Yemizobo
+-GenericName[xx]=xxProgram for Diagramsxx
+ GenericName[zh_CN]=图表绘制程åº
+ GenericName[zh_TW]=圖表製作程å¼
+ GenericName[zu]=Uhlelo lwemisebenzi lwemidwebo
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Office/Ical.desktop kdebase-branch-3.4/kappfinder/apps/Office/Ical.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Office/Ical.desktop 2005-02-23 00:05:30.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Office/Ical.desktop 2005-03-07 09:14:56.000000000 -0500
+@@ -6,7 +6,6 @@
+ Name[fa]=تماس L
+ Name[fr]=iCal
+ Name[hi]=आईकेल
+-Name[xx]=xxIcalxx
+ GenericName=Calendar Program
+ GenericName[af]=Kalender Program
+ GenericName[ar]=برنامج تقويم
+@@ -73,7 +72,6 @@
+ GenericName[vi]=Trình lịch
+ GenericName[wa]=Programe calindrî
+ GenericName[xh]=Inkqubo ye Calendar
+-GenericName[xx]=xxCalendar Programxx
+ GenericName[zh_CN]=日程管ç†ç¨‹åº
+ GenericName[zh_TW]=行事曆程å¼
+ GenericName[zu]=Uhlelo lwemisebenzi lekhalenda
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Office/WordPerfect.desktop kdebase-branch-3.4/kappfinder/apps/Office/WordPerfect.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Office/WordPerfect.desktop 2005-02-10 23:51:45.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Office/WordPerfect.desktop 2005-03-07 09:14:56.000000000 -0500
+@@ -17,7 +17,6 @@
+ Name[ta]=வேரà¯à®Ÿà¯ பரà¯à®ªà¯†à®•à¯à®Ÿà¯
+ Name[th]=เวิร์ดเพà¸à¸£à¹Œà¹€à¸Ÿà¹‡à¸à¸•์
+ Name[ven]=Maipfi a Vhukuma
+-Name[xx]=xxWordPerfectxx
+ MimeType=application/wordperfect;
+ Exec=xwp
+ Icon=wp
+@@ -88,7 +87,6 @@
+ GenericName[uz]=Матн процеÑÑори
+ GenericName[ven]=Tshiiti tsha Maipfi
+ GenericName[vi]=Trình xỠlà Word
+-GenericName[xx]=xxWord Processorxx
+ GenericName[zh_CN]=å—处ç†å™¨
+ GenericName[zh_TW]=文書處ç†ç¨‹å¼
+ GenericName[zu]=Umqhubekisi wegama
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Office/WordPerfect2000.desktop kdebase-branch-3.4/kappfinder/apps/Office/WordPerfect2000.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Office/WordPerfect2000.desktop 2005-02-10 23:51:45.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Office/WordPerfect2000.desktop 2005-03-07 09:14:56.000000000 -0500
+@@ -17,7 +17,6 @@
+ Name[ta]=வேரà¯à®Ÿà¯à®ªà®°à¯à®ªà¯†à®•à¯à®Ÿà¯ 2000
+ Name[th]=เวิร์ดเพà¸à¸£à¹Œà¹€à¸Ÿà¹‡à¸à¸•์ 2000
+ Name[ven]=MaipfiVhukuma a Gidimbili
+-Name[xx]=xxWordPerfect 2000xx
+ MimeType=application/wordperfect;application/msword;application/x-winword97;
+ Exec=wordperfect
+ Icon=wp
+@@ -88,7 +87,6 @@
+ GenericName[uz]=Матн процеÑÑори
+ GenericName[ven]=Tshiiti tsha Maipfi
+ GenericName[vi]=Trình xỠlà Word
+-GenericName[xx]=xxWord Processorxx
+ GenericName[zh_CN]=å—处ç†å™¨
+ GenericName[zh_TW]=文書處ç†ç¨‹å¼
+ GenericName[zu]=Umqhubekisi wegama
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Office/XAcc.desktop kdebase-branch-3.4/kappfinder/apps/Office/XAcc.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Office/XAcc.desktop 2005-02-10 23:51:45.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Office/XAcc.desktop 2005-03-07 09:14:56.000000000 -0500
+@@ -6,7 +6,6 @@
+ Name[hi]=à¤à¤•à¥à¤¸à¤à¤¸à¥€à¤¸à¥€
+ Name[sv]=Xacc
+ Name[vi]=xacc
+-Name[xx]=xxxaccxx
+ MimeType=
+ Exec=xacc
+ Icon=xapp
+@@ -76,7 +75,6 @@
+ GenericName[uz]=ШахÑий ҳиÑоб-китоб воÑитаÑи
+ GenericName[ven]=Tshishumiswa Tshauvhalela Tshau
+ GenericName[vi]=Công cụ quản lý tà i khoản cá nhân
+-GenericName[xx]=xxPersonal Accounting Toolxx
+ GenericName[zh_CN]=个人记账工具
+ GenericName[zh_TW]=個人會計程å¼
+ GenericName[zu]=Ithuluzi lomuntu sintu lezama-akhawunti
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Office/XsLite.desktop kdebase-branch-3.4/kappfinder/apps/Office/XsLite.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Office/XsLite.desktop 2005-02-23 00:05:30.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Office/XsLite.desktop 2005-03-07 09:14:56.000000000 -0500
+@@ -9,7 +9,6 @@
+ Name[sv]=Xslite
+ Name[ta]=Xsலைடà¯
+ Name[vi]=XsLite
+-Name[xx]=xxXsLitexx
+ MimeType=
+ Exec=xslite
+ Icon=xapp
+@@ -84,7 +83,6 @@
+ GenericName[ven]=Andaladza Siatari
+ GenericName[vi]=Trình xem file .xls (Spread Sheet)
+ GenericName[wa]=TÃ¥vleu
+-GenericName[xx]=xxSpread Sheetxx
+ GenericName[zh_CN]=电åè¡¨æ ¼
+ GenericName[zh_TW]=試算表
+ X-KDE-StartupNotify=false
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Office/abiword.desktop kdebase-branch-3.4/kappfinder/apps/Office/abiword.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Office/abiword.desktop 2005-02-10 23:51:45.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Office/abiword.desktop 2005-03-07 09:14:56.000000000 -0500
+@@ -12,7 +12,6 @@
+ Name[sv]=Abiword
+ Name[ta]=அபிவேரà¯à®Ÿà¯
+ Name[ven]=Maipfi a Abi
+-Name[xx]=xxAbiWordxx
+ GenericName=Word Processor
+ GenericName[af]=Woord Verwerker
+ GenericName[ar]=معالج نصوص
+@@ -76,7 +75,6 @@
+ GenericName[uz]=Матн процеÑÑори
+ GenericName[ven]=Tshiiti tsha Maipfi
+ GenericName[vi]=Trình xỠlà Word
+-GenericName[xx]=xxWord Processorxx
+ GenericName[zh_CN]=å—处ç†å™¨
+ GenericName[zh_TW]=文書處ç†ç¨‹å¼
+ GenericName[zu]=Umqhubekisi wegama
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Office/acroread.desktop kdebase-branch-3.4/kappfinder/apps/Office/acroread.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Office/acroread.desktop 2005-02-10 23:51:45.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Office/acroread.desktop 2005-03-07 09:14:56.000000000 -0500
+@@ -25,7 +25,6 @@
+ Name[ta]=ஆகà¯à®°à¯‹à®ªà¯‡à®Ÿà¯ ரீடரà¯
+ Name[tg]=Хонандаи Acrobat
+ Name[ven]=Muvhali wa Akhurobati
+-Name[xx]=xxAcrobat Readerxx
+ Name[zh_CN]=Acrobat 阅读器
+ Name[zh_TW]=Acrobat 閱讀器
+ Name[zu]=Umfundi we-Acrobat
+@@ -101,7 +100,6 @@
+ GenericName[ven]=Tshivhoni tsha PDF
+ GenericName[vi]=Trình xem PDF
+ GenericName[wa]=HÃ¥yneu di documints PDF
+-GenericName[xx]=xxPDF Viewerxx
+ GenericName[zh_CN]=PDF 查看器
+ GenericName[zh_TW]=PDF 檢視程å¼
+ GenericName[zu]=Umbukisi we-PDF
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Office/gnucash.desktop kdebase-branch-3.4/kappfinder/apps/Office/gnucash.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Office/gnucash.desktop 2005-02-04 23:14:40.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Office/gnucash.desktop 2005-03-07 09:14:56.000000000 -0500
+@@ -11,7 +11,6 @@
+ Name[ta]=gபணமà¯
+ Name[tg]=Пули Gnu
+ Name[ven]=Tshelede ya Gnu
+-Name[xx]=xxGnuCashxx
+ Exec=gnucash
+ Type=Application
+ DocPath=
+@@ -75,7 +74,6 @@
+ GenericName[ven]=Mulanguli wa Tshelede
+ GenericName[vi]=Trình quản là tà i chÃnh
+ GenericName[xh]=Umphathi Wezimali
+-GenericName[xx]=xxFinance Managerxx
+ GenericName[zh_CN]=金èžç®¡ç†
+ GenericName[zh_TW]=財務管ç†ç¨‹å¼
+ GenericName[zu]=Imenenja yezezimali
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Office/lyx.desktop kdebase-branch-3.4/kappfinder/apps/Office/lyx.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Office/lyx.desktop 2005-02-10 23:51:45.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Office/lyx.desktop 2005-03-07 09:14:56.000000000 -0500
+@@ -7,7 +7,6 @@
+ Name[hr]=Lyx
+ Name[lo]=Lyx
+ Name[sv]=Lyx
+-Name[xx]=xxLyXxx
+ GenericName=Word Processor
+ GenericName[af]=Woord Verwerker
+ GenericName[ar]=معالج نصوص
+@@ -71,7 +70,6 @@
+ GenericName[uz]=Матн процеÑÑори
+ GenericName[ven]=Tshiiti tsha Maipfi
+ GenericName[vi]=Trình xỠlà Word
+-GenericName[xx]=xxWord Processorxx
+ GenericName[zh_CN]=å—处ç†å™¨
+ GenericName[zh_TW]=文書處ç†ç¨‹å¼
+ GenericName[zu]=Umqhubekisi wegama
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Office/mrproject.desktop kdebase-branch-3.4/kappfinder/apps/Office/mrproject.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Office/mrproject.desktop 2005-02-04 23:14:40.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Office/mrproject.desktop 2005-03-07 09:14:56.000000000 -0500
+@@ -12,7 +12,6 @@
+ Name[ta]=Mrதிடà¯à®Ÿ அறிகà¯à®•ை
+ Name[ven]=Radziphurodzhekiti
+ Name[vi]=Ngà i Dự án
+-Name[xx]=xxMrProjectxx
+ Exec=mrproject
+ Type=Application
+ DocPath=
+@@ -78,7 +77,6 @@
+ GenericName[ven]=Mulanguli wa phurodzhekiti
+ GenericName[vi]=Trình quản là dự án
+ GenericName[xh]=Umphathi Wephulo
+-GenericName[xx]=xxProject Managerxx
+ GenericName[zh_CN]=项目管ç†
+ GenericName[zh_TW]=計劃管ç†ç¨‹å¼
+ GenericName[zu]=Imenenja yeprojekthi
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Office/netscapeaddressbook.desktop kdebase-branch-3.4/kappfinder/apps/Office/netscapeaddressbook.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Office/netscapeaddressbook.desktop 2005-02-04 23:14:40.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Office/netscapeaddressbook.desktop 2005-03-07 09:14:56.000000000 -0500
+@@ -60,7 +60,6 @@
+ Name[vi]=Sổ địa chỉ Netscape
+ Name[wa]=Calpin d'Â adresses di Netscape
+ Name[xh]=Incwadi Yedilesi ye Netscape
+-Name[xx]=xxNetscape Addressbookxx
+ Name[zh_CN]=Netscape 地å€ç°¿
+ Name[zh_TW]=Netscape 地å€ç°¿
+ Name[zu]=Incwadi yamakheli ye-Netscape
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Office/plan.desktop kdebase-branch-3.4/kappfinder/apps/Office/plan.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Office/plan.desktop 2005-02-04 23:14:40.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Office/plan.desktop 2005-03-07 09:14:56.000000000 -0500
+@@ -18,7 +18,6 @@
+ Name[ven]=Maano
+ Name[vi]=Lên kế hoạch
+ Name[xh]=Icebo
+-Name[xx]=xxPlanxx
+ Name[zu]=Iplani
+ MimeType=
+ Exec=plan
+@@ -96,7 +95,6 @@
+ GenericName[vi]=Trình quản là Lịch công tác
+ GenericName[wa]=Manaedjeu di calindrîs
+ GenericName[xh]=Umphathi we Khalenda
+-GenericName[xx]=xxCalendar Managerxx
+ GenericName[zh_CN]=日程管ç†ç¨‹åº
+ GenericName[zh_TW]=行事曆管ç†ç¨‹å¼
+ GenericName[zu]=Imenenja yekhalenda
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Office/pybliographic.desktop kdebase-branch-3.4/kappfinder/apps/Office/pybliographic.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Office/pybliographic.desktop 2005-02-04 23:14:40.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Office/pybliographic.desktop 2005-03-07 09:14:57.000000000 -0500
+@@ -66,7 +66,6 @@
+ GenericName[ven]=Databeizi ya Mawanwa
+ GenericName[vi]=Cơ sở dữ liệu Bibliographic
+ GenericName[xh]=Isiseko sedata Esiluluhlu lweencwadi zombhali nawuphi na
+-GenericName[xx]=xxBibliographic Databasexx
+ GenericName[zh_CN]=书目数æ®åº“
+ GenericName[zh_TW]=書目資料庫
+ GenericName[zu]=Isiqu sedata somlando
+@@ -84,7 +83,6 @@
+ Name[lv]=PybliogrÄfisks
+ Name[pa]=ਫੀਬਬਲੀਓਗਰਾਫ
+ Name[tg]=Иттилооти китобшиноÑи P
+-Name[xx]=xxPybliographicxx
+ Path=
+ ServiceTypes=
+ Terminal=false
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Office/scribus.desktop kdebase-branch-3.4/kappfinder/apps/Office/scribus.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Office/scribus.desktop 2005-02-04 23:14:40.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Office/scribus.desktop 2005-03-07 09:14:57.000000000 -0500
+@@ -7,7 +7,6 @@
+ Name[hi]=सà¥à¤•à¥à¤°à¤¿à¤¬à¤¸
+ Name[lo]=ສະຄຣີບັດສ໌
+ Name[ta]=ஸà¯à®•ிரிபஸà¯
+-Name[xx]=xxScribusxx
+ GenericName=Desktop Publishing
+ GenericName[af]=Werkskerm Publisering
+ GenericName[ar]=نشر مكتبي
+@@ -56,7 +55,6 @@
+ GenericName[uz]=Кичик нашриёт
+ GenericName[ven]=U andadza Desikithopo
+ GenericName[xh]=Upapasho lwe Desktop
+-GenericName[xx]=xxDesktop Publishingxx
+ GenericName[zh_CN]=桌é¢å‡ºç‰ˆ
+ GenericName[zh_TW]=桌é¢å‡ºç‰ˆ
+ GenericName[zu]=Ukushicilelwa kwe-Desktop
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Office/xpdf.desktop kdebase-branch-3.4/kappfinder/apps/Office/xpdf.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Office/xpdf.desktop 2005-02-10 23:51:45.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Office/xpdf.desktop 2005-03-07 09:14:57.000000000 -0500
+@@ -10,7 +10,6 @@
+ Name[hi]=à¤à¤•à¥à¤¸ पीडीà¤à¤«
+ Name[ko]=Xìš© PDF
+ Name[mn]=X-PDF
+-Name[xx]=xxX PDFxx
+ MimeType=application/pdf
+ GenericName=PDF Viewer
+ GenericName[af]=Pdf Aansig
+@@ -80,7 +79,6 @@
+ GenericName[ven]=Tshivhoni tsha PDF
+ GenericName[vi]=Trình xem PDF
+ GenericName[wa]=HÃ¥yneu di documints PDF
+-GenericName[xx]=xxPDF Viewerxx
+ GenericName[zh_CN]=PDF 查看器
+ GenericName[zh_TW]=PDF 檢視程å¼
+ GenericName[zu]=Umbukisi we-PDF
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/System/Terminal/aterm.desktop kdebase-branch-3.4/kappfinder/apps/System/Terminal/aterm.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/System/Terminal/aterm.desktop 2005-02-04 23:14:42.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/System/Terminal/aterm.desktop 2005-03-07 09:14:58.000000000 -0500
+@@ -40,7 +40,6 @@
+ Name[vi]=Äấu cuối(Terminal)
+ Name[wa]=Terminå
+ Name[xh]=Isixhobo sangaphandle sekhompuma
+-Name[xx]=xxTerminalxx
+ Name[zh_CN]=终端
+ Name[zh_TW]=終端機
+ Name[zu]=Okwangaphandle
+@@ -110,7 +109,6 @@
+ GenericName[vi]=Trình đầu cuối
+ GenericName[wa]=Programe di terminå
+ GenericName[xh]=Inkqubo Yesixhobo sangaphandle sekhompyutha
+-GenericName[xx]=xxTerminal Programxx
+ GenericName[zh_CN]=终端程åº
+ GenericName[zh_TW]=終端機程å¼
+ GenericName[zu]=Uhlelo lwemisebenzi lwangaohandle
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/System/Terminal/procinfo.desktop kdebase-branch-3.4/kappfinder/apps/System/Terminal/procinfo.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/System/Terminal/procinfo.desktop 2005-02-10 23:51:46.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/System/Terminal/procinfo.desktop 2005-03-07 09:14:58.000000000 -0500
+@@ -15,7 +15,6 @@
+ Name[sl]=Podatki o procesih
+ Name[tg]=Иттилооти Proc
+ Name[th]=ข้à¸à¸¡à¸¹à¸¥à¹‚ปรเซส
+-Name[xx]=xxProcinfoxx
+ GenericName=System Process Information
+ GenericName[af]=Stelsel Proses Informasie
+ GenericName[ar]=معلومات عمليات النظام
+@@ -79,7 +78,6 @@
+ GenericName[ven]=Mafhungo a Tshitenwa tsha Kuitele
+ GenericName[vi]=Thông tin vỠcác tiến trình hệ thống
+ GenericName[xh]=Ulwazi Lwendlela Yoqhubekeko
+-GenericName[xx]=xxSystem Process Informationxx
+ GenericName[zh_CN]=系统进程信æ¯
+ GenericName[zh_TW]=系統程åºè³‡è¨Š
+ GenericName[zu]=Ulwazi Lwenqubo yesistimu
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/System/Terminal/rxvt.desktop kdebase-branch-3.4/kappfinder/apps/System/Terminal/rxvt.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/System/Terminal/rxvt.desktop 2005-02-04 23:14:42.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/System/Terminal/rxvt.desktop 2005-03-22 12:38:02.000000000 -0500
+@@ -17,7 +17,7 @@
+ GenericName[hr]=ouR (naš) eXtended (prošireni) Virtual Terminal
+ GenericName[hu]=Virtuális terminál
+ GenericName[is]=Okkar góði endurbætti skjáhermir
+-GenericName[it]=Terminale esteso
++GenericName[it]=Terminale esteso
+ GenericName[lo]=ປັບà»àº•່ງປະສົມສງງ
+ GenericName[mk]=ouR eXtended Virtual Terminal (нашиот проширен виртуелен терминал)
+ GenericName[mn]=ouR eXtended Virtual Терминал
+@@ -44,7 +44,6 @@
+ GenericName[ven]=Theminala ya mutshini yo lapfiswaho yashu
+ GenericName[vi]=Trình đầu cuối ảo mở rộng của chúng ta (RXVT)
+ GenericName[xh]=ouR eXtended Isiphelo sendlela Esingabonakaliyo
+-GenericName[xx]=xxouR eXtended Virtual Terminalxx
+ GenericName[zh_CN]=我们扩展的虚拟终端
+ GenericName[zh_TW]=我們的延伸å¼è™›æ“¬çµ‚端機
+ GenericName[zu]=Ithuluzi langaphandle Langamanga Lethu Elinwetshiwe
+@@ -53,5 +52,4 @@
+ Name=RXVT
+ Name[hi]=आरà¤à¤•à¥à¤¸à¤µà¥€à¤Ÿà¥€
+ Name[lo]=ສຸວັນທàºàº‡
+-Name[xx]=xxRXVTxx
+ Type=Application
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/System/Terminal/vmstat.desktop kdebase-branch-3.4/kappfinder/apps/System/Terminal/vmstat.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/System/Terminal/vmstat.desktop 2005-02-10 23:51:46.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/System/Terminal/vmstat.desktop 2005-03-07 09:14:58.000000000 -0500
+@@ -11,7 +11,6 @@
+ Name[lo]=ສະຖິຕິຄວາມຈຳສະເຫມືàºàº™
+ Name[mn]=VM-Stat
+ Name[th]=สถิติความจำเสมืà¸à¸™
+-Name[xx]=xxVmstatxx
+ GenericName=Virtual Memory Statistics
+ GenericName[af]=Virtuele Geheue Statistieke
+ GenericName[ar]=Ø§ØØµØ§Ø¡Ø§Øª الذاكرة Ø§Ù„Ø¥ÙØªØ±Ø§Ø¶ÙŠØ©
+@@ -75,7 +74,6 @@
+ GenericName[ven]=Tsedzuluso dza Kuhumbulele
+ GenericName[vi]=Thống kê bộ nhớ ảo
+ GenericName[xh]=Izitatistiki Zobume Benkumbulo
+-GenericName[xx]=xxVirtual Memory Statisticsxx
+ GenericName[zh_CN]=虚拟内å˜ç»Ÿè®¡
+ GenericName[zh_TW]=虛擬記憶體統計
+ GenericName[zu]=Isitathistiki senkumbulo yangamanga
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/System/citrix_ica.desktop kdebase-branch-3.4/kappfinder/apps/System/citrix_ica.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/System/citrix_ica.desktop 2005-02-04 23:14:41.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/System/citrix_ica.desktop 2005-03-16 03:32:43.000000000 -0500
+@@ -5,7 +5,7 @@
+ Name[az]=Citrix ICA Alıcısı
+ Name[be]=Кліент Citrix ICA
+ Name[bn]=সাইটà§à¦°à¦¿à¦•à§à¦¸ ICA কà§à¦²à¦¾à§Ÿà§‡à¦¨à§à¦Ÿ
+-Name[br]=Arval Citrix ICA Client
++Name[br]=Kliant Citrix ICA Client
+ Name[bs]=Citrix ICA klijent
+ Name[ca]=Client Citrix ICA
+ Name[cs]=Citrix ICA klient
+@@ -56,7 +56,6 @@
+ Name[uz]=Citrix ICA клиенти
+ Name[ven]=Mushumisani wa Citrix ICA
+ Name[xh]=Citrix Umxhasi we ICA
+-Name[xx]=xxCitrix ICA Clientxx
+ Name[zh_CN]=Citrix ICA 客户程åº
+ Name[zh_TW]=Citrix ICA 客戶端程å¼
+ Name[zu]=Umxhasi we-Citrix ICA
+@@ -66,7 +65,7 @@
+ GenericName[be]=Кліент WTS
+ GenericName[bg]=Клиент за WTS
+ GenericName[bn]=WTS কà§à¦²à¦¾à§Ÿà§‡à¦¨à§à¦Ÿ
+-GenericName[br]=Arval UTS
++GenericName[br]=Kliant UTS
+ GenericName[bs]=WTS klijent
+ GenericName[ca]=Client WTS
+ GenericName[cs]=WTS klient
+@@ -120,7 +119,6 @@
+ GenericName[uz]=WTS клиенти
+ GenericName[ven]=Mushumisani wa WTS
+ GenericName[xh]=Umxhasi we WTS
+-GenericName[xx]=xxWTS Clientxx
+ GenericName[zh_CN]=WTS 客户端程åº
+ GenericName[zh_TW]=WTS 客戶端程å¼
+ GenericName[zu]=Umxhasi we-WTS
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/System/editres.desktop kdebase-branch-3.4/kappfinder/apps/System/editres.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/System/editres.desktop 2005-02-10 23:51:46.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/System/editres.desktop 2005-03-07 09:14:58.000000000 -0500
+@@ -12,7 +12,6 @@
+ Name[sv]=Editxres
+ Name[th]=à¹à¸à¹‰à¹„ขà¸à¸²à¸£à¹à¸ªà¸”งผล X
+ Name[ven]=SengulusaXRes
+-Name[xx]=xxEditXResxx
+ GenericName=X Resource Editor
+ GenericName[af]=X Hulpbron Redigeerder
+ GenericName[ar]=Ù…ØØ±Ø± مصادر X
+@@ -75,7 +74,6 @@
+ GenericName[uz]=X имкониÑтларини таҳрирчи
+ GenericName[ven]=Musengulusi tshishumiswa tsha X
+ GenericName[xh]=Umhleli Wecebo le X
+-GenericName[xx]=xxX Resource Editorxx
+ GenericName[zh_CN]=X 资æºç¼–辑器
+ GenericName[zh_TW]=X 資æºç·¨è¼¯å™¨
+ Exec=editres
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/System/sam.desktop kdebase-branch-3.4/kappfinder/apps/System/sam.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/System/sam.desktop 2005-02-10 23:51:46.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/System/sam.desktop 2005-03-07 09:14:58.000000000 -0500
+@@ -66,7 +66,6 @@
+ Name[ven]=Kulangulele kwa sisitemu ya SAM
+ Name[vi]=SAM Hệ thống-Quản trị
+ Name[xh]=SAM Umphathi Wendlela yokusebenza
+-Name[xx]=xxSAM System-Administrationxx
+ Name[zh_CN]=SAM 系统管ç†
+ Name[zh_TW]=SAM 系統管ç†
+ Name[zu]=Ukugcinwa kwesisitimu kwe-SAM
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/System/wine.desktop kdebase-branch-3.4/kappfinder/apps/System/wine.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/System/wine.desktop 2005-02-04 23:14:41.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/System/wine.desktop 2005-03-22 12:38:02.000000000 -0500
+@@ -11,7 +11,6 @@
+ Name[ss]=Iwayini
+ Name[ta]=வைனà¯
+ Name[ven]=Veini
+-Name[xx]=xxWinexx
+ Name[zu]=Iwayini
+ GenericName=Run Windows Programs
+ GenericName[af]=Hardloop Vensters Programme
+@@ -42,7 +41,7 @@
+ GenericName[hr]=Pokretanje Windows programa
+ GenericName[hu]=Windows-emulátor
+ GenericName[is]=Keyra Windows forrit
+-GenericName[it]=Esecuzione programmi windows
++GenericName[it]=Esecuzione programmi Windows
+ GenericName[ja]=Windowsプãƒã‚°ãƒ©ãƒ 実行
+ GenericName[lo]=ໂປຣà»àºàº£àº¡àº§àº²àº”ພາບທຳມະດາ
+ GenericName[lt]=Leisti Windows programas
+@@ -77,7 +76,6 @@
+ GenericName[vi]=Chạy các chương trình đồ hoạ
+ GenericName[wa]=Po-z enonder des programes Windows
+ GenericName[xh]=Sebenzisa Udweliso lweenkqubo lwe Windows
+-GenericName[xx]=xxRun Windows Programsxx
+ GenericName[zh_CN]=è¿è¡Œ Windows 程åº
+ GenericName[zh_TW]=執行 Windows 程å¼
+ GenericName[zu]=Sebenzisa izinhlelo zemisebenzi zama-WIndow
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/System/xosview.desktop kdebase-branch-3.4/kappfinder/apps/System/xosview.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/System/xosview.desktop 2005-02-10 23:51:46.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/System/xosview.desktop 2005-03-07 09:14:58.000000000 -0500
+@@ -18,7 +18,6 @@
+ Name[ru]=Xosview
+ Name[se]=X-vuogádatgoziheapmi
+ Name[th]=สถานะระบบปà¸à¸´à¸šà¸±à¸•ิà¸à¸²à¸£à¸šà¸™ X
+-Name[xx]=xxX osviewxx
+ MimeType=
+ GenericName=System Monitor
+ GenericName[af]=Stelsel Monitor
+@@ -88,7 +87,6 @@
+ GenericName[vi]=Trình theo dõi hệ thống
+ GenericName[wa]=Corwaitoe do sistinme
+ GenericName[xh]=Indlela yokusebenza Yophatho
+-GenericName[xx]=xxSystem Monitorxx
+ GenericName[zh_CN]=系统监视器
+ GenericName[zh_TW]=系統監視器
+ GenericName[zu]=I-Monitor yesistimu
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Toys/xeyes.desktop kdebase-branch-3.4/kappfinder/apps/Toys/xeyes.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Toys/xeyes.desktop 2005-02-04 23:14:42.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Toys/xeyes.desktop 2005-03-07 09:14:58.000000000 -0500
+@@ -37,7 +37,6 @@
+ Name[tr]=X Gözler
+ Name[uk]=Очі X
+ Name[ven]=Mato a X
+-Name[xx]=xxX Eyesxx
+ Name[zh_CN]=X 眼ç›
+ MimeType=
+ Exec=xeyes
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Toys/xpinguin.desktop kdebase-branch-3.4/kappfinder/apps/Toys/xpinguin.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Toys/xpinguin.desktop 2005-02-10 23:51:46.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Toys/xpinguin.desktop 2005-03-07 09:14:58.000000000 -0500
+@@ -13,7 +13,6 @@
+ Name[ta]=டகà¯à®¸à¯
+ Name[th]=ตุ๊à¸à¸‹à¹Œ
+ Name[tr]=Tux penguen
+-Name[xx]=xxTuxxx
+ MimeType=
+ GenericName=Linux Mascot
+ GenericName[af]=Linux Gelukbringer
+@@ -74,7 +73,6 @@
+ GenericName[uk]=ТаліÑман Linux
+ GenericName[uz]=Linux тумори
+ GenericName[xh]=Uphawu lwe Linux
+-GenericName[xx]=xxLinux Mascotxx
+ GenericName[zh_CN]=Linux å‰ç¥¥ç‰©
+ GenericName[zh_TW]=Linux å‰ç¥¥ç‰©
+ Exec=xpinguin
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Utilities/GKrellM.desktop kdebase-branch-3.4/kappfinder/apps/Utilities/GKrellM.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Utilities/GKrellM.desktop 2005-02-10 23:51:47.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Utilities/GKrellM.desktop 2005-03-07 09:14:59.000000000 -0500
+@@ -4,7 +4,6 @@
+ Icon=gnome-app
+ Name=GKrellM
+ Name[hi]=जी-कà¥à¤°à¥‡à¤²-à¤à¤®
+-Name[xx]=xxGKrellMxx
+ GenericName=GNU Krell Monitors
+ GenericName[ar]=مراقبات GNU Krell
+ GenericName[az]=GNU Krell İzləyiciləri
+@@ -52,7 +51,6 @@
+ GenericName[tr]=GNU Krell İzleyiciler
+ GenericName[uz]=GNU Krell мониторлари
+ GenericName[vi]=Trình theo dõi GNU Krell
+-GenericName[xx]=xxGNU Krell Monitorsxx
+ GenericName[zh_CN]=GNU Krell 监视器
+ GenericName[zh_TW]=GNU Krell 監視器
+ Terminal=false
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Utilities/GnomeWho.desktop kdebase-branch-3.4/kappfinder/apps/Utilities/GnomeWho.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Utilities/GnomeWho.desktop 2005-02-10 23:51:47.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Utilities/GnomeWho.desktop 2005-03-07 09:14:59.000000000 -0500
+@@ -23,7 +23,6 @@
+ Name[sv]=Gnome who
+ Name[ta]=கà¯à®©à¯‹à®®à¯ யாரà¯
+ Name[tr]=GNOME Kim
+-Name[xx]=xxGNOME Whoxx
+ Name[zu]=GNOME Ubani
+ GenericName=System Info Tool
+ GenericName[af]=Stelsel Inligting Program
+@@ -89,7 +88,6 @@
+ GenericName[ven]=Tshishumiswa tsha Mafhungo a Kuitele
+ GenericName[vi]=Công cụ thông tin hệ thống
+ GenericName[xh]=Isixhobo Senkcukacha Sendlela yokusebenza
+-GenericName[xx]=xxSystem Info Toolxx
+ GenericName[zh_CN]=系统信æ¯å·¥å…·
+ GenericName[zh_TW]=系統資訊工具
+ GenericName[zu]=Ithuluzi Lolwazi Lesistimu
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Utilities/SystemInfo.desktop kdebase-branch-3.4/kappfinder/apps/Utilities/SystemInfo.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Utilities/SystemInfo.desktop 2005-02-23 00:05:31.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Utilities/SystemInfo.desktop 2005-03-30 01:47:41.000000000 -0500
+@@ -10,6 +10,7 @@
+ Name[cy]=Gwybodaeth Gysawd
+ Name[da]=Systeminfo
+ Name[de]=System-Information
++Name[el]=ΠληÏοφοÏίες συστήματος
+ Name[eo]=Sisteminformo
+ Name[es]=Información del sistema
+ Name[et]=Süsteemi info
+@@ -41,14 +42,13 @@
+ Name[sk]=Systémové informácie
+ Name[sl]=Sistemske informacije
+ Name[sr]=Информације о ÑиÑтему
+-Name[sr@Latn]=Информације о ÑиÑтему
++Name[sr@Latn]=Informacije o sistemu
+ Name[sv]=Systeminformation
+ Name[ta]=அமைபà¯à®ªà¯ தகவலà¯
+ Name[tg]=Иттилооти ÑиÑтема
+ Name[tr]=Sistem Bilgisi
+ Name[uk]=Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ ÑиÑтему
+ Name[uz]=Тизим ҳақида маълумот
+-Name[xx]=xxSystem Infoxx
+ Name[zh_CN]=系统信æ¯
+ Exec=guname
+ Terminal=false
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Utilities/SystemLogViewer.desktop kdebase-branch-3.4/kappfinder/apps/Utilities/SystemLogViewer.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Utilities/SystemLogViewer.desktop 2005-02-10 23:51:47.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Utilities/SystemLogViewer.desktop 2005-03-07 09:14:59.000000000 -0500
+@@ -61,7 +61,6 @@
+ Name[vi]=Trình xem log hệ thống
+ Name[wa]=Håyneu des fitchîs djournå do sistinme
+ Name[xh]=Umboniseli Woshicilelo oluneenkcukacha Lwendlela esetyenziswayo
+-Name[xx]=xxSystem Log Viewerxx
+ Name[zh_CN]=系统记录查看器
+ Name[zh_TW]=系統紀錄檔檢視器
+ Name[zu]=Umbukisi Wenqubo eqoshiwe Yesistimu
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Utilities/calctool.desktop kdebase-branch-3.4/kappfinder/apps/Utilities/calctool.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Utilities/calctool.desktop 2005-02-04 23:14:42.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Utilities/calctool.desktop 2005-03-07 09:14:59.000000000 -0500
+@@ -24,7 +24,6 @@
+ Name[th]=เครื่à¸à¸‡à¸„ิดเลข
+ Name[tr]=Hesap Aracı
+ Name[ven]=Tshishumiswa tsha Calc
+-Name[xx]=xxCalctoolxx
+ GenericName=Calculator
+ GenericName[af]=Sakrekenaar
+ GenericName[ar]=آلة ØØ§Ø³Ø¨Ø©
+@@ -90,7 +89,6 @@
+ GenericName[vi]=Máy tÃnh
+ GenericName[wa]=Carculete
+ GenericName[xh]=Umatshini wokubala
+-GenericName[xx]=xxCalculatorxx
+ GenericName[zh_CN]=计算器
+ GenericName[zh_TW]=計算機
+ GenericName[zu]=Umshini wokubala
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Utilities/e-notes.desktop kdebase-branch-3.4/kappfinder/apps/Utilities/e-notes.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Utilities/e-notes.desktop 2005-02-04 23:14:42.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Utilities/e-notes.desktop 2005-03-07 09:14:59.000000000 -0500
+@@ -21,7 +21,6 @@
+ Name[th]=บันทึà¸à¸Šà¹ˆà¸§à¸¢à¸ˆà¸³ E
+ Name[tr]=E-Notlar
+ Name[ven]=Dzinotsi dza-E
+-Name[xx]=xxE-Notesxx
+ Name[zu]=Amapheshana-E
+ GenericName=Personal Notes
+ GenericName[af]=Persoonlike Notas
+@@ -87,7 +86,6 @@
+ GenericName[ven]=Dzinotsi dza vhune
+ GenericName[vi]=Ghi chép cá nhân
+ GenericName[xh]=Iifayile Zobuntu
+-GenericName[xx]=xxPersonal Notesxx
+ GenericName[zh_CN]=个人记事本
+ GenericName[zh_TW]=個人ç†è¨˜
+ GenericName[zu]=Amapheshana omuntu siqu
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Utilities/oclock.desktop kdebase-branch-3.4/kappfinder/apps/Utilities/oclock.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Utilities/oclock.desktop 2005-02-04 23:14:42.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Utilities/oclock.desktop 2005-03-07 09:14:59.000000000 -0500
+@@ -18,7 +18,6 @@
+ Name[tg]=Соат
+ Name[th]=นาฬิà¸à¸²
+ Name[ven]=Ntha ha Thoho
+-Name[xx]=xxOClockxx
+ Name[zu]=Ezimpondweni
+ GenericName=Clock
+ GenericName[af]=Horlosie
+@@ -86,7 +85,6 @@
+ GenericName[ven]=Tshifhinga
+ GenericName[wa]=Ôrlodje
+ GenericName[xh]=Ikloko
+-GenericName[xx]=xxClockxx
+ GenericName[zh_CN]=æ—¶é’Ÿ
+ GenericName[zh_TW]=時é˜
+ GenericName[zu]=Iwashi
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Utilities/xgnokii.desktop kdebase-branch-3.4/kappfinder/apps/Utilities/xgnokii.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Utilities/xgnokii.desktop 2005-02-04 23:14:42.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Utilities/xgnokii.desktop 2005-03-07 09:14:59.000000000 -0500
+@@ -8,7 +8,6 @@
+ Name[sv]=Xgnokii
+ Name[ta]=Gnotski
+ Name[tr]=Gnokii
+-Name[xx]=xxX-Gnokiixx
+ GenericName=Mobile Phone Management Tool
+ GenericName[ar]=أداة ادارة الهوات٠النقالة
+ GenericName[az]=Mobil Telefon İdarə Vasitəsi
+@@ -63,7 +62,6 @@
+ GenericName[uk]=ЗаÑіб ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¼Ð¾Ð±Ñ–Ð»ÑŒÐ½Ð¸Ð¼ телефоном
+ GenericName[uz]=УÑли телефон воÑитаÑи
+ GenericName[vi]=Công cụ quản lý điện thoại di động
+-GenericName[xx]=xxMobile Phone Management Toolxx
+ GenericName[zh_CN]=移动电è¯ç®¡ç†å·¥å…·
+ Exec=xgnokii
+ Type=Application
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Utilities/xutils/Xkill.desktop kdebase-branch-3.4/kappfinder/apps/Utilities/xutils/Xkill.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Utilities/xutils/Xkill.desktop 2005-02-10 23:51:47.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Utilities/xutils/Xkill.desktop 2005-03-07 09:14:59.000000000 -0500
+@@ -11,7 +11,6 @@
+ Name[sv]=Xkill
+ Name[ta]=Xkill
+ Name[tg]=Қотили X
+-Name[xx]=xxX Killxx
+ GenericName=Window Termination Tool
+ GenericName[af]=Venster Beëindiging Program
+ GenericName[ar]=أداة إنهاء Ø§Ù„Ù†ÙˆØ§ÙØ°
+@@ -74,7 +73,6 @@
+ GenericName[ven]=Tshishumiswa tsha u fhelisa Windo
+ GenericName[vi]=Công cụ giết cá»a sổ
+ GenericName[xh]=Isixhobo Sopheliso lwe Window
+-GenericName[xx]=xxWindow Termination Toolxx
+ GenericName[zh_CN]=Window 终端工具
+ GenericName[zh_TW]=視窗終çµå·¥å…·
+ GenericName[zu]=Ithuluzi Lokunqamula i-Window
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Utilities/xutils/Xrefresh.desktop kdebase-branch-3.4/kappfinder/apps/Utilities/xutils/Xrefresh.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Utilities/xutils/Xrefresh.desktop 2005-02-04 23:14:43.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Utilities/xutils/Xrefresh.desktop 2005-03-07 09:14:59.000000000 -0500
+@@ -16,7 +16,6 @@
+ Name[ta]=Xபà¯à®¤à¯à®ªà¯à®ªà®¿
+ Name[tg]=ÐавÑози X
+ Name[tr]=X Tazele
+-Name[xx]=xxX Refreshxx
+ GenericName=Refresh Screen
+ GenericName[af]=Verfris Skerm
+ GenericName[ar]=ØªØØ¯ÙŠØ« الشاشة
+@@ -81,7 +80,6 @@
+ GenericName[ven]=U Kokodza Muya ha Tshikirini
+ GenericName[vi]=Là m tươi mà n hình
+ GenericName[xh]=Hlaziya Ikhusi
+-GenericName[xx]=xxRefresh Screenxx
+ GenericName[zh_CN]=刷新å±å¹•
+ GenericName[zh_TW]=更新螢幕
+ GenericName[zu]=Vuselela kabusha Isikrini
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Utilities/xutils/Xtraceroute.desktop kdebase-branch-3.4/kappfinder/apps/Utilities/xutils/Xtraceroute.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Utilities/xutils/Xtraceroute.desktop 2005-02-04 23:14:43.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Utilities/xutils/Xtraceroute.desktop 2005-03-07 09:14:59.000000000 -0500
+@@ -10,7 +10,6 @@
+ Name[pa]=X ਰਸਤਾ ਖੋਜ
+ Name[sv]=Xtraceroute
+ Name[ta]=Xதொடரà¯à®µà®´à®¿
+-Name[xx]=xxX Traceroutexx
+ GenericName=Network Tool
+ GenericName[af]=Netwerk Program
+ GenericName[ar]=أداة الشبكة
+@@ -77,7 +76,6 @@
+ GenericName[vi]=Công cụ mạng
+ GenericName[wa]=Usteye rantoele
+ GenericName[xh]=Isixhobo Somsebenzi womnatha
+-GenericName[xx]=xxNetwork Toolxx
+ GenericName[zh_CN]=网络工具
+ GenericName[zh_TW]=網路工具
+ GenericName[zu]=Ithuluzi Loxhumano olusakazekile
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Utilities/xutils/xcalc.desktop kdebase-branch-3.4/kappfinder/apps/Utilities/xutils/xcalc.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Utilities/xutils/xcalc.desktop 2005-02-04 23:14:43.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Utilities/xutils/xcalc.desktop 2005-03-07 09:14:59.000000000 -0500
+@@ -29,7 +29,6 @@
+ Name[tg]=Мошини ҳиÑобии X
+ Name[th]=เครื่à¸à¸‡à¸„ิดเลขขà¸à¸‡ X
+ Name[uz]=X учун калкулÑтор
+-Name[xx]=xxX Calcxx
+ Name[zh_CN]=X 计算器
+ MimeType=
+ GenericName=Calculator
+@@ -97,7 +96,6 @@
+ GenericName[vi]=Máy tÃnh
+ GenericName[wa]=Carculete
+ GenericName[xh]=Umatshini wokubala
+-GenericName[xx]=xxCalculatorxx
+ GenericName[zh_CN]=计算器
+ GenericName[zh_TW]=計算機
+ GenericName[zu]=Umshini wokubala
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Utilities/xutils/xclipboard.desktop kdebase-branch-3.4/kappfinder/apps/Utilities/xutils/xclipboard.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Utilities/xutils/xclipboard.desktop 2005-02-10 23:51:47.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Utilities/xutils/xclipboard.desktop 2005-03-07 09:14:59.000000000 -0500
+@@ -44,7 +44,6 @@
+ Name[uz]=X клипборд
+ Name[ven]=Bodo yau Farisa ya X
+ Name[xh]=Ibhodi yokuqhoboshela ye X
+-Name[xx]=xxX Clipboardxx
+ Name[zh_CN]=X 剪贴æ¿
+ Name[zh_TW]=X 剪貼簿
+ MimeType=
+@@ -112,7 +111,6 @@
+ GenericName[ven]=Muvhoni wa Bodo yau Farisa
+ GenericName[vi]=Trình xem clipboard
+ GenericName[xh]=Umboniseli Webhodi eqhoboshayo
+-GenericName[xx]=xxClipboard Viewerxx
+ GenericName[zh_CN]=å‰ªè´´æ¿æŸ¥çœ‹å™¨
+ GenericName[zh_TW]=剪貼簿檢視器
+ GenericName[zu]=Umbukisi Webhodi elibophayo
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Utilities/xutils/xclock.desktop kdebase-branch-3.4/kappfinder/apps/Utilities/xutils/xclock.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Utilities/xutils/xclock.desktop 2005-02-04 23:14:43.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Utilities/xutils/xclock.desktop 2005-03-07 09:14:59.000000000 -0500
+@@ -49,7 +49,6 @@
+ Name[uz]=X учун Ñоат
+ Name[ven]=Tshifhinga tsha X
+ Name[xh]=Ikloko ye X
+-Name[xx]=xxX Clockxx
+ Name[zh_CN]=X æ—¶é’Ÿ
+ Name[zh_TW]=X 時é˜
+ Exec=xclock
+@@ -122,7 +121,6 @@
+ GenericName[ven]=Tshifhinga
+ GenericName[wa]=Ôrlodje
+ GenericName[xh]=Ikloko
+-GenericName[xx]=xxClockxx
+ GenericName[zh_CN]=æ—¶é’Ÿ
+ GenericName[zh_TW]=時é˜
+ GenericName[zu]=Iwashi
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Utilities/xutils/xconsole.desktop kdebase-branch-3.4/kappfinder/apps/Utilities/xutils/xconsole.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Utilities/xutils/xconsole.desktop 2005-02-10 23:51:47.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Utilities/xutils/xconsole.desktop 2005-03-07 09:14:59.000000000 -0500
+@@ -44,7 +44,6 @@
+ Name[tr]=X Konsol
+ Name[uz]=X учун конÑол
+ Name[xh]=Konsole ye X
+-Name[xx]=xxX Consolexx
+ Name[zh_CN]=X 控制å°
+ Name[zh_TW]=X 控制å°
+ MimeType=
+@@ -110,7 +109,6 @@
+ GenericName[ven]=Muvhoni wa Mulaedza wa Console
+ GenericName[vi]=Trình xem thông điệp console
+ GenericName[xh]=Umboniseli Womyalezo we Konsole
+-GenericName[xx]=xxConsole Message Viewerxx
+ GenericName[zh_CN]=控制å°ä¿¡æ¯æŸ¥çœ‹å™¨
+ GenericName[zh_TW]=控制å°è¨Šæ¯æª¢è¦–器
+ GenericName[zu]=Umbukisi Womyalezo Wekhonsoli
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Utilities/xutils/xload.desktop kdebase-branch-3.4/kappfinder/apps/Utilities/xutils/xload.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Utilities/xutils/xload.desktop 2005-02-10 23:51:47.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Utilities/xutils/xload.desktop 2005-03-07 09:14:59.000000000 -0500
+@@ -42,7 +42,6 @@
+ Name[th]=โหลดระบบขà¸à¸‡ X
+ Name[tr]=X Yük
+ Name[ven]=Muhwalo wa X
+-Name[xx]=xxX Loadxx
+ Name[zh_CN]=X è´Ÿè½½
+ Name[zh_TW]=X è² è¼‰
+ GenericName=Monitors System Load
+@@ -108,7 +107,6 @@
+ GenericName[ven]=Muhwalo wa sisitemu yau linda
+ GenericName[vi]=Theo dõi tải hệ thống
+ GenericName[xh]=Iphatha Ulayisho Lwendlela yokusebenza
+-GenericName[xx]=xxMonitors System Loadxx
+ GenericName[zh_CN]=监视系统负载
+ GenericName[zh_TW]=ç›£è¦–ç³»çµ±è² è¼‰
+ GenericName[zu]=Iqikelela Ukulayisha kwesistimu
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Utilities/xutils/xmag.desktop kdebase-branch-3.4/kappfinder/apps/Utilities/xutils/xmag.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Utilities/xutils/xmag.desktop 2005-02-10 23:51:47.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Utilities/xutils/xmag.desktop 2005-03-07 09:14:59.000000000 -0500
+@@ -48,7 +48,6 @@
+ Name[uz]=X учун катталаштирувчи
+ Name[ven]=Muengedzi wa X
+ Name[xh]=Umenzi mkhulu we X
+-Name[xx]=xxX Magnifierxx
+ Name[zh_CN]=X 放大镜
+ Name[zh_TW]=X 放大é¡
+ GenericName=Desktop Magnifier
+@@ -113,7 +112,6 @@
+ GenericName[ven]=Muengedzi wa Desikethopo
+ GenericName[vi]=Phóng to Desktop
+ GenericName[xh]=Umenzi mkhulu we Desktop
+-GenericName[xx]=xxDesktop Magnifierxx
+ GenericName[zh_CN]=æ¡Œé¢æ”¾å¤§é•œ
+ GenericName[zh_TW]=æ¡Œé¢æ”¾å¤§é¡
+ GenericName[zu]=Umkhulisi we-Desktop
+diff -Nru kdebase-release-3.4.0/kappfinder/apps/Utilities/xutils/xterm.desktop kdebase-branch-3.4/kappfinder/apps/Utilities/xutils/xterm.desktop
+--- kdebase-release-3.4.0/kappfinder/apps/Utilities/xutils/xterm.desktop 2005-02-04 23:14:43.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/apps/Utilities/xutils/xterm.desktop 2005-03-07 09:14:59.000000000 -0500
+@@ -67,7 +67,6 @@
+ GenericName[vi]=Trình đầu cuối
+ GenericName[wa]=Programe di terminå
+ GenericName[xh]=Inkqubo Yesixhobo sangaphandle sekhompyutha
+-GenericName[xx]=xxTerminal Programxx
+ GenericName[zh_CN]=终端程åº
+ GenericName[zh_TW]=終端機程å¼
+ GenericName[zu]=Uhlelo lwemisebenzi lwangaohandle
+@@ -115,7 +114,6 @@
+ Name[uz]=X учун терминал
+ Name[wa]=Terminå X
+ Name[xh]=Isiphelo sendlela se X
+-Name[xx]=xxX Terminalxx
+ Name[zh_CN]=X 终端
+ Name[zh_TW]=X 終端機
+ Exec=xterm
+diff -Nru kdebase-release-3.4.0/kappfinder/kappfinder.desktop kdebase-branch-3.4/kappfinder/kappfinder.desktop
+--- kdebase-release-3.4.0/kappfinder/kappfinder.desktop 2005-02-18 23:26:57.000000000 -0500
++++ kdebase-branch-3.4/kappfinder/kappfinder.desktop 2005-03-07 09:14:45.000000000 -0500
+@@ -60,7 +60,6 @@
+ Name[uk]=ЗаÑіб Ð´Ð»Ñ Ð¿Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¼ÐµÐ½ÑŽ
+ Name[uz]=Менюни Ñнгиловчи воÑита
+ Name[wa]=Usteye d' amidraedje des menus
+-Name[xx]=xxMenu Updating Toolxx
+ Name[zh_CN]=èœå•更新工具
+ X-DCOP-ServiceType=Multi
+ Categories=Qt;KDE;Settings;
+diff -Nru kdebase-release-3.4.0/kate/app/katefilelist.cpp kdebase-branch-3.4/kate/app/katefilelist.cpp
+--- kdebase-release-3.4.0/kate/app/katefilelist.cpp 2005-02-22 09:19:12.000000000 -0500
++++ kdebase-branch-3.4/kate/app/katefilelist.cpp 2005-03-11 12:00:20.000000000 -0500
+@@ -444,25 +444,22 @@
+ {
+ }
+
+-int KateFileListItem::height() const
++const QPixmap *KateFileListItem::pixmap ( int column ) const
+ {
+- int h;
+- static int iSize = IconSize( KIcon::Small );
+- if ( text( 0 ).isEmpty() )
+- h = iSize;
+- else
+- h = QMAX( iSize, listView()->fontMetrics().lineSpacing() + 1 );
+-
+- return QMAX( h, QApplication::globalStrut().height() );
+-}
+-
+-int KateFileListItem::width( const QFontMetrics &fm, const QListView* /*lv*/, int column ) const
+-{
+- static int iSize = IconSize( KIcon::Small );
+- if ( text( 0 ).isEmpty() )
+- return QMAX( iSize + 6, QApplication::globalStrut().width() );
+-
+- return QMAX( iSize + fm.width( text(column) ) + 6, QApplication::globalStrut().width() );
++ if ( column == 0) {
++ static QPixmap noPm = SmallIcon ("null");
++ static QPixmap modPm = SmallIcon("modified");
++ static QPixmap discPm = SmallIcon("modonhd");
++ static QPixmap modmodPm = SmallIcon("modmod");
++
++ const KateDocumentInfo *info = KateDocManager::self()->documentInfo(doc);
++
++ if (info && info->modifiedOnDisc)
++ return doc->isModified() ? &modmodPm : &discPm;
++ else
++ return doc->isModified() ? &modPm : &noPm;
++ }
++ return 0;
+ }
+
+ void KateFileListItem::paintCell( QPainter *painter, const QColorGroup & cg, int column, int width, int align )
+@@ -470,75 +467,49 @@
+ KateFileList *fl = (KateFileList*)listView();
+ if ( ! fl ) return;
+
+- switch ( column ) {
+- case 0:
+- {
+- static QPixmap noPm = SmallIcon ("null");
+- static QPixmap modPm = SmallIcon("modified");
+- static QPixmap discPm = SmallIcon("modonhd");
+- static QPixmap modmodPm = SmallIcon("modmod");
+-
+- const KateDocumentInfo *info = KateDocManager::self()->documentInfo(doc);
++ if ( column == 0 ) {
++ QColorGroup cgNew = cg;
+
++ // replace the base color with a different shading if necessary...
++ if ( fl->shadingEnabled() && m_viewhistpos > 1 )
++ {
+ QColor b( cg.base() );
+- if ( fl->shadingEnabled() && m_viewhistpos > 1 )
+- {
+- QColor shade = fl->viewShade();
+- QColor eshade = fl->editShade();
+- int hc = fl->histCount();
+- // If this file is in the edit history, blend in the eshade
+- // color. The blend is weighted by the position in the editing history
+- if ( fl->shadingEnabled() && m_edithistpos > 0 )
+- {
+- int ec = fl->editHistCount();
+- int v = hc-m_viewhistpos;
+- int e = ec-m_edithistpos+1;
+- e = e*e;
+- int n = QMAX(v + e, 1);
+- shade.setRgb(
+- ((shade.red()*v) + (eshade.red()*e))/n,
+- ((shade.green()*v) + (eshade.green()*e))/n,
+- ((shade.blue()*v) + (eshade.blue()*e))/n
+- );
+- }
+- // blend in the shade color.
+- // max transperancy < .5, latest is most colored.
+- float t = (0.5/hc)*(hc-m_viewhistpos+1);
+- b.setRgb(
+- (int)((b.red()*(1-t)) + (shade.red()*t)),
+- (int)((b.green()*(1-t)) + (shade.green()*t)),
+- (int)((b.blue()*(1-t)) + (shade.blue()*t))
+- );
+- }
+-
+- painter->fillRect( 0, 0, width, height(), isSelected() ? cg.highlight() : b );
+
+- if (info && info->modifiedOnDisc)
+- painter->drawPixmap( 3, 0, doc->isModified() ? modmodPm : discPm );
+- else
+- painter->drawPixmap( 3, 0, doc->isModified() ? modPm : noPm );
+-
+- if ( !text( 0 ).isEmpty() )
++ QColor shade = fl->viewShade();
++ QColor eshade = fl->editShade();
++ int hc = fl->histCount();
++ // If this file is in the edit history, blend in the eshade
++ // color. The blend is weighted by the position in the editing history
++ if ( fl->shadingEnabled() && m_edithistpos > 0 )
+ {
+- QFontMetrics fm = painter->fontMetrics();
+- painter->setPen( isSelected() ? cg.highlightedText() : cg.text() );
+-
+- static int iSize = IconSize( KIcon::Small );
+- int yPos; // vertical text position
+-
+- if ( iSize < fm.height() )
+- yPos = fm.ascent() + fm.leading()/2;
+- else
+- yPos = iSize/2 - fm.height()/2 + fm.ascent();
+-
+- painter->drawText( iSize + 4, yPos,
+- KStringHandler::rPixelSqueeze( text(0), painter->fontMetrics(), width - 20 ) );
++ int ec = fl->editHistCount();
++ int v = hc-m_viewhistpos;
++ int e = ec-m_edithistpos+1;
++ e = e*e;
++ int n = QMAX(v + e, 1);
++ shade.setRgb(
++ ((shade.red()*v) + (eshade.red()*e))/n,
++ ((shade.green()*v) + (eshade.green()*e))/n,
++ ((shade.blue()*v) + (eshade.blue()*e))/n
++ );
+ }
+- break;
++ // blend in the shade color.
++ // max transperancy < .5, latest is most colored.
++ float t = (0.5/hc)*(hc-m_viewhistpos+1);
++ b.setRgb(
++ (int)((b.red()*(1-t)) + (shade.red()*t)),
++ (int)((b.green()*(1-t)) + (shade.green()*t)),
++ (int)((b.blue()*(1-t)) + (shade.blue()*t))
++ );
++
++ cgNew.setColor(QColorGroup::Base, b);
+ }
+- default:
+- QListViewItem::paintCell( painter, cg, column, width, align );
++
++ QListViewItem::paintCell( painter, cgNew, column, width, align );
++ } else {
++ QListViewItem::paintCell( painter, cg, column, width, align );
+ }
++
+ }
+
+ int KateFileListItem::compare ( QListViewItem * i, int col, bool ascending ) const
+diff -Nru kdebase-release-3.4.0/kate/app/katefilelist.h kdebase-branch-3.4/kate/app/katefilelist.h
+--- kdebase-release-3.4.0/kate/app/katefilelist.h 2005-02-13 18:03:42.000000000 -0500
++++ kdebase-branch-3.4/kate/app/katefilelist.h 2005-03-06 11:57:52.000000000 -0500
+@@ -47,8 +47,6 @@
+ inline uint documentNumber () { return m_docNumber; }
+ inline Kate::Document * document() { return doc; }
+
+- int height() const;
+- int width( const QFontMetrics &fm, const QListView* lv, int column ) const;
+ int rtti() const { return RTTI_KateFileListItem; }
+
+ /**
+@@ -61,6 +59,7 @@
+ void setEditHistPos( int p ) { m_edithistpos = p; }
+
+ protected:
++ virtual const QPixmap *pixmap ( int column ) const;
+ void paintCell( QPainter *painter, const QColorGroup & cg, int column, int width, int align );
+ /**
+ * Reimplemented so we can sort by a number of different document properties.
+diff -Nru kdebase-release-3.4.0/kate/data/kate.desktop kdebase-branch-3.4/kate/data/kate.desktop
+--- kdebase-release-3.4.0/kate/data/kate.desktop 2005-02-04 23:14:43.000000000 -0500
++++ kdebase-branch-3.4/kate/data/kate.desktop 2005-03-07 09:15:00.000000000 -0500
+@@ -55,7 +55,6 @@
+ GenericName[uz]=Кенгайтирилган матн таҳрирчи
+ GenericName[vi]=Trình soạn văn bản tiên tiến
+ GenericName[wa]=Aspougneu di tecse avancî
+-GenericName[xx]=xxAdvanced Text Editorxx
+ GenericName[zh_CN]=高级文本编辑器
+ GenericName[zh_TW]=進階文å—編輯器
+ Name=Kate
+@@ -67,7 +66,6 @@
+ Name[ko]=카테
+ Name[pa]=ਕੇਟ
+ Name[ru]=Редактор Kate
+-Name[xx]=xxKatexx
+ MimeType=text/plain;application/x-kate-project
+ Exec=kate %U
+ X-KDE-StartupNotify=true
+diff -Nru kdebase-release-3.4.0/kate/data/kateinitplugin.desktop kdebase-branch-3.4/kate/data/kateinitplugin.desktop
+--- kdebase-release-3.4.0/kate/data/kateinitplugin.desktop 2005-02-10 23:51:47.000000000 -0500
++++ kdebase-branch-3.4/kate/data/kateinitplugin.desktop 2005-03-07 09:15:00.000000000 -0500
+@@ -49,14 +49,13 @@
+ Comment[sk]=InicializaÄný modul Kate
+ Comment[sl]=Vstavek za inicializacijo Kate
+ Comment[sr]=Kate Init прикључак
+-Comment[sr@Latn]=Kate Init dodatak
++Comment[sr@Latn]=Kate Init prikljuÄak
+ Comment[sv]=Kate-initieringsinsticksprogram
+ Comment[ta]=Kate Init செரà¯à®•௠சாதனமà¯
+ Comment[tg]=МутаÑÑалкунандаи Kate Init
+ Comment[th]=ปลั้à¸à¸à¸´à¸™à¹€à¸£à¸´à¹ˆà¸¡à¸‚à¸à¸‡ Kate
+ Comment[tr]=Kate Eklentisi
+ Comment[uk]=Втулок ініціалізації Kate
+-Comment[xx]=xxKate Init Pluginxx
+ Comment[zh_CN]=Kate åˆå§‹åŒ–æ’ä»¶
+ Comment[zh_TW]=Kate åˆå§‹å¤–掛程å¼
+
+diff -Nru kdebase-release-3.4.0/kate/data/kateplugin.desktop kdebase-branch-3.4/kate/data/kateplugin.desktop
+--- kdebase-release-3.4.0/kate/data/kateplugin.desktop 2005-02-23 00:05:31.000000000 -0500
++++ kdebase-branch-3.4/kate/data/kateplugin.desktop 2005-03-26 02:37:38.000000000 -0500
+@@ -51,12 +51,12 @@
+ Comment[pt]='Plugin' do Kate
+ Comment[pt_BR]=Plug-in do Kate
+ Comment[ro]=Modul Kate
+-Comment[ru]=Плагин Kate
++Comment[ru]=Модуль Kate
+ Comment[se]=Kate-lassemoduvla
+ Comment[sk]=Modul Kate
+ Comment[sl]=Vstavek za Kate
+ Comment[sr]=Kate-ин прикључак
+-Comment[sr@Latn]=Kate-ov dodatak
++Comment[sr@Latn]=Kate-in prikljuÄak
+ Comment[ss]=I-plugin ye Kate
+ Comment[sv]=Kate-insticksprogram
+ Comment[ta]=Kபதிபà¯à®ªà®¾à®©à¯ செரà¯à®•லà¯
+@@ -66,7 +66,6 @@
+ Comment[uk]=Втулок Kate
+ Comment[uz]=Kate учун плагин
+ Comment[xh]=Iplagi efakiweyo ye Kate
+-Comment[xx]=xxKate Pluginxx
+ Comment[zh_CN]=Kate æ’ä»¶
+ Comment[zh_TW]=Kate 外掛程å¼
+ Comment[zu]=I-Plugin ye-Kate
+diff -Nru kdebase-release-3.4.0/kate/data/kateprojectplugin.desktop kdebase-branch-3.4/kate/data/kateprojectplugin.desktop
+--- kdebase-release-3.4.0/kate/data/kateprojectplugin.desktop 2005-02-23 00:05:31.000000000 -0500
++++ kdebase-branch-3.4/kate/data/kateprojectplugin.desktop 2005-03-07 09:15:00.000000000 -0500
+@@ -51,7 +51,7 @@
+ Comment[sk]=Modul projektov Kate
+ Comment[sl]=Vstavek za projekt Kate
+ Comment[sr]=Kate-ин прикључак за пројекте
+-Comment[sr@Latn]=Kate-ov dodatak za projekte
++Comment[sr@Latn]=Kate-in prikljuÄak za projekte
+ Comment[sv]=Kate-projektinsticksprogram
+ Comment[ta]=Kate திடà¯à®Ÿ அறிகà¯à®•ை செரà¯à®•௠சாதனமà¯
+ Comment[tg]=МутаÑÑалкунандаи нақшаи Kate
+@@ -59,7 +59,6 @@
+ Comment[tr]=Kate Proje Eklentisi
+ Comment[uk]=Втулок проектів Kate
+ Comment[uz]=Kate лойиҳа плагини
+-Comment[xx]=xxKate Project Pluginxx
+ Comment[zh_CN]=Kate 项目æ’ä»¶
+ Comment[zh_TW]=Kate 專案外掛程å¼
+
+diff -Nru kdebase-release-3.4.0/kate/data/kwrite.desktop kdebase-branch-3.4/kate/data/kwrite.desktop
+--- kdebase-release-3.4.0/kate/data/kwrite.desktop 2005-02-04 23:14:43.000000000 -0500
++++ kdebase-branch-3.4/kate/data/kwrite.desktop 2005-03-07 09:15:00.000000000 -0500
+@@ -70,7 +70,6 @@
+ GenericName[vi]=Trình soạn văn bản
+ GenericName[wa]=Aspougneu di tecse
+ GenericName[xh]=Umhleli Wombhalo
+-GenericName[xx]=xxText Editorxx
+ GenericName[zh_CN]=文本编辑器
+ GenericName[zh_TW]=æ–‡å—編輯器
+ GenericName[zu]=Umlungisi wombhalo
+@@ -91,7 +90,6 @@
+ Name[sv]=Kwrite
+ Name[tg]=Ðавиштори K
+ Name[ven]=Nwala ha K
+-Name[xx]=xxKWritexx
+ MimeType=text/plain
+ Exec=kwrite %U
+ X-KDE-StartupNotify=true
+diff -Nru kdebase-release-3.4.0/kate/data/sample.desktop kdebase-branch-3.4/kate/data/sample.desktop
+--- kdebase-release-3.4.0/kate/data/sample.desktop 2005-02-23 00:05:31.000000000 -0500
++++ kdebase-branch-3.4/kate/data/sample.desktop 2005-03-07 09:15:00.000000000 -0500
+@@ -61,7 +61,6 @@
+ Name[ven]=Zwikiriputi zwa Mulingo wa Shele
+ Name[vi]=Thá» Shell Script
+ Name[xh]=Vavanya Iqokobhe Lokushicilelweyo
+-Name[xx]=xxTest Shell Scriptxx
+ Name[zh_CN]=测试 Shell 脚本
+ Name[zh_TW]=測試命令列巨集
+ Name[zu]=Vivinya Isikript segobolondo
+@@ -114,7 +113,7 @@
+ Comment[sk]=Toto je demonÅ¡tarÄný skript pre pkážku skriptovacieho rozhrania Kate.
+ Comment[sl]=To je poskusni skript, ki prikazuje skriptni vmesnik do Kate.
+ Comment[sr]=Ово је демонÑтрациона Ñкрипта за приказ Ñкриптујућег интерфејÑа за Kate.
+-Comment[sr@Latn]=Ovo je demonstraciona skripta koja pokazuje interfejs za skripte u Kate-u.
++Comment[sr@Latn]=Ovo je demonstraciona skripta za prikaz skriptujućeg interfejsa za Kate.
+ Comment[sv]=Det här är ett demonstrationsskript för att visa skriptgränssnittet i Kate
+ Comment[ta]=Kate எழà¯à®¤à¯à®¤à®¾à®•à¯à®•தà¯à®¤à¯ˆ காணà¯à®ªà®¿à®ªà¯à®ªà®¤à®±à¯à®•ான விளகà¯à®• எழà¯à®¤à¯à®¤à®¾à®•à¯à®•à®®à¯.
+ Comment[tg]= Ин Ñк нигораи намоише барои нишон додани воÑитаи нигораи Kate аÑÑ‚.
+@@ -124,7 +123,6 @@
+ Comment[ven]=Hetshi ndi tshikiriputi tsha demo u sumbedza Kate
+ Comment[vi]=Äây là script mẫu hiển thị các giao diện script cá»§a Kate
+ Comment[xh]=Oku kokushicilelweyo okuboniswayo ukubonisa ujongano olushicilelayo kwi Kate.
+-Comment[xx]=xxThis is a demo script to show off the scripting interface to Kate.xx
+ Comment[zh_CN]=这是一个演示 Kate 的脚本接å£çš„示范脚本。
+ Comment[zh_TW]=這是一個用來顯示 Kate 的巨集界é¢çš„示範巨集。
+ Comment[zu]=Lesi isikript esingumboniso ukugabisa ngomxhumanisi wokubhala kwi-Kate.
+diff -Nru kdebase-release-3.4.0/kate/data/x-kate-project.desktop kdebase-branch-3.4/kate/data/x-kate-project.desktop
+--- kdebase-release-3.4.0/kate/data/x-kate-project.desktop 2005-02-23 00:05:31.000000000 -0500
++++ kdebase-branch-3.4/kate/data/x-kate-project.desktop 2005-03-30 01:47:41.000000000 -0500
+@@ -18,6 +18,7 @@
+ Comment[cy]=Ffeil Cywaith Kate
+ Comment[da]=Kate projektfil
+ Comment[de]=Kate-Projektdatei
++Comment[el]=Î Ïόσθετο εÏγασιών του Kate
+ Comment[eo]=Kodredaktila projektdosiero
+ Comment[es]=Archivo de proyecto de Kate
+ Comment[et]=Kate projekti fail
+@@ -50,13 +51,12 @@
+ Comment[sk]=Súbor projektu Kate
+ Comment[sl]=Projektna datoteka Kate
+ Comment[sr]=Kate-ин пројектни фајл
+-Comment[sr@Latn]=Kate-ин пројектни фајл
++Comment[sr@Latn]=Kate-in projektni fajl
+ Comment[sv]=Kate-projektfil
+ Comment[ta]=Kate திடà¯à®Ÿà®ªà¯à®ªà®£à®¿ கோபà¯à®ªà¯
+ Comment[tr]=Kate Proje Dosyası
+ Comment[uk]=Файл проекту Kate
+ Comment[uz]=Kate лойиҳа файли
+-Comment[xx]=xxKate Project Filexx
+ Comment[zh_CN]=Kate 项目æ’ä»¶
+
+ [Property::X-KDE-NativeExtension]
+diff -Nru kdebase-release-3.4.0/kate/plugins/defaultproject/katedefaultproject.desktop kdebase-branch-3.4/kate/plugins/defaultproject/katedefaultproject.desktop
+--- kdebase-release-3.4.0/kate/plugins/defaultproject/katedefaultproject.desktop 2005-02-23 00:05:32.000000000 -0500
++++ kdebase-branch-3.4/kate/plugins/defaultproject/katedefaultproject.desktop 2005-03-07 09:15:01.000000000 -0500
+@@ -50,7 +50,7 @@
+ Name[sk]=Plugin štandardného projektu Kate
+ Name[sl]=Vstavek za privzeti projekt Kate
+ Name[sr]=Kate-ин подразумевани прикључак за пројекте
+-Name[sr@Latn]=Kate-ov predefinisani dodatak za projekte
++Name[sr@Latn]=Kate-in podrazumevani prikljuÄak za projekte
+ Name[sv]=Kate förvalt projektinsticksprogram
+ Name[ta]=Kate à®®à¯à®©à¯à®©à®¿à®°à¯à®•à¯à®•à¯à®®à¯ திடà¯à®Ÿ அறிகà¯à®•ை செரà¯à®•௠சாதனமà¯
+ Name[tg]=МутаÑÑалкунандаи пешфарзи нақши Kate
+@@ -58,7 +58,6 @@
+ Name[tr]=Öntanımlı Kate Proje Eklentisi
+ Name[uk]=Типовий втулок проекту Kate
+ Name[uz]=Kate андоза лойиҳа плагини
+-Name[xx]=xxKate Default Project Pluginxx
+ Name[zh_CN]=Kate 默认项目æ’ä»¶
+ Comment=Default Plugin for Projects
+ Comment[ar]=الملØÙ‚ Ø§Ù„Ø§ÙØªØ±Ø§Ø¶ÙŠ Ù„Ù„Ù…Ø´Ø§Ø±ÙŠØ¹
+@@ -106,7 +105,7 @@
+ Comment[sk]=Štandardné plugin pre projekty
+ Comment[sl]=Privzeti vstavek za projekte
+ Comment[sr]=Подразумевани прикључак за пројекте
+-Comment[sr@Latn]=Predefinisani dodatak za projekte
++Comment[sr@Latn]=Podrazumevani prikljuÄak za projekte
+ Comment[sv]=Förvalt insticksprogram för projekt
+ Comment[ta]=திடà¯à®Ÿà®¤à¯à®¤à®¿à®±à¯à®•ான நிலையான செரà¯à®•௠சாதனமà¯
+ Comment[tg]=МутаÑÑалкунандаи пешфарз барои нақшаҳо
+@@ -115,6 +114,5 @@
+ Comment[uk]=Типовий втулок Ð´Ð»Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñ–Ð²
+ Comment[uz]=Лойиҳалар учун андоза плагин
+ Comment[vi]=Plugin mặc định cho các dự án
+-Comment[xx]=xxDefault Plugin for Projectsxx
+ Comment[zh_CN]=项目的默认æ’ä»¶
+ Comment[zh_TW]=給專案用的é è¨å¤–掛程å¼
+diff -Nru kdebase-release-3.4.0/kcontrol/access/kaccess.desktop kdebase-branch-3.4/kcontrol/access/kaccess.desktop
+--- kdebase-release-3.4.0/kcontrol/access/kaccess.desktop 2005-02-18 23:26:59.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/access/kaccess.desktop 2005-03-30 01:47:42.000000000 -0500
+@@ -12,6 +12,7 @@
+ Name[cy]=Erfyn Hygyrchedd KDE
+ Name[da]=KDE Tilgængelighedsværktøj
+ Name[de]=KDE-Zugangshilfe
++Name[el]=ΕÏγαλείο Ï€Ïοσιτότητας του KDE
+ Name[eo]=KDE-ilo por Alirebleco
+ Name[es]=Herramienta de accesibilidad de KDE
+ Name[et]=KDE hõlbustusvahend
+@@ -44,13 +45,12 @@
+ Name[sk]=KDE sprÃstupnenie
+ Name[sl]=Orodje za dostopnost KDE
+ Name[sr]=KDE алатка за приÑтупачноÑÑ‚
+-Name[sr@Latn]=KDE алатка за приÑтупачноÑÑ‚
++Name[sr@Latn]=KDE alatka za pristupaÄnost
+ Name[sv]=Handikappverktyg för KDE
+ Name[ta]=KDE அணà¯à®•à¯à®®à¯ கரà¯à®µà®¿
+ Name[tr]=KDE Erişilebilirlik Aracı
+ Name[uk]=Утиліта ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¾ÑтупноÑті KDE
+ Name[uz]=KDE қулайлик воÑитаÑи
+-Name[xx]=xxKDE Accessibility Toolxx
+ Name[zh_CN]=KDE 辅助工具
+ Exec=kaccess
+ X-DCOP-ServiceType=None
+diff -Nru kdebase-release-3.4.0/kcontrol/access/kcmaccess.cpp kdebase-branch-3.4/kcontrol/access/kcmaccess.cpp
+--- kdebase-release-3.4.0/kcontrol/access/kcmaccess.cpp 2005-02-16 10:01:38.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/access/kcmaccess.cpp 2005-03-18 10:06:23.000000000 -0500
+@@ -29,6 +29,7 @@
+ #include <kshortcut.h>
+ #include <kkeynative.h>
+
++#include <X11/Xlib.h>
+ #include <X11/XKBlib.h>
+ #define XK_MISCELLANY
+ #define XK_XKB_KEYS
+diff -Nru kdebase-release-3.4.0/kcontrol/access/kcmaccess.desktop kdebase-branch-3.4/kcontrol/access/kcmaccess.desktop
+--- kdebase-release-3.4.0/kcontrol/access/kcmaccess.desktop 2005-02-10 23:51:48.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/access/kcmaccess.desktop 2005-03-07 09:15:01.000000000 -0500
+@@ -78,7 +78,6 @@
+ Name[vi]=Hỗ trợ
+ Name[wa]=Accessibilité
+ Name[xh]=Unikezelo
+-Name[xx]=xxAccessibilityxx
+ Name[zh_CN]=辅助
+ Name[zh_TW]=輔助
+ Name[zu]=Ukungena
+@@ -145,7 +144,6 @@
+ Comment[ven]=Khwinifhadzani madzhenele uitela vhathu vha zwihole
+ Comment[vi]=Há»— trợ ngưá»i tà n táºt
+ Comment[xh]=Phucula unikekezeleko lwabantu abakhubazekileyo
+-Comment[xx]=xxImprove accessibility for disabled personsxx
+ Comment[zh_CN]=方便残疾人使用的辅助功能
+ Comment[zh_TW]=方便傷殘人士使用
+ Comment[zu]=Ukwenza ukungena kwabantu abakhubazekile kube lula
+@@ -202,7 +200,6 @@
+ Keywords[uk]=доÑтуп,доÑтупніÑть,глухий,каліка,дзвінок,аудіодзвінок,відеодзвінок,клавіатура,клавіші,липкі клавіші,пружні клавіші,повільні клавіші,Ð½Ð°Ð²Ñ–Ð³Ð°Ñ†Ñ–Ñ Ð¼Ð¸ÑˆÑ–,цифрова клавіатура
+ Keywords[ven]=dzhena,dzheneaho,dzingandevhe,bele,bele i pfalaho,bele i vhonalaho,khiibodo,khii,khii i nambatelaho,khii i fhufhaho,khii i lengaho,lwendo lwa mausu,num pad
+ Keywords[xh]=nikezela,unikezelo,ayiva,yonakalisiwe,intsimbi,intsimbi evakalayo, intsimbi ebonakalayo,ibhodi yezitshixo,izitshixo,isithixo esincangathi, izitshixo ezilungisiweyo,izitshixo ezinengxolo,izitshixo ezicothayo,indlela yokubeka i mouse endaweni,inkatha ye num
+-Keywords[xx]=xxaccess,accessibility,deaf,impaired,bell,audible bell,visible bell,Keyboard,keys,sticky keys,bounce keys,slow keys,mouse navigation,num padxx
+ Keywords[zh_CN]=access,accessibility,deaf,impaired,bell,audible bell,visible bell,Keyboard,keys,sticky keys,bounce keys,slow keys,mouse navigation,num pad,å¯ç”¨æ€§,è‹,键盘,粘滞键,é¼ æ ‡å¯¼èˆª,å¯è§†é“ƒå£°
+ Keywords[zh_TW]=access,accessibility,deaf,impaired,bell,audible bell,visible bell,Keyboard,keys,sticky keys,bounce keys,slow keys,mouse navigation,num pad,使用,è¾,鈴è²,è½å¾—見的鈴,看得見的鈴,éµç›¤,按éµ,æ»‘é¼ å°Žå‘,數å—éµ
+ Keywords[zu]=ngena,ukungena,okuthuli,kukhubazekile,insimbi,insimbiezwakalayo, insimbi ebonakalayo,okhiye,okhiye abanamathelayo,okhiyeababhampayo,okhiye abahamba kancane,ukuzula kwe-mouse,num pad
+diff -Nru kdebase-release-3.4.0/kcontrol/accessibility/accessibility.desktop kdebase-branch-3.4/kcontrol/accessibility/accessibility.desktop
+--- kdebase-release-3.4.0/kcontrol/accessibility/accessibility.desktop 2005-02-10 23:51:48.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/accessibility/accessibility.desktop 2005-03-07 09:15:01.000000000 -0500
+@@ -77,7 +77,6 @@
+ Name[vi]=Hỗ trợ
+ Name[wa]=Accessibilité
+ Name[xh]=Unikezelo
+-Name[xx]=xxAccessibilityxx
+ Name[zh_CN]=辅助
+ Name[zh_TW]=輔助
+ Name[zu]=Ukungena
+@@ -144,7 +143,6 @@
+ Comment[ven]=Khwinifhadzani madzhenele uitela vhathu vha zwihole
+ Comment[vi]=Há»— trợ ngưá»i tà n táºt
+ Comment[xh]=Phucula unikekezeleko lwabantu abakhubazekileyo
+-Comment[xx]=xxImprove accessibility for disabled personsxx
+ Comment[zh_CN]=方便残疾人使用的辅助功能
+ Comment[zh_TW]=方便傷殘人士使用
+ Comment[zu]=Ukwenza ukungena kwabantu abakhubazekile kube lula
+@@ -201,7 +199,6 @@
+ Keywords[uk]=доÑтуп,доÑтупніÑть,глухий,каліка,дзвінок,аудіодзвінок,відеодзвінок,клавіатура,клавіші,липкі клавіші,пружні клавіші,повільні клавіші,Ð½Ð°Ð²Ñ–Ð³Ð°Ñ†Ñ–Ñ Ð¼Ð¸ÑˆÑ–,цифрова клавіатура
+ Keywords[ven]=dzhena,dzheneaho,dzingandevhe,bele,bele i pfalaho,bele i vhonalaho,khiibodo,khii,khii i nambatelaho,khii i fhufhaho,khii i lengaho,lwendo lwa mausu,num pad
+ Keywords[xh]=nikezela,unikezelo,ayiva,yonakalisiwe,intsimbi,intsimbi evakalayo, intsimbi ebonakalayo,ibhodi yezitshixo,izitshixo,isithixo esincangathi, izitshixo ezilungisiweyo,izitshixo ezinengxolo,izitshixo ezicothayo,indlela yokubeka i mouse endaweni,inkatha ye num
+-Keywords[xx]=xxaccess,accessibility,deaf,impaired,bell,audible bell,visible bell,Keyboard,keys,sticky keys,bounce keys,slow keys,mouse navigation,num padxx
+ Keywords[zh_CN]=access,accessibility,deaf,impaired,bell,audible bell,visible bell,Keyboard,keys,sticky keys,bounce keys,slow keys,mouse navigation,num pad,å¯ç”¨æ€§,è‹,键盘,粘滞键,é¼ æ ‡å¯¼èˆª,å¯è§†é“ƒå£°
+ Keywords[zh_TW]=access,accessibility,deaf,impaired,bell,audible bell,visible bell,Keyboard,keys,sticky keys,bounce keys,slow keys,mouse navigation,num pad,使用,è¾,鈴è²,è½å¾—見的鈴,看得見的鈴,éµç›¤,按éµ,æ»‘é¼ å°Žå‘,數å—éµ
+ Keywords[zu]=ngena,ukungena,okuthuli,kukhubazekile,insimbi,insimbiezwakalayo, insimbi ebonakalayo,okhiye,okhiye abanamathelayo,okhiyeababhampayo,okhiye abahamba kancane,ukuzula kwe-mouse,num pad
+diff -Nru kdebase-release-3.4.0/kcontrol/arts/arts.desktop kdebase-branch-3.4/kcontrol/arts/arts.desktop
+--- kdebase-release-3.4.0/kcontrol/arts/arts.desktop 2005-02-10 23:51:49.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/arts/arts.desktop 2005-03-29 01:24:37.000000000 -0500
+@@ -73,7 +73,6 @@
+ Name[vi]=Hệ thống âm thanh
+ Name[wa]=Sistinme di son
+ Name[xh]=Indlela yokusebenza Yesandi
+-Name[xx]=xxSound Systemxx
+ Name[zh_CN]=声音系统
+ Name[zh_TW]=è²éŸ³ç³»çµ±
+ Name[zu]=Isistimu yomsindo
+@@ -140,7 +139,6 @@
+ Comment[vi]=Cấu hình server âm thanh
+ Comment[wa]=Apontiaedje do sistinme di son
+ Comment[xh]=Uqwalaselo Lwendlela yokusebenza Yesandi
+-Comment[xx]=xxSound System Configurationxx
+ Comment[zh_CN]=声音系统é…ç½®
+ Comment[zh_TW]=è²éŸ³ç³»çµ±çµ„æ…‹
+ Comment[zu]=Inhlanganiselo yesistimu yomsindo
+@@ -178,7 +176,7 @@
+ Keywords[nl]=aRts,sound server,artsd,audio,sound,geluidsserver,geluid,opstarten,netwerk ,netwerktransparantie,priority,prioriteit,duplex,full duplex,response time,responstijd,volume,KMix,kanalen,login,aanmelden,synthesizer,muziek,mixer,midi,
+ Keywords[nn]=aRts,lydtenar,artsd,lyd,audio,oppstart,nettverkstransparens,transparens,prioritet,dupleks,full dupleks,svartid,responstid,miksar,volum,lydstyrke,KMix,innlogging,synt,musikk
+ Keywords[nso]=aRts,Seabi sa Modumo,artsd,Kwagalo,Modumo,thomiso, bobontsha tsakamosola bja kgokagano,bobontsha tsaka mosola,kgethokgolo,kgatiso, kgatiso yeo e feleletsego,nako ya phetolo,Setswaki,Volume,KMix,Motswako,tsena,MIDI, mokopanyi,mmino
+-Keywords[pl]=aRts,Serwer dźwiękowy,artsd,Audio,Dzwięk,uruchomienie,przeźroczystość dla sieci,przeźroczystość,priorytet,dupleks,pełny dupleks,czas odpowiedzi,mikser,głośność, KMix,Mix,logowanie,MIDI,syntezator,muzyka,rozpoczęcie pracy
++Keywords[pl]=aRts,Serwer dźwiękowy,artsd,Audio,Dźwięk,uruchomienie,przeźroczystość dla sieci,przeźroczystość,priorytet,dupleks,pełny dupleks,czas odpowiedzi,mikser,głośność, KMix,Mix,logowanie,MIDI,syntezator,muzyka,rozpoczęcie pracy
+ Keywords[pt]=aRts,servidor de som,artsd,áudio,som,iniciar,transparência de rede,transparência,prioridade,duplex,full duplex,tempo de resposta,mistura,volume,KMix,Misturador,MIDI,ligação,sintetizador,música
+ Keywords[pt_BR]=aRts,servidor de som,artsd,áudio,som,inicialização,transparência de rede,transparência,prioridade,duplex,full-duplex,tempo de resposta,mixer,volume,KMix,Mix,login,MIDI,sintetizador,música
+ Keywords[ro]=aRts,server de sunet,artsd,audio,sunet,pornire,startare,transparenţă de reţea,transparenţă,prioritate,duplex,duplex integral,timp de răspuns,mixer,volum,KMix,logare,MIDI,sintetizator,muzică
+@@ -194,7 +192,6 @@
+ Keywords[uz]=aRts,Товуш Ñервери,artsd,Ðудио,Товуш,startup,тармоқ шаффофлиги,шаффофлик,муҳимлик даражаÑи,дуплекÑ,тўлиқ дуплекÑ,жавоб бериш вақти,МикÑер,Товуш баландлиги,KMix,Mix,кириш,MIDI,Ñинтезатор,муÑиқа
+ Keywords[ven]=aRts,Siva ya Mubvumo,artsd,Pfala,Mubvumo,thoma,vhudavhidzano ha khagala,khagala,tshipikwa,dubulekisi,dubulekisi yo fhelelaho, tshifhinga tshau fhindula,tshitanganisi,Volomu,KMix,Tanganisa, u loga,MIDI,tshiiti,muzika
+ Keywords[xh]=aRts,Umncedisi Wesandi,artsd,Evakalayo,qalisa kwakhona,umsebenzi womnatha obinisa ngaphaya, Isandi,Isandi,isiqalo,ubono ngaphaya komsebenzi womnatha,bona ngaphaya,intshukumo yokuqala,into ephindwe kabinini,into ephindwe kabini epheleleyo,ixesha lokujongana nokuthile
+-Keywords[xx]=xxaRts,Sound Server,artsd,Audio,Sound,startup,network transparency,transparency,priority,duplex,full duplex,response time,Mixer,Volume,KMix,Mix,login,MIDI,synthesizer,musicxx
+ Keywords[zh_CN]=aRts,Sound Server,artsd,Audio,Sound,startup,network transparency,transparency,priority,duplex,full duplex,response time,声音æœåС噍,声音,å¯åЍ,ç½‘ç»œé€æ˜Ž,优先级,å…¨åŒå·¥,å“应时间
+ Keywords[zh_TW]=aRts,Sound Server,artsd,Audio,Sound,startup,network transparency,transparency,priority,duplex,full duplex,response time,Mixer,Volume,KMix,Mix,login,MIDI,synthesizer,musica,è²éŸ³ä¼ºæœå™¨,è²éŸ³,啟動,ç¶²è·¯é€æ˜Ž,優先級,全雙工,響應時間,混音器,音é‡,登入
+ Keywords[zu]=aRts,Umlekeleli Womsindo,artsd,Okuzwakalayo,Umsindo,Isiqaliso, ukubonakala koxhumano olusakazekile,Ukubonakala ngale,ukubaluleka,okunezingxemye ezimbili,okunezingxenye ezimbili eziphendulanayo,isikhathi sokuphendula, Umxubi,Izinga lomsindo,KMix,Xuba,ngena ngaphakathi,MIDI,umlungisi womsindo, umculo
+diff -Nru kdebase-release-3.4.0/kcontrol/background/background.desktop kdebase-branch-3.4/kcontrol/background/background.desktop
+--- kdebase-release-3.4.0/kcontrol/background/background.desktop 2005-02-10 23:51:49.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/background/background.desktop 2005-03-26 02:37:39.000000000 -0500
+@@ -78,7 +78,6 @@
+ Name[vi]=Ảnh ná»n
+ Name[wa]=Fond
+ Name[xh]=Indawo yangasemva
+-Name[xx]=xxBackgroundxx
+ Name[zh_CN]=背景
+ Name[zh_TW]=背景
+ Name[zu]=Inkundla yangemuva
+@@ -104,7 +103,7 @@
+ Comment[fa]=تغییر تنظیمات پس‌زمینه
+ Comment[fi]=Muuta taustan asetuksia
+ Comment[fr]=Configuration du fond d'écran
+-Comment[fy]=Eftergrûnynstellingen wizigje
++Comment[fy]=Eftergrûnynstellings wizigje
+ Comment[gl]=Cambia-las opcións do fondo
+ Comment[he]=×©×™× ×•×™ הגדרות הרקע
+ Comment[hi]=पृषà¥à¤ à¤à¥‚मि सेटिंग बदलें
+@@ -146,7 +145,6 @@
+ Comment[vi]=Thay đổi thiết láºp ảnh ná»n
+ Comment[wa]=Candjî les apontiaedjes do fond del waitroûle
+ Comment[xh]=Tshintsha izicwangciso zendawo yangasemva
+-Comment[xx]=xxChange the background settingsxx
+ Comment[zh_CN]=更改背景设置
+ Comment[zh_TW]=改變背景è¨å®š
+ Comment[zu]=Shintsha izilungiselelo zendawo yangemuva
+@@ -204,7 +202,6 @@
+ Keywords[uz]=орқа фон,иш Ñтоллари,ранглар,раÑмлар,wallpapers,блендинг,balance,кÑш,multiple wallpapers,pixmap
+ Keywords[ven]=murahu,desikithopo,mivhala,zwifanyiso,mabammbiri a luvhondoni,tanganisa,linganisa,cache,mabammbiri a luvhondoni manzhi,tsumbamashango ya phikisi
+ Keywords[xh]=indawo yangasemva,desktops,imibala,imibala,imifanekiso,amaphepha odonga,uxubo,isikali,indawo efihlakeleyo yokufihla izixhobo,amaphepha odonga amaninzi,imaphu ye pix
+-Keywords[xx]=xxbackground,desktops,colors,colours,images,wallpapers,blending,balance,cache,multiple wallpapers,pixmapxx
+ Keywords[zh_CN]=background,desktops,colors,colours,images,wallpapers,blending,balance,cache,multiple wallpapers,pixmap,背景,桌é¢,颜色,图åƒ,墙纸,混色,平衡,缓冲,多个墙纸,ä½å›¾
+ Keywords[zh_TW]=background,desktops,colors,colours,images,wallpapers,blending,balance,cache,multiple wallpapers,pixmap,背景,桌é¢,é¡è‰²,å½±åƒ,桌布,混色,平衡,ç·©è¡,多個桌布,ä½åœ–
+ Keywords[zu]=inkundla yangemuva,ama-desktop,imibala,imibala,izithombe,amaphepha ezindonga,ukuxubanisa,ukulinganisa,cache,amaphepha ezindonga eziningi,pixmap
+diff -Nru kdebase-release-3.4.0/kcontrol/background/bgdialog.cpp kdebase-branch-3.4/kcontrol/background/bgdialog.cpp
+--- kdebase-release-3.4.0/kcontrol/background/bgdialog.cpp 2005-02-20 13:04:07.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/background/bgdialog.cpp 2005-04-04 17:06:07.000000000 -0400
+@@ -501,7 +501,7 @@
+ QString pattern = KImageIO::pattern();
+ #ifdef HAVE_LIBART
+ pattern = "*.svg *.svgz " + pattern;
+- pattern += "\n*.svg *.SVG *.svgz *.SVGZ|Scalable Vector Graphics";
++ pattern += i18n("\n*.svg *.SVG *.svgz *.SVGZ|Scalable Vector Graphics");
+ #endif
+ dlg.setFilter(pattern);
+ dlg.setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly );
+diff -Nru kdebase-release-3.4.0/kcontrol/background/bgsettings.cpp kdebase-branch-3.4/kcontrol/background/bgsettings.cpp
+--- kdebase-release-3.4.0/kcontrol/background/bgsettings.cpp 2004-12-05 11:05:40.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/background/bgsettings.cpp 2005-03-30 16:42:08.000000000 -0500
+@@ -666,6 +666,11 @@
+ KStandardDirs *d = KGlobal::dirs();
+ if (m_WallpaperList == list)
+ return;
++
++ QString currentWallpaper;
++ if ((m_MultiMode == InOrder) && (m_CurrentWallpaper < (int) m_WallpaperFiles.count()))
++ currentWallpaper = m_WallpaperFiles[m_CurrentWallpaper];
++
+ dirty = hashdirty = true;
+ m_WallpaperList.clear();
+ for(QStringList::ConstIterator it = list.begin();
+@@ -674,7 +679,9 @@
+ m_WallpaperList.append(d->relativeLocation("wallpaper", *it));
+ }
+ updateWallpaperFiles();
+- changeWallpaper(true);
++ // Try to keep the current wallpaper
++ m_CurrentWallpaper = m_WallpaperFiles.findIndex(currentWallpaper) - 1;
++ changeWallpaper(m_CurrentWallpaper < 0);
+ }
+
+
+diff -Nru kdebase-release-3.4.0/kcontrol/background/bgwallpaper.cpp kdebase-branch-3.4/kcontrol/background/bgwallpaper.cpp
+--- kdebase-release-3.4.0/kcontrol/background/bgwallpaper.cpp 2005-01-07 11:04:39.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/background/bgwallpaper.cpp 2005-04-04 17:06:07.000000000 -0400
+@@ -20,6 +20,8 @@
+ Boston, MA 02111-1307, USA.
+ */
+
++#include <config.h>
++
+ #include <qcheckbox.h>
+ #include <qevent.h>
+ #include <qpushbutton.h>
+@@ -142,8 +144,14 @@
+
+ void BGMultiWallpaperDialog::slotAdd()
+ {
++ QString pattern = KImageIO::pattern();
++#ifdef HAVE_LIBART
++ pattern = "*.svg *.svgz " + pattern;
++ pattern += i18n("\n*.svg *.SVG *.svgz *.SVGZ|Scalable Vector Graphics");
++#endif
++
+ KFileDialog fileDialog(KGlobal::dirs()->findDirs("wallpaper", "").first(),
+- KImageIO::pattern(), this,
++ pattern, this,
+ 0L, true);
+
+ fileDialog.setCaption(i18n("Select Image"));
+diff -Nru kdebase-release-3.4.0/kcontrol/bell/bell.desktop kdebase-branch-3.4/kcontrol/bell/bell.desktop
+--- kdebase-release-3.4.0/kcontrol/bell/bell.desktop 2005-02-10 23:51:49.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/bell/bell.desktop 2005-03-07 09:15:03.000000000 -0500
+@@ -79,7 +79,6 @@
+ Name[vi]=Chuông hệ thống
+ Name[wa]=Xhîlete do sistinme
+ Name[xh]=Indlela yokusebenza Yentsimbi
+-Name[xx]=xxSystem Bellxx
+ Name[zh_CN]=系统铃声
+ Name[zh_TW]=系統鈴è²
+ Name[zu]=Insimbi yesistimu
+@@ -151,7 +150,6 @@
+ Comment[vi]=Cấu hình Chuông hệ thống
+ Comment[wa]=Apontiaedje del xhîlete do sistinme
+ Comment[xh]=Uqwalaselo Lwendlela Yentsimbi
+-Comment[xx]=xxSystem Bell Configurationxx
+ Comment[zh_CN]=系统铃声é…ç½®
+ Comment[zh_TW]=系統鈴è²çµ„æ…‹
+ Comment[zu]=Inhlanganiselo Yensimbi Yesistimu
+@@ -213,7 +211,6 @@
+ Keywords[ven]=Bele,Zwo u pfala,Mubvumo,Volomu,Fhufhela,Tshikhala
+ Keywords[vi]=Chuông,Audio, Âm thanh,Âm lượng,Mức độ,khoảng thá»i gian
+ Keywords[xh]=Intsimbi,Evakalayo,iSandi,Umqulu,Uniko lobude obufunekayo,Ixesha ezalithatha
+-Keywords[xx]=xxBell,Audio,Sound,Volume,Pitch,Durationxx
+ Keywords[zh_CN]=Bell,Audio,Sound,Volume,Pitch,Duration,å“铃,音频,音é‡,音调,æŒç»æ—¶é—´
+ Keywords[zh_TW]=Bell,Audio,Sound,Volume,Pitch,Duration,響鈴,è²éŸ³,音é‡,音調,æŒçºŒæ™‚é–“
+ Keywords[zu]=Insimbi,Okuzwakalayo,Usimdo,Izinga lomsindo,Umnswininizo,Ubude besikhathi
+diff -Nru kdebase-release-3.4.0/kcontrol/clock/clock.desktop kdebase-branch-3.4/kcontrol/clock/clock.desktop
+--- kdebase-release-3.4.0/kcontrol/clock/clock.desktop 2005-02-10 23:51:49.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/clock/clock.desktop 2005-03-07 09:15:03.000000000 -0500
+@@ -81,7 +81,6 @@
+ Name[vi]=Ngà y & Thá»i gian
+ Name[wa]=Date et eure
+ Name[xh]=Umhla & Ixesha
+-Name[xx]=xxDate & Timexx
+ Name[zh_CN]=日期和时间
+ Name[zh_TW]=日期和時間
+ Name[zu]=Usuku & Isikhathi
+@@ -154,7 +153,6 @@
+ Comment[vi]=Ngà y và thiết láºp thá»i gian
+ Comment[wa]=Apontiaedjes del date et l'Â eure
+ Comment[xh]=Izicwangciso zomhla kunye nexesha
+-Comment[xx]=xxDate and time settingsxx
+ Comment[zh_CN]=日期和时间设置
+ Comment[zh_TW]=日期和時間è¨å®šå€¼
+ Comment[zu]=Izilungiso Zosuku kanye nesikhathi
+@@ -211,7 +209,6 @@
+ Keywords[uz]=Ñоат,Ñана,вақт,вақт зонаÑи
+ Keywords[vi]=đồng hồ, ngà y, thá»i gian, múi giá»
+ Keywords[wa]=ôrlodje,date,eure,coisse d' eureye
+-Keywords[xx]=xxclock,date,time,time zonexx
+ Keywords[zh_CN]=clock,date,time,time zone,时钟,日期,时间,时区
+
+ Categories=Qt;KDE;X-KDE-settings-system;
+diff -Nru kdebase-release-3.4.0/kcontrol/colors/colors.desktop kdebase-branch-3.4/kcontrol/colors/colors.desktop
+--- kdebase-release-3.4.0/kcontrol/colors/colors.desktop 2005-02-10 23:51:50.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/colors/colors.desktop 2005-03-07 09:15:04.000000000 -0500
+@@ -79,7 +79,6 @@
+ Name[vi]=MÃ u
+ Name[wa]=Coleurs
+ Name[xh]=Imibala
+-Name[xx]=xxColorsxx
+ Name[zh_CN]=颜色
+ Name[zh_TW]=é¡è‰²
+ Name[zu]=Imibala
+@@ -154,7 +153,6 @@
+ Comment[vi]=Thiết láºp mà u
+ Comment[wa]=Apontiaedje des coleurs
+ Comment[xh]=Izicwangciso zombala
+-Comment[xx]=xxColor settingsxx
+ Comment[zh_CN]=颜色设置
+ Comment[zh_TW]=é¡è‰²è¨å®š
+ Comment[zu]=Izilungiso zombala
+@@ -219,7 +217,6 @@
+ Keywords[ven]=mivhala,mivhala,tshikimu,mbambe,Widget mivhala,Tshikimu tsha Muvhala
+ Keywords[vi]=mà u,mà u sắc,phối hợp,tương phản,Mà u của Widget,Phối hợp Mầu
+ Keywords[xh]=imibala,imibala,udweliso,isiboniso somahluko,Imibala ye widget,Udweliso Olunombala
+-Keywords[xx]=xxcolors,colours,scheme,contrast,Widget colors,Color Schemexx
+ Keywords[zh_CN]=colors,colours,scheme,contrast,Widget colors,Color Scheme,颜色,方案,对比,部件颜色,é…色方案
+ Keywords[zh_TW]=colors,colours,scheme,contrast,Widget colors,Color Scheme,é¡è‰²,å°æ¯”,元件é¡è‰²,é…色
+ Keywords[zu]=imibala,imibala,iplani,ukugqama,imibala ye-Widget,Iplani Lombala
+diff -Nru kdebase-release-3.4.0/kcontrol/colors/colorscm.cpp kdebase-branch-3.4/kcontrol/colors/colorscm.cpp
+--- kdebase-release-3.4.0/kcontrol/colors/colorscm.cpp 2005-02-21 19:55:02.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/colors/colorscm.cpp 2005-03-24 17:41:22.000000000 -0500
+@@ -240,7 +240,7 @@
+
+ cbShadeList = new QCheckBox(i18n("Shade sorted column in lists"), this);
+ stackLayout->addWidget(cbShadeList);
+- connect(cbShadeList, SIGNAL(toggled(bool)), this, SLOT(changed()));
++ connect(cbShadeList, SIGNAL(toggled(bool)), this, SLOT(slotShadeSortColumnChanged(bool)));
+
+ QWhatsThis::add(cbShadeList,
+ i18n("Check this box to show the sorted column in a list with a shaded background"));
+@@ -333,7 +333,7 @@
+ cfg->writeEntry("visitedLinkColor", cs->visitedLink, true, true);
+ cfg->writeEntry("alternateBackground", cs->alternateBackground, true, true);
+
+- cfg->writeEntry("shadeSortColumn", cbShadeList->isChecked());
++ cfg->writeEntry("shadeSortColumn", cs->shadeSortColumn, true, true);
+
+ cfg->setGroup( "WM" );
+ cfg->writeEntry("activeForeground", cs->aTxt, true, true);
+@@ -470,6 +470,7 @@
+ config->writeEntry("linkColor", cs->link);
+ config->writeEntry("visitedLinkColor", cs->visitedLink);
+ config->writeEntry("alternateBackground", cs->alternateBackground);
++ config->writeEntry("shadeSortColumn", cs->shadeSortColumn);
+
+ delete config;
+ }
+@@ -715,6 +716,13 @@
+ slotSelectColor(col);
+ }
+
++void KColorScheme::slotShadeSortColumnChanged(bool b)
++{
++ cs->shadeSortColumn = b;
++ sCurrentScheme = QString::null;
++
++ emit changed(true);
++}
+
+ /*
+ * Read a color scheme into "cs".
+diff -Nru kdebase-release-3.4.0/kcontrol/colors/colorscm.h kdebase-branch-3.4/kcontrol/colors/colorscm.h
+--- kdebase-release-3.4.0/kcontrol/colors/colorscm.h 2005-01-12 13:49:41.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/colors/colorscm.h 2005-03-24 17:41:22.000000000 -0500
+@@ -56,6 +56,7 @@
+ void slotWidgetColor(int);
+ void slotColorForWidget(int, const QColor &);
+ void slotPreviewScheme(int);
++ void slotShadeSortColumnChanged(bool);
+
+ private:
+ void setColorName( const QString &name, int id );
+diff -Nru kdebase-release-3.4.0/kcontrol/componentchooser/EXAMPLE.desktop kdebase-branch-3.4/kcontrol/componentchooser/EXAMPLE.desktop
+--- kdebase-release-3.4.0/kcontrol/componentchooser/EXAMPLE.desktop 2005-02-10 23:51:50.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/componentchooser/EXAMPLE.desktop 2005-03-07 09:15:04.000000000 -0500
+@@ -58,7 +58,6 @@
+ Name[ven]=Dziona la vhudi lenali nanga uitela tshikirini tsha khomupwutha yanu
+ Name[vi]=Má»™t cái tên đẹp bạn đã chá»n cho giao diện cá»§a bạn
+ Name[xh]=Igama elihle olikhetileyo kujongano lwakho
+-Name[xx]=xxA nice name you have chosen for your interfacexx
+ Name[zh_CN]=选择您的界é¢çš„好åå—
+ Name[zh_TW]=您為您的界é¢é¸æ“‡çš„好åå—
+ Name[zu]=Igama elihle olikhethele umxhumanisi wakho
+@@ -123,7 +122,6 @@
+ Comment[ven]=Thalutshedzo yau thusa ya tshikirini tsha khomupwutha uitela bogisi la mafhungo la tshaula ntha
+ Comment[vi]=Má»™t mô tả giao diện có Ãch cho há»™p thông tinh ở bên trên cùng bên phải
+ Comment[xh]=Uchazo oluluncedo lojongano olungaphezulu ekunene kwebhokisi yolwazi
+-Comment[xx]=xxA helpful description of the interface for the top right info boxxx
+ Comment[zh_CN]=å³ä¾§ä¿¡æ¯æ¡†ä¸ç•Œé¢çš„ç®€çŸæè¿°
+ Comment[zh_TW]=用於å³ä¸Šæ–¹è³‡è¨Šæ–¹å¡Šç•Œé¢çš„æœ‰ç”¨æ•˜è¿°
+ Comment[zu]=Incazelo esizayo yomxhumanisi yebhokisi lolwazi eliphezulu ngakwesokudla
+diff -Nru kdebase-release-3.4.0/kcontrol/componentchooser/componentchooser.desktop kdebase-branch-3.4/kcontrol/componentchooser/componentchooser.desktop
+--- kdebase-release-3.4.0/kcontrol/componentchooser/componentchooser.desktop 2005-02-10 23:51:50.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/componentchooser/componentchooser.desktop 2005-03-22 12:38:03.000000000 -0500
+@@ -72,7 +72,6 @@
+ Name[ven]=Tshinangi tsha tshipida
+ Name[vi]=Bá»™ chá»n thà nh phần
+ Name[xh]=Inxenye Yomkhethi
+-Name[xx]=xxComponent Chooserxx
+ Name[zh_CN]=组件选择程åº
+ Name[zh_TW]=å…ƒä»¶é¸æ“‡ç¨‹å¼
+ Name[zu]=Umkhethi welunga
+@@ -135,7 +134,6 @@
+ Comment[ven]=Nangani zwipida zwa default uitela tshumelo dzo vhambanaho
+ Comment[vi]=Chá»n các thà nh phần mặc định cho các dịch vụ khác nhau
+ Comment[xh]=Khetha ingxenye zokungagqibekanga kweenkonzo eziliqela
+-Comment[xx]=xxChoose the default components for various servicesxx
+ Comment[zh_CN]=选择å„ç§æœåŠ¡çš„é»˜è®¤ç»„ä»¶
+ Comment[zh_TW]=鏿“‡å„種æœå‹™çš„é è¨å…ƒä»¶
+ Comment[zu]=Khetha amalunga endalo emisebenzi eyahlukene
+@@ -163,7 +161,7 @@
+ Keywords[hi]=अवयव,अवयव चयनक,संसाधन,ईमेल कà¥à¤²à¤¾à¤à¤‚ट,टरà¥à¤®à¤¿à¤¨à¤² à¤à¤®à¥à¤²à¥‡à¤Ÿà¤°
+ Keywords[hu]=komponensek,komponensválasztó,erőforrások,levelezőprogram,terminálemuláció
+ Keywords[is]=eining,einingar,einingaval,auðlindir,póstforrit,skjáhermir
+-Keywords[it]=componenti,scleta componenti,risorse,email,client di posta,posta elettronica,terminale,emulatore di terminale
++Keywords[it]=componenti,scelta componenti,risorse,email,client di posta,posta elettronica,terminale,emulatore di terminale
+ Keywords[ja]=コンãƒãƒ¼ãƒãƒ³ãƒˆ,é¸æŠž,リソース,Eメール,クライアント,ターミナル エミュレータ
+ Keywords[lo]=ຄàºàº¡à»‚ພເນັດ,ເລືàºàºàº„àºàº¡à»‚ພເນັນ,ຊັບພະàºàº²àºàºàº™
+ Keywords[lt]=components,component chooser,resources, email client, terminal emulator, komponentai, komponentų parinkėjas, resursai, e. pašto klientas, terminalo emuliatorius
+@@ -193,7 +191,6 @@
+ Keywords[ven]=Zwipida,tshipida,zwishumiswa,mushumisani wa email, tshitevhedzeli tsha theminala
+ Keywords[vi]=thà nh phần, bá»™ chá»n thà nh phần, tà i nguyên, trình Ä‘á»c thư Ä‘iện tá», bá»™ mô phá»ng đầu cuối
+ Keywords[xh]=iingxenye,umkhethi wengxenye,amacebo, umxhasi weposi, umlinganiseli wesiphelo sendlela
+-Keywords[xx]=xxcomponents,component chooser,resources, email client, terminal emulatorxx
+ Keywords[zh_CN]=components,component chooser,resources, email client, terminal emulator,组件,组件选择程åº,资æº,电å邮件程åº,终端仿真器
+ Keywords[zh_TW]=components,component chooser,resources, email client, terminal emulator,元件,å…ƒä»¶é¸æ“‡ç¨‹å¼,資æº,é›»å郵件客戶端程å¼,終端機模擬程å¼
+ Keywords[zu]=amalunga,umkhethi welunga,amathuluzi okusebenza,umxhasi weposi lekhomputha,umlingisi wethuluzi langaphandle
+diff -Nru kdebase-release-3.4.0/kcontrol/componentchooser/componentservices/kcm_browser.desktop kdebase-branch-3.4/kcontrol/componentchooser/componentservices/kcm_browser.desktop
+--- kdebase-release-3.4.0/kcontrol/componentchooser/componentservices/kcm_browser.desktop 2005-02-23 00:05:32.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/componentchooser/componentservices/kcm_browser.desktop 2005-03-30 01:47:42.000000000 -0500
+@@ -28,7 +28,7 @@
+ Name[hr]=Web pretraživaÄ
+ Name[hsb]=Web-browser
+ Name[hu]=Webböngésző
+-Name[is]=Vefskoðari
++Name[is]=Vafri
+ Name[it]=Navigazione Web
+ Name[ja]=Webブラウザ
+ Name[ko]=웹 íƒìƒ‰ê¸°
+@@ -52,7 +52,7 @@
+ Name[sk]=Webový prehliadaÄ
+ Name[sl]=Spletni brskalnik
+ Name[sr]=Веб прегледач
+-Name[sr@Latn]=Veb pretraživaÄ
++Name[sr@Latn]=Veb pregledaÄ
+ Name[ss]=Ibrawuza ye-Web
+ Name[sv]=Webbläsning
+ Name[ta]=வலை உலாவி
+@@ -65,7 +65,6 @@
+ Name[vi]=Trình duyệt Web
+ Name[wa]=Betchteu waibe
+ Name[xh]=Umkhangeli zincwadi we Web
+-Name[xx]=xxWeb Browserxx
+ Name[zh_CN]=Web æµè§ˆå™¨
+ Name[zh_TW]=ç¶²é ç€è¦½å™¨
+ Name[zu]=Umcingi we-Web
+@@ -78,6 +77,7 @@
+ Comment[cy]=Dyma lle gallwch ffurfweddu eich porydd gwe rhagosodol. Dylai pob rhaglen KDE lle gallwch ddewis hypergysylltau ddefnyddio'r gosodiad yma.
+ Comment[da]=Her kan du indstille din standard-browser. Alle KDE-programmer hvor du kan vælge hyperlink skulle respektere denne indstilling.
+ Comment[de]=Hier können Sie Ihren Standard-Browser festlegen. Alle KDE-Programme, in denen Sie Verknüpfungen (Links) aufrufen können, benutzen diese Einstellung.
++Comment[el]=Εδώ μποÏείτε να Ïυθμίσετε τον Ï€ÏοκαθοÏισμÎνο πεÏιηγητή Î¹ÏƒÏ„Î¿Ï ÏƒÎ±Ï‚. Όλες οι εφαÏμογÎÏ‚ του KDE στις οποίες μποÏείτε να επιλÎξετε υπεÏσυνδÎσεις θα Ï€ÏÎπει να χÏησιμοποιοÏν αυτή τη ÏÏθμιση.
+ Comment[en_GB]=Here you can configure your default web browser. All KDE applications in which you can select hyperlinks should honour this setting.
+ Comment[eo]=Tiu servo ebligas, ke vi elektas vian norman vidigilon. Ĉiuj KDEa aplikaĵoj, kiuj necesas vidigilon, uzos tiun agordon.
+ Comment[es]=Este servicio le permite configurar su navegador de Internet predeterminado. Todas las aplicaciones KDE que precisan acceso a hiperenlaces deberÃan reconocer esta opción.
+@@ -91,7 +91,7 @@
+ Comment[hi]=यहाठपर आप अपने डिफ़ॉलà¥à¤Ÿ वेब बà¥à¤°à¤¾à¤‰à¤œà¤¼à¤° को कॉनà¥à¤«à¤¼à¤¿à¤—र कर सकते हैं. सà¤à¥€ केडीई अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤—ों में जिसमें हायपरलिंक चà¥à¤¨ सकते हैं, वे इस विनà¥à¤¯à¤¾à¤¸ का इसà¥à¤¤à¥‡à¤®à¤¾à¤² करेंगे.
+ Comment[hu]=Itt lehet beállÃtani, mi legyen az alapértelmezett webböngészÅ‘. Az összes KDE-alkalmazásnak figyelembe kell vennie ezt az értéket levelezési funkció használata esetén.
+ Comment[is]=Þessi þjónusta leyfir þér að skilgreina sjálfgefinn vafra. Öll KDE forrit sem gera þér kleift að smella á tengla ættu að virða þessa stillingu.
+-Comment[it]= Definisci il tuo browser web predefinito. Tutte le applicazioni di KDE in cui è selezionabile un collegamento dovrebbero rispettare questa impostazione.
++Comment[it]=Definisci il tuo browser web predefinito. Tutte le applicazioni di KDE in cui è selezionabile un collegamento dovrebbero rispettare questa impostazione.
+ Comment[ja]=ã“ã“ã§æ¨™æº–ã®ã‚¦ã‚§ãƒ–ブラウザをè¨å®šã§ãã¾ã™ã€‚ å…¨ã¦ã®KDEアプリケーションã§ãƒã‚¤ãƒ‘ãƒ¼ãƒªãƒ³ã‚¯ã‚’é¸æŠžã—ãŸå ´åˆã“ã®è¨å®šã‚’å‚ç…§ã—ã¾ã™ã€‚
+ Comment[lt]=Ši tarnyba leidžia jums nustatyti Jūsų numatytą žiniatinklio naršyklę. Visos KDE programos, kuriose galima spragtelėti hipersaitus, turi atsižvelgti į šį nustatymą.
+ Comment[mk]=Тука може да го конфигурирате вашиот Ñтандарден вебпрелиÑтувач. Сите KDE-апликации во кои може да изберете хиперврÑки ќе го почитуваат ова поÑтавување.
+@@ -110,11 +110,10 @@
+ Comment[sk]=Tu môžete nastaviÅ¥ Å¡tandardný prehliadaÄ. VÅ¡etky aplikácie KDE, v ktorým môžete aktivovaÅ¥ URL, by mali použÃvaÅ¥ toto nastavenie.
+ Comment[sl]=Tu lahko nastavite vaš privzeti spletni brskalnik. Vsi programi za KDE, ki ga uporabljajo, bi morali upoštevati te nastavitve.
+ Comment[sr]=Овде можете да подеÑите ваш подразумевани веб прегледач. Сви KDE програми у којима можете да одаберете хипервезе требало би да поштују ово подешавање.
+-Comment[sr@Latn]=Овде можете да подеÑите ваш подразумевани веб прегледач. Сви KDE програми у којима можете да одаберете хипервезе требало би да поштују ово подешавање.
++Comment[sr@Latn]=Ovde možete da podesite vaÅ¡ podrazumevani veb pregledaÄ. Svi KDE programi u kojima možete da odaberete hiperveze trebalo bi da poÅ¡tuju ovo podeÅ¡avanje.
+ Comment[sv]=Här kan du anpassa förvald webbläsare. Alla KDE-program där du kan välja hyperlänkar bör följa inställningen.
+ Comment[ta]=இநà¯à®¤ சேவை உஙà¯à®•ளà¯à®Ÿà¯ˆà®¯ à®®à¯à®©à¯à®©à®¿à®°à¯à®¨à¯à®¤ மின௠அஞà¯à®šà®²à¯à®‰à®±à¯à®ªà¯à®ªà®¿à®©à®° வடிவமைதà¯à®¤à¯à®•à¯à®•ொளà¯à®³ அனà¯à®®à®¤à®¿à®•à¯à®•ிறதà¯. மினà¯à®…ஞà¯à®šà®²à¯ உறà¯à®ªà¯à®ªà®¿à®©à®°à¯ பயனà¯à®ªà®¾à®Ÿà¯à®¤à¯‡à®µà¯ˆà®ªà¯à®ªà®Ÿà¯à®•ிற எலà¯à®²à®¾ கேடிஇபயனà¯à®ªà®¾à®Ÿà¯à®•ளà¯à®®à¯ இநà¯à®¤ அமைபà¯à®ªà¯ˆà®¨à®¿à®±à¯à®µà®µà¯‡à®£à¯à®Ÿà¯à®®à¯.
+ Comment[tr]=Burada öntanımlı web tarayıcınızı yapılandırabilrsiniz. Tüm KDE uygulamalarında bulunan bağlantılar bu seçenek kullanılarak açılacaktır.
+ Comment[uk]=Тут можна налаштувати ваш типовий навігатор Тенет. Ð’ÑÑ– програми KDE, в Ñкі підтримують роботу з гіперпоÑиланнÑми повинні кориÑтуватиÑÑ Ñ†Ð¸Ð¼Ð¸ уÑтановками.
+-Comment[xx]=xxHere you can configure your default web browser. All KDE applications in which you can select hyperlinks should honor this setting.xx
+ Comment[zh_CN]=您å¯ä»¥åœ¨è¿™é‡Œé…置您默认的 Web æµè§ˆå™¨ã€‚您在所有 KDE 应用程åºä¸å•击超级链接时都应该éµä»Žæ¤è®¾ç½®ã€‚
+ configurationType=internal_browser
+diff -Nru kdebase-release-3.4.0/kcontrol/componentchooser/componentservices/kcm_kemail.desktop kdebase-branch-3.4/kcontrol/componentchooser/componentservices/kcm_kemail.desktop
+--- kdebase-release-3.4.0/kcontrol/componentchooser/componentservices/kcm_kemail.desktop 2005-02-23 00:05:32.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/componentchooser/componentservices/kcm_kemail.desktop 2005-03-26 02:37:39.000000000 -0500
+@@ -5,7 +5,7 @@
+ Name[be]=Кліент Ñлектроннай пошты
+ Name[bg]=Клиент за е-поща
+ Name[bn]=ই-মেইল কà§à¦²à¦¾à§Ÿà§‡à¦¨à§à¦Ÿ
+-Name[br]=Arval Postel
++Name[br]=Kliant Postel
+ Name[bs]=Email klijent
+ Name[ca]=Client de correu
+ Name[cs]=Emailový klient
+@@ -51,7 +51,7 @@
+ Name[sk]=E-mailový klient
+ Name[sl]=Odjemalec e-pošte
+ Name[sr]=Е-поштанÑки клијент
+-Name[sr@Latn]=Klijent za elektronsku poštu
++Name[sr@Latn]=E-poštanski klijent
+ Name[ss]=Likhasimende le email
+ Name[sv]=E-postklient
+ Name[ta]=மினà¯à®©à®žà¯à®šà®²à¯ வேணà¯à®Ÿà®¿
+@@ -64,7 +64,6 @@
+ Name[vi]=Trình quản lý thư Ä‘iện tá»
+ Name[wa]=Cliyint d'Â emilaedje
+ Name[xh]=Umxhasi we Email
+-Name[xx]=xxEmail Clientxx
+ Name[zh_CN]=电å邮件客户程åº
+ Name[zh_TW]=é›»å郵件客戶端程å¼
+ Name[zu]=Umxhasi weposi lekhomputha
+@@ -87,7 +86,7 @@
+ Comment[fa]=این سرویس کارگیر Ù¾ÛŒØ´â€ŒÙØ±Ø¶ پست‌الکترونیتان را تنظیم می‌کند. تمام Ù†Ø±Ù…â€ŒØ§ÙØ²Ø§Ø±Ù‡Ø§ÛŒ KDE Ú©Ù‡ نیاز به دسترسی به‌ کارگیر پست الکترونیکی دارند از این تنظیمات تبعیت خواهند کرد.
+ Comment[fi]=Tämän palvelun avulla voit määritellä oletussähköpostiohjelman. Kaikki KDE-sovellukset, jotka käyttävät sähköpostiohjelmaa, käyttävät tätä asetusta.
+ Comment[fr]=Ce service vous permet de configurer votre client de courrier par défaut. Toutes les applications KDE qui ont besoin d'accéder à un client de courrier électronique doivent accepter ce réglage.
+-Comment[fy]=Mei dizze tsjinst kinst dyn standert e-postprogramma ynstelle. KDE-tapassingen dy tagong ta in e-postprogramma neadich hawwe sille dizze ynstellingen brûke.
++Comment[fy]=Mei dizze tsjinst kinst dyn standert e-postprogramma ynstelle. KDE-tapassingen dy tagong ta in e-postprogramma neadich hawwe sille dizze ynstellings brûke.
+ Comment[gl]=Este servicio permÃtelle configurar os seu axente de correo predeterminado. Tódalas aplicacións de KDE que precisen acceso á aplicación de correo electrónico deberÃan ter en conta esta opción.
+ Comment[he]=שירות ×–×” מ×פשר לך להגדיר ×ת ×ª×•×›× ×™×ª הדו×"ל שתשמש כברירת מחדל. כל יישומי KDE שיזדקקו לגישה ×ל ×ª×•×›× ×™×ª דו×"ל יתחשבו בהגדרה זו.
+ Comment[hi]=यह सेवा आपको आपके डिफ़ॉलà¥à¤Ÿ ईमेल कà¥à¤²à¤¾à¤à¤‚ट को कॉनà¥à¤«à¤¼à¤¿à¤—र करने की सà¥à¤µà¥€à¤•ृति देती है. सà¤à¥€ केडीई अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— जो ईमेल कà¥à¤²à¤¾à¤à¤‚ट अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— à¤à¤•à¥à¤¸à¥‡à¤¸ करते हैं, वे इस विनà¥à¤¯à¤¾à¤¸ इसà¥à¤¤à¥‡à¤®à¤¾à¤² करेंगे.
+@@ -114,7 +113,7 @@
+ Comment[sk]=Táto služba umožňuje nastaviÅ¥ Å¡tandardného klienta poÅ¡ty. VÅ¡etky aplikácie KDE, ktoré použÃvajú poÅ¡tového klienta, by mali použÃvaÅ¥ toto nastavenie.
+ Comment[sl]=Ta storitev vam omogoÄa nastavitev vaÅ¡ega privzetega e-poÅ¡tnega odjemalca. Vsi programi za KDE, ki ga uporabljajo, bi morali upoÅ¡tevati te nastavitve.
+ Comment[sr]=Овај ÑÐµÑ€Ð²Ð¸Ñ Ð²Ð°Ð¼ дозвољава да подеÑите подразумевани клијент за електронÑку пошту. Сви KDE програми, којима је потребан приÑтуп електронÑкој пошти, требало би да поштују ову поÑтавку.
+-Comment[sr@Latn]=Ovaj servis vam dozvoljava da podesite podrazumevanog klijenta za elektronsku poštu. Svi KDE programi, kojima je potreban pristup elektronskoj pošti, bi trebalo da poštuju ovu postavku.
++Comment[sr@Latn]=Ovaj servis vam dozvoljava da podesite podrazumevani klijent za elektronsku poštu. Svi KDE programi, kojima je potreban pristup elektronskoj pošti, trebalo bi da poštuju ovu postavku.
+ Comment[sv]=Den här tjänsten låter dig anpassa förvald e-postklient. Alla KDE-program som behöver använda e-postklient ska använda den här inställningen
+ Comment[ta]=இநà¯à®¤ சேவை உஙà¯à®•ளà¯à®Ÿà¯ˆà®¯ à®®à¯à®©à¯à®©à®¿à®°à¯à®¨à¯à®¤ மின௠அஞà¯à®šà®²à¯ உறà¯à®ªà¯à®ªà®¿à®©à®°à¯ˆ வடிவமைதà¯à®¤à¯à®•௠கொளà¯à®³ அனà¯à®®à®¤à®¿à®•à¯à®•ிறதà¯. மின௠அஞà¯à®šà®²à¯ உறà¯à®ªà¯à®ªà®¿à®©à®°à¯ பயனà¯à®ªà®¾à®Ÿà¯ தேவைபà¯à®ªà®Ÿà¯à®•ிற எலà¯à®²à®¾ கேடிஇ பயனà¯à®ªà®¾à®Ÿà¯à®•ளà¯à®®à¯ இநà¯à®¤ அமைபà¯à®ªà¯ˆ நிறà¯à®µà®µà¯‡à®£à¯à®Ÿà¯à®®à¯.
+ Comment[tg]= Ин ÑервиÑи коргири пешфарзи почтаи Ñлектроникиатонро танзим мекунед. Тамоми нармафзорҳои KDE ки ниёз ба даÑтраÑи ба коргири почтаи Ñлектроникӣ доранд аз ин танзимоти табии хоҳанд кард.
+@@ -124,7 +123,6 @@
+ Comment[ven]=Tshumelo iyi ini tendela u dzudzanya mushumisani wa email ya default yanu. Apulifikhesheni dza KDE dzothe dzine dza toda apulifikhesheni ya mushimisani wa email i fanela u thonifha mavhekanyele aya.
+ Comment[vi]=Dịch vụ nà y cho phép bạn cấu hình trình quản lý thư Ä‘iện tá» mặc định. Tất cả các chương trình cá»§a KDE cần má»™t trình gá»i thư Ä‘iện tá» Ä‘á»u dá»±a và o thiết láºp nà y.
+ Comment[xh]=Lenkonzo ikuvumela ukuba uqwalasele umxhasi wakho we email. Zonke izicelo ezidinga unikezelo kumxhasi we email wesicelo kufuneka yamkele esisicelo.
+-Comment[xx]=xxThis service allows you to configure your default email client. All KDE applications which need access to an email client application should honor this setting.xx
+ Comment[zh_CN]=æ¤æœåŠ¡å…许您é…置您的默认电å邮件程åºã€‚所有需è¦è®¿é—®ç”µå邮件客户程åºçš„ KDE 应用程åºéƒ½éµä»Žæ¤è®¾ç½®ã€‚
+ Comment[zh_TW]=這個æœå‹™å…許您è¨å®šæ‚¨çš„é è¨é›»å郵件客戶端程å¼ã€‚所有需è¦ä½¿ç”¨é›»å郵件客戶端應用程å¼çš„ KDE 應用程å¼éƒ½æ‡‰è©²éµå¾žé€™å€‹è¨å®šã€‚
+ Comment[zu]=Lo msebenzi ukuvumela ukuthi uhlanganisele umxhasi weposi lekhomputha wendalo. Bonke abayaleli be-KDE abadinga ukungena kumyaleli womxhasi weposi lekhomputha kumele bahloniphe lesi silingiselelo.
+diff -Nru kdebase-release-3.4.0/kcontrol/componentchooser/componentservices/kcm_terminal.desktop kdebase-branch-3.4/kcontrol/componentchooser/componentservices/kcm_terminal.desktop
+--- kdebase-release-3.4.0/kcontrol/componentchooser/componentservices/kcm_terminal.desktop 2005-02-23 00:05:32.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/componentchooser/componentservices/kcm_terminal.desktop 2005-03-07 09:15:04.000000000 -0500
+@@ -65,7 +65,6 @@
+ Name[ven]=Mulingedzisi wa theminala
+ Name[vi]=Trình mô phá»ng Terminal
+ Name[xh]=Umzami kulinganisela ngokulinganayo Wendlela yesiphelo
+-Name[xx]=xxTerminal Emulatorxx
+ Name[zh_CN]=终端仿真器
+ Name[zh_TW]=終端機模擬程å¼
+ Name[zu]=Umlingisi wangaphandle
+@@ -115,7 +114,7 @@
+ Comment[sk]=Táto služba umožňuje nastaviÅ¥ Å¡tandardný emulátor terminálu. VÅ¡etky aplikácie KDE, ktoré použÃvajú emulátor terminálu, by mali použÃvaÅ¥ toto nastavenie.
+ Comment[sl]=Ta storitev vam omogoÄa nastavitev vaÅ¡ega privzetega terminalskega emulatorja. Vsi programi za KDE, ki ga uporabljajo, bi morali upoÅ¡tevati te nastavitve.
+ Comment[sr]=Овај ÑÐµÑ€Ð²Ð¸Ñ Ð²Ð°Ð¼ дозвољава да подеÑите подразумевани емулатор терминала. Сви KDE програми, који позивају емулатор терминала, требало би да поштују ову поÑтавку.
+-Comment[sr@Latn]=Ovaj servis vam dozvoljava da podesite podrazumevani emulator terminala. Svi KDE programi, koji pozivaju emulator terminala, bi trebalo da poštuju ovu postavku.
++Comment[sr@Latn]=Ovaj servis vam dozvoljava da podesite podrazumevani emulator terminala. Svi KDE programi, koji pozivaju emulator terminala, trebalo bi da poštuju ovu postavku.
+ Comment[sv]=Den här tjänsten låter dig anpassa din förvalda terminalemulator. Alla KDE-program som startar ett terminalprogram ska använda den här inställningen
+ Comment[ta]=இநà¯à®¤ சேவை உஙà¯à®•ளà¯à®Ÿà¯ˆà®¯ à®®à¯à®©à¯à®©à®¿à®°à¯à®¨à¯à®¤ கடைசி போடà¯à®Ÿà®¿à®¯à®¾à®³à®° வடிவமைதà¯à®¤à¯à®•௠கொளà¯à®³ அனà¯à®®à®¤à®¿à®•à¯à®•ிறதà¯. கடைசி போடà¯à®Ÿà®¿à®¯à®¾à®³à®°à¯ பயனà¯à®ªà®¾à®Ÿà¯ தேவைபà¯à®ªà®Ÿà¯à®•ிற எலà¯à®²à®¾ கேடிஇ பயனà¯à®ªà®¾à®Ÿà¯à®•ளà¯à®®à¯ இநà¯à®¤ அமைபà¯à®ªà¯ˆ நிறà¯à®µà®µà¯‡à®£à¯à®Ÿà¯à®®à¯.
+ Comment[tg]= Ин ÑÐµÑ€Ð²Ð¸Ñ Ð±Ð° шумо иҷозат медиҳад ÑмулÑтори поёнаи пешфарзатонро танзим кунед. Тамоми нармафзорҳои KDE ки ба ÑмулÑтори поёна ниёз доранд ба ин танзимот Ñҳтиром хоҳанд гузошт.
+@@ -125,7 +124,6 @@
+ Comment[ven]=Tshumelo iyi ini tendela u dzudzanya tshilingedzi tsha theminala ya default. Apulifikhesheni dzothe dza KDE dzine dza shandukisa apulifikhesheni ya tshilingedzi tsha theminala dzi fanela u thonifha mavhekanyele aya.
+ Comment[vi]=Dịch vụ nà y cho phép bạn cấu hình trình quản lý thư Ä‘iện tá» mặc định. Tất cả các chương trình cá»§a KDE cần má»™t trình gá»i thư Ä‘iện tá» Ä‘á»u dá»±a và o thiết láºp nà y.
+ Comment[xh]=Lenkonzo ikuvumela ukuba ukwazi ukuqwalasela isiphelo esingagqibekanga sendlela yokulinganisa.Zonke izicelo ze KDE eziqalisa isicelo sesiphelo sendlela yokulinganisa kumele zisamkele esisicwangciso.
+-Comment[xx]=xxThis service allows you to configure your default terminal emulator. All KDE applications which invoke a terminal emulator application should honor this setting.xx
+ Comment[zh_CN]=æ¤æœåŠ¡å…许您é…置您的默认终端仿真器。所有调用终端仿真程åºçš„ KDE 应用程åºéƒ½éµä»Žæ¤è®¾ç½®ã€‚
+ Comment[zh_TW]=這個æœå‹™å…許您è¨å®šæ‚¨çš„é è¨çµ‚端機模擬程å¼ã€‚所有呼å«çµ‚端機模擬程å¼çš„ KDE 應用程å¼éƒ½æ‡‰è©²éµå¾žé€™å€‹è¨å®šã€‚
+ Comment[zu]=Lo msebenzi ukuvumela ukuthi uhlanganisele umlingisi wangaphandle wendalo. Bonke abayaleli be-KDE ababiza umyaleli womlingisi wangaphandle bahloniphe lesi silingiselelo.
+diff -Nru kdebase-release-3.4.0/kcontrol/crypto/crypto.desktop kdebase-branch-3.4/kcontrol/crypto/crypto.desktop
+--- kdebase-release-3.4.0/kcontrol/crypto/crypto.desktop 2005-02-10 23:51:51.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/crypto/crypto.desktop 2005-03-26 02:37:39.000000000 -0500
+@@ -69,7 +69,6 @@
+ Name[vi]=Máºt mã
+ Name[wa]=Criptografeye
+ Name[xh]=Imfihlo
+-Name[xx]=xxCryptoxx
+ Name[zh_CN]=åŠ å¯†
+ Name[zh_TW]=åŠ å¯†
+ Comment=Configure SSL, manage certificates, and other cryptography settings
+@@ -92,7 +91,7 @@
+ Comment[fa]=تنظیم SSl,مدیریت اعتبارنامه‌ها,و سایر تنظیمات رمزنگاری
+ Comment[fi]=SSL-, sertifikaatti- ja muut salausasetukset
+ Comment[fr]=Configuration de SSL, de la cryptographie et gestion des certificats
+-Comment[fy]=Hjir kinst SSL, sertifikatenbehear en oare kryptografyske ynstellingen wizigje
++Comment[fy]=Hjir kinst SSL, sertifikatenbehear en oare kryptografyske ynstellings wizigje
+ Comment[gl]=Configurar SSL, xestionar certicados, e outras configuracións de cifrado
+ Comment[he]=×©×™× ×•×™ ההגדרות של SSL, × ×™×”×•×œ תעודות, והגדרות ×”×¦×¤× ×” ×חרות
+ Comment[hi]=कॉनà¥à¤«à¤¼à¤¿à¤—र à¤à¤¸à¤à¤¸à¤à¤², पà¥à¤°à¤®à¤¾à¤£à¤ªà¤¤à¥à¤° पà¥à¤°à¤¬à¤‚धन, तथा अनà¥à¤¯ कà¥à¤°à¤¿à¤ªà¥à¤Ÿà¥‹à¤—à¥à¤°à¤¾à¤«à¥€ विनà¥à¤¯à¤¾à¤¸ करे
+@@ -136,7 +135,6 @@
+ Comment[ven]=Khonifiga SSL, i laula sethifikheithi, na dzine mbekanyo dza khiraiputogirafi
+ Comment[vi]=Cấu hình SSL, quản là giấy chứng nháºn và các thiết láºp vá» máºt mã khác
+ Comment[xh]=Qwalasela i SSL, yenza iziqinisekiso, kunye nezinye izicwangciso zokufihlakeleyo
+-Comment[xx]=xxConfigure SSL, manage certificates, and other cryptography settingsxx
+ Comment[zh_CN]=é…ç½® SSL,管ç†è¯ä¹¦,å’Œå…¶å®ƒçš„åŠ å¯†è®¾ç½®
+ Comment[zh_TW]=è¨å®š SSLã€ç®¡ç†æ†‘è‰å’Œå…¶å®ƒçš„åŠ å¯†è¨å®š
+ Comment[zu]=Hlanganisela i-SSL, phatha izitifiketi, kanye nezinye izilungiselelo zokuqaqa umbhalo ongaqondakali
+@@ -197,7 +195,6 @@
+ Keywords[ven]=Crypto,Krypto,Cryptography,encryption,SSL,https,sethifikheithi,ciphers,TLS,tsireledza,vhutsireledzi
+ Keywords[vi]=Máºt mã,Krypto,Máºt mã há»c,mã hóa,SSL,https, giấy chứng nháºn, ciphers, TLS, bảo máºt, tÃnh bảo máºt
+ Keywords[xh]=Imfihlo,Imfihlo,Okufihlakeleyo,ufihlo,SSL,https,iziqinisekiso,imibhalo efihlakeleyo,TLS,khusela,ukhuseleko
+-Keywords[xx]=xxCrypto,Krypto,Cryptography,encryption,SSL,https,certificates,ciphers,TLS,secure,securityxx
+ Keywords[zh_CN]=Crypto,Krypto,Cryptography,encryption,SSL,https,certificates,ciphers,TLS,secure,security,åŠ å¯†,åŠ å¯†å¦,è¯ä¹¦,密ç ,安全
+ Keywords[zh_TW]=Crypto,Krypto,Cryptography,encryption,SSL,https,certificates,ciphers,TLS,secure,security,åŠ å¯†,åŠ å¯†å¸,証書,密碼,安全
+ Keywords[zu]=Crypto,Krypto,Ukuqaqa umbhalo ongaqondakali,SSL,https, izitifiketi,imibhalo yekhodi,TLS,vikela,ukuvikela
+diff -Nru kdebase-release-3.4.0/kcontrol/css/kcmcss.desktop kdebase-branch-3.4/kcontrol/css/kcmcss.desktop
+--- kdebase-release-3.4.0/kcontrol/css/kcmcss.desktop 2005-02-10 23:51:51.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/css/kcmcss.desktop 2005-03-07 09:15:05.000000000 -0500
+@@ -71,7 +71,6 @@
+ Name[uk]=Таблиці Ñтилів
+ Name[ven]=Siatari la Tshitaela
+ Name[xh]=Amakhasi ohlobo oluthile
+-Name[xx]=xxStylesheetsxx
+ Name[zh_CN]=æ ·å¼è¡¨
+ Name[zh_TW]=樣å¼è¡¨å–®
+ Name[zu]=Amakhasi esitayela
+@@ -135,7 +134,6 @@
+ Comment[ven]=Dzudzanyani tshitaela tsha siatari tshino shumiswa u nekedza masiatari a webu
+ Comment[vi]=Cấu hình stylesheets được dùng để hỗ trợ HTML
+ Comment[xh]=Qwalasela uhlobo lwamakhasi asebenziswa ukuchaza amaphepha e web
+-Comment[xx]=xxConfigure the stylesheets used to render web pagesxx
+ Comment[zh_CN]=é…ç½®ç”¨æ¥æ˜¾ç¤ºç½‘é¡µæ ·å¼è¡¨
+ Comment[zh_TW]=è¨å®šç”¨ä¾†é¡¯ç¤ºç¶²é 的樣å¼è¡¨å–®
+ Comment[zu]=Hlanganisela amakhasi esitayela asetshenziswa ukunikeza amakhasi e-web
+@@ -196,7 +194,6 @@
+ Keywords[uz]=CSS,HTML,уÑлуб,stylesheet,қулайликлар
+ Keywords[ven]=CSS,HTML,tshitaela,siatari la tshitaela,u dzhenea
+ Keywords[xh]=CSS,HTML,uhlobo,ikhasi lohlobo oluthile,unikezelo
+-Keywords[xx]=xxCSS,HTML,style,stylesheet,accessibilityxx
+ Keywords[zh_CN]=CSS,HTML,style,stylesheet,accessibility,é£Žæ ¼,æ ·å¼è¡¨,辅助功能
+ Keywords[zh_TW]=CSS,HTML,style,stylesheet,accessibility,é¢¨æ ¼,é¢¨æ ¼è¡¨å–®,å¯ç”¨æ€§
+ Keywords[zu]=CSS,HTML,isitayela,ikhasi lesitayela,ukungena
+diff -Nru kdebase-release-3.4.0/kcontrol/display/display.desktop kdebase-branch-3.4/kcontrol/display/display.desktop
+--- kdebase-release-3.4.0/kcontrol/display/display.desktop 2005-02-23 00:05:32.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/display/display.desktop 2005-03-26 02:37:39.000000000 -0500
+@@ -61,7 +61,6 @@
+ Name[uk]=ДиÑплей
+ Name[uz]=ДиÑплей
+ Name[wa]=HÃ¥ynaedje
+-Name[xx]=xxDisplayxx
+ Name[zh_CN]=显示
+ Name[zh_TW]=顯示
+ Comment=Display Settings
+@@ -83,7 +82,7 @@
+ Comment[eu]=Pantailaren konfigurazioa
+ Comment[fi]=Näytön asetukset
+ Comment[fr]=Paramètres d'affichage
+-Comment[fy]=Byldskerm ynstellingen
++Comment[fy]=Byldskerm ynstellings
+ Comment[gl]=Opcións da Pantalla
+ Comment[he]=הגדרות תצוגה
+ Comment[hi]=रूप-रंग विनà¥à¤¯à¤¾à¤¸
+@@ -110,7 +109,7 @@
+ Comment[sk]=Nastavenie displeja
+ Comment[sl]=Nastavitve zaslona
+ Comment[sr]=Подешавања екрана
+-Comment[sr@Latn]=Postavke ekrana
++Comment[sr@Latn]=Podešavanja ekrana
+ Comment[sv]=Anpassa bildskärm
+ Comment[ta]=அமைபà¯à®ªà¯à®•ளை காடà¯à®Ÿà¯
+ Comment[tg]=Танзимоти намоиш
+@@ -120,7 +119,6 @@
+ Comment[uz]=ДиÑплейнинг моÑламалари
+ Comment[vi]=Thiết láºp mà u
+ Comment[wa]=Apontiaedjes do HÃ¥ynaedje
+-Comment[xx]=xxDisplay Settingsxx
+ Comment[zh_CN]=显示设置
+ Comment[zh_TW]=顯示è¨å®š
+ Categories=Qt;KDE;X-KDE-settings-hardware;
+diff -Nru kdebase-release-3.4.0/kcontrol/dnssd/kcm_kdnssd.desktop kdebase-branch-3.4/kcontrol/dnssd/kcm_kdnssd.desktop
+--- kdebase-release-3.4.0/kcontrol/dnssd/kcm_kdnssd.desktop 2005-02-23 00:05:32.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/dnssd/kcm_kdnssd.desktop 2005-03-28 02:02:17.000000000 -0500
+@@ -2,20 +2,23 @@
+ Comment=Configure service discovery
+ Comment[bg]=Конфигуриране на откриването на уÑлуги
+ Comment[bn]=সারà§à¦à¦¿à¦¸ উদà§à¦˜à¦¾à¦Ÿà¦¨ কনফিগার করà§à¦¨
++Comment[bs]=Podesite otkrivanje servisa
+ Comment[ca]=Configura el descobriment de serveis
+ Comment[cs]=Nastavenà hledánà služeb
+ Comment[da]=Indstil opdagelse af tjeneste
+ Comment[de]=Diensteerkennung einrichten
+ Comment[es]=Configura el buscador de servicios
+ Comment[et]=Teenuste tuvastamise seadistamine
++Comment[eu]=Konfiguratu igartze zerbitzua
+ Comment[fi]=Asetuspalvelimen löytäminen
+ Comment[fr]=Configuration de la découverte de service
+ Comment[fy]=Tsjinst waarnimming ynstellen
+ Comment[he]=הגדרת זיהוי השירותי×
+ Comment[hi]=सेवा डिसà¥à¤•वरी कॉनà¥à¤«à¤¼à¤¿à¤—र करें
+ Comment[hu]=A szolgáltatásdetektálás beállÃtásai
+-Comment[is]=Stilla þjónustu uppgötvara
++Comment[is]=Stilla uppgötvun þjónustna
+ Comment[it]=Configura scoperta servizi
++Comment[ja]=サービスディスカãƒãƒªã®è¨å®š
+ Comment[lt]=Konfigūruoti tarnybų radimą
+ Comment[nb]=Sett opp oppdagingstjenesten
+ Comment[nl]=Dienstwaarneming instellen
+@@ -26,38 +29,40 @@
+ Comment[pt_BR]=Configurar o serviço discovery
+ Comment[ru]=ÐаÑтройка Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¸Ñ ÑервиÑов
+ Comment[se]=Heivet bálvalusáicama
++Comment[sk]=Nastavenie hľadania služieb
+ Comment[sl]=Nastavi odkrivanje storitev
+ Comment[sr]=Подешавање откривања ÑервиÑа
+-Comment[sr@Latn]=Подешавање откривања ÑервиÑа
++Comment[sr@Latn]=Podešavanje otkrivanja servisa
+ Comment[sv]=Anpassa tjänstupptäckt
+ Comment[ta]=சரà¯à®µà¯€à®¸à¯ டிஸà¯à®•வரியை வடிவமை
+ Comment[tr]=Hizmet araştırmasını yapılandır
+ Comment[uk]=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð½Ð°Ñ…Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ Ñлужб
+-Comment[xx]=xxConfigure service discoveryxx
+ Comment[zh_CN]=é…置探索æœåŠ¡
+ Encoding=UTF-8
+ Exec=kcmshell kcm_kdnssd
+ GenericName=
+-GenericName[xx]=xxxx
+ Icon=blockdevice
+ MimeType=
+ Name=Service Discovery
+ Name[bg]=Откриване на уÑлуги
+ Name[bn]=সারà§à¦à¦¿à¦¸ উদà§à¦˜à¦¾à¦Ÿà¦¨
++Name[bs]=Otkrivanje servisa
+ Name[ca]=Descobriment de serveis
+ Name[cs]=Hledánà služeb
+ Name[da]=Opdagelse af tjenester
+ Name[de]=Dienste-Suche
+ Name[es]=Buscador de servicios
+ Name[et]=Teenuste tuvastamine
++Name[eu]=Igartze zerbitzua
+ Name[fi]=Palvelut
+ Name[fr]=Découverte de service
+ Name[fy]=Tsjinst warskôging
+ Name[he]=זיהוי שירותי×
+ Name[hi]=सेवा डिसà¥à¤•वरी
+ Name[hu]=Szolgáltatásdetektálás
+-Name[is]=Þjónustu uppgötvun
++Name[is]=Uppgötvun þjónustu
+ Name[it]=Scoperta servizi
++Name[ja]=サービスディスカãƒãƒª
+ Name[lt]=Tarnybų radimas
+ Name[nb]=Oppdaging av tjenester
+ Name[nl]=Dienstwaarneming
+@@ -68,14 +73,14 @@
+ Name[pt_BR]=Serviço Discovery
+ Name[ru]=Обнаружение Ñлужб
+ Name[se]=Bálvalusáican
++Name[sk]=Hľadanie služieb
+ Name[sl]=Odkrivanje storitev
+ Name[sr]=Откривање ÑервиÑа
+-Name[sr@Latn]=Откривање ÑервиÑа
++Name[sr@Latn]=Otkrivanje servisa
+ Name[sv]=Tjänstupptäckt
+ Name[ta]=சரà¯à®µà¯€à®¸à¯ டிஸà¯à®•வரி
+ Name[tr]=Hizmet Araştırması
+ Name[uk]=Ð—Ð½Ð°Ñ…Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ Ñлужб
+-Name[xx]=xxService Discoveryxx
+ Name[zh_CN]=æœåŠ¡æŽ¢ç´¢
+ Path=
+ StartupNotify=true
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/ebrowsing.desktop kdebase-branch-3.4/kcontrol/ebrowsing/ebrowsing.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/ebrowsing.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/ebrowsing.desktop 2005-03-07 09:15:06.000000000 -0500
+@@ -71,7 +71,6 @@
+ Name[ven]=Tshikhau tsha webu
+ Name[wa]=Rascourtis waibe
+ Name[xh]=Ezimfutshane ze Web
+-Name[xx]=xxWeb Shortcutsxx
+ Name[zh_CN]=网页缩写
+ Name[zh_TW]=ç¶²é æ·å¾‘
+ Name[zu]=Izindlela Ezimfishane ze-Web
+@@ -125,7 +124,7 @@
+ Comment[sk]=Nastaenie rozÅ¡Ãreného prehliadaÄa
+ Comment[sl]=Nastavite izboljšano brskanje
+ Comment[sr]=Подешавање побољшаног прегледања
+-Comment[sr@Latn]=Podešavanje poboljšanog pretraživanja
++Comment[sr@Latn]=Podešavanje poboljšanog pregledanja
+ Comment[sv]=Anpassa utökad webbläsning
+ Comment[ta]= மேமà¯à®ªà®Ÿà¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®Ÿ தேடà¯à®¤à®²à¯ˆ அமை
+ Comment[tg]=МухтаÑаркунӣ, дар вақти таÑвири Ð’Ñб иÑтифода мешаванд
+@@ -137,7 +136,6 @@
+ Comment[vi]=Cấu hình duyệt nâng cao
+ Comment[wa]=Apontyî li naiviaedje waibe avancî
+ Comment[xh]=Qwalasela ukhangelo lwencwadi olongezelelweyo
+-Comment[xx]=xxConfigure enhanced browsingxx
+ Comment[zh_CN]=é…置增强æµè§ˆç‰¹æ€§
+ Comment[zh_TW]=è¨å®šå¢žå¼·å¼ç€è¦½
+ Comment[zu]=Hlannganisela ukucinga okujulile
+@@ -186,7 +184,7 @@
+ Keywords[sk]=RozÅ¡Ãrené prehliadanie,PrehliadaÄ,Prehliadanie,WWW,Internet, SieÅ¥,Klávesové skratky,Internetové kľúÄové slová,Vyhľadávacie stroje,Skratky
+ Keywords[sl]=izboljÅ¡ano brskanje,brskanje,WWW,splet,internet,kljuÄne besede interneta,filtri interneta,omrežje,iskalni stroji,bližnjice
+ Keywords[sr]=Enhanced Browsing,Browsing,WWW,Интернет,Интернет Keywords,Интернет Filters,Network,Search Engines,Shortcuts,Прегледање,Мрежа,Пречице
+-Keywords[sr@Latn]=Enhanced Browsing,Browsing,WWW,Internet,Internet Keywords,Internet Filters,Network,Search Engines,Shortcuts,Pretraživanje,Mreža,PreÄice
++Keywords[sr@Latn]=Enhanced Browsing,Browsing,WWW,Internet,Internet Keywords,Internet Filters,Network,Search Engines,Shortcuts,Pregledanje,Mreža,PreÄice
+ Keywords[sv]=Utökad webbläsning,Surfning,WWW,Internet,Internetsökord,Nätverk,Sökmotorer,Internetfilter,Genvägar
+ Keywords[ta]= அதிகபà¯à®ªà®Ÿà¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®Ÿ உலாவà¯à®¤à®²à¯,உலாவà¯à®¤à®²à¯,WWW,இணைதளமà¯,இணைய à®®à¯à®•à¯à®•ிய வாரà¯à®¤à¯à®¤à¯ˆà®•ளà¯,இணையதள வடிகடà¯à®Ÿà®¿à®•ளà¯,வலைபà¯à®ªà®¿à®©à¯à®©à®²à¯,தேட௠இயநà¯à®¤à®¿à®°à®™à¯à®•ளà¯,கà¯à®±à¯à®•à¯à®•௠வழிகளà¯
+ Keywords[tr]=Gelişkin Tarama,Tarama,WWW,İnternet,İnternet Anahtar Kelimeleri,İnternet Süzgeçleri,Ağ,Kısayollar,Kısayol tuşları
+@@ -196,7 +194,6 @@
+ Keywords[vi]=Duyệt nâng cao,duyệt,WWW,Internet,từ khoá Internet, Bá»™ lá»c Internet,Mạng, Dụng cụ tìm kiếm,Shortcuts
+ Keywords[wa]=Naiviaedje waibe avancî,naivyî,naiviaedje,betchteu,waibe,WWW,internet,daegntoele,rascourtis waibe,passetes waibe,rantoele,ricwerreces,rascourtis
+ Keywords[xh]=Ukhangelo zincwadi olomeleziweyo,Khangela iincwadi,WWW,Amagama angundoqo e Internet,Amacebo okucoca ulwelo e Internet,Umsebenzi womnatha,Iinjini Zophendlo,Iindlela ezimfutshane
+-Keywords[xx]=xxEnhanced Browsing,Browsing,WWW,Internet,Internet Keywords,Internet Filters,Network,Search Engines,Shortcutsxx
+ Keywords[zh_CN]=Enhanced Browsing,Browsing,WWW,Internet,Internet Keywords,Internet Filters,Network,Search Engines,Shortcuts,增强æµè§ˆ,æµè§ˆ,Internet 关键å—,Internet 过滤,网络,æœç´¢å¼•擎,å¿«æ·æ–¹å¼
+ Keywords[zh_TW]=Enhanced Browsing,Browsing,WWW,Internet,Internet Keywords,Internet Filters,Network,Search Engines,Shortcuts,增強ç€è¦½,ç€è¦½,網際網路,網路,æœå°‹å¼•擎,æ·å¾‘
+ Keywords[zu]=Ukucinga okujulile,Ukucinga,WWW,Internet,Amagama abalulekile e-Internet,Amahluzo,Uxhumano olusakazekile,Izinjini zokusesha, Izindlela ezimfushane
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.desktop 2005-02-10 23:51:52.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.desktop 2005-03-07 09:15:06.000000000 -0500
+@@ -54,7 +54,6 @@
+ Name[ven]=Filithara ya Khiimaipfi ya Inithanete
+ Name[vi]=Trình lá»c các từ khoá Internet
+ Name[xh]=Amagama Angundoqo ecebo lokucoca ulwelo e Internet
+-Name[xx]=xxInternetKeywordsFilterxx
+ Name[zh_CN]=Internet 关键å—过滤
+ Name[zh_TW]=Internet é—œéµå—éŽæ¿¾
+ Name[zu]=Ihluzo lamagama abalulekile e-Internet
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.desktop 2005-01-22 23:37:51.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.desktop 2005-03-07 09:15:06.000000000 -0500
+@@ -51,7 +51,6 @@
+ Name[ven]=Filithara ya Khiimaipfi yau setsha
+ Name[vi]=Trình tìm và lá»c các từ khoá
+ Name[xh]=Phendla Amagama Angundoqo Ecebo Lokucoca Ulwelo
+-Name[xx]=xxSearchKeywordsFilterxx
+ Name[zh_CN]=æœç´¢å…³é”®å—过滤
+ Name[zh_TW]=æœç´¢é—œéµå—éŽæ¿¾
+ Name[zu]=Ihluzo lamagama abalulekile okusesha
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchprovider.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchprovider.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchprovider.desktop 2005-02-04 23:14:49.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchprovider.desktop 2005-03-07 09:15:06.000000000 -0500
+@@ -68,7 +68,6 @@
+ Comment[vi]=Dụng cụ tìm kiếm
+ Comment[wa]=Ricwerrece
+ Comment[xh]=Phendla Injini
+-Comment[xx]=xxSearch Enginexx
+ Comment[zh_CN]=æœç´¢å¼•擎
+ Comment[zh_TW]=æœç´¢å¼•擎
+ Comment[zu]=Injini Yokusesha
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/acronym.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/acronym.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/acronym.desktop 2005-02-04 23:14:49.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/acronym.desktop 2005-03-07 09:15:06.000000000 -0500
+@@ -62,11 +62,10 @@
+ Name[ven]=Databeizi ya tshikau
+ Name[vi]=Cơ sở dữ liệu Acronym
+ Name[xh]=Isiseko sedata Segama elenziwe ngonoobumba bamanye amagama
+-Name[xx]=xxAcronym Databasexx
+ Name[zh_CN]=首嗿¯ç¼©å†™æ•°æ®åº“
+ Name[zh_TW]=Acronym 資料庫
+ Name[zu]=Isiqu sedata samagama asho okufanayo
+ ServiceTypes=SearchProvider
+ Keys=ad,acro,acronym
+ Query=http://www.chemie.de/tools/acronym.php3?language=e&acronym=\\{@}
+-Query[xx]=xxhttp://www.chemie.de/tools/acronym.php3?language=e&acronym=\\{@}xx
++Query[sk]=http://www.chemie.de/tools/acronym.php3?language=sk&acronym=\\{@}
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/alexa.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/alexa.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/alexa.desktop 2005-01-30 00:10:26.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/alexa.desktop 2005-03-07 09:15:06.000000000 -0500
+@@ -10,8 +10,6 @@
+ Name[lo]=ສຸວັນທàºàº‡
+ Name[pa]=ਅਲੀਕਸਾ
+ Name[ta]=அலெகà¯à®šà®¾
+-Name[xx]=xxAlexaxx
+ ServiceTypes=SearchProvider
+ Keys=al,alexa
+ Query=http://info.alexa.com/search?q=\\{@}
+-Query[xx]=xxhttp://info.alexa.com/search?q=\\{@}xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/alexa_url.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/alexa_url.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/alexa_url.desktop 2005-02-10 23:51:52.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/alexa_url.desktop 2005-03-07 09:15:06.000000000 -0500
+@@ -33,9 +33,7 @@
+ Name[ss]=I-URL ye Alexa
+ Name[sv]=Alexa webbadress
+ Name[ta]=அலெகà¯à®šà®¾ URL
+-Name[xx]=xxAlexa URLxx
+ Name[zu]=I-URL ye-Alexa
+ ServiceTypes=SearchProvider
+ Keys=alu,url
+ Query=http://info.alexa.com/data/details?url=\\{@}
+-Query[xx]=xxhttp://info.alexa.com/data/details?url=\\{@}xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/alltheweb.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/alltheweb.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/alltheweb.desktop 2005-01-30 00:10:26.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/alltheweb.desktop 2005-03-07 09:15:06.000000000 -0500
+@@ -31,9 +31,7 @@
+ Name[uz]=Бутун вебни (тез)
+ Name[ven]=Webu dzothe ngau tavhanya
+ Name[xh]=Yonke i Web ngokukhawuleza
+-Name[xx]=xxAllTheWeb fastxx
+ Name[zu]=Yonke i-Web ngokushesha
+ ServiceTypes=SearchProvider
+ Keys=atw,alltheweb
+ Query=http://www.alltheweb.com/search?exec=FAST+Search&type=all&query=\\{@}&cat=web
+-Query[xx]=xxhttp://www.alltheweb.com/search?exec=FAST+Search&type=all&query=\\{@}&cat=webxx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/altavista.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/altavista.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/altavista.desktop 2005-02-21 13:17:49.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/altavista.desktop 2005-03-07 09:15:06.000000000 -0500
+@@ -14,10 +14,8 @@
+ Name[sv]=Altavista
+ Name[ta]=அலà¯à®Ÿà®¾à®µà®¿à®¸à¯à®Ÿà®¾
+ Name[th]=à¸à¸±à¸¥à¸•้าวิสต้า
+-Name[xx]=xxAltaVistaxx
+ ServiceTypes=SearchProvider
+ Keys=av,altavista
+ Query=http://www.altavista.com/cgi-bin/query?pg=q&kl=XX&stype=stext&q=\\{@}
+ Query[nb]=http://no.altavista.com/cgi-bin/query?pg=q&kl=XX&stype=stext&q=\\{@}
+ Query[nn]=http://no.altavista.com/cgi-bin/query?pg=q&kl=XX&stype=stext&q=\\{@}
+-Query[xx]=xxhttp://www.altavista.com/cgi-bin/query?pg=q&kl=XX&stype=stext&q=\\{@}xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/amg.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/amg.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/amg.desktop 2005-02-18 23:27:00.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/amg.desktop 2005-03-07 09:15:06.000000000 -0500
+@@ -24,13 +24,11 @@
+ Name[ro]=Ghid muzical complet
+ Name[sl]=Vodnik All Music
+ Name[sr]=Свемузички водич
+-Name[sr@Latn]=Свемузички водич
++Name[sr@Latn]=SvemuziÄki vodiÄ
+ Name[sv]=Guiden All Musik
+ Name[ta]=அனைதà¯à®¤à¯ இசை தà¯à®£à¯ˆ
+ Name[tr]=Müzik Kılavuzu
+-Name[xx]=xxAll Music Guidexx
+ Name[zh_CN]=å…¨éŸ³ä¹æŒ‡å—
+ Query=http://www.allmusic.com/cg/amg.dll?p=amg&opt1=1&sql=\\{@}
+-Query[xx]=xxhttp://www.allmusic.com/cg/amg.dll?p=amg&opt1=1&sql=\\{@}xx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/appsy.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/appsy.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/appsy.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/appsy.desktop 2005-03-07 09:15:06.000000000 -0500
+@@ -50,7 +50,7 @@
+ Name[sk]=Hľadanie aplikácià KDE
+ Name[sl]=Iskanje programov za KDE
+ Name[sr]=Претраживање KDE програма
+-Name[sr@Latn]=KDE App pretraživanje
++Name[sr@Latn]=Pretraživanje KDE programa
+ Name[ss]=Kusesha kwe App ku KDE
+ Name[sv]=KDE-programsökning
+ Name[ta]=KDE App தேடà¯à®¤à®²à¯
+@@ -61,11 +61,9 @@
+ Name[ven]=U setsha ha apulifikhesheni ya KDE
+ Name[wa]=Programe di cweraedje di KDE
+ Name[xh]=Uphendlo lwe KDE App
+-Name[xx]=xxKDE App Searchxx
+ Name[zh_CN]=KDE åº”ç”¨ç¨‹åºæœç´¢
+ Name[zh_TW]=KDE ç¨‹å¼æœå°‹
+ Name[zu]=Usesho lwe-App lwe-KDE
+ ServiceTypes=SearchProvider
+ Keys=apps,appsy
+ Query=http://www.kde-apps.org/content/search.php?search=Search&name=\\{@}
+-Query[xx]=xxhttp://www.kde-apps.org/content/search.php?search=Search&name=\\{@}xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/austronaut.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/austronaut.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/austronaut.desktop 2005-01-30 00:10:26.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/austronaut.desktop 2005-03-07 09:15:06.000000000 -0500
+@@ -11,9 +11,7 @@
+ Name[pa]=ਅਸਟਰੋਨਾਊਟ
+ Name[sv]=Astronaut
+ Name[ta]=ஆஸà¯à®Ÿà¯à®°à¯‹à®¨à®Ÿà¯
+-Name[xx]=xxAustroNautxx
+ Name[zu]=Umuntu wasemkhathini
+ ServiceTypes=SearchProvider
+ Keys=austro,austronaut
+ Query=http://austronaut.at/page.php?begriff=\{@}&wo=at
+-Query[xx]=xxhttp://austronaut.at/page.php?begriff=\{@}&wo=atxx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/backports.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/backports.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/backports.desktop 2005-02-18 23:27:00.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/backports.desktop 2005-03-07 09:15:06.000000000 -0500
+@@ -37,14 +37,12 @@
+ Name[sk]=Hľadanie v Debian Backports
+ Name[sl]=Iskanje po prenosih v Debian
+ Name[sr]=Debian-ова Backports претрага
+-Name[sr@Latn]=Debian-ова Backports претрага
++Name[sr@Latn]=Debian-ova Backports pretraga
+ Name[sv]=Sökning i Debians uppdateringar
+ Name[ta]=டெபியன௠பினà¯à®®à¯à®©à¯ˆà®¯à®™à¯à®•ள௠தேடலà¯
+ Name[tr]=Debian Arkakapı Arama
+ Name[uk]=Пошук Ñеред додаткових пакетів Debian
+-Name[xx]=xxDebian Backports Searchxx
+ Name[zh_CN]=Debian åŽç«¯æœç´¢
+ Query=http://www.backports.org/package.php?search=\\{@}
+-Query[xx]=xxhttp://www.backports.org/package.php?search=\\{@}xx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/bugft.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/bugft.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/bugft.desktop 2005-02-04 23:14:49.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/bugft.desktop 2005-03-07 09:15:06.000000000 -0500
+@@ -62,11 +62,9 @@
+ Name[ven]=Databeizi ya KDE baga ya manwalwafhelela a u todulusa
+ Name[vi]=Tìm kiếm fulltext trên cơ sở dữ liệu của KDE bug
+ Name[xh]=Uphendlo lwesiseko sedata ye KDE Bug Olubhaliweyo ngokupheleleyo
+-Name[xx]=xxKDE Bug Database Fulltext Searchxx
+ Name[zh_CN]=KDE 错误数æ®åº“全文检索
+ Name[zh_TW]=KDE è‡èŸ²è³‡æ–™åº«å…¨æ–‡æª¢ç´¢
+ Name[zu]=Usesho lwe-KDE lombhalo ogcwele lwesiqu sedata sedata
+ Query=http://bugs.kde.org/simple_search.cgi?id=\\{1}+\\{2}+\\{3}+\\{4}+\\{5}+\\{6}+\\{7}+\\{8}+\\{9}
+-Query[xx]=xxhttp://bugs.kde.org/simple_search.cgi?id=\\{1}+\\{2}+\\{3}+\\{4}+\\{5}+\\{6}+\\{7}+\\{8}+\\{9}xx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/bugno.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/bugno.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/bugno.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/bugno.desktop 2005-03-07 09:15:06.000000000 -0500
+@@ -52,7 +52,7 @@
+ Name[sk]=Hľadanie podľa ÄÃsla chyby v KDE databáze chýb
+ Name[sl]=Iskanje v zbirki hroÅ¡Äev KDE po Å¡tevilki hroÅ¡Äa
+ Name[sr]=KDE-ова база грешака, претраживање по броју грешке
+-Name[sr@Latn]=KDE baza grešaka sa podrškom za pretraživanje po broju greške
++Name[sr@Latn]=KDE-ova baza grešaka, pretraživanje po broju greške
+ Name[sv]=Felnummersökning i KDE:s feldatabas
+ Name[ta]=கேடிஇ பிழையான தகவலà¯à®¤à®³ பிழையான எண௠தேடà¯à®¤à®²à¯
+ Name[tg]=Бар ҳиÑби KDE ҷуÑтуҷӯи бонки иттилооти ишколоти шумора
+@@ -63,11 +63,9 @@
+ Name[ven]=Databeizi ya baga ya KDE baga yau todulusa nomboro
+ Name[vi]=Tìm kiếm theo số của cơ sở dữ liệu KDE bug
+ Name[xh]=KDE Uphendlo Lwenani Legciwane Isiseko se data Segciwane
+-Name[xx]=xxKDE Bug Database Bug Number Searchxx
+ Name[zh_CN]=KDE 错误数æ®åº“æŒ‰é”™è¯¯ç¼–å·æœç´¢
+ Name[zh_TW]=KDE è‡èŸ²è³‡æ–™åº«æŒ‰éŒ¯èª¤ç·¨è™Ÿæœç´¢
+ Name[zu]=Usesho lwe-KDE lwenombolo yegciwane lwesiqu sedata segciwane
+ Query=http://bugs.kde.org/show_bug.cgi?id=\\{@}
+-Query[xx]=xxhttp://bugs.kde.org/show_bug.cgi?id=\\{@}xx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/call.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/call.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/call.desktop 2005-02-18 23:27:00.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/call.desktop 2005-03-07 09:15:06.000000000 -0500
+@@ -42,14 +42,12 @@
+ Name[sk]=Databáza skratiek QRZ.com
+ Name[sl]=Zbirka okrajšav QRZ.com
+ Name[sr]=QRZ.com callsign база података
+-Name[sr@Latn]=QRZ.com callsign база података
++Name[sr@Latn]=QRZ.com callsign baza podataka
+ Name[sv]=Databas för QRZ.com-anropssignaler
+ Name[ta]=QRZ.com அழைபà¯à®ªà¯à®¨à¯à®´à¯ˆ தகவலà¯à®¤à®³à®®à¯
+ Name[tr]=QRZ.com Aramaişaret Veritabanı
+ Name[uk]=База даних callsign QRZ.com
+-Name[xx]=xxQRZ.com Callsign Databasexx
+ Name[zh_CN]=QRZ.com Callsign æ•°æ®åº“
+ Query=http://www.qrz.com/database?callsign=\\{@}
+-Query[xx]=xxhttp://www.qrz.com/database?callsign=\\{@}xx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/cia.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/cia.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/cia.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/cia.desktop 2005-03-07 09:15:06.000000000 -0500
+@@ -8,18 +8,17 @@
+ Name[lt]=CIA pasaulio faktų knyga
+ Name[pa]=CIA ਸੰਸਾਰ ਜਾਣਕਾਰੀ ਕਿਤਾਬ
+ Name[ru]=Ð’ÑÐµÐ¼Ð¸Ñ€Ð½Ð°Ñ ÐºÐ½Ð¸Ð³Ð° фактов ЦРУ
++Name[sk]=Dokument CIA World Fact Book
+ Name[sr]=Књига ÑветÑких чињеница CIA-е
+-Name[sr@Latn]=Књига ÑветÑких чињеница CIA-е
++Name[sr@Latn]=Knjiga svetskih Äinjenica CIA-e
+ Name[sv]=CIA-världsfaktabok
+ Name[ta]=CIA உலக உணà¯à®®à¯ˆà®ªà¯ பà¯à®¤à¯à®¤à®•à®®à¯
+ Name[uk]=Ð’ÑеÑÐ²Ñ–Ñ‚Ð½Ñ ÐºÐ½Ð¸Ð³Ð° фактів ЦРУ
+-Name[xx]=xxCIA World Fact Bookxx
+ Query=http://www.google.com/search?q=allintitle%3A\\{@}+world+fact+book+site%3Awww.cia.gov&ie=UTF-8&btnI=I%27m+Feeling+Lucky
+ Query[en_GB]=http://www.google.co.uk/search?q=allintitle%3A\\{@}+world+fact+book+site%3Awww.cia.gov&ie=UTF-8&btnI=I%27m+Feeling+Lucky
+ Query[fi]=http://www.google.fi/search?q=allintitle%3A\\{@}+world+fact+book+site%3Awww.cia.gov&ie=UTF-8&btnI=I%27m+Feeling+Lucky
+ Query[fr]=http://www.google.fr/search?q=allintitle%3A\\{@}+world+fact+book+site%3Awww.cia.gov&ie=UTF-8&btnI=I%27m+Feeling+Lucky
+ Query[he]=http://www.google.co.il/search?q=allintitle%3A\\{@}+world+fact+book+site%3Awww.cia.gov&ie=UTF-8&btnI=I%27m+Feeling+Lucky
+ Query[nb]=http://www.google.no/search?q=allintitle%3A\\{@}+world+fact+book+site%3Awww.cia.gov&ie=UTF-8&btnI=I%27m+Feeling+Lucky
+-Query[xx]=xxhttp://www.google.com/search?q=allintitle%3A\\{@}+world+fact+book+site%3Awww.cia.gov&ie=UTF-8&btnI=I%27m+Feeling+Luckyxx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/citeseer.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/citeseer.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/citeseer.desktop 2005-02-10 23:51:52.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/citeseer.desktop 2005-03-07 09:15:06.000000000 -0500
+@@ -49,9 +49,7 @@
+ Name[uk]=CiteSeer: цифрова бібліотека наукової літератури
+ Name[uz]=CiteSeer: Ðниқ фанлар учун Ñлектрон кутубхона
+ Name[vi]=CiteSeer:Thư viện khoa há»c & Văn há»c số hoá
+-Name[xx]=xxCiteSeer: Scientific Literature Digital Libraryxx
+ Name[zh_TW]=CiteSeer: ç§‘å¸æ–‡ç»æ•¸ä½åœ–書館
+ Query=http://citeseer.ist.psu.edu/cs?q=\\{@}&submit=Search+Documents&cs=1
+-Query[xx]=xxhttp://citeseer.ist.psu.edu/cs?q=\\{@}&submit=Search+Documents&cs=1xx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/cpan.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/cpan.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/cpan.desktop 2005-02-10 23:51:52.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/cpan.desktop 2005-03-07 09:15:06.000000000 -0500
+@@ -42,9 +42,7 @@
+ Name[uz]=CPAN - Perl бўйича мукаммал архив тармоғи
+ Name[ven]=CPAN - Vhudavhidzani ha Mbeazwakale ya Perl vhu Pfalaho
+ Name[xh]=CPAN - Enomxholo Perl Indawo yokugcina Yomsebenzi womnatha
+-Name[xx]=xxCPAN - Comprehensive Perl Archive Networkxx
+ Name[zh_TW]=CPAN - å…¨é¢çš„ Perl 收集網路
+ Query=http://search.cpan.org/search?mode=\\{mode,2,"dist"}&query=\\{query,q,1}
+-Query[xx]=xxhttp://search.cpan.org/search?mode=\\{mode,2,"dist"}&query=\\{query,q,1}xx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/ctan.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/ctan.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/ctan.desktop 2005-02-10 23:51:52.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/ctan.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -40,9 +40,7 @@
+ Name[uz]=CTAN - TeX бўйича мукаммал архив тармоғи
+ Name[ven]=CTAN - Vhudavhidzani ha Mbeazwakale ya TeX Vhupfalaho
+ Name[xh]=CTAN - Enomxholo TeX Indawo yokugcina Yomsebenzi womnatha
+-Name[xx]=xxCTAN - Comprehensive TeX Archive Networkxx
+ Name[zh_TW]=CTAN - å…¨é¢çš„ Tex 收集網路
+ Query=http://www.ctan.org/tools/filesearch?action=/search/&filename=\\{@}
+-Query[xx]=xxhttp://www.ctan.org/tools/filesearch?action=/search/&filename=\\{@}xx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/ctan_cat.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/ctan_cat.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/ctan_cat.desktop 2005-02-04 23:14:49.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/ctan_cat.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -57,9 +57,7 @@
+ Name[uz]=CTAN каталоги
+ Name[vi]=CTAN Catalogue
+ Name[wa]=Catalogue do CTAN
+-Name[xx]=xxCTAN Catalogxx
+ Name[zh_CN]=CTAN 目录
+ Query=http://www.ctan.org/tools/cataloguesearch?action=/search/&catstring=\\{@}
+-Query[xx]=xxhttp://www.ctan.org/tools/cataloguesearch?action=/search/&catstring=\\{@}xx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/dbug.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/dbug.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/dbug.desktop 2005-02-18 23:27:00.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/dbug.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -39,14 +39,12 @@
+ Name[sk]=Hľadanie chýb na Debian BTS
+ Name[sl]=Iskanje po hroÅ¡Äih Debian BTS
+ Name[sr]=Debian-ова BTS претрага грешака
+-Name[sr@Latn]=Debian-ова BTS претрага грешака
++Name[sr@Latn]=Debian-ova BTS pretraga grešaka
+ Name[sv]=Sökning i Debians felspårningssystem
+ Name[ta]=டெபியன௠BTS பிழை தேடலà¯
+ Name[tr]=Debian BTS Hata Arama
+ Name[uk]=Пошук у ÑиÑтемі відÑÐ»Ñ–Ð´ÐºÐ¾Ð²ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ð¼Ð¸Ð»Ð¾Ðº Ð´Ð»Ñ Debian
+-Name[xx]=xxDebian BTS Bug Searchxx
+ Name[zh_CN]=Debian BTS Bug æœç´¢
+ Query=http://bugs.debian.org/\\{@}
+-Query[xx]=xxhttp://bugs.debian.org/\\{@}xx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/de2en.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/de2en.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/de2en.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/de2en.desktop 2005-03-30 01:47:42.000000000 -0500
+@@ -3,11 +3,14 @@
+ Hidden=false
+ Keys=de2en
+ Name=dict.cc Translation: German to English
++Name[bs]=dict.cc prijevod: njemaÄki u engleski
+ Name[ca]=Traducció dict.cc: Alemany - Anglès
+ Name[da]=dict.cc oversættelse: Tysk til engelsk
+ Name[de]=dict.cc-Übersetzung: Deutsch/Englisch
++Name[el]=ΜετάφÏαση dict.cc: ΓεÏμανικά σε Αγγλικά
+ Name[es]=dict.cc Traducción: alemán a inglés
+ Name[et]=dict.cc tõlkimine: saksa->inglise
++Name[eu]=dict.cc itzulpena: Alemanatik ingelera
+ Name[fi]=dict.cc Käännös: saksasta englanniksi
+ Name[fr]=Traduction dict.cc : Allemand en Anglais
+ Name[fy]=dict.cc-oersetting Dûts nei Ingelsk
+@@ -17,6 +20,7 @@
+ Name[hu]=Dict.cc - FordÃtás németrÅ‘l angolra
+ Name[is]=dict.cc Þýðing: Þýska til ensku
+ Name[it]=Traduzioni dict.cc: dal tedesco all'inglese
++Name[ja]=dict.cc ドイツ語-英語翻訳
+ Name[lt]=dict.cc vertimas: iÅ¡ vokieÄių į anglų
+ Name[nb]=dict.cc Oversettelse: Tysk til engelsk
+ Name[nl]=dict.cc-vertaling: Duits naar Engels
+@@ -27,15 +31,14 @@
+ Name[pt_BR]=dict.cc - Tradução: Alemão para Inglês
+ Name[ru]=Переводчик dictcc.com: немецко-английÑкий
+ Name[se]=dict.cc Jorgaleapmi: Duiskkagielas eŋgelašgillii
++Name[sk]=dict.cc preklad: Z nemÄiny do angliÄtiny
+ Name[sl]=Prevod dict.cc: nemÅ¡Äina v angleÅ¡Äino
+ Name[sr]=Превод на dict.cc: Ñа немачког на енглеÑки
+-Name[sr@Latn]=Превод на dict.cc: Ñа немачког на енглеÑки
++Name[sr@Latn]=Prevod na dict.cc: sa nemaÄkog na engleski
+ Name[sv]=dict.cc översättning: tyska till engelska
+ Name[ta]=dict.cc Translation மொழிபà¯à®ªà¯†à®¯à®°à¯à®ªà¯à®ªà¯: ஜெரà¯à®®à®©à¯ மொழியில௠இரà¯à®¨à¯à®¤à¯ ஆஙà¯à®•ிலதà¯à®¤à¯à®•à¯à®•à¯
+ Name[tr]=dict.cc Çevirisi: Almancadan İngilizceye
+ Name[uk]=dict.cc: переклад з німецької на англійÑьку
+-Name[xx]=xxdict.cc Translation: German to Englishxx
+ Query=http://www.dict.cc/?s=\\{@}
+-Query[xx]=xxhttp://www.dict.cc/?s=\\{@}xx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/de2fr.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/de2fr.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/de2fr.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/de2fr.desktop 2005-03-30 01:47:42.000000000 -0500
+@@ -3,11 +3,14 @@
+ Type=Service
+ Name=LEO - Translate Between German and French
+ Name[bn]=লিও - জারà§à¦®à¦¾à¦¨ থেকে ফরাসী বা ফরাসী থেকে জারà§à¦®à¦¾à¦¨-ঠঅনà§à¦¬à¦¾à¦¦ করà§à¦¨
++Name[bs]=LEO prijevod: njemaÄki u francuski
+ Name[ca]=LEO - Tradueix entre alemany i francès
+ Name[da]=LEO - Oversæt mellem tysk og fransk
+ Name[de]=LEO - Übersetzung Deutsch/Französisch
++Name[el]=LEO - ΜετάφÏαση Î¼ÎµÏ„Î±Î¾Ï Î“ÎµÏμανικών και Γαλλικών
+ Name[es]=LEO - Traducción entre alemán y francés
+ Name[et]=LEO - tõlkimine: saksa-prantsuse
++Name[eu]=LEO - Itzuli alemana eta ingelesaren artean
+ Name[fi]=LEO - Käännä saksan ja ranskan välillä
+ Name[fr]=LEO - Traduction Allemand - Français
+ Name[fy]=LEO -oersetting tusken Dûtsk en Frânsk
+@@ -17,6 +20,7 @@
+ Name[hu]=LEO - FordÃtás németrÅ‘l franciára (mindkét irányban)
+ Name[is]=LEO - Þýða á milli þýsku og frönsku
+ Name[it]=LEO - Traduzioni dal tedesco al francese
++Name[ja]=LEO - ドイツ語ã¨ãƒ•ランス語間ã®ç¿»è¨³
+ Name[lt]=LEO - vertimas iÅ¡ vokieÄių į prancÅ«zų ir atvirkÅ¡Äiai
+ Name[nb]=LEO - Oversettelse fra tysk til fransk
+ Name[nl]=LEO - vertaling tussen Duits en Frans
+@@ -27,15 +31,14 @@
+ Name[pt_BR]=LEO - Tradução entre Alemão e Francês
+ Name[ru]=LEO - немецко-французÑкий перевод
+ Name[se]=LEO – Jorgal duiskka- ja fránskkagiela gaskkas
++Name[sk]=LEO - Preklad medzi nemÄinou a francúzÅ¡tinou
+ Name[sl]=LEO - Prevod med nemÅ¡Äino in francoÅ¡Äino
+ Name[sr]=LEO — превод између немачког и француÑког
+-Name[sr@Latn]=LEO — превод између немачког и француÑког
++Name[sr@Latn]=LEO — prevod izmeÄ‘u nemaÄkog i francuskog
+ Name[sv]=LEO - översätt från tyska till franska
+ Name[ta]=LEO - ஜெரà¯à®®à®©à¯ மறà¯à®±à¯à®®à¯ பà¯à®°à¯†à®©à¯à®šà¯ இடையே மொழிபà¯à®ªà¯†à®¯à®°à¯à®•à¯à®•வà¯à®®à¯
+ Name[tr]=LEO - Almancadan Fransızcaya Çeviri
+ Name[uk]=LEO - переклад між німецькою та французькою
+-Name[xx]=xxLEO - Translate Between German and Frenchxx
+ ServiceTypes=SearchProvider
+ Keys=de2fr
+ Query=http://dict.leo.org/?lp=frde&search=\\{@}
+-Query[xx]=xxhttp://dict.leo.org/?lp=frde&search=\\{@}xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/deb.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/deb.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/deb.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/deb.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -38,14 +38,12 @@
+ Name[sk]=Hľadanie balÃkov Debian
+ Name[sl]=Iskanje po paketih Debian
+ Name[sr]=Претрага Debian-ових пакета
+-Name[sr@Latn]=Претрага Debian-ових пакета
++Name[sr@Latn]=Pretraga Debian-ovih paketa
+ Name[sv]=Sökning i Debians paket
+ Name[ta]=டெபியன௠BTS பிழை தேடலà¯
+ Name[tr]=Debian Paket Arama
+ Name[uk]=Пошук пакунків Ð´Ð»Ñ Debian
+-Name[xx]=xxDebian Package Searchxx
+ Name[zh_CN]=Debian 软件包æœç´¢
+ Query=http://packages.debian.org/cgi-bin/search_packages.pl?keywords=\\{@}&searchon=names&subword=1&version=all&release=all
+-Query[xx]=xxhttp://packages.debian.org/cgi-bin/search_packages.pl?keywords=\\{@}&searchon=names&subword=1&version=all&release=allxx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/dmoz.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/dmoz.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/dmoz.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/dmoz.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -28,7 +28,7 @@
+ Name[ru]=Открытый Каталог
+ Name[sl]=Odpri imenik
+ Name[sr]=Отворени адреÑар
+-Name[sr@Latn]=Otvoreni direktorijum
++Name[sr@Latn]=Otvoreni adresar
+ Name[sv]=Öppen katalog
+ Name[ta]=அடைவை திற
+ Name[tg]=Кушодани феҳраÑÑ‚
+@@ -36,10 +36,8 @@
+ Name[ven]=Tsumbavhulwo yo Vuleaho
+ Name[vi]=Mở thư mục
+ Name[xh]=Vula Ulawulo
+-Name[xx]=xxOpen Directoryxx
+ Name[zh_TW]=開啟目錄
+ Name[zu]=Vula Uhlu lwamafayela
+ ServiceTypes=SearchProvider
+ Keys=dmoz,odp
+ Query=http://search.dmoz.org/cgi-bin/search?search=\\{@}
+-Query[xx]=xxhttp://search.dmoz.org/cgi-bin/search?search=\\{@}xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/docbook.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/docbook.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/docbook.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/docbook.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -42,7 +42,7 @@
+ Name[se]=DocBook – The Definitive Guide
+ Name[sl]=DocBook - Popolni vodiÄ
+ Name[sr]=DocBook — Дефинитивни водич
+-Name[sr@Latn]=DocBook - Definitivni vodiÄ
++Name[sr@Latn]=DocBook — Definitivni vodiÄ
+ Name[sv]=Den slutgiltiga guiden till docbook
+ Name[ta]=Docபà¯à®¤à¯à®¤à®•ம௠- விளகà¯à®•மான வழிகாடà¯à®Ÿà®¿
+ Name[tg]=DocBook - Роҳнамои таърифӣ
+@@ -51,11 +51,9 @@
+ Name[uz]=DocBook - тўлиқ қўлланма
+ Name[ven]=DocBook - Tsumbavhulwo i Talutshedzaho
+ Name[xh]=DocBook - Incwadi Echazayo
+-Name[xx]=xxDocBook - The Definitive Guidexx
+ Name[zh_CN]=DocBook - æƒå¨çš„æŒ‡å—
+ Name[zh_TW]=DocBook - 終極指å—
+ Name[zu]=DocBook - Umbonisi ochazayo
+ Query=http://www.docbook.org/tdg/en/html/\\{1}.html
+-Query[xx]=xxhttp://www.docbook.org/tdg/en/html/\\{1}.htmlxx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/doi.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/doi.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/doi.desktop 2005-02-04 23:14:49.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/doi.desktop 2005-03-22 12:38:04.000000000 -0500
+@@ -21,8 +21,9 @@
+ Name[hr]=Identifikator digitalnog objekta
+ Name[hu]=Digitális objektumazonosÃtó (DOI)
+ Name[is]=Stafrænn hlutaauðkennir
+-Name[it]=Identificatore oggetto digitale
++Name[it]=Identificatore oggetti digitali
+ Name[ja]=デジタルオブジェクトè˜åˆ¥å
++Name[lt]=Skaitmeninių objektų identifikatorius
+ Name[mk]=Идентификатор на дигитален објект
+ Name[mn]=Дижитал объект Ñлгагч
+ Name[nb]=Digitalt objektnavn
+@@ -42,8 +43,6 @@
+ Name[tg]=МуайÑнкунандаи мавзӯъҳои рақамӣ
+ Name[tr]=Sayısal Nesne Kimlikleyici
+ Name[uk]=Цифровий ідентифікатор об'єкта
+-Name[xx]=xxDigital Object Identifierxx
+ Query=http://dx.doi.org/\\{@}
+-Query[xx]=xxhttp://dx.doi.org/\\{@}xx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2de.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2de.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2de.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2de.desktop 2005-03-30 01:47:42.000000000 -0500
+@@ -4,12 +4,15 @@
+ Keys=en2de
+ Name=dict.cc Translation: English to German
+ Name[bn]=dict.cc অনà§à¦¬à¦¾à¦¦: ইংরাজি থেকে জারà§à¦®à¦¾à¦¨
++Name[bs]=dict.cc prijevod: engleski u njemaÄki
+ Name[ca]=Traducció dict.cc: Anglès - Alemany
+ Name[cs]=PÅ™eklad dict.cc: z angliÄtiny do nÄ›mÄiny
+ Name[da]=dict.cc oversættelse: engelsk til tysk
+ Name[de]=dict.cc-Übersetzung: Englisch/Deutsch
++Name[el]=dict.cc ΜετάφÏαση: Αγγλικά σε ΓεÏμανικά
+ Name[es]=dict.cc Tranducción: inglés a alemán
+ Name[et]=dict.cc tõlkimine: inglise->saksa
++Name[eu]=dict.cc Itzulpena: ingelesetik alemanerara
+ Name[fi]=dict.cc käännös: englannista saksaksi
+ Name[fr]=Traduction dict.cc : Anglais en Allemand
+ Name[fy]=dict.cc-oersetting: Ingelsk nei Dûtsk
+@@ -18,7 +21,8 @@
+ Name[hi]=dict.cc अनà¥à¤µà¤¾à¤¦à¤ƒ अंगà¥à¤°à¥‡à¤œà¥€ से जरà¥à¤®à¤¨
+ Name[hu]=Dict.cc - FordÃtás angolról németre
+ Name[is]=dict.cc Þýðing: Enska à þýsku
+-Name[it]=Traduzione dict.ccç: dall'inglese al tedesco
++Name[it]=Traduzione dict.cc: dall'inglese al tedesco
++Name[ja]=dict.cc 英語-ドイツ語翻訳
+ Name[lt]=dict.cc vertimas: iÅ¡ anglų į vokieÄių
+ Name[nb]=dict.cc Oversettelse: Engelsk til tysk
+ Name[nl]=dict.cc-vertaling: Engels naar Duits
+@@ -29,15 +33,14 @@
+ Name[pt_BR]=dict.cc - Tradução: Inglês para Alemão
+ Name[ru]=Переводчик dict.cc: английÑко-немецкий
+ Name[se]=dict.cc Jorgaleapmi: Eŋgelasgielas duiskkagillii
++Name[sk]=dict.cc preklad: Z angliÄtiny do nemÄiny
+ Name[sl]=Prevod dict.cc: angleÅ¡Äina v nemÅ¡Äino
+ Name[sr]=Превод на dict.cc: Ñа енглеÑког на немачки
+-Name[sr@Latn]=Превод на dict.cc: Ñа енглеÑког на немачки
++Name[sr@Latn]=Prevod na dict.cc: sa engleskog na nemaÄki
+ Name[sv]=dict.cc översättning: engelska till tyska
+ Name[ta]=dict.cc Translation மொழிபெயரà¯à®ªà¯à®ªà¯: ஆஙà¯à®•ிலதà¯à®¤à®¿à®²à¯ இரà¯à®¨à¯à®¤à¯ ஜெரà¯à®®à®©à¯ மொழிகà¯à®•à¯
+ Name[tr]=dict.cc Çevirisi: İngilizceden Almancaya
+ Name[uk]=dict.cc: переклад з англійÑької на німецьку
+-Name[xx]=xxdict.cc Translation: English to Germanxx
+ Query=http://www.dict.cc/?s=\\{@}
+-Query[xx]=xxhttp://www.dict.cc/?s=\\{@}xx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2es.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2es.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2es.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2es.desktop 2005-03-30 01:47:42.000000000 -0500
+@@ -12,6 +12,7 @@
+ Name[cy]=Cyfieithiad WordReference.com: Saesneg i Sbaeneg
+ Name[da]=WordReference.com oversættelse: Engelsk til spansk
+ Name[de]=WordReference.com-Übersetzung: Englisch/Spanisch
++Name[el]=WordReference.com ΜετάφÏαση: Αγγλικά σε Ισπανικά
+ Name[eo]=WordReference.com Traduko: angla al hispana
+ Name[es]=WordReference.com Traducción: inglés a español
+ Name[et]=WordReference.com tõlkimine: inglise->hispaania
+@@ -44,15 +45,13 @@
+ Name[sk]=WordReference.com preklad z angliÄtiny do Å¡panieÅ¡tiny
+ Name[sl]=Prevod WordReference.com: angleÅ¡Äina v Å¡panÅ¡Äino
+ Name[sr]=Превод на WordReference.com: Ñа енглеÑког на шпанÑки
+-Name[sr@Latn]=Превод на WordReference.com: Ñа енглеÑког на шпанÑки
++Name[sr@Latn]=Prevod na WordReference.com: sa engleskog na španski
+ Name[sv]=Wordreference.com översättning: engelska till spanska
+ Name[ta]=WordReference.com மொழிபெயரà¯à®ªà¯à®ªà¯: ஆஙà¯à®•ிலதà¯à®¤à®¿à®²à¯ இரà¯à®¨à¯à®¤à¯ ஸà¯à®ªà®¾à®©à®¿à®·à¯ மொழிகà¯à®•à¯
+ Name[tr]=WordReference.com Çevirisi: İngilizceden İspanyolcaya
+ Name[uk]=WordReference.com: переклад з англійÑької на Ñ–ÑпанÑьку
+ Name[uz]=WordReference.com таржима: Инглизчадан ИÑпанчага
+-Name[xx]=xxWordReference.com Translation: English to Spanishxx
+ Name[zh_CN]=WordReference.com 翻译:英è¯è¯‘西ç牙è¯
+ Query=http://www.wordreference.com/es/translation.asp?tranword=\\{@}
+-Query[xx]=xxhttp://www.wordreference.com/es/translation.asp?tranword=\\{@}xx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2fr.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2fr.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2fr.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2fr.desktop 2005-03-30 01:47:42.000000000 -0500
+@@ -12,6 +12,7 @@
+ Name[cy]=Cyfieithiad WordReference.com: Saesneg i Ffrangeg
+ Name[da]=WordReference.com oversættelse: Engelsk til fransk
+ Name[de]=WordReference.com-Übersetzung: Englisch/Französisch
++Name[el]=WordReference.com ΜετάφÏαση: Αγγλικά σε Γαλλικά
+ Name[eo]=WordReference.com Traduko: angla al franca
+ Name[es]=WordReference.com Traducción: inglés a francés
+ Name[et]=WordReference.com tõlkimine: inglise->prantsuse
+@@ -25,7 +26,7 @@
+ Name[hi]=WordReference.com अनà¥à¤µà¤¾à¤¦à¤ƒ अंगà¥à¤°à¥‡à¤œà¥€ से फà¥à¤°à¤¾à¤‚सीसी
+ Name[hu]=WordReference.com fordÃtás: angolról franciára
+ Name[is]=WordReference.com þýðing: Ensk/frönsk
+-Name[it]=Traduzione WordReferece.com: Dall'inglese al francese
++Name[it]=Traduzione WordReferece.com: dall'inglese al francese
+ Name[ja]=WordReference.com 英語-フランス語翻訳
+ Name[lt]=WordReference.com vertimas: iš anglų į prancūzų
+ Name[mk]=WordReference.com превод: од англиÑки на француÑки
+@@ -44,15 +45,13 @@
+ Name[sk]=WordReference.com preklad z angliÄtiny do francúzÅ¡tiny
+ Name[sl]=Prevod WordReference.com: angleÅ¡Äina v francoÅ¡Äino
+ Name[sr]=Превод на WordReference.com: Ñа енглеÑког на француÑки
+-Name[sr@Latn]=Превод на WordReference.com: Ñа енглеÑког на француÑки
++Name[sr@Latn]=Prevod na WordReference.com: sa engleskog na francuski
+ Name[sv]=Wordreference.com översättning: engelska till franska
+ Name[ta]=WordReference.com மொழிபெயரà¯à®ªà¯à®ªà¯: ஆஙà¯à®•ிலதà¯à®¤à®¿à®²à¯ இரà¯à®¨à¯à®¤à¯ பà¯à®°à¯†à®©à¯à®šà¯ மொழிகà¯à®•à¯
+ Name[tr]=WordReference.com Çevirisi: İngilizceden Fransızcaya
+ Name[uk]=WordReference.com: переклад з англійÑької на французьку
+ Name[uz]=WordReference.com таржима: Инглизчадан Французчага
+-Name[xx]=xxWordReference.com Translation: English to Frenchxx
+ Name[zh_CN]=WordReference.com 翻译:英è¯è¯‘法è¯
+ Query=http://www.wordreference.com/fr/Translation.asp?enfr=\\{@}
+-Query[xx]=xxhttp://www.wordreference.com/fr/Translation.asp?enfr=\\{@}xx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2it.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2it.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2it.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2it.desktop 2005-03-30 01:47:42.000000000 -0500
+@@ -12,6 +12,7 @@
+ Name[cy]=Cyfieithiad WordReference.com: Saesneg i Eidaleg
+ Name[da]=WordReference.com oversættelse: Engelsk til italiensk
+ Name[de]=WordReference.com-Übersetzung: Englisch/Italienisch
++Name[el]=WordReference.com ΜετάφÏαση: Αγγλικά σε Ιταλικά
+ Name[eo]=WordReference.com Traduko: angla al itala
+ Name[es]=WordReference.com Traducción: inglés a italiano
+ Name[et]=WordReference.com tõlkimine: inglise->itaalia
+@@ -25,7 +26,7 @@
+ Name[hi]=WordReference.com अनà¥à¤µà¤¾à¤¦à¤ƒ अंगà¥à¤°à¥‡à¤œà¥€ से इतालवी
+ Name[hu]=WordReference.com fordÃtás: angolról olaszra
+ Name[is]=WordReference.com þýðing: Ensk/Ãtölsk
+-Name[it]=Traduzione WordReferece.com: Dall'inglese all'italiano
++Name[it]=Traduzione WordReferece.com: dall'inglese all'italiano
+ Name[ja]=WordReference.com 英語-イタリア語翻訳
+ Name[lt]=WordReference.com vertimas: iš anglų į italų
+ Name[mk]=WordReference.com превод: од англиÑки на италијанÑки
+@@ -44,15 +45,13 @@
+ Name[sk]=WordReference.com preklad z angliÄtiny do talianÅ¡tiny
+ Name[sl]=Prevod WordReference.com: angleÅ¡Äina v italijanÅ¡Äino
+ Name[sr]=Превод на WordReference.com: Ñа енглеÑког на италијанÑки
+-Name[sr@Latn]=Превод на WordReference.com: Ñа енглеÑког на италијанÑки
++Name[sr@Latn]=Prevod na WordReference.com: sa engleskog na italijanski
+ Name[sv]=Wordreference.com översättning: engelska till italienska
+ Name[ta]=WordReference.com மொழிபெயரà¯à®ªà¯à®ªà¯: ஆஙà¯à®•ிலதà¯à®¤à®¿à®²à¯ இரà¯à®¨à¯à®¤à¯ இதà¯à®¤à®¾à®²à®¿à®¯ மொழிகà¯à®•à¯
+ Name[tr]=WordReference.com Çevirisi: İngilizceden İtalyancaya
+ Name[uk]=WordReference.com: переклад з англійÑької на італійÑьку
+ Name[uz]=WordReference.com таржима: Инглизчадан ИталÑнчага
+-Name[xx]=xxWordReference.com Translation: English to Italianxx
+ Name[zh_CN]=WordReference.com 翻译:英è¯è¯‘æ„大利è¯
+ Query=http://www.wordreference.com/it/translation.asp?enit=\\{@}
+-Query[xx]=xxhttp://www.wordreference.com/it/translation.asp?enit=\\{@}xx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/es2en.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/es2en.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/es2en.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/es2en.desktop 2005-03-30 01:47:42.000000000 -0500
+@@ -12,6 +12,7 @@
+ Name[cy]=Cyfieithiad WordReference.com: Sbaeneg i Saesneg
+ Name[da]=WordReference.com oversættelse: Spansk til engelsk
+ Name[de]=WordReference.com-Übersetzung: Spanisch/Englisch
++Name[el]=WordReference.com ΜετάφÏαση: Ισπανικά σε Αγγλικά
+ Name[eo]=WordReference.com Traduko: hispana al angla
+ Name[es]=WordReference.com Traducción: español a inglés
+ Name[et]=WordReference.com tõlkimine: hispaania->inglise
+@@ -24,7 +25,7 @@
+ Name[hi]=WordReference.com अनà¥à¤µà¤¾à¤¦à¤ƒ सà¥à¤ªà¥‡à¤¨à¥€ से अंगà¥à¤°à¥‡à¤œà¥€
+ Name[hu]=WordReference.com fordÃtás: spanyolról angolra
+ Name[is]=WordReference.com þýðing: Spönsk/ensk
+-Name[it]=Traduzione WordReferececom: Dallo spagnolo all'inglese
++Name[it]=Traduzione WordReferececom: dallo spagnolo all'inglese
+ Name[ja]=WordReference.com スペイン語-英語翻訳
+ Name[lt]=WordReference.com vertimas: iš ispanų į anglų
+ Name[mk]=WordReference.com превод: од шпанÑки на англиÑки
+@@ -43,15 +44,13 @@
+ Name[sk]=WordReference.com preklad zo Å¡panieÅ¡tiny do angliÄtiny
+ Name[sl]=Prevod WordReference.com: Å¡panÅ¡Äina v angleÅ¡Äino
+ Name[sr]=Превод на WordReference.com: Ñа шпанÑког на енглеÑки
+-Name[sr@Latn]=Превод на WordReference.com: Ñа шпанÑког на енглеÑки
++Name[sr@Latn]=Prevod na WordReference.com: sa španskog na engleski
+ Name[sv]=Wordreference.com översättning: spanska till engelska
+ Name[ta]=WordReference.com மொழிபெயரà¯à®ªà¯à®ªà¯: ஸà¯à®ªà®¾à®©à®¿à®·à¯ மொழியில௠இரà¯à®¨à¯à®¤à¯ ஆஙà¯à®•ிலதà¯à®¤à¯à®•à¯à®•à¯
+ Name[tr]=WordReference.com Çevirisi: İspanyolcadan İngilizceye
+ Name[uk]=WordReference.com: переклад з Ñ–ÑпанÑької на англійÑьку
+ Name[uz]=WordReference.com таржима: ИÑпанчадан Инглизчага
+-Name[xx]=xxWordReference.com Translation: Spanish to Englishxx
+ Name[zh_CN]=WordReference.com 翻译:西ç牙è¯è¯‘英è¯
+ Query=http://www.wordreference.com/es/en/translation.asp?spen=\\{@}
+-Query[xx]=xxhttp://www.wordreference.com/es/en/translation.asp?spen=\\{@}xx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/excite.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/excite.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/excite.desktop 2005-02-21 13:17:49.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/excite.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -13,10 +13,8 @@
+ Name[ss]=Jabulisa
+ Name[ta]=ஆசà¯à®šà®°à¯à®¯à®®à¯
+ Name[ven]=Takadza
+-Name[xx]=xxExcitexx
+ Name[zu]=Jabulisa
+ ServiceTypes=SearchProvider
+ Keys=ex,excite
+ Query=http://search.excite.com/search.gw?search=\\{@}
+ Query[en_GB]=http://www.excite.co.uk/search/web/results?q=\\{@}&c=web
+-Query[xx]=xxhttp://search.excite.com/search.gw?search=\\{@}xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/feedster.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/feedster.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/feedster.desktop 2005-01-31 03:35:25.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/feedster.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -8,10 +8,8 @@
+ Name[ja]=Feedster検索
+ Name[pa]=ਫੀਡਸਟੀਰ
+ Name[ta]=பீடà¯à®¸à¯à®Ÿà®°à¯
+-Name[xx]=xxFeedsterxx
+ ServiceTypes=SearchProvider
+ Keys=blog,rss,feedster
+ Query=http://www.feedster.com/search.php?q=\\{@}&ie=UTF-8&oe=UTF-8
+ Query[he]=http://www.feedster.com/search.php?q=\\{@}&ie=UTF8&oe=UTF-88
+-Query[xx]=xxhttp://www.feedster.com/search.php?q=\\{@}&ie=UTF-8&oe=UTF-8xx
+ Charset=utf8
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/foldoc.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/foldoc.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/foldoc.desktop 2005-02-18 23:27:00.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/foldoc.desktop 2005-03-30 01:47:42.000000000 -0500
+@@ -9,6 +9,7 @@
+ Name[cs]=Online slovnÃk výp. techniky
+ Name[cy]=Geiriadur Rhydd Ar-lein o Gyfrifiaduro
+ Name[da]=Gratis online-computerordbog
++Name[el]=ΕλεÏθεÏο διαδικτυακό λεξικό υπολογιστών
+ Name[eo]=Libera reta vortaro de komputado
+ Name[es]=Free On-Line Dictionary Of Computing
+ Name[et]=Vaba arvutialane võrgusõnastik
+@@ -39,15 +40,13 @@
+ Name[sk]=Free On-Line Dictionary Of Computing
+ Name[sl]=Free On-Line Dictionary Of Computing
+ Name[sr]=БеÑплатни On-Line речник за рачунаре
+-Name[sr@Latn]=БеÑплатни On-Line речник за рачунаре
++Name[sr@Latn]=Besplatni On-Line reÄnik za raÄunare
+ Name[sv]=Free On-Line Dictionary Of Computing (en datortermsordlista)
+ Name[ta]=கணிபà¯à®ªà¯Šà®±à®¿ அகராதி வலைதளதà¯à®¤à®¿à®²à¯ இலவசமாக
+ Name[tr]=Ücretsiz Çevrimiçi Bilişim Sözlüğü
+ Name[uk]=Вільний Ñловник з інформатики в мережі
+ Name[uz]=Компьютер атамалари бўйича Интернет луғат
+-Name[xx]=xxFree On-Line Dictionary of Computingxx
+ Name[zh_CN]=Free On-Line Dictionary Of Computing
+ ServiceTypes=SearchProvider
+ Keys=fd,foldoc
+ Query=http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=\\{@}
+-Query[xx]=xxhttp://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=\\{@}xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/fr2de.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/fr2de.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/fr2de.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/fr2de.desktop 2005-03-30 01:47:42.000000000 -0500
+@@ -3,12 +3,15 @@
+ Type=Service
+ Name=LEO - Translate Between French and German
+ Name[bn]=লিও - জারà§à¦®à¦¾à¦¨ থেকে ফরাসী বা ফরাসী থেকে জারà§à¦®à¦¾à¦¨-ঠঅনà§à¦¬à¦¾à¦¦ করà§à¦¨
++Name[bs]=LEO prijevod: francuski u njemaÄki
+ Name[ca]=LEO - Tradueix entre francès i alemany
+ Name[cs]=LEO - pÅ™eklad mezi francouzÅ¡tinou a nÄ›mÄinou
+ Name[da]=LEO - Oversæt mellem fransk og tysk
+ Name[de]=LEO - Übersetzung Französisch/Deutsch
++Name[el]=LEO - ΜετάφÏαση Î¼ÎµÏ„Î±Î¾Ï Î“Î±Î»Î»Î¹ÎºÏŽÎ½ και ΓεÏμανικών
+ Name[es]=LEO - Traducción entre francés y alemán
+ Name[et]=LEO - tõlkimine: prantsuse-saksa
++Name[eu]=LEO - itzuli alemana eta frantsearen artean
+ Name[fi]=LEO - Käännä ranskan ja saksan välillä
+ Name[fr]=LEO - Traduction Français - Allemand
+ Name[fy]=LEO - oersetting tusken Fransk en Dûtsk
+@@ -17,6 +20,7 @@
+ Name[hu]=LEO - FordÃtás franciáról németre (mindkét irányban)
+ Name[is]=LEO - Þýða á milli frönsku og þýsku
+ Name[it]=LEO - Traduzione dal francese al tedesco
++Name[ja]=LEO - フランス語ードイツ語間ã®ç¿»è¨³
+ Name[lt]=LEO - vertimas iÅ¡ prancÅ«zų į vokieÄių ir atvirkÅ¡Äiai
+ Name[nb]=LEO - Oversettelse fra fransk til tysk
+ Name[nl]=LEO - vertaling tussen Frans en Duits
+@@ -27,15 +31,14 @@
+ Name[pt_BR]=LEO - Tradução entre Francês e Alemão
+ Name[ru]=LEO - французÑко-немецкий перевод
+ Name[se]=LEO – jorgal fránskka- ja duiskkagiela gaskkas
++Name[sk]=LEO - Preklad medzi francúzÅ¡tinou a nemÄinou
+ Name[sl]=LEO - Prevod med francoÅ¡Äino in nemÅ¡Äino
+ Name[sr]=LEO — превод између француÑког и немачког
+-Name[sr@Latn]=LEO — превод између француÑког и немачког
++Name[sr@Latn]=LEO — prevod izmeÄ‘u francuskog i nemaÄkog
+ Name[sv]=LEO - översätt från franska till tyska
+ Name[ta]=LEO - பà¯à®°à¯†à®©à¯à®šà¯ மறà¯à®±à¯à®®à¯ ஜெரà¯à®®à®©à¯ இடையே மொழிபà¯à®ªà¯†à®¯à®°à¯à®•à¯à®•வà¯à®®à¯
+ Name[tr]=LEO - Fransızcadan Almancaya Çeviri
+ Name[uk]=LEO - переклад між французькою та німецькою
+-Name[xx]=xxLEO - Translate Between French and Germanxx
+ ServiceTypes=SearchProvider
+ Keys=fr2de
+ Query=http://dict.leo.org/?lp=frde&search=\\{@}
+-Query[xx]=xxhttp://dict.leo.org/?lp=frde&search=\\{@}xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/fr2en.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/fr2en.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/fr2en.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/fr2en.desktop 2005-03-22 12:38:04.000000000 -0500
+@@ -24,7 +24,7 @@
+ Name[hi]=WordReference.com अनà¥à¤µà¤¾à¤¦à¤ƒ फà¥à¤°à¤¾à¤‚सीसी से अंगà¥à¤°à¥‡à¤œà¥€
+ Name[hu]=WordReference.com fordÃtás: franciáról angolra
+ Name[is]=WordReference.com þýðing: Frönsk/ensk
+-Name[it]=Traduzione WordReferececom: Dal francese all'inglese
++Name[it]=Traduzione WordReferececom: dal francese all'inglese
+ Name[ja]=WordReference.com フランス語-英語翻訳
+ Name[lt]=WordReference.com vertimas: iš prancūzų į anglų
+ Name[mk]=WordReference.com превод: од француÑки на англиÑки
+@@ -43,15 +43,13 @@
+ Name[sk]=WordReference.com preklad z francúzÅ¡tiny do angliÄtiny
+ Name[sl]=Prevod WordReference.com: francoÅ¡Äina v angleÅ¡Äino
+ Name[sr]=Превод на WordReference.com: Ñа француÑког на енглеÑки
+-Name[sr@Latn]=Превод на WordReference.com: Ñа француÑког на енглеÑки
++Name[sr@Latn]=Prevod na WordReference.com: sa francuskog na engleski
+ Name[sv]=Wordreference.com översättning: franska till engelska
+ Name[ta]=WordReference.com மொழிபெயரà¯à®ªà¯à®ªà¯: பிரெனà¯à®šà¯ மொழியில௠இரà¯à®¨à¯à®¤à¯ ஆஙà¯à®•ிலதà¯à®¤à¯à®•à¯à®•à¯
+ Name[tr]=WordReference.com Çevirisi: Fransızcadan İngilizceye
+ Name[uk]=WordReference.com: переклад з французької на англійÑьку
+ Name[uz]=WordReference.com таржима: Французчадан Инглизчага
+-Name[xx]=xxWordReference.com Translation: French to Englishxx
+ Name[zh_CN]=WordReference.com 翻译:法è¯è¯‘英è¯
+ Query=http://www.wordreference.com/fr/en/translation.asp?fren=\\{@}
+-Query[xx]=xxhttp://www.wordreference.com/fr/en/translation.asp?fren=\\{@}xx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/freedb.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/freedb.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/freedb.desktop 2005-02-18 23:27:00.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/freedb.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -6,9 +6,7 @@
+ Name[eo]=Libera Civilizludo
+ Name[hi]=फà¥à¤°à¥€-डीबी
+ Name[ta]=இலவசடிபி
+-Name[xx]=xxFreeDBxx
+ ServiceTypes=SearchProvider
+ Keys=fdb,freedb
+ Query=http://www.freedb.org/freedb_search.php?words=\\{@}
+-Query[xx]=xxhttp://www.freedb.org/freedb_search.php?words=\\{@}xx
+ Charset=utf8
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/freshmeat.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/freshmeat.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/freshmeat.desktop 2005-01-30 00:10:26.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/freshmeat.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -12,9 +12,7 @@
+ Name[pl]=Freshmeat - wyszukiwarka programów
+ Name[ta]=பà¯à®¤à¯ இறைசà¯à®šà®¿
+ Name[ven]=Namathethe
+-Name[xx]=xxFreshmeatxx
+ Name[zu]=Inyama yamanje
+ ServiceTypes=SearchProvider
+ Keys=fm,freshmeat
+ Query=http://freshmeat.net/search/?q=\\{@}
+-Query[xx]=xxhttp://freshmeat.net/search/?q=\\{@}xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/froogle.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/froogle.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/froogle.desktop 2005-02-10 23:51:52.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/froogle.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -8,10 +8,8 @@
+ Name[ja]=Froogle商哿¤œç´¢
+ Name[pa]=ਫਰੂਗਲ
+ Name[ta]=ஃபà¯à®°à¯‚கà¯à®²à¯
+-Name[xx]=xxFrooglexx
+ ServiceTypes=SearchProvider
+ Keys=froogle
+ Query=http://froogle.google.com/froogle?q=\\{@}
+ Query[en_GB]=http://froogle.google.co.uk/froogle?q=\\{@}
+ Query[nb]=http://froogle.google.no/froogle?q=\\{@}
+-Query[xx]=xxhttp://froogle.google.com/froogle?q=\\{@}xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/fsd.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/fsd.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/fsd.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/fsd.desktop 2005-03-22 12:38:04.000000000 -0500
+@@ -3,15 +3,18 @@
+ Type=Service
+ Name=FSF/UNESCO Free Software Directory
+ Name[bn]=FSF/UNESCO ফà§à¦°à§€ সফà§â€Œà¦Ÿà¦“à§Ÿà§à¦¯à¦¾à¦° ডিরেকà§à¦Ÿà¦°à¦¿
++Name[bs]=FSF/UNESCO imenik slobodnog softvera
+ Name[ca]=Directori de programari lliure FSF/UNESCO
+ Name[da]=FSF/UNESCO Free Software katalog
+ Name[es]=Directorio de software libre de FSF/UNESCO
++Name[eu]=FSF/UNESCO Free Software direktorioa
+ Name[fi]=FSF/UNESCO Vapaa ohjelmien hakemisto
+ Name[fr]=Catalogue de logiciels libres FSF/UNESCO
+ Name[he]=ספריית ×ª×•×›× ×” חופשית של FSF/UNESCO
+ Name[hi]=à¤à¤«à¤à¤¸à¤à¤«/यूनेसà¥à¤•ो फà¥à¤°à¥€ सॉफ़à¥à¤Ÿà¤µà¥‡à¤¯à¤° डिरेकà¥à¤Ÿà¥à¤°à¥€
+ Name[hu]=FSF/UNESCO szabadszoftver-gyűjtemény
+ Name[it]=Elenco software liberp FSF/UNESCO
++Name[ja]=FSF/UNESCO フリー ソフトウェア ディレクトリ
+ Name[lt]=FSF/UNESCO laisvos programinės įrangos katalogas
+ Name[nb]=FSF/UNESCO-katalogen over fri programvare
+ Name[nn]=FSF/UNESCO-katalogen over fri programvare
+@@ -20,17 +23,16 @@
+ Name[pt]=Directoria de Software Livre FSF/UNESCO
+ Name[pt_BR]=Diretório de Software Livre - FSF/UNESCO
+ Name[ru]=Каталог Ñвободного ПО FSF/UNESCO
++Name[sk]=FSF/UNESCO Adresár voľného sofvéru
+ Name[sl]=Imenik prostega programja FSF/UNESCO
+ Name[sr]=ÐдреÑар Ñлободног Ñофтвера FSF-а/UNESCO-а
+-Name[sr@Latn]=ÐдреÑар Ñлободног Ñофтвера FSF-а/UNESCO-а
++Name[sr@Latn]=Adresar slobodnog softvera FSF-a/UNESCO-a
+ Name[sv]=FSF/UNESCO katalog över fri programvara
+ Name[ta]=FSF/UNESCO இலவச மெனà¯à®ªà¯Šà®°à¯à®³à¯ அடைவà¯
+ Name[tr]=FSF/UNESCO Ücretsiz Yazılım Dizini
+ Name[uk]=Словник з вільного програмного Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑ‡ÐµÐ½Ð½Ñ FSF/UNESCO
+-Name[xx]=xxFSF/UNESCO Free Software Directoryxx
+ ServiceTypes=SearchProvider
+ Keys=fsd
+ Query=http://directory.fsf.org/search/fsd-search.py?q=\\{@}
+-Query[xx]=xxhttp://directory.fsf.org/search/fsd-search.py?q=\\{@}xx
+
+
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/google.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/google.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/google.desktop 2005-02-21 13:17:50.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/google.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -11,7 +11,6 @@
+ Name[pl]=Google - wyszukiwarka stron WWW
+ Name[ta]=கூகà¯à®²à¯
+ Name[th]=à¸à¸¹à¹€à¸à¸´à¹‰à¸¥
+-Name[xx]=xxGooglexx
+ ServiceTypes=SearchProvider
+ Keys=gg,google
+ Query=http://www.google.com/search?q=\\{@}&ie=UTF-8&oe=UTF-8
+@@ -25,5 +24,4 @@
+ Query[nl]=http://www.google.nl/search?q=\\{@}&ie=UTF-8&oe=UTF-8
+ Query[nn]=http://www.google.com/search?hl=nn&q=\\{@}&ie=UTF-8&oe=UTF-8
+ Query[pt]=http://www.google.pt/search?q=\\{@}&ie=UTF-8&oe=UTF-8
+-Query[xx]=xxhttp://www.google.com/search?q=\\{@}&ie=UTF-8&oe=UTF-8xx
+ Charset=utf8
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_advanced.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_advanced.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_advanced.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_advanced.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -52,7 +52,7 @@
+ Name[sk]=PokroÄilé hľadanie Google
+ Name[sl]=Napredno iskanje z Google
+ Name[sr]=Google-ово напредно претраживање
+-Name[sr@Latn]=Google napredno pretraživanje
++Name[sr@Latn]=Google-ovo napredno pretraživanje
+ Name[ss]=Kusesha lokusembili kwe Google
+ Name[sv]=Google avancerad sökning
+ Name[ta]=கூகà¯à®²à¯ மேமà¯à®ªà®Ÿà¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®Ÿ தேடà¯à®¤à®²à¯
+@@ -63,7 +63,6 @@
+ Name[ven]=U setsha ho Engedzeaho ha Google
+ Name[wa]=Ricweraedje avancî di Google
+ Name[xh]=Uphendlo Olubhekisa phambili lwe Google
+-Name[xx]=xxGoogle Advanced Searchxx
+ Name[zh_CN]=Google 高级æœç´¢
+ Name[zh_TW]=Google 進階æœå°‹
+ Name[zu]=Usesho lwezinga eliphezulu lwe-Google
+@@ -78,7 +77,6 @@
+ Query[nl]=http://www.google.nl/search?as_q=\\{all,@}&num=\\{num,"10"}&btnG=Google+Search&as_epq=\\{exact,""}&as_oq=\\{any,""}&as_eq=\\{without,""}&lr=\\{lang,""}&as_ft=\\{ft,"i"}&as_filetype=\\{filetype,""}&as_qdr=\{date,"all"}&as_occt=\\{occ,"any"}&as_dt=\\{siteop,"i"}&as_sitesearch=\\{site}&safe=\\{safe,"active"}&ie=UTF-8&oe=UTF-8
+ Query[nn]=http://www.google.com/search?hl=nn&as_q=\\{all,@}&num=\\{num,"10"}&btnG=Google+Search&as_epq=\\{exact,""}&as_oq=\\{any,""}&as_eq=\\{without,""}&lr=\\{lang,""}&as_ft=\\{ft,"i"}&as_filetype=\\{filetype,""}&as_qdr=\{date,"all"}&as_occt=\\{occ,"any"}&as_dt=\\{siteop,"i"}&as_sitesearch=\\{site}&safe=\\{safe,"active"}&ie=UTF-8&oe=UTF-8
+ Query[pt]=http://www.google.pt/search?as_q=\\{all,@}&num=\\{num,"10"}&btnG=Google+Search&as_epq=\\{exact,""}&as_oq=\\{any,""}&as_eq=\\{without,""}&lr=\\{lang,""}&as_ft=\\{ft,"i"}&as_filetype=\\{filetype,""}&as_qdr=\{date,"all"}&as_occt=\\{occ,"any"}&as_dt=\\{siteop,"i"}&as_sitesearch=\\{site}&safe=\\{safe,"active"}&ie=UTF-8&oe=UTF-8
+-Query[xx]=xxhttp://www.google.com/search?as_q=\\{all,@}&num=\\{num,"10"}&btnG=Google+Search&as_epq=\\{exact,""}&as_oq=\\{any,""}&as_eq=\\{without,""}&lr=\\{lang,""}&as_ft=\\{ft,"i"}&as_filetype=\\{filetype,""}&as_qdr=\{date,"all"}&as_occt=\\{occ,"any"}&as_dt=\\{siteop,"i"}&as_sitesearch=\\{site}&safe=\\{safe,"active"}&ie=UTF-8&oe=UTF-8xx
+ Charset=utf8
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_groups.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_groups.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_groups.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_groups.desktop 2005-03-22 12:38:04.000000000 -0500
+@@ -29,7 +29,7 @@
+ Name[hi]=गूगल समूह
+ Name[hr]=Google Grupe
+ Name[is]=Google - Ráðstefnur
+-Name[it]=Gruppi di Google
++Name[it]=Google gruppi
+ Name[ja]=Google グループ
+ Name[ko]=구글 그룹
+ Name[lt]=Google grupÄ—s
+@@ -49,7 +49,7 @@
+ Name[sk]=Diskusné skupiny Google
+ Name[sl]=Skupine Google
+ Name[sr]=Google-ове групе
+-Name[sr@Latn]=Google grupe
++Name[sr@Latn]=Google-ove grupe
+ Name[ss]=Emacembu ye Google
+ Name[sv]=Google-grupper
+ Name[ta]=கூகà¯à®²à¯ கà¯à®´à¯à®•à¯à®•ளà¯
+@@ -59,7 +59,6 @@
+ Name[uz]=Google - Гуруҳлар
+ Name[ven]=Tshigwada tsha Google
+ Name[xh]=Amaqela e Google
+-Name[xx]=xxGoogle Groupsxx
+ Name[zh_CN]=Google 新闻群组
+ Name[zh_TW]=Google 群組
+ Name[zu]=Amaqembu e-Google
+@@ -74,4 +73,3 @@
+ Query[nl]=http://groups.google.nl/groups?oi=djq&as_q=\\{@}
+ Query[nn]=http://groups.google.com/groups?hl=nn&oi=djq&as_q=\\{@}
+ Query[pt]=http://groups.google.pt/groups?oi=djq&as_q=\\{@}
+-Query[xx]=xxhttp://groups.google.com/groups?oi=djq&as_q=\\{@}xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_images.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_images.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_images.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_images.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -52,7 +52,7 @@
+ Name[sk]=Hľadanie obrázkov Google
+ Name[sl]=Iskanje slik z Google
+ Name[sr]=Google-ово претраживање Ñлика
+-Name[sr@Latn]=Google pretraživanje slika
++Name[sr@Latn]=Google-ovo pretraživanje slika
+ Name[ss]=Kusesha kwemfanekiso ku Google
+ Name[sv]=Google bildsökning
+ Name[ta]=கூகà¯à®²à¯ சிதà¯à®¤à®¿à®° தேடà¯
+@@ -64,7 +64,6 @@
+ Name[vi]=Google Tìm kiếm hình ảnh
+ Name[wa]=Cweraedje d' imådjes avou Google
+ Name[xh]=Uphendlo Lomfanekiso we Google
+-Name[xx]=xxGoogle Image Searchxx
+ Name[zh_CN]=Google å›¾åƒæœç´¢
+ Name[zh_TW]=Google 圖片æœå°‹
+ Name[zu]=Ukusesha isithombe kwe-Google
+@@ -79,4 +78,3 @@
+ Query[nl]=http://images.google.nl/images?q=\\{@}
+ Query[nn]=http://images.google.com/images?hl=nn&q=\\{@}
+ Query[pt]=http://images.google.pt/images?q=\\{@}
+-Query[xx]=xxhttp://images.google.com/images?q=\\{@}xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_lucky.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_lucky.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_lucky.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_lucky.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -49,7 +49,7 @@
+ Name[sk]=Google (CÃtim sa Å¡tastne)
+ Name[sl]=Google (PoÄutim se sreÄnega)
+ Name[sr]=Google (Добијам из прве)
+-Name[sr@Latn]=Google (Osećam da imam sreće)
++Name[sr@Latn]=Google (Dobijam iz prve)
+ Name[ss]=Google (Ngitiva nginenhlanhla)
+ Name[sv]=Google (Jag har tur)
+ Name[ta]=கூகà¯à®²à¯ (நான௠அதிரà¯à®·à¯à®Ÿà®šà®¾à®²à®¿à®¯à®¾à®• உணரà¯à®•ிறேனà¯)
+@@ -58,7 +58,6 @@
+ Name[uk]=Google (Я - везунчик)
+ Name[uz]=Google (Омадим борга ўхшайди)
+ Name[ven]=Google (Ndi pfa ndina Mashudu)
+-Name[xx]=xxGoogle (I'm Feeling Lucky)xx
+ Name[zh_CN]=Google (手气ä¸é”™)
+ Name[zh_TW]=Google (好手氣)
+ Name[zu]=Google (Ngizizwa Ngisenhlanhleni)
+@@ -74,5 +73,4 @@
+ Query[nb]=http://www.google.no/search?q=\\{@}&btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8
+ Query[nl]=http://www.google.nl/search?q=\\{@}&btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8
+ Query[pt]=http://www.google.pt/search?q=\\{@}&btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8
+-Query[xx]=xxhttp://www.google.com/search?q=\\{@}&btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8xx
+ Charset=utf8
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_news.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_news.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_news.desktop 2005-02-21 13:17:50.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_news.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -53,7 +53,6 @@
+ Name[uk]=Ðовини Google
+ Name[uz]=Google - Янгиликлар
+ Name[vi]=Tin tức Google
+-Name[xx]=xxGoogle Newsxx
+ Name[zh_CN]=Google æ–°é—»
+ Name[zh_TW]=Google æ–°èž
+ ServiceTypes=SearchProvider
+@@ -68,5 +67,4 @@
+ Query[nb]=http://news.google.no/news?q=\\{@}&ie=UTF-8&oe=UTF-8
+ Query[nl]=http://news.google.nl/news?q=\\{@}&ie=UTF-8&oe=UTF-8
+ Query[pt]=http://news.google.pt/news?q=\\{@}&ie=UTF-8&oe=UTF-8
+-Query[xx]=xxhttp://news.google.com/news?q=\\{@}&ie=UTF-8&oe=UTF-8xx
+ Charset=utf8
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/gracenote.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/gracenote.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/gracenote.desktop 2005-02-18 23:27:00.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/gracenote.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -7,9 +7,7 @@
+ Name[hi]=गà¥à¤°à¥‡à¤¸à¤¨à¥‹à¤Ÿ
+ Name[pa]=ਗਰੇਸਨੋਟ
+ Name[ta]=கà¯à®°à¯‡à®¸à¯à®¨à¯‹à®Ÿà¯
+-Name[xx]=xxGracenotexx
+ ServiceTypes=SearchProvider
+ Keys=gn,gracenote
+ Query=http://www.gracenote.com/music/search-adv.html?q=\\{@}
+-Query[xx]=xxhttp://www.gracenote.com/music/search-adv.html?q=\\{@}xx
+ Charset=utf8
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/grec.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/grec.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/grec.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/grec.desktop 2005-03-30 01:47:42.000000000 -0500
+@@ -5,16 +5,20 @@
+ Keys=grec
+ Name=Great Dictionary of the Catalan Language (GRan Enciclopèdia Catalana)
+ Name[bn]=কাটালান à¦à¦¾à¦·à¦¾à¦° অà¦à¦¿à¦§à¦¾à¦¨ (GRan Enciclopèdia Catalana)
++Name[bs]=Veliki rjeÄnik katalonskog jezika (GRan Enciclopèdia Catalana)
+ Name[ca]=Gran diccionari de la Llengua Catalana (Grup Enciclopèdia Catalana)
+ Name[da]=Storartet ordbog for det katalanske sprog (GRan Enciclopèdia Catalana)
+ Name[de]=Großes Wörterbuch der Katalanischen Sprache (GRan Enciclopèdia Catalana)
++Name[el]=Μεγάλο Λεξικό της Καταλανικής Γλώσσας (GRan Enciclopèdia Catalana)
+ Name[es]=Gran enciclopedia catalana
+ Name[et]=Suur katalaani sõnaraamat (GRan Enciclopèdia Catalana)
++Name[eu]=Katalaniera hiztegia (GRan Enciclopèdia Catalana)
+ Name[fi]=Catalanian suurenmoinen sanakirja (GRan Enciclopèdia Catalana)
+ Name[fr]=Grand dictionnaire du langage catalan (GRan Enciclopèdia Catalana)
+ Name[hu]=Katalán nagyszótár (GRan Enciclopèdia Catalana)
+ Name[is]=Stóra orðabók katalónska tungumálsins (GRan Enciclopèdia Catalana)
+ Name[it]=Grande dizionario della lingua catalana (GRan Enciclopèdia Catalana)
++Name[ja]=カタラン語大辞典 (GRan Enciclopèdia Catalana)
+ Name[lt]=Puikus katalonų kalbos žodynas (GRan Enciclopèdia Catalana)
+ Name[nb]=Den store, katalanske ordboka (GRan Enciclopèdia Catalana)
+ Name[nl]=Catalaanse Encyclopedie
+@@ -25,14 +29,13 @@
+ Name[pt_BR]=Dicionário no Idioma Catalão (GRan Enciclopèdia Catalana)
+ Name[ru]=Большой Ñловарь каталанÑкого Ñзыка (GRan Enciclopèdia Catalana)
+ Name[se]=Katalangiela stuorra sátnegirji (GRan Enciclopèdia Catalana)
++Name[sk]=VeÅ¡ký slovnÃk katalánskeho jazyka (GRan Enciclopèdia Catalana)
+ Name[sl]=Veliki slovar katalonÅ¡Äine (GRan Enciclopèdia Catalana)
+ Name[sr]=Велики речник каталонÑког језика (Gran Enciclopèdia Catalana)
+-Name[sr@Latn]=Велики речник каталонÑког језика (Gran Enciclopèdia Catalana)
++Name[sr@Latn]=Veliki reÄnik katalonskog jezika (Gran Enciclopèdia Catalana)
+ Name[sv]=Stor ordbok för katalanska språket (Gran Enciclopèdia Catalana)
+ Name[ta]=கேடலன௠மொழியின௠அகராதி (GRan Enciclopèdia Catalana)
+ Name[uk]=Великий Ñловник каталонÑької мови (GRan Enciclopèdia Catalana)
+-Name[xx]=xxGreat Dictionary of the Catalan Language (GRan Enciclopèdia Catalana)xx
+ Query=http://www.grec.net/cgibin/lexicx.pgm?GECART=\\{@}
+-Query[xx]=xxhttp://www.grec.net/cgibin/lexicx.pgm?GECART=\\{@}xx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/hotbot.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/hotbot.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/hotbot.desktop 2005-02-21 13:17:50.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/hotbot.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -10,9 +10,7 @@
+ Name[pl]=Hotbot - wyszukiwarka stron WWW
+ Name[ta]=ஹாடà¯à®ªà®¾à®Ÿà¯
+ Name[ven]=Bot yau fhisa
+-Name[xx]=xxHotbotxx
+ ServiceTypes=SearchProvider
+ Keys=hb,hotbot
+ Query=http://hotbot.lycos.com/?MT=\\{@}&SM=MC&DV=0&LG=any&DC=10&DE=2
+ Query[en_GB]=http://search.hotbot.co.uk/cgi-bin/pursuit?query=\\{@}&cat=hb_loc&enc=utf-8&SITE=uk&command=
+-Query[xx]=xxhttp://hotbot.lycos.com/?MT=\\{@}&SM=MC&DV=0&LG=any&DC=10&DE=2xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/hyperdictionary.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/hyperdictionary.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/hyperdictionary.desktop 2005-01-30 00:10:26.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/hyperdictionary.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -7,8 +7,6 @@
+ Name[pl]=HyperDictionary.com - słownik
+ Name[sv]=Hyperdictionary.com
+ Name[ta]=திறநà¯à®¤ அடைவà¯
+-Name[xx]=xxHyperDictionary.comxx
+ ServiceTypes=SearchProvider
+ Keys=hd,hyperdict
+ Query=http://www.hyperdictionary.com/search.aspx?define=\\{@}
+-Query[xx]=xxhttp://www.hyperdictionary.com/search.aspx?define=\\{@}xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/hyperdictionary_thesaurus.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/hyperdictionary_thesaurus.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/hyperdictionary_thesaurus.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/hyperdictionary_thesaurus.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -37,15 +37,13 @@
+ Name[sk]=HyperDictionary.com - slovnÃk synoným
+ Name[sl]=Tezaver HyperDictionary.com
+ Name[sr]=Речник Ñинонима на HyperDictionary.com
+-Name[sr@Latn]=HyperDictionary.com reÄnik sinonima
++Name[sr@Latn]=ReÄnik sinonima na HyperDictionary.com
+ Name[sv]=HyperDictionary.com synonymlexikon
+ Name[ta]=HyperDictionary.com சொறà¯à®•ளஞà¯à®šà®¿à®¯à®®à¯
+ Name[tr]=HyperDictionary.com Terimler
+ Name[uk]=Словник Ñинонімів HyperDictionary.com
+ Name[uz]=HyperDictionary.com луғати
+-Name[xx]=xxHyperDictionary.com Thesaurusxx
+ Name[zh_CN]=HyperDictionary.com å®è—
+ ServiceTypes=SearchProvider
+ Keys=hdt,hd-ths,hd-thesaurus
+ Query=http://www.hyperdictionary.com/search.aspx?Dict=T&define=\\{@}
+-Query[xx]=xxhttp://www.hyperdictionary.com/search.aspx?Dict=T&define=\\{@}xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/imdb.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/imdb.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/imdb.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/imdb.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -40,7 +40,7 @@
+ Name[sk]=Internetová databáza filmov
+ Name[sl]=Internetna zbirka filmov
+ Name[sr]=База података о филмовима на Интернету
+-Name[sr@Latn]=Internet baza podataka o filmovima
++Name[sr@Latn]=Baza podataka o filmovima na Internetu
+ Name[sv]=Internet filmdatabas
+ Name[ta]=வலைதள திரைபà¯à®ªà®Ÿ தகவலà¯à®¤à®³à®®à¯
+ Name[tg]=Бонки иттилооти филм дар интернет
+@@ -48,7 +48,6 @@
+ Name[uk]=База даних кінофільмів в Інтернет
+ Name[uz]=Интернетдаги кино маълумот базаÑи
+ Name[vi]=Cơ sở dư liệu phim ảnh trên Internet
+-Name[xx]=xxInternet Movie Databasexx
+ Name[zh_CN]=互è”网电影数æ®åº“
+ Name[zh_TW]=Internet 電影資料庫
+ ServiceTypes=SearchProvider
+@@ -56,5 +55,4 @@
+ Query=http://imdb.com/Find?\\{@}
+ Query[en_GB]=http://imdb.co.uk/Find?\\{@}
+ Query[it]=http://italian.imdb.com/Find?\\{@}
+-Query[xx]=xxhttp://imdb.com/Find?\\{@}xx
+
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/it2en.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/it2en.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/it2en.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/it2en.desktop 2005-03-30 01:47:42.000000000 -0500
+@@ -12,6 +12,7 @@
+ Name[cy]=Cyfieithiad WordReference.com: Eidaleg i Saesneg
+ Name[da]=WordReference.com oversættelse: Italiensk til engelsk
+ Name[de]=WordReference.com-Übersetzung: Italienisch/Englisch
++Name[el]=WordReference.com ΜετάφÏαση: Ιταλικά σε Αγγλικά
+ Name[eo]=WordReference.com Traduko: itala al angla
+ Name[es]=WordReference.com Traducción: italiano a inglés
+ Name[et]=WordReference.com tõlkimine: itaalia->inglise
+@@ -24,7 +25,7 @@
+ Name[hi]=WordReference.com अनà¥à¤µà¤¾à¤¦à¤ƒ इतालवी से अंगà¥à¤°à¥‡à¤œà¥€
+ Name[hu]=WordReference.com fordÃtás: olaszról angolra
+ Name[is]=WordReference.com þýðing: Ãtölsk/ensk
+-Name[it]=Traduzione WordReferececom: Dall'italiano all'inglese
++Name[it]=Traduzione WordReferececom: dall'italiano all'inglese
+ Name[ja]=WordReference.com イタリア語-英語翻訳
+ Name[lt]=WordReference.com vertimas: iš italų į anglų
+ Name[mk]=WordReference.com превод: од италијанÑки на англиÑки
+@@ -43,15 +44,13 @@
+ Name[sk]=WordReference.com preklad z talianÅ¡tiny do angliÄtiny
+ Name[sl]=Prevod WordReference.com: italijanÅ¡Äina v angleÅ¡Äino
+ Name[sr]=Превод на WordReference.com: Ñа италијанÑког на енглеÑки
+-Name[sr@Latn]=Превод на WordReference.com: Ñа италијанÑког на енглеÑки
++Name[sr@Latn]=Prevod na WordReference.com: sa italijanskog na engleski
+ Name[sv]=Wordreference.com översättning: italienska till engelska
+ Name[ta]=WordReference.com மொழிபெயரà¯à®ªà¯à®ªà¯: இதà¯à®¤à®¾à®²à®¿à®¯ மொழியில௠இரà¯à®¨à¯à®¤à¯ ஆஙà¯à®•ிலதà¯à®¤à¯à®•à¯à®•à¯
+ Name[tr]=WordReference.com Çevirisi: İtalyancadan İngilizceye
+ Name[uk]=WordReference.com: переклад з італійÑької на англійÑьку
+ Name[uz]=WordReference.com таржима: ИталÑнчадан Инглизчага
+-Name[xx]=xxWordReference.com Translation: Italian to Englishxx
+ Name[zh_CN]=WordReference.com 翻译:æ„大利è¯è¯‘英è¯
+ Query=http://www.wordreference.com/it/en/translation.asp?iten=\\{@}
+-Query[xx]=xxhttp://www.wordreference.com/it/en/translation.asp?iten=\\{@}xx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/jeeves.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/jeeves.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/jeeves.desktop 2005-01-30 00:10:26.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/jeeves.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -20,9 +20,7 @@
+ Name[ss]=Buta Jeeves
+ Name[ta]=ஜீவசை கேளà¯
+ Name[ven]=Vhudzisani Jeeves
+-Name[xx]=xxAsk Jeevesxx
+ ServiceTypes=SearchProvider
+ Keys=ask,jeeves
+ Query=http://www.ask.com/main/askJeeves.asp?origin=0&qSource=4&site_name=Jeeves&metasearch=yes&ask=\\{@}
+ Query[en_GB]=http://www.ask.co.uk/main/askJeeves.asp?origin=0&qSource=4&site_name=Jeeves&metasearch=yes&ask=\\{@}
+-Query[xx]=xxhttp://www.ask.com/main/askJeeves.asp?origin=0&qSource=4&site_name=Jeeves&metasearch=yes&ask=\\{@}xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/katatudo.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/katatudo.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/katatudo.desktop 2005-02-18 23:27:00.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/katatudo.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -9,9 +9,7 @@
+ Name[nds]=Kate Tudo
+ Name[pa]=ਕਾਟਾ ਕਰਨ ਲਈ
+ Name[ta]=காடà¯à®Ÿà®¾ டà¯à®¯à¯‚டோ
+-Name[xx]=xxKataTudoxx
+ ServiceTypes=SearchProvider
+ Keys=kt,katatudo
+ Query=http://www.katatudo.com.br/busca/resultado.php?q=\\{@}&onde=&b=Buscar
+-Query[xx]=xxhttp://www.katatudo.com.br/busca/resultado.php?q=\\{@}&onde=&b=Buscarxx
+ Charset=utf8
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/kde.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/kde.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/kde.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/kde.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -48,7 +48,7 @@
+ Name[sk]=KDE dokumentácia API
+ Name[sl]=Dokumentacija KDE API
+ Name[sr]=Документација API-ја KDE-а
+-Name[sr@Latn]=Dokumentacija KDE API-ja
++Name[sr@Latn]=Dokumentacija API-ja KDE-a
+ Name[sv]=Dokumentation av KDE:s programmeringsgränssnitt
+ Name[ta]=KDE API ஆவணமாகà¯à®•லà¯
+ Name[tg]=МуÑтанадоти KDE API
+@@ -57,11 +57,9 @@
+ Name[uz]=KDE API бўйича қўлланмалар
+ Name[vi]=Tà i liệu vỠKDE API
+ Name[wa]=Documintåcion di l' API di KDE
+-Name[xx]=xxKDE API Documentationxx
+ Name[zh_CN]=KDE API 文档
+ Name[zh_TW]=KDE API 文件
+ Query=http://developer.kde.org/documentation/library/classmapper.php?class=\\{@}
+ Query[bg]=http://developer.kde.org/documentation/library/classmapper.php?class=\
+-Query[xx]=xxhttp://developer.kde.org/documentation/library/classmapper.php?class=\\{@}xx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/kde_webcvs.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/kde_webcvs.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/kde_webcvs.desktop 2005-01-30 00:10:26.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/kde_webcvs.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -24,9 +24,7 @@
+ Name[sv]=KDE-webbcvs
+ Name[tg]=KDE Ð’ÑбCVS
+ Name[wa]=WebCVS di KDE
+-Name[xx]=xxKDE WebCVSxx
+ ServiceTypes=SearchProvider
+ Keys=webcvs,kdecvs,kcvs,kvs
+ Query=http://webcvs.kde.org/\\{@}
+-Query[xx]=xxhttp://webcvs.kde.org/\\{@}xx
+
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/leo.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/leo.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/leo.desktop 2005-01-31 03:35:25.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/leo.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -32,9 +32,7 @@
+ Name[uz]=LEO таржима
+ Name[ven]=Hu dologa-LEO
+ Name[xh]=LEO-Guqulela
+-Name[xx]=xxLEO-Translatexx
+ Name[zu]=Uguqulelo-LEO
+ ServiceTypes=SearchProvider
+ Keys=leo
+ Query=http://dict.leo.org/?search=\\{@}
+-Query[xx]=xxhttp://dict.leo.org/?search=\\{@}xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/lycos.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/lycos.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/lycos.desktop 2005-02-21 13:17:50.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/lycos.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -9,8 +9,6 @@
+ Name[pa]=ਲà©à¨•ੋਸ
+ Name[pl]=Lycos - wyszukiwarka stron WWW
+ Name[ta]=லைகோஸà¯
+-Name[xx]=xxLycosxx
+ ServiceTypes=SearchProvider
+ Keys=lycos,ly
+ Query=http://www.lycos.com/cgi-bin/pursuit?cat=dir&query=\\{@}
+-Query[xx]=xxhttp://www.lycos.com/cgi-bin/pursuit?cat=dir&query=\\{@}xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -44,7 +44,7 @@
+ Name[se]=Mamma – Mother of all Search Engines
+ Name[sl]=Mamma - Mati vseh iskalnikov
+ Name[sr]=Mamma - Мајка Ñвих претраживачких мотора
+-Name[sr@Latn]=Mamma - Majka svih pretraživaÄkih maÅ¡ina
++Name[sr@Latn]=Mamma - Majka svih pretraživaÄkih motora
+ Name[ss]=Mamma - make wato tonkhe tinjinin tekusesha
+ Name[sv]=Mamma - Moder till alla sökmotorer
+ Name[ta]=மமà¯à®®à®¾ - தேட௠இயநà¯à®¤à®¿à®°à®™à¯à®•ளின௠தாயà¯
+@@ -55,11 +55,9 @@
+ Name[ven]=Mamma - Mmea nzhini dzothe dzau setsha
+ Name[vi]=Mamma - Mẹ của tất cả các Search Engines
+ Name[xh]=Mamma - Umama weenjini zonke zophendlo
+-Name[xx]=xxMamma - Mother of all Search Enginesxx
+ Name[zh_CN]=Mamma - 所有æœç´¢å¼•擎之æ¯
+ Name[zh_TW]=Mamma - æœå°‹å¼•擎之æ¯
+ Name[zu]=Mamma - Umama wazo zonke Izinjini Zokusesha
+ ServiceTypes=SearchProvider
+ Keys=mm,mamma
+ Query=http://www.mamma.com/Mamma?lang=1&timeout=4&qtype=0&query=\\{@}
+-Query[xx]=xxhttp://www.mamma.com/Mamma?lang=1&timeout=4&qtype=0&query=\\{@}xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/metacrawler.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/metacrawler.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/metacrawler.desktop 2005-01-30 00:10:26.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/metacrawler.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -12,8 +12,6 @@
+ Name[pl]=MetaCrawler - wyszukiwarka stron WWW
+ Name[ta]=மெடா கà¯à®°à®¾à®µà¯à®²à¯†à®°à¯
+ Name[ven]=Tshikokovhi tsha Meta
+-Name[xx]=xxMetaCrawlerxx
+ ServiceTypes=SearchProvider
+ Keys=mc,meta,metacrawler
+ Query=http://search.metacrawler.com/crawler?general=\\{@}&method=0&cat=Web&target=metaworld&redirect=web&rpp=20&hpe=10®ion=0&timeout=0&sort=0&format=beta99&theme=classic&refer=mc-search&refer=mc-search
+-Query[xx]=xxhttp://search.metacrawler.com/crawler?general=\\{@}&method=0&cat=Web&target=metaworld&redirect=web&rpp=20&hpe=10®ion=0&timeout=0&sort=0&format=beta99&theme=classic&refer=mc-search&refer=mc-searchxx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/msdn.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/msdn.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/msdn.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/msdn.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -44,7 +44,7 @@
+ Name[sk]=Hľadanie Microsoft Developer Network
+ Name[sl]=Iskalnik po razvijalnem omrežju Microsofta
+ Name[sr]=Претраживање Мреже Microsoft-ових развијача (MSDN)
+-Name[sr@Latn]=Microsoft Developer Network pretraživanje
++Name[sr@Latn]=Pretraživanje Mreže Microsoft-ovih razvijaÄa (MSDN)
+ Name[ss]=Kusesha kweluchungechunge lesindlondlobalisi seMicrosoft
+ Name[sv]=Sökning i Microsoft Developer Network
+ Name[ta]=மைகà¯à®°à¯‹à®šà®¾à®ªà¯à®Ÿà¯ டெவலபà¯à®ªà®°à¯ வலைதà¯à®¤à®³ தேடà¯à®¤à®²à¯
+@@ -54,11 +54,9 @@
+ Name[uz]=Microsoft Developer Network'да қидириш
+ Name[ven]=Vhukwamani hau setsha ha mubveledzi wa Microsoft
+ Name[xh]=Uphendlo Womsebenzi womnatha Wombhekisi phambili we Microsoft
+-Name[xx]=xxMicrosoft Developer Network Searchxx
+ Name[zh_CN]=MSDN 微软开å‘者网络æœç´¢
+ Name[zh_TW]=微軟開發者網路æœå°‹
+ Name[zu]=Usesho Loxhumano olusakazekile Lomthuthukisi we-Microsoft
+ ServiceTypes=SearchProvider
+ Keys=msdn
+ Query=http://msdn.microsoft.com/library/shared/searchtab/searchHandoff.asp?handoffurl=%2Fisapi%2Fgosearch.asp%3FTARGET%3D%2Fus%2Fdev%2Fdefault.asp&stcfg=d%3A%2Fhttp%2Fcnfg.xml&qu=\\{@}&btnSearch=GO
+-Query[xx]=xxhttp://msdn.microsoft.com/library/shared/searchtab/searchHandoff.asp?handoffurl=%2Fisapi%2Fgosearch.asp%3FTARGET%3D%2Fus%2Fdev%2Fdefault.asp&stcfg=d%3A%2Fhttp%2Fcnfg.xml&qu=\\{@}&btnSearch=GOxx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/netcraft.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/netcraft.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/netcraft.desktop 2005-01-30 00:10:26.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/netcraft.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -10,8 +10,6 @@
+ Name[pa]=ਨੈੱਟਕਰਾਫਟ
+ Name[ta]=நெடà¯à®•à¯à®°à®¾à®ƒà®ªà¯à®Ÿà¯
+ Name[tg]=Шабакаи craft
+-Name[xx]=xxNetcraftxx
+ ServiceTypes=SearchProvider
+ Keys=nc,netcraft
+ Query=http://uptime.netcraft.com/up/graph?site=\\{@}
+-Query[xx]=xxhttp://uptime.netcraft.com/up/graph?site=\\{@}xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop 2005-02-18 23:27:00.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop 2005-03-30 01:47:42.000000000 -0500
+@@ -9,6 +9,7 @@
+ Name[cy]= Darparydd Chwiliadau Llyfr Ffôn
+ Name[da]=Telefonbog-søgeudbyder
+ Name[de]=Telefonbuch-Suche
++Name[el]=ΠαÏοχÎας αναζήτησης Telephonebook
+ Name[eo]=Telefonlibro-serĉprovizanto
+ Name[es]=Proveedor de búsqueda de teléfonos
+ Name[et]=Hollandi telefoniraamatu otsingumootor
+@@ -39,16 +40,14 @@
+ Name[sk]=Hľadanie v telefónnom zozname
+ Name[sl]=Ponudnik iskanja po telefonskem imeniku
+ Name[sr]=Провајдер за претрагу телефонÑког именика
+-Name[sr@Latn]=Провајдер за претрагу телефонÑког именика
++Name[sr@Latn]=Provajder za pretragu telefonskog imenika
+ Name[sv]=Söktjänst för telefonkatalog
+ Name[ta]=தொலைபேசிபà¯à®¤à¯à®¤à®• தேடà¯à®¤à®²à¯ˆ அளிபà¯à®ªà®¾à®©à¯
+ Name[tr]=Telefon Defteri Arama Sağlayıcı
+ Name[uk]=Провайдер пошуку Telephonebook
+ Name[uz]=Телефонлар дафтарида қидириш
+-Name[xx]=xxTelephonebook Search Providerxx
+ Name[zh_CN]=Telephonebook æœç´¢æä¾›è€…
+ Type=Service
+ ServiceTypes=SearchProvider
+ Keys=telnl,telefoon
+ Query=http://www.detelefoongids.nl/tginl.dll?action=white&type=search&name=\{1}&city=\{2}
+-Query[xx]=xxhttp://www.detelefoongids.nl/tginl.dll?action=white&type=search&name=\{1}&city=\{2}xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-teletekst.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-teletekst.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-teletekst.desktop 2005-02-18 23:27:00.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-teletekst.desktop 2005-03-30 01:47:42.000000000 -0500
+@@ -9,6 +9,7 @@
+ Name[cy]= Darparwr Chwiliadau Teletekst
+ Name[da]=Teletekst-søgeudbyder
+ Name[de]=Teletekst-Suche
++Name[el]=ΠαÏοχÎας αναζήτησης Teletekst
+ Name[eo]=Teletekst-serĉprovizanto
+ Name[es]=Proveedor de búsqueda Teletekst
+ Name[et]=Hollandi teleteksti otsingumootor
+@@ -40,16 +41,14 @@
+ Name[sk]=Poskytovateľ hľadania Teletekst
+ Name[sl]=Ponudnik iskanja po teletekstu
+ Name[sr]=Провајдер за телетекÑÑ‚ претрагу
+-Name[sr@Latn]=Провајдер за телетекÑÑ‚ претрагу
++Name[sr@Latn]=Provajder za teletekst pretragu
+ Name[sv]=Teletekst söktjänst
+ Name[ta]=Teletekst தேடà¯à®¤à®²à¯ அளிபà¯à®ªà®¾à®©à¯
+ Name[tr]=Teletekst Arama Sağlayıcı
+ Name[uk]=Провайдер пошуку Teletekst
+ Name[uz]=ТелетекÑтда қидириш
+-Name[xx]=xxTeletekst Search Providerxx
+ Name[zh_CN]=Teletekst æœç´¢æä¾›è€…
+ Type=Service
+ ServiceTypes=SearchProvider
+ Keys=tt,teletekst
+ Query=http://teletekst.nos.nl/gif/\\{@}-01.html
+-Query[xx]=xxhttp://teletekst.nos.nl/gif/\\{@}-01.htmlxx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/pgpkeys.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/pgpkeys.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/pgpkeys.desktop 2005-02-04 23:14:50.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/pgpkeys.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -61,11 +61,9 @@
+ Name[vi]=OpenPGP Tìm kiếm bằng từ khoá
+ Name[wa]=Cweraedje d' ene clé OpenPGP
+ Name[xh]=Uphendlo Lwesitshixo se OpenPGP
+-Name[xx]=xxOpenPGP Key Searchxx
+ Name[zh_CN]=OpenPGP 关键嗿œç´¢
+ Name[zh_TW]=OpenPGP 金鑰æœå°‹
+ Name[zu]=OpenPGP Usesho olubalulekile
+ Query=http://pgp.dtype.org:11371/pks/lookup?search=\\{@}&op=vindex
+-Query[xx]=xxhttp://pgp.dtype.org:11371/pks/lookup?search=\\{@}&op=vindexxx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/php.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/php.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/php.desktop 2005-02-04 23:14:50.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/php.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -58,11 +58,9 @@
+ Name[uz]=PHP қидириш
+ Name[ven]=U setsha ha PHP
+ Name[xh]=Uphendlo lwe PHP
+-Name[xx]=xxPHP Searchxx
+ Name[zh_CN]=PHP æœç´¢
+ Name[zh_TW]=PHP æœå°‹
+ Name[zu]=Usesho lwe-PHP
+ Query=http://www.php.net/search.php?show=\\{mode,"manual"}&pattern=\\{@}
+-Query[xx]=xxhttp://www.php.net/search.php?show=\\{mode,"manual"}&pattern=\\{@}xx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/python.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/python.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/python.desktop 2005-02-21 13:17:50.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/python.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -56,7 +56,6 @@
+ Name[vi]=Tham khảo toà n diện Python
+ Name[wa]=Manuel di referince di Python
+ Name[xh]=Ubhekiso lwe Python yesandla
+-Name[xx]=xxPython Reference Manualxx
+ Name[zh_CN]=Python å‚考手册
+ Name[zh_TW]=Python åƒè€ƒæ‰‹å†Š
+ Name[zu]=Incwadi yokuqondiwe ye-Python
+@@ -67,6 +66,5 @@
+ Query[nb]=http://www.google.no/search?sourceid=python-search&q=\{@}&submit=Search&q=site%3Apython.org
+ Query[nl]=http://www.google.nl/search?sourceid=python-search&q=\{@}&submit=Search&q=site%3Apython.org
+ Query[pt]=http://www.google.pt/search?sourceid=python-search&q=\{@}&submit=Search&q=site%3Apython.org
+-Query[xx]=xxhttp://www.google.com/search?sourceid=python-search&q=\{@}&submit=Search&q=site%3Apython.orgxx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/qt.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/qt.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/qt.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/qt.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -46,7 +46,7 @@
+ Name[sk]=Posledná online dokumentácia Qt
+ Name[sl]=Najnovejša spletna dokumentacija za Qt
+ Name[sr]=Ðајновија документација Qt-а на вези
+-Name[sr@Latn]=Najnovija Online dokumentacija Qt-a
++Name[sr@Latn]=Najnovija dokumentacija Qt-a na vezi
+ Name[sv]=Senaste Qt-direktdokumentation
+ Name[ta]=பà¯à®¤à®¿à®¯ கà¯à®¯à¯‚ டீ இணை ஆவணபà¯à®ªà®¤à®¿à®µà¯
+ Name[tg]=Ҷадидтарин муÑтанадҳои рӯи хати Qt
+@@ -56,10 +56,8 @@
+ Name[uz]=Qt учун кўлланма
+ Name[vi]=Tà i liệu trực tuyến mới nhất của Qt
+ Name[wa]=Documintåcion di Qt so les fyis
+-Name[xx]=xxLatest Qt Online Documentationxx
+ Name[zh_CN]=最新的 Qt 在线文档
+ Name[zh_TW]=最新的 Qt 線上文件
+ Query=http://doc.trolltech.com/latest/\\{@}.html
+-Query[xx]=xxhttp://doc.trolltech.com/latest/\\{@}.htmlxx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/rae.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/rae.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/rae.desktop 2005-02-04 23:14:50.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/rae.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -56,10 +56,8 @@
+ Name[uz]=ИÑпан академиÑÑининг (RAE) луғати
+ Name[vi]=Từ điển của Viện hà n lâm Tây Ban Nha (RAE)
+ Name[wa]=Diccionaire del Royåle Academeye Espagnole (RAE)
+-Name[xx]=xxDictionary of the Spanish Academy (RAE)xx
+ Name[zh_CN]=西ç牙å¦é™¢çš„å—å…¸(RAE)
+ Name[zh_TW]=西ç牙金åƒçŽå—å…¸ (RAE)
+ Query=http://buscon.rae.es/draeI/SrvltGUIBusUsual?TIPO_HTML=2&LEMA=\\{@}&FORMATO=ampliado
+-Query[xx]=xxhttp://buscon.rae.es/draeI/SrvltGUIBusUsual?TIPO_HTML=2&LEMA=\\{@}&FORMATO=ampliadoxx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/rfc.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/rfc.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/rfc.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/rfc.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -30,18 +30,16 @@
+ Name[ru]=ЗапроÑÑ‹ Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼ÐµÐ½Ñ‚Ð°Ñ€Ð¸ÐµÐ² IETF (RFC)
+ Name[sl]=Zahteve IETF za komentarje
+ Name[sr]=IETF-ови захтеви за коментаре
+-Name[sr@Latn]=IETF zahtevi i komentari
++Name[sr@Latn]=IETF-ovi zahtevi za komentare
+ Name[ta]=IETF கà¯à®±à®¿à®ªà¯à®ªà¯à®•ளà¯à®•à¯à®•ான வேணà¯à®Ÿà¯à®¤à®²à¯à®•ளà¯
+ Name[tg]=Барои назри IETF-и дархоÑÑ‚
+ Name[tr]=IETF Yorum istemleri
+ Name[uk]=Запит коментарів (RFC) IETF
+ Name[ven]=IETF i humbela Mahumbulwa
+ Name[xh]=Izicelo Zogqabazo ze IETF
+-Name[xx]=xxIETF Requests for Commentsxx
+ Name[zh_CN]=IETF 评论请求
+ Name[zh_TW]=IETF RFC 文件
+ Name[zu]=Izicelo ze-IETF zemibono
+ Query=http://www.ietf.org/rfc/rfc\\{@}.txt
+-Query[xx]=xxhttp://www.ietf.org/rfc/rfc\\{@}.txtxx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/rpmfind.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/rpmfind.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/rpmfind.desktop 2005-01-30 00:10:26.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/rpmfind.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -27,10 +27,8 @@
+ Name[uz]=RPM қидириш
+ Name[ven]=RPM-Toda
+ Name[xh]=RPM-Fumana
+-Name[xx]=xxRPM-Findxx
+ Name[zu]=RPM-Thola
+ ServiceTypes=SearchProvider
+ Keys=rf,rpmfind
+ Query=http://www.rpmfind.net/linux/rpm2html/search.php?query=\{@}
+ Query[en_GB]=http://fr.rpmfind.net/linux/rpm2html/search.php?query=\{@}
+-Query[xx]=xxhttp://www.rpmfind.net/linux/rpm2html/search.php?query=\{@}xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/ruby_application_archive.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/ruby_application_archive.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/ruby_application_archive.desktop 2005-02-04 23:14:50.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/ruby_application_archive.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -52,10 +52,8 @@
+ Name[uz]=Ruby даÑтур архиви
+ Name[ven]=Apulifikhesheni ya Vhulungazwakale ya Ruby
+ Name[xh]=Indawo ye Ruby yokugcina Isicelo
+-Name[xx]=xxRuby Application Archivexx
+ Name[zh_TW]=Ruby æ‡‰ç”¨ç¨‹å¼æª”案庫
+ Name[zu]=Umqulu Womyaleli we-Ruby
+ ServiceTypes=SearchProvider
+ Keys=raa
+ Query=http://www.ruby-lang.org/en/raa-list.rhtml?name=\\{@}
+-Query[xx]=xxhttp://www.ruby-lang.org/en/raa-list.rhtml?name=\\{@}xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/seek.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/seek.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/seek.desktop 2005-01-30 00:10:26.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/seek.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -8,8 +8,6 @@
+ Name[hi]=गो.कॉम
+ Name[mn]=go.com
+ Name[nso]=EYA.com
+-Name[xx]=xxGO.comxx
+ ServiceTypes=SearchProvider
+ Keys=seek
+ Query=http://www.go.com/Titles?col=WW&qt=\\{@}&svx=home_searchbox&sv=IS&lk=noframeso
+-Query[xx]=xxhttp://www.go.com/Titles?col=WW&qt=\\{@}&svx=home_searchbox&sv=IS&lk=noframesoxx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/sourceforge.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/sourceforge.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/sourceforge.desktop 2005-01-30 00:10:26.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/sourceforge.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -10,8 +10,6 @@
+ Name[nso]=Bofora bja Mothopo
+ Name[pl]=SourceForge - projekty
+ Name[ta]=மூலதà¯à®¤à®¿à®°à¯à®Ÿà¯à®Ÿà¯
+-Name[xx]=xxSourceForgexx
+ Query=http://sourceforge.net/search/?type_of_search=\\{type,"soft"}&exact=\{exact,"0"}&words=\\{@}
+-Query[xx]=xxhttp://sourceforge.net/search/?type_of_search=\\{type,"soft"}&exact=\{exact,"0"}&words=\\{@}xx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/thesaurus.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/thesaurus.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/thesaurus.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/thesaurus.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -37,18 +37,16 @@
+ Name[sk]=Merriam-Webster Synonymá
+ Name[sl]=Merriam-Websterjev tezaver
+ Name[sr]=Речник Ñинонима Меријам-ВебÑтер
+-Name[sr@Latn]=Merijam-Vebsterov reÄnik sinonima
++Name[sr@Latn]=ReÄnik sinonima Merijam-Vebster
+ Name[sv]=Merriam-Websters synonymlexikon
+ Name[ta]=மெரà¯à®°à®¿à®¯à®®à¯-வெபà¯à®¸à¯à®Ÿà®°à¯ சொறà¯à®•ளஞà¯à®šà®¿à®¯à®®à¯
+ Name[tg]=ТезауруÑи Merriam-Webster
+ Name[uk]=Словник Ñинонімів Merriam-Webster
+ Name[uz]=Мерриам-ВебÑтер луғати
+ Name[vi]=Từ điển đồng nghĩa Merriam-Webster
+-Name[xx]=xxMerriam-Webster Thesaurusxx
+ Name[zh_CN]=韦æ°è¾žå…¸
+ Name[zh_TW]=韋æ°è¾å…¸
+ Name[zu]=Incawdi yamagama afanayo ye-Merriam-Webster
+ ServiceTypes=SearchProvider
+ Keys=ths,thesaurus
+ Query=http://www.m-w.com/cgi-bin/thesaurus?book=Thesaurus&va=\\{@}
+-Query[xx]=xxhttp://www.m-w.com/cgi-bin/thesaurus?book=Thesaurus&va=\\{@}xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/tvtome.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/tvtome.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/tvtome.desktop 2005-02-10 23:51:52.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/tvtome.desktop 2005-03-22 12:38:04.000000000 -0500
+@@ -4,10 +4,9 @@
+ Name=TV Tome
+ Name[bn]=টিà¦à¦¿ টোম
+ Name[da]=TV-Tome
++Name[eu]=TV toma
+ Name[nb]=Stor TV
+ Name[sv]=TV-tome
+-Name[xx]=xxTV Tomexx
+ Query=http://www.tvtome.com/tvtome/servlet/Search?searchType=all&searchString=\\{@}
+-Query[xx]=xxhttp://www.tvtome.com/tvtome/servlet/Search?searchType=all&searchString=\\{@}xx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/uspto.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/uspto.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/uspto.desktop 2005-02-23 00:05:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/uspto.desktop 2005-03-22 12:38:04.000000000 -0500
+@@ -4,12 +4,14 @@
+ Keys=uspto
+ Name=U.S. Patent Database
+ Name[bn]=মারà§à¦•িন পেটেনà§à¦Ÿ ডেটাবেস
++Name[bs]=SAD baza patenata
+ Name[ca]=Base de dades de patents U.S.
+ Name[cs]=Patentová databáze USA
+ Name[da]=U.S. Patent-database
+ Name[de]=U.S.-Patentdatenbank
+ Name[es]=Base de datos de patentes de EEUU
+ Name[et]=USA patentide andmebaas
++Name[eu]=EEBB patente datu-basea
+ Name[fi]=U.S. patenttitietokanta
+ Name[fr]=Base de données des brevets aux U.S.A
+ Name[fy]=U.S. Patent-database
+@@ -18,6 +20,7 @@
+ Name[hu]=Amerikai szabadalmi adatbázis
+ Name[is]=Gagnagrunnur einkaleyfisstofu BandarÃkjana
+ Name[it]=Database brevetti U.S.A.
++Name[ja]=米国特許データベース
+ Name[lt]=JAV patentų duomenų bazė
+ Name[nb]=US patentdatabase
+ Name[nl]=U.S. Patent-database
+@@ -27,15 +30,14 @@
+ Name[pt_BR]=Base de dados de patentes dos EUA
+ Name[ru]=База патентов СШÐ
+ Name[se]=Amerihká patenta diehtovuođđu
++Name[sk]=Databáza patentov USA
+ Name[sl]=Zbirka patentov U.S. Patent Database
+ Name[sr]=База патената СÐД
+-Name[sr@Latn]=База патената СÐД
++Name[sr@Latn]=Baza patenata SAD
+ Name[sv]=Förenta staternas patentdatabas
+ Name[ta]=U.S.காபà¯à®ªà¯à®°à®¿à®®à¯ˆ தரவà¯à®¤à®³à®®à¯
+ Name[tr]=U.S. Patent Veritabanı
+ Name[uk]=База даних патентів в СШÐ
+-Name[xx]=xxU.S. Patent Databasexx
+ Query=http://patft.uspto.gov/netacgi/nph-Parser?TERM1=\\{@}&Sect1=PTO1&Sect2=HITOFF&d=PALL&p=1&u=/netahtml/srchnum.htm&r=0&f=S&l=50
+-Query[xx]=xxhttp://patft.uspto.gov/netacgi/nph-Parser?TERM1=\\{@}&Sect1=PTO1&Sect2=HITOFF&d=PALL&p=1&u=/netahtml/srchnum.htm&r=0&f=S&l=50xx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/vivisimo.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/vivisimo.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/vivisimo.desktop 2005-01-30 00:10:26.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/vivisimo.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -6,8 +6,6 @@
+ Name[hi]=विविसिमो
+ Name[pa]=ਵੀਵੀਸੀਮੋ
+ Name[ta]=விவிசிமோ
+-Name[xx]=xxVivisimoxx
+ ServiceTypes=SearchProvider
+ Keys=vi
+ Query=http://vivisimo.com/search?query=\\{@}&se=Yahoo%2CAltaVista%2CMSN%2CFast%2COD%2CExcite%2CDirectHit%2CLooksmart%2CEuroseek&x=49&y=16
+-Query[xx]=xxhttp://vivisimo.com/search?query=\\{@}&se=Yahoo%2CAltaVista%2CMSN%2CFast%2COD%2CExcite%2CDirectHit%2CLooksmart%2CEuroseek&x=49&y=16xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/voila.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/voila.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/voila.desktop 2005-01-30 00:10:26.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/voila.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -8,8 +8,6 @@
+ Name[pa]=ਵੋਈਲਾ
+ Name[ta]=வாயà¯à®²à®¾
+ Name[wa]=VoilÃ
+-Name[xx]=xxVoilaxx
+ ServiceTypes=SearchProvider
+ Keys=voila
+ Query=http://www.voila.com/S/geek?an=1&kw=\\{@}&dt=*
+-Query[xx]=xxhttp://www.voila.com/S/geek?an=1&kw=\\{@}&dt=*xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/webster.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/webster.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/webster.desktop 2005-02-23 00:05:34.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/webster.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -42,7 +42,7 @@
+ Name[sk]=SlovnÃk Merriam-Webster
+ Name[sl]=Slovar Merriam-Webster
+ Name[sr]=Речник Меријам-ВебÑтер
+-Name[sr@Latn]=Merijam-Vebsterov reÄnik
++Name[sr@Latn]=ReÄnik Merijam-Vebster
+ Name[ss]=Sichazimagama se Merriam-Webster
+ Name[sv]=Merriam-Websters ordlexikon
+ Name[ta]=மெரà¯à®°à®¿à®¯à®®à¯-வெபà¯à®¸à¯à®Ÿà®°à¯ அகராதி
+@@ -54,11 +54,9 @@
+ Name[vi]=Từ điển Merriam-Webster
+ Name[wa]=Diccionaire inglès Merriam-Webster
+ Name[xh]= Dikshinari ye Merriam-Webster
+-Name[xx]=xxMerriam-Webster Dictionaryxx
+ Name[zh_CN]=韦æ°è¯å…¸
+ Name[zh_TW]=韋æ°è©žå…¸
+ Name[zu]=Isichazamagama se-Merriam-Webster
+ ServiceTypes=SearchProvider
+ Keys=dict,webster
+ Query=http://www.m-w.com/cgi-bin/dictionary?book=Dictionary&va=\\{@}
+-Query[xx]=xxhttp://www.m-w.com/cgi-bin/dictionary?book=Dictionary&va=\\{@}xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/whatis.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/whatis.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/whatis.desktop 2005-02-18 23:27:00.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/whatis.desktop 2005-03-30 01:47:42.000000000 -0500
+@@ -10,6 +10,7 @@
+ Name[cy]=Ymholiad Beth-yw-Hwn
+ Name[da]=Whatis-forespørgsel
+ Name[de]=Whatis-Abfrage
++Name[el]=ΕÏώτηση Whatis
+ Name[eo]=Kio-estas-demando
+ Name[es]=Consulta Whatis
+ Name[et]=Whatis päring
+@@ -40,14 +41,12 @@
+ Name[sk]=Otázka "Čo to je?"
+ Name[sl]=Poizvedba Whatis
+ Name[sr]=Whatis упит
+-Name[sr@Latn]=Whatis упит
++Name[sr@Latn]=Whatis upit
+ Name[sv]=Vad är det här-fråga
+ Name[ta]=கேளà¯à®µà®¿ எனà¯à®±à®¾à®²à¯ எனà¯à®©
+ Name[tr]=Nedir Sorgusu
+ Name[uk]=Запит "Що це"
+-Name[xx]=xxWhatis Queryxx
+ Name[zh_CN]=Whatis 查询
+ ServiceTypes=SearchProvider
+ Keys=wi,whatis
+ Query= http://whatis.techtarget.com/definitionsSearchResults/1,289878,sid9,00.html?query=\\{@}
+-Query[xx]=xx http://whatis.techtarget.com/definitionsSearchResults/1,289878,sid9,00.html?query=\\{@}xx
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop 2005-02-23 00:05:34.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -45,7 +45,7 @@
+ Name[sk]=Wikipedia - voľne dostupná encyklopédia
+ Name[sl]=Wikipedia - Prosta enciklopedija
+ Name[sr]=Wikipedia — Слободна енциклопедија
+-Name[sr@Latn]=Wikipedia - Slobodna enciklopedija
++Name[sr@Latn]=Wikipedia — Slobodna enciklopedija
+ Name[sv]=Wikipedia - den fria encyklopedin
+ Name[ta]=விகிபிடியா - இலவச கலைகà¯à®•ளஞà¯à®šà®¿à®¯à®®à¯
+ Name[tg]=Wikipedia - ÐнÑиклопедиÑи озод
+@@ -54,7 +54,6 @@
+ Name[uz]=Wikipedia - Бепул ÑнциклопедиÑ
+ Name[vi]=Wikipedia -Bá»™ từ Ä‘iển bách khoa má»…n phÃ
+ Name[wa]=Wikipedia - Li libe eciclopedeye
+-Name[xx]=xxWikipedia - The Free Encyclopediaxx
+ Name[zh_CN]=Wikipedia - å…费的百科全书
+ Name[zh_TW]=Wikipedia - å…費的 Encyclopedia
+ ServiceTypes=SearchProvider
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/wordref.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/wordref.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/wordref.desktop 2005-02-23 00:05:34.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/ikws/searchproviders/wordref.desktop 2005-03-07 09:15:07.000000000 -0500
+@@ -46,7 +46,7 @@
+ Name[sk]=Anglický slovnÃk WordReference.com
+ Name[sl]=Angleški slovar WordReference.com
+ Name[sr]=ЕнглеÑки речник на WordReference.com
+-Name[sr@Latn]=WordReference.com engleski reÄnik
++Name[sr@Latn]=Engleski reÄnik na WordReference.com
+ Name[sv]=Wordreference.com engelsk ordbok
+ Name[ta]=WordReference.com ஆஙà¯à®•ில அகராதி
+ Name[tg]=WordReference.com Луғати ÐнглиÑÓ£
+@@ -55,10 +55,8 @@
+ Name[uz]=WordReference.com Инглизча луғат
+ Name[vi]=WordReference.com Từ điển tiếng anh
+ Name[wa]=WordReference.com diccionaire inglès
+-Name[xx]=xxWordReference.com English Dictionaryxx
+ Name[zh_CN]=WordReference.com 英è¯å—å…¸
+ Name[zh_TW]=WordReference.com 英文å—å…¸
+ Query=http://www.wordreference.com/english/definition.asp?en=\\{@}
+-Query[xx]=xxhttp://www.wordreference.com/english/definition.asp?en=\\{@}xx
+ ServiceTypes=SearchProvider
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.desktop 2005-01-22 23:37:53.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.desktop 2005-03-07 09:15:10.000000000 -0500
+@@ -33,7 +33,6 @@
+ Name[uk]=Фільтр локальних доменів
+ Name[ven]=Filithara ya tshigwada ya henefhano
+ Name[vi]=Lá»c miá»n địa phương
+-Name[xx]=xxLocalDomainFilterxx
+ Name[zh_CN]=本地域å过滤
+ Name[zh_TW]=å€åŸŸç¶²åŸŸéŽæ¿¾å™¨
+ Name[zu]=Ihluzo Lendawo Yaseduze
+diff -Nru kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.desktop kdebase-branch-3.4/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.desktop
+--- kdebase-release-3.4.0/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.desktop 2005-02-21 13:17:50.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.desktop 2005-03-07 09:15:10.000000000 -0500
+@@ -43,7 +43,6 @@
+ Name[tr]=KısaURISüzgeci
+ Name[uk]=Фільтр коротких URI
+ Name[ven]=Filithara thukhu ya URI
+-Name[xx]=xxShortURIFilterxx
+ Name[zh_CN]=çŸ URI 过滤
+ Name[zh_TW]=çŸ URI éŽæ¿¾å™¨
+ X-KDE-Library=libkshorturifilter
+diff -Nru kdebase-release-3.4.0/kcontrol/energy/energy.desktop kdebase-branch-3.4/kcontrol/energy/energy.desktop
+--- kdebase-release-3.4.0/kcontrol/energy/energy.desktop 2005-02-23 00:05:35.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/energy/energy.desktop 2005-03-26 02:37:40.000000000 -0500
+@@ -79,7 +79,6 @@
+ Name[vi]=Äiá»u khiển nguồn Ä‘iện
+ Name[wa]=Controle di l' alimintåcion
+ Name[xh]=Ulawulo Lwamandla
+-Name[xx]=xxPower Controlxx
+ Name[zh_CN]=ç”µæºæŽ§åˆ¶
+ Name[zh_TW]=é›»æºæŽ§åˆ¶
+ Name[zu]=Ukulawulwa kwamandla
+@@ -104,7 +103,7 @@
+ Comment[fa]=تنظیمات مدیریت برق نمایشگر
+ Comment[fi]=Asetukset näytön virranhallinnalle
+ Comment[fr]=Paramètres de la gestion d'énergie pour l'affichage
+-Comment[fy]=Ynstellingen foar energybesparring foar byldskerms
++Comment[fy]=Ynstellings foar energybesparring foar byldskerms
+ Comment[gl]=Configuracións para a xestión de enerxÃa da pantalla
+ Comment[he]=×©×™× ×•×™ הגדרות × ×™×”×•×œ צריכת החשמל של התצוגה
+ Comment[hi]=बिज़ली नियंतà¥à¤°à¤£ पà¥à¤°à¤¦à¤°à¥à¤¶à¤• के लिठविनà¥à¤¯à¤¾à¤¸
+@@ -145,7 +144,6 @@
+ Comment[ven]=Mavhekanyele au sumbedza ndangulo ya maanda
+ Comment[vi]=Thiết láºp cho quản lý nguồn Ä‘iện
+ Comment[xh]=Izicwangciso zoboniso lophatho lwamandla
+-Comment[xx]=xxSettings for display power managementxx
+ Comment[zh_CN]=显示器电æºç®¡ç†è®¾ç½®
+ Comment[zh_TW]=顯示器電æºç®¡ç†çš„è¨å®šå€¼
+ Comment[zu]=Izilungiselelo zokuvezwa kokuphathwa kwamandla
+@@ -202,7 +200,6 @@
+ Keywords[ven]=maanda,muvhulungi,apm,acpi,u fhela ha tshifhinga,blanking,zwanagatsini,phandela,Maanda
+ Keywords[vi]=năng lượng,tiết kiệm,apm,acpi,dpms,hết giá»,blanking,stand by,suspend,power
+ Keywords[xh]=amandla,umgcini,apm,acpi,dpms,ixesha lokuphuma,engenambhalo,umphumzi,gxotha,amandla
+-Keywords[xx]=xxenergy,saver,apm,acpi,dpms,timeout,blanking,stand by,suspend,powerxx
+ Keywords[zh_CN]=energy,saver,apm,acpi,dpms,timeout,blanking,stand by,suspend,power,能æº,节çœ,è¶…æ—¶,黑å±,待机,ä¼‘çœ ,电æº
+ Keywords[zh_TW]=energy,saver,apm,acpi,dpms,timeout,blanking,stand by,suspend,Power,能æº,çœé›»å™¨,逾時,轉暗,待機,ä¼‘çœ ,é›»æº
+ Keywords[zu]=umdlandla,umgcini,apm,acpi,isikhathi sokuphuma,ukuvimbela,lindela lengisa,amandla
+diff -Nru kdebase-release-3.4.0/kcontrol/filetypes/filetypes.desktop kdebase-branch-3.4/kcontrol/filetypes/filetypes.desktop
+--- kdebase-release-3.4.0/kcontrol/filetypes/filetypes.desktop 2005-02-04 23:14:51.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/filetypes/filetypes.desktop 2005-03-07 09:15:10.000000000 -0500
+@@ -75,7 +75,6 @@
+ Name[ven]=U fanyisa faela
+ Name[vi]=Gắn kết tệp tin
+ Name[xh]=Uyelemaniso Lwefayile
+-Name[xx]=xxFile Associationsxx
+ Name[zh_CN]=文件关è”
+ Name[zh_TW]=檔案關è¯
+ Name[zu]=Ubudlelwano befayela
+@@ -141,7 +140,6 @@
+ Comment[ven]=Nzudzanyo yau fanyisa ha faela
+ Comment[vi]=Cấu hình gắn kết tệp tin
+ Comment[xh]=Qwalasela uloyamiso lwefayile
+-Comment[xx]=xxConfigure file associationsxx
+ Comment[zh_CN]=é…置文件关è”
+ Comment[zh_TW]=è¨å®šæª”案關è¯
+ Comment[zu]=Hlanganisela ubudlelwano befayela
+@@ -203,7 +201,6 @@
+ Keywords[ven]=Tshakha dza faela,U fanyisa ha Faela,Tshakha dza Maimi,Phathene ya Faela,Dzifaela,Phathene
+ Keywords[vi]=Kiểu tệp,Gắn kết tệp,Kiểu MIME,Mẫu tệp, Tệp, Mẫu
+ Keywords[xh]=Iindidi zefayile,Unxubelelaniso lwefayile,Iindidi zeMime,Imilinganiselo yefayile,Iifayile,Umlinganiselo
+-Keywords[xx]=xxFiletypes,File Associations,Mime Types,File Patterns,Files,Patternxx
+ Keywords[zh_CN]=Filetypes,File Associations,Mime Types,File Patterns,Files,文件类型,文件关è”,Mime 类型,文件模å¼,文件
+ Keywords[zh_TW]=Filetypes,File Associations,Mime Types,File Patterns,Files,Pattern,檔案類型,檔案關è¯,MIME 類型,檔案樣å¼,檔案,樣å¼
+ Keywords[zu]=Izinhlobo zamafayela, Ubudlelwano bamafayela,Izinhlobo zamafayela,Amaphethini amafayela,Iphethini
+diff -Nru kdebase-release-3.4.0/kcontrol/fonts/fonts.desktop kdebase-branch-3.4/kcontrol/fonts/fonts.desktop
+--- kdebase-release-3.4.0/kcontrol/fonts/fonts.desktop 2005-02-04 23:14:52.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/fonts/fonts.desktop 2005-03-27 02:28:58.000000000 -0500
+@@ -75,7 +75,6 @@
+ Name[vi]=Phông
+ Name[wa]=Fontes
+ Name[xh]=Uhlobo lwamagama
+-Name[xx]=xxFontsxx
+ Name[zh_CN]=å—体
+ Name[zh_TW]=å—åž‹
+ Name[zu]=Izinhlobo zamagama
+@@ -102,7 +101,7 @@
+ Comment[fa]=تنظیمات قلم‌ها
+ Comment[fi]=Kirjasinten asetukset
+ Comment[fr]=Configuration des police de caractères
+-Comment[fy]=Lettertypen ynstellingen
++Comment[fy]=Lettertypen ynstellings
+ Comment[gl]=Configuración das fontes
+ Comment[he]=×©×™× ×•×™ הגדרות ×”×’×•×¤× ×™×
+ Comment[hi]=फ़ॉनà¥à¤Ÿà¥à¤¸ विनà¥à¤¯à¤¾à¤¸
+@@ -146,7 +145,6 @@
+ Comment[vi]=Thiết láºp phông
+ Comment[wa]=Apontiaedje des fontes
+ Comment[xh]=Izicwangciso zohlobo lwamagama
+-Comment[xx]=xxFont settingsxx
+ Comment[zh_CN]=å—体设置
+ Comment[zh_TW]=å—åž‹è¨å®š
+ Comment[zu]=Izilungiselelo Zohlobo lwamagama
+@@ -168,7 +166,7 @@
+ Keywords[fa]=قلم,خط,font size,styles,charsets,character sets,panel,kicker,control panel,desktops,FileManager,Toolbars,Menu,Window Title,Title
+ Keywords[fi]=kirjasimet,kirjasin,kirjasimen koko,tyyli,merkistö,paneeli,kicker,ohjauspaneeli,työpöydät,Tiedostonhallinta,Työkalurivit,Valikko,Ikkunan otsikko,Otsikko
+ Keywords[fr]=polices,police,taille de police,jeu de caractères,tableau de bord,kicker,bureau,bureaux,gestionnaire de fichiers,gestion de fichiers,barre d'outils,menu,titre de fenêtre,titre,fenêtre,barre de menus,barres de menus,barres d'outils
+-Keywords[fy]=fonts,font,letters,lettertypen,lettertypes,tekenset,karakterferzamling,paniel,kicker,Foarkarsintrum,styl,triembehearder,wurkbalke,menu,Finster,titel,finstertitel,desktops,buroblêden
++Keywords[fy]=fonts,font,letters,lettertypen,lettertypes,tekenset,karakterferzamling,paniel,kicker,Konfiguraasjesintrum,styl,triembehearder,wurkbalke,menu,Finster,titel,finstertitel,desktops,buroblêden
+ Keywords[gl]=fontes,tamaño da fonte,estilos,codificación,conxunto de caracteres,panel,kicker,panel de control,escritorios,Xestor de Ficheiros,Barras de ferramentas,Menú,TÃtulo da Fiestra,TÃtulo
+ Keywords[he]=לוח הבקרה,×©×•×œ×—× ×•×ª עבודה,×ž× ×”×œ קבצי×,סרגלי כלי×,תפריט,כותרת חלון,כותרת,×’×•×¤× ×™×,גודל גופן,×¡×’× ×•× ×•×ª,מערכי תווי×,לוח
+ Keywords[hi]=फ़ॉनà¥à¤Ÿà¥à¤¸, फ़ॉनà¥à¤Ÿà¥à¤¸ आकार,शैली,कैरसेट,कैरेकà¥à¤Ÿà¤° सेटà¥à¤¸,फलक,किकर, नियंतà¥à¤°à¤£ फलक,डेसà¥à¤•टॉप,फ़ाइल पà¥à¤°à¤¬à¤‚धक,औज़ार पटà¥à¤Ÿà¥€,मेनà¥à¤¯à¥‚,विंडो शीरà¥à¤·à¤•,शीरà¥à¤·à¤•
+@@ -184,7 +182,7 @@
+ Keywords[mn]=Бичгүүд,Бичгийн Ñ…ÑмжÑÑ,ТÑмдÑгтүүд,Удирдах Ñамбар,Самбар,Дамжуулагч,Ð¥ÑлбÑÑ€,Файл удирдагч,Ðжлын тавцан,Багаж Ñамбар,ЦÑÑ,Цонхны толгой,Гарчиг
+ Keywords[nb]=skrift,skrifttyper,skriftstørrelse,stil,tegnsett,panel,kicker,kontrollpanel,skrivebord,filbehandler,verktøylinjer,meny,vindustittel,tittel
+ Keywords[nds]=Schriftoorden,Schriftgrött,Stilen,Tekensetten,Paneel,kicker,Kuntrullbalken,Schriefdischen,Dateimanager,Dateipleger,Warktüüchbalken,Menü,Finstertitel,Titel
+-Keywords[nl]=fonts,font,letters,lettertypen,lettertypes,tekenset,karakterverzamelingen,paneel,kicker,configuratiecentrum,stijl,bestandsbeheerder,werkbalk,menu,venster,titel,venstertitel,desktops,bureaubladen
++Keywords[nl]=fonts,font,letters,lettertypen,lettertypes,tekenset,tekenverzamelingen,paneel,kicker,configuratiecentrum,stijl,bestandsbeheerder,werkbalk,menu,venster,titel,venstertitel,desktops,bureaubladen
+ Keywords[nn]=skrift,skrift,skriftstorleik,stil,teiknsett,panel,kicker,kontrollpanel,skrivebord,filhandsamar,verktøylinjer,meny,vindaugstittel,tittel
+ Keywords[nso]=difonto,bogolo bja difonto,mokgwa,charsets,dipeakanyo tsa dihlaka, panel,seragi,panel ya taolo,di-desktop,Molaodi wa Faele,Di-bar tsa Dibereka,Menu, Sehlogo sa Window,Sehlogo
+ Keywords[pl]=czcionki,rozmiar czcionki,styl,zestaw znaków,panel,kicker,panel sterowania,pulpity,biurka,menedżer plików,paski narzędzi,menu,tytuł okna,tytuł
+@@ -206,7 +204,6 @@
+ Keywords[vi]=Phông, cỡ, kiểu, bảng mã, bá»™ ký tá»±, bảng, kicker, bảng Ä‘iá»u khiển, desktops, Trình quản lý tệp tin, Thanh công cụ, Thá»±c đơn, Tên cá»a sổ, Tên
+ Keywords[wa]=fonte,fontes,grandeu del fonte,stîle,miernowes,cråsses,clintcheyes,ecôdaedjes,djeu di caracteres,scriftôr,kicker,cinte di contrôle,scribannes,Manaedjeu di fitchîs,Bår d' usteyes,Menu,Tite do purnea,Bår di tite,Tite
+ Keywords[xh]=ubungakanani bamagama,ubungakanani begama,iintlobo,iicharset,amaqela abasebenzi,iqela labantu benjongo ethile,umkhabi,iqela labantu abalawulayo benjongo ethile,desktops,Umphathi wefayile iibar zesixhobo,Menu,Umxholo we Window,Umxholo
+-Keywords[xx]=xxfonts,font size,styles,charsets,character sets,panel,kicker,control panel,desktops,FileManager,Toolbars,Menu,Window Title,Titlexx
+ Keywords[zh_CN]=fonts,font size,styles,charsets,character sets,panel,kicker,control panel,desktops,FileManager,Toolbars,Menu,Window Title,Title,å—体,å—体大å°,é£Žæ ¼,å—符集,颿¿,æŽ§åˆ¶é¢æ¿,桌é¢,文件管ç†å™¨,工具æ¡,èœå•,çª—å£æ ‡é¢˜,æ ‡é¢˜
+ Keywords[zh_TW]=fonts,font size,styles,charsets,character sets,panel,kicker,control panel,desktops,FileManager,Toolbars,Menu,Window Title,Title,å—åž‹,å—型大å°,é¢¨æ ¼,å—å…ƒ,å—元集,颿¿,æŽ§åˆ¶é¢æ¿,桌é¢,檔案管ç†ç¨‹å¼,工具列,é¸å–®,視窗標題,標題
+ Keywords[zu]=Izinhlobo zamagama,uhlobo lwamagama,izitayela,charsets, amaqoqo ezaimpawu,kicker,lawula,iwindi lemininingwane,ama-desktop,Imenenja yefayela,amabha amathuluzi,Imenu,Isihloko se-Window,Isihloko
+diff -Nru kdebase-release-3.4.0/kcontrol/icons/icons.desktop kdebase-branch-3.4/kcontrol/icons/icons.desktop
+--- kdebase-release-3.4.0/kcontrol/icons/icons.desktop 2005-02-04 23:14:52.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/icons/icons.desktop 2005-03-07 09:15:11.000000000 -0500
+@@ -79,7 +79,6 @@
+ Name[vi]=Biểu tượng
+ Name[wa]=Imådjetes
+ Name[xh]=Imphawu zemmifanekiso
+-Name[xx]=xxIconsxx
+ Name[zh_CN]=å›¾æ ‡
+ Name[zh_TW]=圖示
+ Name[zu]=Izimpawu zezithombe
+@@ -150,7 +149,6 @@
+ Comment[ven]=Customize dziaikhonu dza KDE
+ Comment[vi]=Tự chỉnh các biểu tượng của KDE
+ Comment[xh]=Yenza Imphawu zomfanekiso ze KDE Ngokwemfuneko
+-Comment[xx]=xxCustomize KDE Iconsxx
+ Comment[zh_CN]=定制 KDE å›¾æ ‡
+ Comment[zh_TW]=自訂 KDE 圖示
+ Comment[zu]=Yenza Izimpawu zezithombe ze-KDE ngokwemfuneko
+@@ -215,7 +213,6 @@
+ Keywords[ven]=dziaikhono,zwivhangi,saizi,muvhala wa ntha,muvhala wa fhasi
+ Keywords[vi]=biểu tượng,hiệu ứng,cỡ,mà u tươi, mà u Ä‘áºm
+ Keywords[xh]=imphawu zomfanekiso,iziphumo,ubungakanani,hicolor,locolor
+-Keywords[xx]=xxicons,effects,size,hicolor,locolorxx
+ Keywords[zh_CN]=icons,effects,size,hicolor,locolor,å›¾æ ‡,效果,大å°,高色彩,低色彩
+ Keywords[zh_TW]=icons,effects,size,hicolor,locolor,圖示,效果,大å°,高彩,低彩
+ Keywords[zu]=izimpawu,imiphumela,usayizi,umbala ophezulu,umbala ophansi
+diff -Nru kdebase-release-3.4.0/kcontrol/info/devices.desktop kdebase-branch-3.4/kcontrol/info/devices.desktop
+--- kdebase-release-3.4.0/kcontrol/info/devices.desktop 2005-02-04 23:14:52.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/info/devices.desktop 2005-03-07 09:15:11.000000000 -0500
+@@ -79,7 +79,6 @@
+ Name[vi]=Thiết bị
+ Name[wa]=Éndjins
+ Name[xh]=Amacebo
+-Name[xx]=xxDevicesxx
+ Name[zh_CN]=设备
+ Name[zh_TW]=è¨å‚™
+ Name[zu]=Amathuluzi anenjongo
+@@ -90,7 +89,7 @@
+ Comment[az]=Bağlanmış avadanlıqlar haqqında mə'lumat
+ Comment[bg]=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° ÑиÑтемните уÑтройÑтва
+ Comment[bn]=সংলগà§à¦¨ ডিà¦à¦¾à¦‡à¦¸ সংকà§à¦°à¦¾à¦¨à§à¦¤ তথà§à¦¯
+-Comment[br]=Titouroù war an trobarzhelloù luget
++Comment[br]=Titouroù diwar-benn an trobarzhelloù luget
+ Comment[bs]=Informacije o prikljuÄenim ureÄ‘ajima
+ Comment[ca]=Informació dels dispositius connectats
+ Comment[cs]=Informace o pÅ™ipojených zaÅ™ÃzenÃch
+@@ -148,7 +147,6 @@
+ Comment[ven]=Maitele a mafhungo o kwamanywaho
+ Comment[vi]=Thông tin vỠthiết bị kèm
+ Comment[xh]=Ulwazi lwamacebo afakelweyo
+-Comment[xx]=xxAttached devices informationxx
+ Comment[zh_CN]=é™„åŠ çš„è®¾å¤‡ä¿¡æ¯
+ Comment[zh_TW]=é™„åŠ çš„è¨å‚™è³‡è¨Š
+ Comment[zu]=Ulwazi lwamathuluzi anenjongo ananyathiseliwe
+@@ -213,7 +211,6 @@
+ Keywords[ven]=dev,Maano,Mafhungo a sisitemu,Mafhungo
+ Keywords[vi]=dev,Thiết bị,Thông tin hệ thống, Thông tin
+ Keywords[xh]=dev,Amacebo,Ulwazi lwendlela,Ulwazi
+-Keywords[xx]=xxdev,Devices,System Information,Informationxx
+ Keywords[zh_CN]=dev,Devices,System Information,Information,设备,系统信æ¯,ä¿¡æ¯
+ Keywords[zh_TW]=dev,Devices,System Information,Information,è¨å‚™,系統資訊,資訊
+ Keywords[zu]=dev,Amathuluzi anenjongo,Ulwazi lwesistimu,Ulwazi
+diff -Nru kdebase-release-3.4.0/kcontrol/info/dma.desktop kdebase-branch-3.4/kcontrol/info/dma.desktop
+--- kdebase-release-3.4.0/kcontrol/info/dma.desktop 2005-02-04 23:14:52.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/info/dma.desktop 2005-03-07 09:15:12.000000000 -0500
+@@ -78,7 +78,6 @@
+ Name[vi]=Kênh DMA
+ Name[wa]=Canås DMA
+ Name[xh]=DMA-Imijelo
+-Name[xx]=xxDMA-Channelsxx
+ Name[zh_CN]=DMA 通é“
+ Name[zh_TW]=DMA 通é“
+ Name[zu]=Imigudu-DMA
+@@ -90,7 +89,7 @@
+ Comment[be]=Ð†Ð½Ñ„Ð°Ñ€Ð¼Ð°Ñ†Ñ‹Ñ Ð°Ð± DMA
+ Comment[bg]=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° каналите DMA
+ Comment[bn]=ডি.à¦à¦®.à¦. সংকà§à¦°à¦¾à¦¨à§à¦¤ তথà§à¦¯
+-Comment[br]=Titouroù war an DMA
++Comment[br]=Titouroù diwar-benn an DMA
+ Comment[bs]=DMA informacije
+ Comment[ca]=Informació de la DMA
+ Comment[cs]=Informace o DMA
+@@ -150,7 +149,6 @@
+ Comment[vi]=Thông tin DMA
+ Comment[wa]=Informåcion so les canås DMA
+ Comment[xh]=DMA ulwazi
+-Comment[xx]=xxDMA informationxx
+ Comment[zh_CN]=DMA ä¿¡æ¯
+ Comment[zh_TW]=DMA 資訊
+ Comment[zu]=Ulwazi lwe-DMA
+@@ -216,7 +214,6 @@
+ Keywords[ven]=dma,Dzitshanele dza DMA,Mafhungo a sisitemu
+ Keywords[vi]=dma,kênh DMA,thông tin hệ thống
+ Keywords[xh]=dma,DMA-Imijelo,Ulwazi Lwendlela yokusebenza
+-Keywords[xx]=xxdma,DMA-Channels,System Informationxx
+ Keywords[zh_CN]=dma,DMA-Channels,System Information,DMA 通é“,系统信æ¯
+ Keywords[zh_TW]=dma,DMA-Channels,System Information,DMA通é“,系統資訊
+ Keywords[zu]=dma,Imigudu-DMA,Ulwazi lwesistimu
+diff -Nru kdebase-release-3.4.0/kcontrol/info/interrupts.desktop kdebase-branch-3.4/kcontrol/info/interrupts.desktop
+--- kdebase-release-3.4.0/kcontrol/info/interrupts.desktop 2005-02-04 23:14:52.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/info/interrupts.desktop 2005-03-07 09:15:12.000000000 -0500
+@@ -69,7 +69,6 @@
+ Name[ven]=Dzithithiso
+ Name[vi]=Ngắt
+ Name[xh]=Iziphazamiso
+-Name[xx]=xxInterruptsxx
+ Name[zh_CN]=䏿–
+ Name[zh_TW]=䏿–·
+ Name[zu]=Iziphazamiso
+@@ -80,7 +79,7 @@
+ Comment[az]=Kəsmələr haqqında mə'lumat
+ Comment[bg]=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° прекъÑваниÑта в ÑиÑтемата
+ Comment[bn]=ইনটরাপà§à¦Ÿ তথà§à¦¯
+-Comment[br]=Titouroù war ar spanoù
++Comment[br]=Titouroù diwar-benn ar spanoù
+ Comment[bs]=Informacije o interaptima
+ Comment[ca]=Informació de les interrupcions
+ Comment[cs]=Informace o pÅ™eruÅ¡enÃch
+@@ -138,7 +137,6 @@
+ Comment[ven]=U thithisa mafhungo
+ Comment[vi]=Thông tin vỠngắt
+ Comment[xh]=Phazamisa ulwazi
+-Comment[xx]=xxInterrupt informationxx
+ Comment[zh_CN]=䏿–ä¿¡æ¯
+ Comment[zh_TW]=䏿–·è³‡è¨Š
+ Comment[zu]=Ulwazi lweziphazamiso
+@@ -203,7 +201,6 @@
+ Keywords[ven]=U thithisa,IRQ,Mafhungo a Sisitemu
+ Keywords[vi]=Ngắt,IRQ,thông tin hệ hống
+ Keywords[xh]=Iziphazamiso,IRQ,Ulwazi lwendlela
+-Keywords[xx]=xxInterrupts,IRQ,System Informationxx
+ Keywords[zh_CN]=Interrupts,䏿–,IRQ,System Information,系统信æ¯
+ Keywords[zh_TW]=Interrupts,IRQ,System Information,䏿–·,系統資訊
+ Keywords[zu]=Iziphazamiso,IRQ,Ulwazi lwesistimu
+diff -Nru kdebase-release-3.4.0/kcontrol/info/ioports.desktop kdebase-branch-3.4/kcontrol/info/ioports.desktop
+--- kdebase-release-3.4.0/kcontrol/info/ioports.desktop 2005-02-04 23:14:52.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/info/ioports.desktop 2005-03-07 09:15:12.000000000 -0500
+@@ -76,7 +76,6 @@
+ Name[vi]=Cổng và o ra (VR)
+ Name[wa]=Pôrts I/R
+ Name[xh]=IO-Ufako
+-Name[xx]=xxIO-Portsxx
+ Name[zh_CN]=IO 端å£
+ Name[zu]=Izikhumulo-IO
+
+@@ -86,7 +85,7 @@
+ Comment[az]=Giriş Çıktı portları haqqında mə'lumat
+ Comment[bg]=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° входно-изходните портове
+ Comment[bn]=আই-ও পোরà§à¦Ÿ সংকà§à¦°à¦¾à¦¨à§à¦¤ তথà§à¦¯
+-Comment[br]=Titouroù war ar porzhioù ED
++Comment[br]=Titouroù diwar-benn ar porzhioù ED
+ Comment[bs]=Informacije o IO-portovima
+ Comment[ca]=Informació dels ports E/S
+ Comment[cs]=Informace o vstupnÄ›/výstupnÃch-portech
+@@ -146,7 +145,6 @@
+ Comment[vi]=Thông tin vỠcổng VR
+ Comment[wa]=Informåcion so les pôrts d' Intrêye/Rexhowe
+ Comment[xh]=IO-ulwazi lwezibuko
+-Comment[xx]=xxIO-port informationxx
+ Comment[zh_CN]=IO 端å£ä¿¡æ¯
+ Comment[zh_TW]=IO-Port 資訊
+ Comment[zu]=Ulwazi lwe-isikhumulo-IO
+@@ -207,7 +205,6 @@
+ Keywords[ven]=IO,I/O,IO-Ports,I/O-Ports,Ports,IO-Range,I/O-Range,Mafhungo a Sisitemu
+ Keywords[vi]=VR,V/R,Cổng VR,Cổng V/R,Cổng,Vùng VR,Vùng VR,thông tin hệ thống
+ Keywords[xh]=IO,I/O,IO-Amazibuko,I/O-Amazibuko,Amazibuko,IO-Beka ngendlela,Ulwazi lwendlela
+-Keywords[xx]=xxIO,I/O,IO-Ports,I/O-Ports,Ports,IO-Range,I/O-Range,System Informationxx
+ Keywords[zh_CN]=IO,I/O,IO-Ports,I/O-Ports,Ports,IO-Range,I/O-Range,System Information,IO 端å£,I/O 端å£,端å£,IO 范围,I/O 范围,系统信æ¯
+ Keywords[zh_TW]=IO,I/O,IO-Ports,Ports,IO-Range,I/O-Range,System Information,IO 範åœ,I/O 範åœ,系統資訊
+ Keywords[zu]=IO,I/O,Izikhumulo-IO,Izikhumulo-I/O,Izikhumulo,IO-Umbandela,I/O-Umbandela, Ulwazi Lwesistimu
+diff -Nru kdebase-release-3.4.0/kcontrol/info/main.cpp kdebase-branch-3.4/kcontrol/info/main.cpp
+--- kdebase-release-3.4.0/kcontrol/info/main.cpp 2004-11-21 22:00:08.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/info/main.cpp 2005-04-02 05:06:27.000000000 -0500
+@@ -97,7 +97,7 @@
+ #endif
+ }
+
+- KCModule *create_devices(QWidget *parent, const char * /*name*/)
++ KDE_EXPORT KCModule *create_devices(QWidget *parent, const char * /*name*/)
+ {
+ #ifdef INFO_DEVICES_AVAILABLE
+ return new KInfoListWidget(i18n("Devices"), parent, "kcminfo", GetInfo_Devices);
+diff -Nru kdebase-release-3.4.0/kcontrol/info/memory.desktop kdebase-branch-3.4/kcontrol/info/memory.desktop
+--- kdebase-release-3.4.0/kcontrol/info/memory.desktop 2005-02-04 23:14:52.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/info/memory.desktop 2005-03-07 09:15:12.000000000 -0500
+@@ -78,7 +78,6 @@
+ Name[vi]=Bá»™ nhá»›
+ Name[wa]=Memwere
+ Name[xh]=Inkumbulo
+-Name[xx]=xxMemoryxx
+ Name[zh_CN]=内å˜
+ Name[zh_TW]=記憶體
+ Name[zu]=Inkumbulo
+@@ -90,7 +89,7 @@
+ Comment[be]=Ð†Ð½Ñ„Ð°Ñ€Ð¼Ð°Ñ†Ñ‹Ñ Ð°Ð± памÑці
+ Comment[bg]=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° ÑиÑтемната памет
+ Comment[bn]=মেমরি সংকà§à¦°à¦¾à¦¨à§à¦¤ তথà§à¦¯
+-Comment[br]=Titouroù war ar memor
++Comment[br]=Titouroù diwar-benn ar memor
+ Comment[bs]=Informacije o memoriji
+ Comment[ca]=Informació de la memòria
+ Comment[cs]=Informace o paměti
+@@ -150,7 +149,6 @@
+ Comment[vi]=Thông tin vỠbộ nhớ
+ Comment[wa]=Informåcion sol memwere
+ Comment[xh]=Ulwazi lwenkumbulo
+-Comment[xx]=xxMemory informationxx
+ Comment[zh_CN]=内å˜ä¿¡æ¯
+ Comment[zh_TW]=記憶體資訊資訊
+ Comment[zu]=Ulwazi lwenkumbulo
+@@ -214,7 +212,6 @@
+ Keywords[ven]=Muhumbulo,RAM,Muhumbulo wa vitshuala,muhumbulo zwao,muhumbulo wo kovhekanywaho,swap,mafhungo a sisitemu
+ Keywords[vi]=Bá»™ nhá»›, RAM, Bá»™ nhá»› ảo, Bá»™ nhá»› váºt lý, Bá»™ nhá»› dùng chung,Swap,Thông tin hệ thống
+ Keywords[xh]=Inkumbulo,RAM,Inkumbulo yobume,Inkumbulo yomzimba,Inkumbulo yokwahlulelana,Ukutshintshiselana,Ulwazi lwendlela
+-Keywords[xx]=xxMemory,RAM,Virtual memory,Physical memory,Shared memory,Swap,System Informationxx
+ Keywords[zh_CN]=Memory,RAM,Virtual memory,Physical memory,Shared memory,Swap,System Information,内å˜,虚拟å˜å‚¨,物ç†å˜å‚¨,共享内å˜,交æ¢,系统信æ¯
+ Keywords[zh_TW]=Memory,RAM,Virtual memory,Physical memory,Shared memory,Swap,System Information,記憶體,虛擬記憶體,實體記憶體,共享記憶體,系統資訊
+ Keywords[zu]=Inkumbulo,RAM,Inkumbulo yamanga,Inkumbulo siqu,Inkumbulo yokwabelana,Shintshanisa,Ulwazi Lwesistimu
+diff -Nru kdebase-release-3.4.0/kcontrol/info/opengl.desktop kdebase-branch-3.4/kcontrol/info/opengl.desktop
+--- kdebase-release-3.4.0/kcontrol/info/opengl.desktop 2005-02-23 00:05:35.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/info/opengl.desktop 2005-03-30 01:47:43.000000000 -0500
+@@ -14,20 +14,22 @@
+ Name[bn]=ওপেন-জি-à¦à¦²
+ Name[hi]=ओपन-जीà¤à¤²
+ Name[ta]=ஓபன௠ஜிஎலà¯
+-Name[xx]=xxOpenGLxx
+
+ Comment=OpenGL information
+ Comment[az]=OpenGL mə'lumatı
+ Comment[bg]=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° OpenGL
+ Comment[bn]=ওপেন-জি-à¦à¦² সংকà§à¦°à¦¾à¦¨à§à¦¤ তথà§à¦¯
+-Comment[br]=Titouroù war OpenGL
++Comment[br]=Titouroù diwar-benn OpenGL
++Comment[bs]=Informacije o OpenGL-u
+ Comment[ca]=Informació OpenGL
+ Comment[cs]=Informace o OpenGL
+ Comment[da]=OpenGL-information
+ Comment[de]=Informationen zu OpenGL
++Comment[el]=ΠληÏοφοÏίες OpenGL
+ Comment[eo]=OpenGLa informo
+ Comment[es]=Información OpenGL
+ Comment[et]=OpenGL info
++Comment[eu]=OpenGL informazioa
+ Comment[fi]=OpenGL tiedot
+ Comment[fr]=Informations OpenGL
+ Comment[fy]=OpenGL-ynformaasje
+@@ -37,6 +39,7 @@
+ Comment[hu]=OpenGL-jellemzők
+ Comment[is]=OpenGL upplýsingar
+ Comment[it]=Informazioni sull'OpenGL
++Comment[ja]=OpenGL æƒ…å ±
+ Comment[lt]=OpenGL informacija
+ Comment[mk]=Информации за OpenGL
+ Comment[mt]=Informazzjoni dwar OpenGL
+@@ -49,19 +52,20 @@
+ Comment[pt_BR]=Informações sobre OpenGL
+ Comment[ru]=Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ OpenGL
+ Comment[se]=OpenGL-diehtu
++Comment[sk]=Informácie o OpenGL
+ Comment[sl]=Informacije o OpenGL
+ Comment[sr]=Информације о OpenGL-у
+-Comment[sr@Latn]=Информације о OpenGL-у
++Comment[sr@Latn]=Informacije o OpenGL-u
+ Comment[sv]=Information om OpenGL
+ Comment[ta]=ஓபன௠ஜிஎல௠தகவலà¯
+ Comment[tr]=OpenGL Bilgisi
+ Comment[uk]=Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ OpenGL
+-Comment[xx]=xxOpenGL informationxx
+ Comment[zh_CN]=OpenGL ä¿¡æ¯
+
+ Keywords=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display
+ Keywords[az]=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display, Displey, Avadanlıq,Qrafika
+ Keywords[bg]=видеокарта, хардуер,екран, уÑкорение, графика, OpenGL, DRI, GLX, 3D, VideoCard, Hardware Acceleration, Graphics, X, X11, Xserver, X-Server, XFree86, Display
++Keywords[bs]=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,Grafika
+ Keywords[ca]=OpenGL,DRI,GLX,3D,Targeta de vÃdeo,Hardware Acceleració,Grà fics,X,X11,Xserver,Servidor X,XFree86,Pantalla
+ Keywords[cs]=OpenGL,DRI,GLX,3D,videokarta,akcelerace,grafika,X,X11,Xserver,X-Server,XFree86,Display
+ Keywords[da]=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Grafik,X,X11,Xserver,X-Server,XFree86,Skærm
+@@ -82,14 +86,14 @@
+ Keywords[pl]=OpenGL,DRI,GLX,3D,karta graficzna,grafika,X,X11,Xserver,X-Server,XFree86,ekran
+ Keywords[pt]=OpenGL,DRI,GLX,3D,Placa VÃdeo,Aceleração por Hardware,Gráficos,X,X11,Servidor X,XFree86,Ecrã
+ Keywords[pt_BR]=OpenGL,DRI,GLX,3D,Placa de VÃdeo,Aceleração de Hardware,Gráficos,X,X11,Servidor X,X Server,XFree86,Display
++Keywords[sk]=OpenGL,DRI,GLX,3D,grafická karta,hardvérová akcelerácia,grafika,X,X11,Xserver,X-Server,XFree86,obrazovka
+ Keywords[sl]=OpenGL,DRI,GLX,3D,Strojna pospešitev,Grafika,X,X11,Xserver,X-Server,X-stežnik,X,XFree86,Zaslon
+ Keywords[sr]=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,видео картица,хардверÑко убрзање,графика
+-Keywords[sr@Latn]=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,видео картица,хардверÑко убрзање,графика
++Keywords[sr@Latn]=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,video kartica,hardversko ubrzanje,grafika
+ Keywords[sv]=OpenGL,DRI,GLX,3D,videokort,hårdvaruacceleration,grafik,X,X11,Xserver,X-server,Xfree86,skärm
+ Keywords[ta]=ஓபன௠ஜிஎலà¯,டிஆரை,ஜிஎலà¯X,à®®à¯à®ªà¯à®ªà®°à®¿à®®à®¾à®£à®®à¯,வீடியோஅடà¯à®Ÿà¯ˆ,வனà¯à®ªà¯Šà®°à¯à®³à¯ à®®à¯à®Ÿà¯à®•à¯à®•à®®à¯,சிதà¯à®¤à®¿à®°à®™à¯à®•ளà¯,X,X11,Xசேவகனà¯,X-சேவகனà¯,XFree86,காடà¯à®Ÿà¯
+ Keywords[tr]=OpenGL,DRI,GLX,3D,VideoCard,Video kartı,Donanım Hızlandırma,Grafik,X,X11,Xserver,X-Server,X-Sunucu,Xsunucu,XFree86,Görüntü
+ Keywords[uk]=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,відео карта,3D акÑелераціÑ,графіка,X Ñервер,монітор
+-Keywords[xx]=xxOpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Displayxx
+ Keywords[zh_CN]=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,显å¡,ç¡¬ä»¶åŠ é€Ÿ,图形,X æœåС噍,显示
+
+ Categories=Qt;KDE;X-KDE-information;
+diff -Nru kdebase-release-3.4.0/kcontrol/info/partitions.desktop kdebase-branch-3.4/kcontrol/info/partitions.desktop
+--- kdebase-release-3.4.0/kcontrol/info/partitions.desktop 2005-02-04 23:14:52.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/info/partitions.desktop 2005-03-07 09:15:12.000000000 -0500
+@@ -76,7 +76,6 @@
+ Name[vi]=Phân vùng
+ Name[wa]=PÃ¥rticions
+ Name[xh]=Ulwahlulo ngokwamaqhekeza
+-Name[xx]=xxPartitionsxx
+ Name[zh_CN]=分区
+ Name[zh_TW]=ç£ç¢Ÿåˆ†å‰²å€
+ Name[zu]=Izahluko
+@@ -87,7 +86,7 @@
+ Comment[az]=Bölmələr Haqqında Mə'lumat
+ Comment[bg]=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° дÑловете и диÑковете
+ Comment[bn]=পারà§à¦Ÿà¦¿à¦¶à¦¨ সংকà§à¦°à¦¾à¦¨à§à¦¤ তথà§à¦¯
+-Comment[br]=Titouroù war ar parzhadur
++Comment[br]=Titouroù diwar-benn ar parzhadur
+ Comment[bs]=Informacije o particijama
+ Comment[ca]=Informació de particions
+ Comment[cs]=Informace o oddÃlech disků
+@@ -146,7 +145,6 @@
+ Comment[vi]=Thông tin vỠphân vùng
+ Comment[wa]=Informåcion sol pårtixhaedje del deure plake
+ Comment[xh]=Ulwazi lowahlulelwano ngokwamaqhekeza
+-Comment[xx]=xxPartition informationxx
+ Comment[zh_CN]=分区信æ¯
+ Comment[zh_TW]=ç£ç¢Ÿåˆ†å‰²å€è³‡è¨Š
+ Comment[zu]=Ulwazi Lokwehlukanisa
+@@ -212,7 +210,6 @@
+ Keywords[ven]=Partitions,Harddrive,HD,Mafhungo a sisitemu
+ Keywords[vi]=Phân vùng, Ổ cứng, HD, Thông tin hệ thống
+ Keywords[xh]=Ulwahlulelwano ngokwamaqhekeza,Harddrive,HD,Ulwazi lwendlela yokusebenza
+-Keywords[xx]=xxPartitions,Harddrive,HD,System Informationxx
+ Keywords[zh_CN]=Partitions,Harddrive,HD,System Information,分区,硬盘,系统信æ¯
+ Keywords[zh_TW]=Partitions,Harddrive,HD,System Information,ç£ç¢Ÿåˆ†å‰²å€,硬å¼ç£ç¢Ÿæ©Ÿ,硬碟,系統資訊
+ Keywords[zu]=Izahluko,Harddrive,HD,Ulwazi Lwesistimu
+diff -Nru kdebase-release-3.4.0/kcontrol/info/pci.desktop kdebase-branch-3.4/kcontrol/info/pci.desktop
+--- kdebase-release-3.4.0/kcontrol/info/pci.desktop 2005-02-04 23:14:52.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/info/pci.desktop 2005-03-07 09:15:12.000000000 -0500
+@@ -22,7 +22,6 @@
+ Name[ru]=Шина PCI
+ Name[th]=à¸à¸¸à¸›à¸à¸£à¸“์ PCI
+ Name[uk]=Шина PCI
+-Name[xx]=xxPCIxx
+
+ Comment=PCI information
+ Comment[af]=Pci informasie
+@@ -31,7 +30,7 @@
+ Comment[be]=Ð†Ð½Ñ„Ð°Ñ€Ð¼Ð°Ñ†Ñ‹Ñ Ð°Ð± PCI
+ Comment[bg]=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° шината PCI
+ Comment[bn]=পি-সি-আই তথà§à¦¯
+-Comment[br]=Titouroù war ar PCI
++Comment[br]=Titouroù diwar-benn ar PCI
+ Comment[bs]=Informacije o PCI uređajima
+ Comment[ca]=Informació de PCI
+ Comment[cs]=Informace o PCI
+@@ -91,7 +90,6 @@
+ Comment[ven]=Mafhungo a PCI
+ Comment[vi]=Thông tin vỠPCI
+ Comment[xh]=Inkcukacha ye PCI
+-Comment[xx]=xxPCI informationxx
+ Comment[zh_CN]=PCI ä¿¡æ¯
+ Comment[zh_TW]=PCI 資訊
+ Comment[zu]=Ulwazi lwe-PCI
+@@ -157,7 +155,6 @@
+ Keywords[ven]=PCI,Maano a PCI,PCI Bus,Mafhungo a sisitemu
+ Keywords[vi]=PCI,Thiết bị PCI,Thông tin hệ thống
+ Keywords[xh]=PCI,PCI-Amacebo,PCI-Ibhasi,Ulwazi lwendlela
+-Keywords[xx]=xxPCI,PCI-Devices,PCI-Bus,System Informationxx
+ Keywords[zh_CN]=PCI,PCI-Devices,PCI-Bus,System Information,PCI 设备,PCI 总线,系统信æ¯
+ Keywords[zh_TW]=PCI,PCI-Devices,PCI-Bus,System Information,PCI è¨å‚™,PCI åŒ¯æµæŽ’,系統資訊
+ Keywords[zu]=PCI,Amathuluzi-PCI,Ibhasi-PCI,Ulwaz Lwesistimu
+diff -Nru kdebase-release-3.4.0/kcontrol/info/processor.desktop kdebase-branch-3.4/kcontrol/info/processor.desktop
+--- kdebase-release-3.4.0/kcontrol/info/processor.desktop 2005-02-04 23:14:52.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/info/processor.desktop 2005-03-07 09:15:12.000000000 -0500
+@@ -75,7 +75,6 @@
+ Name[ven]=Mubveledzi
+ Name[vi]=Bộ xỠlý
+ Name[xh]=Umqhubekekisi phambili
+-Name[xx]=xxProcessorxx
+ Name[zh_CN]=处ç†å™¨
+ Name[zh_TW]=處ç†å™¨
+ Name[zu]=Umqhubekisi
+@@ -87,7 +86,7 @@
+ Comment[be]=Ð†Ð½Ñ„Ð°Ñ€Ð¼Ð°Ñ†Ñ‹Ñ Ð°Ð± працÑÑары
+ Comment[bg]=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° процеÑора(ите) на ÑиÑтемата
+ Comment[bn]=পà§à¦°à¦¸à§‡à¦¸à¦° তথà§à¦¯
+-Comment[br]=Titouroù war ar c'hewerier
++Comment[br]=Titouroù diwar-benn ar c'hewerier
+ Comment[bs]=Informacije o procesoru
+ Comment[ca]=Informació del processador
+ Comment[cs]=Informace o procesoru
+@@ -147,7 +146,6 @@
+ Comment[ven]=Mafhungo a mubveledzi
+ Comment[vi]=Thông tin vỠbộ xỠlý
+ Comment[xh]=Inkcukacha yenkcukacha
+-Comment[xx]=xxProcessor informationxx
+ Comment[zh_CN]=处ç†å™¨ä¿¡æ¯
+ Comment[zh_TW]=處ç†å™¨è³‡è¨Š
+ Comment[zu]=Ulwazi lomqhubekisi
+@@ -214,7 +212,6 @@
+ Keywords[ven]=Mubveledzi,CPU,FPU,MHz,Mafhungo a sisitemu
+ Keywords[vi]=Bộ xỠlý, CPU, FPU, Mhz, Thông tin hệ thống
+ Keywords[xh]=Umqhubekekisi,CPU,FPU,MHz,Inkcukacha Yendlela yokusebenza
+-Keywords[xx]=xxProcessor,CPU,FPU,MHz,System Informationxx
+ Keywords[zh_CN]=Processor,CPU,FPU,MHz,System Information,处ç†å™¨,系统信æ¯
+ Keywords[zh_TW]=Processor,CPU,FPU,MHz,System Information,處ç†å™¨,ä¸å¤®è™•ç†å™¨,浮點é‹ç®—器,系統資訊
+ Keywords[zu]=Umqhubekisi,CPU,FPU,MHz,Ulwazi Lwesistimu
+diff -Nru kdebase-release-3.4.0/kcontrol/info/scsi.desktop kdebase-branch-3.4/kcontrol/info/scsi.desktop
+--- kdebase-release-3.4.0/kcontrol/info/scsi.desktop 2005-02-04 23:14:52.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/info/scsi.desktop 2005-03-07 09:15:12.000000000 -0500
+@@ -22,7 +22,6 @@
+ Name[lo]=àºàº¸àº›àº°àºàºàº™ SCSI
+ Name[ro]=Magistrala SCSI
+ Name[th]=à¸à¸¸à¸›à¸à¸£à¸“์ SCSI
+-Name[xx]=xxSCSIxx
+
+ Comment=SCSI information
+ Comment[af]=Scsi informasie
+@@ -31,7 +30,7 @@
+ Comment[be]=Ð†Ð½Ñ„Ð°Ñ€Ð¼Ð°Ñ†Ñ‹Ñ Ð°Ð± SCSI
+ Comment[bg]=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° шината SCSI
+ Comment[bn]=সà§à¦•াসি (SCSI) তথà§à¦¯
+-Comment[br]=Titouroù war ar SCSI
++Comment[br]=Titouroù diwar-benn ar SCSI
+ Comment[bs]=Informacije o SCSI uređajima
+ Comment[ca]=Informació de SCSI
+ Comment[cs]=Informace o SCSI
+@@ -91,7 +90,6 @@
+ Comment[ven]=Mafhungo a SCSI
+ Comment[vi]=Thông tin vỠSCSI
+ Comment[xh]=Inkcukacha ye SCSI
+-Comment[xx]=xxSCSI informationxx
+ Comment[zh_CN]=SCSI ä¿¡æ¯
+ Comment[zh_TW]=SCSI 資訊
+ Comment[zu]=Ulwazi lwe-SCSI
+@@ -156,7 +154,6 @@
+ Keywords[ven]=SCSI,SCSI-Bus,Mafhungo a sisitemu
+ Keywords[vi]=SCSI,SCSI-Bus,Thông tin hệ thống
+ Keywords[xh]=SCSI,SCSI-Ibhasi,Ulwazi lwendlela
+-Keywords[xx]=xxSCSI,SCSI-Bus,System Informationxx
+ Keywords[zh_CN]=SCSI,SCSI-Bus,System Information,SCSI 总线,系统信æ¯
+ Keywords[zh_TW]=SCSI,SCSI-Bus,System Information,系統資訊
+ Keywords[zu]=SCSI,Ibhasi-SCSI,Ulwazi Lwesistimu
+diff -Nru kdebase-release-3.4.0/kcontrol/info/sound.desktop kdebase-branch-3.4/kcontrol/info/sound.desktop
+--- kdebase-release-3.4.0/kcontrol/info/sound.desktop 2005-02-18 23:27:01.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/info/sound.desktop 2005-03-07 09:15:12.000000000 -0500
+@@ -79,7 +79,6 @@
+ Name[vi]=Âm thanh
+ Name[wa]=Son
+ Name[xh]=Isandi
+-Name[xx]=xxSoundxx
+ Name[zh_CN]=音效
+ Name[zh_TW]=音效
+ Name[zu]=Umsindo
+@@ -91,7 +90,7 @@
+ Comment[be]=Ð†Ð½Ñ„Ð°Ñ€Ð¼Ð°Ñ†Ñ‹Ñ Ð°Ð± гуку
+ Comment[bg]=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° аудио ÑиÑтемата
+ Comment[bn]=শবà§à¦¦ সংকà§à¦°à¦¾à¦¨à§à¦¤ তথà§à¦¯
+-Comment[br]=Titouroù war ar son
++Comment[br]=Titouroù diwar-benn ar son
+ Comment[bs]=Informacije o zvuku
+ Comment[ca]=Informació del so
+ Comment[cs]=Informace o zvuku
+@@ -151,7 +150,6 @@
+ Comment[ven]=Mafhungo a mubvumo
+ Comment[vi]=Thông tin vỠâm thanh
+ Comment[xh]=Inkcukacha yesandi
+-Comment[xx]=xxSound informationxx
+ Comment[zh_CN]=éŸ³å“æ•ˆæžœä¿¡æ¯
+ Comment[zh_TW]=音效資訊
+ Comment[zu]=Ulwazi Lomsindo
+@@ -197,12 +195,11 @@
+ Keywords[sk]=Zvuk,Zvuky,Zvuková karta,MIDI,OSS,Systémové Informácie
+ Keywords[sl]=zvok,glasba,zvoÄna kartica,avdio,midi,OSS,informacije o sistemu
+ Keywords[sr]=Sound,Ðудио,Soundcard,Midi,OSS,System Information,Звук,Ðудио,звучна карта,звучна картица,миди,ÑиÑтемÑке информације
+-Keywords[sr@Latn]=Sound,Ðудио,Soundcard,Midi,OSS,System Information,Звук,Ðудио,звучна карта,звучна картица,миди,ÑиÑтемÑке информације
++Keywords[sr@Latn]=Sound,Audio,Soundcard,Midi,OSS,System Information,Zvuk,Audio,zvuÄna karta,zvuÄna kartica,midi,sistemske informacije
+ Keywords[sv]=Ljud,Ljudkort,Midi,OSS,Systeminformation
+ Keywords[ta]=ஒலி,ஒலி அமைபà¯à®ªà¯,ஒலி அடà¯à®Ÿà¯ˆ,மிடி,OSS,சாதன தகவலà¯
+ Keywords[tr]=Ses,Seskartı,Midi,OSS,Sistem Bilgisi,MIDI
+ Keywords[uk]=звук,аудіо,sound,audio,звукова плата,midi,oss,ÑиÑтемна інформаціÑ
+ Keywords[uz]=MIDI,OSS,Товуш,Ðудио,Товуш картаÑи,Тизм ҳақида маълумот
+-Keywords[xx]=xxSound,Audio,Soundcard,MIDI,OSS,System Informationxx
+ Keywords[zh_CN]=Sound,Audio,Soundcard,MIDI,OSS,System Information,音频,音å“,声å¡,系统信æ¯
+ Categories=Qt;KDE;X-KDE-information;
+diff -Nru kdebase-release-3.4.0/kcontrol/info/xserver.desktop kdebase-branch-3.4/kcontrol/info/xserver.desktop
+--- kdebase-release-3.4.0/kcontrol/info/xserver.desktop 2005-02-23 00:05:35.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/info/xserver.desktop 2005-03-22 12:38:05.000000000 -0500
+@@ -69,7 +69,6 @@
+ Name[uz]=X-Сервер
+ Name[ven]=Siva ya X
+ Name[xh]=Umncedisi we-X
+-Name[xx]=xxX-Serverxx
+ Name[zh_CN]=X æœåС噍
+ Name[zh_TW]=X 伺æœå™¨
+ Name[zu]=Umlekeleli we-X
+@@ -81,7 +80,7 @@
+ Comment[be]=Ð†Ð½Ñ„Ð°Ñ€Ð¼Ð°Ñ†Ñ‹Ñ Ð°Ð± X-ÑÑрвÑры
+ Comment[bg]=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° Ñървъра X
+ Comment[bn]=à¦à¦•à§à¦¸-সারà§à¦à¦¾à¦° সংকà§à¦°à¦¾à¦¨à§à¦¤ তথà§à¦¯
+-Comment[br]=Titouroù war ar servijer X
++Comment[br]=Titouroù diwar-benn ar servijer X
+ Comment[bs]=Informacije o X-Serveru
+ Comment[ca]=Informació del servidor X
+ Comment[cs]=Informace o X-Serveru
+@@ -141,7 +140,6 @@
+ Comment[ven]=Mafhungo a siva ya X
+ Comment[vi]=thông tin vỠX-Server
+ Comment[xh]=Ulwazi lomncedisi we-X
+-Comment[xx]=xxX-Server informationxx
+ Comment[zh_CN]=X æœåŠ¡å™¨ä¿¡æ¯
+ Comment[zh_TW]=X 伺æœå™¨è³‡è¨Š
+ Comment[zu]=Ulwazi lomlekeleli we-X
+@@ -150,11 +148,13 @@
+ Keywords[az]=X,X-Server,XServer,XFree86,Display,VideoCard,System Information,X-Verici,XVerici,XFree86,Displey,Sistem Haqqında Mə'lumat
+ Keywords[bg]=екран, видеокарта, ÑиÑтемна информациÑ, Ñървър, X, X-Server, XServer, XFree86, Display, VideoCard, System Information
+ Keywords[br]=X,servijer X,XServer,XFree86,diskwel,kartenn video,titouroù reizhiad
++Keywords[bs]=X,X-Server,XServer,XFree86,VideoCard,Display,System Information, Ekran, Informacije o sistemu
+ Keywords[ca]=X,Servidor X,XServer,XFree86,Monitor,Targeta de video,Informació del sistema
+ Keywords[cs]=X,X-server,XServer,XFree86,Obrazovka,Informace o systému,Videokarta
+ Keywords[da]=X,X-server,Xserver,XFree86,Skærm,Videokort,Systeminformation
+ Keywords[es]=X,X-Server,XServer,XFree86,Monitor,Tarjeta, Gráfica,Sistema,Información
+ Keywords[et]=X,X'i server,X Server,XFree86,Ekraan,Videokaart,Süsteemi info
++Keywords[eu]=X,X-Server,XServer,XFree86,Display,VideoCard,sistema informazioa
+ Keywords[fr]=X,serveur X,XFree86,XServer,moniteur,affichage,informations système,xfree,carte vidéo,carte graphique
+ Keywords[fy]=X,X-Server,XServer,XFree86,display,systeemynformaasje,byldskerm,grafyske kaart
+ Keywords[he]=תצוגה,מידע מערכת,XFree86,שרת X,X, כרטיס מסך
+@@ -162,6 +162,7 @@
+ Keywords[hu]=X,X-kiszolgáló,XServer,XFree86,képernyő,videokártya,rendszerinformáció
+ Keywords[is]=X,X-Server,X-þjónn,XServer,Xþjónn,XFree86,Display,skjár, VideoCard,skjákort,System Information,kerfisupplýsingar
+ Keywords[it]=X,Server X,XServer,XFree86,display,schermo,informazioni sul sistema,SchedaVideo
++Keywords[ja]=X,X-サーãƒ,Xサーãƒ,XFree86,ディスプレイ,ã‚·ã‚¹ãƒ†ãƒ æƒ…å ±
+ Keywords[lt]=X,X-Serveris,XServer,XFree86,Displėjus,Video plokštė,Sistemos informacija
+ Keywords[mk]=X,X-Server,XServer,XFree86,Display,VideoCard,System Information,X Ñервер,Екран,Видеокартичка,Информации за ÑиÑтемот
+ Keywords[mt]=X,X-Server,XServer,XFree86,Display,System Information
+@@ -172,14 +173,14 @@
+ Keywords[pl]=X,X serwer,Xserwer,XFree86,karta graficzna,grafika,informacja o systemie
+ Keywords[pt]=X,servidor X,XServer,XFree86,ecrã,placa de vÃdeo,informações de sistema
+ Keywords[pt_BR]=X,Servidor X,XFree,XFree86,Display,Tela,Placa de VÃdeo,Informações do sistema
++Keywords[sk]=X,X-Server,XServer,XFree86,Display,Zobrazenie,Systémové Informácie
+ Keywords[sl]=X,strežnik X,X-strežnik,XServer,XFree86,zaslon,grafiÄna kartica,Podatki o sistemu,sistemske informacije
+ Keywords[sr]=X,X-Server,XServer,XFree86,Display,VideoCard,System Information,екран,видео картица
+-Keywords[sr@Latn]=X,X-Server,XServer,XFree86,Display,VideoCard,System Information,екран,видео картица
++Keywords[sr@Latn]=X,X-Server,XServer,XFree86,Display,VideoCard,System Information,ekran,video kartica
+ Keywords[sv]=X,X-server,Xserver,Xfree86,skärm,videokort,systeminformation
+ Keywords[ta]=X,X-சேவகனà¯,Xசேவகனà¯,XFree86, காடà¯à®šà®¿,படகà¯à®•ாடà¯à®šà®¿à®…டà¯à®Ÿà¯ˆ,அமைபà¯à®ªà¯ தகவலà¯
+ Keywords[tr]=X,X-Server,XServer,X sunucu, X-sunucu,Xsunucu,XFree86,Görüntü,Video Kartı,Sistem Bilgisi
+ Keywords[uk]=X,X-Server,XServer,XFree86,Display,ÑиÑтемна інформаціÑ,монітор,X Ñервер,відео карта
+-Keywords[xx]=xxX,X-Server,XServer,XFree86,Display,VideoCard,System Informationxx
+ Keywords[zh_CN]=X,X-Server,XServer,XFree86,Display,VideoCard,System InformationX æœåС噍,显示器,显å¡,系统信æ¯
+
+ Categories=Qt;KDE;X-KDE-information;
+diff -Nru kdebase-release-3.4.0/kcontrol/input/mouse.desktop kdebase-branch-3.4/kcontrol/input/mouse.desktop
+--- kdebase-release-3.4.0/kcontrol/input/mouse.desktop 2005-02-04 23:14:53.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/input/mouse.desktop 2005-03-26 02:37:40.000000000 -0500
+@@ -75,7 +75,6 @@
+ Name[ven]=Mausu
+ Name[vi]=Chuá»™t
+ Name[wa]=Sori
+-Name[xx]=xxMousexx
+ Name[zh_CN]=é¼ æ ‡
+ Name[zh_TW]=滑é¼
+ Name[zu]=i-Mouse
+@@ -102,7 +101,7 @@
+ Comment[fa]=تنظیمات موش
+ Comment[fi]=Hiiren asetukset
+ Comment[fr]=Configuration de la souris
+-Comment[fy]=Mûsynstellingen
++Comment[fy]=Mûsynstellings
+ Comment[ga]=Socruithe luiche
+ Comment[gl]=Configuración do rato
+ Comment[he]=×©×™× ×•×™ הגדרות העכבר
+@@ -148,7 +147,6 @@
+ Comment[vi]=Thiết láºp chuá»™t
+ Comment[wa]=Apontiaedjes del sori
+ Comment[xh]=Izicwangciso ze mouse
+-Comment[xx]=xxMouse settingsxx
+ Comment[zh_CN]=é¼ æ ‡è®¾ç½®
+ Comment[zh_TW]=æ»‘é¼ è¨å®š
+ Comment[zu]=Izilungiselelo ze-Mouse
+@@ -211,7 +209,6 @@
+ Keywords[ven]=Mausu,U gonyisa mausu,mausu,bathene ya mausu,nanga,tshivhumbeo tsha Cursor,maano a InputSedzulusa bathene,u putedza,aikhonoPhindulo,vhasumbedzi,kokodza,uputedza luvhili,utalulusa,tshaula,tshamonde
+ Keywords[vi]=Chuá»™t,Gia tốc chuá»™t,Giá»›i hạn chuá»™t,Nút chuá»™t,Chá»n,Kiểu dáng con trá»,Thiết bị nháºp, Nút Mapping,Nhấn,biểu tượng,phản hồi,Con trá»,Kéo Nhấn đúp,mapping,thuáºn tay phải,thuáºn tay trái
+ Keywords[xh]=Mouse,Unyuso lwesantya seMouse,Ungeno lwe Mouse,Amaqhosha eMouse,Ukhetho,Ukumila kwesalathisi,Amacebo egalelo,Ukucetywa kwamaqhosha,Nqakraza,ii-icon, isiphumo,Izalathi,Tsala,Nqakraza kabini,iyaceba,isandla sokunene,isandla sasekhohlo
+-Keywords[xx]=xxMouse,Mouse acceleration,Mouse threshold,Mouse buttons,Selection,Cursor Shape,Input Devices,Button Mapping,Click,icons,feedback,Pointers,Drag,DoubleClick,mapping,right handed,left handedxx
+ Keywords[zh_CN]=Mouse,Mouse acceleration,Mouse threshold,Mouse buttons,Selection,Cursor Shape,Input Devices,Button Mapping,Click,icons,feedback,Pointers,Drag,DoubleClick,mapping,right handed,left handed,é¼ æ ‡,é¼ æ ‡åŠ é€Ÿ,é¼ æ ‡åŠ é€Ÿé˜ˆå€¼,é¼ æ ‡æŒ‰é’®,选择,å…‰æ ‡å½¢çŠ¶,输入设备,æŒ‰é’®æ˜ å°„,å•击,å›¾æ ‡,å馈,拖放,åŒå‡»,æ˜ å°„,峿‰‹ä¹ 惯,å·¦æ‰‹ä¹ æƒ¯
+ Keywords[zh_TW]=Mouse,Mouse acceleration,Mouse threshold,Mouse buttons,Selection,Cursor Shape,Input Devices,Button Mapping,Click,icons,feedback,Pointers,Drag,DoubleClick,mapping,right handed,left handed,æ»‘é¼ ,æ»‘é¼ æ¸¸æ¨™åŠ é€Ÿ,æ»‘é¼ æ¸¸æ¨™åŠ é€Ÿé–“è·,æ»‘é¼ æŒ‰éˆ•,鏿“‡,指標外觀,輸入è¨å‚™,按éµå°æ‡‰,單擊,圖示,å饋,指標,拖放,雙擊,æ˜ å°„,ç¿’æ…£å³æ‰‹,習慣左手
+ Keywords[zu]=i-Mouse,Ukugijimisa kwe-Mouse,i-Mouse threshold, Izinkinobho ze-Mouse,Ukhetho,Isimo senkomba,Amthuluzi Omphumela wangaphakathi,Ukuqondanisa Izinkinobho,Cofa,Izimpawu zezithombe, umphumela obuyayo,Izinkomba zendawo yokubhala,Hudula,Cofa-kabili, ukuqondanisa,okwesanadla sangakwesokudla,okwesandla sangakwesokunxele
+diff -Nru kdebase-release-3.4.0/kcontrol/ioslaveinfo/ioslaveinfo.desktop kdebase-branch-3.4/kcontrol/ioslaveinfo/ioslaveinfo.desktop
+--- kdebase-release-3.4.0/kcontrol/ioslaveinfo/ioslaveinfo.desktop 2005-02-04 23:14:53.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/ioslaveinfo/ioslaveinfo.desktop 2005-03-07 09:15:13.000000000 -0500
+@@ -64,7 +64,6 @@
+ Comment[ven]=Mafhungo ngaha purotokolo ire hone
+ Comment[vi]=Thông tin vỠcác giao thức có thể dùng
+ Comment[xh]=Ulwazi malunga nemithetho elandelwayo ekhoyo
+-Comment[xx]=xxInformation about the available protocolsxx
+ Comment[zh_CN]=å¯ç”¨å议的信æ¯
+ Comment[zh_TW]=å¯ç”¨å”定的資訊
+ Comment[zu]=Ulwazi mayelana nemithetho elandelwayo ekhona
+@@ -126,7 +125,6 @@
+ Keywords[ven]=Purotokolo,dziphuli dza IO,Dziphuli,Vhudavhidzani,mafhungo,u fhela ha tshifhinga
+ Keywords[vi]=Giao thức,VR tớ,Tớ,Mạng,Thông tin,Timeout
+ Keywords[xh]=Imithetho elandelwayo,IO izicaka,Izicaka,Umsebenzi womtya,Ulwazi, Ixesha lokuphuma
+-Keywords[xx]=xxProtocol,IO slaves,Slaves,Network,Information,Timeoutxx
+ Keywords[zh_CN]=Protocol,IO slaves,Slaves,Network,Information,Timeout,åè®®,网络,ä¿¡æ¯,è¶…æ—¶
+ Keywords[zh_TW]=Protocol,IO slaves,Slaves,Network,Information,Timeout,å”定,網路,資訊,作æ¥é€¾æ™‚
+ Keywords[zu]=Umthetho olandelwayo,IO slaves,Izigqila,Uxhumano olusakazekile, Ulwazi,Isikhathi sokuphuma
+@@ -195,7 +193,6 @@
+ Name[ven]=Purotokolo
+ Name[vi]=Giao thức
+ Name[xh]=Umthetho olandelwayo
+-Name[xx]=xxProtocolsxx
+ Name[zh_CN]=åè®®
+ Name[zh_TW]=å”定
+ Name[zu]=Imithetho elandelwayo
+diff -Nru kdebase-release-3.4.0/kcontrol/joystick/joydevice.cpp kdebase-branch-3.4/kcontrol/joystick/joydevice.cpp
+--- kdebase-release-3.4.0/kcontrol/joystick/joydevice.cpp 2004-06-01 16:25:11.000000000 -0400
++++ kdebase-branch-3.4/kcontrol/joystick/joydevice.cpp 2005-03-14 15:36:40.000000000 -0500
+@@ -30,6 +30,7 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <sys/ioctl.h>
++#include <sys/time.h>
+ #include <errno.h>
+ #include <math.h>
+
+diff -Nru kdebase-release-3.4.0/kcontrol/joystick/joystick.desktop kdebase-branch-3.4/kcontrol/joystick/joystick.desktop
+--- kdebase-release-3.4.0/kcontrol/joystick/joystick.desktop 2005-02-18 23:27:01.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/joystick/joystick.desktop 2005-03-26 02:37:41.000000000 -0500
+@@ -15,7 +15,7 @@
+ Comment[eu]=joystick - joystickak aztertzeko kontrol modulua
+ Comment[fi]=peliohjain - KDE:n ohjauskeskuksen moduuli peliohjainta varten
+ Comment[fr]=Manettes de jeu - un module pour tester les manettes de jeu
+-Comment[fy]=joystick - in ynstellingsmodule foar it teste fan joysticks
++Comment[fy]=joystick - in Konfiguraasjemodule foar it teste fan joysticks
+ Comment[gl]=joystick - un módulo de kcontrol para probar joysticks
+ Comment[he]=×’'ויסטיק - מודול לבדיקת ×’'ויסטיקי×
+ Comment[hi]=जॉयसà¥à¤Ÿà¤¿à¤• - जॉयसà¥à¤Ÿà¤¿à¤• को जाà¤à¤šà¤¨à¥‡ का à¤à¤• के-कंटà¥à¤°à¥‹à¤² मॉडà¥à¤¯à¥‚ल
+@@ -39,13 +39,12 @@
+ Comment[sk]=Ovládacà modul pre test joysticku
+ Comment[sl]=joystick - modul Nadzornega srediÅ¡Äa za preizkus igralnih palic
+ Comment[sr]=џојÑтик - модул контролног центра за теÑтирање џојÑтика
+-Comment[sr@Latn]=џојÑтик - модул контролног центра за теÑтирање џојÑтика
++Comment[sr@Latn]=džojstik - modul kontrolnog centra za testiranje džojstika
+ Comment[sv]=Styrspak: en inställningsmodul för att testa styrspakar
+ Comment[ta]=இயகà¯à®•à¯à®®à¯ கரà¯à®µà®¿ - கேகணà¯à®Ÿà¯à®°à¯‹à®²à¯ கூற௠இயகà¯à®•à¯à®®à¯ கரà¯à®µà®¿à®¯à¯ˆ பரிசோதிகà¯à®•ிறதà¯
+ Comment[tr]=oyun kumandası - oyun kumandalarını denemek için bir kcontrol modülü
+ Comment[uk]=ДжойÑтик - модуль центру ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ñ‚ÐµÑÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¶Ð¾Ð¹Ñтиків
+ Comment[uz]=ЖойÑтик учун бошқарув модули
+-Comment[xx]=xxjoystick - a kcontrol module to test joysticksxx
+ Comment[zh_CN]=joystick - æµ‹è¯•æ¸¸æˆæ†çš„ kcontrol 模å—
+ Exec=kcmshell joystick
+ Keywords=joystick,gamepad
+@@ -71,13 +70,12 @@
+ Keywords[se]=stivrensággi,speallanstivrran
+ Keywords[sl]=joystick,gamepad,igralna palica,igralni ploÅ¡Äek
+ Keywords[sr]=joystick,gamepad,џојÑтик
+-Keywords[sr@Latn]=joystick,gamepad,џојÑтик
++Keywords[sr@Latn]=joystick,gamepad,džojstik
+ Keywords[sv]=styrspak,spelkonsol
+ Keywords[ta]=இயகà¯à®•à¯à®®à¯ கரà¯à®µà®¿, விளையாடà¯à®Ÿà¯ பலகை
+ Keywords[tr]=oyun çubuğu
+ Keywords[uk]=джойÑтик,gamepad
+ Keywords[uz]=жойÑтик,геймпад
+-Keywords[xx]=xxjoystick,gamepadxx
+ Keywords[zh_CN]=joystick,gamepad,æ¸¸æˆæ†,手柄
+ Name=Joystick
+ Name[bg]=ДжойÑтик
+@@ -106,7 +104,7 @@
+ Name[se]=Stivrensággi
+ Name[sl]=Igralna palica
+ Name[sr]=ÐојÑтик
+-Name[sr@Latn]=ÐојÑтик
++Name[sr@Latn]=Džojstik
+ Name[sv]=Styrspak
+ Name[ta]=இயகà¯à®•௠கரà¯à®µà®¿
+ Name[tr]=Oyun Çubuğu
+@@ -114,7 +112,6 @@
+ Name[uz]=ЖойÑтик
+ Name[ven]=Thambo dzau tumanya na tshishumiswa
+ Name[xh]=Uvuyo
+-Name[xx]=xxJoystickxx
+ Name[zh_CN]=æ¸¸æˆæ†
+ Name[zu]=Induku yenjabulo
+ Terminal=false
+diff -Nru kdebase-release-3.4.0/kcontrol/kcontrol/KControl.desktop kdebase-branch-3.4/kcontrol/kcontrol/KControl.desktop
+--- kdebase-release-3.4.0/kcontrol/kcontrol/KControl.desktop 2005-02-04 23:14:54.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kcontrol/KControl.desktop 2005-03-22 12:38:05.000000000 -0500
+@@ -7,7 +7,7 @@
+ X-KDE-StartupNotify=true
+
+ Name=Control Center
+-Name[af]=Kontrole Sentrum
++Name[af]=Beheer Sentrum
+ Name[ar]=مركز التØÙƒÙ…
+ Name[az]=İdarə Mərkəzi
+ Name[be]=ЦÑнтар кіраваньнÑ
+@@ -29,7 +29,7 @@
+ Name[fa]=مرکز کنترل
+ Name[fi]=Ohjauskeskus
+ Name[fr]=Centre de configuration de KDE
+-Name[fy]=Foarkarsintrum
++Name[fy]=Konfiguraasjesintrum
+ Name[ga]=Lárionad Rialaithe
+ Name[gl]=Centro de Control
+ Name[he]=מרכז הבקרה
+@@ -76,7 +76,6 @@
+ Name[vi]=Trung tâm Ä‘iá»u khiển
+ Name[wa]=Cinte di contrôle
+ Name[xh]=Umbindi Wolawulo
+-Name[xx]=xxControl Centerxx
+ Name[zh_CN]=控制ä¸å¿ƒ
+ Name[zh_TW]=控制ä¸å¿ƒ
+ Name[zu]=Indawo Yokulawula
+diff -Nru kdebase-release-3.4.0/kcontrol/kcontrol/KControl_NoDisplay.desktop kdebase-branch-3.4/kcontrol/kcontrol/KControl_NoDisplay.desktop
+--- kdebase-release-3.4.0/kcontrol/kcontrol/KControl_NoDisplay.desktop 2005-02-04 23:14:54.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kcontrol/KControl_NoDisplay.desktop 2005-03-22 12:38:05.000000000 -0500
+@@ -7,7 +7,7 @@
+ X-KDE-StartupNotify=true
+
+ Name=Control Center
+-Name[af]=Kontrole Sentrum
++Name[af]=Beheer Sentrum
+ Name[ar]=مركز التØÙƒÙ…
+ Name[az]=İdarə Mərkəzi
+ Name[be]=ЦÑнтар кіраваньнÑ
+@@ -29,7 +29,7 @@
+ Name[fa]=مرکز کنترل
+ Name[fi]=Ohjauskeskus
+ Name[fr]=Centre de configuration de KDE
+-Name[fy]=Foarkarsintrum
++Name[fy]=Konfiguraasjesintrum
+ Name[ga]=Lárionad Rialaithe
+ Name[gl]=Centro de Control
+ Name[he]=מרכז הבקרה
+@@ -76,7 +76,6 @@
+ Name[vi]=Trung tâm Ä‘iá»u khiển
+ Name[wa]=Cinte di contrôle
+ Name[xh]=Umbindi Wolawulo
+-Name[xx]=xxControl Centerxx
+ Name[zh_CN]=控制ä¸å¿ƒ
+ Name[zh_TW]=控制ä¸å¿ƒ
+ Name[zu]=Indawo Yokulawula
+diff -Nru kdebase-release-3.4.0/kcontrol/kcontrol/kinfocenter.desktop kdebase-branch-3.4/kcontrol/kcontrol/kinfocenter.desktop
+--- kdebase-release-3.4.0/kcontrol/kcontrol/kinfocenter.desktop 2005-02-23 00:05:36.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kcontrol/kinfocenter.desktop 2005-03-30 01:47:43.000000000 -0500
+@@ -10,18 +10,20 @@
+ Name=KInfoCenter
+ Name[bn]=কে-ইনফো-সেনà§à¦Ÿà¦¾à¦°
+ Name[de]=Infozentrum
++Name[el]=ΚÎντÏο πληÏοφοÏιών
+ Name[et]=KDE infokeskus
+ Name[he]=מרכז המידע
++Name[ja]=インフォセンター
+ Name[pa]=ਜਾਣਕਾਰੀ ਕੇਂਦਰ
+ Name[pl]=Centrum informacyjne
+ Name[pt_BR]=Centro de Informações do KDE
+ Name[sv]=Informationscentralen
+ Name[ta]=கேதகவல௠மையமà¯
+-Name[xx]=xxKInfoCenterxx
+ GenericName=Info Center
+ GenericName[bg]=Информационен център
+ GenericName[bn]=তথà§à¦¯ কেনà§à¦¦à§à¦°
+ GenericName[br]=Kreizenn Titouroù
++GenericName[bs]=Info centar
+ GenericName[ca]=Centre d'informació
+ GenericName[cs]=InformaÄnà centrum
+ GenericName[cy]=Canolfan Gwybodaeth
+@@ -30,6 +32,7 @@
+ GenericName[en_GB]=Info Centre
+ GenericName[es]=Centro de información
+ GenericName[et]=Infokeskus
++GenericName[eu]=Info gunea
+ GenericName[fi]=Infokeskus
+ GenericName[fr]=Centre d'informations
+ GenericName[fy]=Ynformaasjesintrum
+@@ -38,6 +41,7 @@
+ GenericName[hu]=Rendszerinformáció
+ GenericName[is]=Upplýsingaborð
+ GenericName[it]=Centro informazioni
++GenericName[ja]=インフォセンター
+ GenericName[lt]=Info centras
+ GenericName[nb]=KDEs informasjonssenter
+ GenericName[nl]=Informatiecentrum
+@@ -46,13 +50,13 @@
+ GenericName[pt]=Centro de Informações
+ GenericName[pt_BR]=Centro de Informações
+ GenericName[ru]=Центр информации
++GenericName[sk]=InformaÄné centrum
+ GenericName[sl]=Informacijsko srediÅ¡Äe
+ GenericName[sr]=Информациони центар
+-GenericName[sr@Latn]=Информациони центар
++GenericName[sr@Latn]=Informacioni centar
+ GenericName[sv]=Informationscentralen
+ GenericName[ta]=தகவல௠மையமà¯
+ GenericName[uk]=Центр інформації
+-GenericName[xx]=xxInfo Centerxx
+ GenericName[zh_CN]=ä¿¡æ¯ä¸å¿ƒ
+
+ X-DCOP-ServiceType=Unique
+diff -Nru kdebase-release-3.4.0/kcontrol/kded/kcmkded.desktop kdebase-branch-3.4/kcontrol/kded/kcmkded.desktop
+--- kdebase-release-3.4.0/kcontrol/kded/kcmkded.desktop 2005-02-04 23:14:54.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kded/kcmkded.desktop 2005-03-07 09:15:16.000000000 -0500
+@@ -73,7 +73,6 @@
+ Name[vi]=Trình quản lý dịch vụ
+ Name[wa]=Manaedjeu di siervices
+ Name[xh]=Umphathi Wenkonzo
+-Name[xx]=xxService Managerxx
+ Name[zh_CN]=æœåŠ¡ç®¡ç†å™¨
+ Name[zh_TW]=æœå‹™ç®¡ç†ç¨‹å¼
+ Name[zu]=Imenenja Yomsebenzi
+@@ -141,7 +140,6 @@
+ Comment[vi]=Cấu hình dịch vụ hệ thống
+ Comment[wa]=Apontiaedje des siervices do sistinme
+ Comment[xh]=Uqwalaselo Lweenkonzo Zendlela zokuseneza
+-Comment[xx]=xxSystem Services Configurationxx
+ Comment[zh_CN]=系统æœåŠ¡é…ç½®
+ Comment[zh_TW]=系統æœå‹™çµ„æ…‹
+ Comment[zu]=Inhlanganisela Yemisebenzi Yesistimu
+@@ -198,7 +196,6 @@
+ Keywords[ven]=KDED,Daemon,Dzitshumelo
+ Keywords[vi]=KDED,Daemon,Dịch vụ
+ Keywords[xh]=KDED,Daemon,Iinkonzo
+-Keywords[xx]=xxKDED,Daemon,Servicesxx
+ Keywords[zh_CN]=KDED,Daemon,Services,守护程åº,æœåŠ¡
+ Keywords[zh_TW]=KDED,Daemon,Services,伺æœç¨‹å¼,æœå‹™
+ Keywords[zu]=KDED,Daemon,Imisebenzi
+diff -Nru kdebase-release-3.4.0/kcontrol/kdm/kdm.desktop kdebase-branch-3.4/kcontrol/kdm/kdm.desktop
+--- kdebase-release-3.4.0/kcontrol/kdm/kdm.desktop 2005-02-10 23:51:54.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kdm/kdm.desktop 2005-03-07 09:15:16.000000000 -0500
+@@ -77,7 +77,6 @@
+ Name[ven]=Mulanguli wa u loga
+ Name[vi]=Trình quản là đăng nháºp
+ Name[xh]=Umphathi Wegama elithile
+-Name[xx]=xxLogin Managerxx
+ Name[zh_CN]=登录管ç†å™¨
+ Name[zh_TW]=登錄管ç†ç¨‹å¼
+ Name[zu]=Imenenja yokungena ngaphakathi
+@@ -143,7 +142,6 @@
+ Comment[ven]=Ni nga dzudzanya mulanguli wau loga (KDM)
+ Comment[vi]=Cấu hình trình đăng nháºp (KDM)
+ Comment[xh]=Qwalasela umphathi wegama elithile (KDM)
+-Comment[xx]=xxConfigure the login manager (KDM)xx
+ Comment[zh_CN]=é…置登录管ç†å™¨(KDM)
+ Comment[zh_TW]=è¨å®šç™»å…¥ç®¡ç†ç¨‹å¼ (KDM)
+ Comment[zu]=Hlanganisela imenenja yokungena ngaphakathi (KDM)
+@@ -201,7 +199,6 @@
+ Keywords[ven]=kdm,mulanguli wau vhonisa,xdm,vhashumisi,u loga,dzindumeliso,logo,zwitaela,luambo,shango,fontu,murahu,mabammbiri a luvhondoni,tshitenwa,thutha,thomolosa
+ Keywords[vi]=kdm,quản lý mà n hình,xdm,ngưá»i dùng,đăng nháºp,chà o há»i,Biểu tượng,kiểu,ngôn ngữ,nước,phông,ná»n,ảnh ná»n,session,tắt,khởi động lại
+ Keywords[xh]=kdm,umphathi womboniso,xdm,abasebenzisi,igama elithile,umbuliso,ilogo,iintlobo,ulwimi,ilizwe,ubungakanani bamagama, imvelaphi,amaphepha odonga,iintlanganiso,vala,qala kwakhona
+-Keywords[xx]=xxkdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restartxx
+ Keywords[zh_CN]=kdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart,显示管ç†å™¨,用户,登录,欢迎辞,æ ‡å¿—,é£Žæ ¼,è¯è¨€,国家,å—体,背景,墙纸,会è¯,关机,é‡å¯åЍ
+ Keywords[zh_TW]=kdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart,顯示管ç†ç¨‹å¼,使用者,登入,æ¡è¿Ž,é¢¨æ ¼,語言,國家,å—åž‹,背景,底圖,工作階段,關機,釿–°å•Ÿå‹•
+ Keywords[zu]=kdm,Imenenja yokuveza,xdm,abasebenzisi,ukungena ngaphakathi,isibingelelo,Isiqubulo,izitayela,ulimi,izwe,izinhlobo zamagama, inkundla yangemuva,emaphepha ezindonga,iziqendu,vala,phinda uqale
+diff -Nru kdebase-release-3.4.0/kcontrol/keys/keys.desktop kdebase-branch-3.4/kcontrol/keys/keys.desktop
+--- kdebase-release-3.4.0/kcontrol/keys/keys.desktop 2005-02-10 23:51:55.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/keys/keys.desktop 2005-03-26 02:37:41.000000000 -0500
+@@ -72,7 +72,6 @@
+ Name[ven]=Tshikhau tsha khiibodo
+ Name[vi]=BÃ n phÃm Shortcuts
+ Name[xh]=Indlela ezimfutshane Zebhodi yezitshixo
+-Name[xx]=xxKeyboard Shortcutsxx
+ Name[zh_CN]=键盘快æ·é”®
+ Name[zh_TW]=éµç›¤æ·å¾‘
+ Name[zu]=Izindlela Ezimfushane zebhodi yokhiye
+@@ -99,7 +98,7 @@
+ Comment[fa]=تنظیم اعمال کلیدها
+ Comment[fi]=Näppäinsidosten asetukset
+ Comment[fr]=Configuration des raccourcis clavier
+-Comment[fy]=Ynstellingen foar snelkaaien
++Comment[fy]=Ynstellings foar snelkaaien
+ Comment[gl]=Configuración dos atallos de teclado
+ Comment[he]=×©×™× ×•×™ הגדרות מיפוי המקשי×
+ Comment[hi]=की-बाइंडिंग का कॉनà¥à¤«à¤¼à¤¿à¤—रेशन
+@@ -142,7 +141,6 @@
+ Comment[vi]=Cấu hình các tổ hợp phÃm
+ Comment[wa]=Apontiaedje des rascourtis di tapes
+ Comment[xh]=Uqwalaselo lwezibopheleo zesitshixo
+-Comment[xx]=xxConfiguration of keybindingsxx
+ Comment[zh_CN]=键绑定é…ç½®
+ Comment[zh_TW]=按éµé—œè¯è¨å®š
+ Comment[zu]=Inhlanganiselo yezibopho zokhiye
+@@ -202,7 +200,6 @@
+ Keywords[ven]=Dzikhii,u badekanywa ha khii dzothe,tshikimu tsha khii,u badekanywa ha khii,tshikhau,tshikhau tsha apulifikhesheni
+ Keywords[vi]=PhÃm,tổ hợp phÃm toà n cục,phối hợp phÃm,tổ hợp phÃm shortcuts,application shortcuts
+ Keywords[xh]=Izitshixo,Izibophelelo zesitshixo esiNgqukuva,Udweliso lwesitshixo,Izibophelelo zesitshixo,iindlela ezimfutshane,izicelo zeendlela ezimfutshane
+-Keywords[xx]=xxKeys,Global key bindings,Key scheme,Key bindings,shortcuts,application shortcutsxx
+ Keywords[zh_CN]=Keys,Global key bindings,Key scheme,Key bindings,shortcuts,application shortcuts,é”®,全局键绑定,键盘布局,键绑定,å¿«æ·é”®,程åºå¿«æ·é”®
+ Keywords[zh_TW]=Keys,Global key bindings,Key scheme,Key bindings,shortcuts,application shortcuts,按éµ,全域按建連çµ,éµç›¤é…ç½®,按éµé€£çµ,快速éµ,æ‡‰ç”¨ç¨‹å¼æ·å¾‘
+ Keywords[zu]=Okhiye,Izibopho zokhiye zezizwe,Iplani lokhiye,Izibopho zokhiye,izindlela ezimfushane,izindlela ezimfushane zomyaleli
+diff -Nru kdebase-release-3.4.0/kcontrol/kfontinst/installfont.desktop kdebase-branch-3.4/kcontrol/kfontinst/installfont.desktop
+--- kdebase-release-3.4.0/kcontrol/kfontinst/installfont.desktop 2005-02-18 23:27:01.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kfontinst/installfont.desktop 2005-03-30 01:47:43.000000000 -0500
+@@ -4,6 +4,7 @@
+
+ [Desktop Action installFont]
+ Name=Install
++Name[af]=Installeer
+ Name[be]=УÑталÑваць
+ Name[bg]=ИнÑталиране
+ Name[bn]=ইনসà§à¦Ÿà¦²
+@@ -14,6 +15,7 @@
+ Name[cy]=Gosod
+ Name[da]=Installér
+ Name[de]=Installieren
++Name[el]=Εγκατάσταση
+ Name[eo]=Instalu
+ Name[es]=Instalar
+ Name[et]=Paigaldamine
+@@ -47,13 +49,12 @@
+ Name[sk]=Inštalácia
+ Name[sl]=Namesti
+ Name[sr]=ИнÑталирај
+-Name[sr@Latn]=ИнÑталирај
++Name[sr@Latn]=Instaliraj
+ Name[sv]=Installera
+ Name[ta]=நிறà¯à®µà®¿
+ Name[tr]=Kur
+ Name[uk]=Ð’ÑтановленнÑ
+ Name[uz]=Ўрнатиш
+-Name[xx]=xxInstallxx
+ Name[zh_CN]=安装
+ Icon=fonts
+ Exec=kfmclient copy %U fonts:/
+diff -Nru kdebase-release-3.4.0/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp kdebase-branch-3.4/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
+--- kdebase-release-3.4.0/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp 2005-02-23 05:15:11.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp 2005-03-08 08:20:53.000000000 -0500
+@@ -4,7 +4,7 @@
+ // Author : Craig Drummond
+ // Project : K Font Installer
+ // Creation Date : 26/04/2003
+-// Version : $Revision: 1.43 $ $Date: 2005/02/23 10:15:11 $
++// Version : $Revision: 1.43.2.1 $ $Date: 2005/03/08 13:20:53 $
+ //
+ ////////////////////////////////////////////////////////////////////////////////
+ //
+@@ -133,7 +133,7 @@
+
+ QString previousPath=itsConfig.readEntry(CFG_PATH);
+
+- itsDirOp = new KDirOperator(Misc::root() ? QString("fonts:/") : QString("fonts:/")+i18n(KFI_KIO_FONTS_USER),
++ itsDirOp = new KDirOperator(Misc::root() ? QString("fonts:/") : QString("fonts:/")+KFI_KIO_FONTS_USER,
+ fontsFrame);
+ itsDirOp->setViewConfig(&itsConfig, "ListView Settings");
+ itsDirOp->setMinimumSize(QSize(96, 64));
+diff -Nru kdebase-release-3.4.0/kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop kdebase-branch-3.4/kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop
+--- kdebase-release-3.4.0/kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop 2005-02-18 23:27:02.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop 2005-03-07 09:15:19.000000000 -0500
+@@ -78,7 +78,6 @@
+ Name[vi]=Cà i đặt phông
+ Name[wa]=Astaleu di fontes
+ Name[xh]=Umfaki Wohlobo lwegama
+-Name[xx]=xxFont Installerxx
+ Name[zh_CN]=å—体安装程åº
+ Name[zh_TW]=å—型安è£ç¨‹å¼
+ Name[zu]=Umfakeli Wohlobo lwamagama
+@@ -147,7 +146,6 @@
+ Comment[vi]=Cà i đặt & xem trước phông
+ Comment[wa]=Astalaedje et håynaedje des fontes
+ Comment[xh]=Faka & yenza imboniso yohlobo lwamagama
+-Comment[xx]=xxInstall & preview fontsxx
+ Comment[zh_CN]=安装和预览å—体
+ Comment[zh_TW]=安è£ä¸¦é 覽å—åž‹
+ Comment[zu]=Fakela & buka ngaphambili izinhlobo zamagama
+@@ -190,13 +188,12 @@
+ Keywords[sk]=pÃsmo,pÃsma,inÅ¡talátor,truetype,type1,speedo,bitmap
+ Keywords[sl]=pisava,pisave,namestilnik,truetype,type1,speedo,bitmap
+ Keywords[sr]=font,fonts,installer,truetype,type1,speedo,bitmap,фонт,фонтови,инÑталер,битмапа
+-Keywords[sr@Latn]=font,fonts,installer,truetype,type1,speedo,bitmap,фонт,фонтови,инÑталер,битмапа
++Keywords[sr@Latn]=font,fonts,installer,truetype,type1,speedo,bitmap,font,fontovi,instaler,bitmapa
+ Keywords[sv]=teckensnitt,installation,truetype,type1,speedo,bitmap
+ Keywords[ta]=எழà¯à®¤à¯à®¤à¯à®°à¯,எழà¯à®¤à¯à®¤à¯à®°à¯à®•à¯à®•ளà¯,அமரà¯à®µà®°à¯,மெயà¯à®µà®•ை,வகை1,speedo,பிடà¯à®ªà®Ÿà®®à¯
+ Keywords[tr]=yazıtipi,yazıtipleri,kurucu,truetype,type1,speedo,bitmap
+ Keywords[uk]=шрифт, шрифти,вÑтановленнÑ,векторний,раÑтровий,truetype,type1,speedo
+ Keywords[uz]=шрифт,шрифтлар,ўрнатувчи,битмап,truetype,type1,speedo
+-Keywords[xx]=xxfont,fonts,installer,truetype,type1,speedo,bitmapxx
+ Keywords[zh_CN]=font,fonts,installer,truetype,type1,speedo,bitmap,å—体,安装程åº,ä½å›¾å—体
+
+ Categories=Qt;KDE;X-KDE-settings-system;
+diff -Nru kdebase-release-3.4.0/kcontrol/kfontinst/kfile-plugin/kfile_font.desktop kdebase-branch-3.4/kcontrol/kfontinst/kfile-plugin/kfile_font.desktop
+--- kdebase-release-3.4.0/kcontrol/kfontinst/kfile-plugin/kfile_font.desktop 2005-02-04 23:14:57.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kfontinst/kfile-plugin/kfile_font.desktop 2005-03-07 09:15:19.000000000 -0500
+@@ -8,7 +8,7 @@
+ Name[be]=Ð†Ð½Ñ„Ð°Ñ€Ð¼Ð°Ñ†Ñ‹Ñ Ð°Ð± шрыфце
+ Name[bg]=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° шрифт
+ Name[bn]=ফনà§à¦Ÿ তথà§à¦¯
+-Name[br]=Titouroù war ar font
++Name[br]=Titouroù diwar-benn ar font
+ Name[bs]=Informacije o fontu
+ Name[ca]=Informació de la font
+ Name[cs]=Informace o pÃsmu
+@@ -65,7 +65,6 @@
+ Name[vi]=Thông tin vỠphông
+ Name[wa]=Informåcion sol fonte
+ Name[xh]=Ulwazi Lohlobo lwamagama
+-Name[xx]=xxFont Informationxx
+ Name[zh_CN]=å—体信æ¯
+ Name[zh_TW]=å—型資訊
+ Name[zu]=Ulwazi lohlobo lwamagama
+diff -Nru kdebase-release-3.4.0/kcontrol/kfontinst/kfontinst/Fontmap.cpp kdebase-branch-3.4/kcontrol/kfontinst/kfontinst/Fontmap.cpp
+--- kdebase-release-3.4.0/kcontrol/kfontinst/kfontinst/Fontmap.cpp 2004-11-15 21:08:33.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kfontinst/kfontinst/Fontmap.cpp 2005-04-04 07:59:26.000000000 -0400
+@@ -4,7 +4,7 @@
+ // Author : Craig Drummond
+ // Project : K Font Installer
+ // Creation Date : 06/06/2003
+-// Version : $Revision: 1.2 $ $Date: 2004/11/16 02:08:33 $
++// Version : $Revision: 1.2.2.1 $ $Date: 2005/04/04 11:59:26 $
+ //
+ ////////////////////////////////////////////////////////////////////////////////
+ //
+@@ -267,7 +267,7 @@
+ QStringList entries;
+ int i;
+ FcPattern *pat = FcPatternCreate();
+- FcObjectSet *os = FcObjectSetBuild(FC_FILE, FC_SCALABLE, 0);
++ FcObjectSet *os = FcObjectSetBuild(FC_FILE, FC_SCALABLE, (void*)0);
+ FcFontSet *fs = FcFontList(0, pat, os);
+
+ FcPatternDestroy(pat);
+diff -Nru kdebase-release-3.4.0/kcontrol/kfontinst/kfontinst/GetPid.c kdebase-branch-3.4/kcontrol/kfontinst/kfontinst/GetPid.c
+--- kdebase-release-3.4.0/kcontrol/kfontinst/kfontinst/GetPid.c 2005-02-19 18:35:22.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kfontinst/kfontinst/GetPid.c 2005-02-23 10:38:51.000000000 -0500
+@@ -5,7 +5,7 @@
+ // Author : Craig Drummond
+ // Project : K Font Installer
+ // Creation Date : 19/03/2003
+-// Version : $Revision: 1.2 $ $Date: 2005/02/19 23:35:22 $
++// Version : $Revision: 1.3 $ $Date: 2005/02/23 15:38:51 $
+ //
+ ////////////////////////////////////////////////////////////////////////////////
+ //
+@@ -243,7 +243,20 @@
+ #include <pwd.h>
+ #include <sys/resource.h>
+ #ifdef OS_Solaris
++
++#if (!defined(_LP64)) && (_FILE_OFFSET_BITS - 0 == 64)
++#define PROCFS_FILE_OFFSET_BITS_HACK 1
++#undef _FILE_OFFSET_BITS
++#else
++#define PROCFS_FILE_OFFSET_BITS_HACK 0
++#endif
++
+ #include <procfs.h>
++
++#if (PROCFS_FILE_OFFSET_BITS_HACK - 0 == 1)
++#define _FILE_OFFSET_BITS 64
++#endif
++
+ #else
+ #include <sys/procfs.h>
+ #include <sys/sysmp.h>
+diff -Nru kdebase-release-3.4.0/kcontrol/kfontinst/kio/KioFonts.cpp kdebase-branch-3.4/kcontrol/kfontinst/kio/KioFonts.cpp
+--- kdebase-release-3.4.0/kcontrol/kfontinst/kio/KioFonts.cpp 2005-02-19 17:57:46.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kfontinst/kio/KioFonts.cpp 2005-04-04 07:59:26.000000000 -0400
+@@ -4,7 +4,7 @@
+ // Author : Craig Drummond
+ // Project : K Font Installer
+ // Creation Date : 05/03/2003
+-// Version : $Revision: 1.51 $ $Date: 2005/02/19 22:57:46 $
++// Version : $Revision: 1.51.2.3 $ $Date: 2005/04/04 11:59:26 $
+ //
+ ////////////////////////////////////////////////////////////////////////////////
+ //
+@@ -49,7 +49,7 @@
+ #include <kio/netaccess.h>
+ #include <kio/slaveinterface.h>
+ #include <kio/connection.h>
+-#include <qdatastream.h>
++#include <qtextstream.h>
+ #include <kmimetype.h>
+ #include <kmessagebox.h>
+ #include <kprocess.h>
+@@ -744,14 +744,14 @@
+ if(itsRoot)
+ err=!createStatEntry(entry, url, FOLDER_SYS);
+ else
+- if(i18n(KFI_KIO_FONTS_USER)==pathList[0])
++ if(i18n(KFI_KIO_FONTS_USER)==pathList[0] || KFI_KIO_FONTS_USER==pathList[0])
+ err=!createUDSEntry(entry, i18n(KFI_KIO_FONTS_USER), itsFolders[FOLDER_USER].location, false);
+- else if(i18n(KFI_KIO_FONTS_SYS)==pathList[0])
++ else if(i18n(KFI_KIO_FONTS_SYS)==pathList[0] || KFI_KIO_FONTS_SYS==pathList[0])
+ err=!createUDSEntry(entry, i18n(KFI_KIO_FONTS_SYS), itsFolders[FOLDER_USER].location, true);
+ else
+ {
+ error(KIO::ERR_SLAVE_DEFINED,
+- i18n("Please specify \"%1\" or \"%2\".").arg(KFI_KIO_FONTS_USER).arg(KFI_KIO_FONTS_SYS));
++ i18n("Please specify \"%1\" or \"%2\".").arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS)));
+ return;
+ }
+ break;
+@@ -810,8 +810,8 @@
+ // read this and just ask Xft/fontconfig for the font data.
+ if(hasMetaData("thumbnail") && "1"==metaData("thumbnail"))
+ {
+- QByteArray array;
+- QDataStream stream(array, IO_WriteOnly);
++ QByteArray array;
++ QTextOStream stream(array);
+
+ emit mimeType("text/pain");
+
+@@ -917,7 +917,7 @@
+
+ if(passwd.isEmpty())
+ {
+- error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(KFI_KIO_FONTS_SYS));
++ error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
+ return;
+ }
+ }
+@@ -969,7 +969,7 @@
+ }
+ else
+ {
+- error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(KFI_KIO_FONTS_SYS));
++ error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
+ return;
+ }
+ }
+@@ -984,7 +984,7 @@
+ }
+ else
+ {
+- error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(KFI_KIO_FONTS_USER));
++ error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_USER)));
+ return;
+ }
+ }
+@@ -1188,7 +1188,7 @@
+ }
+ else
+ {
+- error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(KFI_KIO_FONTS_SYS));
++ error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
+ return;
+ }
+ }
+@@ -1375,7 +1375,7 @@
+ }
+ else
+ {
+- error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(KFI_KIO_FONTS_SYS));
++ error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
+ return;
+ }
+ }
+@@ -1433,7 +1433,7 @@
+ if(doRootCmd(cmd))
+ modified(FOLDER_SYS);
+ else
+- error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(KFI_KIO_FONTS_SYS));
++ error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
+ }
+ else
+ {
+@@ -1617,7 +1617,8 @@
+ {
+ QString sect(getSect(url.path()));
+
+- if(i18n(KFI_KIO_FONTS_USER)!=sect && i18n(KFI_KIO_FONTS_SYS)!=sect)
++ if(i18n(KFI_KIO_FONTS_USER)!=sect && i18n(KFI_KIO_FONTS_SYS)!=sect &&
++ KFI_KIO_FONTS_USER!=sect && KFI_KIO_FONTS_SYS!=sect)
+ {
+ bool changeToSystem=false;
+
+@@ -1629,7 +1630,7 @@
+ "case the font will only be usable by you), or \"%2\" ("
+ "the font will be usable by all users - but you will "
+ "need to know the administrator's password)?")
+- .arg(KFI_KIO_FONTS_USER).arg(KFI_KIO_FONTS_SYS),
++ .arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS)),
+ i18n("Where to Install"), i18n(KFI_KIO_FONTS_USER),
+ i18n(KFI_KIO_FONTS_SYS));
+
+@@ -1678,7 +1679,7 @@
+ #ifdef KFI_FC_HAS_WIDTHS
+ FC_WIDTH,
+ #endif
+- FC_SLANT, 0);
++ FC_SLANT, (void*)0);
+
+ itsFontList=FcFontList(0, pat, os);
+
+@@ -1987,6 +1988,11 @@
+
+ if(itsRoot)
+ {
++ if (KFI_KIO_FONTS_USER==sect)
++ sect = i18n(KFI_KIO_FONTS_USER);
++ if (KFI_KIO_FONTS_SYS==sect)
++ sect = i18n(KFI_KIO_FONTS_SYS);
++
+ if((i18n(KFI_KIO_FONTS_USER)==sect || i18n(KFI_KIO_FONTS_SYS)==sect) &&
+ (itsFolders[FOLDER_SYS].fontMap.end()==itsFolders[FOLDER_SYS].fontMap.find(sect)))
+ //CPD: TODO: || it has a font specified! e.g. fonts:/System/Times -> even in have a fonts:/System font, redirect
+@@ -1998,7 +2004,8 @@
+ }
+ }
+ else
+- if(i18n(KFI_KIO_FONTS_USER)!=sect && i18n(KFI_KIO_FONTS_SYS)!=sect)
++ if(i18n(KFI_KIO_FONTS_USER)!=sect && i18n(KFI_KIO_FONTS_SYS)!=sect &&
++ KFI_KIO_FONTS_USER!=sect && KFI_KIO_FONTS_SYS!=sect)
+ {
+ error(KIO::ERR_SLAVE_DEFINED, i18n("Please specify \"%1\" or \"%2\".")
+ .arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS)));
+@@ -2016,7 +2023,9 @@
+ QString ds(Misc::dirSyntax(u.path()));
+
+ if(ds==QString(QChar('/')+i18n(KFI_KIO_FONTS_USER)+QChar('/')) ||
+- ds==QString(QChar('/')+i18n(KFI_KIO_FONTS_SYS)+QChar('/')))
++ ds==QString(QChar('/')+i18n(KFI_KIO_FONTS_SYS)+QChar('/')) ||
++ ds==QString(QChar('/')+QString::fromLatin1(KFI_KIO_FONTS_USER)+QChar('/')) ||
++ ds==QString(QChar('/')+QString::fromLatin1(KFI_KIO_FONTS_SYS)+QChar('/')))
+ {
+ error(KIO::ERR_SLAVE_DEFINED, i18n("Sorry, you cannot rename, move, copy, or delete either \"%1\" or \"%2\".")
+ .arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS))); \
+diff -Nru kdebase-release-3.4.0/kcontrol/kfontinst/kio/folder.desktop kdebase-branch-3.4/kcontrol/kfontinst/kio/folder.desktop
+--- kdebase-release-3.4.0/kcontrol/kfontinst/kio/folder.desktop 2005-02-18 23:27:02.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kfontinst/kio/folder.desktop 2005-03-30 01:47:44.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=Fonts Folder
++Comment[af]=Skrif tipe Gids
+ Comment[be]=ТÑчка шрыфтоў
+ Comment[bg]=Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð° шрифтове
+ Comment[bn]=ফনà§à¦Ÿ ফোলà§à¦¡à¦¾à¦°
+@@ -10,6 +11,7 @@
+ Comment[cs]=Složka pÃsem
+ Comment[da]=Skrifttypemappe
+ Comment[de]=Schriftenordner
++Comment[el]=Φάκελος γÏαμματοσειÏών
+ Comment[eo]=Tipardosierujo
+ Comment[es]=Carpeta de fuentes
+ Comment[et]=Fontide kataloog
+@@ -42,13 +44,12 @@
+ Comment[sk]=PrieÄinok pÃsiem
+ Comment[sl]=Mapa za pisave
+ Comment[sr]=Директоријум за фонтове
+-Comment[sr@Latn]=Директоријум за фонтове
++Comment[sr@Latn]=Direktorijum za fontove
+ Comment[sv]=Teckensnittskatalog
+ Comment[ta]=எழà¯à®¤à¯à®¤à¯à®°à¯à®•à¯à®•ள௠அடைவà¯
+ Comment[tr]=Yazıtipi Klasörü
+ Comment[uk]=Тека шрифтів
+ Comment[uz]=Шрифтларнинг жилди
+-Comment[xx]=xxFonts Folderxx
+ Comment[zh_CN]=å—体文件夹
+ Icon=folder
+ Type=MimeType
+diff -Nru kdebase-release-3.4.0/kcontrol/kfontinst/kio/fonts.desktop kdebase-branch-3.4/kcontrol/kfontinst/kio/fonts.desktop
+--- kdebase-release-3.4.0/kcontrol/kfontinst/kio/fonts.desktop 2005-02-04 23:14:57.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kfontinst/kio/fonts.desktop 2005-03-07 09:15:19.000000000 -0500
+@@ -68,7 +68,6 @@
+ Name[vi]=Phông
+ Name[wa]=Fontes
+ Name[xh]=Uhlobo lwamagama
+-Name[xx]=xxFontsxx
+ Name[zh_CN]=å—体
+ Name[zh_TW]=å—åž‹
+ Name[zu]=Izinhlobo zamagama
+diff -Nru kdebase-release-3.4.0/kcontrol/kfontinst/kio/system-folder.desktop kdebase-branch-3.4/kcontrol/kfontinst/kio/system-folder.desktop
+--- kdebase-release-3.4.0/kcontrol/kfontinst/kio/system-folder.desktop 2005-02-18 23:27:02.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kfontinst/kio/system-folder.desktop 2005-03-30 01:47:44.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=System Fonts Folder
++Comment[af]=Stelsel Skrif tipe Gids
+ Comment[be]=ТÑчка ÑÑ‹ÑÑ‚Ñмных шрыфтоў
+ Comment[bg]=Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð° ÑиÑтемните шрифтове
+ Comment[bn]=সিসà§à¦Ÿà§‡à¦® ফনà§à¦Ÿ ফোলà§à¦¡à¦¾à¦°
+@@ -10,6 +11,7 @@
+ Comment[cs]=Složka se systémovými pÃsmy
+ Comment[da]=Mappe til systemets skrifttyper
+ Comment[de]=Ordner für Systemschriften
++Comment[el]=Φάκελος γÏαμματοσειÏών συστήματος
+ Comment[eo]=Sistema tipardosierujo
+ Comment[es]=Carpeta de fuentes del sistema
+ Comment[et]=Süsteemi fontide kataloog
+@@ -41,13 +43,12 @@
+ Comment[sk]=PrieÄinok systémových pÃsiem
+ Comment[sl]=Mapa za sistemske pisave
+ Comment[sr]=СиÑтемÑки директоријум за фонтове
+-Comment[sr@Latn]=СиÑтемÑки директоријум за фонтове
++Comment[sr@Latn]=Sistemski direktorijum za fontove
+ Comment[sv]=Systemteckensnittskatalog
+ Comment[ta]=அமைபà¯à®ªà¯ எழà¯à®¤à¯à®¤à¯à®°à¯à®•à¯à®•ள௠அடைவà¯
+ Comment[tr]=Sistem Yazı Tipi Klasörü
+ Comment[uk]=Тека ÑиÑтемних шрифтів
+ Comment[uz]=Тизим шрифтларининг жилди
+-Comment[xx]=xxSystem Fonts Folderxx
+ Comment[zh_CN]=系统å—体文件夹
+ Icon=folder_red
+ Type=MimeType
+diff -Nru kdebase-release-3.4.0/kcontrol/kfontinst/lib/FcEngine.cpp kdebase-branch-3.4/kcontrol/kfontinst/lib/FcEngine.cpp
+--- kdebase-release-3.4.0/kcontrol/kfontinst/lib/FcEngine.cpp 2004-12-30 16:56:51.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kfontinst/lib/FcEngine.cpp 2005-04-04 07:59:25.000000000 -0400
+@@ -3,6 +3,7 @@
+ #include <qfontmetrics.h>
+ #include <qfont.h>
+ #include <qfile.h>
++#include <qtextstream.h>
+ #include <kurl.h>
+ #include <kconfig.h>
+ #include <kglobalsettings.h>
+@@ -866,7 +867,7 @@
+ // itsFoundry=getFcString(xft->pattern, FC_FOUNDRY, faceNo);
+ // XftFontClose(QPaintDevice::x11AppDisplay(), xft);
+ // }
+- FcObjectSet *os = FcObjectSetBuild(FC_SPACING, FC_FOUNDRY, 0);
++ FcObjectSet *os = FcObjectSetBuild(FC_SPACING, FC_FOUNDRY, (void*)0);
+ FcPattern *pat = FcPatternBuild(NULL,
+ FC_FAMILY, FcTypeString, (const FcChar8 *)(itsName.latin1()),
+ FC_WEIGHT, FcTypeInteger, itsWeight,
+@@ -899,9 +900,9 @@
+ if(file.size()<2048 && file.open(IO_ReadOnly)) // Urls should be less than 2k, and fonts usually above!
+ {
+ QString thumbUrl;
+- QDataStream stream(&file);
++ QTextStream stream(&file);
+
+- stream >> thumbUrl;
++ thumbUrl=stream.readLine();
+ isThumbnailUrl=0==thumbUrl.find(KFI_KIO_FONTS_PROTOCOL) && parseUrl(KURL(thumbUrl), faceNo, all);
+ file.close();
+ }
+diff -Nru kdebase-release-3.4.0/kcontrol/kfontinst/thumbnail/fontthumbnail.desktop kdebase-branch-3.4/kcontrol/kfontinst/thumbnail/fontthumbnail.desktop
+--- kdebase-release-3.4.0/kcontrol/kfontinst/thumbnail/fontthumbnail.desktop 2005-02-04 23:14:57.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kfontinst/thumbnail/fontthumbnail.desktop 2005-03-07 09:15:19.000000000 -0500
+@@ -65,7 +65,6 @@
+ Name[vi]=Tệp phông
+ Name[wa]=Fitchîs fontes
+ Name[xh]=Iifayile Zohlobo lwamagama
+-Name[xx]=xxFont Filesxx
+ Name[zh_CN]=å—体文件
+ Name[zh_TW]=å—型檔案
+ Name[zu]=Amafayela ohlobo lwamagama
+diff -Nru kdebase-release-3.4.0/kcontrol/kfontinst/viewpart/kfontview.desktop kdebase-branch-3.4/kcontrol/kfontinst/viewpart/kfontview.desktop
+--- kdebase-release-3.4.0/kcontrol/kfontinst/viewpart/kfontview.desktop 2005-02-18 23:27:02.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kfontinst/viewpart/kfontview.desktop 2005-03-30 01:47:44.000000000 -0500
+@@ -13,7 +13,6 @@
+ Name[se]=FontaÄájeheaddji
+ Name[sk]=PrehliadaÄ pÃsiem
+ Name[sv]=Kfontview
+-Name[xx]=xxKFontViewxx
+ Name[zh_CN]=å—体预览
+ Exec=kfontview %u
+ Icon=fonts
+@@ -30,6 +29,7 @@
+ GenericName[cy]=Gwelydd Wynebfathau
+ GenericName[da]=Skrifttype-fremviser
+ GenericName[de]=Schriftarten-Betrachter
++GenericName[el]=Î ÏοβολÎας γÏαμματοσειÏών
+ GenericName[eo]=Tipara rigardilo
+ GenericName[es]=Visor de fuentes
+ GenericName[et]=Fontide vaataja
+@@ -61,12 +61,11 @@
+ GenericName[sk]=PrehliadaÄ pÃsiem
+ GenericName[sl]=Pregledovalnik pisav
+ GenericName[sr]=Приказивач фонтова
+-GenericName[sr@Latn]=Приказивач фонтова
++GenericName[sr@Latn]=PrikazivaÄ fontova
+ GenericName[sv]=Teckensnittsvisning
+ GenericName[tr]=Yazıtipi Görüntüleyici
+ GenericName[uk]=ПереглÑдач шрифтів
+ GenericName[uz]=Шрифт кўрувчи
+-GenericName[xx]=xxFont Viewerxx
+ GenericName[zh_CN]=å—体查看器
+ Terminal=false
+ InitialPreference=1
+diff -Nru kdebase-release-3.4.0/kcontrol/kfontinst/viewpart/kfontviewpart.desktop kdebase-branch-3.4/kcontrol/kfontinst/viewpart/kfontviewpart.desktop
+--- kdebase-release-3.4.0/kcontrol/kfontinst/viewpart/kfontviewpart.desktop 2005-02-04 23:14:58.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kfontinst/viewpart/kfontviewpart.desktop 2005-03-07 09:15:20.000000000 -0500
+@@ -63,7 +63,6 @@
+ Name[vi]=Trình xem phông
+ Name[wa]=HÃ¥yneu di fontes
+ Name[xh]=Imboniselo Yohlobo lwegama
+-Name[xx]=xxFont Viewerxx
+ Name[zh_CN]=å—体查看器
+ Name[zh_TW]=å—型檢視器
+ Name[zu]=Umbukisi Wohlobo lwamagama
+diff -Nru kdebase-release-3.4.0/kcontrol/kicker/kicker_config.desktop kdebase-branch-3.4/kcontrol/kicker/kicker_config.desktop
+--- kdebase-release-3.4.0/kcontrol/kicker/kicker_config.desktop 2005-02-23 00:05:36.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kicker/kicker_config.desktop 2005-03-07 09:15:20.000000000 -0500
+@@ -65,7 +65,6 @@
+ Name[uz]=Жойлашиши
+ Name[ven]=Tshivhumbeo
+ Name[xh]=Ubeko
+-Name[xx]=xxLayoutxx
+ Name[zh_CN]=布局
+ Name[zh_TW]=é…ç½®
+ Name[zu]=Isendlalelo
+@@ -130,7 +129,6 @@
+ Comment[ven]=Ninga dzudzanya mavhekanyele a phanele hafhano
+ Comment[vi]=Bạn có thể cấu hình sự sắp xếp các bảng ở đây
+ Comment[xh]=Uyakwazi ukuqwalasela apha i window yenkcukacha
+-Comment[xx]=xxYou can configure the arrangement of the panel herexx
+ Comment[zh_CN]=您å¯ä»¥åœ¨è¿™é‡Œé…ç½®é¢æ¿çš„æŽ’列
+ Comment[zh_TW]=您å¯ä»¥åœ¨æ¤è¨å®šé¢æ¿çš„外觀
+ Comment[zu]=Ungahlanganisela ukuhlelwa kwewindi lemininingwane lapha
+@@ -173,11 +171,10 @@
+ Keywords[sk]=kicker,panel,kpanel,taskbar,startbar,launchbar,miesto,umiestnenie,veľkosÅ¥,terminálová aplikácia,skrývanie,automatické skrývanie,tlaÄidlá,animácia,pozadie,témy,cache,cache ponuky,skryté,K-Menu,záložky,posledné dokumenty,rýchly prehliadaÄ,ponuka prehliadaÄa,menu,ikony,applety,Å¡tart,zvýraznenie,handles,zväÄÅ¡ovanie ikon,overené applety,úroveň zabezpeÄenia
+ Keywords[sl]=kicker,pult,kpanel,opravilna vrstica,zagonska vrstica,mesto,lokacija,velikost,terminalski program,skrij,samodejno skrivanje,skrivanje,gumbi,animacija,ozadje,teme,menijski predpomnilnik,predpomnilnik,skrit,K-Menu,zaznamki,nedavni dokumenti,hitro brskanje,brskalni meni,meni,tlakovci,ikone,vstavki,zagon,osvetlitev,roÄice,ikone za poveÄavo
+ Keywords[sr]=kicker,панел,kpanel,трака задатака,startbar,launchbar,локација,величина,ТерминалÑки програм,аутоматÑко Ñакривање,Ñакривање,дугмићи,анимација,позадина,теме,мени кеш,кеш,Ñкривен,K-Menu,маркери,Ñкори документи,брзи прегледач,мени прегледача,мени,иконе,блокови,апплети,startup,иÑтицање,хватаљке,увеличавање икона,аплети којима Ñе верује,ниво ÑигурноÑти
+-Keywords[sr@Latn]=kicker,панел,kpanel,трака задатака,startbar,launchbar,локација,величина,ТерминалÑки програм,аутоматÑко Ñакривање,Ñакривање,дугмићи,анимација,позадина,теме,мени кеш,кеш,Ñкривен,K-Menu,маркери,Ñкори документи,брзи прегледач,мени прегледача,мени,иконе,блокови,апплети,startup,иÑтицање,хватаљке,увеличавање икона,аплети којима Ñе верује,ниво ÑигурноÑти
++Keywords[sr@Latn]=kicker,panel,kpanel,traka zadataka,startbar,launchbar,lokacija,veliÄina,Terminalski program,automatsko sakrivanje,sakrivanje,dugmići,animacija,pozadina,teme,meni keÅ¡,keÅ¡,skriven,K-Menu,markeri,skori dokumenti,brzi pregledaÄ,meni pregledaÄa,meni,ikone,blokovi,appleti,startup,isticanje,hvataljke,uveliÄavanje ikona,apleti kojima se veruje,nivo sigurnosti
+ Keywords[sv]=kicker,panel,k-panel,aktivitetsfält,startfält,körningsfält,plats,storlek,dölj automatiskt,dölj,göm,knappar,animering,bakgrund,teman,menycache,cache,gömd,dold,K-meny,bokmärken,senaste dokument,snabbläddrare,bläddringsmeny,meny,ikoner,miniprogram,start,framhäv,grepp,zoomikoner
+ Keywords[ta]=கிகà¯à®•à®°à¯, பானலà¯, கேபானலà¯,தà¯à®µà®•à¯à®•பà¯à®ªà®Ÿà¯à®Ÿà®¿, தà¯à®µà®™à¯à®•à¯à®®à¯à®ªà®Ÿà¯à®Ÿà®¿,இடமà¯,அளவà¯, சதà¯à®¤à®®à¯ மறை, மறை,படà¯à®Ÿà®©à¯, உயிரà¯à®šà®¿à®¤à¯à®¤à®¿à®°à®®à¯,பினà¯à®©à®©à®¿,கரà¯à®ªà¯à®ªà¯Šà®°à¯à®³à¯, தறà¯à®•ாலிக மெனà¯, மறைநà¯à®¤,கே-மெனà¯,பà¯à®¤à¯à®¤à®•கà¯à®±à®¿à®•ளà¯, தறà¯à®ªà¯‹à®¤à¯ˆà®¯ ஆவணமà¯. வேக உலாவி, உலாவி மெனà¯, மெனà¯, சினà¯à®©à®®à¯, சிறà¯à®¨à®¿à®°à®²à¯, தà¯à®µà®•à¯à®•à®®à¯, கையாளà¯, பெரிதாகà¯à®•à¯à®®à¯ சினà¯à®©à®™à¯à®•ளà¯
+ Keywords[tr]=kicker,panel,kpanel,görev çubuğu,başlangıç çubuğu,başlat çubuğu,konum,boyut,Uç birim uygulaması,otomatik gizle,gizle,tuşlar,animasyon,artalan,temalar,menü ön belleği,ön bellek,gizli,K-Menu,yer imleri,en son kullanılan belgeler,hızlı gözatıcı,göz atıcı menüsü,menü,simgeler,karo,programcıklar,Başlangıç,belirt,tutamaçlar,büyüyen simgeler,güvenilen programcıklar,güvenlik düzeyi
+ Keywords[uk]=kicker,панель,Ñмужка задач,kpanel,Ñмужка запуÑку,розташуваннÑ,розмір,конÑольна програма,автоматичне згортаннÑ,згортаннÑ,кнопки,анімаціÑ,тло,теми,кеш меню,кеш,Ñхований,К-Меню,закладки,недавні документи,швидка навігаціÑ,меню навігатора,меню,піктограми,заголовки,аплети,запуÑк,підÑвічуваннÑ,маніпулÑтор,маÑÑˆÑ‚Ð°Ð±ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–ÐºÑ‚Ð¾Ð³Ñ€Ð°Ð¼
+ Keywords[uz]=панел,вазифалар панели,бекитиш,авто-бекитиш,тугмалар,анимациÑ,орқа фон,мавзулар,К-меню,кÑш,Ñширилган,хатчўплар,Ñқинда очилган ҳужжатлар,тез кўрувчи,браузер менюÑи,менюнинг кÑши,меню,нишончалар,апплетлар,нишончаларни катталаштириш,ўлчам,kicker,kpanel,startbar,launchbar,жойлашиши,tiles,startup,highlight,handles
+-Keywords[xx]=xxkicker,panel,kpanel,taskbar,startbar,launchbar,location,size,auto hide,hide,buttons,animation,background,themes,menu cache,cache,hidden,K-Menu,bookmarks,recent documents,quickbrowser,browser menu,menu,icons,tiles,applets,startup,highlight,handles,zooming iconsxx
+ Keywords[zh_CN]=kicker,panel,kpanel,taskbar,startbar,launchbar,location,size,auto hide,hide,buttons,animation,background,themes,menu cache,cache,hidden,K-Menu,bookmarks,recent documents,quickbrowser,browser menu,menu,icons,tiles,applets,startup,highlight,handles,zooming icons颿¿,任务æ ,å¯åЍæ ,ä½ç½®,大å°,自动éšè—,éšè—,按钮,动画,背景,主题,èœå•缓å˜,缓å˜,书ç¾,最近文档,快速æµè§ˆå™¨,æµè§ˆå™¨èœå•,èœå•,å›¾æ ‡,平铺,å¯åЍ,çªå‡º,奿Ÿ„,ç¼©æ”¾å›¾æ ‡
+diff -Nru kdebase-release-3.4.0/kcontrol/kicker/kicker_config_appearance.desktop kdebase-branch-3.4/kcontrol/kicker/kicker_config_appearance.desktop
+--- kdebase-release-3.4.0/kcontrol/kicker/kicker_config_appearance.desktop 2005-02-23 00:05:36.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kicker/kicker_config_appearance.desktop 2005-03-07 09:15:20.000000000 -0500
+@@ -74,7 +74,6 @@
+ Name[vi]=Diện mạo
+ Name[wa]=Rivnance
+ Name[xh]=Inkangeleko
+-Name[xx]=xxAppearancexx
+ Name[zh_CN]=外观
+ Name[zh_TW]=外觀
+ Name[zu]=Ukubukeka
+@@ -145,7 +144,6 @@
+ Comment[vi]=Bạn có thể cấu hình diện mạo các bảng ở đây
+ Comment[wa]=Vos ploz apontyî chal li rivnance do scriftôr
+ Comment[xh]=Ungaqwalasela inkangeleko yeqela labantu benjongo ethile apha
+-Comment[xx]=xxYou can configure the appearance of the panel herexx
+ Comment[zh_CN]=é…ç½®é¢æ¿çš„外观
+ Comment[zh_TW]=在æ¤è¨å®šé¢æ¿çš„外觀
+ Comment[zu]=Ungahlanganisela ukubukeka kwewindi lemininingwane lapha
+@@ -187,11 +185,10 @@
+ Keywords[sk]=kicker,panel,kpanel,taskbar,startbar,launchbar,miesto,umiestnenie,veľkosÅ¥,terminálová aplikácia,skrývanie,automatické skrývanie,tlaÄidlá,animácia,pozadie,témy,cache,cache ponuky,skryté,K-Menu,záložky,posledné dokumenty,rýchly prehliadaÄ,ponuka prehliadaÄa,menu,ikony,applety,Å¡tart,zvýraznenie,handles,zväÄÅ¡ovanie ikon,overené applety,úroveň zabezpeÄenia
+ Keywords[sl]=kicker,pult,kpanel,opravilna vrstica,zagonska vrstica,mesto,lokacija,velikost,terminalski program,skrij,samodejno skrivanje,skrivanje,gumbi,animacija,ozadje,teme,menijski predpomnilnik,predpomnilnik,skrit,K-Menu,zaznamki,nedavni dokumenti,hitro brskanje,brskalni meni,meni,tlakovci,ikone,vstavki,zagon,osvetlitev,roÄice,ikone za poveÄavo
+ Keywords[sr]=kicker,панел,kpanel,трака задатака,startbar,launchbar,локација,величина,ТерминалÑки програм,аутоматÑко Ñакривање,Ñакривање,дугмићи,анимација,позадина,теме,мени кеш,кеш,Ñкривен,K-Menu,маркери,Ñкори документи,брзи прегледач,мени прегледача,мени,иконе,блокови,апплети,startup,иÑтицање,хватаљке,увеличавање икона,аплети којима Ñе верује,ниво ÑигурноÑти
+-Keywords[sr@Latn]=kicker,панел,kpanel,трака задатака,startbar,launchbar,локација,величина,ТерминалÑки програм,аутоматÑко Ñакривање,Ñакривање,дугмићи,анимација,позадина,теме,мени кеш,кеш,Ñкривен,K-Menu,маркери,Ñкори документи,брзи прегледач,мени прегледача,мени,иконе,блокови,апплети,startup,иÑтицање,хватаљке,увеличавање икона,аплети којима Ñе верује,ниво ÑигурноÑти
++Keywords[sr@Latn]=kicker,panel,kpanel,traka zadataka,startbar,launchbar,lokacija,veliÄina,Terminalski program,automatsko sakrivanje,sakrivanje,dugmići,animacija,pozadina,teme,meni keÅ¡,keÅ¡,skriven,K-Menu,markeri,skori dokumenti,brzi pregledaÄ,meni pregledaÄa,meni,ikone,blokovi,appleti,startup,isticanje,hvataljke,uveliÄavanje ikona,apleti kojima se veruje,nivo sigurnosti
+ Keywords[sv]=kicker,panel,k-panel,aktivitetsfält,startfält,körningsfält,plats,storlek,dölj automatiskt,dölj,göm,knappar,animering,bakgrund,teman,menycache,cache,gömd,dold,K-meny,bokmärken,senaste dokument,snabbläddrare,bläddringsmeny,meny,ikoner,miniprogram,start,framhäv,grepp,zoomikoner
+ Keywords[ta]=கிகà¯à®•à®°à¯, பானலà¯, கேபானலà¯,தà¯à®µà®•à¯à®•பà¯à®ªà®Ÿà¯à®Ÿà®¿, தà¯à®µà®™à¯à®•à¯à®®à¯à®ªà®Ÿà¯à®Ÿà®¿,இடமà¯,அளவà¯, சதà¯à®¤à®®à¯ மறை, மறை,படà¯à®Ÿà®©à¯, உயிரà¯à®šà®¿à®¤à¯à®¤à®¿à®°à®®à¯,பினà¯à®©à®©à®¿,கரà¯à®ªà¯à®ªà¯Šà®°à¯à®³à¯, தறà¯à®•ாலிக மெனà¯, மறைநà¯à®¤,கே-மெனà¯,பà¯à®¤à¯à®¤à®•கà¯à®±à®¿à®•ளà¯, தறà¯à®ªà¯‹à®¤à¯ˆà®¯ ஆவணமà¯. வேக உலாவி, உலாவி மெனà¯, மெனà¯, சினà¯à®©à®®à¯, சிறà¯à®¨à®¿à®°à®²à¯, தà¯à®µà®•à¯à®•à®®à¯, கையாளà¯, பெரிதாகà¯à®•à¯à®®à¯ சினà¯à®©à®™à¯à®•ளà¯
+ Keywords[tr]=kicker,panel,kpanel,görev çubuğu,başlangıç çubuğu,başlat çubuğu,konum,boyut,Uç birim uygulaması,otomatik gizle,gizle,tuşlar,animasyon,artalan,temalar,menü ön belleği,ön bellek,gizli,K-Menu,yer imleri,en son kullanılan belgeler,hızlı gözatıcı,göz atıcı menüsü,menü,simgeler,karo,programcıklar,Başlangıç,belirt,tutamaçlar,büyüyen simgeler,güvenilen programcıklar,güvenlik düzeyi
+ Keywords[uk]=kicker,панель,Ñмужка задач,kpanel,Ñмужка запуÑку,розташуваннÑ,розмір,конÑольна програма,автоматичне згортаннÑ,згортаннÑ,кнопки,анімаціÑ,тло,теми,кеш меню,кеш,Ñхований,К-Меню,закладки,недавні документи,швидка навігаціÑ,меню навігатора,меню,піктограми,заголовки,аплети,запуÑк,підÑвічуваннÑ,маніпулÑтор,маÑÑˆÑ‚Ð°Ð±ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–ÐºÑ‚Ð¾Ð³Ñ€Ð°Ð¼
+ Keywords[uz]=панел,вазифалар панели,бекитиш,авто-бекитиш,тугмалар,анимациÑ,орқа фон,мавзулар,К-меню,кÑш,Ñширилган,хатчўплар,Ñқинда очилган ҳужжатлар,тез кўрувчи,браузер менюÑи,менюнинг кÑши,меню,нишончалар,апплетлар,нишончаларни катталаштириш,ўлчам,kicker,kpanel,startbar,launchbar,жойлашиши,tiles,startup,highlight,handles
+-Keywords[xx]=xxkicker,panel,kpanel,taskbar,startbar,launchbar,location,size,auto hide,hide,buttons,animation,background,themes,menu cache,cache,hidden,K-Menu,bookmarks,recent documents,quickbrowser,browser menu,menu,icons,tiles,applets,startup,highlight,handles,zooming iconsxx
+ Keywords[zh_CN]=kicker,panel,kpanel,taskbar,startbar,launchbar,location,size,auto hide,hide,buttons,animation,background,themes,menu cache,cache,hidden,K-Menu,bookmarks,recent documents,quickbrowser,browser menu,menu,icons,tiles,applets,startup,highlight,handles,zooming icons颿¿,任务æ ,å¯åЍæ ,ä½ç½®,大å°,自动éšè—,éšè—,按钮,动画,背景,主题,èœå•缓å˜,缓å˜,书ç¾,最近文档,快速æµè§ˆå™¨,æµè§ˆå™¨èœå•,èœå•,å›¾æ ‡,平铺,å¯åЍ,çªå‡º,奿Ÿ„,ç¼©æ”¾å›¾æ ‡
+diff -Nru kdebase-release-3.4.0/kcontrol/kicker/panel.desktop kdebase-branch-3.4/kcontrol/kicker/panel.desktop
+--- kdebase-release-3.4.0/kcontrol/kicker/panel.desktop 2005-02-23 00:05:36.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kicker/panel.desktop 2005-03-07 09:15:20.000000000 -0500
+@@ -72,7 +72,6 @@
+ Name[vi]=Bảng
+ Name[wa]=Scriftôrs
+ Name[xh]=Amaqela eenjongo ezithile
+-Name[xx]=xxPanelsxx
+ Name[zh_CN]=颿¿
+ Name[zh_TW]=颿¿
+ Name[zu]=amawindi emininingwane
+@@ -132,7 +131,6 @@
+ Comment[uk]=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð°Ð½ÐµÐ»Ñ–
+ Comment[uz]=Панелнинг тартибини моÑлаш
+ Comment[vi]=Cấu hình sự sắp xếp các bảng
+-Comment[xx]=xxConfigure the arrangement of the panelxx
+ Comment[zh_CN]=é…ç½®é¢æ¿çš„æŽ’列
+ Comment[zh_TW]=您å¯ä»¥åœ¨æ¤è¨å®šé¢æ¿çš„æŽ’列方å¼
+
+@@ -174,13 +172,12 @@
+ Keywords[sk]=kicker,panel,kpanel,taskbar,startbar,launchbar,miesto,umiestnenie,veľkosÅ¥,terminálová aplikácia,skrývanie,automatické skrývanie,tlaÄidlá,animácia,pozadie,témy,cache,cache ponuky,skryté,K-Menu,záložky,posledné dokumenty,rýchly prehliadaÄ,ponuka prehliadaÄa,menu,ikony,applety,Å¡tart,zvýraznenie,handles,zväÄÅ¡ovanie ikon,overené applety,úroveň zabezpeÄenia
+ Keywords[sl]=kicker,pult,kpanel,opravilna vrstica,zagonska vrstica,mesto,lokacija,velikost,terminalski program,skrij,samodejno skrivanje,skrivanje,gumbi,animacija,ozadje,teme,menijski predpomnilnik,predpomnilnik,skrit,K-Menu,zaznamki,nedavni dokumenti,hitro brskanje,brskalni meni,meni,tlakovci,ikone,vstavki,zagon,osvetlitev,roÄice,ikone za poveÄavo
+ Keywords[sr]=kicker,панел,kpanel,трака задатака,startbar,launchbar,локација,величина,ТерминалÑки програм,аутоматÑко Ñакривање,Ñакривање,дугмићи,анимација,позадина,теме,мени кеш,кеш,Ñкривен,K-Menu,маркери,Ñкори документи,брзи прегледач,мени прегледача,мени,иконе,блокови,апплети,startup,иÑтицање,хватаљке,увеличавање икона,аплети којима Ñе верује,ниво ÑигурноÑти
+-Keywords[sr@Latn]=kicker,панел,kpanel,трака задатака,startbar,launchbar,локација,величина,ТерминалÑки програм,аутоматÑко Ñакривање,Ñакривање,дугмићи,анимација,позадина,теме,мени кеш,кеш,Ñкривен,K-Menu,маркери,Ñкори документи,брзи прегледач,мени прегледача,мени,иконе,блокови,апплети,startup,иÑтицање,хватаљке,увеличавање икона,аплети којима Ñе верује,ниво ÑигурноÑти
++Keywords[sr@Latn]=kicker,panel,kpanel,traka zadataka,startbar,launchbar,lokacija,veliÄina,Terminalski program,automatsko sakrivanje,sakrivanje,dugmići,animacija,pozadina,teme,meni keÅ¡,keÅ¡,skriven,K-Menu,markeri,skori dokumenti,brzi pregledaÄ,meni pregledaÄa,meni,ikone,blokovi,appleti,startup,isticanje,hvataljke,uveliÄavanje ikona,apleti kojima se veruje,nivo sigurnosti
+ Keywords[sv]=kicker,panel,k-panel,aktivitetsfält,startfält,körningsfält,plats,storlek,dölj automatiskt,dölj,göm,knappar,animering,bakgrund,teman,menycache,cache,gömd,dold,K-meny,bokmärken,senaste dokument,snabbläddrare,bläddringsmeny,meny,ikoner,miniprogram,start,framhäv,grepp,zoomikoner
+ Keywords[ta]=கிகà¯à®•à®°à¯, பானலà¯, கேபானலà¯,தà¯à®µà®•à¯à®•பà¯à®ªà®Ÿà¯à®Ÿà®¿, தà¯à®µà®™à¯à®•à¯à®®à¯à®ªà®Ÿà¯à®Ÿà®¿,இடமà¯,அளவà¯, சதà¯à®¤à®®à¯ மறை, மறை,படà¯à®Ÿà®©à¯, உயிரà¯à®šà®¿à®¤à¯à®¤à®¿à®°à®®à¯,பினà¯à®©à®©à®¿,கரà¯à®ªà¯à®ªà¯Šà®°à¯à®³à¯, தறà¯à®•ாலிக மெனà¯, மறைநà¯à®¤,கே-மெனà¯,பà¯à®¤à¯à®¤à®•கà¯à®±à®¿à®•ளà¯, தறà¯à®ªà¯‹à®¤à¯ˆà®¯ ஆவணமà¯. வேக உலாவி, உலாவி மெனà¯, மெனà¯, சினà¯à®©à®®à¯, சிறà¯à®¨à®¿à®°à®²à¯, தà¯à®µà®•à¯à®•à®®à¯, கையாளà¯, பெரிதாகà¯à®•à¯à®®à¯ சினà¯à®©à®™à¯à®•ளà¯
+ Keywords[tr]=kicker,panel,kpanel,görev çubuğu,başlangıç çubuğu,başlat çubuğu,konum,boyut,Uç birim uygulaması,otomatik gizle,gizle,tuşlar,animasyon,artalan,temalar,menü ön belleği,ön bellek,gizli,K-Menu,yer imleri,en son kullanılan belgeler,hızlı gözatıcı,göz atıcı menüsü,menü,simgeler,karo,programcıklar,Başlangıç,belirt,tutamaçlar,büyüyen simgeler,güvenilen programcıklar,güvenlik düzeyi
+ Keywords[uk]=kicker,панель,Ñмужка задач,kpanel,Ñмужка запуÑку,розташуваннÑ,розмір,конÑольна програма,автоматичне згортаннÑ,згортаннÑ,кнопки,анімаціÑ,тло,теми,кеш меню,кеш,Ñхований,К-Меню,закладки,недавні документи,швидка навігаціÑ,меню навігатора,меню,піктограми,заголовки,аплети,запуÑк,підÑвічуваннÑ,маніпулÑтор,маÑÑˆÑ‚Ð°Ð±ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–ÐºÑ‚Ð¾Ð³Ñ€Ð°Ð¼
+ Keywords[uz]=панел,вазифалар панели,бекитиш,авто-бекитиш,тугмалар,анимациÑ,орқа фон,мавзулар,К-меню,кÑш,Ñширилган,хатчўплар,Ñқинда очилган ҳужжатлар,тез кўрувчи,браузер менюÑи,менюнинг кÑши,меню,нишончалар,апплетлар,нишончаларни катталаштириш,ўлчам,kicker,kpanel,startbar,launchbar,жойлашиши,tiles,startup,highlight,handles
+-Keywords[xx]=xxkicker,panel,kpanel,taskbar,startbar,launchbar,location,size,auto hide,hide,buttons,animation,background,themes,menu cache,cache,hidden,K-Menu,bookmarks,recent documents,quickbrowser,browser menu,menu,icons,tiles,applets,startup,highlight,handles,zooming iconsxx
+ Keywords[zh_CN]=kicker,panel,kpanel,taskbar,startbar,launchbar,location,size,auto hide,hide,buttons,animation,background,themes,menu cache,cache,hidden,K-Menu,bookmarks,recent documents,quickbrowser,browser menu,menu,icons,tiles,applets,startup,highlight,handles,zooming icons颿¿,任务æ ,å¯åЍæ ,ä½ç½®,大å°,自动éšè—,éšè—,按钮,动画,背景,主题,èœå•缓å˜,缓å˜,书ç¾,最近文档,快速æµè§ˆå™¨,æµè§ˆå™¨èœå•,èœå•,å›¾æ ‡,平铺,å¯åЍ,çªå‡º,奿Ÿ„,ç¼©æ”¾å›¾æ ‡
+
+ Categories=Qt;KDE;X-KDE-settings-desktop;
+diff -Nru kdebase-release-3.4.0/kcontrol/kicker/positiontab_impl.cpp kdebase-branch-3.4/kcontrol/kicker/positiontab_impl.cpp
+--- kdebase-release-3.4.0/kcontrol/kicker/positiontab_impl.cpp 2005-01-17 23:59:59.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kicker/positiontab_impl.cpp 2005-04-03 12:15:32.000000000 -0400
+@@ -293,7 +293,7 @@
+ setPositionButtons();
+ return;
+ }
+- m_panelAlign = AlignRight;
++ m_panelAlign = kapp->reverseLayout() ? AlignLeft : AlignRight;
+ m_panelPos = PosBottom;
+ }
+ else if (pushed == locationRightTop)
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/cache.desktop kdebase-branch-3.4/kcontrol/kio/cache.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/cache.desktop 2005-02-23 00:05:37.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/cache.desktop 2005-03-07 09:15:21.000000000 -0500
+@@ -60,7 +60,6 @@
+ Name[vi]=Äệm
+ Name[wa]=Muchete
+ Name[xh]=Indawo yokugcina efihlakeleyo
+-Name[xx]=xxCachexx
+ Name[zh_CN]=缓å˜
+ Name[zh_TW]=å¿«å–
+ Comment=Configure web cache settings
+@@ -124,7 +123,6 @@
+ Comment[vi]=Cấu hình các thiết láºp bá»™ đệm cho Web
+ Comment[wa]=Fijhoz l' apontiaedje del muchete des pådjes waibe chal
+ Comment[xh]=Qwalasela izicwangciso ze web yendawo yokugcina efihlakeleyo
+-Comment[xx]=xxConfigure web cache settingsxx
+ Comment[zh_CN]=é…置网页缓å˜è®¾ç½®
+ Comment[zh_TW]=è¨å®šç¶²é å¿«å–è¨å®š
+ Comment[zu]=Hlanganisela izilungiselelo ze-cache ye-web
+@@ -172,7 +170,7 @@
+ Keywords[sk]=Cache,Keš,vyrovnávacia pamäť,prehliadanie,história,porty,veľkosť
+ Keywords[sl]=predpomnilnik,zgodovina,zgodovina brskanja,vrata,velikost
+ Keywords[sr]=Кеш, ИÑторијат, Прегледање иÑторијата, Портови, Величина
+-Keywords[sr@Latn]=KeÅ¡, Istorija, Pretraživanje istorije, Portovi, VeliÄina
++Keywords[sr@Latn]=KeÅ¡, Istorijat, Pregledanje istorijata, Portovi, VeliÄina
+ Keywords[sv]=Cache,Historik,Webbläsningshistorik,Portar,Storlek
+ Keywords[ta]=தறà¯à®•ாலிக,வரலாறà¯,உலாவà¯à®¤à®²à®¿à®©à¯ வரலாறà¯,à®®à¯à®©à¯ˆà®¯à®™à¯à®•ளà¯,அளவà¯
+ Keywords[th]=à¹à¸„ช,ประวัติà¸à¸²à¸£à¹ƒà¸Šà¹‰,ประวัติà¸à¸²à¸£à¸—่à¸à¸‡à¹€à¸§à¹‡à¸š,พà¸à¸£à¹Œà¸•,ขนาด
+@@ -183,7 +181,6 @@
+ Keywords[vi]=Äệm,Lịch sá»,Lịch sá» duyệt,Cổng,Cỡ
+ Keywords[wa]=Muchete,Istwere,Istwere do foytaedje,Pôrts,Grandeu
+ Keywords[xh]=Indawo yokugcina, Imbali, imbali Yokhangelo zincwadi, Amazibuko, Ubungakanani
+-Keywords[xx]=xxCache,History,Browsing History,Ports,Sizexx
+ Keywords[zh_CN]=Cache,History,Browsing History,Ports,Size,缓å˜,历å²
+ Keywords[zh_TW]=Cache,History,Browsing History,Ports,Size,å¿«å–
+ Keywords[zu]=Cache,Umlando,Umlando wokucinga,Izikhumulo,Usayizi
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/cookies.desktop kdebase-branch-3.4/kcontrol/kio/cookies.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/cookies.desktop 2005-02-23 00:05:37.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/cookies.desktop 2005-03-07 09:15:21.000000000 -0500
+@@ -59,7 +59,6 @@
+ Name[uk]=Куки
+ Name[uz]=Кукилар
+ Name[wa]=Coukes
+-Name[xx]=xxCookiesxx
+
+ Comment=Configure the way cookies work
+ Comment[af]=Konfigureer die weg koekies werk
+@@ -121,7 +120,6 @@
+ Comment[ven]=Dzudzanyani ndila ine cookies dza shuma ngayo
+ Comment[vi]=Cấu hình cách cookies hoạt động
+ Comment[xh]=Qwalasela indlela ezisebenza ngayo i cookies
+-Comment[xx]=xxConfigure the way cookies workxx
+ Comment[zh_CN]=é…ç½® cookies 相关设置
+ Comment[zh_TW]=è¨å®š cookies é‹ä½œæ–¹å¼
+ Comment[zu]=Hlanganisela indlela i-cookies esebenza ngayo
+@@ -173,7 +171,7 @@
+ Keywords[sk]=Cookies,Prehliadanie, Internet, WWW, Sieť,Politika,Domény
+ Keywords[sl]=piškotki,brskanje,internet,splet,WWW,omrežje,politika,domene
+ Keywords[sr]=Cookies,Browsing,Интернет,WWW,Network,Policy,Domains,колачићи,Прегледање,мрежа,полиÑа,домени
+-Keywords[sr@Latn]=Cookies,Browsing,Internet,WWW,Network,Policy,Domains,kolaÄići,pretraživanje,mreža,polisa,domeni
++Keywords[sr@Latn]=Cookies,Browsing,Internet,WWW,Network,Policy,Domains,kolaÄići,Pregledanje,mreža,polisa,domeni
+ Keywords[sv]=Kakor,Surfning,Internet,WWW,Nätverk,Policy,Domäner
+ Keywords[ta]=தறà¯à®•ாலிக நினைவகமà¯,உலாவà¯à®¤à®²à¯,இணையமà¯t,WWW,வலைபà¯à®ªà®¿à®©à¯à®©à®²à¯,கொளà¯à®•ை,வலைதளஙà¯à®•ளà¯
+ Keywords[th]=คุà¸à¸à¸µà¹‰,à¸à¸²à¸£à¹€à¸£à¸µà¸¢à¸à¸”ูเว็บเพจ,à¸à¸´à¸™à¹€à¸•à¸à¸£à¹Œà¹€à¸™à¹‡à¸•,WWW,ระบบเครืà¸à¸‚่าย,ข้à¸à¸à¸³à¸«à¸™à¸”,โดเมน
+@@ -183,7 +181,6 @@
+ Keywords[ven]=Cookies,Burousini.Inithenete,WWW<Vhukwamani,Pholisi,Domaini
+ Keywords[vi]=Cookies,Duyệt,Internet,WWW,Mạng,ChÃnh sách,Tên miá»n
+ Keywords[xh]=Cookies,Khangela iincwadi,Internet,WWW,Umsebenzi womnatha,Inkqubo,Ezongameleyo
+-Keywords[xx]=xxCookies,Browsing,Internet,WWW,Network,Policy,Domainsxx
+ Keywords[zh_CN]=Cookies,Browsing,Internet,WWW,Network,Policy,Domains,æµè§ˆ,互连网,万维网,网络,ç–ç•¥,域
+ Keywords[zh_TW]=Cookies,Browsing,Internet,WWW,Network,Policy,Domain,ç€è¦½,網際網路,網路,ç–ç•¥,域å
+ Keywords[zu]=Cookies,Cinga,Internet,WWW,Uxhumano olusakazekile,Umthetho, Izindawo
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/kcookiespolicies.cpp kdebase-branch-3.4/kcontrol/kio/kcookiespolicies.cpp
+--- kdebase-release-3.4.0/kcontrol/kio/kcookiespolicies.cpp 2005-02-14 13:07:44.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/kcookiespolicies.cpp 2005-03-06 11:04:34.000000000 -0500
+@@ -60,9 +60,9 @@
+ QValueList<int> columns;
+ columns.append(0);
+ dlg->kListViewSearchLine->setSearchColumns(columns);
+-
++
+ mainLayout->addWidget(dlg);
+-
++
+ load();
+ }
+
+@@ -81,7 +81,7 @@
+ dlg->bgDefault->setEnabled( enable );
+ dlg->bgPreferences->setEnabled ( enable );
+ dlg->gbDomainSpecific->setEnabled( enable );
+-
++
+ if (enable)
+ {
+ ignoreCookieExpirationDate ( enable );
+@@ -104,7 +104,7 @@
+ enable = (enable && isIgnoreExpirationChecked);
+
+ dlg->bgDefault->setEnabled( !enable );
+- dlg->gbDomainSpecific->setEnabled( !enable );
++ dlg->gbDomainSpecific->setEnabled( !enable );
+ }
+
+ void KCookiesPolicies::addNewPolicy(const QString& domain)
+@@ -249,13 +249,16 @@
+ for (; it != domainConfig.end(); ++it)
+ {
+ QString domain;
+- KCookieAdvice::Value advice;
+- QListViewItem *index;
++ KCookieAdvice::Value advice = KCookieAdvice::Dunno;
+
+ splitDomainAdvice(*it, domain, advice);
+- index = new QListViewItem( dlg->lvDomainPolicy, KIDNA::toUnicode(domain),
+- i18n(KCookieAdvice::adviceToStr(advice)) );
+- m_pDomainPolicy[index] = KCookieAdvice::adviceToStr(advice);
++
++ if (!domain.isEmpty())
++ {
++ QListViewItem* index = new QListViewItem( dlg->lvDomainPolicy, KIDNA::toUnicode(domain),
++ i18n(KCookieAdvice::adviceToStr(advice)) );
++ m_pDomainPolicy[index] = KCookieAdvice::adviceToStr(advice);
++ }
+ }
+ }
+
+@@ -279,7 +282,7 @@
+ {
+ d_itemsSelected = 0;
+ d_configChanged = false;
+-
++
+ KConfig cfg ("kcookiejarrc", true);
+ cfg.setGroup ("Cookie Policy");
+
+@@ -321,9 +324,9 @@
+
+ // Connect the main swicth :) Enable/disable cookie support
+ connect( dlg->cbEnableCookies, SIGNAL( toggled(bool) ),
+- SLOT( cookiesEnabled(bool) ) );
++ SLOT( cookiesEnabled(bool) ) );
+ connect( dlg->cbEnableCookies, SIGNAL( toggled(bool) ),
+- SLOT( configChanged() ) );
++ SLOT( configChanged() ) );
+
+ // Connect the preference check boxes...
+ connect ( dlg->cbRejectCrossDomainCookies, SIGNAL(clicked()),
+@@ -332,7 +335,7 @@
+ SLOT(configChanged()));
+ connect ( dlg->cbIgnoreCookieExpirationDate, SIGNAL(toggled(bool)),
+ SLOT(configChanged()));
+-
++
+ connect ( dlg->cbAutoAcceptSessionCookies, SIGNAL(toggled(bool)),
+ SLOT(autoAcceptSessionCookies(bool)));
+ connect ( dlg->cbIgnoreCookieExpirationDate, SIGNAL(toggled(bool)),
+@@ -348,12 +351,12 @@
+ SLOT(changePressed() ) );
+ connect( dlg->lvDomainPolicy, SIGNAL(returnPressed ( QListViewItem * )),
+ SLOT(changePressed() ) );
+-
++
+ // Connect the buttons...
+ connect( dlg->pbNew, SIGNAL(clicked()), SLOT( addPressed() ) );
+ connect( dlg->pbChange, SIGNAL( clicked() ), SLOT( changePressed() ) );
+ connect( dlg->pbDelete, SIGNAL( clicked() ), SLOT( deletePressed() ) );
+- connect( dlg->pbDeleteAll, SIGNAL( clicked() ), SLOT( deleteAllPressed() ) );
++ connect( dlg->pbDeleteAll, SIGNAL( clicked() ), SLOT( deleteAllPressed() ) );
+ }
+
+ void KCookiesPolicies::save()
+@@ -386,7 +389,7 @@
+
+ QStringList domainConfig;
+ QListViewItem *at = dlg->lvDomainPolicy->firstChild();
+-
++
+ while( at )
+ {
+ domainConfig.append(QString::fromLatin1("%1:%2").arg(KIDNA::toAscii(at->text(0))).arg(m_pDomainPolicy[at]));
+@@ -406,7 +409,7 @@
+ "Any changes you made will not take effect until the service "
+ "is restarted."));
+ }
+-
++
+ // Force running io-slave to reload configurations...
+ KSaveIOConfig::updateRunningIOSlaves (this);
+ emit changed( false );
+@@ -431,20 +434,14 @@
+ void KCookiesPolicies::splitDomainAdvice (const QString& cfg, QString &domain,
+ KCookieAdvice::Value &advice)
+ {
+- int pos;
++ int sepPos = cfg.findRev(':');
+
+- pos = cfg.find(':');
++ // Ignore any policy that does not contain a domain...
++ if ( sepPos <= 0 )
++ return;
+
+- if ( pos == -1)
+- {
+- domain = cfg;
+- advice = KCookieAdvice::Dunno;
+- }
+- else
+- {
+- domain = cfg.left(pos);
+- advice = KCookieAdvice::strToAdvice (cfg.mid (pos+1, cfg.length()));
+- }
++ domain = cfg.left(sepPos);
++ advice = KCookieAdvice::strToAdvice( cfg.mid( sepPos+1 ) );
+ }
+
+ QString KCookiesPolicies::quickHelp() const
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/lanbrowser.desktop kdebase-branch-3.4/kcontrol/kio/lanbrowser.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/lanbrowser.desktop 2005-02-23 00:05:37.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/lanbrowser.desktop 2005-03-07 09:15:21.000000000 -0500
+@@ -58,7 +58,7 @@
+ Name[sk]=Prehliadanie lokálnej siete
+ Name[sl]=Brskanje po krajevnem omrežju
+ Name[sr]=Прегледање локалне мреже
+-Name[sr@Latn]=Pretraživanje lokalne mreže
++Name[sr@Latn]=Pregledanje lokalne mreže
+ Name[sv]=Lokal nätverksbläddring
+ Name[ta]=உள௠வலைதல உலாவà¯à®¤à®²à¯
+ Name[tg]=Обзори шабакаи локалӣ
+@@ -69,7 +69,6 @@
+ Name[ven]=Burausini ya vhukwamani ha hefhano
+ Name[vi]=Duyệt mạng nội bộ
+ Name[xh]=Ukhangelo Lomsebenzi womnatha Wobulali
+-Name[xx]=xxLocal Network Browsingxx
+ Name[zh_CN]=局域网æµè§ˆ
+ Name[zh_TW]=å€åŸŸç¶²è·¯ç€è¦½
+ Name[zu]=Ukucinga oxhumanweni oluseduze
+@@ -133,7 +132,6 @@
+ Comment[ven]=Vhekanyani lisa,reslisa na ioslaves
+ Comment[vi]=Cà i đặt lisa,reslisa và các ioslave
+ Comment[xh]=Cwangcisa i lisa, reslisa ne ioslaves
+-Comment[xx]=xxSetup lisa, reslisa and the ioslavesxx
+ Comment[zh_CN]=设置 lisaã€reslisa å’Œ ioslaves
+ Comment[zu]=lungiselela i-lisa, i-reslisa ne-ioslaves
+
+@@ -187,7 +185,6 @@
+ Keywords[uk]=samba,smb,windows,мережа
+ Keywords[uz]=samba,smb,windows,тармоқ
+ Keywords[vi]=samba,smb,cá»a sổ,mạng
+-Keywords[xx]=xxsamba,smb,windows,networkxx
+ Keywords[zh_CN]=samba,smb,windows,network,网络
+
+ Categories=Qt;KDE;X-KDE-settings-network;
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/netpref.desktop kdebase-branch-3.4/kcontrol/kio/netpref.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/netpref.desktop 2005-02-23 00:05:37.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/netpref.desktop 2005-03-30 01:47:44.000000000 -0500
+@@ -62,7 +62,6 @@
+ Comment[ven]=Khonifigarani thodea dza vhukwamani sa tshifhinga tsho fhelaho
+ Comment[vi]=Cấu hình mạng nói chung và dụ như giá trị timeout
+ Comment[xh]=Qwalasela iinketho zomsebenzi womnatha ka wonke-wonke, njengamaxabiso ophelelo lwexesha
+-Comment[xx]=xxConfigure generic network preferences, like timeout valuesxx
+ Comment[zh_CN]=é…置通用网络首选项,例如超时值
+ Comment[zh_TW]=è¨å®šä¸€èˆ¬ç¶²è·¯å–œå¥½è¨å®šï¼Œä¾‹å¦‚逾時值
+ Comment[zu]=Hlanganisela okuncanyelwa uwonkewonke koxhumano olusazekile, njengamanani esikhathi sokuphuma
+@@ -70,41 +69,47 @@
+ Icon=network
+ Keywords=timeout,iopref,netpref,network preferences,ftp
+ Keywords[bg]=проÑрочка, време, времето, пауза, прекъÑване, връзка, timeout, iopref, netpref, network preferences, ftp
++Keywords[bs]=timeout,iopref,netpref,network preferences,ftp,mreža
+ Keywords[ca]=temps d'expiració,iopref,netpref,preferències de la xarxa,ftp
+ Keywords[cs]=Äasový limit,iopref,netpref,nastavenà sÃtÄ›,ftp
+ Keywords[da]=timeout,udløb,ioindst,netindst,netværksindstillinger,ftp
+ Keywords[de]=Zeitlimit,Netzwerk-Einstellungen,Ein/Ausgabemodul-Einstellungen
+ Keywords[es]=timeout,iopref,netpref,red preferencias,ftp
+ Keywords[et]=taimaut,aegumine,võrgu seadistused,ftp
++Keywords[eu]=denbora-muga,iopref,netpref,sareko hobespenak, ftp
+ Keywords[fr]=délai,configuration du réseau,réseau,entrées/sorties,ftp
+ Keywords[fy]=timeout,iopref,netpref,netwurkfoarkar,tiidslimyt,ftp
+ Keywords[he]=זמן מוקצב,iopref,netpref,העדפות רשת
+ Keywords[hu]=várakozási idÅ‘,iopref,netpref,hálózati beállÃtások,ftp
+ Keywords[is]=hámarkstÃmi,iopref,netpref,netstillingar,ftp
+ Keywords[it]=tempo massimo,timeout,iopref,netpref,rete,preferenze di rete,ftp
++Keywords[ja]=タイムアウト, iopref, netpref, ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯è¨å®š, ftp
+ Keywords[lt]=timeout,iopref,netpref,network preferences,ftp,laiko limitas, tinklo pasirinkimai
+ Keywords[nb]=avbruddsverdi,io-innstillinger,nettverk,nettverksinnstillinger,ftp
+ Keywords[nl]=timeout,iopref,netpref,netwerkvoorkeuren,tijdslimiet,ftp
+ Keywords[pl]=limit czasu, ustawienia sieciowe,sieć,ustawienia we/wy,ftp
+ Keywords[pt]=tempo limite,iopref,netpref,configuração da rede,ftp
+ Keywords[pt_BR]=tempo limite,iopref,netpref,preferências de rede,ftp,configurações de rede
++Keywords[sk]=timeout,Äakanie,iopref,netpref,nastavenie siete,sieÅ¥,ftp
+ Keywords[sl]=iztek,zakasnitev,iopref,netpref,nastavitve omrežja,ftp
+ Keywords[sv]=tidsgräns,io-inställning,nät-inställning,nätverksinställningar,FTP
+ Keywords[ta]=நேரம௠மà¯à®Ÿà®¿à®¨à¯à®¤à®¤à¯,iopref,netpref,வலைதளம௠சலà¯à®•ைகளà¯,ftp
+ Keywords[tr]=zaman aşımı,ağ tercihleri,iopref,netpref,ftp
+ Keywords[uk]=тайм-аут,iopref,netpref,параметри мережі,ftp
+-Keywords[xx]=xxtimeout,iopref,netpref,network preferences,ftpxx
+ Keywords[zh_CN]=timeout,iopref,netpref,network preferences,超时,网络首选项,ftp
+ Name=Connection Preferences
+ Name[bg]=ÐаÑтройки на връзката
+ Name[bn]=যোগাযোগ পছনà§à¦¦à¦¸à¦®à§‚হ
+ Name[br]=Kefluniadur ar gevreadenn
++Name[bs]=Postavke konekcije
+ Name[ca]=Preferències de connexió
+ Name[cs]=Nastavenà pÅ™ipojenÃ
+ Name[da]=Indstillinger af forbindelse
+ Name[de]=Verbindungseinstellungen
++Name[el]=Î Ïοτιμήσεις σÏνδεσης
+ Name[es]=Preferencias de conexión
+ Name[et]=Ühenduse seadistused
++Name[eu]=Konexio hobespenak
+ Name[fi]=Asetukset
+ Name[fr]=Préférences de connexion
+ Name[fy]=Ferbiningfoarkar
+@@ -112,8 +117,9 @@
+ Name[he]=העדפות חיבור
+ Name[hi]=कनेकà¥à¤¶à¤¨ वरीयताà¤à¤
+ Name[hu]=Hálózati paraméterek
+-Name[is]=Tengingar stillingar
++Name[is]=Stillingar tenginga
+ Name[it]=Preferenze sulle connessioni
++Name[ja]=接続è¨å®š
+ Name[lt]=Prisijungimo pasirinkimai
+ Name[nb]=Forbindelsesinnstillinger
+ Name[nl]=Verbindingsvoorkeuren
+@@ -123,14 +129,14 @@
+ Name[pt]=Preferências da Ligação
+ Name[pt_BR]=Configurações de Conexão
+ Name[ru]=СвойÑтва ÑоединениÑ
++Name[sk]=Nastavenie pripojenia
+ Name[sl]=Lastnosti povezave
+ Name[sr]=Подешавања повезивања
+-Name[sr@Latn]=Подешавања повезивања
++Name[sr@Latn]=Podešavanja povezivanja
+ Name[sv]=Anslutningsinställningar
+ Name[ta]=இணைபà¯à®ªà¯ à®®à¯à®©à¯à®©à¯à®°à®¿à®®à¯ˆà®•ளà¯
+ Name[tr]=Bağlantı Tercihleri
+ Name[uk]=Параметри з'єднаннÑ
+-Name[xx]=xxConnection Preferencesxx
+ Name[zh_CN]=连接首选项
+ Type=Application
+ DocPath=kcontrol/netpref/index.html
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/proxy.desktop kdebase-branch-3.4/kcontrol/kio/proxy.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/proxy.desktop 2005-02-11 23:26:19.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/proxy.desktop 2005-03-07 09:15:21.000000000 -0500
+@@ -55,7 +55,6 @@
+ Name[uz]=ПрокÑи
+ Name[ven]=Purokusi
+ Name[xh]=Umntu onegunya lokusebenzela omnye
+-Name[xx]=xxProxyxx
+ Name[zh_CN]=代ç†
+ Name[zh_TW]=代ç†
+ Name[zu]=Umlingani
+@@ -121,7 +120,6 @@
+ Comment[ven]=Dzudzanyani dzisiva dza Proxy dzo shumiswaho
+ Comment[vi]=Cấu hình máy chủ proxy sỠdụng
+ Comment[xh]=Qwalasela indlela abasebenziswa ngayo abancedisi be proxy
+-Comment[xx]=xxConfigure the proxy servers usedxx
+ Comment[zh_CN]=é…ç½®æ‰€ç”¨çš„ä»£ç†æœåС噍
+ Comment[zh_TW]=è¨å®šä½¿ç”¨çš„代ç†ä¼ºæœå™¨
+ Comment[zu]=Hlanganisela abalekeleli abangabalingani abasetshenziswayo
+@@ -176,7 +174,6 @@
+ Keywords[ven]=Purokusi,Siva ya Purokusi,Luvhondo lwa mulilo,Squid,Purokusi
+ Keywords[vi]=Proxy,Proxy server,Tưá»ng lá»a,Squid,proxy
+ Keywords[xh]=Umntu onegunya lokudsebenzela omnye, umncedisi womntu onegunya,udonga lomlilo,Squid,umntu onegunya lokusebenzela omnye
+-Keywords[xx]=xxProxy,Proxy server,Firewall,Squid,proxyxx
+ Keywords[zh_CN]=Proxy,Proxy server,Firewall,Squid,proxy,代ç†,ä»£ç†æœåС噍,防ç«å¢™
+ Keywords[zh_TW]=Proxy,Proxy server,Firewall,Squid,proxy,代ç†,代ç†ä¼ºæœå™¨,防ç«ç‰†
+ Keywords[zu]=Umlingani,Umlekeleli ongumlingana,Firewall,Squid,umlingani
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/smb.desktop kdebase-branch-3.4/kcontrol/kio/smb.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/smb.desktop 2005-02-10 23:51:56.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/smb.desktop 2005-03-07 09:15:21.000000000 -0500
+@@ -71,7 +71,6 @@
+ Name[uk]=Спільні реÑурÑи Windows
+ Name[ven]=Mukovhekano wa dziwindo
+ Name[xh]=Ulwahlulelwano lwe Windows
+-Name[xx]=xxWindows Sharesxx
+ Name[zh_CN]=Windows 共享资æº
+ Name[zh_TW]=Windows 資æºå…±äº«
+ Name[zu]=Izabelo zama-Window
+@@ -140,7 +139,6 @@
+ Comment[ven]=I shuma u khonifigara uri ndi mashumele a (SMB) faela a windo ane ninga buronza
+ Comment[vi]=Dùng để cấu hình hệ thống tệp (SMB) nà o mà bạn duyệt
+ Comment[xh]=Sebenzisa ukuqwalasela eyiphi (SMB) indlela yousebenza okwaziyo ukukhangela iincwadi
+-Comment[xx]=xxUse to configure which windows (SMB) filesystems you can browsexx
+ Comment[zh_CN]=é…置您å¯ä»¥æµè§ˆçš„ Windows (SMB) 文件系统
+ Comment[zh_TW]=è¨å®šæ‚¨å¯ä»¥ç€è¦½çš„ Windows (SMB) 檔案系統
+ Comment[zu]=Sebenzisa ukuhlanganisela ukuthi imaphi amasistimu amafayela ama-window (SMB) ongacinga kuwo
+@@ -200,7 +198,6 @@
+ Keywords[ven]=SMB,SAMBA,vhashumisani na SMB,Vhukwamani ha Dziwindo,LAN,Vhukwamani,vhadzulatsini,Siva,Hasha,WINS,U kovhekana,U loga,Dziphasiwede
+ Keywords[vi]=SMB,SAMBA,SMB kha'ch,Mạng Windows,LAN,Mạng,hà ng xóm,Máy chá»§,Broadcast,WINS,Chia xẻ,Äăng nháºp,Máºt khẩu
+ Keywords[xh]=SMB,SAMBA,umxhasi we SMB,umsebenzi womnatha we Window,LAN, Umsebenzi womnatha,ubumelwane,Umncedisi,Usasazo,WINS,Yahlula,Igama elithile, Amagama agqithisiweyo
+-Keywords[xx]=xxSMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwordsxx
+ Keywords[zh_CN]=SMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwords,局域网,网络,邻居,æœåС噍,广æ’,共享,登录,密ç
+ Keywords[zh_TW]=SMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwords,客戶端程å¼,Windows 網路,å€åŸŸç¶²è·¯,網路,網路芳鄰,伺æœå™¨,廣æ’,共享,登入,密碼
+ Keywords[zu]=SMB,SAMBA,umxhasi we-SMB,uxhumano olusakazekile lwama-window,LAN,Uxhumano olusakazekile,isizinda,Umlekeleli,Sakaza,WINS, ukwabelana,Ukungena ngaphakathi,Amagama-okudlula
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasprovider.desktop kdebase-branch-3.4/kcontrol/kio/uasprovider.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasprovider.desktop 2005-02-10 23:51:56.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasprovider.desktop 2005-03-07 09:15:21.000000000 -0500
+@@ -62,7 +62,6 @@
+ Comment[ven]=Mutevhe wa vhashumisi
+ Comment[vi]=Chuá»—i UserAgent
+ Comment[xh]=Iqela lamagama UserAgent
+-Comment[xx]=xxUserAgent Stringsxx
+ Comment[zh_CN]=用户代ç†è®¾ç½®
+ Comment[zh_TW]=使用者代ç†å—串è¨å®š
+ Comment[zu]=Iqoqo lamagama lommeli womsebenzisi
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasproviders/firefoxoncurrent.desktop kdebase-branch-3.4/kcontrol/kio/uasproviders/firefoxoncurrent.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasproviders/firefoxoncurrent.desktop 2005-02-23 00:05:37.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasproviders/firefoxoncurrent.desktop 2005-03-30 01:47:44.000000000 -0500
+@@ -1,12 +1,15 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=UADescription (Firefox 1.0 on current)
++Name[bs]=UADescription (Firefox 1.0 na trenutnom)
+ Name[ca]=Descripció UA (Firefox 1.0 a l'actual)
+ Name[cs]=Popis agenta (Firefox 1.0 na aktuálnÃm)
+ Name[da]=Brugeragentbeskrivelse (Firefox 1.0 på denne)
+ Name[de]=User-Agent-Kennung (Firefix 1.0 on current)
++Name[el]=ΠεÏιγÏαφή UA (Firefox 1.0 στο Ï„ÏÎχον σÏστημα)
+ Name[es]=UADescription (Firefox 1.0 en actual)
+ Name[et]=UADescription (Selles masinas töötav Firefox 1.0)
++Name[eu]=UA azalpena (Firefox 1.0 unekoan)
+ Name[fi]=Käyttäjäagenttikuvaus (Firefox 1.0)
+ Name[fr]=Identité du navigateur (Firefox 1.0 sous le système actuel)
+ Name[fy]=GA-omskriuwing (Firefox 1.0 op hjoeddeisk)
+@@ -24,14 +27,14 @@
+ Name[pt]=UADescription (Firefox 1.0 no sistema actual)
+ Name[pt_BR]=Descrição (Firefox 3.01 no sistema atual)
+ Name[ru]=UADescription (Firefox 1.0 на текущей)
++Name[sk]=Popis agenta (Firefox 1.0 na aktuálnom)
+ Name[sl]=UAOpis (Firefox 1.0 na trenutnem)
+ Name[sr]=UADescription (Firefox 1.0 на тренутном)
+-Name[sr@Latn]=UADescription (Firefox 1.0 на тренутном)
++Name[sr@Latn]=UADescription (Firefox 1.0 na trenutnom)
+ Name[sv]=AA-beskrivning (Firefox 1.0 på aktuell)
+ Name[ta]=UAவிவரம௠(Firefox 1.0 on current)
+ Name[tr]=UA Tanımı (bulunulanda Firefox 1.0)
+ Name[uk]=UADescription (Firefox 1.0 на поточній)
+-Name[xx]=xxUADescription (Firefox 1.0 on current)xx
+ Name[zh_CN]=ç”¨æˆ·ä»£ç†æè¿° (è¿è¡ŒäºŽæœ¬æœºçš„ Firefox 1.0)
+ Type=Service
+ ServiceTypes=UserAgentStrings
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasproviders/googlebot.desktop kdebase-branch-3.4/kcontrol/kio/uasproviders/googlebot.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasproviders/googlebot.desktop 2005-02-23 00:05:37.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasproviders/googlebot.desktop 2005-03-30 01:47:44.000000000 -0500
+@@ -5,7 +5,9 @@
+ Name[ca]=Descripció UA (Googlebot/2.1)
+ Name[cs]=Popis agenta (Googlebot/2.1)
+ Name[de]=User-Agent-Kennung (Googlebot/2.1)
++Name[el]=ΠεÏιγÏαφή UA (Googlebot/2.1)
+ Name[eo]=UA-Priskribo (Googlebot/2.1)
++Name[eu]=UA azalpena (Wget 1.5.3)
+ Name[fi]=Käyttäjäagenttikuvaus (Googlebot/2.1)
+ Name[fr]=Identité du navigateur (Googlebot/2.1)
+ Name[fy]=GA-omskriuwing (Googlebot/2.1)
+@@ -19,11 +21,11 @@
+ Name[nn]=Brukaragent (Googlebot/2.1)
+ Name[pl]=Opis Programu Użytkownika (Googlebot/2.1)
+ Name[pt_BR]=Descrição (Googlebot/2.1)
++Name[sk]=Popis agenta (Googlebox/2.1)
+ Name[sl]=UAOpis (Googlebot/2.1)
+ Name[sv]=AA-beskrivning (Googlebot/2.1)
+ Name[ta]=UAவிவரம௠(Googlebot/2.1)
+ Name[tr]=UA Tanımı (Googlebot/2.1)
+-Name[xx]=xxUADescription (Googlebot/2.1)xx
+ Name[zh_CN]=ç”¨æˆ·ä»£ç†æè¿° (Google 机器人/2.1)
+ Type=Service
+ ServiceTypes=UserAgentStrings
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasproviders/ie401onwinnt4.desktop kdebase-branch-3.4/kcontrol/kio/uasproviders/ie401onwinnt4.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasproviders/ie401onwinnt4.desktop 2005-02-23 00:05:37.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasproviders/ie401onwinnt4.desktop 2005-03-22 12:38:06.000000000 -0500
+@@ -13,7 +13,7 @@
+ Name[eo]=UA-Priskribo (IE 4.01 sur Vindozo 2000)
+ Name[es]=Descripción de AU (IE 4.01 en Windows 2000)
+ Name[et]=UADescription (IE 4.01 Win2000 platvormil)
+-Name[eu]=UA deskripzioa (IE 4.01 Win 2000-n)
++Name[eu]=UA azalpena (IE 4.01 Win 2000-n)
+ Name[fa]=UA ØªÙˆØ¶ÛŒØ IE Û´/Û°Û± روی Win Û²Û°Û°Û°
+ Name[fi]=Käyttäjäagenttikuvaus (IE 4.01 Win 2000:lla)
+ Name[fr]=Identité du navigateur (IE 4.01 sous Windows 2000)
+@@ -57,7 +57,6 @@
+ Name[ven]=Thalutshedzo ya UA (IE 4.01 on Win 2000)
+ Name[vi]=UADescription (IE 4.01 trên Win 2000)
+ Name[xh]=UADescription (IE 4.01 kwi Win 2000)
+-Name[xx]=xxUADescription (IE 4.01 on Win 2000)xx
+ Name[zh_CN]=ç”¨æˆ·ä»£ç†æè¿° (è¿è¡ŒäºŽ Win 2000 çš„ IE 4.01)
+ Name[zh_TW]=ä½¿ç”¨è€…ä»£ç†æè¿° (IE 4.01 on Win 2000)
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasproviders/ie45onwinnt5.desktop kdebase-branch-3.4/kcontrol/kio/uasproviders/ie45onwinnt5.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasproviders/ie45onwinnt5.desktop 2005-02-23 00:05:37.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasproviders/ie45onwinnt5.desktop 2005-03-22 12:38:06.000000000 -0500
+@@ -14,7 +14,7 @@
+ Name[eo]=UA-Priskribo (IE 4.5 sub Vindozo 2000)
+ Name[es]=Descripción de AU (IE 4.5 en Windows 2000)
+ Name[et]=UADescription (IE 4.5 Win2000 platvormil)
+-Name[eu]=UA deskripzioa (IE 4.5 Win 2000-n)
++Name[eu]=UA azalpena (IE 4.5 Win 2000-n)
+ Name[fa]=UA ØªÙˆØ¶ÛŒØ IE Û´.Ûµ روی Win Û²Û°Û°Û°
+ Name[fi]=Käyttäjäagenttikuvaus (IE 4.5 Win 2000:lla)
+ Name[fr]=Identité du navigateur (IE 4.5 sous Windows 2000)
+@@ -57,7 +57,6 @@
+ Name[ven]=Thalutshedzo ya UA (IE 4.5 on Win 2000)
+ Name[vi]=UADescription (IE 5.5 trên Win 2000)
+ Name[xh]=UADescription (IE 4.5 kwi Win 2000)
+-Name[xx]=xxUADescription (IE 4.5 on Win 2000)xx
+ Name[zh_CN]=ç”¨æˆ·ä»£ç†æè¿° (è¿è¡ŒäºŽ Win 2000 çš„ IE 4.5)
+ Name[zh_TW]=ä½¿ç”¨è€…ä»£ç†æè¿° (IE 4.5 on Win 2000)
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasproviders/ie501onwinnt5.desktop kdebase-branch-3.4/kcontrol/kio/uasproviders/ie501onwinnt5.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasproviders/ie501onwinnt5.desktop 2005-02-23 00:05:37.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasproviders/ie501onwinnt5.desktop 2005-03-22 12:38:06.000000000 -0500
+@@ -13,7 +13,7 @@
+ Name[eo]=UA-Priskribo (IE 5.01 sub Vindozo 2000)
+ Name[es]=Descripción de AU (IE 5.01 en Windows 2000)
+ Name[et]=UADescription (IE 5.01 Win2000 platvormil)
+-Name[eu]=UA deskripzioa (IE 5.01 Win 2000-n)
++Name[eu]=UA azalpena (IE 5.01 Win 2000-n)
+ Name[fa]=UA ØªÙˆØ¶ÛŒØ IE Ûµ.Û°Û± روی Win Û²Û°Û°Û°
+ Name[fi]=Käyttäjäagenttikuvaus (IE 5.01 Win 2000:lla)
+ Name[fr]=Identité du navigateur (IE 5.01 sous Windows 2000)
+@@ -56,7 +56,6 @@
+ Name[ven]=Thalutshedzo (IE 5.01 on Win 2000)
+ Name[vi]=UADescription (IE 5.01 trên Win 2000)
+ Name[xh]=UADescription (IE 5.01 kwi Win 2000)
+-Name[xx]=xxUADescription (IE 5.01 on Win 2000)xx
+ Name[zh_CN]=ç”¨æˆ·ä»£ç†æè¿° (è¿è¡ŒäºŽ Win 2000 çš„ IE 5.01)
+ Name[zh_TW]=ä½¿ç”¨è€…ä»£ç†æè¿° (IE 5.01 on Win 2000)
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasproviders/ie50onppc.desktop kdebase-branch-3.4/kcontrol/kio/uasproviders/ie50onppc.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasproviders/ie50onppc.desktop 2005-02-23 00:05:37.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasproviders/ie50onppc.desktop 2005-03-22 12:38:06.000000000 -0500
+@@ -13,7 +13,7 @@
+ Name[eo]=UA-Priskribo (IE 5.0 sub Mac-PPC)
+ Name[es]=Descripción de AU (IE 5.0 en Mac PPC)
+ Name[et]=UADescription (IE 5.0 MacPPC platvormil)
+-Name[eu]=UA deskripzioa (IE 5.0 Mac PPC-n)
++Name[eu]=UA azalpena (IE 5.0 Mac PPC-n)
+ Name[fa]=UA ØªÙˆØ¶ÛŒØ IE Ûµ.Û° روی Mac PPC
+ Name[fi]=Käyttäjäagenttikuvaus (IE 5.0 Mac PPC:llä)
+ Name[fr]=Identité du navigateur (IE 5.0 sous Mac PPC)
+@@ -56,7 +56,6 @@
+ Name[ven]=Thalutshedzo ya UA (IE 5.0 on Mac PPC)
+ Name[vi]=UADescription (IE 5.0 trên Mac PPC)
+ Name[xh]=UADescription (IE 5.0 kwi Mac PPC)
+-Name[xx]=xxUADescription (IE 5.0 on Mac PPC)xx
+ Name[zh_CN]=ç”¨æˆ·ä»£ç†æè¿° (è¿è¡ŒäºŽ Mac PPC çš„ IE 5.0)
+ Name[zh_TW]=ä½¿ç”¨è€…ä»£ç†æè¿° (IE 5.0 on Mac PPC)
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasproviders/ie55onwin98.desktop kdebase-branch-3.4/kcontrol/kio/uasproviders/ie55onwin98.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasproviders/ie55onwin98.desktop 2005-02-23 00:05:37.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasproviders/ie55onwin98.desktop 2005-03-22 12:38:06.000000000 -0500
+@@ -13,7 +13,7 @@
+ Name[eo]=UA-Priskribo (IE 5.5 sub Vindozo 98)
+ Name[es]=Descripción de AU (IE 5.5 en Windows 98)
+ Name[et]=UADescription (IE 5.5 Win98 platvormil)
+-Name[eu]=UA deskripzioa (IE 5.5 Win 98-an)
++Name[eu]=UA azalpena (IE 5.5 Win 98-an)
+ Name[fa]=UA ØªÙˆØ¶ÛŒØ IE Ûµ..Ûµ روی Win Û¹Û¸
+ Name[fi]=Käyttäjäagenttikuvaus (IE 5.5 Win 98:lla)
+ Name[fr]=Identité du navigateur (IE 5.5 sous Windows 98)
+@@ -56,7 +56,6 @@
+ Name[ven]=Thalutshedzo ya UA (IE 5.5 on Win 98)
+ Name[vi]=UADescription (IE 5.5 trên Win 98)
+ Name[xh]=UADescription UA (IE 5.5 kwi Win 98)
+-Name[xx]=xxUADescription (IE 5.5 on Win 98)xx
+ Name[zh_CN]=ç”¨æˆ·ä»£ç†æè¿° (è¿è¡ŒäºŽ Win 98 çš„ IE 5.5)
+ Name[zh_TW]=ä½¿ç”¨è€…ä»£ç†æè¿° (IE 5.5 on Win 98)
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasproviders/ie55onwinnt5.desktop kdebase-branch-3.4/kcontrol/kio/uasproviders/ie55onwinnt5.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasproviders/ie55onwinnt5.desktop 2005-02-23 00:05:37.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasproviders/ie55onwinnt5.desktop 2005-03-22 12:38:06.000000000 -0500
+@@ -13,7 +13,7 @@
+ Name[eo]=UA-Priskribo (IE 5.5 sub Vindozo 2000)
+ Name[es]=Descripción de AU (IE 5.5 en Windows 2000)
+ Name[et]=UADescription (IE 5.5 Win2000 platvormil)
+-Name[eu]=UA deskripzioa (IE 5.5 Win 2000-n)
++Name[eu]=UA azalpena (IE 5.5 Win 2000-n)
+ Name[fa]=UA ØªÙˆØ¶ÛŒØ IE Ûµ.Ûµ روی Win Û²Û°Û°Û°
+ Name[fi]=Käyttäjäagenttikuvaus (IE 5.5 Win 2000:lla)
+ Name[fr]=Identité du navigateur (IE 5.5 sous Windows 2000)
+@@ -56,7 +56,6 @@
+ Name[ven]=Thalutshedzo ya UA (IE 5.5 on Win 2000)
+ Name[vi]=UADescription (IE 5.5 trên Win 2000)
+ Name[xh]=UADescription (IE 5.5 kwi Win 2000)
+-Name[xx]=xxUADescription (IE 5.5 on Win 2000)xx
+ Name[zh_CN]=ç”¨æˆ·ä»£ç†æè¿° (è¿è¡ŒäºŽ Win 2000 çš„ IE 5.5)
+ Name[zh_TW]=ä½¿ç”¨è€…ä»£ç†æè¿° (IE 5.5 on Win 2000)
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasproviders/ie60oncurrent.desktop kdebase-branch-3.4/kcontrol/kio/uasproviders/ie60oncurrent.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasproviders/ie60oncurrent.desktop 2005-02-23 00:05:37.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasproviders/ie60oncurrent.desktop 2005-03-30 01:47:44.000000000 -0500
+@@ -1,12 +1,15 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=UADescription (IE 6.0 on current)
++Name[bs]=UADescription (IE 6.0 na trenutnom)
+ Name[ca]=Descripció UA (IE 6.0 a l'actual)
+ Name[cs]=Popis agenta (IE 6.0 na aktuálnÃm)
+ Name[da]=Brugeragentbeskrivelse (IE 6.0 på denne)
+ Name[de]=User-Agent-Kennung (IE 6.0 on current)
++Name[el]=ΠεÏιγÏαφή UA (IE 6.01 στο Ï„ÏÎχον σÏστημα)
+ Name[es]=UADescription (IE 6.0 en actual)
+ Name[et]=UADescription (Selles masinas töötav IE 6.0)
++Name[eu]=UA azalpena (IE 6.0 unekoan)
+ Name[fr]=Identité du navigateur (IE 6.0 sous le système actuel)
+ Name[fy]=GA-omskriuwing (IE 6.0 op hjoeddeisk)
+ Name[ga]=UADescription (IE 6.0 ar an gcóras reatha)
+@@ -23,14 +26,14 @@
+ Name[pt]=UADescription (IE 6.0 no sistema actual)
+ Name[pt_BR]=Descrição (IE 6.0 no sistema atual)
+ Name[ru]=UADescription (IE 6.0 на текущей)
++Name[sk]=Popis agenta (IE 6.0 na aktuálnom)
+ Name[sl]=UAOpis (IE 6.0 na trenutnem)
+ Name[sr]=UADescription (IE 6.0 на тренутном)
+-Name[sr@Latn]=UADescription (IE 6.0 на тренутном)
++Name[sr@Latn]=UADescription (IE 6.0 na trenutnom)
+ Name[sv]=AA-beskrivning (IE 6.0 på aktuell)
+ Name[ta]=UAவிவரம௠(IE 6.0 on current)
+ Name[tr]=UA Tanımı (bulunulanda IE 6.0)
+ Name[uk]=UADescription (IE 6.0 на поточній)
+-Name[xx]=xxUADescription (IE 6.0 on current)xx
+ Name[zh_CN]=ç”¨æˆ·ä»£ç†æè¿° (è¿è¡ŒäºŽæœ¬æœºçš„ IE 6.0)
+ Type=Service
+ ServiceTypes=UserAgentStrings
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasproviders/ie60onwinnt51.desktop kdebase-branch-3.4/kcontrol/kio/uasproviders/ie60onwinnt51.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasproviders/ie60onwinnt51.desktop 2005-02-23 00:05:37.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasproviders/ie60onwinnt51.desktop 2005-03-22 12:38:06.000000000 -0500
+@@ -15,7 +15,7 @@
+ Name[eo]=UA-Priskribo (IE 6.0 sub Vindozo XP)
+ Name[es]=Descripción de AU (IE 6.0 en Win XP)
+ Name[et]=UADescription (IE 6.0 Win XP platvormil)
+-Name[eu]=UA deskripzioa (IE 6.0 Win XP-n)
++Name[eu]=UA azalpena (IE 6.0 Win XP-n)
+ Name[fa]=UA ØªÙˆØ¶ÛŒØ IE Û¶.Û° روی Win XP
+ Name[fi]=Käyttäjäagenttikuvaus (IE 6.0 Win XP:llä)
+ Name[fr]=Identité du navigateur (IE 6.0 sous Windows XP)
+@@ -56,7 +56,6 @@
+ Name[uz]=UADescription (Win XP билан IE 6.0)
+ Name[ven]=Thalutshedzo ya UA (IE 5.0 kha Win XP)
+ Name[xh]=UADescription (IE 6.0 kwi Win XP)
+-Name[xx]=xxUADescription (IE 6.0 on Win XP)xx
+ Name[zh_CN]=ç”¨æˆ·ä»£ç†æè¿° (è¿è¡ŒäºŽ Win XP çš„ IE 6.0)
+ Name[zh_TW]=ä½¿ç”¨è€…ä»£ç†æè¿° (IE 6.0 on Win XP)
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasproviders/lynxoncurrent.desktop kdebase-branch-3.4/kcontrol/kio/uasproviders/lynxoncurrent.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasproviders/lynxoncurrent.desktop 2005-02-23 00:05:38.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasproviders/lynxoncurrent.desktop 2005-03-22 12:38:06.000000000 -0500
+@@ -10,7 +10,7 @@
+ Name[el]=ΠεÏιγÏαφή UA (Lynx 2.8.3)
+ Name[eo]=UA-Priskribo (Lynx 2.8.3)
+ Name[es]=Descripción de AU (Lynx 2.8.3)
+-Name[eu]=UA deskripzioa (Lynx 2.8.3)
++Name[eu]=UA azalpena (Lynx 2.8.3)
+ Name[fa]=UA ØªÙˆØ¶ÛŒØ Ù„ÛŒÙ†Ú©Ø³ Û².Û¸.Û³
+ Name[fi]=Käyttäjäagenttikuvaus (Lynx 2.8.3)
+ Name[fr]=Identité du navigateur (Lynx 2.8.3)
+@@ -39,7 +39,6 @@
+ Name[tg]=ТавзеҳиUA (Ð›Ð¸Ð½ÑƒÐºÑ 2.8.3)
+ Name[tr]=UA Tanımı (Lynx 2.8.3)
+ Name[ven]=Thalutshedzo ya UA (Lynx 2.8.3)
+-Name[xx]=xxUADescription (Lynx 2.8.3)xx
+ Name[zh_CN]=ç”¨æˆ·ä»£ç†æè¿° (Lynx 2.8.3)
+ Name[zh_TW]=ä½¿ç”¨è€…ä»£ç†æè¿° (Lynx 2.8.3)
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasproviders/mozoncurrent.desktop kdebase-branch-3.4/kcontrol/kio/uasproviders/mozoncurrent.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasproviders/mozoncurrent.desktop 2005-02-23 00:05:38.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasproviders/mozoncurrent.desktop 2005-03-30 01:47:44.000000000 -0500
+@@ -1,12 +1,15 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=UADescription (Mozilla 1.7 on current)
++Name[bs]=UADescription (Mozilla 1.7 na trenutnom)
+ Name[ca]=Descripció UA (Mozilla 1.7 a l'actual)
+ Name[cs]=Popis agenta (Mozilla 1.7 na aktuálnÃm)
+ Name[da]=Brugeragentbeskrivelse (Mozilla 1.7 på denne)
+ Name[de]=User-Agent-Kennung (Mozilla 1.7 on current)
++Name[el]=ΠεÏιγÏαφή UA (Mozilla 1.7 στο Ï„ÏÎχον σÏστημα)
+ Name[es]=UADescription (Mozilla 1.7 en actual)
+ Name[et]=UADescription (Selles masinas töötav Mozilla 1.7)
++Name[eu]=UA deskriptioa (Mozilla 1.7 unekoan)
+ Name[fi]=Käyttäjäagenttikuvaus (Mozilla 1.7 nykyisin)
+ Name[fr]=Identité du navigateur (Mozilla 1.7 sous le système actuel)
+ Name[fy]=GA-omskriuwing (Mozilla 1.7 op hjoeddeisk)
+@@ -14,7 +17,7 @@
+ Name[he]=UADescription (Mozilla 1.7 ×‘× ×•×›×—×™)
+ Name[hu]=BöngészÅ‘tÃpus (Mozilla 1.7)
+ Name[is]=UAD strengur (Mozilla 1.7 á núverandi)
+-Name[it]=DescrizioneUA(Mozilla 1.7 su sistema attuale)
++Name[it]=DescrizioneUA (Mozilla 1.7 su sistema attuale)
+ Name[lt]=Vartotojo agento aprašymas (Mozilla 1.7 ir esama)
+ Name[nb]=Brukeragent (Mozilla 1.7 på denne)
+ Name[nl]=GA-beschrijving (Mozilla 1.7 op current)
+@@ -24,14 +27,14 @@
+ Name[pt]=UADescription (Mozilla 1.7 no sistema actual)
+ Name[pt_BR]=Descrição (Mozilla 1.7 no sistema atual)
+ Name[ru]=UADescription (Mozilla 1.7 на текущей)
++Name[sk]=Popis agenta (Mozilla 1.7 na aktuálnom)
+ Name[sl]=UAOpis (Mozilla 1.7 na trenutnem)
+ Name[sr]=UADescription (Mozilla 1.7 на тренутном)
+-Name[sr@Latn]=UADescription (Mozilla 1.7 на тренутном)
++Name[sr@Latn]=UADescription (Mozilla 1.7 na trenutnom)
+ Name[sv]=AA-beskrivning (Mozilla 1.7 på aktuell)
+ Name[ta]=UADescription (Mozilla 1.7 on current)
+ Name[tr]=UA Tanımı (bulunulanda Mozilla 1.6)
+ Name[uk]=UADescription (Mozilla 1.7 на поточній)
+-Name[xx]=xxUADescription (Mozilla 1.7 on current)xx
+ Name[zh_CN]=ç”¨æˆ·ä»£ç†æè¿° (è¿è¡ŒäºŽæœ¬æœºçš„ Mozilla 1.7)
+ Type=Service
+ ServiceTypes=UserAgentStrings
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasproviders/mozoncurrent12.desktop kdebase-branch-3.4/kcontrol/kio/uasproviders/mozoncurrent12.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasproviders/mozoncurrent12.desktop 2005-02-23 00:05:38.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasproviders/mozoncurrent12.desktop 2005-03-30 01:47:44.000000000 -0500
+@@ -9,7 +9,7 @@
+ Name[cy]=UADisgrifiad (Mozilla 1.2.1 ar gyfredol)
+ Name[da]=Brugeragentbeskrivelse (Mozilla 1.2.1 på denne)
+ Name[de]=User-Agent-Kennung (Mozilla 1.2.1 on current)
+-Name[el]=UADescription (Mozilla 1.2.1 στο Ï„ÏÎχον σÏστημα)
++Name[el]=ΠεÏιγÏαφή UA (Mozilla 1.2.1 στο Ï„ÏÎχον σÏστημα)
+ Name[eo]=UA-Priskribo (Mozilo 1.2.1 sub nuna)
+ Name[es]=Descripción de AU (Mozilla 1.2.1 en actual
+ Name[et]=UADescription (Selles masinas töötav Mozilla 1.2.1)
+@@ -24,7 +24,7 @@
+ Name[hi]=यूà¤à¤¡à¥€-डिसà¥à¤•à¥à¤°à¤¿à¤ªà¥à¤¶à¤¨ (मोज़िला 1.2.1 हालिया पर)
+ Name[hu]=BöngészÅ‘tÃpus (Mozilla 1.2.1)
+ Name[is]=UAD strengur (Mozilla 1.2.1 on current)
+-Name[it]=DescrizioneUA(Mozilla 1.2.1 su sistema attuale)
++Name[it]=DescrizioneUA (Mozilla 1.2.1 su sistema attuale)
+ Name[lt]=Vartotojo agento aprašymas (Mozilla 1.2.1 ir esama)
+ Name[mk]=UADescription (Mozilla 1.2.1 на тековниот)
+ Name[mn]=UserAgent-Тодорхойлолт (Мокилла 1.2.1 идÑвхитÑй)
+@@ -51,7 +51,6 @@
+ Name[uk]=UADescription (Mozilla 1.2.1 на поточній ОС)
+ Name[uz]=UADescription (жорий билан Mozilla 1.2.1)
+ Name[vi]=UADescription (Mozilla 1.2.1 trên trình duyệt đang dùng)
+-Name[xx]=xxUADescription (Mozilla 1.2.1 on current)xx
+ Name[zh_CN]=ç”¨æˆ·ä»£ç†æè¿° (è¿è¡ŒäºŽæœ¬æœºçš„ Mozilla 1.2.1)
+ Name[zh_TW]=ä½¿ç”¨è€…ä»£ç†æè¿° (Mozilla 1.2.1 on current)
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasproviders/mozoncurrent16.desktop kdebase-branch-3.4/kcontrol/kio/uasproviders/mozoncurrent16.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasproviders/mozoncurrent16.desktop 2005-02-23 00:05:38.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasproviders/mozoncurrent16.desktop 2005-03-30 01:47:44.000000000 -0500
+@@ -9,6 +9,7 @@
+ Name[cy]=DisgrifiadUA (Mozilla 1.6 ar hyn o bryd)
+ Name[da]=Brugeragentbeskrivelse (Mozilla 1.6 på denne)
+ Name[de]=User-Agent-Kennung (Mozilla 1.6 on current)
++Name[el]=ΠεÏιγÏαφή UA (Mozilla 1.6 στο Ï„ÏÎχον σÏστημα)
+ Name[eo]=UA-Priskribo (Mozilo 1.6 sub nuna)
+ Name[es]=Descripción de AU (Mozilla 1.6 en actual)
+ Name[et]=UADescription (Selles masinas töötav Mozilla 1.6)
+@@ -40,13 +41,12 @@
+ Name[sk]=Popis agenta (Mozilla 1.6 na aktuálnom)
+ Name[sl]=UAOpis (Mozilla 1.6 na trenutnem)
+ Name[sr]=UADescription (Mozilla 1.6 на тренутном)
+-Name[sr@Latn]=UADescription (Mozilla 1.6 на тренутном)
++Name[sr@Latn]=UADescription (Mozilla 1.6 na trenutnom)
+ Name[sv]=AA-beskrivning (Mozilla 1.6 på aktuell)
+ Name[ta]=UADescription (Mozilla 1.6 தறà¯à®ªà¯à®ªà¯‹à®¤à®¿à®²à¯)
+ Name[tr]=UATanımı (güncel üzerinde Mozilla 1.6)
+ Name[uk]=UADescription (Mozilla 1.6 на поточній ОС)
+ Name[uz]=UADescription (жорий билан Mozilla 1.6)
+-Name[xx]=xxUADescription (Mozilla 1.6 on current)xx
+ Name[zh_CN]=ç”¨æˆ·ä»£ç†æè¿° (è¿è¡ŒäºŽæœ¬æœºçš„ Mozilla 1.6)
+ Type=Service
+ ServiceTypes=UserAgentStrings
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasproviders/mozonwin2000.desktop kdebase-branch-3.4/kcontrol/kio/uasproviders/mozonwin2000.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasproviders/mozonwin2000.desktop 2005-02-23 00:05:38.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasproviders/mozonwin2000.desktop 2005-03-30 01:47:44.000000000 -0500
+@@ -2,12 +2,15 @@
+ Encoding=UTF-8
+ Name=UADescription (1.2.1 on Windows 2000)
+ Name[br]=UADescription (1.2.1 war Windows 2000)
++Name[bs]=UADescription (1.2.1 na Windows 2000)
+ Name[ca]=Descripció UA (1.2.1 a Windows 2000)
+ Name[cs]=Popis agenta (1.2.1 na Windows 2000)
+ Name[da]=Brugeragentbeskrivelse (1.2.1 på Windows 2000)
+ Name[de]=User-Agent-Kennung (1.2.1 on Windows 2000)
++Name[el]=ΠεÏιγÏαφή UA (1.2.1 σε Windows 2000)
+ Name[es]=UADescription (1.2.1 en Windows 2000)
+ Name[et]=UADescription (1.2.1 Windows 2000 platvormil)
++Name[eu]=UA azalpena (1.2.1 Windows 2000n)
+ Name[fi]=Käyttäjäagenttikuvaus (1.2.1 Windows 2000)
+ Name[fr]=Identité du navigateur (1.2.1 sous Windows 2000)
+ Name[fy]=GA-omskriuwing (1.2.1 op Windows 2000)
+@@ -25,14 +28,14 @@
+ Name[pt]=UADescription (1.2.1 no Windows 2000)
+ Name[pt_BR]=Descrição (1.2.1 no Windows 2000)
+ Name[ru]=UADescription (1.2.1 на Windows 2000)
++Name[sk]=Popis agenta (1.2.1 na Windows 2000)
+ Name[sl]=UAOpis (1.2.1 na Windows 2000)
+ Name[sr]=UADescription (1.2.1 на Windows 2000)
+-Name[sr@Latn]=UADescription (1.2.1 на Windows 2000)
++Name[sr@Latn]=UADescription (1.2.1 na Windows 2000)
+ Name[sv]=AA-beskrivning (1.2.1 på Windows 2000)
+ Name[ta]=UAவிவரம௠(1.2.1 on Windows 2000)
+ Name[tr]=UA Tanımı (Windows 2000'de 1.2.1)
+ Name[uk]=UADescription (1.2.1 на Windows 2000)
+-Name[xx]=xxUADescription (1.2.1 on Windows 2000)xx
+ Name[zh_CN]=ç”¨æˆ·ä»£ç†æè¿° (è¿è¡ŒäºŽ Windows 2000 çš„ 1.2.1)
+ Type=Service
+ ServiceTypes=UserAgentStrings
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasproviders/mozonwinxp.desktop kdebase-branch-3.4/kcontrol/kio/uasproviders/mozonwinxp.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasproviders/mozonwinxp.desktop 2005-02-23 00:05:38.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasproviders/mozonwinxp.desktop 2005-03-30 01:47:44.000000000 -0500
+@@ -2,12 +2,15 @@
+ Encoding=UTF-8
+ Name=UADescription (Mozilla 1.7 on Windows XP)
+ Name[br]=UADescription (Mozilla 1.7 war Windows XP)
++Name[bs]=UADescription (Mozilla 1.7 na Windows XP)
+ Name[ca]=Descripció UA (Mozilla 1.7 a Windows XP)
+ Name[cs]=Popis agenta (Mozilla 1.7 na Windows XP)
+ Name[da]=Brugeragentbeskrivelse (Mozilla 1.7 på Windows XP)
+ Name[de]=User-Agent-Kennung (Mozilla 1.7 on Windows XP)
++Name[el]=ΠεÏιγÏαφή UA (Mozilla 1.7 σε Windows XP)
+ Name[es]=UADescription (Mozilla 1.7 en Windows XP)
+ Name[et]=UADescription (Mozilla 1.7 Windows XP platvormil)
++Name[eu]=UA azalpena (Mozilla 1.7 Windows XPn)
+ Name[fi]=Käyttäjäagenttikuvaus (Mozilla 1.7 Windows XP)
+ Name[fr]=Identité du navigateur (Mozilla 1.7 sous Windows XP)
+ Name[fy]=GA-omskriuwing (Mozilla 1.7 op Windows XP)
+@@ -24,14 +27,14 @@
+ Name[pt]=UADescription (Mozilla 1.7 no Windows XP)
+ Name[pt_BR]=Descrição (Mozilla 1.7 no Windows XP)
+ Name[ru]=UADescription (Mozilla 1.7 на Windows XP)
++Name[sk]=Popis agenta (Mozilla 1.7 na Windows XP)
+ Name[sl]=UAOpis (Mozilla 1.7 na Windows XP)
+ Name[sr]=UADescription (Mozilla 1.7 на Windows XP)
+-Name[sr@Latn]=UADescription (Mozilla 1.7 на Windows XP)
++Name[sr@Latn]=UADescription (Mozilla 1.7 na Windows XP)
+ Name[sv]=AA-beskrivning (Mozilla 1.7 på Windows XP)
+ Name[ta]=UAவிவரம௠(Mozilla 1.7 on Windows XP)
+ Name[tr]=UA Tanımı (Windows XP'de Mozilla 1.7)
+ Name[uk]=UADescription (Mozilla 1.7 на Windows XP)
+-Name[xx]=xxUADescription (Mozilla 1.7 on Windows XP)xx
+ Name[zh_CN]=ç”¨æˆ·ä»£ç†æè¿° (è¿è¡ŒäºŽ Windows XP çš„ NN 4.7)
+ Type=Service
+ ServiceTypes=UserAgentStrings
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasproviders/nn301oncurrent.desktop kdebase-branch-3.4/kcontrol/kio/uasproviders/nn301oncurrent.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasproviders/nn301oncurrent.desktop 2005-02-23 00:05:38.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasproviders/nn301oncurrent.desktop 2005-03-22 12:38:06.000000000 -0500
+@@ -13,7 +13,7 @@
+ Name[eo]=UA-Priskribo (NN 3.01 sub nuna)
+ Name[es]=Descripción de AU (NN 3.01 en actual)
+ Name[et]=UADescription (Selles masinas töötav Netscape 3.01)
+-Name[eu]=UA deskripzioa (NN 3.01 unekoan)
++Name[eu]=UA azalpena (NN 3.01 unekoan)
+ Name[fa]=UA توضیØNN Û³.Û°.Û± روی ÙØ¹Ù„ÛŒ
+ Name[fi]=Käyttäjäagenttikuvaus (NN 3.01 nykyisellä)
+ Name[fr]=Identité du navigateur (Navigator 3.01 sous le système actuel)
+@@ -55,7 +55,6 @@
+ Name[ven]=Thalutshedzo ya UA (NN 3.01 zwa zwino)
+ Name[vi]=UADescription (NN 3.01 trên trình duyệt đang dùng)
+ Name[xh]=UADescription (NN 3.01 okwangoku)
+-Name[xx]=xxUADescription (NN 3.01 on current)xx
+ Name[zh_CN]=ç”¨æˆ·ä»£ç†æè¿° (è¿è¡ŒäºŽæœ¬æœºçš„ NN 3.01)
+ Name[zh_TW]=ä½¿ç”¨è€…ä»£ç†æè¿° (NN 3.01 on current)
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasproviders/nn475oncurrent.desktop kdebase-branch-3.4/kcontrol/kio/uasproviders/nn475oncurrent.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasproviders/nn475oncurrent.desktop 2005-02-23 00:05:38.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasproviders/nn475oncurrent.desktop 2005-03-22 12:38:06.000000000 -0500
+@@ -13,7 +13,7 @@
+ Name[eo]=UA-Priskribo (NN 4.76 sub nuna)
+ Name[es]=Descripción de AU (NN 4.76 en actual)
+ Name[et]=UADescription (Selles masinas töötav Netscape 4.76)
+-Name[eu]=UA deskripzioa (NN 4.76 unekoan)
++Name[eu]=UA azalpena (NN 4.76 unekoan)
+ Name[fa]=UA توضیØNN Û´.Û·Û¶ روی ÙØ¹Ù„ÛŒ
+ Name[fi]=Käyttäjäagenttikuvaus (NN 4.76 nykyisellä)
+ Name[fr]=Identité du navigateur (Navigator 4.76 sous le système actuel)
+@@ -55,7 +55,6 @@
+ Name[ven]=Thalutshedzo ya UA (NN 4.76 zwa zwino)
+ Name[vi]=UADescription (NN 4.76 trên trình duyệt đang dùng)
+ Name[xh]=UADescription (NN 4.76 okwangoku)
+-Name[xx]=xxUADescription (NN 4.76 on current)xx
+ Name[zh_CN]=ç”¨æˆ·ä»£ç†æè¿° (è¿è¡ŒäºŽæœ¬æœºçš„ NN 4.76)
+ Name[zh_TW]=ä½¿ç”¨è€…ä»£ç†æè¿° (NN 4.76 on current)
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasproviders/nn475onwin95.desktop kdebase-branch-3.4/kcontrol/kio/uasproviders/nn475onwin95.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasproviders/nn475onwin95.desktop 2005-02-23 00:05:38.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasproviders/nn475onwin95.desktop 2005-03-22 12:38:06.000000000 -0500
+@@ -14,7 +14,7 @@
+ Name[eo]=UA-Priskribo (NN 4.7 sub Vindozo 95)
+ Name[es]=Descripción de AU (NN 4.7 en Windows 95)
+ Name[et]=UADescription (Netscape 4.7 Win95 platvormil)
+-Name[eu]=UA deskripzioa (NN 4.7 Windows 95-ean)
++Name[eu]=UA azalpena (NN 4.7 Windows 95-ean)
+ Name[fa]=UA ØªÙˆØ¶ÛŒØ NN Û´.Û· روی ویندوز Û¹Ûµ
+ Name[fi]=Käyttäjäagenttikuvaus (NN 4.7 Windows 95:lla)
+ Name[fr]=Identité du navigateur (Navigator 4.7 sous Windows 95)
+@@ -56,7 +56,6 @@
+ Name[ven]=Thalutshedzo ya UA (NN 4.7 kha 95)
+ Name[vi]=UADescription (NN 4.7 trên Windows 95)
+ Name[xh]=UADescription (NN 4.7 kwi Windows.95)
+-Name[xx]=xxUADescription (NN 4.7 on Windows 95)xx
+ Name[zh_CN]=ç”¨æˆ·ä»£ç†æè¿° (è¿è¡ŒäºŽ Windows 95 çš„ NN 4.7)
+ Name[zh_TW]=ä½¿ç”¨è€…ä»£ç†æè¿° (NN 4.7 on Windows 95)
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasproviders/nn476onppc.desktop kdebase-branch-3.4/kcontrol/kio/uasproviders/nn476onppc.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasproviders/nn476onppc.desktop 2005-02-23 00:05:38.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasproviders/nn476onppc.desktop 2005-03-22 12:38:06.000000000 -0500
+@@ -14,7 +14,7 @@
+ Name[eo]=UA-Priskribo (NN sub Mac-PPC)
+ Name[es]=Descripción de AU (NN en Mac PPC)
+ Name[et]=UADescription (Netscape MacPPC platvormil)
+-Name[eu]=UA deskripzioa (NN Mac PPC-n)
++Name[eu]=UA azalpena (NN Mac PPC-n)
+ Name[fa]=UA توضیØNN روی Mac PPC
+ Name[fi]=Käyttäjäagenttikuvaus (NN Mac PPC:llä)
+ Name[fr]=Identité du navigateur (Navigator sous Mac PPC)
+@@ -56,7 +56,6 @@
+ Name[ven]=Thalutshedzo ya UA (NN kha Mac PPC)
+ Name[vi]=UADescription (NN trên Mac PPC)
+ Name[xh]=UADescription (NN kwi Mac PPC)
+-Name[xx]=xxUADescription (NN on Mac PPC)xx
+ Name[zh_CN]=ç”¨æˆ·ä»£ç†æè¿° (è¿è¡ŒäºŽ Mac PPC çš„ NN)
+ Name[zh_TW]=ä½¿ç”¨è€…ä»£ç†æè¿° (NN on Mac PPC)
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasproviders/ns71oncurrent.desktop kdebase-branch-3.4/kcontrol/kio/uasproviders/ns71oncurrent.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasproviders/ns71oncurrent.desktop 2005-02-23 00:05:38.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasproviders/ns71oncurrent.desktop 2005-03-30 01:47:44.000000000 -0500
+@@ -2,13 +2,16 @@
+ Encoding=UTF-8
+ Name=UADescription (Netscape 7.1 on current)
+ Name[az]=İA İzahatı (Netscape 7.1 on current)
++Name[bs]=UADescription (Netscape 7.1 na trenutnom)
+ Name[ca]=Descripció UA (Netscape 7.1 a l'actual)
+ Name[cs]=Popis agenta (Netscape 7.1 na aktuálnÃm)
+ Name[da]=UADescription (Netscape 7.1 på denne)
+ Name[de]=User-Agent-Kennung (Netscape 7.1 on current)
++Name[el]=ΠεÏιγÏαφή UA (Netscape 7.1 στο Ï„ÏÎχον σÏστημα)
+ Name[eo]=UA-Priskribo (Netskapo 7.1 sub nuna)
+ Name[es]=UADescription (Netscape 7.1 en actual)
+ Name[et]=UADescription (Selles masinas töötav Netscape 7.1)
++Name[eu]=UA azalpena (Netscape 7.1 unekoan)
+ Name[fi]=Käyttäjäagenttikuvaus (Netscape 7.1 nykyisellä)
+ Name[fr]=Identité du navigateur (Netscape 7.1 sous le système actuel)
+ Name[fy]=GA-omskriuwing (Netscape 7.1 op hjoeddeisk)
+@@ -29,13 +32,13 @@
+ Name[pt]=UADescription (Netscape 7.1 no sistema actual)
+ Name[pt_BR]=Descrição (Netscape 7.1 no sistema atual)
+ Name[ru]=UADescription (Netscape 7.1 на текущей)
++Name[sk]=Popis agenta (Netscape 7.1 na aktuálnom)
+ Name[sl]=UAOpis (Netscape 7.1 na trenutnem)
+ Name[sr]=UADescription (Netscape 7.1 на тренутном)
+-Name[sr@Latn]=UADescription (Netscape 7.1 на тренутном)
++Name[sr@Latn]=UADescription (Netscape 7.1 na trenutnom)
+ Name[sv]=AA-beskrivning (Netscape 7.1 på aktuell)
+ Name[ta]=UAவிவரம௠(நடபà¯à®ªà®¿à®²à¯ 3.01 நெடà¯à®¸à¯à®•ேபà¯)
+ Name[tr]=UA Tanımı (Netscape 7.1)
+-Name[xx]=xxUADescription (Netscape 7.1 on current)xx
+ Name[zh_CN]=ç”¨æˆ·ä»£ç†æè¿° (è¿è¡ŒäºŽæœ¬æœºçš„ Netscape 7.1)
+ Type=Service
+ ServiceTypes=UserAgentStrings
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasproviders/ns71onwinnt51.desktop kdebase-branch-3.4/kcontrol/kio/uasproviders/ns71onwinnt51.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasproviders/ns71onwinnt51.desktop 2005-02-23 00:05:38.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasproviders/ns71onwinnt51.desktop 2005-03-30 01:47:44.000000000 -0500
+@@ -3,13 +3,16 @@
+ Name=UADescription (Netscape 7.1 on XP)
+ Name[az]=İA İzahatı (XP üstündə Netscape 7.1)
+ Name[br]=UADescription (Netscape 7.1 war XP)
++Name[bs]=UADescription (Netscape 7.1 na XP)
+ Name[ca]=Descripció UA (Netscape 7.1 a XP)
+ Name[cs]=Popis agenta (Netscape 7.1 na XP)
+ Name[da]=UADescription (Netscape 7.1 på XP)
+ Name[de]=User-Agent-Kennung (Netscape 7.1 on Win XP)
++Name[el]=ΠεÏιγÏαφή UA (Netscape 7.1 σε Win XP)
+ Name[eo]=UA-Priskribo (Netskapo 7.1 sub Vindozo XP)
+ Name[es]=UADescription (Netscape 7.1 en XP)
+ Name[et]=UADescription (Netscape 7.1 Win XP platvormil)
++Name[eu]=UA azalpena (Netscape 7.1 XPn)
+ Name[fi]=Käyttäjäagenttikuvaus (Netscape 7.1 Win XP:llä)
+ Name[fr]=Identité du navigateur (Netscape 7.1 sous Windows XP)
+ Name[fy]=GA-omskriuwing (Netscape 7.1 op XP)
+@@ -30,13 +33,13 @@
+ Name[pt]=UADescription (Netscape 7.1 no XP)
+ Name[pt_BR]=Descrição (Netscape 7.1 no XP)
+ Name[ru]=UADescription (Netscape 7.1 на XP)
++Name[sk]=Popis agenta (Netscape 7.1 na XP)
+ Name[sl]=UAopis (Netscape 7.1 na Windows XP)
+ Name[sr]=UADescription (Netscape 7.1 на XP)
+-Name[sr@Latn]=UADescription (Netscape 7.1 на XP)
++Name[sr@Latn]=UADescription (Netscape 7.1 na XP)
+ Name[sv]=AA-beskrivning (Netscape 7.1 på XP)
+ Name[ta]=UAவிவரம௠( XPல௠நெடà¯à®¸à¯à®•ேப௠7.1 )
+ Name[tr]=UA Tanımı (XP üzerinde Netscape 6.0)
+-Name[xx]=xxUADescription (Netscape 7.1 on XP)xx
+ Name[zh_CN]=ç”¨æˆ·ä»£ç†æè¿° (è¿è¡ŒäºŽ Win XP çš„ Netscape 7.1)
+ Type=Service
+ ServiceTypes=UserAgentStrings
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasproviders/op403onwinnt4.desktop kdebase-branch-3.4/kcontrol/kio/uasproviders/op403onwinnt4.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasproviders/op403onwinnt4.desktop 2005-02-23 00:05:38.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasproviders/op403onwinnt4.desktop 2005-03-22 12:38:06.000000000 -0500
+@@ -14,7 +14,7 @@
+ Name[eo]=UA-Priskribo (Opera 4.03 sub NT)
+ Name[es]=Descripción de AU (Opera 4.03 en NT)
+ Name[et]=UADescription (Opera 4.03 WinNT platvormil)
+-Name[eu]=UA deskripzioa (Opera 4.03 NT-n)
++Name[eu]=UA azalpena (Opera 4.03 NT-n)
+ Name[fa]=UA ØªÙˆØ¶ÛŒØ Ø§Ù¾Ø±Ø§ Û´.Û°.Û³ روی NT
+ Name[fi]=Käyttäjäagenttikuvaus (Opera 4.03 NT:llä)
+ Name[fr]=Identité du navigateur (Opera 4.03 sous Windows NT)
+@@ -57,7 +57,6 @@
+ Name[ven]=Thalutshedzo ya UA (Opera 4.03 kha NT)
+ Name[vi]=UADescription (Opera 4.03 trên NT)
+ Name[xh]=UADescription (Opera 4.03 kwi NT)
+-Name[xx]=xxUADescription (Opera 4.03 on NT)xx
+ Name[zh_CN]=ç”¨æˆ·ä»£ç†æè¿° (è¿è¡ŒäºŽ NT çš„ Opera 4.03)
+ Name[zh_TW]=ä½¿ç”¨è€…ä»£ç†æè¿° (Opera 4.03 on NT)
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasproviders/op75oncurrent.desktop kdebase-branch-3.4/kcontrol/kio/uasproviders/op75oncurrent.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasproviders/op75oncurrent.desktop 2005-02-23 00:05:38.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasproviders/op75oncurrent.desktop 2005-03-30 01:47:44.000000000 -0500
+@@ -1,12 +1,15 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=UADescription (Opera 7.53 on current)
++Name[bs]=UADescription (Opera 7.53 na trenutnom)
+ Name[ca]=Descripció UA (Opera 7.53 a l'actual)
+ Name[cs]=Popis agenta (Opera 7.53 na aktuálnÃm)
+ Name[da]=UADescription (Opera 7.53 på denne)
+ Name[de]=User-Agent-Kennung (Opera 7.53 on current)
++Name[el]=ΠεÏιγÏαφή UA (Opera 7.53 στο Ï„ÏÎχον σÏστημα)
+ Name[es]=UADescription (Opera 7.53 en actual)
+ Name[et]=UADescription (Selles masinas töötav Opera 7.53)
++Name[eu]=UA azalpena (Opera 7.53 unekoan)
+ Name[fi]=Käyttäjäagenttikuvaus (Opera 7.53 nykyisellä)
+ Name[fr]=Identité du navigateur (Opera 7.53 sous le système actuel)
+ Name[fy]=GA-omskriuwing (Opera 7.53 op hjoeddeisk)
+@@ -23,14 +26,14 @@
+ Name[pt]=UADescription (Opera 7.53 no sistema actual)
+ Name[pt_BR]=Descrição (Opera 7.53 no sistema atual)
+ Name[ru]=UADescription (Opera 7.53 на текущей)
++Name[sk]=Popis agenta (Opera 7.53 na aktuálnom)
+ Name[sl]=UAOpis (Opera 7.53 na trenutnem)
+ Name[sr]=UADescription (Opera 7.53 на тренутном)
+-Name[sr@Latn]=UADescription (Opera 7.53 на тренутном)
++Name[sr@Latn]=UADescription (Opera 7.53 na trenutnom)
+ Name[sv]=AA-beskrivning (Opera 7.53 på aktuell)
+ Name[ta]=UAவிவரம௠(நடபà¯à®ªà®¿à®²à¯ 7.53 ஓபெரா)
+ Name[tr]=UA Tanımı (bulunulanda Opera 7.53)
+ Name[uk]=UADescription (Opera 7.53 на поточній)
+-Name[xx]=xxUADescription (Opera 7.53 on current)xx
+ Name[zh_CN]=ç”¨æˆ·ä»£ç†æè¿° (è¿è¡ŒäºŽæœ¬æœºçš„ Opera 7.53)
+ Type=Service
+ ServiceTypes=UserAgentStrings
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasproviders/safari.desktop kdebase-branch-3.4/kcontrol/kio/uasproviders/safari.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasproviders/safari.desktop 2005-02-23 00:05:38.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasproviders/safari.desktop 2005-03-30 01:47:44.000000000 -0500
+@@ -2,12 +2,15 @@
+ Encoding=UTF-8
+ Name=UADescription (Safari 1.2 on MacOS X)
+ Name[br]=UADescription (Safari 1.2 war MacOS X)
++Name[bs]=UADescription (Safari 1.2 na MacOS X)
+ Name[ca]=Descripció UA (Safari 1.2 a MacOS X)
+ Name[cs]=Popis agenta (Safari 1.2 na MacOS X)
+ Name[da]=UADescription (Safari 1.2 på MacOS X)
+ Name[de]=UA-Beschreibung (Safari 1.2 on MacOS X)
++Name[el]=ΠεÏιγÏαφή UA (Safari 1.2 σε MacOS X)
+ Name[es]=UADescription (Safari 1.2 en MacOS X)
+ Name[et]=UADescription (Safari 1.2 MacOS X platvormil)
++Name[eu]=UADescription (Safari 1.2 MacOS Xn)
+ Name[fi]=Käyttäjäagenttikuvaus (Safari 1.2 MacOS X:llä)
+ Name[fr]=Identité du navigateur (Safari 1.2 sous MacOS X)
+ Name[fy]=GA-omskriuwing (Safari 1.2 op MacOS X)
+@@ -25,14 +28,14 @@
+ Name[pt]=UADescription (Safari 1.2 no MacOS X)
+ Name[pt_BR]=Descrição (Safari 1.2 no MacOS X)
+ Name[ru]=UADescription (Safari 1.2 на Mac MacOS X)
++Name[sk]=Popis agenta (Safari 1.2 na MacOS X)
+ Name[sl]=UAOpis (Safari 1.2 na MacOS X)
+ Name[sr]=UADescription (Safari 1.2 на MacOS X)
+-Name[sr@Latn]=UADescription (Safari 1.2 на MacOS X)
++Name[sr@Latn]=UADescription (Safari 1.2 na MacOS X)
+ Name[sv]=AA-beskrivning (Safari 1.2 på MacOS X)
+ Name[ta]=UAவிவரம௠(Safari 1.2 on MacOS X)
+ Name[tr]=UA Tanımı (MacOS X'de Safari 1.2)
+ Name[uk]=UADescription (Safari 1.2 на MacOS X)
+-Name[xx]=xxUADescription (Safari 1.2 on MacOS X)xx
+ Name[zh_CN]=ç”¨æˆ·ä»£ç†æè¿° (è¿è¡ŒäºŽ MacOS X çš„ Safari 1.2)
+ Type=Service
+ ServiceTypes=UserAgentStrings
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasproviders/w3moncurrent.desktop kdebase-branch-3.4/kcontrol/kio/uasproviders/w3moncurrent.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasproviders/w3moncurrent.desktop 2005-02-23 00:05:38.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasproviders/w3moncurrent.desktop 2005-03-22 12:38:06.000000000 -0500
+@@ -10,7 +10,7 @@
+ Name[el]=ΠεÏιγÏαφή UA (w3m 0.1.9)
+ Name[eo]=UA-Priskribo (w3m 0.1.9)
+ Name[es]=Descripción de AU (w3m 0.1.9)
+-Name[eu]=UA deskripzioa (w3m 0.1.9)
++Name[eu]=UA azalpena (w3m 0.1.9)
+ Name[fa]=UA توضیØw3m Û°.Û±.Û¹
+ Name[fi]=Käyttäjäagenttikuvaus (w3m 0.1.9)
+ Name[fr]=Identité du navigateur (w3m 0.1.9)
+@@ -39,7 +39,6 @@
+ Name[tg]=ТавзеҳиUA (w3m 0.1.9)
+ Name[tr]=UA Tanımı (w3m 0.1.9)
+ Name[ven]=Thalutshedzo ya UA (w3m 0.1.9)
+-Name[xx]=xxUADescription (w3m 0.1.9)xx
+ Name[zh_CN]=ç”¨æˆ·ä»£ç†æè¿° (w3m 0.1.9)
+ Name[zh_TW]=ä½¿ç”¨è€…ä»£ç†æè¿° (w3m 0.1.9)
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/uasproviders/wgetoncurrent.desktop kdebase-branch-3.4/kcontrol/kio/uasproviders/wgetoncurrent.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/uasproviders/wgetoncurrent.desktop 2005-02-23 00:05:38.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/uasproviders/wgetoncurrent.desktop 2005-03-22 12:38:06.000000000 -0500
+@@ -10,7 +10,7 @@
+ Name[el]=ΠεÏιγÏαφή UA (Wget 1.5.3)
+ Name[eo]=UA-Priskribo (Wget 1.5.3)
+ Name[es]=Descripción de AU (Wget 1.5.3)
+-Name[eu]=UA deskripzioa (Wget 1.5.3)
++Name[eu]=UA azalpena (Wget 1.5.3)
+ Name[fa]=UA توضیØWget Û±.Ûµ.Û³
+ Name[fi]=Käyttäjäagenttikuvaus (Wget 1.5.3)
+ Name[fr]=Identité du navigateur (Wget 1.5.3)
+@@ -39,7 +39,6 @@
+ Name[tg]=ТавзеҳиUA (Wget 1.5.3)
+ Name[tr]=UA Tanımı (Wget 1.5.3)
+ Name[ven]=Thalutshedzo ya UA (Wget 1.5.3)
+-Name[xx]=xxUADescription (Wget 1.5.3)xx
+ Name[zh_CN]=ç”¨æˆ·ä»£ç†æè¿° (Wget 1.5.3)
+ Name[zh_TW]=ä½¿ç”¨è€…ä»£ç†æè¿° (Wget 1.5.3)
+ Type=Service
+diff -Nru kdebase-release-3.4.0/kcontrol/kio/useragent.desktop kdebase-branch-3.4/kcontrol/kio/useragent.desktop
+--- kdebase-release-3.4.0/kcontrol/kio/useragent.desktop 2005-02-23 00:05:37.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kio/useragent.desktop 2005-03-07 09:15:21.000000000 -0500
+@@ -60,7 +60,7 @@
+ Name[sk]=Identifikácie prehliadaÄa
+ Name[sl]=Identifikacija brskalnika
+ Name[sr]=Идентификација прегледача
+-Name[sr@Latn]=Identifikacija pretraživaÄa
++Name[sr@Latn]=Identifikacija pregledaÄa
+ Name[sv]=Webbläsaridentifikation
+ Name[ta]=உலாவி அடையாளமà¯
+ Name[tg]=ШиноÑоии тафÑир
+@@ -70,7 +70,6 @@
+ Name[ven]=U talusa ha burausu
+ Name[vi]=Nháºn diện trình duyệt
+ Name[xh]=Uchazo Lomkhangeli zincwadi
+-Name[xx]=xxBrowser Identificationxx
+ Name[zh_CN]=æµè§ˆå™¨è¯†åˆ«
+ Name[zh_TW]=ç€è¦½å™¨è˜åˆ¥
+ Name[zu]=Umazisi Womcingi
+@@ -134,7 +133,6 @@
+ Comment[ven]=Dzudzanyani ndila ine Kongueror yadi vhiga ngayo
+ Comment[vi]=Cấu hình cách Konqueror tự báo
+ Comment[xh]=Qwalasela indlela i Konqueror ezichaza ngayo
+-Comment[xx]=xxConfigure the way Konqueror reports itselfxx
+ Comment[zh_CN]=é…ç½® Konqueror 的报告自己的方å¼
+ Comment[zh_TW]=è¨å®š Konqueror å›žå ±è‡ªèº«ç‹€æ³çš„æ–¹å¼
+ Comment[zu]=Hlanganisela indlela i-Konqueror ezibika ngayo
+@@ -184,7 +182,7 @@
+ Keywords[sk]=User Agent,PrehliadaÄ,Internet,WWW,SieÅ¥,agent,server,login,prihlásenie
+ Keywords[sl]=uporabniški agent,brskalnik,internet,WWW,splet,omrežje,strežnik,prijava
+ Keywords[sr]=User Ðгент,Browser,Интернет,WWW,Network,агент,bindings,Ñервер,login, Мрежа,прегледач,агент,кориÑнички агент
+-Keywords[sr@Latn]=User Agent,Browser,Internet,WWW,Network,agent,bindings,server,login, Mreža,pretraživaÄ,agent,korisniÄki agent
++Keywords[sr@Latn]=User Agent,Browser,Internet,WWW,Network,agent,bindings,server,login, Mreža,pregledaÄ,agent,korisniÄki agent
+ Keywords[sv]=Användaragent,Webbläsare,Internet,WWW,Nätverk,agent,bindningar, server,inloggning
+ Keywords[ta]=பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®ªà®µà®°à¯ à®®à¯à®•வரà¯,உலாவி,வலைபினà¯à®©à®²à¯,WWW,வலைதளமà¯,à®®à¯à®•வரà¯,bindings,சேவகனà¯,உளà¯à®¨à¯à®´à¯ˆ
+ Keywords[th]=เครื่à¸à¸‡à¸¡à¸·à¸à¸‚à¸à¸‡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰,บราวเซà¸à¸£à¹Œ,à¸à¸´à¸™à¹€à¸•à¸à¸£à¹Œà¹€à¸™à¹‡à¸•,WWW,เครืà¸à¸‚่าย,เครื่à¸à¸‡à¸¡à¸·à¸,à¸à¸²à¸£à¸ˆà¸±à¸šà¸„ู่,เซิร์ฟเวà¸à¸£à¹Œ,ล็à¸à¸à¸à¸´à¸™
+@@ -194,7 +192,6 @@
+ Keywords[ven]=Mushumisi,Buronza.Inithanete,WWW,Vhgukwamani,Mushumeli,dzithanganyo,Siva,U loga
+ Keywords[vi]=Trình khách (User Agent),Trình duyệt,Internet,WWW,Mạng,khách,tổ hợp,máy chá»§,đăng nháºp
+ Keywords[xh]=Ummeli womsebenzisi,Umkhangeli zincwadi,Internet,WWW,Umsebenzi womnatha,ummeli,izibophelelo,umncedisi,igama elithile
+-Keywords[xx]=xxUser Agent,Browser,Internet,WWW,Network,agent,bindings,server,loginxx
+ Keywords[zh_CN]=User Agent,Browser,Internet,WWW,Network,agent,bindings,server,login,用户代ç†,Agent,Browser,Internet,WWW,Network,agent,bindings,server,login,用户代ç†,æµè§ˆ,网络,代ç†,å…³è”,æœåС噍,登录
+ Keywords[zh_TW]=User Agent,Browser,Internet,WWW,Network,agent,bindings,server,login,使用者代ç†ç¨‹å¼,ç€è¦½å™¨,網際網路,網路,代ç†ç¨‹å¼,伺æœå™¨,登入
+ Keywords[zu]=Ummeli Womsebenzisi,Umcingi,Internet,WWW,Uxhumano olusakazekile, ummeli,izibongo,umlekeleli,ngena ngaphakathi
+diff -Nru kdebase-release-3.4.0/kcontrol/knotify/kcmnotify.desktop kdebase-branch-3.4/kcontrol/knotify/kcmnotify.desktop
+--- kdebase-release-3.4.0/kcontrol/knotify/kcmnotify.desktop 2005-02-10 23:51:58.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/knotify/kcmnotify.desktop 2005-03-28 02:02:17.000000000 -0500
+@@ -38,7 +38,7 @@
+ Name[hr]=Obavijesti sustava
+ Name[hu]=Rendszerüzenetek
+ Name[id]=Pemberitahuan Sistem
+-Name[is]=Tilkynningar frá kerfinu
++Name[is]=Kerfistilkynningar
+ Name[it]=Avvisi di sistema
+ Name[ja]=システム通知
+ Name[ko]=시스템 알림
+@@ -76,7 +76,6 @@
+ Name[vi]=Thông báo của hệ thống
+ Name[wa]=Notifiaedjes do sistinme
+ Name[xh]=Izaziso Zendlela esetyenziswayo
+-Name[xx]=xxSystem Notificationsxx
+ Name[zh_CN]=系统通知
+ Name[zh_TW]=系統通知
+ Name[zu]=Izaziso zesistimu
+@@ -102,7 +101,7 @@
+ Comment[fa]=تنظیم هشدارهای سیستم
+ Comment[fi]=Järjestelmähuomautusten asetukset
+ Comment[fr]=Configuration du système de notifications
+-Comment[fy]=Ynstellingen fan de systeemoankundigingen
++Comment[fy]=Ynstellings fan de systeemoankundigingen
+ Comment[gl]=Configuración dos Notificadores do Sistema
+ Comment[he]=×©×™× ×•×™ הגדרות הודעות המערכת
+ Comment[hi]=तंतà¥à¤° सूचना कॉनà¥à¤«à¤¼à¤¿à¤—रेशन
+@@ -147,7 +146,6 @@
+ Comment[vi]=Cấu hình thông báo hệ thống
+ Comment[wa]=Apontiaedje po les notifiaedjes do sistinme
+ Comment[xh]=Uqwalaselo Lwezaziso Zendlela yokusebenza
+-Comment[xx]=xxSystem Notification Configurationxx
+ Comment[zh_CN]=系统通知é…ç½®
+ Comment[zh_TW]=系統通知組態
+ Comment[zu]=Inhlanganiselo yokwazisa kwesistimu
+@@ -211,7 +209,6 @@
+ Keywords[ven]=Mubvumo wa sisitemu,Zwaupfiwa,Mubvumo,Divhadza,Divhisa,Ndivhadzo
+ Keywords[vi]=Âm thanh hệ thống,Audio,Âm thanh,Thông báo,Cảnh báo,Thông báo
+ Keywords[xh]=Izandi zendlela,Evakalayo,Isandi,Yazisa,Izilumkiso zengozi,Izaziso
+-Keywords[xx]=xxSystem sounds,Audio,Sound,Notify,Alerts,Notificationxx
+ Keywords[zh_CN]=System sounds,Audio,Sound,Notify,Alerts,Notification,系统音效,音效,通知,è¦æŠ¥
+ Keywords[zh_TW]=System sounds,Audio,Sound,Notify,Alerts,Notification,系統音效,音效,通知,è¦å ±
+ Keywords[zu]=Imisindo yesistimu,Okuzwakalayo,Umsindo,Yazisa,Ukuqwashisa, Ukwazisa
+diff -Nru kdebase-release-3.4.0/kcontrol/konq/desktop.desktop kdebase-branch-3.4/kcontrol/konq/desktop.desktop
+--- kdebase-release-3.4.0/kcontrol/konq/desktop.desktop 2005-02-21 13:17:53.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/konq/desktop.desktop 2005-03-07 09:15:23.000000000 -0500
+@@ -70,7 +70,6 @@
+ Name[ven]=Desktop nnzhi
+ Name[vi]=Äa Desktop
+ Name[xh]=Desktops Ezininzi
+-Name[xx]=xxMultiple Desktopsxx
+ Name[zh_CN]=多个桌é¢
+ Name[zh_TW]=å¤šé‡æ¡Œé¢
+ Name[zu]=Ama-Desktops amaningi
+@@ -135,7 +134,6 @@
+ Comment[ven]=Ni nga dzudzanya uri ndi desktop ngana dza zwamutshini.
+ Comment[vi]=Bạn có thể đặt bao nhiêu desktop ảo ở đây
+ Comment[xh]=Ungaqwalasela ukuba zizakubangakanani ii desktops ezingabonakaliyo.
+-Comment[xx]=xxYou can configure how many virtual desktops there are.xx
+ Comment[zh_CN]=å¯ä»¥åœ¨è¿™é‡Œé…置虚拟桌é¢çš„æ•°é‡ã€‚
+ Comment[zh_TW]=您å¯ä»¥åœ¨é€™è£¡è¨å®šè¦æœ‰å¤šå°‘個虛擬桌é¢ã€‚
+ Comment[zu]=Ungahlanganisela ukuthi mangaki ama-desktop angamanga akhona.
+@@ -190,7 +188,6 @@
+ Keywords[uk]=ÑтільницÑ,Ñтільниці,номер,віртуальна ÑтільницÑ
+ Keywords[uz]=иш Ñтоли,иш Ñтоллари,Ñон,виртуал иш Ñтоли
+ Keywords[vi]=desktop,desktops,số,desktop ảo
+-Keywords[xx]=xxdesktop,desktops,number,virtual desktopxx
+ Keywords[zh_CN]=desktop,desktops,number,virtual desktop,桌é¢,æ•°é‡,虚拟桌é¢
+
+ Categories=Qt;KDE;X-KDE-settings-desktop;
+diff -Nru kdebase-release-3.4.0/kcontrol/konq/desktopbehavior.desktop kdebase-branch-3.4/kcontrol/konq/desktopbehavior.desktop
+--- kdebase-release-3.4.0/kcontrol/konq/desktopbehavior.desktop 2005-02-23 00:05:39.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/konq/desktopbehavior.desktop 2005-03-22 12:38:07.000000000 -0500
+@@ -76,7 +76,6 @@
+ Name[vi]=Cách chạy (Behavior)
+ Name[wa]=Dujhance
+ Name[xh]=Ukuziphatha
+-Name[xx]=xxBehaviorxx
+ Name[zh_CN]=行为
+ Name[zh_TW]=行為
+ Name[zu]=Ukuziphatha
+@@ -144,7 +143,6 @@
+ Comment[vi]=Bạn có thỠcấu hình cách hoạt động của desktop ở đây
+ Comment[wa]=Vos ploz apontyî chal li dujhance do scribanne
+ Comment[xh]=Ungaqwalasela ukuziphatha kwe desktop apha
+-Comment[xx]=xxYou can configure how the desktop behaves herexx
+ Comment[zh_CN]=在这里é…置桌é¢è¡Œä¸º
+ Comment[zh_TW]=您å¯ä»¥åœ¨é€™è£¡è¨å®šæ¡Œé¢çš„行為
+ Comment[zu]=Ungahlanganisela ukuthi idesktop iziphathe kanjanilapha
+@@ -168,9 +166,9 @@
+ Keywords[hi]=कॉनà¥à¤•रर,फ़ाइलमैनेजर,केà¤à¤«à¤à¤®,संकेत,फ़ाइल संकेत,अलग विंडो,विंडो बनाà¤à¤,बरà¥à¤¤à¤¾à¤µ,आचरण,मेमोरी उपयोग,मà¥à¤– यूआरà¤à¤²,
+ Keywords[hu]=konqueror,fájlkezelő,kfm,tippek,fájltippek,külön ablak,ablakgenerálás,viselkedés,memóriahasználat,saját URL,
+ Keywords[is]=konqueror,skráastjóri,kfm,ráð,skráarráð,aðskilin gluggi,margfaldast, gluggar,hegðun,minnisnotkun,heimaslóð,
+-Keywords[it]=konqueror,filemanager,kfm,trucchi,files,separa finestre,comportamento, memoria utilizzata,home
++Keywords[it]=konqueror,filemanager,kfm,trucchi,files,separa finestre,comportamento,memoria utilizzata,home
+ Keywords[ja]=konqueror,ファイルマãƒãƒ¼ã‚¸ãƒ£,kfm,ãƒãƒƒãƒ—ス,ファイル ãƒãƒƒãƒ—ス,個別ウィンドウ, ãƒãƒƒãƒ—ウィンドウ,挙動,メモリ使用é‡,ホームURL
+-Keywords[lt]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL, bylų tvarkyklė, kfm, patarimai, atskiri langai, elgesys, elgsena, atminties naudojimas, namų URL
++Keywords[lt]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL, bylų tvarkyklė, kfm, patarimai, atskiri langai, elgesys, elgsena, atminties naudojimas, namų adresas
+ Keywords[mk]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,менаџер на датотеки,Ñовети,Ñовети за датотеки,подели го прозорецот, однеÑување,кориÑтење на меморија,Домашно URL,
+ Keywords[mn]=Конкюрор,Файл удирдагч,kfm,Зөвлөмж,Цонх,Байдал, Хувийн лавлах,Санах ойн ашиглалт
+ Keywords[mt]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,ħjilijiet,pariri,imġieba
+@@ -197,7 +195,6 @@
+ Keywords[ven]=konqueror,mulanguli wa faela,kfm,tsivhudzo,tsivhudzo ya faela,window yo fhandekanaho,spawn windows,maitele,maitele,mashumisele a muhumbulo,Haya URL,
+ Keywords[vi]=konqueror,filemanager,kfm,tips,file tips,phân cách cá»a sổ,spawn windows,cách hoạt động,cách hoạt động,bá»™ nhá»› sá» dụng,URL Nhà ,
+ Keywords[xh]=konqueror,umphathi wefayile,kfm,amancam, ifayile amancam,yahlula i window,yenza,windows, ukuziphatha,usebenziso lwenkumbulo,Ekhaya URL,
+-Keywords[xx]=xxkonqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,xx
+ Keywords[zh_CN]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,文件管ç†å™¨,æç¤º,文件æç¤º,拆分窗å£,新开窗å£,行为,内å˜ä½¿ç”¨,主 URL,
+ Keywords[zh_TW]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,徿œå®¶,檔案管ç†ç¨‹å¼,檔案密訣,分離視窗,產生視窗,行為,記憶體使用é‡,å®¶ URL,
+ Keywords[zu]=konqueror,imenenja yefayela,kfm,amacebo,amacebo efayela,i-window elahlukene,ama-window azelwe,ukuziphatha,ukuziphhatha, ukusetshenziswa kenkumbulo,i-URL yasekhaya,
+diff -Nru kdebase-release-3.4.0/kcontrol/konq/desktoppath.desktop kdebase-branch-3.4/kcontrol/konq/desktoppath.desktop
+--- kdebase-release-3.4.0/kcontrol/konq/desktoppath.desktop 2005-02-10 23:51:59.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/konq/desktoppath.desktop 2005-03-30 01:47:45.000000000 -0500
+@@ -73,7 +73,6 @@
+ Name[vi]=ÄÆ°á»ng dẫn
+ Name[wa]=Tchimins
+ Name[xh]=Umendo
+-Name[xx]=xxPathsxx
+ Name[zh_CN]=路径
+ Name[zh_TW]=路徑
+ Name[zu]=Izindlela
+@@ -137,7 +136,6 @@
+ Comment[uz]=Муҳим файлларнинг жойлашган жойини ўзгартириш
+ Comment[ven]=Shandukisani fhethu huna dzifaela dza ndeme dza vhulungwa hone
+ Comment[xh]=Tshintsha indawo apho zibekwa kona iifayile ezibalulekileyo
+-Comment[xx]=xxChange the location important files are storedxx
+ Comment[zh_CN]=更改é‡è¦æ–‡ä»¶å˜å‚¨çš„ä½ç½®
+ Comment[zh_TW]=改變儲å˜é‡è¦æª”案的ä½ç½®
+ Comment[zu]=Shintsha indawo okugcinwe kuyo amafayela abalulekile
+@@ -149,7 +147,6 @@
+ Keywords[cy]=konqueror,rheolydd ffeiliau,llwybrau,penbwrdd,sbwriel,cyfeiriaduron,awtogychwyn
+ Keywords[da]=konqueror,filhåndtering,stier,desktop,affald,mapper,autostart
+ Keywords[de]=Konqueror,Dateimanager,Pfade,Arbeitsfläche,Mülleimer,Verzeichnisse,Ordner,Autostart
+-Keywords[el]=konqueror,διαχειÏιστής αÏχείων,διαδÏομÎÏ‚,επιφάνεια εÏγασίας,σκουπίδια,κατάλογοι,αυτόματη εκκίνηση
+ Keywords[en_GB]=konqueror,filemanager,paths,desktop,wastebin,directories,autostart
+ Keywords[eo]=dosieradministrilo,labortablo,vojoj,rubo,listo,listoj
+ Keywords[es]=konqueror,administrador de archivos,rutas,escritorio,papelera,directorios,autoinicio
+@@ -192,7 +189,6 @@
+ Keywords[ven]=konqueror,mulanguli wa faela,ludila,desktop,malatwa,dzitsumbavhulwo,mathomo
+ Keywords[vi]=konqueror,trình quản lý file,đưá»ng dẫn,desktop,thùng rác,thư mục,tá»± khởi động
+ Keywords[xh]=konqueror,umphathi wefayile,umendo, desktop,umonakalo,abalawuli,qala ngokuzenzekelayo
+-Keywords[xx]=xxkonqueror,filemanager,paths,desktop,trash,directories,autostartxx
+ Keywords[zh_CN]=konqueror,filemanager,paths,desktop,trash,directories,autostart,文件管ç†å™¨,路径,桌é¢,回收站,目录,自动å¯åЍ
+ Keywords[zh_TW]=konqueror,filemanager,paths,desktop,trash,directories,autostart,徿œå®¶,檔案管ç†ç¨‹å¼,路徑,桌é¢,垃圾桶,目錄,自動啟動
+ Keywords[zu]=konqueror,imenenja yamafayela,izindlela,desktop,izibi,uhlu lwamafayela,ukuqala ngokuzenzekela
+diff -Nru kdebase-release-3.4.0/kcontrol/konq/fileappearance.desktop kdebase-branch-3.4/kcontrol/konq/fileappearance.desktop
+--- kdebase-release-3.4.0/kcontrol/konq/fileappearance.desktop 2005-02-10 23:51:59.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/konq/fileappearance.desktop 2005-03-22 12:38:07.000000000 -0500
+@@ -74,7 +74,6 @@
+ Name[vi]=Diện mạo
+ Name[wa]=Rivnance
+ Name[xh]=Inkangeleko
+-Name[xx]=xxAppearancexx
+ Name[zh_CN]=外观
+ Name[zh_TW]=外觀
+ Name[zu]=Ukubukeka
+@@ -141,7 +140,6 @@
+ Comment[ven]=Ninga dzudzanya uri na Konqueror i sedzea sa mulanguli wa faela hafhano
+ Comment[vi]=Bạn có thể cấu hình Konqueror như một trình quản lý file ở đây
+ Comment[xh]=Ungaqwalasela indlela ebonakala ngoyo i Konqueror njengomphathi wefayile
+-Comment[xx]=xxYou can configure how Konqueror looks as a file manager herexx
+ Comment[zh_CN]=在这里é…ç½® Konqueror 的文件管ç†å™¨å¤–è§‚
+ Comment[zh_TW]=您å¯ä»¥åœ¨é€™è£¡è¨å®š Konqueror åšç‚ºæª”案管ç†ç¨‹å¼çš„外觀
+ Comment[zu]=Ungahlanganisela ukuthi i-konqueror ibukeke kanjani njengemenenja yamafayela lapha
+@@ -168,7 +166,7 @@
+ Keywords[hi]=कॉनà¥à¤•रर,फ़ाइलपà¥à¤°à¤¬à¤‚धक,वरà¥à¤¡ रैप,रैप,रेखांकित,पà¥à¤°à¤•टन,फ़ाइलआकार,बाइटà¥à¤¸,फ़ॉनà¥à¤Ÿ,रंग
+ Keywords[hu]=konqueror,fájlkezelÅ‘,szótördelés,tördelés,aláhúzás,képernyÅ‘,fájlméret,bájt,betűtÃpus,szÃn,szÃnek
+ Keywords[is]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour, litir,lÃnuskipting,skjár,skjáborð,bæt,litur
+-Keywords[it]=konqueror,filemanager,a capo,sottolineatura,schermo,dimensione file,byte,caratteri,colori
++Keywords[it]=konqueror,filemanager,a capo,sottolineatura,schermo,dimensione file,byte,caratteri,colori
+ Keywords[ja]=konqueror,ファイルマãƒãƒ¼ã‚¸ãƒ£,ワードラップ,è¡Œã®æŠ˜ã‚Šè¿”ã—,下線,表示,ファイルサイズ, ãƒã‚¤ãƒˆ,フォント,色,カラー
+ Keywords[lt]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,bylų tvarkyklė, žodžių perkėlimas, perkėlimas, pabraukimas, ekranas, bylos dydis, baitai, šriftas,spalva
+ Keywords[mk]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,менаџер на датотеки,прекршување на зборови,прекршување,подвлекување,екран,големина на датотека,бајти,фонт,боја
+@@ -197,7 +195,6 @@
+ Keywords[ven]=konqueror,mulanguli wa faela,putela ha fhungo,putela,talela,sumbedza,saizi ya faela, bytes,fontu,muvhala,muvhala
+ Keywords[vi]=konqueror,trình quản lý file,word wrap,wrap,gạch chân,mà n hình,cỡ file,bytes,phông,mầu,mầu sắc
+ Keywords[xh]=konqueror,umphathi wefayile,songela amagama,songela, yenza umgca ezantsi,bonisa, ubngakanani befayile,bytes,umgca,umbala,umbala
+-Keywords[xx]=xxkonqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colourxx
+ Keywords[zh_CN]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,文件管ç†å™¨,自动æ¢è¡Œ,下划线,显示,文件大å°,å—节,å—体,颜色
+ Keywords[zh_TW]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,徿œå®¶,檔案管ç†ç¨‹å¼,æ–‡å—æ›è¡Œ,æ›è¡Œ,底線,顯示,檔案大å°,ä½å…ƒçµ„,å—åž‹,é¡è‰²
+ Keywords[zu]=konqueror,imenenja yamafayela,ukugoqwa kwamafayela, ukugoqwa,dwebela,veza,usayizi ama-byte osayizi wefayela,uhlobo lwamagama, umbala,umbala
+diff -Nru kdebase-release-3.4.0/kcontrol/konq/filebehavior.desktop kdebase-branch-3.4/kcontrol/konq/filebehavior.desktop
+--- kdebase-release-3.4.0/kcontrol/konq/filebehavior.desktop 2005-02-23 00:05:39.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/konq/filebehavior.desktop 2005-03-22 12:38:07.000000000 -0500
+@@ -76,7 +76,6 @@
+ Name[vi]=Cách chạy (Behavior)
+ Name[wa]=Dujhance
+ Name[xh]=Ukuziphatha
+-Name[xx]=xxBehaviorxx
+ Name[zh_CN]=行为
+ Name[zh_TW]=行為
+ Name[zu]=Ukuziphatha
+@@ -143,12 +142,12 @@
+ Comment[vi]=Bạn có thể cấu hình Konqueror như một trình quản lý file ở đây
+ Comment[wa]=Chal vos ploz apontyî li dujhance di Konqueror cwand i fwait do manaedjeu di fitchîs
+ Comment[xh]=Ungaqwalasela ukuziphatha kwe Konqueror njengomphathi wefayile apha
+-Comment[xx]=xxYou can configure how Konqueror behaves as a file manager herexx
+ Comment[zh_CN]=在这里é…ç½® Konqueror 的文件管ç†å™¨è¡Œä¸º
+ Comment[zh_TW]=您å¯ä»¥åœ¨é€™è£¡è¨å®š Konqueror åšç‚ºæª”案管ç†ç¨‹å¼çš„行為
+ Comment[zu]=Ungahlanganisela ukuthi i-Konqueror iziphathe kanjani njengemenenja yamafayela lapha
+ Keywords=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation
+ Keywords[bg]=работен, плот, поведение, мÑÑто, браузър, прозорец,konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,
++Keywords[bs]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation,savjeti,odvojen prozor,otvaraj prozore,ponaÅ¡anje,zauzeće memorije,mrežne operacije,traka napretka,kućni URL,poÄetni URL,smeće,brisanje,potvrda,potvrdi
+ Keywords[ca]=konqueror,gestor de fitxers,kfm,consells,consells del fitxer,finestra separada,expandir finestres,comportament,us de la memòria, URL d'inici,operacions de xarxa,dià leg de progrés,paperera,esborra,confirmacio
+ Keywords[cs]=konqueror,správce souborů,kfm,tipy,oddÄ›lené okno,chovánÃ,využità pamÄ›ti,domvské URL,sÃÅ¥ové operace,průbÄ›h,koÅ¡,potvrzenÃ
+ Keywords[da]=konqueror,filhåndtering,kfm,tip,filtip,separat vindue,flere vinduer,opførsel,hukommelsesforbrug,Hjemme-URL,netværksoperationer, fremgangsdialog,affald,slet bekræftelse
+@@ -156,22 +155,25 @@
+ Keywords[en_GB]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialogue,wastebin,delete,confirmation
+ Keywords[es]=konqueror,administrador de archivos,kfm,sugerencias,ventana separada, extender ventanas,comportamiento,uso de memoria, URL de inicio,operaciones de red, diálogo de progreso,papelera,borrar,confirmación
+ Keywords[et]=konqueror,failihaldur,kfm,vihjed,failide vihjed,eraldi aken,käitumine,mälukasutus,kodukataloog,võrguoperatsioonid,edenemisdialoog,prügikast,kustutamine
++Keywords[eu]=konqueror,fitxategi kudeatzailea,kfm,iradokizunak,fitxategi iradokizunak, aparteko leihoa,leihoak hedatu,portamoldea,memoriaren erabilera,Hasierako URLa,ezabatu, berrespena
+ Keywords[fi]=konqueror,tiedostonhallinta,kfm,vinkit,tiedostovinkit,erillinen ikkuna,erityisikkuna,käytös,muistinkäyttö,Koti-URL,kotiosoite,verkkotoiminnot,edistymisdialogi,roskakori,poisto,vahvistus
+ Keywords[fr]=konqueror,gestionnaire de fichiers,explorateur,kfm,astuces,fenêtre séparée,rafraîchissement des fenêtres,comportement,utilisation de la mémoire,Home URL,URL de démarrage,opérations réseau,fenêtre de progression,corbeille,poubelle,effacer,détruire,suppression,confirmation
+ Keywords[fy]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,ûnthâld gebrûk, ynternetadres, fuortgong, netwurk hanelingen, finsters fergrutsje, triembehearder, finsterbehearder
+ Keywords[he]=konqueror,×ž× ×”×œ קבצי×,kfm,עצות,פירוט לקבצי×,חלון × ×¤×¨×“,שימוש בזיכרון,פעולה,כתובת בית, פח זבל, ×שפה, סל מחזור, סל מחזור
+ Keywords[hu]=konqueror,fájlkezelÅ‘,kfm,tippek,fájltippek,külön ablak,ablakmegnyitás,viselkedés,memóriahasználat,saját URL,hálózati műveletek,állapotjelzÅ‘ ablak,szemétkosár,törlés,megerÅ‘sÃtés
+ Keywords[is]=konqueror,skráastjóri,kfm,ráð,skráarráð,aðskilin gluggi,margfaldast, gluggar,hegðun,minnisnotkun,heimaslóð, netaðgerðir, framvindugluggi, ruslafata,eyða, staðfesta
+-Keywords[it]=konqueror,filemanager,kfm,trucchi,files,separa finestre,comportamento, memoria utilizzata,home,operazioni di rete,avanzamento,finestra avanzamento,cestino,elimina,cancella,conferme
+-Keywords[lt]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation,bylų tvarkyklė,patarimai,bylų patarimai,langai,atskiri langai, elgesys, elgsena, atminties naudojimas, namų URL,tinklo operacijos,progreso dialogas,šiukšliadėžė,trinti,patvirtinimas
++Keywords[it]=konqueror,filemanager,kfm,trucchi,files,separa finestre,comportamento,memoria utilizzata,home,operazioni di rete,avanzamento,finestra avanzamento,cestino,elimina,cancella,conferme
++Keywords[ja]=konqueror,ファイルマãƒãƒ¼ã‚¸ãƒ£,kfm,ãƒãƒƒãƒ—ス,ファイル ãƒãƒƒãƒ—ス,個別ウィンドウ, ãƒãƒƒãƒ—ウィンドウ,挙動,メモリ使用é‡,ホームURL,ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æ“作,進æ—ダイアãƒã‚°,ã”ã¿ç®±,削除,確èª
++Keywords[lt]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation,bylų tvarkyklė,patarimai,bylų patarimai,langai,atskiri langai, elgesys, elgsena, atminties naudojimas, namų adresas,tinklo operacijos,progreso dialogas,šiukšliadėžė,trinti,patvirtinimas
+ Keywords[nb]=konqueror,filbehandler,kfm,tips,tips om filer,eget vindu,åpne vinduer,oppførsel,minnebruk,hjemmeside på nettet,nettverksoperasjoner,framdriftsviser,papirkurv
+ Keywords[nl]=konqueror,filemanager,bestandsbeheerder,kfm,tips,file tips,bestandstips,apart venster,gedrag,geheugengebruik,persoonlijke map,netwerkoperaties,voortgangsdialoog,prullenbak,verwijderen,bevestiging,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation
+ Keywords[pl]=konqueror,menedżer plików,kfm,podpowiedzi,osobne okno,nowe okna,zachowanie,zużycie pamięci,katalog domowy,kosz,pasek postępu,usuwanie,potwierdzenia,operacje sieciowe
+ Keywords[pt]=konqueror,gestor de ficheiros,kfm,dicas,dicas de ficheiros,janela separada,comportamento,utilização de memória,URL de base,operações de rede,janela de evolução,caixote do lixo,apagar,confirmação
+ Keywords[pt_BR]=konqueror,gerenciador de arquivos,kfm,dicas,arquivos de dicas,janelas separadas,janelas unidas,comportamento,uso de memória,pasta do usuário, operações de rede, diálogo de progresso, lata de lixo, remoção, confirmação
++Keywords[sk]=konqueror,správa súborov,kfm,tipy,oddelené okná,nové okná,chovanie,využitie pamäti,domovské URL,sieťové operácie,dialóg priebehu,kôš,odstránenie,potvrdenie
+ Keywords[sl]=konqueror,upravitelj datotek,upravljalnik,kfm,namig,namigi datotek,loÄeno okno,ustvari okna,obnaÅ¡anje,poraba pomnilnika,domaÄi URL, omrežne operacije,okno napredka,smeti,brisanje,potrditev
+ Keywords[sr]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation,форе,форе за фајлове,одвојени прозор,spawn прозори,понашање,иÑкоришћеноÑÑ‚ меморије,Home URL,Ñавети,Ñмеће,мрежне операције
+-Keywords[sr@Latn]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation,форе,форе за фајлове,одвојени прозор,spawn прозори,понашање,иÑкоришћеноÑÑ‚ меморије,Home URL,Ñавети,Ñмеће,мрежне операције
++Keywords[sr@Latn]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation,fore,fore za fajlove,odvojeni prozor,spawn prozori,ponašanje,iskorišćenost memorije,Home URL,saveti,smeće,mrežne operacije
+ Keywords[sv]=konqueror,filhanterare,kfm,tips,filtips,särskilt fönster,visa fönster,beteende,minnesanvändning,hemadress,nätverksåtgärder,förloppsdialogruta,papperskorg,ta bort,bekräftelse
+ Keywords[ta]=கானà¯à®•ொரரà¯,கோபà¯à®ªà¯ மேலாளரà¯,kfm,கà¯à®±à®¿à®ªà¯à®ªà¯à®•ளà¯,கோபà¯à®ªà¯ கà¯à®±à®¿à®ªà¯à®ªà¯à®•ளà¯,தனி சாளரமà¯,நீளà¯à®µà®Ÿà¯à®Ÿ சாளரமà¯,நடதà¯à®¤à¯ˆ,நினைவ௠பயனà¯à®ªà®¾à®Ÿà¯,வீடà¯à®Ÿà¯ வலைபà¯à®ªà®¿à®©à¯à®©à®²à¯,வலைபà¯à®ªà®¿à®©à¯à®©à®²à¯ செயலà¯à®ªà®¾à®Ÿà¯à®•ளà¯, வழிமà¯à®±à¯ˆ உரையாடலà¯,கà¯à®ªà¯à®ªà¯ˆà®¤à¯à®¤à¯Šà®Ÿà¯à®Ÿà®¿, நீகà¯à®•à¯,உறà¯à®¤à®¿à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à¯
+ Keywords[uk]=konqueror,менеджер файлів,kfm,підказки,підказки по файлам,окремі вікна,Ð¿Ð¾Ñ€Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ Ð²Ñ–ÐºÐ¾Ð½,поведінка,викориÑÑ‚Ð°Ð½Ð½Ñ Ð¿Ð°Ð¼'Ñті,домашній URL,робота з мережею,вікно поÑтупу,Ñмітник,
+diff -Nru kdebase-release-3.4.0/kcontrol/konq/filebrowser.desktop kdebase-branch-3.4/kcontrol/konq/filebrowser.desktop
+--- kdebase-release-3.4.0/kcontrol/konq/filebrowser.desktop 2005-02-10 23:51:59.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/konq/filebrowser.desktop 2005-03-22 12:38:07.000000000 -0500
+@@ -82,7 +82,6 @@
+ Name[vi]=Trình quản là file
+ Name[wa]=Manaedjeu di fitchîs
+ Name[xh]=Umphathi Wefayile
+-Name[xx]=xxFile Managerxx
+ Name[zh_CN]=文件管ç†å™¨
+ Name[zh_TW]=檔案管ç†ç¨‹å¼
+ Name[zu]=imenenja yamafayela
+@@ -147,7 +146,6 @@
+ Comment[ven]=Ni nga dzudzanya moudu wa mulanguli wa faela Konqueror hafhano
+ Comment[vi]=Bạn có thể cấu hình các chế độ hoạt động của Konqueror, trình quản lý file, ở đây
+ Comment[xh]=Uyakwazi ukuqwalasela apha indlela yomphathi wefayile we Konqueror
+-Comment[xx]=xxYou can configure Konqueror's file manager mode herexx
+ Comment[zh_CN]=在这里é…ç½® Konqueror 的文件管ç†å™¨æ¨¡å¼
+ Comment[zh_TW]=您å¯ä»¥åœ¨é€™è£¡è¨å®š Konqueror çš„æª”æ¡ˆç®¡ç†æ¨¡å¼
+ Comment[zu]=Ungahlanganisela indlela yemenenja yamafayela ye-konqueror lapha
+@@ -174,7 +172,7 @@
+ Keywords[hi]=कॉनà¥à¤•रर,फ़ाइलपà¥à¤°à¤¬à¤‚धक,वरà¥à¤¡ रैप,रैप,रेखांकित,पà¥à¤°à¤•टन,फ़ाइलआकार,बाइटà¥à¤¸,फ़ॉनà¥à¤Ÿ,रंग
+ Keywords[hu]=konqueror,fájlkezelÅ‘,szótördelés,tördelés,aláhúzás,képernyÅ‘,fájlméret,bájt,betűtÃpus,szÃn,szÃnek
+ Keywords[is]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour, litir,lÃnuskipting,skjár,skjáborð,bæt,litur
+-Keywords[it]=konqueror,filemanager,a capo,sottolineatura,schermo,dimensione file,byte,caratteri,colori
++Keywords[it]=konqueror,filemanager,a capo,sottolineatura,schermo,dimensione file,byte,caratteri,colori
+ Keywords[ja]=konqueror,ファイルマãƒãƒ¼ã‚¸ãƒ£,ワードラップ,è¡Œã®æŠ˜ã‚Šè¿”ã—,下線,表示,ファイルサイズ, ãƒã‚¤ãƒˆ,フォント,色,カラー
+ Keywords[lt]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,bylų tvarkyklė, žodžių perkėlimas, perkėlimas, pabraukimas, ekranas, bylos dydis, baitai, šriftas,spalva
+ Keywords[mk]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,менаџер на датотеки,прекршување на зборови,прекршување,подвлекување,екран,големина на датотека,бајти,фонт,боја
+@@ -203,7 +201,6 @@
+ Keywords[ven]=konqueror,mulanguli wa faela,putela ha fhungo,putela,talela,sumbedza,saizi ya faela, bytes,fontu,muvhala,muvhala
+ Keywords[vi]=konqueror,trình quản lý file,word wrap,wrap,gạch chân,mà n hình,cỡ file,bytes,phông,mầu,mầu sắc
+ Keywords[xh]=konqueror,umphathi wefayile,songela amagama,songela, yenza umgca ezantsi,bonisa, ubngakanani befayile,bytes,umgca,umbala,umbala
+-Keywords[xx]=xxkonqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colourxx
+ Keywords[zh_CN]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,文件管ç†å™¨,自动æ¢è¡Œ,下划线,显示,文件大å°,å—节,å—体,颜色
+ Keywords[zh_TW]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,徿œå®¶,檔案管ç†ç¨‹å¼,æ–‡å—æ›è¡Œ,æ›è¡Œ,底線,顯示,檔案大å°,ä½å…ƒçµ„,å—åž‹,é¡è‰²
+ Keywords[zu]=konqueror,imenenja yamafayela,ukugoqwa kwamafayela, ukugoqwa,dwebela,veza,usayizi ama-byte osayizi wefayela,uhlobo lwamagama, umbala,umbala
+diff -Nru kdebase-release-3.4.0/kcontrol/konq/filepreviews.desktop kdebase-branch-3.4/kcontrol/konq/filepreviews.desktop
+--- kdebase-release-3.4.0/kcontrol/konq/filepreviews.desktop 2005-02-10 23:51:59.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/konq/filepreviews.desktop 2005-03-22 12:38:07.000000000 -0500
+@@ -36,7 +36,7 @@
+ Name[hr]=Pregledi i meta podaci
+ Name[hu]=Gyorsnézetek
+ Name[is]=Forsýnir og metagögn
+-Name[it]=Anteprime & informazioni
++Name[it]=Anteprime e informazioni
+ Name[ja]=プレビュー & メタデータ
+ Name[lt]=Peržiūros ir meta duomenys
+ Name[mk]=Прегледи и мета податоци
+@@ -64,7 +64,6 @@
+ Name[uk]=ПереглÑд та метадані
+ Name[uz]=Кўриб чиқишлар ва мета-маълумот
+ Name[vi]=Xem trước & Mata-Data
+-Name[xx]=xxPreviews & Meta-Dataxx
+ Name[zh_CN]=预览和元数æ®
+
+ Comment=You can configure how Konqueror Previews & Meta-data work here
+@@ -119,7 +118,6 @@
+ Comment[tr]=Konqueror önizlemelerini buradan yapılandırabilirsiniz
+ Comment[uk]=Тут можна налаштувати роботу попереднього переглÑду Konqueror та метаданих
+ Comment[vi]=Bạn có thể cấu hình cách là m việc của bộ Xem trước & Meta-data của Konqueror ở đây
+-Comment[xx]=xxYou can configure how Konqueror Previews & Meta-data work herexx
+ Comment[zh_CN]=您å¯åœ¨æ¤é…ç½® Konqueror 预览和元数æ®å·¥ä½œçš„æ–¹å¼
+ Keywords=konqueror,filemanager,previews,file previews,maximum size
+ Keywords[af]=konqueror,filemanager,previews,file previews,maximum grootte
+@@ -174,7 +172,6 @@
+ Keywords[ven]=konqueror,mulanguli wa faela,mbonelaphanda,mbonelaphanda ya faela,saizi khulwane
+ Keywords[vi]=konqueror,trình quản lý file,xem trước,xem trước file,cơ lớn nhất
+ Keywords[xh]=konqueror,umphathi wefayile,imboniselo. iimboniselo zefayile,yandisa ubungakanani
+-Keywords[xx]=xxkonqueror,filemanager,previews,file previews,maximum sizexx
+ Keywords[zh_CN]=konqueror,filemanager,previews,file previews,maximum size,文件管ç†å™¨,预览,文件预览,最大大å°
+ Keywords[zh_TW]=konqueror,filemanager,previews,file previews,maximum size,徿œå®¶,檔案管ç†ç¨‹å¼,é 覽,檔案é 覽,最大大å°,
+ Keywords[zu]=konqueror,imenenja yamafayela,imibukiso yangaphambili, imibukiso yangaphambili yamafayela,usayizi ophezulu
+diff -Nru kdebase-release-3.4.0/kcontrol/konq/webappearance.desktop kdebase-branch-3.4/kcontrol/konq/webappearance.desktop
+--- kdebase-release-3.4.0/kcontrol/konq/webappearance.desktop 2005-02-10 23:51:59.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/konq/webappearance.desktop 2005-03-22 12:38:07.000000000 -0500
+@@ -74,7 +74,6 @@
+ Name[vi]=Diện mạo
+ Name[wa]=Rivnance
+ Name[xh]=Inkangeleko
+-Name[xx]=xxAppearancexx
+ Name[zh_CN]=外观
+ Name[zh_TW]=外觀
+ Name[zu]=Ukubukeka
+@@ -141,7 +140,6 @@
+ Comment[ven]=Ninga dzudzanya uri na Konqueror i sedzea sa mulanguli wa faela hafhano
+ Comment[vi]=Bạn có thể cấu hình Konqueror như một trình quản lý file ở đây
+ Comment[xh]=Ungaqwalasela indlela ebonakala ngoyo i Konqueror njengomphathi wefayile
+-Comment[xx]=xxYou can configure how Konqueror looks as a file manager herexx
+ Comment[zh_CN]=在这里é…ç½® Konqueror 的文件管ç†å™¨å¤–è§‚
+ Comment[zh_TW]=您å¯ä»¥åœ¨é€™è£¡è¨å®š Konqueror åšç‚ºæª”案管ç†ç¨‹å¼çš„外觀
+ Comment[zu]=Ungahlanganisela ukuthi i-konqueror ibukeke kanjani njengemenenja yamafayela lapha
+@@ -168,7 +166,7 @@
+ Keywords[hi]=कॉनà¥à¤•रर,फ़ाइलपà¥à¤°à¤¬à¤‚धक,वरà¥à¤¡ रैप,रैप,रेखांकित,पà¥à¤°à¤•टन,फ़ाइलआकार,बाइटà¥à¤¸,फ़ॉनà¥à¤Ÿ,रंग
+ Keywords[hu]=konqueror,fájlkezelÅ‘,szótördelés,tördelés,aláhúzás,képernyÅ‘,fájlméret,bájt,betűtÃpus,szÃn,szÃnek
+ Keywords[is]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour, litir,lÃnuskipting,skjár,skjáborð,bæt,litur
+-Keywords[it]=konqueror,filemanager,a capo,sottolineatura,schermo,dimensione file,byte,caratteri,colori
++Keywords[it]=konqueror,filemanager,a capo,sottolineatura,schermo,dimensione file,byte,caratteri,colori
+ Keywords[ja]=konqueror,ファイルマãƒãƒ¼ã‚¸ãƒ£,ワードラップ,è¡Œã®æŠ˜ã‚Šè¿”ã—,下線,表示,ファイルサイズ, ãƒã‚¤ãƒˆ,フォント,色,カラー
+ Keywords[lt]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,bylų tvarkyklė, žodžių perkėlimas, perkėlimas, pabraukimas, ekranas, bylos dydis, baitai, šriftas,spalva
+ Keywords[mk]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,менаџер на датотеки,прекршување на зборови,прекршување,подвлекување,екран,големина на датотека,бајти,фонт,боја
+@@ -197,7 +195,6 @@
+ Keywords[ven]=konqueror,mulanguli wa faela,putela ha fhungo,putela,talela,sumbedza,saizi ya faela, bytes,fontu,muvhala,muvhala
+ Keywords[vi]=konqueror,trình quản lý file,word wrap,wrap,gạch chân,mà n hình,cỡ file,bytes,phông,mầu,mầu sắc
+ Keywords[xh]=konqueror,umphathi wefayile,songela amagama,songela, yenza umgca ezantsi,bonisa, ubngakanani befayile,bytes,umgca,umbala,umbala
+-Keywords[xx]=xxkonqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colourxx
+ Keywords[zh_CN]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,文件管ç†å™¨,自动æ¢è¡Œ,下划线,显示,文件大å°,å—节,å—体,颜色
+ Keywords[zh_TW]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,徿œå®¶,檔案管ç†ç¨‹å¼,æ–‡å—æ›è¡Œ,æ›è¡Œ,底線,顯示,檔案大å°,ä½å…ƒçµ„,å—åž‹,é¡è‰²
+ Keywords[zu]=konqueror,imenenja yamafayela,ukugoqwa kwamafayela, ukugoqwa,dwebela,veza,usayizi ama-byte osayizi wefayela,uhlobo lwamagama, umbala,umbala
+diff -Nru kdebase-release-3.4.0/kcontrol/konq/webbehavior.desktop kdebase-branch-3.4/kcontrol/konq/webbehavior.desktop
+--- kdebase-release-3.4.0/kcontrol/konq/webbehavior.desktop 2005-02-10 23:51:59.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/konq/webbehavior.desktop 2005-03-22 12:38:07.000000000 -0500
+@@ -76,7 +76,6 @@
+ Name[vi]=Cách chạy (Behavior)
+ Name[wa]=Dujhance
+ Name[xh]=Ukuziphatha
+-Name[xx]=xxBehaviorxx
+ Name[zh_CN]=行为
+ Name[zh_TW]=行為
+ Name[zu]=Ukuziphatha
+@@ -143,7 +142,6 @@
+ Comment[vi]=Bạn có thể cấu hình Konqueror như một trình quản lý file ở đây
+ Comment[wa]=Chal vos ploz apontyî li dujhance di Konqueror cwand i fwait do manaedjeu di fitchîs
+ Comment[xh]=Ungaqwalasela ukuziphatha kwe Konqueror njengomphathi wefayile apha
+-Comment[xx]=xxYou can configure how Konqueror behaves as a file manager herexx
+ Comment[zh_CN]=在这里é…ç½® Konqueror 的文件管ç†å™¨è¡Œä¸º
+ Comment[zh_TW]=您å¯ä»¥åœ¨é€™è£¡è¨å®š Konqueror åšç‚ºæª”案管ç†ç¨‹å¼çš„行為
+ Comment[zu]=Ungahlanganisela ukuthi i-Konqueror iziphathe kanjani njengemenenja yamafayela lapha
+@@ -167,9 +165,9 @@
+ Keywords[hi]=कॉनà¥à¤•रर,फ़ाइलमैनेजर,केà¤à¤«à¤à¤®,संकेत,फ़ाइल संकेत,अलग विंडो,विंडो बनाà¤à¤,बरà¥à¤¤à¤¾à¤µ,आचरण,मेमोरी उपयोग,मà¥à¤– यूआरà¤à¤²,
+ Keywords[hu]=konqueror,fájlkezelő,kfm,tippek,fájltippek,külön ablak,ablakgenerálás,viselkedés,memóriahasználat,saját URL,
+ Keywords[is]=konqueror,skráastjóri,kfm,ráð,skráarráð,aðskilin gluggi,margfaldast, gluggar,hegðun,minnisnotkun,heimaslóð,
+-Keywords[it]=konqueror,filemanager,kfm,trucchi,files,separa finestre,comportamento, memoria utilizzata,home
++Keywords[it]=konqueror,filemanager,kfm,trucchi,files,separa finestre,comportamento,memoria utilizzata,home
+ Keywords[ja]=konqueror,ファイルマãƒãƒ¼ã‚¸ãƒ£,kfm,ãƒãƒƒãƒ—ス,ファイル ãƒãƒƒãƒ—ス,個別ウィンドウ, ãƒãƒƒãƒ—ウィンドウ,挙動,メモリ使用é‡,ホームURL
+-Keywords[lt]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL, bylų tvarkyklė, kfm, patarimai, atskiri langai, elgesys, elgsena, atminties naudojimas, namų URL
++Keywords[lt]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL, bylų tvarkyklė, kfm, patarimai, atskiri langai, elgesys, elgsena, atminties naudojimas, namų adresas
+ Keywords[mk]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,менаџер на датотеки,Ñовети,Ñовети за датотеки,подели го прозорецот, однеÑување,кориÑтење на меморија,Домашно URL,
+ Keywords[mn]=Конкюрор,Файл удирдагч,kfm,Зөвлөмж,Цонх,Байдал, Хувийн лавлах,Санах ойн ашиглалт
+ Keywords[mt]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,ħjilijiet,pariri,imġieba
+@@ -196,7 +194,6 @@
+ Keywords[ven]=konqueror,mulanguli wa faela,kfm,tsivhudzo,tsivhudzo ya faela,window yo fhandekanaho,spawn windows,maitele,maitele,mashumisele a muhumbulo,Haya URL,
+ Keywords[vi]=konqueror,filemanager,kfm,tips,file tips,phân cách cá»a sổ,spawn windows,cách hoạt động,cách hoạt động,bá»™ nhá»› sá» dụng,URL Nhà ,
+ Keywords[xh]=konqueror,umphathi wefayile,kfm,amancam, ifayile amancam,yahlula i window,yenza,windows, ukuziphatha,usebenziso lwenkumbulo,Ekhaya URL,
+-Keywords[xx]=xxkonqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,xx
+ Keywords[zh_CN]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,文件管ç†å™¨,æç¤º,文件æç¤º,拆分窗å£,新开窗å£,行为,内å˜ä½¿ç”¨,主 URL,
+ Keywords[zh_TW]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,徿œå®¶,檔案管ç†ç¨‹å¼,檔案密訣,分離視窗,產生視窗,行為,記憶體使用é‡,å®¶ URL,
+ Keywords[zu]=konqueror,imenenja yefayela,kfm,amacebo,amacebo efayela,i-window elahlukene,ama-window azelwe,ukuziphatha,ukuziphhatha, ukusetshenziswa kenkumbulo,i-URL yasekhaya,
+diff -Nru kdebase-release-3.4.0/kcontrol/konqhtml/khtml_behavior.desktop kdebase-branch-3.4/kcontrol/konqhtml/khtml_behavior.desktop
+--- kdebase-release-3.4.0/kcontrol/konqhtml/khtml_behavior.desktop 2005-02-23 00:05:39.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/konqhtml/khtml_behavior.desktop 2005-03-27 02:28:58.000000000 -0500
+@@ -67,7 +67,6 @@
+ Name[uz]=Веб хуÑуÑиÑтлари
+ Name[vi]=Thái độ của Web
+ Name[wa]=Dujhance waibe
+-Name[xx]=xxWeb Behaviorxx
+ Name[zh_CN]=Web 行为
+ Comment=Configure the browser behavior
+ Comment[af]=Konfigureer die blaaier gedrag
+@@ -120,7 +119,7 @@
+ Comment[sk]=Nastavenie chovania prehliadaÄa
+ Comment[sl]=Nastavitve obnašanja brskalnika
+ Comment[sr]=Подешавање понашања прегледача
+-Comment[sr@Latn]=PodeÅ¡avanje ponaÅ¡anja pretraživaÄa
++Comment[sr@Latn]=PodeÅ¡avanje ponaÅ¡anja pregledaÄa
+ Comment[sv]=Anpassa webbläsarens beteende
+ Comment[ta]=உலாவியின௠இயகà¯à®•தà¯à®¤à¯ˆ வடிவமை
+ Comment[tg]=Танзими рафтори тафÑир
+@@ -132,7 +131,6 @@
+ Comment[vi]=Cấu hình cách hoạt động của trình duyệt
+ Comment[wa]=Apontyî l' dujhance do betchteu waibe
+ Comment[xh]=Qwalasela indlela umkhangeli zincwadi aziphatha ngayo
+-Comment[xx]=xxConfigure the browser behaviorxx
+ Comment[zh_CN]=é…ç½®æµè§ˆå™¨è¡Œä¸º
+ Comment[zh_TW]=è¨å®šç€è¦½å™¨è¡Œç‚º
+ Comment[zu]=Hlanaganisela ukuziphatha komcingi
+@@ -169,7 +167,7 @@
+ Keywords[mn]=Конкюрор,Kfm,Хөтөч,HTML,Ð’Ñб,WWW,Бичиг,Өнгө,Java,JavaScript,ТүүчÑÑ,ХолбооÑууд,Links,Зураг,ТÑмдÑгт олонлог,Кодчилол
+ Keywords[nb]=konqueror,kfm,nettleser,html,nettet,www,veven,verdensveven,skriftyper,farger,java,javaskript,markør,tegnsett,koding,bilde,skriptspråk,Internett
+ Keywords[nds]=Konqueror,kfm,Browser,HTML,web,www,Schriftoorden,Klören,Klöör,Java,JavaScript,Cursor,Links,Biller,Tekensett,Tekensetten,Koderen
+-Keywords[nl]=konqueror,kfm,browser,html,web,www,fonts,lettertypen,kleuren,,java,,javascript,cursor,links,koppelingen,afbeeldingen,charsets,tekensets,karakterverzamelingen,codering,internet
++Keywords[nl]=konqueror,kfm,browser,html,web,www,fonts,lettertypen,kleuren,,java,,javascript,cursor,links,koppelingen,afbeeldingen,charsets,tekensets,tekenverzamelingen,codering,internet
+ Keywords[nn]=Konqueror,KFM,nettlesar,HTML,verdsveven,WWW,skrifter,fargar,Java,JavaScript,skriptspråk,Internett,peikar,lenkjer,bilete,teiknsett,koding,teiknkoding
+ Keywords[nso]=konqueror,kfm,seinyakisi,html,web,www,difonto,mebala,mebala,java,setlankana sa java,cursor,dikgokaganyi,diponagalo,charsets,dipeakanyo tsa dihlaka,go khouta
+ Keywords[pl]=konqueror,kfm,przeglądarka,html,sieć www,czcionki,kolory,java,javascript,kursor,linki,odnośniki,obrazki,zestawy znaków,kodowanie
+@@ -180,7 +178,7 @@
+ Keywords[sk]=konqueror,kfm,prehliadaÄ,html,web,www,pÃsma,farby,java,javascript,kurzor,odkazy,obrázky,znakové sady,kódovanie
+ Keywords[sl]=konqueror,kfm,brskalnik,html,splet,www,pisave,barve,java,javascript,kurzor,povezave,slike,nabori znakov,znakovni nabori,kodiranje
+ Keywords[sr]=konqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encoding,прегледач,веб,фонтови,боје,показивач,везе,Ñлике,Ñкупови знакова,кодирање
+-Keywords[sr@Latn]=konqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encoding,pretraživaÄ,veb,fontovi,boje,pokazivaÄ,veze,slike,skupovi znakova,kodiranje
++Keywords[sr@Latn]=konqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encoding,pregledaÄ,veb,fontovi,boje,pokazivaÄ,veze,slike,skupovi znakova,kodiranje
+ Keywords[sv]=konqueror,kfm,webbläsare,html,webb,www,teckensnitt,färger,java,javaskript,länkar,bilder,kodning,teckenuppsättningar
+ Keywords[ta]=கானà¯à®•ொரரà¯,kfm,உலாவி,html,வலை,www,எழà¯à®¤à¯à®¤à¯à®°à¯à®•à¯à®•ளà¯,வணà¯à®£à®™à¯à®•ளà¯,வணà¯à®£à®™à¯à®•ளà¯,ஜாவா,ஜாவா எழà¯à®¤à¯à®¤à¯à®°à¯,நிலைகà¯à®•ாடà¯à®Ÿà®¿,இணைபà¯à®ªà¯à®•ளà¯,பிமà¯à®ªà®™à¯à®•ளà¯,charsets,சொல௠அமைபà¯à®ªà¯à®•ளà¯,கà¯à®±à®¿à®¯à¯€à®Ÿà¯
+ Keywords[th]=คà¸à¸™à¹€à¸„วà¸à¸£à¹Œà¹€à¸£à¸à¸£à¹Œ,kfm,บราวเซà¸à¸£à¹Œ,html,เว็บ,www,à¹à¸šà¸šà¸à¸±à¸à¸©à¸£,สี,จาวา,จาวาสคริปต์,เคà¸à¸£à¹Œà¹€à¸‹à¸à¸£à¹Œ,à¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸à¸¡à¹‚ยง,ภาพ,ชุดรหัสà¸à¸±à¸à¸‚ระ,ชุดรหัสà¸à¸±à¸à¸‚ระ,à¸à¸²à¸£à¹€à¸‚้ารหัส
+@@ -191,7 +189,6 @@
+ Keywords[vi]=konqueror,kfm,trình duyệt,html,web,www,phông,mà u sắc,mà u,java,javascript,,liên kết,hình ảnh,ký tá»±,táºp ký tá»±,mã ký tá»±
+ Keywords[wa]=konqueror,kfm,betchteu,html,waibe,www,fontes,coleurs,java,javascript,cursoe,loyéns,imådjes,ecôdaedjes
+ Keywords[xh]=konqueror,kfm,umkhangeli zincwadi,html,web,www,imigca,imibala,imibala,java,okushicilelwe phantsi kwe java,isalatisi,amakhonkco,imifanekiso,icharsets,amaqela abasebenzi, encoding
+-Keywords[xx]=xxkonqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encodingxx
+ Keywords[zh_CN]=konqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encoding,æµè§ˆ,å—体,颜色,å…‰æ ‡,链接,图åƒ,å—符集,ç¼–ç
+ Keywords[zh_TW]=konqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encoding,ç€è¦½,å—åž‹,色彩,é¡è‰²,游標,連çµ,å½±åƒ,å—å…ƒ,å—集,編碼
+ Keywords[zu]=konqueror,kfm,umcingi,html,web,www,izinhlobo zamagama, imibala,imibala,java,javascripy,inkomba,izixhumanisi,izithombe,charsets, amaqoqo ezimpawu,ukubhala ngekhodi
+diff -Nru kdebase-release-3.4.0/kcontrol/konqhtml/khtml_fonts.desktop kdebase-branch-3.4/kcontrol/konqhtml/khtml_fonts.desktop
+--- kdebase-release-3.4.0/kcontrol/konqhtml/khtml_fonts.desktop 2005-02-23 00:05:39.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/konqhtml/khtml_fonts.desktop 2005-03-07 09:15:24.000000000 -0500
+@@ -74,7 +74,6 @@
+ Name[vi]=Phông
+ Name[wa]=Fontes
+ Name[xh]=Uhlobo lwamagama
+-Name[xx]=xxFontsxx
+ Name[zh_CN]=å—体
+ Name[zh_TW]=å—åž‹
+ Name[zu]=Izinhlobo zamagama
+@@ -139,7 +138,6 @@
+ Comment[vi]=Cấu hình phông sỠdụng trên các trang web
+ Comment[wa]=Apontyî les fontes eployeyes ezès pådjes waibe
+ Comment[xh]=Qwlasela uhlobo lwamagama asebenziswe kumaphepha e web
+-Comment[xx]=xxConfigure the fonts used on web pagesxx
+ Comment[zh_CN]=é…置网页所使用的å—体
+ Comment[zh_TW]=è¨å®šä½¿ç”¨æ–¼ç¶²é çš„å—åž‹
+ Comment[zu]=Hlanganisela uhlobo lwamagama olusetshenziswa emakhasini e-web
+@@ -183,7 +181,7 @@
+ Keywords[sk]=konqueror,kfm,prehliadaÄ,html,web,www,pÃsma,farby,znakové sady,kódovanie
+ Keywords[sl]=konqueror,kfm,brskalnik,html,splet,www,pisave,nabori znakov,znakovni nabori,kodiranje
+ Keywords[sr]=konqueror,kfm,прегледач,html,web,www,фонтови,боје,java,јаваÑцрипт,показивач,везе,Ñлике,кодни раÑпоред,Ñкуп знакова,кодирање
+-Keywords[sr@Latn]=konqueror,kfm,pretraživaÄ,html,web,www,fontovi,boje,java,javascript,pokazivaÄ,veze,slike,kodni raspored,skup znakova,kodiranje
++Keywords[sr@Latn]=konqueror,kfm,pregledaÄ,html,web,www,fontovi,boje,java,javascript,pokazivaÄ,veze,slike,kodni raspored,skup znakova,kodiranje
+ Keywords[sv]=konqueror,kfm,webbläsare,html,webb,www,teckensnitt,färger,java,javaskript,länkar,bilder,kodning,teckenuppsättningar
+ Keywords[ta]=கானà¯à®•ொரரà¯, கோபà¯à®ªà¯ மேலாளரà¯, html,வலை, www,எழà¯à®¤à¯à®¤à¯à®°à¯, எழà¯à®¤à¯à®¤à®®à¯ˆà®ªà¯à®ªà¯ à®®à¯à®±à¯ˆ,எழà¯à®¤à¯à®¤à®®à¯ˆà®ªà¯à®ªà¯ à®®à¯à®±à¯ˆ, கà¯à®±à®¿à®¯à¯€à®Ÿà¯ à®®à¯à®±à¯ˆ
+ Keywords[th]=คà¸à¸™à¹€à¸„วà¸à¸£à¹Œà¹€à¸£à¸à¸£à¹Œ,kfm,บราวเซà¸à¸£à¹Œ,html,เว็บ,www,à¹à¸šà¸šà¸à¸±à¸à¸©à¸£,à¸à¸±à¸à¸‚ระ,ชุดà¸à¸±à¸à¸‚ระ,à¸à¸²à¸£à¹€à¸‚้ารหัส
+@@ -194,7 +192,6 @@
+ Keywords[vi]=konqueror,kfm,trình duyệt,html,web,www,phông,ký tự,bảng ký tự, mã ký tự
+ Keywords[wa]=konqueror,kfm,betchteu,html,waibe,www,fontes,ecôdaedjes,ecôdaedje
+ Keywords[xh]=konqueror,kfm,umkhangeli zincwadi,html,web,www,imigca, amaqela abasebenzisi,encoding
+-Keywords[xx]=xxkonqueror,kfm,browser,html,web,www,fonts,charsets,character sets,encodingxx
+ Keywords[zh_CN]=konqueror,kfm,browser,html,web,www,fonts,charsets,character sets,encoding,æµè§ˆå™¨,网页,å—体,å—符集,ç¼–ç
+ Keywords[zh_TW]=konqueror,kfm,browser,html,web,www,fonts,charsets,character sets,徿œå®¶,å—å…ƒ,å—元集,編碼,ç€è¦½å™¨,å—åž‹,ç¶²é
+ Keywords[zu]=konqueror,kfm,umcingi,html,web,www,izinhlobo zamagama,charsets,amaqoqo ezimpawu,ukubhala ngekhodi
+diff -Nru kdebase-release-3.4.0/kcontrol/konqhtml/khtml_java_js.desktop kdebase-branch-3.4/kcontrol/konqhtml/khtml_java_js.desktop
+--- kdebase-release-3.4.0/kcontrol/konqhtml/khtml_java_js.desktop 2005-02-23 00:05:40.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/konqhtml/khtml_java_js.desktop 2005-03-07 09:15:24.000000000 -0500
+@@ -55,7 +55,6 @@
+ Name[th]=จาวาà¹à¸¥à¸°à¸ˆà¸²à¸§à¸²à¸ªà¸„ริปต์
+ Name[uz]=Java ва JavaScript
+ Name[wa]=Java eyet JavaScript
+-Name[xx]=xxJava & JavaScriptxx
+ Name[zh_CN]=Java 和 JavaScript
+ Comment=Configure the behavior of Java and JavaScript
+ Comment[af]=Konfigureer die gedrag van Java en Javaskrip
+@@ -121,7 +120,6 @@
+ Comment[vi]=Cấu hình cách hoạt động cuat Java và JavaScript
+ Comment[wa]=Apontyî li dujhance pol Java eyet l' JavaScript
+ Comment[xh]=Qwalasela ukuziphatha kwe Java ne JavaScript
+-Comment[xx]=xxConfigure the behavior of Java and JavaScriptxx
+ Comment[zh_CN]=é…ç½® Java å’Œ JavaScript 的行为
+ Comment[zh_TW]=è¨å®š Java 與 JavaScript 的行為
+ Comment[zu]=Hlanganisela ukuthi i-Java kanye ne-JavaScript iziphathe kanjani
+@@ -167,7 +165,7 @@
+ Keywords[sk]=konqueror,kfm,prehliadaÄ,html,web,www,java,javascript
+ Keywords[sl]=konqueror,kfm,brskalnik,html,splet,www,java,javascript
+ Keywords[sr]=konqueror,kfm,прегледач,html,web,www,java,javascript
+-Keywords[sr@Latn]=konqueror,kfm,pretraživaÄ,html,web,www,java,javascript
++Keywords[sr@Latn]=konqueror,kfm,pregledaÄ,html,web,www,java,javascript
+ Keywords[sv]=konqueror,kfm,webbläsare,html,webb,www,teckensnitt,färger,java,javaskript,länkar,bilder,kodning,teckenuppsättningar
+ Keywords[ta]=கானà¯à®•ொரரà¯,kfm,உலாவி,html,வலை,www,ஜாவா,ஜாவா எழà¯à®¤à¯à®¤à®¾à®•à¯à®•à®®à¯
+ Keywords[th]=คà¸à¸™à¹€à¸„วà¸à¸£à¹Œà¹€à¸£à¸à¸£à¹Œ,kfm,บราวเซà¸à¸£à¹Œ,html,เว็บ,www,จาวา,จาวาสคริปต์
+@@ -178,7 +176,6 @@
+ Keywords[vi]=konqueror,kfm,trình duyệt,html,web,www,java,javascript
+ Keywords[wa]=konqueror,kfm,betchteu,html,waibe,waibes,www,java,javascript
+ Keywords[xh]=konqueror,kfm,umkhangeli zincwadi,html,web, www,java,okushicilelwe phantsi kwe java
+-Keywords[xx]=xxkonqueror,kfm,browser,html,web,www,java,javascriptxx
+ Keywords[zh_CN]=konqueror,kfm,browser,html,web,www,java,javascript,æµè§ˆå™¨
+ Keywords[zh_TW]=konqueror,kfm,browser,html,web,www,java,javascript,徿œå®¶,ç€è¦½å™¨,ç¶²é
+ Keywords[zu]=konqueror,kfm,umcingi,html,web,www,java,javascript
+diff -Nru kdebase-release-3.4.0/kcontrol/konsole/kcmkonsole.desktop kdebase-branch-3.4/kcontrol/konsole/kcmkonsole.desktop
+--- kdebase-release-3.4.0/kcontrol/konsole/kcmkonsole.desktop 2005-02-10 23:52:00.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/konsole/kcmkonsole.desktop 2005-03-07 09:15:24.000000000 -0500
+@@ -42,7 +42,6 @@
+ Name[tg]=КонÑол
+ Name[th]=คà¸à¸™à¹‚ซล K
+ Name[uz]=КонÑол
+-Name[xx]=xxKonsolexx
+ Name[zu]=Ikhonsoli
+ Comment=Konsole configuration module
+ Comment[af]=Konsole opstelling module
+@@ -108,7 +107,6 @@
+ Comment[vi]=Module cấu hình Konsole
+ Comment[wa]=Module d' apontiaedje do terminå di KDE Konsole
+ Comment[xh]=Umnqongo woqwalaselo we Konsole
+-Comment[xx]=xxKonsole configuration modulexx
+ Comment[zh_CN]=Konsole é…置模å—
+ Comment[zh_TW]=Konsole 組態模組
+ Comment[zu]=Ingxenye yokuhlanganisela ikhonsoli
+@@ -167,7 +165,6 @@
+ Keywords[ven]=konsole,tshikimu,vhuvha ha konsole,mivhala ya konsole,theminala,apulifikhesheni ya theminala,theminala
+ Keywords[vi]=konsole,schema,ảnh ná»n cá»§a kónole,mà u,ná»n,trình đầu cuối,đầu cuối
+ Keywords[xh]=konsole,schema,imvelaphi ye konsole,imibala,imvelaphi,isicelo sesiphelo sendlela,isiphelo sendlela
+-Keywords[xx]=xxkonsole,schema,konsole background,colors,background,terminal application,terminalxx
+ Keywords[zh_CN]=konsole,schema,konsole background,colors,background,terminal application,terminal,颜色,背景色,终端程åº,终端
+ Keywords[zh_TW]=konsole,schema,konsole background,colors,background,terminal application,terminal,é…色,konsole 背景,é¡è‰²,背景,終端機應用程å¼,終端機
+ Keywords[zu]=konsole,iplani,inkundla yekhonsoli,imibala,inkundla, umyaleli wangaphandle,ithuluzi langaphandle
+diff -Nru kdebase-release-3.4.0/kcontrol/konsole/sessioneditor.cpp kdebase-branch-3.4/kcontrol/konsole/sessioneditor.cpp
+--- kdebase-release-3.4.0/kcontrol/konsole/sessioneditor.cpp 2004-06-27 12:18:49.000000000 -0400
++++ kdebase-branch-3.4/kcontrol/konsole/sessioneditor.cpp 2005-03-16 13:18:52.000000000 -0500
+@@ -30,6 +30,7 @@
+ #include <kmessagebox.h>
+ #include <kurlrequester.h>
+ #include <klineedit.h>
++#include <kiconloader.h>
+
+ // SessionListBoxText is a list box text item with session filename
+ class SessionListBoxText : public QListBoxText
+@@ -54,6 +55,8 @@
+ loaded=false;
+
+ KGlobal::locale()->insertCatalogue("konsole"); // For schema and keytab translations
++ KGlobal::iconLoader()->addAppDir( "konsole" );
++
+ directoryLine->setMode(KFile::Directory);
+ connect(sessionList, SIGNAL(highlighted(int)), this, SLOT(readSession(int)));
+ connect(saveButton, SIGNAL(clicked()), this, SLOT(saveCurrent()));
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/AtlasGreen.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/AtlasGreen.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/AtlasGreen.kcsrc 2005-02-10 23:52:00.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/AtlasGreen.kcsrc 2005-03-07 09:15:24.000000000 -0500
+@@ -56,7 +56,6 @@
+ Name[ven]=Atlas Dala
+ Name[vi]=MÃ u xanh Atlas
+ Name[xh]=Okuluhlaza kwe Atlas
+-Name[xx]=xxAtlas Greenxx
+ Name[zh_CN]=地图绿
+ Name[zh_TW]=Atlas ç¶
+ background=#afb49f
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/BeOS.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/BeOS.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/BeOS.kcsrc 2004-10-26 22:59:21.000000000 -0400
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/BeOS.kcsrc 2005-03-07 09:15:24.000000000 -0500
+@@ -13,7 +13,6 @@
+ Name[lo]=ລະບົບປະຕິບັດàºàº²àº™ BeOS
+ Name[tg]=СиÑтемаи омили Be
+ Name[th]=ระบบปà¸à¸´à¸šà¸±à¸•ิà¸à¸²à¸£ BeOS
+-Name[xx]=xxBeOSxx
+ contrast=7
+ background=217,217,217
+ buttonBackground=217,217,217
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/BlackOnWhite.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/BlackOnWhite.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/BlackOnWhite.kcsrc 2005-02-23 00:05:40.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/BlackOnWhite.kcsrc 2005-03-30 01:47:45.000000000 -0500
+@@ -1,12 +1,15 @@
+ [Color Scheme]
+ Name=High Contrast Black Text
+ Name[bn]=হাই কনটà§à¦°à¦¾à¦¸à§à¦Ÿ কালো লেখা
++Name[bs]=Visoki kontrast, crni tekst
+ Name[ca]=Text negre d'alt contrast
+ Name[cs]=Vysoký kontrast, Äerný text
+ Name[da]=Sort tekst med høj kontrast
+ Name[de]=Hoher Kontrast, Schwarz auf Weiß
++Name[el]=ΜάυÏο κείμενο υψηλής αντίθεσης
+ Name[es]=Texto negro de alto contraste
+ Name[et]=Väga kontrastne must tekst
++Name[eu]=Kontraste handiko zuria beltzaren gainean
+ Name[fi]=Valkoista mustalla suurilla värivastakohdilla
+ Name[fr]=Texte en noir avec contraste élevé
+ Name[fy]=Heech kontrast swarte tekst
+@@ -23,13 +26,13 @@
+ Name[pt_BR]=Alto Contraste do Texto Preto
+ Name[ru]=Ð’Ñ‹ÑококонтраÑтный черный текÑÑ‚
+ Name[se]=Alla vuostálasvuohta, Äáhppes teaksta
++Name[sk]=Čierny text s vysokým kontrastom
+ Name[sl]=Visoko kontrastno Ärno besedilo
+ Name[sr]=Црни текÑÑ‚ виÑоког контраÑта
+-Name[sr@Latn]=Црни текÑÑ‚ виÑоког контраÑта
++Name[sr@Latn]=Crni tekst visokog kontrasta
+ Name[sv]=Svart text med hög kontrast
+ Name[ta]=அதிக மாறà¯à®ªà®Ÿà¯à®Ÿ கறà¯à®ªà¯à®ªà¯ மீத௠வெளà¯à®³à¯ˆ உரை
+ Name[uk]=ВиÑоко-контраÑтний чорний текÑÑ‚
+-Name[xx]=xxHigh Contrast Black Textxx
+ Name[zh_CN]=高对比黑å—
+ activeBackground=165,165,255
+ activeBlend=165,165,255
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/BlueSlate.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/BlueSlate.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/BlueSlate.kcsrc 2005-02-04 23:15:03.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/BlueSlate.kcsrc 2005-03-22 12:38:07.000000000 -0500
+@@ -27,7 +27,7 @@
+ Name[hr]=Plava ploÄa
+ Name[hu]=Kékes árnyalat
+ Name[is]=Bláar flögur
+-Name[it]=Blue ardesia
++Name[it]=Blu ardesia
+ Name[ja]=ブルースレート
+ Name[lo]=ເຈ້àºàºªàºµàºŸà»‰àº²
+ Name[lt]=Pilkai mÄ—lyna
+@@ -56,7 +56,6 @@
+ Name[uz]=Кўкиш кул
+ Name[ven]=Tshileiti tsha lutombo
+ Name[vi]=Xanh xám
+-Name[xx]=xxBlue Slatexx
+ Name[zh_CN]=è“ç°
+ Name[zh_TW]=è—ç°
+ background=#9db9c8
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/CDE.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/CDE.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/CDE.kcsrc 2004-10-26 22:59:21.000000000 -0400
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/CDE.kcsrc 2005-03-07 09:15:24.000000000 -0500
+@@ -7,7 +7,6 @@
+ Name[mn]=КДE
+ Name[tg]=Муҳити графикии муштарак (CDE)
+ Name[th]=à¹à¸šà¸š CDE
+-Name[xx]=xxCDExx
+ background=#999999
+ buttonBackground=#999999
+ buttonForeground=#ffffff
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/DarkBlue.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/DarkBlue.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/DarkBlue.kcsrc 2005-02-04 23:15:03.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/DarkBlue.kcsrc 2005-03-07 09:15:24.000000000 -0500
+@@ -77,7 +77,6 @@
+ Name[ven]=Lutombo lwo nzwinzwimalaho
+ Name[vi]=Mà u xanh thẫm
+ Name[xh]=Luhlaza buntsundu (okwesibhaka-bhaka)
+-Name[xx]=xxDark Bluexx
+ Name[zh_CN]=æ·±è“
+ Name[zh_TW]=æ·±è—
+ Name[zu]=Okuluhlaza kakhulu
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/DesertRed.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/DesertRed.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/DesertRed.kcsrc 2005-02-04 23:15:03.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/DesertRed.kcsrc 2005-03-07 09:15:24.000000000 -0500
+@@ -57,7 +57,6 @@
+ Name[vi]=Äá» chói
+ Name[wa]=Rodje do dezert
+ Name[xh]=Bomvu Krwe
+-Name[xx]=xxDesert Redxx
+ Name[zh_CN]=æ²™æ¼ çº¢
+ Name[zh_TW]=æ²™æ¼ ç´…
+ Name[zu]=Okubovu okogwadule
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/DigitalCDE.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/DigitalCDE.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/DigitalCDE.kcsrc 2005-02-04 23:15:03.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/DigitalCDE.kcsrc 2005-03-07 09:15:24.000000000 -0500
+@@ -36,7 +36,6 @@
+ Name[ven]=CDE ya Didzhithala
+ Name[vi]=CDE số
+ Name[xh]=CDE Ebonisa Inani Ngalinye
+-Name[xx]=xxDigital CDExx
+ Name[zh_TW]=æ•¸ä½ CDE
+ Name[zu]=I-CDE eyizinombolo
+ background=#4b7b82
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/EveX.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/EveX.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/EveX.kcsrc 2004-10-26 22:59:21.000000000 -0400
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/EveX.kcsrc 2005-03-07 09:15:24.000000000 -0500
+@@ -6,7 +6,6 @@
+ Name[lo]=à»àºšàºš EveX
+ Name[pl]=WigiliaX
+ Name[th]=à¹à¸šà¸š EveX
+-Name[xx]=xxEveXxx
+ activeBackground=233,233,233
+ activeBlend=233,233,233
+ activeForeground=2,2,2
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/KDEOne.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/KDEOne.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/KDEOne.kcsrc 2004-10-26 22:59:21.000000000 -0400
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/KDEOne.kcsrc 2005-03-07 09:15:24.000000000 -0500
+@@ -23,7 +23,6 @@
+ Name[mn]=КДР1
+ Name[pa]=KDE à©§
+ Name[th]=à¹à¸šà¸š KDE 1
+-Name[xx]=xxKDE 1xx
+ selectBackground=0,0,128
+ selectForeground=255,255,255
+ visitedLinkColor=255,0,255
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/KDETwo.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/KDETwo.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/KDETwo.kcsrc 2004-10-26 22:59:21.000000000 -0400
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/KDETwo.kcsrc 2005-03-07 09:15:24.000000000 -0500
+@@ -21,7 +21,6 @@
+ Name[mn]=КДР2
+ Name[pa]=KDE ੨
+ Name[th]=à¹à¸šà¸š KDE 2
+-Name[xx]=xxKDE 2xx
+ selectBackground=10,95,137
+ selectForeground=255,255,255
+ visitedLinkColor=128,0,128
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/Keramik.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/Keramik.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/Keramik.kcsrc 2005-02-04 23:15:03.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/Keramik.kcsrc 2005-03-07 09:15:24.000000000 -0500
+@@ -21,7 +21,6 @@
+ Name[th]=เครามิà¸
+ Name[uk]=Керамік
+ Name[uz]=Керамика
+-Name[xx]=xxKeramikxx
+ activeBackground=62,145,235
+ activeBlend=62,145,235
+ activeForeground=255,255,255
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/KeramikEmerald.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/KeramikEmerald.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/KeramikEmerald.kcsrc 2005-02-10 23:52:00.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/KeramikEmerald.kcsrc 2005-03-07 09:15:24.000000000 -0500
+@@ -39,7 +39,6 @@
+ Name[th]=เครามิà¸à¸¡à¸£à¸à¸•
+ Name[uz]=Зумрад керамика
+ Name[vi]=Keramik lục bảo
+-Name[xx]=xxKeramik Emeraldxx
+ Name[zh_CN]=Keramik ç¿ ç»¿
+ Name[zh_TW]=ç¶ å¯¶çŸ³ Keramik
+ activeBackground=213,166,55
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/KeramikWhite.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/KeramikWhite.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/KeramikWhite.kcsrc 2005-02-10 23:52:00.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/KeramikWhite.kcsrc 2005-03-07 09:15:25.000000000 -0500
+@@ -54,7 +54,6 @@
+ Name[uz]=Оқ керамика
+ Name[vi]=Keramik trắng
+ Name[xh]=Keramik Emhlophe
+-Name[xx]=xxKeramik Whitexx
+ Name[zh_CN]=Keramik 白
+ Name[zh_TW]=Keramik 白
+ Name[zu]=Okumhlophe kwe-Keramik
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/MediaPeach.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/MediaPeach.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/MediaPeach.kcsrc 2005-02-10 23:52:00.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/MediaPeach.kcsrc 2005-03-07 09:15:25.000000000 -0500
+@@ -31,7 +31,6 @@
+ Name[uz]=Шафтоли
+ Name[ven]=Beregisi Zwimvumvusi
+ Name[xh]=Peach Esesiphakathini
+-Name[xx]=xxMedia Peachxx
+ Name[zh_CN]=Media 桃色
+ Name[zh_TW]=Media 桃紅
+ Name[zu]=Unozindaba osapetshisi
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/Next.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/Next.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/Next.kcsrc 2004-11-27 23:29:39.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/Next.kcsrc 2005-03-07 09:15:25.000000000 -0500
+@@ -42,7 +42,6 @@
+ Name[vi]=Tiếp theo
+ Name[wa]=NeXT
+ Name[xh]=Elandelayo
+-Name[xx]=xxNextxx
+ Name[zh_TW]=下一個
+ Name[zu]=Okulandelayo
+ selectBackground=0,0,0
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/PaleGray.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/PaleGray.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/PaleGray.kcsrc 2005-02-04 23:15:03.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/PaleGray.kcsrc 2005-03-07 09:15:25.000000000 -0500
+@@ -56,7 +56,6 @@
+ Name[ven]=Lutada lwo tshenuluwaho
+ Name[vi]=Mà u xám nhạt
+ Name[xh]=Ngwevu Bumbatsha
+-Name[xx]=xxPale Grayxx
+ Name[zh_CN]=ç°ç™½
+ Name[zh_TW]=ç°ç™½
+ Name[zu]=Okumpunga ngokukhanyayo
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/Plastik.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/Plastik.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/Plastik.kcsrc 2005-02-10 23:52:00.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/Plastik.kcsrc 2005-03-07 09:15:25.000000000 -0500
+@@ -22,7 +22,6 @@
+ Name[th]=พลาสติà¸
+ Name[uk]=ПлаÑтік
+ Name[uz]=ПлаÑтик
+-Name[xx]=xxPlastikxx
+ activeBackground=65,142,220
+ activeBlend=107,145,184
+ activeForeground=255,255,255
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/PointReyesGreen.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/PointReyesGreen.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/PointReyesGreen.kcsrc 2005-02-04 23:15:03.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/PointReyesGreen.kcsrc 2005-03-07 09:15:25.000000000 -0500
+@@ -62,7 +62,6 @@
+ Name[ven]=Kha Muvhala mudala
+ Name[vi]=MÃ u xanh Point Reyes
+ Name[xh]=Point Reyes Green (okwengca)
+-Name[xx]=xxPoint Reyes Greenxx
+ Name[zh_TW]=Point Reyes ç¶
+ selectBackground=65,127,75
+ selectForeground=255,255,255
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/Pumpkin.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/Pumpkin.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/Pumpkin.kcsrc 2005-02-04 23:15:03.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/Pumpkin.kcsrc 2005-03-07 09:15:25.000000000 -0500
+@@ -60,7 +60,6 @@
+ Name[uz]=Қовоқ
+ Name[ven]=Fhuri
+ Name[xh]=Ithanga
+-Name[xx]=xxPumpkinxx
+ Name[zh_CN]=å—瓜黄
+ Name[zh_TW]=å—瓜黃
+ Name[zu]=Ithanga
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/SolarisCDE.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/SolarisCDE.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/SolarisCDE.kcsrc 2004-10-26 22:59:21.000000000 -0400
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/SolarisCDE.kcsrc 2005-03-07 09:15:25.000000000 -0500
+@@ -15,7 +15,6 @@
+ Name[th]=โซลาริส
+ Name[ven]=Solarisi
+ Name[xh]=Isikhanyiso esenziwa lilanga
+-Name[xx]=xxSolarisxx
+ activeBackground=178,77,122
+ activeBlend=174,178,195
+ activeForeground=255,255,255
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/Storm.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/Storm.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/Storm.kcsrc 2005-02-04 23:15:03.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/Storm.kcsrc 2005-03-07 09:15:25.000000000 -0500
+@@ -58,7 +58,6 @@
+ Name[ven]=Madumbu
+ Name[wa]=Timpesse
+ Name[xh]=Isikhukhula
+-Name[xx]=xxStormxx
+ Name[zh_CN]=风暴
+ Name[zh_TW]=風暴
+ Name[zu]=Ukuduma
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/System.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/System.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/System.kcsrc 2005-02-04 23:15:03.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/System.kcsrc 2005-03-07 09:15:25.000000000 -0500
+@@ -80,7 +80,6 @@
+ Name[vi]=Hệ Thống
+ Name[wa]=Sistinme
+ Name[xh]=Indlela esestyenziswayo
+-Name[xx]=xxSystemxx
+ Name[zh_CN]=系统
+ Name[zh_TW]=系統
+ Name[zu]=Isistimu
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/WhiteOnBlack.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/WhiteOnBlack.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/WhiteOnBlack.kcsrc 2005-02-23 00:05:40.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/WhiteOnBlack.kcsrc 2005-03-30 01:47:45.000000000 -0500
+@@ -1,12 +1,15 @@
+ [Color Scheme]
+ Name=High Contrast White Text
+ Name[bn]=হাই কনটà§à¦°à¦¾à¦¸à§à¦Ÿ সাদা লেখা
++Name[bs]=Visoki kontrast, bijeli tekst
+ Name[ca]=Text blanc d'alt contrast
+ Name[cs]=Vysoký kontrast, bÃlý text
+ Name[da]=Hvid tekst med høj kontrast
+ Name[de]=Hoher Kontrast, Weiß auf Schwarz
++Name[el]=ΆσπÏο κείμενο υψηλής αντίθεσης
+ Name[es]=Texto blanco de alto contraste
+ Name[et]=Väga kontrastne valge tekst
++Name[eu]=Kontraste handiko testu zuria
+ Name[fi]=Suuren värikontrastin valkoinen teksti
+ Name[fr]=Texte en blanc avec contraste élevé
+ Name[fy]=Heech kontrast wyte tekst
+@@ -22,13 +25,13 @@
+ Name[pt_BR]=Alto Contraste do Texto Branco
+ Name[ru]=Ð’Ñ‹ÑококонтраÑтный белый текÑÑ‚
+ Name[se]=Alla vuostálasvuohta, vilges teaksta
++Name[sk]=Biely text s vysokým kontrastom
+ Name[sl]=Visoko kontrastno belo besedilo
+ Name[sr]=Бели текÑÑ‚ виÑоког контраÑта
+-Name[sr@Latn]=Бели текÑÑ‚ виÑоког контраÑта
++Name[sr@Latn]=Beli tekst visokog kontrasta
+ Name[sv]=Vit text med hög kontrast
+ Name[ta]=அதிக மாறà¯à®ªà®Ÿà¯à®Ÿ வெளà¯à®³à¯ˆ உரை
+ Name[uk]=ВиÑоко-контраÑтний білий текÑÑ‚
+-Name[xx]=xxHigh Contrast White Textxx
+ activeBackground=0,0,90
+ activeBlend=0,0,90
+ activeForeground=255,255,255
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/Windows2000.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/Windows2000.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/Windows2000.kcsrc 2004-10-26 22:59:21.000000000 -0400
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/Windows2000.kcsrc 2005-03-07 09:15:25.000000000 -0500
+@@ -13,7 +13,6 @@
+ Name[uk]=Редмонд 2000
+ Name[uz]=Редмонд 2000
+ Name[ven]=Redmond gidimbili
+-Name[xx]=xxRedmond 2000xx
+ activeBackground=0,36,104
+ activeBlend=168,204,240
+ activeForeground=255,255,255
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/Windows95.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/Windows95.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/Windows95.kcsrc 2004-10-26 22:59:21.000000000 -0400
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/Windows95.kcsrc 2005-03-07 09:15:25.000000000 -0500
+@@ -14,7 +14,6 @@
+ Name[uk]=Редмонд 95
+ Name[uz]=Редмонд 95
+ Name[ven]=Redmond Futahe thanu
+-Name[xx]=xxRedmond 95xx
+ background=#c3c3c3
+ buttonBackground=#c3c3c3
+ buttonForeground=#000000
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/WindowsXP.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/WindowsXP.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/WindowsXP.kcsrc 2004-10-26 22:59:21.000000000 -0400
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/WindowsXP.kcsrc 2005-03-07 09:15:25.000000000 -0500
+@@ -12,7 +12,6 @@
+ Name[th]=เรดมà¸à¸™à¸”์ XP
+ Name[uk]=Редмонд XP
+ Name[uz]=Редмонд XP
+-Name[xx]=xxRedmond XPxx
+ activeBackground=47,103,255
+ activeBlend=41,93,180
+ activeForeground=255,255,255
+diff -Nru kdebase-release-3.4.0/kcontrol/krdb/kcs/YellowOnBlue.kcsrc kdebase-branch-3.4/kcontrol/krdb/kcs/YellowOnBlue.kcsrc
+--- kdebase-release-3.4.0/kcontrol/krdb/kcs/YellowOnBlue.kcsrc 2005-02-23 00:05:40.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/krdb/kcs/YellowOnBlue.kcsrc 2005-03-30 01:47:45.000000000 -0500
+@@ -1,12 +1,15 @@
+ [Color Scheme]
+ Name=High Contrast Yellow on Blue
+ Name[bn]=হাই কনটà§à¦°à¦¾à¦¸à§à¦Ÿ নীলের ওপর হলà§à¦¦
++Name[bs]=Visoki kontrast, žuto na plavom
+ Name[ca]=Groc sobre blau d'alt contrast
+ Name[cs]=Vysoký kontrast, žlutá na modré
+ Name[da]=Gult på blåt med høj kontrast
+ Name[de]=Hoher Kontrast, Gelb auf Blau
++Name[el]=ΚίτÏινο σε μπλε υψηλής αντίθεσης
+ Name[es]=Amarillo sobre azul de alto contraste
+ Name[et]=Väga kontrastne kollane sinisel
++Name[eu]=Kontraste handiko horia urdinaren gainean
+ Name[fi]=Suuren kontrastin keltainen teksti sinisellä pohjalla
+ Name[fr]=Jaune sur bleu avec contraste élevé
+ Name[fy]=Heech kontrast giel op blau
+@@ -23,13 +26,13 @@
+ Name[pt_BR]=Alto Contraste do Texto Amarelo ou Azul
+ Name[ru]=Ð’Ñ‹ÑококонтраÑтный желтый на Ñинем
+ Name[se]=Alla vuostálašvuohta, fiskat alida alde
++Name[sk]=Žltá na modrej s vysokým kontrastom
+ Name[sl]=Visoko kontrastna rumena na modrem
+ Name[sr]=Жута на плавој виÑоког контраÑта
+-Name[sr@Latn]=Жута на плавој виÑоког контраÑта
++Name[sr@Latn]=Žuta na plavoj visokog kontrasta
+ Name[sv]=Gul på blå med hög kontrast
+ Name[ta]=நீலதà¯à®¤à®¿à®©à¯ மீத௠மாறà¯à®ªà®Ÿà¯à®Ÿ மஞà¯à®šà®³à¯
+ Name[uk]=ВиÑоко-контраÑтний чорний жовтий на Ñиньому
+-Name[xx]=xxHigh Contrast Yellow on Bluexx
+ Name[zh_CN]=高对比è“底黄å—
+ activeBackground=0,0,180
+ activeBlend=0,0,180
+diff -Nru kdebase-release-3.4.0/kcontrol/kthememanager/installktheme.desktop kdebase-branch-3.4/kcontrol/kthememanager/installktheme.desktop
+--- kdebase-release-3.4.0/kcontrol/kthememanager/installktheme.desktop 2005-02-18 23:27:03.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kthememanager/installktheme.desktop 2005-03-30 01:47:46.000000000 -0500
+@@ -12,6 +12,7 @@
+ Name[cy]=Gosod Thema KDE
+ Name[da]=Installér KDE-tema
+ Name[de]=KDE-Design installieren
++Name[el]=Εγκατάσταση θÎματος του KDE
+ Name[eo]=Instalu KDEan etoson
+ Name[es]=Instalar tema de KDE
+ Name[et]=KDE teema paigaldamine
+@@ -44,13 +45,12 @@
+ Name[sk]=Inštalovať tému KDE
+ Name[sl]=Namesti temo KDE
+ Name[sr]=ИнÑталирај KDE тему
+-Name[sr@Latn]=ИнÑталирај KDE тему
++Name[sr@Latn]=Instaliraj KDE temu
+ Name[sv]=Installera KDE-tema
+ Name[ta]=KDE பொரà¯à®³à¯ˆ நிறà¯à®µà¯
+ Name[tr]=KDE Teması Yükle
+ Name[uk]=Ð’ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ‚ÐµÐ¼Ð¸ KDE
+ Name[uz]=KDE мавзуÑини ўрнатиш
+-Name[xx]=xxInstall KDE Themexx
+ Name[zh_CN]=安装 KDE 主题
+ MimeType=application/x-ktheme
+ Icon=kthememgr
+diff -Nru kdebase-release-3.4.0/kcontrol/kthememanager/kthemedlg.ui.h kdebase-branch-3.4/kcontrol/kthememanager/kthemedlg.ui.h
+--- kdebase-release-3.4.0/kcontrol/kthememanager/kthemedlg.ui.h 2005-01-17 06:42:08.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kthememanager/kthemedlg.ui.h 2005-03-09 06:54:40.000000000 -0500
+@@ -16,34 +16,34 @@
+
+ void KThemeDlg::startBackground()
+ {
+- KRun::runCommand("kcmshell background");
++ KRun::runCommand("kcmshell kde-background");
+ }
+
+
+ void KThemeDlg::startColors()
+ {
+- KRun::runCommand("kcmshell colors");
++ KRun::runCommand("kcmshell kde-colors");
+ }
+
+
+ void KThemeDlg::startStyle()
+ {
+- KRun::runCommand("kcmshell style");
++ KRun::runCommand("kcmshell kde-style");
+ }
+
+
+ void KThemeDlg::startIcons()
+ {
+- KRun::runCommand("kcmshell icons");
++ KRun::runCommand("kcmshell kde-icons");
+ }
+
+ void KThemeDlg::startFonts()
+ {
+- KRun::runCommand("kcmshell fonts");
++ KRun::runCommand("kcmshell kde-fonts");
+ }
+
+
+ void KThemeDlg::startSaver()
+ {
+- KRun::runCommand("kcmshell screensaver");
++ KRun::runCommand("kcmshell kde-screensaver");
+ }
+diff -Nru kdebase-release-3.4.0/kcontrol/kthememanager/kthememanager.cpp kdebase-branch-3.4/kcontrol/kthememanager/kthememanager.cpp
+--- kdebase-release-3.4.0/kcontrol/kthememanager/kthememanager.cpp 2005-02-16 14:56:19.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kthememanager/kthememanager.cpp 2005-04-05 11:43:40.000000000 -0400
+@@ -389,7 +389,9 @@
+ {
+ kdDebug() << "Preview is in file: " << pixFile << endl;
+ QImage preview( pixFile, "PNG" );
+- preview = preview.smoothScale( dlg->lbPreview->contentsRect().size(), QImage::ScaleMin );
++ if (preview.width()>dlg->lbPreview->contentsRect().width() ||
++ preview.height()>dlg->lbPreview->contentsRect().height() )
++ preview = preview.smoothScale( dlg->lbPreview->contentsRect().size(), QImage::ScaleMin );
+ QPixmap pix;
+ pix.convertFromImage( preview );
+ dlg->lbPreview->setPixmap( pix );
+diff -Nru kdebase-release-3.4.0/kcontrol/kthememanager/kthememanager.desktop kdebase-branch-3.4/kcontrol/kthememanager/kthememanager.desktop
+--- kdebase-release-3.4.0/kcontrol/kthememanager/kthememanager.desktop 2005-02-23 00:05:40.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kthememanager/kthememanager.desktop 2005-03-30 01:47:46.000000000 -0500
+@@ -41,12 +41,11 @@
+ Comment[sk]=Globálny správca tém
+ Comment[sl]=Upravitelj vizualnih tem za KDE
+ Comment[sr]=Управљање KDE-овим визуелним темама
+-Comment[sr@Latn]=Управљање KDE-овим визуелним темама
++Comment[sr@Latn]=Upravljanje KDE-ovim vizuelnim temama
+ Comment[sv]=Hantera KDE:s allmänna visuella teman
+ Comment[ta]=பொத௠KDE காடà¯à®šà®¿ பொரà¯à®³à¯ˆ மேலà¯à®ªà®¾à®°à¯à®µà¯ˆà®¯à®¿à®Ÿà¯
+ Comment[tr]=Evrensel KDE ekran temalarını yönet
+ Comment[uk]=ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð³Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½Ð¸Ð¼Ð¸ темами KDE
+-Comment[xx]=xxManage global KDE visual themesxx
+ Comment[zh_CN]=管ç†å…¨å±€ KDE 视觉主题
+ Exec=kcmshell kthememanager
+ Icon=kthememgr
+@@ -88,13 +87,12 @@
+ Keywords[sk]=témy,vzhľad
+ Keywords[sl]=teme,videz in obÄutek
+ Keywords[sr]=themes,look and feel,теме,изглед и оÑећај,изглед
+-Keywords[sr@Latn]=themes,look and feel,теме,изглед и оÑећај,изглед
++Keywords[sr@Latn]=themes,look and feel,teme,izgled i osećaj,izgled
+ Keywords[sv]=teman,utseende och känsla
+ Keywords[ta]=உரைபொரà¯à®³à¯,பார௠மறà¯à®±à¯à®®à¯ உணரà¯à®£à®°à¯
+ Keywords[tr]=temalar,görünüm ve hisset
+ Keywords[uk]=теми,виглÑд та поведінка
+ Keywords[uz]=мавзулар,ташқи кўриниши
+-Keywords[xx]=xxthemes,look and feelxx
+ Keywords[zh_CN]=themes,look and feel,主题,观感
+ Name=Theme Manager
+ Name[af]=Tema Bestuurder
+@@ -109,6 +107,7 @@
+ Name[cy]=Rheolwr Thema
+ Name[da]=Temahåndtering
+ Name[de]=Design-Verwaltung
++Name[el]=ΔιαχειÏιστής Θεμάτων
+ Name[eo]=Etosadministrilo
+ Name[es]=Administrador de temas
+ Name[et]=Teemahaldur
+@@ -147,7 +146,7 @@
+ Name[sk]=Správca tém
+ Name[sl]=Upravljalnik tem
+ Name[sr]=Менаџер тема
+-Name[sr@Latn]=Менаџер тема
++Name[sr@Latn]=Menadžer tema
+ Name[ss]=Siphatsi sendzikimba
+ Name[sv]=Temahanterare
+ Name[ta]=பொரà¯à®³à¯ மேலாளரà¯
+@@ -156,7 +155,6 @@
+ Name[uz]=Мавзу бошқарувчиÑи
+ Name[ven]=Mulanguli wa thero
+ Name[xh]=Umphathi Womxholo
+-Name[xx]=xxTheme Managerxx
+ Name[zh_CN]=主题管ç†å™¨
+ Name[zh_TW]=佈景管ç†ç¨‹å¼
+ Name[zu]=Imenenja Yengqikithi
+diff -Nru kdebase-release-3.4.0/kcontrol/kthememanager/x-ktheme.desktop kdebase-branch-3.4/kcontrol/kthememanager/x-ktheme.desktop
+--- kdebase-release-3.4.0/kcontrol/kthememanager/x-ktheme.desktop 2005-02-18 23:27:03.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/kthememanager/x-ktheme.desktop 2005-03-30 01:47:46.000000000 -0500
+@@ -2,7 +2,7 @@
+ Encoding=UTF-8
+ MimeType=application/x-ktheme
+ Comment=KDE Theme
+-Comment[af]=Kde Tema
++Comment[af]=KDE Tema
+ Comment[az]=KDE Örtüyü
+ Comment[be]=ТÑма KDE
+ Comment[bg]=Тема за КДЕ
+@@ -14,6 +14,7 @@
+ Comment[cy]=Thema KDE
+ Comment[da]=KDE-tema
+ Comment[de]=KDE-Design
++Comment[el]=ΘÎμα του KDE
+ Comment[eo]=KDEa etoso
+ Comment[es]=Tema de KDE
+ Comment[et]=KDE teema
+@@ -50,7 +51,7 @@
+ Comment[sk]=Téma KDE
+ Comment[sl]=Tema KDE
+ Comment[sr]=KDE тема
+-Comment[sr@Latn]=KDE тема
++Comment[sr@Latn]=KDE tema
+ Comment[sv]=KDE-tema
+ Comment[ta]=KDE பொரà¯à®³à¯
+ Comment[tr]=KDE Teması
+@@ -58,7 +59,6 @@
+ Comment[uz]=KDE мавзуÑи
+ Comment[ven]=Thero ya KDE
+ Comment[xh]=Umxholo we KDE
+-Comment[xx]=xxKDE Themexx
+ Comment[zh_CN]=KDE 主题
+ Comment[zh_TW]=KDE 主題
+ Comment[zu]=Ingqikithi ye-KDE
+diff -Nru kdebase-release-3.4.0/kcontrol/launch/kcmlaunch.desktop kdebase-branch-3.4/kcontrol/launch/kcmlaunch.desktop
+--- kdebase-release-3.4.0/kcontrol/launch/kcmlaunch.desktop 2005-02-10 23:52:00.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/launch/kcmlaunch.desktop 2005-03-07 09:15:26.000000000 -0500
+@@ -68,7 +68,6 @@
+ Name[uk]=Ð’Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð·Ð°Ð¿ÑƒÑку
+ Name[ven]=U fara phindulo
+ Name[vi]=Gá»i phản hồi
+-Name[xx]=xxLaunch Feedbackxx
+ Name[zh_CN]=å¯åЍå馈
+ Name[zh_TW]=程å¼å•Ÿå‹•å›žé¥‹é¢¨æ ¼
+ Name[zu]=Qalisa umphumela obuyayo
+@@ -131,7 +130,6 @@
+ Comment[ven]=Nangani tshitaela tsha phindulo tshau fara apulifikhesheni
+ Comment[vi]=Chá»n kiểu chương trình sẽ gá»i feedback
+ Comment[xh]=Khetha isicelo-yenza uhlobo lwesiphumo seLaunch
+-Comment[xx]=xxChoose application-launch feedback stylexx
+ Comment[zh_CN]=选择程åºå¯åЍåé¦ˆé£Žæ ¼
+ Comment[zh_TW]=鏿“‡ç¨‹å¼å•Ÿå‹•æ™‚çš„å›žé¥‹é¢¨æ ¼
+ Comment[zu]=Khetha isitayela somphumela obuyayo sokuqalisa-umyaleli
+@@ -184,7 +182,6 @@
+ Keywords[uz]=даÑтур,ишга тушириш,банд,курÑор,Ñичқчонча,диÑк,айланувчи,spinning,ишга тушиш,ҳиÑобот
+ Keywords[vi]=chương trình ứng dụng,bắt đầu,khởi đầu,báºn,con trá»,chuá»™t,con trá»,quay,quay tròn,đĩa,khởi động,chương trình,báo cáo
+ Keywords[xh]=isicelo,qala,launch,xakekile,isalathisi,isiphumo,imouse,isalathisi,iyajikeleza,qulukubhede,idiski,qala,udweliso lwenkqubo,ingxelo
+-Keywords[xx]=xxapplication,start,launch,busy,cursor,feedback,mouse,pointer,rotating,spinning,disk,startup,program,reportxx
+ Keywords[zh_CN]=application,start,launch,busy,cursor,feedback,mouse,pointer,rotating,spinning,disk,startup,program,report,程åº,å¯åЍ,å¿™,å…‰æ ‡,å馈,é¼ æ ‡æŒ‡é’ˆ,旋转,ç£ç›˜,å¯åЍ,报告
+ Keywords[zh_TW]=application,start,launch,busy,cursor,feedback,mouse,pointer,rotating,spinning,disk,startup,program,report,應用程å¼,é–‹å§‹,啟動,忙碌,游標,回饋,æ»‘é¼ ,指標,回轉,旋轉,ç£ç¢Ÿ,啟動,程å¼,å ±å‘Š
+ Keywords[zu]=umyaleli,qala,qalisa,kumatasatasa,inkomba,umphumela obuyayo,i-mouse,inkomba yendawo yokubhala,iyajikeleza,iyajikeleza,i-disk qalisa,uhlelo lwemisebenzi,umbiko
+diff -Nru kdebase-release-3.4.0/kcontrol/locale/default/entry.desktop kdebase-branch-3.4/kcontrol/locale/default/entry.desktop
+--- kdebase-release-3.4.0/kcontrol/locale/default/entry.desktop 2005-02-18 23:27:04.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/locale/default/entry.desktop 2005-03-10 11:05:12.000000000 -0500
+@@ -1,5 +1,6 @@
+ [KCM Locale]
+ Name=US English
++Name[af]=Amerikaanse Engels
+ Name[az]=ABŞ İngiliscəsi
+ Name[be]=ÐнгельÑÐºÐ°Ñ (ЗШÐ)
+ Name[bg]=ÐмериканÑки английÑки
+@@ -43,11 +44,10 @@
+ Name[sk]=Anglický US
+ Name[sl]=Angleško ZDA
+ Name[sr]=Ðмерички енглеÑки
+-Name[sr@Latn]=Ðмерички енглеÑки
++Name[sr@Latn]=AmeriÄki engleski
+ Name[sv]=Amerikansk engelska
+ Name[ta]=US ஆஙà¯à®•ிலமà¯
+ Name[tr]=Amerikan İngilizcesi
+ Name[uk]=ÐнглійÑька (СШÐ)
+ Name[uz]=Инглизча AҚШ
+-Name[xx]=xxUS Englishxx
+ Name[zh_CN]=美国英è¯
+diff -Nru kdebase-release-3.4.0/kcontrol/locale/language.desktop kdebase-branch-3.4/kcontrol/locale/language.desktop
+--- kdebase-release-3.4.0/kcontrol/locale/language.desktop 2005-02-10 23:52:00.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/locale/language.desktop 2005-03-27 02:28:58.000000000 -0500
+@@ -11,6 +11,7 @@
+ X-KDE-ParentApp=kcontrol
+
+ Name=Country/Region & Language
++Name[af]=Land/Streek & Taal
+ Name[ar]=البلد و اللغة
+ Name[az]=Ölkə/Bölgə və Dil
+ Name[be]=Краіна/Ñ€Ñгіён Ñ– мова
+@@ -73,7 +74,6 @@
+ Name[vi]=Quốc gia và ngôn ngữ
+ Name[wa]=Payis & lingaedje
+ Name[xh]=Ilizwe/Ummandla & Ulwimi
+-Name[xx]=xxCountry/Region & Languagexx
+ Name[zh_CN]=国家/地区和è¯è¨€
+ Name[zh_TW]=國家/åœ°å€ & 語言
+ Name[zu]=Izwe/Isifunda & Ulimi
+@@ -144,7 +144,6 @@
+ Comment[vi]=Ngôn ngữ,Số và các thiết láºp vá» thá»i gian cho vùng cụ thể
+ Comment[wa]=Apontiaedje do lingaedje et des preferinces (prezintaedje des limeros, des dates, evnd.) po vosse payis
+ Comment[xh]=Ulwimi, amanani, kunye nezicwangciso zexesha zommandla wakho
+-Comment[xx]=xxLanguage, numeric, and time settings for your particular regionxx
+ Comment[zh_CN]=您所在地区的è¯è¨€ã€æ•°å—和时间设置
+ Comment[zh_TW]=您所在地å€çš„èªžè¨€ã€æ•¸å—和時間è¨å®š
+ Comment[zu]=Ulimi, okuyizinombolo, kanye nezilungiselelo zesikhathi zesifunda sakho esithile
+@@ -172,7 +171,7 @@
+ Keywords[hi]=à¤à¤¾à¤·à¤¾,अनà¥à¤µà¤¾à¤¦,संखà¥à¤¯à¤¾ फारà¥à¤®à¥‡à¤Ÿ,करेंसी,समय,तारीख़,फारà¥à¤®à¥‡à¤Ÿà¥à¤¸,लोकेल,देश,अकà¥à¤·à¤°à¤®à¤¾à¤²à¤¾,अकà¥à¤·à¤° माला,दशमलव पà¥à¤°à¤¤à¥€à¤•,हजार पृथक करने वाला,चिहà¥à¤¨,पृथक करने वाला,निशान,धनातà¥à¤®à¤•,ऋणातà¥à¤®à¤•,फà¥à¤°à¥‡à¤•à¥à¤¶à¤¨à¤² अंक,सपà¥à¤¤à¤¾à¤¹,सपà¥à¤¤à¤¾à¤¹ पà¥à¤°à¤¾à¤°à¤‚à¤
+ Keywords[hu]=nyelv,fordÃtás,számformátum,pénznem,idÅ‘,dátum,formátumok,nyelvi beállÃtások,ország,karakterkészletek,tizedesjel,ezres elválasztó,jel,elválasztó,szimbólum,pozitÃv,negatÃv,tizedesjegyek,hét,a hét elsÅ‘ napja
+ Keywords[is]=tungumál,þýðing,númer,gjaldeyrir,klukka,tÃmi,dagsetning,staðværar stillingar,locale,land,stafatöflur,stafróf,jákvætt,neikvætt, jákvæð,neiðkvæð,brot,tugabrot,vika,helgi,vikudagur,vikudagar
+-Keywords[it]=lingua,traduzione,fomrato numeri,moneta,valuta,ora,data,formati,impostazioni nazionali,paese,charset,insieme di caratteri,virgola,separatore migliaia,simbolo,separatore,segno,più,meno,cifre decimali,settimana,inizio settimana
++Keywords[it]=lingua,traduzione,formato numeri,moneta,valuta,ora,data,formati,impostazioni nazionali,paese,charset,insieme di caratteri,virgola,separatore migliaia,simbolo,separatore,segno,più,meno,cifre decimali,settimana,inizio settimana
+ Keywords[ja]=言語,翻訳,æ•°å€¤ã®æ›¸å¼,通貨,時刻,日付,フォーマット,地域,国,æ–‡å—コード,æ–‡å—セット,å°æ•°ç‚¹,1000ã§ã®åŒºåˆ‡ã‚Š,記å·,区切り文å—,符å·,æ£æ•°,è² æ•°,å°æ•°æ¡æ•°,週,週åˆ
+ Keywords[ko]=language,translation,number format,currency,time,date,formats,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,fractional digits,week,week start,언어,ë§ê¸€,번ì—,ë§ ì˜®ê¹€,ë§ ì˜®ê¸°ê¸°,나ë¼ë§,숫ìž,ê¼´,시간,ë‚ ì§œ,로케ì¼,나ë¼,글ìžì…‹,문ìžì…‹,ì‹ì§„수,기호,구분ìž,사ì¸
+ Keywords[lt]=language,translation,number format,currency,time,date,formats,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,fractional digits,week,week start,kalba,vertimas,skaiÄių formatas,valiuta,laikas,data,formatai,lokalÄ—,Å alis,koduotÄ—s,kodavimai,DeÅ¡imtainis simbolis,TÅ«kstanÄių skirtukas,simbolis,skirtukas,požymis,teigiamas,neigiamas,trupmenų skaitmenys,savaitÄ—,savaitÄ—s pradžia
+@@ -181,7 +180,7 @@
+ Keywords[mn]=Ð¥Ñл,Орчуулга,Тооны Ñ…ÑлбÑÑ€,Мөнгөн нÑгж,Цаг,Огноо,Ð¥ÑлбÑÑ€, БүÑ,Орон, ТÑмдÑгт олонлог,Ðравтын Ñ‚ÑмдÑглÑгÑÑ,ТÑмдÑг,ТÑмдÑгт, ТаÑлал, ÐÑмÑÑ…, ХаÑах,Бутархай тоо, Долоо хоног,Долоо хоногийн ÑхлÑл
+ Keywords[nb]=språk,oversettelse,tallformat,valuta,tid,dato,formater,lokal,land,symbol,separator,tegn,positiv,negativ,uke,ukestart,desimaltegn,skilletegn,brøk
+ Keywords[nds]=Spraak,Översetten,Tallenformaat,Taalmiddel,Tiet,Datum,Formaten,locale,Land,Tekensetten,Tekensett,Dezimaalsymbool,Trennteken,Symbool,Dusend,Vörteken,Positiv,Negativ,Brooktallen,Week,Wekenanfang
+-Keywords[nl]=language,vertaling,taal,getallenopmaak,valuta,valutasymbool,tijd,datum, opmaak,lokaal,locale,land,tekensets,charsets,karakterverzamelingen,Decimaalsymbool, scheidingsteken,duizendtallen,symbool,symbolen,gulden,teken,positief,negatief,week,weken,geld,bedragen
++Keywords[nl]=language,vertaling,taal,getallenopmaak,valuta,valutasymbool,tijd,datum, opmaak,lokaal,locale,land,tekensets,charsets,tekenverzamelingen,Decimaalsymbool, scheidingsteken,duizendtallen,symbool,symbolen,gulden,teken,positief,negatief,week,weken,geld,bedragen
+ Keywords[nn]=språk,omsetjing,talformat,valuta,pengar,tid,dato,format,lokale,land,teiknsett,desimalteikn,skiljeteikn,symbol,teikn,positiv,negativ,desimaltal,veke,vekestart
+ Keywords[nso]=leleme,tiragatso,thlolego ya dinomoro,currency,nako,tsatsikgwedi,dithlolego,tulo,Naga,charsets,dipeakanyo tsa dihlaka,Leswao la decimal,Searoganyi sa Dikete, leswao,searoganyi,leswao,dumela,ganetsa,dinomoro tsa fraction,beke,thomiso ya beke
+ Keywords[pl]=język,tłumaczenie,format liczb,jednostka walutowa,czas,data,formaty,ustawienia regionalne,kraj,zestawy znaków,symbol dziesiętny,znak rozdzielający tysiące,symbol,separator,znak,dodatni,ujemny,liczby ułamkowe,tydzień,początek tygodnia
+@@ -202,7 +201,6 @@
+ Keywords[ven]=luambo,dologa,vhuvha ha nomboro,zwamasheleni,tshifhinga,datumu,vhuvha,henefhano,shango,tshasete,mavhekenyele a tshasete,zwiga zwa desimala,zwikhaukani zwa zwigidi,swiga,zwikhaukani,tshiga,zwavhudi,zwisizwavhudi,vhege,u thoma vhege
+ Keywords[vi]=ngôn ngữ,dịch,dạng hiển thị số,tiá»n tệ,thá»i gian,ngà y,dạng,địa phương,Nước,bảng mã,bảng mã,ký hiệu tháºp phân,dấu cách hà ng ngìn,ký hiệu,dấu phân cách,dấu,dương,âm,phân số,tuần,bắt đầu cá»§a tuần
+ Keywords[xh]=ulwimi,uguqulelo kolunye ulwimi,ifomati yenani,okwangoku,ixesha,umhla,iifomati,locale,Ilizwe,charsets,amaqela abasebenzi,uphawu lwenani leshumi,Umahluli wamawaka,uphawu, umahluli,tyikitya,echaza uvumo,echaza ukhanyelo,amasuntswana angamaqhezu,iveki,isiqalo seveki
+-Keywords[xx]=xxlanguage,translation,number format,currency,time,date,formats,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,fractional digits,week,week startxx
+ Keywords[zh_CN]=language,translation,number format,currency,time,date,formats,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,fractional digits,week,week start,è¯è¨€,翻译,æ•°å—æ ¼å¼,è´§å¸,æ—¶é—´,日期,æ ¼å¼,区域设置,国家,å—符集,åƒä½åˆ†éš”符,符å·,分隔符,æ£,è´Ÿ,å°æ•°,星期
+ Keywords[zh_TW]=language,translation,number format,currency,time,date,formats,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,fractional digits,week,week start,語言,ç¿»è¯,æ•¸å—æ ¼å¼,è²¨å¹£æ ¼å¼,æ™‚é–“æ ¼å¼,æ—¥æœŸæ ¼å¼,æ ¼å¼,地å€,國家,å—å…ƒ,å—元集,å°æ•¸é»žç¬¦è™Ÿ,åƒåˆ†ä½åˆ†éš”,符號,分隔,符號,æ£æ•¸,è² æ•¸,å°æ•¸é»žä½æ•¸,一週,由週日開始
+ Keywords[zu]=ulimi,uguqulelo,isakhiwo senombolo, uphawu lwemali, isikhathi,usuku,izakhiwo,indawo,Izwe,charsets,amaqoqo ezimpawu,uphawu lwedesimali,umehlukanisi wezinkulungwane,uphawu,umehlukanisi,uphawu, okungaphezulu kuka-0,okungaphansi kuka-0,izinombolo azahlukanisiwe,isonto, ukuqala kwesonto
+diff -Nru kdebase-release-3.4.0/kcontrol/nics/nic.desktop kdebase-branch-3.4/kcontrol/nics/nic.desktop
+--- kdebase-release-3.4.0/kcontrol/nics/nic.desktop 2005-02-04 23:15:05.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/nics/nic.desktop 2005-03-07 09:15:27.000000000 -0500
+@@ -75,7 +75,6 @@
+ Name[vi]=Giao diện mạng
+ Name[wa]=Eterfaces rantoele
+ Name[xh]=Ujongano Lomsebenzi womnatha
+-Name[xx]=xxNetwork Interfacesxx
+ Name[zh_CN]=网络接å£
+ Name[zh_TW]=網路界é¢
+ Name[zu]=Abaxhumanisi boxhumano olusakazekile
+@@ -87,7 +86,7 @@
+ Comment[be]=Ð†Ð½Ñ„Ð°Ñ€Ð¼Ð°Ñ†Ñ‹Ñ Ð°Ð± Ñеткавых інтÑрфÑйÑах
+ Comment[bg]=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° мрежовите интерфейÑи
+ Comment[bn]=নেটওয়ারà§à¦• ইনà§à¦Ÿà¦¾à¦°à¦«à§‡à¦¸ সংকà§à¦°à¦¾à¦¨à§à¦¤ তথà§à¦¯
+-Comment[br]=Titouroù war an etrefasoù rouedad
++Comment[br]=Titouroù diwar-benn an etrefasoù rouedad
+ Comment[bs]=Informacije o mrežnom interfejsu
+ Comment[ca]=Informació de la interfÃcie de xarxa
+ Comment[cs]=Informace o sÃÅ¥ových rozhranÃch
+@@ -144,7 +143,6 @@
+ Comment[vi]=Thông tin giao diện mạng
+ Comment[wa]=Informåcion so l' eterface rantoele
+ Comment[xh]=Ulwazi lojongano lomsebenzi womnatha
+-Comment[xx]=xxNetwork interface informationxx
+ Comment[zh_CN]=网络接å£ä¿¡æ¯
+ Comment[zh_TW]=網路界é¢è³‡è¨Š
+ Comment[zu]=Ulwazi lomxhumanisi woxhumano olusakazekile
+diff -Nru kdebase-release-3.4.0/kcontrol/performance/kcmkonqyperformance.desktop kdebase-branch-3.4/kcontrol/performance/kcmkonqyperformance.desktop
+--- kdebase-release-3.4.0/kcontrol/performance/kcmkonqyperformance.desktop 2005-02-04 23:15:05.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/performance/kcmkonqyperformance.desktop 2005-03-26 02:37:41.000000000 -0500
+@@ -63,7 +63,6 @@
+ Name[uk]=ШвидкодіÑ
+ Name[uz]=Унумдорлик
+ Name[vi]=Thi hà nh (Performance)
+-Name[xx]=xxPerformancexx
+ Name[zh_CN]=性能
+ Name[zh_TW]=å好è¨å®š
+
+@@ -85,7 +84,7 @@
+ Comment[fa]=تنظیماتی که می‌توانند عملکرد کانکرر را بهبود بخشند تنظیم کنید
+ Comment[fi]=Muokkaa Konquerorin suorituskykyyn liittyviä asetuksia
+ Comment[fr]=Amélioration des performances de Konqueror
+-Comment[fy]=Hjir kinst ynstellingen kieze die de prestaasjes fan Konqueror ferbetterje
++Comment[fy]=Hjir kinst ynstellings kieze die de prestaasjes fan Konqueror ferbetterje
+ Comment[ga]=Cumraigh socruithe a chuirfidh feabhas ar fheidhmiúchán Konqueror
+ Comment[gl]=Configura-las opcións que poden mellora-lo rendemento de Konqueror
+ Comment[he]=הגדר הגדרות העשויות לשפר ×ת ביצועי Konqueror
+@@ -122,7 +121,6 @@
+ Comment[uk]=Тут можна налаштувати швидкодію Konqueror
+ Comment[uz]=Konqueror унумдорлигини ошириши мумкин бўлган моÑламаларни моÑлаш
+ Comment[vi]=Các thiết láºp nâng cao khả năng cá»§a Konqueror
+-Comment[xx]=xxConfigure settings that can improve Konqueror performancexx
+ Comment[zh_CN]=é…ç½®æé«˜ Konqueror 性能的设置
+ Comment[zh_TW]=å¯å¢žé€² Konqueror 效能的è¨å®š
+
+@@ -167,7 +165,6 @@
+ Keywords[tr]=konqueror,yeniden kullanım,ön yükleme
+ Keywords[uk]=konqueror,повторне викориÑтаннÑ,попереднє завантаженнÑ
+ Keywords[vi]=konqueror,reuse,tiá»n tải
+-Keywords[xx]=xxkonqueror,reuse,preloadingxx
+ Keywords[zh_CN]=konqueror,reuse,preloading,å†åˆ©ç”¨,é¢„åŠ è½½
+ Keywords[zh_TW]=konqueror,reuse,preloading,é‡ç”¨,é 先載入
+
+diff -Nru kdebase-release-3.4.0/kcontrol/performance/kcmperformance.desktop kdebase-branch-3.4/kcontrol/performance/kcmperformance.desktop
+--- kdebase-release-3.4.0/kcontrol/performance/kcmperformance.desktop 2005-02-04 23:15:05.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/performance/kcmperformance.desktop 2005-03-26 02:37:41.000000000 -0500
+@@ -65,7 +65,6 @@
+ Name[uk]=Ð¨Ð²Ð¸Ð´ÐºÐ¾Ð´Ñ–Ñ KDE
+ Name[uz]=KDE унумдорлиги
+ Name[vi]=Trình diễn KDE
+-Name[xx]=xxKDE Performancexx
+ Name[zh_CN]=KDE 性能
+ Name[zh_TW]=KDE 效能
+
+@@ -87,7 +86,7 @@
+ Comment[fa]=تنظیماتی که می‌توانند عملکرد KDE را بهبود بخشند تنظیم کنید
+ Comment[fi]=Muokkaa KDE:n suorituskykyyn liittyviä asetuksia
+ Comment[fr]=Configuration de paramètres qui peuvent améliorer les performances de KDE
+-Comment[fy]=Hjir kinst ynstellingen kiezen die de prestaasjees fan KDE kinne ferbetterje
++Comment[fy]=Hjir kinst ynstellings kiezen die de prestaasjees fan KDE kinne ferbetterje
+ Comment[ga]=Cumraigh socruithe a chuirfidh feabhas ar fheidhmiúchán KDE
+ Comment[gl]=Configuración das opcións que poden mellora-lo rendemento de KDE
+ Comment[he]=הגדר הגדרות שעשויות לשפר ×ת ביצועי KDE
+@@ -124,7 +123,6 @@
+ Comment[uk]=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ–Ð² Ð´Ð»Ñ Ð¿Ð¾ÐºÑ€Ð°Ñ‰Ð°Ð½Ð½Ñ ÑˆÐ²Ð¸Ð´ÐºÐ¾Ð´Ñ–Ñ— KDE
+ Comment[uz]=KDE унумдорлигини ошириши мумкин бўлган моÑламаларни моÑлаш
+ Comment[vi]=Các thiết láºp nâng cao khả năng cá»§a Konqueror
+-Comment[xx]=xxConfigure settings that can improve KDE performancexx
+ Comment[zh_CN]=é…ç½®æé«˜ KDE 性能的设置
+ Comment[zh_TW]=å¯å¢žé€² KDE 效能的è¨å®š
+
+@@ -172,7 +170,6 @@
+ Keywords[uk]=швидкодіÑ,швидкіÑть,пам'Ñть,покращеннÑ
+ Keywords[uz]=унумдорлик,тезлик,хотира,ошириш
+ Keywords[vi]=trình diễn,tốc độ,bộ nhớ,nâng cao
+-Keywords[xx]=xxperformance,speed,memory,improvexx
+ Keywords[zh_CN]=performance,speed,memory,improve,性能,速度,内å˜,æé«˜
+ Keywords[zh_TW]=performance,speed,memory,improve,效能,速度,記憶體,增進
+
+diff -Nru kdebase-release-3.4.0/kcontrol/privacy/privacy.desktop kdebase-branch-3.4/kcontrol/privacy/privacy.desktop
+--- kdebase-release-3.4.0/kcontrol/privacy/privacy.desktop 2005-02-04 23:15:05.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/privacy/privacy.desktop 2005-03-26 02:37:42.000000000 -0500
+@@ -18,7 +18,7 @@
+ Comment[eu]=Pribatutasuna - Erabiltzaileek sisteman zehar nahi izan gabe uzten dituzten aztarnak garbitzen dituen kcontrol modulua
+ Comment[fi]=Yksityisyys - Ohjauskeskuksen moduuli ei-toivottujen jälkien siivoamiseen järjestelmästä
+ Comment[fr]=Confidentialité - Un module externe du centre de configuration pour effacer les traces indésirables qu'un utilisateur laisse sur le système
+-Comment[fy]=Privacy - in ynstellingsmodule wêrmeist ûnwenste efterbluiwende sporen fan brûkers wisse kinst
++Comment[fy]=Privacy - in Konfiguraasjemodule wêrmeist ûnwenste efterbluiwende sporen fan brûkers wisse kinst
+ Comment[gl]=Intimidade - un módulo de kcontrol para limpa-los rastros non desexados que o usuario deixa no sistema
+ Comment[he]=פרטיות - מודול ב־kcontrol המשתמש למחיקת עקבות ×œ× ×¨×¦×•×™×™× ×©×ž×©×ª×ž×© מש×יר ×חריו במערכת
+ Comment[hi]=गोपनीयता- उपयोकà¥à¤¤à¤¾ दà¥à¤µà¤¾à¤°à¤¾ तंतà¥à¤° में छोड़े गठअवांछित पदचिहà¥à¤¨à¥‹à¤‚ को साफ करने का à¤à¤• के-कंटà¥à¤°à¥‹à¤² मॉडà¥à¤¯à¥‚ल
+@@ -50,7 +50,6 @@
+ Comment[tr]=Gizlilik - kullanıcının sistemde bıraktığı iztenilmeyen izlemeleri temizleyen kcontrol modülü
+ Comment[uk]=КонфіденційніÑть - модуль ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð¾Ñ‡Ð¸Ñ‰ÐµÐ½Ð½Ñ Ð½ÐµÐ±Ð°Ð¶Ð°Ð½Ð¾Ñ— інформації залишеної кориÑтувачем у ÑиÑтемі
+ Comment[vi]=Riêng tư - module Ä‘iá»u khiển dùng để xoá các dấu vết mà ngưá»i sá» dụng để lại trên hệ thống
+-Comment[xx]=xxPrivacy - a kcontrol module to clean unwanted traces the user leaves on the systemxx
+ Comment[zh_CN]=éšç§ - 清除用户留在系统ä¸ç—•迹的 kcontrol 模å—
+ Comment[zh_TW]=éš±ç§æ¬Š - 一個控制模組用來清除使用者ä¸å¸Œæœ›ç•™åœ¨ç³»çµ±ä¸çš„ç—•è·¡
+ Exec=kcmshell privacy
+@@ -104,7 +103,6 @@
+ Keywords[uk]=КонфіденційніÑть
+ Keywords[uz]=ШахÑий маълумот,шахÑий маълумот
+ Keywords[vi]=Riêng tư,riêng tư
+-Keywords[xx]=xxPrivacy,privacyxx
+ Keywords[zh_CN]=Privacy,privacy,éšç§
+ Keywords[zh_TW]=Privacy,privacy,éš±ç§æ¬Š
+ Name=Privacy
+@@ -157,7 +155,6 @@
+ Name[uk]=КонфіденційніÑть
+ Name[uz]=ШахÑий маълумот
+ Name[vi]=Riêng tư
+-Name[xx]=xxPrivacyxx
+ Name[zh_CN]=éšç§
+ Name[zh_TW]=éš±ç§æ¬Š
+ Terminal=false
+diff -Nru kdebase-release-3.4.0/kcontrol/randr/krandrmodule.cpp kdebase-branch-3.4/kcontrol/randr/krandrmodule.cpp
+--- kdebase-release-3.4.0/kcontrol/randr/krandrmodule.cpp 2004-11-21 22:00:13.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/randr/krandrmodule.cpp 2005-03-08 09:36:18.000000000 -0500
+@@ -56,7 +56,8 @@
+
+ KDE_EXPORT bool test_randr()
+ {
+- if( XRRQueryExtension(qt_xdisplay(), 0, 0 ) )
++ int eventBase, errorBase;
++ if( XRRQueryExtension(qt_xdisplay(), &eventBase, &errorBase ) )
+ return true;
+ return false;
+ }
+diff -Nru kdebase-release-3.4.0/kcontrol/randr/krandrtray.desktop kdebase-branch-3.4/kcontrol/randr/krandrtray.desktop
+--- kdebase-release-3.4.0/kcontrol/randr/krandrtray.desktop 2005-02-23 00:05:41.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/randr/krandrtray.desktop 2005-03-22 12:38:08.000000000 -0500
+@@ -4,10 +4,10 @@
+ Name[hu]=Képernyőfelbontás
+ Name[pt_BR]=Ãcone do KRandR
+ Name[sv]=Krandrtray
+-Name[xx]=xxKRandRTrayxx
+ GenericName=Screen Resize & Rotate
+ GenericName[bg]=Размер и Ñ€Ð¾Ñ‚Ð°Ñ†Ð¸Ñ Ð½Ð° екрана
+ GenericName[bn]=পরà§à¦¦à¦¾ মাপবদল ও আবরà§à¦¤à¦¨
++GenericName[bs]=VeliÄina i rotacija ekrana
+ GenericName[ca]=Amida i gira la pantalla
+ GenericName[cs]=Změna velikosti a rotace obrazovky
+ GenericName[cy]=Newid Maint a Cylchdroi'r Sgrîn
+@@ -15,6 +15,7 @@
+ GenericName[de]=Bildschirmgröße & -ausrichtung ändern
+ GenericName[es]=Redimensionar y rotar pantalla
+ GenericName[et]=Ekraani suuruse muutmine ja pööramine
++GenericName[eu]=Pantailaren tamaina aldaketa eta biraketa
+ GenericName[fi]=Näytön kuvan koon muuttaminen ja kuvan kääntäminen
+ GenericName[fr]=Redimensionnement et rotation de l'écran
+ GenericName[fy]=Skerm rotearje en grutte wizigje
+@@ -30,13 +31,13 @@
+ GenericName[pt]=Mudar o Tamanho e Rodar o Ecrã
+ GenericName[pt_BR]=Redimensionar Tela & Rotacionar
+ GenericName[ru]=Изменение размера и ориентации Ñкрана
++GenericName[sk]=VeľkosÅ¥ a otoÄenie obrazovky
+ GenericName[sl]=Spreminjanje velikosti in obraÄanje zaslona
+ GenericName[sr]=Промена величине и ротација екрана
+-GenericName[sr@Latn]=Промена величине и ротација екрана
++GenericName[sr@Latn]=Promena veliÄine i rotacija ekrana
+ GenericName[sv]=Ändra skärmstorlek och rotera
+ GenericName[ta]=திரை அளவ௠மாறà¯à®±à¯ & சà¯à®´à®±à¯à®±à¯
+ GenericName[uk]=Зміна розміру та Ð¾Ð±ÐµÑ€Ñ‚Ð°Ð½Ð½Ñ ÐµÐºÑ€Ð°Ð½Ð°
+-GenericName[xx]=xxScreen Resize & Rotatexx
+ GenericName[zh_CN]=å±å¹•大å°å’Œæ—‹è½¬
+ Comment=A panel applet for resizing and reorientating X screens.
+ Comment[ar]=بريمج Ø§Ù„Ù„ÙˆØØ© لتغيير ØØ¬Ù… وضبط شاشات X.
+@@ -90,7 +91,6 @@
+ Comment[uz]=X Ñкранинг ўлчамини ўзгартириш ва айлантириш учун панел апплети
+ Comment[vi]=Bảng con đê thay đổi và định hướng lại mà n hình X
+ Comment[wa]=Ene aplikete po candjî l' grandeu eyet tourner li håynaedje so les waitroûles X11
+-Comment[xx]=xxA panel applet for resizing and reorientating X screens.xx
+ Comment[zh_CN]=ç¼©æ”¾åŠæ›´æ”¹ X å±å¹•æ–¹å‘çš„é¢æ¿å°ç¨‹åºã€‚
+ Comment[zh_TW]=一個用來調整大å°åŠé‡æ–°å®šä½ X 螢幕的å°ç¨‹å¼
+ Exec=krandrtray
+diff -Nru kdebase-release-3.4.0/kcontrol/randr/randr.desktop kdebase-branch-3.4/kcontrol/randr/randr.desktop
+--- kdebase-release-3.4.0/kcontrol/randr/randr.desktop 2005-02-04 23:15:05.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/randr/randr.desktop 2005-03-07 09:15:28.000000000 -0500
+@@ -61,7 +61,6 @@
+ Name[uz]=Ўлчами ва жойлашиши
+ Name[vi]=Cỡ & Hướng
+ Name[wa]=Grandeu eyet oryintåcion
+-Name[xx]=xxSize & Orientationxx
+ Name[zh_CN]=大å°å’Œæ–¹å‘
+ Name[zh_TW]=尺寸åŠå®šä½
+
+@@ -118,7 +117,6 @@
+ Comment[uz]=Ðкранинг ўлчамини ўзгартириш ва айлантириш
+ Comment[vi]=Äổi cỡ và Quay mà n hình cá»§a bạn
+ Comment[wa]=Candjî l' grandeu eyet tourner li håynaedje
+-Comment[xx]=xxResize and Rotate your displayxx
+ Comment[zh_CN]=更改显示大å°å’Œæ—‹è½¬æ˜¾ç¤º
+ Comment[zh_TW]=調整大å°åŠæ—‹è½‰ä½ 的螢幕
+
+@@ -171,7 +169,6 @@
+ Keywords[uz]=ўлчамини ўзгартириш,айлантириш,Ñкран,ранг,чуқурлик,ўлчам,горизантал,вертикал
+ Keywords[vi]=đổi cỡ,quay,mà nh hình,mà u,độ sâu,cỡ,ngang,dá»c
+ Keywords[wa]=candjî l' grandeu,tourner,håynaedje,coleur,parfondeu,grandeu,di coûtchî,d' astampé
+-Keywords[xx]=xxresize,rotate,display,color,depth,size,horizontal,verticalxx
+ Keywords[zh_CN]=resize,rotate,display,color,depth,size,horizontal,vertical,更改大å°,旋转,显示,颜色,深度,大å°,垂直,æ°´å¹³
+ Keywords[zh_TW]=resize,rotate,display,color,depth,size,horizontal,vertical,調整大å°,旋轉,螢幕,é¡è‰²,深度,尺寸,垂直,æ°´å¹³
+ Encoding=UTF-8
+diff -Nru kdebase-release-3.4.0/kcontrol/samba/smbstatus.desktop kdebase-branch-3.4/kcontrol/samba/smbstatus.desktop
+--- kdebase-release-3.4.0/kcontrol/samba/smbstatus.desktop 2005-02-04 23:15:06.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/samba/smbstatus.desktop 2005-03-07 09:15:28.000000000 -0500
+@@ -77,7 +77,6 @@
+ Name[vi]=Trạng thái của Samba
+ Name[wa]=Estat di Samba
+ Name[xh]=Isimo se Samba
+-Name[xx]=xxSamba Statusxx
+ Name[zh_CN]=Samba 状æ€
+ Name[zh_TW]=Samba 狀態
+ Name[zu]=Isimo se-Samba
+@@ -147,7 +146,6 @@
+ Comment[vi]=Theo dõi trạng thái samba
+ Comment[wa]=Corwaitoe di l'Â estat di Samba
+ Comment[xh]=Umphathi wemeko we Samba
+-Comment[xx]=xxSamba status monitorxx
+ Comment[zh_CN]=Samba 状æ€ç›‘视器
+ Comment[zh_TW]=Samba 狀態監視器
+ Comment[zu]=Umphathi wesimo se-samba
+@@ -213,7 +211,6 @@
+ Keywords[vi]=SMB,SAMBA,Mạng Windows,LAN,Thông tin hệ thống
+ Keywords[wa]=SMB,SAMBA,rantoele Windows,LAN,rantoele locåle,informåcion do sistinme
+ Keywords[xh]=SMB,SAMBA,umsebenzi womnatha wee window,LAN,Ulwazi lwendlela yokusebenza
+-Keywords[xx]=xxSMB,SAMBA,Windows network,LAN,System Informationxx
+ Keywords[zh_CN]=SMB,SAMBA,Windows network,LAN,System Information,局域网,系统信æ¯
+ Keywords[zh_TW]=SMB,SAMBA,Windows network,LAN,System Information,Windows 網路,å€åŸŸç¶²è·¯,系統資訊
+ Keywords[zu]=SMB,SAMBA,Uxhumano olusakazekile lwama-windows,LAN,Ulwazi lwesistimu
+diff -Nru kdebase-release-3.4.0/kcontrol/screensaver/screensaver.desktop kdebase-branch-3.4/kcontrol/screensaver/screensaver.desktop
+--- kdebase-release-3.4.0/kcontrol/screensaver/screensaver.desktop 2005-02-04 23:15:06.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/screensaver/screensaver.desktop 2005-03-07 09:15:28.000000000 -0500
+@@ -73,7 +73,6 @@
+ Name[vi]=Bảo vệ mà n hình
+ Name[wa]=Sipårgneu di waitroûle
+ Name[xh]=Umgcini Wekhusi
+-Name[xx]=xxScreen Saverxx
+ Name[zh_CN]=å±å¹•ä¿æŠ¤ç¨‹åº
+ Name[zh_TW]=螢幕ä¿è·ç¨‹å¼
+ Name[zu]=Umgcini skrini
+@@ -141,7 +140,6 @@
+ Comment[vi]=Thiết láºp trình bảo vệ mà n hình
+ Comment[wa]=Apontiaedjes do spårgneu di waitroûle
+ Comment[xh]=Izicwangciso Zomgcini Wekhusi
+-Comment[xx]=xxScreen Saver Settingsxx
+ Comment[zh_CN]=å±å¹•ä¿æŠ¤ç¨‹åºè®¾ç½®
+ Comment[zh_TW]=螢幕ä¿è·ç¨‹å¼è¨å®š
+ Comment[zu]=Izilungiselelo Zomgcini skrini
+@@ -204,7 +202,6 @@
+ Keywords[vi]=bảo vệ mà n hình,Ưu tiên
+ Keywords[wa]=sipårgneu di waitroûle,prumiristé
+ Keywords[xh]=abagcini bekhusi,Ukubaluleka
+-Keywords[xx]=xxscreensavers,Priorityxx
+ Keywords[zh_CN]=screensavers,Priority,优先级,å±å¹•ä¿æŠ¤ç¨‹åº
+ Keywords[zh_TW]=screensavers,Priority,螢幕ä¿è·ç¨‹å¼,優先權
+ Keywords[zu]=abagcini zikrini,Ukubaluleka
+diff -Nru kdebase-release-3.4.0/kcontrol/smartcard/smartcard.desktop kdebase-branch-3.4/kcontrol/smartcard/smartcard.desktop
+--- kdebase-release-3.4.0/kcontrol/smartcard/smartcard.desktop 2005-02-10 23:52:01.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/smartcard/smartcard.desktop 2005-03-07 09:15:29.000000000 -0500
+@@ -56,7 +56,6 @@
+ Name[uz]=Smartcard'лар
+ Name[ven]=Garata
+ Name[vi]=Thẻ thông minh
+-Name[xx]=xxSmartcardsxx
+ Name[zh_CN]=智能å¡
+ Name[zh_TW]=智慧å¡
+ Name[zu]=Amakhadi akhaliphile
+@@ -122,7 +121,6 @@
+ Comment[ven]=Dzudzanyani thikhedzo ya garata
+ Comment[vi]=Cấu hình các hỗ trợ thẻ thông minh
+ Comment[xh]=Qwalasela inkxaso ye smartcard
+-Comment[xx]=xxConfigure smartcard supportxx
+ Comment[zh_CN]=é…ç½®æ™ºèƒ½å¡æ”¯æŒ
+ Comment[zh_TW]=è¨å®šæ™ºæ…§å¡ (SmartCard) 支æ´
+ Comment[zu]=Hlanganisela ukuxhaswa kwekhadi elikhaliphile
+@@ -175,7 +173,6 @@
+ Keywords[ven]=Garata,PKCS,SSL,muvhali,zwavhudi,Garata
+ Keywords[vi]=Thẻ thông minh,PKCS,SSL,đầu Ä‘á»c,thông minh,thẻ
+ Keywords[xh]=Smartcard,PKCS,SSL,umfundi,bukeka,ikhadi
+-Keywords[xx]=xxSmartcard,PKCS,SSL,reader,smart,cardxx
+ Keywords[zh_CN]=Smartcard,PKCS,SSL,reader,smart,card,智能å¡,智能,å¡,读å¡å™¨
+ Keywords[zh_TW]=Smartcard,PKCS,SSL,reader,smart,card,智慧å¡,閱讀器,智慧,å¡
+ Keywords[zu]=Ikhadi elikhaliphile,PKCS,SSLumfundi,okukhaliphile,ikhadi
+diff -Nru kdebase-release-3.4.0/kcontrol/smserver/kcmsmserver.desktop kdebase-branch-3.4/kcontrol/smserver/kcmsmserver.desktop
+--- kdebase-release-3.4.0/kcontrol/smserver/kcmsmserver.desktop 2005-02-23 00:05:41.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/smserver/kcmsmserver.desktop 2005-03-26 02:37:42.000000000 -0500
+@@ -77,7 +77,6 @@
+ Name[vi]=Trình quản là Session
+ Name[wa]=Manaedjeu di sessions
+ Name[xh]=Umphathi wesiqendu
+-Name[xx]=xxSession Managerxx
+ Name[zh_CN]=会è¯ç®¡ç†å™¨
+ Name[zh_TW]=工作階段管ç†ç¨‹å¼
+ Name[zu]=Imenenja yesiqendu
+@@ -101,7 +100,7 @@
+ Comment[fa]= می‌توانید مدیر نشست و تنظیمات خروج را اینجا تنظیم کنید
+ Comment[fi]=Istunnonhallinnan ja uloskirjautumisen asetukset
+ Comment[fr]=Configuration du gestionnaire de session et réglages de la sortie
+-Comment[fy]=Hjir kinst it sesjebehear en ôfmeld-ynstellingen fêststelle
++Comment[fy]=Hjir kinst it sesjebehear en ôfmeld-ynstellings fêststelle
+ Comment[gl]=Configura-lo xestor de sesións e as opcións de saÃda
+ Comment[he]=×©×™× ×•×™ הגדרות ×ž× ×”×œ ההפעלה והיצי××” מהמערכת
+ Comment[hi]=सतà¥à¤° पà¥à¤°à¤¬à¤‚धक तथा लॉगआउट विनà¥à¤¯à¤¾à¤¸ कॉनà¥à¤«à¤¼à¤¿à¤—र करें
+@@ -142,7 +141,6 @@
+ Comment[vi]=Cấu hình buổi trình quản lý session và các thiết láºp đăng xuất
+ Comment[wa]=Apontiaedje do manaedjeu si sessions eyet apontiaedjes do dislodjaedje
+ Comment[xh]=Qwalasela umphathi wesiqendu nezicwangciso zokuphuma ngaphandle
+-Comment[xx]=xxConfigure the session manager and logout settingsxx
+ Comment[zh_CN]=é…置会è¯ç®¡ç†å™¨å’Œæ³¨é”€è®¾ç½®
+ Comment[zh_TW]=è¨å®šå·¥ä½œéšŽæ®µç®¡ç†ç¨‹å¼èˆ‡ç™»å‡ºè¨å®šå€¼
+ Comment[zu]=Hlanganisela imenenja yesiqendu kanye nezilungiselelo zokuphuma ngaphandle
+@@ -202,7 +200,6 @@
+ Keywords[ven]=siva ya ksm,tshitenwa,tsimani,khwathisedzani,vhulunga,vhekanyani hafhu
+ Keywords[vi]=ksmserver,session,đăng xuất,khẳng định,sao lưu,phục hồi
+ Keywords[xh]=ksmserver,isiqendu,phuma ngaphandle,uqinisekiso,gcina,gcina kwakhona
+-Keywords[xx]=xxksmserver,session,logout,confirmation,save,restorexx
+ Keywords[zh_CN]=ksmserver,会è¯,注消,确认,ä¿å˜,æ¢å¤
+ Keywords[zh_TW]=ksmserver,session,logout,confirmation,save,restore,工作階段,登出,確èª,儲å˜,回復
+ Keywords[zu]=ksmserver,isiqendu,ukuphuma ngaphandle,ukuqiniseka,gcina,vuselela
+diff -Nru kdebase-release-3.4.0/kcontrol/spellchecking/spellchecking.desktop kdebase-branch-3.4/kcontrol/spellchecking/spellchecking.desktop
+--- kdebase-release-3.4.0/kcontrol/spellchecking/spellchecking.desktop 2005-02-21 13:17:54.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/spellchecking/spellchecking.desktop 2005-03-07 09:15:30.000000000 -0500
+@@ -71,7 +71,6 @@
+ Name[vi]=Công cụ kiểm tra chÃnh tả
+ Name[wa]=Coridjrece ortografike
+ Name[xh]=Umkhangeki Wopelo
+-Name[xx]=xxSpell Checkerxx
+ Name[zh_CN]=拼写检查工具
+ Name[zh_TW]=æ‹¼å—æª¢æŸ¥å·¥å…·
+ Name[zu]=Umbheki wokubizelwa kwamagama
+@@ -138,7 +137,6 @@
+ Comment[ven]=Dzudzanyani tshisedzi tsha tshipelini
+ Comment[vi]=Cấu hình các bá»™ kiểm tra chÃnh tả
+ Comment[xh]=Qwalasela umkhangelo wopelo
+-Comment[xx]=xxConfigure the spell checkerxx
+ Comment[zh_CN]=é…置拼写检查工具
+ Comment[zh_TW]=è¨å®šæ‹¼å—檢查程å¼
+ Comment[zu]=Hlanganisela umbheki wokubizelwa kwamagama
+@@ -200,7 +198,6 @@
+ Keywords[ven]=Tshipelini
+ Keywords[vi]=ChÃnh tả
+ Keywords[xh]=Pela
+-Keywords[xx]=xxSpellxx
+ Keywords[zh_CN]=拼写
+ Keywords[zh_TW]=拼å—
+ Keywords[zu]=Bizela
+diff -Nru kdebase-release-3.4.0/kcontrol/style/style.desktop kdebase-branch-3.4/kcontrol/style/style.desktop
+--- kdebase-release-3.4.0/kcontrol/style/style.desktop 2005-02-10 23:52:02.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/style/style.desktop 2005-03-07 09:15:30.000000000 -0500
+@@ -79,7 +79,6 @@
+ Name[vi]=Kiểu
+ Name[wa]=Stîle
+ Name[xh]=Uhlobo
+-Name[xx]=xxStylexx
+ Name[zh_CN]=é£Žæ ¼
+ Name[zh_TW]=é¢¨æ ¼
+ Name[zu]=Isitayela
+@@ -141,7 +140,6 @@
+ Comment[ven]=Tendela u tshinywa ha maitele a widget ni tendele nau shandukisa tshitaela tsha KDE
+ Comment[vi]=Cho phép chỉnh ứng xỠcủa các widget và thay đổi kiểu của KDE
+ Comment[xh]=Ivumela uhanahaniso lokuziphatha kwe widget kwaye itshintsha Uhlobo lwe KDE
+-Comment[xx]=xxAllows the manipulation of widget behavior and changing the Style for KDExx
+ Comment[zh_CN]=å…许æ“纵修饰行为和更改 KDE çš„æ ·å¼
+ Comment[zh_TW]=讓您控制視窗元件 (widget) çš„æ“作方å¼ï¼Œä»¥åŠæ›´æ”¹ KDE çš„é¢¨æ ¼
+ Comment[zu]=Ivumela ukulawula kokuziphatha kwe-widget kanye nokushintsha isitayela se-KDE
+@@ -199,7 +197,6 @@
+ Keywords[ven]=Tshitaela,Zwitaela,sedza,widget,dziaikhono,bara ya tshishumiswa,manwalwa,bvisela khagala,apps,dziapulifikhesheni ya KDE
+ Keywords[vi]=kiểu,các kiểu,nhìn,widget,biểu tượng,thanh công cụ,text,đánh dấu,apps,ứng dụng KDE
+ Keywords[xh]=uhlobo, iintlobo, jonga, widget, amaphawu emifanekiso, iibar zesixhobo, umbhalo, phawula, apps, izicelo ze KDE
+-Keywords[xx]=xxstyle,styles,look,widget,icons,toolbars,text,highlight,apps,KDE applicationsxx
+ Keywords[zh_CN]=style,styles,look,widget,icons,toolbars,text,highlight,apps,KDE applications,é£Žæ ¼,外观,窗å£éƒ¨ä»¶,å›¾æ ‡,工具æ ,æ–‡å—,çªå‡º,KDE 程åº,KDE 应用程åº
+ Keywords[zh_TW]=style,styles,look,widget,icons,toolbars,text,highlight,apps,KDE applications,é¢¨æ ¼,主題,外觀,視窗元件,圖示,工具列,æ–‡å—,çªå‡ºé¡¯ç¤º,應用程å¼,KDE 應用程å¼
+ Keywords[zu]=isitayela,izitayela,ukubukeka,widget,izimpawu zezithombe,amabha amathuluzi,umbhalo,ukugqamisa,apps,abayaleli be-KDE
+diff -Nru kdebase-release-3.4.0/kcontrol/taskbar/kcmtaskbar.desktop kdebase-branch-3.4/kcontrol/taskbar/kcmtaskbar.desktop
+--- kdebase-release-3.4.0/kcontrol/taskbar/kcmtaskbar.desktop 2005-02-23 00:05:41.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/taskbar/kcmtaskbar.desktop 2005-03-07 09:15:30.000000000 -0500
+@@ -62,6 +62,7 @@
+ Name[sk]=Panel úloh
+ Name[sl]=Opravilna vrstica
+ Name[sr]=Трака задатака
++Name[sr@Latn]=Traka zadataka
+ Name[ss]=Ibar yemsebenti
+ Name[sv]=Aktivitetsfält
+ Name[ta]=பணிபà¯à®ªà®Ÿà¯à®Ÿà®¿
+@@ -73,7 +74,6 @@
+ Name[ven]=Bara ya mushumo
+ Name[vi]=Thanh công việc
+ Name[xh]=Ibar yomsebenzi
+-Name[xx]=xxTaskbarxx
+ Name[zh_CN]=任务æ¡
+ Name[zh_TW]=工作列
+ Name[zu]=Ibha yemisebenzi
+@@ -132,7 +132,6 @@
+ Comment[uk]=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñмужки задач
+ Comment[uz]=Вазифалар панелини моÑлаш
+ Comment[vi]=Cấu hình thanh công việc
+-Comment[xx]=xxConfigure the panel taskbarxx
+ Comment[zh_CN]=é…ç½®é¢æ¿çš„任务æ¡
+ Comment[zh_TW]=您å¯ä»¥åœ¨é€™è£¡è¨å®šé¢æ¿å·¥ä½œåˆ—
+
+@@ -180,7 +179,7 @@
+ Keywords[sk]=kicker,panel,kpanel,taskbar,startbar,launchbar,okná
+ Keywords[sl]=kicker,panel,kpanel,opravilna vrstica,zaÄetna vrstica,izstreliÅ¡Äe,okna
+ Keywords[sr]=kicker,panel,kpanel,taskbar,startbar,launchbar,windows,панел,поÑлови,трака задатака
+-Keywords[sr@Latn]=kicker,panel,kpanel,taskbar,startbar,launchbar,windows,panel,poslovi,taskbar
++Keywords[sr@Latn]=kicker,panel,kpanel,taskbar,startbar,launchbar,windows,panel,poslovi,traka zadataka
+ Keywords[sv]=kicker,panel,kpanel,aktivitetsfält,startrad,programrad,fönster
+ Keywords[ta]= கிகà¯à®•à®°à¯, பலகமà¯.kபலகமà¯,பணிபà¯à®ªà®Ÿà¯à®Ÿà®¿,தà¯à®µà®•à¯à®•படà¯à®Ÿà®¿, வெளியீடà¯à®Ÿà¯à®ªà¯à®ªà®Ÿà¯à®Ÿà®¿, சாளரமà¯
+ Keywords[tr]=kicker,panel,kpanel,görev çubuğu,başlangıç çubuğu,yükleme çubuğu,pencere,pencereler
+@@ -189,7 +188,6 @@
+ Keywords[ven]=murahi,phanele,phanele ya k,bara ya mushumo,thomani bara,thoma bara,dziwindo
+ Keywords[vi]=kicker,panel,kpanel,thanh công việc,thanh khởi động,cá»a sổ
+ Keywords[xh]=umkhabi,iwindowe eneenkcukacha,kpanel,ibar yomsebenzi,ibar yokuqalisa,ibar yelaunch,i windows
+-Keywords[xx]=xxkicker,panel,kpanel,taskbar,startbar,launchbar,windowsxx
+ Keywords[zh_CN]=kicker,panel,kpanel,taskbar,startbar,launchbar,windows,颿¿,任务æ ,å¯åЍæ
+ Keywords[zh_TW]=kicker,panel,kpanel,taskbar,startbar,launchbar,windows,æŽ§åˆ¶é¢æ¿,工作列,狀態列,å¿«æ·åˆ—,視窗
+ Keywords[zu]=kicker,iwindi lemininingwane,kpanel,ibha yemisebenzi, ibha yokuqala,ibha yokuqalisa,ama-window
+diff -Nru kdebase-release-3.4.0/kcontrol/usbview/kcmusb.desktop kdebase-branch-3.4/kcontrol/usbview/kcmusb.desktop
+--- kdebase-release-3.4.0/kcontrol/usbview/kcmusb.desktop 2005-02-04 23:15:09.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/usbview/kcmusb.desktop 2005-03-07 09:15:31.000000000 -0500
+@@ -75,7 +75,6 @@
+ Name[vi]=Các thiết bị USB
+ Name[wa]=Éndjins USB
+ Name[xh]=Amacebo e USB
+-Name[xx]=xxUSB Devicesxx
+ Name[zh_CN]=USB 设备
+ Name[zh_TW]=USB è£ç½®
+ Name[zu]=Amathuluzi anenjongo e-USB
+@@ -144,7 +143,6 @@
+ Comment[vi]=Xem các thiết bị USB nối vá»›i máy tÃnh
+ Comment[wa]=Vey les éndjins USB raloyîs a cisse copiutrece chal
+ Comment[xh]=Bonisela amacebo e USB afakelwe kule khompyutha
+-Comment[xx]=xxView the USB devices attached to this computerxx
+ Comment[zh_CN]=查看连接到该计算机的 USB 设备
+ Comment[zh_TW]=查看連接到這å°é›»è…¦çš„ USB è£ç½®
+ Comment[zu]=Buka amathuluzi e-USB ananyathiselwe kule khomputha
+@@ -206,7 +204,6 @@
+ Keywords[vi]=USB,thiết bị,xem,Ä‘iá»u khiển
+ Keywords[wa]=USB,éndjins,håyneu,contrôle,corwaitaedje
+ Keywords[xh]=USB,amacebo,umboniseli,ulawula
+-Keywords[xx]=xxUSB,devices,viewer,controlxx
+ Keywords[zh_CN]=USB,devices,viewer,control,设备,查看器,控制
+ Keywords[zh_TW]=USB,devices,viewer,control,è£ç½®,檢視器,控制
+ Keywords[zu]=USB,amathukuzi ananjongo,umbukisi,lawula
+diff -Nru kdebase-release-3.4.0/kcontrol/view1394/kcmview1394.desktop kdebase-branch-3.4/kcontrol/view1394/kcmview1394.desktop
+--- kdebase-release-3.4.0/kcontrol/view1394/kcmview1394.desktop 2005-02-04 23:15:09.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/view1394/kcmview1394.desktop 2005-03-07 09:15:31.000000000 -0500
+@@ -64,7 +64,6 @@
+ Name[uz]=IEEE 1394 уÑкуналар
+ Name[vi]=Thiết bị IEEE 1394
+ Name[wa]=Éndjins IEEE 1394
+-Name[xx]=xxIEEE 1394 Devicesxx
+ Name[zh_CN]=IEEE 1394 设备
+ Name[zh_TW]=IEEE 1394 è£ç½®
+
+@@ -123,7 +122,6 @@
+ Comment[uz]=Компьютерга уланган IEEE 1394 уÑкуналарни кўриш
+ Comment[vi]=Xem các thiết bị IEEE 1394 nối và o máy tÃnh nà y
+ Comment[wa]=Vey les éndjins IEEE 1394 raloyîs a cisse copiutrece chal
+-Comment[xx]=xxView the IEEE 1394 devices attached to this computerxx
+ Comment[zh_CN]=查看连接到该计算机的 IEEE 1394 设备
+ Comment[zh_TW]=查看連接到這å°é›»è…¦çš„ IEEE 1394 è£ç½®
+
+@@ -176,7 +174,6 @@
+ Keywords[uz]=1394,Firewire,уÑкуналар,кўрувчи,бошқарув
+ Keywords[vi]=1394,Firewire,thiết bị xem,Ä‘iá»u khiển
+ Keywords[wa]=1394,IEEE 1394,Firewire,éndjins,håyneu,contrôle,corwaitaedje
+-Keywords[xx]=xx1394,Firewire,devices,viewer,controlxx
+ Keywords[zh_CN]=1394,Firewire,devices,viewer,control,设备,查看器,控制,ç«çº¿
+ Keywords[zh_TW]=1394,Firewire,devices,viewer,control,è£ç½®,檢視器,控制
+
+diff -Nru kdebase-release-3.4.0/kcontrol/xinerama/xinerama.desktop kdebase-branch-3.4/kcontrol/xinerama/xinerama.desktop
+--- kdebase-release-3.4.0/kcontrol/xinerama/xinerama.desktop 2005-02-04 23:15:10.000000000 -0500
++++ kdebase-branch-3.4/kcontrol/xinerama/xinerama.desktop 2005-03-07 09:15:31.000000000 -0500
+@@ -62,7 +62,6 @@
+ Name[uz]=Бир нечта монитор
+ Name[vi]=Äa desktop
+ Name[wa]=Multi-waitroûles
+-Name[xx]=xxMultiple Monitorsxx
+ Name[zh_CN]=多个监视器
+ Name[zh_TW]=多é‡é¡¯ç¤ºå™¨
+ Comment=Configure KDE for multiple monitors
+@@ -120,7 +119,6 @@
+ Comment[uz]=KDE'ни бир нечта монитор учун моÑлаш
+ Comment[vi]=Cấu hình KDE cho đa mà n hình
+ Comment[wa]=Apontyî KDE po on håynaedje so sacwantès waitroûles
+-Comment[xx]=xxConfigure KDE for multiple monitorsxx
+ Comment[zh_CN]=é…ç½® KDE 的多个监视器
+ Comment[zh_TW]=è¨å®š KDE 支æ´å¤šé‡é¡¯ç¤ºå™¨
+ Keywords=Xinerama,dual head,multihead,monitor
+@@ -162,6 +160,5 @@
+ Keywords[uz]=Xinerama,dual head,multihead,монитор
+ Keywords[vi]=Xinerama,đầu kép,đa đầu,mà n hình
+ Keywords[wa]=Xinerama,deus waitroûles,multi-waitroûles,waitroûle,dual head,multihead
+-Keywords[xx]=xxXinerama,dual head,multihead,monitorxx
+ Keywords[zh_CN]=Xinerama,dual head,multihead,monitor,åŒå¤´,多头,监视器,显示器
+ Encoding=UTF-8
+diff -Nru kdebase-release-3.4.0/kdepasswd/kcm/kcm_useraccount.desktop kdebase-branch-3.4/kdepasswd/kcm/kcm_useraccount.desktop
+--- kdebase-release-3.4.0/kdepasswd/kcm/kcm_useraccount.desktop 2005-02-18 23:27:04.000000000 -0500
++++ kdebase-branch-3.4/kdepasswd/kcm/kcm_useraccount.desktop 2005-03-30 01:47:46.000000000 -0500
+@@ -17,6 +17,7 @@
+ Name[cy]=Cyfrinair a Chyfrif Defnyddiwr
+ Name[da]=Kodeord og brugerkonto
+ Name[de]=Passwort & Benutzerzugang
++Name[el]=Κωδικός Ï€Ïόσβασης & ΠληÏοφοÏίες χÏήστη
+ Name[eo]=Pasvorto kaj uzanta konto
+ Name[es]=Contraseña y cuenta de usuario
+ Name[et]=Parool ja kasutaja konto
+@@ -49,13 +50,12 @@
+ Name[sk]=Heslo a úÄet
+ Name[sl]=Geslo in uporabniÅ¡ki raÄun
+ Name[sr]=Лозинка и кориÑнички налог
+-Name[sr@Latn]=Лозинка и кориÑнички налог
++Name[sr@Latn]=Lozinka i korisniÄki nalog
+ Name[sv]=Lösenord och användarkonto
+ Name[ta]=கடவà¯à®šà¯à®šà¯Šà®²à¯ & பயனர௠கணகà¯à®•à¯
+ Name[tr]=Parola & Kullanıcı Hesabı
+ Name[uk]=Пароль та рахунок кориÑтувача
+ Name[uz]=Махфий Ñўз ва фойдаланувчи ҳиÑоби
+-Name[xx]=xxPassword & User Accountxx
+ Name[zh_CN]=密ç 和用户信æ¯
+ Keywords=password;email;name;organization;realname;login image;face; echo mode;
+ Keywords[bg]=парола, е-поща, организациÑ, акаунт, потребител, вход, включване, password, email, name, organization, realname, login image, face, echo mode
+@@ -78,7 +78,7 @@
+ Keywords[he]=ססמ×ות, דו×"ל, ש×, ×רגון, ×©× ×מתי,×ª×ž×•× ×ª ×›× ×™×¡×”, מצב echo
+ Keywords[hi]=पासवरà¥à¤¡;ईमेल;नाम;संसà¥à¤¥à¤¾;वासà¥à¤¤à¤µà¤¿à¤•-नाम;लॉगइन छवि;चेहरा; इको मोड;
+ Keywords[hu]=jelszó;e-mail;név;szervezet;valódi név;bejelentkezési kép;arc;kiÃrási mód;
+-Keywords[it]=password;email;nome;organizzazione;nome vero;immagine login;faccia;modoecho;
++Keywords[it]=password;email;nome;organizzazione;nome vero;immagine login;faccia;modo echo;
+ Keywords[ja]=パスワード;email;eメール;åå‰;組織;本å;login ç”»åƒ;ãƒã‚°ã‚¤ãƒ³ç”»åƒ;é¡”; エコーモード;
+ Keywords[lt]=password;email;name;organization;realname;login image;face; echo mode;slaptažodis;e. paštas;el.paštas;vardas;organizacija;tikrasis vardas;veidas
+ Keywords[mk]=password;email;name;organization;realname;login image;face; echo mode;лозинка;е-пошта;електронÑка пошта;име;организација;виÑтинÑко име;Ñлика за најава;лице
+@@ -94,13 +94,12 @@
+ Keywords[sk]=heslo,e-mail,meno,organizácia,celé meno,obrázok pre prihlásenie,režim echo
+ Keywords[sl]=geslo;e-poÅ¡ta;ime;organizacija;pravo ime;slika prijave;obraz; naÄin odmeva;
+ Keywords[sr]=password;email;name;organization;realname;login image;face; echo mode,лозинка,е-пошта,име,организација
+-Keywords[sr@Latn]=password;email;name;organization;realname;login image;face; echo mode,лозинка,е-пошта,име,организација
++Keywords[sr@Latn]=password;email;name;organization;realname;login image;face; echo mode,lozinka,e-pošta,ime,organizacija
+ Keywords[sv]=lösenord;e-post;namn;organisation;verkligt namn;inloggningsbild;bild;ekoläge;
+ Keywords[ta]=கடவà¯à®šà¯à®šà¯Šà®²à¯;மினà¯à®©à®žà¯à®šà®²à¯;பெயரà¯;நிறà¯à®µà®©à®®à¯;மெயà¯à®ªà¯†à®¯à®°à¯;பà¯à®•à¯à®ªà®¤à®¿à®•ை படிமமà¯;à®®à¯à®•à®®à¯; எதிரொலி பாஙà¯à®•à¯;
+ Keywords[tr]=parola,e-posta,isim,gerçek isim,giriş resmi,yüz
+ Keywords[uk]=пароль;адреÑа електронної пошти;організаціÑ;ім'Ñ;фотографіÑ;
+ Keywords[uz]=махфий Ñўз,Ñлектрон почта,фойдаланувчи,ҳақиқий иÑми,нишонча,ташкилот, echo mode
+-Keywords[xx]=xxpassword;email;name;organization;realname;login image;face; echo mode;xx
+ Keywords[zh_CN]=password,email,name,organization,realname,login image,face, echo mode,密ç ,电å邮件,å§“å,组织,真实姓å,登陆图åƒ,头åƒ,回显
+ Comment=User information such as password, name and email
+ Comment[bg]=ÐаÑтройки на потребителÑÐºÐ¸Ñ Ð°ÐºÐ°ÑƒÐ½Ñ‚, паролата, името и е-пощата
+@@ -143,11 +142,10 @@
+ Comment[sk]=Informácie o použÃvateľovi, ako heslo, meno a e-mail
+ Comment[sl]=Uporabniške informacije, kot so geslo, ime in e-pošta
+ Comment[sr]=Информације о кориÑнику као што је лозинка, име и е-пошта
+-Comment[sr@Latn]=Информације о кориÑнику као што је лозинка, име и е-пошта
++Comment[sr@Latn]=Informacije o korisniku kao što je lozinka, ime i e-pošta
+ Comment[sv]=Användarinformation som lösenord, namn och e-post
+ Comment[ta]=பயனர௠தகவல௠கடவà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆà®ªà¯ போல, பெயர௠மறà¯à®±à¯à®®à¯ மிணà¯à®£à®žà¯à®šà®²à¯
+ Comment[tr]=Parola, isim ve e-posta gibi kullanıcı bilgisi
+ Comment[uk]=Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ кориÑтувача така Ñк: пароль, ім'Ñ Ñ‚Ð° адреÑа електронної пошти
+ Comment[uz]=Фойдаланувчининг иÑми, махфий Ñўзи ва Ñлектрон почтаÑи каби маълумот
+-Comment[xx]=xxUser information such as password, name and emailxx
+ Comment[zh_CN]=åƒå¯†ç ã€å§“å和电åé‚®ä»¶è¿™æ ·çš„ç”¨æˆ·ä¿¡æ¯
+diff -Nru kdebase-release-3.4.0/kdepasswd/kdepasswd.desktop kdebase-branch-3.4/kdepasswd/kdepasswd.desktop
+--- kdebase-release-3.4.0/kdepasswd/kdepasswd.desktop 2005-02-18 23:27:04.000000000 -0500
++++ kdebase-branch-3.4/kdepasswd/kdepasswd.desktop 2005-03-07 09:15:31.000000000 -0500
+@@ -53,12 +53,11 @@
+ Name[sk]=Zmena heslahesla
+ Name[sl]=Spremeni geslo
+ Name[sr]=Промени лозинку
+-Name[sr@Latn]=Промени лозинку
++Name[sr@Latn]=Promeni lozinku
+ Name[sv]=Ändra lösenord
+ Name[ta]=கடவà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ மாறà¯à®±à¯
+ Name[th]=เปลี่ยนรหัสผ่าน
+ Name[tr]=Parola DeÄŸiÅŸtir
+ Name[uk]=Зміна паролÑ
+ Name[uz]=Махфий Ñўзни ўзгартириш
+-Name[xx]=xxChange Passwordxx
+ Name[zh_CN]=更改密ç
+diff -Nru kdebase-release-3.4.0/kdeprint/kdeprint_part/kdeprint_part.desktop kdebase-branch-3.4/kdeprint/kdeprint_part/kdeprint_part.desktop
+--- kdebase-release-3.4.0/kdeprint/kdeprint_part/kdeprint_part.desktop 2005-02-04 23:15:11.000000000 -0500
++++ kdebase-branch-3.4/kdeprint/kdeprint_part/kdeprint_part.desktop 2005-04-04 18:02:35.000000000 -0400
+@@ -68,7 +68,6 @@
+ Name[vi]=Công cụ quản lý in ấn
+ Name[wa]=Usteye po manaedjî l' imprimaedje
+ Name[xh]=Isixhobo Sophatho soshicilelo
+-Name[xx]=xxPrint Management Toolxx
+ Name[zh_CN]=打å°ç®¡ç†å·¥å…·
+ Name[zh_TW]=列å°ç®¡ç†å·¥å…·
+ Name[zu]=Ithuluzi Lokuphathwa Koshicilelo
+@@ -76,4 +75,4 @@
+ ServiceTypes=Browser/View,KParts/ReadOnlyPart
+ X-KDE-Library=libkdeprint_part
+ Icon=printmgr
+-InitialPreference=6
++InitialPreference=12
+diff -Nru kdebase-release-3.4.0/kdeprint/kdeprintfax/faxctrl.cpp kdebase-branch-3.4/kdeprint/kdeprintfax/faxctrl.cpp
+--- kdebase-release-3.4.0/kdeprint/kdeprintfax/faxctrl.cpp 2004-03-12 11:27:45.000000000 -0500
++++ kdebase-branch-3.4/kdeprint/kdeprintfax/faxctrl.cpp 2005-03-15 03:53:25.000000000 -0500
+@@ -424,10 +424,10 @@
+ m_filteredfiles.prepend(tmp);
+ m_tempfiles.append(tmp);
+ m_process->clearArguments();
+- *m_process << locate("data","kdeprintfax/anytops") << "-m" << locate("data","kdeprintfax/faxfilters")
++ *m_process << locate("data","kdeprintfax/anytops") << "-m" << KProcess::quote(locate("data","kdeprintfax/faxfilters"))
+ << QString::fromLatin1("--mime=%1").arg(mimeType)
+ << "-p" << pageSize()
+- << m_files[0] << tmp;
++ << KProcess::quote(m_files[0]) << KProcess::quote(tmp);
+ if (!m_process->start(KProcess::NotifyOnExit, KProcess::AllOutput))
+ emit faxSent(false);
+ else
+diff -Nru kdebase-release-3.4.0/kdeprint/kdeprintfax/kdeprintfax.desktop kdebase-branch-3.4/kdeprint/kdeprintfax/kdeprintfax.desktop
+--- kdebase-release-3.4.0/kdeprint/kdeprintfax/kdeprintfax.desktop 2005-02-10 23:52:03.000000000 -0500
++++ kdebase-branch-3.4/kdeprint/kdeprintfax/kdeprintfax.desktop 2005-03-07 09:15:32.000000000 -0500
+@@ -12,7 +12,6 @@
+ Name[sv]=KDE:s skriv ut fax
+ Name[ta]=Kdeஅசà¯à®šà¯à®ªà®¾à®•à¯à®¸à¯
+ Name[th]=จัดà¸à¸²à¸£à¸‡à¸²à¸™à¸žà¸´à¸¡à¸žà¹Œ
+-Name[xx]=xxKdeprintFaxxx
+ GenericName=Fax Utility
+ GenericName[af]=Faks Program
+ GenericName[ar]=أداة Ø§Ù„ÙØ§ÙƒØ³
+@@ -75,7 +74,6 @@
+ GenericName[vi]=Các tiện Ãch Fax
+ GenericName[wa]=Usteye di facs
+ GenericName[xh]=Uncedo lwe Fax
+-GenericName[xx]=xxFax Utilityxx
+ GenericName[zh_CN]=ä¼ çœŸå·¥å…·
+ GenericName[zh_TW]=傳真工具
+ GenericName[zu]=Isisebenzi se-Fax
+diff -Nru kdebase-release-3.4.0/kdeprint/kjobviewer/kjobviewer.desktop kdebase-branch-3.4/kdeprint/kjobviewer/kjobviewer.desktop
+--- kdebase-release-3.4.0/kdeprint/kjobviewer/kjobviewer.desktop 2005-02-23 00:05:42.000000000 -0500
++++ kdebase-branch-3.4/kdeprint/kjobviewer/kjobviewer.desktop 2005-03-22 12:38:09.000000000 -0500
+@@ -9,14 +9,15 @@
+ Name=KJobViewer
+ Name[bn]=কে-জব-à¦à¦¿à¦‰à§Ÿà¦¾à¦°
+ Name[cy]=KGwelyddSwyddi
++Name[ja]=Kジョブビューア
+ Name[pl]=Przeglądarka zadań drukowania
+ Name[pt_BR]=Trabalhos de Impressão
+ Name[sv]=K-jobbvisare
+ Name[ta]=கேபணி காடà¯à®šà®¿à®¯à®¾à®³à®©à¯
+-Name[xx]=xxKJobViewerxx
+ GenericName=Print Jobs
+ GenericName[bg]=Ð—Ð°Ð´Ð°Ð½Ð¸Ñ Ð·Ð° печат
+ GenericName[bn]=মà§à¦¦à§à¦°à¦£ তালিকা
++GenericName[bs]=Zadaci štampe
+ GenericName[ca]=Treballs d'impressió
+ GenericName[cs]=Tiskové úlohy
+ GenericName[cy]=Swyddi Argraffu
+@@ -24,6 +25,7 @@
+ GenericName[de]=Druckaufträge
+ GenericName[es]=Imprimir trabajos
+ GenericName[et]=Printeri tööd
++GenericName[eu]=Inprimaketa lanak
+ GenericName[fi]=Tulostustyöt
+ GenericName[fr]=Tâches d'impressions
+ GenericName[fy]=Ofdruktaken
+@@ -32,6 +34,7 @@
+ GenericName[hu]=Nyomtatási feladatok
+ GenericName[is]=Prentverk
+ GenericName[it]=Lavori di stampa
++GenericName[ja]=å°åˆ·ã‚¸ãƒ§ãƒ–
+ GenericName[lt]=Spausdinimo užduotys
+ GenericName[nb]=Utskriftsjobber
+ GenericName[nl]=Afdruktaken
+@@ -41,13 +44,13 @@
+ GenericName[pt_BR]=Tarefas de Impressão
+ GenericName[ru]=Ð—Ð°Ð´Ð°Ð½Ð¸Ñ Ð¿ÐµÑ‡Ð°Ñ‚Ð¸
+ GenericName[se]=Čálihanbarggut
++GenericName[sk]=TlaÄové úlohy
+ GenericName[sl]=Tiskalniška opravila
+ GenericName[sr]=ПоÑлови штампе
+-GenericName[sr@Latn]=ПоÑлови штампе
++GenericName[sr@Latn]=Poslovi štampe
+ GenericName[sv]=Skrivarjobb
+ GenericName[ta]=அசà¯à®šà¯à®ªà¯ பணிகளà¯
+ GenericName[uk]=Задачі друку
+-GenericName[xx]=xxPrint Jobsxx
+ GenericName[zh_CN]=打å°ä»»åŠ¡
+
+ X-DCOP-ServiceType=Unique
+diff -Nru kdebase-release-3.4.0/kdeprint/kprinter/kprinter.desktop kdebase-branch-3.4/kdeprint/kprinter/kprinter.desktop
+--- kdebase-release-3.4.0/kdeprint/kprinter/kprinter.desktop 2005-02-04 23:15:11.000000000 -0500
++++ kdebase-branch-3.4/kdeprint/kprinter/kprinter.desktop 2005-03-07 09:15:33.000000000 -0500
+@@ -28,7 +28,6 @@
+ Name[th]=เครื่à¸à¸‡à¸žà¸´à¸¡à¸žà¹Œ K
+ Name[tr]=KYazıcı
+ Name[ven]=Phirinthara ya K
+-Name[xx]=xxKPrinterxx
+ GenericName=Printing Tool
+ GenericName[af]=Besig om te druk Program
+ GenericName[ar]=أداة الطباعة
+@@ -92,7 +91,6 @@
+ GenericName[vi]=Công cụ in
+ GenericName[wa]=Usteye d'Â imprimaedje
+ GenericName[xh]=Isixhobo Sokushicilela
+-GenericName[xx]=xxPrinting Toolxx
+ GenericName[zh_CN]=打å°å·¥å…·
+ GenericName[zh_TW]=列å°å·¥å…·
+ GenericName[zu]=Ithuluzi Lokushicelela
+diff -Nru kdebase-release-3.4.0/kdeprint/printmgr/printers.desktop kdebase-branch-3.4/kdeprint/printmgr/printers.desktop
+--- kdebase-release-3.4.0/kdeprint/printmgr/printers.desktop 2005-02-04 23:15:12.000000000 -0500
++++ kdebase-branch-3.4/kdeprint/printmgr/printers.desktop 2005-03-26 02:37:42.000000000 -0500
+@@ -72,7 +72,6 @@
+ Name[vi]=Máy in
+ Name[wa]=Sicrireces
+ Name[xh]=Abashicileli
+-Name[xx]=xxPrintersxx
+ Name[zh_CN]=æ‰“å°æœº
+ Name[zh_TW]=å°è¡¨æ©Ÿ
+ Name[zu]=Abashicileli
+@@ -98,7 +97,7 @@
+ Comment[fa]=تنظیمات سیستم چاپ چاپگرها,کارها,کلاسها وغیره
+ Comment[fi]=Tulostusjärjestelmän asetukset (tulostimet, työt, luokat, ...)
+ Comment[fr]=Configuration du système d'impression (imprimantes, travaux d'impression, classes...)
+-Comment[fy]=Ynstellingen fan it ôfdruksysteem (printers, taken, klassen, ...)
++Comment[fy]=Ynstellings fan it ôfdruksysteem (printers, taken, klassen, ...)
+ Comment[gl]=Configuración de impresión do sistema (impresoras, traballos, clases, ...)
+ Comment[he]=×©×™× ×•×™ הגדרות מערכת ההדפסה (מדפסות, עבודות, מחלקות...)
+ Comment[hi]=पà¥à¤°à¤¿à¤‚टर तंतà¥à¤° कॉनà¥à¤«à¤¼à¤¿à¤—रेशन (पà¥à¤°à¤¿à¤‚टर,कारà¥à¤¯,कà¥à¤²à¤¾à¤¸à¥‡à¤¸...)
+@@ -140,7 +139,6 @@
+ Comment[ven]=Nzudzanyo ya maitele au phirintha (Dziphirinthara, mishumo, dzikilasi,...)
+ Comment[vi]=Cấu hình hệ thống in ấn(máy in, tác vụ, lớp, ...)
+ Comment[xh]=Uqwalaselo lwendlela yoshicilelo (abashicileli, imisebenzi, iintlobo, ...)
+-Comment[xx]=xxPrinting system configuration (printers, jobs, classes, ...)xx
+ Comment[zh_CN]=打å°ç³»ç»Ÿé…ç½®(æ‰“å°æœºã€ä»»åŠ¡ã€ç±»ç‰ç‰)
+ Comment[zh_TW]=列å°ç³»çµ±è¨å®š (å°è¡¨æ©Ÿã€å·¥ä½œã€é¡žåˆ¥ç‰ç‰)
+ Comment[zu]=Inhlanganiselo yesistimu yokushicilelo (abashicileli, imisebenzi, amakilasi, ...)
+@@ -205,7 +203,6 @@
+ Keywords[ven]=u phirintha,phirinthara,vhulanguli ha phirinthara
+ Keywords[vi]=in ấn,máy in,quản lÃ
+ Keywords[xh]=shicilela,umshicileli,uphatho lokushicilela
+-Keywords[xx]=xxprint,printer,printing managementxx
+ Keywords[zh_CN]=print,printer,printing management,打å°,æ‰“å°æœº,打å°ç®¡ç†
+ Keywords[zh_TW]=print,printer,printing management,列å°,å°è¡¨æ©Ÿ,列å°ç®¡ç†
+ Keywords[zu]=shicilela,umshicileli,abaphathi boshicilelo
+diff -Nru kdebase-release-3.4.0/kdeprint/printmgr/printmgr.desktop kdebase-branch-3.4/kdeprint/printmgr/printmgr.desktop
+--- kdebase-release-3.4.0/kdeprint/printmgr/printmgr.desktop 2005-02-04 23:15:12.000000000 -0500
++++ kdebase-branch-3.4/kdeprint/printmgr/printmgr.desktop 2005-03-26 02:37:42.000000000 -0500
+@@ -78,7 +78,6 @@
+ Name[vi]=Trình quản là in
+ Name[wa]=Manaedjeu d'Â imprimaedje
+ Name[xh]=Umphathi Woshicilelo
+-Name[xx]=xxPrinting Managerxx
+ Name[zh_CN]=打å°ç®¡ç†å™¨
+ Name[zh_TW]=列å°ç®¡ç†ç¨‹å¼
+ Name[zu]=Imenenja Yoshicilelo
+@@ -104,7 +103,7 @@
+ Comment[fa]=تنظیمات سیستم چاپ چاپگرها,کارها,کلاسها وغیره
+ Comment[fi]=Tulostusjärjestelmän asetukset (tulostimet, työt, luokat, ...)
+ Comment[fr]=Configuration du système d'impression (imprimantes, travaux d'impression, classes...)
+-Comment[fy]=Ynstellingen fan it ôfdruksysteem (printers, taken, klassen, ...)
++Comment[fy]=Ynstellings fan it ôfdruksysteem (printers, taken, klassen, ...)
+ Comment[gl]=Configuración de impresión do sistema (impresoras, traballos, clases, ...)
+ Comment[he]=×©×™× ×•×™ הגדרות מערכת ההדפסה (מדפסות, עבודות, מחלקות...)
+ Comment[hi]=पà¥à¤°à¤¿à¤‚टर तंतà¥à¤° कॉनà¥à¤«à¤¼à¤¿à¤—रेशन (पà¥à¤°à¤¿à¤‚टर,कारà¥à¤¯,कà¥à¤²à¤¾à¤¸à¥‡à¤¸...)
+@@ -146,7 +145,6 @@
+ Comment[ven]=Nzudzanyo ya maitele au phirintha (Dziphirinthara, mishumo, dzikilasi,...)
+ Comment[vi]=Cấu hình hệ thống in ấn(máy in, tác vụ, lớp, ...)
+ Comment[xh]=Uqwalaselo lwendlela yoshicilelo (abashicileli, imisebenzi, iintlobo, ...)
+-Comment[xx]=xxPrinting system configuration (printers, jobs, classes, ...)xx
+ Comment[zh_CN]=打å°ç³»ç»Ÿé…ç½®(æ‰“å°æœºã€ä»»åŠ¡ã€ç±»ç‰ç‰)
+ Comment[zh_TW]=列å°ç³»çµ±è¨å®š (å°è¡¨æ©Ÿã€å·¥ä½œã€é¡žåˆ¥ç‰ç‰)
+ Comment[zu]=Inhlanganiselo yesistimu yokushicilelo (abashicileli, imisebenzi, amakilasi, ...)
+@@ -211,7 +209,6 @@
+ Keywords[ven]=u phirintha,phirinthara,vhulanguli ha phirinthara
+ Keywords[vi]=in ấn,máy in,quản lÃ
+ Keywords[xh]=shicilela,umshicileli,uphatho lokushicilela
+-Keywords[xx]=xxprint,printer,printing managementxx
+ Keywords[zh_CN]=print,printer,printing management,打å°,æ‰“å°æœº,打å°ç®¡ç†
+ Keywords[zh_TW]=print,printer,printing management,列å°,å°è¡¨æ©Ÿ,列å°ç®¡ç†
+ Keywords[zu]=shicilela,umshicileli,abaphathi boshicilelo
+diff -Nru kdebase-release-3.4.0/kdeprint/slave/kio_print.cpp kdebase-branch-3.4/kdeprint/slave/kio_print.cpp
+--- kdebase-release-3.4.0/kdeprint/slave/kio_print.cpp 2005-03-02 08:48:18.000000000 -0500
++++ kdebase-branch-3.4/kdeprint/slave/kio_print.cpp 2005-04-04 18:02:35.000000000 -0400
+@@ -72,7 +72,7 @@
+ addAtom(entry, KIO::UDS_URL, 0, url);
+ PRINT_DEBUG << "creating dir entry url=" << url << endl;
+ addAtom(entry, KIO::UDS_SIZE, 0);
+- addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
++ //addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
+ }
+
+ static void createFileEntry(KIO::UDSEntry& entry, const QString& name, const QString& url, const QString& mime)
+@@ -402,7 +402,7 @@
+ else if (path[0].lower() == "specials")
+ createDirEntry(entry, i18n("Specials"), "print:/specials", "print/folder");
+ else if (path[0].lower() == "manager")
+- createFileEntry(entry, i18n("Manager"), "print:/manager", "print/manager");
++ createDirEntry(entry, i18n("Manager"), "print:/manager", "print/manager");
+ else if (path[0].lower().startsWith("jobs"))
+ createFileEntry(entry, i18n("Jobs"), url.url(), "text/html");
+ else
+diff -Nru kdebase-release-3.4.0/kdeprint/slave/mimetypes/class.desktop kdebase-branch-3.4/kdeprint/slave/mimetypes/class.desktop
+--- kdebase-release-3.4.0/kdeprint/slave/mimetypes/class.desktop 2005-02-18 23:27:05.000000000 -0500
++++ kdebase-branch-3.4/kdeprint/slave/mimetypes/class.desktop 2005-03-30 01:47:46.000000000 -0500
+@@ -9,6 +9,7 @@
+ Comment[cs]=TÅ™Ãda tiskáren
+ Comment[da]=Klasse af printere
+ Comment[de]=Druckerklasse
++Comment[el]=Κλάση Εκτυπωτών
+ Comment[eo]=Presiloklaso
+ Comment[es]=Clase de impresoras
+ Comment[et]=Printerite klass
+@@ -40,13 +41,12 @@
+ Comment[sk]=Trieda tlaÄiarnÃ
+ Comment[sl]=Razred tiskalnikov
+ Comment[sr]=КлаÑе штампача
+-Comment[sr@Latn]=КлаÑе штампача
++Comment[sr@Latn]=Klase Å¡tampaÄa
+ Comment[sv]=Klass av skrivare
+ Comment[ta]=அசà¯à®šà®¿à®¯à®¨à¯à®¤à®¿à®°à®™à¯à®•ளின௠வகை
+ Comment[tr]=Yazıcı Sınıfı
+ Comment[uk]=ÐšÐ»Ð°Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ñ–Ð²
+ Comment[uz]=Принтерлар Ñинфи
+-Comment[xx]=xxClass of Printersxx
+ Comment[zh_CN]=æ‰“å°æœºç±»
+ Icon=print_class
+ Type=MimeType
+diff -Nru kdebase-release-3.4.0/kdeprint/slave/mimetypes/driver.desktop kdebase-branch-3.4/kdeprint/slave/mimetypes/driver.desktop
+--- kdebase-release-3.4.0/kdeprint/slave/mimetypes/driver.desktop 2005-02-18 23:27:05.000000000 -0500
++++ kdebase-branch-3.4/kdeprint/slave/mimetypes/driver.desktop 2005-03-30 01:47:46.000000000 -0500
+@@ -10,6 +10,7 @@
+ Comment[cs]=OvladaÄ tiskárny
+ Comment[da]=Printerdriver
+ Comment[de]=Druckertreiber
++Comment[el]=Οδηγός εκτυπωτή
+ Comment[eo]=Presila aparato
+ Comment[es]=Controlador de impresora
+ Comment[et]=Printeri draiver
+@@ -42,13 +43,12 @@
+ Comment[sk]=OvládaÄ tlaÄiarne
+ Comment[sl]=Tiskalniški gonilnik
+ Comment[sr]=Управљачки програм за штампач
+-Comment[sr@Latn]=Управљачки програм за штампач
++Comment[sr@Latn]=UpravljaÄki program za Å¡tampaÄ
+ Comment[sv]=Skrivardrivrutin
+ Comment[ta]=அசà¯à®šà®¿à®¯à®¨à¯à®¤à®¿à®° இயகà¯à®•ி
+ Comment[tr]=Yazıcı Sürücüsü
+ Comment[uk]=Драйвер принтера
+ Comment[uz]=Принтернинг драйвери
+-Comment[xx]=xxPrinter Driverxx
+ Comment[zh_CN]=æ‰“å°æœºé©±åŠ¨ç¨‹åº
+ Icon=postscript
+ Type=MimeType
+diff -Nru kdebase-release-3.4.0/kdeprint/slave/mimetypes/folder.desktop kdebase-branch-3.4/kdeprint/slave/mimetypes/folder.desktop
+--- kdebase-release-3.4.0/kdeprint/slave/mimetypes/folder.desktop 2005-02-23 00:05:42.000000000 -0500
++++ kdebase-branch-3.4/kdeprint/slave/mimetypes/folder.desktop 2005-03-30 01:47:46.000000000 -0500
+@@ -4,12 +4,15 @@
+ Comment[bg]=Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ð° печата
+ Comment[bn]=মà§à¦¦à§à¦°à¦£ ফোলà§à¦¡à¦¾à¦°
+ Comment[br]=Renkell moulañ
++Comment[bs]=Direktorij za štampu
+ Comment[ca]=Carpeta d'impressió
+ Comment[cs]=Složka tisku
+ Comment[da]=Udskriftsmappe
+ Comment[de]=Druckordner
++Comment[el]=Φάκελος εκτυπώσεων
+ Comment[es]=Carpeta de impresión
+ Comment[et]=Trükkimise kataloog
++Comment[eu]=Inprimaketa karpeta
+ Comment[fi]=Tulostuskansio
+ Comment[fr]=Dossier d'impression
+ Comment[fy]=Ofdrukmap
+@@ -18,6 +21,7 @@
+ Comment[hu]=Nyomtatáskezelő-mappa
+ Comment[is]=Prentmappa
+ Comment[it]=Cartella di stampa
++Comment[ja]=å°åˆ·ãƒ•ォルダ
+ Comment[lt]=Spausdinimo aplankas
+ Comment[nb]=Skrivermappe
+ Comment[nl]=Afdrukmap
+@@ -27,9 +31,10 @@
+ Comment[pt_BR]=Pasta de Impressão
+ Comment[ru]=Папка печати
+ Comment[se]=Čálihanmáhppa
++Comment[sk]=PrieÄinok tlaÄiarne
+ Comment[sl]=Tiskalniška mapa
+ Comment[sr]=Директоријум за штампу
+-Comment[sr@Latn]=Директоријум за штампу
++Comment[sr@Latn]=Direktorijum za štampu
+ Comment[sv]=Skrivarkatalog
+ Comment[ta]=அசà¯à®šà®¿à®Ÿà¯à®®à¯ அடைவà¯
+ Comment[uk]=Тека друку
+diff -Nru kdebase-release-3.4.0/kdeprint/slave/mimetypes/jobs.desktop kdebase-branch-3.4/kdeprint/slave/mimetypes/jobs.desktop
+--- kdebase-release-3.4.0/kdeprint/slave/mimetypes/jobs.desktop 2005-02-04 23:15:12.000000000 -0500
++++ kdebase-branch-3.4/kdeprint/slave/mimetypes/jobs.desktop 2005-03-07 09:15:33.000000000 -0500
+@@ -62,7 +62,6 @@
+ Comment[vi]=Tác vụ in
+ Comment[wa]=Bouyes d'Â imprimaedje
+ Comment[xh]=Imisebenzi Yoshicilelo
+-Comment[xx]=xxPrint Jobsxx
+ Comment[zh_CN]=打å°ä»»åŠ¡
+ Comment[zh_TW]=列å°å·¥ä½œ
+ Comment[zu]=Imisebenzi Yokushicilela
+diff -Nru kdebase-release-3.4.0/kdeprint/slave/mimetypes/manager.desktop kdebase-branch-3.4/kdeprint/slave/mimetypes/manager.desktop
+--- kdebase-release-3.4.0/kdeprint/slave/mimetypes/manager.desktop 2005-02-23 00:05:42.000000000 -0500
++++ kdebase-branch-3.4/kdeprint/slave/mimetypes/manager.desktop 2005-03-07 09:15:34.000000000 -0500
+@@ -54,7 +54,7 @@
+ Comment[sk]=Nástroj na správu tlaÄe
+ Comment[sl]=Orodje za upravljanje tiskanja
+ Comment[sr]=Ðлат за управљање штампом
+-Comment[sr@Latn]=Alatka za upravljanje štampom
++Comment[sr@Latn]=Alat za upravljanje štampom
+ Comment[sv]=Verktyg för att hantera utskrifter
+ Comment[ta]=அசà¯à®šà¯ மேலாணà¯à®®à¯ˆ கரà¯à®µà®¿
+ Comment[tg]=Обзори мудириÑти чоп
+@@ -66,7 +66,6 @@
+ Comment[vi]=Công cụ quản là in
+ Comment[wa]=Usteye po manaedjî l' imprimaedje
+ Comment[xh]=Isixhobo Sophatho Sokushicilela
+-Comment[xx]=xxPrint Management Toolxx
+ Comment[zh_CN]=打å°ç®¡ç†å·¥å…·
+ Comment[zh_TW]=列å°ç®¡ç†å·¥å…·
+ Comment[zu]=Ithuluzi Lokuphatha Ushicilelo
+diff -Nru kdebase-release-3.4.0/kdeprint/slave/mimetypes/printer.desktop kdebase-branch-3.4/kdeprint/slave/mimetypes/printer.desktop
+--- kdebase-release-3.4.0/kdeprint/slave/mimetypes/printer.desktop 2005-02-04 23:15:12.000000000 -0500
++++ kdebase-branch-3.4/kdeprint/slave/mimetypes/printer.desktop 2005-03-07 09:15:34.000000000 -0500
+@@ -61,7 +61,6 @@
+ Comment[vi]=Máy in
+ Comment[wa]=Sicrirece
+ Comment[xh]=Umshicileli
+-Comment[xx]=xxPrinterxx
+ Comment[zh_CN]=æ‰“å°æœº
+ Comment[zh_TW]=å°è¡¨æ©Ÿ
+ Comment[zu]=Umshicileli
+diff -Nru kdebase-release-3.4.0/kdeprint/slave/mimetypes/printermodel.desktop kdebase-branch-3.4/kdeprint/slave/mimetypes/printermodel.desktop
+--- kdebase-release-3.4.0/kdeprint/slave/mimetypes/printermodel.desktop 2005-02-18 23:27:05.000000000 -0500
++++ kdebase-branch-3.4/kdeprint/slave/mimetypes/printermodel.desktop 2005-03-30 01:47:46.000000000 -0500
+@@ -11,6 +11,7 @@
+ Comment[cy]=Model Argraffydd
+ Comment[da]=Printermodel
+ Comment[de]=Druckermodell
++Comment[el]=ΜοντÎλο εκτυπωτή
+ Comment[eo]=Presila modelo
+ Comment[es]=Modelo de impresora
+ Comment[et]=Printeri mudel
+@@ -43,13 +44,12 @@
+ Comment[sk]=Model tlaÄiarne
+ Comment[sl]=Model tiskalnika
+ Comment[sr]=Модел штампача
+-Comment[sr@Latn]=Модел штампача
++Comment[sr@Latn]=Model Å¡tampaÄa
+ Comment[sv]=Skrivarmodell
+ Comment[ta]=அசà¯à®šà®¿à®¯à®¨à¯à®¤à®¿à®° மாதிரி
+ Comment[tr]=Yazıcı Modeli
+ Comment[uk]=Модель принтера
+ Comment[uz]=Принтернинг модели
+-Comment[xx]=xxPrinter Modelxx
+ Comment[zh_CN]=æ‰“å°æœºåž‹å·
+ Icon=printer1
+ Type=MimeType
+diff -Nru kdebase-release-3.4.0/kdesktop/desktop.cc kdebase-branch-3.4/kdesktop/desktop.cc
+--- kdebase-release-3.4.0/kdesktop/desktop.cc 2005-02-19 10:45:35.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/desktop.cc 2005-03-18 10:40:22.000000000 -0500
+@@ -371,6 +371,7 @@
+ keys->updateConnections();
+ }
+
++ KLaunchSettings::self()->readConfig();
+ if( !KLaunchSettings::busyCursor() )
+ {
+ delete startup_id;
+diff -Nru kdebase-release-3.4.0/kdesktop/init/Home.desktop kdebase-branch-3.4/kdesktop/init/Home.desktop
+--- kdebase-release-3.4.0/kdesktop/init/Home.desktop 2005-02-23 00:05:42.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/init/Home.desktop 2005-03-07 09:15:34.000000000 -0500
+@@ -67,7 +67,6 @@
+ Name[vi]=NhÃ
+ Name[wa]=MÃ¥jhon
+ Name[xh]=Ikhaya
+-Name[xx]=xxHomexx
+ Name[zh_CN]=主文件夹
+ Name[zh_TW]=家目錄
+ Name[zu]=Ikhaya
+@@ -127,7 +126,7 @@
+ GenericName[sk]=Osobné súbory
+ GenericName[sl]=Osebne datoteke
+ GenericName[sr]=Лични фајлови
+-GenericName[sr@Latn]=Ovaj direktorijum sadrži vaÅ¡e liÄne fajlove
++GenericName[sr@Latn]=LiÄni fajlovi
+ GenericName[sv]=Personliga filer
+ GenericName[ta]=சொநà¯à®¤ கோபà¯à®ªà¯à®•ளà¯
+ GenericName[tg]=Файлҳои шахÑÓ£
+@@ -139,7 +138,6 @@
+ GenericName[vi]=File cá nhân
+ GenericName[wa]=Fitchîs da vosse
+ GenericName[xh]=Iifayile Zobuqu
+-GenericName[xx]=xxPersonal Filesxx
+ GenericName[zh_CN]=个人文件
+ GenericName[zh_TW]=個人檔案
+ GenericName[zu]=Amafayela Omuntu siqu
+diff -Nru kdebase-release-3.4.0/kdesktop/init/System.desktop kdebase-branch-3.4/kdesktop/init/System.desktop
+--- kdebase-release-3.4.0/kdesktop/init/System.desktop 2005-02-23 00:05:42.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/init/System.desktop 2005-03-30 01:47:47.000000000 -0500
+@@ -64,20 +64,22 @@
+ Name[vi]=Hệ Thống
+ Name[wa]=Sistinme
+ Name[xh]=Indlela esestyenziswayo
+-Name[xx]=xxSystemxx
+ Name[zh_CN]=系统
+ Name[zh_TW]=系統
+ Name[zu]=Isistimu
+ GenericName=System Locations
+ GenericName[bg]=СиÑтемни файлове
+ GenericName[bn]=সিসà§à¦Ÿà§‡à¦® অবসà§à¦¥à¦¾à¦¨à¦¸à¦®à§‚হ
++GenericName[bs]=Sistemske lokacije
+ GenericName[ca]=Localitzacions del sistema
+ GenericName[cs]=Systémová umÃstÄ›nÃ
+ GenericName[da]=System-steder
+ GenericName[de]=Systemordner
++GenericName[el]=Τοποθεσίες συστήματος
+ GenericName[eo]=Sistemaj lokoj
+ GenericName[es]=Localizaciones del sistema
+ GenericName[et]=Süsteemi asukohad
++GenericName[eu]=Sistemaren kokapenak
+ GenericName[fi]=Järjestelmän sijainti
+ GenericName[fr]=Emplacements systèmes
+ GenericName[fy]=Systeemlokaasjes
+@@ -86,6 +88,7 @@
+ GenericName[hu]=Rendszerkönyvtárak
+ GenericName[is]=Staðsetningar kerfis
+ GenericName[it]=Indirizzi di sistema
++GenericName[ja]=ã‚·ã‚¹ãƒ†ãƒ å ´æ‰€
+ GenericName[lt]=Sistemos vietos
+ GenericName[mk]=СиÑтемÑки локации
+ GenericName[mt]=System Monitor
+@@ -98,14 +101,14 @@
+ GenericName[pt_BR]=Localizações no Sistema
+ GenericName[ru]=СиÑтемные адреÑа
+ GenericName[se]=Vuogádatbáikkit
++GenericName[sk]=Systémové umiestnenia
+ GenericName[sl]=Sistemske lokacije
+ GenericName[sr]=СиÑтемÑке локације
+-GenericName[sr@Latn]=СиÑтемÑке локације
++GenericName[sr@Latn]=Sistemske lokacije
+ GenericName[sv]=Systemplatser
+ GenericName[ta]=அமைபà¯à®ªà¯ இடஙà¯à®•ளà¯
+ GenericName[tr]=Sistem Konumları
+ GenericName[uk]=СиÑтемні адреÑи
+-GenericName[xx]=xxSystem Locationsxx
+ GenericName[zh_CN]=系统定ä½
+ URL=system:/
+ Icon=system
+diff -Nru kdebase-release-3.4.0/kdesktop/init/Templates/CDROM-Device.desktop kdebase-branch-3.4/kdesktop/init/Templates/CDROM-Device.desktop
+--- kdebase-release-3.4.0/kdesktop/init/Templates/CDROM-Device.desktop 2005-02-04 23:15:13.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/init/Templates/CDROM-Device.desktop 2005-03-07 09:15:35.000000000 -0500
+@@ -77,7 +77,6 @@
+ Name[vi]=Äẩy ra
+ Name[wa]=Fé rexhe
+ Name[xh]=Khuphela ngaphandle
+-Name[xx]=xxEjectxx
+ Name[zh_CN]=弹出
+ Name[zh_TW]=跳出
+ Name[zu]=Khipha
+diff -Nru kdebase-release-3.4.0/kdesktop/init/Templates/CDWRITER-Device.desktop kdebase-branch-3.4/kdesktop/init/Templates/CDWRITER-Device.desktop
+--- kdebase-release-3.4.0/kdesktop/init/Templates/CDWRITER-Device.desktop 2005-02-04 23:15:13.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/init/Templates/CDWRITER-Device.desktop 2005-03-07 09:15:35.000000000 -0500
+@@ -77,7 +77,6 @@
+ Name[vi]=Äẩy ra
+ Name[wa]=Fé rexhe
+ Name[xh]=Khuphela ngaphandle
+-Name[xx]=xxEjectxx
+ Name[zh_CN]=弹出
+ Name[zh_TW]=跳出
+ Name[zu]=Khipha
+diff -Nru kdebase-release-3.4.0/kdesktop/init/Templates/DVDROM-Device.desktop kdebase-branch-3.4/kdesktop/init/Templates/DVDROM-Device.desktop
+--- kdebase-release-3.4.0/kdesktop/init/Templates/DVDROM-Device.desktop 2005-02-04 23:15:13.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/init/Templates/DVDROM-Device.desktop 2005-03-07 09:15:35.000000000 -0500
+@@ -77,7 +77,6 @@
+ Name[vi]=Äẩy ra
+ Name[wa]=Fé rexhe
+ Name[xh]=Khuphela ngaphandle
+-Name[xx]=xxEjectxx
+ Name[zh_CN]=弹出
+ Name[zh_TW]=跳出
+ Name[zu]=Khipha
+diff -Nru kdebase-release-3.4.0/kdesktop/init/Templates/Directory.desktop kdebase-branch-3.4/kdesktop/init/Templates/Directory.desktop
+--- kdebase-release-3.4.0/kdesktop/init/Templates/Directory.desktop 2005-02-15 23:31:29.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/init/Templates/Directory.desktop 2005-03-07 09:15:35.000000000 -0500
+@@ -58,7 +58,6 @@
+ Name[uz]=Жилд
+ Name[vi]=Thư mục
+ Name[wa]=Ridant...
+-Name[xx]=xxFolder...xx
+ Name[zh_CN]=文件夹...
+ Comment=Enter folder name:
+ Comment[ar]=أدخل اسم المجلَد:
+@@ -117,7 +116,6 @@
+ Comment[uz]=Жилднинг номини киритинг:
+ Comment[vi]=Äiá»n thư mục má»›i
+ Comment[wa]=Dinez l'Â no do ridant:
+-Comment[xx]=xxEnter folder name:xx
+ Comment[zh_CN]=输入文件夹å称:
+ Type=Link
+ URL=.source/emptydir
+diff -Nru kdebase-release-3.4.0/kdesktop/init/Templates/Floppy.desktop kdebase-branch-3.4/kdesktop/init/Templates/Floppy.desktop
+--- kdebase-release-3.4.0/kdesktop/init/Templates/Floppy.desktop 2005-02-04 23:15:13.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/init/Templates/Floppy.desktop 2005-03-07 09:15:35.000000000 -0500
+@@ -51,7 +51,6 @@
+ Name[vi]=Äinh dạng
+ Name[wa]=Abwesner
+ Name[xh]=Ifomati
+-Name[xx]=xxFormatxx
+ Name[zh_CN]=æ ¼å¼
+ Name[zh_TW]=æ ¼å¼åŒ–
+ Name[zu]=Isakhiwo
+diff -Nru kdebase-release-3.4.0/kdesktop/init/Templates/HTMLFile.desktop kdebase-branch-3.4/kdesktop/init/Templates/HTMLFile.desktop
+--- kdebase-release-3.4.0/kdesktop/init/Templates/HTMLFile.desktop 2005-02-10 23:52:04.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/init/Templates/HTMLFile.desktop 2005-03-30 01:47:47.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=HTML File...
++Name[af]=HTML Lêer...
+ Name[ar]=مل٠HTML...
+ Name[be]=HTML файл...
+ Name[bg]=Файл HTML...
+@@ -58,7 +59,6 @@
+ Name[uz]=HTML-файли...
+ Name[vi]=File HTML
+ Name[wa]=Fitchî HTML...
+-Name[xx]=xxHTML File...xx
+ Name[zh_CN]=HTML 文件...
+ Name[zh_TW]=HTML 檔案...
+ Comment=Enter HTML filename:
+@@ -72,6 +72,7 @@
+ Comment[cs]=Zadejte název HTML souboru:
+ Comment[da]=Indtast HTML-filnavn:
+ Comment[de]=Name der HTML-Datei eingeben:
++Comment[el]=Δώστε το όνομα του αÏχείου HTML:
+ Comment[eo]=Enigu HTML-dosiernomon:
+ Comment[es]=Introduzca nombre de archivo HTML:
+ Comment[et]=Sisesta HTML-faili nimi:
+@@ -104,13 +105,12 @@
+ Comment[sk]=Zadajte meno súboru HTML:
+ Comment[sl]=Vnesite ime datoteke HTML:
+ Comment[sr]=УнеÑите име HTML фајла:
+-Comment[sr@Latn]=УнеÑите име HTML фајла:
++Comment[sr@Latn]=Unesite ime HTML fajla:
+ Comment[sv]=Ange HTML-filnamn:
+ Comment[ta]=HTML கோபà¯à®ªà¯ பெயரை உளà¯à®³à®¿à®Ÿà¯:
+ Comment[tr]=HTML dosyasını girin:
+ Comment[uk]=Введіть назву файлу HTML:
+ Comment[uz]=HTML-файлнинг номини киритинг:
+-Comment[xx]=xxEnter HTML filename:xx
+ Comment[zh_CN]=输入 HTML 文件å:
+ Type=Link
+ URL=.source/HTMLFile.html
+diff -Nru kdebase-release-3.4.0/kdesktop/init/Templates/TextFile.desktop kdebase-branch-3.4/kdesktop/init/Templates/TextFile.desktop
+--- kdebase-release-3.4.0/kdesktop/init/Templates/TextFile.desktop 2005-02-10 23:52:04.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/init/Templates/TextFile.desktop 2005-03-30 01:47:47.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Text File...
++Name[af]=Teks Lêer...
+ Name[ar]=مل٠نصي...
+ Name[be]=ТÑкÑтавы файл...
+ Name[bg]=ТекÑтов файл...
+@@ -58,7 +59,6 @@
+ Name[uz]=Матн файли...
+ Name[vi]=File text
+ Name[wa]=Fitchî tecse...
+-Name[xx]=xxText File...xx
+ Name[zh_CN]=文本文件...
+ Name[zh_TW]=æ–‡å—æª”案...
+ Comment=Enter text filename:
+@@ -72,6 +72,7 @@
+ Comment[cs]=Zadejte název textového souboru:
+ Comment[da]=Indtast tekstfilnavn:
+ Comment[de]=Name der Textdatei eingeben:
++Comment[el]=Δώστε το όνομα του αÏχείου κειμÎνου:
+ Comment[eo]=Enigu la tekstodosieran nomon:
+ Comment[es]=Introduzca nombre de archivo de texto:
+ Comment[et]=Sisesta tekstifaili nimi:
+@@ -104,13 +105,12 @@
+ Comment[sk]=Zadajte meno textového súboru:
+ Comment[sl]=Vnesite ime besedilne datoteke:
+ Comment[sr]=УнеÑите име текÑтуалног фајла:
+-Comment[sr@Latn]=УнеÑите име текÑтуалног фајла:
++Comment[sr@Latn]=Unesite ime tekstualnog fajla:
+ Comment[sv]=Ange textfilnamn:
+ Comment[ta]=உரை கோபà¯à®ªà¯ பெயரை உளà¯à®³à®¿à®Ÿà¯:
+ Comment[tr]=Metin dosya adını girin:
+ Comment[uk]=Введіть назву текÑтового файлу:
+ Comment[uz]=Матн файлининг номини киритинг:
+-Comment[xx]=xxEnter text filename:xx
+ Comment[zh_CN]=输入文本文件å:
+ Type=Link
+ URL=.source/TextFile.txt
+diff -Nru kdebase-release-3.4.0/kdesktop/init/Templates/ZIP-Device.desktop kdebase-branch-3.4/kdesktop/init/Templates/ZIP-Device.desktop
+--- kdebase-release-3.4.0/kdesktop/init/Templates/ZIP-Device.desktop 2005-02-04 23:15:13.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/init/Templates/ZIP-Device.desktop 2005-03-07 09:15:36.000000000 -0500
+@@ -77,7 +77,6 @@
+ Name[vi]=Äẩy ra
+ Name[wa]=Fé rexhe
+ Name[xh]=Khuphela ngaphandle
+-Name[xx]=xxEjectxx
+ Name[zh_CN]=弹出
+ Name[zh_TW]=跳出
+ Name[zu]=Khipha
+diff -Nru kdebase-release-3.4.0/kdesktop/init/Templates/linkCAMERA.desktop kdebase-branch-3.4/kdesktop/init/Templates/linkCAMERA.desktop
+--- kdebase-release-3.4.0/kdesktop/init/Templates/linkCAMERA.desktop 2005-02-10 23:52:04.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/init/Templates/linkCAMERA.desktop 2005-03-10 11:05:13.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Camera Device...
++Name[af]=Kamera Toestel...
+ Name[ar]=جهاز الكاميرا...
+ Name[bg]=Фотоапарат...
+ Name[bn]=কà§à¦¯à¦®à§‡à¦°à¦¾ ডিà¦à¦¾à¦‡à¦¸...
+@@ -57,7 +58,6 @@
+ Name[uz]=Камера уÑкунаÑи...
+ Name[vi]=Thiế bị Camera
+ Name[wa]=Éndjin camera...
+-Name[xx]=xxCamera Device...xx
+ Name[zh_CN]=相机设备...
+ Name[zh_TW]=照相機è¨å‚™...
+ Comment=New camera
+@@ -117,7 +117,6 @@
+ Comment[uz]=Янги камера
+ Comment[vi]=Camera má»›i
+ Comment[wa]=Novele camera
+-Comment[xx]=xxNew cameraxx
+ Comment[zh_CN]=新建相机
+ Comment[zh_TW]=新增照相機
+ Type=Link
+diff -Nru kdebase-release-3.4.0/kdesktop/init/Templates/linkCDROM.desktop kdebase-branch-3.4/kdesktop/init/Templates/linkCDROM.desktop
+--- kdebase-release-3.4.0/kdesktop/init/Templates/linkCDROM.desktop 2005-02-04 23:15:13.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/init/Templates/linkCDROM.desktop 2005-03-07 09:15:36.000000000 -0500
+@@ -57,7 +57,6 @@
+ Name[uk]=ПриÑтрій CD-ROM...
+ Name[uz]=Компакт-диÑк уÑкунаÑи...
+ Name[wa]=Éndjin léjheu di plakes lazer...
+-Name[xx]=xxCD-ROM Device...xx
+ Name[zh_CN]=CD-ROM 设备...
+ Name[zh_TW]=光碟機è¨å‚™
+ Comment=New CD-ROM Device
+@@ -118,7 +117,6 @@
+ Comment[uz]=Янги компакт-диÑк уÑкунаÑи
+ Comment[vi]=CD/DVD-ROM má»›i
+ Comment[wa]=Novea éndjin léjheu di plakes lazer
+-Comment[xx]=xxNew CD-ROM Devicexx
+ Comment[zh_CN]=新建 CD-ROM 设备
+ Comment[zh_TW]=新光碟機è¨å‚™
+ Type=Link
+diff -Nru kdebase-release-3.4.0/kdesktop/init/Templates/linkCDWRITER.desktop kdebase-branch-3.4/kdesktop/init/Templates/linkCDWRITER.desktop
+--- kdebase-release-3.4.0/kdesktop/init/Templates/linkCDWRITER.desktop 2005-02-10 23:52:04.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/init/Templates/linkCDWRITER.desktop 2005-03-07 09:15:36.000000000 -0500
+@@ -57,7 +57,6 @@
+ Name[uz]=Компакт-диÑк ёзувчи уÑкуна...
+ Name[vi]=CDWRITER
+ Name[wa]=Éndjin broûleu di plakes lazer...
+-Name[xx]=xxCDWRITER Device...xx
+ Name[zh_CN]=刻录机设备...
+ Name[zh_TW]=光碟燒錄機è¨å‚™
+ Comment=New CDWRITER Device
+@@ -116,7 +115,6 @@
+ Comment[uz]=Янги компакт-диÑк ёзувчи уÑкуна
+ Comment[vi]=CDWRITER má»›i
+ Comment[wa]=Novea éndjin broûleu di plakes lazer
+-Comment[xx]=xxNew CDWRITER Devicexx
+ Comment[zh_CN]=新建刻录机设备
+ Comment[zh_TW]=新光碟燒錄機è¨å‚™
+ Type=Link
+diff -Nru kdebase-release-3.4.0/kdesktop/init/Templates/linkDVDROM.desktop kdebase-branch-3.4/kdesktop/init/Templates/linkDVDROM.desktop
+--- kdebase-release-3.4.0/kdesktop/init/Templates/linkDVDROM.desktop 2005-02-04 23:15:13.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/init/Templates/linkDVDROM.desktop 2005-03-07 09:15:36.000000000 -0500
+@@ -58,7 +58,6 @@
+ Name[uz]=DVD-ROM уÑкунаÑи...
+ Name[vi]=DVD-ROM
+ Name[wa]=Éndjin léjheu di plakes lazer DVD...
+-Name[xx]=xxDVD-ROM Device...xx
+ Name[zh_CN]=DVD-ROM 设备...
+ Name[zh_TW]=DVD-ROM è¨å‚™...
+ Comment=New DVD-ROM Device
+@@ -118,7 +117,6 @@
+ Comment[uz]=Янги DVD уÑкунаÑи
+ Comment[vi]=DVD-ROM Má»›i
+ Comment[wa]=Novea éndjin léjheu di plakes lazer DVD
+-Comment[xx]=xxNew DVD-ROM Devicexx
+ Comment[zh_CN]=新建 DVD-ROM 设备
+ Comment[zh_TW]=æ–° DVD-ROM è¨å‚™
+ Type=Link
+diff -Nru kdebase-release-3.4.0/kdesktop/init/Templates/linkFloppy.desktop kdebase-branch-3.4/kdesktop/init/Templates/linkFloppy.desktop
+--- kdebase-release-3.4.0/kdesktop/init/Templates/linkFloppy.desktop 2005-02-10 23:52:04.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/init/Templates/linkFloppy.desktop 2005-03-07 09:15:36.000000000 -0500
+@@ -57,7 +57,6 @@
+ Name[uz]=ДиÑкет уÑкунаÑи...
+ Name[vi]=á»” má»m
+ Name[wa]=Éndjin léjheu di plaketes...
+-Name[xx]=xxFloppy Device...xx
+ Name[zh_CN]=软驱设备...
+ Name[zh_TW]=軟碟è¨å‚™...
+ Comment=New Floppy Device
+@@ -127,7 +126,6 @@
+ Comment[vi]=á»” má»m má»›i
+ Comment[wa]=Novea éndjin léjheu di plaketes...
+ Comment[xh]=Icebo Elitsha le Floppy
+-Comment[xx]=xxNew Floppy Devicexx
+ Comment[zh_CN]=新建软驱设备
+ Comment[zh_TW]=新軟碟è¨å‚™
+ Comment[zu]=Ithuluzi le-Floppy elisha
+diff -Nru kdebase-release-3.4.0/kdesktop/init/Templates/linkHD.desktop kdebase-branch-3.4/kdesktop/init/Templates/linkHD.desktop
+--- kdebase-release-3.4.0/kdesktop/init/Templates/linkHD.desktop 2005-02-10 23:52:04.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/init/Templates/linkHD.desktop 2005-03-07 09:15:36.000000000 -0500
+@@ -57,7 +57,6 @@
+ Name[uz]=Қаттиқ диÑк уÑкунаÑи...
+ Name[vi]=Ổ cứng
+ Name[wa]=Éndjin di deure plake...
+-Name[xx]=xxHard Disc Device...xx
+ Name[zh_CN]=硬盘设备...
+ Name[zh_TW]=硬碟è¨å‚™...
+ Comment=New Hard Disc
+@@ -126,7 +125,6 @@
+ Comment[vi]=Ổ cứng mới
+ Comment[wa]=Novea éndjin di deure plake
+ Comment[xh]=Hard Disc Entsha
+-Comment[xx]=xxNew Hard Discxx
+ Comment[zh_CN]=新建硬盘
+ Comment[zh_TW]=新硬碟è¨å‚™
+ Comment[zu]=I-diski Elukhuni Entsha
+diff -Nru kdebase-release-3.4.0/kdesktop/init/Templates/linkMO.desktop kdebase-branch-3.4/kdesktop/init/Templates/linkMO.desktop
+--- kdebase-release-3.4.0/kdesktop/init/Templates/linkMO.desktop 2005-02-04 23:15:13.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/init/Templates/linkMO.desktop 2005-03-07 09:15:36.000000000 -0500
+@@ -56,7 +56,6 @@
+ Name[uk]=ПриÑтрій MO...
+ Name[uz]=MO уÑкунаÑи
+ Name[vi]=Thiết bị MO
+-Name[xx]=xxMO Device...xx
+ Name[zh_CN]=MO 设备...
+ Name[zh_TW]=MO è¨å‚™...
+ Comment=New MO Device
+@@ -115,7 +114,6 @@
+ Comment[uk]=Ðовий приÑтрій MO
+ Comment[uz]=Янги MO уÑкунаÑи
+ Comment[vi]=MO má»›i
+-Comment[xx]=xxNew MO Devicexx
+ Comment[zh_CN]=新建 MO 设备
+ Comment[zh_TW]=æ–° MO è¨å‚™
+ Type=Link
+diff -Nru kdebase-release-3.4.0/kdesktop/init/Templates/linkNFS.desktop kdebase-branch-3.4/kdesktop/init/Templates/linkNFS.desktop
+--- kdebase-release-3.4.0/kdesktop/init/Templates/linkNFS.desktop 2005-02-04 23:15:13.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/init/Templates/linkNFS.desktop 2005-03-07 09:15:36.000000000 -0500
+@@ -11,7 +11,6 @@
+ Name[se]=NFS ...
+ Name[sl]=NFS ...
+ Name[th]=à¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸à¸¡à¹‚ยง NFS...
+-Name[xx]=xxNFS...xx
+ Comment=New NFS Link
+ Comment[ar]=رابط NFS جديد
+ Comment[be]=Ðовае NFS ÑпаÑылка
+@@ -69,7 +68,6 @@
+ Comment[uz]=NFS билан Ñнги боғ
+ Comment[vi]=Liên kết NFS mới
+ Comment[wa]=Novea loyén NFS
+-Comment[xx]=xxNew NFS Linkxx
+ Comment[zh_CN]=新建 NFS 链接
+ Comment[zh_TW]=æ–° NFS éˆçµ
+ Type=Link
+diff -Nru kdebase-release-3.4.0/kdesktop/init/Templates/linkProgram.desktop kdebase-branch-3.4/kdesktop/init/Templates/linkProgram.desktop
+--- kdebase-release-3.4.0/kdesktop/init/Templates/linkProgram.desktop 2005-02-04 23:15:13.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/init/Templates/linkProgram.desktop 2005-03-10 11:05:13.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Link to Application...
++Name[af]=Skakel na Program...
+ Name[ar]=رابط لتطبيق...
+ Name[be]=СпаÑылка на даÑтаÑаваньне...
+ Name[bg]=Връзка към програма...
+@@ -58,7 +59,6 @@
+ Name[uz]=ДаÑтур билан боғ...
+ Name[vi]=Liên kết tới một chương trình
+ Name[wa]=Loyén viè on programe...
+-Name[xx]=xxLink to Application...xx
+ Name[zh_CN]=应用程åºé“¾æŽ¥...
+ Name[zh_TW]=應用程å¼é€£çµ...
+ Comment=New Link to Application
+@@ -124,7 +124,6 @@
+ Comment[vi]=Tạo liên kết mới tới một chương trình
+ Comment[wa]=Novea loyén viè on programe
+ Comment[xh]=Ikhonkco Elitsha Lwesicelo
+-Comment[xx]=xxNew Link to Applicationxx
+ Comment[zh_CN]=新建应用程åºé“¾æŽ¥
+ Comment[zh_TW]=新建應用程å¼é€£çµ
+ Comment[zu]=Isixhumanisi esisha esiya kumyaleli
+diff -Nru kdebase-release-3.4.0/kdesktop/init/Templates/linkURL.desktop kdebase-branch-3.4/kdesktop/init/Templates/linkURL.desktop
+--- kdebase-release-3.4.0/kdesktop/init/Templates/linkURL.desktop 2005-02-10 23:52:04.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/init/Templates/linkURL.desktop 2005-03-10 11:05:13.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Link to Location (URL)...
++Name[af]=Skakel na Ligging (URL)...
+ Name[ar]=رابط لموقع (URL)...
+ Name[bg]=Връзка към адреÑ...
+ Name[bn]=ইউ-আর-à¦à¦² অবসà§à¦¥à¦¾à¦¨à§‡ লিঙà§à¦•...
+@@ -55,7 +56,6 @@
+ Name[uk]=ПоÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð¾ адреÑи (URL)...
+ Name[uz]=Мавзу билан боғ (URL)...
+ Name[vi]=Liên kết tới một trang web (URL)
+-Name[xx]=xxLink to Location (URL)...xx
+ Name[zh_CN]=到ä½ç½®(URL)的链接...
+ Name[zh_TW]=到ä½ç½®çš„連çµ(URL)
+ Comment=Enter link to location (URL):
+@@ -118,7 +118,6 @@
+ Comment[ven]=Dzhenisani vhukwamani kha fhethu (URL):
+ Comment[vi]=Tạo liên kết mới tới một trang web
+ Comment[xh]=Ngenisa ikhonkco kwindawo ekuyo (URL):
+-Comment[xx]=xxEnter link to location (URL):xx
+ Comment[zh_CN]=输入到ä½ç½®(URL)的链接:
+ Comment[zh_TW]=輸入到ä½ç½®çš„連çµ(URL):
+ Comment[zu]=Ngenisa isixhumanisi esiya endaweni (URL):
+diff -Nru kdebase-release-3.4.0/kdesktop/init/Templates/linkZIP.desktop kdebase-branch-3.4/kdesktop/init/Templates/linkZIP.desktop
+--- kdebase-release-3.4.0/kdesktop/init/Templates/linkZIP.desktop 2005-02-04 23:15:13.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/init/Templates/linkZIP.desktop 2005-03-10 11:05:13.000000000 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=ZIP Device...
++Name[af]=ZIP Toestel...
+ Name[ar]=جهاز ZIP...
+ Name[be]=ZIP прылада...
+ Name[bg]=ZIP...
+@@ -58,7 +59,6 @@
+ Name[uz]=ZIP уÑкунаÑи...
+ Name[vi]=á»” ZIP
+ Name[wa]=Éndjin léjheu di plaketes ZIP...
+-Name[xx]=xxZIP Device...xx
+ Name[zh_CN]=ZIP 设备...
+ Name[zh_TW]=ZIP è¨å‚™...
+ Comment=New ZIP Device
+@@ -119,7 +119,6 @@
+ Comment[uz]=Янги ZIP уÑкунаÑи
+ Comment[vi]=á»” ZIP má»›i
+ Comment[wa]=Novea éndjin léjheu di plaketes ZIP
+-Comment[xx]=xxNew ZIP Devicexx
+ Comment[zh_CN]=新建 ZIP 设备
+ Comment[zh_TW]=æ–° ZIP è¨å‚™
+ Type=Link
+diff -Nru kdebase-release-3.4.0/kdesktop/init/directory.autostart kdebase-branch-3.4/kdesktop/init/directory.autostart
+--- kdebase-release-3.4.0/kdesktop/init/directory.autostart 2005-02-04 23:15:13.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/init/directory.autostart 2005-03-07 09:15:35.000000000 -0500
+@@ -51,7 +51,6 @@
+ Name[ven]=Thoma
+ Name[vi]=Tự khởi động
+ Name[xh]=Isiqalo esizenzekelayo
+-Name[xx]=xxAutostartxx
+ Name[zh_CN]=自动å¯åЍ
+ Name[zh_TW]=自動啟動
+ Name[zu]=Ukuqala ngokuzenzekela
+diff -Nru kdebase-release-3.4.0/kdesktop/init/directory.templates kdebase-branch-3.4/kdesktop/init/directory.templates
+--- kdebase-release-3.4.0/kdesktop/init/directory.templates 2005-02-04 23:15:13.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/init/directory.templates 2005-03-07 09:15:35.000000000 -0500
+@@ -64,7 +64,6 @@
+ Name[uz]=Ðамуналар
+ Name[vi]=Mẫu
+ Name[wa]=Modeles
+-Name[xx]=xxTemplatesxx
+ Name[zh_CN]=模æ¿
+ Name[zh_TW]=範本
+ Name[zu]=Ama-Templates
+diff -Nru kdebase-release-3.4.0/kdesktop/init/directory.trash kdebase-branch-3.4/kdesktop/init/directory.trash
+--- kdebase-release-3.4.0/kdesktop/init/directory.trash 2005-02-10 23:52:03.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/init/directory.trash 2005-03-22 12:38:09.000000000 -0500
+@@ -72,7 +72,6 @@
+ Name[vi]=Thùng rác
+ Name[wa]=Batch
+ Name[xh]=Inkukumo
+-Name[xx]=xxTrashxx
+ Name[zh_CN]=回收站
+ Name[zh_TW]=垃圾桶
+ Name[zu]=Izibi
+@@ -84,7 +83,7 @@
+ Comment[bg]=Изтрити файлове
+ Comment[bn]=মà§à¦›à§‡ ফেলা ফাইল থাকে
+ Comment[bs]=Sadrži izbrisane datoteke
+-Comment[ca]=Conté els fitxers esborrats a la paperera
++Comment[ca]=Conté els fitxers esborrats
+ Comment[cs]=Obsahuje odstraněné soubory
+ Comment[cy]=Yn cynnwys ffeiliau sydd wedi eu gwaredu
+ Comment[da]=Indeholder fjernede filer
+@@ -104,7 +103,7 @@
+ Comment[hr]=Sadrži izbrisane datoteke
+ Comment[hu]=Itt találhatók a törölt fájlok
+ Comment[is]=Inniheldur fjarlægðar skrár
+-Comment[it]=Contiene i file eliminati
++Comment[it]=Contiene i file cestinati
+ Comment[ja]=削除ã•れãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä¿æŒã—ã¦ã„ã¾ã™
+ Comment[ko]=지워진 파ì¼ì„ ë‹´ê³ ìžˆìŠµë‹ˆë‹¤
+ Comment[lo]=ທີ່ສຳລັບເàºàº±àºšà»àºŸà»‰àº¡àº‚àºàº‡à»€àºˆàº»à»‰àº²àº—ີ່ຕ້àºàº‡àºàº²àº™àº¥àº·àºš
+@@ -139,7 +138,6 @@
+ Comment[ven]=Ina faela dzo bviswaho
+ Comment[vi]=Chứa file đã xoá
+ Comment[xh]=Iqulathe iifayile ezisusiweyo
+-Comment[xx]=xxContains removed filesxx
+ Comment[zh_CN]=ä¿å˜ä¸´æ—¶åˆ 除的文件
+ Comment[zh_TW]=包å«åˆªé™¤çš„æª”案
+ Comment[zu]=Iqukethe amafayela agudluziwe
+diff -Nru kdebase-release-3.4.0/kdesktop/kdesktop.desktop kdebase-branch-3.4/kdesktop/kdesktop.desktop
+--- kdebase-release-3.4.0/kdesktop/kdesktop.desktop 2005-02-04 23:15:12.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/kdesktop.desktop 2005-03-07 09:15:34.000000000 -0500
+@@ -67,7 +67,6 @@
+ Name[ven]=Desikithopo ya KDE
+ Name[vi]=Desktop KDE
+ Name[wa]=Sicribanne KDE
+-Name[xx]=xxKDE Desktopxx
+ Name[zh_CN]=KDE 桌é¢
+ Name[zh_TW]=KDE 桌é¢
+ Name[zu]=I-Desktop ye-KDE
+diff -Nru kdebase-release-3.4.0/kdesktop/kdesktopSetAsBackground.desktop kdebase-branch-3.4/kdesktop/kdesktopSetAsBackground.desktop
+--- kdebase-release-3.4.0/kdesktop/kdesktopSetAsBackground.desktop 2005-02-18 23:27:05.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/kdesktopSetAsBackground.desktop 2005-03-30 01:47:47.000000000 -0500
+@@ -13,6 +13,7 @@
+ Name[cy]=Canoledig
+ Name[da]=Centreret
+ Name[de]=Zentriert
++Name[el]=ΚεντÏάÏισμα
+ Name[en_GB]=Centred
+ Name[eo]=Meza
+ Name[es]=Centrado
+@@ -46,13 +47,12 @@
+ Name[sk]=V strede
+ Name[sl]=UsrediÅ¡Äeno
+ Name[sr]=Центрирано
+-Name[sr@Latn]=Центрирано
++Name[sr@Latn]=Centrirano
+ Name[sv]=Centrerad
+ Name[ta]=மைய
+ Name[tr]=Ortalanmış
+ Name[uk]=По центру
+ Name[uz]=Марказда
+-Name[xx]=xxCenteredxx
+ Name[zh_CN]=å±…ä¸
+ Icon=background
+ Exec=dcop kdesktop KBackgroundIface setWallpaper %u 6
+@@ -68,6 +68,7 @@
+ Name[cy]=Teiledig
+ Name[da]=Fliselagt
+ Name[de]=Gekachelt
++Name[el]=Σε παÏάθεση
+ Name[eo]=kahela
+ Name[es]=Mosaico
+ Name[et]=Paanidena
+@@ -100,12 +101,11 @@
+ Name[sk]=Dlaždice
+ Name[sl]=Razdeljeno
+ Name[sr]=Поређано
+-Name[sr@Latn]=Поређано
++Name[sr@Latn]=Poređano
+ Name[sv]=Sida vid sida
+ Name[ta]=பிணà¯à®£à®©à®¿
+ Name[tr]=Uzatılmış
+ Name[uk]=Плиткою
+-Name[xx]=xxTiledxx
+ Name[zh_CN]=平铺
+ Icon=background
+ Exec=dcop kdesktop KBackgroundIface setWallpaper %u 2
+diff -Nru kdebase-release-3.4.0/kdesktop/krootwm.cc kdebase-branch-3.4/kdesktop/krootwm.cc
+--- kdebase-release-3.4.0/kdesktop/krootwm.cc 2005-02-19 10:45:35.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/krootwm.cc 2005-03-26 08:54:51.000000000 -0500
+@@ -394,11 +394,9 @@
+ if (m_bDesktopEnabled)
+ {
+ action = m_pDesktop->actionCollection()->action( "undo" );
+- Q_ASSERT( action );
+ if (action)
+ action->plug( desktopMenu );
+ action = m_pDesktop->actionCollection()->action( "paste" );
+- Q_ASSERT( action );
+ if (action)
+ action->plug( desktopMenu );
+ desktopMenu->insertSeparator();
+@@ -690,8 +688,8 @@
+
+ QStringList KRootWm::configModules() {
+ QStringList args;
+- args << "kde-background" << "kde-desktopbehavior" << "kde-desktop"
+- << "kde-screensaver" << "kde-display";
++ args << "kde-background.desktop" << "kde-desktopbehavior.desktop" << "kde-desktop.desktop"
++ << "kde-screensaver.desktop" << "kde-display.desktop";
+ return args;
+ }
+
+diff -Nru kdebase-release-3.4.0/kdesktop/kwebdesktop/kwebdesktop.desktop kdebase-branch-3.4/kdesktop/kwebdesktop/kwebdesktop.desktop
+--- kdebase-release-3.4.0/kdesktop/kwebdesktop/kwebdesktop.desktop 2005-02-21 13:17:55.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/kwebdesktop/kwebdesktop.desktop 2005-03-07 09:15:36.000000000 -0500
+@@ -60,7 +60,6 @@
+ Comment[uz]=KDE веб-иш Ñтоли
+ Comment[ven]=Webe ya desikithopo ya KDE
+ Comment[vi]=Desktop kiểu Web của KDE
+-Comment[xx]=xxKDE Web Desktopxx
+ Comment[zh_CN]=KDE Web 桌é¢
+ Comment[zh_TW]=KDE ç¶²é æ¡Œé¢
+ Comment[zu]=I-Desktop ye-Web ye-KDE
+diff -Nru kdebase-release-3.4.0/kdesktop/minicli.cpp kdebase-branch-3.4/kdesktop/minicli.cpp
+--- kdebase-release-3.4.0/kdesktop/minicli.cpp 2004-12-27 12:53:57.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/minicli.cpp 2005-03-07 20:25:13.000000000 -0500
+@@ -63,6 +63,7 @@
+ #include <kstdguiitem.h>
+ #include <kmimetype.h>
+ #include <kurifilter.h>
++#include <kcompletionbox.h>
+
+ #include "minicli.moc"
+ #include "minicli_ui.h"
+@@ -129,7 +130,8 @@
+
+ connect( m_dlg->cbCommand, SIGNAL( textChanged( const QString& ) ),
+ SLOT( slotCmdChanged(const QString&) ) );
+- connect( m_dlg->cbCommand, SIGNAL( activated( const QString& ) ),
++
++ connect( m_dlg->cbCommand, SIGNAL( returnPressed() ),
+ m_dlg->pbRun, SLOT( animateClick() ) );
+
+ // Advanced group box...
+@@ -212,6 +214,10 @@
+ int mode = KDesktopSettings::completionMode();
+ m_dlg->cbCommand->setCompletionMode( (KGlobalSettings::Completion) mode );
+
++ KCompletionBox* box = m_dlg->cbCommand->completionBox();
++ if (box)
++ box->setActivateOnSelect( false );
++
+ m_finalFilters = KURIFilter::self()->pluginNames();
+ m_finalFilters.remove("kuriikwsfilter");
+
+@@ -235,6 +241,7 @@
+ m_dlg->leUsername->setCompletionObject(completion, true);
+ m_dlg->leUsername->setCompletionMode(KGlobalSettings::completionMode());
+ m_dlg->leUsername->setAutoDeleteCompletionObject( true );
++
+ }
+
+ void Minicli::saveConfig()
+diff -Nru kdebase-release-3.4.0/kdesktop/patterns/fish.desktop kdebase-branch-3.4/kdesktop/patterns/fish.desktop
+--- kdebase-release-3.4.0/kdesktop/patterns/fish.desktop 2005-02-04 23:15:14.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/patterns/fish.desktop 2005-03-07 09:15:37.000000000 -0500
+@@ -57,7 +57,6 @@
+ Comment[uk]=Тенета
+ Comment[uz]=Тўр
+ Comment[ven]=Mulavhu wa khovhe
+-Comment[xx]=xxFish Netxx
+ Comment[zh_CN]=渔网
+ Comment[zh_TW]=æ¼ç¶²
+ Comment[zu]=I-nethi yofishi
+diff -Nru kdebase-release-3.4.0/kdesktop/patterns/flowers.desktop kdebase-branch-3.4/kdesktop/patterns/flowers.desktop
+--- kdebase-release-3.4.0/kdesktop/patterns/flowers.desktop 2005-02-04 23:15:14.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/patterns/flowers.desktop 2005-03-07 09:15:37.000000000 -0500
+@@ -64,7 +64,6 @@
+ Comment[vi]=Bông hoa
+ Comment[wa]=Fleurs
+ Comment[xh]=Iintyatyambo
+-Comment[xx]=xxFlowersxx
+ Comment[zh_CN]=花
+ Comment[zh_TW]=花朵
+ Comment[zu]=Izimbali
+diff -Nru kdebase-release-3.4.0/kdesktop/patterns/night-rock.desktop kdebase-branch-3.4/kdesktop/patterns/night-rock.desktop
+--- kdebase-release-3.4.0/kdesktop/patterns/night-rock.desktop 2005-02-10 23:52:04.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/patterns/night-rock.desktop 2005-03-07 09:15:37.000000000 -0500
+@@ -59,7 +59,6 @@
+ Comment[uz]=Оқшом қоÑÑи (Тигерт томонидан)
+ Comment[ven]=Vhusiku ha Rock nga Tigert
+ Comment[vi]=Night Rock cá»§a Tigert
+-Comment[xx]=xxNight Rock by Tigertxx
+ Comment[zh_CN]=Tigert 的夜色ä¸çš„岩石
+ Comment[zh_TW]=åˆå¤œæ–滾 (Tigert 繪製)
+ Comment[zu]=Night Rock ngu-Tigert
+diff -Nru kdebase-release-3.4.0/kdesktop/patterns/pavement.desktop kdebase-branch-3.4/kdesktop/patterns/pavement.desktop
+--- kdebase-release-3.4.0/kdesktop/patterns/pavement.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/patterns/pavement.desktop 2005-03-07 09:15:37.000000000 -0500
+@@ -58,7 +58,6 @@
+ Comment[vi]=Lát
+ Comment[wa]=Pavmints
+ Comment[xh]=Umgangatho osecaleni kwendlela
+-Comment[xx]=xxPavementxx
+ Comment[zh_CN]=人行é“
+ Comment[zh_TW]=人行é“
+ Comment[zu]=Unqenqema eceleni komgwaqo
+diff -Nru kdebase-release-3.4.0/kdesktop/patterns/rattan.desktop kdebase-branch-3.4/kdesktop/patterns/rattan.desktop
+--- kdebase-release-3.4.0/kdesktop/patterns/rattan.desktop 2005-02-10 23:52:04.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/patterns/rattan.desktop 2005-03-07 09:15:37.000000000 -0500
+@@ -27,7 +27,6 @@
+ Comment[th]=หวาย
+ Comment[uz]=Пальма
+ Comment[vi]=Cây song mây
+-Comment[xx]=xxRattanxx
+ Comment[zh_CN]=è—¤æ¡
+ Comment[zh_TW]=è—¤æ¢
+ File=rattan.png
+diff -Nru kdebase-release-3.4.0/kdesktop/patterns/stonewall2.desktop kdebase-branch-3.4/kdesktop/patterns/stonewall2.desktop
+--- kdebase-release-3.4.0/kdesktop/patterns/stonewall2.desktop 2005-02-10 23:52:04.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/patterns/stonewall2.desktop 2005-03-07 09:15:37.000000000 -0500
+@@ -59,7 +59,6 @@
+ Comment[ven]=Luvhondo lwa tombo lwa vhuvhili nga Tigert
+ Comment[vi]=Stonewall 2 cá»§a Tigert
+ Comment[xh]=Stonewall 2 ngu Tigert
+-Comment[xx]=xxStonewall 2 by Tigertxx
+ Comment[zh_CN]=Tigert 的石墙 2
+ Comment[zh_TW]=石牆 2 (Tigert 繪製)
+ Comment[zu]=Stonewall 2 ngu-Tigert
+diff -Nru kdebase-release-3.4.0/kdesktop/patterns/triangles.desktop kdebase-branch-3.4/kdesktop/patterns/triangles.desktop
+--- kdebase-release-3.4.0/kdesktop/patterns/triangles.desktop 2005-02-10 23:52:04.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/patterns/triangles.desktop 2005-03-07 09:15:37.000000000 -0500
+@@ -59,7 +59,6 @@
+ Comment[vi]=Tam giác
+ Comment[wa]=Triyangues
+ Comment[xh]=Oonxantathu
+-Comment[xx]=xxTrianglesxx
+ Comment[zh_CN]=三角形
+ Comment[zh_TW]=三角形
+ Comment[zu]=Onxantathu
+diff -Nru kdebase-release-3.4.0/kdesktop/programs/xearth.desktop kdebase-branch-3.4/kdesktop/programs/xearth.desktop
+--- kdebase-release-3.4.0/kdesktop/programs/xearth.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/programs/xearth.desktop 2005-03-07 09:15:37.000000000 -0500
+@@ -63,7 +63,6 @@
+ Comment[ven]=Shango la X nga Kirk Johnson
+ Comment[vi]=XEarth cá»§a Kirk Johnson
+ Comment[xh]=XEarth ngu Kirk Johnson
+-Comment[xx]=xxXEarth by Kirk Johnsonxx
+ Comment[zh_CN]=Kirk Johnson çš„ XEarth
+ Comment[zh_TW]=XEarth (Kirk Johnson 繪製)
+ Comment[zu]=XEarth ngu-Kirk Johnson
+diff -Nru kdebase-release-3.4.0/kdesktop/programs/xglobe.desktop kdebase-branch-3.4/kdesktop/programs/xglobe.desktop
+--- kdebase-release-3.4.0/kdesktop/programs/xglobe.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/programs/xglobe.desktop 2005-03-07 09:15:37.000000000 -0500
+@@ -63,7 +63,6 @@
+ Comment[ven]=Lifhasi la X nga Thorsten Scheuermann
+ Comment[vi]=XGlobe cá»§a Thorsten Scheuermann
+ Comment[xh]=XGlobe ngu Thorsten Scheuermann
+-Comment[xx]=xxXGlobe by Thorsten Scheuermannxx
+ Comment[zh_CN]=Thorsten Scheuermann çš„ XGlobe
+ Comment[zh_TW]=XGlobe (Thorsten Scheuermann 繪製)
+ Comment[zu]=XGlobe ngu-Thorsten Scheuermann
+diff -Nru kdebase-release-3.4.0/kdesktop/programs/xplanet.desktop kdebase-branch-3.4/kdesktop/programs/xplanet.desktop
+--- kdebase-release-3.4.0/kdesktop/programs/xplanet.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdesktop/programs/xplanet.desktop 2005-03-07 09:15:37.000000000 -0500
+@@ -62,7 +62,6 @@
+ Comment[ven]=Pulanete ya X nga Hari Nair
+ Comment[vi]=XPlanet cá»§a Hari Nair
+ Comment[xh]=XPlanet ngu Hari Nair
+-Comment[xx]=xxXPlanet by Hari Nairxx
+ Comment[zh_CN]=Hari Nair çš„ XPlanet
+ Comment[zh_TW]=XPlanet (Hari Nair 繪製)
+ Comment[zu]=XPlanet ngu-Hari Nair
+diff -Nru kdebase-release-3.4.0/kdm/backend/auth.c kdebase-branch-3.4/kdm/backend/auth.c
+--- kdebase-release-3.4.0/kdm/backend/auth.c 2005-02-20 04:41:35.000000000 -0500
++++ kdebase-branch-3.4/kdm/backend/auth.c 2005-03-05 19:07:05.000000000 -0500
+@@ -398,14 +398,9 @@
+ }
+
+ struct addrList {
+- unsigned short family;
+- unsigned short address_length;
+- char *address;
+- unsigned short number_length;
+- char *number;
+- unsigned short name_length;
+- char *name;
+ struct addrList *next;
++ unsigned short family, address_length, number_length;
++ char data[1];
+ };
+
+ static struct addrList *addrs;
+@@ -422,53 +417,23 @@
+ struct addrList *a, *n;
+ for (a = addrs; a; a = n) {
+ n = a->next;
+- if (a->address)
+- free( a->address );
+- if (a->number)
+- free( a->number );
+- free( (char *)a );
++ free( a );
+ }
+ }
+
+-static int checkEntry( Xauth *auth );
+-
+ static void
+ saveEntry( Xauth *auth )
+ {
+ struct addrList *new;
+
+- if (!(new = (struct addrList *)Malloc( sizeof(struct addrList) )))
++ if (!(new = Malloc( offsetof(struct addrList, data) +
++ auth->address_length + auth->number_length )))
+ return;
+- if ((new->address_length = auth->address_length) > 0) {
+- new->address = Malloc( auth->address_length );
+- if (!new->address) {
+- free( (char *)new );
+- return;
+- }
+- memmove( new->address, auth->address, (int)auth->address_length );
+- } else
+- new->address = 0;
+- if ((new->number_length = auth->number_length) > 0) {
+- new->number = Malloc( auth->number_length );
+- if (!new->number) {
+- free( new->address );
+- free( (char *)new );
+- return;
+- }
+- memmove( new->number, auth->number, (int)auth->number_length );
+- } else
+- new->number = 0;
+- if ((new->name_length = auth->name_length) > 0) {
+- new->name = Malloc( auth->name_length );
+- if (!new->name) {
+- free( new->number );
+- free( new->address );
+- free( (char *)new );
+- return;
+- }
+- memmove( new->name, auth->name, (int)auth->name_length );
+- } else
+- new->name = 0;
++ new->address_length = auth->address_length;
++ new->number_length = auth->number_length;
++ memcpy( new->data, auth->address, (int)auth->address_length );
++ memcpy( new->data + (int)auth->address_length,
++ auth->number, (int)auth->number_length );
+ new->family = auth->family;
+ new->next = addrs;
+ addrs = new;
+@@ -482,14 +447,11 @@
+ for (a = addrs; a; a = a->next)
+ if (a->family == auth->family &&
+ a->address_length == auth->address_length &&
+- !memcmp( a->address, auth->address, auth->address_length ) &&
++ !memcmp( a->data, auth->address, auth->address_length ) &&
+ a->number_length == auth->number_length &&
+- !memcmp( a->number, auth->number, auth->number_length ) &&
+- a->name_length == auth->name_length &&
+- !memcmp( a->name, auth->name, auth->name_length ))
+- {
++ !memcmp( a->data + a->address_length,
++ auth->number, auth->number_length ))
+ return 1;
+- }
+ return 0;
+ }
+
+@@ -522,7 +484,8 @@
+ auth->address = addr;
+ Debug( "writeAddr: writing and saving an entry\n" );
+ writeAuth( file, auth );
+- saveEntry( auth );
++ if (!checkEntry( auth ))
++ saveEntry( auth );
+ }
+
+ static void
+@@ -612,7 +575,7 @@
+
+ #endif /* SYSV_SIOCGIFCONF */
+
+-#ifdef HAVE_GOOD_GETIFADDRS
++#ifdef HAVE_GETIFADDRS
+ # include <ifaddrs.h>
+
+ static void
+@@ -625,6 +588,8 @@
+ if (getifaddrs( &ifap ) < 0)
+ return;
+ for (ifr = ifap; ifr; ifr = ifr->ifa_next) {
++ if (!ifr->ifa_addr)
++ continue;
+ family = ConvertAddr( (char *)(ifr->ifa_addr), &len, &addr );
+ if (family == -1 || family == FamilyLocal)
+ continue;
+@@ -990,7 +955,7 @@
+ static void
+ writeLocalAuth( FILE *file, Xauth *auth, const char *name )
+ {
+-#if defined(STREAMSCONN) || !defined(HAVE_GOOD_GETIFADDRS)
++#if defined(STREAMSCONN) || !defined(HAVE_GETIFADDRS)
+ int fd;
+ #endif
+
+@@ -1002,7 +967,7 @@
+ DefineSelf( fd, file, auth );
+ t_unbind( fd );
+ t_close( fd );
+-# elif defined(HAVE_GOOD_GETIFADDRS)
++# elif defined(HAVE_GETIFADDRS)
+ DefineSelf( file, auth );
+ # else
+ # ifdef TCPCONN
+diff -Nru kdebase-release-3.4.0/kdm/configure.in.in kdebase-branch-3.4/kdm/configure.in.in
+--- kdebase-release-3.4.0/kdm/configure.in.in 2005-02-20 07:03:33.000000000 -0500
++++ kdebase-branch-3.4/kdm/configure.in.in 2005-03-23 17:26:59.000000000 -0500
+@@ -13,7 +13,7 @@
+
+ dnl ask imake about various X settings
+ AC_MSG_CHECKING([X paths])
+-imkv=7
++imkv=8
+ test "$kde_cv_defines_imake_version" = $imkv || unset kde_cv_defines_imake
+ AC_CACHE_VAL(kde_cv_defines_imake, [
+ rm -fr conftestdir
+@@ -26,7 +26,7 @@
+
+ ]EOF
+ if $XMKMF >&5 2>&1 && test -f Makefile; then
+- kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null`
++ kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null | grep -v "^make"`
+ kde_cv_defines_imake_version=$imkv
+ else
+ AC_MSG_RESULT([failed])
+@@ -53,6 +53,7 @@
+ AC_CHECK_FUNCS([getttyent])
+ case $host_os in
+ linux*) ac_cv_func_getutxent=no;;
++ darwin*) ac_cv_func_getutxent=no;;
+ *) AC_CHECK_FUNC([getutxent]);;
+ esac
+ if test $ac_cv_func_getutxent = yes; then
+@@ -74,46 +75,8 @@
+ AC_CHECK_FUNCS([setlogin setusercontext getusershell login_getclass auth_timeok])
+ LIBS=$ac_save_libs
+
+-AC_CHECK_FUNCS([mkstemp setproctitle sysinfo strnlen])
+-
+-dnl is this always available without additional libs?
+-dnl my linux glibc 2.3.2 getifaddrs() returns nonsense, so ignore it
+-AC_CACHE_CHECK([for working getifaddrs], ac_cv_func_getifaddrs_ok,
+- [AC_RUN_IFELSE(
+- [AC_LANG_PROGRAM([
+-#include <stdio.h>
+-#include <string.h>
+-#include <sys/types.h>
+-#include <sys/socket.h>
+-#include <ifaddrs.h>
+- ],[[
+- struct ifaddrs *ifr;
+- if (getifaddrs(&ifr) < 0) {
+- fprintf(stderr, "getifaddrs failed\n");
+- return 1;
+- }
+- for (; ifr; ifr = ifr->ifa_next)
+- if (!strcmp(ifr->ifa_name, "lo"))
+- switch (ifr->ifa_addr->sa_family) {
+- case AF_INET:
+-#ifdef AF_INET6
+- case AF_INET6:
+-#endif
+- return 0;
+- default:
+- fprintf(stderr, "getifaddrs returns nonsense\n");
+- return 1;
+- }
+- fprintf(stderr, "getifaddrs returned no loopback interface\n");
+- return 1;
+- ]])],
+- [ac_cv_func_getifaddrs_ok=yes],
+- [ac_cv_func_getifaddrs_ok=no],
+- [ac_cv_func_getifaddrs_ok=no])
+- ])
+-if test $ac_cv_func_getifaddrs_ok = yes; then
+- AC_DEFINE(HAVE_GOOD_GETIFADDRS, 1, [Define if you have a working getifaddrs()])
+-fi
++dnl is getifaddrs always available without additional libs?
++AC_CHECK_FUNCS([mkstemp setproctitle sysinfo strnlen getifaddrs])
+
+ AC_CHECK_FUNCS([arc4random], ,
+ [
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/genkdmconf.c kdebase-branch-3.4/kdm/kfrontend/genkdmconf.c
+--- kdebase-release-3.4.0/kdm/kfrontend/genkdmconf.c 2005-02-04 16:19:55.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/genkdmconf.c 2005-03-19 10:02:23.000000000 -0500
+@@ -609,6 +609,8 @@
+ "#! /bin/sh\n"
+ "# Xsession - run as user\n"
+ "\n"
++"session=$1\n"
++"\n"
+ "# Note that the respective logout scripts are not sourced.\n"
+ "case $SHELL in\n"
+ " */bash)\n"
+@@ -648,7 +650,7 @@
+ "[ -f /etc/xprofile ] && . /etc/xprofile\n"
+ "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n"
+ "\n"
+-"case $1 in\n"
++"case $session in\n"
+ " \"\")\n"
+ " exec xmessage -center -buttons OK:0 -default OK \"Sorry, $DESKTOP_SESSION is no valid session.\"\n"
+ " ;;\n"
+@@ -662,10 +664,10 @@
+ " exec " KDE_BINDIR "/startkde\n"
+ " ;;\n"
+ " *)\n"
+-" eval exec \"$1\"\n"
++" eval exec \"$session\"\n"
+ " ;;\n"
+ "esac\n"
+-"exec xmessage -center -buttons OK:0 -default OK \"Sorry, cannot execute $1. Check $DESKTOP_SESSION.desktop.\"\n";
++"exec xmessage -center -buttons OK:0 -default OK \"Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop.\"\n";
+
+ static const char def_background[] =
+ "[Desktop0]\n"
+@@ -817,7 +819,7 @@
+ * XXX this stuff is highly borked. it does not handle collisions at all.
+ */
+ static int
+-copyfile( Entry *ce, const char *tname, int mode, int (*proc)( File *, char **, int * ) )
++copyfile( Entry *ce, const char *tname, int mode, int (*proc)( File * ) )
+ {
+ const char *tptr;
+ char *nname;
+@@ -840,12 +842,7 @@
+ fprintf( stderr, "Warning: cannot copy file %s\n", ce->value );
+ rt = 0;
+ } else {
+- char *nbuf;
+- int nlen;
+-
+- if (!proc || !proc( &file, &nbuf, &nlen ) ||
+- (nlen == file.eof - file.buf && !memcmp( nbuf, file.buf, nlen )))
+- {
++ if (!proc || !proc( &file )) {
+ if (!use_destdir && !strcmp( ce->value, nname ))
+ linkedFile( nname );
+ else {
+@@ -855,7 +852,7 @@
+ copiedFile( ce->value );
+ }
+ } else {
+- WriteOut( nname, mode, 0, nbuf, nlen );
++ WriteOut( nname, mode, 0, file.buf, file.eof - file.buf );
+ editedFile( ce->value );
+ }
+ if (strcmp( ce->value, nname ) && inNewDir( ce->value ) && !use_destdir)
+@@ -1378,7 +1375,7 @@
+
+ /*
+ static int
+-edit_resources(File *file, char **nbuf, int *nlen)
++edit_resources( File *file )
+ {
+ // XXX remove any login*, chooser*, ... resources
+ return 0;
+@@ -1415,15 +1412,14 @@
+ paap = pap += 2;
+ while (!isspace( *pap ))
+ pap++;
+- for (;;) {
+- if (*pp++ != '/')
+- goto no;
+- for (bpp = pp; *pp != '/'; pp++)
+- if (isspace( *pp ))
++ if (*pp != '/')
++ break;
++ for (;;)
++ for (bpp = ++pp; *pp != '/'; pp++)
++ if (!*pp || isspace( *pp ))
+ goto wbrk;
+- }
+ wbrk:
+- if (memcmp( bpp, paap, pap - paap ))
++ if ((pp - bpp != pap - paap) || memcmp( bpp, paap, pap - paap ))
+ break;
+ } else if (*pap == '\t') {
+ pap++;
+@@ -1472,24 +1468,25 @@
+ static int mod_usebg;
+
+ static int
+-edit_setup( File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED )
++edit_setup( File *file )
+ {
+- putval( "UseBackground",
+- (delstr( file, "\n"
+- "(\n"
+- " PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
+- " */kdmdesktop\t&\n"
+- " echo $! >$PIDFILE\n"
+- " wait $!\n"
+- " rm $PIDFILE\n"
+- ")\t&\n" ) ||
+- delstr( file, "\n"
+- "*/kdmdesktop\t&\n" ) ||
+- delstr( file, "\n"
+- "kdmdesktop\t&\n" ) ||
+- delstr( file, "\n"
+- "kdmdesktop\n" )) ? "true" : "false" );
+- return 0;
++ int chg =
++ delstr( file, "\n"
++ "(\n"
++ " PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
++ " */kdmdesktop\t&\n"
++ " echo $! >$PIDFILE\n"
++ " wait $!\n"
++ " rm $PIDFILE\n"
++ ")\t&\n" ) |
++ delstr( file, "\n"
++ "*/kdmdesktop\t&\n" ) |
++ delstr( file, "\n"
++ "kdmdesktop\t&\n" ) |
++ delstr( file, "\n"
++ "kdmdesktop\n" );
++ putval( "UseBackground", chg ? "true" : "false" );
++ return chg;
+ }
+
+ static void
+@@ -1515,19 +1512,22 @@
+ }
+
+ static int
+-edit_startup( File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED )
++edit_startup( File *file )
+ {
++ int chg1 = 0, chg2 = 0;
++
+ if (mod_usebg &&
+- !delstr( file, "\n"
++ (delstr( file, "\n"
+ "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
+ "if [[] -f $PIDFILE ] ; then\n"
+ " kill `cat $PIDFILE`\n"
+- "fi\n" ))
+- delstr( file, "\n"
+- "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
+- "test -f $PIDFILE && kill `cat $PIDFILE`\n" );
+- if (oldver < 0x0203)
+- putval( "UseSessReg", (
++ "fi\n" ) ||
++ delstr( file, "\n"
++ "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
++ "test -f $PIDFILE && kill `cat $PIDFILE`\n" )))
++ chg1 = 1;
++ if (oldver < 0x0203) {
++ chg2 =
+ #ifdef _AIX
+ delstr( file, "\n"
+ "# We create a pseudodevice for finger. (host:0 becomes [kx]dm/host_0)\n" );
+@@ -1552,11 +1552,11 @@
+ " else\n"
+ " exec /usr/lib/X11/xdm/sessreg -a -l [kx]dm/$devname -h $hostname $USER\n"
+ " fi\n"
+-"fi\n") ||
++"fi\n") |
+ #else
+ # ifdef BSD
+ delstr( file, "\n"
+-"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) ||
++"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) |
+ # endif
+ #endif /* _AIX */
+ delstr( file, "\n"
+@@ -1564,11 +1564,12 @@
+ #ifdef BSD
+ " -x */Xservers"
+ #endif
+-" $USER\n" ) ||
++" $USER\n" ) |
+ delstr( file, "\n"
+-"exec sessreg -a -l $DISPLAY -u /var/run/utmp -x */Xservers $USER\n" )
+- ) ? "true" : "false");
+- return 0;
++"exec sessreg -a -l $DISPLAY -u /var/run/utmp -x */Xservers $USER\n" );
++ putval( "UseSessReg", chg2 ? "true" : "false");
++ }
++ return chg1 | chg2;
+ }
+
+ static void
+@@ -1592,29 +1593,29 @@
+ }
+
+ static int
+-edit_reset( File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED )
++edit_reset( File *file )
+ {
++ return
+ #ifdef _AIX
+- delstr( file, "\n"
++ delstr( file, "\n"
+ "if [[] -f /usr/lib/X11/xdm/sessreg ]; then\n"
+ " devname=`echo $DISPLAY | /usr/bin/sed -e 's/[[]:\\.]/_/g' | /usr/bin/cut -c1-8`\n"
+ " exec /usr/lib/X11/xdm/sessreg -d -l [kx]dm/$devname $USER\n"
+-"fi\n" );
++"fi\n" ) |
+ #else
+ # ifdef BSD
+- delstr( file, "\n"
+-"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" );
++ delstr( file, "\n"
++"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) |
+ # endif
+ #endif /* _AIX */
+- delstr( file, "\n"
++ delstr( file, "\n"
+ "exec sessreg -d -l $DISPLAY"
+ # ifdef BSD
+ " -x */Xservers"
+ # endif
+-" $USER\n" );
+- delstr( file, "\n"
++" $USER\n" ) |
++ delstr( file, "\n"
+ "exec sessreg -d -l $DISPLAY -u /var/run/utmp -x */Xservers $USER\n" );
+- return 0;
+ }
+
+ static void
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/9wm.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/9wm.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/9wm.desktop 2005-01-31 03:35:40.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/9wm.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -8,7 +8,6 @@
+ Name[eo]=9FA
+ Name[hi]=9डबलà¥à¤¯à¥‚-à¤à¤®
+ Name[ta]=9 WM
+-Name[xx]=xx9WMxx
+ Comment=An emulation of the Plan 9 window manager 8-1/2
+ Comment[ar]=Ù…ØØ§ÙƒØ§Ø© لمدير Ù†ÙˆØ§ÙØ° Plan 9 8-1/2
+ Comment[bn]=পà§à¦²à§à¦¯à¦¾à¦¨ ৯ উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦° à§®-à§§/২ -à¦à¦° à¦à¦®à§à¦²à§‡à¦¶à¦¨
+@@ -56,6 +55,5 @@
+ Comment[uk]=ЕмулÑÑ†Ñ–Ñ Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ€Ð° вікон Plan 9 "8-1/2"
+ Comment[vi]=Má»™t bá»™ mô phá»ng cá»§a bá»™ quản lý cá»a sổ Plan 9 8-1/2
+ Comment[wa]=Ene emulåcion do manaedjeu di purneas di Plan 9
+-Comment[xx]=xxAn emulation of the Plan 9 window manager 8-1/2xx
+ Comment[zh_CN]=Plan 9 窗å£ç®¡ç†å™¨ 8-1/2 的模拟
+ Comment[zh_TW]=模仿 Plan 9 的視窗管ç†ç¨‹å¼ 8-1/2
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/aewm++.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/aewm++.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/aewm++.desktop 2005-02-10 23:52:05.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/aewm++.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -6,7 +6,6 @@
+ Name=AEWM++
+ Name[eo]=MFA++
+ Name[hi]=à¤à¤ˆà¤¡à¤¬à¤²à¥à¤¯à¥‚à¤à¤®++
+-Name[xx]=xxAEWM++xx
+ Comment=A minimal window manager based on AEWM, enhanced by virtual desktops and partial GNOME support
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° مصغّر مبني على AEWMØŒ Ù…ØØ³Ù‘Ù† Ø¨Ø£Ø³Ø·Ø Ù…ÙƒØªØ¨ وهمية ودعم جينوم جزئي
+ Comment[bn]=AEWM à¦à¦¿à¦¤à§à¦¤à¦¿à¦• à¦à¦•টি পরিমিত উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°, à¦à¦¾à¦°à§à¦šà§à§Ÿà¦¾à¦² ডেসà§à¦•টপ à¦à¦¬à¦‚ আংশিক গনোম সমরà§à¦¥à¦¨ দà§à¦¬à¦¾à¦°à¦¾ বরà§à¦§à¦¿à¦¤
+@@ -53,5 +52,4 @@
+ Comment[uk]=Мінімальний менеджер вікон, заÑнований на AEWM, покращений підтримкою віртуальних Ñтільниць та чаÑтковою підтримкою GNOME
+ Comment[vi]=Bá»™ quản lý cá»a sổ tối thiểu dá»±a trên AEWM, cải tiến vá»›i desktop ảo và được há»— trợ má»™t phần bởi GNOME
+ Comment[wa]=On manaedjeu di purneas minimå båzé so AEWM, avou sopoirt po les forveyous scribannes eyet ene miete di sopoirt po Gnome
+-Comment[xx]=xxA minimal window manager based on AEWM, enhanced by virtual desktops and partial GNOME supportxx
+ Comment[zh_CN]=基于 AEWM çš„å°åž‹çª—å£ç®¡ç†å™¨ï¼Œå¢žå¼ºäº†è™šæ‹Ÿæ¡Œé¢å’Œéƒ¨åˆ† GNOME 支æŒ
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/aewm.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/aewm.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/aewm.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/aewm.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -6,7 +6,6 @@
+ Name=AEWM
+ Name[eo]=MFA
+ Name[hi]=à¤à¤ˆà¤¡à¤¬à¤²à¥à¤¯à¥‚à¤à¤®
+-Name[xx]=xxAEWMxx
+ Comment=A minimalist window manager
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° مصغر
+ Comment[be]=Кіраваньне вокнамі Ð´Ð»Ñ Ð¼Ñ–Ð½Ñ–Ð¼Ð°Ð»Ñ–Ñта
+@@ -59,6 +58,5 @@
+ Comment[uz]=Жуда оддий ойна бошқарувчи
+ Comment[vi]=Trình quản lý cá»a sổ đơn giản nhất
+ Comment[wa]=On manaedjeu di purneas minimå
+-Comment[xx]=xxA minimalist window managerxx
+ Comment[zh_CN]=最å°çš„窗å£ç®¡ç†å™¨
+ Comment[zh_TW]=一個最å°åž‹çš„視窗管ç†ç¨‹å¼
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/afterstep.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/afterstep.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/afterstep.desktop 2005-02-10 23:52:05.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/afterstep.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -10,7 +10,6 @@
+ Name[pa]=ਪਗਬਾਅਦ
+ Name[sv]=Afterstep
+ Name[ta]=ஆஃபà¯à®Ÿà®°à¯à®¸à¯à®Ÿà¯†à®ªà¯
+-Name[xx]=xxAfterStepxx
+ Comment=A window manager with the NeXTStep look and feel, based on FVWM
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° ذو مظهر شبيه بـNeXTStepØŒ مبني على FVWM
+ Comment[bn]=FVWM-à¦à¦° ওপর à¦à¦¿à¦¤à§à¦¤à¦¿ করে তৈরি à¦à¦•টি উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°, যা দেখতে শà§à¦¨à¦¤à§‡ অনেকটানেকà§à¦¸à¦Ÿ-সà§à¦Ÿà§‡à¦ª (NeXTStep)-à¦à¦° মত
+@@ -61,6 +60,5 @@
+ Comment[uz]=FVWM аÑоÑида Ñратилган NeXTStep'га ўхшаш ойна бошқарувчи
+ Comment[vi]=Trình quản lý cá»a sổ vá»›i giao diện NeXTStep dá»±a trên FVWM
+ Comment[wa]=On manaedjeu di purneas avou l' rivnance di NeXTStep, båzé so FVWM
+-Comment[xx]=xxA window manager with the NeXTStep look and feel, based on FVWMxx
+ Comment[zh_CN]=一个带有 NeXTStep 观感的窗å£ç®¡ç†å™¨ï¼ŒåŸºäºŽ FVWM
+ Comment[zh_TW]=一個基於 FVWM ä¸¦æ“æœ‰ NeXTStep å¤–è§€åŠæ„Ÿè¦ºçš„視窗管ç†ç¨‹å¼
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/amaterus.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/amaterus.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/amaterus.desktop 2005-01-31 03:35:41.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/amaterus.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -5,7 +5,6 @@
+ TryExec=amaterus
+ Name=AMATERUS
+ Name[hi]=à¤à¤®à¥‡à¤šà¥à¤¯à¥‹à¤°à¥à¤¸
+-Name[xx]=xxAMATERUSxx
+ Comment=A GTK+ based window manager with a window grouping feature
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° مبني على GTK+ له ميزة تجميع Ø§Ù„Ù†ÙˆØ§ÙØ°
+ Comment[bn]=GTK+ à¦à¦¿à¦¤à§à¦¤à¦¿à¦² উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°, যাতে উইণà§à¦¡à§‹ গà§à¦°à§à¦ªà¦¿à¦‚ করা যায়
+@@ -55,6 +54,5 @@
+ Comment[uz]=A GTK+ аÑоÑида Ñратилган, ойналарни гуруҳлаш имкониÑтига Ñга ойна бошқарувчи
+ Comment[vi]=Trình quản lý cá»a sổ vá»›i khả năng tạo nhóm cá»a sổ dá»±a trên GTK
+ Comment[wa]=On manaedjeu di purneas båzé so GTK+, avou ene fonccionålité di rgroupaedje des purneas
+-Comment[xx]=xxA GTK+ based window manager with a window grouping featurexx
+ Comment[zh_CN]=一个基于 GTK+ 的窗å£ç®¡ç†å™¨ï¼Œå¸¦æœ‰çª—壿ˆç»„特性
+ Comment[zh_TW]=一個基於 GTK+ 的視窗管ç†ç¨‹å¼ä¸¦æ“有視窗群組功能
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/amiwm.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/amiwm.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/amiwm.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/amiwm.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -7,7 +7,6 @@
+ Name[eo]=AmiFA
+ Name[hi]=à¤à¤®à¥€-डबलà¥à¤¯à¥‚à¤à¤®
+ Name[sv]=Ami WM
+-Name[xx]=xxAmiWMxx
+ Comment=The Amiga look-alike window manager
+ Comment[ar]=مدير Ø§Ù„Ù†ÙˆØ§ÙØ° الذي يبدو كأميجا
+ Comment[be]=Кіраваньне вокнамі падобнае на Amiga
+@@ -60,6 +59,5 @@
+ Comment[uz]=Amiga'га ўхшаш ойна бошқарувчи
+ Comment[vi]=Trình quản lý cá»a sổ nhìn giống Amiga
+ Comment[wa]=On manaedjeu di purneas rishonnant l'Â ci di l'Â Amiga
+-Comment[xx]=xxThe Amiga look-alike window managerxx
+ Comment[zh_CN]=Amiga 外观的窗å£ç®¡ç†å™¨
+ Comment[zh_TW]=ä¸€å€‹çœ‹èµ·ä¾†åƒ Amiga 視窗管ç†ç¨‹å¼
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/asclassic.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/asclassic.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/asclassic.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/asclassic.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -9,7 +9,6 @@
+ Name[hi]=à¤à¤à¤¸-कà¥à¤²à¥‰à¤¸à¤¿à¤•
+ Name[sv]=AS klassisk
+ Name[ta]=ASதரமான
+-Name[xx]=xxASClassicxx
+ Comment=AfterStep Classic, a window manager based on AfterStep v1.1
+ Comment[ar]=AfterStep كلاسيك، وهو مدير Ù†ÙˆØ§ÙØ° مبني على AfterStep الإصدارة 1.1
+ Comment[be]=КлÑÑычны AfterStep, кіраваньне вокнамі базаванае на AfterStep вÑÑ€ÑÑ–Ñ– 1.1
+@@ -60,6 +59,5 @@
+ Comment[uk]=AfterStep Classic, менеджер вікон, заÑнований на AfterStep v1.1
+ Comment[uz]=AfterStep Classic - AfterStep v1.1 аÑоÑида Ñратилган ойна бошқарувчи
+ Comment[vi]=AfterStep Classic, trình quản lý cá»a sổ dá»±a trên AfterStep v1.1
+-Comment[xx]=xxAfterStep Classic, a window manager based on AfterStep v1.1xx
+ Comment[zh_CN]=AfterStep ç»å…¸ï¼Œä¸€ä¸ªåŸºäºŽ AfterStep v1.1 的窗å£ç®¡ç†å™¨
+ Comment[zh_TW]=AfterStep 經典, 一個基於 AfterStep v1.1 的視窗管ç†ç¨‹å¼
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/blackbox.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/blackbox.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/blackbox.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/blackbox.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -13,7 +13,6 @@
+ Name[pa]=ਕਾਲਾਬਕਸਾ
+ Name[ta]=கறà¯à®ªà¯à®ªà¯à®ªà¯ பெடà¯à®Ÿà®¿
+ Name[tg]=Қуттии Ñиёҳ
+-Name[xx]=xxBlackboxxx
+ Comment=A fast & light window manager
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° Ø®Ùي٠وسريع
+ Comment[bn]=à¦à¦•টি হালকা à¦à¦¬à¦‚ দà§à¦°à§à¦¤ উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°
+@@ -64,6 +63,5 @@
+ Comment[uk]=Легкий та швидкий менеджер вікон
+ Comment[uz]=Тез ва оддий ойна бошқарувчи
+ Comment[vi]=Má»™t trình quản lý cá»a sổ nhẹ và nhanh
+-Comment[xx]=xxA fast & light window managerxx
+ Comment[zh_CN]=åˆå¿«åˆè½»å·§çš„窗å£ç®¡ç†å™¨
+ Comment[zh_TW]=一個快速åŠè¼•é‡åŒ–的視窗管ç†ç¨‹å¼
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/cde.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/cde.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/cde.desktop 2005-02-10 23:52:05.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/cde.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -10,7 +10,6 @@
+ Name[mn]=КДE
+ Name[tg]=Муҳити графикии муштарак (CDE)
+ Name[th]=à¹à¸šà¸š CDE
+-Name[xx]=xxCDExx
+ Comment=The Common Desktop Environment, a proprietary industry standard desktop environment
+ Comment[ar]=بيئة Ø³Ø·Ø Ø§Ù„Ù…ÙƒØªØ¨ الشائع، بيئة Ø³Ø·Ø Ù…ÙƒØªØ¨ متملكية قياسية
+ Comment[bn]=কমন ডেসà§à¦•টপ à¦à¦¨à¦à¦¾à§Ÿà¦°à¦¨à¦®à§‡à¦¨à§à¦Ÿ (Common Desktop Environment), à¦à¦•টি মালিকানাধীন ইনডাসà§à¦Ÿà§à¦°à¦¿ সà§à¦Ÿà§à¦¯à¦¾à¦¨à§à¦¡à¦¾à¦°à§à¦¡
+@@ -56,6 +55,5 @@
+ Comment[tr]=Common Desktop Environment (CDE)
+ Comment[uk]=The Common Desktop Environment, закритий промиÑловий Ñтандарт графічного Ñередовища
+ Comment[vi]=Môi trưá»ng desktop chung, má»™t môi trưá»ng desktop thÃch hợp chuẩn công nghiệp
+-Comment[xx]=xxThe Common Desktop Environment, a proprietary industry standard desktop environmentxx
+ Comment[zh_CN]=通用窗å£çŽ¯å¢ƒ(CDE)ï¼Œç§æœ‰å·¥ä¸šæ ‡å‡†çš„æ¡Œé¢çŽ¯å¢ƒ
+ Comment[zh_TW]=The Common Desktop Environment, ä¸€å€‹æœ‰å°ˆåˆ©çš„å·¥æ¥æ¨™æº–
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/ctwm.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/ctwm.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/ctwm.desktop 2005-02-10 23:52:05.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/ctwm.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -6,7 +6,6 @@
+ Name=CTWM
+ Name[eo]=TFAC
+ Name[hi]=सीटीडबलà¥à¤¯à¥‚à¤à¤®
+-Name[xx]=xxCTWMxx
+ Comment=Claude's Tab Window Manager, TWM enhanced by virtual screens, etc.
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° Claude's TabØŒ وهي TWM Ù…ØØ³Ù‘Ù† بشاشات وهمية، إلخ.
+ Comment[bn]=কà§à¦²à¦¡-à¦à¦° টà§à¦¯à¦¾à¦¬ উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°
+@@ -55,6 +54,5 @@
+ Comment[tr]=Claude's Sekme Pencere Yöneticisi, sanal ekranlar ile TWM genişletilmiş, vb.
+ Comment[uk]=Claude's Tab Window Manager, TWM з підтримкою віртуальних екранів, тощо.
+ Comment[vi]=Trình quản lý cá»a sổ kiểu Tab cá»§a Claude, TWM cải tiến vá»›i mà n hình ảo, v..v..
+-Comment[xx]=xxClaude's Tab Window Manager, TWM enhanced by virtual screens, etc.xx
+ Comment[zh_CN]=Claude çš„æ ‡ç¾å¼çª—å£ç®¡ç†å™¨ï¼ŒåŠ å¼ºäº†è™šæ‹Ÿå±å¹•ç‰åŠŸèƒ½çš„ TWM。
+ Comment[zh_TW]=Claude's Tab 視窗管ç†ç¨‹å¼ï¼Œ 基於 TWM ä¸¦åŠ å¼·è™›æ“¬èž¢å¹•ç‰åŠŸèƒ½
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/cwwm.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/cwwm.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/cwwm.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/cwwm.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -6,7 +6,6 @@
+ Name=CWWM
+ Name[eo]=CWFA
+ Name[hi]=सीडबलà¥à¤¯à¥‚डबलà¥à¤¯à¥‚à¤à¤®
+-Name[xx]=xxCWWMxx
+ Comment=The ChezWam Window Manager, a minimalist window manager based on EvilWM
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° ChezWamØŒ وهو مدير Ù†ÙˆØ§ÙØ° مصغّر مبني على EvilWM
+ Comment[be]=Кіраваньне вокнамі ChezWam Ð´Ð»Ñ Ð¼Ñ–Ð½Ñ–Ð¼Ð°Ð»Ñ–Ñта, базаванае на EvilWM
+@@ -56,6 +55,5 @@
+ Comment[uk]=МінімаліÑтичний менеджер вікон ChezWam, заÑнований на EvilWM
+ Comment[uz]=EvilWM аÑоÑида Ñратилган жуда оддий ойна бошқарувчи
+ Comment[vi]=Trình quản lý cá»a sổ ChezWam, má»™t trình quản lý cá»a sổ đơn giản dá»±a trên EvilWM
+-Comment[xx]=xxThe ChezWam Window Manager, a minimalist window manager based on EvilWMxx
+ Comment[zh_CN]=ChezWam 窗å£ç®¡ç†å™¨ï¼ŒåŸºäºŽ EvilWM 的最å°åŒ–窗å£ç®¡ç†å™¨
+ Comment[zh_TW]=The ChezWam 視窗管ç†ç¨‹å¼ï¼ŒåŸºæ–¼ EvilWM çš„å°åž‹åŒ–視窗管ç†ç¨‹å¼
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/enlightenment.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/enlightenment.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/enlightenment.desktop 2005-02-10 23:52:05.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/enlightenment.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -11,7 +11,6 @@
+ Name[mn]=ГÑгÑÑÑ€Ñл
+ Name[pa]=ਗਿਆਨ
+ Name[ta]=விளகà¯à®•ிகà¯à®•ூறà¯à®¤à®²à¯
+-Name[xx]=xxEnlightenmentxx
+ Comment=An extremely themable very feature-rich window manager
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° غني بالمزايا وقابل لاستخدام السّمات بشكل كبير.
+ Comment[bn]=পà§à¦°à¦šà§à¦° বৈশিষà§à¦Ÿà§à¦¯ সমà§à¦¬à¦²à¦¿à¦¤ à¦à¦•টি উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°, যা বহà§à¦à¦¾à¦¬à§‡ নিজের পছনà§à¦¦à¦®à¦¤ বদলে নেওয়া যায়
+@@ -59,6 +58,5 @@
+ Comment[uk]=Менеджер вікон з потужною підтримкою тем та різноманітних функцій
+ Comment[uz]=Мавзу ва имкониÑтларга жуда бой ойна бошқарувчи
+ Comment[vi]=Má»™t trình quản lý cá»a sổ cá»±c kỳ dá»… thay đổi theme
+-Comment[xx]=xxAn extremely themable very feature-rich window managerxx
+ Comment[zh_CN]=强主题化的多功能窗å£ç®¡ç†å™¨
+ Comment[zh_TW]=一個功能相當è±å¯Œçš„視窗管ç†ç¨‹å¼
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/evilwm.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/evilwm.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/evilwm.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/evilwm.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -7,7 +7,6 @@
+ Name[eo]=MalbonaFA
+ Name[hi]=à¤à¤µà¤¿à¤²à¤¡à¤¬à¤²à¥à¤¯à¥‚à¤à¤®
+ Name[sv]=Ond WM
+-Name[xx]=xxEvilWMxx
+ Comment=A minimalist window manager based on AEWM
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° مصغّر مبني على AEWM
+ Comment[be]=Кіраваньне вокнамі Ð´Ð»Ñ Ð¼Ñ–Ð½Ñ–Ð¼Ð°Ð»Ñ–Ñта базаванае на AEWM
+@@ -58,6 +57,5 @@
+ Comment[uk]=МінімаліÑтичний менеджер вікон, заÑнований на AEWM
+ Comment[uz]=AEWM аÑоÑида Ñратилган жуда оддий ойна бошқарувчи
+ Comment[vi]=Má»™t trình quản lý cá»a sổ đơn giản dá»±a trên AEWM
+-Comment[xx]=xxA minimalist window manager based on AEWMxx
+ Comment[zh_CN]=基于 AEWM 的最å°åŒ–窗å£ç®¡ç†å™¨
+ Comment[zh_TW]=一個基於 AEWM çš„å°åž‹åŒ–視窗管ç†ç¨‹å¼
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/fluxbox.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/fluxbox.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/fluxbox.desktop 2005-01-31 03:35:41.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/fluxbox.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -11,7 +11,6 @@
+ Name[pa]=ਫਕਸਬਕਸ
+ Name[ta]=பà¯à®³à®•à¯à®¸à¯ பெடà¯à®Ÿà®¿
+ Name[tg]=Қуттии Flux
+-Name[xx]=xxFluxboxxx
+ Comment=A highly configurable and low resource window manager based on Blackbox
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° قابل للإعداد بشكل كبير ويستخدم القليل من موارد الجهاز وهو مبني Blackbox
+ Comment[bn]=বà§à¦²à§à¦¯à¦¾à¦•বকà§à¦¸ à¦à¦¿à¦¤à§à¦¤à¦¿à¦• à¦à¦•টি উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°, যা নানাà¦à¦¾à¦¬à§‡ কনফিগার করা যায়, কিনà§à¦¤à§ খà§à¦¬à¦‡ কম রিসোরà§à¦¸ বà§à¦¯à¦¬à¦¹à¦¾à¦° করে
+@@ -57,5 +56,4 @@
+ Comment[ta]=கறà¯à®ªà¯à®ªà¯à®ªà¯†à®Ÿà¯à®Ÿà®¿ சாரà¯à®¨à¯à®¤ அமைகà¯à®•கà¯à®•ூடிய கà¯à®±à¯ˆà®¨à¯à®¤ வள சாளர மேளாளரà¯
+ Comment[tr]=Blackbox temelli, kolayca özelleştirilebilir düşük kaynaklı bir pencere yöneticisi
+ Comment[uk]=Дуже гнучкий та невибагливий Ð´Ð»Ñ Ñ€ÐµÑурÑів менеджер вікон, заÑнований на Blackbox
+-Comment[xx]=xxA highly configurable and low resource window manager based on Blackboxxx
+ Comment[zh_CN]=基于 BlackBox 坿·±å…¥é…置且å 用资æºè¾ƒå°‘的窗å£ç®¡ç†å™¨
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/flwm.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/flwm.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/flwm.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/flwm.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -6,7 +6,6 @@
+ Name=FLWM
+ Name[eo]=RMFA
+ Name[hi]=à¤à¤«à¤à¤²à¤¡à¤¬à¤²à¥à¤¯à¥‚à¤à¤®
+-Name[xx]=xxFLWMxx
+ Comment=The Fast Light Window Manager, based primarily on WM2
+ Comment[ar]=مدير Ø§Ù„Ù†ÙˆØ§ÙØ° السريع الخÙÙŠÙØŒ مبني بشكل أساسي على WM2
+ Comment[bn]=ফাসà§à¦Ÿ লাইট উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°, WM2 à¦à¦¿à¦¤à§à¦¤à¦¿ করে তৈরি
+@@ -56,6 +55,5 @@
+ Comment[uk]=Швидкий легкий менеджер вікон, заÑнований здебільшого на WM2
+ Comment[uz]=ÐÑоÑан WM2 аÑоÑида Ñратилган тез ва оддий ойна бошқарувчи
+ Comment[vi]=Trình quản lý cá»a sổ nhanh, dá»±a chá»§ yếu và o WM2
+-Comment[xx]=xxThe Fast Light Window Manager, based primarily on WM2xx
+ Comment[zh_CN]=åˆå¿«åˆè½»å·§çš„窗å£ç®¡ç†å™¨ï¼Œä¸»è¦åŸºäºŽ WM2
+ Comment[zh_TW]=一個主è¦åŸºæ–¼ WM2 且快速åŠè¼•é‡åŒ–的視窗管ç†ç¨‹å¼
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/fvwm.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/fvwm.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/fvwm.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/fvwm.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -5,7 +5,6 @@
+ TryExec=fvwm
+ Name=FVWM
+ Name[hi]=à¤à¤«à¤¼à¤µà¥€à¤¡à¤¬à¤²à¥à¤¯à¥‚à¤à¤®
+-Name[xx]=xxFVWMxx
+ Comment=A powerful ICCCM-compliant multiple virtual desktop window manager
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° قوي ومتواÙÙ‚ مع ICCCM ذي Ø£Ø³Ø·Ø Ù…ÙƒØªØ¨ وهمية متعددة
+ Comment[bn]= à¦à¦•টি শকà§à¦¤à¦¿à¦¶à¦¾à¦²à§€ ICCCM-compliant উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°, যাতে à¦à¦•াধিক à¦à¦¾à¦°à§à¦šà§à§Ÿà¦¾à¦² ডেসà§à¦•টপ সমà§à¦à¦¬
+@@ -53,6 +52,5 @@
+ Comment[tr]=Güçlü ICCCM-uyumlu çoklu sanal masaüstü yöneticisi
+ Comment[uk]=Потужний, ÑуміÑний з ICCCM менеджер вікон, з підтримкою віртуальних Ñтільниць
+ Comment[vi]=Trình quản lý cá»a sổ ICCCM tương thÃch Ä‘a desktop ảo
+-Comment[xx]=xxA powerful ICCCM-compliant multiple virtual desktop window managerxx
+ Comment[zh_CN]=强大的多虚拟桌é¢çª—å£ç®¡ç†å™¨ï¼Œä¸Ž ICCCM 兼容
+ Comment[zh_TW]=一個強大的 ICCCM 相容的多é‡è™›æ“¬æ¡Œé¢è¦–窗管ç†ç¨‹å¼
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/fvwm95.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/fvwm95.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/fvwm95.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/fvwm95.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -5,7 +5,6 @@
+ TryExec=fvwm95
+ Name=FVWM95
+ Name[hi]=à¤à¤«à¤¼à¤µà¥€à¤¡à¤¬à¤²à¥à¤¯à¥‚à¤à¤®95
+-Name[xx]=xxFVWM95xx
+ Comment=A Windows 95 look-alike derivative of FVWM
+ Comment[ar]=شبيه بـWin95 ومشتق من FVWM
+ Comment[be]=Ð’Ñ‹Ñ‚Ð²Ð¾Ñ€Ð½Ð°Ñ Ð°Ð´ FVWM Ð¿Ð°Ð´Ð¾Ð±Ð½Ð°Ñ Ð½Ð° Windows 95
+@@ -57,5 +56,4 @@
+ Comment[uk]=Похідний від FVWM з виглÑдом Windows 95
+ Comment[uz]=Win95'га ўхшаган FVWM'нинг тури
+ Comment[vi]=Trình quản lý cá»a sổ giống háºu duệ cá»§a Windows 95
+-Comment[xx]=xxA Windows 95 look-alike derivative of FVWMxx
+ Comment[zh_CN]=一个与 Windows 95 外观类似的 FVWM å˜ç§
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/gnome.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/gnome.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/gnome.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/gnome.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -11,7 +11,6 @@
+ Name[mn]=ГÐОМЕ
+ Name[sv]=Gnome
+ Name[ta]=கà¯à®©à¯‹à®®à¯
+-Name[xx]=xxGNOMExx
+ Comment=The GNU Network Object Model Environment. A complete, free and easy-to-use desktop environment
+ Comment[ar]=بيئة نموذج الكائن الشبكي من GNUØŒ بيئة Ø³Ø·Ø Ù…ÙƒØªØ¨ÙŠ ØØ±Ù‘Ø© وسهلة الاستخدام
+ Comment[bn]=দি গনিউ নেটওয়ারà§à¦• অবজেকà§à¦Ÿà¦®à¦¡à§‡à¦² à¦à¦¨à¦à¦¾à§Ÿà¦°à¦¨à¦®à§‡à¦¨à§à¦Ÿà¥¤ à¦à¦•টি পূরà§à¦£, মà§à¦•à§à¦¤ à¦à¦¬à¦‚ সহজেই বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦¯à§‹à¦—à§à¦¯ ডেসà§à¦•টপ à¦à¦¨à¦à¦¾à§Ÿà¦°à¦¨à¦®à§‡à¦¨à§à¦Ÿ
+@@ -60,5 +59,4 @@
+ Comment[uk]=The GNU Network Object Model Environment. Повнофункціональне, вільне та зручне графічне Ñередовище
+ Comment[uz]=GNOME (GNU Network Object Model Environment) - мукаммал, бепул ва фойдаланиш учун жуда қулай иш Ñтоли муҳити
+ Comment[vi]=Môi trưá»ng kiểu đối tượng cá»§a GNU: Má»™t môi trưá»ng desktop đầy đủ, miá»…n phà và dá»… sá» dụng
+-Comment[xx]=xxThe GNU Network Object Model Environment. A complete, free and easy-to-use desktop environmentxx
+ Comment[zh_CN]=GNU 网络对象模型环境。完整ã€è‡ªç”±ã€æ˜“用的桌é¢çŽ¯å¢ƒ
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/golem.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/golem.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/golem.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/golem.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -9,7 +9,6 @@
+ Name[eo]=Golemo
+ Name[hi]=गोलेम
+ Name[pa]=ਗੋਲੀਮ
+-Name[xx]=xxGolemxx
+ Comment=A lightweight window manager
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ± Ø®Ùي٠العبء
+ Comment[bn]=à¦à¦•টি হালà§à¦•া উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°
+@@ -61,6 +60,5 @@
+ Comment[uz]=Оддий ойна бошқарувчи
+ Comment[vi]=Trình quản lý cá»a sổ nhẹ ký
+ Comment[wa]=On ledjir manaedjeu di purneas
+-Comment[xx]=xxA lightweight window managerxx
+ Comment[zh_CN]=è½»é‡çº§çª—å£ç®¡ç†å™¨
+ Comment[zh_TW]=一個輕é‡åŒ–的視窗管ç†ç¨‹å¼
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/icewm.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/icewm.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/icewm.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/icewm.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -10,7 +10,6 @@
+ Name[lo]=ຕົວຈັດàºàº²àº™àº«àº™à»‰àº²àº•່າງ IceWM
+ Name[sv]=Ice WM
+ Name[th]=ตัวจัดà¸à¸²à¸£à¸«à¸™à¹‰à¸²à¸•่าง IceWM
+-Name[xx]=xxIceWMxx
+ Comment=A Windows 95-OS/2-Motif-like window manager
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° مشابه لـ Win95-OS/2-Motif
+ Comment[be]=Кіраваньне вокнамі падобнае на Windows 95-OS/2-Motif
+@@ -63,5 +62,4 @@
+ Comment[uz]=Win95-OS/2-Motif'га ўхшаш ойна бошқарувчи
+ Comment[vi]=Trình quản lý cá»a sổ vá»›i mô tÃp kiểu Windows 95
+ Comment[wa]=On manaedjeu di purneas rishonnant Windows95-OS/2-Motif
+-Comment[xx]=xxA Windows 95-OS/2-Motif-like window managerxx
+ Comment[zh_CN]=类似 Windows-OS/2-Motif 的窗å£ç®¡ç†å™¨
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/ion.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/ion.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/ion.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/ion.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -9,7 +9,6 @@
+ Name[hi]=आयन
+ Name[ja]=ION
+ Name[pa]=ਲੋਨ
+-Name[xx]=xxIonxx
+ Comment=A keyboard-friendly window manager with tiled windows, based on PWM
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° سهل استخدام Ù„ÙˆØØ© Ø§Ù„Ù…ÙØ§ØªÙŠØ ذي Ù†ÙˆØ§ÙØ° معنونة، مبني على PWM
+ Comment[bn]=PWM à¦à¦¿à¦¤à§à¦¤à¦¿à¦• উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°, যা কীবোরà§à¦¡ দিয়ে নিয়নà§à¦¤à§à¦°à¦£ করা সহজ
+@@ -58,6 +57,5 @@
+ Comment[tr]=PWM tabanlı, klavye dostu uzatılmış pencereleriyle bir pencere yönetici
+ Comment[uk]=Менеджер вікон налаштований Ð´Ð»Ñ Ð»ÐµÐ³ÐºÐ¾Ð³Ð¾ викориÑÑ‚Ð°Ð½Ð½Ñ Ð· клавіатурою, заÑновано на PWM
+ Comment[vi]=Trình quản lý cá»a sổ dà nh việc dùng bà n phÃm, dá»±a trên PWM
+-Comment[xx]=xxA keyboard-friendly window manager with tiled windows, based on PWMxx
+ Comment[zh_CN]=一个基于 PWM 的窗å£ç®¡ç†å™¨ï¼Œé€‚åˆé”®ç›˜æ“作,å¯å¹³é“ºçª—å£
+ Comment[zh_TW]=一個基於 PWM 且方便éµç›¤ä½¿ç”¨å’Œæ”¯æ´æ£‹ç›¤åŒ–視窗的視窗管ç†ç¨‹å¼
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/larswm.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/larswm.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/larswm.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/larswm.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -7,7 +7,6 @@
+ Name[eo]=Lazero
+ Name[hi]=लारà¥à¤¸-डबलà¥à¤¯à¥‚à¤à¤®
+ Name[sv]=Lars WM
+-Name[xx]=xxLarsWMxx
+ Comment=The Lars Window Manager, based on 9WM, supports tiled windows
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° لارس، مبني على 9WMØŒ يدعم Ø§Ù„Ù†ÙˆØ§ÙØ° المعنونة
+ Comment[bn]=লারà§à¦¸ উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°, 9WM-à¦à¦° ওপর à¦à¦¿à¦¤à§à¦¤à¦¿ করে তৈরি
+@@ -56,6 +55,5 @@
+ Comment[tr]=Lars Pencere Yöneticisi
+ Comment[uk]=The Lars Window Manager, заÑновано на 9WM, підтримує Ñ€Ð¾Ð·Ñ‚Ð°ÑˆÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ñ–ÐºÐ¾Ð½ плиткою
+ Comment[vi]= Trình quản lý cá»a sổ cá»§a Lars, dá»±a và o 9WM, há»— trợ tên cá»a sổ
+-Comment[xx]=xxThe Lars Window Manager, based on 9WM, supports tiled windowsxx
+ Comment[zh_CN]=Lars 窗å£ç®¡ç†å™¨ï¼ŒåŸºäºŽ 9WM,支æŒå¹³é“ºçª—å£
+ Comment[zh_TW]=The Lars 視窗管ç†ç¨‹å¼ï¼ŒåŸºæ–¼ 9WMï¼Œæ”¯æ´æ£‹ç›¤åŒ–視窗
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/lwm.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/lwm.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/lwm.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/lwm.desktop 2005-03-22 12:38:10.000000000 -0500
+@@ -6,7 +6,6 @@
+ Name=LWM
+ Name[eo]=MFA
+ Name[hi]=à¤à¤²à¤¡à¤¬à¤²à¥à¤¯à¥‚à¤à¤®
+-Name[xx]=xxLWMxx
+ Comment=The Lightweight Window Manager. A non-configurable, bare window manager
+ Comment[ar]=مدير Ø§Ù„Ù†ÙˆØ§ÙØ° Ø®Ùي٠العبء، مدير Ù†ÙˆØ§ÙØ° مجرّد غير قابل للإعداد
+ Comment[bn]=দি লাইটওয়েট উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°
+@@ -28,7 +27,7 @@
+ Comment[hi]=हलà¥à¤•ा विंडो पà¥à¤°à¤¬à¤‚धक. खाली विंडो पà¥à¤°à¤¬à¤‚धक जो कॉनà¥à¤«à¤¼à¤¿à¤—र नहीं हो सकता
+ Comment[hu]=Lightweight Window Manager, egy könnyen konfigurálható, alapszintű ablakkezelő
+ Comment[is]=Hinn létti gluggastjóri. Ekki stillanlegur og hrár
+-Comment[it]=Il Window Manager Leggero, non configurabile, semplice window manager
++Comment[it]=Il Window Manager Leggero. Un window manager essenziale e non configurabile
+ Comment[ja]=è¨å®šé …ç›®ã®ãªã„ã€å˜ç´”ãªã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãƒžãƒãƒ¼ã‚¸ãƒ£
+ Comment[lt]=„Lengva“ langų tvarkyklė. Nekonfigūruojama, „plika“ langų tvarkyklė
+ Comment[mk]=Lightweight Window Manager. Ðеконфигурабилен, Ñкоро празен менаџер на прозорци
+@@ -55,7 +54,6 @@
+ Comment[uk]=Ðевеличкий менеджер вікон без можливоÑті налаштуваннÑ
+ Comment[vi]=Trình quản lý cá»a sổ Nhẹ Ký (Lightweight) rất khó cấu hình
+ Comment[wa]=Li Ledjir Manaedjeu di Purneas (Lightweight Window Manager). On manaedjeu di purneas tot simpe, nén apontiåve
+-Comment[xx]=xxThe Lightweight Window Manager. A non-configurable, bare window managerxx
+ Comment[zh_CN]=è½»é‡çº§çª—å£ç®¡ç†å™¨ã€‚ä¸å¯é…置的裸窗å£ç®¡ç†å™¨
+ # this can't be used as a session in itself
+ Hidden=true
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/matchbox.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/matchbox.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/matchbox.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/matchbox.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -11,7 +11,6 @@
+ Name[ta]=பொரà¯à®¤à¯à®¤à®ªà¯à®ªà¯†à®Ÿà¯à®Ÿà®¿
+ Name[tg]=Қуттии гӯгирд
+ Name[wa]=Boesse di brocales (Matchbox)
+-Name[xx]=xxMatchboxxx
+ Comment=A window manager for handheld devices
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° للأجهزة اليدوية
+ Comment[bn]=হà§à¦¯à¦¾à¦£à§à¦¡à¦¹à§‡à¦²à§à¦¡ যনà§à¦¤à§à¦°à¦¾à¦¦à¦¿à¦° উপযোগী à¦à¦•টি উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°
+@@ -62,6 +61,5 @@
+ Comment[uk]=Менеджер вікон Ð´Ð»Ñ Ð¿Ð¾Ñ€Ñ‚Ð°Ñ‚Ð¸Ð²Ð½Ð¸Ñ… приÑтроїв
+ Comment[vi]=Trình quản lý cá»a sổ dà nh cho handheld thiết bị
+ Comment[wa]=On manaedjeu di purneas po les éndjins ebarkés
+-Comment[xx]=xxA window manager for handheld devicesxx
+ Comment[zh_CN]=手æŒè®¾å¤‡çš„窗å£ç®¡ç†å™¨
+ Comment[zh_TW]=一個掌上型è¨å‚™æ‰€ä½¿ç”¨çš„視窗管ç†ç¨‹å¼
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/metacity.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/metacity.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/metacity.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/metacity.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -9,7 +9,6 @@
+ Name[hi]=मेटासिटी
+ Name[mn]=МетаÑити
+ Name[ta]=மெடாசிடà¯à®Ÿà®¿
+-Name[xx]=xxMetacityxx
+ Comment=A lightweight GTK2 based window manager
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° Ø®Ùي٠العبء مبني على GTK2
+ Comment[bn]=à¦à¦•টি হালà§à¦•া GTK2 à¦à¦¿à¦¤à§à¦¤à¦¿à¦• উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°
+@@ -60,6 +59,5 @@
+ Comment[uk]=ПроÑтий менеджер вікон Ð´Ð»Ñ GTK2
+ Comment[uz]=GTK2 аÑоÑида Ñратилган оддий ойна бошқарувчи
+ Comment[vi]=Trình quản lý cá»a sổ nhá» gá»n dá»±a trên GTK2
+-Comment[xx]=xxA lightweight GTK2 based window managerxx
+ Comment[zh_CN]=è½»é‡çº§ GTK2 窗å£ç®¡ç†å™¨
+ Comment[zh_TW]=一個基於 GTK2 的輕é‡åŒ–視窗管ç†ç¨‹å¼
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/mwm.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/mwm.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/mwm.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/mwm.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -6,7 +6,6 @@
+ Name=MWM
+ Name[eo]=MFA
+ Name[hi]=à¤à¤®à¤¡à¤¬à¤²à¥à¤¯à¥‚à¤à¤®
+-Name[xx]=xxMWMxx
+ Comment=The Motif Window Manager
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° موتيÙ
+ Comment[bn]=দি মোটিফ উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°
+@@ -57,6 +56,5 @@
+ Comment[uz]=Motif ойна бошқарувчи
+ Comment[vi]=Trình quản lý cá»a sổ Motif
+ Comment[wa]=Li manaedjeu di purneas di Motif
+-Comment[xx]=xxThe Motif Window Managerxx
+ Comment[zh_CN]=Motif 窗å£ç®¡ç†å™¨
+ Comment[zh_TW]=Motif 視窗管ç†ç¨‹å¼
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/olvwm.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/olvwm.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/olvwm.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/olvwm.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -7,7 +7,6 @@
+ Name[br]=OVLWM
+ Name[eo]=OLVFA
+ Name[hi]=ओà¤à¤²à¤µà¥€à¤¡à¤¬à¤²à¥à¤¯à¥‚à¤à¤®
+-Name[xx]=xxOLVWMxx
+ Comment=The OpenLook Virtual Window Manager. OLWM enhanced for handling of virtual desktops
+ Comment[ar]=مدير Ø§Ù„Ù†ÙˆØ§ÙØ° الوهمي OpenLookØŒ Ù…ØØ³Ù‘Ù† للتعامل مع Ø£Ø³Ø·Ø Ø§Ù„Ù…ÙƒØªØ¨ الوهمية
+ Comment[bn]=দি ওপেনলà§à¦• à¦à¦¾à¦°à§à¦šà§à§Ÿà¦¾à¦² উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°à¥¤ OLWM-à¦à¦° বরà§à¦§à¦¿à¦¤ সংসà§à¦•রণ যাতে à¦à¦¾à¦°à§à¦šà§à§Ÿà¦¾à¦² ডেসà§à¦•টপ সমরà§à¦¥à¦¿à¦¤
+@@ -54,5 +53,4 @@
+ Comment[tr]=OpenLook Sanal Pencere Yöneticisi.
+ Comment[uk]=OpenLook Virtual Window Manager. OLWM з підтримкою віртуальних Ñтільниць
+ Comment[vi]=Trình quản lý cá»a sổ ảo Cái nhìn thoáng (OpenLook), OLWM cải tiến cho việc xá» lý desktop ảo
+-Comment[xx]=xxThe OpenLook Virtual Window Manager. OLWM enhanced for handling of virtual desktopsxx
+ Comment[zh_CN]=OpenLook 虚拟窗å£ç®¡ç†å™¨ã€‚OLWM 特别增强了虚拟桌é¢çš„处ç†
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/olwm.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/olwm.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/olwm.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/olwm.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -6,7 +6,6 @@
+ Name=OLWM
+ Name[eo]=OLFA
+ Name[hi]=ओà¤à¤²à¤¡à¤¬à¤²à¥à¤¯à¥‚à¤à¤®
+-Name[xx]=xxOLWMxx
+ Comment=The traditional Open Look Window Manager
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° أوبن لوك التقليدي
+ Comment[be]=Традыцыйнае кіраваньне вокнамі Open Look
+@@ -57,6 +56,5 @@
+ Comment[tr]=OpenLook Pencere Yöneticisi
+ Comment[uk]=Традиційний менеджер вікон Open Look
+ Comment[vi]=Trình quản lý cá»a sổ Cái nhìn thoáng truyá»n thống
+-Comment[xx]=xxThe traditional Open Look Window Managerxx
+ Comment[zh_CN]=ä¼ ç»Ÿçš„ OpenLook 窗å£ç®¡ç†å™¨
+ Comment[zh_TW]=傳統的 Open Look 視窗管ç†ç¨‹å¼
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/openbox.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/openbox.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/openbox.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/openbox.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -11,7 +11,6 @@
+ Name[pa]=ਓਪਨ ਬਕਸਾ
+ Name[ta]=திறபà¯à®ªà¯ பெடà¯à®Ÿà®¿
+ Name[tg]=Кушодани қуттӣ
+-Name[xx]=xxOpenboxxx
+ Comment=A lightweight window manager based on Blackbox
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° Ø®Ùي٠العبء مبني على Blackbox
+ Comment[bn]=বà§à¦²à§à¦¯à¦¾à¦•বকà§à¦¸ à¦à¦¿à¦¤à§à¦¤à¦¿à¦• হালà§à¦•া উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°
+@@ -62,5 +61,4 @@
+ Comment[uz]=Blackbox аÑоÑида Ñратилган оддий ойна бошқарувчи
+ Comment[vi]=Trình quản lý cá»a sổ nhá» gá»n dá»±a trên Blackbox
+ Comment[wa]=On ledjir manaedjeu di purneas båzé so Blackbox
+-Comment[xx]=xxA lightweight window manager based on Blackboxxx
+ Comment[zh_CN]=基于 BlackBox 的轻é‡çº§çª—å£ç®¡ç†å™¨
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/oroborus.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/oroborus.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/oroborus.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/oroborus.desktop 2005-03-22 12:38:10.000000000 -0500
+@@ -7,7 +7,6 @@
+ Name[eo]=Koloroj
+ Name[hi]=ऑरोबोरस
+ Name[pa]=ਓਰੂਬੋਰà©à¨¸
+-Name[xx]=xxOroborusxx
+ Comment=A lightweight themeable window manager
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° Ø®Ùي٠العبء قابل لاستخدام السمات
+ Comment[bn]=হালà§à¦•া থীমযà§à¦•à§à¦¤ উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°
+@@ -30,7 +29,7 @@
+ Comment[hr]=Lagani upravitelj prozora sa temama
+ Comment[hu]=Kis erőforrásigényű ablakkezelő, témázási lehetőséggel
+ Comment[is]=Léttur þemanlegur gluggastjóri
+-Comment[it]=Un window manager leggero che supporta i temi
++Comment[it]=Un window manager leggero che supporta i temi
+ Comment[ja]=テーマ化å¯èƒ½ãªè»½é‡ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãƒžãƒãƒ¼ã‚¸ãƒ£
+ Comment[lt]=Nedaug resursų reikalaujanti temas palaikanti langų tvarkyklė
+ Comment[mk]=ЛеÑен менаџер на прозорци Ñо теми
+@@ -55,7 +54,6 @@
+ Comment[tr]=Küçük, hafif, temalı bir pencere yöneticisi
+ Comment[uk]=Легкий менеджер вікон з підтримкою тем
+ Comment[vi]=Trình quản lý cá»a sổ thay đổi được chá»§ Ä‘á»
+-Comment[xx]=xxA lightweight themeable window managerxx
+ Comment[zh_CN]=è½»é‡çº§çª—å£ç®¡ç†å™¨ï¼Œå¯å®šä¹‰ä¸»é¢˜
+ Comment[zh_TW]=一個輕é‡åŒ–且有佈景功能的視窗管ç†ç¨‹å¼
+ # not usable as a session
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/phluid.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/phluid.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/phluid.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/phluid.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -7,7 +7,6 @@
+ Name[eo]=Plena
+ Name[hi]=फà¥à¤²à¥à¤‡à¤¡
+ Name[pa]=ਫਲà©à¨‡à¨¡
+-Name[xx]=xxPhluidxx
+ Comment=An Imlib2 based window manager
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° مبني على Imlib2
+ Comment[be]=Кіраваньне вокнамі базаванае на Imlib2
+@@ -60,6 +59,5 @@
+ Comment[uk]=Менеджер вікон, заÑнований на Imlib2
+ Comment[uz]=Imlib2 аÑоÑида Ñратилган ойна бошқарувчи
+ Comment[vi]=Trình quản lý cá»a sổ dá»±a trên lmlib2
+-Comment[xx]=xxAn Imlib2 based window managerxx
+ Comment[zh_CN]=基于 Imlib2 的窗å£ç®¡ç†å™¨
+ Comment[zh_TW]=一個基於 Imlib2 的視窗管ç†ç¨‹å¼
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/pwm.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/pwm.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/pwm.desktop 2005-01-31 03:35:41.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/pwm.desktop 2005-03-22 12:38:10.000000000 -0500
+@@ -6,7 +6,6 @@
+ Name=PWM
+ Name[eo]=UnuFA
+ Name[hi]=पीडबलà¥à¤¯à¥‚à¤à¤®
+-Name[xx]=xxPWMxx
+ Comment=A lightweight window manager able to attach multiple windows to one frame
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° Ø®Ùي٠العبء قابل لربط عدة Ù†ÙˆØ§ÙØ° إلى إطار ÙˆØ§ØØ¯
+ Comment[bn]=à¦à¦•টি হালà§à¦•া উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°, যাতে à¦à¦•টি ফà§à¦°à§‡à¦®à§‡ à¦à¦•াধিক উইণà§à¦¡à§‹ সংযà§à¦•à§à¦¤ করা সমà§à¦à¦¬
+@@ -28,7 +27,7 @@
+ Comment[hi]=à¤à¤• हलà¥à¤•ा विंडो पà¥à¤°à¤¬à¤‚धक जिसके à¤à¤• फ़रमा में अनेक विंडो जोड़े जा सकते हैं
+ Comment[hu]=Alacsony erőforrásigényű ablakkezelő, több ablakot képes egy kerethez rendelni
+ Comment[is]=Léttur gluggastjóri sem getur tengt marga glugga við einn ramma
+-Comment[it]=Un window manager leggereo in grado di attaccare più finestre ad una cornice
++Comment[it]=Un window manager leggero in grado di attaccare più finestre ad una cornice
+ Comment[ja]=複数ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦æž ã‚’è¨å®šå¯èƒ½ãªè»½é‡ãªã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãƒžãƒãƒ¼ã‚¸ãƒ£
+ Comment[lt]=Nedaug resursų reikalaujanti langų tvarkyklė, galinti prijungti daug langų prie vieno rėmo
+ Comment[mk]=ЛеÑен менаџер на прозорци кој може да прикачи повеќе прозорци на една рамка
+@@ -52,5 +51,4 @@
+ Comment[tr]=Düşük ağırlıklı bir çok pencereyi bir çerçeveye toplayabilen bir pencere yöneticisi
+ Comment[uk]=ПроÑтий менеджер вікон, що дозволÑÑ” долучати декілька вікон до однієї рамки
+ Comment[vi]=Trình quản lý cá»a sổ nhá» gá»n, có thể gắn nhiá»u cá»a sổ và o má»™t khung
+-Comment[xx]=xxA lightweight window manager able to attach multiple windows to one framexx
+ Comment[zh_CN]=è½»é‡çº§çª—å£ç®¡ç†å™¨ï¼Œå¯å°†å¤šä¸ªçª—å£é™„åŠ åˆ°ä¸€ä¸ªæ¡†æž¶ä¸
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/qvwm.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/qvwm.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/qvwm.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/qvwm.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -6,7 +6,6 @@
+ Name=QVWM
+ Name[eo]=QVFA
+ Name[hi]=कà¥à¤¯à¥‚वीडबलà¥à¤¯à¥‚à¤à¤®
+-Name[xx]=xxQVWMxx
+ Comment=A Windows 95 like window manager
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° شبيه بويندوز 95
+ Comment[be]=Кіраваньне вокнамі падобнае на Windows 95
+@@ -60,5 +59,4 @@
+ Comment[uz]=Win95'га ўхшаган ойна бошқарувчи
+ Comment[vi]=Trình quản lý cá»a sổ giống Windows 95
+ Comment[wa]=On manaedjeu di purneas rishonnant a Windows 95
+-Comment[xx]=xxA Windows 95 like window managerxx
+ Comment[zh_CN]=类似 Windows 95 的窗å£ç®¡ç†å™¨
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/ratpoison.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/ratpoison.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/ratpoison.desktop 2005-02-02 00:15:42.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/ratpoison.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -13,7 +13,6 @@
+ Name[ta]=ராட௠பாயà¯à®šà®©à¯
+ Name[vi]=Bả chuột
+ Name[wa]=Pwezon po les rats (Ratpoison)
+-Name[xx]=xxRatpoisonxx
+ Comment=A simple keyboard-only window manager modeled after Screen
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° بسيط يستخدم Ù„ÙˆØØ© Ø§Ù„Ù…ÙØ§ØªÙŠØ Ùقط صنع مشابهاً لـScreen
+ Comment[bn]=à¦à¦•টি সরল কীবোরà§à¦¡-à¦à¦¿à¦¤à§à¦¤à¦¿à¦• উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°, Screen-à¦à¦° আদরà§à¦¶à§‡ তৈরি
+@@ -61,5 +60,4 @@
+ Comment[tr]=Screen'den sonra modellenmiş salt klavye basit pencere yöneticisi
+ Comment[uk]=ПроÑтий менеджер вікон, розроблений на базі Screen, з підтримкою тільки клавіатури
+ Comment[wa]=On simpe manaedjeu di purneas eployant fok li taprece, båzé so ls idêyes da «Screen»
+-Comment[xx]=xxA simple keyboard-only window manager modeled after Screenxx
+ Comment[zh_CN]=Screen åŽåˆä¸€åªæ”¯æŒé”®ç›˜çš„窗å£ç®¡ç†å™¨
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/sapphire.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/sapphire.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/sapphire.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/sapphire.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -11,7 +11,6 @@
+ Name[ru]=Сапфир
+ Name[ta]=சபையரà¯
+ Name[tg]=Ðқути кабуд
+-Name[xx]=xxSapphirexx
+ Comment=A minimal but configurable window manager
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° مصغّر ولكن قابل للإعداد
+ Comment[bn]=পরিমিত কিনà§à¦¤à§ থীমযà§à¦•à§à¦¤ উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°
+@@ -61,6 +60,5 @@
+ Comment[uk]=Мінімальний менеджер вікон з можливіÑтю налаштуваннÑ
+ Comment[uz]=Оддий, аммо моÑлаб бўладиган ойна бошқарувчи
+ Comment[vi]=Trình quản lý cá»a sổ tối thiểu nhưng có thể cấu hình được
+-Comment[xx]=xxA minimal but configurable window managerxx
+ Comment[zh_CN]=很å°å´å¯é…置的窗å£ç®¡ç†å™¨
+ Comment[zh_TW]=一個å°ä½†å¯çµ„態的視窗管ç†ç¨‹å¼
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/sawfish.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/sawfish.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/sawfish.desktop 2005-01-31 03:35:41.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/sawfish.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -8,7 +8,6 @@
+ Name[eo]=SegfiÅo
+ Name[hi]=सा-फिश
+ Name[pa]=ਸ਼ਾਅਫਿਸ਼
+-Name[xx]=xxSawfishxx
+ Comment=An extensible window manager scriptable with an Emacs Lisp-like language
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° قابل للتوسعة يمكن بشÙيره بلغة إيماكس ليسب
+ Comment[bs]=ProÅ¡iriv window manager sa podÅ¡kom za skriptiranje u jeziku sliÄnom Emacs Lisp-u
+@@ -53,5 +52,4 @@
+ Comment[tr]=Eklenti destekli Emacs Lisp benzeri bir kodlama dili kullanan kodlanabilir bir pencere yöneticisi
+ Comment[uk]=Менеджер вікон, що можна розширювати мовою Ñкриптів наподіб Emacs Lisp
+ Comment[vi]=Trình quản lý cá»a sổ có thể script được vá»›i ngôn ngữ giống Emacs Lisp
+-Comment[xx]=xxAn extensible window manager scriptable with an Emacs Lisp-like languagexx
+ Comment[zh_CN]=å¯ç”¨ç±»ä¼¼ Emacs Lisp çš„è¯æ³•进行编程的窗å£ç®¡ç†å™¨
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/twm.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/twm.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/twm.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/twm.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -7,7 +7,6 @@
+ Name[eo]=TFA
+ Name[hi]=टीडबलà¥à¤¯à¥‚à¤à¤®
+ Name[th]=รูปà¹à¸šà¸š TWM
+-Name[xx]=xxTWMxx
+ Comment=The Tab Window Manager
+ Comment[ar]=مدير Ø§Ù„Ù†ÙˆØ§ÙØ° Tab
+ Comment[bn]=দি টà§à¦¯à¦¾à¦¬ উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°
+@@ -54,6 +53,5 @@
+ Comment[tr]=Tab Pencere Yöneticisi
+ Comment[uk]=Tab Window Manager
+ Comment[vi]=Trình quản lý cá»a sổ Tab
+-Comment[xx]=xxThe Tab Window Managerxx
+ Comment[zh_CN]=æ ‡ç¾å¼çª—å£ç®¡ç†å™¨
+ Comment[zh_TW]=Tab 視窗管ç†ç¨‹å¼
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/ude.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/ude.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/ude.desktop 2005-01-31 03:35:41.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/ude.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -7,7 +7,6 @@
+ Name[eo]=ULĈ
+ Name[hi]=यूडीई
+ Name[th]=รูปà¹à¸šà¸š UDE
+-Name[xx]=xxUDExx
+ Comment=The UNIX Desktop Environment
+ Comment[ar]=بيئة Ø³Ø·Ø Ù…ÙƒØªØ¨ يونكس
+ Comment[bn]=দি ইউনিকà§à¦¸ ডেসà§à¦•টপ à¦à¦¨à¦à¦¾à§Ÿà¦°à¦¨à¦®à§‡à¦¨à§à¦Ÿ
+@@ -55,5 +54,4 @@
+ Comment[uz]=Unix иш Ñтоли муҳити (Unix Desktop Environment)
+ Comment[vi]=Môi trưá»ng desktop UNIX
+ Comment[wa]=L'Â evironmint di scribanne Unix UDE
+-Comment[xx]=xxThe UNIX Desktop Environmentxx
+ Comment[zh_CN]=UNIX 桌é¢çŽ¯å¢ƒ
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/vtwm.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/vtwm.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/vtwm.desktop 2005-01-31 03:35:41.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/vtwm.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -6,7 +6,6 @@
+ Name=VTWM
+ Name[eo]=VTFA
+ Name[hi]=वीटीडबलà¥à¤¯à¥‚à¤à¤®
+-Name[xx]=xxVTWMxx
+ Comment=The Virtual Tab Window Manager. TWM enhanced by virtual screens, etc.
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° Tab الوهمي، مدير Ù†ÙˆØ§ÙØ° TWM Ù…ØØ³Ù‘Ù† Ø¨Ø£Ø³Ø·Ø Ø§Ù„Ù…ÙƒØªØ¨ الوهمية، إلخ.
+ Comment[bn]=à¦à¦¾à¦°à§à¦šà§à§Ÿà¦¾à¦² টà§à¦¯à¦¾à¦¬ উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°, à¦à¦¾à¦°à§à¦šà§à§Ÿà¦¾à¦² সà§à¦•à§à¦°à§€à¦£ ইতà§à¦¯à¦¾à¦¦à¦¿ দà§à¦¬à¦¾à¦°à¦¾ বরà§à¦§à¦¿à¦¤
+@@ -53,5 +52,4 @@
+ Comment[tr]=Virtual Tab Masaüstü Yöneticisi.
+ Comment[uk]=Virtual Tab Window Manager. TWM з підтримкою віртуальних екранів.
+ Comment[vi]=Trình quản lý cá»a sổ Tab ảo. TWM cải tiến vá»›i mà n hình ảo; v..v..
+-Comment[xx]=xxThe Virtual Tab Window Manager. TWM enhanced by virtual screens, etc.xx
+ Comment[zh_CN]=è™šæ‹Ÿæ ‡ç¾å¼çª—å£ç®¡ç†å™¨ã€‚用虚拟å±å¹•ç‰åŠŸèƒ½å¢žå¼ºçš„ TWM。
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/w9wm.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/w9wm.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/w9wm.desktop 2005-01-31 03:35:41.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/w9wm.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -7,7 +7,6 @@
+ Name[eo]=F9FA
+ Name[hi]=डबलà¥à¤¯à¥‚9डबलà¥à¤¯à¥‚à¤à¤®
+ Name[ta]=IceWM
+-Name[xx]=xxW9WMxx
+ Comment=A window manager based on 9WM, enhanced by virtual screens and keyboard bindings
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° مبني على 9WMØŒ Ù…ØØ³Ù‘Ù† الشاشات الوهمية ÙˆØ§Ù„Ù…ÙØ§ØªÙŠØ المرتبطة
+ Comment[bn]=9WM à¦à¦¿à¦¤à§à¦¤à¦¿à¦• উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°, à¦à¦¾à¦°à§à¦šà§à§Ÿà¦¾à¦² সà§à¦•à§à¦°à§€à¦£ à¦à¦¬à¦‚ কীবোরà§à¦¡ বাইনà§à¦¡à¦¿à¦‚ দà§à¦¬à¦¾à¦°à¦¾ বরà§à¦§à¦¿à¦¤
+@@ -53,6 +52,5 @@
+ Comment[tr]=9WM tabanlı, sanal ekranları ve klavye kısayolları ile geliştirilmiş bir masaüstü yöneticisi
+ Comment[uk]=Менеджер вікон, заÑнований на 9WM, додано віртуальні екрани та прив'Ñзки клавіш
+ Comment[vi]=Trình quản lý cá»a sổ dá»±a và o 9WM, cải tiến vá»›i mà n hình ảo, tổ hợp phÃm
+-Comment[xx]=xxA window manager based on 9WM, enhanced by virtual screens and keyboard bindingsxx
+ Comment[zh_CN]=基于 9WM 的窗å£ç®¡ç†å™¨ï¼Œç”¨è™šæ‹Ÿå±å¹•和键盘绑定ç‰åŠŸèƒ½å¢žå¼ºäº†
+ Comment[zh_TW]=一個基於 9WM ä¸¦åŠ å¼·è™›æ“¬èž¢å¹•åŠéµç›¤çµ„åˆéµåŠŸèƒ½
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/waimea.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/waimea.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/waimea.desktop 2005-01-31 03:35:41.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/waimea.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -7,7 +7,6 @@
+ Name[eo]=Vaimeo
+ Name[hi]=वाईमिया
+ Name[pa]=ਵਾਈਮਿਆ
+-Name[xx]=xxWaimeaxx
+ Comment=A highly customizable window manager based on Blackbox
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° قابل جداً للتخصيص مبني على Blackbox
+ Comment[bn]=বà§à¦²à§à¦¯à¦¾à¦•বকà§à¦¸ à¦à¦¿à¦¤à§à¦¤à¦¿à¦• উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°
+@@ -56,6 +55,5 @@
+ Comment[uk]=Ðадгнучкий менеджер вікон, заÑнований на Blackbox
+ Comment[uz]=Blackbox аÑоÑида Ñратилган, моÑлаб бўладиган ойна бошқарувчи
+ Comment[vi]=Trình quản lý cá»a sổ rất dá»… cá nhân hoá dá»±a trên Blackbox
+-Comment[xx]=xxA highly customizable window manager based on Blackboxxx
+ Comment[zh_CN]=基于 BlackBox å¯é«˜åº¦è‡ªå®šä¹‰çš„窗å£ç®¡ç†å™¨
+ Comment[zh_TW]=一個基於 Blackbox 且高度å¯å®¢è£½åŒ–的視窗管ç†ç¨‹å¼
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/wm2.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/wm2.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/wm2.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/wm2.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -6,7 +6,6 @@
+ Name=WM2
+ Name[eo]=Fa2
+ Name[hi]=डबलà¥à¤¯à¥‚à¤à¤®2
+-Name[xx]=xxWM2xx
+ Comment=A small, non-configurable window manager
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° صغير غير قابل للإعداد
+ Comment[bn]=à¦à¦•টি ছোটো উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°
+@@ -57,5 +56,4 @@
+ Comment[uz]=Кичик, моÑлаб бўлмайдиган ойна бошқарувчи
+ Comment[vi]=Trình quản lý cá»a sổ nhá», không cấu hình được
+ Comment[wa]=On ptit, nén apontiåve, manaedjeu di purneas
+-Comment[xx]=xxA small, non-configurable window managerxx
+ Comment[zh_CN]=å°å·§çš„ä¸å¯é…置的窗å£ç®¡ç†å™¨
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/wmaker.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/wmaker.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/wmaker.desktop 2005-02-10 23:52:05.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/wmaker.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -12,7 +12,6 @@
+ Name[sv]=Windowmaker
+ Name[ta]=விணà¯à®Ÿà¯‹à®¸à¯à®®à¯‡à®•à¯à®•à®°à¯
+ Name[tg]=Созандаи тиреза
+-Name[xx]=xxWindowMakerxx
+ Comment=A simple window manager that resembles the NeXTStep look very closely
+ Comment[ar]=مدير Ù†ÙˆØ§ÙØ° بسيط يمثّل مظهر NeXTStep بشكل قريب جداً
+ Comment[bn]=à¦à¦•টি উইণà§à¦¡à§‹ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦° যা à¦à§€à¦·à¦£à¦°à¦•ম NeXTStep-à¦à¦° মত দেখতে
+@@ -61,6 +60,5 @@
+ Comment[uk]=ПроÑтий менеджер вікон, що дуже нагадує NeXTStep
+ Comment[uz]=NeXTStep'га жуда ўхшаш оддий ойна бошқарувчи
+ Comment[vi]=Trình quản lý cá»a sổ giống vá»›i NeXTStep
+-Comment[xx]=xxA simple window manager that resembles the NeXTStep look very closelyxx
+ Comment[zh_CN]=éžå¸¸æŽ¥è¿‘ NeXTStep 外观的简å•窗å£ç®¡ç†å™¨
+ Comment[zh_TW]=一個å°åž‹ä¸”與 NeXTStep 外觀很接近的視窗管ç†ç¨‹å¼
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/xfce.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/xfce.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/xfce.desktop 2005-02-04 23:15:15.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/xfce.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -7,7 +7,6 @@
+ Name[eo]=Facoj
+ Name[hi]=à¤à¤•à¥à¤¸à¤à¤«à¤¸à¥€à¤ˆ
+ Name[sv]=Xfce
+-Name[xx]=xxXFcexx
+ Comment=The Cholesterol Free Desktop Environment. A desktop environment reminiscent of CDE
+ Comment[ar]=بيئة Ø³Ø·Ø Ø§Ù„Ù…ÙƒØªØ¨ الخالي من الكوليسترول، بيئة Ø³Ø·Ø Ù…ÙƒØªØ¨ مليئة بذكريات CDE
+ Comment[bn]=দি কলেসà§à¦Ÿà¦°à¦² ফà§à¦°à§€ ডেসà§à¦•টপ à¦à¦¨à¦à¦¾à§Ÿà¦°à¦¨à¦®à§‡à¦¨à§à¦Ÿà¥¤ CDE-র কথা মনে করিয়ে দেয় à¦à¦®à¦¨ à¦à¦•টি ডেসà§à¦•টপ à¦à¦¨à¦à¦¾à§Ÿà¦°à¦¨à¦®à§‡à¦¨à§à¦Ÿ
+@@ -54,5 +53,4 @@
+ Comment[tr]=Cholesterol Masaüstü Ortamı
+ Comment[uk]=The Cholesterol Free Desktop Environment. Графічне Ñередовище, що нагадує CDE
+ Comment[vi]=Môi trưá»ng desktop không Cholesterol. Môi trưá»ng desktop gợi nhá»› lại CDE
+-Comment[xx]=xxThe Cholesterol Free Desktop Environment. A desktop environment reminiscent of CDExx
+ Comment[zh_CN]=胆固醇自由桌é¢çŽ¯å¢ƒã€‚CDE 桌é¢çŽ¯å¢ƒçš„è¿½éšè€…
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/sessions/xfce4.desktop kdebase-branch-3.4/kdm/kfrontend/sessions/xfce4.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/sessions/xfce4.desktop 2005-02-18 23:27:05.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/sessions/xfce4.desktop 2005-03-07 09:15:38.000000000 -0500
+@@ -8,7 +8,6 @@
+ Name[hi]=à¤à¤•à¥à¤¸à¤à¤«à¤¸à¥€à¤ˆ4
+ Name[pa]=XFce ੪
+ Name[sv]=Xfce 4
+-Name[xx]=xxXFce 4xx
+ Comment=The Cholesterol Free Desktop Environment, version 4. A desktop environment reminiscent of CDE
+ Comment[bn]=দি কলেসà§à¦Ÿà¦°à¦² ফà§à¦°à§€ ডেসà§à¦•টপ à¦à¦¨à¦à¦¾à§Ÿà¦°à¦¨à¦®à§‡à¦¨à§à¦Ÿ, ৪রà§à¦¥ সংসà§à¦•রণ। CDE-র কথা মনে করিয়ে দেয় à¦à¦®à¦¨ à¦à¦•টি ডেসà§à¦•টপ à¦à¦¨à¦à¦¾à§Ÿà¦°à¦¨à¦®à§‡à¦¨à§à¦Ÿ
+ Comment[bs]=Cholesterol Free Desktop Environment. Desktop okolina nalik na CDE
+@@ -48,10 +47,9 @@
+ Comment[sk]=The Cholesterol Free Desktop Environment verzia 4. Pracovné prostredie pripomÃnajúce CDE
+ Comment[sl]=Cholesterol Free Desktop Environment, razliÄica 4. Namizno okolje, podobno okolju CDE
+ Comment[sr]=„The Cholesterol Free Desktop Environment“ 4. издање. Радно окружење које подÑећа на CDE
+-Comment[sr@Latn]=„The Cholesterol Free Desktop Environment“ 4. издање. Радно окружење које подÑећа на CDE
++Comment[sr@Latn]=„The Cholesterol Free Desktop Environment“ 4. izdanje. Radno okruženje koje podseća na CDE
+ Comment[sv]=Den kolesterolfria skrivbordsmiljön, version 4. En skrivbordsmiljö som påminner om CDE
+ Comment[ta]=கொலஸà¯à®Ÿà¯à®°à®¾à®²à¯ இலà¯à®²à®¾à®¤ மேலà¯à®®à¯‡à®šà¯ˆ சூழலà¯. பதிபà¯à®ªà¯ 4. CDE பொரà¯à®³à¯à®ªà¯Šà®¤à®¿à®¨à¯à®¤ மேலà¯à®®à¯‡à®šà¯ˆ சூழலà¯
+ Comment[tr]=Cholesterol Ücretsiz Masaüstü Ortamı, sürüm 4. CDE'nin benzeri olan masaüstü ortamı
+ Comment[uk]=The Cholesterol Free Desktop Environment, верÑÑ–Ñ 4. Графічне Ñередовище, що нагадує CDE
+-Comment[xx]=xxThe Cholesterol Free Desktop Environment, version 4. A desktop environment reminiscent of CDExx
+ Comment[zh_CN]=胆固醇自由桌é¢çŽ¯å¢ƒï¼Œç‰ˆæœ¬ 4。CDE 桌é¢çŽ¯å¢ƒçš„è¿½éšè€…
+diff -Nru kdebase-release-3.4.0/kdm/kfrontend/themes/circles/GdmGreeterTheme.desktop kdebase-branch-3.4/kdm/kfrontend/themes/circles/GdmGreeterTheme.desktop
+--- kdebase-release-3.4.0/kdm/kfrontend/themes/circles/GdmGreeterTheme.desktop 2005-02-23 00:05:43.000000000 -0500
++++ kdebase-branch-3.4/kdm/kfrontend/themes/circles/GdmGreeterTheme.desktop 2005-03-30 01:47:47.000000000 -0500
+@@ -7,11 +7,13 @@
+ Name=Circles
+ Name[bn]=সারà§à¦•লà§â€Œà¦¸
+ Name[br]=Kelc'hioù
++Name[bs]=Krugovi
+ Name[ca]=Cercles
+ Name[cs]=Kruhy
+ Name[cy]=Cylchoedd
+ Name[da]=Cirkler
+ Name[de]=Kreise
++Name[el]=ΚÏκλοι
+ Name[eo]=cirkloj
+ Name[es]=CÃrculos
+ Name[et]=Ringid
+@@ -22,6 +24,7 @@
+ Name[hu]=Körök
+ Name[is]=Hringir
+ Name[it]=Cerchi
++Name[ja]=サークル
+ Name[lt]=Skrituliai
+ Name[nb]=Sirkler
+ Name[nl]=Cirkels
+@@ -32,24 +35,27 @@
+ Name[pt_BR]=CÃrculos
+ Name[ru]=Круги
+ Name[se]=Gearddut
++Name[sk]=Kruhy
+ Name[sl]=Krogi
+ Name[sr]=Кругови
+-Name[sr@Latn]=Кругови
++Name[sr@Latn]=Krugovi
+ Name[sv]=Cirklar
+ Name[ta]=வடà¯à®Ÿà®™à¯à®•ளà¯
+ Name[tr]=Çemberler
+ Name[uk]=Кола
+-Name[xx]=xxCirclesxx
+ Name[zh_CN]=圆环
+ Description=Theme with blue circles
+ Description[bn]=নীল বৃতà§à¦¤ সমà§à¦¬à¦²à¦¿à¦¤ থীম
++Description[bs]=Tema sa plavim krugovima
+ Description[ca]=Tema amb cercles blaus
+ Description[cs]=Motiv s modrými kruhy
+ Description[da]=Tema med blå cirkler
+ Description[de]=Thema mit blauen Kreisen
++Description[el]=ΘÎμα με μπλε κÏκλους
+ Description[eo]=Etoso kun bluaj cirkloj
+ Description[es]=Tema con cÃrculos azules
+ Description[et]=Siniste ringidega teema
++Description[eu]=Biribil urdindun tema
+ Description[fi]=Teema sinisillä ympyröillä
+ Description[fr]=Thème avec des cercles bleus
+ Description[fy]=Tema mei blauwe sirkels
+@@ -58,6 +64,7 @@
+ Description[hu]=Téma kék körökkel
+ Description[is]=Þema með bláum hringjum
+ Description[it]=Tema con cerchi blu
++Description[ja]=é’ã„丸ã®ãƒ†ãƒ¼ãƒž
+ Description[lt]=Tema su melsvais skrituliais
+ Description[nb]=Tema med blå sirkler
+ Description[nl]=Thema met blauwe cirkels
+@@ -68,14 +75,14 @@
+ Description[pt_BR]=Tema com cÃrculos azuis
+ Description[ru]=Тема Ñ Ñиними кругами
+ Description[se]=Fáddá mas lea alit gearddut
++Description[sk]=Téma s modrými kruhmi
+ Description[sl]=Tema z modrimi krogi
+ Description[sr]=Тема Ñа плавим круговима
+-Description[sr@Latn]=Тема Ñа плавим круговима
++Description[sr@Latn]=Tema sa plavim krugovima
+ Description[sv]=Tema med blåa cirklar
+ Description[ta]=நீல வடà¯à®Ÿà®™à¯à®•ளà¯à®Ÿà®©à¯ தலைபà¯à®ªà¯
+ Description[tr]=Mavi çemberli tema
+ Description[uk]=Тема з Ñиніми колами
+-Description[xx]=xxTheme with blue circlesxx
+ Description[zh_CN]=带è“环的主题
+ Author=Bond, James Bond
+ Copyright=(c) 2002 Bond, James Bond
+diff -Nru kdebase-release-3.4.0/kfind/Kfind.desktop kdebase-branch-3.4/kfind/Kfind.desktop
+--- kdebase-release-3.4.0/kfind/Kfind.desktop 2005-02-23 00:05:43.000000000 -0500
++++ kdebase-branch-3.4/kfind/Kfind.desktop 2005-03-30 01:47:48.000000000 -0500
+@@ -9,12 +9,15 @@
+ Name=Find Files/Folders
+ Name[bg]=ТърÑене на файлове
+ Name[bn]=ফাইল/ফোলà§à¦¡à¦¾à¦° অনà§à¦¸à¦¨à§à¦§à¦¾à¦¨
++Name[bs]=Pronađi datoteke
+ Name[ca]=Cerca fitxers i carpetes
+ Name[cs]=NajÃt soubory/složky
+ Name[da]=Find filer/mapper
+ Name[de]=Dateien suchen
++Name[el]=ΕÏÏεση αÏχείων/φακÎλων
+ Name[es]=Buscar archivos/carpetas
+ Name[et]=Failide/kataloogide otsimine
++Name[eu]=Bilatu fitxategiak/karpetak
+ Name[fi]=Etsi tiedostoja/kansioita
+ Name[fr]=Recherche de fichiers/dossiers
+ Name[fy]=Triemen/mappen sykje
+@@ -23,6 +26,7 @@
+ Name[hu]=Fájlkereső
+ Name[is]=Finna skrár/möppur
+ Name[it]=Trova file/cartelle
++Name[ja]=ファイル/フォルダを検索
+ Name[lt]=Rasti bylas/aplankus
+ Name[nb]=Finn filer/mapper
+ Name[nl]=Bestanden/mappen zoeken
+@@ -33,14 +37,14 @@
+ Name[pt_BR]=Procurar arquivos/pastas
+ Name[ru]=ПоиÑк файлов и папок
+ Name[se]=Oza fiillaid dahje máhpaid
++Name[sk]=HľadaÅ¥ súbory/prieÄinky
+ Name[sl]=Najdi datoteke in mape
+ Name[sr]=Тражење фајлова/директоријума
+-Name[sr@Latn]=Тражење фајлова/директоријума
++Name[sr@Latn]=Traženje fajlova/direktorijuma
+ Name[sv]=Hitta filer eller kataloger
+ Name[ta]=கோபà¯à®ªà¯à®•ளà¯/அடைவà¯à®•ளைக௠கணà¯à®Ÿà¯à®ªà®¿à®Ÿà®¿
+ Name[tr]=Dosya/Dizin Bul
+ Name[uk]=Пошук файлів та тек
+-Name[xx]=xxFind Files/Foldersxx
+ Name[zh_CN]=查找文件/文件夹
+ X-KDE-StartupNotify=true
+ OnlyShowIn=KDE;
+diff -Nru kdebase-release-3.4.0/kfind/findpart.desktop kdebase-branch-3.4/kfind/findpart.desktop
+--- kdebase-release-3.4.0/kfind/findpart.desktop 2005-02-23 00:05:43.000000000 -0500
++++ kdebase-branch-3.4/kfind/findpart.desktop 2005-03-07 09:15:40.000000000 -0500
+@@ -56,7 +56,7 @@
+ Name[sk]=Nájsť Part
+ Name[sl]=Najdi del
+ Name[sr]=Део за тражење
+-Name[sr@Latn]=Pronađi deo
++Name[sr@Latn]=Deo za traženje
+ Name[sv]=Sökdel
+ Name[ta]=பகà¯à®¤à®¿ கணà¯à®Ÿà¯à®ªà®¿à®Ÿà®¿
+ Name[tg]=ҚиÑматро пайдо кунед
+@@ -66,7 +66,6 @@
+ Name[ven]=Todani tshipida
+ Name[vi]=Tìm từng phần
+ Name[xh]=Fumana Indawana
+-Name[xx]=xxFind Partxx
+ Name[zh_CN]=查找部件
+ Name[zh_TW]=尋找組件
+ Name[zu]=Thola Ingxenye
+diff -Nru kdebase-release-3.4.0/kfind/kfindpart.desktop kdebase-branch-3.4/kfind/kfindpart.desktop
+--- kdebase-release-3.4.0/kfind/kfindpart.desktop 2005-02-23 00:05:43.000000000 -0500
++++ kdebase-branch-3.4/kfind/kfindpart.desktop 2005-03-07 09:15:40.000000000 -0500
+@@ -54,7 +54,7 @@
+ Name[sk]=Nájsť Part
+ Name[sl]=Najdi del
+ Name[sr]=Део за тражење
+-Name[sr@Latn]=Pronađi deo
++Name[sr@Latn]=Deo za traženje
+ Name[sv]=Sökdel
+ Name[ta]=பகà¯à®¤à®¿ கணà¯à®Ÿà¯à®ªà®¿à®Ÿà®¿
+ Name[tg]=ҚиÑматро пайдо кунед
+@@ -64,7 +64,6 @@
+ Name[ven]=Todani tshipida
+ Name[vi]=Tìm từng phần
+ Name[xh]=Fumana Indawana
+-Name[xx]=xxFind Partxx
+ Name[zh_CN]=查找部件
+ Name[zh_TW]=尋找組件
+ Name[zu]=Thola Ingxenye
+diff -Nru kdebase-release-3.4.0/khelpcenter/Help.desktop kdebase-branch-3.4/khelpcenter/Help.desktop
+--- kdebase-release-3.4.0/khelpcenter/Help.desktop 2005-02-23 00:05:43.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/Help.desktop 2005-03-10 11:05:13.000000000 -0500
+@@ -6,6 +6,7 @@
+ Type=Application
+ Terminal=false
+ Name=Help
++Name[af]=Hulp
+ Name[ar]=مساعدة
+ Name[be]=Дапамога
+ Name[bg]=Помощ
+@@ -67,7 +68,6 @@
+ Name[vi]=Trợ giúp
+ Name[wa]=Aidance
+ Name[xh]=Uncedo
+-Name[xx]=xxHelpxx
+ Name[zh_CN]=帮助
+ Name[zh_TW]=求助
+ Name[zu]=Usizo
+diff -Nru kdebase-release-3.4.0/khelpcenter/htmlsearch/htmlsearch.desktop kdebase-branch-3.4/khelpcenter/htmlsearch/htmlsearch.desktop
+--- kdebase-release-3.4.0/khelpcenter/htmlsearch/htmlsearch.desktop 2005-02-10 23:52:05.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/htmlsearch/htmlsearch.desktop 2005-03-07 09:15:40.000000000 -0500
+@@ -71,7 +71,6 @@
+ Name[ven]=Mafhelelo a bugu
+ Name[vi]=Danh mục
+ Name[xh]=Isalathiso
+-Name[xx]=xxIndexxx
+ Name[zh_CN]=索引
+ Name[zh_TW]=索引
+ Name[zu]=Uhlelo lokuqukethwe
+@@ -141,7 +140,6 @@
+ Comment[ven]=Murafho wa Index
+ Comment[vi]=Tạo danh sách
+ Comment[xh]=Ulwenziwo Lwesalathiso
+-Comment[xx]=xxIndex generationxx
+ Comment[zh_CN]=索引生æˆ
+ Comment[zh_TW]=產生索引
+ Comment[zu]=Ukugaywa kohlelo lokuqukethwe
+@@ -203,7 +201,6 @@
+ Keywords[ven]=Thuso,HTML,Toda,Mafhelelo,bwa ha ht,toda ha ht,thanganyo ya ht,zwaphanda,luambo
+ Keywords[vi]=Trợ giúp,HTML,Tìm kiếm,danh sách,htdig,htsearch,htmerge,Phạm vi,Ngôn ngữ
+ Keywords[xh]=Uncedo,HTML,Phendla,Isalathiso,htdig,htsearch,htmerge,Scope,Ulwimi
+-Keywords[xx]=xxHelp,HTML,Search,Index,htdig,htsearch,htmerge,Scope,Languagexx
+ Keywords[zh_CN]=Help,HTML,Search,Index,htdig,htsearch,htmerge,Scope,Language,帮助,查找,索引,范围,è¯è¨€
+ Keywords[zh_TW]=Help,HTML,Search,Index,htdig,htsearch,htmerge,Scope,Language,求助,æœå°‹,索引,語言
+ Keywords[zu]=Usizo,HTML,Usesho,Uhlelo lokuqukethwe,htdig,htsearch,htmerge, Indawo elinganiselwe,Ulimi
+diff -Nru kdebase-release-3.4.0/khelpcenter/kcmhelpcenter.desktop kdebase-branch-3.4/khelpcenter/kcmhelpcenter.desktop
+--- kdebase-release-3.4.0/khelpcenter/kcmhelpcenter.desktop 2005-02-10 23:52:05.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/kcmhelpcenter.desktop 2005-03-07 09:15:40.000000000 -0500
+@@ -71,7 +71,6 @@
+ Name[ven]=Thusani Index
+ Name[vi]=Danh mục trợ giúp
+ Name[xh]=Uncedo Lwesalathisi
+-Name[xx]=xxHelp Indexxx
+ Name[zh_CN]=帮助索引
+ Name[zh_TW]=說明索引
+ Name[zu]=Uhlelo lokuqukethwe losizo
+@@ -135,7 +134,6 @@
+ Comment[ven]=Nzudzanyo ya index yau setsha senthara ya thuso na murafho
+ Comment[vi]=Cấu hình và tạo danh mục của trung tâp trợ giúp
+ Comment[xh]=Uqwalaselo lophendlo loncedo osembindi nolwenziwo
+-Comment[xx]=xxHelp center search index configuration and generationxx
+ Comment[zh_CN]=帮助ä¸å¿ƒæœç´¢ç´¢å¼•é…置和生æˆ
+ Comment[zh_TW]=求助ä¸å¿ƒæœå°‹ç´¢å¼•的組態與產生
+ Comment[zu]=ukuhlanganiselwa kanye nokugaywa kohlelo lokuqukethwe lokusesha indawo yosizo
+@@ -194,7 +192,6 @@
+ Keywords[ven]=senthara ya thuso k,thuso,index,toda
+ Keywords[vi]=khelpcenter,trợ giúp,danh mục,tìm kiếm
+ Keywords[xh]=khelpcenter,uncedo,isalathisi,uphendlo
+-Keywords[xx]=xxkhelpcenter,help,index,searchxx
+ Keywords[zh_CN]=khelpcenter,help,index,search,帮助ä¸å¿ƒ,帮助,索引,æœç´¢
+ Keywords[zh_TW]=khelpcenter,help,index,search,求助,索引,æœå°‹
+ Keywords[zu]=khelpcenter,usizo,uhlelo lokuqukethwe,usesho
+diff -Nru kdebase-release-3.4.0/khelpcenter/khelpcenter.desktop kdebase-branch-3.4/khelpcenter/khelpcenter.desktop
+--- kdebase-release-3.4.0/khelpcenter/khelpcenter.desktop 2005-02-04 23:15:17.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/khelpcenter.desktop 2005-03-07 09:15:40.000000000 -0500
+@@ -32,7 +32,6 @@
+ Name[tr]=KDE Yardım Merkezi
+ Name[uz]=Ðрдам маркази
+ Name[ven]=Senthara ya thuso ya K
+-Name[xx]=xxKHelpCenterxx
+ Name[zh_CN]=KHelpcenter
+ Comment=The KDE Help Center
+ Comment[af]=Die Kde Hulp Sentrum
+@@ -102,7 +101,6 @@
+ Comment[ven]=Senthara ya thuso ya KDE
+ Comment[vi]=Trung tâm trợ giúp KDE
+ Comment[xh]=Umbindi woncedo lwe KDE
+-Comment[xx]=xxThe KDE Help Centerxx
+ Comment[zh_CN]=KDE 帮助ä¸å¿ƒ
+ Comment[zh_TW]=KDE 求助ä¸å¿ƒ
+ Comment[zu]=Indawo Yosizi ye-KDE
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/Applications/.directory kdebase-branch-3.4/khelpcenter/plugins/Applications/.directory
+--- kdebase-release-3.4.0/khelpcenter/plugins/Applications/.directory 2005-02-09 05:08:07.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/Applications/.directory 2005-03-07 09:15:41.000000000 -0500
+@@ -61,7 +61,6 @@
+ Name[ven]=Apulikhesheni
+ Name[vi]=Các hướng dẫn sỠdụng chương trình
+ Name[xh]=Isicelo Sesandla
+-Name[xx]=xxApplication Manualsxx
+ Name[zh_CN]=åº”ç”¨ç¨‹åºæ‰‹å†Œ
+ Name[zh_TW]=æ‡‰ç”¨ç¨‹å¼æ‰‹å†Š
+ Name[zu]=Izincwadi zesandla Zomyaleli
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/Manpages/.directory kdebase-branch-3.4/khelpcenter/plugins/Manpages/.directory
+--- kdebase-release-3.4.0/khelpcenter/plugins/Manpages/.directory 2005-02-09 05:08:07.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/Manpages/.directory 2005-03-07 09:15:42.000000000 -0500
+@@ -60,7 +60,6 @@
+ Name[ven]=Masiatari a UNIX
+ Name[vi]=Trang hướng dẫn sỠdụng Unix
+ Name[xh]=UNIX amaphepha esandla
+-Name[xx]=xxUNIX manual pagesxx
+ Name[zh_CN]=Unix 手册页é¢
+ Name[zh_TW]=UNIX 手冊
+ Name[zu]=Amakhasi Ezincwadi zesandla ze-UNIX
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/Manpages/man1.desktop kdebase-branch-3.4/khelpcenter/plugins/Manpages/man1.desktop
+--- kdebase-release-3.4.0/khelpcenter/plugins/Manpages/man1.desktop 2005-02-18 23:27:07.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/Manpages/man1.desktop 2005-03-30 01:47:48.000000000 -0500
+@@ -9,6 +9,7 @@
+ Name[cy]=(1) Gorchmynion Defnyddiwr
+ Name[da]=(1) Brugerkommandoer
+ Name[de]=(1) Benutzerbefehle
++Name[el]=(1) ΕντολÎÏ‚ χÏήστη
+ Name[eo]=(1) Uzantokomandoj
+ Name[es]=(1) Comandos de usuario
+ Name[et]=(1) Kasutaja käsud
+@@ -41,13 +42,12 @@
+ Name[sk]=(1) PoužÃvateľské prÃkazy
+ Name[sl]=(1) Uporabniški ukazi
+ Name[sr]=(1) КориÑничке наредбе
+-Name[sr@Latn]=(1) КориÑничке наредбе
++Name[sr@Latn]=(1) KorisniÄke naredbe
+ Name[sv]=(1) Användarkommandon
+ Name[ta]=(1) பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®ªà®µà®°à¯ கடà¯à®Ÿà®³à¯ˆà®•ளà¯
+ Name[tr]=(1) Kullanıcı Komutları
+ Name[uk]=(1) Команди кориÑтувача
+ Name[uz]=(1) Фойдаланувчи учун буйруқлар
+-Name[xx]=xx(1) User Commandsxx
+ Name[zh_CN]=(1) 用户命令
+
+ DocPath=man:/(1)
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/Manpages/man2.desktop kdebase-branch-3.4/khelpcenter/plugins/Manpages/man2.desktop
+--- kdebase-release-3.4.0/khelpcenter/plugins/Manpages/man2.desktop 2005-02-18 23:27:07.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/Manpages/man2.desktop 2005-03-30 01:47:48.000000000 -0500
+@@ -2,12 +2,14 @@
+ Name=(2) System Calls
+ Name[bg]=(2) СиÑтемни Ñигнали
+ Name[bn]=(2) সিসà§à¦Ÿà§‡à¦® কল
++Name[br]=(3) Galvioù reizhiad
+ Name[bs]=(2) Sistemski pozivi
+ Name[ca]=(2) Crides al sistema
+ Name[cs]=(2) Systémová volánÃ
+ Name[cy]=(2) Galwadau Cysawd
+ Name[da]=(2) Systemkald
+ Name[de]=(2) Systemaufrufe
++Name[el]=(2) Κλήσεις συστήματος
+ Name[eo]=(2) Sistemvokoj
+ Name[es]=(2) Llamadas de sistema
+ Name[et]=(2) Süsteemsed väljakutsed
+@@ -40,13 +42,12 @@
+ Name[sk]=(2) Systémové volania
+ Name[sl]=(2) Sistemski klici
+ Name[sr]=(2) СиÑтемÑки позиви
+-Name[sr@Latn]=(2) СиÑтемÑки позиви
++Name[sr@Latn]=(2) Sistemski pozivi
+ Name[sv]=(2) Systemanrop
+ Name[ta]=(2) கணினி அழைபà¯à®ªà¯à®•ளà¯
+ Name[tr]=(2) Sistem Çağrıları
+ Name[uk]=(2) СиÑтемні виклики
+ Name[uz]=(2) Тизим чақирувлари
+-Name[xx]=xx(2) System Callsxx
+ Name[zh_CN]=(2) 系统调用
+
+ DocPath=man:/(2)
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/Manpages/man3.desktop kdebase-branch-3.4/khelpcenter/plugins/Manpages/man3.desktop
+--- kdebase-release-3.4.0/khelpcenter/plugins/Manpages/man3.desktop 2005-02-04 23:15:19.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/Manpages/man3.desktop 2005-03-18 03:21:29.000000000 -0500
+@@ -5,6 +5,7 @@
+ Name[be]=(3) Падпраграмы
+ Name[bg]=(3) Подпрограми
+ Name[bn]=(3) সাবরà§à¦Ÿà¦¿à¦¨
++Name[br]=(3) Isroudennadoù
+ Name[bs]=(3) Podprogrami
+ Name[ca]=(3) Subrutines
+ Name[cs]=(3) Funkce
+@@ -55,7 +56,6 @@
+ Name[uk]=(3) Підпрограми
+ Name[ven]=(3) Ndila
+ Name[xh]=(3) Ulwenzeko rhoqo olusezantsi
+-Name[xx]=xx(3) Subroutinesxx
+ Name[zh_CN]=(3) å例程
+ Name[zh_TW]=(3) å程å¼
+ Name[zu]=(3) iqoqo lemisebenzana
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/Manpages/man4.desktop kdebase-branch-3.4/khelpcenter/plugins/Manpages/man4.desktop
+--- kdebase-release-3.4.0/khelpcenter/plugins/Manpages/man4.desktop 2005-02-04 23:15:19.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/Manpages/man4.desktop 2005-03-07 09:15:42.000000000 -0500
+@@ -62,7 +62,6 @@
+ Name[vi]=(4) Thiết bị
+ Name[wa]=(4) Éndjins
+ Name[xh]=(4) Amacebo
+-Name[xx]=xx(4) Devicesxx
+ Name[zh_CN]=(4) 设备
+ Name[zh_TW]=(4) è£ç½®
+ Name[zu]=(4) Amathuluzi anenjongo
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/Manpages/man5.desktop kdebase-branch-3.4/khelpcenter/plugins/Manpages/man5.desktop
+--- kdebase-release-3.4.0/khelpcenter/plugins/Manpages/man5.desktop 2005-02-04 23:15:19.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/Manpages/man5.desktop 2005-03-07 09:15:42.000000000 -0500
+@@ -62,7 +62,6 @@
+ Name[vi]=(5) Äịnh dạng tệp
+ Name[wa]=(5) Sôres di fitchîs
+ Name[xh]=(5) Ifomati Yeefayile
+-Name[xx]=xx(5) File Formatsxx
+ Name[zh_CN]=(5) æ–‡ä»¶æ ¼å¼
+ Name[zh_TW]=(5) æª”æ¡ˆæ ¼å¼
+ Name[zu]=(5) Izakhiwo zamafayela
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/Manpages/man6.desktop kdebase-branch-3.4/khelpcenter/plugins/Manpages/man6.desktop
+--- kdebase-release-3.4.0/khelpcenter/plugins/Manpages/man6.desktop 2005-02-04 23:15:19.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/Manpages/man6.desktop 2005-03-07 09:15:42.000000000 -0500
+@@ -63,7 +63,6 @@
+ Name[vi]=(6) Trò chơi
+ Name[wa]=(6) Djeus
+ Name[xh]=(6) Imidlalo
+-Name[xx]=xx(6) Gamesxx
+ Name[zh_CN]=(6) 游æˆ
+ Name[zh_TW]=(6) éŠæˆ²
+ Name[zu]=(6) Imidlalo
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/Manpages/man7.desktop kdebase-branch-3.4/khelpcenter/plugins/Manpages/man7.desktop
+--- kdebase-release-3.4.0/khelpcenter/plugins/Manpages/man7.desktop 2005-02-04 23:15:19.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/Manpages/man7.desktop 2005-03-07 09:15:42.000000000 -0500
+@@ -61,7 +61,6 @@
+ Name[vi]=(7) Linh tinh
+ Name[wa]=(7) Totès sôres
+ Name[xh]=(7) Ezixubeneyo
+-Name[xx]=xx(7) Miscellaneousxx
+ Name[zh_CN]=(7) æ‚项
+ Name[zh_TW]=(7) é›œé …
+ Name[zu]=(7) Ingxubevange
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/Manpages/man8.desktop kdebase-branch-3.4/khelpcenter/plugins/Manpages/man8.desktop
+--- kdebase-release-3.4.0/khelpcenter/plugins/Manpages/man8.desktop 2005-02-04 23:15:19.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/Manpages/man8.desktop 2005-03-07 09:15:42.000000000 -0500
+@@ -60,7 +60,6 @@
+ Name[ven]=(8) Ndangulo ya sisitemu
+ Name[vi]=(8) Quản trị hệ thống
+ Name[wa]=(8) Manaedjmint do sistinme
+-Name[xx]=xx(8) Sys. Administrationxx
+ Name[zh_CN]=(8) 系统管ç†
+ Name[zh_TW]=(8) 系統管ç†
+ Name[zu]=(8) Ukugcinwa kwesistimu
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/Manpages/man9.desktop kdebase-branch-3.4/khelpcenter/plugins/Manpages/man9.desktop
+--- kdebase-release-3.4.0/khelpcenter/plugins/Manpages/man9.desktop 2005-02-04 23:15:19.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/Manpages/man9.desktop 2005-03-07 09:15:42.000000000 -0500
+@@ -46,7 +46,6 @@
+ Name[uz]=(9) Кернел
+ Name[vi]=(9) Nhân
+ Name[wa]=(9) Fonccions do nawea linux
+-Name[xx]=xx(9) Kernelxx
+ Name[zh_CN]=(9) å†…æ ¸
+ Name[zh_TW]=(9) æ ¸å¿ƒ
+
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/Manpages/mann.desktop kdebase-branch-3.4/khelpcenter/plugins/Manpages/mann.desktop
+--- kdebase-release-3.4.0/khelpcenter/plugins/Manpages/mann.desktop 2005-02-04 23:15:19.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/Manpages/mann.desktop 2005-03-07 09:15:42.000000000 -0500
+@@ -61,7 +61,6 @@
+ Name[ven]=(n) Tshiswa
+ Name[vi]=(n) Tin tức
+ Name[xh]=(n) Entsha
+-Name[xx]=xx(n) Newxx
+ Name[zh_CN]=(n) 新建
+ Name[zh_TW]=(n) æ–°
+ Name[zu]=(n) Okusha
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/Scrollkeeper/.directory kdebase-branch-3.4/khelpcenter/plugins/Scrollkeeper/.directory
+--- kdebase-release-3.4.0/khelpcenter/plugins/Scrollkeeper/.directory 2004-11-11 22:37:16.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/Scrollkeeper/.directory 2005-03-07 09:15:42.000000000 -0500
+@@ -1,7 +1,6 @@
+ [KDE Desktop Entry]
+ Name=Scrollkeeper
+ Name[bn]=সà§à¦•à§à¦°à§‹à¦²à¦•িপার
+-Name[ca]=Mantenidor de deslliçament
+ Name[da]=Rulleholder
+ Name[eo]=Rulumilo
+ Name[fa]=اسکرول کیپر
+@@ -12,7 +11,6 @@
+ Name[ru]=Хранитель Ñкрана
+ Name[sv]=Panoreringshantering
+ Name[ta]=நகரà¯à®¤à¯à®¤à¯à®¤à®²à¯ˆ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®ªà®µà®©à¯
+-Name[xx]=xxScrollkeeperxx
+ Name[zh_TW]=ScrollKeeper
+ Icon=contents2
+ X-DOC-Weight=-400
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/Tutorials/.directory kdebase-branch-3.4/khelpcenter/plugins/Tutorials/.directory
+--- kdebase-release-3.4.0/khelpcenter/plugins/Tutorials/.directory 2005-02-04 23:15:20.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/Tutorials/.directory 2005-03-07 09:15:42.000000000 -0500
+@@ -66,7 +66,6 @@
+ Name[ven]=Dzikilasi dzau haseledza
+ Name[vi]=Hướng dẫn
+ Name[xh]=Izifundo zokuzikhumbuza
+-Name[xx]=xxTutorialsxx
+ Name[zh_CN]=教程
+ Name[zh_TW]=指å—
+ Name[zu]=izifundo zokubuyekeza
+@@ -136,7 +135,6 @@
+ Comment[ven]=Kilasi yau haseledza na mathomo a manwalwa
+ Comment[vi]=Hướng dẫn và giới thiệu các tà i liệụ
+ Comment[xh]=Isifundo sokuzikhumbuza kunye nesiqalo samaxwebhu.
+-Comment[xx]=xxTutorial and introduction documents.xx
+ Comment[zh_CN]=æ•™ç¨‹å’Œä»‹ç»æ€§æ–‡æ¡£ã€‚
+ Comment[zh_TW]=指導和介紹性文件。
+ Comment[zu]=Ushicilelo lweziqalo kanye nezifundo zokubuyekeza
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/Tutorials/quickstart.desktop kdebase-branch-3.4/khelpcenter/plugins/Tutorials/quickstart.desktop
+--- kdebase-release-3.4.0/khelpcenter/plugins/Tutorials/quickstart.desktop 2005-02-10 23:52:06.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/Tutorials/quickstart.desktop 2005-03-07 09:15:43.000000000 -0500
+@@ -66,7 +66,6 @@
+ Name[ven]=Tsumbavhulwo ya mathomele au tavhanya
+ Name[vi]=Hướng dẫn nhanh
+ Name[xh]=Isikhombisi Sesiqalo esikhawulezayo
+-Name[xx]=xxQuickstart Guidexx
+ Name[zh_CN]=é€ŸæˆæŒ‡å—
+ Name[zh_TW]=快速入門指å—
+ Name[zu]=Umbonisi wokuqala ngokushesha
+@@ -122,7 +121,6 @@
+ Comment[tr]=KDE hızlı başlama rehberi.
+ Comment[uk]=ПоÑібник KDE Ð´Ð»Ñ ÑˆÐ²Ð¸Ð´ÐºÐ¾Ð³Ð¾ Ñтарту.
+ Comment[uz]=Ўрганувчилар учун KDE бўйича йўлкўрÑатгич.
+-Comment[xx]=xxKDE quickstart guide.xx
+ Comment[zh_CN]=KDE é€ŸæˆæŒ‡å—。
+ Icon=helpdoc
+ DocPath=help:/khelpcenter/quickstart/index.html
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/Tutorials/visualdict.desktop kdebase-branch-3.4/khelpcenter/plugins/Tutorials/visualdict.desktop
+--- kdebase-release-3.4.0/khelpcenter/plugins/Tutorials/visualdict.desktop 2005-02-04 23:15:20.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/Tutorials/visualdict.desktop 2005-03-07 09:15:43.000000000 -0500
+@@ -63,7 +63,6 @@
+ Name[ven]=Tsumbavhulwo ya zwauvhona ya KDE
+ Name[vi]=Trình hướng dẫn kiểu visual cho KDE
+ Name[xh]=Isikhombisi esibonakalayo se KDE
+-Name[xx]=xxA Visual Guide to KDExx
+ Name[zh_CN]=KDE å¯è§†åŒ–指å—
+ Name[zh_TW]=KDE 視覺指å—
+ Name[zu]=Umbonisi obonakalayo oya kwi-KDE
+@@ -130,7 +129,6 @@
+ Comment[ven]=Tsumbavhulwo ya widget ya KDE
+ Comment[vi]=Hướng dẫn cho KDE widgets
+ Comment[xh]=Isikhombisi esiya kwi KDE widgets
+-Comment[xx]=xxGuide to KDE widgetsxx
+ Comment[zh_CN]=KDE 部件指å—
+ Comment[zh_TW]=KDE 視窗元件 (widget) 指å—
+ Comment[zu]=Umbonisi oya kuma-widget e-KDE
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/applets.desktop kdebase-branch-3.4/khelpcenter/plugins/applets.desktop
+--- kdebase-release-3.4.0/khelpcenter/plugins/applets.desktop 2005-02-10 23:52:06.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/applets.desktop 2005-03-07 09:15:41.000000000 -0500
+@@ -59,7 +59,6 @@
+ Name[uz]= Ðпплетлар учун қўлланмалар
+ Name[vi]=Hướng dẫn sỠdụng chương trình con (applet)
+ Name[xh]=Applet Zesandla
+-Name[xx]=xxApplet Manualsxx
+ Name[zh_CN]=å°åº”ç”¨ç¨‹åºæ‰‹å†Œ
+ Name[zh_TW]=颿¿ç¨‹å¼æ‰‹å†Š
+ Name[zu]=Izincwadi zesandla zama-Applet
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/contact.desktop kdebase-branch-3.4/khelpcenter/plugins/contact.desktop
+--- kdebase-release-3.4.0/khelpcenter/plugins/contact.desktop 2005-02-04 23:15:18.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/contact.desktop 2005-03-26 02:37:43.000000000 -0500
+@@ -7,6 +7,7 @@
+ Name[be]=ÐšÐ°Ð½Ñ‚Ð°ÐºÑ‚Ð½Ð°Ñ Ñ–Ð½Ñ„Ð°Ñ€Ð¼Ð°Ñ†Ñ‹Ñ
+ Name[bg]=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° връзка
+ Name[bn]=যোগাযোগ তথà§à¦¯
++Name[br]=Titouroù diwar-benn an darempred
+ Name[bs]=Kontakt informacije
+ Name[ca]=Informació de contacte
+ Name[cs]=Kontaktnà informace
+@@ -62,7 +63,6 @@
+ Name[ven]=Mafhungo nga vhudalo
+ Name[vi]=Thông tin tiếp xúc
+ Name[xh]=Qhagamshelana Nolwazi
+-Name[xx]=xxContact Informationxx
+ Name[zh_CN]=è”系信æ¯
+ Name[zh_TW]=è¯çµ¡è³‡è¨Š
+ Name[zu]=Ulwazi lwabangathinteka
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/faq.desktop kdebase-branch-3.4/khelpcenter/plugins/faq.desktop
+--- kdebase-release-3.4.0/khelpcenter/plugins/faq.desktop 2005-02-10 23:52:06.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/faq.desktop 2005-03-07 09:15:41.000000000 -0500
+@@ -58,7 +58,6 @@
+ Name[uz]=KDE ТСС
+ Name[vi]=Các câu há»i hay gặp cá»§a KDE
+ Name[xh]=KDE FAQ
+-Name[xx]=xxThe KDE FAQxx
+ Name[zh_CN]=KDE FAQ
+ Name[zh_TW]=KDE 常見å•題
+ Name[zu]=I-FAQ ye-KDE
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/info.desktop kdebase-branch-3.4/khelpcenter/plugins/info.desktop
+--- kdebase-release-3.4.0/khelpcenter/plugins/info.desktop 2005-02-23 00:05:43.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/info.desktop 2005-03-30 01:47:48.000000000 -0500
+@@ -3,12 +3,14 @@
+ Name=Browse Info Pages
+ Name[bg]=Преглед на Ñтраниците Info
+ Name[bn]=ইনফো পেজ বà§à¦°à¦¾à¦‰à¦œ করà§à¦¨
++Name[br]=Furchal ar pajennoù titouroù
+ Name[bs]=Pregled info stranica
+ Name[ca]=Fulleja les pà gines Info
+ Name[cs]=ProhlÞeÄ info stránek
+ Name[cy]=Pori Tudalennau Info
+ Name[da]=Gennemse infosider
+ Name[de]=Infoseiten durchsehen
++Name[el]=ΠεÏιήγηση στις σελίδες info
+ Name[eo]=Rigardu info-paÄojn
+ Name[es]=Navegar por páginas info
+ Name[et]=Infolehekülgede lehitsemine
+@@ -31,7 +33,7 @@
+ Name[nl]=Info-pagina's doorbladeren
+ Name[nn]=Les info-sider
+ Name[pa]=ਜਾਣਕਾਰੀ ਸਫੇ à¨à¨²à¨•
+-Name[pl]=PrzeglÄ…daj stron informacyjnych
++Name[pl]=PrzeglÄ…danie stron informacyjnych
+ Name[pt]=Navegar nas Páginas Info
+ Name[pt_BR]=Navegar nas Páginas Info
+ Name[ro]=Pagini info
+@@ -40,13 +42,12 @@
+ Name[sk]=Prehliadanie info stránok
+ Name[sl]=Brskanje po straneh info
+ Name[sr]=Прегледање инфо Ñтраница
+-Name[sr@Latn]=Прегледање инфо Ñтраница
++Name[sr@Latn]=Pregledanje info stranica
+ Name[sv]=Bläddra i info-sidor
+ Name[ta]=தகவல௠பகà¯à®•à®™à¯à®•ளில௠உலாவவà¯à®®à¯
+ Name[tr]=Bilgi Sayfarlarını Tara
+ Name[uk]=ÐÐ°Ð²Ñ–Ð³Ð°Ñ†Ñ–Ñ Ñторінок info
+ Name[uz]=Info варақларни кўриш
+-Name[xx]=xxBrowse Info Pagesxx
+ Name[zh_CN]=æµè§ˆä¿¡æ¯é¡µé¢
+ Icon=contents2
+
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/kcontrolmodules.desktop kdebase-branch-3.4/khelpcenter/plugins/kcontrolmodules.desktop
+--- kdebase-release-3.4.0/khelpcenter/plugins/kcontrolmodules.desktop 2005-02-04 23:15:18.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/kcontrolmodules.desktop 2005-03-26 02:37:43.000000000 -0500
+@@ -22,7 +22,7 @@
+ Name[fa]=بخش‌های مرکز کنترل
+ Name[fi]=Ohjauskeskuksen moduulit
+ Name[fr]=Modules du centre de configuration
+-Name[fy]=Ynstellingsintrummodules
++Name[fy]=Konfiguraasjemodules
+ Name[ga]=Modúil an Lárionad Rialaithe
+ Name[gl]=Módulos do Centro de Control
+ Name[he]=מודולי מרכז הבקרה
+@@ -64,7 +64,6 @@
+ Name[vi]=Trung tâm Ä‘iá»u khiển module
+ Name[wa]=Modules do cinte di contrôle di KDE
+ Name[xh]=Izicatshulwa Zolawulo Ezisembindini
+-Name[xx]=xxControl Center Modulesxx
+ Name[zh_CN]=控制ä¸å¿ƒæ¨¡å—
+ Name[zh_TW]=控制ä¸å¿ƒæ¨¡çµ„
+ Name[zu]=Izingxenye ze-Control Center
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/kicmodules.desktop kdebase-branch-3.4/khelpcenter/plugins/kicmodules.desktop
+--- kdebase-release-3.4.0/khelpcenter/plugins/kicmodules.desktop 2005-02-10 23:52:06.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/kicmodules.desktop 2005-03-07 09:15:41.000000000 -0500
+@@ -61,7 +61,6 @@
+ Name[uz]=KInfoCenter модуллари
+ Name[ven]=Modulu ya senthara ya mafhungo a K
+ Name[xh]=Izicatshulwa ze KInfoCenter
+-Name[xx]=xxKInfoCenter Modulesxx
+ Name[zh_CN]=KInfoCenter 模å—
+ Name[zh_TW]=KInfoCenter 模組
+ Name[zu]=Izingxenye ze-KInfoCenter
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/kioslaves.desktop kdebase-branch-3.4/khelpcenter/plugins/kioslaves.desktop
+--- kdebase-release-3.4.0/khelpcenter/plugins/kioslaves.desktop 2005-02-04 23:15:18.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/kioslaves.desktop 2005-03-07 09:15:41.000000000 -0500
+@@ -23,7 +23,6 @@
+ Name[sv]=I/O-slavar
+ Name[tg]=Бандаҳои Kio
+ Name[uk]=Підлеглі В/В
+-Name[xx]=xxKioslavesxx
+ Icon=contents2
+
+ X-DOC-Weight=-400
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/konqplugins.desktop kdebase-branch-3.4/khelpcenter/plugins/konqplugins.desktop
+--- kdebase-release-3.4.0/khelpcenter/plugins/konqplugins.desktop 2005-02-04 23:15:18.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/konqplugins.desktop 2005-03-26 02:37:43.000000000 -0500
+@@ -45,12 +45,12 @@
+ Name[pt]='Plugins' do Konqueror
+ Name[pt_BR]=Plug-Ins do Konqueror
+ Name[ro]=Module Konqueror
+-Name[ru]=Плагины Konqueror
++Name[ru]=Модули Konqueror
+ Name[se]=Konqueror-lassemoduvllat
+ Name[sk]=Moduly pre Konqueror
+ Name[sl]=Vstavki za Konqueror
+ Name[sr]=Konqueror-ови прикључци
+-Name[sr@Latn]=Konqueror-ovi dodaci
++Name[sr@Latn]=Konqueror-ovi prikljuÄci
+ Name[sv]=Konqueror-insticksprogram
+ Name[ta]=கானà¯à®•ொரர௠செரà¯à®•௠சாதனஙà¯à®•ளà¯
+ Name[tg]=МутаÑÑалкунандаҳои Konqueror
+@@ -60,7 +60,6 @@
+ Name[uz]=Konqueror плагинлари
+ Name[wa]=Tchôke-divins po Konqueror
+ Name[xh]=Iplagi zangaphakathi ze Konqueror
+-Name[xx]=xxKonqueror Pluginsxx
+ Name[zh_CN]=Konqueror æ’ä»¶
+ Name[zh_TW]=Konqueror 外掛程å¼
+ Name[zu]=Ama-Plugin e-Konqueror
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/links.desktop kdebase-branch-3.4/khelpcenter/plugins/links.desktop
+--- kdebase-release-3.4.0/khelpcenter/plugins/links.desktop 2005-02-18 23:27:06.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/links.desktop 2005-03-30 01:47:48.000000000 -0500
+@@ -12,6 +12,7 @@
+ Name[cy]=KDE ar y We
+ Name[da]=KDE på nettet
+ Name[de]=KDE im Web
++Name[el]=Το KDE στο διαδίκτυο
+ Name[eo]=KDE en TTT
+ Name[es]=KDE en la web
+ Name[et]=KDE veebis
+@@ -42,13 +43,12 @@
+ Name[sk]=KDE na WWW
+ Name[sl]=KDE na spletu
+ Name[sr]=KDE на вебу
+-Name[sr@Latn]=KDE на вебу
++Name[sr@Latn]=KDE na vebu
+ Name[sv]=KDE på Internet
+ Name[ta]=வலையதà¯à®¤à®¿à®²à¯ கேடியி
+ Name[tr]=Web'de KDE
+ Name[uk]=KDE в Тенетах
+ Name[uz]=KDE веб-Ñаҳифалари
+-Name[xx]=xxKDE on the Webxx
+ Name[zh_CN]=网上 KDE
+
+ X-DOC-Weight=4000
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/support.desktop kdebase-branch-3.4/khelpcenter/plugins/support.desktop
+--- kdebase-release-3.4.0/khelpcenter/plugins/support.desktop 2005-02-14 23:44:18.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/support.desktop 2005-03-07 09:15:41.000000000 -0500
+@@ -63,7 +63,6 @@
+ Name[ven]=U tikedza KDE
+ Name[vi]=Hỗ trợ KDE
+ Name[xh]=Ixhasa i KDE
+-Name[xx]=xxSupporting KDExx
+ Name[zh_CN]=æ”¯æŒ KDE
+ Name[zh_TW]=æ”¯æ´ KDE
+ Name[zu]=Ixhasa i-KDE
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/userguide.desktop kdebase-branch-3.4/khelpcenter/plugins/userguide.desktop
+--- kdebase-release-3.4.0/khelpcenter/plugins/userguide.desktop 2005-02-18 23:27:06.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/userguide.desktop 2005-03-30 01:47:48.000000000 -0500
+@@ -10,6 +10,7 @@
+ Name[cy]=Llawlyfr Defnyddwyr KDE
+ Name[da]=KDE-brugervejledning
+ Name[de]=KDE-Benutzerhandbuch
++Name[el]=ΕγχειÏίδιο χÏήστη του KDE
+ Name[eo]=KDE-uzantula manlibro
+ Name[es]=Manual del usuario de KDE
+ Name[et]=KDE kasutaja käsiraamat
+@@ -41,13 +42,12 @@
+ Name[sk]=PoužÃvateľský manuál KDE
+ Name[sl]=UporabniÅ¡ki priroÄnik KDE
+ Name[sr]=KDE-ово упутÑтво за кориÑнике
+-Name[sr@Latn]=KDE-ово упутÑтво за кориÑнике
++Name[sr@Latn]=KDE-ovo uputstvo za korisnike
+ Name[sv]=KDE:s användarhandbok
+ Name[ta]=KDE பயனரà¯à®•ளின௠கையேடà¯
+ Name[tr]=KDE Kullanıcı Klavuzu
+ Name[uk]=Підручник кориÑтувача KDE
+ Name[uz]=KDE учун қўлланма
+-Name[xx]=xxKDE Users' Manualxx
+ Name[zh_CN]=KDE 用户手册
+
+ X-DOC-Weight=-2000
+diff -Nru kdebase-release-3.4.0/khelpcenter/plugins/welcome.desktop kdebase-branch-3.4/khelpcenter/plugins/welcome.desktop
+--- kdebase-release-3.4.0/khelpcenter/plugins/welcome.desktop 2005-02-04 23:15:18.000000000 -0500
++++ kdebase-branch-3.4/khelpcenter/plugins/welcome.desktop 2005-03-07 09:15:41.000000000 -0500
+@@ -64,7 +64,6 @@
+ Name[vi]=Má»i bạn đến vá»›i KDE
+ Name[wa]=Bénvnowe dins KDE
+ Name[xh]=Wamkelekile kwi KDE
+-Name[xx]=xxWelcome to KDExx
+ Name[zh_CN]=欢迎使用 KDE
+ Name[zh_TW]=æ¡è¿Žä½¿ç”¨ KDE
+ Name[zu]=Wamukulekile kwi-KDE
+diff -Nru kdebase-release-3.4.0/khotkeys/app/khotkeys.desktop kdebase-branch-3.4/khotkeys/app/khotkeys.desktop
+--- kdebase-release-3.4.0/khotkeys/app/khotkeys.desktop 2005-02-10 23:52:06.000000000 -0500
++++ kdebase-branch-3.4/khotkeys/app/khotkeys.desktop 2005-03-07 09:15:44.000000000 -0500
+@@ -25,7 +25,6 @@
+ Name[sv]=Khotkeys
+ Name[ta]=Kஹாடà¯à®•ீஸà¯
+ Name[uk]=Швидкі клавіші KDE
+-Name[xx]=xxKHotKeysxx
+ Name[zh_TW]=KDE 熱éµ
+ Type=Service
+ ServiceTypes=KDEDModule
+diff -Nru kdebase-release-3.4.0/khotkeys/kcontrol/khotkeys.desktop kdebase-branch-3.4/khotkeys/kcontrol/khotkeys.desktop
+--- kdebase-release-3.4.0/khotkeys/kcontrol/khotkeys.desktop 2005-02-18 23:27:07.000000000 -0500
++++ kdebase-branch-3.4/khotkeys/kcontrol/khotkeys.desktop 2005-03-07 09:15:44.000000000 -0500
+@@ -32,7 +32,6 @@
+ Name[sv]=Khotkeys
+ Name[ta]=Kஹாடà¯à®•ீஸà¯
+ Name[uk]=Швидкі клавіші KDE
+-Name[xx]=xxKHotKeysxx
+ Name[zh_TW]=KDE 熱éµ
+
+ Comment=Configure Hotkey settings
+@@ -76,12 +75,11 @@
+ Comment[sk]=Nastavenia klávesových skratiek
+ Comment[sl]=Nastavitve vroÄih tipk
+ Comment[sr]=Подешавање поÑтавки пречица
+-Comment[sr@Latn]=Подешавање поÑтавки пречица
++Comment[sr@Latn]=PodeÅ¡avanje postavki preÄica
+ Comment[sv]=Anpassa Hotkey-inställningar
+ Comment[ta]=ÃÕìÌÅ¢¨º ǬÃôÒ¸¨Ç ¯ûǨÃ
+ Comment[tr]=Kısayol ayarlarını yapılandır
+ Comment[uk]=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÑˆÐ²Ð¸Ð´ÐºÐ¸Ñ… клавіш
+-Comment[xx]=xxConfigure Hotkey settingsxx
+ Comment[zh_CN]=é…ç½®çƒé”®è®¾ç½®
+
+ Keywords=Keys,Global key bindings,Key bindings,Gestures,Mouse gestures
+@@ -123,13 +121,12 @@
+ Keywords[sk]=Klávesy,Globálne klávesové skratky,schéma kláves,klávesové skratky,gestá,gestá myšou
+ Keywords[sl]=tipke,globalne vezi tipk,vezi tipk,tipkovne vezi,gibi,miškini gibi
+ Keywords[sr]=Keys,Global key bindings,Key scheme,Key bindings,shortcuts,application shortcuts,таÑтери,глобални таÑтери,пречица,шема таÑтера,пречице,програмÑке пречице
+-Keywords[sr@Latn]=Keys,Global key bindings,Key scheme,Key bindings,shortcuts,application shortcuts,таÑтери,глобални таÑтери,пречица,шема таÑтера,пречице,програмÑке пречице
++Keywords[sr@Latn]=Keys,Global key bindings,Key scheme,Key bindings,shortcuts,application shortcuts,tasteri,globalni tasteri,preÄica,Å¡ema tastera,preÄice,programske preÄice
+ Keywords[sv]=tangenter,globala tangentbindningar,tangentbindningar,gester,musgester
+ Keywords[ta]=விசைகளà¯,உலகலாவிய விசை பிணைபà¯à®ªà¯à®•ளà¯,விசை திடà¯à®Ÿà®®à¯,விசை பிணைபà¯à®ªà¯à®•ளà¯,கà¯à®±à¯à®•à¯à®•à¯à®µà®´à®¿à®•ளà¯,பயனà¯à®ªà®¾à®Ÿà¯à®Ÿà¯à®•௠கà¯à®±à¯à®•à¯à®•à¯à®µà®´à®¿à®•ளà¯
+ Keywords[tr]=Tuşlar,Küresel tuş bağlantıları,Tuş bağlantıları,Kısayollar,Uygulama kısayolları,Fare hareketleri
+ Keywords[uk]=клавіші,глобальні прив'Ñзки клавіш,Ñхема клавіш,прив'Ñзка клавіш, жеÑти, жеÑти мишки
+ Keywords[uz]=Gestures,Mouse gestures,Тугмалар,Умумий тугмалар бирикмаÑи,Тугмалар бирикмаÑи
+-Keywords[xx]=xxKeys,Global key bindings,Key bindings,Gestures,Mouse gesturesxx
+ Keywords[zh_CN]=Keys,Global key bindings,Key bindings,Gestures,Mouse gestures,é”®,全局键绑定,手势,é¼ æ ‡æ‰‹åŠ¿
+
+ Categories=Qt;KDE;X-KDE-settings-accessibility;
+diff -Nru kdebase-release-3.4.0/khotkeys/kcontrol/menuedit.cpp kdebase-branch-3.4/khotkeys/kcontrol/menuedit.cpp
+--- kdebase-release-3.4.0/khotkeys/kcontrol/menuedit.cpp 2005-01-28 06:20:53.000000000 -0500
++++ kdebase-branch-3.4/khotkeys/kcontrol/menuedit.cpp 2005-03-31 07:42:51.000000000 -0500
+@@ -303,6 +303,7 @@
+ return "";
+ }
+ entry->reparent( khotkeys_get_menu_root( settings.actions ));
++ settings.daemon_disabled = false; // #91782
+ settings.write_settings();
+ khotkeys_send_reread_config();
+ return shortcut;
+diff -Nru kdebase-release-3.4.0/kicker/applets/clock/clock.cpp kdebase-branch-3.4/kicker/applets/clock/clock.cpp
+--- kdebase-release-3.4.0/kicker/applets/clock/clock.cpp 2005-02-21 00:55:05.000000000 -0500
++++ kdebase-branch-3.4/kicker/applets/clock/clock.cpp 2005-03-04 14:05:45.000000000 -0500
+@@ -929,6 +929,11 @@
+
+ int ClockApplet::widthForHeight(int h) const
+ {
++ if (orientation() == Qt::Vertical)
++ {
++ return width();
++ }
++
+ int shareDateHeight = 0, shareDayOfWeekHeight = 0;
+ bool dateToSide = false;
+ bool mustShowDate = showDate || (zone->zoneIndex() != 0);
+@@ -953,16 +958,15 @@
+ _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter);
+ }
+
+- static int lastWidth = -1;
+ int clockWidth = _clock->preferedWidthForHeight(KMAX(0, h - shareDateHeight - shareDayOfWeekHeight));
+ int w = clockWidth;
+ if (!mustShowDate && !showDayOfWeek)
+ {
+- if (lastWidth == w)
+- {
+- return w;
+- }
++ // resize the date widgets in case the are to the left of the clock
+ _clock->widget()->setFixedSize(w, h);
++ _clock->widget()->move(0,0);
++ _dayOfWeek->move(clockWidth + 4, 0);
++ _date->move(clockWidth + 4, 0);
+ }
+ else
+ {
+@@ -972,12 +976,6 @@
+ if (dateToSide)
+ {
+ w += dateWidth + dayOfWeekWidth;
+-
+- if (lastWidth == w)
+- {
+- return w;
+- }
+-
+ bool dateFirst = false;
+
+ if (mustShowDate)
+@@ -1005,6 +1003,8 @@
+ else
+ {
+ _clock->widget()->setFixedSize(clockWidth, h);
++ _clock->widget()->move(0,0);
++
+ if (showDayOfWeek)
+ {
+ _dayOfWeek->setFixedSize(dayOfWeekWidth, h);
+@@ -1022,11 +1022,6 @@
+ {
+ w = KMAX(KMAX(w, dateWidth), dayOfWeekWidth);
+
+- if (lastWidth == w)
+- {
+- return w;
+- }
+-
+ _clock->widget()->setFixedSize(w, h - shareDateHeight - shareDayOfWeekHeight);
+ _clock->widget()->setMinimumSize(w, h - shareDateHeight - shareDayOfWeekHeight);
+ if (showDayOfWeek)
+@@ -1048,6 +1043,11 @@
+
+ int ClockApplet::heightForWidth(int w) const
+ {
++ if (orientation() == Qt::Horizontal)
++ {
++ return height();
++ }
++
+ int clockHeight = _clock->preferedHeightForWidth(w);
+ bool mustShowDate = showDate || (zone->zoneIndex() != 0);
+
+@@ -1536,11 +1536,11 @@
+ void ClockApplet::showZone(int z)
+ {
+ zone->setZone(z);
++ zone->writeSettings();
+ TZoffset = zone->calc_TZ_offset( zone->zone() );
+- updateDateLabel();
++ _clock->updateClock();
+ _clock->forceUpdate(); /* force repaint */
+- slotUpdate();
+- zone->writeSettings();
++ updateDateLabel();
+ }
+
+ void ClockApplet::nextZone()
+@@ -1575,16 +1575,9 @@
+
+ void ClockApplet::wheelEvent(QWheelEvent* e)
+ {
+- if (_clock->showDate() || zone->zoneIndex())
+- {
+- // delay the updating so it isn't so hurky-jurky
+- // when scrolling through the applet.
+- m_layoutDelay = 500;
+- }
+- else
+- {
+- m_layoutDelay = 0;
+- }
++ // delay the updating so it isn't so hurky-jurky
++ // when scrolling through the applet.
++ m_layoutDelay = 300;
+
+ if (e->delta() < 0)
+ {
+@@ -1622,7 +1615,7 @@
+ _lastDate = clockGetDate();
+ _dayOfWeek->setText(KGlobal::locale()->calendar()->weekDayName(_lastDate));
+
+- if (zone->zoneIndex())
++ if (zone->zoneIndex() != 0)
+ {
+ QString zone_s = i18n(zone->zone().utf8());
+ _date->setText(zone_s.mid(zone_s.find('/') + 1).replace("_", " "));
+@@ -1647,12 +1640,40 @@
+ }
+ }
+
+-
+ void ClockApplet::fixupLayout()
+ {
+ m_layoutDelay = 0;
+- _date->adjustSize();
+- _dayOfWeek->adjustSize();
++
++ // ensure we have the right widget line up in horizontal mode
++ // when we are showing date beside the clock
++ // this fixes problems triggered by having the date first
++ // because of the date format (e.g. YY/MM/DD) and then hiding
++ // the date
++ if (orientation() == Qt::Horizontal && height() < 32)
++ {
++ bool showDate = showDate || (zone->zoneIndex() != 0);
++
++ if (!showDate && !showDayOfWeek)
++ {
++ _clock->widget()->move(0,0);
++ }
++
++ int dayWidth = 0;
++ if (!showDayOfWeek)
++ {
++ _dayOfWeek->move(_clock->widget()->width() + 4, 0);
++ }
++ else
++ {
++ dayWidth = _dayOfWeek->width();
++ }
++
++ if (!showDate)
++ {
++ _date->move(_clock->widget()->width() + dayWidth + 4, 0);
++ }
++ }
++
+ emit updateLayout();
+ }
+
+diff -Nru kdebase-release-3.4.0/kicker/applets/clock/clockapplet.desktop kdebase-branch-3.4/kicker/applets/clock/clockapplet.desktop
+--- kdebase-release-3.4.0/kicker/applets/clock/clockapplet.desktop 2005-02-04 23:15:21.000000000 -0500
++++ kdebase-branch-3.4/kicker/applets/clock/clockapplet.desktop 2005-03-07 09:15:44.000000000 -0500
+@@ -71,7 +71,6 @@
+ Name[vi]=Äồng hồ
+ Name[wa]=Ôrlodje
+ Name[xh]=Ikloko
+-Name[xx]=xxClockxx
+ Name[zh_CN]=æ—¶é’Ÿ
+ Name[zh_TW]=時é˜
+ Name[zu]=Iwashi
+@@ -142,7 +141,6 @@
+ Comment[vi]=Khung cho đồng hồ bình thưá»ng và đồng hồ Ä‘iện tá»
+ Comment[wa]=Ene aplikete ôrlodje.
+ Comment[xh]=Ikloko ye window eneenkcukacha ye applet enamanani nengenamanani.
+-Comment[xx]=xxA analog and digital clock panel applet.xx
+ Comment[zh_CN]=æ¨¡æ‹Ÿå’Œæ•°å—æ—¶é’Ÿé¢æ¿å°ç¨‹åºã€‚
+ Comment[zh_TW]=一個å°çš„æ¨¡æ“¬æˆ–æ•¸å—æ™‚é˜é¢æ¿ç¨‹å¼ã€‚
+ Comment[zu]=I-applet yewindi lemininingwane yewashi eliqhubekayo noma elezinombolo.
+diff -Nru kdebase-release-3.4.0/kicker/applets/launcher/quicklauncher.cpp kdebase-branch-3.4/kicker/applets/launcher/quicklauncher.cpp
+--- kdebase-release-3.4.0/kicker/applets/launcher/quicklauncher.cpp 2004-11-21 09:58:52.000000000 -0500
++++ kdebase-branch-3.4/kicker/applets/launcher/quicklauncher.cpp 2005-04-01 02:31:19.000000000 -0500
+@@ -376,14 +376,15 @@
+ if (kurlList.size()<=0) {
+ e->accept(false); return;
+ }
+- QStringList urlList=kurlList.toStringList();
+ _dragButtons=new ButtonGroup;
+ _oldButtons=new ButtonGroup(*_buttons);
+
+- QStringList::const_iterator iter=urlList.begin();
++
+ QString url;
+- while (iter!=urlList.end()) {
+- url=QuickURL(*iter).url();
++ KURL::List::ConstIterator it = kurlList.begin();
++ for ( ; it != kurlList.end(); ++it ) {
++ const KURL &tmpUrl( *it );
++ url = tmpUrl.path();
+ DEBUGSTR << " Drag Object='"<<url<<"'"<<endl<<flush;
+ int pos=_buttons->findDescriptor(url);
+ if (pos!=NotFound) {
+@@ -393,7 +394,6 @@
+ // otherwise, create a new one
+ _dragButtons->push_back(new QuickButton(url,this));
+ }
+- ++iter;
+ }
+ if (_dragButtons->size()>0) {
+ //make sure we can drag at least one button.
+diff -Nru kdebase-release-3.4.0/kicker/applets/launcher/quicklauncher.desktop kdebase-branch-3.4/kicker/applets/launcher/quicklauncher.desktop
+--- kdebase-release-3.4.0/kicker/applets/launcher/quicklauncher.desktop 2005-02-10 23:52:07.000000000 -0500
++++ kdebase-branch-3.4/kicker/applets/launcher/quicklauncher.desktop 2005-03-07 09:15:45.000000000 -0500
+@@ -66,7 +66,6 @@
+ Name[uz]=Тез ишга туширгич
+ Name[ven]=Tavhanya
+ Name[vi]=Trình khởi động nhanh
+-Name[xx]=xxQuick Launcherxx
+ Name[zh_CN]=快速å¯åЍ
+ Name[zh_TW]=快速起動
+ Name[zu]=Umqalisi osheshayo
+@@ -134,7 +133,6 @@
+ Comment[uz]=Тез ишга туширгич апплети
+ Comment[vi]=Trình giúp khởi động nhanh các applet
+ Comment[xh]=I applet ye quick launcher
+-Comment[xx]=xxThe quick launcher appletxx
+ Comment[zh_CN]=快速å¯åЍå°ç¨‹åº
+ Comment[zh_TW]=快速起動 颿¿ç¨‹å¼
+ Comment[zu]=I-applet yomqalisi osheshayo
+diff -Nru kdebase-release-3.4.0/kicker/applets/lockout/lockout.desktop kdebase-branch-3.4/kicker/applets/lockout/lockout.desktop
+--- kdebase-release-3.4.0/kicker/applets/lockout/lockout.desktop 2005-02-23 00:05:44.000000000 -0500
++++ kdebase-branch-3.4/kicker/applets/lockout/lockout.desktop 2005-03-07 09:15:45.000000000 -0500
+@@ -62,7 +62,6 @@
+ Name[uz]=Қулфлаш/чиқиш апплети
+ Name[ven]=Khiela/Tsima
+ Name[xh]=Tshixa/Uphumo ngaphandle lwe Applet
+-Name[xx]=xxLock/Logout Appletxx
+ Name[zh_CN]=é”定/注销å°ç¨‹åº
+ Name[zh_TW]=「螢幕鎖定/登出ã€é¢æ¿ç¨‹å¼
+ Name[zu]=I-applet yokukhiya/ukuphumela ngaphandle
+@@ -127,7 +126,6 @@
+ Comment[ven]=Khiela/bathene dzau litsha dza phanele
+ Comment[vi]=Nút Lock/Logout cho khung
+ Comment[xh]=Tshixa/Amaqhosa ophumo ngaphandle lwe window eneenkcukacha
+-Comment[xx]=xxLock/Logout buttons for the panelxx
+ Comment[zh_CN]=颿¿çš„é”定/注销按钮
+ Comment[zh_TW]=åœ¨é¢æ¿ä¸Šé¡¯ç¤ºã€Œèž¢å¹•鎖定/ç™»å‡ºã€æŒ‰éˆ•
+ Comment[zu]=Izinkinobho Zokukhiya/Ukuphumela ngaphandle zewindi lemininingwane
+diff -Nru kdebase-release-3.4.0/kicker/applets/media/mediaapplet.desktop kdebase-branch-3.4/kicker/applets/media/mediaapplet.desktop
+--- kdebase-release-3.4.0/kicker/applets/media/mediaapplet.desktop 2005-02-23 00:05:44.000000000 -0500
++++ kdebase-branch-3.4/kicker/applets/media/mediaapplet.desktop 2005-03-30 01:47:49.000000000 -0500
+@@ -4,12 +4,15 @@
+ Comment=A panel applet that displays your storage media
+ Comment[bg]=Ðплет за показване на ÑъхранÑващите уÑтройÑтва
+ Comment[bn]=à¦à¦•টি পà§à¦¯à¦¾à¦¨à§‡à¦² অà§à¦¯à¦¾à¦ªà¦²à§‡à¦Ÿ যা আপনার সà§à¦Ÿà§‹à¦°à§‡à¦œ মিডিয়া দেখায়
++Comment[bs]=Panel applet koji prikazuje vaše uređaje
+ Comment[ca]=Un aplet del plafó que mostra els suports d'emmagatzematge
+ Comment[cs]=Applet panelu zobrazujÃcà zaÅ™ÃzenÃ
+ Comment[da]=En panel-applet der viser dine opbevaringsmedier
+ Comment[de]=Kontrollleistenprogramm, das Ihre Speichermedien anzeigt
++Comment[el]=Ένα εφαÏμογίδιο πίνακα που εμφανίζει τις συσκευÎÏ‚ αποθήκευσής σας
+ Comment[es]=Un applet del panel que muestra sus dispositivos de almacenamiento
+ Comment[et]=Paneeliaplett, mis näitab olemasolevaid andmekandjaid
++Comment[eu]=Zure almezenamendu gailuak erakusten dituen panel appleta
+ Comment[fi]=Tallennuslaitteet näyttävä paneelisovelma
+ Comment[fr]=Une applet qui affiche vos supports de stockage
+ Comment[fy]=In panielapplet dat dyn opslachapparaten lit sjen
+@@ -18,6 +21,7 @@
+ Comment[hu]=Kisalkalmazás a tárolóeszközök kiÃrásához
+ Comment[is]=Spjaldforrit sem birtir geymslumiðlana þÃna
+ Comment[it]=Una applet del pannello che mostra i tuoi dispositivi di archiviazione
++Comment[ja]=記憶メディアを表示ã™ã‚‹ãƒ‘ãƒãƒ«ã‚¢ãƒ—レット
+ Comment[lt]=Pulto įskiepis, rodantis Jūsų informacijos saugojimo įrenginius
+ Comment[nb]=Et panelprogram som viser lagringsenheter
+ Comment[nl]=Een paneelapplet dat uw opslagapparaten toont
+@@ -27,25 +31,28 @@
+ Comment[pt]=Uma 'applet' do painel que mostra os seus dispositivos de armazenamento
+ Comment[pt_BR]=Um mini-aplicativo de painel que exibe as suas mÃdias
+ Comment[ru]=Ðплет панели, отображающий ваши уÑтройÑтва
++Comment[sk]=Applet panelu, ktorý zobrazuje vaše diskové zariadenia
+ Comment[sl]=Pultni vstavek, ki prikazuje medije za shranjevanje
+ Comment[sr]=ПанелÑки аплет који приказује ваше Ñкладишне медијуме
+-Comment[sr@Latn]=ПанелÑки аплет који приказује ваше Ñкладишне медијуме
++Comment[sr@Latn]=Panelski aplet koji prikazuje vaše skladišne medijume
+ Comment[sv]=Ett miniprogram för panelen som visar lagringsmedia
+ Comment[ta]=உஙà¯à®•ள௠சேகரிபà¯à®ªà¯ ஊடகதà¯à®¤à¯ˆ திரையில௠காடà¯à®Ÿà¯à®®à¯ ஒர௠பலக கà¯à®±à¯à®¨à®¿à®°à®²à¯
+ Comment[tr]=Depolama ortamının görüntülendiği bir panel programcığı
+ Comment[uk]=Ðплет панелі, що відображує ваші приÑтрої Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ—
+-Comment[xx]=xxA panel applet that displays your storage mediaxx
+ Comment[zh_CN]=显示您å˜å‚¨ä»‹è´¨çš„颿¿å°ç¨‹åº
+ Name=Storage Media
+ Name[bg]=СъхранÑващи уÑтройÑтва
+ Name[bn]=সà§à¦Ÿà§‹à¦°à§‡à¦œ মিডিয়া
++Name[bs]=Uređaji za smještaj podataka
+ Name[ca]=Suports d'emmagatzematge
+ Name[cs]=Úložná zaÅ™ÃzenÃ
+ Name[da]=Opbevaringsmedie
+ Name[de]=Speichermedien
++Name[el]=ΣυσκευÎÏ‚ αποθήκευσης
+ Name[eo]=Konservejo
+ Name[es]=Dispositivos de almacenamiento
+ Name[et]=Andmekandjad
++Name[eu]=Almazenamendua
+ Name[fi]=Tallennusmedia
+ Name[fr]=Support de stockage
+ Name[fy]=Opslachapparaten
+@@ -54,6 +61,7 @@
+ Name[hu]=Tárolóeszköz
+ Name[is]=Geymslumiðill
+ Name[it]=Dispositivi di archiviazione
++Name[ja]=記憶メディア
+ Name[lt]=Informacijos saugojimo įrenginiai
+ Name[nb]=Lagringsenheter
+ Name[nl]=Opslagapparaten
+@@ -63,14 +71,14 @@
+ Name[pt]=Dispositivos de Armazenamento
+ Name[pt_BR]=MÃdia
+ Name[ru]=УÑтройÑтва Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ…
++Name[sk]=Diskové zariadenia
+ Name[sl]=Medij za shranjevanje
+ Name[sr]=Складишни медијуми
+-Name[sr@Latn]=Складишни медијуми
++Name[sr@Latn]=Skladišni medijumi
+ Name[sv]=Lagringsmedia
+ Name[ta]=சேகரிபà¯à®ªà¯ ஊடகமà¯
+ Name[tr]=Depolama Ortamı
+ Name[uk]=ПриÑтрої Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ—
+-Name[xx]=xxStorage Mediaxx
+ Name[zh_CN]=å˜å‚¨ä»‹è´¨
+ Icon=3floppy_unmount
+ X-KDE-Library=media_panelapplet
+diff -Nru kdebase-release-3.4.0/kicker/applets/menu/menuapplet.cpp kdebase-branch-3.4/kicker/applets/menu/menuapplet.cpp
+--- kdebase-release-3.4.0/kicker/applets/menu/menuapplet.cpp 2005-02-24 10:56:13.000000000 -0500
++++ kdebase-branch-3.4/kicker/applets/menu/menuapplet.cpp 2005-03-15 07:00:38.000000000 -0500
+@@ -201,7 +201,7 @@
+ active_menu->show();
+ //if (embed->isDesktopMenu())
+ {
+- active_menu->setMinimumSize( active_menu->width(), height() + topEdgeOffset );
++ active_menu->setMinimumSize( width(), height() + topEdgeOffset );
+ }
+ }
+ emit updateLayout();
+diff -Nru kdebase-release-3.4.0/kicker/applets/menu/menuapplet.desktop kdebase-branch-3.4/kicker/applets/menu/menuapplet.desktop
+--- kdebase-release-3.4.0/kicker/applets/menu/menuapplet.desktop 2005-02-21 23:13:02.000000000 -0500
++++ kdebase-branch-3.4/kicker/applets/menu/menuapplet.desktop 2005-03-07 09:15:46.000000000 -0500
+@@ -47,7 +47,6 @@
+ Name[uk]=Меню
+ Name[uz]=Меню
+ Name[vi]=Thực đơn
+-Name[xx]=xxMenuxx
+ Name[zh_CN]=èœå•
+ Name[zh_TW]=é¸å–®
+ Comment=Applet embedding standalone menubars
+@@ -98,7 +97,6 @@
+ Comment[tr]=Yalnız menü çubuklarını gömen uygulamacıkÂ
+ Comment[uk]=Ðплет вбудовних окремих Ñмужок меню
+ Comment[vi]=Applet thanh thực đơn đứng riêng embedding
+-Comment[xx]=xxApplet embedding standalone menubarsxx
+ Comment[zh_CN]=嵌入独立èœå•æ çš„å°ç¨‹åº
+ Comment[zh_TW]=å–®ç¨ç½®æ–¼é¢æ¿ä¸çš„é¸å–®åˆ—
+
+diff -Nru kdebase-release-3.4.0/kicker/applets/minipager/minipagerapplet.desktop kdebase-branch-3.4/kicker/applets/minipager/minipagerapplet.desktop
+--- kdebase-release-3.4.0/kicker/applets/minipager/minipagerapplet.desktop 2005-02-23 00:05:45.000000000 -0500
++++ kdebase-branch-3.4/kicker/applets/minipager/minipagerapplet.desktop 2005-03-22 12:38:11.000000000 -0500
+@@ -4,12 +4,14 @@
+ Name=Desktop Previewer & Pager
+ Name[bg]=Изглед на екрана и пейджър
+ Name[bn]=ডেসà§à¦•টপ পà§à¦°à¦¾à¦•দরà§à¦¶à¦¨ à¦à¦¬à¦‚ পেজার
++Name[bs]=Preglednik radnih površina
+ Name[ca]=Previsualitzador i paginador de l'escriptori
+ Name[cs]=PÅ™epÃnaÄ a náhled ploch
+ Name[da]=Desktop-forhåndsviser & -pager
+ Name[de]=Umschalten zwischen Arbeitsflächen
+ Name[es]=Paginador con previsualización del escritorio
+ Name[et]=Töölaudade eelvaatlus ja vahetaja
++Name[eu]=Mahaigain aurreikustailua eta bilagailua
+ Name[fi]=Työpöydän esikatselu ja sivutus
+ Name[fr]=Gestionnaire et Aperçu des bureaux
+ Name[fy]=Buroblêdfoarbyld en pager
+@@ -26,14 +28,14 @@
+ Name[pt_BR]=Pager e Pré-visualizador de Ãrea de Trabalho
+ Name[ru]=Переключатель рабочих Ñтолов
+ Name[se]=Čállinbevddiid ovdaÄájeheaddji ja molssodeaddji
++Name[sk]=Náhľad plochy a prepÃnanie
+ Name[sl]=Ogledovalnik namizja in aporoÄilnik
+ Name[sr]=Прегледач и пејџер радних површина
+-Name[sr@Latn]=Прегледач и пејџер радних површина
++Name[sr@Latn]=PregledaÄ i pejdžer radnih povrÅ¡ina
+ Name[sv]=Förhandsgranskning och hantering av skrivbord
+ Name[ta]=மேலà¯à®®à¯‡à®šà¯ˆ à®®à¯à®©à¯à®•ாடà¯à®šà®¿à®¯à®¾à®³à®°à¯ & பேஜரà¯
+ Name[tr]=Masaüstü Önizleyici & Sayfalayıcı
+ Name[uk]=Пейджер та переглÑдач Ð´Ð»Ñ Ñтільниці
+-Name[xx]=xxDesktop Previewer & Pagerxx
+ Name[zh_CN]=桌é¢é¢„览器和页é¢åˆ‡æ¢å™¨
+
+ Comment=A basic desktop switching panel applet
+@@ -100,7 +102,6 @@
+ Comment[ven]=Phanele ya desikithopo
+ Comment[vi]=Desktop cơ bản để chuyển giữa các panel applet
+ Comment[xh]=I applet eneenkcukacha etshintshisa i desktop yoqobo
+-Comment[xx]=xxA basic desktop switching panel appletxx
+ Comment[zh_CN]=åˆ‡æ¢æ¡Œé¢çš„颿¿å°ç¨‹åº
+ Comment[zh_TW]=一個基本的桌é¢åˆ‡æ›é¢æ¿å°ç¨‹å¼
+ Comment[zu]=I-applet yewindi lemininingwane yoqobo yokushintshanisa ama-desktop
+diff -Nru kdebase-release-3.4.0/kicker/applets/naughty/naughtyapplet.desktop kdebase-branch-3.4/kicker/applets/naughty/naughtyapplet.desktop
+--- kdebase-release-3.4.0/kicker/applets/naughty/naughtyapplet.desktop 2005-02-10 23:52:08.000000000 -0500
++++ kdebase-branch-3.4/kicker/applets/naughty/naughtyapplet.desktop 2005-03-07 09:15:47.000000000 -0500
+@@ -58,7 +58,6 @@
+ Name[uk]=Захоплювач процеÑів-дезертирів
+ Name[ven]=TShitenwa tsha Catcher
+ Name[vi]=Bắt tiến trình runaway
+-Name[xx]=xxRunaway Process Catcherxx
+ Name[zh_TW]=å¤±æŽ§ç¨‹å¼æ•æ‰å™¨
+ Name[zu]=Umbambi wenqubo ebalekayo
+ Comment=Runaway process catcher for the KDE panel
+@@ -120,7 +119,6 @@
+ Comment[ven]=Tshitenwa tsha catcher kha phanele ya KDE
+ Comment[vi]=Trình giám sát các tiến trình bị mất cho KDE panel
+ Comment[xh]=Runaway process catcher ye windowe eneenkcukacha ye KDE
+-Comment[xx]=xxRunaway process catcher for the KDE panelxx
+ Comment[zh_TW]=KDE æ•æ‰å¤±æŽ§ç¨‹å¼çš„颿¿ç¨‹å¼
+ Comment[zu]=Umbambi wenqubo ebalekayo yewindi lemininingwane we-KDE
+ X-KDE-Library=naughty_panelapplet
+diff -Nru kdebase-release-3.4.0/kicker/applets/run/runapplet.desktop kdebase-branch-3.4/kicker/applets/run/runapplet.desktop
+--- kdebase-release-3.4.0/kicker/applets/run/runapplet.desktop 2005-02-23 00:05:46.000000000 -0500
++++ kdebase-branch-3.4/kicker/applets/run/runapplet.desktop 2005-03-30 01:47:49.000000000 -0500
+@@ -5,13 +5,16 @@
+ Name[bg]=Изпълнение на команда
+ Name[bn]=কমানà§à¦¡ চালাও
+ Name[br]=Seveniñ ur Goulev
++Name[bs]=Izvrši naredbu
+ Name[ca]=Executa un comandament
+ Name[cs]=Spustit pÅ™Ãkaz
+ Name[cy]=Rhedeg Gorchymyn
+ Name[da]=Kør kommando
+ Name[de]=Befehl ausführen
++Name[el]=ΕκτÎλεση εντολής
+ Name[es]=Ejecutar comando
+ Name[et]=Käsu käivitamine
++Name[eu]=Exekutatu komandoa
+ Name[fi]=Suoritta-käsky
+ Name[fr]=Lancer une commande
+ Name[fy]=kommando útfiere
+@@ -21,6 +24,7 @@
+ Name[hu]=Parancs végrehajtása
+ Name[is]=Keyra skipun
+ Name[it]=Esegui comando
++Name[ja]=コマンドを実行
+ Name[lt]=Paleisti komandÄ…
+ Name[nb]=Kjør kommando
+ Name[nl]=Commando uitvoeren
+@@ -31,14 +35,14 @@
+ Name[pt_BR]=Executar Comando
+ Name[ru]=Выполнить команду
+ Name[se]=Vuoje gohÄÄuma
++Name[sk]=SpustiÅ¥ prÃkaz
+ Name[sl]=Poženi ukaz
+ Name[sr]=Покретање наредбе
+-Name[sr@Latn]=Покретање наредбе
++Name[sr@Latn]=Pokretanje naredbe
+ Name[sv]=Kör kommando
+ Name[ta]=இயகà¯à®• கடà¯à®Ÿà®³à¯ˆ
+ Name[tr]=Komut Çalıştır
+-Name[uk]=КапуÑк команди
+-Name[xx]=xxRun Commandxx
++Name[uk]=ЗапуÑк команди
+ Name[zh_CN]=è¿è¡Œå‘½ä»¤
+ Comment=A command line applet
+ Comment[af]='n opdrag lyn miniprogram
+@@ -105,7 +109,6 @@
+ Comment[ven]=Mutalo wa muthetho
+ Comment[vi]=Một applet cho dòng lệnh
+ Comment[xh]=Umyalelo womgca we applet
+-Comment[xx]=xxA command line appletxx
+ Comment[zh_CN]=命令行å°ç¨‹åº
+ Comment[zh_TW]=å‘½ä»¤åˆ—é¢æ¿å°ç¨‹å¼
+ Comment[zu]=I-applet kalayini yomyalelo
+diff -Nru kdebase-release-3.4.0/kicker/applets/swallow/swallowapplet.desktop kdebase-branch-3.4/kicker/applets/swallow/swallowapplet.desktop
+--- kdebase-release-3.4.0/kicker/applets/swallow/swallowapplet.desktop 2005-02-23 00:05:46.000000000 -0500
++++ kdebase-branch-3.4/kicker/applets/swallow/swallowapplet.desktop 2005-03-07 09:15:47.000000000 -0500
+@@ -47,7 +47,7 @@
+ Name[sk]=Pohlcovacà applet
+ Name[sl]=Vstavek z lastovko
+ Name[sr]=Ðплет за гутање
+-Name[sr@Latn]=Progutaj aplet
++Name[sr@Latn]=Aplet za gutanje
+ Name[sv]=Uppslukande miniprogram
+ Name[ta]=உளà¯à®µà®¾à®™à¯à®•à¯à®®à¯ சிறà¯à®¨à®¿à®°à®²à¯
+ Name[tg]=Барномаи қурт доданӣ
+@@ -55,7 +55,6 @@
+ Name[uk]=Ðплет Swallow
+ Name[ven]=Apulete ya Swallow
+ Name[vi]=Applet Thiên Nga
+-Name[xx]=xxSwallow Appletxx
+ Name[zh_TW]=Swallow 颿¿å°ç¨‹å¼
+ Name[zu]=I-Applet yokugwinya
+ Comment=The swallow panel applet
+@@ -106,7 +105,7 @@
+ Comment[sk]=Pohlcovacà applet pre panel
+ Comment[sl]=Vstavek lastovke za na pult
+ Comment[sr]=Ðплет панела за гутање
+-Comment[sr@Latn]=Progutaj aplet panela.
++Comment[sr@Latn]=Aplet panela za gutanje
+ Comment[sv]=Uppslukande miniprogram för panelen
+ Comment[ta]=உளà¯à®µà®¾à®™à¯à®•à¯à®®à¯ பலக சிறà¯à®¨à®¿à®°à®²à¯
+ Comment[tg]=Барномаи қурт додани Ñафҳа
+@@ -114,7 +113,6 @@
+ Comment[uk]=Ðплет панелі swallow
+ Comment[vi]=Panel applet thiên nga
+ Comment[xh]=I window eneenkcukacha ye swallow applet
+-Comment[xx]=xxThe swallow panel appletxx
+ Comment[zh_TW]=swallow 颿¿å°ç¨‹å¼
+ Comment[zu]=I-applet lewindi lemininingwane lokugwinya
+ X-KDE-Library=swallow_panelapplet
+diff -Nru kdebase-release-3.4.0/kicker/applets/systemtray/systemtrayapplet.cpp kdebase-branch-3.4/kicker/applets/systemtray/systemtrayapplet.cpp
+--- kdebase-release-3.4.0/kicker/applets/systemtray/systemtrayapplet.cpp 2005-02-16 03:18:25.000000000 -0500
++++ kdebase-branch-3.4/kicker/applets/systemtray/systemtrayapplet.cpp 2005-03-04 12:10:55.000000000 -0500
+@@ -331,18 +331,25 @@
+ if (!m_expandButton)
+ {
+ m_expandButton = new HideButton(this, "expandButton");
++ refreshExpandButton();
+
+ if (orientation() == Vertical)
+ {
+- m_expandButton->setFixedSize(width() - 4, 16);
++ int iconSize = (m_expandButton->pixmap() ? m_expandButton->pixmap()->height() : 16);
++ m_expandButton->setFixedSize(width() - 4, iconSize);
+ }
+ else
+ {
+- m_expandButton->setFixedSize(16, height() - 4);
++ int iconSize = (m_expandButton->pixmap() ? m_expandButton->pixmap()->width() : 100);
++ m_expandButton->setFixedSize(iconSize, height() - 4);
+ }
+ connect(m_expandButton, SIGNAL(clicked()), this, SLOT(toggleExpanded()));
+ }
+- refreshExpandButton();
++ else
++ {
++ refreshExpandButton();
++ }
++
+ m_expandButton->show();
+ }
+ else if (m_expandButton)
+@@ -753,11 +760,13 @@
+ {
+ if (orientation() == Vertical)
+ {
+- m_expandButton->setFixedSize(width() - 4, 16);
++ int iconSize = (m_expandButton->pixmap() ? m_expandButton->pixmap()->height() : 16);
++ m_expandButton->setFixedSize(width() - 4, iconSize);
+ }
+ else
+ {
+- m_expandButton->setFixedSize(16, height() - 4);
++ int iconSize = (m_expandButton->pixmap() ? m_expandButton->pixmap()->width() : 16);
++ m_expandButton->setFixedSize(iconSize, height() - 4);
+ }
+ }
+
+diff -Nru kdebase-release-3.4.0/kicker/applets/systemtray/systemtrayapplet.desktop kdebase-branch-3.4/kicker/applets/systemtray/systemtrayapplet.desktop
+--- kdebase-release-3.4.0/kicker/applets/systemtray/systemtrayapplet.desktop 2005-02-23 00:05:46.000000000 -0500
++++ kdebase-branch-3.4/kicker/applets/systemtray/systemtrayapplet.desktop 2005-03-07 09:15:47.000000000 -0500
+@@ -65,7 +65,6 @@
+ Name[ven]=Thirei ya sistemu
+ Name[vi]=Khay hệ thống
+ Name[xh]=Itreyi Yendlela yokusebenza
+-Name[xx]=xxSystem Trayxx
+ Name[zh_CN]=系统托盘
+ Name[zh_TW]=系統匣
+ Name[zu]=Itreyi lesistimu
+@@ -124,7 +123,7 @@
+ Comment[sk]=Applet Systémová lišta
+ Comment[sl]=Vstavek za sistemsko vrstico v pultu
+ Comment[sr]=Ðплет ÑиÑтемÑке каÑете за панел
+-Comment[sr@Latn]=Aplet za panel, sistemska kaseta.
++Comment[sr@Latn]=Aplet sistemske kasete za panel
+ Comment[sv]=Panelminiprogram för systembricka
+ Comment[ta]=சாதன தடà¯à®Ÿà¯ பலக சிறà¯à®¨à®¿à®°à®²à¯
+ Comment[tg]=Барномаи Ñафҳаи идоракунии ÑиÑтемаи Ñафҳа
+@@ -133,7 +132,6 @@
+ Comment[uk]=Ðплет ÑиÑтемного лотку панелі
+ Comment[vi]=khung applet cho khay hệ thống
+ Comment[xh]=I applet yeqela lenjongo ethile yendlela yetreyi yokusebenza
+-Comment[xx]=xxThe system tray panel appletxx
+ Comment[zh_CN]=系统托盘å°ç¨‹åº
+ Comment[zh_TW]=系統匣 (system tray) 颿¿å°ç¨‹å¼
+ Comment[zu]=I-applet yewindi lemininingwane yetreyi lesistimu
+diff -Nru kdebase-release-3.4.0/kicker/applets/taskbar/taskbarapplet.cpp kdebase-branch-3.4/kicker/applets/taskbar/taskbarapplet.cpp
+--- kdebase-release-3.4.0/kicker/applets/taskbar/taskbarapplet.cpp 2004-11-25 18:58:17.000000000 -0500
++++ kdebase-branch-3.4/kicker/applets/taskbar/taskbarapplet.cpp 2005-03-04 12:13:38.000000000 -0500
+@@ -28,6 +28,8 @@
+ #include <klocale.h>
+ #include <kdebug.h>
+
++#include "global.h"
++
+ #include "taskbarcontainer.h"
+
+ #include "taskbarapplet.h"
+@@ -37,6 +39,7 @@
+ {
+ KDE_EXPORT KPanelApplet* init( QWidget *parent, const QString& configFile )
+ {
++ // FIXME: what about two taskbars? perhaps this should be inserted just once
+ KGlobal::locale()->insertCatalogue( "ktaskbarapplet" );
+ int options = 0;
+ if (kapp->authorizeControlModule("kde-kcmtaskbar.desktop"))
+@@ -61,17 +64,28 @@
+
+ TaskbarApplet::~TaskbarApplet()
+ {
++ // FIXME: what about TWO taskbars?
+ KGlobal::locale()->removeCatalogue( "ktaskbarapplet" );
+ }
+
+-int TaskbarApplet::widthForHeight( int ) const
+-{
+- return 200;
+-}
+-
+-int TaskbarApplet::heightForWidth( int ) const
++int TaskbarApplet::widthForHeight(int h) const
+ {
+- return 50;
++ // FIXME KDE4: when either TaskBarContainer or Applet smartens us
++ // simplify this
++ KPanelExtension::Position d = orientation() == Qt::Horizontal ?
++ KPanelExtension::Top :
++ KPanelExtension::Left;
++ return container->sizeHint(d, QSize(200, h)).width();
++}
++
++int TaskbarApplet::heightForWidth(int w) const
++{
++ // FIXME KDE4: when either TaskBarContainer or Applet smartens us
++ // simplify this
++ KPanelExtension::Position d = orientation() == Qt::Horizontal ?
++ KPanelExtension::Top :
++ KPanelExtension::Left;
++ return container->sizeHint(d, QSize(w, 200)).height();
+ }
+
+ void TaskbarApplet::preferences()
+diff -Nru kdebase-release-3.4.0/kicker/applets/taskbar/taskbarapplet.desktop kdebase-branch-3.4/kicker/applets/taskbar/taskbarapplet.desktop
+--- kdebase-release-3.4.0/kicker/applets/taskbar/taskbarapplet.desktop 2005-02-23 00:05:47.000000000 -0500
++++ kdebase-branch-3.4/kicker/applets/taskbar/taskbarapplet.desktop 2005-03-07 09:15:48.000000000 -0500
+@@ -53,6 +53,7 @@
+ Name[sk]=Panel úloh
+ Name[sl]=Opravilna vrstica
+ Name[sr]=Трака задатака
++Name[sr@Latn]=Traka zadataka
+ Name[ss]=Ibar yemsebenti
+ Name[sv]=Aktivitetsfält
+ Name[ta]=பணிபà¯à®ªà®Ÿà¯à®Ÿà®¿
+@@ -64,7 +65,6 @@
+ Name[ven]=Bara ya mushumo
+ Name[vi]=Thanh công việc
+ Name[xh]=Ibar yomsebenzi
+-Name[xx]=xxTaskbarxx
+ Name[zh_CN]=任务æ¡
+ Name[zh_TW]=工作列
+ Name[zu]=Ibha yemisebenzi
+@@ -123,7 +123,7 @@
+ Comment[sk]=Å tandardný applet prepÃnaÄa panelu.
+ Comment[sl]=Privzeti vstavek za opravilno vrstico v pultu
+ Comment[sr]=Подразумевани аплет траке задатака за панел.
+-Comment[sr@Latn]=Predefinisani taskbar aplet za panel.
++Comment[sr@Latn]=Podrazumevani aplet trake zadataka za panel.
+ Comment[sv]=Det förvalda miniprogrammet för att visa aktivitetsfältet i panelen
+ Comment[ta]=à®®à¯à®©à¯à®©à®¿à®°à¯à®ªà¯à®ªà¯ பணிபà¯à®ªà®Ÿà¯à®Ÿà®¿ பலக சிறà¯à®¨à®¿à®°à®²à¯
+ Comment[tg]=Барномаи майли Ñафҳаи идоракунӣ.
+@@ -132,7 +132,6 @@
+ Comment[uk]=Типовий аплет панелі Ñмужки задач.
+ Comment[vi]=panel applet cho thanh tác vụ mặc định
+ Comment[xh]=I applet yeqela lenjongo ethile yebar yomsebenzi wendalo.
+-Comment[xx]=xxThe default taskbar panel applet.xx
+ Comment[zh_CN]=默认任务æ 颿¿å°ç¨‹åºã€‚
+ Comment[zh_TW]=é è¨çš„å·¥ä½œåˆ—é¢æ¿å°ç¨‹å¼ã€‚
+ Comment[zu]=I-applet yewindi lemininingwane yebha yemisebenzi yendalo
+diff -Nru kdebase-release-3.4.0/kicker/applets/trash/trashapplet.desktop kdebase-branch-3.4/kicker/applets/trash/trashapplet.desktop
+--- kdebase-release-3.4.0/kicker/applets/trash/trashapplet.desktop 2005-02-23 00:05:47.000000000 -0500
++++ kdebase-branch-3.4/kicker/applets/trash/trashapplet.desktop 2005-03-30 01:47:49.000000000 -0500
+@@ -5,14 +5,17 @@
+ Comment[az]=Zibil qutusunu göstərən panel appleti
+ Comment[bg]=Ðплет за показване на кошчето
+ Comment[bn]=à¦à¦•টি পà§à¦¯à¦¾à¦¨à§‡à¦² অà§à¦¯à¦¾à¦ªà¦²à§‡à¦Ÿ যা আবরà§à¦œà¦¨à¦¾à¦° বাকà§à¦¸à¦Ÿà¦¿ দেখায়
++Comment[bs]=Panel applet koji prikazuje kantu za smeće
+ Comment[ca]=Un aplet del plafó que mostra la paperera
+ Comment[cs]=Applet panelu zobrazujÃcà odpadkový koÅ¡
+ Comment[da]=En panel-applet der viser din affaldsspand
+ Comment[de]=Kontrollleistenprogramm, das den Mülleimer anzeigt
++Comment[el]=Ένα εφαÏμογίδιο πίνακα που εμφανίζει τα σκουπίδια
+ Comment[en_GB]=A panel applet that displays the wastebin
+ Comment[eo]=Panela aplikaĵo, kiu vidigas la rubujon
+ Comment[es]=Un applet de panel que muestra la papelera
+ Comment[et]=Paneeliaplett, mis näitab prügikasti
++Comment[eu]=Zakarontzia erakusten duen panel appleta
+ Comment[fi]=Roskakorin näyttävä paneelisovelma
+ Comment[fr]=Une applet qui affiche la corbeille
+ Comment[fy]=In panielapplet dat it jiskefet lit sjen
+@@ -21,6 +24,7 @@
+ Comment[hu]=Kisalkalmazás a szemétkosár megjelenÃtéséhez
+ Comment[is]=Spjaldforrit sem sýnir ruslakörfuna
+ Comment[it]=Una applet del pannello che mostra il cestino
++Comment[ja]=ã”ã¿ç®±ã‚’表示ã™ã‚‹ãƒ‘ãƒãƒ«ã‚¢ãƒ—レット
+ Comment[lt]=Pulto įskiepis, rodantis šiukšliadėžę
+ Comment[nb]=Et panelprogram som viser papirkurven
+ Comment[nl]=Een paneelapplet dat de prullenbak toont
+@@ -31,14 +35,14 @@
+ Comment[pt_BR]=Um mini-aplicativo de painel que exibe sua lixeira
+ Comment[ru]=Ðплет панели, отображающий корзину
+ Comment[se]=Panelprográmma mii Äájeha ruskalihti
++Comment[sk]=Applet panelu, ktorý zobrazuje váš kôš
+ Comment[sl]=Pultni vstavek, ki prikazuje Smeti
+ Comment[sr]=ПанелÑки аплет који приказује канту за Ñмеће
+-Comment[sr@Latn]=ПанелÑки аплет који приказује канту за Ñмеће
++Comment[sr@Latn]=Panelski aplet koji prikazuje kantu za smeće
+ Comment[sv]=Ett miniprogram för panelen som visar papperskorgen
+ Comment[ta]=கà¯à®ªà¯à®ªà¯ˆà®¤à¯à®¤à¯Šà®Ÿà¯à®Ÿà®¿à®•ளை காடà¯à®Ÿà¯à®®à¯ ஒர௠பலக சிறà¯à®¨à®¿à®°à®²à¯
+ Comment[tr]=Çöp kutusunun görüntülendiği bir panel programcığı
+ Comment[uk]=Ðплет панелі, що відображує Ñмітник
+-Comment[xx]=xxA panel applet that displays the trashbinxx
+ Name=Trash
+ Name[af]=Gemors
+ Name[ar]=سلة Ø§Ù„Ù†ÙØ§ÙŠØ§Øª
+@@ -107,7 +111,6 @@
+ Name[vi]=Thùng rác
+ Name[wa]=Batch
+ Name[xh]=Inkukumo
+-Name[xx]=xxTrashxx
+ Name[zh_CN]=回收站
+ Name[zh_TW]=垃圾桶
+ Name[zu]=Izibi
+diff -Nru kdebase-release-3.4.0/kicker/core/childpanelextension.desktop kdebase-branch-3.4/kicker/core/childpanelextension.desktop
+--- kdebase-release-3.4.0/kicker/core/childpanelextension.desktop 2005-02-23 00:05:47.000000000 -0500
++++ kdebase-branch-3.4/kicker/core/childpanelextension.desktop 2005-03-30 01:47:49.000000000 -0500
+@@ -6,8 +6,10 @@
+ Name[br]=Panell
+ Name[ca]=Plafó
+ Name[de]=Kontrollleiste
++Name[el]=Πίνακας
+ Name[eo]=Panelo
+ Name[et]=Paneel
++Name[eu]=Panela
+ Name[fi]=Paneeli
+ Name[fo]=Bróst
+ Name[fr]=Tableau de bord
+@@ -17,6 +19,7 @@
+ Name[hi]=फलक
+ Name[is]=Spjald
+ Name[it]=Pannello
++Name[ja]=パãƒãƒ«
+ Name[lo]=ถาดพาเนล
+ Name[lt]=Pultas
+ Name[lv]=Panelis
+@@ -29,12 +32,10 @@
+ Name[se]=Panela
+ Name[sl]=Pult
+ Name[sr]=Панел
+-Name[sr@Latn]=Панел
+ Name[ta]=பலகமà¯
+ Name[uk]=Панель
+ Name[ven]=Phanele
+ Name[xh]=Iqela lenjongo ethile
+-Name[xx]=xxPanelxx
+ Name[zh_CN]=颿¿
+ Name[zu]=Iwindi lemininingwane
+ Comment=Child panel extension.
+@@ -88,7 +89,7 @@
+ Comment[sk]=RozÅ¡Ãrenie pre potomkov panelu.
+ Comment[sl]=Razširitev za podrejeni pult.
+ Comment[sr]=Дечји панел, проширење панела.
+-Comment[sr@Latn]=DeÄije proÅ¡irenje panela.
++Comment[sr@Latn]=DeÄji panel, proÅ¡irenje panela.
+ Comment[sv]=Underpanelutbyggnad
+ Comment[ta]=சிறà¯à®µà®°à¯ பலக விரிவாகà¯à®•à®®à¯.
+ Comment[tg]=БаÑти Ñафҳаи контроли кӯдак
+@@ -99,7 +100,6 @@
+ Comment[ven]=Thumanyo ya phanele ya nwana
+ Comment[vi]=Các panel con mở rộng
+ Comment[xh]=Ulwandiso lweqela lenjongo ethile yomntwana.
+-Comment[xx]=xxChild panel extension.xx
+ Comment[zh_CN]=å颿¿æ‰©å±•。
+ Comment[zh_TW]=å颿¿å»¶ä¼¸ã€‚
+ Comment[zu]=Isandiso sewindi lemininingwane elingumntwana.
+diff -Nru kdebase-release-3.4.0/kicker/core/container_applet.cpp kdebase-branch-3.4/kicker/core/container_applet.cpp
+--- kdebase-release-3.4.0/kicker/core/container_applet.cpp 2005-02-21 19:00:34.000000000 -0500
++++ kdebase-branch-3.4/kicker/core/container_applet.cpp 2005-04-02 05:47:10.000000000 -0500
+@@ -214,12 +214,15 @@
+
+ QPopupMenu *menu = opMenu();
+
++ Kicker::the()->setInsertionPoint(_handle->mapToGlobal(_handle->rect().center()));
++
+ switch(menu->exec(KickerLib::popupPosition(popupDirection(), menu, this)))
+ {
+ case PanelAppletOpMenu::Move:
+ moveApplet(_handle->mapToParent(_handle->rect().center()));
+ break;
+ case PanelAppletOpMenu::Remove:
++ Kicker::the()->setInsertionPoint(QPoint());
+ emit removeme(this);
+ return; // Above signal will cause this to be deleted.
+ break;
+@@ -239,6 +242,8 @@
+ break;
+ }
+
++ Kicker::the()->setInsertionPoint(QPoint());
++
+ if (!_handle->onMenuButton(QCursor::pos()))
+ {
+ _handle->toggleMenuButtonOff();
+diff -Nru kdebase-release-3.4.0/kicker/core/container_button.cpp kdebase-branch-3.4/kicker/core/container_button.cpp
+--- kdebase-release-3.4.0/kicker/core/container_button.cpp 2005-02-24 01:05:42.000000000 -0500
++++ kdebase-branch-3.4/kicker/core/container_button.cpp 2005-04-04 23:42:20.000000000 -0400
+@@ -241,8 +241,11 @@
+ QPopupMenu* menu = opMenu();
+ connect( menu, SIGNAL( aboutToHide() ), this, SLOT( slotMenuClosed() ) );
+ QPoint pos = KickerLib::popupPosition(popupDirection(), menu, this,
+- (orientation() == Horizontal) ?
+- QPoint(0, 0) : me->pos());
++ (orientation() == Horizontal) ?
++ QPoint(0, 0) : me->pos());
++
++ Kicker::the()->setInsertionPoint(me->globalPos());
++
+ switch (menu->exec(pos))
+ {
+ case PanelAppletOpMenu::Move:
+@@ -266,6 +269,7 @@
+ break;
+ }
+
++ Kicker::the()->setInsertionPoint(QPoint());
+ KickerTip::enableTipping(true);
+ sentinal = false;
+ return true;
+diff -Nru kdebase-release-3.4.0/kicker/core/container_extension.cpp kdebase-branch-3.4/kicker/core/container_extension.cpp
+--- kdebase-release-3.4.0/kicker/core/container_extension.cpp 2005-02-27 20:11:22.000000000 -0500
++++ kdebase-branch-3.4/kicker/core/container_extension.cpp 2005-04-02 05:47:10.000000000 -0500
+@@ -337,7 +337,9 @@
+ if (m_extension && m_extension->customMenu())
+ {
+ // use the extenion's own custom menu
++ Kicker::the()->setInsertionPoint(globalPos);
+ m_extension->customMenu()->exec(globalPos);
++ Kicker::the()->setInsertionPoint(QPoint());
+ return;
+ }
+
+@@ -351,6 +353,8 @@
+
+ QPopupMenu *menu = BaseContainer::reduceMenu(_opMnu);
+
++ Kicker::the()->setInsertionPoint(globalPos);
++
+ switch (menu->exec(globalPos))
+ {
+ case PanelExtensionOpMenu::Remove:
+@@ -371,6 +375,7 @@
+ default:
+ break;
+ }
++ Kicker::the()->setInsertionPoint(QPoint());
+ }
+
+ void ExtensionContainer::about()
+@@ -1856,7 +1861,9 @@
+ QMouseEvent* me = (QMouseEvent*) e;
+ if (_is_lmb_down &&
+ ((me->state() & LeftButton) == LeftButton) &&
+- !Kicker::the()->isImmutable())
++ !Kicker::the()->isImmutable() &&
++ !m_settings.config()->isImmutable() &&
++ !ExtensionManager::the()->isMenuBar(this))
+ {
+ QPoint p(me->globalPos() - _last_lmb_press);
+ int x_treshold = width();
+diff -Nru kdebase-release-3.4.0/kicker/core/containerarea.cpp kdebase-branch-3.4/kicker/core/containerarea.cpp
+--- kdebase-release-3.4.0/kicker/core/containerarea.cpp 2005-02-28 23:57:39.000000000 -0500
++++ kdebase-branch-3.4/kicker/core/containerarea.cpp 2005-04-02 05:47:10.000000000 -0500
+@@ -568,7 +568,10 @@
+
+ if (arrange)
+ {
+- m_layout->insertIntoFreeSpace(a);
++ if (Kicker::the()->insertionPoint().isNull())
++ m_layout->insertIntoFreeSpace(a, QPoint());
++ else
++ m_layout->insertIntoFreeSpace(a, mapFromGlobal(Kicker::the()->insertionPoint()));
+ }
+ else
+ {
+@@ -707,13 +710,15 @@
+ a->raise();
+ }
+
+-void ContainerArea::stopContainerMove(BaseContainer *b)
++void ContainerArea::mouseReleaseEvent(QMouseEvent *)
+ {
+- if (_moveAC != b)
++ if (!_moveAC)
+ {
+ return;
+ }
+
++ // start container move was caled successfuly
++ // so we need to complete the move here
+ _autoScrollTimer.stop();
+ releaseMouse();
+ setCursor(arrowCursor);
+@@ -730,12 +735,6 @@
+ saveContainerConfig(true);
+ }
+
+-void ContainerArea::mouseReleaseEvent(QMouseEvent *)
+-{
+- if (_moveAC)
+- stopContainerMove(_moveAC);
+-}
+-
+ void ContainerArea::mouseMoveEvent(QMouseEvent *ev)
+ {
+ if (!_moveAC) {
+diff -Nru kdebase-release-3.4.0/kicker/core/containerarea.h kdebase-branch-3.4/kicker/core/containerarea.h
+--- kdebase-release-3.4.0/kicker/core/containerarea.h 2005-02-27 20:11:22.000000000 -0500
++++ kdebase-branch-3.4/kicker/core/containerarea.h 2005-04-02 05:47:10.000000000 -0500
+@@ -126,7 +126,6 @@
+ void setBackgroundTheme();
+ void updateContainersBackground();
+ void startContainerMove(BaseContainer*);
+- void stopContainerMove(BaseContainer*);
+
+ private:
+ ContainerList m_containers;
+diff -Nru kdebase-release-3.4.0/kicker/core/containerarealayout.cpp kdebase-branch-3.4/kicker/core/containerarealayout.cpp
+--- kdebase-release-3.4.0/kicker/core/containerarealayout.cpp 2005-02-27 20:00:25.000000000 -0500
++++ kdebase-branch-3.4/kicker/core/containerarealayout.cpp 2005-04-02 05:47:10.000000000 -0500
+@@ -195,7 +195,7 @@
+ m_items.append(new ContainerAreaLayoutItem(item, this));
+ }
+
+-void ContainerAreaLayout::insertIntoFreeSpace(QWidget* widget)
++void ContainerAreaLayout::insertIntoFreeSpace(QWidget* widget, QPoint insertionPoint)
+ {
+ if (!widget)
+ {
+@@ -225,11 +225,13 @@
+ if (!next.current())
+ {
+ // first item in!
+- item->setGeometryR(QRect(0, 0, widget->width(), widget->height()));
++ item->setGeometryR(QRect(insertionPoint.x(), insertionPoint.y(), widget->width(), widget->height()));
+ updateFreeSpaceValues();
+ return;
+ }
+
++ int insPos = (orientation() == Horizontal) ? insertionPoint.x(): insertionPoint.y();
++
+ for (; next.current(); ++current, ++next)
+ {
+ if (current.current() == item ||
+@@ -238,25 +240,54 @@
+ continue;
+ }
+
+- if (current.current()->rightR() + 3 <
+- next.current()->leftR())
++ if (insPos == 0)
+ {
+- break;
++ if (current.current()->rightR() + 3 <
++ next.current()->leftR())
++ {
++ insPos = current.current()->rightR();
++ break;
++ }
++ }
++ else
++ {
++ if ((current.current()->rightR() < insPos) &&
++ (next.current()->leftR() > insPos))
++ {
++ // Free space available at insertion point!
++ if (insPos + item->widthR() > next.current()->leftR())
++ {
++ // We have overlap on the right, move to the left
++ insPos = next.current()->leftR() - item->widthR();
++ if (insPos < current.current()->rightR())
++ {
++ // We have overlap on the left as well, move to the right
++ insPos = current.current()->rightR();
++ // We don't fit entirely, let updateFreeSpaceValues sort it out
++ }
++ }
++ break;
++ }
++ if ((next.current()->leftR() <= insPos) &&
++ (next.current()->rightR() > insPos))
++ {
++ // Insert at the location of next
++ insPos = next.current()->leftR();
++ break;
++ }
+ }
+- }
+-
+- if (!current.current() || !next.current())
+- {
+- return;
+ }
+
+ QRect geom = item->geometryR();
+- m_items.removeRef(item);
+- m_items.insert(m_items.findRef(current) + 1, item);
+-
+- // Move the container to its new position and prevent it from moving outside the panel.
+- geom.moveRight(current.current()->rightR());
++ geom.moveLeft(insPos);
+ item->setGeometryR(geom);
++ widget->setGeometry(transform(geom)); // widget isn't shown, layout not active yet
++
++ if (current.current() && next.current())
++ {
++ m_items.removeRef(item);
++ m_items.insert(m_items.findRef(next), item);
++ }
+
+ updateFreeSpaceValues();
+ }
+@@ -364,15 +395,15 @@
+
+ void ContainerAreaLayout::updateFreeSpaceValues()
+ {
+- double freeSpace =
++ int freeSpace =
+ kMax(0, widthR() - widthForHeightR(heightR()));
+
+ double fspace = 0;
+ for (ItemIterator it(m_items); it.current(); ++it)
+ {
+ int distance = distanceToPreviousItem(it);
++ if (distance < 0) distance = 0;
+ fspace += distance;
+- if (fspace < 0) fspace = 0;
+ double ssf = ( freeSpace == 0 ? 0 : fspace/freeSpace );
+ if (ssf > 1) ssf = 1;
+ if (ssf < 0) ssf = 0;
+@@ -387,7 +418,7 @@
+ ContainerAreaLayoutItem* cur = it.current();
+ ContainerAreaLayoutItem* prev = --it;
+
+- return prev ? cur->leftR() - prev->rightR() - 1 :
++ return prev ? cur->leftR() - prev->leftR() - prev->widthForHeightR(heightR()) :
+ cur->leftR() - leftR();
+ }
+
+diff -Nru kdebase-release-3.4.0/kicker/core/containerarealayout.h kdebase-branch-3.4/kicker/core/containerarealayout.h
+--- kdebase-release-3.4.0/kicker/core/containerarealayout.h 2005-02-22 19:25:42.000000000 -0500
++++ kdebase-branch-3.4/kicker/core/containerarealayout.h 2005-04-02 05:47:10.000000000 -0500
+@@ -82,7 +82,7 @@
+ ContainerAreaLayout(QWidget* parent);
+
+ void addItem(QLayoutItem* item);
+- void insertIntoFreeSpace(QWidget* item);
++ void insertIntoFreeSpace(QWidget* item, QPoint insertionPoint);
+ QSize sizeHint() const;
+ QSize minimumSize() const;
+ QLayoutIterator iterator();
+diff -Nru kdebase-release-3.4.0/kicker/core/extensionmanager.cpp kdebase-branch-3.4/kicker/core/extensionmanager.cpp
+--- kdebase-release-3.4.0/kicker/core/extensionmanager.cpp 2005-02-22 12:12:51.000000000 -0500
++++ kdebase-branch-3.4/kicker/core/extensionmanager.cpp 2005-03-04 12:16:03.000000000 -0500
+@@ -357,6 +357,11 @@
+ return m_mainPanel == panel;
+ }
+
++bool ExtensionManager::isMenuBar(const QWidget* panel) const
++{
++ return m_menubarPanel == panel;
++}
++
+ void ExtensionManager::addExtension( const QString& desktopFile )
+ {
+ PluginManager* pm = PluginManager::the();
+diff -Nru kdebase-release-3.4.0/kicker/core/extensionmanager.h kdebase-branch-3.4/kicker/core/extensionmanager.h
+--- kdebase-release-3.4.0/kicker/core/extensionmanager.h 2005-02-16 23:39:35.000000000 -0500
++++ kdebase-branch-3.4/kicker/core/extensionmanager.h 2005-03-04 12:16:03.000000000 -0500
+@@ -43,6 +43,7 @@
+ void configureMenubar(bool duringInit);
+ void addExtension( const QString &desktopFile );
+ bool isMainPanel(const QWidget* panel) const;
++ bool isMenuBar(const QWidget* panel) const;
+ void addContainer( ExtensionContainer* );
+ void removeAllContainers();
+ ExtensionList containers() const { return _containers; }
+diff -Nru kdebase-release-3.4.0/kicker/core/kicker.cpp kdebase-branch-3.4/kicker/core/kicker.cpp
+--- kdebase-release-3.4.0/kicker/core/kicker.cpp 2005-02-21 01:52:08.000000000 -0500
++++ kdebase-branch-3.4/kicker/core/kicker.cpp 2005-04-02 05:47:10.000000000 -0500
+@@ -288,6 +288,17 @@
+ return args;
+ }
+
++QPoint Kicker::insertionPoint()
++{
++ return m_insertionPoint;
++}
++
++void Kicker::setInsertionPoint(const QPoint &p)
++{
++ m_insertionPoint = p;
++}
++
++
+ void Kicker::showConfig(const QString& configPath, int page)
+ {
+ if (!m_configDialog)
+diff -Nru kdebase-release-3.4.0/kicker/core/kicker.h kdebase-branch-3.4/kicker/core/kicker.h
+--- kdebase-release-3.4.0/kicker/core/kicker.h 2005-02-06 04:39:50.000000000 -0500
++++ kdebase-branch-3.4/kicker/core/kicker.h 2005-04-02 05:47:10.000000000 -0500
+@@ -70,6 +70,29 @@
+
+ static QStringList configModules(bool controlCenter);
+
++ /**
++ * Global position where to insert a new item
++ */
++ QPoint insertionPoint();
++
++ /**
++ * Set the global position where to insert a new item
++ * This is not meant to be used by more than one code path
++ * at a time! A point is set, then later accessed, then cleared
++ * as an atomic action:
++ *
++ * KickerLib::setInsertionPoint(p);
++ * ...
++ * QPoint where = KickerLib::insertionPoint();
++ * ...
++ * KickerLib::setInsertionPoint(QPoint());
++ *
++ * this is not pretty, but it's pragmatic and does everything
++ * that is needed
++ */
++ void setInsertionPoint(const QPoint &p);
++
++
+ public slots:
+ void slotToggleShowDesktop();
+
+@@ -91,6 +114,7 @@
+ KWinModule* m_kwinModule;
+ KCMultiDialog* m_configDialog;
+ bool m_canAddContainers;
++ QPoint m_insertionPoint;
+ };
+
+ #endif
+diff -Nru kdebase-release-3.4.0/kicker/core/panelextension.cpp kdebase-branch-3.4/kicker/core/panelextension.cpp
+--- kdebase-release-3.4.0/kicker/core/panelextension.cpp 2005-02-27 20:11:22.000000000 -0500
++++ kdebase-branch-3.4/kicker/core/panelextension.cpp 2005-04-04 23:42:20.000000000 -0400
+@@ -149,7 +149,9 @@
+ QMouseEvent* me = (QMouseEvent*) e;
+ if ( me->button() == RightButton )
+ {
++ Kicker::the()->setInsertionPoint(me->globalPos());
+ opMenu()->exec(me->globalPos());
++ Kicker::the()->setInsertionPoint(QPoint());
+ return true;
+ }
+ }
+@@ -305,7 +307,7 @@
+ if (it.current()->appletType() == "Applet")
+ {
+ AppletContainer* applet = dynamic_cast<AppletContainer*>(it.current());
+- if (applet->info().desktopFile() == "menuapplet.desktop")
++ if (applet && applet->info().desktopFile() == "menuapplet.desktop")
+ {
+ m_menubar = applet;
+ break;
+@@ -318,6 +320,11 @@
+ m_menubar = _containerArea->addApplet("menuapplet.desktop");
+ }
+
+- m_menubar->setImmutable(true);
++ // in the pathological case we may not have a menuapplet at all,
++ // so check for it =/
++ if (m_menubar)
++ {
++ m_menubar->setImmutable(true);
++ }
+ }
+
+diff -Nru kdebase-release-3.4.0/kicker/core/showdesktop.cpp kdebase-branch-3.4/kicker/core/showdesktop.cpp
+--- kdebase-release-3.4.0/kicker/core/showdesktop.cpp 2005-02-16 03:08:07.000000000 -0500
++++ kdebase-branch-3.4/kicker/core/showdesktop.cpp 2005-03-04 12:14:39.000000000 -0500
+@@ -110,9 +110,21 @@
+ const QValueList<WId> windows = Kicker::the()->kwinModule()->windows();
+ QValueList<WId>::ConstIterator it;
+
++ WId kickerTip = 0;
++ if (KickerSettings::showMouseOverEffects())
++ {
++ kickerTip = KickerTip::the()->winId();
++ }
++
+ for (it = windows.begin(); it != windows.end(); ++it)
+ {
+ WId w = *it;
++
++ if (w == kickerTip)
++ {
++ continue;
++ }
++
+ NETWinInfo info( qt_xdisplay(), w, qt_xrootwin(),
+ NET::XAWMState | NET::WMDesktop );
+
+diff -Nru kdebase-release-3.4.0/kicker/extensions/dockbar/dockbarextension.cpp kdebase-branch-3.4/kicker/extensions/dockbar/dockbarextension.cpp
+--- kdebase-release-3.4.0/kicker/extensions/dockbar/dockbarextension.cpp 2004-12-19 17:54:52.000000000 -0500
++++ kdebase-branch-3.4/kicker/extensions/dockbar/dockbarextension.cpp 2005-03-12 16:26:25.000000000 -0500
+@@ -33,6 +33,7 @@
+ #include <kmessagebox.h>
+ #include <kapplication.h>
+ #include <dcopclient.h>
++#include <kglobal.h>
+
+ #include "dockbarextension.h"
+ #include "dockbarextension.moc"
+@@ -45,6 +46,7 @@
+ {
+ KDE_EXPORT KPanelExtension* init(QWidget *parent, const QString& configFile)
+ {
++ KGlobal::locale()->insertCatalogue("dockbarextension");
+ return new DockBarExtension(configFile, KPanelExtension::Normal,
+ 0, parent, "dockbarextension");
+ }
+diff -Nru kdebase-release-3.4.0/kicker/extensions/dockbar/dockbarextension.desktop kdebase-branch-3.4/kicker/extensions/dockbar/dockbarextension.desktop
+--- kdebase-release-3.4.0/kicker/extensions/dockbar/dockbarextension.desktop 2005-02-23 00:05:47.000000000 -0500
++++ kdebase-branch-3.4/kicker/extensions/dockbar/dockbarextension.desktop 2005-03-30 01:47:50.000000000 -0500
+@@ -12,6 +12,7 @@
+ Name[cy]=Docio'r Bar Cymhwysiad
+ Name[da]=Dok programlinje
+ Name[de]=Programm-Andockleiste
++Name[el]=ΓÏαμμή Ï€ÏοσαÏτημÎνων εφαÏμογών
+ Name[eo]=Aplikaĵolistelo
+ Name[es]=Barra para anclar aplicaciones
+ Name[et]=Dokitavate rakenduste riba
+@@ -50,7 +51,7 @@
+ Name[sk]=Panel pre dokovanie aplikáciÃ
+ Name[sl]=Vrstica za zasidranje programov
+ Name[sr]=Трака за приÑтајање програма
+-Name[sr@Latn]=Dok za programe
++Name[sr@Latn]=Traka za pristajanje programa
+ Name[sv]=Programdocka
+ Name[ta]=டாக௠பயனà¯à®ªà®¾à®Ÿà¯à®Ÿà¯ படà¯à®Ÿà®¿
+ Name[tg]=Ðавори барномаи обзор
+@@ -59,7 +60,6 @@
+ Name[uk]=Панель-док Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼
+ Name[vi]=Thanh chương trình Dock
+ Name[xh]=Ibar Yesicelo ye Dock
+-Name[xx]=xxDock Application Barxx
+ Name[zh_CN]=åœé åº”ç”¨ç¨‹åºæ
+ Name[zh_TW]=嵌入程å¼å·¥å…·åˆ—
+ Name[zu]=Ibha Yomyaleli we-Dock
+@@ -75,6 +75,7 @@
+ Comment[cy]=Docio estyniad y bar cymhwysiad
+ Comment[da]=Udvidelse - dok programlinje.
+ Comment[de]=Eine Andock-Leiste für Programme
++Comment[el]=ΕπÎκταση γÏαμμής Ï€ÏοσαÏτημÎνων εφαÏμογών
+ Comment[eo]=Apliakĵolistela aldono
+ Comment[es]=Extensión Barra para anclar aplicaciones.
+ Comment[et]=Paneeli laiendus dokitavate rakenduste hoidmiseks
+@@ -113,7 +114,7 @@
+ Comment[sk]=RozÅ¡Ãrenie pre dokovacà panel aplikáciÃ
+ Comment[sl]=RazÅ¡iritev za sidriÅ¡Äe programov.
+ Comment[sr]=Проширење траке за приÑтајање програма.
+-Comment[sr@Latn]=Proširenje doka za programe.
++Comment[sr@Latn]=Proširenje trake za pristajanje programa.
+ Comment[sv]=Bygger ut med en programdocka
+ Comment[ta]=டாக௠பயனà¯à®ªà®¾à®Ÿà¯ படà¯à®Ÿà®¿ விரிவாகà¯à®•à®®à¯
+ Comment[tg]=Кушодкунии панел барои бино кунӣ.
+@@ -122,7 +123,6 @@
+ Comment[uk]=Ð Ð¾Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ Ð´Ð¾Ðº-панелі Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼.
+ Comment[vi]=Chương trình dock cho thanh mở rộng
+ Comment[xh]=Ulwandiso lwe bar yesicelo se Dock.
+-Comment[xx]=xxDock application bar extension.xx
+ Comment[zh_CN]=åœé åº”ç”¨ç¨‹åºæ 扩展。
+ Comment[zh_TW]=嵌入延伸程å¼å·¥å…·åˆ—
+ Comment[zu]=Isandiso sebha Yomyaleli we-Dock
+diff -Nru kdebase-release-3.4.0/kicker/extensions/kasbar/configure.in.in kdebase-branch-3.4/kicker/extensions/kasbar/configure.in.in
+--- kdebase-release-3.4.0/kicker/extensions/kasbar/configure.in.in 1969-12-31 19:00:00.000000000 -0500
++++ kdebase-branch-3.4/kicker/extensions/kasbar/configure.in.in 2005-03-25 11:38:04.000000000 -0500
+@@ -0,0 +1,2 @@
++AC_CHECK_HEADERS(sys/loadavg.h)
++
+diff -Nru kdebase-release-3.4.0/kicker/extensions/kasbar/kasbarextension.desktop kdebase-branch-3.4/kicker/extensions/kasbar/kasbarextension.desktop
+--- kdebase-release-3.4.0/kicker/extensions/kasbar/kasbarextension.desktop 2005-02-23 00:05:48.000000000 -0500
++++ kdebase-branch-3.4/kicker/extensions/kasbar/kasbarextension.desktop 2005-03-07 09:15:49.000000000 -0500
+@@ -24,7 +24,6 @@
+ Name[sv]=Kasbar
+ Name[tg]=Ðавори Kas
+ Name[th]=คาสบาร์ K
+-Name[xx]=xxKasBarxx
+ Name[zu]=I-KasBar
+
+ Comment=An alternative taskbar panel applet.
+@@ -79,7 +78,7 @@
+ Comment[sk]=AlternatÃvny panel úloh
+ Comment[sl]=Vstavek za alternativno opravilno vrstico na pultu
+ Comment[sr]=Ðлтернативни аплет траке задатака за панел.
+-Comment[sr@Latn]=Alternativni taskbar aplet za panel.
++Comment[sr@Latn]=Alternativni aplet trake zadataka za panel.
+ Comment[sv]=Alternativt miniprogram till aktivitetsfältet
+ Comment[ta]=மாறà¯à®±à¯à®µà®´à®¿ பணிபடà¯à®Ÿà®¿ பலக சிறà¯à®¨à®¿à®°à®²à¯
+ Comment[tg]=Барномаи Ñафҳаи маÑъалаҳои алтернативӣ
+@@ -89,7 +88,6 @@
+ Comment[ven]=Apulete phanele ine nanga shumisa yone ya bara ya mushumo.
+ Comment[vi]=Thanh panel applet taskbar thứ cấp
+ Comment[xh]=I applet yeqela lenjongo ethile yebar yomsebenzi olandelelanayo.
+-Comment[xx]=xxAn alternative taskbar panel applet.xx
+ Comment[zh_CN]=备选的任务æ 颿¿å°ç¨‹åºã€‚
+ Comment[zh_TW]=å¯ä¾›é¸æ“‡çš„å¦å¤–ä¸€å€‹å·¥ä½œåˆ—é¢æ¿å°ç¨‹å¼ã€‚
+ Comment[zu]=Enye i-applet yewindi lemininingwane yebha yemisebenzi
+diff -Nru kdebase-release-3.4.0/kicker/extensions/kasbar/kasloaditem.cpp kdebase-branch-3.4/kicker/extensions/kasbar/kasloaditem.cpp
+--- kdebase-release-3.4.0/kicker/extensions/kasbar/kasloaditem.cpp 2004-12-04 20:22:53.000000000 -0500
++++ kdebase-branch-3.4/kicker/extensions/kasbar/kasloaditem.cpp 2005-03-25 11:38:04.000000000 -0500
+@@ -1,6 +1,11 @@
+ #include <math.h>
+ #include <stdlib.h>
+
++#include <config.h>
++#ifdef HAVE_SYS_LOADAVG_H
++#include <sys/loadavg.h> // e.g. Solaris
++#endif
++
+ #include <qpainter.h>
+ #include <qbitmap.h>
+ #include <qdatetime.h>
+diff -Nru kdebase-release-3.4.0/kicker/extensions/sidebar/sidebarextension.desktop kdebase-branch-3.4/kicker/extensions/sidebar/sidebarextension.desktop
+--- kdebase-release-3.4.0/kicker/extensions/sidebar/sidebarextension.desktop 2005-02-10 23:52:11.000000000 -0500
++++ kdebase-branch-3.4/kicker/extensions/sidebar/sidebarextension.desktop 2005-03-07 09:15:49.000000000 -0500
+@@ -53,7 +53,6 @@
+ Name[uk]=УніверÑальна бічна панель
+ Name[uz]=УниверÑал ён панели
+ Name[vi]=Thanh lên xuống tổng hợp
+-Name[xx]=xxUniversal Sidebarxx
+ Name[zh_CN]=通用侧边æ
+ Name[zh_TW]=整體的邊列
+
+@@ -101,7 +100,6 @@
+ Comment[tr]=Konqueror'un yönlendirme paneli çevresindeki satır atlatıcı
+ Comment[uk]=Обгортка навколо навігаційної панелі Konqueror
+ Comment[vi]=Bá»™ bá»c xung quanh bảng duyệt
+-Comment[xx]=xxWrapper around Konqueror's navigation panelxx
+
+ Icon=view_sidetree
+
+diff -Nru kdebase-release-3.4.0/kicker/extensions/taskbar/taskbarextension.desktop kdebase-branch-3.4/kicker/extensions/taskbar/taskbarextension.desktop
+--- kdebase-release-3.4.0/kicker/extensions/taskbar/taskbarextension.desktop 2005-02-23 00:05:48.000000000 -0500
++++ kdebase-branch-3.4/kicker/extensions/taskbar/taskbarextension.desktop 2005-03-10 11:05:13.000000000 -0500
+@@ -6,6 +6,7 @@
+ Name[az]=Xarici Vəzifə Çubuğu
+ Name[bg]=Допълнителна лента
+ Name[bn]=বহিঃসà§à¦¥ টাসà§à¦•বার
++Name[br]=Barrenn dleadoù diavaez
+ Name[bs]=Eksterni taskbar
+ Name[ca]=Barra de tasques externa
+ Name[cs]=Externà pruh úloh
+@@ -52,7 +53,7 @@
+ Name[sk]=Externý taskbar
+ Name[sl]=Zunanja opravilna vrstica
+ Name[sr]=Спољашња трака задатака
+-Name[sr@Latn]=Spoljnji taskbar
++Name[sr@Latn]=Spoljašnja traka zadataka
+ Name[sv]=Externt aktivitetsfält
+ Name[ta]=பà¯à®± பணிபà¯à®ªà®Ÿà¯à®Ÿà®¿
+ Name[tg]=Сафҳаи маÑъалаҳои ваÑеъ
+@@ -63,7 +64,6 @@
+ Name[ven]=Bara ya mushumo ya nga nnda
+ Name[vi]=Thanh tác vụ ngoà i
+ Name[xh]=Ibar yomsebenzi Wangaphandle
+-Name[xx]=xxExternal Taskbarxx
+ Name[zh_CN]=外部任务æ
+ Name[zh_TW]=外部工作列
+ Name[zu]=Ibha yemisebenzi yangaphandle
+@@ -118,7 +118,7 @@
+ Comment[sk]=RozÅ¡Ãrenie panelu pre externý taskbar.
+ Comment[sl]=Zunanja razširitev opravilne vrstice za pult.
+ Comment[sr]=Спољашња трака задатака, проширење панела.
+-Comment[sr@Latn]=Proširenje spoljnjeg taskbara.
++Comment[sr@Latn]=Spoljašnja traka zadataka, proširenje panela.
+ Comment[sv]=Extern utökning till aktivitetsfältet
+ Comment[ta]=வெளிபà¯à®ªà¯à®± பணிபà¯à®ªà®Ÿà¯à®Ÿà®¿ பலக விரிவாகà¯à®•à®®à¯
+ Comment[tg]=ВаÑеъкунии Ñафҳаи маÑъалаҳои KDE барои маÑъалаҳои иловагӣ.
+@@ -128,7 +128,6 @@
+ Comment[ven]=U lapfiswa ha phanele ya bara ya mushumo ya nga nnda
+ Comment[vi]=Thanh tác vụ mở rộng ngoà i
+ Comment[xh]=Ulwandiso lweqela lenjongo ethile yebar yomsebenzi wangaphandle.
+-Comment[xx]=xxExternal taskbar panel extension.xx
+ Comment[zh_CN]=外部任务æ 颿¿æ‰©å±•。
+ Comment[zh_TW]=å¤–éƒ¨å·¥ä½œåˆ—é¢æ¿å»¶ä¼¸ã€‚
+ Comment[zu]=Isandiso sewindi lemininingwane lebha yemisebenzi yangaphandle
+diff -Nru kdebase-release-3.4.0/kicker/kcmkicker.desktop kdebase-branch-3.4/kicker/kcmkicker.desktop
+--- kdebase-release-3.4.0/kicker/kcmkicker.desktop 2005-02-04 23:15:21.000000000 -0500
++++ kdebase-branch-3.4/kicker/kcmkicker.desktop 2005-03-07 09:15:44.000000000 -0500
+@@ -61,7 +61,6 @@
+ Name[uz]=Панелни моÑлаш
+ Name[vi]=Cấu hình Panel
+ Name[wa]=Apontyî li scriftôr
+-Name[xx]=xxConfigure the Panelxx
+ Name[zh_CN]=é…ç½®é¢æ¿
+ Name[zh_TW]=è¨å®šé¢æ¿
+ X-KDE-StartupNotify=true
+diff -Nru kdebase-release-3.4.0/kicker/menuext/find/find.desktop kdebase-branch-3.4/kicker/menuext/find/find.desktop
+--- kdebase-release-3.4.0/kicker/menuext/find/find.desktop 2005-02-04 23:15:25.000000000 -0500
++++ kdebase-branch-3.4/kicker/menuext/find/find.desktop 2005-03-07 09:15:50.000000000 -0500
+@@ -56,11 +56,9 @@
+ Name[uk]=Знайти
+ Name[uz]=Қидириш
+ Name[wa]=Trover
+-Name[xx]=xxFindxx
+ Name[zh_CN]=查找
+ Name[zh_TW]=尋找
+ Comment=
+-Comment[xx]=xxxx
+ Icon=kfind
+
+ X-KDE-Library=kickermenu_find
+diff -Nru kdebase-release-3.4.0/kicker/menuext/find/kfind.desktop kdebase-branch-3.4/kicker/menuext/find/kfind.desktop
+--- kdebase-release-3.4.0/kicker/menuext/find/kfind.desktop 2005-02-04 23:15:25.000000000 -0500
++++ kdebase-branch-3.4/kicker/menuext/find/kfind.desktop 2005-03-07 09:15:50.000000000 -0500
+@@ -72,7 +72,6 @@
+ Name[ven]=Todani faela
+ Name[vi]=Tìm file
+ Name[xh]=Fumana Iifayile
+-Name[xx]=xxFind Filesxx
+ Name[zh_CN]=查找文件
+ Name[zh_TW]=尋找檔案
+ Name[zu]=Thola Amafayela
+diff -Nru kdebase-release-3.4.0/kicker/menuext/find/websearch.desktop kdebase-branch-3.4/kicker/menuext/find/websearch.desktop
+--- kdebase-release-3.4.0/kicker/menuext/find/websearch.desktop 2005-02-23 23:27:01.000000000 -0500
++++ kdebase-branch-3.4/kicker/menuext/find/websearch.desktop 2005-03-07 09:15:50.000000000 -0500
+@@ -54,7 +54,7 @@
+ Name[sk]=Hľadanie na WWW
+ Name[sl]=Spletno iskanje
+ Name[sr]=Претраживање Веба
+-Name[sr@Latn]=Veb pretraživanje
++Name[sr@Latn]=Pretraživanje Veba
+ Name[sv]=Webbsökning
+ Name[ta]=வலை தேடà¯
+ Name[tg]=ҶуÑтуҷӯи Ð’Ñб
+@@ -64,7 +64,6 @@
+ Name[uz]=Интернетда қидириш
+ Name[vi]=Tìm kiếm trên Web
+ Name[wa]=Cweraedje sol daegntoele
+-Name[xx]=xxWeb Searchxx
+ Name[zh_CN]=Web æœç´¢
+ Name[zh_TW]=ç¶²é æœå°‹
+ Categories=Qt;KDE;Find;
+diff -Nru kdebase-release-3.4.0/kicker/menuext/kdeprint/print_mnu.cpp kdebase-branch-3.4/kicker/menuext/kdeprint/print_mnu.cpp
+--- kdebase-release-3.4.0/kicker/menuext/kdeprint/print_mnu.cpp 2004-01-10 14:50:38.000000000 -0500
++++ kdebase-branch-3.4/kicker/menuext/kdeprint/print_mnu.cpp 2005-03-09 08:01:35.000000000 -0500
+@@ -112,7 +112,7 @@
+ kapp->kdeinitExec("kaddprinterwizard", QStringList("--serverconfig"));
+ break;
+ case PRINT_MANAGER_ID:
+- kapp->startServiceByDesktopName("printmgr");
++ KRun::runCommand("kcmshell kde-printers.desktop");
+ break;
+ case PRINT_BROWSER_ID:
+ KRun::runCommand("kfmclient openProfile filemanagement print:/", "kfmclient", "konqueror");
+diff -Nru kdebase-release-3.4.0/kicker/menuext/kdeprint/printmenu.desktop kdebase-branch-3.4/kicker/menuext/kdeprint/printmenu.desktop
+--- kdebase-release-3.4.0/kicker/menuext/kdeprint/printmenu.desktop 2005-02-04 23:15:26.000000000 -0500
++++ kdebase-branch-3.4/kicker/menuext/kdeprint/printmenu.desktop 2005-03-22 12:38:12.000000000 -0500
+@@ -66,7 +66,6 @@
+ Name[vi]=Hệ thống in
+ Name[wa]=Sistinme d'Â imprimaedje
+ Name[xh]=Indlela Yoshicilelo
+-Name[xx]=xxPrint Systemxx
+ Name[zh_CN]=打å°ç³»ç»Ÿ
+ Name[zh_TW]=列å°ç³»çµ±
+ Name[zu]=Isistimu yokushicilela
+@@ -98,7 +97,7 @@
+ Comment[hr]=Jednostavan pristup sustavu za ispisivanje
+ Comment[hu]=Egyszerű hozzáférést biztosÃt a nyomtatási rendszerhez
+ Comment[is]=Fljótleg leið að prentkerfinu
+-Comment[it]=Accesso facilitato al sistema di stampa
++Comment[it]=Accesso facilie al sistema di stampa
+ Comment[ja]=å°åˆ·ã‚·ã‚¹ãƒ†ãƒ ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã™
+ Comment[lo]=ເຂົ້າໃຊ້ລະບົບàºàº²àº™àºžàº´àº¡àº¢à»ˆàº²àº‡à»„ວ
+ Comment[lt]=Lengvas priÄ—jimas prie spausdinimo sistemos
+@@ -132,7 +131,6 @@
+ Comment[ven]=Madzhenele o leluwaho kha maitele au phirintha
+ Comment[vi]=Dá»… dà ng truy cáºp đến hệ thống in
+ Comment[xh]=Kulula ukunikeza kwindlela yoshicilelo
+-Comment[xx]=xxEasy access to the print systemxx
+ Comment[zh_CN]=è½»æ¾è®¿é—®æ‰“å°ç³»ç»Ÿ
+ Comment[zh_TW]=方便å˜å–列å°ç³»çµ±
+ Comment[zu]=Ukungena kalula kwisistimu yokushicilela
+diff -Nru kdebase-release-3.4.0/kicker/menuext/konq-profiles/konquerormenu.desktop kdebase-branch-3.4/kicker/menuext/konq-profiles/konquerormenu.desktop
+--- kdebase-release-3.4.0/kicker/menuext/konq-profiles/konquerormenu.desktop 2005-02-18 23:27:09.000000000 -0500
++++ kdebase-branch-3.4/kicker/menuext/konq-profiles/konquerormenu.desktop 2005-03-30 01:47:50.000000000 -0500
+@@ -11,6 +11,7 @@
+ Name[cy]=Proffilau Konqueror
+ Name[da]=Konqueror-profiler
+ Name[de]=Konqueror-Profile
++Name[el]=Î Ïοφίλ του Konqueror
+ Name[eo]=Konkeranta agordaro
+ Name[es]=Perfiles de Konqueror
+ Name[et]=Konquerori profiilid
+@@ -43,13 +44,12 @@
+ Name[sk]=Profily pre Konqueror
+ Name[sl]=Profili Konquerorja
+ Name[sr]=Konqueror-ови профили
+-Name[sr@Latn]=Konqueror-ови профили
++Name[sr@Latn]=Konqueror-ovi profili
+ Name[sv]=Konqueror-profiler
+ Name[ta]=Konqueror விவரகà¯à®•à¯à®±à®¿à®ªà¯à®ªà¯à®•ளà¯
+ Name[tr]=Konqueror Profilleri
+ Name[uk]=Профілі Konqueror
+ Name[uz]=Konqueror профиллари
+-Name[xx]=xxKonqueror Profilesxx
+ Name[zh_CN]=Konqueror é…置文件
+ Comment=Easy access to the Konqueror profiles
+ Comment[be]=Зручны доÑтуп да профілÑÑž Konqueror
+@@ -94,13 +94,12 @@
+ Comment[sk]=Jednoduchý prÃstup k profilom pre Konqueror
+ Comment[sl]=Preprost dostop do profilov Konquerorja
+ Comment[sr]=Лак приÑтуп Konqueror-овим профилима
+-Comment[sr@Latn]=Лак приÑтуп Konqueror-овим профилима
++Comment[sr@Latn]=Lak pristup Konqueror-ovim profilima
+ Comment[sv]=Enkel åtkomst till Konquerors profiler
+ Comment[ta]=Konqueror விவரகà¯à®•à¯à®±à®¿à®ªà¯à®ªà¯à®•ளை இயகà¯à®• எளிதானதà¯
+ Comment[tr]=Konqueror profillerine kolay eriÅŸim
+ Comment[uk]=ПроÑтий доÑтуп до профілів Konqueror
+ Comment[uz]=Konqueror профилларига енгил йўл
+-Comment[xx]=xxEasy access to the Konqueror profilesxx
+ Comment[zh_CN]=è½»æ¾è®¿é—® Konqueror é…置文件
+ Icon=konqueror
+
+diff -Nru kdebase-release-3.4.0/kicker/menuext/konsole/konsole_mnu.cpp kdebase-branch-3.4/kicker/menuext/konsole/konsole_mnu.cpp
+--- kdebase-release-3.4.0/kicker/menuext/konsole/konsole_mnu.cpp 2004-12-26 16:37:26.000000000 -0500
++++ kdebase-branch-3.4/kicker/menuext/konsole/konsole_mnu.cpp 2005-04-01 15:50:26.000000000 -0500
+@@ -27,6 +27,7 @@
+ #include <kglobal.h>
+ #include <kapplication.h>
+ #include <krun.h>
++#include <kshell.h>
+
+ #include <stdlib.h>
+ #include <dirent.h>
+@@ -112,6 +113,7 @@
+ }
+
+ exec = KRun::binaryName(exec, false);
++ exec = KShell::tildeExpand(exec);
+ QString pexec = KGlobal::dirs()->findExe(exec);
+ if (text.isEmpty() || conf.readEntry("Type") != "KonsoleApplication"
+ || ( !exec.isEmpty() && pexec.isEmpty() ) )
+diff -Nru kdebase-release-3.4.0/kicker/menuext/konsole/konsolemenu.desktop kdebase-branch-3.4/kicker/menuext/konsole/konsolemenu.desktop
+--- kdebase-release-3.4.0/kicker/menuext/konsole/konsolemenu.desktop 2005-02-10 23:52:12.000000000 -0500
++++ kdebase-branch-3.4/kicker/menuext/konsole/konsolemenu.desktop 2005-03-07 09:15:51.000000000 -0500
+@@ -63,7 +63,6 @@
+ Name[ven]=Zwitenwa zwa theminala
+ Name[vi]=Các session đầu cuối
+ Name[xh]=Intlanganiso Yesiphelo sendlela
+-Name[xx]=xxTerminal Sessionsxx
+ Name[zh_CN]=终端会è¯
+ Name[zh_TW]=終端機工作階段
+ Name[zu]=Iziqendu Zangaphandle
+@@ -123,7 +122,6 @@
+ Comment[uz]=Терминал ÑмулÑтори
+ Comment[ven]=Uedzisela ha theminala
+ Comment[xh]=Ulinganiso-Lwesiphelo sendlela
+-Comment[xx]=xxTerminal-Emulationxx
+ Comment[zh_CN]=终端仿真器
+ Comment[zh_TW]=終端機模擬程å¼
+ Comment[zu]=Ukulingisa-Kwangaphandle
+diff -Nru kdebase-release-3.4.0/kicker/menuext/prefmenu/prefmenu.cpp kdebase-branch-3.4/kicker/menuext/prefmenu/prefmenu.cpp
+--- kdebase-release-3.4.0/kicker/menuext/prefmenu/prefmenu.cpp 2005-02-06 15:53:51.000000000 -0500
++++ kdebase-branch-3.4/kicker/menuext/prefmenu/prefmenu.cpp 2005-04-03 17:32:09.000000000 -0400
+@@ -300,7 +300,7 @@
+
+ KServiceGroup::List list = root->entries(true, true, true,
+ KickerSettings::detailedMenuEntries() &&
+- KickerSettings::detailedEntriesNamesFirst());
++ !KickerSettings::detailedEntriesNamesFirst());
+
+ if (list.isEmpty())
+ {
+diff -Nru kdebase-release-3.4.0/kicker/menuext/prefmenu/prefmenu.desktop kdebase-branch-3.4/kicker/menuext/prefmenu/prefmenu.desktop
+--- kdebase-release-3.4.0/kicker/menuext/prefmenu/prefmenu.desktop 2005-02-10 23:52:12.000000000 -0500
++++ kdebase-branch-3.4/kicker/menuext/prefmenu/prefmenu.desktop 2005-03-26 02:37:43.000000000 -0500
+@@ -68,7 +68,6 @@
+ Name[vi]=Sở thÃch
+ Name[wa]=Preferinces
+ Name[xh]=Iinketho
+-Name[xx]=xxPreferencesxx
+ Name[zh_CN]=首选项
+ Name[zh_TW]=å好è¨å®š
+ Name[zu]=Okuncanyelwayo
+@@ -93,7 +92,7 @@
+ Comment[fa]=دسترسی آسان به مرکز کنترل
+ Comment[fi]=Ohjauskeskuksen moduulit
+ Comment[fr]=Accès rapide aux modules du centre de configuration
+-Comment[fy]=Snelle tagong ta de ynstellingsmodules
++Comment[fy]=Snelle tagong ta de Konfiguraasjemodules
+ Comment[gl]=Acceso doado ós módulos do Centro de Control
+ Comment[he]=גישה מהירה ×œ×ž×•×“×•×œ×™× ×©×œ מרכז הבקרה
+ Comment[hi]=नियंतà¥à¤°à¤£ केंदà¥à¤° मॉडà¥à¤¯à¥‚लà¥à¤¸ पर आसान पहà¥à¤à¤š
+@@ -133,7 +132,6 @@
+ Comment[ven]=U dzhena ho leluwaho kha modulu wa senthara ya ndangulo
+ Comment[vi]=Dá»… dà ng truy cáºp đến modules cá»§a trung tâm Ä‘iá»u khiển
+ Comment[xh]=Unikezelo olulula kumnqongo womlinganiselo Kulawulo Osembindini
+-Comment[xx]=xxEasy access to the Control Center modulesxx
+ Comment[zh_CN]=è½»æ¾è®¿é—®æŽ§åˆ¶ä¸å¿ƒæ¨¡å—
+ Comment[zh_TW]=方便å˜å–使用控制ä¸å¿ƒæ¨¡
+ Comment[zu]=Ukungena kalula ezingxenyeni ze-Control Center
+diff -Nru kdebase-release-3.4.0/kicker/menuext/recentdocs/recentdocs.desktop kdebase-branch-3.4/kicker/menuext/recentdocs/recentdocs.desktop
+--- kdebase-release-3.4.0/kicker/menuext/recentdocs/recentdocs.desktop 2005-02-10 23:52:12.000000000 -0500
++++ kdebase-branch-3.4/kicker/menuext/recentdocs/recentdocs.desktop 2005-03-07 09:15:51.000000000 -0500
+@@ -63,7 +63,6 @@
+ Name[ven]=Manwalwa a Zwino
+ Name[vi]=Tà i liệu mở gần đây
+ Name[xh]=Uxwebhu Olusandukusebenziswa
+-Name[xx]=xxRecent Documentsxx
+ Name[zh_CN]=最近文档
+ Name[zh_TW]=最近的文件
+ Name[zu]=Ushicilelo olusanda kuvulwa
+@@ -128,7 +127,6 @@
+ Comment[ven]=Manwalwa a zwino enaa shumisa
+ Comment[vi]=Tà i liệu mới sỠdụng
+ Comment[xh]=Amaxwebhu owasebenzisileyo
+-Comment[xx]=xxRecent documents you have usedxx
+ Comment[zh_CN]=您最近的文档
+ Comment[zh_TW]=您最近使用éŽçš„æ–‡ä»¶
+ Comment[zu]=Ushicilelo olusanda kusetshenziswa
+diff -Nru kdebase-release-3.4.0/kicker/menuext/remote/remotemenu.desktop kdebase-branch-3.4/kicker/menuext/remote/remotemenu.desktop
+--- kdebase-release-3.4.0/kicker/menuext/remote/remotemenu.desktop 2005-02-23 00:05:49.000000000 -0500
++++ kdebase-branch-3.4/kicker/menuext/remote/remotemenu.desktop 2005-03-30 01:47:50.000000000 -0500
+@@ -4,12 +4,15 @@
+ Name[bg]=Мрежови директории
+ Name[bn]=নেটওয়ারà§à¦• ফোলà§à¦¡à¦¾à¦°
+ Name[br]=Renkelloù rouedad
++Name[bs]=Mrežni folderi
+ Name[ca]=Carpetes de xarxa
+ Name[cs]=SÃÅ¥ové složky
+ Name[da]=Netværksmapper
+ Name[de]=Netzwerkordner
++Name[el]=Δικτυακοί φάκελοι
+ Name[es]=Carpetas de red
+ Name[et]=Võrgukataloogid
++Name[eu]=Sareko karpetak
+ Name[fi]=Verkkokansiot
+ Name[fr]=Dossiers réseau
+ Name[fy]=Netwurkmappen
+@@ -19,6 +22,7 @@
+ Name[hu]=Hálózati mappák
+ Name[is]=Netmöppur
+ Name[it]=Cartelle di rete
++Name[ja]=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ãƒ•ォルダ
+ Name[lt]=Tinklo aplankai
+ Name[nb]=Nettverksmapper
+ Name[nl]=Netwerkmappen
+@@ -29,24 +33,27 @@
+ Name[pt_BR]=Pastas de Rede
+ Name[ru]=Сетевые папки
+ Name[se]=Fierpmádatmáhpat
++Name[sk]=SieÅ¥ové prieÄinky
+ Name[sl]=Omrežne mape
+ Name[sr]=Мрежни директоријумиа
+-Name[sr@Latn]=Мрежни директоријумиа
++Name[sr@Latn]=Mrežni direktorijumia
+ Name[sv]=Nätverkskataloger
+ Name[ta]=வலைபà¯à®ªà®¿à®©à¯à®©à®²à¯ அடைவà¯à®•ளà¯
+ Name[tr]=AÄŸ Dizinleri
+ Name[uk]=Мережні теки
+-Name[xx]=xxNetwork Foldersxx
+ Name[zh_CN]=网络文件夹
+ Comment=Easy access to network folders
+ Comment[bg]=ДоÑтъп до мрежови директории
+ Comment[bn]=সহজে বিà¦à¦¿à¦¨à§à¦¨ নেটওয়ারà§à¦• ফোলà§à¦¡à¦¾à¦° বà§à¦¯à¦¬à¦¹à¦¾à¦° করà§à¦¨
++Comment[bs]=Brz pristup do mrežnih foldera
+ Comment[ca]=Accés fà cil a les carpetes de xarxa
+ Comment[cs]=Jednoduchý pÅ™Ãstup k sÃÅ¥ovým složkám
+ Comment[da]=Nem adgang til netværksmapper
+ Comment[de]=Vereinfachter Zugriff auf Netzwerkordner
++Comment[el]=ΕÏκολη Ï€Ïόσβαση στους δικτυακοÏÏ‚ φακÎλους
+ Comment[es]=Acceso sencillo a carpetas de red
+ Comment[et]=Lihtne ligipääs võrgukataloogidele
++Comment[eu]=Sareko karpetetan sarbide erraza
+ Comment[fi]=Helppokäyttöiset verkkokansiot
+ Comment[fr]=Accès rapide aux dossiers réseau
+ Comment[fy]=Ienfâldige tagong ta netwurkmappen
+@@ -54,6 +61,7 @@
+ Comment[hu]=Egyszerű hozzáférés hálózati mappákhoz
+ Comment[is]=Einföld leið að netmöppum
+ Comment[it]=Accesso facile alle cartelle di rete
++Comment[ja]=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ フォルダã¸ã®ç°¡æ˜“アクセス
+ Comment[lt]=Lengvas priėjimas prie tinklo aplankų
+ Comment[nb]=Enkel tilgang til nettverksmappene
+ Comment[nl]=Eenvoudige toegang tot netwerkmappen
+@@ -63,13 +71,13 @@
+ Comment[pt_BR]=Acesso fácil às pastas de rede
+ Comment[ru]=Легкий доÑтуп к Ñетевым папкам
+ Comment[se]=Ãlkes geaidnu fierpmádatmáhpaide
++Comment[sk]=Jednoduchý prÃstup k sieÅ¥ovým prieÄinkom
+ Comment[sl]=Preprost dostop do omrežnih map
+ Comment[sr]=Лак приÑтуп мрежним директоријумима
+-Comment[sr@Latn]=Лак приÑтуп мрежним директоријумима
++Comment[sr@Latn]=Lak pristup mrežnim direktorijumima
+ Comment[sv]=Enkel åtkomst till nätverkskataloger
+ Comment[ta]=வலைபà¯à®ªà®¿à®©à¯à®©à®²à¯ அடைவà¯à®•ளà¯à®•à¯à®•௠சà¯à®²à®ª அணà¯à®•லà¯
+ Comment[uk]=ПроÑтий доÑтуп до мережевих тек
+-Comment[xx]=xxEasy access to network foldersxx
+ Comment[zh_CN]=è½»æ¾è®¿é—®ç½‘络文件夹
+ Icon=network
+
+diff -Nru kdebase-release-3.4.0/kicker/menuext/system/systemmenu.desktop kdebase-branch-3.4/kicker/menuext/system/systemmenu.desktop
+--- kdebase-release-3.4.0/kicker/menuext/system/systemmenu.desktop 2005-02-23 00:05:49.000000000 -0500
++++ kdebase-branch-3.4/kicker/menuext/system/systemmenu.desktop 2005-03-30 01:47:50.000000000 -0500
+@@ -64,19 +64,21 @@
+ Name[vi]=Hệ Thống
+ Name[wa]=Sistinme
+ Name[xh]=Indlela esestyenziswayo
+-Name[xx]=xxSystemxx
+ Name[zh_CN]=系统
+ Name[zh_TW]=系統
+ Name[zu]=Isistimu
+ Comment=Easy access to system places
+ Comment[bg]=ДоÑтъп до ÑиÑтемните директории
+ Comment[bn]=সহজে সিসà§à¦Ÿà§‡à¦® অবসà§à¦¥à¦¾à¦¨à¦—à§à¦²à¦¿ বà§à¦¯à¦¬à¦¹à¦¾à¦° করà§à¦¨
++Comment[bs]=Brz pristup do sistemskih lokacija
+ Comment[ca]=Accés fà cil als llocs del sistema
+ Comment[cs]=Jednoduchý pÅ™Ãstup k systémovým mÃstům
+ Comment[da]=Nem adgang til systemets steder
+ Comment[de]=Einfacher Zugriff auf Systemordner
++Comment[el]=ΕÏκολη Ï€Ïόσβαση στις τοποθεσίες συστήματος
+ Comment[es]=Acceso sencillo a lugares del sistema
+ Comment[et]=Lihtne ligipääs süsteemi osadele
++Comment[eu]=Sistemaren lekuetara sarbide erraza
+ Comment[fi]=Helppokäyttöiset systeemikansiot
+ Comment[fr]=Accès rapide aux emplacements du système
+ Comment[fy]=Snelle tagong ta de systeemplakken
+@@ -84,6 +86,7 @@
+ Comment[hu]=Egyszerű hozzáférés a rendszerkönyvtárakhoz
+ Comment[is]=Fljótleg leið að kerfishlutum
+ Comment[it]=Accesso facile agli indirizzi di sistema
++Comment[ja]=システム内ã¸ã®ç°¡å˜ã‚¢ã‚¯ã‚»ã‚¹
+ Comment[lt]=Lengvas priėjimas prie sistemos vietų
+ Comment[nb]=Enkel tilgang til systemsteder
+ Comment[nl]=Snelle toegang tot de systeemplaatsen
+@@ -93,13 +96,13 @@
+ Comment[pt_BR]=Acesso fácil a locais do Sistema
+ Comment[ru]=Легкий доÑтуп к ÑиÑтемным меÑтам
+ Comment[se]=Alkes geaidnu vuogádatbáikkiide
++Comment[sk]=Jednoduchý prÃstup k systémovým oblastiam
+ Comment[sl]=Preprost dostop do sistemskih mest
+ Comment[sr]=Лак приÑтуп ÑиÑтемÑким меÑтима
+-Comment[sr@Latn]=Лак приÑтуп ÑиÑтемÑким меÑтима
++Comment[sr@Latn]=Lak pristup sistemskim mestima
+ Comment[sv]=Enkel åtkomst till systemplatser
+ Comment[ta]=அமைபà¯à®ªà¯ இடஙà¯à®•ளà¯à®•à¯à®•௠சà¯à®²à®ª அணà¯à®•லà¯
+ Comment[uk]=ПроÑтий доÑтуп до ÑиÑтемних міÑць
+-Comment[xx]=xxEasy access to system placesxx
+ Comment[zh_CN]=è½»æ¾è®¿é—®ç³»ç»Ÿä½ç½®
+ Icon=system
+
+diff -Nru kdebase-release-3.4.0/kicker/menuext/tom/tom.desktop kdebase-branch-3.4/kicker/menuext/tom/tom.desktop
+--- kdebase-release-3.4.0/kicker/menuext/tom/tom.desktop 2005-01-31 03:35:46.000000000 -0500
++++ kdebase-branch-3.4/kicker/menuext/tom/tom.desktop 2005-03-07 09:15:52.000000000 -0500
+@@ -4,7 +4,6 @@
+ Name[bg]=Задачно меню
+ Name[eo]=PTMS
+ Name[hi]=टीओà¤à¤®
+-Name[xx]=xxTOMxx
+ Comment=A task oriented menu system
+ Comment[ar]=نظام قوائم وظيÙيّ المنØÙ‰
+ Comment[be]=СыÑÑ‚Ñма мÑню Ð°Ñ€Ñ‹ÐµÐ½Ñ‚Ð°Ð²Ð°Ð½Ð°Ñ Ð½Ð° выкананьне задач
+@@ -55,7 +54,6 @@
+ Comment[tr]=Görev yönelimli bir menü sistemi
+ Comment[uk]=СиÑтема меню орієнтована на завданнÑ
+ Comment[vi]=Hệ thực đơn hướng công vụ (task oriented)
+-Comment[xx]=xxA task oriented menu systemxx
+ Comment[zh_CN]=é¢å‘任务的èœå•系统
+ Comment[zh_TW]=一個工作導å‘çš„é¸å–®ç³»çµ±
+ Icon=kmenu
+diff -Nru kdebase-release-3.4.0/kicker/panel.desktop kdebase-branch-3.4/kicker/panel.desktop
+--- kdebase-release-3.4.0/kicker/panel.desktop 2005-02-04 23:15:21.000000000 -0500
++++ kdebase-branch-3.4/kicker/panel.desktop 2005-03-07 09:15:44.000000000 -0500
+@@ -65,7 +65,6 @@
+ Name[ven]=Phanele ya KDE
+ Name[vi]=Khung KDE
+ Name[xh]=Ipanel ye KDE
+-Name[xx]=xxKDE Panelxx
+ Name[zh_CN]=KDE 颿¿
+ Name[zh_TW]=KDE 颿¿
+ Name[zu]=Iwindi lemininingwane le-KDE
+diff -Nru kdebase-release-3.4.0/kicker/share/kickertip.cpp kdebase-branch-3.4/kicker/share/kickertip.cpp
+--- kdebase-release-3.4.0/kicker/share/kickertip.cpp 2005-02-18 00:32:48.000000000 -0500
++++ kdebase-branch-3.4/kicker/share/kickertip.cpp 2005-03-04 12:14:40.000000000 -0500
+@@ -72,6 +72,11 @@
+ MaskEffect mEff,
+ int durationMs)
+ {
++ if (!tippingEnabled())
++ {
++ return;
++ }
++
+ delete m_richText;
+ m_richText = new QSimpleRichText("<qt><nobr><h3>" + title + "</h3><p>" +
+ subtext + "</p></qt>",
+diff -Nru kdebase-release-3.4.0/kicker/taskbar/taskbar.cpp kdebase-branch-3.4/kicker/taskbar/taskbar.cpp
+--- kdebase-release-3.4.0/kicker/taskbar/taskbar.cpp 2005-02-05 17:53:00.000000000 -0500
++++ kdebase-branch-3.4/kicker/taskbar/taskbar.cpp 2005-03-12 17:00:40.000000000 -0500
+@@ -585,27 +585,43 @@
+ {
+ bwidth = contentsRect().width() / bpr;
+ if (bwidth > TaskBarSettings::maximumButtonWidth())
++ {
+ bwidth = TaskBarSettings::maximumButtonWidth();
++ }
+ }
+
+ // layout containers
++
++ // for taskbars at the bottom, we need to ensure that the bottom
++ // buttons touch the bottom of the screen. since we layout from
++ // top to bottom this means seeing if we have any padding and
++ // popping it on the top. this preserves Fitt's Law behaviour
++ // for taskbars on the bottom
++ int topPadding = 0;
++ if (arrowType == UpArrow)
++ {
++ topPadding = contentsRect().height() % (rows * bheight);
++ }
++
+ int i = 0;
+ bool reverseLayout = QApplication::reverseLayout();
+- for ( TaskContainerIterator it(list); it.current(); ++it )
++ for (TaskContainerIterator it(list); it.current(); ++it, i++)
+ {
+ TaskContainer* c = it.current();
+
+ int row = i % rows;
++
+ c->setArrowType(arrowType);
+ c->resize( bwidth, bheight );
+ c->show();
+
+ int x = ( i / rows ) * bwidth;
+ if (reverseLayout)
++ {
+ x = contentsRect().width() - x - bwidth;
++ }
+
+- moveChild( c, x, row * bheight );
+- i++;
++ moveChild(c, x, (row * bheight) + topPadding);
+ }
+ }
+ else // vertical layout
+diff -Nru kdebase-release-3.4.0/kicker/ui/service_mnu.cpp kdebase-branch-3.4/kicker/ui/service_mnu.cpp
+--- kdebase-release-3.4.0/kicker/ui/service_mnu.cpp 2005-02-21 01:43:54.000000000 -0500
++++ kdebase-branch-3.4/kicker/ui/service_mnu.cpp 2005-04-03 17:32:10.000000000 -0400
+@@ -248,7 +248,7 @@
+ excludeNoDisplay_,
+ true,
+ KickerSettings::detailedMenuEntries() &&
+- KickerSettings::detailedEntriesNamesFirst());
++ !KickerSettings::detailedEntriesNamesFirst());
+
+ if (list.isEmpty()) {
+ setItemEnabled(insertItem(i18n("No Entries")), false);
+diff -Nru kdebase-release-3.4.0/kioslave/cgi/kcmcgi/kcmcgi.desktop kdebase-branch-3.4/kioslave/cgi/kcmcgi/kcmcgi.desktop
+--- kdebase-release-3.4.0/kioslave/cgi/kcmcgi/kcmcgi.desktop 2005-02-21 13:17:56.000000000 -0500
++++ kdebase-branch-3.4/kioslave/cgi/kcmcgi/kcmcgi.desktop 2005-03-07 09:15:52.000000000 -0500
+@@ -68,7 +68,6 @@
+ Name[uz]=CGI Ñкриптлар
+ Name[ven]=Zwikiriputi zwa CGI
+ Name[xh]=Amagama ashicilelwe phantsi CGI
+-Name[xx]=xxCGI Scriptsxx
+ Name[zh_CN]=CGI 脚本
+ Name[zh_TW]=CGI 命令稿
+ Name[zu]=Izikript ze-CGI
+@@ -132,7 +131,6 @@
+ Comment[ven]=Dzudzanyani phuli CGI KIO
+ Comment[vi]=Cấu hình CGI KIO tớ
+ Comment[xh]=Qwlalsela i CGI KIO slave
+-Comment[xx]=xxConfigure the CGI KIO slavexx
+ Comment[zh_CN]=é…ç½® CGI KIO 仆人
+ Comment[zh_TW]=è¨å®š CGI KIO slave
+ Comment[zu]=Hlanganisela i-CGI KIO slave
+@@ -189,7 +187,6 @@
+ Keywords[uz]=CGI,KIO,Слейв,Йўллар
+ Keywords[ven]=CGI,KIO,Phuli,Ludila
+ Keywords[vi]=CGI,KIO,Tá»›,ÄÆ°á»ng dẫn
+-Keywords[xx]=xxCGI,KIO,Slave,Pathsxx
+ Keywords[zh_CN]=CGI,KIO,Slave,Paths,路径
+ Keywords[zh_TW]=CGI,KIO,Slave,Paths,路徑
+ Keywords[zu]=CGI,KIO,Slave,Izindlela
+diff -Nru kdebase-release-3.4.0/kioslave/fish/fish.protocol kdebase-branch-3.4/kioslave/fish/fish.protocol
+--- kdebase-release-3.4.0/kioslave/fish/fish.protocol 2005-02-23 00:05:49.000000000 -0500
++++ kdebase-branch-3.4/kioslave/fish/fish.protocol 2005-03-30 01:47:51.000000000 -0500
+@@ -13,12 +13,15 @@
+ Icon=remote
+ Description=A kioslave for the FISH protocol
+ Description[bn]=ফিশ (FISH) পà§à¦°à§‹à¦Ÿà§‹à¦•ল-à¦à¦° জনà§à¦¯ à¦à¦•টি kioslave
++Description[bs]=kioslave za FISH protokol
+ Description[ca]=Un kioslave pel protocol FISH
+ Description[cs]=Pomocný protokol FISH
+ Description[da]=En kioslave for FISH-protokollen
+ Description[de]=Ein-/Ausgabemodul für das FISH-Protokoll
++Description[el]=Ένας kioslave για το Ï€Ïωτόκολλο FISH
+ Description[es]=Un kioslave para el protocolo FISH
+ Description[et]=Protokolli FISH IO-moodul
++Description[eu]=FISH protokolorako kioslavea
+ Description[fi]=Liitäntä FISH-protokollalle
+ Description[fr]=Un kioslave pour le protocole FISH
+ Description[fy]=In kioslave foar it FISH protokol
+@@ -26,6 +29,7 @@
+ Description[hu]=KDE-protokoll a FISH protokollhoz
+ Description[is]=kioslave fyrir FISH samskiptaregluna
+ Description[it]=Un kioslave per il protocollo FISH
++Description[ja]=FISH プãƒãƒˆã‚³ãƒ«ã®ãŸã‚ã® kioslave
+ Description[lt]=Kiovergas FISH protokolui
+ Description[nb]=En IU-slave for FISH-protokollen
+ Description[nl]=Een kioslave voor het protocol FISH
+@@ -36,12 +40,12 @@
+ Description[pt_BR]=Uma implementação para o protocolo FISH
+ Description[ru]=Модульфайловой ÑиÑтемы Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ð° FISH
+ Description[se]=SO-šláva FISH-protokolla várás
++Description[sk]=IO klient pre protokol FISH
+ Description[sl]=kioslave za protokol FISH
+ Description[sr]=Kioslave за протокол FISH
+-Description[sr@Latn]=Kioslave за протокол FISH
++Description[sr@Latn]=Kioslave za protokol FISH
+ Description[sv]=En I/O-slav för protokollet FISH
+ Description[ta]=FISH நெறிமà¯à®±à¯ˆà®•à¯à®•ான ஒர௠கà¯à®¯à¯‹à®¸à¯à®²à¯‡à®µà¯
+ Description[tr]=FISH protokolü için kioslave
+ Description[uk]=Підлеглий B/Ð’ Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ñƒ FISH
+-Description[xx]=xxA kioslave for the FISH protocolxx
+ DocPath=kioslave/fish.html
+diff -Nru kdebase-release-3.4.0/kioslave/mac/mac.protocol kdebase-branch-3.4/kioslave/mac/mac.protocol
+--- kdebase-release-3.4.0/kioslave/mac/mac.protocol 2005-02-23 00:05:49.000000000 -0500
++++ kdebase-branch-3.4/kioslave/mac/mac.protocol 2005-03-30 01:47:51.000000000 -0500
+@@ -8,12 +8,15 @@
+ defaultMimetype=application/octet-stream
+ Description=A kioslave for MacOS HFS+ partitions
+ Description[bn]=মà§à¦¯à¦¾à¦•-ও-à¦à¦¸ HFS+ পারà§à¦Ÿà¦¿à¦¶à¦¨-à¦à¦° জনà§à¦¯ à¦à¦•টি kioslave
++Description[bs]=kioslave za MacOS HFS+ particije
+ Description[ca]=Un kioslave per a particions MacOS HFS+
+ Description[cs]=Pomocný protokol pro diskové oddÃly MacOS HFS+
+ Description[da]=En kioslave for MacOS HFS+ partitioner
+ Description[de]=Ein-/Ausgabemodul für MacOS HFS+ Partitionen
++Description[el]=Ένας kioslave για κατατμήσεις MacOS HFS+
+ Description[es]=Un kioslave para particiones MacOS HFS+
+ Description[et]=MacOS-i HFS+-partitsioonide IO-moodul
++Description[eu]=MacOS HFS+ zatiketetarako kioslavea
+ Description[fi]=Liitäntä MacOS HFS+ osioinneille
+ Description[fr]=Un kioslave pour les partitions MacOS HFS+
+ Description[fy]=In kioslave foar MacOS HFS+-partities
+@@ -21,6 +24,7 @@
+ Description[hu]=KDE-protokoll MacOS HFS+ partÃciók kezeléséhez
+ Description[is]=kioslave fyrir MacOS HFS+ disksneiðar
+ Description[it]=Un kioslave per partizioni MacOS HFS+
++Description[ja]=MacOS HFS+ パーティションã®ãŸã‚ã® kioslave
+ Description[lt]=Kiovergas MacOS HFS+ dalmenims
+ Description[nb]=En IU-slave for MacOS HFS+-partisjoner
+ Description[nl]=Een kioslave voor MacOS HFS+-partities
+@@ -31,13 +35,13 @@
+ Description[pt_BR]=Um protocolo para as partições HFS+ do MacOS
+ Description[ru]=Модуль ввода-вывода Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑиÑтемы MacOS HFS+
+ Description[se]=SO-šláva MacOS HFS+-partišuvnnaid várás
++Description[sk]=IO klient pre oddiely MacOS HFS+
+ Description[sl]=kioslave za razdelke MacOS HFS+
+ Description[sr]=Kioslave за MacOS-ове HFS+ партиције
+-Description[sr@Latn]=Kioslave за MacOS-ове HFS+ партиције
++Description[sr@Latn]=Kioslave za MacOS-ove HFS+ particije
+ Description[sv]=En I/O-slav för MacOS HFS+ partitioner
+ Description[ta]=MacOS HFS+ partitionsகà¯à®•௠ஒர௠கà¯à®¯à¯‹à®¸à¯à®²à¯‡à®µà¯
+ Description[tr]=MacOS HFS+ bölümleri için kioslave
+ Description[uk]=Підлеглий B/Ð’ Ð´Ð»Ñ Ñ€Ð¾Ð·Ð´Ñ–Ð»Ñ–Ð² MacOS HFS+
+-Description[xx]=xxA kioslave for MacOS HFS+ partitionsxx
+ Icon=mac
+ DocPath=kioslave/mac.html
+diff -Nru kdebase-release-3.4.0/kioslave/man/kmanpart.desktop kdebase-branch-3.4/kioslave/man/kmanpart.desktop
+--- kdebase-release-3.4.0/kioslave/man/kmanpart.desktop 2005-02-10 23:52:13.000000000 -0500
++++ kdebase-branch-3.4/kioslave/man/kmanpart.desktop 2005-03-07 09:15:53.000000000 -0500
+@@ -61,7 +61,6 @@
+ Comment[vi]=Trình xem Troff nhúng được
+ Comment[wa]=Ravalåve håyneu di fitchîs Troff
+ Comment[xh]=Umboniseli we Troff Elungiselekayo
+-Comment[xx]=xxEmbeddable Troff Viewerxx
+ Comment[zh_TW]=å¯åµŒå…¥çš„ Troff 檢視元件
+ Comment[zu]=Umbukisi we-Troff Oshuthekiwe
+ MimeType=application/x-troff
+@@ -73,6 +72,5 @@
+ Name[ro]=Componentă KMan
+ Name[sv]=Kman-del
+ Name[th]=คู่มืภK
+-Name[xx]=xxKManPartxx
+ ServiceTypes=KParts/ReadOnlyPart,Browser/View
+ X-KDE-Library=libkmanpart
+diff -Nru kdebase-release-3.4.0/kioslave/media/configure.in.in kdebase-branch-3.4/kioslave/media/configure.in.in
+--- kdebase-release-3.4.0/kioslave/media/configure.in.in 2005-02-15 16:08:41.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/configure.in.in 2005-03-30 16:25:59.000000000 -0500
+@@ -13,9 +13,9 @@
+
+ if test "x$hal_test" = "xyes" ; then
+
+-########### Check for the HAL
++########### Check for the HAL, version 0.4.x
+
+- AC_MSG_CHECKING(for the HAL)
++ AC_MSG_CHECKING(for the HAL 0.4)
+
+ hal_inc=NOTFOUND
+ hal_lib=NOTFOUND
+@@ -37,6 +37,15 @@
+ hal_lib=FOUND
+ fi
+
++ if test -r $hal_incdir/libhal.h ; then
++ hal_version=5
++ grep LibHalFunctions $hal_incdir/libhal.h \
++ > /dev/null 2>&1 && hal_version=4
++ if test $hal_version = 5 ; then
++ hal_lib=NOT_FOUND
++ fi
++ fi
++
+
+ if [test $hal_inc = FOUND] && [test $hal_lib = FOUND] ; then
+ AC_MSG_RESULT(headers $hal_incdir libraries $hal_libdir)
+diff -Nru kdebase-release-3.4.0/kioslave/media/kdedmodule/halbackend.cpp kdebase-branch-3.4/kioslave/media/kdedmodule/halbackend.cpp
+--- kdebase-release-3.4.0/kioslave/media/kdedmodule/halbackend.cpp 2005-02-14 10:47:23.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/kdedmodule/halbackend.cpp 2005-03-30 16:25:59.000000000 -0500
+@@ -267,6 +267,9 @@
+
+ /* Get device information from libhal-storage */
+ HalVolume* halVolume = hal_volume_from_udi(m_halContext, udi);
++ if (!halVolume)
++ return;
++
+ QString driveUdi = hal_volume_get_storage_device_udi(halVolume);
+ HalDrive* halDrive = hal_drive_from_udi(m_halContext, driveUdi.ascii());
+
+@@ -382,6 +385,8 @@
+ return;
+
+ HalDrive* halDrive = hal_drive_from_udi(m_halContext, udi);
++ if (!halDrive)
++ return;
+ int numVolumes;
+ char** volumes = hal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes);
+ HalVolume* halVolume = NULL;
+diff -Nru kdebase-release-3.4.0/kioslave/media/kdedmodule/linuxcdpolling.cpp kdebase-branch-3.4/kioslave/media/kdedmodule/linuxcdpolling.cpp
+--- kdebase-release-3.4.0/kioslave/media/kdedmodule/linuxcdpolling.cpp 2005-02-21 04:13:51.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/kdedmodule/linuxcdpolling.cpp 2005-03-25 17:04:18.000000000 -0500
+@@ -84,13 +84,15 @@
+ {
+ return m_type != None
+ && m_type != Unknown
+- && m_type != UnknownType;
++ && m_type != UnknownType
++ && m_type != Broken;
+ }
+
+ bool DiscType::isDisc() const
+ {
+ return m_type != None
+- && m_type != Unknown;
++ && m_type != Unknown
++ && m_type != Broken;
+ }
+
+ bool DiscType::isNotDisc() const
+@@ -145,7 +147,7 @@
+ virtual void run()
+ {
+ kdDebug() << "PollingThread(" << m_dev << ") start" << endl;
+- while (!m_stop)
++ while (!m_stop && m_lastPollType!=DiscType::Broken)
+ {
+ m_mutex.lock();
+ DiscType type = m_lastPollType;
+@@ -394,7 +396,7 @@
+
+ // open the device
+ fd = open(devNode, O_RDONLY | O_NONBLOCK);
+- if (fd < 0) return DiscType::Unknown;
++ if (fd < 0) return DiscType::Broken;
+
+ switch (ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT))
+ {
+diff -Nru kdebase-release-3.4.0/kioslave/media/kdedmodule/linuxcdpolling.h kdebase-branch-3.4/kioslave/media/kdedmodule/linuxcdpolling.h
+--- kdebase-release-3.4.0/kioslave/media/kdedmodule/linuxcdpolling.h 2004-12-21 04:33:18.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/kdedmodule/linuxcdpolling.h 2005-03-25 17:04:18.000000000 -0500
+@@ -29,7 +29,7 @@
+ {
+ public:
+ enum Type { None, Unknown, Audio, Data, DVD, Mixed,
+- Blank, VCD, SVCD, UnknownType };
++ Blank, VCD, SVCD, UnknownType, Broken };
+
+ DiscType(Type type = Unknown);
+
+diff -Nru kdebase-release-3.4.0/kioslave/media/kdedmodule/mediamanager.desktop kdebase-branch-3.4/kioslave/media/kdedmodule/mediamanager.desktop
+--- kdebase-release-3.4.0/kioslave/media/kdedmodule/mediamanager.desktop 2005-02-23 00:05:50.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/kdedmodule/mediamanager.desktop 2005-03-29 01:24:37.000000000 -0500
+@@ -5,6 +5,7 @@
+ Name[az]=KDED Mediya İdarəcisi
+ Name[bg]=Управление на уÑтройÑтвата KDED
+ Name[bn]=কে.ডি.ই.ডি. মিডিয়া মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°
++Name[bs]=KDED upravitelj medijima
+ Name[ca]=Gestor de suports KDED
+ Name[cs]=KDED správce médiÃ
+ Name[da]=KDED Mediehåndtering
+@@ -12,6 +13,7 @@
+ Name[eo]=Konserveja administrilo
+ Name[es]=Administrador de recursos KDED
+ Name[et]=KDED andmekandjate haldur
++Name[eu]=KDED media kudeatzailea
+ Name[fi]=KDED Tallennusmedianhallinta
+ Name[fr]=Gestionnaire de médias KDED
+ Name[fy]=KDEDED-mediabeheerder
+@@ -19,6 +21,7 @@
+ Name[hu]=KDED médiakezelő
+ Name[is]=KDED miðilstjóri
+ Name[it]=Gestore dei supporti KDED
++Name[ja]=KDED メディア マãƒãƒ¼ã‚¸ãƒ£
+ Name[mk]=Менаџер на ноÑачи KDED
+ Name[nb]=KDED mediebehandler
+ Name[nl]=KDEDED-mediabeheerder
+@@ -29,18 +32,19 @@
+ Name[pt_BR]=Gerenciador de MÃdia
+ Name[ru]=Управление Ñменными ноÑителÑми KDED
+ Name[se]=KDED-mediagieđahalli
++Name[sk]=Správca zariadenà KDED
+ Name[sl]=Upravitelj medijev KDED
+ Name[sr]=Менаџер медијума, KDED
+-Name[sr@Latn]=Менаџер медијума, KDED
++Name[sr@Latn]=Menadžer medijuma, KDED
+ Name[sv]=KDED-mediahanterare
+ Name[ta]=KDED மீடியா மேலாளரà¯
+ Name[tr]=KDED Ortam Yöneticisi
+ Name[uk]=Менеджер ноÑіїв інформації Ð´Ð»Ñ KDED
+-Name[xx]=xxKDED Media Managerxx
+ Name[zh_CN]=KDED 介质管ç†å™¨
+ Comment=Keep track of media activities and allow to (un)mount (media:/)
+ Comment[bg]=Ðаблюдение на уÑтройÑтвата и разрешаване на монтиране/демонтиране на (media:/)
+ Comment[bn]=কোথায় কী মিডিয়া বà§à¦¯à¦¬à¦¹à¦¾à¦° করা হচà§à¦›à§‡ খেয়াল রাখà§à¦¨ à¦à¦¬à¦‚ (আন)মাউনà§à¦Ÿ করà§à¦¨ (media:/)
++Comment[bs]=Prati aktivnosti montiranja uređaja za smještaj podataka (media:/)
+ Comment[ca]=Fa el seguiment de les activitats dels suports i permet muntar i desmuntar (media:/)
+ Comment[cs]=Udržuje pÅ™ehled o pÅ™ipojených zaÅ™ÃzenÃch
+ Comment[da]=Hold styr på medieaktiviteter og tillad at (af)montere (media:/)
+@@ -48,6 +52,7 @@
+ Comment[eo]=Sekvu spurojn de konservejaj aktivecoj kan permesu (ne)kroĉi (media:/)
+ Comment[es]=Monitoriza las actividades de los recursos y permite (des)montarlos (media:/)
+ Comment[et]=Hoiab silma peal andmekandjate aktiivsusel ja võimaldab neid ühendada/lahutada (media:/)
++Comment[eu]=Montatzeak begiztatzen ditu (media:/) eta desmontatzen uzten du
+ Comment[fi]=Pidä kirjaa tallennustapahtumista ja salli tallennusvälineen liittäminen/irroitus (devices:/)
+ Comment[fr]=Gardez une trace des montages et permettre le (dé)montage (media:/)
+ Comment[fy]=Hâld de media-aktiviteiten by en stien ta om media oan- en ôf te keppelje (media:/)
+@@ -55,6 +60,7 @@
+ Comment[hu]=Az adathordozók követése, csatlakoztatása és leválasztása (media:/)
+ Comment[is]=Fylgjast með breytingum á tækjum og bjóða upp á (af)tengingu (media:/)
+ Comment[it]=Tiene traccia delle attività dei supporti e permette di montarli o smontarli (device:/)
++Comment[ja]=ãƒ¡ãƒ‡ã‚£ã‚¢ã®æ´»å‹•ã‚’æ•æ‰ã—ã€ãƒžã‚¦ãƒ³ãƒˆã—ãŸã‚Šã‚¢ãƒ³ãƒžã‚¦ãƒ³ãƒˆã—ã¾ã™ã€‚(media:/)
+ Comment[lt]=Stebi laikmenose vykdomus veiksmus ir leidžia (iš)montuoti (media:/)
+ Comment[mk]=Води Ñметка за активноÑтите на ноÑачите и дозволува (де)монтирање (media:/)
+ Comment[mt]=Żomm kont ta' attivitajiet ta' mmuntar u ippermetti (un)mount (media:/)
+@@ -62,19 +68,19 @@
+ Comment[nl]=Houdt de media-activiteiten bij en staat u toe om media aan- en af te koppelen (media:/)
+ Comment[nn]=Held styr på medieaktivitetar og lèt deg montera og avmontera (media:/)
+ Comment[pa]=ਮਾਊਟ ਕਾਰਵਾਈਆਂ ਦੀ ਜਾਣਕਾਰੀ ਰੱਖੋ ਅਤੇ ਅਨ-ਮਾਊਟ ਕਰਨ ਦਿਓ (ਜੰਤਰ:/)
+-Comment[pl]=Śledzi zdarzenia związane z nośnikami danych i pozala je (od)montować (media:/)
++Comment[pl]=Śledzi zdarzenia związane z nośnikami danych i pozwala je (od)montować (media:/)
+ Comment[pt]=Manter o registo das actividades de dispositivos e permitir a (des)montagem (media:/)
+ Comment[pt_BR]=Monitora as atividades de mÃdias e permite a (des)montagem (media:/)
+ Comment[ru]=ОтÑлеживает активноÑть уÑтройÑтв и позволÑет (от)монтировать (media:/)
+ Comment[se]=Gozit mii dáhpáhuvvá median ja diktá du gálgat ja Äadnat daid (media:/)
++Comment[sk]=Sledovanie aktivity diskov a ich pripojenie (media:/)
+ Comment[sl]=Nadzoruj dejanja medija in dovilo priklop/odklop (media:/)
+ Comment[sr]=Прати активноÑÑ‚ медијума и омогућава (де)монтирање (media:/)
+-Comment[sr@Latn]=Прати активноÑÑ‚ медијума и омогућава (де)монтирање (media:/)
++Comment[sr@Latn]=Prati aktivnost medijuma i omogućava (de)montiranje (media:/)
+ Comment[sv]=Håll reda på mediaaktiviteter och tillåt (av)montering (media:/)
+ Comment[ta]=இடைகà¯à®•ாலதà¯à®¤à®¿à®±à¯à®•à¯à®°à®¿à®¯ நடவடிகà¯à®•ைகளின௠வைதà¯à®¤à®¿à®°à¯. (சாதனமà¯:/)தà¯à®¤à¯ˆ à®à®±à¯à®±(இறகà¯à®•)கவà¯à®®à¯ அனà¯à®®à®¤à®¿
+ Comment[tr]=Ortam iÅŸlemlerini takip et ve baÄŸlanma iÅŸlemlerine izin ver(media:/)
+ Comment[uk]=СпоÑтерігає за змінами Ñеред ноÑіїв інформації та дозволÑÑ” (роз)Ð¼Ð¾Ð½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ (media:/)
+-Comment[xx]=xxKeep track of media activities and allow to (un)mount (media:/)xx
+ ServiceTypes=KDEDModule
+ X-KDE-ModuleType=Library
+ X-KDE-Library=mediamanager
+diff -Nru kdebase-release-3.4.0/kioslave/media/kfile-plugin/kfile_media.desktop kdebase-branch-3.4/kioslave/media/kfile-plugin/kfile_media.desktop
+--- kdebase-release-3.4.0/kioslave/media/kfile-plugin/kfile_media.desktop 2005-02-23 00:05:50.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/kfile-plugin/kfile_media.desktop 2005-03-30 01:47:51.000000000 -0500
+@@ -5,13 +5,16 @@
+ Name[az]=Mediyum Mə'lumatı
+ Name[bg]=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° уÑтройÑтвата
+ Name[bn]=মিডিয়া তথà§à¦¯
++Name[bs]=Informacije o mediju
+ Name[ca]=Informació de suports
+ Name[cs]=Informace o médiu
+ Name[da]=Medieinformation
+ Name[de]=Medien-Information
++Name[el]=ΠληÏοφοÏίες μÎσου
+ Name[eo]=Konservejaj informoj
+ Name[es]=Información de recursos
+ Name[et]=Andmekandja info
++Name[eu]=Media informazioa
+ Name[fi]=Tallenteiden tiedot
+ Name[fr]=Informations sur le média
+ Name[fy]=Mediumynformaasje
+@@ -20,6 +23,7 @@
+ Name[hu]=Adathordozó-jellemzők
+ Name[is]=Upplýsingar um miðill
+ Name[it]=Informazioni supporto
++Name[ja]=ãƒ¡ãƒ‡ã‚£ã‚¢æƒ…å ±
+ Name[lt]=Laikmenos informacija
+ Name[mk]=Информации за ноÑач
+ Name[mt]=Informazzjoni tal-apparat
+@@ -32,14 +36,14 @@
+ Name[pt_BR]=Informações sobre a MÃdia
+ Name[ru]=Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ ноÑителе
+ Name[se]=Mediumdieđut
++Name[sk]=Informácie o médiu
+ Name[sl]=Informacije o mediju
+ Name[sr]=Информације о медијуму
+-Name[sr@Latn]=Информације о медијуму
++Name[sr@Latn]=Informacije o medijumu
+ Name[sv]=Mediainformation
+ Name[ta]=சாதனத௠தகவலà¯
+ Name[tr]=Ortam Bilgisi
+ Name[uk]=Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ ноÑій інформації
+-Name[xx]=xxMedium Informationxx
+ Name[zh_CN]=介质信æ¯
+ ServiceTypes=KFilePlugin
+ X-KDE-Library=kfile_media
+diff -Nru kdebase-release-3.4.0/kioslave/media/mediaimpl.cpp kdebase-branch-3.4/kioslave/media/mediaimpl.cpp
+--- kdebase-release-3.4.0/kioslave/media/mediaimpl.cpp 2005-02-15 08:55:08.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mediaimpl.cpp 2005-04-04 07:03:55.000000000 -0400
+@@ -229,6 +229,7 @@
+ KIO::Job* job = KIO::mount(false, 0,
+ medium.deviceNode(),
+ medium.mountPoint());
++ job->setInteractive(false);
+ connect( job, SIGNAL( result( KIO::Job * ) ),
+ this, SLOT( slotMountResult( KIO::Job * ) ) );
+ kapp->dcopClient()
+diff -Nru kdebase-release-3.4.0/kioslave/media/mimetypes/audiocd.desktop kdebase-branch-3.4/kioslave/media/mimetypes/audiocd.desktop
+--- kdebase-release-3.4.0/kioslave/media/mimetypes/audiocd.desktop 2005-02-23 00:05:50.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mimetypes/audiocd.desktop 2005-03-08 04:28:39.000000000 -0500
+@@ -18,6 +18,7 @@
+ Comment[hu]=Hang-CD
+ Comment[is]=Hljóð CD
+ Comment[it]=CD audio
++Comment[ja]=オーディオCD
+ Comment[nb]=Lyd-CD
+ Comment[nl]=Audio-cd
+ Comment[nn]=Lyd-CD
+@@ -27,13 +28,12 @@
+ Comment[pt_BR]=CD de Ãudio
+ Comment[ru]=Звуковой CD
+ Comment[se]=Jietna-CD
++Comment[sk]=Zvukové CD
+ Comment[sl]=Avdio CD
+ Comment[sr]=Ðудио CD
+-Comment[sr@Latn]=Ðудио CD
+ Comment[sv]=Ljud-cd
+ Comment[tr]=Müzik CD'si
+ Comment[uk]=Ðудіо КД
+-Comment[xx]=xxAudio CDxx
+ Comment[zh_CN]=音频 CD
+ Icon=cdaudio_unmount
+
+diff -Nru kdebase-release-3.4.0/kioslave/media/mimetypes/blankcd.desktop kdebase-branch-3.4/kioslave/media/mimetypes/blankcd.desktop
+--- kdebase-release-3.4.0/kioslave/media/mimetypes/blankcd.desktop 2005-02-23 00:05:50.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mimetypes/blankcd.desktop 2005-03-22 12:38:14.000000000 -0500
+@@ -6,12 +6,14 @@
+ Comment[bg]=Празен диÑк
+ Comment[bn]=ফাà¦à¦•া সিডি
+ Comment[br]=Goullonderiñ ur CD
++Comment[bs]=Prazan CD
+ Comment[ca]=CD en blanc
+ Comment[cs]=Prázdné CD
+ Comment[da]=Blank cd
+ Comment[de]=Leere CD
+ Comment[es]=Borrar CD
+ Comment[et]=Tühi CD
++Comment[eu]=CD hutsik
+ Comment[fi]=Tyhjä CD
+ Comment[fr]=CD vierge
+ Comment[fy]=Blanke Kompaktskiif
+@@ -21,6 +23,7 @@
+ Comment[hu]=Üres CD
+ Comment[is]=Tómur CD
+ Comment[it]=CD vergine
++Comment[ja]=空ã®CD
+ Comment[lt]=TuÅ¡Äias CD
+ Comment[nb]=Tom CD
+ Comment[nl]=Blanko cd
+@@ -31,14 +34,14 @@
+ Comment[pt_BR]=CD virgem
+ Comment[ru]=ЧиÑтый CD
+ Comment[se]=Guorus CD
++Comment[sk]=Prázdne CD
+ Comment[sl]=Prazen CD
+ Comment[sr]=Празан CD
+-Comment[sr@Latn]=Празан CD
++Comment[sr@Latn]=Prazan CD
+ Comment[sv]=Tom cd
+ Comment[ta]=காலி கà¯à®±à¯à®¨à¯à®¤à®•டà¯
+ Comment[tr]=BoÅŸ CD
+ Comment[uk]=ЧиÑтий КД
+-Comment[xx]=xxBlank CDxx
+ Comment[zh_CN]=空 CD
+ Icon=cdwriter_unmount
+
+diff -Nru kdebase-release-3.4.0/kioslave/media/mimetypes/blankdvd.desktop kdebase-branch-3.4/kioslave/media/mimetypes/blankdvd.desktop
+--- kdebase-release-3.4.0/kioslave/media/mimetypes/blankdvd.desktop 2005-02-23 00:05:50.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mimetypes/blankdvd.desktop 2005-03-22 12:38:14.000000000 -0500
+@@ -6,12 +6,14 @@
+ Comment[bg]=Празен диÑк DVD
+ Comment[bn]=ফাà¦à¦•া ডিà¦à¦¿à¦¡à¦¿
+ Comment[br]=Goullonderiñ un DVD
++Comment[bs]=Prazan DVD
+ Comment[ca]=DVD en blanc
+ Comment[cs]=Prázdné DVD
+ Comment[da]=Blank dvd
+ Comment[de]=Leere DVD
+ Comment[es]=Borrar DVD
+ Comment[et]=Tühi DVD
++Comment[eu]=DVD hutsik
+ Comment[fi]=Tyhjä DVD-levy
+ Comment[fr]=DVD vierge
+ Comment[fy]=Blanke Dûbelskiif
+@@ -21,6 +23,7 @@
+ Comment[hu]=Üres DVD
+ Comment[is]=Tómur DVD
+ Comment[it]=DVD vergine
++Comment[ja]=空ã®DVD
+ Comment[lt]=TuÅ¡Äias DVD
+ Comment[nb]=Tom DVD
+ Comment[nl]=Blanko dvd
+@@ -30,14 +33,14 @@
+ Comment[pt_BR]=DVD virgem
+ Comment[ru]=ЧиÑтый DVD
+ Comment[se]=Guorus DVD
++Comment[sk]=Prázdne DVD
+ Comment[sl]=Prazen DVD
+ Comment[sr]=Празан DVD
+-Comment[sr@Latn]=Празан DVD
++Comment[sr@Latn]=Prazan DVD
+ Comment[sv]=Tom dvd
+ Comment[ta]=காலி டிவிடி
+ Comment[tr]=BoÅŸ DVD
+ Comment[uk]=ЧиÑтий DVD
+-Comment[xx]=xxBlank DVDxx
+ Comment[zh_CN]=空 DVD
+ Icon=cdwriter_unmount
+
+diff -Nru kdebase-release-3.4.0/kioslave/media/mimetypes/cdrom_mounted.desktop kdebase-branch-3.4/kioslave/media/mimetypes/cdrom_mounted.desktop
+--- kdebase-release-3.4.0/kioslave/media/mimetypes/cdrom_mounted.desktop 2005-02-04 23:15:29.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mimetypes/cdrom_mounted.desktop 2005-03-07 09:15:54.000000000 -0500
+@@ -65,7 +65,6 @@
+ Comment[ven]=CD-ROM yo gonyiswaho
+ Comment[wa]=Plake lazer montêye
+ Comment[xh]=CD-ROM Enyusiweyo
+-Comment[xx]=xxMounted CD-ROMxx
+ Comment[zh_CN]=挂载的 CD-ROM
+ Comment[zh_TW]=已掛載的 CD-ROM
+ Comment[zu]=I-CD-ROM eyenyusiwe
+diff -Nru kdebase-release-3.4.0/kioslave/media/mimetypes/cdrom_unmounted.desktop kdebase-branch-3.4/kioslave/media/mimetypes/cdrom_unmounted.desktop
+--- kdebase-release-3.4.0/kioslave/media/mimetypes/cdrom_unmounted.desktop 2005-02-04 23:15:29.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mimetypes/cdrom_unmounted.desktop 2005-03-07 09:15:55.000000000 -0500
+@@ -67,7 +67,6 @@
+ Comment[vi]=CD-ROM được gỡ
+ Comment[wa]=Plake lazer dismontêye
+ Comment[xh]=CD-ROM Enganyuswanga
+-Comment[xx]=xxUnmounted CD-ROMxx
+ Comment[zh_CN]=未挂载的 CD-ROM
+ Comment[zh_TW]=未掛載的 CD-ROM
+ Comment[zu]=I-CD-ROM eyehlisiwe
+diff -Nru kdebase-release-3.4.0/kioslave/media/mimetypes/cdwriter_mounted.desktop kdebase-branch-3.4/kioslave/media/mimetypes/cdwriter_mounted.desktop
+--- kdebase-release-3.4.0/kioslave/media/mimetypes/cdwriter_mounted.desktop 2005-02-23 00:05:50.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mimetypes/cdwriter_mounted.desktop 2005-03-07 09:15:55.000000000 -0500
+@@ -54,7 +54,7 @@
+ Comment[sk]=Pripojená napaľovacia mechanika CD
+ Comment[sl]=Priklopljen zapisovalnik CD-jev
+ Comment[sr]=Монтиран CD резач
+-Comment[sr@Latn]=Montirani CD RezaÄ
++Comment[sr@Latn]=Montiran CD rezaÄ
+ Comment[sv]=Monterad cd-brännare
+ Comment[ta]=à®à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿ கà¯à®±à¯à®¨à¯à®¤à®•ட௠எழà¯à®¤à®¿
+ Comment[tg]=Монтажшудаи CD Writer
+@@ -66,7 +66,6 @@
+ Comment[vi]=Ổ ghi CD được gắn kết
+ Comment[wa]=Plake lazer sol broûleu montêye
+ Comment[xh]=CD Writer Enyusiweyo
+-Comment[xx]=xxMounted CD Writerxx
+ Comment[zh_CN]=挂载的刻录机
+ Comment[zh_TW]=已掛載的 CD Writer
+ Comment[zu]=I-CD-Writer eyenyusiwe
+diff -Nru kdebase-release-3.4.0/kioslave/media/mimetypes/cdwriter_unmounted.desktop kdebase-branch-3.4/kioslave/media/mimetypes/cdwriter_unmounted.desktop
+--- kdebase-release-3.4.0/kioslave/media/mimetypes/cdwriter_unmounted.desktop 2005-02-23 00:05:50.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mimetypes/cdwriter_unmounted.desktop 2005-03-07 09:15:55.000000000 -0500
+@@ -54,7 +54,7 @@
+ Comment[sk]=Nepripojená napaľovacia mechanika CD
+ Comment[sl]=Odklopljen zapisovalnik CD-jev
+ Comment[sr]=Демонтиран CD резач
+-Comment[sr@Latn]=Demontiran CD RezaÄ
++Comment[sr@Latn]=Demontiran CD rezaÄ
+ Comment[sv]=Avmonterad cd-brännare
+ Comment[ta]=வெளியேறà¯à®±à®¿à®¯ கà¯à®±à¯à®¨à¯à®¤à®•ட௠எழà¯à®¤à®¿
+ Comment[tg]=Ҷудо шудаи CD Writer
+@@ -66,7 +66,6 @@
+ Comment[vi]=Ổ ghi CD được gỡ
+ Comment[wa]=Plake lazer sol broûleu dismontêye
+ Comment[xh]=CD Writer Enganyuswanga
+-Comment[xx]=xxUnmounted CD Writerxx
+ Comment[zh_CN]=未挂载的刻录机
+ Comment[zh_TW]=未掛載的 CD Writer
+ Comment[zu]=I-CD-Writer eyehlisiwe
+diff -Nru kdebase-release-3.4.0/kioslave/media/mimetypes/dvd_mounted.desktop kdebase-branch-3.4/kioslave/media/mimetypes/dvd_mounted.desktop
+--- kdebase-release-3.4.0/kioslave/media/mimetypes/dvd_mounted.desktop 2005-02-04 23:15:29.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mimetypes/dvd_mounted.desktop 2005-03-07 09:15:55.000000000 -0500
+@@ -62,7 +62,6 @@
+ Comment[uz]=Уланган DVD
+ Comment[vi]=DVD được gắn kết
+ Comment[wa]=Plake lazer DVD montêye
+-Comment[xx]=xxMounted DVDxx
+ Comment[zh_CN]=挂载的 DVD
+ Comment[zh_TW]=已掛載的 DVD-ROM
+ Patterns=
+diff -Nru kdebase-release-3.4.0/kioslave/media/mimetypes/dvd_unmounted.desktop kdebase-branch-3.4/kioslave/media/mimetypes/dvd_unmounted.desktop
+--- kdebase-release-3.4.0/kioslave/media/mimetypes/dvd_unmounted.desktop 2005-02-04 23:15:29.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mimetypes/dvd_unmounted.desktop 2005-03-07 09:15:55.000000000 -0500
+@@ -62,7 +62,6 @@
+ Comment[uz]=Уланмаган DVD
+ Comment[vi]=DVD được gỡ
+ Comment[wa]=Plake lazer DVD dismontêye
+-Comment[xx]=xxUnmounted DVDxx
+ Comment[zh_CN]=未挂载的 DVD
+ Comment[zh_TW]=未掛載的 DVD-ROM
+ Patterns=
+diff -Nru kdebase-release-3.4.0/kioslave/media/mimetypes/dvdvideo.desktop kdebase-branch-3.4/kioslave/media/mimetypes/dvdvideo.desktop
+--- kdebase-release-3.4.0/kioslave/media/mimetypes/dvdvideo.desktop 2005-02-23 00:05:50.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mimetypes/dvdvideo.desktop 2005-03-22 12:38:14.000000000 -0500
+@@ -6,12 +6,14 @@
+ Comment[bg]=Видео диÑк DVD
+ Comment[bn]=ডিà¦à¦¿à¦¡à¦¿ à¦à¦¿à¦¡à¦¿à¦“ ডিসà§à¦•
+ Comment[br]=Pladenn DVD Video
++Comment[bs]=DVD video disk
+ Comment[ca]=VÃdeo disc DVD
+ Comment[cs]=DVD video
+ Comment[da]=Dvd video-disk
+ Comment[de]=DVD Video-Disk
+ Comment[es]=Disco de video DVD
+ Comment[et]=DVD videoplaat
++Comment[eu]=DVD bideo diska
+ Comment[fi]=DVD videolevy
+ Comment[fr]=DVD vidéo
+ Comment[fy]=Dûbelskiif Fideoskiif
+@@ -20,6 +22,7 @@
+ Comment[hu]=DVD-videolemez
+ Comment[is]=DVD vÃdeó diskur
+ Comment[it]=Disco video DVD
++Comment[ja]=DVD ビデオ ディスク
+ Comment[lt]=DVD video diskas
+ Comment[nb]=DVD-videoplate
+ Comment[nl]=DVD Videodisk
+@@ -29,14 +32,14 @@
+ Comment[pt_BR]=DVD de vÃdeo
+ Comment[ru]=ВидеодиÑк DVD
+ Comment[se]=DVD-videoskearru
++Comment[sk]=Video disk DVD
+ Comment[sl]=DVD Video disk
+ Comment[sr]=DVD видео диÑк
+-Comment[sr@Latn]=DVD видео диÑк
++Comment[sr@Latn]=DVD video disk
+ Comment[sv]=Dvd-videoskiva
+ Comment[ta]=டிவிடி படகà¯à®•ாடà¯à®šà®¿ வடà¯à®Ÿà¯
+ Comment[tr]=DVD Vidyo Diski
+ Comment[uk]=Виідео диÑк DVD
+-Comment[xx]=xxDVD Video Diskxx
+ Comment[zh_CN]=DVD 影碟
+ Icon=dvd_unmount
+
+diff -Nru kdebase-release-3.4.0/kioslave/media/mimetypes/floppy5_mounted.desktop kdebase-branch-3.4/kioslave/media/mimetypes/floppy5_mounted.desktop
+--- kdebase-release-3.4.0/kioslave/media/mimetypes/floppy5_mounted.desktop 2005-02-04 23:15:29.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mimetypes/floppy5_mounted.desktop 2005-03-07 09:15:55.000000000 -0500
+@@ -65,7 +65,6 @@
+ Comment[vi]=ÄÄ©a má»m 5¼"được gỡ
+ Comment[wa]=Plakete 5" ¼ montêye
+ Comment[xh]=Elayishiweyo 5¼" Floppy
+-Comment[xx]=xxMounted 5¼" Floppyxx
+ Comment[zh_CN]=挂载的 5.25 英寸软驱
+ Comment[zh_TW]=已掛載的軟碟機
+ Comment[zu]=I-5¼" Floppy eyenyusiwe
+diff -Nru kdebase-release-3.4.0/kioslave/media/mimetypes/floppy5_unmounted.desktop kdebase-branch-3.4/kioslave/media/mimetypes/floppy5_unmounted.desktop
+--- kdebase-release-3.4.0/kioslave/media/mimetypes/floppy5_unmounted.desktop 2005-02-04 23:15:29.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mimetypes/floppy5_unmounted.desktop 2005-03-07 09:15:55.000000000 -0500
+@@ -65,7 +65,6 @@
+ Comment[vi]=ÄÄ©a má»m 5¼" được gỡ
+ Comment[wa]=Plakete 5" ¼ dismontêye
+ Comment[xh]=Enganyuswanga 5¼" Floppy
+-Comment[xx]=xxUnmounted 5¼" Floppyxx
+ Comment[zh_CN]=未挂载的 5.25 英寸软驱
+ Comment[zh_TW]=未掛載的軟碟機
+ Comment[zu]=I-5¼" Floppy Yehlisiwe
+diff -Nru kdebase-release-3.4.0/kioslave/media/mimetypes/floppy_mounted.desktop kdebase-branch-3.4/kioslave/media/mimetypes/floppy_mounted.desktop
+--- kdebase-release-3.4.0/kioslave/media/mimetypes/floppy_mounted.desktop 2005-02-04 23:15:29.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mimetypes/floppy_mounted.desktop 2005-03-07 09:15:55.000000000 -0500
+@@ -66,7 +66,6 @@
+ Comment[vi]=ÄÄ©a má»m được gắn kết
+ Comment[wa]=Plakete montêye
+ Comment[xh]=Floppy Enyusiweyo
+-Comment[xx]=xxMounted Floppyxx
+ Comment[zh_CN]=挂载的软驱
+ Comment[zh_TW]=已掛載的軟碟機
+ Comment[zu]=I-Floppy eyenyusiwe
+diff -Nru kdebase-release-3.4.0/kioslave/media/mimetypes/floppy_unmounted.desktop kdebase-branch-3.4/kioslave/media/mimetypes/floppy_unmounted.desktop
+--- kdebase-release-3.4.0/kioslave/media/mimetypes/floppy_unmounted.desktop 2005-02-04 23:15:29.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mimetypes/floppy_unmounted.desktop 2005-03-07 09:15:55.000000000 -0500
+@@ -66,7 +66,6 @@
+ Comment[vi]=ÄÄ©a má»m được gỡ
+ Comment[wa]=Plakete dismontêye
+ Comment[xh]=Floppy Enganyuswanga
+-Comment[xx]=xxUnmounted Floppyxx
+ Comment[zh_CN]=未挂载的软驱
+ Comment[zh_TW]=未掛載的軟碟機
+ Comment[zu]=I-Floppy eyehlisiwe
+diff -Nru kdebase-release-3.4.0/kioslave/media/mimetypes/gphoto2camera.desktop kdebase-branch-3.4/kioslave/media/mimetypes/gphoto2camera.desktop
+--- kdebase-release-3.4.0/kioslave/media/mimetypes/gphoto2camera.desktop 2005-02-23 00:05:50.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mimetypes/gphoto2camera.desktop 2005-03-30 01:47:52.000000000 -0500
+@@ -7,13 +7,16 @@
+ Comment[bg]=Фотоапарат
+ Comment[bn]=কà§à¦¯à¦¾à¦®à§‡à¦°à¦¾
+ Comment[br]=Kamera
++Comment[bs]=Kamera
+ Comment[ca]=CÃ mara
+ Comment[cs]=Kamera
+ Comment[da]=Kamera
+ Comment[de]=Kamera
++Comment[el]=ΚάμεÏα
+ Comment[eo]=Kamero
+ Comment[es]=Cámara
+ Comment[et]=Kaamera
++Comment[eu]=Kamara
+ Comment[fi]=Kamera
+ Comment[fr]=Nouvel appareil photo
+ Comment[fy]=Kamera
+@@ -23,6 +26,7 @@
+ Comment[hu]=Kamera
+ Comment[is]=Myndavél
+ Comment[it]=Macchina fotografica
++Comment[ja]=カメラ
+ Comment[lt]=Fotoaparatas
+ Comment[nb]=Kamera
+ Comment[nn]=Kamera
+@@ -32,14 +36,14 @@
+ Comment[pt_BR]=Câmera
+ Comment[ru]=Камера
+ Comment[se]=Govvanaperáhtta
++Comment[sk]=Digitálny fotoaparát
+ Comment[sl]=Kamera
+ Comment[sr]=Камера
+-Comment[sr@Latn]=Камера
++Comment[sr@Latn]=Kamera
+ Comment[sv]=Kamera
+ Comment[ta]=பà¯à®•ைபà¯à®ªà®Ÿ கரà¯à®µà®¿
+ Comment[tr]=Kamera
+ Comment[uk]=Камера
+-Comment[xx]=xxCameraxx
+ Comment[zh_CN]=相机
+ Icon=camera_unmount
+
+diff -Nru kdebase-release-3.4.0/kioslave/media/mimetypes/hdd_mounted.desktop kdebase-branch-3.4/kioslave/media/mimetypes/hdd_mounted.desktop
+--- kdebase-release-3.4.0/kioslave/media/mimetypes/hdd_mounted.desktop 2005-02-23 00:05:50.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mimetypes/hdd_mounted.desktop 2005-03-30 01:47:52.000000000 -0500
+@@ -7,13 +7,16 @@
+ Comment[az]=Bağlanmış Sabit Disk Bölməsi
+ Comment[bg]=Монтиран дÑл на твърд диÑк
+ Comment[bn]=মাউনà§à¦Ÿ করা হারà§à¦¡ ডিসà§à¦• à¦à¦²à¦¿à¦‰à¦®
++Comment[bs]=Montirana hard disk particija
+ Comment[ca]=Disc dur muntat
+ Comment[cs]=PÅ™ipojený oddÃl pevného disku
+ Comment[da]=Monteret harddisk-volumen
+ Comment[de]=Eingebundene Festplattenpartition
++Comment[el]=Î ÏοσαÏτημÎνη κατάτμηση σκληÏÎ¿Ï Î´Î¯ÏƒÎºÎ¿Ï…
+ Comment[eo]=Kroĉita subdisko
+ Comment[es]=Volumen de disco duro montado
+ Comment[et]=Ühendatud kõvaketta partitsioon
++Comment[eu]=Diska gogorraren zatiketa montatua
+ Comment[fi]=Liitetty kiintoleyosio
+ Comment[fr]=Partition de disque dur montée
+ Comment[fy]=Oankeppele Fêsteskiif pastitie
+@@ -22,6 +25,7 @@
+ Comment[hu]=Csatlakoztatott merevlemezes partÃció
+ Comment[is]=Tengd disksneið
+ Comment[it]=Volume disco rigido montato
++Comment[ja]=マウントã•れãŸãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ ボリューãƒ
+ Comment[lt]=Sumontuotas kieto disko skirsnis
+ Comment[mt]=Partizzjoni ta' ħard-disk immuntata
+ Comment[nb]=Montert harddiskpartisjon
+@@ -33,14 +37,14 @@
+ Comment[pt_BR]=Volume do HD Montado
+ Comment[ru]=Смонтированный том жеÑткого диÑка
+ Comment[se]=ÄŒatnon garraskearrooassi
++Comment[sk]=Pripojený oddiel pevného disku
+ Comment[sl]=Priklopljen pogon trdega diska
+ Comment[sr]=Монтирана партиција хард диÑка
+-Comment[sr@Latn]=Монтирана партиција хард диÑка
++Comment[sr@Latn]=Montirana particija hard diska
+ Comment[sv]=Monterad hårdiskpartition
+ Comment[ta]=à®à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿ வனà¯à®¤à®•ட௠வடà¯à®Ÿà¯ பிரிவà¯
+ Comment[tr]=Bağlanmış Sabit Disk Bölümü
+ Comment[uk]=Змонтований розділ жорÑткого диÑку
+-Comment[xx]=xxMounted Hard Disk Volumexx
+ Comment[zh_CN]=挂载的硬盘å·
+ Patterns=
+
+diff -Nru kdebase-release-3.4.0/kioslave/media/mimetypes/hdd_unmounted.desktop kdebase-branch-3.4/kioslave/media/mimetypes/hdd_unmounted.desktop
+--- kdebase-release-3.4.0/kioslave/media/mimetypes/hdd_unmounted.desktop 2005-02-23 00:05:51.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mimetypes/hdd_unmounted.desktop 2005-03-30 01:47:52.000000000 -0500
+@@ -8,13 +8,16 @@
+ Comment[bg]=Демонтиран дÑл на твърд диÑк
+ Comment[bn]=আনমাউনà§à¦Ÿ করা হারà§à¦¡ ডিসà§à¦• à¦à¦²à¦¿à¦‰à¦®
+ Comment[br]=Pladenn divarc'het
++Comment[bs]=Demontirana hard disk particija
+ Comment[ca]=Disc dur desmuntat
+ Comment[cs]=Odpojený oddÃl pevného disku
+ Comment[da]=Afmonteret harddisk-volumen
+ Comment[de]=Nicht eingebundene Festplattenpartition
++Comment[el]=ΑποπÏοσαÏτημÎνη κατάτμηση σκληÏÎ¿Ï Î´Î¯ÏƒÎºÎ¿Ï…
+ Comment[eo]=Malkroĉita subdisko
+ Comment[es]=Volumen de disco duro desmontado
+ Comment[et]=Lahutatud kõvaketta partitsioon
++Comment[eu]=Diska gogorraren zatiketa desmontatua
+ Comment[fi]=Irroitettu kiintolevyosio
+ Comment[fr]=Partition de disque dur non montée
+ Comment[fy]=Afgekoppelde Fêsteskiif pastitie
+@@ -23,6 +26,7 @@
+ Comment[hu]=Leválasztott merevlemezes partÃció
+ Comment[is]=Aftengd disksneið
+ Comment[it]=Volume disco rigido non montato
++Comment[ja]=マウントã•れã¦ã„ãªã„ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ ボリューãƒ
+ Comment[lt]=Išmontuotas kieto disko skirsnis
+ Comment[mt]=Partizzjoni ta' ħard-disk mhux immuntata
+ Comment[nb]=Avmontert harddiskpartisjon
+@@ -34,14 +38,14 @@
+ Comment[pt_BR]=Volume do HD Desmontado
+ Comment[ru]=Отмонтированный том жеÑткого диÑка
+ Comment[se]=Gálgajuvvon garraskearrooassi
++Comment[sk]=Nepripojený oddiel pevného disku
+ Comment[sl]=Odklopljen pogon trdega diska
+ Comment[sr]=Демонтирана партиција хард диÑка
+-Comment[sr@Latn]=Демонтирана партиција хард диÑка
++Comment[sr@Latn]=Demontirana particija hard diska
+ Comment[sv]=Avmonterad hårdiskpartition
+ Comment[ta]=வெளியேறà¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿ வனà¯à®µà®Ÿà¯à®Ÿà¯ பகà¯à®¤à®¿
+ Comment[tr]=Ayrılmış Sabit Disk Bölümü
+ Comment[uk]=Демонтований розділ жорÑткого диÑку
+-Comment[xx]=xxUnmounted Hard Disk Volumexx
+ Comment[zh_CN]=未挂载的硬盘å·
+ Patterns=
+
+diff -Nru kdebase-release-3.4.0/kioslave/media/mimetypes/nfs_mounted.desktop kdebase-branch-3.4/kioslave/media/mimetypes/nfs_mounted.desktop
+--- kdebase-release-3.4.0/kioslave/media/mimetypes/nfs_mounted.desktop 2005-02-23 00:05:51.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mimetypes/nfs_mounted.desktop 2005-03-30 01:47:52.000000000 -0500
+@@ -7,13 +7,16 @@
+ Comment[az]=Bağlanmış NFS Sahəsi
+ Comment[bg]=Монтиран реÑÑƒÑ€Ñ NFS
+ Comment[bn]=মাউনà§à¦Ÿ করা à¦à¦¨-à¦à¦«-à¦à¦¸ শেয়ার
++Comment[bs]=Montiran NFS resurs
+ Comment[ca]=Recurs NFS muntat
+ Comment[cs]=Připojený zdroj NFS
+ Comment[da]=Monteret NFS-share
+ Comment[de]=Eingebundene NFS-Freigabe
++Comment[el]=Î ÏοσαÏτημÎνος πόÏος NFS
+ Comment[eo]=Kroĉita NFS-disko
+ Comment[es]=Recurso NFS montado
+ Comment[et]=Ühendatud NFS ressurss
++Comment[eu]=NFS baliabide montatua
+ Comment[fi]=Liitetty NFS resurssi
+ Comment[fr]=Ressource NFS montée
+ Comment[fy]=Oankeppele NFS-helpboarne
+@@ -22,6 +25,7 @@
+ Comment[hu]=Csatlakoztatott NFS-megosztás
+ Comment[is]=Tengd NFS auðlind
+ Comment[it]=Risorsa NFS montata
++Comment[ja]=マウントã•れãŸNFSã‚·ã‚§ã‚¢
+ Comment[lt]=Sumontuotas NFS bendro naudojimo resursas
+ Comment[mk]=Монтиран NFS реÑурÑ
+ Comment[mt]=Riżors NFS immuntat
+@@ -34,14 +38,14 @@
+ Comment[pt_BR]=Volume NFS Montado
+ Comment[ru]=Смонтированный реÑÑƒÑ€Ñ NFS
+ Comment[se]=ÄŒatnon NFS-resursa
++Comment[sk]=Pripojený zdroj NFS
+ Comment[sl]=Priklopljen vir NFS
+ Comment[sr]=Монтирано NFS дељење
+-Comment[sr@Latn]=Монтирано NFS дељење
++Comment[sr@Latn]=Montirano NFS deljenje
+ Comment[sv]=Monterad NFS-resurs
+ Comment[ta]=à®à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿ NFS பஙà¯à®•à¯
+ Comment[tr]=Bağlı NFS Paylaşımı
+ Comment[uk]=Змонтований реÑÑƒÑ€Ñ NFS
+-Comment[xx]=xxMounted NFS Sharexx
+ Comment[zh_CN]=挂载的 NFS 共享
+ Patterns=
+
+diff -Nru kdebase-release-3.4.0/kioslave/media/mimetypes/nfs_unmounted.desktop kdebase-branch-3.4/kioslave/media/mimetypes/nfs_unmounted.desktop
+--- kdebase-release-3.4.0/kioslave/media/mimetypes/nfs_unmounted.desktop 2005-02-23 00:05:51.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mimetypes/nfs_unmounted.desktop 2005-03-30 01:47:52.000000000 -0500
+@@ -7,13 +7,16 @@
+ Comment[az]=Ayrılmış NFS Sahəsi
+ Comment[bg]=Демонтиран реÑÑƒÑ€Ñ NFS
+ Comment[bn]=আনমাউনà§à¦Ÿ করা à¦à¦¨-à¦à¦«-à¦à¦¸ শেয়ার
++Comment[bs]=Demontiran NFS resurs
+ Comment[ca]=Recurs NFS desmuntat
+ Comment[cs]=Odpojený zdroj NFS
+ Comment[da]=Afmonteret NFS-share
+ Comment[de]=Nicht eingebundene NFS-Freigabe
++Comment[el]=ΑποπÏοσαÏτημÎνος πόÏος NFS
+ Comment[eo]=Malkroĉita NFS-disko
+ Comment[es]=Recurso NFS desmontado
+ Comment[et]=Lahutatud NFS ressurss
++Comment[eu]=NFS baliabide desmontatua
+ Comment[fi]=Irroitettu NFS resurssi
+ Comment[fr]=Ressource NFS non montée
+ Comment[fy]=Oankeppele NFS-helpboarne
+@@ -22,6 +25,7 @@
+ Comment[hu]=Leválasztott NFS-megosztás
+ Comment[is]=Aftengd NFS auðlind
+ Comment[it]=Risorsa NFS non montata
++Comment[ja]=マウントã•れã¦ã„ãªã„NFSã‚·ã‚§ã‚¢
+ Comment[lt]=Išmontuotas NFS bendro naudojimo resursas
+ Comment[mk]=Демонтиран NFS реÑурÑ
+ Comment[mt]=Riżors NFS mhux immuntat
+@@ -34,14 +38,14 @@
+ Comment[pt_BR]=Volume NFS Desmontado
+ Comment[ru]=Отмонтированный реÑÑƒÑ€Ñ NFS
+ Comment[se]=Gálgajuvvon NFS-resursa
++Comment[sk]=Nepripojený zdroj NFS
+ Comment[sl]=Odklopljen vir NFS
+ Comment[sr]=Демонтирано NFS дељење
+-Comment[sr@Latn]=Демонтирано NFS дељење
++Comment[sr@Latn]=Demontirano NFS deljenje
+ Comment[sv]=Avmonterad NFS-resurs
+ Comment[ta]=இறகà¯à®•பà¯à®ªà®Ÿà¯à®Ÿ NFS பஙà¯à®•à¯
+ Comment[tr]=Bağlanmamış NFS Paylaşımı
+ Comment[uk]=Демонтований реÑÑƒÑ€Ñ NFS
+-Comment[xx]=xxUnmounted NFS Sharexx
+ Comment[zh_CN]=未挂载的 NFS 共享
+ Patterns=
+
+diff -Nru kdebase-release-3.4.0/kioslave/media/mimetypes/removable_mounted.desktop kdebase-branch-3.4/kioslave/media/mimetypes/removable_mounted.desktop
+--- kdebase-release-3.4.0/kioslave/media/mimetypes/removable_mounted.desktop 2005-02-23 00:05:51.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mimetypes/removable_mounted.desktop 2005-03-30 01:47:52.000000000 -0500
+@@ -7,13 +7,16 @@
+ Comment[az]=Bağlanmış Çıxarıla Bilən Mediyum
+ Comment[bg]=Монтиран преноÑим ноÑител
+ Comment[bn]=মাউনà§à¦Ÿ করা অপসারণযোগà§à¦¯ মিডিয়াম
++Comment[bs]=Montiran izmjenjivi uređaj
+ Comment[ca]=Suport extraible muntat
+ Comment[cs]=Připojené výměnné médium
+ Comment[da]=Monteret medie der kan fjernes
+ Comment[de]=Eingebundenes Wechsellaufwerk
++Comment[el]=Î ÏοσαÏτημÎνος αφαιÏοÏμενο μÎσο
+ Comment[eo]=Kroĉita forigebla konservejo
+ Comment[es]=Recurso extraÃble montado
+ Comment[et]=Ühendatud eemaldatav andmekandja
++Comment[eu]=Baliabide mugikorra montatua
+ Comment[fi]=Liitetty irroitettava resurssi
+ Comment[fr]=Média amovible monté
+ Comment[fy]=Oankeppele ferwiderber medium
+@@ -21,7 +24,8 @@
+ Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ रीमूवेबल माधà¥à¤¯à¤®
+ Comment[hu]=Csatlakoztatott adathordozó
+ Comment[is]=Tengdur útskiptanlegur miðill
+-Comment[it]=Supporto rimuovibile montato
++Comment[it]=Supporto rimovibile montato
++Comment[ja]=マウントã•れãŸãƒªãƒ ーãƒãƒ–ル メディア
+ Comment[lt]=Sumontuotas pašalinamas diskas
+ Comment[mk]=Монтиран отÑтранлив ноÑач
+ Comment[mt]=Riżors NFS immuntat
+@@ -34,14 +38,14 @@
+ Comment[pt_BR]=MÃdia RemovÃvel Montada
+ Comment[ru]=Смонтированный Ñменный ноÑитель
+ Comment[se]=Čátnon sirdehahtti medium
++Comment[sk]=Pripojené prenosné médium
+ Comment[sl]=Priklopljen odstranljiv medij
+ Comment[sr]=Монтиран уклоњиви медијум
+-Comment[sr@Latn]=Монтиран уклоњиви медијум
++Comment[sr@Latn]=Montiran uklonjivi medijum
+ Comment[sv]=Monterad flyttbar enhet
+ Comment[ta]=à®à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿ நீகà¯à®•கà¯à®•ூடிய மீடியமà¯
+ Comment[tr]=Bağlı Ayrılabilir Ortam
+ Comment[uk]=Змонтований переноÑний ноÑій
+-Comment[xx]=xxMounted Removable Mediumxx
+ Comment[zh_CN]=挂载的å¯ç§»åŠ¨ä»‹è´¨
+ Patterns=
+
+diff -Nru kdebase-release-3.4.0/kioslave/media/mimetypes/removable_unmounted.desktop kdebase-branch-3.4/kioslave/media/mimetypes/removable_unmounted.desktop
+--- kdebase-release-3.4.0/kioslave/media/mimetypes/removable_unmounted.desktop 2005-02-23 00:05:51.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mimetypes/removable_unmounted.desktop 2005-03-30 01:47:52.000000000 -0500
+@@ -7,13 +7,16 @@
+ Comment[az]=Ayrılmış Çıxarıla Bilən Mediyum
+ Comment[bg]=Демонтиран преноÑим ноÑител
+ Comment[bn]=আনমাউনà§à¦Ÿ করা অপসারণযোগà§à¦¯ মিডিয়াম
++Comment[bs]=Demontiran izmjenjivi uređaj
+ Comment[ca]=Suport extraible desmuntat
+ Comment[cs]=Odpojené výměnné médium
+ Comment[da]=Afmonteret medie der kan fjernes
+ Comment[de]=Nicht eingebundene Wechsellaufwerk
++Comment[el]=ΑποπÏοσαÏτημÎνο αφαιÏοÏμενο μÎσο
+ Comment[eo]=Malkroĉita forigebla konservejo
+ Comment[es]=Recurso extraÃble desmontado
+ Comment[et]=Lahutatud eemaldatav andmekandja
++Comment[eu]=Baliabide mugikorra desmontatua
+ Comment[fi]=Irroitettu irroitettava resurssi
+ Comment[fr]=Média amovible non monté
+ Comment[fy]=Ofkeppele ferwiderber medium
+@@ -21,7 +24,8 @@
+ Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ रीमूवेबल माधà¥à¤¯à¤®
+ Comment[hu]=Leválasztott adathordozó
+ Comment[is]=Aftengdur útskiptanlegur miðill
+-Comment[it]=Supporto rimuovibile non montato
++Comment[it]=Supporto rimovibile non montato
++Comment[ja]=マウントã•れã¦ã„ãªã„リムーãƒãƒ–ル メディア
+ Comment[lt]=Išmontuotas pašalinamas diskas
+ Comment[mk]=Демонтиран отÑтранлив ноÑач
+ Comment[mt]=Riżors għall-ħażna tad-data mhux immuntat
+@@ -34,14 +38,14 @@
+ Comment[pt_BR]=MÃdia RemovÃvel Desmontada
+ Comment[ru]=Отмонтированный Ñменный ноÑитель
+ Comment[se]=Gálgaduvvon sirdehahtti medium
++Comment[sk]=Nepripojené prenosné médium
+ Comment[sl]=Odklopljen odstranljiv medij
+ Comment[sr]=Демонтиран уклоњиви медијум
+-Comment[sr@Latn]=Демонтиран уклоњиви медијум
++Comment[sr@Latn]=Demontiran uklonjivi medijum
+ Comment[sv]=Avmonterad flyttbar enhet
+ Comment[ta]=à®à®±à¯à®±à®¾à®¤ நீகà¯à®•கà¯à®•ூடிய சாதனமà¯
+ Comment[tr]=Bağlanmamış Ayrılabilir Ortam
+ Comment[uk]=Демонтований переноÑний ноÑій
+-Comment[xx]=xxUnmounted Removable Mediumxx
+ Comment[zh_CN]=未挂载的å¯ç§»åŠ¨ä»‹è´¨
+ Patterns=
+
+diff -Nru kdebase-release-3.4.0/kioslave/media/mimetypes/smb_mounted.desktop kdebase-branch-3.4/kioslave/media/mimetypes/smb_mounted.desktop
+--- kdebase-release-3.4.0/kioslave/media/mimetypes/smb_mounted.desktop 2005-02-23 00:05:51.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mimetypes/smb_mounted.desktop 2005-03-07 09:15:55.000000000 -0500
+@@ -52,7 +52,7 @@
+ Comment[sk]=Pripojený disk Samba (Microsoft Network)
+ Comment[sl]=Priklopljen deljeni vir Sambe (Microsoftovo omrežje)
+ Comment[sr]=Монтирано Samba дељење (Microsoft-ова мрежа)
+-Comment[sr@Latn]=Montirano Samba (Microsoft Network) deljenje
++Comment[sr@Latn]=Montirano Samba deljenje (Microsoft-ova mreža)
+ Comment[sv]=Monterad utdelad Samba-katalog (Microsoft-nätverk)
+ Comment[ta]=சமà¯à®ªà®¾ à®à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯ (மைகà¯à®°à¯‡à®šà®¾à®ªà¯à®Ÿà¯ வலை) பகிரà¯à®µà¯
+ Comment[tg]=Монтажшудаи манбаъи Samba (шабакаи Microsoft)
+@@ -62,7 +62,6 @@
+ Comment[ven]=Samba yo gonyaho (Vhukwamani ha Microsoft) U kovhekana
+ Comment[vi]=Vùng chia sẻ SAMBA (mạng của Microsoft) được gắn kết
+ Comment[xh]=Samba Enyusiweyo (Umsebenzi womnatha we Microsoft) Ulwahlulo
+-Comment[xx]=xxMounted Samba (Microsoft Network) Sharexx
+ Comment[zh_CN]=挂载的 Samba (Microsoft 网络)共享
+ Comment[zh_TW]=已掛載的 Samba (Microsoft 網路) 分享
+ Comment[zu]=Isabelo se-Samba esinyusiwe (Uxhumano olusakazekile le-Network)
+diff -Nru kdebase-release-3.4.0/kioslave/media/mimetypes/smb_unmounted.desktop kdebase-branch-3.4/kioslave/media/mimetypes/smb_unmounted.desktop
+--- kdebase-release-3.4.0/kioslave/media/mimetypes/smb_unmounted.desktop 2005-02-23 00:05:51.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mimetypes/smb_unmounted.desktop 2005-03-07 09:15:55.000000000 -0500
+@@ -53,7 +53,7 @@
+ Comment[sk]=Nepripojený disk Samba (Microsoft Network)
+ Comment[sl]=Odklopljen deljeni vir Sambe (Microsoftovo omrežje)
+ Comment[sr]=Демонтирано Samba дељење (Microsoft-ова мрежа)
+-Comment[sr@Latn]=Demontirano Samba (Microsoft Network) deljenje
++Comment[sr@Latn]=Demontirano Samba deljenje (Microsoft-ova mreža)
+ Comment[sv]=Avmonterad utdelad Samba-katalog (Microsoft-nätverk)
+ Comment[ta]=சமà¯à®ªà®¾à®µà¯ˆ வெளியேறà¯à®±à¯(மைகà¯à®°à¯‡à®šà®¾à®ªà¯à®Ÿà¯ வலை) பகிரà¯à®µà¯
+ Comment[tg]=Ҷудо шудаи манбаъи Samba (шабакаи Microsoft)
+@@ -63,7 +63,6 @@
+ Comment[ven]=Samba i songo gonyaho (Vhukamani ha Microsoft) U kovhekana
+ Comment[vi]=Vùng chia sẻ SAMBA (Mạng của Microsoft) được gỡ
+ Comment[xh]=Samba Enganyuswanga (Umsebenzi womnatha we Microsoft) Ulwahlulo
+-Comment[xx]=xxUnmounted Samba (Microsoft Network) Sharexx
+ Comment[zh_CN]=未挂载的 Samba (Microsoft 网络)共享
+ Comment[zh_TW]=未掛載的 Samba (Microsoft 網路) 分享
+ Comment[zu]=Isabelo se-Samba esehlisiwe (Uxhumano olusakazekile lwe-Microsoft)
+diff -Nru kdebase-release-3.4.0/kioslave/media/mimetypes/svcd.desktop kdebase-branch-3.4/kioslave/media/mimetypes/svcd.desktop
+--- kdebase-release-3.4.0/kioslave/media/mimetypes/svcd.desktop 2005-02-23 00:05:51.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mimetypes/svcd.desktop 2005-03-08 04:28:39.000000000 -0500
+@@ -13,6 +13,7 @@
+ Comment[hu]=Super Video-CD
+ Comment[is]=Súper vÃdeó CD
+ Comment[it]=Super video CD
++Comment[ja]=スーパー ビデオ CD
+ Comment[nb]=Super video CD
+ Comment[nl]=Super Video-cd
+ Comment[nn]=Super Video-CD
+@@ -21,11 +22,10 @@
+ Comment[pt]=Super VÃdeo CD
+ Comment[pt_BR]=Super vÃdeo CD (SVCD)
+ Comment[sr]=Супер видео CD
+-Comment[sr@Latn]=Супер видео CD
++Comment[sr@Latn]=Super video CD
+ Comment[sv]=Supervideo-cd
+ Comment[ta]=சூபà¯à®ªà®°à¯ படகà¯à®•ாடà¯à®šà®¿ கà¯à®±à¯à®¨à¯à®¤à®•டà¯
+ Comment[tr]=Süper Vidyo CD
+ Comment[uk]=Супер відео КД
+-Comment[xx]=xxSuper Video CDxx
+ Comment[zh_CN]=超级 VCD
+ Icon=cdrom_unmount
+diff -Nru kdebase-release-3.4.0/kioslave/media/mimetypes/vcd.desktop kdebase-branch-3.4/kioslave/media/mimetypes/vcd.desktop
+--- kdebase-release-3.4.0/kioslave/media/mimetypes/vcd.desktop 2005-02-23 00:05:51.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mimetypes/vcd.desktop 2005-03-08 04:28:39.000000000 -0500
+@@ -13,6 +13,7 @@
+ Comment[hi]=वीडियो सीडी
+ Comment[hu]=Video-CD
+ Comment[is]=VÃdeó CD
++Comment[ja]=ビデオ CD
+ Comment[nl]=Video-cd
+ Comment[nn]=Video-CD
+ Comment[pa]=ਵੀਡਿਓ CD
+@@ -20,11 +21,9 @@
+ Comment[pt]=VÃdeo CD
+ Comment[pt_BR]=VÃdeo CD (VCD)
+ Comment[sr]=Видео CD
+-Comment[sr@Latn]=Видео CD
+ Comment[sv]=Video-cd
+ Comment[ta]=படகà¯à®•ாடà¯à®šà®¿ கà¯à®±à¯à®¨à¯à®¤à®•டà¯
+ Comment[tr]=Vidyo CD
+ Comment[uk]=Видео КД
+-Comment[xx]=xxVideo CDxx
+ Comment[zh_CN]=VCD
+ Icon=cdrom_unmount
+diff -Nru kdebase-release-3.4.0/kioslave/media/mimetypes/zip_mounted.desktop kdebase-branch-3.4/kioslave/media/mimetypes/zip_mounted.desktop
+--- kdebase-release-3.4.0/kioslave/media/mimetypes/zip_mounted.desktop 2005-02-04 23:15:29.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mimetypes/zip_mounted.desktop 2005-03-07 09:15:55.000000000 -0500
+@@ -65,7 +65,6 @@
+ Comment[ven]=Disk ya Zip yo gonyiswaho
+ Comment[wa]=Plakete ZIP montêye
+ Comment[xh]=Diski Yoqokelelo ndawonye Kwediski
+-Comment[xx]=xxMounted Zip Diskxx
+ Comment[zh_CN]=挂载的 Zip ç£ç›˜
+ Comment[zh_TW]=已掛載的 Zip ç£ç¢Ÿ
+ Comment[zu]=I-disk yokuhlanganiselwe ndawonye eyenyusiwe
+diff -Nru kdebase-release-3.4.0/kioslave/media/mimetypes/zip_unmounted.desktop kdebase-branch-3.4/kioslave/media/mimetypes/zip_unmounted.desktop
+--- kdebase-release-3.4.0/kioslave/media/mimetypes/zip_unmounted.desktop 2005-02-04 23:15:29.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/mimetypes/zip_unmounted.desktop 2005-03-07 09:15:55.000000000 -0500
+@@ -65,7 +65,6 @@
+ Comment[ven]=Disk ya Zip i songo gonyiswaho
+ Comment[wa]=Plakete ZIP dismontêye
+ Comment[xh]=Diski Yoqokelelo ndawone Enganyuswanga
+-Comment[xx]=xxUnmounted Zip Diskxx
+ Comment[zh_CN]=挂载的 Zip ç£ç›˜
+ Comment[zh_TW]=未掛載的 Zip ç£ç¢Ÿ
+ Comment[zu]=I-disk yokuhlanganiselwe ndawonye eyehlisiwe
+diff -Nru kdebase-release-3.4.0/kioslave/media/services/media_eject.desktop kdebase-branch-3.4/kioslave/media/services/media_eject.desktop
+--- kdebase-release-3.4.0/kioslave/media/services/media_eject.desktop 2005-02-04 23:15:30.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/services/media_eject.desktop 2005-03-07 09:15:56.000000000 -0500
+@@ -72,7 +72,6 @@
+ Name[vi]=Äẩy ra
+ Name[wa]=Fé rexhe
+ Name[xh]=Khuphela ngaphandle
+-Name[xx]=xxEjectxx
+ Name[zh_CN]=弹出
+ Name[zh_TW]=跳出
+ Name[zu]=Khipha
+diff -Nru kdebase-release-3.4.0/kioslave/media/services/media_mount.desktop kdebase-branch-3.4/kioslave/media/services/media_mount.desktop
+--- kdebase-release-3.4.0/kioslave/media/services/media_mount.desktop 2005-02-04 23:15:30.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/services/media_mount.desktop 2005-03-07 09:15:56.000000000 -0500
+@@ -67,7 +67,6 @@
+ Name[vi]=Gắn kết
+ Name[wa]=Monter
+ Name[xh]=Layisha
+-Name[xx]=xxMountxx
+ Name[zh_CN]=挂载
+ Name[zh_TW]=掛載
+ Name[zu]=Yenyusa
+diff -Nru kdebase-release-3.4.0/kioslave/media/services/media_safelyremove.desktop kdebase-branch-3.4/kioslave/media/services/media_safelyremove.desktop
+--- kdebase-release-3.4.0/kioslave/media/services/media_safelyremove.desktop 2005-02-23 00:05:51.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/services/media_safelyremove.desktop 2005-03-30 01:47:52.000000000 -0500
+@@ -7,18 +7,22 @@
+ Name=Safely Remove
+ Name[bg]=БезопаÑно изваждане
+ Name[bn]=নিরাপদà¦à¦¾à¦¬à§‡ সরাও
++Name[bs]=Sigurno ukloni
+ Name[ca]=Extreu amb seguretat
+ Name[cs]=BezpeÄnÄ› odstranit
+ Name[da]=Fjern sikkert
+ Name[de]=Sicher entfernen
++Name[el]=Ασφαλής αφαίÏεση
+ Name[es]=Borrado seguro
+ Name[et]=Eemalda turvaliselt
++Name[eu]=Atera arriskurik gabe
+ Name[fi]=Poista turvallisesti
+ Name[fr]=Enlever en toute sécurité
+ Name[he]=שליפה בבטחה
+ Name[hu]=Biztonságos leválasztás
+ Name[is]=Fjarlægja öruggt
+ Name[it]=Rimozione sicura
++Name[ja]=安全ã«å–り除ã
+ Name[lt]=Saugiai pašalinti
+ Name[nb]=Sikker fjerning
+ Name[nl]=Veilig verwijderen
+@@ -27,12 +31,12 @@
+ Name[pt]=Retirar com Segurança
+ Name[pt_BR]=Remover de Modo Seguro
+ Name[ru]=БезопаÑно извлечь
++Name[sk]=BezpeÄne odstrániÅ¥
+ Name[sl]=Varno odstrani
+ Name[sr]=Безбедно уклони
+-Name[sr@Latn]=Безбедно уклони
++Name[sr@Latn]=Bezbedno ukloni
+ Name[sv]=Säker urkoppling
+ Name[ta]=பாதà¯à®•ாபà¯à®ªà®¾à®• நீகà¯à®•à¯
+ Name[uk]=Безпечно вилучити
+-Name[xx]=xxSafely Removexx
+ Exec=kio_media_mounthelper -s %u
+
+diff -Nru kdebase-release-3.4.0/kioslave/media/services/media_unmount.desktop kdebase-branch-3.4/kioslave/media/services/media_unmount.desktop
+--- kdebase-release-3.4.0/kioslave/media/services/media_unmount.desktop 2005-02-21 23:13:04.000000000 -0500
++++ kdebase-branch-3.4/kioslave/media/services/media_unmount.desktop 2005-03-07 09:15:56.000000000 -0500
+@@ -68,7 +68,6 @@
+ Name[vi]=Gỡ
+ Name[wa]=Dismonter
+ Name[xh]=Sukuyilayisha
+-Name[xx]=xxUnmountxx
+ Name[zh_CN]=å¸è½½
+ Name[zh_TW]=未掛載
+ Name[zu]=Yehlisa
+diff -Nru kdebase-release-3.4.0/kioslave/remote/kdedmodule/remotedirnotify.desktop kdebase-branch-3.4/kioslave/remote/kdedmodule/remotedirnotify.desktop
+--- kdebase-release-3.4.0/kioslave/remote/kdedmodule/remotedirnotify.desktop 2005-02-23 00:05:52.000000000 -0500
++++ kdebase-branch-3.4/kioslave/remote/kdedmodule/remotedirnotify.desktop 2005-03-22 12:38:14.000000000 -0500
+@@ -2,10 +2,13 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=KDED Remote Base URL Notifier
++Name[bs]=KDED udaljeno obavještenje o baznom URLu
+ Name[ca]=Notificador d'URL de base remota KDED
+ Name[da]=KDED Ekstern basis-URL påmindelser
++Name[de]=KDED Benachrichtung für entfernte Basis-URLs
+ Name[es]=Notificador de URL remota KDED
+ Name[et]=KDED mujalasuva URL-i teadustaja
++Name[eu]=KDED urruneko URL oinarriaren iragarlea
+ Name[fi]=KDED:in etä-urlin ilmaisin
+ Name[fr]=Notificateur d'URL distante KDED
+ Name[fy]=KDED ekstern basis-URL-adres melding
+@@ -13,18 +16,19 @@
+ Name[hu]=KDED távoli alap-URL-értesÃtÅ‘
+ Name[is]=KDED fjarlægur grunnslóðar tilkynnari
+ Name[it]=Notifica KDED Remote Base URL
++Name[ja]=KDED リモート ベース URL 通知
+ Name[nb]=KDED-påminner for eksterne nettadresser
+ Name[nl]=KDED extern basis-URL-adres notificatie
+ Name[pa]=KDED ਰਿਮੋਟ ਅਧਾਰਿਤ URL ਸੂਚਨਾ
+ Name[pl]=Powiadamianie o zdalnych URL-ach dla KDED
+ Name[pt]=Notificador KDED de URL Base Remota
+ Name[pt_BR]=Serviço de Notificação da URL Remota
++Name[sk]=Modul pre upozornenie zmien vzdialených URL pre KDED
+ Name[sr]=Обавештавач о удаљеном базном URL-у, KDED
+-Name[sr@Latn]=Обавештавач о удаљеном базном URL-у, KDED
++Name[sr@Latn]=ObaveÅ¡tavaÄ o udaljenom baznom URL-u, KDED
+ Name[sv]=KDED-meddelande om fjärrbaswebbadresser
+ Name[ta]=KDED தொலைதூரம௠சாரà¯à®¨à¯à®¤ வலைமனை கà¯à®±à®¿à®ªà¯à®ªà®¾à®©à¯
+ Name[tr]=KDED Uzak Tabanlı URL Hatırlatıcı
+-Name[xx]=xxKDED Remote Base URL Notifierxx
+ Name[zh_CN]=KDED 远程基 URL 通知器
+ ServiceTypes=KDEDModule
+ X-KDE-ModuleType=Library
+diff -Nru kdebase-release-3.4.0/kioslave/sftp/sftp.protocol kdebase-branch-3.4/kioslave/sftp/sftp.protocol
+--- kdebase-release-3.4.0/kioslave/sftp/sftp.protocol 2005-02-23 00:05:52.000000000 -0500
++++ kdebase-branch-3.4/kioslave/sftp/sftp.protocol 2005-03-30 01:47:52.000000000 -0500
+@@ -13,12 +13,15 @@
+ Icon=ftp
+ Description=A kioslave for sftp
+ Description[bn]=à¦à¦¸.à¦à¦«.টি.পি-র জনà§à¦¯ à¦à¦•টি kioslave
++Description[bs]=kioslave za SFTP
+ Description[ca]=Un kioslave per a sftp
+ Description[cs]=Protokol KDE pro sftp
+ Description[da]=En kioslave for sftp
+ Description[de]=Ein-/Ausgabemodul für das sftp-Protokoll
++Description[el]=Ένας kioslave για sftp
+ Description[es]=Un kioslave para sftp
+ Description[et]=SFTP IO-moodul
++Description[eu]=Sftp-rako kioslave bat
+ Description[fi]=Sftp:n liitin
+ Description[fr]=Un kioslave pour le sftp
+ Description[fy]=Een kioslave Foar sftp
+@@ -27,6 +30,7 @@
+ Description[hu]=KDE-protokoll az sftp-hez
+ Description[is]=kioslave fyrir sftp
+ Description[it]=Un kioslave per sftp
++Description[ja]=sftp ã®ãŸã‚ã® kioslave
+ Description[lt]=Kiovergas sftp protokolui
+ Description[nb]=En kioslave for sftp
+ Description[nl]=Een kioslave voor sftp
+@@ -36,14 +40,14 @@
+ Description[pt_BR]=Uma implementação para o sftp
+ Description[ru]=Модуль ввода-вывода Ð´Ð»Ñ sftp
+ Description[se]=ŠO-šláva sftp-protokolla várás
++Description[sk]=IO klient pre SFTP
+ Description[sl]=kioslave za sftp
+ Description[sr]=Kioslave за SFTP
+-Description[sr@Latn]=Kioslave за SFTP
++Description[sr@Latn]=Kioslave za SFTP
+ Description[sv]=En I/O-slav för SFTP
+ Description[ta]=sftpகà¯à®•ான ஒர௠கà¯à®¯à¯‹à®¸à¯à®²à¯‡à®µà¯
+ Description[tr]=Sftp için kioslave
+ Description[uk]=Підлеглий Ð’/Ð’ Ð´Ð»Ñ sftp
+-Description[xx]=xxA kioslave for sftpxx
+ Description[zh_CN]=sftp çš„ kioslave
+ DocPath=kioslave/sftp.html
+ Icon=ftp
+diff -Nru kdebase-release-3.4.0/kioslave/sftp/sftpfileattr.cpp kdebase-branch-3.4/kioslave/sftp/sftpfileattr.cpp
+--- kdebase-release-3.4.0/kioslave/sftp/sftpfileattr.cpp 2004-10-02 00:55:32.000000000 -0400
++++ kdebase-branch-3.4/kioslave/sftp/sftpfileattr.cpp 2005-03-13 14:55:51.000000000 -0500
+@@ -294,7 +294,6 @@
+ mFlags = 0;
+ mLongname = "\0";
+ mLinkType = 0;
+- mEncoding = "\0";
+ }
+
+ /** Return the size of the sftp attribute. */
+diff -Nru kdebase-release-3.4.0/kioslave/smb/smb-network.desktop kdebase-branch-3.4/kioslave/smb/smb-network.desktop
+--- kdebase-release-3.4.0/kioslave/smb/smb-network.desktop 2005-02-11 23:26:26.000000000 -0500
++++ kdebase-branch-3.4/kioslave/smb/smb-network.desktop 2005-03-07 09:15:57.000000000 -0500
+@@ -63,7 +63,6 @@
+ Name[vi]=Samba chia sẻ
+ Name[wa]=PÃ¥rtaedjes Samba
+ Name[xh]=Izahlulo ze Samba
+-Name[xx]=xxSamba Sharesxx
+ Name[zh_CN]=Samba 共享
+ Name[zh_TW]=Samba 資æºåˆ†äº«
+ Name[zu]=Izabelo ze-Samba
+diff -Nru kdebase-release-3.4.0/kioslave/smb/x-smb-server.desktop kdebase-branch-3.4/kioslave/smb/x-smb-server.desktop
+--- kdebase-release-3.4.0/kioslave/smb/x-smb-server.desktop 2005-02-18 23:27:11.000000000 -0500
++++ kdebase-branch-3.4/kioslave/smb/x-smb-server.desktop 2005-03-30 01:47:52.000000000 -0500
+@@ -11,6 +11,7 @@
+ Comment[cy]=Grŵp Gwaith Windows
+ Comment[da]=Windows server
+ Comment[de]=Windows-Server
++Comment[el]=Διακομιστής των Windows
+ Comment[eo]=Vindoza servilo
+ Comment[es]=Servidor Windows
+ Comment[et]=Windowsi server
+@@ -42,13 +43,12 @@
+ Comment[sk]=Server Windows
+ Comment[sl]=Strežnik za Windows
+ Comment[sr]=Windows Ñервер
+-Comment[sr@Latn]=Windows Ñервер
++Comment[sr@Latn]=Windows server
+ Comment[sv]=Windows server
+ Comment[ta]=சாளர சேவகனà¯
+ Comment[tr]=Windows Sunucusu
+ Comment[uk]=Сервер Windows
+ Comment[uz]=Windows Ñервери
+-Comment[xx]=xxWindows Serverxx
+ Comment[zh_CN]=Windows æœåС噍
+ Icon=server
+ Type=MimeType
+diff -Nru kdebase-release-3.4.0/kioslave/smb/x-smb-workgroup.desktop kdebase-branch-3.4/kioslave/smb/x-smb-workgroup.desktop
+--- kdebase-release-3.4.0/kioslave/smb/x-smb-workgroup.desktop 2005-02-10 23:52:15.000000000 -0500
++++ kdebase-branch-3.4/kioslave/smb/x-smb-workgroup.desktop 2005-03-07 09:15:57.000000000 -0500
+@@ -53,7 +53,6 @@
+ Comment[uz]=Windows ишчи гуруҳи
+ Comment[vi]=Nhóm là m việc của Windows
+ Comment[wa]=Groupe d'Â ovraedje Windows
+-Comment[xx]=xxWindows Workgroupxx
+ Comment[zh_CN]=Windows 工作组
+ Comment[zh_TW]=視窗工作群組
+ Icon=network_local
+diff -Nru kdebase-release-3.4.0/kioslave/system/entries/home.desktop kdebase-branch-3.4/kioslave/system/entries/home.desktop
+--- kdebase-release-3.4.0/kioslave/system/entries/home.desktop 2005-02-04 23:15:31.000000000 -0500
++++ kdebase-branch-3.4/kioslave/system/entries/home.desktop 2005-03-10 11:05:14.000000000 -0500
+@@ -4,6 +4,7 @@
+ URL=$HOME
+ Icon=kfm_home
+ Name=Home Folder
++Name[af]=Tuis Gids
+ Name[ar]=مجلدي
+ Name[az]=Ev QovluÄŸu
+ Name[be]=ХатнÑÑ Ñ‚Ñчка
+@@ -61,7 +62,6 @@
+ Name[uz]=Уй жилди
+ Name[vi]=Thư mục nhÃ
+ Name[wa]=Ridant måjhon
+-Name[xx]=xxHome Folderxx
+ Name[zh_CN]=主文件夹
+ Open=false
+ X-KDE-TreeModule=Directory
+diff -Nru kdebase-release-3.4.0/kioslave/system/entries/media.desktop kdebase-branch-3.4/kioslave/system/entries/media.desktop
+--- kdebase-release-3.4.0/kioslave/system/entries/media.desktop 2005-02-23 00:05:52.000000000 -0500
++++ kdebase-branch-3.4/kioslave/system/entries/media.desktop 2005-03-30 01:47:53.000000000 -0500
+@@ -6,13 +6,16 @@
+ Name=Storage Media
+ Name[bg]=СъхранÑващи уÑтройÑтва
+ Name[bn]=সà§à¦Ÿà§‹à¦°à§‡à¦œ মিডিয়া
++Name[bs]=Uređaji za smještaj podataka
+ Name[ca]=Suports d'emmagatzematge
+ Name[cs]=Úložná zaÅ™ÃzenÃ
+ Name[da]=Opbevaringsmedie
+ Name[de]=Speichermedien
++Name[el]=ΣυσκευÎÏ‚ αποθήκευσης
+ Name[eo]=Konservejo
+ Name[es]=Dispositivos de almacenamiento
+ Name[et]=Andmekandjad
++Name[eu]=Almazenamendua
+ Name[fi]=Tallennusmedia
+ Name[fr]=Support de stockage
+ Name[fy]=Opslachapparaten
+@@ -21,6 +24,7 @@
+ Name[hu]=Tárolóeszköz
+ Name[is]=Geymslumiðill
+ Name[it]=Dispositivi di archiviazione
++Name[ja]=記憶メディア
+ Name[lt]=Informacijos saugojimo įrenginiai
+ Name[nb]=Lagringsenheter
+ Name[nl]=Opslagapparaten
+@@ -30,14 +34,14 @@
+ Name[pt]=Dispositivos de Armazenamento
+ Name[pt_BR]=MÃdia
+ Name[ru]=УÑтройÑтва Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ…
++Name[sk]=Diskové zariadenia
+ Name[sl]=Medij za shranjevanje
+ Name[sr]=Складишни медијуми
+-Name[sr@Latn]=Складишни медијуми
++Name[sr@Latn]=Skladišni medijumi
+ Name[sv]=Lagringsmedia
+ Name[ta]=சேகரிபà¯à®ªà¯ ஊடகமà¯
+ Name[tr]=Depolama Ortamı
+ Name[uk]=ПриÑтрої Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ—
+-Name[xx]=xxStorage Mediaxx
+ Name[zh_CN]=å˜å‚¨ä»‹è´¨
+ Open=true
+ X-KDE-TreeModule=Directory
+diff -Nru kdebase-release-3.4.0/kioslave/system/entries/remote.desktop kdebase-branch-3.4/kioslave/system/entries/remote.desktop
+--- kdebase-release-3.4.0/kioslave/system/entries/remote.desktop 2005-02-23 00:05:52.000000000 -0500
++++ kdebase-branch-3.4/kioslave/system/entries/remote.desktop 2005-03-30 01:47:53.000000000 -0500
+@@ -6,11 +6,15 @@
+ Name=Remote Places
+ Name[bg]=Отдалечени директории
+ Name[bn]=দূরবরà§à¦¤à§€ অবসà§à¦¥à¦¾à¦¨
++Name[bs]=Udaljena mjesta
+ Name[ca]=Llocs remots
+ Name[cs]=Vzdálená umÃstÄ›nÃ
+ Name[da]=Eksterne steder
++Name[de]=Entfernte Orte
++Name[el]=ΑπομακÏυσμÎνες τοποθεσίες
+ Name[es]=Lugares remotos
+ Name[et]=Võrgukohad
++Name[eu]=Urruneko lekuak
+ Name[fi]=Etäkohteet
+ Name[fr]=Emplacements distants
+ Name[fy]=Eksterne plakken
+@@ -19,6 +23,7 @@
+ Name[hu]=Távoli helyek
+ Name[is]=Fjarlægir staðir
+ Name[it]=Indirizzi remoti
++Name[ja]=リモートã®å ´æ‰€
+ Name[lt]=Nutolusios vietos
+ Name[nb]=Eksterne steder
+ Name[nl]=Externe plekken
+@@ -28,14 +33,14 @@
+ Name[pt_BR]=Locais Remotos
+ Name[ru]=Удаленные меÑта
+ Name[se]=Gáiddus báikkit
++Name[sk]=Vzdialené miesta
+ Name[sl]=Oddaljena mesta
+ Name[sr]=Удаљена меÑта
+-Name[sr@Latn]=Удаљена меÑта
++Name[sr@Latn]=Udaljena mesta
+ Name[sv]=Fjärrplatser
+ Name[ta]=தொலைதூர இடஙà¯à®•ளà¯
+ Name[tr]=Uzak Yerler
+ Name[uk]=Відалені міÑцÑ
+-Name[xx]=xxRemote Placesxx
+ Name[zh_CN]=远程ä½ç½®
+ Open=false
+ X-KDE-TreeModule=Directory
+diff -Nru kdebase-release-3.4.0/kioslave/system/entries/settings.desktop kdebase-branch-3.4/kioslave/system/entries/settings.desktop
+--- kdebase-release-3.4.0/kioslave/system/entries/settings.desktop 2005-02-04 23:15:31.000000000 -0500
++++ kdebase-branch-3.4/kioslave/system/entries/settings.desktop 2005-03-26 02:37:43.000000000 -0500
+@@ -4,6 +4,7 @@
+ URL=settings:/
+ Icon=kcontrol
+ Name=Settings
++Name[af]=Instellings
+ Name[ar]=الإعدادات
+ Name[az]=QurÄŸular
+ Name[be]=ÐаÑтройкі
+@@ -23,7 +24,7 @@
+ Name[eu]=Ezarpenak
+ Name[fi]=Asetukset
+ Name[fr]=Configuration
+-Name[fy]=Ynstellingen
++Name[fy]=Ynstellings
+ Name[ga]=Socruithe
+ Name[gl]=Opcións
+ Name[he]=הגדרות
+@@ -63,7 +64,6 @@
+ Name[uz]=МоÑламалар
+ Name[vi]=Thiết láºp
+ Name[wa]=Apontiaedjes
+-Name[xx]=xxSettingsxx
+ Name[zh_CN]=设置
+ Open=false
+ X-KDE-TreeModule=Directory
+diff -Nru kdebase-release-3.4.0/kioslave/system/entries/trash.desktop kdebase-branch-3.4/kioslave/system/entries/trash.desktop
+--- kdebase-release-3.4.0/kioslave/system/entries/trash.desktop 2005-02-10 23:52:15.000000000 -0500
++++ kdebase-branch-3.4/kioslave/system/entries/trash.desktop 2005-03-07 09:15:57.000000000 -0500
+@@ -72,7 +72,6 @@
+ Name[vi]=Thùng rác
+ Name[wa]=Batch
+ Name[xh]=Inkukumo
+-Name[xx]=xxTrashxx
+ Name[zh_CN]=回收站
+ Name[zh_TW]=垃圾桶
+ Name[zu]=Izibi
+diff -Nru kdebase-release-3.4.0/kioslave/system/kdedmodule/systemdirnotify.desktop kdebase-branch-3.4/kioslave/system/kdedmodule/systemdirnotify.desktop
+--- kdebase-release-3.4.0/kioslave/system/kdedmodule/systemdirnotify.desktop 2005-02-23 00:05:52.000000000 -0500
++++ kdebase-branch-3.4/kioslave/system/kdedmodule/systemdirnotify.desktop 2005-03-22 12:38:15.000000000 -0500
+@@ -2,10 +2,13 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=KDED System Base URL Notifier
++Name[bs]=KDED sistemsko obavještenje o baznom URLu
+ Name[ca]=Notificador d'URL de base al sistema KDED
+ Name[da]=KDED Systembais-url påmindelser
++Name[de]=KDED Benachrichtigung für System Basis-URLs
+ Name[es]=Notificador de URL de base sistema de KDED
+ Name[et]=KDED süsteemsete URL-ide teadustaja
++Name[eu]=KDEren sistema oinarri URL iragarlea
+ Name[fi]=KDED:in järjestelmä-urlien ilmoittaja
+ Name[fr]=Notificateur d'URL système KDED
+ Name[fy]=KDED systeem basis URL-adres melding
+@@ -13,18 +16,19 @@
+ Name[hu]=KDED-értesÃtÅ‘ rendszer-alap-URL-hez
+ Name[is]=KDED kerfis grunnslóðar tilkynnari
+ Name[it]=Notifica KDED System Base URL
++Name[ja]=KDED システムベース URL 通知
+ Name[nb]=KDED-Systembase URL-varsler
+ Name[nl]=KDED systeem basis URL-adres notificatie
+ Name[pa]=KDE ਸਿਸਟਮ ਆਧਾਰ URL ਸੂਚਨਾ
+ Name[pl]=Powiadamianie o systemowych URL-ach dla KDED
+ Name[pt]=Notificador KDED de URL Base de Sistema
+ Name[pt_BR]=Serviço de Notificação da URL da Base do Sistema
++Name[sk]=Modul pre upozornenie zmien lokálnych URL pre KDED
+ Name[sr]=Обавештавач о ÑиÑтемÑком базном URL-у, KDED
+-Name[sr@Latn]=Обавештавач о ÑиÑтемÑком базном URL-у, KDED
++Name[sr@Latn]=ObaveÅ¡tavaÄ o sistemskom baznom URL-u, KDED
+ Name[sv]=KDED-meddelande om systembaswebbadresser
+ Name[ta]=KDED அமைபà¯à®ªà¯ சாரà¯à®¨à¯à®¤ வலைமனை கà¯à®±à®¿à®ªà¯à®ªà®¾à®©à¯
+ Name[tr]=KDED Sistem Tabanlı URL Hatırlatıcı
+-Name[xx]=xxKDED System Base URL Notifierxx
+ Name[zh_CN]=KDED 系统基 URL 通知器
+ ServiceTypes=KDEDModule
+ X-KDE-ModuleType=Library
+diff -Nru kdebase-release-3.4.0/kioslave/system/mimetypes/system_directory.desktop kdebase-branch-3.4/kioslave/system/mimetypes/system_directory.desktop
+--- kdebase-release-3.4.0/kioslave/system/mimetypes/system_directory.desktop 2005-02-23 00:05:53.000000000 -0500
++++ kdebase-branch-3.4/kioslave/system/mimetypes/system_directory.desktop 2005-03-30 01:47:53.000000000 -0500
+@@ -6,12 +6,15 @@
+ Comment=System Folder
+ Comment[bg]=СиÑтемна директориÑ
+ Comment[bn]=সিসà§à¦Ÿà§‡à¦® ফোলà§à¦¡à¦¾à¦°
++Comment[bs]=Sistemski direktorij
+ Comment[ca]=Carpeta del sistema
+ Comment[cs]=Systémová složka
+ Comment[da]=Systemmappe
+ Comment[de]=Systemordner
++Comment[el]=Φάκελος συστήματος
+ Comment[es]=Carpeta del sistema
+ Comment[et]=Süsteemi kataloog
++Comment[eu]=Sistemaren karpeta
+ Comment[fi]=Järjestelmän kansio
+ Comment[fr]=Dossier système
+ Comment[fy]=Systeemmap
+@@ -20,6 +23,7 @@
+ Comment[hu]=Rendszermappa
+ Comment[is]=Kerfismappa
+ Comment[it]=Cartella di sistema
++Comment[ja]=システムフォルダ
+ Comment[lt]=Sistemos aplankas
+ Comment[nb]=Systemmappe
+ Comment[nl]=Systeemmap
+@@ -29,9 +33,10 @@
+ Comment[pt_BR]=Pasta do Sistema
+ Comment[ru]=СиÑÑ‚ÐµÐ¼Ð½Ð°Ñ Ð¿Ð°Ð¿ÐºÐ°
+ Comment[se]=Vuogádatmáhpa
++Comment[sk]=Systémový prieÄinok
+ Comment[sl]=Sistemska mapa
+ Comment[sr]=СиÑтемÑки директоријум
+-Comment[sr@Latn]=СиÑтемÑки директоријум
++Comment[sr@Latn]=Sistemski direktorijum
+ Comment[sv]=Systemkatalog
+ Comment[ta]=அமைபà¯à®ªà¯ அடைவà¯
+ Comment[uk]=СиÑтемна тека
+diff -Nru kdebase-release-3.4.0/kioslave/tar/tar.cc kdebase-branch-3.4/kioslave/tar/tar.cc
+--- kdebase-release-3.4.0/kioslave/tar/tar.cc 2004-11-15 21:10:36.000000000 -0500
++++ kdebase-branch-3.4/kioslave/tar/tar.cc 2005-03-17 10:29:52.000000000 -0500
+@@ -368,9 +368,23 @@
+ kdDebug(7109) << "Emitting mimetype " << result->mimeType() << endl;
+ mimeType( result->mimeType() );
+
+- data( completeData );
++ QByteArray partialData;
++ int offset = 0;
++ const int inc = 0x800000; // 8MB
++
++ while ( offset + inc < archiveFileEntry->size() ) {
++ partialData.setRawData( completeData.data() + offset, inc );
++ data( partialData );
++ partialData.resetRawData( completeData.data() + offset, inc );
++ processedSize( offset + inc );
++ offset += inc;
++ }
+
++ partialData.setRawData( completeData.data() + offset, archiveFileEntry->size() - offset );
++ data( partialData );
++ partialData.resetRawData( completeData.data() + offset, archiveFileEntry->size() - offset );
+ processedSize( archiveFileEntry->size() );
++
+ data( QByteArray() );
+
+ finished();
+diff -Nru kdebase-release-3.4.0/kioslave/thumbnail/cursorthumbnail.desktop kdebase-branch-3.4/kioslave/thumbnail/cursorthumbnail.desktop
+--- kdebase-release-3.4.0/kioslave/thumbnail/cursorthumbnail.desktop 2005-02-10 23:52:16.000000000 -0500
++++ kdebase-branch-3.4/kioslave/thumbnail/cursorthumbnail.desktop 2005-03-07 09:15:58.000000000 -0500
+@@ -57,7 +57,6 @@
+ Name[uz]=КурÑор файллари
+ Name[vi]=File con trá»
+ Name[wa]=Fitchîs cursoe
+-Name[xx]=xxCursor Filesxx
+ Name[zh_CN]=å…‰æ ‡æ–‡ä»¶
+ Name[zh_TW]=游標檔案
+ ServiceTypes=ThumbCreator
+diff -Nru kdebase-release-3.4.0/kioslave/thumbnail/djvuthumbnail.desktop kdebase-branch-3.4/kioslave/thumbnail/djvuthumbnail.desktop
+--- kdebase-release-3.4.0/kioslave/thumbnail/djvuthumbnail.desktop 2005-02-04 23:15:31.000000000 -0500
++++ kdebase-branch-3.4/kioslave/thumbnail/djvuthumbnail.desktop 2005-03-07 09:15:58.000000000 -0500
+@@ -58,7 +58,6 @@
+ Name[uz]=DjVu-файллари
+ Name[vi]=File đã nhìn thấy
+ Name[wa]=Fitchîs DjVu
+-Name[xx]=xxDjVu Filesxx
+ Name[zh_CN]=DjVu 文件
+ Name[zh_TW]=DjVu 檔案
+ ServiceTypes=ThumbCreator
+diff -Nru kdebase-release-3.4.0/kioslave/thumbnail/exrthumbnail.desktop kdebase-branch-3.4/kioslave/thumbnail/exrthumbnail.desktop
+--- kdebase-release-3.4.0/kioslave/thumbnail/exrthumbnail.desktop 2005-02-23 00:05:53.000000000 -0500
++++ kdebase-branch-3.4/kioslave/thumbnail/exrthumbnail.desktop 2005-03-30 01:47:53.000000000 -0500
+@@ -6,13 +6,16 @@
+ Name[bg]=EXR образи
+ Name[bn]=ই-à¦à¦•à§à¦¸-আর ছবি
+ Name[br]=Skeudennoù EXR
++Name[bs]=EXR slike
+ Name[ca]=Imatges EXR
+ Name[cs]=EXR obrázky
+ Name[da]=EXR-billeder
+ Name[de]=EXR-Bilder
++Name[el]=Εικόνες EXR
+ Name[eo]=EXR-Bildoj
+ Name[es]=Imágenes EXR
+ Name[et]=EXR pildifailid
++Name[eu]=EXR irudiak
+ Name[fi]=EXR-kuvat
+ Name[fr]=Images EXR
+ Name[fy]=EXR-ôfbyldings
+@@ -22,6 +25,7 @@
+ Name[hu]=EXR-képek
+ Name[is]=EXR myndir
+ Name[it]=Immagini EXR
++Name[ja]=EXR イメージ
+ Name[lt]=EXR paveiksliukai
+ Name[mk]=Слики EXR
+ Name[mt]=Stampi EXR
+@@ -33,14 +37,14 @@
+ Name[pt_BR]=Imagens EXR
+ Name[ru]=Ð˜Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ EXR
+ Name[se]=EXR-govat
++Name[sk]=Obrázky EXR
+ Name[sl]=Slike EXR
+ Name[sr]=EXR Ñлике
+-Name[sr@Latn]=EXR Ñлике
++Name[sr@Latn]=EXR slike
+ Name[sv]=EXR-bilder
+ Name[ta]=இ எகà¯à®¸à¯ ஆர௠பிமà¯à®ªà®™à¯à®•ளà¯
+ Name[tr]=EXR Görüntüsü
+ Name[uk]=Ð—Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ EXR
+-Name[xx]=xxEXR Imagesxx
+ Name[zh_CN]=EXR Emacs
+ ServiceTypes=ThumbCreator
+ MimeTypes=image/x-exr
+diff -Nru kdebase-release-3.4.0/kioslave/thumbnail/htmlthumbnail.desktop kdebase-branch-3.4/kioslave/thumbnail/htmlthumbnail.desktop
+--- kdebase-release-3.4.0/kioslave/thumbnail/htmlthumbnail.desktop 2005-02-04 23:15:32.000000000 -0500
++++ kdebase-branch-3.4/kioslave/thumbnail/htmlthumbnail.desktop 2005-03-07 09:15:58.000000000 -0500
+@@ -68,7 +68,6 @@
+ Name[vi]=File HTML
+ Name[wa]=Fitchîs HTML
+ Name[xh]=Iifayile ze HTML
+-Name[xx]=xxHTML Filesxx
+ Name[zh_CN]=HTML 文件
+ Name[zh_TW]=HTML 檔案
+ Name[zu]=Amafayela e-HTML
+diff -Nru kdebase-release-3.4.0/kioslave/thumbnail/imagethumbnail.desktop kdebase-branch-3.4/kioslave/thumbnail/imagethumbnail.desktop
+--- kdebase-release-3.4.0/kioslave/thumbnail/imagethumbnail.desktop 2005-02-04 23:15:32.000000000 -0500
++++ kdebase-branch-3.4/kioslave/thumbnail/imagethumbnail.desktop 2005-03-07 09:15:58.000000000 -0500
+@@ -67,7 +67,6 @@
+ Name[vi]=Ảnh
+ Name[wa]=Imådjes
+ Name[xh]=Imifanekiso
+-Name[xx]=xxImagesxx
+ Name[zh_CN]=图åƒ
+ Name[zh_TW]=å½±åƒ
+ Name[zu]=Izithombe
+diff -Nru kdebase-release-3.4.0/kioslave/thumbnail/picturethumbnail.desktop kdebase-branch-3.4/kioslave/thumbnail/picturethumbnail.desktop
+--- kdebase-release-3.4.0/kioslave/thumbnail/picturethumbnail.desktop 2005-02-04 23:15:32.000000000 -0500
++++ kdebase-branch-3.4/kioslave/thumbnail/picturethumbnail.desktop 2005-03-07 09:15:58.000000000 -0500
+@@ -44,7 +44,6 @@
+ Name[uk]=МаÑштабовна векторна графіка (SVG)
+ Name[uz]=SVG
+ Name[vi]=Äồ hoạ vector lá»· lệ được (scalable)
+-Name[xx]=xxScalable Vector Graphics (SVG)xx
+ Name[zh_CN]=å¯ç¼©æ”¾çŸ¢é‡å›¾åƒ(SVG)
+ Name[zh_TW]=å¯èª¿æ•´å°ºå¯¸çš„å‘é‡åœ–åž‹ (SVG)
+ ServiceTypes=ThumbCreator
+diff -Nru kdebase-release-3.4.0/kioslave/thumbnail/textthumbnail.desktop kdebase-branch-3.4/kioslave/thumbnail/textthumbnail.desktop
+--- kdebase-release-3.4.0/kioslave/thumbnail/textthumbnail.desktop 2005-02-04 23:15:32.000000000 -0500
++++ kdebase-branch-3.4/kioslave/thumbnail/textthumbnail.desktop 2005-03-07 09:15:58.000000000 -0500
+@@ -69,7 +69,6 @@
+ Name[vi]=File text
+ Name[wa]=Fitchîs tecse
+ Name[xh]=Iifayile Zombhalo
+-Name[xx]=xxText Filesxx
+ Name[zh_CN]=文本文件
+ Name[zh_TW]=æ–‡å—æª”案
+ Name[zu]=Amafayela Ombhalo
+diff -Nru kdebase-release-3.4.0/kioslave/thumbnail/thumbcreator.desktop kdebase-branch-3.4/kioslave/thumbnail/thumbcreator.desktop
+--- kdebase-release-3.4.0/kioslave/thumbnail/thumbcreator.desktop 2005-02-04 23:15:32.000000000 -0500
++++ kdebase-branch-3.4/kioslave/thumbnail/thumbcreator.desktop 2005-03-07 09:15:58.000000000 -0500
+@@ -60,7 +60,6 @@
+ Comment[ven]=Tshaufara nga gunwe
+ Comment[vi]=Chỉnh các thumbnail
+ Comment[xh]=Umqheba Wozipho lobhontsi
+-Comment[xx]=xxThumbnail Handlerxx
+ Comment[zh_CN]=缩略图处ç†å™¨
+ Comment[zh_TW]=縮圖處ç†å™¨
+ Comment[zu]=Umphathi we-Thumbnail
+diff -Nru kdebase-release-3.4.0/kioslave/trash/kfile-plugin/kfile_trash.desktop kdebase-branch-3.4/kioslave/trash/kfile-plugin/kfile_trash.desktop
+--- kdebase-release-3.4.0/kioslave/trash/kfile-plugin/kfile_trash.desktop 2005-02-23 00:05:53.000000000 -0500
++++ kdebase-branch-3.4/kioslave/trash/kfile-plugin/kfile_trash.desktop 2005-03-22 12:38:16.000000000 -0500
+@@ -5,6 +5,7 @@
+ Name[az]=Zibil Faylı Məlumatı
+ Name[bg]=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° кошчето
+ Name[bn]=আবরà§à¦œà¦¨à¦¾ ফাইল তথà§à¦¯
++Name[bs]=Smeće informacije o datoteci
+ Name[ca]=Informació del fitxer paperera
+ Name[cs]=Info o koši
+ Name[da]=Fil-info om affald
+@@ -13,6 +14,7 @@
+ Name[eo]=Rubuja informo
+ Name[es]=Información de la papelera
+ Name[et]=Prügikasti failiinfo
++Name[eu]=Zakarontziaren infoa
+ Name[fi]=Roskakorin tiedot
+ Name[fr]=Info Fichier Corbeille
+ Name[fy]=JiskefetYnformaasje
+@@ -21,6 +23,7 @@
+ Name[hu]=Szemétkosár-jellemzők
+ Name[is]=Upplýsingar um ruslaskrá
+ Name[it]=Informazioni file del cestino
++Name[ja]=ã”ã¿ç®±æƒ…å ±
+ Name[lt]=Šiukšlių bylos informacija
+ Name[mk]=Инфо. за датотека од Корпата
+ Name[mt]=Skart
+@@ -32,14 +35,14 @@
+ Name[pt_BR]=Informações sobre o Arquivo de Lixo
+ Name[ru]=Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ файле в корзине
+ Name[se]=Ruskalihttedieđut
++Name[sk]=Informácie o koši
+ Name[sl]=Informacije o Smeteh
+ Name[sr]=Информације о фајлу у Ñмећу
+-Name[sr@Latn]=Информације о фајлу у Ñмећу
++Name[sr@Latn]=Informacije o fajlu u smeću
+ Name[sv]=Information om filer i papperskorgen
+ Name[ta]=கà¯à®ªà¯à®ªà¯ˆà®¤à¯à®¤à¯Šà®Ÿà¯à®Ÿà®¿ கோபà¯à®ªà¯ தகவலà¯
+ Name[tr]=Çöp Dosya Bilgisi
+ Name[uk]=Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ файл у Ñмітнику
+-Name[xx]=xxTrash File Infoxx
+ Name[zh_CN]=回收站文件信æ¯
+ ServiceTypes=KFilePlugin
+ X-KDE-Library=kfile_trash
+diff -Nru kdebase-release-3.4.0/kioslave/trash/trash.protocol kdebase-branch-3.4/kioslave/trash/trash.protocol
+--- kdebase-release-3.4.0/kioslave/trash/trash.protocol 2005-02-23 00:05:53.000000000 -0500
++++ kdebase-branch-3.4/kioslave/trash/trash.protocol 2005-04-05 16:45:19.000000000 -0400
+@@ -12,7 +12,7 @@
+ deleting=true
+ linking=false
+ moving=true
+-Icon=trash
++Icon=trashcan_full
+ maxInstances=2
+ Class=:local
+ renameFromFile=true
+@@ -25,11 +25,13 @@
+ ExtraNames=Original Path,Deletion Date
+ ExtraNames[bg]=МеÑтоположение,Дата на изтриване
+ ExtraNames[bn]=পূরà§à¦¬à¦¤à¦¨ পাথ, মোছার তারিখ
++ExtraNames[bs]=Originalni put,Datum brisanja
+ ExtraNames[ca]=Camà original,Data d'esborrat
+ ExtraNames[da]=Original sti, sletningsdato
+ ExtraNames[de]=Ursprünglicher Pfad, Löschzeitpunkt
+ ExtraNames[es]=Ruta original,Fecha de borrado
+ ExtraNames[et]=Algne asukoht,Kustutamisaeg
++ExtraNames[eu]=Jatorrizko bideizena, ezabatzeko data
+ ExtraNames[fi]=Alkuperäinen polku, poistopäivä
+ ExtraNames[fr]=Chemin d'origine, date de suppression
+ ExtraNames[fy]=Oarspronklike lokaasje,datum fan ferwidering
+@@ -38,6 +40,7 @@
+ ExtraNames[hu]=Eredeti elérési út,Törlési dátum
+ ExtraNames[is]=Upprunaleg slóð,dagsetning á eyðingu
+ ExtraNames[it]=Percorso originale,ora di eliminazione
++ExtraNames[ja]=å…ƒã®ãƒ‘ス,削除日
+ ExtraNames[lt]=Originalus kelias,Trynimo data
+ ExtraNames[nb]=Opprinnelig sti, slettedato
+ ExtraNames[nl]=Oorspronkelijke locatie,datum van verwijdering
+@@ -46,13 +49,13 @@
+ ExtraNames[pt]=Localização Original,Data de Remoção
+ ExtraNames[pt_BR]=Caminho Original,Data da Remoção
+ ExtraNames[ru]=ИÑходный путь, дата удалениÑ
++ExtraNames[sk]=Pôvodná cesta,Dátum odstránenia
+ ExtraNames[sl]=Prvotna pot,Datum brisanja
+ ExtraNames[sr]=првобитна путања,датум бриÑања
+-ExtraNames[sr@Latn]=првобитна путања,датум бриÑања
++ExtraNames[sr@Latn]=prvobitna putanja,datum brisanja
+ ExtraNames[sv]=Ursprunglig sökväg,Borttagsdatum
+ ExtraNames[ta]=மூல பாதை,நீகà¯à®•பà¯à®ªà®Ÿà¯à®Ÿ தேதி
+ ExtraNames[tr]=Orjinal Yol, Silinme Tarihi
+ ExtraNames[uk]=ШлÑÑ…,Дата видаленнÑ
+-ExtraNames[xx]=xxOriginal Path,Deletion Datexx
+ ExtraNames[zh_CN]=原始路径,åˆ é™¤æ—¥æœŸ
+ ExtraTypes=QString,QDateTime
+diff -Nru kdebase-release-3.4.0/kioslave/trash/trashimpl.cpp kdebase-branch-3.4/kioslave/trash/trashimpl.cpp
+--- kdebase-release-3.4.0/kioslave/trash/trashimpl.cpp 2005-02-25 12:53:54.000000000 -0500
++++ kdebase-branch-3.4/kioslave/trash/trashimpl.cpp 2005-03-11 05:50:54.000000000 -0500
+@@ -200,7 +200,7 @@
+ // Choose destination trash
+ trashId = findTrashDirectory( origPath );
+ if ( trashId < 0 ) {
+- kdWarning() << "OUCH - internal error, TrashImpl::createInfo got " << trashId << endl;
++ kdWarning() << "OUCH - internal error, TrashImpl::findTrashDirectory returned " << trashId << endl;
+ return false; // ### error() needed?
+ }
+
+@@ -713,7 +713,8 @@
+ // Skip pseudo-filesystems, there's no chance we'll find a .Trash on them :)
+ // ## Maybe we should also skip readonly filesystems
+ if ( str != "proc" && str != "devfs" && str != "usbdevfs" &&
+- str != "sysfs" && str != "devpts" && str != "subfs" /* #96259 */ ) {
++ str != "sysfs" && str != "devpts" && str != "subfs" /* #96259 */ &&
++ str != "autofs" /* #101116 */ ) {
+ QString topdir = (*it)->mountPoint();
+ QString trashDir = trashForMountPoint( topdir, false );
+ if ( !trashDir.isEmpty() ) {
+@@ -759,24 +760,24 @@
+ int requiredBits = S_IWOTH | S_IXOTH | S_ISVTX;
+ if ( KDE_lstat( QFile::encodeName( rootTrashDir ), &buff ) == 0 ) {
+ if ( (buff.st_uid == 0) // must be owned by root
+- && (S_ISDIR(buff.st_mode)) // must be a dir
+- && (!S_ISLNK(buff.st_mode)) // not a symlink
+- && (buff.st_mode & requiredBits == requiredBits)
+- ) {
+- const QString trashDir = rootTrashDir + "/" + QString::number( uid );
+- const QCString trashDir_c = QFile::encodeName( trashDir );
+- if ( KDE_lstat( trashDir_c, &buff ) == 0 ) {
+- if ( (buff.st_uid == uid) // must be owned by user
+- && (S_ISDIR(buff.st_mode)) // must be a dir
+- && (!S_ISLNK(buff.st_mode)) // not a symlink
+- && (buff.st_mode & S_IRWXU) ) { // rwx for user
++ && (S_ISDIR(buff.st_mode)) // must be a dir
++ && (!S_ISLNK(buff.st_mode)) // not a symlink
++ && (buff.st_mode & requiredBits == requiredBits)
++ ) {
++ const QString trashDir = rootTrashDir + "/" + QString::number( uid );
++ const QCString trashDir_c = QFile::encodeName( trashDir );
++ if ( KDE_lstat( trashDir_c, &buff ) == 0 ) {
++ if ( (buff.st_uid == uid) // must be owned by user
++ && (S_ISDIR(buff.st_mode)) // must be a dir
++ && (!S_ISLNK(buff.st_mode)) // not a symlink
++ && (buff.st_mode & 0777) == 0700 ) { // rwx for user
++ return trashDir;
++ }
++ kdDebug() << "Directory " << trashDir << " exists but didn't pass the security checks, can't use it" << endl;
++ }
++ else if ( createIfNeeded && initTrashDirectory( trashDir_c ) ) {
+ return trashDir;
+ }
+- kdDebug() << "Directory " << trashDir << " exists but didn't pass the security checks, can't use it" << endl;
+- }
+- else if ( createIfNeeded && initTrashDirectory( trashDir_c ) ) {
+- return trashDir;
+- }
+ } else {
+ kdDebug() << "Root trash dir " << rootTrashDir << " exists but didn't pass the security checks, can't use it" << endl;
+ }
+@@ -790,7 +791,7 @@
+ if ( (buff.st_uid == uid) // must be owned by user
+ && (S_ISDIR(buff.st_mode)) // must be a dir
+ && (!S_ISLNK(buff.st_mode)) // not a symlink
+- && (buff.st_mode & S_IRWXU) ) { // rwx for user
++ && ((buff.st_mode & 0777) == 0700) ) { // rwx for user, ------ for group and others
+ return trashDir;
+ }
+ kdDebug() << "Directory " << trashDir << " exists but didn't pass the security checks, can't use it" << endl;
+@@ -810,7 +811,7 @@
+ for ( ; it != m_trashDirectories.end() ; ++it ) {
+ if ( it.data() == trashDir ) {
+ return it.key();
+- }
++ }
+ }
+ return -1;
+ }
+@@ -826,14 +827,14 @@
+ if ( KDE_lstat( trashDir_c, &buff ) != 0 )
+ return false; // huh?
+ if ( (buff.st_uid == uid) // must be owned by user
+- && (buff.st_mode & S_IRWXU) ) { // rwx for user
++ && ((buff.st_mode & 0777) == 0700) ) { // rwx for user, --- for group and others
+
+- QCString info_c = trashDir_c + "/info";
+- if ( ::mkdir( info_c, 0700 ) != 0 )
+- return false;
+- QCString files_c = trashDir_c + "/files";
+- if ( ::mkdir( files_c, 0700 ) != 0 )
+- return false;
++ QCString info_c = trashDir_c + "/info";
++ if ( ::mkdir( info_c, 0700 ) != 0 )
++ return false;
++ QCString files_c = trashDir_c + "/files";
++ if ( ::mkdir( files_c, 0700 ) != 0 )
++ return false;
+ } else {
+ kdDebug() << trashDir_c << " just created, by it doesn't have the right permissions, must be a FAT partition. Removing it again." << endl;
+ // Not good, e.g. USB key. Delete again.
+diff -Nru kdebase-release-3.4.0/klipper/klipper.desktop kdebase-branch-3.4/klipper/klipper.desktop
+--- kdebase-release-3.4.0/klipper/klipper.desktop 2005-02-23 00:05:54.000000000 -0500
++++ kdebase-branch-3.4/klipper/klipper.desktop 2005-03-07 09:15:59.000000000 -0500
+@@ -12,7 +12,6 @@
+ Name[ta]=கà¯à®³à®¿à®ªà¯à®ªà®°à¯
+ Name[th]=คลิปเปà¸à¸£à¹Œ
+ Name[ven]=Kilipara
+-Name[xx]=xxKlipperxx
+ Name[zh_TW]=剪貼薄(Klipper)
+ GenericName=Clipboard Tool
+ GenericName[af]=Klipbord Program
+@@ -65,7 +64,7 @@
+ GenericName[sk]=Nástroj pre schránku
+ GenericName[sl]=Orodje za odložiÅ¡Äe
+ GenericName[sr]=Ðлат за клипборд
+-GenericName[sr@Latn]=Klipbord alatka
++GenericName[sr@Latn]=Alat za klipbord
+ GenericName[sv]=Klippbordsverktyg
+ GenericName[ta]=தறà¯à®•ாலிக கரà¯à®µà®¿
+ GenericName[tg]=Обзори хотираи муваққат
+@@ -76,7 +75,6 @@
+ GenericName[ven]=Tshishumiswa tsha bodo yau nambatedza
+ GenericName[vi]=Công cụ Clipboard
+ GenericName[xh]=Isixhobo Sebhodi eqhoboshayo
+-GenericName[xx]=xxClipboard Toolxx
+ GenericName[zh_CN]=剪贴æ¿å·¥å…·
+ GenericName[zh_TW]=剪貼簿工具
+ GenericName[zu]=Ithuluzi Lebhodi elibophayo
+diff -Nru kdebase-release-3.4.0/klipper/klipperrc.desktop kdebase-branch-3.4/klipper/klipperrc.desktop
+--- kdebase-release-3.4.0/klipper/klipperrc.desktop 2005-02-10 23:52:17.000000000 -0500
++++ kdebase-branch-3.4/klipper/klipperrc.desktop 2005-03-08 09:52:00.000000000 -0500
+@@ -63,7 +63,6 @@
+ Description[ven]=Tshifanyiso tsha jpeg
+ Description[wa]=Imådje JPEG
+ Description[xh]=Jpeg-Umfanekiso
+-Description[xx]=xxJpeg-Imagexx
+ Description[zh_CN]=JPEG 图åƒ
+ Description[zh_TW]=JPEG å½±åƒ
+ Description[zu]=Isithombe se-Jpeg
+@@ -137,7 +136,6 @@
+ Description[ven]=Thoma K&Vhona
+ Description[vi]=Chạy K&View
+ Description[wa]=Enonder K&View
+-Description[xx]=xxLaunch K&Viewxx
+ Description[zh_CN]=掉用 K&View
+ Description[zh_TW]=啟動 K&View
+ Description[zu]=Qalisa i-K&View
+@@ -193,7 +191,6 @@
+ Description[uz]=Веб-URL
+ Description[ven]=Webe ya URL
+ Description[wa]=Hårdêye waibe
+-Description[xx]=xxWeb-URLxx
+ Description[zh_CN]=Web URL
+ Description[zh_TW]=ç¶²é URL
+ Description[zu]=I-URL ye-Web
+@@ -269,7 +266,6 @@
+ Description[vi]=Mở bằng &Konqueror
+ Description[wa]=Drovi avou &Konqueror
+ Description[xh]=Vula nge &Konqueror
+-Description[xx]=xxOpen with &Konquerorxx
+ Description[zh_CN]=用 &Konqueror 打开
+ Description[zh_TW]=使用 &Konqueror 開啟
+ Description[zu]=Vula nge-&Konqueror
+@@ -345,7 +341,6 @@
+ Description[vi]=Mở bằng &Mozilla
+ Description[wa]=Drovi avou &Mozilla
+ Description[xh]=Vula nge &Mozilla
+-Description[xx]=xxOpen with &Mozillaxx
+ Description[zh_CN]=用 &Mozilla 打开
+ Description[zh_TW]=使用 &Mozilla 開啟
+ Description[zu]=Vula nge-&Mozilla
+@@ -416,7 +411,6 @@
+ Description[vi]=Gá»i&URL
+ Description[wa]=Evoyî &hårdêye
+ Description[xh]=Thumela i &URL
+-Description[xx]=xxSend &URLxx
+ Description[zh_CN]=å‘é€ &URL
+ Description[zh_TW]=é€å‡º &URL
+ Description[zu]=Thumela i-&URL
+@@ -489,7 +483,6 @@
+ Description[vi]=Gá»i &trang
+ Description[wa]=Evoyî &pådje
+ Description[xh]=Thumela &Iphepha
+-Description[xx]=xxSend &Pagexx
+ Description[zh_CN]=å‘é€é¡µé¢(&P)
+ Description[zh_TW]=é€å‡º &Page
+ Description[zu]=Thumela &Ikhasi
+@@ -551,7 +544,6 @@
+ Description[ven]=Meili-URL
+ Description[wa]=Hårdêye emile
+ Description[xh]=Iposi-URL
+-Description[xx]=xxMail-URLxx
+ Description[zh_CN]=邮寄 URL
+ Description[zh_TW]=郵寄 URL
+ Description[zu]=I-URl yeposi
+@@ -625,7 +617,6 @@
+ Description[ven]=Thoma &Kmeili
+ Description[vi]=Khởi động &Kmail
+ Description[wa]=Enonder &Kmail
+-Description[xx]=xxLaunch &Kmailxx
+ Description[zh_CN]=调用 &Kmail
+ Description[zh_TW]=啟動 &Kmail
+ Description[zu]=Qalisa i-&Kmail
+@@ -699,7 +690,6 @@
+ Description[ven]=Thoma &mutt
+ Description[vi]=Khởi động &mutt
+ Description[wa]=Enonder &mutt
+-Description[xx]=xxLaunch &muttxx
+ Description[zh_CN]=调用 &mutt
+ Description[zh_TW]=啟動 &mutt
+ Description[zu]=Qalisa i-&mutt
+@@ -772,7 +762,6 @@
+ Description[vi]=File Text
+ Description[wa]=Fitchî tecse
+ Description[xh]=Ifayile Yombhalo
+-Description[xx]=xxText Filexx
+ Description[zh_CN]=文本文件
+ Description[zh_TW]=æ–‡å—æª”案
+ Description[zu]=Ifayela Lombhalo
+@@ -845,7 +834,6 @@
+ Description[ven]=Thoma K&Sengulusa
+ Description[vi]=Khởi động K&Edit
+ Description[wa]=Enonder K&Edit
+-Description[xx]=xxLaunch K&Editxx
+ Description[zh_CN]=调用 K&Edit
+ Description[zh_TW]=啟動 K&Edit
+ Description[zu]=Qalisa i-K&Edit
+@@ -917,7 +905,6 @@
+ Description[ven]=Thoma K&Nwala
+ Description[vi]=Khởi động K&Write
+ Description[wa]=Enonder K&Write
+-Description[xx]=xxLaunch K&Writexx
+ Description[zh_CN]=调用 K&Write
+ Description[zh_TW]=啟動 K&Write
+ Description[zu]=Qalisa K&Write
+@@ -988,7 +975,6 @@
+ Description[vi]= File URL địa phương
+ Description[wa]=Hårdêye viè on fitchî locå
+ Description[xh]=Ifayile yobulali ye URL
+-Description[xx]=xxLocal file URLxx
+ Description[zh_CN]=本地文件 URL
+ Description[zh_TW]=本地檔案 URL
+ Description[zu]=I-URL yefayela eseduze
+@@ -1060,7 +1046,6 @@
+ Description[vi]=Gá»i&URL
+ Description[wa]=Evoyî &hårdêye
+ Description[xh]=Thumela i &URL
+-Description[xx]=xxSend &URLxx
+ Description[zh_CN]=å‘é€ &URL
+ Description[zh_TW]=é€å‡º &URL
+ Description[zu]=Thumela i-&URL
+@@ -1133,7 +1118,6 @@
+ Description[vi]=Gá»i &File
+ Description[wa]=Evoyî &fitchî
+ Description[xh]=Thumela &Ifayile
+-Description[xx]=xxSend &Filexx
+ Description[zh_CN]=å‘逿–‡ä»¶(&F)
+ Description[zh_TW]=é€å‡ºæª”案(&F)
+ Description[zu]=Thumela &Ifayela
+@@ -1185,7 +1169,6 @@
+ Description[tr]=Gopher URL'i
+ Description[uk]=URL від Gopher
+ Description[wa]=Hårdêye Gopher
+-Description[xx]=xxGopher URLxx
+ Description[zu]=I-URL ye-Gopher
+ Number of commands=2
+ Regexp=^gopher:.
+@@ -1255,7 +1238,6 @@
+ Description[vi]=Gá»i&URL
+ Description[wa]=Evoyî &hårdêye
+ Description[xh]=Thumela i &URL
+-Description[xx]=xxSend &URLxx
+ Description[zh_CN]=å‘é€ &URL
+ Description[zh_TW]=é€å‡º &URL
+ Description[zu]=Thumela i-&URL
+@@ -1328,7 +1310,6 @@
+ Description[vi]=Gá»i &File
+ Description[wa]=Evoyî &fitchî
+ Description[xh]=Thumela &Ifayile
+-Description[xx]=xxSend &Filexx
+ Description[zh_CN]=å‘逿–‡ä»¶(&F)
+ Description[zh_TW]=é€å‡ºæª”案(&F)
+ Description[zu]=Thumela &Ifayela
+@@ -1383,7 +1364,6 @@
+ Description[tr]=ftp URL'i
+ Description[uk]=URL ftp
+ Description[wa]=Hårdêye FTP
+-Description[xx]=xxftp URLxx
+ Description[zh_TW]=FTP URL
+ Number of commands=5
+ Regexp=^ftp://.
+@@ -1457,7 +1437,6 @@
+ Description[vi]=Mở bằng &Konqueror
+ Description[wa]=Drovi avou &Konqueror
+ Description[xh]=Vula nge &Konqueror
+-Description[xx]=xxOpen with &Konquerorxx
+ Description[zh_CN]=用 &Konqueror 打开
+ Description[zh_TW]=使用 &Konqueror 開啟
+ Description[zu]=Vula nge-&Konqueror
+@@ -1531,7 +1510,6 @@
+ Description[vi]=Mở bằng &Netscape
+ Description[wa]=Drovi avou &Netscape
+ Description[xh]=Vula nge &Netscape
+-Description[xx]=xxOpen with &Netscapexx
+ Description[zh_CN]=用 &Netscape 打开
+ Description[zh_TW]=使用 &Netscape 開啟
+ Description[zu]=Vula nge-&Netscape
+@@ -1606,7 +1584,6 @@
+ Description[vi]=Mở bằng &Mozilla
+ Description[wa]=Drovi avou &Mozilla
+ Description[xh]=Vula nge &Mozilla
+-Description[xx]=xxOpen with &Mozillaxx
+ Description[zh_CN]=用 &Mozilla 打开
+ Description[zh_TW]=使用 &Mozilla 開啟
+ Description[zu]=Vula nge-&Mozilla
+@@ -1677,7 +1654,6 @@
+ Description[vi]=Gá»i&URL
+ Description[wa]=Evoyî &hårdêye
+ Description[xh]=Thumela i &URL
+-Description[xx]=xxSend &URLxx
+ Description[zh_CN]=å‘é€ &URL
+ Description[zh_TW]=é€å‡º &URL
+ Description[zu]=Thumela i-&URL
+@@ -1750,7 +1726,6 @@
+ Description[vi]=Gá»i &File
+ Description[wa]=Evoyî &fitchî
+ Description[xh]=Thumela &Ifayile
+-Description[xx]=xxSend &Filexx
+ Description[zh_CN]=å‘逿–‡ä»¶(&F)
+ Description[zh_TW]=é€å‡ºæª”案(&F)
+ Description[zu]=Thumela &Ifayela
+@@ -1758,7 +1733,7 @@
+
+ [General]
+ KeepClipboardContents=true
+-No Actions for WM_CLASS=Navigator,navigator:browser,konqueror,keditbookmarks,mozilla-bin,Mozilla,Opera main window,opera,gnumeric,Gnumeric,Galeon,kcontrol,ksirc,MozillaFirebird-bin,firefox-bin,klipper
++No Actions for WM_CLASS=Navigator,navigator:browser,konqueror,keditbookmarks,mozilla-bin,Mozilla,Opera main window,opera,gnumeric,Gnumeric,Galeon,kcontrol,ksirc,MozillaFirebird-bin,firefox-bin,Firefox-bin,klipper,Gecko
+ Number of Actions=7
+ PopupAtMousePosition=false
+ URLGrabberEnabled=false
+diff -Nru kdebase-release-3.4.0/kmenuedit/khotkeys.cpp kdebase-branch-3.4/kmenuedit/khotkeys.cpp
+--- kdebase-release-3.4.0/kmenuedit/khotkeys.cpp 2005-01-28 06:26:29.000000000 -0500
++++ kdebase-branch-3.4/kmenuedit/khotkeys.cpp 2005-03-28 15:02:14.000000000 -0500
+@@ -80,7 +80,7 @@
+
+ void KHotKeys::cleanup()
+ {
+- if( khotkeys_inited )
++ if( khotkeys_inited && khotkeys_present )
+ khotkeys_cleanup_2();
+ khotkeys_inited = false;
+ }
+diff -Nru kdebase-release-3.4.0/kmenuedit/kmenuedit.desktop kdebase-branch-3.4/kmenuedit/kmenuedit.desktop
+--- kdebase-release-3.4.0/kmenuedit/kmenuedit.desktop 2005-02-04 23:15:33.000000000 -0500
++++ kdebase-branch-3.4/kmenuedit/kmenuedit.desktop 2005-03-07 09:16:01.000000000 -0500
+@@ -75,7 +75,6 @@
+ Name[vi]=Biên soạn menu
+ Name[wa]=Aspougneu di menus
+ Name[xh]=Umhleli we Menu
+-Name[xx]=xxMenu Editorxx
+ Name[zh_CN]=èœå•编辑器
+ Name[zh_TW]=é¸å–®ç·¨è¼¯å™¨
+ Name[zu]=Umlungisi wemenu
+diff -Nru kdebase-release-3.4.0/kmenuedit/menuinfo.cpp kdebase-branch-3.4/kmenuedit/menuinfo.cpp
+--- kdebase-release-3.4.0/kmenuedit/menuinfo.cpp 2004-05-11 08:52:47.000000000 -0400
++++ kdebase-branch-3.4/kmenuedit/menuinfo.cpp 2005-03-17 11:45:14.000000000 -0500
+@@ -75,6 +75,18 @@
+ return false;
+ }
+
++// Recursively update all fullIds
++void MenuFolderInfo::updateFullId(const QString &parentId)
++{
++ fullId = parentId + id;
++
++ for(MenuFolderInfo *subFolderInfo = subFolders.first();
++ subFolderInfo; subFolderInfo = subFolders.next())
++ {
++ subFolderInfo->updateFullId(fullId);
++ }
++}
++
+ // Add entry
+ void MenuFolderInfo::add(MenuEntryInfo *entry, bool initial)
+ {
+diff -Nru kdebase-release-3.4.0/kmenuedit/menuinfo.h kdebase-branch-3.4/kmenuedit/menuinfo.h
+--- kdebase-release-3.4.0/kmenuedit/menuinfo.h 2004-05-11 08:52:47.000000000 -0400
++++ kdebase-branch-3.4/kmenuedit/menuinfo.h 2005-03-17 11:45:14.000000000 -0500
+@@ -72,6 +72,9 @@
+ // from @p exclude
+ QString uniqueItemCaption(const QString &caption, const QString &exclude = QString::null);
+
++ // Update full id's for this item and all submenus
++ void updateFullId(const QString &parentId);
++
+ // Return a list of existing submenu ids
+ QStringList existingMenuIds();
+
+diff -Nru kdebase-release-3.4.0/kmenuedit/treeview.cpp kdebase-branch-3.4/kmenuedit/treeview.cpp
+--- kdebase-release-3.4.0/kmenuedit/treeview.cpp 2004-10-05 13:26:34.000000000 -0400
++++ kdebase-branch-3.4/kmenuedit/treeview.cpp 2005-03-17 11:45:13.000000000 -0500
+@@ -687,7 +687,10 @@
+ static KDesktopFile *copyDesktopFile(MenuEntryInfo *entryInfo, QString *menuId, QStringList *excludeList)
+ {
+ QString result = createDesktopFile(entryInfo->file(), menuId, excludeList);
+- return entryInfo->desktopFile()->copyTo(result);
++ KDesktopFile *df = entryInfo->desktopFile()->copyTo(result);
++ df->deleteEntry("Categories"); // Don't set any categories!
++
++ return df;
+ }
+
+ static QString createDirectoryFile(const QString &file, QStringList *excludeList)
+@@ -756,7 +759,11 @@
+ tmpItem = static_cast<TreeItem*>(tmpItem->parent() );
+ }
+
+- del(m_dragItem, false);
++ // Remove MenuFolderInfo
++ TreeItem *oldParentItem = static_cast<TreeItem*>(m_dragItem->parent());
++ MenuFolderInfo *oldParentFolderInfo = oldParentItem ? oldParentItem->folderInfo() : m_rootFolder;
++ oldParentFolderInfo->take(folderInfo);
++
+ // Move menu
+ QString oldFolder = folderInfo->fullId;
+ QString folderName = folderInfo->id;
+@@ -779,14 +786,26 @@
+ parentItem->setOpen(true);
+
+ // update fileInfo data
+- folderInfo->fullId = parentFolderInfo->fullId + folderInfo->id;
++ folderInfo->updateFullId(parentFolderInfo->fullId);
+ folderInfo->setInUse(true);
+ parentFolderInfo->add(folderInfo);
+
+- TreeItem *newItem = createTreeItem(parentItem, after, folderInfo);
+-
+- setSelected ( newItem, true);
+- itemSelected( newItem);
++ if ((parentItem != oldParentItem) || !after)
++ {
++ if (oldParentItem)
++ oldParentItem->takeItem(m_dragItem);
++ else
++ takeItem(m_dragItem);
++ if (parentItem)
++ parentItem->insertItem(m_dragItem);
++ else
++ insertItem(m_dragItem);
++ }
++ m_dragItem->moveItem(after);
++ m_dragItem->setName(folderInfo->caption);
++ m_dragItem->setDirectoryPath(folderInfo->fullId);
++ setSelected(m_dragItem, true);
++ itemSelected(m_dragItem);
+ }
+ }
+ else if (command == MOVE_FILE)
+diff -Nru kdebase-release-3.4.0/knetattach/knetattach.desktop kdebase-branch-3.4/knetattach/knetattach.desktop
+--- kdebase-release-3.4.0/knetattach/knetattach.desktop 2005-02-23 00:05:54.000000000 -0500
++++ kdebase-branch-3.4/knetattach/knetattach.desktop 2005-03-22 12:38:16.000000000 -0500
+@@ -4,16 +4,17 @@
+ Name[bn]=কে-নেট-অà§à¦¯à¦¾à¦Ÿà¦¾à¦š
+ Name[sv]=Knetattach
+ Name[ta]=நெடà¯à®¹à®¾à®•à¯à®‡à®£à¯ˆà®ªà¯à®ªà¯
+-Name[xx]=xxKNetAttachxx
+ GenericName=Network Folder Wizard
+ GenericName[bg]=Мрежови инÑтрумент
+ GenericName[bn]=নেটওয়ারà§à¦• ফোলà§à¦¡à¦¾à¦° উইজারà§à¦¡
++GenericName[bs]=Čarobnjak za mrežne foldere
+ GenericName[ca]=Assistent de carpeta de xarxa
+ GenericName[cs]=Průvodce sÃÅ¥ovou složkou
+ GenericName[da]=Guide til netværksmappe
+ GenericName[de]=Assistent für Netzwerkordner
+ GenericName[es]=Asistente de carpetas de red
+ GenericName[et]=Võrgukataloogide nõustaja
++GenericName[eu]=Sareko karpeten morroia
+ GenericName[fi]=Verkkokansiotyökalu
+ GenericName[fr]=Assistant dossier réseau
+ GenericName[fy]=Netwurkmap-assistint
+@@ -21,6 +22,7 @@
+ GenericName[hu]=Varázsló hálózati mappa beállÃtásához
+ GenericName[is]=Netmöppuálfur
+ GenericName[it]=Assistente per le cartelle di rete
++GenericName[ja]=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ フォルダ ウィザード
+ GenericName[lt]=Tinklo aplanko vedlys
+ GenericName[nb]=Veiviser for nettverksmappe
+ GenericName[nl]=Netwerkmap-assistent
+@@ -29,13 +31,13 @@
+ GenericName[pt]=Assistente de Pastas de Rede
+ GenericName[pt_BR]=Assistente de Pastas de Rede
+ GenericName[ru]=МаÑтер Ñетевых папок
++GenericName[sk]=Sprievodca pre sieÅ¥ový prieÄinok
+ GenericName[sl]=Čarovnik za omrežne mape
+ GenericName[sr]=Чаробњак за мрежне директоријуме
+-GenericName[sr@Latn]=Чаробњак за мрежне директоријуме
++GenericName[sr@Latn]=Čarobnjak za mrežne direktorijume
+ GenericName[sv]=Nätverkskatalogguide
+ GenericName[ta]=வலைபà¯à®ªà®¿à®©à¯à®©à®²à¯ அடைவ௠பகà¯à®¤à®¿
+ GenericName[uk]=МайÑтер мережевих тек
+-GenericName[xx]=xxNetwork Folder Wizardxx
+ GenericName[zh_CN]=网络文件夹å‘导
+ Exec=knetattach
+ InitialPreference=6
+diff -Nru kdebase-release-3.4.0/knetattach/knetattach.ui.h kdebase-branch-3.4/knetattach/knetattach.ui.h
+--- kdebase-release-3.4.0/knetattach/knetattach.ui.h 2005-03-02 15:46:39.000000000 -0500
++++ kdebase-branch-3.4/knetattach/knetattach.ui.h 2005-03-27 23:02:34.000000000 -0500
+@@ -68,6 +68,9 @@
+ setInformationText("FTP");
+ updateForProtocol("FTP");
+ _port->setValue(21);
++ if (_path->text().isEmpty()) {
++ _path->setText("/");
++ }
+ } else if (_smb->isChecked()) {
+ setInformationText("SMB");
+ updateForProtocol("SMB");
+@@ -135,6 +138,7 @@
+ url.setPort(_port->value());
+ } else if (_type == "Fish") {
+ url.setProtocol("fish");
++ url.setPort(_port->value());
+ } else if (_type == "FTP") {
+ url.setProtocol("ftp");
+ url.setPort(_port->value());
+@@ -256,7 +260,7 @@
+ _useEncryption->hide();
+ _portText->show();
+ _port->show();
+- _userText->hide();
++ _userText->show();
+ _user->show();
+ } else if (protocol == "SMB") {
+ _useEncryption->hide();
+diff -Nru kdebase-release-3.4.0/konqueror/Home.desktop kdebase-branch-3.4/konqueror/Home.desktop
+--- kdebase-release-3.4.0/konqueror/Home.desktop 2005-02-23 00:05:54.000000000 -0500
++++ kdebase-branch-3.4/konqueror/Home.desktop 2005-03-07 09:16:01.000000000 -0500
+@@ -72,7 +72,6 @@
+ Name[vi]=NhÃ
+ Name[wa]=MÃ¥jhon
+ Name[xh]=Ikhaya
+-Name[xx]=xxHomexx
+ Name[zh_CN]=主文件夹
+ Name[zh_TW]=家目錄
+ Name[zu]=Ikhaya
+@@ -133,7 +132,7 @@
+ GenericName[sk]=Osobné súbory
+ GenericName[sl]=Osebne datoteke
+ GenericName[sr]=Лични фајлови
+-GenericName[sr@Latn]=Ovaj direktorijum sadrži vaÅ¡e liÄne fajlove
++GenericName[sr@Latn]=LiÄni fajlovi
+ GenericName[sv]=Personliga filer
+ GenericName[ta]=சொநà¯à®¤ கோபà¯à®ªà¯à®•ளà¯
+ GenericName[tg]=Файлҳои шахÑÓ£
+@@ -145,7 +144,6 @@
+ GenericName[vi]=File cá nhân
+ GenericName[wa]=Fitchîs da vosse
+ GenericName[xh]=Iifayile Zobuqu
+-GenericName[xx]=xxPersonal Filesxx
+ GenericName[zh_CN]=个人文件
+ GenericName[zh_TW]=個人檔案
+ GenericName[zu]=Amafayela Omuntu siqu
+diff -Nru kdebase-release-3.4.0/konqueror/about/konq_aboutpage.desktop kdebase-branch-3.4/konqueror/about/konq_aboutpage.desktop
+--- kdebase-release-3.4.0/konqueror/about/konq_aboutpage.desktop 2005-02-04 23:15:35.000000000 -0500
++++ kdebase-branch-3.4/konqueror/about/konq_aboutpage.desktop 2005-03-07 09:16:02.000000000 -0500
+@@ -66,7 +66,6 @@
+ Name[ven]=Nga ha siatari la Konqueror
+ Name[vi]=Trang giới thiệu của Konqueror
+ Name[xh]=Malunga-Nephepha le Konqueror
+-Name[xx]=xxAbout-Page for Konquerorxx
+ Name[zh_CN]=Konqueror 的关于页é¢
+ Name[zh_TW]=Konqueror 相關資訊
+ Name[zu]=Mayelana-nekhasi le-Konqueror
+diff -Nru kdebase-release-3.4.0/konqueror/iconview/konq_iconview.desktop kdebase-branch-3.4/konqueror/iconview/konq_iconview.desktop
+--- kdebase-release-3.4.0/konqueror/iconview/konq_iconview.desktop 2005-02-04 23:15:35.000000000 -0500
++++ kdebase-branch-3.4/konqueror/iconview/konq_iconview.desktop 2005-03-07 09:16:02.000000000 -0500
+@@ -68,7 +68,6 @@
+ Name[vi]=Xem icon
+ Name[wa]=Vey en imådjetes
+ Name[xh]=Imboniselo Yophawu lomfanekiso
+-Name[xx]=xxIcon Viewxx
+ Name[zh_CN]=å›¾æ ‡è§†å›¾
+ Name[zh_TW]=圖示ç€è¦½
+ Name[zu]=Umbukiso wophawu lwesithombe
+diff -Nru kdebase-release-3.4.0/konqueror/iconview/konq_multicolumnview.desktop kdebase-branch-3.4/konqueror/iconview/konq_multicolumnview.desktop
+--- kdebase-release-3.4.0/konqueror/iconview/konq_multicolumnview.desktop 2005-02-04 23:15:35.000000000 -0500
++++ kdebase-branch-3.4/konqueror/iconview/konq_multicolumnview.desktop 2005-03-07 09:16:03.000000000 -0500
+@@ -67,7 +67,6 @@
+ Name[vi]=Xem kiểu nhiá»u cá»™t(multicolumn)
+ Name[wa]=Vey e colones
+ Name[xh]=Imboniselo Enemihlathi emininzie
+-Name[xx]=xxMultiColumn Viewxx
+ Name[zh_CN]=多列视图
+ Name[zh_TW]=多列ç€è¦½
+ Name[zu]=Umbukiso onamakholumu amaningi
+diff -Nru kdebase-release-3.4.0/konqueror/kfmclient.desktop kdebase-branch-3.4/konqueror/kfmclient.desktop
+--- kdebase-release-3.4.0/konqueror/kfmclient.desktop 2004-11-09 16:34:29.000000000 -0500
++++ kdebase-branch-3.4/konqueror/kfmclient.desktop 2005-03-07 09:16:01.000000000 -0500
+@@ -19,7 +19,6 @@
+ Name[pa]=ਕੋਨਕਿਉਰੋਰ
+ Name[ta]=கானà¯à®•ொரரà¯
+ Name[th]=คà¸à¸™à¹€à¸„วà¸à¸£à¹Œà¹€à¸£à¸à¸£à¹Œ
+-Name[xx]=xxKonquerorxx
+ X-DCOP-ServiceType=None
+ Categories=Qt;KDE;System;
+ X-KDE-HasTempFileOption=true
+diff -Nru kdebase-release-3.4.0/konqueror/kfmclient_dir.desktop kdebase-branch-3.4/konqueror/kfmclient_dir.desktop
+--- kdebase-release-3.4.0/konqueror/kfmclient_dir.desktop 2004-10-26 22:59:56.000000000 -0400
++++ kdebase-branch-3.4/konqueror/kfmclient_dir.desktop 2005-03-07 09:16:01.000000000 -0500
+@@ -19,5 +19,4 @@
+ Name[pa]=ਕੋਨਕਿਉਰੋਰ
+ Name[ta]=கானà¯à®•ொரரà¯
+ Name[th]=คà¸à¸™à¹€à¸„วà¸à¸£à¹Œà¹€à¸£à¸à¸£à¹Œ
+-Name[xx]=xxKonquerorxx
+ Categories=Qt;KDE;System;
+diff -Nru kdebase-release-3.4.0/konqueror/kfmclient_html.desktop kdebase-branch-3.4/konqueror/kfmclient_html.desktop
+--- kdebase-release-3.4.0/konqueror/kfmclient_html.desktop 2004-11-18 11:24:02.000000000 -0500
++++ kdebase-branch-3.4/konqueror/kfmclient_html.desktop 2005-03-07 09:16:01.000000000 -0500
+@@ -19,6 +19,5 @@
+ Name[pa]=ਕੋਨਕਿਉਰੋਰ
+ Name[ta]=கானà¯à®•ொரரà¯
+ Name[th]=คà¸à¸™à¹€à¸„วà¸à¸£à¹Œà¹€à¸£à¸à¸£à¹Œ
+-Name[xx]=xxKonquerorxx
+ Categories=Qt;KDE;System;
+ X-KDE-HasTempFileOption=true
+diff -Nru kdebase-release-3.4.0/konqueror/kfmclient_war.desktop kdebase-branch-3.4/konqueror/kfmclient_war.desktop
+--- kdebase-release-3.4.0/konqueror/kfmclient_war.desktop 2004-11-09 16:34:29.000000000 -0500
++++ kdebase-branch-3.4/konqueror/kfmclient_war.desktop 2005-03-07 09:16:01.000000000 -0500
+@@ -19,6 +19,5 @@
+ Name[pa]=ਕੋਨਕਿਉਰੋਰ
+ Name[ta]=கானà¯à®•ொரரà¯
+ Name[th]=คà¸à¸™à¹€à¸„วà¸à¸£à¹Œà¹€à¸£à¸à¸£à¹Œ
+-Name[xx]=xxKonquerorxx
+ Categories=Qt;KDE;System;
+ X-KDE-HasTempFileOption=true
+diff -Nru kdebase-release-3.4.0/konqueror/konq_combo.cc kdebase-branch-3.4/konqueror/konq_combo.cc
+--- kdebase-release-3.4.0/konqueror/konq_combo.cc 2005-02-16 15:26:43.000000000 -0500
++++ kdebase-branch-3.4/konqueror/konq_combo.cc 2005-03-17 12:47:24.000000000 -0500
+@@ -613,7 +613,7 @@
+ r.setRight( re.right() );
+ if ( r != edit->geometry() )
+ edit->setGeometry( r );
+- edit->unsetPalette();
++ edit->setPaletteBackgroundColor( QApplication::palette( edit ).color( QPalette::Active, QColorGroup::Base ) );
+ }
+ }
+
+@@ -682,6 +682,8 @@
+ else
+ pm = KonqPixmapProvider::self()->pixmapFor( text(), KIcon::SizeSmall );
+ }
++ else
++ pm = QPixmap();
+ lookup_pending = false;
+ }
+
+@@ -776,6 +778,11 @@
+ const QString currentSelection = completionbox->currentText();
+ completionbox->setItems( items );
+ QListBoxItem* item = completionbox->findItem( currentSelection, Qt::ExactMatch );
++ if( !item || !wasSelected )
++ {
++ wasSelected = false;
++ item = completionbox->item( 0 );
++ }
+ if ( item ) {
+ completionbox->blockSignals( true );
+ completionbox->setCurrentItem( item );
+diff -Nru kdebase-release-3.4.0/konqueror/konq_extensionmanager.cc kdebase-branch-3.4/konqueror/konq_extensionmanager.cc
+--- kdebase-release-3.4.0/konqueror/konq_extensionmanager.cc 2004-08-26 09:56:06.000000000 -0400
++++ kdebase-branch-3.4/konqueror/konq_extensionmanager.cc 2005-03-25 07:57:11.000000000 -0500
+@@ -1,4 +1,4 @@
+-/*
++/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset:4 -*-
+ konq_extensionmanager.cc - Extension Manager for Konqueror
+
+ Copyright (c) 2003 by Martijn Klingens <klingens@kde.org>
+@@ -25,22 +25,23 @@
+ #include <kplugininfo.h>
+ #include <kpluginselector.h>
+ #include <ksettings/dispatcher.h>
++#include <dcopref.h>
+
+ #include "konq_extensionmanager.h"
+ #include "konq_mainwindow.h"
+
+ class KonqExtensionManagerPrivate
+ {
+- public:
+- KPluginSelector *pluginSelector;
+- KonqMainWindow *mainWindow;
+- KConfig *khtmlConfig;
+- bool isChanged;
++public:
++ KPluginSelector *pluginSelector;
++ KonqMainWindow *mainWindow;
++ KParts::ReadOnlyPart* activePart;
++ bool isChanged;
+ };
+
+-KonqExtensionManager::KonqExtensionManager(QWidget *parent, const char *name, KonqMainWindow *mainWindow) :
++KonqExtensionManager::KonqExtensionManager(QWidget *parent, KonqMainWindow *mainWindow, KParts::ReadOnlyPart* activePart) :
+ KDialogBase(Plain, i18n("Configure"), Help | Default | Cancel | Apply | Ok | User1,
+- Ok, parent, name, false, true, KGuiItem(i18n("&Reset"), "undo"))
++ Ok, parent, "extensionmanager", false, true, KGuiItem(i18n("&Reset"), "undo"))
+ {
+ d = new KonqExtensionManagerPrivate;
+ showButton(User1, false);
+@@ -59,17 +60,17 @@
+ KSettings::Dispatcher::self(), SLOT(reparseConfiguration(const QCString &)));
+
+ d->mainWindow = mainWindow;
++ d->activePart = activePart;
+
+- d->khtmlConfig = new KConfig("khtmlrc");
+ d->pluginSelector->addPlugins("konqueror", i18n("Extensions"), "Extensions", KGlobal::config());
+- d->pluginSelector->addPlugins("khtml", i18n("Tools"), "Tools", d->khtmlConfig);
+- //d->pluginSelector->addPlugins(KPluginInfo::fromServices(KTrader::self()->query("Browser/View")), i18n("Browser Plugins"), QString::null, KGlobal::config());
++ if ( activePart )
++ d->pluginSelector->addPlugins(activePart->instance()->instanceName(), i18n("Tools"), "Tools", activePart->instance()->config());
+ }
+
+ KonqExtensionManager::~KonqExtensionManager()
+ {
+- delete d->khtmlConfig;
+- delete d;
++ //delete d->khtmlConfig;
++ delete d;
+ }
+
+ void KonqExtensionManager::setChanged(bool c)
+@@ -96,7 +97,7 @@
+ {
+ d->pluginSelector->save();
+ setChanged(false);
+- if(d->mainWindow != 0L)
++ if( d->mainWindow )
+ {
+ KParts::Plugin::loadPlugins(d->mainWindow, d->mainWindow, KGlobal::instance());
+ QPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(d->mainWindow);
+@@ -108,6 +109,18 @@
+ d->mainWindow->factory()->addClient(plugin);
+ }
+ }
++ if ( d->activePart )
++ {
++ KParts::Plugin::loadPlugins( d->activePart, d->activePart, d->activePart->instance() );
++ QPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects( d->activePart );
++ QPtrListIterator<KParts::Plugin> it(plugins);
++ KParts::Plugin *plugin;
++ while((plugin = it.current()) != 0)
++ {
++ ++it;
++ d->activePart->factory()->addClient(plugin);
++ }
++ }
+ }
+ }
+
+diff -Nru kdebase-release-3.4.0/konqueror/konq_extensionmanager.h kdebase-branch-3.4/konqueror/konq_extensionmanager.h
+--- kdebase-release-3.4.0/konqueror/konq_extensionmanager.h 2004-08-24 19:28:12.000000000 -0400
++++ kdebase-branch-3.4/konqueror/konq_extensionmanager.h 2005-03-25 07:57:11.000000000 -0500
+@@ -1,4 +1,5 @@
+-/*
++/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset:4 -*-
++
+ konq_extensionmanager.h - Extension Manager for Konqueror
+
+ Copyright (c) 2003 by Martijn Klingens <klingens@kde.org>
+@@ -21,6 +22,7 @@
+
+ class KonqExtensionManagerPrivate;
+ class KonqMainWindow;
++namespace KParts { class ReadOnlyPart; }
+
+ /**
+ * Extension Manager for Konqueror. See KPluginSelector in kdelibs for
+@@ -34,7 +36,7 @@
+ Q_OBJECT
+
+ public:
+- KonqExtensionManager(QWidget *parent, const char *name = 0L, KonqMainWindow *mainWindow = 0L);
++ KonqExtensionManager(QWidget *parent, KonqMainWindow *mainWindow, KParts::ReadOnlyPart* activePart);
+ ~KonqExtensionManager();
+
+ void apply();
+diff -Nru kdebase-release-3.4.0/konqueror/konq_main.cc kdebase-branch-3.4/konqueror/konq_main.cc
+--- kdebase-release-3.4.0/konqueror/konq_main.cc 2004-11-17 12:56:19.000000000 -0500
++++ kdebase-branch-3.4/konqueror/konq_main.cc 2005-04-04 21:58:50.000000000 -0400
+@@ -174,7 +174,7 @@
+ if (url.isLocalFile() && QFile::exists(url.path())) // "konqueror index.html"
+ urlToOpen = url;
+ else
+- urlToOpen = KURL( KonqMisc::konqFilteredURL(0L, args->arg(i)) ); // "konqueror slashdot.org"
++ urlToOpen = KURL( KonqMisc::konqFilteredURL(0L, QString::fromLocal8Bit(args->arg(i))) ); // "konqueror slashdot.org"
+
+ if ( !mainwin ) {
+ KParts::URLArgs urlargs;
+diff -Nru kdebase-release-3.4.0/konqueror/konq_mainwindow.cc kdebase-branch-3.4/konqueror/konq_mainwindow.cc
+--- kdebase-release-3.4.0/konqueror/konq_mainwindow.cc 2005-03-02 20:06:02.000000000 -0500
++++ kdebase-branch-3.4/konqueror/konq_mainwindow.cc 2005-03-25 07:57:11.000000000 -0500
+@@ -474,7 +474,7 @@
+ req.newTab = inNewTab;
+ req.newTabInFront = true;
+ req.tempFile = tempFile;
+-
++
+ openFilteredURL( _url, req );
+ }
+
+@@ -1850,8 +1850,8 @@
+
+ void KonqMainWindow::slotConfigureExtensions()
+ {
+- KonqExtensionManager extensionManager(0L, "extensionmanager", this);
+- extensionManager.exec();
++ KonqExtensionManager extensionManager(0, this, m_currentView ? m_currentView->part() : 0);
++ extensionManager.exec();
+ }
+
+ void KonqMainWindow::slotConfigure()
+@@ -3067,8 +3067,8 @@
+ if (newView && inFront)
+ m_pViewManager->showTab( newView );
+ }
+- else
+- KonqMisc::newWindowFromHistory(this->currentView(), m_goBuffer);
++ else
++ KonqMisc::newWindowFromHistory(this->currentView(), m_goBuffer);
+ }
+ else
+ {
+@@ -3675,20 +3675,20 @@
+
+ // Go menu
+ m_paUp = new KToolBarPopupAction( i18n( "&Up" ), "up", KStdAccel::shortcut(KStdAccel::Up), actionCollection(), "up" );
+- connect( m_paUp, SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this,
++ connect( m_paUp, SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this,
+ SLOT( slotUp(KAction::ActivationReason, Qt::ButtonState) ) );
+ connect( m_paUp->popupMenu(), SIGNAL( aboutToShow() ), this, SLOT( slotUpAboutToShow() ) );
+ connect( m_paUp->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotUpActivated( int ) ) );
+
+ QPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward();
+ m_paBack = new KToolBarPopupAction( backForward.first, KStdAccel::shortcut(KStdAccel::Back), 0, "", actionCollection(), "back" );
+- connect( m_paBack, SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this,
++ connect( m_paBack, SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this,
+ SLOT( slotBack(KAction::ActivationReason, Qt::ButtonState) ) );
+ connect( m_paBack->popupMenu(), SIGNAL( aboutToShow() ), this, SLOT( slotBackAboutToShow() ) );
+ connect( m_paBack->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotBackActivated( int ) ) );
+
+ m_paForward = new KToolBarPopupAction( backForward.second, KStdAccel::shortcut(KStdAccel::Forward), 0, "", actionCollection(), "forward" );
+- connect( m_paForward, SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this,
++ connect( m_paForward, SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this,
+ SLOT( slotForward(KAction::ActivationReason, Qt::ButtonState) ) );
+ connect( m_paForward->popupMenu(), SIGNAL( aboutToShow() ), this, SLOT( slotForwardAboutToShow() ) );
+ connect( m_paForward->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotForwardActivated( int ) ) );
+@@ -3698,7 +3698,7 @@
+ connect( m_paHistory, SIGNAL( activated( int ) ), this, SLOT( slotGoHistoryActivated( int ) ) );
+
+ m_paHome = new KAction( i18n( "Home" ), "gohome", KStdAccel::shortcut(KStdAccel::Home), actionCollection(), "home" );
+- connect( m_paHome, SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this,
++ connect( m_paHome, SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this,
+ SLOT( slotHome(KAction::ActivationReason, Qt::ButtonState) ) );
+
+ (void) new KAction( i18n( "App&lications" ), 0, this, SLOT( slotGoApplications() ), actionCollection(), "go_applications" );
+diff -Nru kdebase-release-3.4.0/konqueror/konq_view.cc kdebase-branch-3.4/konqueror/konq_view.cc
+--- kdebase-release-3.4.0/konqueror/konq_view.cc 2005-01-20 03:57:06.000000000 -0500
++++ kdebase-branch-3.4/konqueror/konq_view.cc 2005-03-05 15:42:15.000000000 -0500
+@@ -882,7 +882,7 @@
+ if ( m_pRun )
+ currentURL = m_pRun->url();
+ else
+- currentURL = m_sLocationBarURL;
++ currentURL = KURL::fromPathOrURL( m_sLocationBarURL );
+ return currentURL.upURL();
+ }
+
+diff -Nru kdebase-release-3.4.0/konqueror/konq_viewmgr.cc kdebase-branch-3.4/konqueror/konq_viewmgr.cc
+--- kdebase-release-3.4.0/konqueror/konq_viewmgr.cc 2005-01-25 21:24:50.000000000 -0500
++++ kdebase-branch-3.4/konqueror/konq_viewmgr.cc 2005-04-04 13:59:59.000000000 -0400
+@@ -1751,7 +1751,9 @@
+ QColor color;
+ KonqFrameTabs* konqframetabs = static_cast<KonqFrameTabs*>( parentContainer );
+ if ( loading )
+- color = KGlobalSettings::inactiveTextColor();
++ color = QColor( (KGlobalSettings::linkColor().red() + KGlobalSettings::inactiveTextColor().red())/2,
++ (KGlobalSettings::linkColor().green()+ KGlobalSettings::inactiveTextColor().green())/2,
++ (KGlobalSettings::linkColor().blue() + KGlobalSettings::inactiveTextColor().blue())/2 );
+ else
+ {
+ if ( konqframetabs->currentPage() != view->frame() )
+diff -Nru kdebase-release-3.4.0/konqueror/konqbrowser.desktop kdebase-branch-3.4/konqueror/konqbrowser.desktop
+--- kdebase-release-3.4.0/konqueror/konqbrowser.desktop 2005-02-23 00:05:54.000000000 -0500
++++ kdebase-branch-3.4/konqueror/konqbrowser.desktop 2005-03-07 09:16:01.000000000 -0500
+@@ -17,7 +17,6 @@
+ Name[pa]=ਕੋਨਕਿਉਰੋਰ
+ Name[ta]=கானà¯à®•ொரரà¯
+ Name[th]=คà¸à¸™à¹€à¸„วà¸à¸£à¹Œà¹€à¸£à¸à¸£à¹Œ
+-Name[xx]=xxKonquerorxx
+ GenericName=Web Browser
+ GenericName[af]=Web Blaaier
+ GenericName[ar]=Ù…ØªØµÙØ ويب
+@@ -71,7 +70,7 @@
+ GenericName[sk]=Webový prehliadaÄ
+ GenericName[sl]=Spletni brskalnik
+ GenericName[sr]=Веб прегледач
+-GenericName[sr@Latn]=Veb pretraživaÄ
++GenericName[sr@Latn]=Veb pregledaÄ
+ GenericName[ss]=Ibrawuza yeWeb
+ GenericName[sv]=Webbläsare
+ GenericName[ta]=வலை உலாவி
+@@ -84,7 +83,6 @@
+ GenericName[vi]=Trình duyệt Web
+ GenericName[wa]=Betchteu waibe
+ GenericName[xh]=Umkhangeli zincwadi we Web
+-GenericName[xx]=xxWeb Browserxx
+ GenericName[zh_CN]=网页æµè§ˆå™¨
+ GenericName[zh_TW]=ç¶²é ç€è¦½å™¨
+ GenericName[zu]=Umcingi we-Web
+diff -Nru kdebase-release-3.4.0/konqueror/konqfilemgr.desktop kdebase-branch-3.4/konqueror/konqfilemgr.desktop
+--- kdebase-release-3.4.0/konqueror/konqfilemgr.desktop 2005-02-04 23:15:34.000000000 -0500
++++ kdebase-branch-3.4/konqueror/konqfilemgr.desktop 2005-03-07 09:16:01.000000000 -0500
+@@ -77,7 +77,6 @@
+ Name[vi]=Trình quản là file
+ Name[wa]=Manaedjeu di fitchîs
+ Name[xh]=Umphathi Wefayile
+-Name[xx]=xxFile Managerxx
+ Name[zh_CN]=文件管ç†å™¨
+ Name[zh_TW]=檔案管ç†ç¨‹å¼
+ Name[zu]=imenenja yamafayela
+diff -Nru kdebase-release-3.4.0/konqueror/konqueror.desktop kdebase-branch-3.4/konqueror/konqueror.desktop
+--- kdebase-release-3.4.0/konqueror/konqueror.desktop 2005-02-23 00:05:54.000000000 -0500
++++ kdebase-branch-3.4/konqueror/konqueror.desktop 2005-03-07 09:16:01.000000000 -0500
+@@ -14,7 +14,6 @@
+ Name[pa]=ਕੋਨਕਿਉਰੋਰ
+ Name[ta]=கானà¯à®•ொரரà¯
+ Name[th]=คà¸à¸™à¹€à¸„วà¸à¸£à¹Œà¹€à¸£à¸à¸£à¹Œ
+-Name[xx]=xxKonquerorxx
+ Exec=konqueror %U
+ Comment=KDE File Manager & Web Browser
+ Comment[af]=Kde Lêer Bestuurder & Web Blaaier
+@@ -70,7 +69,7 @@
+ Comment[sk]=KDE Správca súborov a Web prehliadaÄ
+ Comment[sl]=Upravitelj datotek za KDE in spletni brskalnik
+ Comment[sr]=Менаџер фајлова и веб прегледач за KDE
+-Comment[sr@Latn]=Menadžer fajlova i veb pretraživaÄ za KDE
++Comment[sr@Latn]=Menadžer fajlova i veb pregledaÄ za KDE
+ Comment[sv]=KDE:s filhanterare och webbläsare
+ Comment[ta]=KDE கோபà¯à®ªà¯ மேலாளர௠மறà¯à®±à¯à®®à¯ வலை உலாவி
+ Comment[tg]=Мудири файл ва мурургари шабакаи KDE
+@@ -82,7 +81,6 @@
+ Comment[vi]=Trình quản là và Duyệt web KDE
+ Comment[wa]=Manaedjeu di fitchîs eyet betchteu waibe di KDE
+ Comment[xh]=Umphathi Wefayile ye KDE & Umkhangeli zincwadi we Web
+-Comment[xx]=xxKDE File Manager & Web Browserxx
+ Comment[zh_CN]=KDE 文件管ç†å™¨å’Œ Web æµè§ˆå™¨
+ Comment[zh_TW]=KDE 檔案管ç†ç¨‹å¼å’Œç¶²é ç€è¦½å™¨
+ Comment[zu]=Imenenja yamafayela ye-KDE & Umcingi we-Web
+diff -Nru kdebase-release-3.4.0/konqueror/konquerorsu.desktop kdebase-branch-3.4/konqueror/konquerorsu.desktop
+--- kdebase-release-3.4.0/konqueror/konquerorsu.desktop 2005-02-04 23:15:34.000000000 -0500
++++ kdebase-branch-3.4/konqueror/konquerorsu.desktop 2005-03-07 09:16:01.000000000 -0500
+@@ -69,7 +69,6 @@
+ Name[vi]=Trình quản là file(cá»§a ngưá»i quản lý)
+ Name[wa]=Manaedjeu di fitchîs - Môde super uzeu (root)
+ Name[xh]=Umphathi Wefayile - Indlela Ephezulu Yomsebenzisi
+-Name[xx]=xxFile Manager - Super User Modexx
+ Name[zh_CN]=文件管ç†å™¨ - 超级用户模å¼
+ Name[zh_TW]=檔案總管 - 超級使用者模å¼
+ Name[zu]=Imenenja yamafayela - Indlela Yomsebenzisi Omkhulu
+diff -Nru kdebase-release-3.4.0/konqueror/kttsplugin/khtmlkttsd.desktop kdebase-branch-3.4/konqueror/kttsplugin/khtmlkttsd.desktop
+--- kdebase-release-3.4.0/konqueror/kttsplugin/khtmlkttsd.desktop 2005-02-23 00:05:55.000000000 -0500
++++ kdebase-branch-3.4/konqueror/kttsplugin/khtmlkttsd.desktop 2005-03-30 01:47:54.000000000 -0500
+@@ -13,12 +13,15 @@
+ Name=Text-to-Speech Plugin
+ Name[bg]=ПриÑтавка за Ñинтез на глаÑ
+ Name[bn]=লেখা-থেকে-বলা পà§à¦²à¦¾à¦—-ইন
++Name[bs]=Dodatak za izgovaranje teksta
+ Name[ca]=Endollable de text a veu
+ Name[cs]=Modul text-na-Å™eÄ
+ Name[da]=Tekst-til-tale plugin
+ Name[de]=Sprachausgabe-Plugin
++Name[el]=Î ÏοσθÎτο Κείμενο σε Ομιλία
+ Name[es]=Plugin Texto-a-Voz
+ Name[et]=Teksti kõneks muutmise plugin
++Name[eu]=Testu-ahotserako plugina
+ Name[fi]=Teksti puheeksi -liitännäinen
+ Name[fr]=Module de synthèse vocale
+ Name[hu]=Szövegfelolvasó modul
+@@ -32,9 +35,10 @@
+ Name[pt]='Plugin' de Texto para Voz
+ Name[pt_BR]=Plug-in de Conversão de Fala
+ Name[ru]=Модуль Ð¿Ñ€Ð¾Ð³Ð¾Ð²Ð°Ñ€Ð¸Ð²Ð°Ð½Ð¸Ñ Ñ‚ÐµÐºÑта
++Name[sk]=Modul pre prevod textu na reÄ
+ Name[sl]=Vstavek za pretvorbo besedila v govor
+ Name[sr]=Прикључак за текÑÑ‚-у-говор
+-Name[sr@Latn]=Прикључак за текÑÑ‚-у-говор
++Name[sr@Latn]=PrikljuÄak za tekst-u-govor
+ Name[sv]=Text till tal-insticksprogram
+ Name[ta]=உரையில௠இரà¯à®¨à¯à®¤à¯ பேசà¯à®šà¯ சொரà¯à®•à¯à®ªà¯à®ªà¯Šà®°à¯à®³à¯
+ Name[uk]=Втулок Ñинтезу мовленнÑ з текÑту
+diff -Nru kdebase-release-3.4.0/konqueror/kttsplugin/khtmlkttsd.rc kdebase-branch-3.4/konqueror/kttsplugin/khtmlkttsd.rc
+--- kdebase-release-3.4.0/konqueror/kttsplugin/khtmlkttsd.rc 2005-01-25 06:07:52.000000000 -0500
++++ kdebase-branch-3.4/konqueror/kttsplugin/khtmlkttsd.rc 2005-03-17 19:01:21.000000000 -0500
+@@ -1,5 +1,5 @@
+ <!DOCTYPE kpartgui>
+-<kpartgui name="Speak Text" library="libkhtmlkttsdplugin" version="2" >
++<kpartgui name="khtmlkttsdplugin" library="libkhtmlkttsdplugin" version="2" >
+ <MenuBar>
+ <Menu name="tools">
+ <Text>&Tools</Text>
+diff -Nru kdebase-release-3.4.0/konqueror/listview/konq_detailedlistview.desktop kdebase-branch-3.4/konqueror/listview/konq_detailedlistview.desktop
+--- kdebase-release-3.4.0/konqueror/listview/konq_detailedlistview.desktop 2005-02-23 00:05:55.000000000 -0500
++++ kdebase-branch-3.4/konqueror/listview/konq_detailedlistview.desktop 2005-03-07 09:16:04.000000000 -0500
+@@ -54,7 +54,7 @@
+ Name[sk]=Detailný zoznam
+ Name[sl]=Pogled podrobnega seznama
+ Name[sr]=Детаљан приказ (лиÑта)
+-Name[sr@Latn]=Detaljni prikaz (lista)
++Name[sr@Latn]=Detaljan prikaz (lista)
+ Name[sv]=Detaljerad listvy
+ Name[ta]=விவரமான படà¯à®Ÿà®¿à®¯à®²à¯ காடà¯à®šà®¿
+ Name[tg]=Ба намуди Ñаҳифаи ҷузъиёт
+@@ -66,7 +66,6 @@
+ Name[vi]=Xem danh sách đầy đủ
+ Name[wa]=Vey en ene sipepieuse djivêye
+ Name[xh]=Imboniselo Yoluhlu Oluneenkcukacha
+-Name[xx]=xxDetailed List Viewxx
+ Name[zh_CN]=细节列表视图
+ Name[zh_TW]=詳細的清單檢視
+ Name[zu]=Umbukiso Woluhlu Oluneminingwane
+diff -Nru kdebase-release-3.4.0/konqueror/listview/konq_infolistview.desktop kdebase-branch-3.4/konqueror/listview/konq_infolistview.desktop
+--- kdebase-release-3.4.0/konqueror/listview/konq_infolistview.desktop 2005-02-04 23:15:36.000000000 -0500
++++ kdebase-branch-3.4/konqueror/listview/konq_infolistview.desktop 2005-03-07 09:16:04.000000000 -0500
+@@ -62,7 +62,6 @@
+ Name[ven]=Mbonalelo ya mutevhe wa mafhungo
+ Name[wa]=Vey les informåcions en ene djivêye
+ Name[xh]=Imboniselo Yoluhlu Lolwazi
+-Name[xx]=xxInfo List Viewxx
+ Name[zh_CN]=ä¿¡æ¯åˆ—表视图
+ Name[zh_TW]=資訊清單檢視
+ Name[zu]=Umbukiso wohlu lolwazi
+diff -Nru kdebase-release-3.4.0/konqueror/listview/konq_infolistview.rc kdebase-branch-3.4/konqueror/listview/konq_infolistview.rc
+--- kdebase-release-3.4.0/konqueror/listview/konq_infolistview.rc 2004-06-27 06:23:22.000000000 -0400
++++ kdebase-branch-3.4/konqueror/listview/konq_infolistview.rc 2005-03-18 17:52:45.000000000 -0500
+@@ -1,5 +1,5 @@
+ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
+-<kpartgui name="KonqInfoListView" version="11">
++<kpartgui name="KonqInfoListView" version="12">
+ <MenuBar>
+ <Menu name="edit"><text>&Edit</text>
+ <Menu name="selection"><text>Selection</text>
+@@ -26,20 +26,7 @@
+ <Action name="show_dot"/>
+ <Action name="sort_caseinsensitive"/>
+ <!--<Action name="sort_directoriesfirst" /> TODO -->
+- <Menu name="listview_show"><text>Show Details</text>
+- <TearOffHandle />
+- <Action name="show_size"/>
+- <Action name="show_type"/>
+- <Action name="show_mimetype"/>
+- <Action name="show_url"/>
+- <Action name="show_time"/>
+- <Action name="show_access_time"/>
+- <Action name="show_creation_time"/>
+- <Action name="show_permissions"/>
+- <Action name="show_owner"/>
+- <Action name="show_group"/>
+- <Action name="show_link_dest"/>
+- </Menu>
++ <Action name="view_as"/>
+ <Separator/>
+ <Action name="bgsettings"/>
+ </Menu>
+diff -Nru kdebase-release-3.4.0/konqueror/listview/konq_infolistviewwidget.cc kdebase-branch-3.4/konqueror/listview/konq_infolistviewwidget.cc
+--- kdebase-release-3.4.0/konqueror/listview/konq_infolistviewwidget.cc 2004-07-13 18:10:16.000000000 -0400
++++ kdebase-branch-3.4/konqueror/listview/konq_infolistviewwidget.cc 2005-03-18 17:42:08.000000000 -0500
+@@ -222,7 +222,8 @@
+
+ slotUpdateBackground();
+
+- determineCounts(list);
++ if ( !m_favorite.mimetype )
++ determineCounts(list);
+
+ kdDebug(1203) << " ------------------------ startin metainfo job ------\n";
+
+@@ -277,6 +278,7 @@
+ m_metaInfoTodo.clear();
+ delete m_metaInfoJob;
+ m_metaInfoJob = 0;
++ m_favorite = KonqILVMimeType();
+
+ KonqBaseListViewWidget::slotClear();
+ }
+diff -Nru kdebase-release-3.4.0/konqueror/listview/konq_listview.cc kdebase-branch-3.4/konqueror/listview/konq_listview.cc
+--- kdebase-release-3.4.0/konqueror/listview/konq_listview.cc 2005-02-20 06:59:30.000000000 -0500
++++ kdebase-branch-3.4/konqueror/listview/konq_listview.cc 2005-03-18 17:05:23.000000000 -0500
+@@ -55,10 +55,8 @@
+
+ KonqListViewFactory::~KonqListViewFactory()
+ {
+- if ( s_instance )
+- delete s_instance;
+- if ( s_defaultViewProps )
+- delete s_defaultViewProps;
++ delete s_instance;
++ delete s_defaultViewProps;
+
+ s_instance = 0;
+ s_defaultViewProps = 0;
+@@ -117,6 +115,7 @@
+ // This code is very related to KonqIconViewWidget::slotSelectionChanged
+ int canCopy = 0;
+ int canDel = 0;
++ int canTrash = 0;
+ bool bInTrash = false;
+ KFileItemList lstItems = m_listView->selectedFileItems();
+
+@@ -128,11 +127,13 @@
+ bInTrash = true;
+ if ( KProtocolInfo::supportsDeleting( url ) )
+ canDel++;
++ if ( !item->localPath().isEmpty() )
++ canTrash++;
+ }
+
+ emit enableAction( "copy", canCopy > 0 );
+ emit enableAction( "cut", canDel > 0 );
+- emit enableAction( "trash", canDel > 0 && !bInTrash && m_listView->url().isLocalFile() );
++ emit enableAction( "trash", canDel > 0 && !bInTrash && canDel == canTrash );
+ emit enableAction( "del", canDel > 0 );
+ emit enableAction( "properties", lstItems.count() > 0 && KPropertiesDialog::canDisplay( lstItems ) );
+ emit enableAction( "editMimeType", ( lstItems.count() == 1 ) );
+diff -Nru kdebase-release-3.4.0/konqueror/listview/konq_listviewwidget.cc kdebase-branch-3.4/konqueror/listview/konq_listviewwidget.cc
+--- kdebase-release-3.4.0/konqueror/listview/konq_listviewwidget.cc 2005-02-21 16:19:20.000000000 -0500
++++ kdebase-branch-3.4/konqueror/listview/konq_listviewwidget.cc 2005-03-17 12:04:06.000000000 -0500
+@@ -405,9 +405,6 @@
+ bool on = m_pSettings->showFileTips() && QToolTip::isGloballyEnabled();
+ m_fileTip->setOptions( on, m_pSettings->showPreviewsInFileTips(), m_pSettings->numFileTips() );
+
+- // if the user wants our own tooltip, don't show the one from Qts ListView
+- setShowToolTips(!on);
+-
+ updateListContents();
+ }
+
+@@ -496,6 +493,8 @@
+ vp.setY( itemRect( item ).y() );
+ QRect rect( viewportToContents( vp ), QSize(20, item->height()) );
+ m_fileTip->setItem( item->item(), rect, item->pixmap( 0 ) );
++ m_fileTip->setPreview( KGlobalSettings::showFilePreview( item->item()->url() ) );
++ setShowToolTips( !m_pSettings->showFileTips() );
+ }
+ else
+ {
+@@ -503,6 +502,7 @@
+ m_pBrowserView->emitMouseOver( 0 );
+
+ m_fileTip->setItem( 0 );
++ setShowToolTips( true );
+ }
+ }
+
+diff -Nru kdebase-release-3.4.0/konqueror/listview/konq_textview.desktop kdebase-branch-3.4/konqueror/listview/konq_textview.desktop
+--- kdebase-release-3.4.0/konqueror/listview/konq_textview.desktop 2005-02-04 23:15:36.000000000 -0500
++++ kdebase-branch-3.4/konqueror/listview/konq_textview.desktop 2005-03-07 09:16:04.000000000 -0500
+@@ -67,7 +67,6 @@
+ Name[vi]=Xem text
+ Name[wa]=Vey e môde tecse
+ Name[xh]=Imboniselo Yombhalo
+-Name[xx]=xxText Viewxx
+ Name[zh_CN]=文本视图
+ Name[zh_TW]=æ–‡å—æª¢è¦–
+ Name[zu]=Umbukiso wombhalo
+diff -Nru kdebase-release-3.4.0/konqueror/listview/konq_textviewitem.cc kdebase-branch-3.4/konqueror/listview/konq_textviewitem.cc
+--- kdebase-release-3.4.0/konqueror/listview/konq_textviewitem.cc 2004-12-20 16:40:34.000000000 -0500
++++ kdebase-branch-3.4/konqueror/listview/konq_textviewitem.cc 2005-03-21 12:47:33.000000000 -0500
+@@ -70,11 +70,16 @@
+ QString tmp;
+ KIO::filesize_t size=m_fileitem->size();
+ mode_t m=m_fileitem->mode();
++
++ // The order is: .dir (0), dir (1), .file (2), file (3)
++ sortChar = S_ISDIR( m_fileitem->mode() ) ? 1 : 3;
++ if ( m_fileitem->text()[0] == '.' )
++ --sortChar;
++
+ if (m_fileitem->isLink())
+ {
+ if (S_ISDIR(m))
+ {
+- sortChar='0';
+ type=KTVI_DIRLINK;
+ tmp="~";
+ }
+@@ -107,7 +112,6 @@
+ {
+ type=KTVI_DIR;
+ tmp="/";
+- sortChar='0';
+ }
+ else if (S_ISCHR(m))
+ {
+diff -Nru kdebase-release-3.4.0/konqueror/listview/konq_treeview.desktop kdebase-branch-3.4/konqueror/listview/konq_treeview.desktop
+--- kdebase-release-3.4.0/konqueror/listview/konq_treeview.desktop 2005-02-04 23:15:36.000000000 -0500
++++ kdebase-branch-3.4/konqueror/listview/konq_treeview.desktop 2005-03-07 09:16:04.000000000 -0500
+@@ -68,7 +68,6 @@
+ Name[vi]=Xem dạng cây
+ Name[wa]=Vey come èn åbe
+ Name[xh]=Imboniselo Yomthi
+-Name[xx]=xxTree Viewxx
+ Name[zh_CN]=æ ‘è§†å›¾
+ Name[zh_TW]=樹狀ç€è¦½
+ Name[zu]=Umbukiso Wesihlahla
+diff -Nru kdebase-release-3.4.0/konqueror/preloader/konqy_preload.desktop kdebase-branch-3.4/konqueror/preloader/konqy_preload.desktop
+--- kdebase-release-3.4.0/konqueror/preloader/konqy_preload.desktop 2005-02-23 00:05:56.000000000 -0500
++++ kdebase-branch-3.4/konqueror/preloader/konqy_preload.desktop 2005-03-30 01:47:54.000000000 -0500
+@@ -12,6 +12,7 @@
+ Name[cy]=Cynlwytho Konqueror yn ystod Ymgychwyn KDE
+ Name[da]=Konqueror forhåndsindlæsning ved opstart
+ Name[de]=Konqueror bei KDE-Start im Hintergrund laden
++Name[el]=Î ÏοφόÏτωση του Konqueror κατά την εκκίνηση του KDE
+ Name[eo]=Konkeranto antaÅÅarÄante dum KDE-lanĉo
+ Name[es]=Precargado de Konqueror durante el arranque de KDE
+ Name[et]=Konquerori eellaadimine KDE käivitamisel
+@@ -43,12 +44,11 @@
+ Name[sk]=Prednahratie Konquerora poÄas Å¡tartu KDE
+ Name[sl]=Prednalaganje Konquerorja med zaganjanjem KDE
+ Name[sr]=Предучитавање Konqueror-а приликом покретања KDE-а
+-Name[sr@Latn]=Предучитавање Konqueror-а приликом покретања KDE-а
++Name[sr@Latn]=PreduÄitavanje Konqueror-a prilikom pokretanja KDE-a
+ Name[sv]=Förladdning av Konqueror vid start av KDE
+ Name[ta]=கேடியி தà¯à®µà®•à¯à®•தà¯à®¤à®¿à®©à¯à®ªà¯‹à®¤à¯ கானà¯à®•ொரரை à®®à¯à®©à¯ à®à®±à¯à®±à¯à®¤à®²à¯
+ Name[tr]=KDE açılışında Konqueror Önyüklemesi
+ Name[uk]=Попереднє Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Konqueror при Ñтарті KDE
+-Name[xx]=xxKonqueror Preloading During KDE startupxx
+ Name[zh_CN]=在 KDE å¯åŠ¨æ—¶é¢„å…ˆè£…å…¥ Konqueror
+ X-KDE-autostart-condition=konquerorrc:Reusing:PreloadOnStartup:false
+ X-KDE-StartupNotify=false
+diff -Nru kdebase-release-3.4.0/konqueror/preloader/konqy_preloader.desktop kdebase-branch-3.4/konqueror/preloader/konqy_preloader.desktop
+--- kdebase-release-3.4.0/konqueror/preloader/konqy_preloader.desktop 2005-02-23 00:05:56.000000000 -0500
++++ kdebase-branch-3.4/konqueror/preloader/konqy_preloader.desktop 2005-03-22 12:38:17.000000000 -0500
+@@ -22,7 +22,7 @@
+ Name[hi]=केडीईडी कॉनà¥à¤•à¥à¤µà¥‡à¤°à¤° पà¥à¤°à¥€à¤²à¥‹à¤¡à¤° मॉडà¥à¤¯à¥‚ल
+ Name[hu]=KDED gyorsbetöltő modul a Konquerorhoz
+ Name[is]=KDED Konqueror forræsingareining
+-Name[it]=Modulo di precaricamento di konqueror di KDED
++Name[it]=Modulo di KDED per precaricare konqueror
+ Name[ja]=KDED,Konquerorプリãƒãƒ¼ãƒ€ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«
+ Name[lt]=KDED Konqueror išankstinio įkrovimo modulis
+ Name[mk]=KDED модул за предвчитување на Konqueror
+@@ -40,12 +40,11 @@
+ Name[sk]=Modul KDED prednahrania Konquerora
+ Name[sl]=Modul KDED za prednalaganje Konquerorja
+ Name[sr]=Модул за предучитавање Konqueror-а, KDED
+-Name[sr@Latn]=Модул за предучитавање Konqueror-а, KDED
++Name[sr@Latn]=Modul za preduÄitavanje Konqueror-a, KDED
+ Name[sv]=KDED Konqueror-förladdningsmodul
+ Name[ta]=KDED கானà¯à®•ொரர௠மà¯à®©à¯ à®à®±à¯à®±à®•à¯à®•ூடிய பகà¯à®¤à®¿
+ Name[tr]=KDED Konqueror Önyükleme Modülü
+ Name[uk]=Модуль KDED Ð´Ð»Ñ Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½ÑŒÐ¾Ð³Ð¾ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Konqueror
+-Name[xx]=xxKDED Konqueror Preloader Modulexx
+ Name[zh_CN]=KDED Konqueror 预装入模å—
+ Comment=Reduces Konqueror startup time
+ Comment[ar]=يقلّل من وقت بدء تشغيل كونكويرر
+@@ -100,7 +99,6 @@
+ Comment[uk]=Зменшує Ñ‡Ð°Ñ Ð·Ð°Ð¿ÑƒÑку Konqueror
+ Comment[uz]=Konqueror ишга тушиш вақтини камайтириш
+ Comment[vi]=Thá»i gian khởi động giảm bá»›t cá»§a Konqueror
+-Comment[xx]=xxReduces Konqueror startup timexx
+ Comment[zh_CN]=å‡å°‘ Konqueror å¯åŠ¨æ—¶é—´
+ Comment[zh_TW]=減少 Konqueror 啟動時間
+ ServiceTypes=KDEDModule
+diff -Nru kdebase-release-3.4.0/konqueror/profile_filemanagement.desktop kdebase-branch-3.4/konqueror/profile_filemanagement.desktop
+--- kdebase-release-3.4.0/konqueror/profile_filemanagement.desktop 2005-02-04 23:15:34.000000000 -0500
++++ kdebase-branch-3.4/konqueror/profile_filemanagement.desktop 2005-03-07 09:16:01.000000000 -0500
+@@ -69,7 +69,6 @@
+ Name[vi]=Quản là file
+ Name[wa]=Manaedjî les fitchîs
+ Name[xh]=Uphatho Lwefayile
+-Name[xx]=xxFile Managementxx
+ Name[zh_CN]=文件管ç†å™¨
+ Name[zh_TW]=檔案管ç†
+ Name[zu]=Ukuphathwa kwamafayela
+diff -Nru kdebase-release-3.4.0/konqueror/profile_filepreview.desktop kdebase-branch-3.4/konqueror/profile_filepreview.desktop
+--- kdebase-release-3.4.0/konqueror/profile_filepreview.desktop 2005-02-10 23:52:17.000000000 -0500
++++ kdebase-branch-3.4/konqueror/profile_filepreview.desktop 2005-03-07 09:16:01.000000000 -0500
+@@ -71,7 +71,6 @@
+ Name[ven]=Mbonelephanda ya Faela
+ Name[vi]=Duyệt trước file
+ Name[xh]=Imboniselo yasekuqaleni Yefayile
+-Name[xx]=xxFile Previewxx
+ Name[zh_CN]=文件预览
+ Name[zh_TW]=檔案é 覽
+ Name[zu]=Umbukiso wangaphambili wefayela
+diff -Nru kdebase-release-3.4.0/konqueror/profile_kde_devel.desktop kdebase-branch-3.4/konqueror/profile_kde_devel.desktop
+--- kdebase-release-3.4.0/konqueror/profile_kde_devel.desktop 2005-02-18 23:27:13.000000000 -0500
++++ kdebase-branch-3.4/konqueror/profile_kde_devel.desktop 2005-03-07 09:16:01.000000000 -0500
+@@ -44,7 +44,7 @@
+ Name[sk]=Vývoj KDE
+ Name[sl]=Razvoj KDE
+ Name[sr]=KDE развој
+-Name[sr@Latn]=KDE развој
++Name[sr@Latn]=KDE razvoj
+ Name[sv]=KDE-utveckling
+ Name[ta]=KDE உரà¯à®µà®¾à®•à¯à®•à®®à¯
+ Name[th]=พัฒนาโปรà¹à¸à¸£à¸¡ KDE
+@@ -52,7 +52,6 @@
+ Name[uk]=Розробка KDE
+ Name[uz]=KDE учун даÑтурлаштириш
+ Name[wa]=Diswalpaedje KDE
+-Name[xx]=xxKDE Developmentxx
+ Name[zh_CN]=KDE å¼€å‘
+ RootItem=Tabs0
+ Tabs0_Children=ViewT0,ViewT1,ViewT2,ViewT3,ViewT4
+diff -Nru kdebase-release-3.4.0/konqueror/profile_midnightcommander.desktop kdebase-branch-3.4/konqueror/profile_midnightcommander.desktop
+--- kdebase-release-3.4.0/konqueror/profile_midnightcommander.desktop 2005-01-10 23:17:39.000000000 -0500
++++ kdebase-branch-3.4/konqueror/profile_midnightcommander.desktop 2005-03-07 09:16:01.000000000 -0500
+@@ -23,7 +23,6 @@
+ Name[th]=มิดไนท์คà¸à¸¡à¸¡à¸²à¸™à¹€à¸”à¸à¸£à¹Œ
+ Name[ven]=Muhulwane wa vhukati ha vhusiku
+ Name[xh]=Umyaleli Waphakathi kobusuku
+-Name[xx]=xxMidnight Commanderxx
+ Name[zu]=Umyaleli waphakathi nobusuku
+ RootItem=Container0
+ View2_LinkedView=true
+diff -Nru kdebase-release-3.4.0/konqueror/profile_simplebrowser.desktop kdebase-branch-3.4/konqueror/profile_simplebrowser.desktop
+--- kdebase-release-3.4.0/konqueror/profile_simplebrowser.desktop 2005-02-23 00:05:54.000000000 -0500
++++ kdebase-branch-3.4/konqueror/profile_simplebrowser.desktop 2005-03-30 01:47:54.000000000 -0500
+@@ -8,6 +8,7 @@
+ Name[cy]=Porydd Syml
+ Name[da]=Simpel browser
+ Name[de]=Einfacher Browser
++Name[el]=Απλός ΠεÏιηγητής ΙστοÏ
+ Name[eo]=Simpla TTT-legilo
+ Name[es]=Navegador sencillo
+ Name[et]=Lihtne brauser
+@@ -40,14 +41,13 @@
+ Name[sk]=Jednoduchý prehliadaÄ
+ Name[sl]=Preprost brskalnik
+ Name[sr]=ЈедноÑтаван прегледач
+-Name[sr@Latn]=ЈедноÑтаван прегледач
++Name[sr@Latn]=Jednostavan pregledaÄ
+ Name[sv]=Enkel webbläsning
+ Name[ta]=எளிய உலாவி
+ Name[tr]=Sade Tarayıcı
+ Name[uk]=ПроÑтий навігатор
+ Name[uz]=Оддий веб-браузер
+ Name[wa]=Betchteu waibe simpe
+-Name[xx]=xxSimple Browserxx
+ Name[zh_CN]=ç®€å•æµè§ˆå™¨
+ XMLUIFile=konq-simplebrowser.rc
+ RootItem=View0
+diff -Nru kdebase-release-3.4.0/konqueror/profile_tabbedbrowsing.desktop kdebase-branch-3.4/konqueror/profile_tabbedbrowsing.desktop
+--- kdebase-release-3.4.0/konqueror/profile_tabbedbrowsing.desktop 2005-02-23 00:05:54.000000000 -0500
++++ kdebase-branch-3.4/konqueror/profile_tabbedbrowsing.desktop 2005-03-07 09:16:01.000000000 -0500
+@@ -44,7 +44,7 @@
+ Name[sk]=PrehliadaÄ s kartami
+ Name[sl]=Brskanje v zavihkih
+ Name[sr]=Прегледање Ñа језичцима
+-Name[sr@Latn]=Прегледање Ñа језичцима
++Name[sr@Latn]=Pregledanje sa jeziÄcima
+ Name[sv]=Webbläsning med flikar
+ Name[ta]=ததà¯à®¤à¯à®®à¯ உலாவி
+ Name[th]=ท่à¸à¸‡à¹€à¸§à¹‡à¸šà¹à¸šà¸šà¹ƒà¸Šà¹‰à¹à¸—็บ
+@@ -52,7 +52,6 @@
+ Name[uk]=ÐÐ°Ð²Ñ–Ð³Ð°Ñ†Ñ–Ñ Ð· вкладками
+ Name[uz]=Табли веб кўриш
+ Name[wa]=Naiviaedje waibe avou des linwetes
+-Name[xx]=xxTabbed Browsingxx
+ Name[zh_CN]=æ ‡ç¾å¼æµè§ˆ
+ RootItem=Tabs0
+ Tabs0_Children=ViewT0,ViewT1,ViewT2,ViewT3
+diff -Nru kdebase-release-3.4.0/konqueror/profile_webbrowsing.desktop kdebase-branch-3.4/konqueror/profile_webbrowsing.desktop
+--- kdebase-release-3.4.0/konqueror/profile_webbrowsing.desktop 2005-02-23 00:05:54.000000000 -0500
++++ kdebase-branch-3.4/konqueror/profile_webbrowsing.desktop 2005-03-07 09:16:02.000000000 -0500
+@@ -52,7 +52,7 @@
+ Name[sk]=Web prehliadanie
+ Name[sl]=Brskanje po spletu
+ Name[sr]=Прегледање Веба
+-Name[sr@Latn]=Pretraživanje veba
++Name[sr@Latn]=Pregledanje Veba
+ Name[sv]=Webbläsning
+ Name[ta]=வலை உலாவி
+ Name[tg]=ТафÑири Ð’Ñб
+@@ -64,7 +64,6 @@
+ Name[vi]=Duyệt web
+ Name[wa]=Naiviaedje waibe
+ Name[xh]=Ukhangelo lwencwadi ze Web
+-Name[xx]=xxWeb Browsingxx
+ Name[zh_CN]=Web æµè§ˆ
+ Name[zh_TW]=ç¶²é ç€è¦½
+ Name[zu]=Ukucinga kwi-Web
+diff -Nru kdebase-release-3.4.0/konqueror/quickprint/text-ada-print.desktop kdebase-branch-3.4/konqueror/quickprint/text-ada-print.desktop
+--- kdebase-release-3.4.0/konqueror/quickprint/text-ada-print.desktop 2005-02-23 00:05:56.000000000 -0500
++++ kdebase-branch-3.4/konqueror/quickprint/text-ada-print.desktop 2005-03-30 01:47:54.000000000 -0500
+@@ -9,13 +9,16 @@
+ Name[bg]=Печат...
+ Name[bn]=ছাপাও...
+ Name[br]=Moulañ ...
++Name[bs]=Å tampaj...
+ Name[ca]=Imprimeix...
+ Name[cs]=Tisknout...
+ Name[cy]=Argraffu...
+ Name[da]=Udskriv...
++Name[el]=ΕκτÏπωση...
+ Name[eo]=Presu...
+ Name[es]=Imprimir...
+ Name[et]=Trüki...
++Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+ Name[fy]=Ofdrukken...
+@@ -25,6 +28,7 @@
+ Name[hu]=Nyomtatás...
+ Name[is]=Prenta...
+ Name[it]=Stampa...
++Name[ja]=å°åˆ·...
+ Name[mk]=Печати...
+ Name[mt]=Ipprintja...
+ Name[nb]=Skriv ut...
+@@ -35,14 +39,14 @@
+ Name[pt_BR]=Imprimir...
+ Name[ru]=Печать...
+ Name[se]=Čálit ...
++Name[sk]=TlaÄiÅ¥...
+ Name[sl]=Natisni ...
+ Name[sr]=Штампа...
+-Name[sr@Latn]=Штампа...
++Name[sr@Latn]=Å tampa...
+ Name[sv]=Skriv ut...
+ Name[ta]=அசà¯à®šà®Ÿà®¿...
+ Name[tr]=Yazdır...
+ Name[uk]=Друк...
+-Name[xx]=xxPrint...xx
+ Name[zh_CN]=打å°...
+ Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U
+ Icon=filequickprint
+diff -Nru kdebase-release-3.4.0/konqueror/quickprint/text-c++-print.desktop kdebase-branch-3.4/konqueror/quickprint/text-c++-print.desktop
+--- kdebase-release-3.4.0/konqueror/quickprint/text-c++-print.desktop 2005-02-23 00:05:56.000000000 -0500
++++ kdebase-branch-3.4/konqueror/quickprint/text-c++-print.desktop 2005-03-30 01:47:54.000000000 -0500
+@@ -9,13 +9,16 @@
+ Name[bg]=Печат...
+ Name[bn]=ছাপাও...
+ Name[br]=Moulañ ...
++Name[bs]=Å tampaj...
+ Name[ca]=Imprimeix...
+ Name[cs]=Tisknout...
+ Name[cy]=Argraffu...
+ Name[da]=Udskriv...
++Name[el]=ΕκτÏπωση...
+ Name[eo]=Presu...
+ Name[es]=Imprimir...
+ Name[et]=Trüki...
++Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+ Name[fy]=Ofdrukken...
+@@ -25,6 +28,7 @@
+ Name[hu]=Nyomtatás...
+ Name[is]=Prenta...
+ Name[it]=Stampa...
++Name[ja]=å°åˆ·...
+ Name[mk]=Печати...
+ Name[mt]=Ipprintja...
+ Name[nb]=Skriv ut...
+@@ -35,14 +39,14 @@
+ Name[pt_BR]=Imprimir...
+ Name[ru]=Печать...
+ Name[se]=Čálit ...
++Name[sk]=TlaÄiÅ¥...
+ Name[sl]=Natisni ...
+ Name[sr]=Штампа...
+-Name[sr@Latn]=Штампа...
++Name[sr@Latn]=Å tampa...
+ Name[sv]=Skriv ut...
+ Name[ta]=அசà¯à®šà®Ÿà®¿...
+ Name[tr]=Yazdır...
+ Name[uk]=Друк...
+-Name[xx]=xxPrint...xx
+ Name[zh_CN]=打å°...
+ Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U
+ Icon=filequickprint
+diff -Nru kdebase-release-3.4.0/konqueror/quickprint/text-c++h-print.desktop kdebase-branch-3.4/konqueror/quickprint/text-c++h-print.desktop
+--- kdebase-release-3.4.0/konqueror/quickprint/text-c++h-print.desktop 2005-02-23 00:05:56.000000000 -0500
++++ kdebase-branch-3.4/konqueror/quickprint/text-c++h-print.desktop 2005-03-30 01:47:54.000000000 -0500
+@@ -9,13 +9,16 @@
+ Name[bg]=Печат...
+ Name[bn]=ছাপাও...
+ Name[br]=Moulañ ...
++Name[bs]=Å tampaj...
+ Name[ca]=Imprimeix...
+ Name[cs]=Tisknout...
+ Name[cy]=Argraffu...
+ Name[da]=Udskriv...
++Name[el]=ΕκτÏπωση...
+ Name[eo]=Presu...
+ Name[es]=Imprimir...
+ Name[et]=Trüki...
++Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+ Name[fy]=Ofdrukken...
+@@ -25,6 +28,7 @@
+ Name[hu]=Nyomtatás...
+ Name[is]=Prenta...
+ Name[it]=Stampa...
++Name[ja]=å°åˆ·...
+ Name[mk]=Печати...
+ Name[mt]=Ipprintja...
+ Name[nb]=Skriv ut...
+@@ -35,14 +39,14 @@
+ Name[pt_BR]=Imprimir...
+ Name[ru]=Печать...
+ Name[se]=Čálit ...
++Name[sk]=TlaÄiÅ¥...
+ Name[sl]=Natisni ...
+ Name[sr]=Штампа...
+-Name[sr@Latn]=Штампа...
++Name[sr@Latn]=Å tampa...
+ Name[sv]=Skriv ut...
+ Name[ta]=அசà¯à®šà®Ÿà®¿...
+ Name[tr]=Yazdır...
+ Name[uk]=Друк...
+-Name[xx]=xxPrint...xx
+ Name[zh_CN]=打å°...
+ Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U
+ Icon=filequickprint
+diff -Nru kdebase-release-3.4.0/konqueror/quickprint/text-c-print.desktop kdebase-branch-3.4/konqueror/quickprint/text-c-print.desktop
+--- kdebase-release-3.4.0/konqueror/quickprint/text-c-print.desktop 2005-02-23 00:05:56.000000000 -0500
++++ kdebase-branch-3.4/konqueror/quickprint/text-c-print.desktop 2005-03-30 01:47:54.000000000 -0500
+@@ -9,13 +9,16 @@
+ Name[bg]=Печат...
+ Name[bn]=ছাপাও...
+ Name[br]=Moulañ ...
++Name[bs]=Å tampaj...
+ Name[ca]=Imprimeix...
+ Name[cs]=Tisknout...
+ Name[cy]=Argraffu...
+ Name[da]=Udskriv...
++Name[el]=ΕκτÏπωση...
+ Name[eo]=Presu...
+ Name[es]=Imprimir...
+ Name[et]=Trüki...
++Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+ Name[fy]=Ofdrukken...
+@@ -25,6 +28,7 @@
+ Name[hu]=Nyomtatás...
+ Name[is]=Prenta...
+ Name[it]=Stampa...
++Name[ja]=å°åˆ·...
+ Name[mk]=Печати...
+ Name[mt]=Ipprintja...
+ Name[nb]=Skriv ut...
+@@ -35,14 +39,14 @@
+ Name[pt_BR]=Imprimir...
+ Name[ru]=Печать...
+ Name[se]=Čálit ...
++Name[sk]=TlaÄiÅ¥...
+ Name[sl]=Natisni ...
+ Name[sr]=Штампа...
+-Name[sr@Latn]=Штампа...
++Name[sr@Latn]=Å tampa...
+ Name[sv]=Skriv ut...
+ Name[ta]=அசà¯à®šà®Ÿà®¿...
+ Name[tr]=Yazdır...
+ Name[uk]=Друк...
+-Name[xx]=xxPrint...xx
+ Name[zh_CN]=打å°...
+ Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U
+ Icon=filequickprint
+diff -Nru kdebase-release-3.4.0/konqueror/quickprint/text-ch-print.desktop kdebase-branch-3.4/konqueror/quickprint/text-ch-print.desktop
+--- kdebase-release-3.4.0/konqueror/quickprint/text-ch-print.desktop 2005-02-23 00:05:56.000000000 -0500
++++ kdebase-branch-3.4/konqueror/quickprint/text-ch-print.desktop 2005-03-30 01:47:54.000000000 -0500
+@@ -9,13 +9,16 @@
+ Name[bg]=Печат...
+ Name[bn]=ছাপাও...
+ Name[br]=Moulañ ...
++Name[bs]=Å tampaj...
+ Name[ca]=Imprimeix...
+ Name[cs]=Tisknout...
+ Name[cy]=Argraffu...
+ Name[da]=Udskriv...
++Name[el]=ΕκτÏπωση...
+ Name[eo]=Presu...
+ Name[es]=Imprimir...
+ Name[et]=Trüki...
++Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+ Name[fy]=Ofdrukken...
+@@ -25,6 +28,7 @@
+ Name[hu]=Nyomtatás...
+ Name[is]=Prenta...
+ Name[it]=Stampa...
++Name[ja]=å°åˆ·...
+ Name[mk]=Печати...
+ Name[mt]=Ipprintja...
+ Name[nb]=Skriv ut...
+@@ -35,14 +39,14 @@
+ Name[pt_BR]=Imprimir...
+ Name[ru]=Печать...
+ Name[se]=Čálit ...
++Name[sk]=TlaÄiÅ¥...
+ Name[sl]=Natisni ...
+ Name[sr]=Штампа...
+-Name[sr@Latn]=Штампа...
++Name[sr@Latn]=Å tampa...
+ Name[sv]=Skriv ut...
+ Name[ta]=அசà¯à®šà®Ÿà®¿...
+ Name[tr]=Yazdır...
+ Name[uk]=Друк...
+-Name[xx]=xxPrint...xx
+ Name[zh_CN]=打å°...
+ Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U
+ Icon=filequickprint
+diff -Nru kdebase-release-3.4.0/konqueror/quickprint/text-css-print.desktop kdebase-branch-3.4/konqueror/quickprint/text-css-print.desktop
+--- kdebase-release-3.4.0/konqueror/quickprint/text-css-print.desktop 2005-02-23 00:05:56.000000000 -0500
++++ kdebase-branch-3.4/konqueror/quickprint/text-css-print.desktop 2005-03-30 01:47:54.000000000 -0500
+@@ -9,13 +9,16 @@
+ Name[bg]=Печат...
+ Name[bn]=ছাপাও...
+ Name[br]=Moulañ ...
++Name[bs]=Å tampaj...
+ Name[ca]=Imprimeix...
+ Name[cs]=Tisknout...
+ Name[cy]=Argraffu...
+ Name[da]=Udskriv...
++Name[el]=ΕκτÏπωση...
+ Name[eo]=Presu...
+ Name[es]=Imprimir...
+ Name[et]=Trüki...
++Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+ Name[fy]=Ofdrukken...
+@@ -25,6 +28,7 @@
+ Name[hu]=Nyomtatás...
+ Name[is]=Prenta...
+ Name[it]=Stampa...
++Name[ja]=å°åˆ·...
+ Name[mk]=Печати...
+ Name[mt]=Ipprintja...
+ Name[nb]=Skriv ut...
+@@ -35,14 +39,14 @@
+ Name[pt_BR]=Imprimir...
+ Name[ru]=Печать...
+ Name[se]=Čálit ...
++Name[sk]=TlaÄiÅ¥...
+ Name[sl]=Natisni ...
+ Name[sr]=Штампа...
+-Name[sr@Latn]=Штампа...
++Name[sr@Latn]=Å tampa...
+ Name[sv]=Skriv ut...
+ Name[ta]=அசà¯à®šà®Ÿà®¿...
+ Name[tr]=Yazdır...
+ Name[uk]=Друк...
+-Name[xx]=xxPrint...xx
+ Name[zh_CN]=打å°...
+ Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U
+ Icon=filequickprint
+diff -Nru kdebase-release-3.4.0/konqueror/quickprint/text-diff-print.desktop kdebase-branch-3.4/konqueror/quickprint/text-diff-print.desktop
+--- kdebase-release-3.4.0/konqueror/quickprint/text-diff-print.desktop 2005-02-23 00:05:56.000000000 -0500
++++ kdebase-branch-3.4/konqueror/quickprint/text-diff-print.desktop 2005-03-30 01:47:54.000000000 -0500
+@@ -9,13 +9,16 @@
+ Name[bg]=Печат...
+ Name[bn]=ছাপাও...
+ Name[br]=Moulañ ...
++Name[bs]=Å tampaj...
+ Name[ca]=Imprimeix...
+ Name[cs]=Tisknout...
+ Name[cy]=Argraffu...
+ Name[da]=Udskriv...
++Name[el]=ΕκτÏπωση...
+ Name[eo]=Presu...
+ Name[es]=Imprimir...
+ Name[et]=Trüki...
++Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+ Name[fy]=Ofdrukken...
+@@ -25,6 +28,7 @@
+ Name[hu]=Nyomtatás...
+ Name[is]=Prenta...
+ Name[it]=Stampa...
++Name[ja]=å°åˆ·...
+ Name[mk]=Печати...
+ Name[mt]=Ipprintja...
+ Name[nb]=Skriv ut...
+@@ -35,14 +39,14 @@
+ Name[pt_BR]=Imprimir...
+ Name[ru]=Печать...
+ Name[se]=Čálit ...
++Name[sk]=TlaÄiÅ¥...
+ Name[sl]=Natisni ...
+ Name[sr]=Штампа...
+-Name[sr@Latn]=Штампа...
++Name[sr@Latn]=Å tampa...
+ Name[sv]=Skriv ut...
+ Name[ta]=அசà¯à®šà®Ÿà®¿...
+ Name[tr]=Yazdır...
+ Name[uk]=Друк...
+-Name[xx]=xxPrint...xx
+ Name[zh_CN]=打å°...
+ Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U
+ Icon=filequickprint
+diff -Nru kdebase-release-3.4.0/konqueror/quickprint/text-html-print.desktop kdebase-branch-3.4/konqueror/quickprint/text-html-print.desktop
+--- kdebase-release-3.4.0/konqueror/quickprint/text-html-print.desktop 2005-02-23 00:05:56.000000000 -0500
++++ kdebase-branch-3.4/konqueror/quickprint/text-html-print.desktop 2005-03-30 01:47:54.000000000 -0500
+@@ -9,13 +9,16 @@
+ Name[bg]=Печат...
+ Name[bn]=ছাপাও...
+ Name[br]=Moulañ ...
++Name[bs]=Å tampaj...
+ Name[ca]=Imprimeix...
+ Name[cs]=Tisknout...
+ Name[cy]=Argraffu...
+ Name[da]=Udskriv...
++Name[el]=ΕκτÏπωση...
+ Name[eo]=Presu...
+ Name[es]=Imprimir...
+ Name[et]=Trüki...
++Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+ Name[fy]=Ofdrukken...
+@@ -25,6 +28,7 @@
+ Name[hu]=Nyomtatás...
+ Name[is]=Prenta...
+ Name[it]=Stampa...
++Name[ja]=å°åˆ·...
+ Name[mk]=Печати...
+ Name[mt]=Ipprintja...
+ Name[nb]=Skriv ut...
+@@ -35,14 +39,14 @@
+ Name[pt_BR]=Imprimir...
+ Name[ru]=Печать...
+ Name[se]=Čálit ...
++Name[sk]=TlaÄiÅ¥...
+ Name[sl]=Natisni ...
+ Name[sr]=Штампа...
+-Name[sr@Latn]=Штампа...
++Name[sr@Latn]=Å tampa...
+ Name[sv]=Skriv ut...
+ Name[ta]=அசà¯à®šà®Ÿà®¿...
+ Name[tr]=Yazdır...
+ Name[uk]=Друк...
+-Name[xx]=xxPrint...xx
+ Name[zh_CN]=打å°...
+ Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U
+ Icon=filequickprint
+diff -Nru kdebase-release-3.4.0/konqueror/quickprint/text-java-print.desktop kdebase-branch-3.4/konqueror/quickprint/text-java-print.desktop
+--- kdebase-release-3.4.0/konqueror/quickprint/text-java-print.desktop 2005-02-23 00:05:56.000000000 -0500
++++ kdebase-branch-3.4/konqueror/quickprint/text-java-print.desktop 2005-03-30 01:47:54.000000000 -0500
+@@ -9,13 +9,16 @@
+ Name[bg]=Печат...
+ Name[bn]=ছাপাও...
+ Name[br]=Moulañ ...
++Name[bs]=Å tampaj...
+ Name[ca]=Imprimeix...
+ Name[cs]=Tisknout...
+ Name[cy]=Argraffu...
+ Name[da]=Udskriv...
++Name[el]=ΕκτÏπωση...
+ Name[eo]=Presu...
+ Name[es]=Imprimir...
+ Name[et]=Trüki...
++Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+ Name[fy]=Ofdrukken...
+@@ -25,6 +28,7 @@
+ Name[hu]=Nyomtatás...
+ Name[is]=Prenta...
+ Name[it]=Stampa...
++Name[ja]=å°åˆ·...
+ Name[mk]=Печати...
+ Name[mt]=Ipprintja...
+ Name[nb]=Skriv ut...
+@@ -35,14 +39,14 @@
+ Name[pt_BR]=Imprimir...
+ Name[ru]=Печать...
+ Name[se]=Čálit ...
++Name[sk]=TlaÄiÅ¥...
+ Name[sl]=Natisni ...
+ Name[sr]=Штампа...
+-Name[sr@Latn]=Штампа...
++Name[sr@Latn]=Å tampa...
+ Name[sv]=Skriv ut...
+ Name[ta]=அசà¯à®šà®Ÿà®¿...
+ Name[tr]=Yazdır...
+ Name[uk]=Друк...
+-Name[xx]=xxPrint...xx
+ Name[zh_CN]=打å°...
+ Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U
+ Icon=filequickprint
+diff -Nru kdebase-release-3.4.0/konqueror/quickprint/text-log-print.desktop kdebase-branch-3.4/konqueror/quickprint/text-log-print.desktop
+--- kdebase-release-3.4.0/konqueror/quickprint/text-log-print.desktop 2005-02-23 00:05:56.000000000 -0500
++++ kdebase-branch-3.4/konqueror/quickprint/text-log-print.desktop 2005-03-30 01:47:54.000000000 -0500
+@@ -9,13 +9,16 @@
+ Name[bg]=Печат...
+ Name[bn]=ছাপাও...
+ Name[br]=Moulañ ...
++Name[bs]=Å tampaj...
+ Name[ca]=Imprimeix...
+ Name[cs]=Tisknout...
+ Name[cy]=Argraffu...
+ Name[da]=Udskriv...
++Name[el]=ΕκτÏπωση...
+ Name[eo]=Presu...
+ Name[es]=Imprimir...
+ Name[et]=Trüki...
++Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+ Name[fy]=Ofdrukken...
+@@ -25,6 +28,7 @@
+ Name[hu]=Nyomtatás...
+ Name[is]=Prenta...
+ Name[it]=Stampa...
++Name[ja]=å°åˆ·...
+ Name[mk]=Печати...
+ Name[mt]=Ipprintja...
+ Name[nb]=Skriv ut...
+@@ -35,14 +39,14 @@
+ Name[pt_BR]=Imprimir...
+ Name[ru]=Печать...
+ Name[se]=Čálit ...
++Name[sk]=TlaÄiÅ¥...
+ Name[sl]=Natisni ...
+ Name[sr]=Штампа...
+-Name[sr@Latn]=Штампа...
++Name[sr@Latn]=Å tampa...
+ Name[sv]=Skriv ut...
+ Name[ta]=அசà¯à®šà®Ÿà®¿...
+ Name[tr]=Yazdır...
+ Name[uk]=Друк...
+-Name[xx]=xxPrint...xx
+ Name[zh_CN]=打å°...
+ Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U
+ Icon=filequickprint
+diff -Nru kdebase-release-3.4.0/konqueror/quickprint/text-makefile-print.desktop kdebase-branch-3.4/konqueror/quickprint/text-makefile-print.desktop
+--- kdebase-release-3.4.0/konqueror/quickprint/text-makefile-print.desktop 2005-02-23 00:05:56.000000000 -0500
++++ kdebase-branch-3.4/konqueror/quickprint/text-makefile-print.desktop 2005-03-30 01:47:54.000000000 -0500
+@@ -9,13 +9,16 @@
+ Name[bg]=Печат...
+ Name[bn]=ছাপাও...
+ Name[br]=Moulañ ...
++Name[bs]=Å tampaj...
+ Name[ca]=Imprimeix...
+ Name[cs]=Tisknout...
+ Name[cy]=Argraffu...
+ Name[da]=Udskriv...
++Name[el]=ΕκτÏπωση...
+ Name[eo]=Presu...
+ Name[es]=Imprimir...
+ Name[et]=Trüki...
++Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+ Name[fy]=Ofdrukken...
+@@ -25,6 +28,7 @@
+ Name[hu]=Nyomtatás...
+ Name[is]=Prenta...
+ Name[it]=Stampa...
++Name[ja]=å°åˆ·...
+ Name[mk]=Печати...
+ Name[mt]=Ipprintja...
+ Name[nb]=Skriv ut...
+@@ -35,14 +39,14 @@
+ Name[pt_BR]=Imprimir...
+ Name[ru]=Печать...
+ Name[se]=Čálit ...
++Name[sk]=TlaÄiÅ¥...
+ Name[sl]=Natisni ...
+ Name[sr]=Штампа...
+-Name[sr@Latn]=Штампа...
++Name[sr@Latn]=Å tampa...
+ Name[sv]=Skriv ut...
+ Name[ta]=அசà¯à®šà®Ÿà®¿...
+ Name[tr]=Yazdır...
+ Name[uk]=Друк...
+-Name[xx]=xxPrint...xx
+ Name[zh_CN]=打å°...
+ Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U
+ Icon=filequickprint
+diff -Nru kdebase-release-3.4.0/konqueror/quickprint/text-pas-print.desktop kdebase-branch-3.4/konqueror/quickprint/text-pas-print.desktop
+--- kdebase-release-3.4.0/konqueror/quickprint/text-pas-print.desktop 2005-02-23 00:05:56.000000000 -0500
++++ kdebase-branch-3.4/konqueror/quickprint/text-pas-print.desktop 2005-03-30 01:47:54.000000000 -0500
+@@ -9,13 +9,16 @@
+ Name[bg]=Печат...
+ Name[bn]=ছাপাও...
+ Name[br]=Moulañ ...
++Name[bs]=Å tampaj...
+ Name[ca]=Imprimeix...
+ Name[cs]=Tisknout...
+ Name[cy]=Argraffu...
+ Name[da]=Udskriv...
++Name[el]=ΕκτÏπωση...
+ Name[eo]=Presu...
+ Name[es]=Imprimir...
+ Name[et]=Trüki...
++Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+ Name[fy]=Ofdrukken...
+@@ -25,6 +28,7 @@
+ Name[hu]=Nyomtatás...
+ Name[is]=Prenta...
+ Name[it]=Stampa...
++Name[ja]=å°åˆ·...
+ Name[mk]=Печати...
+ Name[mt]=Ipprintja...
+ Name[nb]=Skriv ut...
+@@ -35,14 +39,14 @@
+ Name[pt_BR]=Imprimir...
+ Name[ru]=Печать...
+ Name[se]=Čálit ...
++Name[sk]=TlaÄiÅ¥...
+ Name[sl]=Natisni ...
+ Name[sr]=Штампа...
+-Name[sr@Latn]=Штампа...
++Name[sr@Latn]=Å tampa...
+ Name[sv]=Skriv ut...
+ Name[ta]=அசà¯à®šà®Ÿà®¿...
+ Name[tr]=Yazdır...
+ Name[uk]=Друк...
+-Name[xx]=xxPrint...xx
+ Name[zh_CN]=打å°...
+ Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U
+ Icon=filequickprint
+diff -Nru kdebase-release-3.4.0/konqueror/quickprint/text-perl-print.desktop kdebase-branch-3.4/konqueror/quickprint/text-perl-print.desktop
+--- kdebase-release-3.4.0/konqueror/quickprint/text-perl-print.desktop 2005-02-23 00:05:56.000000000 -0500
++++ kdebase-branch-3.4/konqueror/quickprint/text-perl-print.desktop 2005-03-30 01:47:54.000000000 -0500
+@@ -9,13 +9,16 @@
+ Name[bg]=Печат...
+ Name[bn]=ছাপাও...
+ Name[br]=Moulañ ...
++Name[bs]=Å tampaj...
+ Name[ca]=Imprimeix...
+ Name[cs]=Tisknout...
+ Name[cy]=Argraffu...
+ Name[da]=Udskriv...
++Name[el]=ΕκτÏπωση...
+ Name[eo]=Presu...
+ Name[es]=Imprimir...
+ Name[et]=Trüki...
++Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+ Name[fy]=Ofdrukken...
+@@ -25,6 +28,7 @@
+ Name[hu]=Nyomtatás...
+ Name[is]=Prenta...
+ Name[it]=Stampa...
++Name[ja]=å°åˆ·...
+ Name[mk]=Печати...
+ Name[mt]=Ipprintja...
+ Name[nb]=Skriv ut...
+@@ -35,14 +39,14 @@
+ Name[pt_BR]=Imprimir...
+ Name[ru]=Печать...
+ Name[se]=Čálit ...
++Name[sk]=TlaÄiÅ¥...
+ Name[sl]=Natisni ...
+ Name[sr]=Штампа...
+-Name[sr@Latn]=Штампа...
++Name[sr@Latn]=Å tampa...
+ Name[sv]=Skriv ut...
+ Name[ta]=அசà¯à®šà®Ÿà®¿...
+ Name[tr]=Yazdır...
+ Name[uk]=Друк...
+-Name[xx]=xxPrint...xx
+ Name[zh_CN]=打å°...
+ Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U
+ Icon=filequickprint
+diff -Nru kdebase-release-3.4.0/konqueror/quickprint/text-print.desktop kdebase-branch-3.4/konqueror/quickprint/text-print.desktop
+--- kdebase-release-3.4.0/konqueror/quickprint/text-print.desktop 2005-02-23 00:05:56.000000000 -0500
++++ kdebase-branch-3.4/konqueror/quickprint/text-print.desktop 2005-03-30 01:47:54.000000000 -0500
+@@ -9,13 +9,16 @@
+ Name[bg]=Печат...
+ Name[bn]=ছাপাও...
+ Name[br]=Moulañ ...
++Name[bs]=Å tampaj...
+ Name[ca]=Imprimeix...
+ Name[cs]=Tisknout...
+ Name[cy]=Argraffu...
+ Name[da]=Udskriv...
++Name[el]=ΕκτÏπωση...
+ Name[eo]=Presu...
+ Name[es]=Imprimir...
+ Name[et]=Trüki...
++Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+ Name[fy]=Ofdrukken...
+@@ -25,6 +28,7 @@
+ Name[hu]=Nyomtatás...
+ Name[is]=Prenta...
+ Name[it]=Stampa...
++Name[ja]=å°åˆ·...
+ Name[mk]=Печати...
+ Name[mt]=Ipprintja...
+ Name[nb]=Skriv ut...
+@@ -35,14 +39,14 @@
+ Name[pt_BR]=Imprimir...
+ Name[ru]=Печать...
+ Name[se]=Čálit ...
++Name[sk]=TlaÄiÅ¥...
+ Name[sl]=Natisni ...
+ Name[sr]=Штампа...
+-Name[sr@Latn]=Штампа...
++Name[sr@Latn]=Å tampa...
+ Name[sv]=Skriv ut...
+ Name[ta]=அசà¯à®šà®Ÿà®¿...
+ Name[tr]=Yazdır...
+ Name[uk]=Друк...
+-Name[xx]=xxPrint...xx
+ Name[zh_CN]=打å°...
+ Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U
+ Icon=filequickprint
+diff -Nru kdebase-release-3.4.0/konqueror/quickprint/text-python-print.desktop kdebase-branch-3.4/konqueror/quickprint/text-python-print.desktop
+--- kdebase-release-3.4.0/konqueror/quickprint/text-python-print.desktop 2005-02-23 00:05:56.000000000 -0500
++++ kdebase-branch-3.4/konqueror/quickprint/text-python-print.desktop 2005-03-30 01:47:54.000000000 -0500
+@@ -9,13 +9,16 @@
+ Name[bg]=Печат...
+ Name[bn]=ছাপাও...
+ Name[br]=Moulañ ...
++Name[bs]=Å tampaj...
+ Name[ca]=Imprimeix...
+ Name[cs]=Tisknout...
+ Name[cy]=Argraffu...
+ Name[da]=Udskriv...
++Name[el]=ΕκτÏπωση...
+ Name[eo]=Presu...
+ Name[es]=Imprimir...
+ Name[et]=Trüki...
++Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+ Name[fy]=Ofdrukken...
+@@ -25,6 +28,7 @@
+ Name[hu]=Nyomtatás...
+ Name[is]=Prenta...
+ Name[it]=Stampa...
++Name[ja]=å°åˆ·...
+ Name[mk]=Печати...
+ Name[mt]=Ipprintja...
+ Name[nb]=Skriv ut...
+@@ -35,14 +39,14 @@
+ Name[pt_BR]=Imprimir...
+ Name[ru]=Печать...
+ Name[se]=Čálit ...
++Name[sk]=TlaÄiÅ¥...
+ Name[sl]=Natisni ...
+ Name[sr]=Штампа...
+-Name[sr@Latn]=Штампа...
++Name[sr@Latn]=Å tampa...
+ Name[sv]=Skriv ut...
+ Name[ta]=அசà¯à®šà®Ÿà®¿...
+ Name[tr]=Yazdır...
+ Name[uk]=Друк...
+-Name[xx]=xxPrint...xx
+ Name[zh_CN]=打å°...
+ Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U
+ Icon=filequickprint
+diff -Nru kdebase-release-3.4.0/konqueror/quickprint/text-tcl-print.desktop kdebase-branch-3.4/konqueror/quickprint/text-tcl-print.desktop
+--- kdebase-release-3.4.0/konqueror/quickprint/text-tcl-print.desktop 2005-02-23 00:05:56.000000000 -0500
++++ kdebase-branch-3.4/konqueror/quickprint/text-tcl-print.desktop 2005-03-30 01:47:54.000000000 -0500
+@@ -9,13 +9,16 @@
+ Name[bg]=Печат...
+ Name[bn]=ছাপাও...
+ Name[br]=Moulañ ...
++Name[bs]=Å tampaj...
+ Name[ca]=Imprimeix...
+ Name[cs]=Tisknout...
+ Name[cy]=Argraffu...
+ Name[da]=Udskriv...
++Name[el]=ΕκτÏπωση...
+ Name[eo]=Presu...
+ Name[es]=Imprimir...
+ Name[et]=Trüki...
++Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+ Name[fy]=Ofdrukken...
+@@ -25,6 +28,7 @@
+ Name[hu]=Nyomtatás...
+ Name[is]=Prenta...
+ Name[it]=Stampa...
++Name[ja]=å°åˆ·...
+ Name[mk]=Печати...
+ Name[mt]=Ipprintja...
+ Name[nb]=Skriv ut...
+@@ -35,14 +39,14 @@
+ Name[pt_BR]=Imprimir...
+ Name[ru]=Печать...
+ Name[se]=Čálit ...
++Name[sk]=TlaÄiÅ¥...
+ Name[sl]=Natisni ...
+ Name[sr]=Штампа...
+-Name[sr@Latn]=Штампа...
++Name[sr@Latn]=Å tampa...
+ Name[sv]=Skriv ut...
+ Name[ta]=அசà¯à®šà®Ÿà®¿...
+ Name[tr]=Yazdır...
+ Name[uk]=Друк...
+-Name[xx]=xxPrint...xx
+ Name[zh_CN]=打å°...
+ Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U
+ Icon=filequickprint
+diff -Nru kdebase-release-3.4.0/konqueror/quickprint/text-tex-print.desktop kdebase-branch-3.4/konqueror/quickprint/text-tex-print.desktop
+--- kdebase-release-3.4.0/konqueror/quickprint/text-tex-print.desktop 2005-02-23 00:05:56.000000000 -0500
++++ kdebase-branch-3.4/konqueror/quickprint/text-tex-print.desktop 2005-03-30 01:47:54.000000000 -0500
+@@ -9,13 +9,16 @@
+ Name[bg]=Печат...
+ Name[bn]=ছাপাও...
+ Name[br]=Moulañ ...
++Name[bs]=Å tampaj...
+ Name[ca]=Imprimeix...
+ Name[cs]=Tisknout...
+ Name[cy]=Argraffu...
+ Name[da]=Udskriv...
++Name[el]=ΕκτÏπωση...
+ Name[eo]=Presu...
+ Name[es]=Imprimir...
+ Name[et]=Trüki...
++Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+ Name[fy]=Ofdrukken...
+@@ -25,6 +28,7 @@
+ Name[hu]=Nyomtatás...
+ Name[is]=Prenta...
+ Name[it]=Stampa...
++Name[ja]=å°åˆ·...
+ Name[mk]=Печати...
+ Name[mt]=Ipprintja...
+ Name[nb]=Skriv ut...
+@@ -35,14 +39,14 @@
+ Name[pt_BR]=Imprimir...
+ Name[ru]=Печать...
+ Name[se]=Čálit ...
++Name[sk]=TlaÄiÅ¥...
+ Name[sl]=Natisni ...
+ Name[sr]=Штампа...
+-Name[sr@Latn]=Штампа...
++Name[sr@Latn]=Å tampa...
+ Name[sv]=Skriv ut...
+ Name[ta]=அசà¯à®šà®Ÿà®¿...
+ Name[tr]=Yazdır...
+ Name[uk]=Друк...
+-Name[xx]=xxPrint...xx
+ Name[zh_CN]=打å°...
+ Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U
+ Icon=filequickprint
+diff -Nru kdebase-release-3.4.0/konqueror/quickprint/text-xml-print.desktop kdebase-branch-3.4/konqueror/quickprint/text-xml-print.desktop
+--- kdebase-release-3.4.0/konqueror/quickprint/text-xml-print.desktop 2005-02-23 00:05:56.000000000 -0500
++++ kdebase-branch-3.4/konqueror/quickprint/text-xml-print.desktop 2005-03-30 01:47:54.000000000 -0500
+@@ -9,13 +9,16 @@
+ Name[bg]=Печат...
+ Name[bn]=ছাপাও...
+ Name[br]=Moulañ ...
++Name[bs]=Å tampaj...
+ Name[ca]=Imprimeix...
+ Name[cs]=Tisknout...
+ Name[cy]=Argraffu...
+ Name[da]=Udskriv...
++Name[el]=ΕκτÏπωση...
+ Name[eo]=Presu...
+ Name[es]=Imprimir...
+ Name[et]=Trüki...
++Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+ Name[fy]=Ofdrukken...
+@@ -25,6 +28,7 @@
+ Name[hu]=Nyomtatás...
+ Name[is]=Prenta...
+ Name[it]=Stampa...
++Name[ja]=å°åˆ·...
+ Name[mk]=Печати...
+ Name[mt]=Ipprintja...
+ Name[nb]=Skriv ut...
+@@ -35,14 +39,14 @@
+ Name[pt_BR]=Imprimir...
+ Name[ru]=Печать...
+ Name[se]=Čálit ...
++Name[sk]=TlaÄiÅ¥...
+ Name[sl]=Natisni ...
+ Name[sr]=Штампа...
+-Name[sr@Latn]=Штампа...
++Name[sr@Latn]=Å tampa...
+ Name[sv]=Skriv ut...
+ Name[ta]=அசà¯à®šà®Ÿà®¿...
+ Name[tr]=Yazdır...
+ Name[uk]=Друк...
+-Name[xx]=xxPrint...xx
+ Name[zh_CN]=打å°...
+ Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U
+ Icon=filequickprint
+diff -Nru kdebase-release-3.4.0/konqueror/quickprint/text-xslt-print.desktop kdebase-branch-3.4/konqueror/quickprint/text-xslt-print.desktop
+--- kdebase-release-3.4.0/konqueror/quickprint/text-xslt-print.desktop 2005-02-23 00:05:56.000000000 -0500
++++ kdebase-branch-3.4/konqueror/quickprint/text-xslt-print.desktop 2005-03-30 01:47:54.000000000 -0500
+@@ -9,13 +9,16 @@
+ Name[bg]=Печат...
+ Name[bn]=ছাপাও...
+ Name[br]=Moulañ ...
++Name[bs]=Å tampaj...
+ Name[ca]=Imprimeix...
+ Name[cs]=Tisknout...
+ Name[cy]=Argraffu...
+ Name[da]=Udskriv...
++Name[el]=ΕκτÏπωση...
+ Name[eo]=Presu...
+ Name[es]=Imprimir...
+ Name[et]=Trüki...
++Name[eu]=Inprimatu...
+ Name[fi]=Tulosta...
+ Name[fr]=Imprimer...
+ Name[fy]=Ofdrukken...
+@@ -25,6 +28,7 @@
+ Name[hu]=Nyomtatás...
+ Name[is]=Prenta...
+ Name[it]=Stampa...
++Name[ja]=å°åˆ·...
+ Name[mk]=Печати...
+ Name[mt]=Ipprintja...
+ Name[nb]=Skriv ut...
+@@ -35,14 +39,14 @@
+ Name[pt_BR]=Imprimir...
+ Name[ru]=Печать...
+ Name[se]=Čálit ...
++Name[sk]=TlaÄiÅ¥...
+ Name[sl]=Natisni ...
+ Name[sr]=Штампа...
+-Name[sr@Latn]=Штампа...
++Name[sr@Latn]=Å tampa...
+ Name[sv]=Skriv ut...
+ Name[ta]=அசà¯à®šà®Ÿà®¿...
+ Name[tr]=Yazdır...
+ Name[uk]=Друк...
+-Name[xx]=xxPrint...xx
+ Name[zh_CN]=打å°...
+ Exec=kprinter -t %n --caption %n --icon %i --miniicon %m %U
+ Icon=filequickprint
+diff -Nru kdebase-release-3.4.0/konqueror/shellcmdplugin/kshellcmdexecutor.cpp kdebase-branch-3.4/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
+--- kdebase-release-3.4.0/konqueror/shellcmdplugin/kshellcmdexecutor.cpp 2003-11-02 08:42:04.000000000 -0500
++++ kdebase-branch-3.4/konqueror/shellcmdplugin/kshellcmdexecutor.cpp 2005-03-27 21:55:18.000000000 -0500
+@@ -70,8 +70,8 @@
+
+ QCStringList args;
+ args+="-c";
+- args+=m_command.latin1();
+- //kdDebug()<<"------- executing: "<<m_command.latin1()<<endl;
++ args+=m_command.local8Bit();
++ //kdDebug()<<"------- executing: "<<m_command.local8Bit()<<endl;
+
+ QCString shell( getenv("SHELL") );
+ if (shell.isEmpty())
+@@ -108,7 +108,7 @@
+ {
+ //kdDebug()<<"***********************\n"<<buffer<<"###################\n"<<endl;
+ buffer[bytesRead]='\0';
+- this->append(QString(buffer));
++ this->append(QString::fromLocal8Bit(buffer));
+ setTextFormat(PlainText);
+ };
+ }
+@@ -121,7 +121,7 @@
+ i18n( "Input Required:" ), QString::null, &ok, this );
+ if ( ok )
+ {
+- QCString input=str.latin1();
++ QCString input=str.local8Bit();
+ ::write(m_shellProcess->fd(),input,input.length());
+ ::write(m_shellProcess->fd(),"\n",1);
+ }
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/konq_sidebartng.desktop kdebase-branch-3.4/konqueror/sidebar/konq_sidebartng.desktop
+--- kdebase-release-3.4.0/konqueror/sidebar/konq_sidebartng.desktop 2005-02-04 23:15:37.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/konq_sidebartng.desktop 2005-03-07 09:16:05.000000000 -0500
+@@ -66,7 +66,6 @@
+ Name[vi]=Khung Navigation
+ Name[wa]=Panea d'Â naiviaedje
+ Name[xh]=Iqela lenjongo Yolawulo
+-Name[xx]=xxNavigation Panelxx
+ Name[zh_CN]=å¯¼èˆªé¢æ¿
+ Name[zh_TW]=å°Žè¦½é¢æ¿
+ Name[zu]=Iwindi lemininingwane Lokuzula
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/test/test.desktop kdebase-branch-3.4/konqueror/sidebar/test/test.desktop
+--- kdebase-release-3.4.0/konqueror/sidebar/test/test.desktop 2005-02-04 23:15:38.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/test/test.desktop 2005-03-07 09:16:05.000000000 -0500
+@@ -52,7 +52,6 @@
+ Name[vi]=Thá»
+ Name[wa]=Sayî
+ Name[xh]=Uvavanyo
+-Name[xx]=xxTestxx
+ Name[zh_CN]=测试
+ Name[zh_TW]=測試
+ Name[zu]=Isivivinyo
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/trees/history_module/kcmhistory.desktop kdebase-branch-3.4/konqueror/sidebar/trees/history_module/kcmhistory.desktop
+--- kdebase-release-3.4.0/konqueror/sidebar/trees/history_module/kcmhistory.desktop 2005-02-23 00:05:57.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/trees/history_module/kcmhistory.desktop 2005-03-22 12:38:18.000000000 -0500
+@@ -36,7 +36,7 @@
+ Name[hr]=Traka s poviješću
+ Name[hu]=Napló-oldalsáv
+ Name[is]=Sögu hliðarslá
+-Name[it]=Barra laterale cronologia
++Name[it]=Barra laterale cronologia
+ Name[ja]=å±¥æ´ã‚µã‚¤ãƒ‰ãƒãƒ¼
+ Name[lo]=ປະວັດàºàº²àº™à»ƒà»àºŠà»‰àº‡àº²àº™
+ Name[lt]=Istorijos šoninė juosta
+@@ -70,7 +70,6 @@
+ Name[vi]=Bảng lịch sá»
+ Name[wa]=Bår di costé di l' istwere
+ Name[xh]=Ibar esecaleni Yembali
+-Name[xx]=xxHistory Sidebarxx
+ Name[zh_CN]=历å²ä¾§è¾¹æ
+ Name[zh_TW]=æ·å²ç´€éŒ„邊列
+ Name[zu]=Umlando webha yaseceleni
+@@ -135,7 +134,6 @@
+ Comment[ven]=Dzudzanyani bara ya lurumbu lwa divhazwakale
+ Comment[vi]=Cấu hình bảng lịch sá»
+ Comment[xh]=Qwalasela imbali ye bar yasecaleni
+-Comment[xx]=xxConfigure the history sidebarxx
+ Comment[zh_CN]=é…置任务侧边æ
+ Comment[zh_TW]=è¨å®šæ·å²ç´€éŒ„邊列
+ Comment[zu]=Hlanganisela ibha yaseceleni yomlando
+@@ -183,7 +181,7 @@
+ Keywords[sk]=história,vypršanie
+ Keywords[sl]=zgodovina,potek,poteÄe
+ Keywords[sr]=history,expire,иÑторијат,иÑтицање
+-Keywords[sr@Latn]=history,expire,istorija,isticanje
++Keywords[sr@Latn]=history,expire,istorijat,isticanje
+ Keywords[sv]=historik,utgå
+ Keywords[ta]=வரலாறà¯,à®®à¯à®Ÿà®¿à®¨à¯à®¤à®¤à¯
+ Keywords[th]=ประวัติà¸à¸²à¸£à¹ƒà¸Šà¹‰,หมดà¸à¸²à¸¢à¸¸
+@@ -194,7 +192,6 @@
+ Keywords[vi]=lịch sá»,hết hạn
+ Keywords[wa]=istwere,espirer,espiraedje
+ Keywords[xh]=imbali,ephelelwa lixesha
+-Keywords[xx]=xxhistory,expirexx
+ Keywords[zh_CN]=history,expire,历å²,过期
+ Keywords[zh_TW]=history,expire,æ·å²ç´€éŒ„,éŽæœŸ
+ Keywords[zu]=umlando,ukuphelelwa isikhathi
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/trees/init/bookmarks.desktop kdebase-branch-3.4/konqueror/sidebar/trees/init/bookmarks.desktop
+--- kdebase-release-3.4.0/konqueror/sidebar/trees/init/bookmarks.desktop 2005-02-04 23:15:38.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/trees/init/bookmarks.desktop 2005-03-07 09:16:06.000000000 -0500
+@@ -70,7 +70,6 @@
+ Name[vi]=Äánh dấu trang
+ Name[wa]=Rimåkes
+ Name[xh]=Amanqaku eencwadi
+-Name[xx]=xxBookmarksxx
+ Name[zh_CN]=书ç¾
+ Name[zh_TW]=書籤
+ Name[zu]=Omaka bencwadi
+@@ -137,7 +136,6 @@
+ Comment[ven]=Hoyu ndi mutevhe wa tswayo dza bugu, uitele u dzhene ngau tavhanya
+ Comment[vi]=Äây là danh sách tất cả các trang đánh dấu cá»§a bạn, giúp cho truy cáºp nhanh hÆ¡n
+ Comment[xh]=Olu luluhlu lwamanqaku encwadi yakho, yonikezelo olukhawulezayo
+-Comment[xx]=xxThis is the list of your bookmarks, for a faster accessxx
+ Comment[zh_CN]=这是您的书ç¾åˆ—è¡¨ï¼Œä»¥ä¾¿ä½¿å¾—è®¿é—®æ›´åŠ æ–¹ä¾¿
+ Comment[zh_TW]=快速å˜å–網站的書籤列表
+ Comment[zu]=Lolu uhlu lomaka bakho bencwadi,ukuze ungene ngokushesha
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/trees/init/bookmarks_module.desktop kdebase-branch-3.4/konqueror/sidebar/trees/init/bookmarks_module.desktop
+--- kdebase-release-3.4.0/konqueror/sidebar/trees/init/bookmarks_module.desktop 2005-02-04 23:15:38.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/trees/init/bookmarks_module.desktop 2005-03-07 09:16:06.000000000 -0500
+@@ -70,7 +70,6 @@
+ Name[vi]=Äánh dấu trang
+ Name[wa]=Rimåkes
+ Name[xh]=Amanqaku eencwadi
+-Name[xx]=xxBookmarksxx
+ Name[zh_CN]=书ç¾
+ Name[zh_TW]=書籤
+ Name[zu]=Omaka bencwadi
+@@ -137,7 +136,6 @@
+ Comment[ven]=Hoyu ndi mutevhe wa tswayo dza bugu, uitele u dzhene ngau tavhanya
+ Comment[vi]=Äây là danh sách tất cả các trang đánh dấu cá»§a bạn, giúp cho truy cáºp nhanh hÆ¡n
+ Comment[xh]=Olu luluhlu lwamanqaku encwadi yakho, yonikezelo olukhawulezayo
+-Comment[xx]=xxThis is the list of your bookmarks, for a faster accessxx
+ Comment[zh_CN]=这是您的书ç¾åˆ—è¡¨ï¼Œä»¥ä¾¿ä½¿å¾—è®¿é—®æ›´åŠ æ–¹ä¾¿
+ Comment[zh_TW]=快速å˜å–網站的書籤列表
+ Comment[zu]=Lolu uhlu lomaka bakho bencwadi,ukuze ungene ngokushesha
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/trees/init/dirtree_module.desktop kdebase-branch-3.4/konqueror/sidebar/trees/init/dirtree_module.desktop
+--- kdebase-release-3.4.0/konqueror/sidebar/trees/init/dirtree_module.desktop 2005-02-04 23:15:38.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/trees/init/dirtree_module.desktop 2005-03-07 09:16:06.000000000 -0500
+@@ -61,7 +61,6 @@
+ Name[uz]=Жилд
+ Name[vi]=Thư mục
+ Name[wa]=Ridant
+-Name[xx]=xxFolderxx
+ Name[zh_CN]=文件夹
+ Open=false
+
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/trees/init/history.desktop kdebase-branch-3.4/konqueror/sidebar/trees/init/history.desktop
+--- kdebase-release-3.4.0/konqueror/sidebar/trees/init/history.desktop 2005-02-04 23:15:38.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/trees/init/history.desktop 2005-03-07 09:16:06.000000000 -0500
+@@ -69,7 +69,6 @@
+ Name[vi]=Lịch sá»
+ Name[wa]=Istwere
+ Name[xh]=Imbali
+-Name[xx]=xxHistoryxx
+ Name[zh_CN]=历å²
+ Name[zh_TW]=æ·å²ç´€éŒ„
+ Name[zu]=Umlando
+@@ -133,7 +132,6 @@
+ Comment[ven]=Heyi ndi divhazwakale ya URL no i dalelaho zwazwino. Ni nga i lugisa nga ndila dzo fhambananho.
+ Comment[vi]=Äây là danh sách các URL bạn đã xem gần đâỵ Bá»n có thể sắp xếp lại chúng theo và i cách khác nhau
+ Comment[xh]=Le yimbali yee URL obusandukuzindwendwela. Ungazibeka ngendlela ezininzi.
+-Comment[xx]=xxThis is the history of the URLs you have recently visited. You can sort them in many ways.xx
+ Comment[zh_TW]=這是您最近訪å•çš„ URL çš„æ·å²ç´€éŒ„。您å¯ä»¥å°‡å®ƒå€‘ä»¥å¤šç¨®æ–¹å¼æŽ’åºã€‚
+ Comment[zu]=Lo umlando wama-URL osanda kuwavakashela. Ungawahlela ngezindlela eziningi.
+ Open=false
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/trees/init/history_module.desktop kdebase-branch-3.4/konqueror/sidebar/trees/init/history_module.desktop
+--- kdebase-release-3.4.0/konqueror/sidebar/trees/init/history_module.desktop 2005-02-04 23:15:38.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/trees/init/history_module.desktop 2005-03-07 09:16:06.000000000 -0500
+@@ -69,7 +69,6 @@
+ Name[vi]=Lịch sá»
+ Name[wa]=Istwere
+ Name[xh]=Imbali
+-Name[xx]=xxHistoryxx
+ Name[zh_CN]=历å²
+ Name[zh_TW]=æ·å²ç´€éŒ„
+ Name[zu]=Umlando
+@@ -133,7 +132,6 @@
+ Comment[ven]=Heyi ndi divhazwakale ya URL no i dalelaho zwazwino. Ni nga i lugisa nga ndila dzo fhambananho.
+ Comment[vi]=Äây là danh sách các URL bạn đã xem gần đâỵ Bá»n có thể sắp xếp lại chúng theo và i cách khác nhau
+ Comment[xh]=Le yimbali yee URL obusandukuzindwendwela. Ungazibeka ngendlela ezininzi.
+-Comment[xx]=xxThis is the history of the URLs you have recently visited. You can sort them in many ways.xx
+ Comment[zh_TW]=這是您最近訪å•çš„ URL çš„æ·å²ç´€éŒ„。您å¯ä»¥å°‡å®ƒå€‘ä»¥å¤šç¨®æ–¹å¼æŽ’åºã€‚
+ Comment[zu]=Lo umlando wama-URL osanda kuwavakashela. Ungawahlela ngezindlela eziningi.
+ Open=false
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/trees/init/home.desktop kdebase-branch-3.4/konqueror/sidebar/trees/init/home.desktop
+--- kdebase-release-3.4.0/konqueror/sidebar/trees/init/home.desktop 2005-02-04 23:15:38.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/trees/init/home.desktop 2005-03-10 11:05:14.000000000 -0500
+@@ -4,6 +4,7 @@
+ URL=file:$HOME
+ Icon=folder_home
+ Name=Home Folder
++Name[af]=Tuis Gids
+ Name[ar]=مجلدي
+ Name[az]=Ev QovluÄŸu
+ Name[be]=ХатнÑÑ Ñ‚Ñчка
+@@ -61,7 +62,6 @@
+ Name[uz]=Уй жилди
+ Name[vi]=Thư mục nhÃ
+ Name[wa]=Ridant måjhon
+-Name[xx]=xxHome Folderxx
+ Name[zh_CN]=主文件夹
+ Comment=This folder contains your personal files
+ Comment[af]=Hierdie kabinet bevat jou persoonlike lêers
+@@ -128,7 +128,6 @@
+ Comment[vi]=Thư mục nà y chứa các file của riêng bạn
+ Comment[wa]=Ci ridant chal a les fitchîs et dnêyes da vosse
+ Comment[xh]=Le ncwadi eneenkcukacha iqulathe iifayile zobuntu bakho
+-Comment[xx]=xxThis folder contains your personal filesxx
+ Comment[zh_CN]=æ¤æ–‡ä»¶å¤¹åŒ…å«äº†æ‚¨çš„个人文件
+ Comment[zh_TW]=é€™å€‹è³‡æ–™å¤¾åŒ…å«æœ‰æ‚¨çš„個人文件
+ Comment[zu]=Lesi sigcini samafayela siqukethe amafayela akho siqu
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/trees/init/remote/.directory kdebase-branch-3.4/konqueror/sidebar/trees/init/remote/.directory
+--- kdebase-release-3.4.0/konqueror/sidebar/trees/init/remote/.directory 2005-02-04 23:15:39.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/trees/init/remote/.directory 2005-03-07 09:16:07.000000000 -0500
+@@ -67,7 +67,6 @@
+ Name[vi]=Mạng
+ Name[wa]=Rantoele
+ Name[xh]=Umsebenzi womnatha
+-Name[xx]=xxNetworkxx
+ Name[zh_CN]=网络
+ Name[zh_TW]=網路
+ Name[zu]=Uxhumano olusakazekile
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/trees/init/remote/ftp/.directory kdebase-branch-3.4/konqueror/sidebar/trees/init/remote/ftp/.directory
+--- kdebase-release-3.4.0/konqueror/sidebar/trees/init/remote/ftp/.directory 2005-02-04 23:15:39.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/trees/init/remote/ftp/.directory 2005-03-10 11:05:14.000000000 -0500
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Name=FTP Archives
+-Name[af]=Ftp Argiewe
++Name[af]=FTP Argiewe
+ Name[ar]=Ø£Ø±Ø´ÙŠÙØ§Øª FTP
+ Name[az]=FTP Arxivləri
+ Name[be]=FTP архівы
+@@ -68,7 +68,6 @@
+ Name[vi]=Luư trữ FTP
+ Name[wa]=Ã…rtchives FTP
+ Name[xh]=Ushicilelo lukawonke-wonke kunye namanye amaxwebhu embali e FTP
+-Name[xx]=xxFTP Archivesxx
+ Name[zh_CN]=FTP å½’æ¡£
+ Name[zh_TW]=FTP 檔案館
+ Name[zu]=Imiqulu ye-FTP
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/trees/init/remote/ftp/kde_ftp.desktop kdebase-branch-3.4/konqueror/sidebar/trees/init/remote/ftp/kde_ftp.desktop
+--- kdebase-release-3.4.0/konqueror/sidebar/trees/init/remote/ftp/kde_ftp.desktop 2005-02-04 23:15:39.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/trees/init/remote/ftp/kde_ftp.desktop 2005-03-07 09:16:07.000000000 -0500
+@@ -71,7 +71,6 @@
+ Name[vi]=FTP chÃnh thức cá»§a KDE
+ Name[wa]=Site FTP oficir di KDE
+ Name[xh]=KDE Osemthethweni FTP
+-Name[xx]=xxKDE Official FTPxx
+ Name[zh_CN]=KDE 官方 FTP
+ Name[zh_TW]=KDE 官方 FTP 站
+ Name[zu]=I-FTP esemthethweni ye-KDE
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/trees/init/remote/web/.directory kdebase-branch-3.4/konqueror/sidebar/trees/init/remote/web/.directory
+--- kdebase-release-3.4.0/konqueror/sidebar/trees/init/remote/web/.directory 2005-02-04 23:15:39.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/trees/init/remote/web/.directory 2005-03-07 09:16:07.000000000 -0500
+@@ -65,7 +65,6 @@
+ Name[ven]=Webu saiti
+ Name[wa]=Waibes
+ Name[xh]=Amanxuwa e Web
+-Name[xx]=xxWeb Sitesxx
+ Name[zh_CN]=网站
+ Name[zh_TW]=網站
+ Name[zu]=Iziza ze-Web
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/trees/init/remote/web/apps_web.desktop kdebase-branch-3.4/konqueror/sidebar/trees/init/remote/web/apps_web.desktop
+--- kdebase-release-3.4.0/konqueror/sidebar/trees/init/remote/web/apps_web.desktop 2005-02-04 23:15:40.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/trees/init/remote/web/apps_web.desktop 2005-03-07 09:16:07.000000000 -0500
+@@ -69,7 +69,6 @@
+ Name[vi]=Chương trình KDE
+ Name[wa]=Programes KDE
+ Name[xh]=Izicelo ze KDE
+-Name[xx]=xxKDE Applicationsxx
+ Name[zh_CN]=KDE 应用程åº
+ Name[zh_TW]=KDE 應用程å¼
+ Name[zu]=Abayaleli be-KDE
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/trees/init/remote/web/dot_web.desktop kdebase-branch-3.4/konqueror/sidebar/trees/init/remote/web/dot_web.desktop
+--- kdebase-release-3.4.0/konqueror/sidebar/trees/init/remote/web/dot_web.desktop 2005-02-04 23:15:40.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/trees/init/remote/web/dot_web.desktop 2005-03-07 09:16:07.000000000 -0500
+@@ -68,7 +68,6 @@
+ Name[vi]=Tin tức KDE
+ Name[wa]=Noveles di KDE
+ Name[xh]=Iindaba ze KDE
+-Name[xx]=xxKDE Newsxx
+ Name[zh_CN]=KDE æ–°é—»
+ Name[zh_TW]=KDE æ–°èž
+ Name[zu]=Izindaba ze-KDE
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/trees/init/remote/web/kde_web.desktop kdebase-branch-3.4/konqueror/sidebar/trees/init/remote/web/kde_web.desktop
+--- kdebase-release-3.4.0/konqueror/sidebar/trees/init/remote/web/kde_web.desktop 2005-02-23 00:05:57.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/trees/init/remote/web/kde_web.desktop 2005-03-10 11:05:15.000000000 -0500
+@@ -3,7 +3,7 @@
+ Type=Link
+ URL=http://www.kde.org
+ Name=KDE Home Page
+-Name[af]=Kde Huis Bladsy
++Name[af]=KDE Tuisblad
+ Name[ar]=موقع كيدي
+ Name[az]=KDE Ana Səhifəsi
+ Name[be]=ХатнÑÑ Ñтаронка KDE
+@@ -58,7 +58,7 @@
+ Name[sk]=Domovská stránka KDE
+ Name[sl]=DomaÄa stran KDE
+ Name[sr]=Матична Ñтрана KDE-а
+-Name[sr@Latn]=Glavna KDE strana
++Name[sr@Latn]=MatiÄna strana KDE-a
+ Name[sv]=KDE:s webbplats
+ Name[ta]=KDE வீடà¯à®Ÿà¯à®ªà¯ பகà¯à®•à®®à¯
+ Name[tg]=Сафҳаи хонагии KDE
+@@ -70,7 +70,6 @@
+ Name[vi]=Trang website cá»§a KDE
+ Name[wa]=Pådje måjhon di KDE
+ Name[xh]=Iphepha Lasekhaya le KDE
+-Name[xx]=xxKDE Home Pagexx
+ Name[zh_CN]=KDE 主页
+ Name[zh_TW]=KDE 首é
+ Name[zu]=Ikhasi lasekhaya le-KDE
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/trees/init/remote/web/look_web.desktop kdebase-branch-3.4/konqueror/sidebar/trees/init/remote/web/look_web.desktop
+--- kdebase-release-3.4.0/konqueror/sidebar/trees/init/remote/web/look_web.desktop 2005-02-23 00:05:57.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/trees/init/remote/web/look_web.desktop 2005-03-22 12:38:18.000000000 -0500
+@@ -4,9 +4,11 @@
+ URL=http://themes.kde.org/
+ Name=KDE Eye Candy
+ Name[bn]=কে.ডি.ই. আই কà§à¦¯à¦¾à¦¨à§à¦¡à¦¿
++Name[bs]=KDE ukrasi
+ Name[ca]=Decoració KDE
+ Name[cs]=Pastva pro oÄi
+ Name[da]=KDE øjenfryd
++Name[de]=KDE Optik
+ Name[es]=Embellecimiento KDE
+ Name[et]=KDE silmarõõm
+ Name[fi]=KDE:n karamellisilmä
+@@ -22,12 +24,12 @@
+ Name[pt]=Gráficos Bonitos do KDE
+ Name[pt_BR]=Candy Eye do KDE
+ Name[se]=KDE-Äalbmenjálgát
++Name[sk]=Vylepšenie vzhľadu KDE
+ Name[sl]=BombonÄki KDE
+ Name[sr]=KDE Ñлаткиши
+-Name[sr@Latn]=KDE Ñлаткиши
++Name[sr@Latn]=KDE slatkiši
+ Name[sv]=KDE-ögongodis
+ Name[ta]=கேடியி ஠காணà¯à®Ÿà®¿
+-Name[xx]=xxKDE Eye Candyxx
+ Name[zh_CN]=KDE 眼ç¦
+ Icon=www
+ Open=false
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/trees/init/remote.desktop kdebase-branch-3.4/konqueror/sidebar/trees/init/remote.desktop
+--- kdebase-release-3.4.0/konqueror/sidebar/trees/init/remote.desktop 2005-02-04 23:15:38.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/trees/init/remote.desktop 2005-03-07 09:16:06.000000000 -0500
+@@ -68,7 +68,6 @@
+ Name[vi]=Mạng
+ Name[wa]=Rantoele
+ Name[xh]=Umsebenzi womnatha
+-Name[xx]=xxNetworkxx
+ Name[zh_CN]=网络
+ Name[zh_TW]=網路
+ Name[zu]=Uxhumano olusakazekile
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/trees/init/root.desktop kdebase-branch-3.4/konqueror/sidebar/trees/init/root.desktop
+--- kdebase-release-3.4.0/konqueror/sidebar/trees/init/root.desktop 2005-02-23 00:05:57.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/trees/init/root.desktop 2005-03-10 11:05:14.000000000 -0500
+@@ -4,6 +4,7 @@
+ URL=file:/
+ Icon=folder_red
+ Name=Root Folder
++Name[af]=Root Gids
+ Name[ar]=مجلد الجذر
+ Name[az]=Ali İstifadəçi Qovluğu
+ Name[be]=КарÑÐ½Ð½Ð°Ñ Ñ‚Ñчка
+@@ -51,7 +52,7 @@
+ Name[sk]=Koreňový prieÄinok
+ Name[sl]=Korenska mapa
+ Name[sr]=Корени директоријум
+-Name[sr@Latn]=Root direktorijum
++Name[sr@Latn]=Koreni direktorijum
+ Name[sv]=Rotkatalog
+ Name[ta]=ஆரமà¯à®ª அடைவà¯
+ Name[tg]=ФеҳриÑти реша
+@@ -61,7 +62,6 @@
+ Name[uz]=Туб жилди
+ Name[vi]=Thư mục của Root
+ Name[wa]=Ridant raecene
+-Name[xx]=xxRoot Folderxx
+ Name[zh_CN]=æ ¹æ–‡ä»¶å¤¹
+ Comment=This is the root of the filesystem
+ Comment[af]=Hierdie is die root van die lêersisteem
+@@ -128,7 +128,6 @@
+ Comment[vi]=Äây là gốc cá»§a hệ thống tệp tin
+ Comment[wa]=Cichal est li ridant raecene do sistinme di fitchîs
+ Comment[xh]=Le yingcambu yendlela yefayile
+-Comment[xx]=xxThis is the root of the filesystemxx
+ Comment[zh_CN]=è¿™æ˜¯æ–‡ä»¶ç³»ç»Ÿçš„æ ¹
+ Comment[zh_TW]=é€™æ˜¯æª”æ¡ˆç³»çµ±çš„æ ¹ç›®éŒ„
+ Comment[zu]=Le yimpande yesistimu yamafayela
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/trees/init/services/.directory kdebase-branch-3.4/konqueror/sidebar/trees/init/services/.directory
+--- kdebase-release-3.4.0/konqueror/sidebar/trees/init/services/.directory 2005-02-09 23:40:14.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/trees/init/services/.directory 2005-03-07 09:16:08.000000000 -0500
+@@ -65,7 +65,6 @@
+ Name[vi]=Các dịch vụ
+ Name[wa]=Siervices
+ Name[xh]=Iinkonzo
+-Name[xx]=xxServicesxx
+ Name[zh_CN]=æœåŠ¡
+ Name[zh_TW]=æœå‹™
+ Name[zu]=Imisebenzi
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/trees/init/services/applications.desktop kdebase-branch-3.4/konqueror/sidebar/trees/init/services/applications.desktop
+--- kdebase-release-3.4.0/konqueror/sidebar/trees/init/services/applications.desktop 2005-02-23 00:05:58.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/trees/init/services/applications.desktop 2005-03-30 01:47:55.000000000 -0500
+@@ -8,14 +8,17 @@
+ Name[bg]=Програми
+ Name[bn]=অà§à¦¯à¦¾à¦ªà¦²à¦¿à¦•েশন
+ Name[br]=Arloadoù
++Name[bs]=Programi
+ Name[ca]=Aplicacions
+ Name[cs]=Aplikace
+ Name[cy]=Cymhwysiadau
+ Name[da]=Programmer
+ Name[de]=Programme
++Name[el]=ΕφαÏμογÎÏ‚
+ Name[eo]=Aplikaĵoj
+ Name[es]=Aplicaciones
+ Name[et]=Rakendused
++Name[eu]=Aplikazioak
+ Name[fi]=Sovellukset
+ Name[fy]=Programma's
+ Name[ga]=Feidhmchláir
+@@ -24,6 +27,7 @@
+ Name[hu]=Alkalmazások
+ Name[is]=Forrit
+ Name[it]=Applicazioni
++Name[ja]=アプリケーション
+ Name[lt]=Programos
+ Name[mk]=Ðпликации
+ Name[mt]=Programmi KDE
+@@ -35,15 +39,15 @@
+ Name[pt_BR]=Aplicativos
+ Name[ru]=ПриложениÑ
+ Name[se]=Prográmmat
++Name[sk]=Aplikácie
+ Name[sl]=Programi
+ Name[sr]=Програми
+-Name[sr@Latn]=Програми
++Name[sr@Latn]=Programi
+ Name[sv]=Program
+ Name[ta]=பயனà¯à®ªà®¾à®Ÿà¯à®•ளà¯
+ Name[tr]=Uygulamalar
+ Name[uk]=Програми
+ Name[wa]=Programes
+-Name[xx]=xxApplicationsxx
+ Name[zh_CN]=应用程åº
+ Open=false
+ X-KDE-TreeModule=Directory
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/trees/init/services/audiocd.desktop kdebase-branch-3.4/konqueror/sidebar/trees/init/services/audiocd.desktop
+--- kdebase-release-3.4.0/konqueror/sidebar/trees/init/services/audiocd.desktop 2005-02-23 00:05:58.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/trees/init/services/audiocd.desktop 2005-03-07 09:16:08.000000000 -0500
+@@ -56,7 +56,7 @@
+ Name[sk]=PrehliadaÄ zvukových CD
+ Name[sl]=Avdio CD brskalnik
+ Name[sr]=Прегледач аудио CD-ова
+-Name[sr@Latn]=Audio CD pretraživaÄ
++Name[sr@Latn]=PregledaÄ audio CD-ova
+ Name[sv]=Bläddrare för ljud-cd
+ Name[ta]=கேடà¯à®ªà¯Šà®²à®¿ கà¯à®±à¯à®¨à¯à®¤à®•ட௠உலாவி
+ Name[tg]=ТафÑири Ðудио CD
+@@ -68,7 +68,6 @@
+ Name[vi]=Duyệt Audio CD
+ Name[wa]=Foyteuse des plakes lazer odio
+ Name[xh]=Umkhangeli zincwadi we CD Audio
+-Name[xx]=xxAudio CD Browserxx
+ Name[zh_CN]=音频 CD æµè§ˆå™¨
+ Name[zh_TW]=音樂 CD ç€è¦½å™¨
+ Name[zu]=Umcingi wama-CD ozwakalayo
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/trees/init/services/media.desktop kdebase-branch-3.4/konqueror/sidebar/trees/init/services/media.desktop
+--- kdebase-release-3.4.0/konqueror/sidebar/trees/init/services/media.desktop 2005-02-23 00:05:58.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/trees/init/services/media.desktop 2005-03-30 01:47:55.000000000 -0500
+@@ -6,13 +6,16 @@
+ Name=Storage Media
+ Name[bg]=СъхранÑващи уÑтройÑтва
+ Name[bn]=সà§à¦Ÿà§‹à¦°à§‡à¦œ মিডিয়া
++Name[bs]=Uređaji za smještaj podataka
+ Name[ca]=Suports d'emmagatzematge
+ Name[cs]=Úložná zaÅ™ÃzenÃ
+ Name[da]=Opbevaringsmedie
+ Name[de]=Speichermedien
++Name[el]=ΣυσκευÎÏ‚ αποθήκευσης
+ Name[eo]=Konservejo
+ Name[es]=Dispositivos de almacenamiento
+ Name[et]=Andmekandjad
++Name[eu]=Almazenamendua
+ Name[fi]=Tallennusmedia
+ Name[fr]=Support de stockage
+ Name[fy]=Opslachapparaten
+@@ -21,6 +24,7 @@
+ Name[hu]=Tárolóeszköz
+ Name[is]=Geymslumiðill
+ Name[it]=Dispositivi di archiviazione
++Name[ja]=記憶メディア
+ Name[lt]=Informacijos saugojimo įrenginiai
+ Name[nb]=Lagringsenheter
+ Name[nl]=Opslagapparaten
+@@ -30,14 +34,14 @@
+ Name[pt]=Dispositivos de Armazenamento
+ Name[pt_BR]=MÃdia
+ Name[ru]=УÑтройÑтва Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ…
++Name[sk]=Diskové zariadenia
+ Name[sl]=Medij za shranjevanje
+ Name[sr]=Складишни медијуми
+-Name[sr@Latn]=Складишни медијуми
++Name[sr@Latn]=Skladišni medijumi
+ Name[sv]=Lagringsmedia
+ Name[ta]=சேகரிபà¯à®ªà¯ ஊடகமà¯
+ Name[tr]=Depolama Ortamı
+ Name[uk]=ПриÑтрої Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ—
+-Name[xx]=xxStorage Mediaxx
+ Name[zh_CN]=å˜å‚¨ä»‹è´¨
+ Open=false
+ X-KDE-TreeModule=Directory
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/trees/init/services/printsystem.desktop kdebase-branch-3.4/konqueror/sidebar/trees/init/services/printsystem.desktop
+--- kdebase-release-3.4.0/konqueror/sidebar/trees/init/services/printsystem.desktop 2005-02-23 00:05:58.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/trees/init/services/printsystem.desktop 2005-03-07 09:16:08.000000000 -0500
+@@ -54,7 +54,7 @@
+ Name[sk]=PrehliadaÄ tlaÄového systému
+ Name[sl]=Brskalnik po tiskalniškem sistemu
+ Name[sr]=Прегледач ÑиÑтема за штампу
+-Name[sr@Latn]=PretraživaÄ sistema za Å¡tampu
++Name[sr@Latn]=PregledaÄ sistema za Å¡tampu
+ Name[sv]=Bläddrare för utskriftssystem
+ Name[ta]=அசà¯à®šà¯ அமைபà¯à®ªà¯ உலாவி
+ Name[tg]=Чопи тафÑири ÑиÑтема
+@@ -66,7 +66,6 @@
+ Name[vi]=Duyệt hệ thống in
+ Name[wa]=Foyteuse do sistinme d'Â imprimaedje
+ Name[xh]=Shicilela Umkhangeli zincwadi Wendlela
+-Name[xx]=xxPrint System Browserxx
+ Name[zh_CN]=打å°ç³»ç»Ÿæµè§ˆå™¨
+ Name[zh_TW]=列å°ç³»çµ±ç€è¦½å™¨
+ Name[zu]=Umcingi wesistimu yokushicilela
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/trees/init/services/settings.desktop kdebase-branch-3.4/konqueror/sidebar/trees/init/services/settings.desktop
+--- kdebase-release-3.4.0/konqueror/sidebar/trees/init/services/settings.desktop 2005-02-04 23:15:40.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/trees/init/services/settings.desktop 2005-03-26 02:37:43.000000000 -0500
+@@ -4,6 +4,7 @@
+ URL=settings:/
+ Icon=kcontrol
+ Name=Settings
++Name[af]=Instellings
+ Name[ar]=الإعدادات
+ Name[az]=QurÄŸular
+ Name[be]=ÐаÑтройкі
+@@ -23,7 +24,7 @@
+ Name[eu]=Ezarpenak
+ Name[fi]=Asetukset
+ Name[fr]=Configuration
+-Name[fy]=Ynstellingen
++Name[fy]=Ynstellings
+ Name[ga]=Socruithe
+ Name[gl]=Opcións
+ Name[he]=הגדרות
+@@ -63,7 +64,6 @@
+ Name[uz]=МоÑламалар
+ Name[vi]=Thiết láºp
+ Name[wa]=Apontiaedjes
+-Name[xx]=xxSettingsxx
+ Name[zh_CN]=设置
+ Open=false
+ X-KDE-TreeModule=Directory
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/trees/init/services.desktop kdebase-branch-3.4/konqueror/sidebar/trees/init/services.desktop
+--- kdebase-release-3.4.0/konqueror/sidebar/trees/init/services.desktop 2005-02-09 23:40:14.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/trees/init/services.desktop 2005-03-07 09:16:06.000000000 -0500
+@@ -67,7 +67,6 @@
+ Name[vi]=Các dịch vụ
+ Name[wa]=Siervices
+ Name[xh]=Iinkonzo
+-Name[xx]=xxServicesxx
+ Name[zh_CN]=æœåŠ¡
+ Name[zh_TW]=æœå‹™
+ Name[zu]=Imisebenzi
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/trees/init/virtualfolderadd.desktop kdebase-branch-3.4/konqueror/sidebar/trees/init/virtualfolderadd.desktop
+--- kdebase-release-3.4.0/konqueror/sidebar/trees/init/virtualfolderadd.desktop 2005-02-04 23:15:38.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/trees/init/virtualfolderadd.desktop 2005-03-07 09:16:06.000000000 -0500
+@@ -61,7 +61,6 @@
+ Name[uz]=Жилд
+ Name[vi]=Thư mục
+ Name[wa]=Ridant
+-Name[xx]=xxFolderxx
+ Name[zh_CN]=文件夹
+
+ Open=false
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/web_module/webmodule_add.desktop kdebase-branch-3.4/konqueror/sidebar/web_module/webmodule_add.desktop
+--- kdebase-release-3.4.0/konqueror/sidebar/web_module/webmodule_add.desktop 2005-02-21 23:13:06.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/web_module/webmodule_add.desktop 2005-03-22 12:38:19.000000000 -0500
+@@ -30,7 +30,7 @@
+ Name[hr]=Modul za web trake
+ Name[hu]=Webes oldalsáv-modul
+ Name[is]=Vefhliðarstiku eining
+-Name[it]=Modoulo barra laterale web
++Name[it]=Modulo barra laterale web
+ Name[ja]=Webサイドãƒãƒ¼ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«
+ Name[lt]=Šoninės žiniatinklio juostos modulis
+ Name[mk]=Модул - Веб Ñтранична лента
+@@ -59,7 +59,6 @@
+ Name[uk]=Модуль бічної панелі Тенет
+ Name[uz]=Веб ён панели модули
+ Name[vi]=Trình chơi nhạc được sidebar
+-Name[xx]=xxWeb SideBar Modulexx
+ Name[zh_CN]=Web ä¾§è¾¹æ æ¨¡å—
+ Name[zh_TW]=ç¶²é 邊列模組
+ Open=false
+diff -Nru kdebase-release-3.4.0/konqueror/sidebar/web_module/websidebar.desktop kdebase-branch-3.4/konqueror/sidebar/web_module/websidebar.desktop
+--- kdebase-release-3.4.0/konqueror/sidebar/web_module/websidebar.desktop 2005-02-21 23:13:06.000000000 -0500
++++ kdebase-branch-3.4/konqueror/sidebar/web_module/websidebar.desktop 2005-03-22 12:38:19.000000000 -0500
+@@ -30,7 +30,7 @@
+ Name[hr]=Modul za web trake
+ Name[hu]=Webes oldalsáv-modul
+ Name[is]=Vefhliðarstiku eining
+-Name[it]=Modoulo barra laterale web
++Name[it]=Modulo barra laterale web
+ Name[ja]=Webサイドãƒãƒ¼ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«
+ Name[lt]=Šoninės žiniatinklio juostos modulis
+ Name[mk]=Модул - Веб Ñтранична лента
+@@ -59,7 +59,6 @@
+ Name[uk]=Модуль бічної панелі Тенет
+ Name[uz]=Веб ён панели модули
+ Name[vi]=Trình chơi nhạc được sidebar
+-Name[xx]=xxWeb SideBar Modulexx
+ Name[zh_CN]=Web ä¾§è¾¹æ æ¨¡å—
+ Name[zh_TW]=ç¶²é 邊列模組
+ Open=false
+diff -Nru kdebase-release-3.4.0/konsole/eventsrc kdebase-branch-3.4/konsole/eventsrc
+--- kdebase-release-3.4.0/konsole/eventsrc 2005-02-10 23:52:18.000000000 -0500
++++ kdebase-branch-3.4/konsole/eventsrc 2005-03-07 09:16:09.000000000 -0500
+@@ -25,7 +25,6 @@
+ Comment[th]=คà¸à¸™à¹‚ซล K
+ Comment[uz]=КонÑол
+ Comment[wa]=Konsole (terminå di KDE)
+-Comment[xx]=xxKonsolexx
+ Comment[zh_TW]=Konsole 終端機程å¼
+
+ [BellVisible]
+@@ -82,7 +81,6 @@
+ Name[tr]=Görünen oturumda zil
+ Name[uk]=Дзвінок у видимому ÑеанÑÑ–
+ Name[vi]=Chuông trong các session nhìn thấy
+-Name[xx]=xxBell in visible sessionxx
+ Name[zh_TW]=在å¯è¦‹çš„工作階段使用響鈴
+ Comment=Bell emitted within a visible session
+ Comment[ar]=قرع جرس أثناء جلسة مرئية
+@@ -135,7 +133,6 @@
+ Comment[tr]=Görünen oturum ile zil çal
+ Comment[uk]=Пролунав дзвінок у видимому ÑеанÑÑ–
+ Comment[vi]=Chuông phát ra trong một session nhìn thấy
+-Comment[xx]=xxBell emitted within a visible sessionxx
+ Comment[zh_TW]=在å¯è¦‹çš„工作階段使用響鈴
+ default_sound=KDE_Beep.ogg
+ default_presentation=1
+@@ -194,7 +191,6 @@
+ Name[tr]=Görünmeyen oturumda zil
+ Name[uk]=Дзвінок у невидимому ÑеанÑÑ–
+ Name[vi]=Chuông trong các session không nhìn thấy
+-Name[xx]=xxBell in non-visible sessionxx
+ Name[zh_TW]=在ä¸å¯è¦‹çš„工作階段使用響鈴
+ Comment=Bell emitted within a non-visible session
+ Comment[ar]=قرع جرس أثناء جلسة غير مرئية
+@@ -246,7 +242,6 @@
+ Comment[tr]=Görünmeyen oturumda zil
+ Comment[uk]=Пролунав дзвінок у невидимому ÑеанÑÑ–
+ Comment[vi]=Chuông phát ra trong một session không nhìn thấy
+-Comment[xx]=xxBell emitted within a non-visible sessionxx
+ Comment[zh_TW]=在ä¸å¯è¦‹çš„工作階段使用響鈴
+ default_sound=KDE_Beep.ogg
+ default_presentation=16
+@@ -303,7 +298,6 @@
+ Name[tr]=İzlenen oturumda etkinlik
+ Name[uk]=ДіÑльніÑть в контрольованому ÑеанÑÑ–
+ Name[vi]=Các hoạt động trong session được theo dõi
+-Name[xx]=xxActivity in monitored sessionxx
+ Name[zh_TW]=活動於監視ä¸çš„工作階段
+ Comment=Activity detected in a monitored session
+ Comment[ar]=التØÙ‚Ù‚ من نشاط أثناء جلسة يتم مراقبتها
+@@ -353,7 +347,6 @@
+ Comment[tr]=İzlenen oturumda etkinlik var
+ Comment[uk]=Ð’ контрольованому ÑеанÑÑ– зареєÑтровано діÑльніÑть
+ Comment[vi]=Hoạt động phát hiện ra của một session bị theo dõi
+-Comment[xx]=xxActivity detected in a monitored sessionxx
+ Comment[zh_TW]=æ´»å‹•è¢«åµæ¸¬åˆ°æ–¼ç›£è¦–ä¸çš„工作階段
+ default_presentation=16
+
+@@ -409,7 +402,6 @@
+ Name[tr]=İzlenen oturumda sessizlik
+ Name[uk]=Тиша в контрольованому ÑеанÑÑ–
+ Name[vi]=Im lặng trong các session được theo dõi
+-Name[xx]=xxSilence in monitored sessionxx
+ Name[zh_TW]=沉默於監視ä¸å·¥ä½œéšŽæ®µ
+ Comment=Silence detected in a monitored session
+ Comment[ar]=التØÙ‚Ù‚ من السكوت أثناء جلسة يتم مراقبتها
+@@ -460,7 +452,6 @@
+ Comment[tr]=İzlenen oturumda sessizlik var
+ Comment[uk]=Ð’ контрольованому ÑеанÑÑ– зареєÑтровано тишу
+ Comment[vi]=Im lặng phát hiện ra của một session bị theo dõi
+-Comment[xx]=xxSilence detected in a monitored sessionxx
+ Comment[zh_TW]=æ²‰æ¼ è¢«åµæ¸¬åˆ°æ–¼ç›£è¦–ä¸çš„工作階段
+ default_presentation=16
+
+@@ -518,7 +509,6 @@
+ Name[tr]=Oturum sıfırdan farklı bir durumla çıktı
+ Name[uk]=Ð¡ÐµÐ°Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð²ÑÑ Ð· кодом помилки
+ Name[vi]=Session kết thúc với trạng thái khác 0
+-Name[xx]=xxSession finished with non-zero statusxx
+ Name[zh_TW]=å·¥ä½œéšŽæ®µçµæŸæ–¼éžé›¶ç‹€æ…‹
+ Comment=A session has exited with non-zero status
+ Comment[ar]=انتهت جلسة Ø¨ØØ§Ù„Ø© غير ØµÙØ±ÙŠØ©
+@@ -573,6 +563,5 @@
+ Comment[tr]=Bir oturum hata vererek çıktı
+ Comment[uk]=Ð¡ÐµÐ°Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð²ÑÑ Ð· кодом помилки
+ Comment[vi]=Một session vừa kết thúc với trạng thái khác 0
+-Comment[xx]=xxA session has exited with non-zero statusxx
+ Comment[zh_TW]=å·¥ä½œéšŽæ®µçµæŸæ–¼éžé›¶ç‹€æ…‹
+ default_presentation=0
+diff -Nru kdebase-release-3.4.0/konsole/kcmkonsole.desktop kdebase-branch-3.4/konsole/kcmkonsole.desktop
+--- kdebase-release-3.4.0/konsole/kcmkonsole.desktop 2005-02-21 23:13:06.000000000 -0500
++++ kdebase-branch-3.4/konsole/kcmkonsole.desktop 2005-03-26 02:37:44.000000000 -0500
+@@ -66,7 +66,6 @@
+ Name[uz]=КонÑол
+ Name[wa]=Conzôle
+ Name[xh]=Konsole
+-Name[xx]=xxConsolexx
+ Name[zh_CN]=控制å°
+ Name[zh_TW]=主控å°
+ Name[zu]=Ikhonsoli
+@@ -93,7 +92,7 @@
+ GenericName[fa]=تمام تنظیمات کنسول
+ GenericName[fi]=Kaikki konsolen asetukset
+ GenericName[fr]=Configuration de Konsole
+-GenericName[fy]=Alle Konsole-Ynstellingen
++GenericName[fy]=Alle Konsole-Ynstellings
+ GenericName[ga]=Gach Socrú Konsole
+ GenericName[gl]=Propiedades da Konsole
+ GenericName[he]=כל ההגדרות של המסוף
+@@ -140,7 +139,6 @@
+ GenericName[vi]=Tất cả các thiết láºp cá»§a Konsole
+ GenericName[wa]=Tos ls apontiaedjes do terminå di KDE
+ GenericName[xh]=Zonke izicwangciso ze Konsole
+-GenericName[xx]=xxAll Konsole Settingsxx
+ GenericName[zh_CN]=Konsole 的全部设置
+ GenericName[zh_TW]=所有的 Konsole è¨å®š
+ GenericName[zu]=Zonke Izilungiselelo zekhonsoli
+@@ -199,6 +197,5 @@
+ Keywords[vi]=konsole,console,đầu cuối
+ Keywords[wa]=konsole,conzôle,terminå
+ Keywords[xh]=konsole,isakhelo esiqulathe ibhodi yezitshixo,isiphelo sendlela
+-Keywords[xx]=xxkonsole,console,terminalxx
+ Keywords[zh_TW]=konsole,console,terminal,主控å°,終端機
+ Keywords[zu]=ikhonsoli,ikhonsoli,okwangaphandle
+diff -Nru kdebase-release-3.4.0/konsole/konsole/TEmuVt102.cpp kdebase-branch-3.4/konsole/konsole/TEmuVt102.cpp
+--- kdebase-release-3.4.0/konsole/konsole/TEmuVt102.cpp 2004-10-16 18:08:12.000000000 -0400
++++ kdebase-branch-3.4/konsole/konsole/TEmuVt102.cpp 2005-04-01 17:03:52.000000000 -0500
+@@ -256,6 +256,7 @@
+ #define DIG 8
+ #define SCS 16
+ #define GRP 32
++#define CPS 64
+
+ void TEmuVt102::initTokenizer()
+ { int i; UINT8* s;
+@@ -263,6 +264,8 @@
+ for(i = 0; i < 32; i++) tbl[ i] |= CTL;
+ for(i = 32; i < 256; i++) tbl[ i] |= CHR;
+ for(s = (UINT8*)"@ABCDGHILMPSTXZcdfry"; *s; s++) tbl[*s] |= CPN;
++// resize = \e[8;<row>;<col>t
++ for(s = (UINT8*)"t"; *s; s++) tbl[*s] |= CPS;
+ for(s = (UINT8*)"0123456789" ; *s; s++) tbl[*s] |= DIG;
+ for(s = (UINT8*)"()+*%" ; *s; s++) tbl[*s] |= SCS;
+ for(s = (UINT8*)"()+*#[]%" ; *s; s++) tbl[*s] |= GRP;
+@@ -335,6 +338,10 @@
+ if (les(3,1,SCS)) { tau( TY_ESC_CS(s[1],s[2]), 0, 0); resetToken(); return; }
+ if (lec(3,1,'#')) { tau( TY_ESC_DE(s[2]), 0, 0); resetToken(); return; }
+ if (eps( CPN)) { tau( TY_CSI_PN(cc), argv[0],argv[1]); resetToken(); return; }
++
++// resize = \e[8;<row>;<col>t
++ if (eps( CPS)) { tau( TY_CSI_PS(cc, argv[0]), argv[1], argv[2]); resetToken(); return; }
++
+ if (epe( )) { tau( TY_CSI_PE(cc), 0, 0); resetToken(); return; }
+ if (ees( DIG)) { addDigit(cc-'0'); return; }
+ if (eec( ';')) { addArgument(); return; }
+@@ -505,6 +512,9 @@
+ case TY_ESC_DE('6' ) : /* IGNORED: double width, single high*/ break;
+ case TY_ESC_DE('8' ) : scr->helpAlign ( ); break;
+
++// resize = \e[8;<row>;<col>t
++ case TY_CSI_PS('t', 8) : changeColLin( q /* col */, p /* lin */ ); break;
++
+ case TY_CSI_PS('K', 0) : scr->clearToEndOfLine ( ); break;
+ case TY_CSI_PS('K', 1) : scr->clearToBeginOfLine ( ); break;
+ case TY_CSI_PS('K', 2) : scr->clearEntireLine ( ); break;
+diff -Nru kdebase-release-3.4.0/konsole/konsole/TEmulation.h kdebase-branch-3.4/konsole/konsole/TEmulation.h
+--- kdebase-release-3.4.0/konsole/konsole/TEmulation.h 2005-01-23 12:30:46.000000000 -0500
++++ kdebase-branch-3.4/konsole/konsole/TEmulation.h 2005-04-01 17:03:52.000000000 -0500
+@@ -68,6 +68,7 @@
+ void sndBlock(const char* txt,int len);
+ void ImageSizeChanged(int lines, int columns);
+ void changeColumns(int columns);
++ void changeColLin(int columns, int lines);
+ void changeTitle(int arg, const char* str);
+ void notifySessionState(int state);
+ void zmodemDetected();
+diff -Nru kdebase-release-3.4.0/konsole/konsole/keytrans.cpp kdebase-branch-3.4/konsole/konsole/keytrans.cpp
+--- kdebase-release-3.4.0/konsole/konsole/keytrans.cpp 2005-01-25 12:56:47.000000000 -0500
++++ kdebase-branch-3.4/konsole/konsole/keytrans.cpp 2005-03-28 14:42:26.000000000 -0500
+@@ -26,6 +26,7 @@
+ #include <klocale.h>
+
+ #include <stdio.h>
++#include <stddef.h>
+
+ #ifndef HERE
+ #define HERE printf("%s(%d): here\n",__FILE__,__LINE__)
+@@ -372,7 +373,7 @@
+ //printf("line %3d: ",startofsym);
+ getSymbol(); assertSyntax(sym == SYMName, "Name expected")
+ assertSyntax(syms->keysyms[res], "Unknown key name")
+- int key = (long)( syms->keysyms[res] ) -1;
++ ptrdiff_t key = (ptrdiff_t)(syms->keysyms[res]) - 1;
+ //printf(" key %s (%04x)",res.latin1(),(int)syms->keysyms[res]-1);
+ getSymbol(); // + - :
+ int mode = 0;
+@@ -384,7 +385,7 @@
+ // mode name
+ assertSyntax(sym == SYMName, "Name expected")
+ assertSyntax(syms->modsyms[res], "Unknown mode name")
+- int bits = (long)syms->modsyms[res]-1;
++ ptrdiff_t bits = (ptrdiff_t)(syms->modsyms[res]) - 1;
+ if (mask & (1 << bits))
+ {
+ fprintf(stderr,"%s(%d,%d): mode name used multible times.\n",path.ascii(),slinno,scolno);
+@@ -401,11 +402,11 @@
+ getSymbol();
+ // string or command
+ assertSyntax(sym == SYMName || sym == SYMString,"Command or string expected")
+- int cmd = 0;
++ ptrdiff_t cmd = 0;
+ if (sym == SYMName)
+ {
+ assertSyntax(syms->oprsyms[res], "Unknown operator name")
+- cmd = (long)syms->oprsyms[res]-1;
++ cmd = (ptrdiff_t)(syms->oprsyms[res]) - 1;
+ //printf(": do %s(%d)",res.latin1(),(int)syms->oprsyms[res]-1);
+ }
+ if (sym == SYMString)
+diff -Nru kdebase-release-3.4.0/konsole/konsole/konsole.cpp kdebase-branch-3.4/konsole/konsole/konsole.cpp
+--- kdebase-release-3.4.0/konsole/konsole/konsole.cpp 2005-02-28 12:33:56.000000000 -0500
++++ kdebase-branch-3.4/konsole/konsole/konsole.cpp 2005-04-01 17:03:52.000000000 -0500
+@@ -108,6 +108,7 @@
+ #include <kaccelmanager.h>
+
+ #include <kaction.h>
++#include <kshell.h>
+ #include <qlabel.h>
+ #include <kpopupmenu.h>
+ #include <klocale.h>
+@@ -2060,8 +2061,16 @@
+
+ }
+
+-// --| color selection |-------------------------------------------------------
++// Called from emulation
++void Konsole::changeColLin(int columns, int lines)
++{
++ if (b_allowResize && !b_fixedSize) {
++ setColLin(columns, lines);
++ te->update();
++ }
++}
+
++// Called from emulation
+ void Konsole::changeColumns(int columns)
+ {
+ if (b_allowResize) {
+@@ -2782,6 +2791,8 @@
+ this, SLOT(slotRenameSession(TESession*, const QString&)) );
+ connect( s->getEmulation(), SIGNAL(changeColumns(int)),
+ this, SLOT(changeColumns(int)) );
++ connect( s->getEmulation(), SIGNAL(changeColLin(int,int)),
++ this, SLOT(changeColLin(int,int)) );
+ connect( s->getEmulation(), SIGNAL(ImageSizeChanged(int,int)),
+ this, SLOT(notifySize(int,int)));
+ connect( s, SIGNAL(zmodemDetected(TESession*)),
+@@ -3223,12 +3234,14 @@
+ }
+
+ exec = KRun::binaryName(exec, false);
++ exec = KShell::tildeExpand(exec);
+ QString pexec = KGlobal::dirs()->findExe(exec);
+ if (typ.isEmpty() || txt.isEmpty() || typ != "KonsoleApplication"
+ || ( !exec.isEmpty() && pexec.isEmpty() ) )
+ {
+ if (!path.isEmpty())
+ delete co;
++ kdWarning()<<"Unable to use "<<path.latin1()<<endl;
+ return; // ignore
+
+ }
+@@ -3532,6 +3545,7 @@
+
+ disconnect( _se->getEmulation(),SIGNAL(ImageSizeChanged(int,int)), this,SLOT(notifySize(int,int)));
+ disconnect( _se->getEmulation(),SIGNAL(changeColumns(int)), this,SLOT(changeColumns(int)) );
++ disconnect( _se->getEmulation(),SIGNAL(changeColLin(int, int)), this,SLOT(changeColLin(int,int)) );
+
+ disconnect( _se,SIGNAL(updateTitle()), this,SLOT(updateTitle()) );
+ disconnect( _se,SIGNAL(notifySessionState(TESession*,int)), this,SLOT(notifySessionState(TESession*,int)) );
+@@ -3575,6 +3589,9 @@
+ if (b_dynamicTabHide && tabwidget->count()==1)
+ tabwidget->setTabBarHidden(true);
+ }
++
++ if( m_removeSessionButton )
++ m_removeSessionButton->setEnabled(tabwidget->count()>1);
+ }
+
+ void Konsole::attachSession(TESession* session)
+@@ -3630,6 +3647,7 @@
+ connect( session,SIGNAL(renameSession(TESession*,const QString&)), this,SLOT(slotRenameSession(TESession*,const QString&)) );
+ connect( session->getEmulation(),SIGNAL(ImageSizeChanged(int,int)), this,SLOT(notifySize(int,int)));
+ connect( session->getEmulation(),SIGNAL(changeColumns(int)), this,SLOT(changeColumns(int)) );
++ connect( session->getEmulation(),SIGNAL(changeColLin(int, int)), this,SLOT(changeColLin(int,int)) );
+
+ activateSession(session);
+ }
+diff -Nru kdebase-release-3.4.0/konsole/konsole/konsole.h kdebase-branch-3.4/konsole/konsole/konsole.h
+--- kdebase-release-3.4.0/konsole/konsole/konsole.h 2005-02-23 07:11:31.000000000 -0500
++++ kdebase-branch-3.4/konsole/konsole/konsole.h 2005-04-01 17:03:52.000000000 -0500
+@@ -154,6 +154,7 @@
+ void updateRMBMenu();
+
+ void changeColumns(int);
++ void changeColLin(int columns, int lines);
+ void notifySessionState(TESession* session,int state);
+ void notifySize(int,int);
+ void updateTitle();
+diff -Nru kdebase-release-3.4.0/konsole/konsole/x-konsole.desktop kdebase-branch-3.4/konsole/konsole/x-konsole.desktop
+--- kdebase-release-3.4.0/konsole/konsole/x-konsole.desktop 2005-02-18 23:27:15.000000000 -0500
++++ kdebase-branch-3.4/konsole/konsole/x-konsole.desktop 2005-03-30 01:47:55.000000000 -0500
+@@ -14,6 +14,7 @@
+ Comment[cs]=Soubor k otevÅ™enà pÅ™Ãkazové řádky
+ Comment[da]=Fil som skal åbnes i en skal
+ Comment[de]=Datei zum Öffnen einer Shell
++Comment[el]=ΑÏχείο για άνοιγμα ενός κελÏφους
+ Comment[eo]=Dosiero por malfermi komandinterpretilon
+ Comment[es]=Archivo para abrir un intérprete de comandos
+ Comment[et]=Shelli avamise rakendus
+@@ -45,11 +46,10 @@
+ Comment[sk]=Súbor na otvorenie shellu
+ Comment[sl]=Datoteka za odprtje lupine
+ Comment[sr]=Фајл за отварање шкољке
+-Comment[sr@Latn]=Фајл за отварање шкољке
++Comment[sr@Latn]=Fajl za otvaranje školjke
+ Comment[sv]=Fil som ska öppnas i ett skal
+ Comment[ta]=ஷெலà¯à®²à¯ˆ திறபà¯à®ªà®¤à®±à¯à®•௠கோபà¯à®ªà¯
+ Comment[tr]=Kabuk'a Açılacak Dosya
+ Comment[uk]=Файл, Ñкий треба відкрити у оболонці
+ Comment[uz]=Шелни очиш учун файл
+-Comment[xx]=xxFile to Open a Shellxx
+ Comment[zh_CN]=打开 Shell 的文件
+diff -Nru kdebase-release-3.4.0/konsole/konsole-script.desktop kdebase-branch-3.4/konsole/konsole-script.desktop
+--- kdebase-release-3.4.0/konsole/konsole-script.desktop 2005-02-04 23:15:41.000000000 -0500
++++ kdebase-branch-3.4/konsole/konsole-script.desktop 2005-03-07 09:16:09.000000000 -0500
+@@ -42,7 +42,6 @@
+ Name[tg]=КонÑол
+ Name[th]=คà¸à¸™à¹‚ซล K
+ Name[uz]=КонÑол
+-Name[xx]=xxKonsolexx
+ Name[zu]=Ikhonsoli
+
+ GenericName=Terminal Program
+@@ -111,7 +110,6 @@
+ GenericName[vi]=Trình đầu cuối
+ GenericName[wa]=Programe di terminå
+ GenericName[xh]=Inkqubo Yesixhobo sangaphandle sekhompyutha
+-GenericName[xx]=xxTerminal Programxx
+ GenericName[zh_CN]=终端程åº
+ GenericName[zh_TW]=終端機程å¼
+ GenericName[zu]=Uhlelo lwemisebenzi lwangaohandle
+diff -Nru kdebase-release-3.4.0/konsole/konsole.desktop kdebase-branch-3.4/konsole/konsole.desktop
+--- kdebase-release-3.4.0/konsole/konsole.desktop 2005-02-14 12:36:51.000000000 -0500
++++ kdebase-branch-3.4/konsole/konsole.desktop 2005-03-07 09:16:09.000000000 -0500
+@@ -42,7 +42,6 @@
+ Name[tg]=КонÑол
+ Name[th]=คà¸à¸™à¹‚ซล K
+ Name[uz]=КонÑол
+-Name[xx]=xxKonsolexx
+ Name[zu]=Ikhonsoli
+
+ GenericName=Terminal Program
+@@ -111,7 +110,6 @@
+ GenericName[vi]=Trình đầu cuối
+ GenericName[wa]=Programe di terminå
+ GenericName[xh]=Inkqubo Yesixhobo sangaphandle sekhompyutha
+-GenericName[xx]=xxTerminal Programxx
+ GenericName[zh_CN]=终端程åº
+ GenericName[zh_TW]=終端機程å¼
+ GenericName[zu]=Uhlelo lwemisebenzi lwangaohandle
+diff -Nru kdebase-release-3.4.0/konsole/konsolehere.desktop kdebase-branch-3.4/konsole/konsolehere.desktop
+--- kdebase-release-3.4.0/konsole/konsolehere.desktop 2005-02-04 23:15:41.000000000 -0500
++++ kdebase-branch-3.4/konsole/konsolehere.desktop 2005-03-07 09:16:09.000000000 -0500
+@@ -68,7 +68,6 @@
+ Name[vi]=Mở một trình đầu cuối ở đây
+ Name[wa]=Drovi on terminå chal
+ Name[xh]=Vula Isiphelo Sendlela Apha
+-Name[xx]=xxOpen Terminal Herexx
+ Name[zh_CN]=åœ¨æ¤æ‰“开终端
+ Name[zh_TW]=在這裡開啟終端機
+ Name[zu]=Vula ithuluzi langaphandle lapha
+diff -Nru kdebase-release-3.4.0/konsole/konsolepart.desktop kdebase-branch-3.4/konsole/konsolepart.desktop
+--- kdebase-release-3.4.0/konsole/konsolepart.desktop 2005-02-04 23:15:41.000000000 -0500
++++ kdebase-branch-3.4/konsole/konsolepart.desktop 2005-03-07 09:16:09.000000000 -0500
+@@ -78,7 +78,6 @@
+ Name[ven]=Mulingedzisi wa theminala
+ Name[vi]=Trình mô phá»ng Terminal
+ Name[xh]=Umzami kulinganisela ngokulinganayo Wendlela yesiphelo
+-Name[xx]=xxTerminal Emulatorxx
+ Name[zh_CN]=终端仿真器
+ Name[zh_TW]=終端機模擬程å¼
+ Name[zu]=Umlingisi wangaphandle
+diff -Nru kdebase-release-3.4.0/konsole/konsolesu.desktop kdebase-branch-3.4/konsole/konsolesu.desktop
+--- kdebase-release-3.4.0/konsole/konsolesu.desktop 2005-02-10 23:52:19.000000000 -0500
++++ kdebase-branch-3.4/konsole/konsolesu.desktop 2005-03-07 09:16:09.000000000 -0500
+@@ -60,7 +60,6 @@
+ Name[uk]=Програма терміналу (режим адмініÑтратора)
+ Name[uz]=Терминал даÑтури (root)
+ Name[wa]=Terminå - Môde super uzeu (root)
+-Name[xx]=xxTerminal Program - Super User Modexx
+ Name[zh_CN]=ç»ˆç«¯ç¨‹åº - 超级用户模å¼
+ X-KDE-AuthorizeAction=shell_access
+ Categories=Qt;KDE;System;TerminalEmulator;X-KDE-More;
+diff -Nru kdebase-release-3.4.0/konsole/kwrited.desktop kdebase-branch-3.4/konsole/kwrited.desktop
+--- kdebase-release-3.4.0/konsole/kwrited.desktop 2005-02-18 23:27:15.000000000 -0500
++++ kdebase-branch-3.4/konsole/kwrited.desktop 2005-03-07 09:16:09.000000000 -0500
+@@ -56,7 +56,6 @@
+ Name[uk]=Демон запиÑу KDE
+ Name[uz]=KDE write демони
+ Name[ven]=Daemon yau nwala ya KDE
+-Name[xx]=xxKDE Write Daemonxx
+ Name[zh_CN]=KDE Write 守护程åº
+ Name[zh_TW]=KDE Write 伺æœç¨‹å¼
+ Name[zu]=I-Daemon Yokubhala ye-KDE
+@@ -97,12 +96,11 @@
+ Comment[sk]=Sledovanie správ od lokálnych použÃvateľov poslaných pomocou prÃkazu write (1) alebo wall (1)
+ Comment[sl]=Opazuj sporoÄila od krajevnih uporabnikov, poslanih z write(1) ali wall(1)
+ Comment[sr]=Чека поруке од локалних кориÑника поÑлатих помоћу write(1) или wall(1)
+-Comment[sr@Latn]=Чека поруке од локалних кориÑника поÑлатих помоћу write(1) или wall(1)
++Comment[sr@Latn]=Čeka poruke od lokalnih korisnika poslatih pomoću write(1) ili wall(1)
+ Comment[sv]=Titta efter meddelanden från lokala användare som skickas med write(1) eller wall(1)
+ Comment[ta]=உள௠பயனர௠அணà¯à®ªà¯à®ªà®¿à®¯à®¤à¯à®Ÿà®©à¯ write(1) or wall(1) அதிலிரà¯à®¨à¯à®¤à¯ பாரà¯à®•à¯à®•வேணà¯à®Ÿà®¿à®¯ தகவலà¯à®•ளà¯
+ Comment[tr]=Yerel kullanıcılarda write(1) veya wall(1) ile gönderilmiş mesajları izle
+ Comment[uk]=СпоÑÑ‚ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ð·Ð°  повідомленнÑми від локальних кориÑтувачів, відіÑланих через write(1) або wall(1)
+-Comment[xx]=xxWatch for messages from local users sent with write(1) or wall(1)xx
+ Type=Service
+ ServiceTypes=KDEDModule
+ X-KDE-ModuleType=Library
+diff -Nru kdebase-release-3.4.0/konsole/other/linux.desktop kdebase-branch-3.4/konsole/other/linux.desktop
+--- kdebase-release-3.4.0/konsole/other/linux.desktop 2005-02-15 23:31:33.000000000 -0500
++++ kdebase-branch-3.4/konsole/other/linux.desktop 2005-03-07 09:16:10.000000000 -0500
+@@ -61,7 +61,6 @@
+ Name[uk]=КонÑоль Linux
+ Name[uz]=Linux конÑоли
+ Name[wa]=Conzôle Linux
+-Name[xx]=xxLinux Consolexx
+ Name[zh_CN]=Linux 控制å°
+ Name[zh_TW]=Linux 主控å°
+ Name[zu]=Ikhonsoli we-Linux
+@@ -129,7 +128,6 @@
+ Comment[vi]=Linux Console má»›i
+ Comment[wa]=Novele conzôle linux
+ Comment[xh]=Konsole Entsha ye Linux
+-Comment[xx]=xxNew Linux Consolexx
+ Comment[zh_CN]=新建 Linux 控制å°
+ Comment[zh_TW]=新增 Linux 主控å°
+ Comment[zu]=Ikhonsoli Entsha ye-Linux
+diff -Nru kdebase-release-3.4.0/konsole/other/mc.desktop kdebase-branch-3.4/konsole/other/mc.desktop
+--- kdebase-release-3.4.0/konsole/other/mc.desktop 2005-02-04 23:15:42.000000000 -0500
++++ kdebase-branch-3.4/konsole/other/mc.desktop 2005-03-07 09:16:10.000000000 -0500
+@@ -18,7 +18,6 @@
+ Name[th]=มิดไนท์คà¸à¸¡à¸¡à¸²à¸™à¹€à¸”à¸à¸£à¹Œ
+ Name[ven]=Muhulwane wa vhukati ha vhusiku
+ Name[xh]=Umyaleli Waphakathi kobusuku
+-Name[xx]=xxMidnight Commanderxx
+ Name[zu]=Umyaleli waphakathi nobusuku
+ Icon=opentermblue
+ Comment=New Midnight Commander
+@@ -83,7 +82,6 @@
+ Comment[ven]=Muhulwane wa vhukati ha vhusiku
+ Comment[vi]=Midnight Commander má»›i
+ Comment[wa]=Novea Midnight Commander
+-Comment[xx]=xxNew Midnight Commanderxx
+ Comment[zh_CN]=新建 Midnight Commander
+ Comment[zh_TW]=新增 Midnight Commander
+ Comment[zu]=Umyaleli Waphakathi nobusuku Omusha
+diff -Nru kdebase-release-3.4.0/konsole/other/screen.desktop kdebase-branch-3.4/konsole/other/screen.desktop
+--- kdebase-release-3.4.0/konsole/other/screen.desktop 2005-02-10 23:52:19.000000000 -0500
++++ kdebase-branch-3.4/konsole/other/screen.desktop 2005-03-07 09:16:10.000000000 -0500
+@@ -60,7 +60,6 @@
+ Name[ven]=Tshipida tsha tshikirini
+ Name[wa]=Session «screen»
+ Name[xh]=Isiqendu Sekhusi
+-Name[xx]=xxScreen Sessionxx
+ Name[zh_CN]=å±å¹•会è¯
+ Name[zh_TW]=螢幕工作階段
+ Name[zu]=Isiqendu seskrini
+@@ -123,7 +122,6 @@
+ Comment[ven]=Tshipida tsha tshikirini tshiswa
+ Comment[vi]=Screen Session má»›i
+ Comment[wa]=Novele session «screen»
+-Comment[xx]=xxNew Screen Sessionxx
+ Comment[zh_CN]=新建å±å¹•会è¯
+ Comment[zh_TW]=新增螢幕工作階段
+ Comment[zu]=Isiqendu Seskrini Esisha
+diff -Nru kdebase-release-3.4.0/konsole/other/shell.desktop kdebase-branch-3.4/konsole/other/shell.desktop
+--- kdebase-release-3.4.0/konsole/other/shell.desktop 2005-02-04 23:15:42.000000000 -0500
++++ kdebase-branch-3.4/konsole/other/shell.desktop 2005-03-07 09:16:10.000000000 -0500
+@@ -49,7 +49,6 @@
+ Name[uk]=Командний Ñ€Ñдок
+ Name[uz]=КонÑол
+ Name[xh]=Iqokobhe
+-Name[xx]=xxShellxx
+ Name[zu]=Igobolodo
+ Comment=New Shell
+ Comment[af]=Nuwe Tolk
+@@ -116,7 +115,6 @@
+ Comment[vi]=Shell má»›i
+ Comment[wa]=Novea shell
+ Comment[xh]=Iqokobhe Elitsha
+-Comment[xx]=xxNew Shellxx
+ Comment[zh_CN]=新建 Shell
+ Comment[zh_TW]=新增 Shell
+ Comment[zu]=Igobolodo Elisha
+diff -Nru kdebase-release-3.4.0/konsole/other/su.desktop kdebase-branch-3.4/konsole/other/su.desktop
+--- kdebase-release-3.4.0/konsole/other/su.desktop 2005-02-23 00:05:58.000000000 -0500
++++ kdebase-branch-3.4/konsole/other/su.desktop 2005-03-30 01:47:56.000000000 -0500
+@@ -3,18 +3,22 @@
+ Type=KonsoleApplication
+ Name=Root Shell
+ Name[bn]=রà§à¦Ÿ শেল
++Name[br]=Shell gwrizienn
+ Name[ca]=Intèrpret de comandaments root
+ Name[cs]=Root shell
+ Name[da]=Root-skal
+ Name[de]=Befehlsfenster (Systemverwaltungsmodus)
++Name[el]=ΚÎλυφος υπεÏχÏήστη
+ Name[es]=Intérprete de comandos de root
+ Name[et]=Administraatori shell
++Name[eu]=Root shell
+ Name[fi]=Pääkäyttäjän komentotulkki
+ Name[fr]=Shell superutilisateur
+ Name[he]=מעטפת root
+ Name[hu]=Parancsértelmező (rendszergazdaként)
+ Name[is]=Skel
+ Name[it]=Shell di root
++Name[ja]=root シェル
+ Name[lt]=Root apvalkalas
+ Name[nb]=Rotskall
+ Name[nl]=Root-shell
+@@ -23,21 +27,25 @@
+ Name[pt]=Linha de Comandos Root
+ Name[pt_BR]=Shell do Root
+ Name[se]=Ruohtasskálžu
++Name[sk]=PrÃkazový riadok pre administrátora
+ Name[sl]=Korenska lupina
+ Name[sr]=Корена шкољка
+-Name[sr@Latn]=Корена шкољка
++Name[sr@Latn]=Korena školjka
+ Name[sv]=Skal för root
+ Name[ta]=ஓட௠ஷெலà¯
+ Name[uk]=Командна оболонка з правами root
+ Icon=opentermred
+ Comment=New Root Shell
+ Comment[bn]=নতà§à¦¨ রà§à¦Ÿ শেল
++Comment[bs]=Novi root shell
+ Comment[ca]=Nou intèrpret de comandaments root
+ Comment[cs]=Nový root shell
+ Comment[da]=Ny root-skal
+ Comment[de]=Neues Befehlsfenster (Systemverwaltungsmodus)
++Comment[el]=ÎÎο κÎλυφος υπεÏχÏήστη
+ Comment[es]=Nuevo intérprete de root
+ Comment[et]=Uus administraatori shell
++Comment[eu]=Root shell berria
+ Comment[fi]=Uusi pääkäyttäjän komentotulkki
+ Comment[fr]=Nouveau shell superutilisateur
+ Comment[fy]=Nije Root Shell
+@@ -45,6 +53,7 @@
+ Comment[hu]=Új parancsértelmező (rendszergazdaként)
+ Comment[is]=Ný skel
+ Comment[it]=Nuova shell di root
++Comment[ja]=æ–°è¦rootシェル
+ Comment[lt]=Naujas Root apvalkalas
+ Comment[nb]=Nytt rotskall
+ Comment[nl]=Nieuwe root-shell
+@@ -54,9 +63,10 @@
+ Comment[pt_BR]=Novo Shell do Root
+ Comment[ru]=ÐÐ¾Ð²Ð°Ñ Ð¾Ð±Ð¾Ð»Ð¾Ñ‡ÐºÐ° Ñ Ð¿Ñ€Ð°Ð²Ð°Ð¼Ð¸ root
+ Comment[se]=Ođđa ruohtasskálžu
++Comment[sk]=Nový shell pre roota
+ Comment[sl]=Nova korenska lupina
+ Comment[sr]=Ðова корена шкољка
+-Comment[sr@Latn]=Ðова корена шкољка
++Comment[sr@Latn]=Nova korena školjka
+ Comment[sv]=Nytt skal för root
+ Comment[ta]=பà¯à®¤à®¿à®¯ ஓட௠ஷெலà¯
+ Comment[uk]=Ðовий командна оболонка з правами root
+diff -Nru kdebase-release-3.4.0/konsole/other/sumc.desktop kdebase-branch-3.4/konsole/other/sumc.desktop
+--- kdebase-release-3.4.0/konsole/other/sumc.desktop 2005-02-23 00:05:58.000000000 -0500
++++ kdebase-branch-3.4/konsole/other/sumc.desktop 2005-03-07 09:16:10.000000000 -0500
+@@ -40,6 +40,7 @@
+ Name[se]=Midnight Commander root geavaheaddji várás
+ Name[sl]=Midnight Commander za root
+ Name[sr]=Корени Midnight Commander
++Name[sr@Latn]=Koreni Midnight Commander
+ Name[sv]=Midnight Commander för root
+ Name[ta]=ஆரமà¯à®ª நட௠இரவ௠கடà¯à®Ÿà®³à¯ˆ
+ Name[tg]=Фармондиҳандаи нимашаби реша
+@@ -49,7 +50,6 @@
+ Name[uz]=Midnight Commander (root)
+ Name[ven]=Muhulwane wa mudzi wa vhukati ha vhusiku
+ Name[wa]=Midnight Commander e môde root
+-Name[xx]=xxRoot Midnight Commanderxx
+ Name[zu]=Umyaleli Waphakathi nobusuku
+ Icon=opentermred
+ Comment=New Root Midnight Commander
+@@ -101,7 +101,7 @@
+ Comment[sk]=Nový root Midnight Commander
+ Comment[sl]=Novi Midnight Commander za root
+ Comment[sr]=Ðови корени Midnight Commander
+-Comment[sr@Latn]=Novi Root Midnight Commander
++Comment[sr@Latn]=Novi koreni Midnight Commander
+ Comment[sv]=Ny Midnight Commander för root
+ Comment[ta]=பà¯à®¤à®¿à®¯ ஆரமà¯à®ª நட௠இரவ௠கடà¯à®Ÿà®³à¯ˆ
+ Comment[tg]=Ðави фармондиҳандаи нимашаби реша
+@@ -112,7 +112,6 @@
+ Comment[ven]=Muhulwane wa mudzi wa vhukati ha vhusiku
+ Comment[vi]=Root Midnight Commander má»›i
+ Comment[wa]=Novea «Midnight Commander» e môde root
+-Comment[xx]=xxNew Root Midnight Commanderxx
+ Comment[zh_CN]=新建 Root Midnight Commander
+ Comment[zh_TW]=新增 Root Midnight Commander
+ Comment[zu]=Umyaleli Waphakathi nobusuku Wempande Entsha
+diff -Nru kdebase-release-3.4.0/konsole/other/vt420pc.keytab kdebase-branch-3.4/konsole/other/vt420pc.keytab
+--- kdebase-release-3.4.0/konsole/other/vt420pc.keytab 2004-11-29 05:37:29.000000000 -0500
++++ kdebase-branch-3.4/konsole/other/vt420pc.keytab 2005-03-05 17:44:34.000000000 -0500
+@@ -131,7 +131,7 @@
+ key F12+Shift : "\E[24;2~"
+
+ key Home : "\E[H"
+-key End : "\E[1~"
++key End : "\E[F"
+
+ key Prior -Shift : "\E[5~"
+ key Next -Shift : "\E[6~"
+diff -Nru kdebase-release-3.4.0/konsole/terminalemulator.desktop kdebase-branch-3.4/konsole/terminalemulator.desktop
+--- kdebase-release-3.4.0/konsole/terminalemulator.desktop 2005-02-04 23:15:41.000000000 -0500
++++ kdebase-branch-3.4/konsole/terminalemulator.desktop 2005-03-07 09:16:09.000000000 -0500
+@@ -70,7 +70,6 @@
+ Name[ven]=Mulingedzisi wa theminala
+ Name[vi]=Trình mô phá»ng Terminal
+ Name[xh]=Umzami kulinganisela ngokulinganayo Wendlela yesiphelo
+-Name[xx]=xxTerminal Emulatorxx
+ Name[zh_CN]=终端仿真器
+ Name[zh_TW]=終端機模擬程å¼
+ Name[zu]=Umlingisi wangaphandle
+diff -Nru kdebase-release-3.4.0/kpager/kpager.desktop kdebase-branch-3.4/kpager/kpager.desktop
+--- kdebase-release-3.4.0/kpager/kpager.desktop 2005-02-10 23:52:19.000000000 -0500
++++ kdebase-branch-3.4/kpager/kpager.desktop 2005-03-07 09:16:10.000000000 -0500
+@@ -17,7 +17,6 @@
+ Name[tr]=KDE Sayfalayıcı
+ Name[ven]=Pheidzha ya K
+ Name[wa]=KPÃ¥djeu
+-Name[xx]=xxKPagerxx
+ GenericName=Desktop Pager
+ GenericName[af]=Werkskerm Boodskapper
+ GenericName[ar]=Ù…ØµÙØ Ø³Ø·Ø Ø§Ù„Ù…ÙƒØªØ¨
+@@ -79,7 +78,6 @@
+ GenericName[uz]=Иш Ñтолининг пейжери
+ GenericName[ven]=Pheidzha ya Desikithopo
+ GenericName[wa]=PÃ¥djeu do scribanne
+-GenericName[xx]=xxDesktop Pagerxx
+ GenericName[zh_CN]=桌é¢åˆ†é¡µå™¨
+ GenericName[zh_TW]=桌é¢å‘¼å«å™¨
+ GenericName[zu]=I-Pager ye-Desktop
+diff -Nru kdebase-release-3.4.0/kpersonalizer/kpersonalizer.desktop kdebase-branch-3.4/kpersonalizer/kpersonalizer.desktop
+--- kdebase-release-3.4.0/kpersonalizer/kpersonalizer.desktop 2005-02-04 23:15:42.000000000 -0500
++++ kdebase-branch-3.4/kpersonalizer/kpersonalizer.desktop 2005-03-07 09:16:10.000000000 -0500
+@@ -68,7 +68,6 @@
+ Name[ven]=Wizadi ya mavhekanyele a desikithopo
+ Name[wa]=Macrea des apontiaedjes do scribanne
+ Name[xh]=Wizard Yezicwangciso ze Desktop
+-Name[xx]=xxDesktop Settings Wizardxx
+ Name[zh_CN]=桌é¢è®¾ç½®å‘导
+ Name[zh_TW]=桌é¢è¨å®šç²¾éˆ
+ Name[zu]=I-Wizard yezilungiselelo ze-Desktop
+diff -Nru kdebase-release-3.4.0/kscreensaver/KBlankscreen.desktop kdebase-branch-3.4/kscreensaver/KBlankscreen.desktop
+--- kdebase-release-3.4.0/kscreensaver/KBlankscreen.desktop 2005-02-23 00:05:58.000000000 -0500
++++ kdebase-branch-3.4/kscreensaver/KBlankscreen.desktop 2005-03-30 01:47:56.000000000 -0500
+@@ -72,7 +72,6 @@
+ Name[vi]=Mà n hình trống
+ Name[wa]=Noere waitroûle
+ Name[xh]=Ikhusi Elingenanto
+-Name[xx]=xxBlank Screenxx
+ Name[zh_CN]=空å±å¹•
+ Name[zh_TW]=空白螢幕
+ Name[zu]=Iskrini Esingenalutho
+@@ -146,7 +145,6 @@
+ Name[vi]=Cà i đặt...
+ Name[wa]=Apontyî...
+ Name[xh]=Iyacwangciswa...
+-Name[xx]=xxSetup...xx
+ Name[zh_CN]=设置...
+ Name[zh_TW]=è¨å®š...
+ Name[zu]=Iyalungiselela...
+@@ -165,6 +163,7 @@
+ Name[cy]=Dangos mewn Ffenestr Benodol
+ Name[da]=Visning i angivet vindue
+ Name[de]=In angegebenem Fenster anzeigen
++Name[el]=Î Ïοβολή στο καθοÏισμÎνο παÏάθυÏο
+ Name[eo]=Montru en indikita fenestro
+ Name[es]=Mostrar en la ventana especificada
+ Name[et]=Määratud aknas näitamine
+@@ -197,14 +196,13 @@
+ Name[sk]=Zobraziť v zadanom okne
+ Name[sl]=Prikaz v doloÄenemu oknu
+ Name[sr]=Прикажи у задатом прозору
+-Name[sr@Latn]=Прикажи у задатом прозору
++Name[sr@Latn]=Prikaži u zadatom prozoru
+ Name[sv]=Visa i angivet fönster
+ Name[ta]=கà¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà®ªà¯à®ªà®Ÿà¯à®Ÿ சாளரதà¯à®¤à®¿à®²à¯ காடà¯à®Ÿà¯
+ Name[tr]=Belirtilen Pencerede Göster
+ Name[uk]=Відобразити у вказаному вікні
+ Name[uz]=КўрÑатилган ойнада кўрÑатиш
+ Name[wa]=Håyner dins l' purnea specifyî
+-Name[xx]=xxDisplay in Specified Windowxx
+ Name[zh_CN]=在指定窗å£ä¸æ˜¾ç¤º
+ NoDisplay=true
+
+@@ -221,6 +219,7 @@
+ Name[cy]=Dangos mewn Ffenestr Wraidd
+ Name[da]=Visning i root-vindue
+ Name[de]=Im Basisfenster (Root Window) anzeigen
++Name[el]=Î Ïοβολή στο βασικό παÏάθυÏο
+ Name[eo]=Montru en radika fenestro
+ Name[es]=Mostrar en la ventana raÃz
+ Name[et]=Juuraknas näitamine
+@@ -253,13 +252,12 @@
+ Name[sk]=Zobraziť v koreňovom okne
+ Name[sl]=Prikaz v korenskem oknu
+ Name[sr]=Прикажи у кореном прозору
+-Name[sr@Latn]=Прикажи у кореном прозору
++Name[sr@Latn]=Prikaži u korenom prozoru
+ Name[sv]=Visa i rotfönstret
+ Name[ta]=மூல சாளரதà¯à®¤à®¿à®²à¯ காடà¯à®Ÿà¯
+ Name[tr]=Kök Pencerede Göster
+ Name[uk]=Відобразити на тлі екрана
+ Name[uz]=Туб ойнада кўрÑатиш
+ Name[wa]=HÃ¥yner e purnea raecene (li fond do scribanne)
+-Name[xx]=xxDisplay in Root Windowxx
+ Name[zh_CN]=在 Root 窗å£ä¸æ˜¾ç¤º
+ NoDisplay=true
+diff -Nru kdebase-release-3.4.0/kscreensaver/KRandom.desktop kdebase-branch-3.4/kscreensaver/KRandom.desktop
+--- kdebase-release-3.4.0/kscreensaver/KRandom.desktop 2005-02-23 00:05:58.000000000 -0500
++++ kdebase-branch-3.4/kscreensaver/KRandom.desktop 2005-03-30 01:47:56.000000000 -0500
+@@ -72,7 +72,6 @@
+ Name[vi]=Ngẫu nhiên
+ Name[wa]=A l' astcheyance
+ Name[xh]=Ngaphandle kwenjongo
+-Name[xx]=xxRandomxx
+ Name[zh_CN]=éšæœº
+ Name[zh_TW]=隨機
+ Name[zu]=Okungenaphethini
+@@ -146,7 +145,6 @@
+ Name[vi]=Cà i đặt...
+ Name[wa]=Apontyî...
+ Name[xh]=Iyacwangciswa...
+-Name[xx]=xxSetup...xx
+ Name[zh_CN]=设置...
+ Name[zh_TW]=è¨å®š...
+ Name[zu]=Iyalungiselela...
+@@ -165,6 +163,7 @@
+ Name[cy]=Dangos mewn Ffenestr Benodol
+ Name[da]=Visning i angivet vindue
+ Name[de]=In angegebenem Fenster anzeigen
++Name[el]=Î Ïοβολή στο καθοÏισμÎνο παÏάθυÏο
+ Name[eo]=Montru en indikita fenestro
+ Name[es]=Mostrar en la ventana especificada
+ Name[et]=Määratud aknas näitamine
+@@ -197,14 +196,13 @@
+ Name[sk]=Zobraziť v zadanom okne
+ Name[sl]=Prikaz v doloÄenemu oknu
+ Name[sr]=Прикажи у задатом прозору
+-Name[sr@Latn]=Прикажи у задатом прозору
++Name[sr@Latn]=Prikaži u zadatom prozoru
+ Name[sv]=Visa i angivet fönster
+ Name[ta]=கà¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà®ªà¯à®ªà®Ÿà¯à®Ÿ சாளரதà¯à®¤à®¿à®²à¯ காடà¯à®Ÿà¯
+ Name[tr]=Belirtilen Pencerede Göster
+ Name[uk]=Відобразити у вказаному вікні
+ Name[uz]=КўрÑатилган ойнада кўрÑатиш
+ Name[wa]=Håyner dins l' purnea specifyî
+-Name[xx]=xxDisplay in Specified Windowxx
+ Name[zh_CN]=在指定窗å£ä¸æ˜¾ç¤º
+ NoDisplay=true
+
+@@ -221,6 +219,7 @@
+ Name[cy]=Dangos mewn Ffenestr Wraidd
+ Name[da]=Visning i root-vindue
+ Name[de]=Im Basisfenster (Root Window) anzeigen
++Name[el]=Î Ïοβολή στο βασικό παÏάθυÏο
+ Name[eo]=Montru en radika fenestro
+ Name[es]=Mostrar en la ventana raÃz
+ Name[et]=Juuraknas näitamine
+@@ -253,13 +252,12 @@
+ Name[sk]=Zobraziť v koreňovom okne
+ Name[sl]=Prikaz v korenskem oknu
+ Name[sr]=Прикажи у кореном прозору
+-Name[sr@Latn]=Прикажи у кореном прозору
++Name[sr@Latn]=Prikaži u korenom prozoru
+ Name[sv]=Visa i rotfönstret
+ Name[ta]=மூல சாளரதà¯à®¤à®¿à®²à¯ காடà¯à®Ÿà¯
+ Name[tr]=Kök Pencerede Göster
+ Name[uk]=Відобразити на тлі екрана
+ Name[uz]=Туб ойнада кўрÑатиш
+ Name[wa]=HÃ¥yner e purnea raecene (li fond do scribanne)
+-Name[xx]=xxDisplay in Root Windowxx
+ Name[zh_CN]=在 Root 窗å£ä¸æ˜¾ç¤º
+ NoDisplay=true
+diff -Nru kdebase-release-3.4.0/ksmserver/shutdown.cpp kdebase-branch-3.4/ksmserver/shutdown.cpp
+--- kdebase-release-3.4.0/ksmserver/shutdown.cpp 2005-02-21 21:01:01.000000000 -0500
++++ kdebase-branch-3.4/ksmserver/shutdown.cpp 2005-03-29 10:03:36.000000000 -0500
+@@ -100,13 +100,12 @@
+ // konqy
+ QFrame* lfrm = new QFrame( frame );
+ lfrm->setFrameStyle( QFrame::Panel | QFrame::Sunken );
+- lfrm->setPaletteBackgroundColor( lfrm->colorGroup().midlight() );
+ hbox->addWidget( lfrm, AlignCenter );
+- QVBoxLayout* iconlay = new QVBoxLayout( lfrm );
+
+ QLabel* icon = new QLabel( lfrm );
+ icon->setPixmap( UserIcon( "shutdownkonq" ) );
+- iconlay->addWidget( icon );
++ lfrm->setFixedSize( icon->sizeHint());
++ icon->setFixedSize( icon->sizeHint());
+
+ // right column (buttons)
+ QVBoxLayout* buttonlay = new QVBoxLayout( hbox, 2 * KDialog::spacingHint() );
+diff -Nru kdebase-release-3.4.0/ksplashml/kcmksplash/ksplashthememgr.desktop kdebase-branch-3.4/ksplashml/kcmksplash/ksplashthememgr.desktop
+--- kdebase-release-3.4.0/ksplashml/kcmksplash/ksplashthememgr.desktop 2005-02-10 23:52:20.000000000 -0500
++++ kdebase-branch-3.4/ksplashml/kcmksplash/ksplashthememgr.desktop 2005-03-07 09:16:11.000000000 -0500
+@@ -67,7 +67,6 @@
+ Name[uz]=СплÑш ойнаÑи
+ Name[ven]=U kwasha tshikirini
+ Name[wa]=Waitroûle d' enondaedje
+-Name[xx]=xxSplash Screenxx
+ Name[zh_CN]=飞溅å±å¹•
+ Name[zh_TW]=Splash ç•«é¢
+ Name[zu]=Isikrini Sokuphahlaza
+@@ -127,7 +126,6 @@
+ Comment[uz]=СплÑш ойнаÑи учун мавзуларни моÑлаш
+ Comment[vi]=Trình quản lý các theme của Splash Screen
+ Comment[wa]=Manaedjeu po les tinmes del waitroûle d' enondaedje
+-Comment[xx]=xxManager for Splash Screen Themesxx
+ Comment[zh_CN]=飞溅å±å¹•主题管ç†å™¨
+ Comment[zh_TW]=Splash ç•«é¢ä½ˆæ™¯ç®¡ç†ç¨‹å¼
+ Keywords=splash screen,splash theme,startup
+@@ -176,7 +174,6 @@
+ Keywords[uk]=екран заÑтавки,тема заÑтавки,запуÑк,Ñтарт
+ Keywords[uz]=ÑплÑш ойнаÑи,ÑплÑш мавзуÑи,ишга тушиш
+ Keywords[vi]=splash screen,splash theme,khởi động
+-Keywords[xx]=xxsplash screen,splash theme,startupxx
+ Keywords[zh_CN]=splash screen,splash theme,startup,飞溅å±å¹•,飞溅主题,å¯åЍ
+ Keywords[zh_TW]=splash screen,splash theme,startup,啟動
+ Categories=Qt;KDE;X-KDE-settings-looknfeel;
+diff -Nru kdebase-release-3.4.0/ksplashml/ksplash.desktop kdebase-branch-3.4/ksplashml/ksplash.desktop
+--- kdebase-release-3.4.0/ksplashml/ksplash.desktop 2004-10-26 23:00:10.000000000 -0400
++++ kdebase-branch-3.4/ksplashml/ksplash.desktop 2005-03-07 09:16:11.000000000 -0500
+@@ -8,7 +8,6 @@
+ Name[pa]=ਕੇਸਪਲੇਸ
+ Name[sv]=Startskärm
+ Name[ta]=Kஸà¯à®ªà¯à®³à®¾à®·à¯
+-Name[xx]=xxKSplashxx
+ Exec=ksplash
+ Icon=ksplash
+ Type=Service
+diff -Nru kdebase-release-3.4.0/ksplashml/themeengine/default/ksplashdefault.desktop kdebase-branch-3.4/ksplashml/themeengine/default/ksplashdefault.desktop
+--- kdebase-release-3.4.0/ksplashml/themeengine/default/ksplashdefault.desktop 2005-02-10 23:52:20.000000000 -0500
++++ kdebase-branch-3.4/ksplashml/themeengine/default/ksplashdefault.desktop 2005-03-07 09:16:12.000000000 -0500
+@@ -46,14 +46,13 @@
+ Comment[sk]=Module pre KSplash
+ Comment[sl]=Vstavek KSplash
+ Comment[sr]=KSplash прикључак
+-Comment[sr@Latn]=KSplash dodatak
++Comment[sr@Latn]=KSplash prikljuÄak
+ Comment[sv]=Insticksprogram för startskärm
+ Comment[ta]=Kஸà¯à®ªà¯à®³à®¾à®·à¯ செரà¯à®•௠பொரà¯à®³à¯
+ Comment[tg]=МутаÑÑалкунандаи KSplash
+ Comment[tr]=KSplash Eklentisi
+ Comment[uk]=Втулок KSplash
+ Comment[uz]=KSplash плагини
+-Comment[xx]=xxKSplash Pluginxx
+ Comment[zh_CN]=KSplash æ’ä»¶
+ Comment[zh_TW]=KSplash 外掛程å¼
+ Name=KSplashLegacy
+@@ -69,7 +68,6 @@
+ Name[pt_BR]=Herança do KSplash
+ Name[sv]=Klassisk startskärm
+ Name[ta]=Kஸà¯à®ªà¯à®³à®¾à®·à¯ Legacy
+-Name[xx]=xxKSplashLegacyxx
+ ServiceTypes=KSplash/Plugin
+ X-KDE-Library=ksplashdefault
+ X-KSplash-Default=true
+diff -Nru kdebase-release-3.4.0/ksplashml/themeengine/redmond/ksplashredmond.desktop kdebase-branch-3.4/ksplashml/themeengine/redmond/ksplashredmond.desktop
+--- kdebase-release-3.4.0/ksplashml/themeengine/redmond/ksplashredmond.desktop 2005-02-10 23:52:20.000000000 -0500
++++ kdebase-branch-3.4/ksplashml/themeengine/redmond/ksplashredmond.desktop 2005-03-07 09:16:12.000000000 -0500
+@@ -46,14 +46,13 @@
+ Comment[sk]=Module pre KSplash
+ Comment[sl]=Vstavek KSplash
+ Comment[sr]=KSplash прикључак
+-Comment[sr@Latn]=KSplash dodatak
++Comment[sr@Latn]=KSplash prikljuÄak
+ Comment[sv]=Insticksprogram för startskärm
+ Comment[ta]=Kஸà¯à®ªà¯à®³à®¾à®·à¯ செரà¯à®•௠பொரà¯à®³à¯
+ Comment[tg]=МутаÑÑалкунандаи KSplash
+ Comment[tr]=KSplash Eklentisi
+ Comment[uk]=Втулок KSplash
+ Comment[uz]=KSplash плагини
+-Comment[xx]=xxKSplash Pluginxx
+ Comment[zh_CN]=KSplash æ’ä»¶
+ Comment[zh_TW]=KSplash 外掛程å¼
+ Name=KSplashRedmond
+@@ -68,7 +67,6 @@
+ Name[pt_BR]=Tela de Apresentação de Redmond
+ Name[sv]=Redmond startskärm
+ Name[ta]=Kஸà¯à®ªà¯à®³à®¾à®·à¯à®°à¯†à®Ÿà¯à®®à®¾à®©à¯
+-Name[xx]=xxKSplashRedmondxx
+ Name[zh_TW]=KSplachRedmond
+ ServiceTypes=KSplash/Plugin
+ X-KDE-Library=ksplashredmond
+diff -Nru kdebase-release-3.4.0/ksplashml/themeengine/redmond/previewredmond.cpp kdebase-branch-3.4/ksplashml/themeengine/redmond/previewredmond.cpp
+--- kdebase-release-3.4.0/ksplashml/themeengine/redmond/previewredmond.cpp 2004-02-24 06:30:14.000000000 -0500
++++ kdebase-branch-3.4/ksplashml/themeengine/redmond/previewredmond.cpp 2005-03-16 13:27:05.000000000 -0500
+@@ -38,7 +38,7 @@
+ m_userColor (Qt::darkGray),
+ m_statusColor (Qt::white),
+
+- m_icon (DesktopIcon("go")),
++ m_icon (DesktopIcon("kmenu")),
+
+ m_showWelcomeString (true),
+ m_showUserString (true),
+diff -Nru kdebase-release-3.4.0/ksplashml/themeengine/redmond/themeredmond.cpp kdebase-branch-3.4/ksplashml/themeengine/redmond/themeredmond.cpp
+--- kdebase-release-3.4.0/ksplashml/themeengine/redmond/themeredmond.cpp 2005-01-21 16:33:06.000000000 -0500
++++ kdebase-branch-3.4/ksplashml/themeengine/redmond/themeredmond.cpp 2005-03-16 13:21:52.000000000 -0500
+@@ -71,7 +71,7 @@
+ _preview->setUserColor( c->readColorEntry( "Username Text Color", &defaultWhiteColor ) );
+ _preview->setStatusColor( c->readColorEntry( "Action Text Color", &defaultDarkColor ) );
+
+- _preview->setIcon( c->readEntry( "User Icon", "go" ) );
++ _preview->setIcon( c->readEntry( "User Icon", "kmenu" ) );
+
+ QLabel *lbl = new QLabel( vbox );
+ lbl->setText( i18n("(Sorry, but I haven't finished writing this one yet...)") );
+@@ -126,7 +126,7 @@
+ bgimg = mTheme->locateThemeData( "Background.png" );
+
+ if( mPixmap.isNull() )
+- mPixmap = DesktopIcon( "go", 48 );
++ mPixmap = DesktopIcon( "kmenu", 48 );
+
+ QPixmap pix( bgimg );
+
+@@ -323,7 +323,7 @@
+
+ // Overall appearance
+ mBackgroundImage = cfg->readEntry( "Background Image", QString::null );
+- mIcon = cfg->readEntry( "User Icon", "go" );
++ mIcon = cfg->readEntry( "User Icon", "kmenu" );
+ mWelcomeText = cfg->readEntry( "Welcome Text", i18n("Welcome") );
+ mUsernameText = cfg->readEntry( "Username Text", QString::null );
+
+diff -Nru kdebase-release-3.4.0/ksplashml/themeengine/standard/ksplashstandard.desktop kdebase-branch-3.4/ksplashml/themeengine/standard/ksplashstandard.desktop
+--- kdebase-release-3.4.0/ksplashml/themeengine/standard/ksplashstandard.desktop 2005-02-10 23:52:21.000000000 -0500
++++ kdebase-branch-3.4/ksplashml/themeengine/standard/ksplashstandard.desktop 2005-03-07 09:16:12.000000000 -0500
+@@ -46,14 +46,13 @@
+ Comment[sk]=Module pre KSplash
+ Comment[sl]=Vstavek KSplash
+ Comment[sr]=KSplash прикључак
+-Comment[sr@Latn]=KSplash dodatak
++Comment[sr@Latn]=KSplash prikljuÄak
+ Comment[sv]=Insticksprogram för startskärm
+ Comment[ta]=Kஸà¯à®ªà¯à®³à®¾à®·à¯ செரà¯à®•௠பொரà¯à®³à¯
+ Comment[tg]=МутаÑÑалкунандаи KSplash
+ Comment[tr]=KSplash Eklentisi
+ Comment[uk]=Втулок KSplash
+ Comment[uz]=KSplash плагини
+-Comment[xx]=xxKSplash Pluginxx
+ Comment[zh_CN]=KSplash æ’ä»¶
+ Comment[zh_TW]=KSplash 外掛程å¼
+ Name=KSplashStandard
+@@ -69,7 +68,6 @@
+ Name[pt_BR]=Tela de Apresentação Padrão
+ Name[sv]=Vanlig startskärm
+ Name[ta]=Kஸà¯à®ªà¯à®³à®¾à®·à¯à®¨à®¿à®²à¯ˆà®¯à®¾à®©
+-Name[xx]=xxKSplashStandardxx
+ ServiceTypes=KSplash/Plugin
+ X-KDE-Library=ksplashstandard
+ X-KSplash-Default=true
+diff -Nru kdebase-release-3.4.0/ksplashml/wndmain.cpp kdebase-branch-3.4/ksplashml/wndmain.cpp
+--- kdebase-release-3.4.0/ksplashml/wndmain.cpp 2004-09-14 07:39:33.000000000 -0400
++++ kdebase-branch-3.4/ksplashml/wndmain.cpp 2005-03-08 09:28:50.000000000 -0500
+@@ -176,6 +176,20 @@
+ }
+ }
+
++void KSplash::updateState( unsigned int state )
++{
++// The whole state updating in ksplashml is simply weird,
++// nextIcon() and also the themes naively assume all states
++// will come, and will come in the expected order, which
++// is not guaranteed, and can happen easily with faster machines.
++// And upAndRunning() even is written to handle it gracefully.
++ while( state > mState )
++ {
++ ++mState;
++ nextIcon();
++ }
++}
++
+ // For KDE startup only.
+ void KSplash::upAndRunning( QString s )
+ {
+@@ -195,61 +209,54 @@
+ if( s == "dcop" )
+ {
+ if( mState > 1 ) return;
+- mState = 1;
++ updateState( 1 );
+ mStep = 1;
+- nextIcon();
+ }
+ else if( s == "kded" )
+ {
+ if( mState > 2 ) return;
+- mState = 2;
++ updateState( 2 );
+ mStep = 2;
+- nextIcon();
+ }
+ else if( s == "kcminit" )
+ ; // No icon
+ else if( s == "ksmserver" )
+ {
+ if( mState > 3 ) return;
+- mState = 3;
++ updateState( 3 );
+ mStep = 3;
+- nextIcon();
+ }
+ else if( s == "wm started" )
+ {
+ if( mState > 4 ) return;
+- mState = 4;
++ updateState( 4 );
+ mStep = 4;
+- nextIcon();
+ }
+ else if( s == "kdesktop" )
+ {
+ if( mState > 5 ) return;
+- mState = 5;
++ updateState( 5 );
+ mStep = 5;
+- nextIcon();
+ }
+ else if( s == "kicker" )
+ {
+ if( mState > 6 ) return;
+- mState = 6;
++ updateState( 6 );
+ mStep = 6;
+- nextIcon();
+ setMaxProgress( mMaxProgress ); // show the progressbar
+ }
+ // else if( (s == "restore session") )
+ // {
+ // if( mState > 7 ) return;
+-// mState = 7;
++// updateState( 7 );
+ // mStep = 7;
+ // mSessMgrCalled = true;
+-// nextIcon();
+ // }
+ else if( s == "session ready" )
+ {
++ updateState( 7 );
+ mStep = 9;
+ //if(!mSessMgrCalled) emit nextIcon();
+- nextIcon();
+ mTimeToGo = true;
+ close_timer->stop();
+ QTimer::singleShot( 1000, this, SLOT(close()));
+diff -Nru kdebase-release-3.4.0/ksplashml/wndmain.h kdebase-branch-3.4/ksplashml/wndmain.h
+--- kdebase-release-3.4.0/ksplashml/wndmain.h 2004-09-13 04:34:01.000000000 -0400
++++ kdebase-branch-3.4/ksplashml/wndmain.h 2005-03-08 09:28:50.000000000 -0500
+@@ -83,6 +83,7 @@
+
+ private:
+ ThemeEngine *_loadThemeEngine( const QString& pluginName, const QString& theme );
++ void updateState( unsigned int state );
+
+ protected:
+ unsigned int mState;
+diff -Nru kdebase-release-3.4.0/ksysguard/example/eventsrc kdebase-branch-3.4/ksysguard/example/eventsrc
+--- kdebase-release-3.4.0/ksysguard/example/eventsrc 2005-02-18 23:27:16.000000000 -0500
++++ kdebase-branch-3.4/ksysguard/example/eventsrc 2005-03-30 01:47:56.000000000 -0500
+@@ -64,7 +64,6 @@
+ Comment[ven]=Mulindi wa maitele a KDE
+ Comment[vi]=Trình bảo vệ hệ thống KDE
+ Comment[xh]=KDE Ukhuselo lendlela yokusebenza
+-Comment[xx]=xxKDE System Guardxx
+ Comment[zh_CN]=KDE 系统å«å£«
+ Comment[zh_TW]=KDE 系統守衛
+ Comment[zu]=Unogada Wesistimu ye-KDE
+@@ -106,7 +105,6 @@
+ Name[th]=เข้าà¸à¸±à¸šà¸£à¸¹à¸›à¹à¸šà¸š
+ Name[ven]=Maitele_Fana
+ Name[xh]=umlinganiselo_thelekisa
+-Name[xx]=xxpattern_matchxx
+ Name[zh_TW]=æ¯”å°æ£ç¢º
+ Name[zu]=ukufanisa_iphethini
+ Comment=Search pattern matched
+@@ -117,6 +115,7 @@
+ Comment[cs]=Hledaný vzor odpovÃdá
+ Comment[da]=Søgemønsteret matchede
+ Comment[de]=Übereinstimmung mit Suchmuster
++Comment[el]=ΤαίÏιασμα μοτίβου αναζήτησης
+ Comment[eo]=SerĉoÅablonesprimo kunvenita
+ Comment[es]=Coincidencia con el patrón de búsqueda
+ Comment[et]=Otsingu muster sobib
+@@ -148,12 +147,11 @@
+ Comment[sk]=Nájdené podľa vzorky
+ Comment[sl]=Iskalni vzorec se ujema
+ Comment[sr]=Подударан узорак је пронађен
+-Comment[sr@Latn]=Подударан узорак је пронађен
++Comment[sr@Latn]=Podudaran uzorak je pronađen
+ Comment[sv]=Sökmönster igenkänt
+ Comment[ta]=மாதிரி பொரà¯à®¤à¯à®¤à®¤à¯à®¤à¯ˆ தேடà¯
+ Comment[tr]=Eşleşen örüntüyü ara
+ Comment[uk]=Знайдено взірець пошуку
+-Comment[xx]=xxSearch pattern matchedxx
+ Comment[zh_CN]=æœç´¢åŒ¹é…的模å¼
+
+ [sensor_alarm]
+@@ -191,7 +189,6 @@
+ Name[ven]=Zwipfi_Alamu
+ Name[vi]=báo động của bộ dò
+ Name[xh]=uluvo_oluvusayo
+-Name[xx]=xxsensor_alarmxx
+ Name[zh_TW]=嵿¸¬å™¨é€šçŸ¥
+ Name[zu]=i-alamu_enemizwa
+ Comment=Sensor exceeded critical limit
+@@ -251,6 +248,5 @@
+ Comment[ven]=Tshisedzi tsho engedza phungudzo i sasaladzeaho
+ Comment[vi]=bộ cảm vượt quá giới hạn chịu đựng
+ Comment[xh]=Umda wokufumana ingxaki ekhoyo woluvo
+-Comment[xx]=xxSensor exceeded critical limitxx
+ Comment[zh_TW]=嵿¸¬å™¨è¶…éŽè‡¨ç•Œé™åˆ¶
+ Comment[zu]=Umuzwa udlule isilinganiso esibucayi
+diff -Nru kdebase-release-3.4.0/ksysguard/gui/ksysguard.desktop kdebase-branch-3.4/ksysguard/gui/ksysguard.desktop
+--- kdebase-release-3.4.0/ksysguard/gui/ksysguard.desktop 2005-02-23 00:05:59.000000000 -0500
++++ kdebase-branch-3.4/ksysguard/gui/ksysguard.desktop 2005-03-30 01:47:57.000000000 -0500
+@@ -26,21 +26,24 @@
+ Name[tg]=Муҳофизати ÑиÑтемаи-K
+ Name[th]=ตรวจสà¸à¸šà¹à¸¥à¸°à¸›à¹‰à¸à¸‡à¸à¸±à¸™à¸£à¸°à¸šà¸š
+ Name[uz]=KDE тизим назоратчиÑи
+-Name[xx]=xxKSysGuardxx
+ GenericName=Performance Monitor
+ GenericName[bg]=Мониторинг на ÑиÑтемата
++GenericName[bs]=Monitor performansi
+ GenericName[ca]=Monitor de rendiment
+ GenericName[cs]=Monitor výkonu
+ GenericName[da]=Overvågning af ydelse
+ GenericName[de]=Performance-Monitor
++GenericName[el]=Επόπτης συστήματος
+ GenericName[es]=Monitor de rendimiento
+ GenericName[et]=Jõudluse monitor
++GenericName[eu]=Sistemaren errendimenduaren monitorea
+ GenericName[fi]=Järjestelmän suorituskyvyn monitori
+ GenericName[fr]=Indicateurs de performance
+ GenericName[he]=צג מערכת
+ GenericName[hu]=TeljesÃtményfigyelÅ‘
+ GenericName[is]=Afkasta eftirlit
+ GenericName[it]=Monitor delle prestazioni
++GenericName[ja]=パフォーマンス モニター
+ GenericName[lt]=Veiksenos monitorius
+ GenericName[nb]=Ytelsesovervåker
+ GenericName[nl]=Prestatiemonitor
+@@ -50,13 +53,13 @@
+ GenericName[pt_BR]=Monitor de Performance
+ GenericName[ru]=Монитор производительноÑти
+ GenericName[se]=Buvttogoziheaddji
++GenericName[sk]=Monitor systému
+ GenericName[sl]=Nadzor delovanja
+ GenericName[sr]=Монитор перформанÑи
+-GenericName[sr@Latn]=Монитор перформанÑи
++GenericName[sr@Latn]=Monitor performansi
+ GenericName[sv]=Prestandaövervakare
+ GenericName[ta]=செயலà¯à®¤à®¿à®±à®©à¯ திரை
+ GenericName[uk]=Монітор швидкодії
+-GenericName[xx]=xxPerformance Monitorxx
+ GenericName[zh_CN]=性能监视器
+ Exec=ksysguard %U
+ Icon=ksysguard
+diff -Nru kdebase-release-3.4.0/ksysguard/gui/ksysguardapplet.desktop kdebase-branch-3.4/ksysguard/gui/ksysguardapplet.desktop
+--- kdebase-release-3.4.0/ksysguard/gui/ksysguardapplet.desktop 2005-02-10 23:52:21.000000000 -0500
++++ kdebase-branch-3.4/ksysguard/gui/ksysguardapplet.desktop 2005-03-07 09:16:13.000000000 -0500
+@@ -26,7 +26,6 @@
+ Name[tg]=Муҳофизати ÑиÑтемаи-K
+ Name[th]=ตรวจสà¸à¸šà¹à¸¥à¸°à¸›à¹‰à¸à¸‡à¸à¸±à¸™à¸£à¸°à¸šà¸š
+ Name[uz]=KDE тизим назоратчиÑи
+-Name[xx]=xxKSysGuardxx
+ Comment=The KDE System Guard Applet.
+ Comment[af]=Die Kde Stelsel Wag Miniprogram.
+ Comment[ar]=بريمج ØØ§Ø±Ø³ النظام
+@@ -89,7 +88,6 @@
+ Comment[ven]=Apulete ya mulindi wa maitele a KDE.
+ Comment[vi]=Applet cho Trình bảo vệ hệ thống của KDE
+ Comment[xh]=I Applet Engumkhuseli Wendlela ye KDE.
+-Comment[xx]=xxThe KDE System Guard Applet.xx
+ Comment[zh_CN]=KDE 系统å«å£«å°ç¨‹åºã€‚
+ Comment[zh_TW]=KDE ç³»çµ±å®ˆè¡›é¢æ¿ç¨‹å¼ã€‚
+ Comment[zu]=i-Applet engunogada Wesistimu ye-KDE.
+diff -Nru kdebase-release-3.4.0/ksysguard/gui/x-ksysguard.desktop kdebase-branch-3.4/ksysguard/gui/x-ksysguard.desktop
+--- kdebase-release-3.4.0/ksysguard/gui/x-ksysguard.desktop 2005-02-04 23:15:45.000000000 -0500
++++ kdebase-branch-3.4/ksysguard/gui/x-ksysguard.desktop 2005-03-07 09:16:13.000000000 -0500
+@@ -67,7 +67,6 @@
+ Comment[ven]=Mulindi wa maitele a KDE
+ Comment[vi]=Trình bảo vệ hệ thống KDE
+ Comment[xh]=KDE Ukhuselo lendlela yokusebenza
+-Comment[xx]=xxKDE System Guardxx
+ Comment[zh_CN]=KDE 系统å«å£«
+ Comment[zh_TW]=KDE 系統守衛
+ Comment[zu]=Unogada Wesistimu ye-KDE
+diff -Nru kdebase-release-3.4.0/ktip/ktip.desktop kdebase-branch-3.4/ktip/ktip.desktop
+--- kdebase-release-3.4.0/ktip/ktip.desktop 2005-02-23 00:05:59.000000000 -0500
++++ kdebase-branch-3.4/ktip/ktip.desktop 2005-03-22 12:38:20.000000000 -0500
+@@ -4,13 +4,14 @@
+ Name[bn]=কে-টিপ
+ Name[cy]=KCynghoryn
+ Name[pa]=ਕੇਟਿੱਪ
++Name[sk]=Tipy
+ Name[sl]=KNamig
+ Name[sv]=Ktip
+-Name[xx]=xxKTipxx
+ GenericName=Useful Tips
+ GenericName[bg]=Полезни Ñъвети
+ GenericName[bn]=কাজের টিপà§â€Œà¦¸
+ GenericName[br]=Lagadennoù talvoudus
++GenericName[bs]=Korisni savjeti
+ GenericName[ca]=Consells útils
+ GenericName[cs]=UžiteÄné tipy
+ GenericName[cy]=Cynghorion Defnyddiol
+@@ -18,6 +19,7 @@
+ GenericName[de]=Nützliche Tipps
+ GenericName[es]=Consejos útiles
+ GenericName[et]=Kasulikud nõuanded
++GenericName[eu]=Aholku erabilgarriak
+ GenericName[fi]=Hyödylliset vihjeet
+ GenericName[fr]=Conseils utiles
+ GenericName[fy]=Brûkbare tips
+@@ -35,12 +37,12 @@
+ GenericName[pt_BR]=Dicas Úteis
+ GenericName[ru]=Полезные Ñоветы
+ GenericName[se]=ÃvkkálaÅ¡ rávvágat
++GenericName[sk]=Šikovné tipy
+ GenericName[sl]=Uporabni namigi
+ GenericName[sr]=КориÑни Ñавети
+-GenericName[sr@Latn]=КориÑни Ñавети
++GenericName[sr@Latn]=Korisni saveti
+ GenericName[sv]=Nyttiga tips
+ GenericName[uk]=КориÑні поради
+-GenericName[xx]=xxUseful Tipsxx
+ GenericName[zh_CN]=有用的æç¤º
+ Exec=ktip
+ Icon=ktip
+diff -Nru kdebase-release-3.4.0/kwin/activation.cpp kdebase-branch-3.4/kwin/activation.cpp
+--- kdebase-release-3.4.0/kwin/activation.cpp 2005-02-20 18:06:11.000000000 -0500
++++ kdebase-branch-3.4/kwin/activation.cpp 2005-03-23 08:50:28.000000000 -0500
+@@ -275,7 +275,8 @@
+ if( c->isMinimized())
+ c->unminimize();
+
+- if( options->focusPolicyIsReasonable())
++// TODO force should perhaps allow this only if the window already contains the mouse
++ if( options->focusPolicyIsReasonable() || force )
+ requestFocus( c, force );
+
+ // Don't update user time for clients that have focus stealing workaround.
+diff -Nru kdebase-release-3.4.0/kwin/clients/b2/b2.desktop kdebase-branch-3.4/kwin/clients/b2/b2.desktop
+--- kdebase-release-3.4.0/kwin/clients/b2/b2.desktop 2004-10-26 23:00:15.000000000 -0400
++++ kdebase-branch-3.4/kwin/clients/b2/b2.desktop 2005-03-07 09:16:14.000000000 -0500
+@@ -6,5 +6,4 @@
+ Name[hi]=बी II
+ Name[lo]= B II
+ Name[th]=ชุดตà¸à¹à¸•่ง B II
+-Name[xx]=xxB IIxx
+ X-KDE-Library=kwin3_b2
+diff -Nru kdebase-release-3.4.0/kwin/clients/b2/b2client.cpp kdebase-branch-3.4/kwin/clients/b2/b2client.cpp
+--- kdebase-release-3.4.0/kwin/clients/b2/b2client.cpp 2004-11-25 11:08:44.000000000 -0500
++++ kdebase-branch-3.4/kwin/clients/b2/b2client.cpp 2005-03-27 09:04:53.000000000 -0500
+@@ -354,6 +354,9 @@
+ i18n("Resize")
+ };
+
++ // This check has to be made early - to make the preview widget work.
++ resizable = isResizable();
++
+ createMainWidget(WResizeNoErase | WRepaintNoErase);
+ widget()->installEventFilter(this);
+
+@@ -425,7 +428,6 @@
+ positionButtons();
+ titlebar->recalcBuffer();
+ titlebar->installEventFilter(this);
+- resizable = isResizable();
+ }
+
+ void B2Client::addButtons(const QString& s, const QString tips[],
+diff -Nru kdebase-release-3.4.0/kwin/clients/keramik/keramik.desktop kdebase-branch-3.4/kwin/clients/keramik/keramik.desktop
+--- kdebase-release-3.4.0/kwin/clients/keramik/keramik.desktop 2005-02-04 23:15:46.000000000 -0500
++++ kdebase-branch-3.4/kwin/clients/keramik/keramik.desktop 2005-03-07 09:16:15.000000000 -0500
+@@ -21,6 +21,5 @@
+ Name[th]=เครามิà¸
+ Name[uk]=Керамік
+ Name[uz]=Керамика
+-Name[xx]=xxKeramikxx
+ X-KDE-Library=kwin3_keramik
+
+diff -Nru kdebase-release-3.4.0/kwin/clients/kwmtheme/kwmtheme.desktop kdebase-branch-3.4/kwin/clients/kwmtheme/kwmtheme.desktop
+--- kdebase-release-3.4.0/kwin/clients/kwmtheme/kwmtheme.desktop 2005-02-04 23:15:46.000000000 -0500
++++ kdebase-branch-3.4/kwin/clients/kwmtheme/kwmtheme.desktop 2005-03-07 09:16:15.000000000 -0500
+@@ -21,7 +21,7 @@
+ Name[fa]=Ø·Ø±Ø KWM
+ Name[fi]=KWM-teema
+ Name[fr]=Thème KWM
+-Name[fy]=KWM-thema
++Name[fy]=KWM-tema
+ Name[ga]=Téama KWM
+ Name[gl]=Tema do KWM
+ Name[hi]=केडबलà¥à¤¯à¥‚à¤à¤® पà¥à¤°à¤¸à¤‚ग
+@@ -66,7 +66,6 @@
+ Name[ven]=Thero ya KWM
+ Name[wa]=Tinme KWM
+ Name[xh]=Umxholo we KWM
+-Name[xx]=xxKWM Themexx
+ Name[zh_CN]=KWM 主题
+ Name[zh_TW]=KWM 主題
+ Name[zu]=Ingqikithi ye-KWM
+diff -Nru kdebase-release-3.4.0/kwin/clients/laptop/laptop.desktop kdebase-branch-3.4/kwin/clients/laptop/laptop.desktop
+--- kdebase-release-3.4.0/kwin/clients/laptop/laptop.desktop 2005-02-23 00:05:59.000000000 -0500
++++ kdebase-branch-3.4/kwin/clients/laptop/laptop.desktop 2005-03-07 09:16:15.000000000 -0500
+@@ -51,7 +51,6 @@
+ Name[ven]=Khomupwutha pfarwa
+ Name[wa]=Poirtåve
+ Name[xh]=Umphezulu osongiweyo
+-Name[xx]=xxLaptopxx
+ Name[zh_CN]=è†ä¸Šè®¡ç®—机
+ Name[zh_TW]=è†ä¸Šåž‹çš„電腦
+ Name[zu]=Ikhomputha ephathwayo eyisicaba
+diff -Nru kdebase-release-3.4.0/kwin/clients/plastik/plastik.desktop kdebase-branch-3.4/kwin/clients/plastik/plastik.desktop
+--- kdebase-release-3.4.0/kwin/clients/plastik/plastik.desktop 2005-02-10 23:52:22.000000000 -0500
++++ kdebase-branch-3.4/kwin/clients/plastik/plastik.desktop 2005-03-07 09:16:16.000000000 -0500
+@@ -24,5 +24,4 @@
+ Name[th]=พลาสติà¸
+ Name[uk]=ПлаÑтік
+ Name[uz]=ПлаÑтик
+-Name[xx]=xxPlastikxx
+ X-KDE-Library=kwin3_plastik
+diff -Nru kdebase-release-3.4.0/kwin/clients/quartz/quartz.desktop kdebase-branch-3.4/kwin/clients/quartz/quartz.desktop
+--- kdebase-release-3.4.0/kwin/clients/quartz/quartz.desktop 2004-12-11 01:37:15.000000000 -0500
++++ kdebase-branch-3.4/kwin/clients/quartz/quartz.desktop 2005-03-07 09:16:16.000000000 -0500
+@@ -24,6 +24,5 @@
+ Name[uk]=Кварц
+ Name[uz]=Чақмоқтош
+ Name[ven]=Musuku
+-Name[xx]=xxQuartzxx
+ Name[zh_TW]=石英
+ X-KDE-Library=kwin3_quartz
+diff -Nru kdebase-release-3.4.0/kwin/clients/redmond/redmond.desktop kdebase-branch-3.4/kwin/clients/redmond/redmond.desktop
+--- kdebase-release-3.4.0/kwin/clients/redmond/redmond.desktop 2004-10-26 23:00:16.000000000 -0400
++++ kdebase-branch-3.4/kwin/clients/redmond/redmond.desktop 2005-03-07 09:16:16.000000000 -0500
+@@ -12,5 +12,4 @@
+ Name[ta]=ரெடà¯à®®à®¾à®©à¯à®Ÿà¯
+ Name[th]=à¹à¸šà¸šà¹€à¸£à¸”มà¸à¸™à¸”์
+ Name[uz]=Редмонд
+-Name[xx]=xxRedmondxx
+ X-KDE-Library=kwin3_redmond
+diff -Nru kdebase-release-3.4.0/kwin/clients/test/test.desktop kdebase-branch-3.4/kwin/clients/test/test.desktop
+--- kdebase-release-3.4.0/kwin/clients/test/test.desktop 2005-02-04 23:15:47.000000000 -0500
++++ kdebase-branch-3.4/kwin/clients/test/test.desktop 2005-03-07 09:16:16.000000000 -0500
+@@ -43,7 +43,6 @@
+ Name[uk]=ТеÑÑ‚ KWin
+ Name[uz]=KWin Ñинаш
+ Name[vi]=Thá» KWin
+-Name[xx]=xxKWin testxx
+ Name[zh_CN]=KWin 测试
+ Name[zh_TW]=KWin 測試
+ X-KDE-Library=kwin3_test
+diff -Nru kdebase-release-3.4.0/kwin/clients/web/web.desktop kdebase-branch-3.4/kwin/clients/web/web.desktop
+--- kdebase-release-3.4.0/kwin/clients/web/web.desktop 2005-02-04 23:15:47.000000000 -0500
++++ kdebase-branch-3.4/kwin/clients/web/web.desktop 2005-03-07 09:16:17.000000000 -0500
+@@ -32,7 +32,6 @@
+ Name[uz]=Веб
+ Name[ven]=Webu
+ Name[wa]=Waibe
+-Name[xx]=xxWebxx
+ Name[zh_TW]=ç¶²é
+ Name[zu]=I-Web
+ X-KDE-Library=kwin3_web
+diff -Nru kdebase-release-3.4.0/kwin/eventsrc kdebase-branch-3.4/kwin/eventsrc
+--- kdebase-release-3.4.0/kwin/eventsrc 2005-02-18 23:27:16.000000000 -0500
++++ kdebase-branch-3.4/kwin/eventsrc 2005-03-30 01:47:57.000000000 -0500
+@@ -68,7 +68,6 @@
+ Comment[vi]=Trình quản là cá»a sổ cá»§a KDE
+ Comment[wa]=Li manaedjeu di purneas di KDE
+ Comment[xh]=Umphathi we Window ye KDE
+-Comment[xx]=xxThe KDE Window Managerxx
+ Comment[zh_CN]=KDE 窗å£ç®¡ç†å™¨
+ Comment[zh_TW]=KDE 視窗管ç†ç¨‹å¼
+ Comment[zu]=Imenenja yama-Window ye-KDE
+@@ -87,7 +86,7 @@
+ Name[cy]=Newid i Penbwrdd 1
+ Name[da]=Skift til desktop 1
+ Name[de]=Wechsel zu Arbeitsfläche 1
+-Name[el]=Αλλαγή στην Επιφάνεια εÏγασίας 1
++Name[el]=Αλλαγή στην επιφάνεια εÏγασίας 1
+ Name[eo]=Al tabulo 1
+ Name[es]=Cambiar al escritorio 1
+ Name[et]=Liikumine 1. töölauale
+@@ -142,7 +141,6 @@
+ Name[vi]=Äổi vá» Desktop 1
+ Name[wa]=Potchî sol prumî scribanne
+ Name[xh]=Tshintshela kwi Desktop 1
+-Name[xx]=xxChange to Desktop 1xx
+ Name[zh_CN]=æ›´æ”¹åˆ°æ¡Œé¢ 1
+ Name[zh_TW]=切æ›åˆ°æ¡Œé¢ä¸€
+ Name[zu]=Shintshela kwi-Desktop 1
+@@ -157,6 +155,7 @@
+ Comment[cs]=Je vybrána virtuálnà plocha 1
+ Comment[da]=Virtuel desktop én er valgt
+ Comment[de]=Virtuelle Arbeitsfläche 1 ausgewählt
++Comment[el]=Έχει επιλεγεί η εικονική επιφάνεια εÏγασίας 1
+ Comment[eo]=Tabulo unua estas elektita
+ Comment[es]=Seleccionado el escritorio virtual Uno
+ Comment[et]=Esimene virtuaalne töölaud on valitud
+@@ -188,14 +187,13 @@
+ Comment[sk]=Je zvolená virtuálna plocha 1
+ Comment[sl]=Izbrano je prvo navidezno namizje
+ Comment[sr]=Изабрана је прва виртуелна радна површина
+-Comment[sr@Latn]=Изабрана је прва виртуелна радна површина
++Comment[sr@Latn]=Izabrana je prva virtuelna radna površina
+ Comment[sv]=Virtuellt skrivbord ett är valt
+ Comment[ta]=மெயà¯à®¨à®¿à®•ர௠மேலà¯à®®à¯‡à®šà¯ˆ ஒனà¯à®±à¯ தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯à®•à¯à®•பà¯à®ªà®Ÿà¯à®Ÿà®¤à¯
+ Comment[tr]=Sanal masaüstü bir seçili
+ Comment[uk]=Вибрано віртуальну Ñтільницю Один
+ Comment[uz]=Биринчи виртуал иш Ñтоли танланган
+ Comment[wa]=Li prumî forveyou scribanne a stî tchoezi
+-Comment[xx]=xxVirtual desktop one is selectedxx
+ Comment[zh_CN]=é€‰æ‹©äº†è™šæ‹Ÿæ¡Œé¢ 1
+ default_sound=KDE_Desktop_1.ogg
+ default_presentation=0
+@@ -214,7 +212,7 @@
+ Name[cy]=Newid i Penbwrdd 2
+ Name[da]=Skift til desktop 2
+ Name[de]=Wechsel zu Arbeitsfläche 2
+-Name[el]=Αλλαγή στην Επιφάνεια εÏγασίας 2
++Name[el]=Αλλαγή στην επιφάνεια εÏγασίας 2
+ Name[eo]=Al tabulo 2
+ Name[es]=Cambiar al escritorio 2
+ Name[et]=Liikumine 2. töölauale
+@@ -269,7 +267,6 @@
+ Name[vi]=Äổi vá» Desktop 2
+ Name[wa]=Potchî sol deujhinme sicribanne
+ Name[xh]=Tshintshela kwi Desktop 2
+-Name[xx]=xxChange to Desktop 2xx
+ Name[zh_CN]=æ›´æ”¹åˆ°æ¡Œé¢ 2
+ Name[zh_TW]=切æ›åˆ°æ¡Œé¢äºŒ
+ Name[zu]=Shintshela kwi-Desktop 2
+@@ -284,6 +281,7 @@
+ Comment[cs]=Je vybrána virtuálnà plocha 2
+ Comment[da]=Virtuel desktop to er valgt
+ Comment[de]=Virtuelle Arbeitsfläche 2 ausgewählt
++Comment[el]=Έχει επιλεγεί η εικονική επιφάνεια εÏγασίας 2
+ Comment[eo]=Tabulo dua estas elektita
+ Comment[es]=Seleccionado el escritorio virtual Dos
+ Comment[et]=Teine virtuaalne töölaud on valitud
+@@ -315,14 +313,13 @@
+ Comment[sk]=Je zvolená virtuálna plocha 2
+ Comment[sl]=Izbrano je drugo navidezno namizje
+ Comment[sr]=Изабрана је друга виртуелна радна површина
+-Comment[sr@Latn]=Изабрана је друга виртуелна радна површина
++Comment[sr@Latn]=Izabrana je druga virtuelna radna površina
+ Comment[sv]=Virtuellt skrivbord två är valt
+ Comment[ta]=மெயà¯à®¨à®¿à®•ர௠மேலà¯à®®à¯‡à®šà¯ˆ இரணà¯à®Ÿà¯ தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯à®•à¯à®•பà¯à®ªà®Ÿà¯à®Ÿà®¤à¯
+ Comment[tr]=Sanal masaüstü iki seçili
+ Comment[uk]=Вибрано віртуальну Ñтільницю Два
+ Comment[uz]=Иккинчи виртуал иш Ñтоли танланган
+ Comment[wa]=Li deujhinme forveyou scribanne a stî tchoezi
+-Comment[xx]=xxVirtual desktop two is selectedxx
+ Comment[zh_CN]=é€‰æ‹©äº†è™šæ‹Ÿæ¡Œé¢ 2
+ default_sound=KDE_Desktop_2.ogg
+ default_presentation=0
+@@ -341,7 +338,7 @@
+ Name[cy]=Newid i Penbwrdd 3
+ Name[da]=Skift til desktop 3
+ Name[de]=Wechsel Arbeitsfläche 3
+-Name[el]=Αλλαγή στην Επιφάνεια εÏγασίας 3
++Name[el]=Αλλαγή στην επιφάνεια εÏγασίας 3
+ Name[eo]=Al tabulo 3
+ Name[es]=Cambiar al escritorio 3
+ Name[et]=Liikumine 3. töölauale
+@@ -396,7 +393,6 @@
+ Name[vi]=Äổi vá» Desktop 3
+ Name[wa]=Potchî sol troejhinme sicribanne
+ Name[xh]=Tshintshela kwi Desktop 3
+-Name[xx]=xxChange to Desktop 3xx
+ Name[zh_CN]=æ›´æ”¹åˆ°æ¡Œé¢ 3
+ Name[zh_TW]=切æ›åˆ°æ¡Œé¢ä¸‰
+ Name[zu]=Shintshela kwi-Desktop 3
+@@ -411,6 +407,7 @@
+ Comment[cs]=Je vybrána virtuálnà plocha 3
+ Comment[da]=Virtuel desktop tre er valgt
+ Comment[de]=Virtuelle Arbeitsfläche 3 ausgewählt
++Comment[el]=Έχει επιλεγεί η εικονική επιφάνεια εÏγασίας 2
+ Comment[eo]=Tabulo tria estas elektita
+ Comment[es]=Seleccionado el escritorio virtual Tres
+ Comment[et]=Kolmas virtuaalne töölaud on valitud
+@@ -442,14 +439,13 @@
+ Comment[sk]=Je zvolená virtuálna plocha 3
+ Comment[sl]=Izbrano je tretje navidezno namizje
+ Comment[sr]=Изабрана је трећа виртуелна радна површина
+-Comment[sr@Latn]=Изабрана је трећа виртуелна радна површина
++Comment[sr@Latn]=Izabrana je treća virtuelna radna površina
+ Comment[sv]=Virtuellt skrivbord tre är valt
+ Comment[ta]=மெயà¯à®¨à®¿à®•ர௠மேலà¯à®®à¯‡à®šà¯ˆ மூனà¯à®±à¯ தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯à®•à¯à®•பà¯à®ªà®Ÿà¯à®Ÿà®¤à¯
+ Comment[tr]=Sanal masaüstü üç seçili
+ Comment[uk]=Вибрано віртуальну Ñтільницю Три
+ Comment[uz]=Учинчи виртуал иш Ñтоли танланган
+ Comment[wa]=Li troejhinme forveyou scribanne a stî tchoezi
+-Comment[xx]=xxVirtual desktop three is selectedxx
+ Comment[zh_CN]=é€‰æ‹©äº†è™šæ‹Ÿæ¡Œé¢ 3
+ default_sound=KDE_Desktop_3.ogg
+ default_presentation=0
+@@ -468,7 +464,7 @@
+ Name[cy]=Newid i Penbwrdd 4
+ Name[da]=Skift til desktop 4
+ Name[de]=Wechsel zu Arbeitsfläche 4
+-Name[el]=Αλλαγή στην Επιφάνεια εÏγασίας 4
++Name[el]=Αλλαγή στην επιφάνεια εÏγασίας 4
+ Name[eo]=Al tabulo 4
+ Name[es]=Cambiar al escritorio 4
+ Name[et]=Liikumine 4. töölauale
+@@ -523,7 +519,6 @@
+ Name[vi]=Äổi vá» Desktop 4
+ Name[wa]=Potchî sol cwatrinme sicribanne
+ Name[xh]=Tshintshela kwi Desktop 4
+-Name[xx]=xxChange to Desktop 4xx
+ Name[zh_CN]=æ›´æ”¹åˆ°æ¡Œé¢ 4
+ Name[zh_TW]=切æ›åˆ°æ¡Œé¢å››
+ Name[zu]=Shintshela kwi-Desktop 4
+@@ -538,6 +533,7 @@
+ Comment[cs]=Je vybrána virtuálnà plocha 4
+ Comment[da]=Virtuel desktop fire er valgt
+ Comment[de]=Virtuelle Arbeitsfläche 4 ausgewählt
++Comment[el]=Έχει επιλεγεί η εικονική επιφάνεια εÏγασίας 4
+ Comment[eo]=Tabulo kvara estas elektita
+ Comment[es]=Seleccionado el escritorio virtual Cuatro
+ Comment[et]=Neljas virtuaalne töölaud on valitud
+@@ -569,14 +565,13 @@
+ Comment[sk]=Je zvolená virtuálna plocha 4
+ Comment[sl]=Izbrano je Äetrto navidezno namizje
+ Comment[sr]=Изабрана је четврта виртуелна радна површина
+-Comment[sr@Latn]=Изабрана је четврта виртуелна радна површина
++Comment[sr@Latn]=Izabrana je Äetvrta virtuelna radna povrÅ¡ina
+ Comment[sv]=Virtuellt skrivbord fyra är valt
+ Comment[ta]=மெயà¯à®¨à®¿à®•ர௠மேலà¯à®®à¯‡à®šà¯ˆ நானà¯à®•௠தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯à®•à¯à®•பà¯à®ªà®Ÿà¯à®Ÿà®¤à¯
+ Comment[tr]=Sanal masaüstü dört seçili
+ Comment[uk]=Вибрано віртуальну Ñтільницю Чотири
+ Comment[uz]=Тўртинчи виртуал иш Ñтоли танланган
+ Comment[wa]=Li cwatrinme forveyou scribanne a stî tchoezi
+-Comment[xx]=xxVirtual desktop four is selectedxx
+ Comment[zh_CN]=é€‰æ‹©äº†è™šæ‹Ÿæ¡Œé¢ 4
+ default_sound=KDE_Desktop_4.ogg
+ default_presentation=0
+@@ -595,7 +590,7 @@
+ Name[cy]=Newid i Penbwrdd 5
+ Name[da]=Skift til desktop 5
+ Name[de]=Wechsel zu Arbeitsfläche 5
+-Name[el]=Αλλαγή στην Επιφάνεια εÏγασίας 5
++Name[el]=Αλλαγή στην επιφάνεια εÏγασίας 5
+ Name[eo]=Al tabulo 5
+ Name[es]=Cambiar al escritorio 5
+ Name[et]=Liikumine 5. töölauale
+@@ -650,7 +645,6 @@
+ Name[vi]=Äổi vá» Desktop 5
+ Name[wa]=Potchî sol cénkinme sicribanne
+ Name[xh]=Tshintshela kwi Desktop 5
+-Name[xx]=xxChange to Desktop 5xx
+ Name[zh_CN]=æ›´æ”¹åˆ°æ¡Œé¢ 5
+ Name[zh_TW]=切æ›åˆ°æ¡Œé¢äº”
+ Name[zu]=Shintshela kwi-Desktop 5
+@@ -665,6 +659,7 @@
+ Comment[cs]=Je vybrána virtuálnà plocha 5
+ Comment[da]=Virtuel desktop fem er valgt
+ Comment[de]=Virtuelle Arbeitsfläche 5 ausgewählt
++Comment[el]=Έχει επιλεγεί η εικονική επιφάνεια εÏγασίας 5
+ Comment[eo]=Tabulo kvina estas elektita
+ Comment[es]=Seleccionado el escritorio virtual Cinco
+ Comment[et]=Viies virtuaalne töölaud on valitud
+@@ -696,14 +691,13 @@
+ Comment[sk]=Je zvolená virtuálna plocha 5
+ Comment[sl]=Izbrano je peto navidezno namizje
+ Comment[sr]=Изабрана је пета виртуелна радна површина
+-Comment[sr@Latn]=Изабрана је пета виртуелна радна површина
++Comment[sr@Latn]=Izabrana je peta virtuelna radna površina
+ Comment[sv]=Virtuellt skrivbord fem är valt
+ Comment[ta]=மெயà¯à®¨à®¿à®•ர௠மேலà¯à®®à¯‡à®šà¯ˆ à®à®¨à¯à®¤à¯ தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯à®•à¯à®•பà¯à®ªà®Ÿà¯à®Ÿà®¤à¯
+ Comment[tr]=Sanal masaüstü beş seçili
+ Comment[uk]=Вибрано віртуальну Ñтільницю П'Ñть
+ Comment[uz]=Бешинчи виртуал иш Ñтоли танланган
+ Comment[wa]=Li cénkinme forveyou scribanne a stî tchoezi
+-Comment[xx]=xxVirtual desktop five is selectedxx
+ Comment[zh_CN]=é€‰æ‹©äº†è™šæ‹Ÿæ¡Œé¢ 5
+ default_sound=KDE_Desktop_5.ogg
+ default_presentation=0
+@@ -722,7 +716,7 @@
+ Name[cy]=Newid i Penbwrdd 6
+ Name[da]=Skift til desktop 6
+ Name[de]=Wechsel zu Arbeitsfläche 6
+-Name[el]=Αλλαγή στην Επιφάνεια εÏγασίας 6
++Name[el]=Αλλαγή στην επιφάνεια εÏγασίας 6
+ Name[eo]=Al tabulo 6
+ Name[es]=Cambiar al escritorio 6
+ Name[et]=Liikumine 6. töölauale
+@@ -777,7 +771,6 @@
+ Name[vi]=Äổi vá» Desktop 6
+ Name[wa]=Potchî sol shijhinme sicribanne
+ Name[xh]=Tshintshela kwi Desktop 6
+-Name[xx]=xxChange to Desktop 6xx
+ Name[zh_CN]=æ›´æ”¹åˆ°æ¡Œé¢ 6
+ Name[zh_TW]=切æ›åˆ°æ¡Œé¢å…
+ Name[zu]=Shintshela kwi-Desktop 6
+@@ -792,6 +785,7 @@
+ Comment[cs]=Je vybrána virtuálnà plocha 6
+ Comment[da]=Virtuel desktop seks er valgt
+ Comment[de]=Virtuelle Arbeitsfläche 6 ausgewählt
++Comment[el]=Έχει επιλεγεί η εικονική επιφάνεια εÏγασίας 6
+ Comment[eo]=Tabulo sesa estas elektita
+ Comment[es]=Seleccionado el escritorio virtual Seis
+ Comment[et]=Kuues virtuaalne töölaud on valitud
+@@ -823,14 +817,13 @@
+ Comment[sk]=Je zvolená virtuálna plocha 6
+ Comment[sl]=Izbrano je šesto navidezno namizje
+ Comment[sr]=Изабрана је шеÑта виртуелна радна површина
+-Comment[sr@Latn]=Изабрана је шеÑта виртуелна радна површина
++Comment[sr@Latn]=Izabrana je šesta virtuelna radna površina
+ Comment[sv]=Virtuellt skrivbord sex är valt
+ Comment[ta]=மெயà¯à®¨à®¿à®•ர௠மேலà¯à®®à¯‡à®šà¯ˆ ஆற௠தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯à®•à¯à®•பà¯à®ªà®Ÿà¯à®Ÿà®¤à¯
+ Comment[tr]=Sanal masaüstü altı seçili
+ Comment[uk]=Вибрано віртуальну Ñтільницю ШіÑть
+ Comment[uz]=Олтинчи виртуал иш Ñтоли танланган
+ Comment[wa]=Li shijhinme forveyou scribanne a stî tchoezi
+-Comment[xx]=xxVirtual desktop six is selectedxx
+ Comment[zh_CN]=é€‰æ‹©äº†è™šæ‹Ÿæ¡Œé¢ 6
+ default_sound=KDE_Desktop_6.ogg
+ default_presentation=0
+@@ -849,7 +842,7 @@
+ Name[cy]=Newid i Penbwrdd 7
+ Name[da]=Skift til desktop 7
+ Name[de]=Wechsel zu Arbeitsfläche 7
+-Name[el]=Αλλαγή στην Επιφάνεια εÏγασίας 7
++Name[el]=Αλλαγή στην επιφάνεια εÏγασίας 7
+ Name[eo]=Al tabulo 7
+ Name[es]=Cambiar al escritorio 7
+ Name[et]=Liikumine 7. töölauale
+@@ -904,7 +897,6 @@
+ Name[vi]=Äổi vá» Desktop 7
+ Name[wa]=Potchî sol setinme sicribanne
+ Name[xh]=Tshintshela kwi Desktop 7
+-Name[xx]=xxChange to Desktop 7xx
+ Name[zh_CN]=æ›´æ”¹åˆ°æ¡Œé¢ 7
+ Name[zh_TW]=切æ›åˆ°æ¡Œé¢ä¸ƒ
+ Name[zu]=Shintshela kwi-Desktop 7
+@@ -919,6 +911,7 @@
+ Comment[cs]=Je vybrána virtuálnà plocha 7
+ Comment[da]=Virtuel desktop syv er valgt
+ Comment[de]=Virtuelle Arbeitsfläche 7 ausgewählt
++Comment[el]=Έχει επιλεγεί η εικονική επιφάνεια εÏγασίας 7
+ Comment[eo]=Tabulo sepa estas elektita
+ Comment[es]=Seleccionado el escritorio virtual Siete
+ Comment[et]=Seitsmes virtuaalne töölaud on valitud
+@@ -950,14 +943,13 @@
+ Comment[sk]=Je zvolená virtuálna plocha 7
+ Comment[sl]=Izbrano je sedmo navidezno namizje
+ Comment[sr]=Изабрана је Ñедма виртуелна радна површина
+-Comment[sr@Latn]=Изабрана је Ñедма виртуелна радна површина
++Comment[sr@Latn]=Izabrana je sedma virtuelna radna površina
+ Comment[sv]=Virtuellt skrivbord sju är valt
+ Comment[ta]=மெயà¯à®¨à®¿à®•ர௠மேலà¯à®®à¯‡à®šà¯ˆ à®à®´à¯ தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯à®•à¯à®•பà¯à®ªà®Ÿà¯à®Ÿà®¤à¯
+ Comment[tr]=Sanal masaüstü yedi seçili
+ Comment[uk]=Вибрано віртуальну Ñтільницю Сім
+ Comment[uz]=Еттинчи виртуал иш Ñтоли танланган
+ Comment[wa]=Li setinme forveyou scribanne a stî tchoezi
+-Comment[xx]=xxVirtual desktop seven is selectedxx
+ Comment[zh_CN]=é€‰æ‹©äº†è™šæ‹Ÿæ¡Œé¢ 7
+ default_sound=KDE_Desktop_7.ogg
+ default_presentation=0
+@@ -976,7 +968,7 @@
+ Name[cy]=Newid i Penbwrdd 8
+ Name[da]=Skift til desktop 8
+ Name[de]=Wechsel zu Arbeitsfläche 8
+-Name[el]=Αλλαγή στην Επιφάνεια εÏγασίας 8
++Name[el]=Αλλαγή στην επιφάνεια εÏγασίας 8
+ Name[eo]=Al tabulo 8
+ Name[es]=Cambiar al escritorio 8
+ Name[et]=Liikumine 8. töölauale
+@@ -1031,7 +1023,6 @@
+ Name[vi]=Äổi vá» Desktop 8
+ Name[wa]=Potchî sol ûtinme sicribanne
+ Name[xh]=Tshintshela kwi Desktop 8
+-Name[xx]=xxChange to Desktop 8xx
+ Name[zh_CN]=æ›´æ”¹åˆ°æ¡Œé¢ 8
+ Name[zh_TW]=切æ›åˆ°æ¡Œé¢å…«
+ Name[zu]=Shintshela kwi-Desktop 8
+@@ -1046,6 +1037,7 @@
+ Comment[cs]=Je vybrána virtuálnà plocha 8
+ Comment[da]=Virtuel desktop otte er valgt
+ Comment[de]=Virtuelle Arbeitsfläche 8 ausgewählt
++Comment[el]=Έχει επιλεγεί η εικονική επιφάνεια εÏγασίας 8
+ Comment[eo]=Tabulo oka estas elektita
+ Comment[es]=Seleccionado el escritorio virtual Ocho
+ Comment[et]=Kaheksas virtuaalne töölaud on valitud
+@@ -1077,14 +1069,13 @@
+ Comment[sk]=Je zvolená virtuálna plocha 8
+ Comment[sl]=Izbrano je osmo navidezno namizje
+ Comment[sr]=Изабрана је оÑма виртуелна радна површина
+-Comment[sr@Latn]=Изабрана је оÑма виртуелна радна површина
++Comment[sr@Latn]=Izabrana je osma virtuelna radna površina
+ Comment[sv]=Virtuellt skrivbord åtta är valt
+ Comment[ta]=மெயà¯à®¨à®¿à®•ர௠மேலà¯à®®à¯‡à®šà¯ˆ எடà¯à®Ÿà¯ தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯à®•à¯à®•பà¯à®ªà®Ÿà¯à®Ÿà®¤à¯
+ Comment[tr]=Sanal masaüstü sekiz seçili
+ Comment[uk]=Вибрано віртуальну Ñтільницю Ð’Ñ–Ñім
+ Comment[uz]=Саккизинчи виртуал иш Ñтоли танланган
+ Comment[wa]=Li ûtinme forveyou scribanne a stî tchoezi
+-Comment[xx]=xxVirtual desktop eight is selectedxx
+ Comment[zh_CN]=é€‰æ‹©äº†è™šæ‹Ÿæ¡Œé¢ 8
+ default_sound=KDE_Desktop_8.ogg
+ default_presentation=0
+@@ -1159,7 +1150,6 @@
+ Name[vi]=Cá»a sổ hoạt động (activate)
+ Name[wa]=Dispierter li purnea
+ Name[xh]=Yenza i window isebenze
+-Name[xx]=xxActivate Windowxx
+ Name[zh_CN]=激活窗å£
+ Name[zh_TW]=作用ä¸è¦–窗
+ Name[zu]=Nyakazisa I-window
+@@ -1173,6 +1163,7 @@
+ Comment[cs]=Je aktivováno jiné okno
+ Comment[da]=Et andet vindue er aktiveret
+ Comment[de]=Ein anderes Fenster ist aktiv.
++Comment[el]=ΕνεÏγοποιήθηκε Îνα άλλο παÏάθυÏο
+ Comment[eo]=Alia fenestro aktiviÄis
+ Comment[es]=Otra ventana está activada
+ Comment[et]=Teine aken on aktiveeritud
+@@ -1204,13 +1195,12 @@
+ Comment[sk]=Iné okno je už aktÃvne
+ Comment[sl]=Aktivno je drugo okno
+ Comment[sr]=Ðктивиран је други прозор
+-Comment[sr@Latn]=Ðктивиран је други прозор
++Comment[sr@Latn]=Aktiviran je drugi prozor
+ Comment[sv]=Ett annat fönster är aktiverat
+ Comment[ta]=மறà¯à®±à¯Šà®°à¯ சாளரம௠செயலாகà¯à®•பà¯à®ªà®Ÿà®¤à¯
+ Comment[tr]=BaÅŸka bir pencere etkinleÅŸtirildi
+ Comment[uk]=Ðктивоване інше вікно
+ Comment[uz]=Бошқа ойна актив бўлди
+-Comment[xx]=xxAnother window is activatedxx
+ Comment[zh_CN]=激活了å¦å¤–一个窗å£
+ default_presentation=0
+
+@@ -1284,7 +1274,6 @@
+ Name[vi]=Cá»a sổ má»›i
+ Name[wa]=Novea purnea
+ Name[xh]=Window Entsha
+-Name[xx]=xxNew Windowxx
+ Name[zh_CN]=新建窗å£
+ Name[zh_TW]=新視窗
+ Name[zu]=I-window Entsha
+@@ -1299,6 +1288,7 @@
+ Comment[cs]=Nové okno
+ Comment[da]=Nyt vindue
+ Comment[de]=Neues Fenster
++Comment[el]=ÎÎο παÏάθυÏο
+ Comment[eo]=Nova fenestro
+ Comment[es]=Nueva ventana
+ Comment[et]=Uus aken
+@@ -1330,14 +1320,13 @@
+ Comment[sk]=Nové okno
+ Comment[sl]=Novo okno
+ Comment[sr]=Ðови прозор
+-Comment[sr@Latn]=Ðови прозор
++Comment[sr@Latn]=Novi prozor
+ Comment[sv]=Nytt fönster
+ Comment[ta]=பà¯à®¤à¯ சாளரமà¯
+ Comment[tr]=Yeni pencere
+ Comment[uk]=Відкрите нове вікно
+ Comment[uz]=Янги ойна
+ Comment[wa]=Novea purnea
+-Comment[xx]=xxNew windowxx
+ Comment[zh_CN]=新建窗å£
+ default_sound=KDE_Window_Open.ogg
+ default_presentation=0
+@@ -1412,7 +1401,6 @@
+ Name[vi]=Xoá cá»a sổ
+ Name[wa]=Disfacer purnea
+ Name[xh]=Cima i Window
+-Name[xx]=xxDelete Windowxx
+ Name[zh_CN]=åˆ é™¤çª—å£
+ Name[zh_TW]=刪除視窗
+ Name[zu]=Cisha I-window
+@@ -1427,6 +1415,7 @@
+ Comment[cs]=Okna bylo odstraněno
+ Comment[da]=Slet vindue
+ Comment[de]=Fenster entfernen
++Comment[el]=ΔιαγÏαφή παÏαθÏÏου
+ Comment[eo]=Forigu fenestron
+ Comment[es]=Eliminar ventana
+ Comment[et]=Akna kustutamine
+@@ -1458,14 +1447,13 @@
+ Comment[sk]=Odstrániť okno
+ Comment[sl]=Zbriši okno
+ Comment[sr]=Прозор Ñе брише
+-Comment[sr@Latn]=Прозор Ñе брише
++Comment[sr@Latn]=Prozor se briše
+ Comment[sv]=Ta bort fönster
+ Comment[ta]=சாளரதà¯à®¤à¯ˆ நீகà¯à®•à¯
+ Comment[tr]=Pencereyi sil
+ Comment[uk]=Вікно вилучено
+ Comment[uz]=Ойнани ўчириш
+ Comment[wa]=Disfacer purnea
+-Comment[xx]=xxDelete windowxx
+ Comment[zh_CN]=åˆ é™¤çª—å£
+ default_presentation=0
+ [close]
+@@ -1538,7 +1526,6 @@
+ Name[vi]=Äóng cá»a sổ
+ Name[wa]=Cloyaedje di purnea
+ Name[xh]=Window Iyavala
+-Name[xx]=xxWindow Closexx
+ Name[zh_CN]=窗å£å…³é—
+ Name[zh_TW]=關閉視窗
+ Name[zu]=Ukuvaleka Kwe-window
+@@ -1553,6 +1540,7 @@
+ Comment[cs]=Okno bylo zavřeno
+ Comment[da]=Et vindue lukker
+ Comment[de]=Fenster wird geschlossen
++Comment[el]=Ένα παÏάθυÏο κλείνει
+ Comment[eo]=Fenestro fermiÄas
+ Comment[es]=Se cierra una ventana
+ Comment[et]=Aken sulgub
+@@ -1584,14 +1572,13 @@
+ Comment[sk]=Okno sa uzavrie
+ Comment[sl]=Zapre se okno
+ Comment[sr]=Прозор Ñе затвара
+-Comment[sr@Latn]=Прозор Ñе затвара
++Comment[sr@Latn]=Prozor se zatvara
+ Comment[sv]=Ett fönster stängs
+ Comment[ta]=சாளரம௠மூடà¯à®•ிறதà¯
+ Comment[tr]=Bir pencere kapatıldı
+ Comment[uk]=Вікно закриваєтьÑÑ
+ Comment[uz]=Ойна ёпилмоқда
+ Comment[wa]=On purnea est cloyou
+-Comment[xx]=xxA window closesxx
+ Comment[zh_CN]=窗å£å…³é—
+ default_sound=KDE_Window_Close.ogg
+ default_presentation=0
+@@ -1662,7 +1649,6 @@
+ Name[vi]=Cuá»™n cá»a sổ xuống
+ Name[wa]=Erôlmint do purnea
+ Name[xh]=Window Yenza umthunzi Phezulu
+-Name[xx]=xxWindow Shade Upxx
+ Name[zh_CN]=窗å£å·èµ·
+ Name[zh_TW]=收起視窗
+ Name[zu]=Umthunzi we-Window Uphezulu
+@@ -1676,6 +1662,7 @@
+ Comment[cs]=Okno je zarolováno
+ Comment[da]=Et vindue skygges op
+ Comment[de]=Fenster ist eingefahren
++Comment[el]=Ένα παÏάθυÏο τυλίχθηκε πάνω
+ Comment[eo]=Fenestro volviÄis supren
+ Comment[es]=Se recoge una ventana
+ Comment[et]=Aken rullitakse kokku
+@@ -1707,13 +1694,12 @@
+ Comment[sk]=Okno je zabalené
+ Comment[sl]=Okno je zvito
+ Comment[sr]=Прозор је намотан
+-Comment[sr@Latn]=Прозор је намотан
++Comment[sr@Latn]=Prozor je namotan
+ Comment[sv]=Ett fönster rullas upp
+ Comment[ta]=சாளரம௠நிழலிடபà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯.
+ Comment[tr]=Pencere yukarı gizlendi
+ Comment[uk]=Вікно згорнуто
+ Comment[wa]=On purnea a stî erôlé
+-Comment[xx]=xxA window is shaded upxx
+ Comment[zh_CN]=窗å£è¢«å·èµ·
+ default_sound=KDE_Window_Shade_Up.ogg
+ default_presentation=0
+@@ -1784,7 +1770,6 @@
+ Name[vi]=Cuá»™n Cá»a sổ xuống
+ Name[wa]=Disrôlmint des purneas
+ Name[xh]=Window Yenza umthunzi Ezantsi
+-Name[xx]=xxWindow Shade Downxx
+ Name[zh_CN]=窗å£å±•å¼€
+ Name[zh_TW]=展開視窗
+ Name[zu]=Umthunzi we-Window Uphansi
+@@ -1798,6 +1783,7 @@
+ Comment[cs]=Okno je vyrolováno
+ Comment[da]=Et vindue skygges ned
+ Comment[de]=Fenster ist ausgefahren
++Comment[el]=Ένα παÏάθυÏο τυλίχθηκε κάτω
+ Comment[eo]=Fenestro volviÄis malsupren
+ Comment[es]=Se extiende una ventana
+ Comment[et]=Aken rullitakse lahti
+@@ -1829,13 +1815,12 @@
+ Comment[sk]=Okno je rozbalené
+ Comment[sl]=Okno je razvito
+ Comment[sr]=Прозор је одмотан
+-Comment[sr@Latn]=Прозор је одмотан
++Comment[sr@Latn]=Prozor je odmotan
+ Comment[sv]=Ett fönster rullas ner
+ Comment[ta]=சாளரமொனà¯à®±à¯ நிழலிடபà¯à®ªà®Ÿà¯à®Ÿà®¤à¯
+ Comment[tr]=Pencere aşağı gizlendi
+ Comment[uk]=Вікно розгорнуто
+ Comment[wa]=On purnea a stî disrôlé
+-Comment[xx]=xxA window is shaded downxx
+ Comment[zh_CN]=窗å£è¢«å±•å¼€
+ default_sound=KDE_Window_Shade_Down.ogg
+ default_presentation=0
+@@ -1900,7 +1885,6 @@
+ Name[uz]=Ойнани йиғиш
+ Name[vi]=Là m to cá»a sổ
+ Name[wa]=Purnea metou å pus ptit
+-Name[xx]=xxWindow Minimizexx
+ Name[zh_CN]=çª—å£æœ€å°åŒ–
+ Name[zh_TW]=最å°åŒ–視窗
+ Comment=A window is minimized
+@@ -1914,6 +1898,7 @@
+ Comment[cs]=Okno je minimalizováno
+ Comment[da]=Et vindue minimeres
+ Comment[de]=Fenster ist minimiert
++Comment[el]=Ένα παÏάθυÏο ελαχιστοποιήθηκε
+ Comment[en_GB]=A window is minimised
+ Comment[eo]=Fenestro minimumiÄas
+ Comment[es]=Se minimiza una ventana
+@@ -1946,14 +1931,13 @@
+ Comment[sk]=Okno je minimalizované
+ Comment[sl]=Okno je pomanjšano
+ Comment[sr]=Прозор је минимизован
+-Comment[sr@Latn]=Прозор је минимизован
++Comment[sr@Latn]=Prozor je minimizovan
+ Comment[sv]=Ett fönster minimeras
+ Comment[ta]=சாளரம௠சிறிதாகà¯à®•பà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯
+ Comment[tr]=Bir pencere simge haline getirildi
+ Comment[uk]=Вікно мінімізовано
+ Comment[uz]=Ойна йиғилган
+ Comment[wa]=On purnea a stî metou å pus ptit
+-Comment[xx]=xxA window is minimizedxx
+ Comment[zh_CN]=窗å£è¢«æœ€å°åŒ–
+ default_sound=KDE_Window_Iconify.ogg
+ default_presentation=0
+@@ -2014,7 +1998,6 @@
+ Name[uk]=Демінімізувати вікно
+ Name[vi]=Không là m to cá»a sổ
+ Name[wa]=Purnea rimetou a s' grandeu di dvant
+-Name[xx]=xxWindow Unminimizexx
+ Name[zh_CN]=窗å£å–消最å°åŒ–
+ Name[zh_TW]=å–æ¶ˆæœ€å°åŒ–視窗
+ Comment=A Window is restored
+@@ -2027,6 +2010,7 @@
+ Comment[cs]=Okno je obnoveno
+ Comment[da]=Et vindue genetableres
+ Comment[de]=Fenster ist wiederhergestellt
++Comment[el]=Ένα παÏάθυÏο αποκαταστάθηκε
+ Comment[eo]=Fenestro reaperas
+ Comment[es]=Se restaura una ventana
+ Comment[et]=Aken on taastatud
+@@ -2058,13 +2042,12 @@
+ Comment[sk]=Okno je obnovené
+ Comment[sl]=Okno je povrnjeno
+ Comment[sr]=Прозор је обновљен
+-Comment[sr@Latn]=Прозор је обновљен
++Comment[sr@Latn]=Prozor je obnovljen
+ Comment[sv]=Ett fönster återställs
+ Comment[ta]=சாளரமொனà¯à®±à¯ மீளமைகà¯à®•பà¯à®ªà®Ÿà¯à®Ÿà®¤à¯
+ Comment[tr]=Bir pencere eski boyutuna getirildi
+ Comment[uk]=Вікно відновлено
+ Comment[uz]=Ойна тикланган
+-Comment[xx]=xxA Window is restoredxx
+ Comment[zh_CN]=窗å£è¢«æ¢å¤
+ default_sound=KDE_Window_DeIconify.ogg
+ default_presentation=0
+@@ -2139,7 +2122,6 @@
+ Name[vi]=Là m to cá»a sổ
+ Name[wa]=Purnea metou å pus grand
+ Name[xh]=Window Yenza nkulu
+-Name[xx]=xxWindow Maximizexx
+ Name[zh_CN]=çª—å£æœ€å¤§åŒ–
+ Name[zh_TW]=最大化視窗
+ Name[zu]=Khulisa I-window
+@@ -2154,6 +2136,7 @@
+ Comment[cs]=Okno je maximalizováno
+ Comment[da]=Et vindue maksimeres
+ Comment[de]=Fenster ist maximiert
++Comment[el]=Ένα παÏάθυÏο μεγιστοποιήθηκε
+ Comment[en_GB]=A window is maximised
+ Comment[eo]=Fenestro maksimumiÄas
+ Comment[es]=Se maximiza una ventana
+@@ -2186,14 +2169,13 @@
+ Comment[sk]=Okno je maximalizované
+ Comment[sl]=Okno je razpeto
+ Comment[sr]=Прозор је макÑимизован
+-Comment[sr@Latn]=Прозор је макÑимизован
++Comment[sr@Latn]=Prozor je maksimizovan
+ Comment[sv]=Ett fönster maximeras
+ Comment[ta]=சாளரம௠பெரிதாகà¯à®•பà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯
+ Comment[tr]=Bir pencere büyütüldü
+ Comment[uk]=Вікно макÑимізовано
+ Comment[uz]=Ойна ёйилган
+ Comment[wa]=On purnea a stî metou å pus grand
+-Comment[xx]=xxA window is maximizedxx
+ Comment[zh_CN]=窗å£è¢«æœ€å¤§åŒ–
+ default_sound=KDE_Window_UnHide.ogg
+ default_presentation=0
+@@ -2265,7 +2247,6 @@
+ Name[vi]=Không là m to cá»a sổ
+ Name[wa]=Purnea rimetou a s' grandeu di dvant
+ Name[xh]=Window Sukwenza ubukhulu
+-Name[xx]=xxWindow Unmaximizexx
+ Name[zh_CN]=窗å£å–消最大化
+ Name[zh_TW]=å–æ¶ˆæœ€å¤§åŒ–視窗
+ Name[zu]=Nciphisa i-Window
+@@ -2311,12 +2292,11 @@
+ Comment[sk]=Okno nie je maximalizované
+ Comment[sl]=Okno ni veÄ razpeto
+ Comment[sr]=Прозор више није макÑимизован
+-Comment[sr@Latn]=Прозор више није макÑимизован
++Comment[sr@Latn]=Prozor više nije maksimizovan
+ Comment[sv]=Ett fönster förlorar maximering
+ Comment[ta]=சாளரம௠பெரிதாவதை இழநà¯à®¤à®¤à¯
+ Comment[tr]=Bir pencere büyümesini kaybetti
+ Comment[uk]=Вікно втрачає макÑимізацію
+-Comment[xx]=xxA window loses maximizationxx
+ Comment[zh_CN]=窗å£ä¸å†æœ€å¤§åŒ–
+ default_sound=KDE_Window_Hide.ogg
+ default_presentation=0
+@@ -2378,7 +2358,6 @@
+ Name[uz]=Ойна ҳамма иш Ñтолларига
+ Name[vi]=Hiện cá»a sổ trên tất cả các Desktop
+ Name[wa]=Purnea håyné so tos les scribannes
+-Name[xx]=xxWindow On All Desktopsxx
+ Name[zh_CN]=窗å£åœ¨å…¨éƒ¨æ¡Œé¢ä¸Š
+ Name[zh_TW]=視窗在所有桌é¢
+ Comment=A window is made visible on all desktops
+@@ -2389,6 +2368,7 @@
+ Comment[cs]=Okno je viditelné na všech plochách
+ Comment[da]=Et vindue gøres synligt på alle desktoppe
+ Comment[de]=Fenster wird auf allen Arbeitsflächen angezeigt
++Comment[el]=Ένα παÏάθυÏο γίνεται οÏατό σε όλες τις επιφάνειες εÏγασίας
+ Comment[eo]=Fenestro videbliÄis sur ĉiuj labortabloj
+ Comment[es]=Una ventana se hace visible en todos los escritorios
+ Comment[et]=Aken on muudetud nähtavaks kõigil töölaudadel
+@@ -2420,14 +2400,13 @@
+ Comment[sk]=Okno bude viditeľné na všetkých plochách
+ Comment[sl]=Okno je vidno na vseh namizjih
+ Comment[sr]=Прозор је учињен видљивим на Ñвим радним површинама
+-Comment[sr@Latn]=Прозор је учињен видљивим на Ñвим радним површинама
++Comment[sr@Latn]=Prozor je uÄinjen vidljivim na svim radnim povrÅ¡inama
+ Comment[sv]=Ett fönster görs synligt på alla skrivbord
+ Comment[ta]=சாளரதà¯à®¤à¯ˆ அனைதà¯à®¤à¯ மேலà¯à®®à¯‡à®šà¯ˆà®¯à®¿à®²à¯à®®à¯ பாரà¯à®•à¯à®• à®®à¯à®Ÿà®¿à®¯à¯à®®à¯
+ Comment[tr]=Bir pencere tüm masaüstlerinde görünür hale getirildi
+ Comment[uk]=Вікно зроблено видимим на вÑÑ–Ñ… ÑтільницÑÑ…
+ Comment[uz]=Ойна ҳамма иш Ñтолларида кўринадиган қилинди
+ Comment[wa]=On purnea a stî håyné so tos les scribannes
+-Comment[xx]=xxA window is made visible on all desktopsxx
+ Comment[zh_CN]=窗å£å‡ºçŽ°åœ¨å…¨éƒ¨æ¡Œé¢ä¸Š
+ default_sound=KDE_Window_Sticky.ogg
+ default_presentation=0
+@@ -2488,7 +2467,6 @@
+ Name[uz]=Ойна ҳамма иш Ñтолларида ÑмаÑ
+ Name[vi]=Không hiện cá»a sổ trên tất cả các Desktop
+ Name[wa]=Purnea nén håyné so tos les scribannes
+-Name[xx]=xxWindow Not On All Desktopsxx
+ Name[zh_CN]=窗å£ä¸åœ¨å…¨éƒ¨æ¡Œé¢ä¸Š
+ Name[zh_TW]=視窗ä¸åœ¨æ‰€æœ‰æ¡Œé¢
+ Comment=A Window is no longer visible on all desktops
+@@ -2499,6 +2477,7 @@
+ Comment[cs]=Okno již nenà viditelné na všech plochách
+ Comment[da]=Et vindue er ikke længere synligt på alle desktoppe
+ Comment[de]=Fenster wird nicht mehr auf allen Arbeitsflächen angezeigt
++Comment[el]=Ένα παÏάθυÏο δεν είναι πλÎον οÏατό σε όλες τις επιφάνειες εÏγασίας
+ Comment[eo]=Fenestro nevidebliÄis sur ĉiuj labortabloj
+ Comment[es]=Una ventana ya no es visible en todos los escritorios
+ Comment[et]=Aken ei ole enam nähtav kõigil töölaudadel
+@@ -2530,14 +2509,13 @@
+ Comment[sk]=Okno už nebude viditeľné na všetkých plochách
+ Comment[sl]=Okno ni veÄ vidno na vseh namizjih
+ Comment[sr]=Прозор више није видљив на Ñвим радним површинама
+-Comment[sr@Latn]=Прозор више није видљив на Ñвим радним површинама
++Comment[sr@Latn]=Prozor više nije vidljiv na svim radnim površinama
+ Comment[sv]=Ett fönster blir inte längre synligt på alla skrivbord
+ Comment[ta]=அனைதà¯à®¤à¯ மேலà¯à®®à¯‡à®šà¯ˆà®¯à®¿à®²à¯à®®à¯ சாளரம௠தெரியாதà¯
+ Comment[tr]=Bir pencere tüm masaüstlerinde gizli hale getirildi
+ Comment[uk]=Вікно більше не Ñ” видимим на вÑÑ–Ñ… ÑтільницÑÑ…
+ Comment[uz]=Ойна ҳамма иш Ñтолларида кўринмайдиган қилинди
+ Comment[wa]=On purnea n' est pus håyné so tos les scribannes
+-Comment[xx]=xxA Window is no longer visible on all desktopsxx
+ Comment[zh_CN]=窗å£ä¸å†å‡ºçŽ°åœ¨å…¨éƒ¨æ¡Œé¢ä¸Š
+ default_presentation=1
+ default_sound=KDE_Window_UnSticky.ogg
+@@ -2611,7 +2589,6 @@
+ Name[vi]=Hộp thoại mới
+ Name[wa]=Novea purnea di kesse
+ Name[xh]=Incoko yababini Entsha
+-Name[xx]=xxNew Dialogxx
+ Name[zh_CN]=æ–°å»ºå¯¹è¯æ¡†
+ Name[zh_TW]=æ–°å°è©±ç›’
+ Name[zu]=Ingxoxo Entsha
+@@ -2623,6 +2600,7 @@
+ Comment[cs]=Objevilo se dialogové okno
+ Comment[da]=Midlertidigt vindue (en dialog) kommer til syne
+ Comment[de]=Transientes Fenster (Dialog) wird angezeigt
++Comment[el]=Εμφάνιση Î¼ÎµÏ„Î±Î²Î±Ï„Î¹ÎºÎ¿Ï Ï€Î±ÏαθÏÏου (διαλόγου)
+ Comment[en_GB]=Transient window (a dialogue) appears
+ Comment[eo]=Provizora fenestro (dialogo) aperas
+ Comment[es]=Aparece una ventana transitoria (un diálogo)
+@@ -2655,13 +2633,12 @@
+ Comment[sk]=Objavilo sa doÄasné dialógové okno
+ Comment[sl]=Odprlo se je prehodno (pogovorno) okno
+ Comment[sr]=Пролазни прозор (дијалог) Ñе појављује
+-Comment[sr@Latn]=Пролазни прозор (дијалог) Ñе појављује
++Comment[sr@Latn]=Prolazni prozor (dijalog) se pojavljuje
+ Comment[sv]=Ett tillfälligt fönster (en dialogruta) dyker upp
+ Comment[ta]=தறà¯à®•ாலிக சாளரம௠(ஒர௠உரையாடலà¯) தோனà¯à®±à¯à®•ிறதà¯
+ Comment[tr]=Bir iletiÅŸim kutusu belirdi
+ Comment[uk]=З'ÑвлÑєтьÑÑ Ñ‚Ð¸Ð¼Ñ‡Ð°Ñове вікно (діалог)
+ Comment[uz]=Мулоқат ойнаÑи пайдо бўлди
+-Comment[xx]=xxTransient window (a dialog) appearsxx
+ default_sound=KDE_Dialog_Appear.ogg
+ default_presentation=0
+
+@@ -2733,7 +2710,6 @@
+ Name[vi]=Xoá hộp thoại
+ Name[wa]=Disfacer l'Â purnea di kesse
+ Name[xh]=Cima Incoko yababini
+-Name[xx]=xxDelete Dialogxx
+ Name[zh_CN]=åˆ é™¤å¯¹è¯æ¡†
+ Name[zh_TW]=刪除å°è©±ç›’
+ Name[zu]=Cisha Ingxoxo
+@@ -2745,6 +2721,7 @@
+ Comment[cs]=Dialogové okno bylo zavřeno
+ Comment[da]=Midlertidigt vindue (en dialog) fjernes
+ Comment[de]=Transientes Fenster (Dialog) wird entfernt
++Comment[el]=Μεταβατικό παÏάθυÏο (Îνας διάλογος) αφαιÏείται
+ Comment[en_GB]=Transient window (a dialogue) is removed
+ Comment[eo]=Provizora fenestro (dialogo) malaperas
+ Comment[es]=Desaparece una ventana transitoria (un diálogo)
+@@ -2777,13 +2754,12 @@
+ Comment[sk]=DoÄasné dialógové okno je odstránené
+ Comment[sl]=Zaprlo se je prehodno (pogovorno) okno
+ Comment[sr]=Пролазни прозор (дијалог) је уклоњен
+-Comment[sr@Latn]=Пролазни прозор (дијалог) је уклоњен
++Comment[sr@Latn]=Prolazni prozor (dijalog) je uklonjen
+ Comment[sv]=Ett tillfälligt fönster (en dialogruta) försvinner
+ Comment[ta]=தறà¯à®•ாலிக சாளரமà¯(உரையாடல௠பெடà¯à®Ÿà®¿) நீகà¯à®•பà¯à®ªà®Ÿà¯à®Ÿà®¤à¯
+ Comment[tr]=Bir iletişim kutusu kaldırıldı
+ Comment[uk]=Зникає тимчаÑове вікно (діалог)
+ Comment[uz]=Мулоқат ойнаÑи ёпилди
+-Comment[xx]=xxTransient window (a dialog) is removedxx
+ default_sound=KDE_Dialog_Disappear.ogg
+ default_presentation=0
+
+@@ -2854,7 +2830,6 @@
+ Name[vi]=Chuyển cá»a sổ vỠđầu
+ Name[wa]=Li purnea cmince a bodjî
+ Name[xh]=Isiqalo Sentshukumo ye Window
+-Name[xx]=xxWindow Move Startxx
+ Name[zh_CN]=窗å£ç§»åЍ开始
+ Name[zh_TW]=開始移動視窗
+ Name[zu]=Ukuqala komnyakazo we-Window
+@@ -2866,6 +2841,7 @@
+ Comment[cs]=Okno zapoÄalo pÅ™esun
+ Comment[da]=Et vindue er begyndt at flyttes
+ Comment[de]=Fenster wird verschoben
++Comment[el]=Ένα παÏάθυÏο άÏχισε να μετακινείται
+ Comment[eo]=Fenestro komencis movadon
+ Comment[es]=Comienza a moverse una ventana
+ Comment[et]=Aken on hakanud liikuma
+@@ -2897,14 +2873,13 @@
+ Comment[sk]=ZaÄal sa presun okna
+ Comment[sl]=Okno se je priÄelo premikati
+ Comment[sr]=Прозор је почео Ñа премештањем
+-Comment[sr@Latn]=Прозор је почео Ñа премештањем
++Comment[sr@Latn]=Prozor je poÄeo sa premeÅ¡tanjem
+ Comment[sv]=Ett fönster har börjat flyttas
+ Comment[ta]=சாளரம௠நகர ஆரமà¯à®ªà®¿à®¤à¯à®¤à®¤à¯
+ Comment[tr]=Bir pencere hareket etmeye başladı
+ Comment[uk]=Початок переÑÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ñ–ÐºÐ½Ð°
+ Comment[uz]=Ойна кўчиб бошлади
+ Comment[wa]=On purnea a cmincî a bodjî
+-Comment[xx]=xxA window has begun movingxx
+ Comment[zh_CN]=窗å£å¼€å§‹ç§»åЍ
+ default_presentation=0
+
+@@ -2975,7 +2950,6 @@
+ Name[vi]=Chuyển cá»a sổ vá» cuối
+ Name[wa]=Li purnea s' djoke di bodjî
+ Name[xh]=Isiphelo Sentshukumo ye Window
+-Name[xx]=xxWindow Move Endxx
+ Name[zh_CN]=窗å£ç§»åŠ¨ç»“æŸ
+ Name[zh_TW]=完æˆç§»å‹•視窗
+ Name[zu]=Ukuphela komnyakazo we-Window
+@@ -2987,6 +2961,7 @@
+ Comment[cs]=Okno dokonÄilo pÅ™esun
+ Comment[da]=Et vindue er færdigt med at flytte
+ Comment[de]=Fensterverschiebung abgeschlossen
++Comment[el]=Ένα παÏάθυÏο ολοκλήÏωσε τη μετακίνησή του
+ Comment[eo]=Fenestro finis la movadon
+ Comment[es]=Termina de moverse una ventana
+ Comment[et]=Aken on lõpetanud liikumise
+@@ -3018,14 +2993,13 @@
+ Comment[sk]=Presun okna je ukonÄený
+ Comment[sl]=Okno se je prenehalo premikati
+ Comment[sr]=Прозор је завршио премештање
+-Comment[sr@Latn]=Прозор је завршио премештање
++Comment[sr@Latn]=Prozor je završio premeštanje
+ Comment[sv]=Ett fönster har flyttats klart
+ Comment[ta]=நகரà¯à®¤à¯à®¤à¯à®µà®¤à®©à¯ மூலம௠சாளரம௠மà¯à®´à¯à®®à¯ˆà®¯à®Ÿà¯ˆà®¨à¯à®¤à®¤à¯.
+ Comment[tr]=Bir pencere hareketini tamamladı
+ Comment[uk]=Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÐµÑÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ñ–ÐºÐ½Ð°
+ Comment[uz]=Ойна кўчишни тугатди
+ Comment[wa]=On purnea a fini d' bodjî
+-Comment[xx]=xxA window has completed its movingxx
+ Comment[zh_CN]=窗å£å®Œæˆç§»åЍ
+ default_presentation=0
+
+@@ -3096,7 +3070,6 @@
+ Name[vi]=Thay đổi cỡ cá»a sổ bắt đầu
+ Name[wa]=Li purnea cmince a candjî di grandeu
+ Name[xh]=Isiqalo Soniko kwakhona sobungakanani se Window
+-Name[xx]=xxWindow Resize Startxx
+ Name[zh_CN]=窗å£ç¼©æ”¾å¼€å§‹
+ Name[zh_TW]=開始改變視窗大å°
+ Name[zu]=Ukuqala Kokushintsha usayizi we-Window
+@@ -3108,6 +3081,7 @@
+ Comment[cs]=Okno zapoÄalo zmÄ›nu velikosti
+ Comment[da]=Et vindue er begyndt at ændre størrelse
+ Comment[de]=Größenveränderung des Fensters wird gestartet
++Comment[el]=Ένα παÏάθυÏο άÏχισε να αλλάζει μÎγεθος
+ Comment[eo]=Vindozo komencis grandecÅanÄon
+ Comment[es]=Comienza a redimensionarse una ventana
+ Comment[et]=Akna suurus on hakanud muutuma
+@@ -3139,14 +3113,13 @@
+ Comment[sk]=ZaÄala zmena veľkosti okna
+ Comment[sl]=Spreminjanje velikosti okna se je zaÄelo
+ Comment[sr]=Прозор је почео мењање величине
+-Comment[sr@Latn]=Прозор је почео мењање величине
++Comment[sr@Latn]=Prozor je poÄeo menjanje veliÄine
+ Comment[sv]=Storleksändring av ett fönster har påbörjats
+ Comment[ta]=சாளரதà¯à®¤à®¿à®©à¯ அளவ௠மாறதà¯à®¤à¯à®µà®™à¯à®•à¯à®•ிறதà¯
+ Comment[tr]=Bir pencere yeniden boyutlandırılmaya başladı
+ Comment[uk]=Початок зміни розміру вікна
+ Comment[uz]=Ойнанинг ўлчами ўзгариб бошлади
+ Comment[wa]=On purnea a cmincî a candjî s' grandeu
+-Comment[xx]=xxA window has begun resizingxx
+ default_presentation=0
+
+ [resizeend]
+@@ -3216,7 +3189,6 @@
+ Name[vi]=Thay đổi cỡ cá»a sổ kết thúc
+ Name[wa]=Li purnea s' djoke di candjî di grandeu
+ Name[xh]=Isiphelo Sobungakanani kwakhona se Window
+-Name[xx]=xxWindow Resize Endxx
+ Name[zh_CN]=窗å£ç¼©æ”¾ç»“æŸ
+ Name[zh_TW]=å®Œæˆæ”¹è®Šè¦–窗大å°
+ Name[zu]=Ukuphela ngokushintsha usayizi we-Window
+@@ -3228,6 +3200,7 @@
+ Comment[cs]=Okno dokonÄilo zmÄ›nu velikosti
+ Comment[da]=Et vindue er færdigt med at ændre størrelse
+ Comment[de]=Größenveränderung des Fensters abgeschlossen
++Comment[el]=Ένα παÏάθυÏο ολοκλήÏωσε την αλλαγή μεγÎθους
+ Comment[eo]=Vindozo finis grandecÅanÄon
+ Comment[es]=Termina de redimensionarse una ventana
+ Comment[et]=Aken on suuruse muutmise lõpetanud
+@@ -3259,12 +3232,11 @@
+ Comment[sk]=Zmena veľkosti okna je ukonÄená
+ Comment[sl]=Spreminjanje velikosti okna je konÄano
+ Comment[sr]=Прозор је завршио промену величине
+-Comment[sr@Latn]=Прозор је завршио промену величине
++Comment[sr@Latn]=Prozor je zavrÅ¡io promenu veliÄine
+ Comment[sv]=Storleksändring av ett fönster har avslutats
+ Comment[ta]=சாளரதà¯à®¤à®¿à®©à¯ அளவ௠மாறà¯à®±à¯à®¤à®²à¯ à®®à¯à®Ÿà®¿à®¨à¯à®¤à®¤à¯
+ Comment[tr]=Bir pencerenin yeniden boyutlandırma işlemi bitti
+ Comment[uk]=Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ð·Ð¼Ñ–Ð½Ð¸ розміру вікна
+ Comment[uz]=Ойнанинг ўлчами ўзгариб бўлди
+ Comment[wa]=On purnea a fini d' candjî s' grandeu
+-Comment[xx]=xxA window has finished resizingxx
+ default_presentation=0
+diff -Nru kdebase-release-3.4.0/kwin/geometry.cpp kdebase-branch-3.4/kwin/geometry.cpp
+--- kdebase-release-3.4.0/kwin/geometry.cpp 2005-01-28 18:28:11.000000000 -0500
++++ kdebase-branch-3.4/kwin/geometry.cpp 2005-03-08 08:18:55.000000000 -0500
+@@ -1121,6 +1121,8 @@
+ switch( mode )
+ {
+ case SizemodeAny:
++#if 0 // make SizemodeAny equal to SizemodeFixedW - prefer keeping fixed width,
++ // so that changing aspect ratio to a different value and back keeps the same size (#87298)
+ {
+ ASPECT_CHECK_SHRINK_H_GROW_W
+ ASPECT_CHECK_SHRINK_W_GROW_H
+@@ -1128,6 +1130,7 @@
+ ASPECT_CHECK_GROW_W
+ break;
+ }
++#endif
+ case SizemodeFixedW:
+ {
+ // the checks are order so that attempts to modify height are first
+diff -Nru kdebase-release-3.4.0/kwin/group.cpp kdebase-branch-3.4/kwin/group.cpp
+--- kdebase-release-3.4.0/kwin/group.cpp 2004-08-04 08:19:50.000000000 -0400
++++ kdebase-branch-3.4/kwin/group.cpp 2005-03-08 08:19:13.000000000 -0500
+@@ -541,6 +541,25 @@
+ // TODO This could possibly be optimized, it also requires hasTransient() to check for loops.
+ if( (*it2)->groupTransient() && (*it1)->hasTransient( *it2, true ) && (*it2)->hasTransient( *it1, true ))
+ (*it2)->transients_list.remove( *it1 );
++ // if there are already windows W1 and W2, W2 being transient for W1, and group transient W3
++ // is added, make it transient only for W2, not for W1, because it's already indirectly
++ // transient for it - the indirect transiency actually shouldn't break anything,
++ // but it can lead to exponentially expensive operations (#95231)
++ // TODO this is pretty slow as well
++ for( ClientList::ConstIterator it3 = group()->members().begin();
++ it3 != group()->members().end();
++ ++it3 )
++ {
++ if( *it1 == *it2 || *it2 == *it3 || *it1 == *it3 )
++ continue;
++ if( (*it2)->hasTransient( *it1, false ) && (*it3)->hasTransient( *it1, false ))
++ {
++ if( (*it2)->hasTransient( *it3, true ))
++ (*it3)->transients_list.remove( *it1 );
++ if( (*it3)->hasTransient( *it2, true ))
++ (*it2)->transients_list.remove( *it1 );
++ }
++ }
+ }
+ }
+ }
+diff -Nru kdebase-release-3.4.0/kwin/kcmkwin/kwindecoration/kwindecoration.desktop kdebase-branch-3.4/kwin/kcmkwin/kwindecoration/kwindecoration.desktop
+--- kdebase-release-3.4.0/kwin/kcmkwin/kwindecoration/kwindecoration.desktop 2005-02-10 23:52:23.000000000 -0500
++++ kdebase-branch-3.4/kwin/kcmkwin/kwindecoration/kwindecoration.desktop 2005-03-07 09:16:17.000000000 -0500
+@@ -71,7 +71,6 @@
+ Name[vi]=Trang trà cá»a sổ
+ Name[wa]=GÃ¥liotaedjes des purneas
+ Name[xh]=Izihombiso zeWindow
+-Name[xx]=xxWindow Decorationsxx
+ Name[zh_CN]=窗å£è£…饰
+ Name[zh_TW]=視窗è£é£¾
+ Name[zu]=Imihlobiso ye-window
+@@ -137,7 +136,6 @@
+ Comment[vi]=Cấu hình 'look&feel' cá»§a tên cá»a sổ
+ Comment[wa]=Apontyî li rivnance eyet l' dujhance des tites des purneas
+ Comment[xh]=Qwalasela inkangeleko nemvakalelo yezihloko zeWindow
+-Comment[xx]=xxConfigure the look and feel of window titlesxx
+ Comment[zh_CN]=é…ç½®çª—å£æ ‡é¢˜çš„观感
+ Comment[zh_TW]=è¨å®šè¦–窗標題列的外觀與感覺
+ Comment[zu]=Hlanganisela ukubona kanye nokuzwa kwezihloko zama-window
+@@ -158,7 +156,7 @@
+ Keywords[fa]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration،طرØâ€ŒØ¨Ù†Ø¯ÛŒ
+ Keywords[fi]=kwin,ikkuna,ikkunaohjelma,ikkunoinnin hallintaohjelma,tausta,tyyli,teema,ulkonäkö,tuntuma,ulkoasu,painike,kahva,kulma,kwm,kehys
+ Keywords[fr]=kwin,fenêtre,gestionnaire,bordure,style,thème,apparence,ergonomie,disposition,bouton,poignée,bord,kwm,décoration
+-Keywords[fy]=kwin,window,manager,rand,stijl,theme,thema,look,uiterlijk,gedrag,feel, layout,opmaak,button,knoppen,handle,rand,kwm,decoratie,windowmanager,venster,vensterbeheerFinster,râne, kader, styl tema,uterlik,gedrach,
++Keywords[fy]=kwin,window,manager,rand,stijl,theme,tema,look,uiterlijk,gedrag,feel, layout,opmaak,button,knoppen,handle,rand,kwm,decoratie,windowmanager,venster,vensterbeheerFinster,râne, kader, styl tema,uterlik,gedrach,
+ Keywords[gl]=kwin,fiestra,xestor,beira,estilo,tema,apariencia,formato,botón,xestión,esquiña,kwm,decoración
+ Keywords[he]=×ž× ×”×œ ×—×œ×•× ×•×ª,×—×œ×•× ×•×ª,×ž× ×”×œ,גבול,מסגרת,×¡×’× ×•×Ÿ,ערכה,ערכת × ×•×©×,מר××”,תחושה,פריסה,תצוגה,כפתור,ידית,קצה,קישוט
+ Keywords[hi]=के-विन,विंडो,पà¥à¤°à¤¬à¤‚धक,बारà¥à¤¡à¤°,शैली,पà¥à¤°à¤¸à¤‚ग,रूप,अनà¥à¤à¤µ,ले-आउट,बटन,हैंडल,किनारा,केडबलà¥à¤¯à¥‚à¤à¤®,सजावट
+@@ -195,7 +193,6 @@
+ Keywords[ven]=kwin,windo,mulanguli,mukanoni,tshitaela,thero,sedza,upfa,vhuvha,bathene,fara,mafhedziselo,kwn,u khavhisedza
+ Keywords[vi]=kwin,window,quản lý,biên,kiểu,theme,look,feel,layout,nút,Ä‘iá»u khiển,cạnh,kwm,trang trÃ
+ Keywords[xh]=kwin,window,umphathi,umda,uhlobo,umxholo wokuxoxwa,jonga,yiva,beka,iqhosha,umqheba,umda,kwm,uhombiso
+-Keywords[xx]=xxkwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decorationxx
+ Keywords[zh_TW]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,視窗,管ç†å“¡,邊框,é¢¨æ ¼,佈景主題,外觀,感覺,佈局,按鈕,邊緣,è£é£¾
+ Keywords[zu]=kwin,i-window,imenenja,umngcele,isitayela,bona,izwa, isendlalelo,inkinobho,isibambo,unqenqema,kwm,umhlobiso
+ Categories=Qt;KDE;X-KDE-settings-looknfeel;
+diff -Nru kdebase-release-3.4.0/kwin/kcmkwin/kwinoptions/kwinactions.desktop kdebase-branch-3.4/kwin/kcmkwin/kwinoptions/kwinactions.desktop
+--- kdebase-release-3.4.0/kwin/kcmkwin/kwinoptions/kwinactions.desktop 2005-02-10 23:52:23.000000000 -0500
++++ kdebase-branch-3.4/kwin/kcmkwin/kwinoptions/kwinactions.desktop 2005-03-26 02:37:44.000000000 -0500
+@@ -73,7 +73,6 @@
+ Name[vi]=Hà nh động
+ Name[wa]=Accions
+ Name[xh]=Iintshukumo
+-Name[xx]=xxActionsxx
+ Name[zh_CN]=动作
+ Name[zh_TW]=動作
+ Name[zu]=Iminyakazo
+@@ -99,7 +98,7 @@
+ Comment[fa]=تنظیمات ØµÙØÙ‡ کلید Ùˆ موش
+ Comment[fi]=Muokkaa näppäimistön ja hiiren asetuksia
+ Comment[fr]=Configuration des réglages du clavier et de la souris
+-Comment[fy]=Hjir kinst de ynstellingen fan kaaiboerd en mûs ynstelle
++Comment[fy]=Hjir kinst de ynstellings fan kaaiboerd en mûs ynstelle
+ Comment[ga]=Cumraigh socruithe an mhéarchláir agus na luiche
+ Comment[gl]=Configura-las opcións do teclado e o rato
+ Comment[he]=×©×™× ×•×™ הגדרות המקלדת והעכבר
+@@ -141,7 +140,6 @@
+ Comment[vi]=Cấu hình bà n phÃm và chuá»™t ở đây
+ Comment[wa]=Apontiaedjes del sori eyet del taprece
+ Comment[xh]=Qwalasela izicwangciso zebhodi yezitshixho neze mouse
+-Comment[xx]=xxConfigure keyboard and mouse settingsxx
+ Comment[zh_CN]=é…ç½®é”®ç›˜å’Œé¼ æ ‡è®¾ç½®
+ Comment[zh_TW]=è¨å®šéµç›¤èˆ‡æ»‘é¼ çš„è¨å®šå€¼
+ Comment[zu]=Hlanganisela izilungiselelo zebhodi yokhiye kanye neze-mouse
+@@ -196,6 +194,5 @@
+ Keywords[ven]=kovhekana,engedza,engedza,fhungudza,fhungudza,fhasi,mashumele a menu, bara ya thoho,uitulula saizi
+ Keywords[vi]=má»,phóng to,phóng to,thu nhá»,thu nhá»,hạ thấp,các thao tác trên thá»±c đơn,tên thanh,thay đổi cỡ
+ Keywords[xh]=umthunzi,yandisa,yandisa,ncipisa nciphisa,yehlisa,menu zemisebenzi,iba yewonga,yenza ubungakanani kwakhona
+-Keywords[xx]=xxshade,maximise,maximize,minimize,minimise,lower,operations menu,titlebar,resizexx
+ Keywords[zh_TW]=shade,maximise,maximize,minimize,minimise,lower,operations menu,titlebar,resize,æ”¶èµ·,最大化,最å°åŒ–,é™ä¸‹,æ“作é¸å–®,標題列,é‡è¨å¤§å°
+ Keywords[zu]=umthunzi,khulisa,khulisa,nciphisa,nciphisa,okungezansi, imenu yemisebenzi,ibha yesihloko,shintsha usayizi
+diff -Nru kdebase-release-3.4.0/kwin/kcmkwin/kwinoptions/kwinadvanced.desktop kdebase-branch-3.4/kwin/kcmkwin/kwinoptions/kwinadvanced.desktop
+--- kdebase-release-3.4.0/kwin/kcmkwin/kwinoptions/kwinadvanced.desktop 2005-02-10 23:52:23.000000000 -0500
++++ kdebase-branch-3.4/kwin/kcmkwin/kwinoptions/kwinadvanced.desktop 2005-03-07 09:16:17.000000000 -0500
+@@ -74,7 +74,6 @@
+ Name[vi]=Nâng cao
+ Name[wa]=Sipepieus
+ Name[xh]=Ebhekisa phambili
+-Name[xx]=xxAdvancedxx
+ Name[zh_CN]=高级
+ Name[zh_TW]=進階
+ Name[zu]=Okwezinga eliphezulu
+@@ -139,7 +138,6 @@
+ Comment[vi]=Cấu hình và nâng cao các tÃnh năng quản lý cá»a sổ ở đây
+ Comment[wa]=Apontiaedje des spepieusès fonccionålités do manaedjaedje des purneas
+ Comment[xh]=Qwalasela imisebenzi esemqoka ebhekisa phambili yophatho lwe window
+-Comment[xx]=xxConfigure advanced window management featuresxx
+ Comment[zh_CN]=é…置高级窗å£ç®¡ç†ç‰¹æ€§
+ Comment[zh_TW]=è¨å®šé€²éšŽè¦–窗管ç†åŠŸèƒ½
+ Comment[zu]=Hlanganisela amalungu okuphathwa kwe-window yezinga eliphezulu
+@@ -195,7 +193,6 @@
+ Keywords[ven]=murunzi,mukano,hover,mikano i tshilaho
+ Keywords[vi]=má»,biên,lượn,biên kÃch hoạt
+ Keywords[xh]=ulwenziwo lwesithuba,umda,ixhonyiwe,imida esebenzayo
+-Keywords[xx]=xxshading,border,hover,active bordersxx
+ Keywords[zh_CN]=shading,border,hover,active borders,å·èµ·,边框,悬åœ,激活边框
+ Keywords[zh_TW]=shading,border,hover,active borders,æ”¶èµ·,邊框,åœç•™,作用ä¸é‚Šæ¡†
+ Keywords[zu]=ukusitha,umngcele,didizela,imingcele enyakazayo
+diff -Nru kdebase-release-3.4.0/kwin/kcmkwin/kwinoptions/kwinfocus.desktop kdebase-branch-3.4/kwin/kcmkwin/kwinoptions/kwinfocus.desktop
+--- kdebase-release-3.4.0/kwin/kcmkwin/kwinoptions/kwinfocus.desktop 2005-02-10 23:52:23.000000000 -0500
++++ kdebase-branch-3.4/kwin/kcmkwin/kwinoptions/kwinfocus.desktop 2005-03-07 09:16:17.000000000 -0500
+@@ -62,7 +62,6 @@
+ Name[uz]=ФокуÑ
+ Name[ven]=U thetshelesa
+ Name[vi]=Chá»n
+-Name[xx]=xxFocusxx
+ Name[zh_CN]=焦点
+ Name[zh_TW]=焦點
+ Name[zu]=Ukunaka
+@@ -127,7 +126,6 @@
+ Comment[ven]=Dzudzanyani wa muano wa window
+ Comment[vi]=Cấu hình cách chá»n cá»a sổ
+ Comment[xh]=Qwalasela inkqubo yobekiso lwe window
+-Comment[xx]=xxConfigure the window focus policyxx
+ Comment[zh_CN]=é…置窗å£ç„¦ç‚¹ç–ç•¥
+ Comment[zh_TW]=è¨å®šè¦–窗焦點政ç–
+ Comment[zu]=Hlanganisela umthetho wokunaka kwe-window
+@@ -181,6 +179,5 @@
+ Keywords[ven]=thetshelesa,u vhetshela,u vusa,vusa,putedzani u vusa,khiibodo,CDE,alt-tab,desktop dzothe
+ Keywords[vi]=chá»n,di chuyển,tá»± nâng lên,nâng lên,nhấn nâng lên,bà n phÃm,CDE,alt-tab,tất cả cá»a sổ
+ Keywords[xh]=ucaco,ubuyiselo,phakamisa ngokuzenzekelayo,phakamisa,nqakraza phakamisa, ibhodi yezitshixho,CDE,alt-tab,zonke ii desktop
+-Keywords[xx]=xxfocus,placement,auto raise,raise,click raise,keyboard,CDE,alt-tab,all desktopxx
+ Keywords[zh_TW]=focus,placement,auto raise,raise,click raise,keyboard,CDE,alt-tab,all desktop,焦點,佈置,自動抬å‡,抬å‡,單擊抬å‡,éµç›¤,全部桌é¢
+ Keywords[zu]=ukunaka,ukubeka,ukukhuphula okuzenzekelayo,ukukhuphula, ukukhuphula ngokucofa,ibhodi yokhiye,CDE,alt-tab,wonke ama-desktop
+diff -Nru kdebase-release-3.4.0/kwin/kcmkwin/kwinoptions/kwinmoving.desktop kdebase-branch-3.4/kwin/kcmkwin/kwinoptions/kwinmoving.desktop
+--- kdebase-release-3.4.0/kwin/kcmkwin/kwinoptions/kwinmoving.desktop 2005-02-10 23:52:23.000000000 -0500
++++ kdebase-branch-3.4/kwin/kcmkwin/kwinoptions/kwinmoving.desktop 2005-03-22 12:38:20.000000000 -0500
+@@ -71,7 +71,6 @@
+ Name[vi]=Di chuyển
+ Name[wa]=Bodjî
+ Name[xh]=Iyahamba
+-Name[xx]=xxMovingxx
+ Name[zh_CN]=移动
+ Name[zh_TW]=移動
+ Name[zu]=Iyanyakaza
+@@ -137,7 +136,6 @@
+ Comment[vi]=Cấu hình cách di chuyển cá»a sổ
+ Comment[wa]=Apontyî l' manire di bodjî des purneas
+ Comment[xh]=Qwalasela iindlela ii windows ezshukunyiswa ngayo
+-Comment[xx]=xxConfigure the way that windows are movedxx
+ Comment[zh_CN]=é…置窗å£ç§»åŠ¨çš„æ–¹å¼
+ Comment[zh_TW]=è¨å®šè¦–窗移動的方å¼
+ Comment[zu]=Hlanganisela indlela ama-window anyakaziswa ngayo
+@@ -164,7 +162,7 @@
+ Keywords[hr]=moving,smart,cascade,maximize,maximise,snap zone,snap,border,pomicanje,pametno,kaskadno,maksimizuj,snap zone,snap,rub
+ Keywords[hu]=mozgatás,intelligens,lépcsőzetes,maximalizálás,illeszkedési zóna,illeszkedés,szegély
+ Keywords[is]=færi,snjallt,stafla,hámarka,gripsvæði,grip,rammi,jaðar
+-Keywords[it]=spostamento,intelligente,cascata,massimizza,zona magnetica,bordi,bordi magnetici
++Keywords[it]=spostamento,intelligente,cascata,massimizza,zona magnetica,bordi,bordi magnetici
+ Keywords[ja]=移動,スマート,カスケード,最大化,スナップゾーン,スナップ境界
+ Keywords[lt]=moving,smart,cascade,maximize,maximise,snap zone,snap,border, perkėlimas,išmoningas,kaskada,išdidinti,rėmelis,riba
+ Keywords[mk]=moving,smart,cascade,maximize,maximise,snap zone,snap,border, движење,паметно,каÑкадно,рашири,Ñпушти,граница
+@@ -191,6 +189,5 @@
+ Keywords[ven]=tshimbila,zwavhudi,cascade,engedza,engedza,fhethu ha snap,snap,mukano+-
+ Keywords[vi]=di chuyển,thông minh,tầng,phóng to,phóng to,vùng thả,thả,biên
+ Keywords[xh]=iyashukuma,iyabukeka,cascade,yenza nkulu,yenza nkulu,yandisa,snap zone,snap,umda
+-Keywords[xx]=xxmoving,smart,cascade,maximize,maximise,snap zone,snap,borderxx
+ Keywords[zh_TW]=moving,smart,cascade,maximize,maximise,snap zone,snap,border,移動,è°æ˜Ž,最大化,邊框
+ Keywords[zu]=iyanyakaza,okukhaliphile,landelanisa,khulisa,khulisa,indawo yokunamathisela,namathisela,umngcele
+diff -Nru kdebase-release-3.4.0/kwin/kcmkwin/kwinoptions/kwinoptions.desktop kdebase-branch-3.4/kwin/kcmkwin/kwinoptions/kwinoptions.desktop
+--- kdebase-release-3.4.0/kwin/kcmkwin/kwinoptions/kwinoptions.desktop 2005-02-18 23:27:17.000000000 -0500
++++ kdebase-branch-3.4/kwin/kcmkwin/kwinoptions/kwinoptions.desktop 2005-03-30 01:47:57.000000000 -0500
+@@ -77,7 +77,6 @@
+ Name[vi]=Thái độ cá»a sổ
+ Name[wa]=Dujhance des purneas
+ Name[xh]=Ukuziphatha kwe Window
+-Name[xx]=xxWindow Behaviorxx
+ Name[zh_CN]=窗å£è¡Œä¸º
+ Name[zh_TW]=視窗行為
+ Name[zu]=Ukuziphatha kwe-Window
+@@ -93,6 +92,7 @@
+ Comment[cy]=Ffurfweddu ymddygiad y ffenestr
+ Comment[da]=Indstil vinduets opførsel
+ Comment[de]=Fensterverhalten festlegen
++Comment[el]=ΡÏθμιση της συμπεÏιφοÏάς του παÏαθÏÏου
+ Comment[en_GB]=Configure the window behaviour
+ Comment[eo]=Agordas la konduton de la fenestro
+ Comment[es]=Configuración del comportamiento de la ventana
+@@ -125,14 +125,13 @@
+ Comment[sk]=Nastavenie chovania okna
+ Comment[sl]=Nastavite obnašanje brskalnika
+ Comment[sr]=Подешавање понашања прозора
+-Comment[sr@Latn]=Подешавање понашања прозора
++Comment[sr@Latn]=Podešavanje ponašanja prozora
+ Comment[sv]=Anpassa fönsterbeteende
+ Comment[ta]=º¡ÇÃò¾¢ý Àñ¨À ¯ûǨÃ
+ Comment[tr]=Pencere davranışlarını yapılandır
+ Comment[uk]=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²ÐµÐ´Ñ–Ð½ÐºÐ¸ вікна
+ Comment[uz]=Ойнанинг хуÑуÑиÑтларини моÑлаш
+ Comment[wa]=Apontyî l' dujhance des purneas
+-Comment[xx]=xxConfigure the window behaviorxx
+ Comment[zh_CN]=é…置窗å£è¡Œä¸º
+
+ Keywords=focus,placement,window behavior,animation,raise,auto raise,windows,frame,titlebar,doubleclick
+@@ -143,6 +142,7 @@
+ Keywords[cy]=canolbwynt,lleoliad,ymddygiad ffenestr,bywluniad,codi,hunan-godi,ffenestri,ffrâm,bar-teitl,clic dwbl,dwbl-glic
+ Keywords[da]=fokus,placering,vinduesopførsel,animering,Hæv,autohæv,vinduer,ramme,titellinje,dobbeltklik
+ Keywords[de]=Aktivierung,Platzierung,Fensterverhalten,Animation,Nach vorn/hinten, Fenster,Rahmen,Umrandung,Titelleiste,Doppelklick
++Keywords[el]=εστίαση,τοποθÎτηση,συμπεÏιφοÏά παÏαθÏÏου,εφΠκίνησης,ανÏψωση,αυτόματη ανÏψωση,παÏάθυÏα,πλαίσιο,μπάÏα τίτλου,διπλό κλικ
+ Keywords[en_GB]=focus,placement,window behaviour,animation,raise,auto raise,windows,frame,titlebar,doubleclick
+ Keywords[eo]=fokuso,lokigo,fenestrokonduto,spektaklo,malfonigo,aÅtomalfonigo,fenestro,kadro,titollistelo,duklako
+ Keywords[es]=foco,ubicación,posición,ventana,comportamiento,animación,frente,pasar al frente,ventanas,marco,barra de tÃtulo,doble pulsación
+@@ -173,11 +173,10 @@
+ Keywords[sk]=fokus,umiestnenie,chovanie okien,animácia,zdvihnutie,automatické zdvihnutie,titulok,dvojité kliknutie,rámec,okná
+ Keywords[sl]=fokus,postavitev,obnašanje okna,animacija,dvigni,okna,okvir,naslovna vrstica,dvojni klik
+ Keywords[sr]=focus,placement,window behaviour,animation,raise,ауто raise,windows,frame,titlebar,doubleclick,фокуÑ,понашање прозора,анимација,прозори,оквир,наÑловна линија,двоклик
+-Keywords[sr@Latn]=focus,placement,window behaviour,animation,raise,ауто raise,windows,frame,titlebar,doubleclick,фокуÑ,понашање прозора,анимација,прозори,оквир,наÑловна линија,двоклик
++Keywords[sr@Latn]=focus,placement,window behaviour,animation,raise,auto raise,windows,frame,titlebar,doubleclick,fokus,ponašanje prozora,animacija,prozori,okvir,naslovna linija,dvoklik
+ Keywords[sv]=fokus,placering,fönsterbeteende,animering,höj, autohöj,fönster,kant,namnlist,dubbelklick
+ Keywords[ta]=பாரà¯à®µà¯ˆ,இடமà¯,சாளரபணà¯à®ªà¯,உயிரà¯à®šà®¿à®¤à¯à®¤à®¿à®°à®®à¯,மேலெழà¯à®ªà¯à®ªà¯, தானாக மேலெழà¯à®ªà¯à®ªà¯,சாளரஙà¯à®•ளà¯,சடà¯à®Ÿà®®à¯,தலைபà¯à®ªà¯à®ªà¯à®ªà®Ÿà¯à®Ÿà®¿,இரணà¯à®Ÿà¯ சொடà¯à®•à¯à®•à¯
+ Keywords[tr]=odak,odak davranış biçimi,pencere yerleşimi,pencere davranışı,Yerleşim davranış biçimi,animasyon,kaldır,otomatik kaldır,çerçeve,çift tıkla
+ Keywords[uk]=фокуÑ,розташовуваннÑ,поведінка вікна,анімаціÑ,піднÑти,піднімати автоматично,вікна,рамка,заголовок,подвійне клацаннÑ
+ Keywords[uz]=фокуÑлаш,жойлашиш,ойнанинг хуÑуÑиÑтлари,анимациÑ,олдинга,авто-олдинга,ойналар,фрейм,Ñарлавҳа,икки марта боÑиш
+-Keywords[xx]=xxfocus,placement,window behavior,animation,raise,auto raise,windows,frame,titlebar,doubleclickxx
+ Categories=Qt;KDE;X-KDE-settings-desktop;
+diff -Nru kdebase-release-3.4.0/kwin/kcmkwin/kwinoptions/kwintranslucency.desktop kdebase-branch-3.4/kwin/kcmkwin/kwinoptions/kwintranslucency.desktop
+--- kdebase-release-3.4.0/kwin/kcmkwin/kwinoptions/kwintranslucency.desktop 2005-02-23 00:06:00.000000000 -0500
++++ kdebase-branch-3.4/kwin/kcmkwin/kwinoptions/kwintranslucency.desktop 2005-03-30 01:47:57.000000000 -0500
+@@ -12,12 +12,15 @@
+ Name=Translucency
+ Name[bg]=ПолупрозрачноÑÑ‚
+ Name[bn]=সমসà§à¦¬à¦šà§à¦›à¦¤à¦¾
++Name[bs]=Prozirnost
+ Name[ca]=Translucidesa
+ Name[cs]=Průhlednost
+ Name[da]=Gennemsigtighed
+ Name[de]=Transparenz
++Name[el]=Hμιδιαφάνεια
+ Name[es]=Translúcido
+ Name[et]=Läbipaistvus
++Name[eu]=Gardentasuna
+ Name[fi]=Läpikuultavuus
+ Name[fr]=Transparence
+ Name[fy]=Trochsichtighyd
+@@ -26,6 +29,7 @@
+ Name[hu]=ÃttetszÅ‘ség
+ Name[is]=Gegnsæi
+ Name[it]=Trasparenza
++Name[ja]=é€éŽæ€§
+ Name[lt]=Permatomumas
+ Name[nb]=Gjennomsiktighet
+ Name[nl]=Transparantie
+@@ -34,28 +38,32 @@
+ Name[pt]=Trasparência
+ Name[pt_BR]=Translúcido
+ Name[ru]=ПолупрозрачноÑть
++Name[sk]=Priesvitnosť
+ Name[sl]=Prosojnost
+ Name[sr]=ПрозирноÑÑ‚
+-Name[sr@Latn]=ПрозирноÑÑ‚
++Name[sr@Latn]=Prozirnost
+ Name[sv]=Genomskinlighet
+ Name[ta]=ஒளிகசிவà¯
+ Name[uk]=ПрозоріÑть
+-Name[xx]=xxTranslucencyxx
+
+ Comment=Configure window translucency and shadow management
+ Comment[bg]=ÐаÑтройки на полупрозрачноÑтта и Ñенките на прозорците
+ Comment[bn]=উইণà§à¦¡à§‹à¦° সমসà§à¦¬à¦šà§à¦›à¦¤à¦¾ à¦à¦¬à¦‚ ছায়া কনফিগার করà§à¦¨
++Comment[bs]=Podesite prozirnost prozora i podesite sjenke
+ Comment[ca]=Configura la translucidesa de finestres i gestiona l'ombra
+ Comment[cs]=Nastavenà průhlednosti a stÃnovánà oken
+ Comment[da]=Indstil vinduets gennemsigtighed og skyggehåndtering
+ Comment[de]=Einrichtung der Fenstertransparenz und Schatten
++Comment[el]=ΡÏθμιση ημιδιαφάνειας παÏαθÏÏου και διαχείÏισης σκίασης
+ Comment[es]=Configurar la opacidad de la ventana y gestión de sombra
+ Comment[et]=Akende läbipaistvuse ja varjude seadistamine
++Comment[eu]=Konfiguratu leiho gardentasunak eta itzalen kudeaketa
+ Comment[fi]=Muokkaa ikkunoinnin läpikuultavuus ja varjostus
+ Comment[fr]=Configuration de la transparence et de l'ombre des fenêtres
+ Comment[hu]=Az ablakkezelés áttetszÅ‘ségi és árnyékolási beállÃtásai
+ Comment[is]=Stilla gegnsæi glugga og sýsla með skugga
+ Comment[it]=Configura la trasparenza e le ombre delle finestre
++Comment[ja]=ウィンドウã®é€éŽæ€§ã¨å½±ã®è¨å®š
+ Comment[lt]=Konfigūruoti langų permatomumą ir šešėlius
+ Comment[nb]=Tilpass behandling av vindusgjennomsiktighet og -skygge
+ Comment[nl]=Venstertransparantie- en -schaduwbeheer instellen
+@@ -64,35 +72,38 @@
+ Comment[pt]=Configuração da transparência e sombras de janelas
+ Comment[pt_BR]=Configura o gerenciamento de sombra e transparência da janela
+ Comment[ru]=ÐаÑтройка полупрозрачноÑти и теней окна
++Comment[sk]=Nastavenie priesvitnosti okien a správa tieňov
+ Comment[sl]=Nastavitve prosojnosti oken in upravljanje s sencami
+ Comment[sr]=Подешавање прозирноÑти прозора и управљање Ñенкама
+-Comment[sr@Latn]=Подешавање прозирноÑти прозора и управљање Ñенкама
++Comment[sr@Latn]=Podešavanje prozirnosti prozora i upravljanje senkama
+ Comment[sv]=Anpassa fönstergenomskinlighet och skugghantering
+ Comment[ta]=சாளர ஒளிகசிவ௠மறà¯à®±à¯à®®à¯ நிழல௠மேலாணà¯à®®à¯ˆà®¯à¯ˆ வடிவமை
+ Comment[uk]=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¾Ð·Ð¾Ñ€Ð¾Ñті вікон та ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð°Ñ‚Ñ–Ð½ÐµÐ½Ð½Ñм
+-Comment[xx]=xxConfigure window translucency and shadow managementxx
+
+ Keywords=translucency,transparence,shadows
+ Keywords[bg]=полупрозрачноÑÑ‚, прозрачноÑÑ‚, ÑÑнка, Ñенки, translucency, transparence, shadows
++Keywords[bs]=translucency,transparence,shadows,providnost,sjene,sjenke,sjenka
+ Keywords[ca]=translucidesa,transparència,ombres
+ Keywords[cs]=průhlednost,průsvitnost,stÃn
+ Keywords[da]=gennemsigtighed,transparens,skygge
+ Keywords[es]=translucido,transparente,sombras,opacidad
+ Keywords[et]=läbipaistvus,läbipaistev,vari
++Keywords[eu]=gardena,gardentasunak,itzalak
+ Keywords[fi]=läpikuultavuus, läpinäkyvyys, varjot
+ Keywords[fr]=translucidité,translucide,transparence,transparent,ombre
+ Keywords[hu]=áttetszőség,áttetsző,árnyékok
+ Keywords[it]=trasparenza,ombre
++Keywords[ja]=é€éŽæ€§,逿˜Ž,å½±
+ Keywords[lt]=translucency,transparence,shadows,permatomumas,šešėliai
+ Keywords[nb]=gjennomsiktighet,skygge
+ Keywords[nl]=translucency,transparantie,schaduwen
+ Keywords[pl]=przezroczystość,półprzezroczystość,prześwitywanie,cień,cienie
+ Keywords[pt]=transparência,sombras
+ Keywords[pt_BR]=translúcido,transparência,sombras
++Keywords[sk]=priesvitnosť,priehľadnosť,tiene
+ Keywords[sl]=prosojnost,prozornost,sence
+ Keywords[sr]=translucency,transparence,shadows,провидноÑÑ‚,Ñенке
+-Keywords[sr@Latn]=translucency,transparence,shadows,провидноÑÑ‚,Ñенке
++Keywords[sr@Latn]=translucency,transparence,shadows,providnost,senke
+ Keywords[sv]=genomskinlighet,skuggor
+ Keywords[ta]=ஒளிகசிவà¯,ஊடகதà¯à®¤à®©à¯à®®à¯ˆ,நிழலà¯à®•ளà¯
+ Keywords[uk]=translucency,transparence,shadows,прозоріÑть,напівпрозоріÑть,тіні
+-Keywords[xx]=xxtranslucency,transparence,shadowsxx
+diff -Nru kdebase-release-3.4.0/kwin/kcmkwin/kwinrules/kwinrules.desktop kdebase-branch-3.4/kwin/kcmkwin/kwinrules/kwinrules.desktop
+--- kdebase-release-3.4.0/kwin/kcmkwin/kwinrules/kwinrules.desktop 2005-02-23 00:06:00.000000000 -0500
++++ kdebase-branch-3.4/kwin/kcmkwin/kwinrules/kwinrules.desktop 2005-03-28 02:02:17.000000000 -0500
+@@ -12,6 +12,7 @@
+ Name=Window-Specific Settings
+ Name[bg]=ПотребителÑки
+ Name[bn]=উইণà§à¦¡à§‹-পà§à¦°à¦¤à¦¿ সেটিংস
++Name[bs]=Postavke specifiÄne za ovaj prozor
+ Name[ca]=Arranjament especÃfic de finestra
+ Name[cs]=Specifická nastavenà oken
+ Name[cy]=Gosodiadau sy'n Benodol i'r Ffenestr
+@@ -19,14 +20,16 @@
+ Name[de]=Fensterspezifische Einstellungen
+ Name[es]=Preferencias especÃficas de la ventana
+ Name[et]=Akende seadistused
++Name[eu]=Leihoen ezarpen espezifikoak
+ Name[fi]=Ikkunakohtaiset asetukset
+ Name[fr]=Paramètres spécifiques à la fenêtre
+-Name[fy]=Finsterspesifike ynstellingen
++Name[fy]=Finsterspesifike ynstellings
+ Name[he]=הגדרות ×—×œ×•× ×•×ª ספציפיות
+ Name[hi]=विशिषà¥à¤Ÿ-विंडो विनà¥à¤¯à¤¾à¤¸
+ Name[hu]=Egyedi ablakbeállÃtások
+-Name[is]=Stillingar þessa glugga
++Name[is]=Stillingar einstakra glugga
+ Name[it]=Impostazioni specifiche della finestra
++Name[ja]=ウィンドウ固有ã®è¨å®š
+ Name[lt]=Nuo lango priklausantys nustatymai
+ Name[nb]=Innstillinger for vinduer
+ Name[nn]=Instillingar for vindauge
+@@ -36,13 +39,13 @@
+ Name[pt_BR]=Configurações EspecÃficas da Janela
+ Name[ru]=ОÑобые параметры окна
+ Name[se]=Láseheivehusat
++Name[sk]=Jednotlivé okná
+ Name[sl]=Nastavitve glede na okno
+ Name[sr]=ПоÑебне поÑтавке за прозоре
+-Name[sr@Latn]=ПоÑебне поÑтавке за прозоре
++Name[sr@Latn]=Posebne postavke za prozore
+ Name[sv]=Fönsterspecifika inställningar
+ Name[ta]=சாளர-கà¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà¯à®®à¯ அமைபà¯à®ªà¯à®•ளà¯
+ Name[uk]=Параметри Ð´Ð»Ñ Ð¾ÐºÑ€ÐµÐ¼Ð¸Ñ… вікон
+-Name[xx]=xxWindow-Specific Settingsxx
+
+ Comment=Configure settings specifically for a window
+ Comment[bg]=ПотребителÑки наÑтройки на прозорците
+@@ -59,7 +62,7 @@
+ Comment[eu]=Konfiguratu leiho jakin baten ezarpenak
+ Comment[fi]=Muokkaa ikkunakohtaisia asetuksia
+ Comment[fr]=Configuration de paramètres spécifiques à une fenêtre
+-Comment[fy]=Hjir kinst ynstellingen kieze spesifyk foar ien finster
++Comment[fy]=Hjir kinst ynstellings kieze spesifyk foar ien finster
+ Comment[gl]=Configuración das opcións especÃficas para unha fiestra
+ Comment[he]=קבע הגדרות לחלון מסוי×
+ Comment[hi]=किसी खास विंडो के लिठविनà¥à¤¯à¤¾à¤¸ कॉनà¥à¤«à¤¼à¤¿à¤—र करें
+@@ -84,14 +87,13 @@
+ Comment[sk]=Nastavenie pre jednotlivé okná
+ Comment[sl]=Nastavite možnosti glede na posamezno okno
+ Comment[sr]=Подешавање поÑтавки поÑебно за прозор
+-Comment[sr@Latn]=Подешавање поÑтавки поÑебно за прозор
++Comment[sr@Latn]=Podešavanje postavki posebno za prozor
+ Comment[sv]=Anpassa inställningar specifikt för ett fönster
+ Comment[ta]=KDE செயலà¯à®¤à®¿à®±à®©à¯ˆ அதிகபà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®®à¯ அமைபà¯à®ªà¯à®•ளை அமை
+ Comment[tr]=Bir pencere için özel olan seçenekleri yapılandır
+ Comment[uk]=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ–Ð² Ð´Ð»Ñ Ð¾ÐºÑ€ÐµÐ¼Ð¾Ð³Ð¾ типу вікон
+ Comment[uz]=Ойнага оид бўлган моÑламаларни моÑлаш
+ Comment[wa]=Apontiaedjes specifikes po on purnea
+-Comment[xx]=xxConfigure settings specifically for a windowxx
+ Comment[zh_CN]=é…置一个窗å£çš„设置
+
+ Keywords=size,position,state,window behavior,windows,specific,workarounds,remember,rules
+@@ -131,12 +133,11 @@
+ Keywords[sk]=veľkosÅ¥,pozÃcia,stav,chovanie okna,okná,Å¡pecifické,jedno okno,opravy,pravidlá
+ Keywords[sl]=velikost,položaj,stanje,obnašanje okna,okna,posebno,obvoz,zapomni,pravila
+ Keywords[sr]=величина,позиција,Ñтање,понашање прозора,прозори,запамти,правила
+-Keywords[sr@Latn]=величина,позиција,Ñтање,понашање прозора,прозори,запамти,правила
++Keywords[sr@Latn]=veliÄina,pozicija,stanje,ponaÅ¡anje prozora,prozori,zapamti,pravila
+ Keywords[sv]=storlek,position,tillstånd,fönsterbeteende,fönster,specifik,komma runt,komma ihåg,regler
+ Keywords[ta]=அளவà¯,நிலை,மாநிலமà¯,சாளர நடதà¯à®¤à¯ˆ,சாளரஙà¯à®•ளà¯,கà¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà¯à®Ÿ,பணிவடà¯à®Ÿà®¾à®°à®™à¯à®•ளà¯,விதிகளà¯
+ Keywords[tr]=boyut,yer,pozisyon,durum,pencere davranışı,pencereler,özel,çalışma alanı,hatırla,kurallar
+ Keywords[uk]=розмір,позиціÑ,Ñтан,поведінка вікна,вікна,окремі,підігнати,запам'Ñтати,правила
+ Keywords[uz]=ўлчам,жой,ҳолат,ойнанинг хуÑуÑиÑтлари,ойналар,махÑуÑ,ÑÑлаб қолиш,қоидалар
+-Keywords[xx]=xxsize,position,state,window behavior,windows,specific,workarounds,remember,rulesxx
+ Keywords[zh_CN]=size,position,state,window behavior,windows,specific,workarounds,remember,rules,大å°,ä½ç½®,状æ€,窗å£è¡Œä¸º,窗å£,特定,工作区,è®°ä½,规则
+ Categories=Qt;KDE;X-KDE-settings-desktop;
+diff -Nru kdebase-release-3.4.0/kwin/layers.cpp kdebase-branch-3.4/kwin/layers.cpp
+--- kdebase-release-3.4.0/kwin/layers.cpp 2005-02-03 10:50:23.000000000 -0500
++++ kdebase-branch-3.4/kwin/layers.cpp 2005-03-14 13:24:19.000000000 -0500
+@@ -483,11 +483,11 @@
+ {
+ Layer l = (*it)->layer();
+ // If a window is raised above some other window in the same window group
+- // which is in a higher layer, make sure it stays above that window (see #95731).
+- if(( l == NormalLayer || l == AboveLayer )
+- && !(*it)->isDock()
+- && minimum_layer.contains( (*it)->group())
+- && l < minimum_layer[ (*it)->group() ] )
++ // which is in the ActiveLayer (i.e. it's fulscreened), make sure it stays
++ // above that window (see #95731).
++ if( minimum_layer.contains( (*it)->group())
++ && minimum_layer[ (*it)->group() ] == ActiveLayer
++ && ( l == NormalLayer || l == AboveLayer ))
+ {
+ l = minimum_layer[ (*it)->group() ];
+ }
+@@ -721,9 +721,10 @@
+ // only raise fullscreen above docks if it's the topmost window in unconstrained stacking order,
+ // i.e. the window set to be topmost by the user (also includes transients of the fullscreen window)
+ const Client* ac = workspace()->mostRecentlyActivatedClient(); // instead of activeClient() - avoids flicker
+- if( isFullScreen() && ac != NULL
+- && workspace()->topClientOnDesktop( desktop(), true ) == ac
+- && ( ac == this || this->hasTransient( ac, true )))
++ const Client* top = workspace()->topClientOnDesktop( desktop(), true );
++ if( isFullScreen() && ac != NULL && top != NULL
++ && ( ac == this || this->hasTransient( ac, true ))
++ && ( top == this || this->hasTransient( top, true )))
+ return ActiveLayer;
+ if( keepAbove())
+ return AboveLayer;
+diff -Nru kdebase-release-3.4.0/kxkb/keyboard.desktop kdebase-branch-3.4/kxkb/keyboard.desktop
+--- kdebase-release-3.4.0/kxkb/keyboard.desktop 2005-02-04 23:15:49.000000000 -0500
++++ kdebase-branch-3.4/kxkb/keyboard.desktop 2005-03-07 09:16:18.000000000 -0500
+@@ -78,7 +78,6 @@
+ Name[vi]=BÃ n phÃm
+ Name[wa]=Taprece
+ Name[xh]=Ibhodi enezitshixo
+-Name[xx]=xxKeyboardxx
+ Name[zh_CN]=键盘
+ Name[zh_TW]=éµç›¤
+ Name[zu]=Ibhodi lokhiye
+@@ -151,7 +150,6 @@
+ Comment[vi]=Các thiết láºp bà n phÃm
+ Comment[wa]=Apontiaedje del taprece
+ Comment[xh]=Izicwangciso zebhodi enezitshixo
+-Comment[xx]=xxKeyboard settingsxx
+ Comment[zh_CN]=键盘设置
+ Comment[zh_TW]=éµç›¤è¨å®š
+ Comment[zu]=Izilungiselelo zebhodi lokhiye
+@@ -210,7 +208,6 @@
+ Keywords[ven]=Khiibodo,U dovholola ha Khiibodo,Tshileme tshau putedza,maano,dovholola,Tshileme
+ Keywords[vi]=Bà n phÃm,Bà n phÃm lặp,Nhấn và p âm lượng,Thiết bị và o,lặp,âm lượng
+ Keywords[xh]=Ibhodi yezitshixo,Ibhodi yezitshixo phinda, Nqakraza izinga lelizwi,Amacebo Ongeniso,phinda, izinga lelizwi
+-Keywords[xx]=xxKeyboard,Keyboard repeat,Click volume,Input Devices,repeat,volumexx
+ Keywords[zh_CN]=Keyboard,Keyboard repeat,Click volume,Input Devices,repeat,volume,键盘,键盘é‡å¤,击键音é‡,输入设备,é‡å¤,音é‡
+ Keywords[zh_TW]=Keyboard,Keyboard repeat,Click volume,Input Devices,repeat,volume,éµç›¤,éµç›¤é‡è¤‡,敲擊音é‡,輸入è£ç½®,é‡è¤‡é€Ÿåº¦,音é‡
+ Keywords[zu]=Ibhodi lokhiye,ukuphindwa kwebhodi lokhiye,Cofa izinga lomsindo, Amathuluzi anenjongo omphumela wangaphakathi,phinda,izina lomsindo
+diff -Nru kdebase-release-3.4.0/kxkb/keyboard_layout.desktop kdebase-branch-3.4/kxkb/keyboard_layout.desktop
+--- kdebase-release-3.4.0/kxkb/keyboard_layout.desktop 2005-02-10 23:52:24.000000000 -0500
++++ kdebase-branch-3.4/kxkb/keyboard_layout.desktop 2005-03-07 09:16:18.000000000 -0500
+@@ -78,7 +78,6 @@
+ Name[vi]=Kiểu bà n phÃm
+ Name[wa]=Adjinçmint del taprece
+ Name[xh]=Ubeko Lwebhodi yezitshixo
+-Name[xx]=xxKeyboard Layoutxx
+ Name[zh_CN]=键盘布局
+ Name[zh_TW]=éµç›¤é…ç½®
+ Name[zu]=Isendlalelo sebhodi lokhiye
+@@ -145,7 +144,6 @@
+ Comment[vi]=Kiểu bà n phÃm
+ Comment[wa]=Adjinçmint des tapes del taprece
+ Comment[xh]=Ubeko Lwebhodi yezitshixo
+-Comment[xx]=xxKeyboard Layoutxx
+ Comment[zh_CN]=键盘布局
+ Comment[zh_TW]=éµç›¤é…ç½®
+ Comment[zu]=Isendlalelo sebhodi lokhiye
+@@ -205,7 +203,6 @@
+ Keywords[vi]=Bà n phÃm,Kiểu,Quốc tế
+ Keywords[wa]=Taprece,Adjinçmint,eternåcionå,eternåcionåle
+ Keywords[xh]=Ibhodi yezitshixo,Ubeko lwebhodi yezitshixo, Okwemazwe ngamazwe
+-Keywords[xx]=xxKeyboard,Layout,Internationalxx
+ Keywords[zh_CN]=Keyboard,Layout,International,键盘,布局,国际
+ Keywords[zh_TW]=Keyboard,Layout,International,éµç›¤,é…ç½®,國際化
+ Keywords[zu]=Ibhodi lokhiye,Isendlalelo,Okwaphakathi kwezizwe
+diff -Nru kdebase-release-3.4.0/kxkb/kxkb.desktop kdebase-branch-3.4/kxkb/kxkb.desktop
+--- kdebase-release-3.4.0/kxkb/kxkb.desktop 2005-02-10 23:52:24.000000000 -0500
++++ kdebase-branch-3.4/kxkb/kxkb.desktop 2005-03-07 09:16:18.000000000 -0500
+@@ -66,7 +66,6 @@
+ Name[vi]=Công cụ ánh xạ phÃm
+ Name[wa]=Adjinçmint del taprece
+ Name[xh]=Isixhobo semaphu yebhodi enezitshixo
+-Name[xx]=xxKeyboard Map Toolxx
+ Name[zh_CN]=é”®ç›˜æ˜ å°„å·¥å…·
+ Name[zh_TW]=éµç›¤æ˜ 射工具
+ Name[zu]=Ithuluzi Lebalazwe lebhodi lokhiye
+diff -Nru kdebase-release-3.4.0/l10n/C/entry.desktop kdebase-branch-3.4/l10n/C/entry.desktop
+--- kdebase-release-3.4.0/l10n/C/entry.desktop 2005-02-23 00:06:00.000000000 -0500
++++ kdebase-branch-3.4/l10n/C/entry.desktop 2005-03-10 11:05:15.000000000 -0500
+@@ -1,6 +1,6 @@
+ [KCM Locale]
+ Name=Default
+-Name[af]=Verstek
++Name[af]=Standaard
+ Name[ar]=Ø§ÙØªØ±Ø§Ø¶ÙŠ
+ Name[az]=Ön Qurğulu
+ Name[be]=Па ўмаўчаньні
+@@ -56,7 +56,7 @@
+ Name[sk]=Štandardný
+ Name[sl]=Privzeto
+ Name[sr]=Подразумевано
+-Name[sr@Latn]=Predefinisano
++Name[sr@Latn]=Podrazumevano
+ Name[sv]=Förval
+ Name[ta]=à®®à¯à®©à¯à®©à®¿à®°à¯à®ªà¯à®ªà¯
+ Name[tg]=Пешфарзӣ
+@@ -67,7 +67,6 @@
+ Name[vi]=Mặc định
+ Name[wa]=Prémetou
+ Name[xh]=Okwendalo
+-Name[xx]=xxDefaultxx
+ Name[zh_CN]=默认
+ Name[zh_TW]=é è¨
+ Name[zu]=Okwendalo
+diff -Nru kdebase-release-3.4.0/l10n/ad/entry.desktop kdebase-branch-3.4/l10n/ad/entry.desktop
+--- kdebase-release-3.4.0/l10n/ad/entry.desktop 2004-12-11 01:37:17.000000000 -0500
++++ kdebase-branch-3.4/l10n/ad/entry.desktop 2005-03-07 09:16:20.000000000 -0500
+@@ -30,7 +30,6 @@
+ Name[uk]=Ðндорра
+ Name[uz]=Ðндорра
+ Name[wa]=Andore
+-Name[xx]=xxAndorraxx
+ Name[zh_TW]=安é“爾
+ Region=westeurope
+ Languages=ca,fr,es
+diff -Nru kdebase-release-3.4.0/l10n/ae/entry.desktop kdebase-branch-3.4/l10n/ae/entry.desktop
+--- kdebase-release-3.4.0/l10n/ae/entry.desktop 2005-02-04 23:15:50.000000000 -0500
++++ kdebase-branch-3.4/l10n/ae/entry.desktop 2005-03-07 09:16:20.000000000 -0500
+@@ -61,7 +61,6 @@
+ Name[uz]=Бирлашган Ðраб Ðмирликлари
+ Name[ven]=Mashango o tangananaho a Emirates
+ Name[wa]=Emirat Arabes Unis
+-Name[xx]=xxUnited Arab Emiratesxx
+ Name[zh_CN]=阿è”é…‹
+ Name[zh_TW]=阿拉伯è¯åˆå¤§å…¬åœ‹
+ Name[zu]=Izindawo zezinduna zase-United Arab
+diff -Nru kdebase-release-3.4.0/l10n/af/entry.desktop kdebase-branch-3.4/l10n/af/entry.desktop
+--- kdebase-release-3.4.0/l10n/af/entry.desktop 2005-01-22 23:38:55.000000000 -0500
++++ kdebase-branch-3.4/l10n/af/entry.desktop 2005-03-07 09:16:20.000000000 -0500
+@@ -47,7 +47,6 @@
+ Name[uk]=ÐфганіÑтан
+ Name[uz]=ÐфғониÑтон
+ Name[wa]=Afganistan
+-Name[xx]=xxAfghanistanxx
+ Name[zh_CN]=阿富汗
+ Name[zh_TW]=阿富汗
+ Region=centralasia
+diff -Nru kdebase-release-3.4.0/l10n/ag/entry.desktop kdebase-branch-3.4/l10n/ag/entry.desktop
+--- kdebase-release-3.4.0/l10n/ag/entry.desktop 2005-02-04 23:15:50.000000000 -0500
++++ kdebase-branch-3.4/l10n/ag/entry.desktop 2005-03-07 09:16:21.000000000 -0500
+@@ -66,7 +66,6 @@
+ Name[vi]=Antigua và Barbuda
+ Name[wa]=Antigua eyet Barbuda
+ Name[xh]=Antigua ne Barbuda
+-Name[xx]=xxAntigua and Barbudaxx
+ Name[zh_TW]=安地瓜島和巴布é”å³¶
+ Name[zu]=Antigua kanye ne-Barbuda
+ Region=caribbean
+diff -Nru kdebase-release-3.4.0/l10n/ai/entry.desktop kdebase-branch-3.4/l10n/ai/entry.desktop
+--- kdebase-release-3.4.0/l10n/ai/entry.desktop 2005-01-22 23:38:56.000000000 -0500
++++ kdebase-branch-3.4/l10n/ai/entry.desktop 2005-03-26 02:37:45.000000000 -0500
+@@ -4,6 +4,7 @@
+ Name[be]=ÐнгільÑ
+ Name[bg]=Ðнгила
+ Name[bn]=অà§à¦¯à¦¾à¦™à§à¦—à§à¦‡à¦²à¦¾
++Name[br]=Angilla
+ Name[cy]=Angwila
+ Name[el]=Ανγκουίλα
+ Name[eo]=Angvilo
+@@ -28,7 +29,6 @@
+ Name[uk]=ÐнгільÑ
+ Name[uz]=Ðнгвилла
+ Name[wa]=Anguila
+-Name[xx]=xxAnguillaxx
+ Name[zh_CN]=å®‰åœæ‹‰
+ Name[zh_TW]=阿爾åŠåˆ©äºž
+ Region=caribbean
+diff -Nru kdebase-release-3.4.0/l10n/al/entry.desktop kdebase-branch-3.4/l10n/al/entry.desktop
+--- kdebase-release-3.4.0/l10n/al/entry.desktop 2005-02-02 00:16:15.000000000 -0500
++++ kdebase-branch-3.4/l10n/al/entry.desktop 2005-03-07 09:16:21.000000000 -0500
+@@ -46,7 +46,6 @@
+ Name[uk]=ÐлбаніÑ
+ Name[uz]=ÐлбаниÑ
+ Name[wa]=Albaneye
+-Name[xx]=xxAlbaniaxx
+ Name[zh_CN]=阿尔巴尼亚
+ Name[zh_TW]=阿亞巴尼亞
+ Region=southeurope
+diff -Nru kdebase-release-3.4.0/l10n/am/entry.desktop kdebase-branch-3.4/l10n/am/entry.desktop
+--- kdebase-release-3.4.0/l10n/am/entry.desktop 2005-01-31 03:36:02.000000000 -0500
++++ kdebase-branch-3.4/l10n/am/entry.desktop 2005-03-07 09:16:21.000000000 -0500
+@@ -45,7 +45,6 @@
+ Name[uk]=ВірменіÑ
+ Name[uz]=ÐрманиÑтон
+ Name[wa]=Ã…rmeneye
+-Name[xx]=xxArmeniaxx
+ Name[zh_CN]=亚美尼亚
+ Name[zh_TW]=亞美尼亞
+ Region=middleeast
+diff -Nru kdebase-release-3.4.0/l10n/an/entry.desktop kdebase-branch-3.4/l10n/an/entry.desktop
+--- kdebase-release-3.4.0/l10n/an/entry.desktop 2005-02-16 23:19:05.000000000 -0500
++++ kdebase-branch-3.4/l10n/an/entry.desktop 2005-03-07 09:16:22.000000000 -0500
+@@ -56,7 +56,6 @@
+ Name[uz]=Ðидерландлар Ðнтил Ороллари
+ Name[vi]=HÃ Lan Antilles
+ Name[wa]=Antiyes Neyerlandesses
+-Name[xx]=xxNetherlands Antillesxx
+ Name[zh_TW]=è·å±¬å®‰åœ°åˆ—斯群島
+ Region=caribbean
+ Languages=nl,en_GB,es
+diff -Nru kdebase-release-3.4.0/l10n/ao/entry.desktop kdebase-branch-3.4/l10n/ao/entry.desktop
+--- kdebase-release-3.4.0/l10n/ao/entry.desktop 2005-01-22 23:38:57.000000000 -0500
++++ kdebase-branch-3.4/l10n/ao/entry.desktop 2005-03-07 09:16:22.000000000 -0500
+@@ -24,7 +24,6 @@
+ Name[th]=à¹à¸à¸‡à¹‚à¸à¸¥à¸²
+ Name[uk]=Ðнгола
+ Name[uz]=Ðнгола
+-Name[xx]=xxAngolaxx
+ Name[zh_CN]=安哥拉
+ Name[zh_TW]=安哥拉
+ Region=southafrica
+diff -Nru kdebase-release-3.4.0/l10n/ar/entry.desktop kdebase-branch-3.4/l10n/ar/entry.desktop
+--- kdebase-release-3.4.0/l10n/ar/entry.desktop 2005-01-22 23:38:57.000000000 -0500
++++ kdebase-branch-3.4/l10n/ar/entry.desktop 2005-03-07 09:16:22.000000000 -0500
+@@ -43,7 +43,6 @@
+ Name[uz]=Ðргентина
+ Name[ven]=Agenthina
+ Name[wa]=Ã…rdjintene
+-Name[xx]=xxArgentinaxx
+ Name[zh_CN]=é˜¿æ ¹å»·
+ Name[zh_TW]=é˜¿æ ¹å»·
+ Region=southamerica
+diff -Nru kdebase-release-3.4.0/l10n/as/entry.desktop kdebase-branch-3.4/l10n/as/entry.desktop
+--- kdebase-release-3.4.0/l10n/as/entry.desktop 2005-02-04 23:15:51.000000000 -0500
++++ kdebase-branch-3.4/l10n/as/entry.desktop 2005-03-07 09:16:23.000000000 -0500
+@@ -57,7 +57,6 @@
+ Name[uk]=ÐмериканÑьке Самоа
+ Name[uz]=Ðмерика СамоаÑи
+ Name[wa]=Samowa Amerikinne
+-Name[xx]=xxAmerican Samoaxx
+ Name[zh_TW]=美屬薩摩亞
+ Region=oceania
+ Languages=en_US
+diff -Nru kdebase-release-3.4.0/l10n/at/entry.desktop kdebase-branch-3.4/l10n/at/entry.desktop
+--- kdebase-release-3.4.0/l10n/at/entry.desktop 2005-02-04 23:15:51.000000000 -0500
++++ kdebase-branch-3.4/l10n/at/entry.desktop 2005-03-07 09:16:23.000000000 -0500
+@@ -58,7 +58,6 @@
+ Name[ven]=Ositiria
+ Name[vi]=Ão
+ Name[wa]=Otriche
+-Name[xx]=xxAustriaxx
+ Name[zh_CN]=奥地利
+ Name[zh_TW]=奧地利
+ Region=centraleurope
+diff -Nru kdebase-release-3.4.0/l10n/au/entry.desktop kdebase-branch-3.4/l10n/au/entry.desktop
+--- kdebase-release-3.4.0/l10n/au/entry.desktop 2005-02-04 23:15:51.000000000 -0500
++++ kdebase-branch-3.4/l10n/au/entry.desktop 2005-03-07 09:16:23.000000000 -0500
+@@ -55,7 +55,6 @@
+ Name[ven]=Ositiralia
+ Name[vi]=Úc
+ Name[wa]=Ostraleye
+-Name[xx]=xxAustraliaxx
+ Name[zh_CN]=澳大利亚
+ Name[zh_TW]=澳大利亞
+ Region=oceania
+diff -Nru kdebase-release-3.4.0/l10n/aw/entry.desktop kdebase-branch-3.4/l10n/aw/entry.desktop
+--- kdebase-release-3.4.0/l10n/aw/entry.desktop 2005-02-04 23:15:52.000000000 -0500
++++ kdebase-branch-3.4/l10n/aw/entry.desktop 2005-03-07 09:16:23.000000000 -0500
+@@ -25,7 +25,6 @@
+ Name[uk]=Ðруба
+ Name[uz]=Ðруба
+ Name[wa]=Arouba
+-Name[xx]=xxArubaxx
+ Name[zh_TW]=阿é¯å·´
+ Region=caribbean
+ Languages=nl,en_GB,sp
+diff -Nru kdebase-release-3.4.0/l10n/az/entry.desktop kdebase-branch-3.4/l10n/az/entry.desktop
+--- kdebase-release-3.4.0/l10n/az/entry.desktop 2005-02-04 23:15:52.000000000 -0500
++++ kdebase-branch-3.4/l10n/az/entry.desktop 2005-03-07 09:16:24.000000000 -0500
+@@ -56,7 +56,6 @@
+ Name[uk]=Ðзербайджан
+ Name[uz]=Озарбайжон
+ Name[wa]=Azerbaydjan
+-Name[xx]=xxAzerbaijanxx
+ Name[zh_CN]=阿塞拜疆
+ Name[zh_TW]=亞塞拜然
+
+diff -Nru kdebase-release-3.4.0/l10n/ba/entry.desktop kdebase-branch-3.4/l10n/ba/entry.desktop
+--- kdebase-release-3.4.0/l10n/ba/entry.desktop 2005-02-04 23:15:52.000000000 -0500
++++ kdebase-branch-3.4/l10n/ba/entry.desktop 2005-03-07 09:16:24.000000000 -0500
+@@ -66,7 +66,6 @@
+ Name[vi]=Bosnia và Herzegovina
+ Name[wa]=Bosneye
+ Name[xh]=Bosnia ne Herzegovina
+-Name[xx]=xxBosnia and Herzegovinaxx
+ Name[zh_TW]=波士尼亞與赫塞哥ç¶ç´
+ Name[zu]=Bosnia kanye ne-Herzegovina
+ Region=southeurope
+diff -Nru kdebase-release-3.4.0/l10n/bb/entry.desktop kdebase-branch-3.4/l10n/bb/entry.desktop
+--- kdebase-release-3.4.0/l10n/bb/entry.desktop 2005-01-22 23:38:58.000000000 -0500
++++ kdebase-branch-3.4/l10n/bb/entry.desktop 2005-03-07 09:16:24.000000000 -0500
+@@ -28,7 +28,6 @@
+ Name[uk]=БарбадоÑ
+ Name[uz]=БарбадоÑ
+ Name[wa]=BÃ¥rbades
+-Name[xx]=xxBarbadosxx
+ Name[zh_CN]=巴巴多斯
+ Name[zh_TW]=å·´è²å¤š
+ Region=caribbean
+diff -Nru kdebase-release-3.4.0/l10n/bd/entry.desktop kdebase-branch-3.4/l10n/bd/entry.desktop
+--- kdebase-release-3.4.0/l10n/bd/entry.desktop 2004-12-11 01:37:21.000000000 -0500
++++ kdebase-branch-3.4/l10n/bd/entry.desktop 2005-03-07 09:16:24.000000000 -0500
+@@ -41,7 +41,6 @@
+ Name[tr]=BangladeÅŸ
+ Name[uk]=Бангладеш
+ Name[uz]=Бангладеш
+-Name[xx]=xxBangladeshxx
+ Name[zh_TW]=åŸåŠ æ‹‰
+ Region=southasia
+ Languages=bn,en_GB
+diff -Nru kdebase-release-3.4.0/l10n/be/entry.desktop kdebase-branch-3.4/l10n/be/entry.desktop
+--- kdebase-release-3.4.0/l10n/be/entry.desktop 2005-02-04 23:15:52.000000000 -0500
++++ kdebase-branch-3.4/l10n/be/entry.desktop 2005-03-07 09:16:25.000000000 -0500
+@@ -65,7 +65,6 @@
+ Name[uz]=БелгиÑ
+ Name[vi]=Bỉ
+ Name[wa]=Beldjike
+-Name[xx]=xxBelgiumxx
+ Name[zh_TW]=比利時
+ Region=westeurope
+ Languages=nl_BE,fr_BE,de_BE,nl,fr,de,wa
+diff -Nru kdebase-release-3.4.0/l10n/bf/entry.desktop kdebase-branch-3.4/l10n/bf/entry.desktop
+--- kdebase-release-3.4.0/l10n/bf/entry.desktop 2004-12-11 01:37:21.000000000 -0500
++++ kdebase-branch-3.4/l10n/bf/entry.desktop 2005-03-07 09:16:25.000000000 -0500
+@@ -26,7 +26,6 @@
+ Name[uk]=Буркіна-ФаÑо
+ Name[uz]=Буркина-ФаÑÑо
+ Name[wa]=Bourkina Fasso
+-Name[xx]=xxBurkina Fasoxx
+ Name[zh_TW]=布å‰ç´æ³•ç´¢
+ Region=westafrica
+ Languages=fr
+diff -Nru kdebase-release-3.4.0/l10n/bg/entry.desktop kdebase-branch-3.4/l10n/bg/entry.desktop
+--- kdebase-release-3.4.0/l10n/bg/entry.desktop 2005-02-04 23:15:53.000000000 -0500
++++ kdebase-branch-3.4/l10n/bg/entry.desktop 2005-03-07 09:16:25.000000000 -0500
+@@ -55,7 +55,6 @@
+ Name[uz]=БолгариÑ
+ Name[ven]=Baligaria
+ Name[wa]=Bulgåreye
+-Name[xx]=xxBulgariaxx
+ Name[zh_TW]=ä¿åŠ åˆ©äºž
+ Region=easteurope
+ Languages=bg
+diff -Nru kdebase-release-3.4.0/l10n/bh/entry.desktop kdebase-branch-3.4/l10n/bh/entry.desktop
+--- kdebase-release-3.4.0/l10n/bh/entry.desktop 2005-01-10 23:17:59.000000000 -0500
++++ kdebase-branch-3.4/l10n/bh/entry.desktop 2005-03-07 09:16:26.000000000 -0500
+@@ -41,7 +41,6 @@
+ Name[uk]=Бахрейн
+ Name[uz]=Баҳрайн
+ Name[wa]=Bareyn
+-Name[xx]=xxBahrainxx
+ Name[zh_TW]=å·´æž—
+ Region=middleeast
+ Languages=ar
+diff -Nru kdebase-release-3.4.0/l10n/bi/entry.desktop kdebase-branch-3.4/l10n/bi/entry.desktop
+--- kdebase-release-3.4.0/l10n/bi/entry.desktop 2004-12-11 01:37:22.000000000 -0500
++++ kdebase-branch-3.4/l10n/bi/entry.desktop 2005-03-07 09:16:26.000000000 -0500
+@@ -25,7 +25,6 @@
+ Name[uk]=Бурунді
+ Name[uz]=Бурунди
+ Name[wa]=Bouroundi
+-Name[xx]=xxBurundixx
+ Name[zh_TW]=浦隆地
+ Region=centralafrica
+ Languages=fr
+diff -Nru kdebase-release-3.4.0/l10n/bj/entry.desktop kdebase-branch-3.4/l10n/bj/entry.desktop
+--- kdebase-release-3.4.0/l10n/bj/entry.desktop 2005-01-22 23:38:58.000000000 -0500
++++ kdebase-branch-3.4/l10n/bj/entry.desktop 2005-03-07 09:16:26.000000000 -0500
+@@ -25,7 +25,6 @@
+ Name[th]=เบนิน
+ Name[uk]=Бенін
+ Name[uz]=Бенин
+-Name[xx]=xxBeninxx
+ Name[zh_CN]=è´å®
+ Name[zh_TW]=è²å—
+ Region=westafrica
+diff -Nru kdebase-release-3.4.0/l10n/bm/entry.desktop kdebase-branch-3.4/l10n/bm/entry.desktop
+--- kdebase-release-3.4.0/l10n/bm/entry.desktop 2005-01-31 03:36:03.000000000 -0500
++++ kdebase-branch-3.4/l10n/bm/entry.desktop 2005-03-07 09:16:26.000000000 -0500
+@@ -34,7 +34,6 @@
+ Name[uk]=Бермуди
+ Name[uz]=Бермуда Ороллари
+ Name[wa]=Bermudes
+-Name[xx]=xxBermudaxx
+ Name[zh_TW]=百慕é”
+ Region=northamerica
+ Languages=en_GB
+diff -Nru kdebase-release-3.4.0/l10n/bn/entry.desktop kdebase-branch-3.4/l10n/bn/entry.desktop
+--- kdebase-release-3.4.0/l10n/bn/entry.desktop 2005-02-04 23:15:53.000000000 -0500
++++ kdebase-branch-3.4/l10n/bn/entry.desktop 2005-03-07 09:16:27.000000000 -0500
+@@ -40,7 +40,6 @@
+ Name[uk]=Бруней ДаруÑÑалам
+ Name[uz]=Бруней ДоруÑÑалом
+ Name[wa]=Bruney Darussalam
+-Name[xx]=xxBrunei Darussalamxx
+ Name[zh_TW]=æ–‡èŠé”é¯è–©è˜
+ Region=southeastasia
+ Languages=ms,zn_CN
+diff -Nru kdebase-release-3.4.0/l10n/bo/entry.desktop kdebase-branch-3.4/l10n/bo/entry.desktop
+--- kdebase-release-3.4.0/l10n/bo/entry.desktop 2005-01-22 23:38:59.000000000 -0500
++++ kdebase-branch-3.4/l10n/bo/entry.desktop 2005-03-07 09:16:27.000000000 -0500
+@@ -48,7 +48,6 @@
+ Name[uk]=БолівіÑ
+ Name[uz]=БоливиÑ
+ Name[wa]=Boliveye
+-Name[xx]=xxBoliviaxx
+ Name[zh_CN]=玻利维亚
+ Name[zh_TW]=玻利ç¶äºž
+ Region=southamerica
+diff -Nru kdebase-release-3.4.0/l10n/br/entry.desktop kdebase-branch-3.4/l10n/br/entry.desktop
+--- kdebase-release-3.4.0/l10n/br/entry.desktop 2005-02-04 23:15:53.000000000 -0500
++++ kdebase-branch-3.4/l10n/br/entry.desktop 2005-03-07 09:16:27.000000000 -0500
+@@ -60,7 +60,6 @@
+ Name[uz]=БразилиÑ
+ Name[ven]=Burazili
+ Name[wa]=Braezi
+-Name[xx]=xxBrazilxx
+ Name[zh_CN]=巴西
+ Name[zh_TW]=巴西
+ Region=southamerica
+diff -Nru kdebase-release-3.4.0/l10n/bs/entry.desktop kdebase-branch-3.4/l10n/bs/entry.desktop
+--- kdebase-release-3.4.0/l10n/bs/entry.desktop 2005-01-31 03:36:03.000000000 -0500
++++ kdebase-branch-3.4/l10n/bs/entry.desktop 2005-03-07 09:16:27.000000000 -0500
+@@ -36,7 +36,6 @@
+ Name[tr]=Bahamalar
+ Name[uk]=Багами
+ Name[uz]=Багама Ороллари
+-Name[xx]=xxBahamasxx
+ Name[zh_TW]=巴拿馬
+ Region=caribbean
+ Languages=en_GB,es
+diff -Nru kdebase-release-3.4.0/l10n/bt/entry.desktop kdebase-branch-3.4/l10n/bt/entry.desktop
+--- kdebase-release-3.4.0/l10n/bt/entry.desktop 2005-01-31 03:36:04.000000000 -0500
++++ kdebase-branch-3.4/l10n/bt/entry.desktop 2005-03-07 09:16:28.000000000 -0500
+@@ -39,7 +39,6 @@
+ Name[uk]=Бутан
+ Name[uz]=Бутан
+ Name[wa]=Boutan
+-Name[xx]=xxBhutanxx
+ Name[zh_TW]=ä¸ä¸¹
+ Region=southasia
+ Languages=dz,en
+diff -Nru kdebase-release-3.4.0/l10n/bw/entry.desktop kdebase-branch-3.4/l10n/bw/entry.desktop
+--- kdebase-release-3.4.0/l10n/bw/entry.desktop 2005-01-31 03:36:04.000000000 -0500
++++ kdebase-branch-3.4/l10n/bw/entry.desktop 2005-03-07 09:16:28.000000000 -0500
+@@ -31,7 +31,6 @@
+ Name[uk]=БотÑвана
+ Name[uz]=Боцвана
+ Name[wa]=Boswana
+-Name[xx]=xxBotswanaxx
+ Name[zh_TW]=æ³¢æœé‚£
+ Region=southafrica
+ Languages=en_GB,ts
+diff -Nru kdebase-release-3.4.0/l10n/by/entry.desktop kdebase-branch-3.4/l10n/by/entry.desktop
+--- kdebase-release-3.4.0/l10n/by/entry.desktop 2005-02-04 23:15:54.000000000 -0500
++++ kdebase-branch-3.4/l10n/by/entry.desktop 2005-03-07 09:16:28.000000000 -0500
+@@ -53,7 +53,6 @@
+ Name[uk]=БілоруÑÑ–Ñ
+ Name[uz]=БелоруÑ
+ Name[wa]=Belaruss
+-Name[xx]=xxBelarusxx
+ Name[zh_TW]=白俄羅斯
+ Region=easteurope
+ Languages=be,ru
+diff -Nru kdebase-release-3.4.0/l10n/bz/entry.desktop kdebase-branch-3.4/l10n/bz/entry.desktop
+--- kdebase-release-3.4.0/l10n/bz/entry.desktop 2005-01-31 03:36:04.000000000 -0500
++++ kdebase-branch-3.4/l10n/bz/entry.desktop 2005-03-07 09:16:29.000000000 -0500
+@@ -27,7 +27,6 @@
+ Name[tg]=Белиз
+ Name[uk]=Беліз
+ Name[uz]=Белиз
+-Name[xx]=xxBelizexx
+ Name[zh_TW]=比利時
+ Region=centralamerica
+ Languages=en_GB,es
+diff -Nru kdebase-release-3.4.0/l10n/ca/entry.desktop kdebase-branch-3.4/l10n/ca/entry.desktop
+--- kdebase-release-3.4.0/l10n/ca/entry.desktop 2005-02-04 23:15:54.000000000 -0500
++++ kdebase-branch-3.4/l10n/ca/entry.desktop 2005-03-07 09:16:29.000000000 -0500
+@@ -58,7 +58,6 @@
+ Name[tr]=Kanada
+ Name[uk]=Канада
+ Name[uz]=Канада
+-Name[xx]=xxCanadaxx
+ Name[zh_CN]=åŠ æ‹¿å¤§
+ Name[zh_TW]=åŠ æ‹¿å¤§
+ Region=northamerica
+diff -Nru kdebase-release-3.4.0/l10n/caribbean.desktop kdebase-branch-3.4/l10n/caribbean.desktop
+--- kdebase-release-3.4.0/l10n/caribbean.desktop 2005-02-04 23:15:49.000000000 -0500
++++ kdebase-branch-3.4/l10n/caribbean.desktop 2005-03-07 09:16:18.000000000 -0500
+@@ -63,5 +63,4 @@
+ Name[uk]=КарибÑькі оÑтрови
+ Name[uz]=Кариб Ороллари
+ Name[wa]=Carayibes
+-Name[xx]=xxCaribbeanxx
+ Name[zh_TW]=åŠ å‹’æ¯”
+diff -Nru kdebase-release-3.4.0/l10n/cc/entry.desktop kdebase-branch-3.4/l10n/cc/entry.desktop
+--- kdebase-release-3.4.0/l10n/cc/entry.desktop 2005-02-04 23:15:54.000000000 -0500
++++ kdebase-branch-3.4/l10n/cc/entry.desktop 2005-03-07 09:16:29.000000000 -0500
+@@ -52,7 +52,6 @@
+ Name[uk]=КокоÑові оÑтрови
+ Name[uz]=ÐšÐ¾ÐºÐ¾Ñ (Килинг) Ороллари
+ Name[wa]=Iyes Cocos
+-Name[xx]=xxCocos (Keeling) Islandsxx
+ Name[zh_TW]=å¯å¯æ–¯ç¾¤å³¶
+ Region=southeastasia
+ Languages=ms,en_GB
+diff -Nru kdebase-release-3.4.0/l10n/cd/entry.desktop kdebase-branch-3.4/l10n/cd/entry.desktop
+--- kdebase-release-3.4.0/l10n/cd/entry.desktop 2005-02-18 23:27:18.000000000 -0500
++++ kdebase-branch-3.4/l10n/cd/entry.desktop 2005-03-30 01:47:58.000000000 -0500
+@@ -9,6 +9,7 @@
+ Name[cy]=Congo, Gweriniaeth Democrataidd y
+ Name[da]=Congo, den demokratiske republik
+ Name[de]=Kongo, Republik
++Name[el]=Κονγκό, ΔημοκÏατία του
+ Name[eo]=Kongo, la Demokratia Respubliko de la
+ Name[es]=Congo, República democrática del
+ Name[et]=Kongo (DV)
+@@ -40,14 +41,13 @@
+ Name[sk]=Demokratická Republika Kongo
+ Name[sl]=Kongo, demokratiÄna republika
+ Name[sr]=Конго, ДемократÑка Република
+-Name[sr@Latn]=Конго, ДемократÑка Република
++Name[sr@Latn]=Kongo, Demokratska Republika
+ Name[sv]=Demokratiska republiken Kongo
+ Name[ta]=கானà¯à®•ோ, கà¯à®Ÿà®¿à®¯à®°à®šà¯
+ Name[tr]=Demokratik Kongo Cumhuriyeti
+ Name[uk]=Конго, демократична реÑпубліка
+ Name[uz]=Конго Демократик РеÑпубликаÑи
+ Name[wa]=Congo, republike democratike
+-Name[xx]=xxCongo, The Democratic Republic of thexx
+ Region=centralafrica
+ Languages=fr
+ #DecimalSymbol=,
+diff -Nru kdebase-release-3.4.0/l10n/centralafrica.desktop kdebase-branch-3.4/l10n/centralafrica.desktop
+--- kdebase-release-3.4.0/l10n/centralafrica.desktop 2005-02-18 23:27:17.000000000 -0500
++++ kdebase-branch-3.4/l10n/centralafrica.desktop 2005-03-30 01:47:58.000000000 -0500
+@@ -10,6 +10,7 @@
+ Name[cy]=Affrica, Canolig
+ Name[da]=Centrale Afrika
+ Name[de]=Afrika, Zentrales
++Name[el]=ΑφÏική, ΚεντÏική
+ Name[eo]=Afriko meza
+ Name[et]=Kesk-Aafrika
+ Name[eu]=Erdiko Afrika
+@@ -40,12 +41,11 @@
+ Name[sk]=Stredná Afrika
+ Name[sl]=Afrika, Srednja
+ Name[sr]=Ðфрика, централна
+-Name[sr@Latn]=Ðфрика, централна
++Name[sr@Latn]=Afrika, centralna
+ Name[sv]=Afrika, central
+ Name[ta]=ஆபà¯à®ªà®¿à®°à®¿à®•à¯à®•ா, மையபà¯à®ªà®Ÿà¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®Ÿ
+ Name[tr]=Orta Afrika
+ Name[uk]=Ðфрика, центральна
+ Name[uz]=Ðфрика, Марказий
+ Name[wa]=Afrike cintråle
+-Name[xx]=xxAfrica, Centralxx
+ Name[zh_CN]=ä¸éž
+diff -Nru kdebase-release-3.4.0/l10n/centralamerica.desktop kdebase-branch-3.4/l10n/centralamerica.desktop
+--- kdebase-release-3.4.0/l10n/centralamerica.desktop 2005-02-04 23:15:49.000000000 -0500
++++ kdebase-branch-3.4/l10n/centralamerica.desktop 2005-03-07 09:16:18.000000000 -0500
+@@ -59,6 +59,5 @@
+ Name[uz]=Ðмерика, Марказий
+ Name[vi]=Châu Mỹ, Trung tâm
+ Name[wa]=Amerike cintråle
+-Name[xx]=xxAmerica, Centralxx
+ Name[zh_CN]=ä¸ç¾Ž
+ Name[zh_TW]=美洲,ä¸éƒ¨
+diff -Nru kdebase-release-3.4.0/l10n/centralasia.desktop kdebase-branch-3.4/l10n/centralasia.desktop
+--- kdebase-release-3.4.0/l10n/centralasia.desktop 2005-02-18 23:27:17.000000000 -0500
++++ kdebase-branch-3.4/l10n/centralasia.desktop 2005-03-30 01:47:58.000000000 -0500
+@@ -10,6 +10,7 @@
+ Name[cy]=Asia, Canolig
+ Name[da]=Centralasien
+ Name[de]=Asien, Zentrales
++Name[el]=Ασία, ΚεντÏική
+ Name[eo]=Azio meza
+ Name[et]=Kesk-Aasia
+ Name[eu]=Erdiko Asia
+@@ -39,12 +40,11 @@
+ Name[sk]=Stredná Ãzia
+ Name[sl]=Azija, Srednja
+ Name[sr]=Ðзија, централна
+-Name[sr@Latn]=Ðзија, централна
++Name[sr@Latn]=Azija, centralna
+ Name[sv]=Asien, central
+ Name[ta]=ஆசியா, மையபà¯à®ªà®Ÿà¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®Ÿ
+ Name[tr]=Orta Asya
+ Name[uk]=ÐзіÑ, центральна
+ Name[uz]=ОÑиё, Марказий
+ Name[wa]=Azeye cintråle
+-Name[xx]=xxAsia, Centralxx
+ Name[zh_CN]=ä¸äºš
+diff -Nru kdebase-release-3.4.0/l10n/centraleurope.desktop kdebase-branch-3.4/l10n/centraleurope.desktop
+--- kdebase-release-3.4.0/l10n/centraleurope.desktop 2005-02-04 23:15:49.000000000 -0500
++++ kdebase-branch-3.4/l10n/centraleurope.desktop 2005-03-07 09:16:19.000000000 -0500
+@@ -69,7 +69,6 @@
+ Name[vi]=Châu Âu,Trung tâm
+ Name[wa]=Urope cintråle
+ Name[xh]=Yurophu, Kumbindi
+-Name[xx]=xxEurope, Centralxx
+ Name[zh_CN]=䏿¬§
+ Name[zh_TW]=ææ´²ï¼Œä¸éƒ¨
+ Name[zu]=Europe, Phakathi
+diff -Nru kdebase-release-3.4.0/l10n/cf/entry.desktop kdebase-branch-3.4/l10n/cf/entry.desktop
+--- kdebase-release-3.4.0/l10n/cf/entry.desktop 2005-02-04 23:15:55.000000000 -0500
++++ kdebase-branch-3.4/l10n/cf/entry.desktop 2005-03-07 09:16:30.000000000 -0500
+@@ -58,7 +58,6 @@
+ Name[uz]=Марказий Ðфрика РеÑпубликаÑи
+ Name[vi]=Cộng hoà Trung Phi
+ Name[wa]=Cintrafrike
+-Name[xx]=xxCentral African Republicxx
+ Name[zh_CN]=ä¸éžå…±å’Œå›½
+ Name[zh_TW]=å¤šæ˜Žå°¼åŠ å…±å’Œåœ‹
+ Region=centralafrica
+diff -Nru kdebase-release-3.4.0/l10n/cg/entry.desktop kdebase-branch-3.4/l10n/cg/entry.desktop
+--- kdebase-release-3.4.0/l10n/cg/entry.desktop 2005-02-04 23:15:55.000000000 -0500
++++ kdebase-branch-3.4/l10n/cg/entry.desktop 2005-03-07 09:16:30.000000000 -0500
+@@ -46,7 +46,6 @@
+ Name[tr]=Kongo
+ Name[uk]=Конго
+ Name[uz]=Конго
+-Name[xx]=xxCongoxx
+ Name[zh_CN]=刚果
+ Name[zh_TW]=剛果
+ Region=centralafrica
+diff -Nru kdebase-release-3.4.0/l10n/ch/entry.desktop kdebase-branch-3.4/l10n/ch/entry.desktop
+--- kdebase-release-3.4.0/l10n/ch/entry.desktop 2005-02-04 23:15:55.000000000 -0500
++++ kdebase-branch-3.4/l10n/ch/entry.desktop 2005-03-07 09:16:30.000000000 -0500
+@@ -65,7 +65,6 @@
+ Name[uz]=ШвейцариÑ
+ Name[vi]=Thuỵ Sĩ
+ Name[wa]=Swisse
+-Name[xx]=xxSwitzerlandxx
+ Name[zh_TW]=瑞士
+ Region=centraleurope
+ Languages=de,fr,it
+diff -Nru kdebase-release-3.4.0/l10n/ci/entry.desktop kdebase-branch-3.4/l10n/ci/entry.desktop
+--- kdebase-release-3.4.0/l10n/ci/entry.desktop 2005-02-04 23:15:55.000000000 -0500
++++ kdebase-branch-3.4/l10n/ci/entry.desktop 2005-03-07 09:16:31.000000000 -0500
+@@ -46,7 +46,6 @@
+ Name[uz]=Кот д'Ивуар
+ Name[vi]=Bá» biển ngÃ
+ Name[wa]=Coisse d'Â Ivwere
+-Name[xx]=xxCote d'ivoirexx
+ Name[zh_CN]=科特迪瓦
+ Name[zh_TW]=象牙海岸
+ Region=westafrica
+diff -Nru kdebase-release-3.4.0/l10n/ck/entry.desktop kdebase-branch-3.4/l10n/ck/entry.desktop
+--- kdebase-release-3.4.0/l10n/ck/entry.desktop 2005-02-04 23:15:56.000000000 -0500
++++ kdebase-branch-3.4/l10n/ck/entry.desktop 2005-03-07 09:16:31.000000000 -0500
+@@ -55,7 +55,6 @@
+ Name[uk]=ОÑтрови Кука
+ Name[uz]=Кук Ороллари
+ Name[wa]=Iyes Cook
+-Name[xx]=xxCook islandsxx
+ Name[zh_CN]=库克群岛
+ Name[zh_TW]=庫克群島
+ Region=oceania
+diff -Nru kdebase-release-3.4.0/l10n/cl/entry.desktop kdebase-branch-3.4/l10n/cl/entry.desktop
+--- kdebase-release-3.4.0/l10n/cl/entry.desktop 2005-01-22 23:39:01.000000000 -0500
++++ kdebase-branch-3.4/l10n/cl/entry.desktop 2005-03-07 09:16:31.000000000 -0500
+@@ -47,7 +47,6 @@
+ Name[uz]=Чили
+ Name[vi]=Chi lê
+ Name[wa]=Tchili
+-Name[xx]=xxChilexx
+ Name[zh_CN]=智利
+ Name[zh_TW]=智利
+ Region=southamerica
+diff -Nru kdebase-release-3.4.0/l10n/cm/entry.desktop kdebase-branch-3.4/l10n/cm/entry.desktop
+--- kdebase-release-3.4.0/l10n/cm/entry.desktop 2005-02-04 23:15:56.000000000 -0500
++++ kdebase-branch-3.4/l10n/cm/entry.desktop 2005-03-07 09:16:31.000000000 -0500
+@@ -57,7 +57,6 @@
+ Name[uk]=Камерун
+ Name[uz]=Камерун
+ Name[wa]=Camrone
+-Name[xx]=xxCameroonxx
+ Name[zh_CN]=喀麦隆
+ Name[zh_TW]=喀麥隆
+ Region=centralafrica
+diff -Nru kdebase-release-3.4.0/l10n/cn/entry.desktop kdebase-branch-3.4/l10n/cn/entry.desktop
+--- kdebase-release-3.4.0/l10n/cn/entry.desktop 2005-02-04 23:15:56.000000000 -0500
++++ kdebase-branch-3.4/l10n/cn/entry.desktop 2005-03-07 09:16:32.000000000 -0500
+@@ -58,7 +58,6 @@
+ Name[uz]=Хитой
+ Name[vi]=Trung Quốc
+ Name[wa]=Chine
+-Name[xx]=xxChinaxx
+ Name[zh_CN]=ä¸å›½
+ Name[zh_TW]=ä¸åœ‹
+ Region=eastasia
+diff -Nru kdebase-release-3.4.0/l10n/co/entry.desktop kdebase-branch-3.4/l10n/co/entry.desktop
+--- kdebase-release-3.4.0/l10n/co/entry.desktop 2005-02-04 23:15:57.000000000 -0500
++++ kdebase-branch-3.4/l10n/co/entry.desktop 2005-03-07 09:16:32.000000000 -0500
+@@ -54,7 +54,6 @@
+ Name[uz]=КолумбиÑ
+ Name[wa]=Colombeye
+ Name[xh]=Columbia
+-Name[xx]=xxColombiaxx
+ Name[zh_CN]=哥伦比亚
+ Name[zh_TW]=哥倫比亞
+ Region=southamerica
+diff -Nru kdebase-release-3.4.0/l10n/cr/entry.desktop kdebase-branch-3.4/l10n/cr/entry.desktop
+--- kdebase-release-3.4.0/l10n/cr/entry.desktop 2004-12-19 23:37:13.000000000 -0500
++++ kdebase-branch-3.4/l10n/cr/entry.desktop 2005-03-07 09:16:32.000000000 -0500
+@@ -36,7 +36,6 @@
+ Name[tr]=Kosta Rika
+ Name[uk]=КоÑта-Ріка
+ Name[uz]=КоÑта Рика
+-Name[xx]=xxCosta Ricaxx
+ Name[zh_TW]=哥斯大黎åŠ
+ Region=centralamerica
+ Languages=es
+diff -Nru kdebase-release-3.4.0/l10n/cu/entry.desktop kdebase-branch-3.4/l10n/cu/entry.desktop
+--- kdebase-release-3.4.0/l10n/cu/entry.desktop 2005-01-22 23:39:02.000000000 -0500
++++ kdebase-branch-3.4/l10n/cu/entry.desktop 2005-03-07 09:16:33.000000000 -0500
+@@ -46,7 +46,6 @@
+ Name[tr]=Küba
+ Name[uk]=Куба
+ Name[uz]=Куба
+-Name[xx]=xxCubaxx
+ Name[zh_CN]=å¤å·´
+ Name[zh_TW]=å¤å·´
+ Region=caribbean
+diff -Nru kdebase-release-3.4.0/l10n/cv/entry.desktop kdebase-branch-3.4/l10n/cv/entry.desktop
+--- kdebase-release-3.4.0/l10n/cv/entry.desktop 2005-01-22 23:39:02.000000000 -0500
++++ kdebase-branch-3.4/l10n/cv/entry.desktop 2005-03-07 09:16:33.000000000 -0500
+@@ -47,7 +47,6 @@
+ Name[uk]=Кабо-Верде
+ Name[uz]=Кейп Верде
+ Name[wa]=Cap Vert
+-Name[xx]=xxCape Verdexx
+ Name[zh_CN]=佛得角
+ Name[zh_TW]=ç¶å¾·è§’
+ Region=westafrica
+diff -Nru kdebase-release-3.4.0/l10n/cx/entry.desktop kdebase-branch-3.4/l10n/cx/entry.desktop
+--- kdebase-release-3.4.0/l10n/cx/entry.desktop 2005-02-04 23:15:57.000000000 -0500
++++ kdebase-branch-3.4/l10n/cx/entry.desktop 2005-03-07 09:16:33.000000000 -0500
+@@ -54,7 +54,6 @@
+ Name[uk]=ОÑтрів Різдва
+ Name[uz]=КриÑÐ¼Ð°Ñ ÐžÑ€Ð¾Ð»Ð¸
+ Name[vi]=Äảo giáng sinh
+-Name[xx]=xxChristmas Islandxx
+ Name[zh_CN]=圣诞岛
+ Name[zh_TW]=è–誕島
+ Region=southeastasia
+diff -Nru kdebase-release-3.4.0/l10n/cy/entry.desktop kdebase-branch-3.4/l10n/cy/entry.desktop
+--- kdebase-release-3.4.0/l10n/cy/entry.desktop 2005-02-04 23:15:57.000000000 -0500
++++ kdebase-branch-3.4/l10n/cy/entry.desktop 2005-03-07 09:16:34.000000000 -0500
+@@ -54,7 +54,6 @@
+ Name[uz]=Кипр
+ Name[vi]=SÃp
+ Name[wa]=Chîpe
+-Name[xx]=xxCyprusxx
+ Name[zh_TW]=賽普勒斯
+ Region=middleeast
+ Languages=el,tr,en_GB
+diff -Nru kdebase-release-3.4.0/l10n/cz/entry.desktop kdebase-branch-3.4/l10n/cz/entry.desktop
+--- kdebase-release-3.4.0/l10n/cz/entry.desktop 2005-02-04 23:15:57.000000000 -0500
++++ kdebase-branch-3.4/l10n/cz/entry.desktop 2005-03-07 09:16:34.000000000 -0500
+@@ -61,7 +61,6 @@
+ Name[uz]=ЧехиÑ
+ Name[vi]=Séc
+ Name[wa]=Tchekeye
+-Name[xx]=xxCzechiaxx
+ Name[zh_TW]=æ·å…‹
+ Region=centraleurope
+ Languages=cs
+diff -Nru kdebase-release-3.4.0/l10n/de/entry.desktop kdebase-branch-3.4/l10n/de/entry.desktop
+--- kdebase-release-3.4.0/l10n/de/entry.desktop 2005-02-04 23:15:58.000000000 -0500
++++ kdebase-branch-3.4/l10n/de/entry.desktop 2005-03-07 09:16:34.000000000 -0500
+@@ -66,7 +66,6 @@
+ Name[uz]=ОлмониÑ
+ Name[vi]=Äức
+ Name[wa]=Almagne
+-Name[xx]=xxGermanyxx
+ Name[zh_CN]=德国
+ Name[zh_TW]=德國
+ Name[zu]=IJalimani
+diff -Nru kdebase-release-3.4.0/l10n/dj/entry.desktop kdebase-branch-3.4/l10n/dj/entry.desktop
+--- kdebase-release-3.4.0/l10n/dj/entry.desktop 2005-02-04 23:15:58.000000000 -0500
++++ kdebase-branch-3.4/l10n/dj/entry.desktop 2005-03-07 09:16:34.000000000 -0500
+@@ -40,7 +40,6 @@
+ Name[tr]=Cibuti
+ Name[uk]=Джібуті
+ Name[uz]=Жибути
+-Name[xx]=xxDjiboutixx
+ Name[zh_TW]=å‰å¸ƒåœ°
+ Region=northafrica
+ Languages=ar
+diff -Nru kdebase-release-3.4.0/l10n/dk/entry.desktop kdebase-branch-3.4/l10n/dk/entry.desktop
+--- kdebase-release-3.4.0/l10n/dk/entry.desktop 2005-02-04 23:15:58.000000000 -0500
++++ kdebase-branch-3.4/l10n/dk/entry.desktop 2005-03-07 09:16:35.000000000 -0500
+@@ -66,7 +66,6 @@
+ Name[uz]=ДаниÑ
+ Name[vi]=Äan Mạch
+ Name[wa]=Daenmåtche
+-Name[xx]=xxDenmarkxx
+ Name[zh_CN]=丹麦
+ Name[zh_TW]=丹麥
+ Region=northeurope
+diff -Nru kdebase-release-3.4.0/l10n/dm/entry.desktop kdebase-branch-3.4/l10n/dm/entry.desktop
+--- kdebase-release-3.4.0/l10n/dm/entry.desktop 2005-01-31 03:36:07.000000000 -0500
++++ kdebase-branch-3.4/l10n/dm/entry.desktop 2005-03-07 09:16:35.000000000 -0500
+@@ -38,7 +38,6 @@
+ Name[uk]=Домініка
+ Name[uz]=Доминика
+ Name[wa]=Dominike
+-Name[xx]=xxDominicaxx
+ Name[zh_CN]=多米尼åŠ
+ Name[zh_TW]=多明尼åŠ
+ Region=caribbean
+diff -Nru kdebase-release-3.4.0/l10n/do/entry.desktop kdebase-branch-3.4/l10n/do/entry.desktop
+--- kdebase-release-3.4.0/l10n/do/entry.desktop 2005-02-04 23:15:58.000000000 -0500
++++ kdebase-branch-3.4/l10n/do/entry.desktop 2005-03-07 09:16:35.000000000 -0500
+@@ -67,7 +67,6 @@
+ Name[vi]=Cộng hoà Dominican
+ Name[wa]=Republike Dominikinne
+ Name[xh]=IRepublic yeDominican
+-Name[xx]=xxDominican Republicxx
+ Name[zh_CN]=å¤šç±³å°¼åŠ å…±å’Œå›½
+ Name[zh_TW]=å¤šæ˜Žå°¼åŠ å…±å’Œåœ‹
+ Region=caribbean
+diff -Nru kdebase-release-3.4.0/l10n/dz/entry.desktop kdebase-branch-3.4/l10n/dz/entry.desktop
+--- kdebase-release-3.4.0/l10n/dz/entry.desktop 2005-01-10 23:18:04.000000000 -0500
++++ kdebase-branch-3.4/l10n/dz/entry.desktop 2005-03-07 09:16:36.000000000 -0500
+@@ -52,7 +52,6 @@
+ Name[uk]=Ðлжир
+ Name[uz]=Жазоир
+ Name[wa]=Aldjereye
+-Name[xx]=xxAlgeriaxx
+ Name[zh_TW]=阿爾åŠåˆ©äºž
+ Region=northafrica
+ Languages=ar
+diff -Nru kdebase-release-3.4.0/l10n/eastasia.desktop kdebase-branch-3.4/l10n/eastasia.desktop
+--- kdebase-release-3.4.0/l10n/eastasia.desktop 2005-02-18 23:27:17.000000000 -0500
++++ kdebase-branch-3.4/l10n/eastasia.desktop 2005-03-30 01:47:58.000000000 -0500
+@@ -10,6 +10,7 @@
+ Name[cy]=Asia,Dwyrain
+ Name[da]=Østasien
+ Name[de]=Asien, Östliches
++Name[el]=Ασία, Ανατολική
+ Name[eo]=Azio orienta
+ Name[es]=Asia, Este
+ Name[et]=Ida-Aasia
+@@ -41,12 +42,11 @@
+ Name[sk]=Východná Ãzia
+ Name[sl]=Azija, Vzhodna
+ Name[sr]=Ðзија, иÑточна
+-Name[sr@Latn]=Ðзија, иÑточна
++Name[sr@Latn]=Azija, istoÄna
+ Name[sv]=Asien, öst
+ Name[ta]=ஆசியா, கிழகà¯à®•à¯
+ Name[tr]=DoÄŸu Asya
+ Name[uk]=ÐзіÑ, Ñхідна
+ Name[uz]=ОÑиё, Шарқий
+ Name[wa]=Azeye levantrece
+-Name[xx]=xxAsia, Eastxx
+ Name[zh_CN]=东亚
+diff -Nru kdebase-release-3.4.0/l10n/easteurope.desktop kdebase-branch-3.4/l10n/easteurope.desktop
+--- kdebase-release-3.4.0/l10n/easteurope.desktop 2005-02-04 23:15:49.000000000 -0500
++++ kdebase-branch-3.4/l10n/easteurope.desktop 2005-03-07 09:16:19.000000000 -0500
+@@ -69,7 +69,6 @@
+ Name[vi]=Tây Âu
+ Name[wa]=Urope levantrece
+ Name[xh]=Yurophu,Impuma
+-Name[xx]=xxEurope, Easternxx
+ Name[zh_CN]=东欧
+ Name[zh_TW]=ææ´²ï¼Œæ±éƒ¨
+ Name[zu]=Europe, Empuma
+diff -Nru kdebase-release-3.4.0/l10n/ec/entry.desktop kdebase-branch-3.4/l10n/ec/entry.desktop
+--- kdebase-release-3.4.0/l10n/ec/entry.desktop 2005-02-04 23:15:59.000000000 -0500
++++ kdebase-branch-3.4/l10n/ec/entry.desktop 2005-03-07 09:16:36.000000000 -0500
+@@ -53,7 +53,6 @@
+ Name[uk]=Еквадор
+ Name[uz]=Ðквадор
+ Name[wa]=Ecwåteur
+-Name[xx]=xxEquadorxx
+ Name[zh_TW]=厄瓜多
+ Region=southamerica
+ Languages=es
+diff -Nru kdebase-release-3.4.0/l10n/ee/entry.desktop kdebase-branch-3.4/l10n/ee/entry.desktop
+--- kdebase-release-3.4.0/l10n/ee/entry.desktop 2005-02-04 23:15:59.000000000 -0500
++++ kdebase-branch-3.4/l10n/ee/entry.desktop 2005-03-07 09:16:36.000000000 -0500
+@@ -55,7 +55,6 @@
+ Name[uk]=ЕÑтоніÑ
+ Name[uz]=ÐÑтониÑ
+ Name[wa]=Estoneye
+-Name[xx]=xxEstoniaxx
+ Name[zh_CN]=爱沙尼亚
+ Name[zh_TW]=愛沙尼亞
+ Region=northeurope
+diff -Nru kdebase-release-3.4.0/l10n/eg/entry.desktop kdebase-branch-3.4/l10n/eg/entry.desktop
+--- kdebase-release-3.4.0/l10n/eg/entry.desktop 2005-02-04 23:15:59.000000000 -0500
++++ kdebase-branch-3.4/l10n/eg/entry.desktop 2005-03-07 09:16:36.000000000 -0500
+@@ -61,7 +61,6 @@
+ Name[uz]=МиÑÑ€
+ Name[vi]=Ai Cáºp
+ Name[wa]=Edjipe
+-Name[xx]=xxEgyptxx
+ Name[zh_CN]=埃åŠ
+ Name[zh_TW]=埃åŠ
+ Name[zu]=Igibhithe
+diff -Nru kdebase-release-3.4.0/l10n/eh/entry.desktop kdebase-branch-3.4/l10n/eh/entry.desktop
+--- kdebase-release-3.4.0/l10n/eh/entry.desktop 2005-02-04 23:16:00.000000000 -0500
++++ kdebase-branch-3.4/l10n/eh/entry.desktop 2005-03-07 09:16:37.000000000 -0500
+@@ -59,7 +59,6 @@
+ Name[uz]=Ғарбий Сахара
+ Name[vi]=Tây Sahara
+ Name[wa]=Sara Coûtchantrece
+-Name[xx]=xxWestern Saharaxx
+ Name[zh_TW]=西盛哈拉
+ Region=northafrica
+ Languages=
+diff -Nru kdebase-release-3.4.0/l10n/er/entry.desktop kdebase-branch-3.4/l10n/er/entry.desktop
+--- kdebase-release-3.4.0/l10n/er/entry.desktop 2005-01-31 03:36:07.000000000 -0500
++++ kdebase-branch-3.4/l10n/er/entry.desktop 2005-03-07 09:16:37.000000000 -0500
+@@ -34,7 +34,6 @@
+ Name[uk]=ЕрітреÑ
+ Name[uz]=ÐритриÑ
+ Name[wa]=Eritrêye
+-Name[xx]=xxEritreaxx
+ Name[zh_TW]=厄利垂亞
+ Region=northafrica
+ Languages=ti,ar
+diff -Nru kdebase-release-3.4.0/l10n/es/entry.desktop kdebase-branch-3.4/l10n/es/entry.desktop
+--- kdebase-release-3.4.0/l10n/es/entry.desktop 2005-02-04 23:16:00.000000000 -0500
++++ kdebase-branch-3.4/l10n/es/entry.desktop 2005-03-07 09:16:37.000000000 -0500
+@@ -66,7 +66,6 @@
+ Name[uz]=ИÑпаниÑ
+ Name[vi]=Tây Ban Nha
+ Name[wa]=Sipagne
+-Name[xx]=xxSpainxx
+ Name[zh_TW]=西ç牙
+ Region=westeurope
+ Languages=es,ca,eu,gl
+diff -Nru kdebase-release-3.4.0/l10n/et/entry.desktop kdebase-branch-3.4/l10n/et/entry.desktop
+--- kdebase-release-3.4.0/l10n/et/entry.desktop 2005-02-04 23:16:00.000000000 -0500
++++ kdebase-branch-3.4/l10n/et/entry.desktop 2005-03-07 09:16:37.000000000 -0500
+@@ -55,7 +55,6 @@
+ Name[uk]=ЕфіопіÑ
+ Name[uz]=ÐфиопиÑ
+ Name[wa]=Etiopeye
+-Name[xx]=xxEthiopiaxx
+ Name[zh_TW]=衣索比亞
+ Region=northafrica
+ Languages=en_GB,am,om,so,ti
+diff -Nru kdebase-release-3.4.0/l10n/fi/entry.desktop kdebase-branch-3.4/l10n/fi/entry.desktop
+--- kdebase-release-3.4.0/l10n/fi/entry.desktop 2005-02-04 23:16:00.000000000 -0500
++++ kdebase-branch-3.4/l10n/fi/entry.desktop 2005-03-07 09:16:38.000000000 -0500
+@@ -60,7 +60,6 @@
+ Name[uz]=ФинлÑндиÑ
+ Name[vi]=Phần Lan
+ Name[wa]=Finlande
+-Name[xx]=xxFinlandxx
+ Name[zh_CN]=芬兰
+ Name[zh_TW]=芬è˜
+ Region=northeurope
+diff -Nru kdebase-release-3.4.0/l10n/fj/entry.desktop kdebase-branch-3.4/l10n/fj/entry.desktop
+--- kdebase-release-3.4.0/l10n/fj/entry.desktop 2005-01-22 23:39:04.000000000 -0500
++++ kdebase-branch-3.4/l10n/fj/entry.desktop 2005-03-07 09:16:38.000000000 -0500
+@@ -41,7 +41,6 @@
+ Name[uk]=Фіджі
+ Name[uz]=Фижи
+ Name[wa]=Fidji
+-Name[xx]=xxFijixx
+ Name[zh_CN]=æ–æµŽ
+ Name[zh_TW]=è²æ¿Ÿ
+ Region=oceania
+diff -Nru kdebase-release-3.4.0/l10n/fk/entry.desktop kdebase-branch-3.4/l10n/fk/entry.desktop
+--- kdebase-release-3.4.0/l10n/fk/entry.desktop 2005-02-04 23:16:01.000000000 -0500
++++ kdebase-branch-3.4/l10n/fk/entry.desktop 2005-03-07 09:16:38.000000000 -0500
+@@ -54,7 +54,6 @@
+ Name[uk]=ФолклендÑькі оÑтрови (БританіÑ)
+ Name[uz]=Фолкленд (Малвин) Ороллари
+ Name[wa]=Iyes Malouwines
+-Name[xx]=xxFalkland Islands (Malvinas)xx
+ Name[zh_TW]=ç¦å…‹è˜ç¾¤å³¶ (馬爾ç¶ç´æ–¯)
+ Region=southamerica
+ Languages=en_GB
+diff -Nru kdebase-release-3.4.0/l10n/fm/entry.desktop kdebase-branch-3.4/l10n/fm/entry.desktop
+--- kdebase-release-3.4.0/l10n/fm/entry.desktop 2005-02-18 23:27:18.000000000 -0500
++++ kdebase-branch-3.4/l10n/fm/entry.desktop 2005-03-30 01:47:58.000000000 -0500
+@@ -9,6 +9,7 @@
+ Name[cy]=Micronesia, Taleithau Cyfunol
+ Name[da]=Mikronesien, de forenede stater af
+ Name[de]=Mikronesien, Föderation von
++Name[el]=ΜικÏονησίας, Ομόσπονδες πολιτείες της
+ Name[eo]=Mikronezio, Respubliko de
+ Name[es]=Micronesia, Estados federados de
+ Name[et]=Mikroneesia
+@@ -20,7 +21,7 @@
+ Name[he]=×ž×™×§×¨×•× ×–×™×”, ×ž×“×™× ×•×ª הפדרציה של
+ Name[hi]=फेडरेटेड सà¥à¤Ÿà¥‡à¤Ÿ ऑफ माइकà¥à¤°à¥‹à¤¨à¥‡à¤¸à¤¿à¤¯à¤¾
+ Name[hu]=Mikronézia
+-Name[it]=Micronesia
++Name[it]=Micronesia, stati federati di
+ Name[ja]=ミクãƒãƒã‚·ã‚¢,米自由連邦
+ Name[lt]=Mikronezija
+ Name[mk]=Микронезија, Федеративни Држави на
+@@ -39,14 +40,13 @@
+ Name[sk]=Spojené štáty Mikronézie
+ Name[sl]=Mikronezija, Združene države
+ Name[sr]=Микронезија, Федерација држава
+-Name[sr@Latn]=Микронезија, Федерација држава
++Name[sr@Latn]=Mikronezija, Federacija država
+ Name[sv]=Mikronesiska federationen
+ Name[ta]=மைகà¯à®°à¯‹à®©à®¿à®šà®¾, à®’à®°à¯à®™à¯à®•ிணைநà¯à®¤ மாநிலமà¯
+ Name[tr]=Mikronezya Federasyonu
+ Name[uk]=МікронезіÑ, федеративні штати
+ Name[uz]=МикронезиÑ
+ Name[wa]=Micronezeye
+-Name[xx]=xxMicronesia, Federated States ofxx
+ Region=oceania
+ Languages=en_GB
+ #DecimalSymbol=,
+diff -Nru kdebase-release-3.4.0/l10n/fo/entry.desktop kdebase-branch-3.4/l10n/fo/entry.desktop
+--- kdebase-release-3.4.0/l10n/fo/entry.desktop 2005-02-04 23:16:01.000000000 -0500
++++ kdebase-branch-3.4/l10n/fo/entry.desktop 2005-03-26 02:37:45.000000000 -0500
+@@ -3,6 +3,7 @@
+ Name[ar]=جزر الÙيرو
+ Name[bg]=ОÑтрови Фаро
+ Name[bn]=ফারো দà§à¦¬à§€à¦ªà¦ªà§à¦žà§à¦œ
++Name[br]=Enez Faroe
+ Name[bs]=Farska ostrva
+ Name[ca]=Illes Faroe
+ Name[cs]=Faerské ostrovy
+@@ -57,7 +58,6 @@
+ Name[uz]=Фарер Ороллари
+ Name[vi]=Äảo Faroe
+ Name[wa]=Iye Faeroyé
+-Name[xx]=xxFaroe Islandsxx
+ Name[zh_CN]=法罗群岛
+ Name[zh_TW]=法羅群島
+ Region=northeurope
+diff -Nru kdebase-release-3.4.0/l10n/fr/entry.desktop kdebase-branch-3.4/l10n/fr/entry.desktop
+--- kdebase-release-3.4.0/l10n/fr/entry.desktop 2005-02-04 23:16:01.000000000 -0500
++++ kdebase-branch-3.4/l10n/fr/entry.desktop 2005-03-07 09:16:39.000000000 -0500
+@@ -68,7 +68,6 @@
+ Name[ven]=Fura
+ Name[vi]=Pháp
+ Name[xh]=Fransi
+-Name[xx]=xxFrancexx
+ Name[zh_CN]=法国
+ Name[zh_TW]=法國
+ Region=westeurope
+diff -Nru kdebase-release-3.4.0/l10n/ga/entry.desktop kdebase-branch-3.4/l10n/ga/entry.desktop
+--- kdebase-release-3.4.0/l10n/ga/entry.desktop 2005-01-31 03:36:08.000000000 -0500
++++ kdebase-branch-3.4/l10n/ga/entry.desktop 2005-03-07 09:16:39.000000000 -0500
+@@ -29,7 +29,6 @@
+ Name[th]=à¸à¸²à¸šà¸à¸™
+ Name[uk]=Габон
+ Name[uz]=Габон
+-Name[xx]=xxGabonxx
+ Name[zh_TW]=åŠ å½
+ Region=centralafrica
+ Languages=fr
+diff -Nru kdebase-release-3.4.0/l10n/gb/entry.desktop kdebase-branch-3.4/l10n/gb/entry.desktop
+--- kdebase-release-3.4.0/l10n/gb/entry.desktop 2005-02-04 23:16:02.000000000 -0500
++++ kdebase-branch-3.4/l10n/gb/entry.desktop 2005-03-07 09:16:40.000000000 -0500
+@@ -67,7 +67,6 @@
+ Name[vi]=Anh
+ Name[wa]=Rweyåme Uni
+ Name[xh]=United Kingdom
+-Name[xx]=xxUnited Kingdomxx
+ Name[zh_CN]=英国
+ Name[zh_TW]=è¯åˆçŽ‹åœ‹
+ Name[zu]=United Kingdom
+diff -Nru kdebase-release-3.4.0/l10n/gd/entry.desktop kdebase-branch-3.4/l10n/gd/entry.desktop
+--- kdebase-release-3.4.0/l10n/gd/entry.desktop 2004-11-01 23:20:31.000000000 -0500
++++ kdebase-branch-3.4/l10n/gd/entry.desktop 2005-03-07 09:16:40.000000000 -0500
+@@ -33,7 +33,6 @@
+ Name[uk]=Гренада
+ Name[uz]=Гренада
+ Name[wa]=Grenåde
+-Name[xx]=xxGrenadaxx
+ Name[zh_TW]=æ ¼ç‘žé‚£é”
+ Region=caribbean
+ Languages=en_GB,en_US
+diff -Nru kdebase-release-3.4.0/l10n/ge/entry.desktop kdebase-branch-3.4/l10n/ge/entry.desktop
+--- kdebase-release-3.4.0/l10n/ge/entry.desktop 2005-01-31 03:36:09.000000000 -0500
++++ kdebase-branch-3.4/l10n/ge/entry.desktop 2005-03-07 09:16:40.000000000 -0500
+@@ -45,7 +45,6 @@
+ Name[uk]=ГрузіÑ
+ Name[uz]=ГуржиÑтон
+ Name[wa]=Djeyordjeye
+-Name[xx]=xxGeorgiaxx
+ Name[zh_TW]=喬治亞
+ Region=easteurope
+ Languages=ka,ru
+diff -Nru kdebase-release-3.4.0/l10n/gh/entry.desktop kdebase-branch-3.4/l10n/gh/entry.desktop
+--- kdebase-release-3.4.0/l10n/gh/entry.desktop 2004-12-11 01:37:34.000000000 -0500
++++ kdebase-branch-3.4/l10n/gh/entry.desktop 2005-03-07 09:16:40.000000000 -0500
+@@ -34,7 +34,6 @@
+ Name[uk]=Гана
+ Name[uz]=Гана
+ Name[wa]=Gana
+-Name[xx]=xxGhanaxx
+ Name[zh_TW]=迦ç´
+ Region=westafrica
+ Languages=en_GB
+diff -Nru kdebase-release-3.4.0/l10n/gi/entry.desktop kdebase-branch-3.4/l10n/gi/entry.desktop
+--- kdebase-release-3.4.0/l10n/gi/entry.desktop 2005-01-31 03:36:09.000000000 -0500
++++ kdebase-branch-3.4/l10n/gi/entry.desktop 2005-03-07 09:16:41.000000000 -0500
+@@ -30,7 +30,6 @@
+ Name[uk]=Гібралтар
+ Name[uz]=Гибралтар
+ Name[wa]=Djibraltar
+-Name[xx]=xxGibraltarxx
+ Name[zh_TW]=直布羅陀
+ Region=westeurope
+ #Languages=
+diff -Nru kdebase-release-3.4.0/l10n/gm/entry.desktop kdebase-branch-3.4/l10n/gm/entry.desktop
+--- kdebase-release-3.4.0/l10n/gm/entry.desktop 2005-01-31 03:36:09.000000000 -0500
++++ kdebase-branch-3.4/l10n/gm/entry.desktop 2005-03-07 09:16:41.000000000 -0500
+@@ -36,7 +36,6 @@
+ Name[uk]=ГамбіÑ
+ Name[uz]=ГамбиÑ
+ Name[wa]=Gambeye
+-Name[xx]=xxGambiaxx
+ Name[zh_CN]=冈比亚
+ Name[zh_TW]=甘比亞
+ Region=westafrica
+diff -Nru kdebase-release-3.4.0/l10n/gn/entry.desktop kdebase-branch-3.4/l10n/gn/entry.desktop
+--- kdebase-release-3.4.0/l10n/gn/entry.desktop 2005-01-31 03:36:09.000000000 -0500
++++ kdebase-branch-3.4/l10n/gn/entry.desktop 2005-03-07 09:16:41.000000000 -0500
+@@ -37,7 +37,6 @@
+ Name[uk]=ГвінеÑ
+ Name[uz]=ГвинеÑ
+ Name[wa]=Guinêye
+-Name[xx]=xxGuineaxx
+ Name[zh_TW]=幾內亞
+ Region=westafrica
+ Languages=fr
+diff -Nru kdebase-release-3.4.0/l10n/gp/entry.desktop kdebase-branch-3.4/l10n/gp/entry.desktop
+--- kdebase-release-3.4.0/l10n/gp/entry.desktop 2004-12-11 01:37:35.000000000 -0500
++++ kdebase-branch-3.4/l10n/gp/entry.desktop 2005-03-07 09:16:42.000000000 -0500
+@@ -35,7 +35,6 @@
+ Name[tg]=Гвадалуппо
+ Name[uk]=Гваделупа
+ Name[uz]=Гваделупа
+-Name[xx]=xxGuadeloupexx
+ Name[zh_TW]=ç“œå¾·é¯æ™®
+ Region=caribbean
+ Languages=fr
+diff -Nru kdebase-release-3.4.0/l10n/gq/entry.desktop kdebase-branch-3.4/l10n/gq/entry.desktop
+--- kdebase-release-3.4.0/l10n/gq/entry.desktop 2005-02-04 23:16:02.000000000 -0500
++++ kdebase-branch-3.4/l10n/gq/entry.desktop 2005-03-07 09:16:42.000000000 -0500
+@@ -54,7 +54,6 @@
+ Name[uk]=Екваторіальна ГвінеÑ
+ Name[uz]=Ðкваториал ГвинеÑ
+ Name[wa]=Guinêye Ecwåtoriåle
+-Name[xx]=xxEquatorial Guineaxx
+ Name[zh_TW]=赤é“幾內亞
+ Region=centralafrica
+ Languages=es,fr,en_GB
+diff -Nru kdebase-release-3.4.0/l10n/gr/entry.desktop kdebase-branch-3.4/l10n/gr/entry.desktop
+--- kdebase-release-3.4.0/l10n/gr/entry.desktop 2005-02-04 23:16:02.000000000 -0500
++++ kdebase-branch-3.4/l10n/gr/entry.desktop 2005-03-07 09:16:42.000000000 -0500
+@@ -65,7 +65,6 @@
+ Name[uz]=ЮнониÑтон
+ Name[vi]=Hy Lạp
+ Name[wa]=Grece
+-Name[xx]=xxGreecexx
+ Name[zh_CN]=希腊
+ Name[zh_TW]=希臘
+ Region=southeurope
+diff -Nru kdebase-release-3.4.0/l10n/gt/entry.desktop kdebase-branch-3.4/l10n/gt/entry.desktop
+--- kdebase-release-3.4.0/l10n/gt/entry.desktop 2004-12-11 01:37:36.000000000 -0500
++++ kdebase-branch-3.4/l10n/gt/entry.desktop 2005-03-07 09:16:42.000000000 -0500
+@@ -36,7 +36,6 @@
+ Name[uk]=Гватемала
+ Name[uz]=Гватемала
+ Name[wa]=Gwatemala
+-Name[xx]=xxGuatemalaxx
+ Name[zh_TW]=瓜地馬拉
+ Region=centralamerica
+ Languages=es
+diff -Nru kdebase-release-3.4.0/l10n/gu/entry.desktop kdebase-branch-3.4/l10n/gu/entry.desktop
+--- kdebase-release-3.4.0/l10n/gu/entry.desktop 2005-01-22 23:39:06.000000000 -0500
++++ kdebase-branch-3.4/l10n/gu/entry.desktop 2005-03-07 09:16:43.000000000 -0500
+@@ -26,7 +26,6 @@
+ Name[uk]=Гуам
+ Name[uz]=Гуам
+ Name[wa]=Gwam
+-Name[xx]=xxGuamxx
+ Name[zh_CN]=关岛
+ Name[zh_TW]=關島
+ Region=oceania
+diff -Nru kdebase-release-3.4.0/l10n/gw/entry.desktop kdebase-branch-3.4/l10n/gw/entry.desktop
+--- kdebase-release-3.4.0/l10n/gw/entry.desktop 2004-12-11 01:37:36.000000000 -0500
++++ kdebase-branch-3.4/l10n/gw/entry.desktop 2005-03-07 09:16:43.000000000 -0500
+@@ -35,7 +35,6 @@
+ Name[uk]=ГвінеÑ-БіÑау
+ Name[uz]=ГвинеÑ-БиÑÑау
+ Name[wa]=Guinêye-Bissaw
+-Name[xx]=xxGuinea-Bissauxx
+ Name[zh_TW]=幾內亞比紹
+ Region=westafrica
+ Languages=es
+diff -Nru kdebase-release-3.4.0/l10n/gy/entry.desktop kdebase-branch-3.4/l10n/gy/entry.desktop
+--- kdebase-release-3.4.0/l10n/gy/entry.desktop 2005-01-31 03:36:10.000000000 -0500
++++ kdebase-branch-3.4/l10n/gy/entry.desktop 2005-03-07 09:16:43.000000000 -0500
+@@ -36,7 +36,6 @@
+ Name[tr]=Guana
+ Name[uk]=ГайÑна
+ Name[uz]=Гвиана
+-Name[xx]=xxGuyanaxx
+ Name[zh_TW]=蓋亞ç´
+ Region=southamerica
+ Languages=en_GB
+diff -Nru kdebase-release-3.4.0/l10n/hk/entry.desktop kdebase-branch-3.4/l10n/hk/entry.desktop
+--- kdebase-release-3.4.0/l10n/hk/entry.desktop 2005-02-23 00:06:00.000000000 -0500
++++ kdebase-branch-3.4/l10n/hk/entry.desktop 2005-03-30 01:47:59.000000000 -0500
+@@ -2,25 +2,31 @@
+ Name=Hong Kong SAR(China)
+ Name[bg]=Хонг Конг (Китай)
+ Name[bn]=হং কং SAR(চীন)
++Name[br]=Hong Kong SAR(Sina)
++Name[bs]=Hong Kong SAR (Kina)
+ Name[ca]=Hong Kong SAR(Xina)
+ Name[cs]=Hong Kong SAR (ÄŒÃna)
+ Name[da]=Hongkong SAR(Kina)
++Name[el]=Χονγκ Κονγκ SAR (Κίνα)
+ Name[et]=Hongkong
++Name[eu]=Hong Kong SAR(Txina)
+ Name[fr]=Hong Kong SAR (Chine)
+ Name[ga]=Hong Cong SAR(An tSÃn)
+ Name[he]=×”×•× ×’ ×§×•× ×’ SAR (סין)
+ Name[hu]=Hongkong (KÃna)
+ Name[is]=Hong Kong SAR(KÃna)
+ Name[it]=Hong Kong SAR(Cina)
++Name[ja]=香港(ä¸å›½)
+ Name[lt]=Hong Kongas SAR(Kinija)
+ Name[nb]=Hongkong SAR(Kina)
+ Name[pa]=ਹਾਂਗ-ਕਾਂਗ SAR(ਚੀਨ)
+ Name[pl]=Hong Kong SAR (Chiny)
+ Name[pt_BR]=Hong Kong SAR (China)
+ Name[ru]=Hong Kong SAR(Китай)
++Name[sk]=Hong Kong SAR(ÄŒÃna)
+ Name[sl]=Hong Kong SAR (Kitajska)
+ Name[sr]=SAR Hong Kong (Кина)
+-Name[sr@Latn]=SAR Hong Kong (Кина)
++Name[sr@Latn]=SAR Hong Kong (Kina)
+ Name[sv]=Hong Kong (Kina)
+ Name[ta]=ஹாஙà¯à®•ாங௠SAR(சீனா)
+ Name[uk]=Гонконг SAR (Китай)
+diff -Nru kdebase-release-3.4.0/l10n/hn/entry.desktop kdebase-branch-3.4/l10n/hn/entry.desktop
+--- kdebase-release-3.4.0/l10n/hn/entry.desktop 2005-01-22 23:39:07.000000000 -0500
++++ kdebase-branch-3.4/l10n/hn/entry.desktop 2005-03-07 09:16:44.000000000 -0500
+@@ -30,7 +30,6 @@
+ Name[th]=ฮà¸à¸™à¸”ูรัส
+ Name[uk]=ГондураÑ
+ Name[uz]=ГондураÑ
+-Name[xx]=xxHondurasxx
+ Name[zh_CN]=洪都拉斯
+ Name[zh_TW]=å®éƒ½æ‹‰æ–¯
+ Region=centralamerica
+diff -Nru kdebase-release-3.4.0/l10n/hr/entry.desktop kdebase-branch-3.4/l10n/hr/entry.desktop
+--- kdebase-release-3.4.0/l10n/hr/entry.desktop 2005-02-04 23:16:03.000000000 -0500
++++ kdebase-branch-3.4/l10n/hr/entry.desktop 2005-03-07 09:16:44.000000000 -0500
+@@ -64,7 +64,6 @@
+ Name[uk]=ХорватіÑ
+ Name[uz]=ХорватиÑ
+ Name[wa]=Crowåceye
+-Name[xx]=xxCroatiaxx
+ Name[zh_TW]=克羅埃西亞
+ Region=southeurope
+ Languages=hr
+diff -Nru kdebase-release-3.4.0/l10n/ht/entry.desktop kdebase-branch-3.4/l10n/ht/entry.desktop
+--- kdebase-release-3.4.0/l10n/ht/entry.desktop 2005-01-31 03:36:10.000000000 -0500
++++ kdebase-branch-3.4/l10n/ht/entry.desktop 2005-03-07 09:16:44.000000000 -0500
+@@ -30,7 +30,6 @@
+ Name[uk]=Гаїті
+ Name[uz]=Гаити
+ Name[wa]=Hayiti
+-Name[xx]=xxHaitixx
+ Name[zh_CN]=海地
+ Name[zh_TW]=海地
+ Region=caribbean
+diff -Nru kdebase-release-3.4.0/l10n/hu/entry.desktop kdebase-branch-3.4/l10n/hu/entry.desktop
+--- kdebase-release-3.4.0/l10n/hu/entry.desktop 2005-02-04 23:16:03.000000000 -0500
++++ kdebase-branch-3.4/l10n/hu/entry.desktop 2005-03-07 09:16:45.000000000 -0500
+@@ -65,7 +65,6 @@
+ Name[uk]=Угорщина
+ Name[uz]=ВенгриÑ
+ Name[wa]=Hongreye
+-Name[xx]=xxHungaryxx
+ Name[zh_CN]=匈牙利
+ Name[zh_TW]=匈牙利
+ Region=centraleurope
+diff -Nru kdebase-release-3.4.0/l10n/id/entry.desktop kdebase-branch-3.4/l10n/id/entry.desktop
+--- kdebase-release-3.4.0/l10n/id/entry.desktop 2005-01-22 23:39:07.000000000 -0500
++++ kdebase-branch-3.4/l10n/id/entry.desktop 2005-03-07 09:16:45.000000000 -0500
+@@ -53,7 +53,6 @@
+ Name[uk]=ІндонезіÑ
+ Name[uz]=ИндонезиÑ
+ Name[wa]=Indonezeye
+-Name[xx]=xxIndonesiaxx
+ Name[zh_CN]=å°åº¦å°¼è¥¿äºš
+ Name[zh_TW]=å°å°¼
+ Region=southeastasia
+diff -Nru kdebase-release-3.4.0/l10n/ie/entry.desktop kdebase-branch-3.4/l10n/ie/entry.desktop
+--- kdebase-release-3.4.0/l10n/ie/entry.desktop 2005-02-04 23:16:03.000000000 -0500
++++ kdebase-branch-3.4/l10n/ie/entry.desktop 2005-03-07 09:16:45.000000000 -0500
+@@ -65,7 +65,6 @@
+ Name[uk]=ІрландіÑ
+ Name[uz]=ИрландиÑ
+ Name[wa]=Irlande
+-Name[xx]=xxIrelandxx
+ Name[zh_CN]=伊朗
+ Name[zh_TW]=愛爾è˜
+ Region=westeurope
+diff -Nru kdebase-release-3.4.0/l10n/il/entry.desktop kdebase-branch-3.4/l10n/il/entry.desktop
+--- kdebase-release-3.4.0/l10n/il/entry.desktop 2004-12-11 01:37:38.000000000 -0500
++++ kdebase-branch-3.4/l10n/il/entry.desktop 2005-03-07 09:16:45.000000000 -0500
+@@ -45,7 +45,6 @@
+ Name[uz]=ИÑроил
+ Name[wa]=Israyel
+ Name[xh]=USirayeli
+-Name[xx]=xxIsraelxx
+ Name[zh_TW]=以色列
+ Region=middleeast
+ Languages=he,ar
+diff -Nru kdebase-release-3.4.0/l10n/in/entry.desktop kdebase-branch-3.4/l10n/in/entry.desktop
+--- kdebase-release-3.4.0/l10n/in/entry.desktop 2005-01-22 23:39:08.000000000 -0500
++++ kdebase-branch-3.4/l10n/in/entry.desktop 2005-03-07 09:16:46.000000000 -0500
+@@ -49,7 +49,6 @@
+ Name[uz]=ҲиндиÑтон
+ Name[vi]=Ấn Äá»™
+ Name[wa]=Inde
+-Name[xx]=xxIndiaxx
+ Name[zh_CN]=å°åº¦
+ Name[zh_TW]=å°åº¦
+ Name[zu]=Endiya
+diff -Nru kdebase-release-3.4.0/l10n/iq/entry.desktop kdebase-branch-3.4/l10n/iq/entry.desktop
+--- kdebase-release-3.4.0/l10n/iq/entry.desktop 2005-02-04 23:16:04.000000000 -0500
++++ kdebase-branch-3.4/l10n/iq/entry.desktop 2005-03-07 09:16:46.000000000 -0500
+@@ -59,7 +59,6 @@
+ Name[uk]=Ірак
+ Name[uz]=Ироқ
+ Name[wa]=Irak
+-Name[xx]=xxIraqxx
+ Name[zh_CN]=伊拉克
+ Name[zh_TW]=伊拉克
+ Region=middleeast
+diff -Nru kdebase-release-3.4.0/l10n/ir/entry.desktop kdebase-branch-3.4/l10n/ir/entry.desktop
+--- kdebase-release-3.4.0/l10n/ir/entry.desktop 2005-02-04 23:16:04.000000000 -0500
++++ kdebase-branch-3.4/l10n/ir/entry.desktop 2005-03-07 09:16:46.000000000 -0500
+@@ -35,7 +35,6 @@
+ Name[tr]=İran
+ Name[uk]=Іран
+ Name[uz]=Ðрон
+-Name[xx]=xxIranxx
+ Name[zh_TW]=伊朗
+ Region=middleeast
+ Languages=
+diff -Nru kdebase-release-3.4.0/l10n/is/entry.desktop kdebase-branch-3.4/l10n/is/entry.desktop
+--- kdebase-release-3.4.0/l10n/is/entry.desktop 2005-02-04 23:16:04.000000000 -0500
++++ kdebase-branch-3.4/l10n/is/entry.desktop 2005-03-07 09:16:47.000000000 -0500
+@@ -65,7 +65,6 @@
+ Name[uk]=ІÑландіÑ
+ Name[uz]=ИÑландиÑ
+ Name[wa]=Izlande
+-Name[xx]=xxIcelandxx
+ Name[zh_CN]=冰岛
+ Name[zh_TW]=冰島
+ Name[zu]=Icelandi
+diff -Nru kdebase-release-3.4.0/l10n/it/entry.desktop kdebase-branch-3.4/l10n/it/entry.desktop
+--- kdebase-release-3.4.0/l10n/it/entry.desktop 2005-02-04 23:16:05.000000000 -0500
++++ kdebase-branch-3.4/l10n/it/entry.desktop 2005-03-07 09:16:47.000000000 -0500
+@@ -67,7 +67,6 @@
+ Name[vi]=Ã
+ Name[wa]=Itåleye
+ Name[xh]=Ithali
+-Name[xx]=xxItalyxx
+ Name[zh_CN]=æ„大利
+ Name[zh_TW]=義大利
+ Region=southeurope
+diff -Nru kdebase-release-3.4.0/l10n/jm/entry.desktop kdebase-branch-3.4/l10n/jm/entry.desktop
+--- kdebase-release-3.4.0/l10n/jm/entry.desktop 2004-12-11 01:37:40.000000000 -0500
++++ kdebase-branch-3.4/l10n/jm/entry.desktop 2005-03-07 09:16:47.000000000 -0500
+@@ -48,7 +48,6 @@
+ Name[uk]=Ямайка
+ Name[uz]=Ямайка
+ Name[wa]=Djamayike
+-Name[xx]=xxJamaicaxx
+ Name[zh_TW]=牙買åŠ
+ Region=caribbean
+ Languages=en_GB,en_US
+diff -Nru kdebase-release-3.4.0/l10n/jo/entry.desktop kdebase-branch-3.4/l10n/jo/entry.desktop
+--- kdebase-release-3.4.0/l10n/jo/entry.desktop 2005-02-04 23:16:05.000000000 -0500
++++ kdebase-branch-3.4/l10n/jo/entry.desktop 2005-03-07 09:16:47.000000000 -0500
+@@ -56,7 +56,6 @@
+ Name[uk]=ЙорданіÑ
+ Name[uz]=Иордан
+ Name[wa]=Djordaneye
+-Name[xx]=xxJordanxx
+ Name[zh_CN]=约旦
+ Name[zh_TW]=ç´„æ—¦
+ Name[zu]=Ijolidani
+diff -Nru kdebase-release-3.4.0/l10n/jp/entry.desktop kdebase-branch-3.4/l10n/jp/entry.desktop
+--- kdebase-release-3.4.0/l10n/jp/entry.desktop 2005-02-04 23:16:05.000000000 -0500
++++ kdebase-branch-3.4/l10n/jp/entry.desktop 2005-03-07 09:16:48.000000000 -0500
+@@ -52,7 +52,6 @@
+ Name[uz]=ЯпониÑ
+ Name[vi]=Nháºt bản
+ Name[wa]=Djapon
+-Name[xx]=xxJapanxx
+ Name[zh_CN]=日本
+ Name[zh_TW]=日本
+ Region=eastasia
+diff -Nru kdebase-release-3.4.0/l10n/ke/entry.desktop kdebase-branch-3.4/l10n/ke/entry.desktop
+--- kdebase-release-3.4.0/l10n/ke/entry.desktop 2005-01-31 03:36:11.000000000 -0500
++++ kdebase-branch-3.4/l10n/ke/entry.desktop 2005-03-07 09:16:48.000000000 -0500
+@@ -42,7 +42,6 @@
+ Name[uk]=КеніÑ
+ Name[uz]=КениÑ
+ Name[wa]=Kenia
+-Name[xx]=xxKenyaxx
+ Name[zh_CN]=肯尼亚
+ Name[zh_TW]=肯亞
+ Region=centralafrica
+diff -Nru kdebase-release-3.4.0/l10n/kg/entry.desktop kdebase-branch-3.4/l10n/kg/entry.desktop
+--- kdebase-release-3.4.0/l10n/kg/entry.desktop 2005-02-04 23:16:05.000000000 -0500
++++ kdebase-branch-3.4/l10n/kg/entry.desktop 2005-03-07 09:16:48.000000000 -0500
+@@ -49,7 +49,6 @@
+ Name[uk]=КиргизÑтан
+ Name[uz]=ҚирғизиÑтон
+ Name[wa]=Kirguiztan
+-Name[xx]=xxKyrgyzstanxx
+ Name[zh_TW]=å‰çˆ¾å‰æ–¯
+ Region=centralasia
+ Languages=ru
+diff -Nru kdebase-release-3.4.0/l10n/kh/entry.desktop kdebase-branch-3.4/l10n/kh/entry.desktop
+--- kdebase-release-3.4.0/l10n/kh/entry.desktop 2005-02-04 23:16:06.000000000 -0500
++++ kdebase-branch-3.4/l10n/kh/entry.desktop 2005-03-07 09:16:48.000000000 -0500
+@@ -56,7 +56,6 @@
+ Name[uz]=Камбоджа
+ Name[vi]=Cam pu chia
+ Name[wa]=Cambodje
+-Name[xx]=xxCambodiaxx
+ Name[zh_TW]=柬埔寨
+ Region=southeastasia
+ Languages=fr,en_GB
+diff -Nru kdebase-release-3.4.0/l10n/ki/entry.desktop kdebase-branch-3.4/l10n/ki/entry.desktop
+--- kdebase-release-3.4.0/l10n/ki/entry.desktop 2004-12-11 01:37:42.000000000 -0500
++++ kdebase-branch-3.4/l10n/ki/entry.desktop 2005-03-07 09:16:49.000000000 -0500
+@@ -24,7 +24,6 @@
+ Name[th]=คิริบาติ
+ Name[uk]=Кірібаті
+ Name[uz]=Кирибати
+-Name[xx]=xxKiribatixx
+ Name[zh_TW]=å‰é‡Œå·´æ–¯
+ Region=oceania
+ Languages=en_GB
+diff -Nru kdebase-release-3.4.0/l10n/km/entry.desktop kdebase-branch-3.4/l10n/km/entry.desktop
+--- kdebase-release-3.4.0/l10n/km/entry.desktop 2005-02-04 23:16:06.000000000 -0500
++++ kdebase-branch-3.4/l10n/km/entry.desktop 2005-03-07 09:16:49.000000000 -0500
+@@ -44,7 +44,6 @@
+ Name[uk]=КоморÑькі оÑтрови
+ Name[uz]=КомороÑ
+ Name[wa]=Comores
+-Name[xx]=xxComorosxx
+ Name[zh_TW]=葛摩
+ Region=southafrica
+ Languages=fr,ar
+diff -Nru kdebase-release-3.4.0/l10n/kn/entry.desktop kdebase-branch-3.4/l10n/kn/entry.desktop
+--- kdebase-release-3.4.0/l10n/kn/entry.desktop 2005-02-04 23:16:06.000000000 -0500
++++ kdebase-branch-3.4/l10n/kn/entry.desktop 2005-03-07 09:16:49.000000000 -0500
+@@ -61,7 +61,6 @@
+ Name[ven]=St. Kitts na Nevis
+ Name[vi]=St. Kitts và Nevis
+ Name[xh]=St. Kitts neNevis
+-Name[xx]=xxSt. Kitts and Nevisxx
+ Name[zh_TW]=è–å…‹ç†æ–¯å¤šç¦åŠå°¼ç¶æ–¯
+ Name[zu]=St. Kitts kanye no-Nevis
+ Region=caribbean
+diff -Nru kdebase-release-3.4.0/l10n/kp/entry.desktop kdebase-branch-3.4/l10n/kp/entry.desktop
+--- kdebase-release-3.4.0/l10n/kp/entry.desktop 2005-02-04 23:16:06.000000000 -0500
++++ kdebase-branch-3.4/l10n/kp/entry.desktop 2005-03-07 09:16:50.000000000 -0500
+@@ -69,7 +69,6 @@
+ Name[vi]=Bắc Triá»u Tiên
+ Name[wa]=Bijhe Corêye
+ Name[xh]=Umntla Korea
+-Name[xx]=xxNorth Koreaxx
+ Name[zh_CN]=æœé²œ
+ Name[zh_TW]=北韓
+ Name[zu]=Enyakatho ne-Korea
+diff -Nru kdebase-release-3.4.0/l10n/kr/entry.desktop kdebase-branch-3.4/l10n/kr/entry.desktop
+--- kdebase-release-3.4.0/l10n/kr/entry.desktop 2005-02-04 23:16:07.000000000 -0500
++++ kdebase-branch-3.4/l10n/kr/entry.desktop 2005-03-07 09:16:50.000000000 -0500
+@@ -69,7 +69,6 @@
+ Name[vi]=Hà n Quốc
+ Name[wa]=Nonne Corêye
+ Name[xh]=Umzantsi Korea
+-Name[xx]=xxSouth Koreaxx
+ Name[zh_CN]=韩国
+ Name[zh_TW]=å—韓
+ Name[zu]=Emzansi Korea
+diff -Nru kdebase-release-3.4.0/l10n/kw/entry.desktop kdebase-branch-3.4/l10n/kw/entry.desktop
+--- kdebase-release-3.4.0/l10n/kw/entry.desktop 2005-01-10 23:18:11.000000000 -0500
++++ kdebase-branch-3.4/l10n/kw/entry.desktop 2005-03-07 09:16:50.000000000 -0500
+@@ -43,7 +43,6 @@
+ Name[uk]=KКувейт
+ Name[uz]=Кувайт
+ Name[wa]=Kuweyt
+-Name[xx]=xxKuwaitxx
+ Name[zh_TW]=ç§‘å¨ç‰¹
+ Region=middleeast
+ Languages=ar
+diff -Nru kdebase-release-3.4.0/l10n/ky/entry.desktop kdebase-branch-3.4/l10n/ky/entry.desktop
+--- kdebase-release-3.4.0/l10n/ky/entry.desktop 2005-02-04 23:16:07.000000000 -0500
++++ kdebase-branch-3.4/l10n/ky/entry.desktop 2005-03-07 09:16:50.000000000 -0500
+@@ -56,7 +56,6 @@
+ Name[uk]=Кайман оÑтрів
+ Name[uz]=Кайман Ороллари
+ Name[wa]=Iyes Cayman
+-Name[xx]=xxCayman Islandsxx
+ Name[zh_TW]=開曼群島
+ Region=caribbean
+ Languages=en_GB
+diff -Nru kdebase-release-3.4.0/l10n/kz/entry.desktop kdebase-branch-3.4/l10n/kz/entry.desktop
+--- kdebase-release-3.4.0/l10n/kz/entry.desktop 2005-02-04 23:16:07.000000000 -0500
++++ kdebase-branch-3.4/l10n/kz/entry.desktop 2005-03-07 09:16:51.000000000 -0500
+@@ -52,7 +52,6 @@
+ Name[uk]=КазахÑтан
+ Name[uz]=ҚозоғиÑтон
+ Name[wa]=Kazaxhtan
+-Name[xx]=xxKazakhstanxx
+ Name[zh_TW]=哈薩克
+ Region=centralasia
+ Languages=kk,ru
+diff -Nru kdebase-release-3.4.0/l10n/la/entry.desktop kdebase-branch-3.4/l10n/la/entry.desktop
+--- kdebase-release-3.4.0/l10n/la/entry.desktop 2005-01-31 03:36:12.000000000 -0500
++++ kdebase-branch-3.4/l10n/la/entry.desktop 2005-03-07 09:16:51.000000000 -0500
+@@ -27,7 +27,6 @@
+ Name[uz]=ЛаоÑ
+ Name[vi]=LÃ o
+ Name[wa]=Lawosse
+-Name[xx]=xxLaosxx
+ Name[zh_CN]=è€æŒ
+ Name[zh_TW]=寮國
+ Region=southeastasia
+diff -Nru kdebase-release-3.4.0/l10n/lb/entry.desktop kdebase-branch-3.4/l10n/lb/entry.desktop
+--- kdebase-release-3.4.0/l10n/lb/entry.desktop 2005-02-04 23:16:08.000000000 -0500
++++ kdebase-branch-3.4/l10n/lb/entry.desktop 2005-03-07 09:16:51.000000000 -0500
+@@ -61,7 +61,6 @@
+ Name[uz]=Лебанон
+ Name[vi]=Li Băng
+ Name[wa]=Liban
+-Name[xx]=xxLebanonxx
+ Name[zh_TW]=黎巴嫩
+ Region=middleeast
+ Languages=ar
+diff -Nru kdebase-release-3.4.0/l10n/lc/entry.desktop kdebase-branch-3.4/l10n/lc/entry.desktop
+--- kdebase-release-3.4.0/l10n/lc/entry.desktop 2004-12-11 01:37:44.000000000 -0500
++++ kdebase-branch-3.4/l10n/lc/entry.desktop 2005-03-07 09:16:52.000000000 -0500
+@@ -42,7 +42,6 @@
+ Name[uk]=Сент-ЛюÑÑ–Ñ
+ Name[uz]=Сент-ЛюÑиÑ
+ Name[wa]=Ste Luceye
+-Name[xx]=xxSt. Luciaxx
+ Name[zh_TW]=è–露西亞
+ Region=caribbean
+ Languages=en_GB,en_US
+diff -Nru kdebase-release-3.4.0/l10n/li/entry.desktop kdebase-branch-3.4/l10n/li/entry.desktop
+--- kdebase-release-3.4.0/l10n/li/entry.desktop 2005-01-31 03:36:12.000000000 -0500
++++ kdebase-branch-3.4/l10n/li/entry.desktop 2005-03-07 09:16:52.000000000 -0500
+@@ -32,7 +32,6 @@
+ Name[uk]=Ліхтенштейн
+ Name[uz]=Лихтенштейн
+ Name[wa]=Lîchtensteyn
+-Name[xx]=xxLiechtensteinxx
+ Name[zh_TW]=列支敦斯登
+ Region=westeurope
+ Languages=de
+diff -Nru kdebase-release-3.4.0/l10n/lk/entry.desktop kdebase-branch-3.4/l10n/lk/entry.desktop
+--- kdebase-release-3.4.0/l10n/lk/entry.desktop 2005-01-31 03:36:12.000000000 -0500
++++ kdebase-branch-3.4/l10n/lk/entry.desktop 2005-03-07 09:16:52.000000000 -0500
+@@ -30,7 +30,6 @@
+ Name[th]=ศรีลังà¸à¸²
+ Name[uk]=Шрі-Ланка
+ Name[uz]=Шри Ланка
+-Name[xx]=xxSri Lankaxx
+ Name[zh_TW]=斯里è˜å¡
+ Region=southasia
+ Languages=ta,en_GB,en_US
+diff -Nru kdebase-release-3.4.0/l10n/lr/entry.desktop kdebase-branch-3.4/l10n/lr/entry.desktop
+--- kdebase-release-3.4.0/l10n/lr/entry.desktop 2004-12-11 01:37:45.000000000 -0500
++++ kdebase-branch-3.4/l10n/lr/entry.desktop 2005-03-07 09:16:52.000000000 -0500
+@@ -38,7 +38,6 @@
+ Name[tr]=Liberya
+ Name[uk]=ЛіберіÑ
+ Name[uz]=ЛибериÑ
+-Name[xx]=xxLiberiaxx
+ Name[zh_TW]=賴比瑞亞
+ Region=westafrica
+ Languages=en_GB
+diff -Nru kdebase-release-3.4.0/l10n/ls/entry.desktop kdebase-branch-3.4/l10n/ls/entry.desktop
+--- kdebase-release-3.4.0/l10n/ls/entry.desktop 2004-12-11 01:37:45.000000000 -0500
++++ kdebase-branch-3.4/l10n/ls/entry.desktop 2005-03-07 09:16:53.000000000 -0500
+@@ -34,7 +34,6 @@
+ Name[uk]=ЛеÑото
+ Name[uz]=ЛеÑото
+ Name[wa]=Lessoto
+-Name[xx]=xxLesothoxx
+ Name[zh_TW]=賴索扥
+ Region=southafrica
+ Languages=en_GB,zu,xh,st
+diff -Nru kdebase-release-3.4.0/l10n/lt/entry.desktop kdebase-branch-3.4/l10n/lt/entry.desktop
+--- kdebase-release-3.4.0/l10n/lt/entry.desktop 2005-02-04 23:16:08.000000000 -0500
++++ kdebase-branch-3.4/l10n/lt/entry.desktop 2005-03-07 09:16:53.000000000 -0500
+@@ -62,7 +62,6 @@
+ Name[uk]=Литва
+ Name[uz]=Литва
+ Name[wa]=Litwaneye
+-Name[xx]=xxLithuaniaxx
+ Name[zh_TW]=ç«‹é™¶å®›
+ Region=centraleurope
+ Languages=lt
+diff -Nru kdebase-release-3.4.0/l10n/lu/entry.desktop kdebase-branch-3.4/l10n/lu/entry.desktop
+--- kdebase-release-3.4.0/l10n/lu/entry.desktop 2005-02-04 23:16:08.000000000 -0500
++++ kdebase-branch-3.4/l10n/lu/entry.desktop 2005-03-07 09:16:53.000000000 -0500
+@@ -59,7 +59,6 @@
+ Name[uk]=ЛюкÑембург
+ Name[uz]=ЛюкÑембург
+ Name[wa]=Lussimbork
+-Name[xx]=xxLuxembourgxx
+ Name[zh_TW]=ç›§æ£®å ¡
+ Region=westeurope
+ Languages=de,fr
+diff -Nru kdebase-release-3.4.0/l10n/lv/entry.desktop kdebase-branch-3.4/l10n/lv/entry.desktop
+--- kdebase-release-3.4.0/l10n/lv/entry.desktop 2005-02-04 23:16:08.000000000 -0500
++++ kdebase-branch-3.4/l10n/lv/entry.desktop 2005-03-07 09:16:54.000000000 -0500
+@@ -54,7 +54,6 @@
+ Name[uz]=ЛатвиÑ
+ Name[ven]=Lativia
+ Name[wa]=Letoneye
+-Name[xx]=xxLatviaxx
+ Name[zh_TW]=拉脫ç¶äºž
+ Region=easteurope
+ Languages=lv
+diff -Nru kdebase-release-3.4.0/l10n/ly/entry.desktop kdebase-branch-3.4/l10n/ly/entry.desktop
+--- kdebase-release-3.4.0/l10n/ly/entry.desktop 2005-01-22 23:39:11.000000000 -0500
++++ kdebase-branch-3.4/l10n/ly/entry.desktop 2005-03-07 09:16:54.000000000 -0500
+@@ -55,7 +55,6 @@
+ Name[uk]=ЛівіÑ
+ Name[uz]=ЛибиÑ
+ Name[wa]=Libeye
+-Name[xx]=xxLibyaxx
+ Name[zh_CN]=利比亚
+ Name[zh_TW]=利比亞
+ Region=northafrica
+diff -Nru kdebase-release-3.4.0/l10n/ma/entry.desktop kdebase-branch-3.4/l10n/ma/entry.desktop
+--- kdebase-release-3.4.0/l10n/ma/entry.desktop 2005-02-04 23:16:09.000000000 -0500
++++ kdebase-branch-3.4/l10n/ma/entry.desktop 2005-03-07 09:16:54.000000000 -0500
+@@ -61,7 +61,6 @@
+ Name[uz]=Марокаш
+ Name[vi]=Ma rốc
+ Name[wa]=Marok
+-Name[xx]=xxMoroccoxx
+ Name[zh_CN]=摩洛哥
+ Name[zh_TW]=摩洛哥
+ Region=northafrica
+diff -Nru kdebase-release-3.4.0/l10n/mc/entry.desktop kdebase-branch-3.4/l10n/mc/entry.desktop
+--- kdebase-release-3.4.0/l10n/mc/entry.desktop 2005-01-31 03:36:13.000000000 -0500
++++ kdebase-branch-3.4/l10n/mc/entry.desktop 2005-03-07 09:16:54.000000000 -0500
+@@ -40,7 +40,6 @@
+ Name[tr]=Monako
+ Name[uk]=Монако
+ Name[uz]=Монако
+-Name[xx]=xxMonacoxx
+ Name[zh_CN]=摩纳哥
+ Name[zh_TW]=æ‘©ç´å“¥
+ Region=westeurope
+diff -Nru kdebase-release-3.4.0/l10n/md/entry.desktop kdebase-branch-3.4/l10n/md/entry.desktop
+--- kdebase-release-3.4.0/l10n/md/entry.desktop 2004-12-11 01:37:47.000000000 -0500
++++ kdebase-branch-3.4/l10n/md/entry.desktop 2005-03-07 09:16:55.000000000 -0500
+@@ -40,7 +40,6 @@
+ Name[th]=มà¸à¸¥à¹‚ดวา
+ Name[uk]=Молдова
+ Name[uz]=Молдова
+-Name[xx]=xxMoldovaxx
+ Name[zh_TW]=摩爾多瓦
+ Region=easteurope
+ Languages=ro,ru
+diff -Nru kdebase-release-3.4.0/l10n/mg/entry.desktop kdebase-branch-3.4/l10n/mg/entry.desktop
+--- kdebase-release-3.4.0/l10n/mg/entry.desktop 2005-02-04 23:16:09.000000000 -0500
++++ kdebase-branch-3.4/l10n/mg/entry.desktop 2005-03-07 09:16:55.000000000 -0500
+@@ -43,7 +43,6 @@
+ Name[tr]=Madagaskar
+ Name[uk]=МадагаÑкар
+ Name[uz]=МадагаÑкар
+-Name[xx]=xxMadagascarxx
+ Name[zh_TW]=馬é”åŠ æ–¯åŠ
+ Region=southafrica
+ Languages=fr
+diff -Nru kdebase-release-3.4.0/l10n/mh/entry.desktop kdebase-branch-3.4/l10n/mh/entry.desktop
+--- kdebase-release-3.4.0/l10n/mh/entry.desktop 2005-02-04 23:16:09.000000000 -0500
++++ kdebase-branch-3.4/l10n/mh/entry.desktop 2005-03-07 09:16:55.000000000 -0500
+@@ -57,7 +57,6 @@
+ Name[uk]=МаршальÑькі оÑтрови
+ Name[uz]=Маршалл Ороллари
+ Name[wa]=Iyes Marshall
+-Name[xx]=xxMarshall Islandsxx
+ Name[zh_TW]=馬紹爾群島
+ Region=oceania
+ Languages=en_GB
+diff -Nru kdebase-release-3.4.0/l10n/middleeast.desktop kdebase-branch-3.4/l10n/middleeast.desktop
+--- kdebase-release-3.4.0/l10n/middleeast.desktop 2005-02-18 23:27:17.000000000 -0500
++++ kdebase-branch-3.4/l10n/middleeast.desktop 2005-03-30 01:47:58.000000000 -0500
+@@ -9,6 +9,7 @@
+ Name[cy]=Dwyrain Canol
+ Name[da]=Mellmøsten
+ Name[de]=Mittlerer Osten
++Name[el]=ΜÎση Ανατολή
+ Name[eo]=Oriento meza
+ Name[es]=Oriente medio
+ Name[et]=Lähis-Ida
+@@ -39,12 +40,11 @@
+ Name[sk]=Stredný východ
+ Name[sl]=Srednji vzhod
+ Name[sr]=Средњи иÑток
+-Name[sr@Latn]=Средњи иÑток
++Name[sr@Latn]=Srednji istok
+ Name[sv]=Mellersta östern
+ Name[ta]=மைய-கிழகà¯à®•à¯
+ Name[tr]=Orta DoÄŸu
+ Name[uk]=Середній Ñхід
+ Name[uz]=Яқин Шарқ
+ Name[wa]=Moyén Oryint
+-Name[xx]=xxMiddle-Eastxx
+ Name[zh_CN]=ä¸ä¸œ
+diff -Nru kdebase-release-3.4.0/l10n/mk/entry.desktop kdebase-branch-3.4/l10n/mk/entry.desktop
+--- kdebase-release-3.4.0/l10n/mk/entry.desktop 2005-02-04 23:16:09.000000000 -0500
++++ kdebase-branch-3.4/l10n/mk/entry.desktop 2005-03-07 09:16:55.000000000 -0500
+@@ -60,7 +60,6 @@
+ Name[uz]=МакедониÑ
+ Name[ven]=Masedonia
+ Name[wa]=Macedoneye
+-Name[xx]=xxMacedoniaxx
+ Name[zh_TW]=é¦¬å…¶é “
+ Languages=mk
+ Region=southeurope
+diff -Nru kdebase-release-3.4.0/l10n/ml/entry.desktop kdebase-branch-3.4/l10n/ml/entry.desktop
+--- kdebase-release-3.4.0/l10n/ml/entry.desktop 2004-12-11 01:37:48.000000000 -0500
++++ kdebase-branch-3.4/l10n/ml/entry.desktop 2005-03-07 09:16:56.000000000 -0500
+@@ -23,7 +23,6 @@
+ Name[th]=มาลี
+ Name[uk]=Малі
+ Name[uz]=Мали
+-Name[xx]=xxMalixx
+ Name[zh_TW]=馬利
+ Region=westafrica
+ Languages=fr
+diff -Nru kdebase-release-3.4.0/l10n/mm/entry.desktop kdebase-branch-3.4/l10n/mm/entry.desktop
+--- kdebase-release-3.4.0/l10n/mm/entry.desktop 2004-12-11 01:37:48.000000000 -0500
++++ kdebase-branch-3.4/l10n/mm/entry.desktop 2005-03-07 09:16:56.000000000 -0500
+@@ -35,7 +35,6 @@
+ Name[uz]=МÑнмар
+ Name[vi]=Miến Äiện
+ Name[wa]=Birmaneye
+-Name[xx]=xxMyanmarxx
+ Name[zh_TW]=緬甸
+ Region=southeastasia
+ #Languages=
+diff -Nru kdebase-release-3.4.0/l10n/mn/entry.desktop kdebase-branch-3.4/l10n/mn/entry.desktop
+--- kdebase-release-3.4.0/l10n/mn/entry.desktop 2005-01-31 03:36:14.000000000 -0500
++++ kdebase-branch-3.4/l10n/mn/entry.desktop 2005-03-07 09:16:56.000000000 -0500
+@@ -47,7 +47,6 @@
+ Name[uz]=МуғилиÑтон
+ Name[vi]=Mông cổ
+ Name[wa]=Mongoleye
+-Name[xx]=xxMongoliaxx
+ Name[zh_CN]=è’™å¤
+ Name[zh_TW]=è’™å¤
+
+diff -Nru kdebase-release-3.4.0/l10n/mo/entry.desktop kdebase-branch-3.4/l10n/mo/entry.desktop
+--- kdebase-release-3.4.0/l10n/mo/entry.desktop 2005-02-23 00:06:01.000000000 -0500
++++ kdebase-branch-3.4/l10n/mo/entry.desktop 2005-03-30 01:47:59.000000000 -0500
+@@ -2,26 +2,32 @@
+ Name=Macau SAR(China)
+ Name[bg]=Макао (Китай)
+ Name[bn]=মাকাউ SAR(চীন)
++Name[br]=Makav SAR(Sina)
++Name[bs]=Makau SAR (Kina)
+ Name[ca]=Macau SAR(Xina)
+ Name[cs]=Macau SAR (ÄŒÃna)
+ Name[da]=Macau SAR(Kina)
+ Name[de]=Macao SAR (China)
++Name[el]=Μακάο SAR (Κίνα)
+ Name[et]=Macau
++Name[eu]=Macau SAR(Txina)
+ Name[fr]=Macao SAR (Chine)
+ Name[ga]=Macao SAR(An tSÃn)
+ Name[he]=מק×ו SAR (סין)
+ Name[hu]=Makaó (KÃna)
+ Name[is]=Macau SAR(KÃna)
+ Name[it]=Macau SAR(Cina)
++Name[ja]=マカオ(ä¸å›½)
+ Name[lt]=Macau SAR(Kinija)
+ Name[nb]=Macao SAR (Kina)
+ Name[pa]=ਮੈਕਿਉ SAR(ਚੀਨ)
+ Name[pl]=Makao SAR (Chiny)
+ Name[pt_BR]=Macau (China)
+ Name[ru]=Макао SAR(Китай)
++Name[sk]=Makao SAR(ÄŒÃna)
+ Name[sl]=Macau SAR (Kitajska)
+ Name[sr]=SAR Macau (Кина)
+-Name[sr@Latn]=SAR Macau (Кина)
++Name[sr@Latn]=SAR Macau (Kina)
+ Name[sv]=Macao (Kina)
+ Name[ta]=Macau SAR(சீனா)
+ Name[uk]=Macau SAR(Китай)
+diff -Nru kdebase-release-3.4.0/l10n/mq/entry.desktop kdebase-branch-3.4/l10n/mq/entry.desktop
+--- kdebase-release-3.4.0/l10n/mq/entry.desktop 2005-01-31 03:36:14.000000000 -0500
++++ kdebase-branch-3.4/l10n/mq/entry.desktop 2005-03-07 09:16:57.000000000 -0500
+@@ -41,7 +41,6 @@
+ Name[uk]=Мартініка
+ Name[uz]=Мартиника
+ Name[wa]=Martinike
+-Name[xx]=xxMartiniquexx
+ Name[zh_TW]=馬æå°¼å…‹
+ Region=caribbean
+ Languages=fr
+diff -Nru kdebase-release-3.4.0/l10n/mr/entry.desktop kdebase-branch-3.4/l10n/mr/entry.desktop
+--- kdebase-release-3.4.0/l10n/mr/entry.desktop 2005-01-31 03:36:14.000000000 -0500
++++ kdebase-branch-3.4/l10n/mr/entry.desktop 2005-03-07 09:16:57.000000000 -0500
+@@ -46,7 +46,6 @@
+ Name[uk]=МавританіÑ
+ Name[uz]=МавританиÑ
+ Name[wa]=Moritanreye
+-Name[xx]=xxMauritaniaxx
+ Name[zh_TW]=茅利塔尼亞
+ Region=westafrica
+ Languages=ar,en_GB
+diff -Nru kdebase-release-3.4.0/l10n/ms/entry.desktop kdebase-branch-3.4/l10n/ms/entry.desktop
+--- kdebase-release-3.4.0/l10n/ms/entry.desktop 2004-12-11 01:37:49.000000000 -0500
++++ kdebase-branch-3.4/l10n/ms/entry.desktop 2005-03-07 09:16:58.000000000 -0500
+@@ -24,7 +24,6 @@
+ Name[th]=มà¸à¸™à¸•์เซà¸à¸£à¹Œà¸£à¸±à¸—
+ Name[uk]=МонтÑеррат
+ Name[uz]=Монцеррат
+-Name[xx]=xxMontserratxx
+ Name[zh_TW]=蒙的塞拉特
+ Region=caribbean
+ Languages=en_GB
+diff -Nru kdebase-release-3.4.0/l10n/mt/entry.desktop kdebase-branch-3.4/l10n/mt/entry.desktop
+--- kdebase-release-3.4.0/l10n/mt/entry.desktop 2004-12-11 01:37:50.000000000 -0500
++++ kdebase-branch-3.4/l10n/mt/entry.desktop 2005-03-07 09:16:58.000000000 -0500
+@@ -29,7 +29,6 @@
+ Name[uk]=Мальта
+ Name[uz]=Малта
+ Name[wa]=Male
+-Name[xx]=xxMaltaxx
+ Name[zh_TW]=馬爾他
+ Region=southeurope
+ Languages=mt,en_GB,en
+diff -Nru kdebase-release-3.4.0/l10n/mu/entry.desktop kdebase-branch-3.4/l10n/mu/entry.desktop
+--- kdebase-release-3.4.0/l10n/mu/entry.desktop 2004-12-19 23:37:15.000000000 -0500
++++ kdebase-branch-3.4/l10n/mu/entry.desktop 2005-03-07 09:16:58.000000000 -0500
+@@ -41,7 +41,6 @@
+ Name[uk]=Маврікій
+ Name[uz]=Маврикий
+ Name[wa]=Iye Môrice
+-Name[xx]=xxMauritiusxx
+ Name[zh_TW]=毛里求斯
+ Region=southafrica
+ Languages=en_GB,fr,hi
+diff -Nru kdebase-release-3.4.0/l10n/mv/entry.desktop kdebase-branch-3.4/l10n/mv/entry.desktop
+--- kdebase-release-3.4.0/l10n/mv/entry.desktop 2005-02-04 23:16:10.000000000 -0500
++++ kdebase-branch-3.4/l10n/mv/entry.desktop 2005-03-07 09:16:58.000000000 -0500
+@@ -52,7 +52,6 @@
+ Name[tr]=Maldivler
+ Name[uk]=Мальдіви
+ Name[uz]=Малдив Ороллари
+-Name[xx]=xxMaldivesxx
+ Name[zh_TW]=馬爾地夫
+ Region=southasia
+ Languages=ar,hi,en_GB
+diff -Nru kdebase-release-3.4.0/l10n/mw/entry.desktop kdebase-branch-3.4/l10n/mw/entry.desktop
+--- kdebase-release-3.4.0/l10n/mw/entry.desktop 2004-12-11 01:37:50.000000000 -0500
++++ kdebase-branch-3.4/l10n/mw/entry.desktop 2005-03-07 09:16:59.000000000 -0500
+@@ -27,7 +27,6 @@
+ Name[tr]=Malavi
+ Name[uk]=Малаві
+ Name[uz]=Малави
+-Name[xx]=xxMalawixx
+ Name[zh_TW]=馬拉å¨
+ Region=southafrica
+ Languages=en_GB
+diff -Nru kdebase-release-3.4.0/l10n/mx/entry.desktop kdebase-branch-3.4/l10n/mx/entry.desktop
+--- kdebase-release-3.4.0/l10n/mx/entry.desktop 2005-01-22 23:39:12.000000000 -0500
++++ kdebase-branch-3.4/l10n/mx/entry.desktop 2005-03-07 09:16:59.000000000 -0500
+@@ -59,7 +59,6 @@
+ Name[uz]=МекÑика
+ Name[vi]=Mê hi cô
+ Name[wa]=Mecsike
+-Name[xx]=xxMexicoxx
+ Name[zh_CN]=墨西哥
+ Name[zh_TW]=墨西哥
+ Region=northamerica
+diff -Nru kdebase-release-3.4.0/l10n/my/entry.desktop kdebase-branch-3.4/l10n/my/entry.desktop
+--- kdebase-release-3.4.0/l10n/my/entry.desktop 2005-01-31 03:36:15.000000000 -0500
++++ kdebase-branch-3.4/l10n/my/entry.desktop 2005-03-22 12:38:21.000000000 -0500
+@@ -25,7 +25,6 @@
+ Name[hr]=Malezija
+ Name[hu]=Malajzia
+ Name[is]=MalasÃa
+-Name[it]=Malesia
+ Name[ja]=マレーシア
+ Name[ko]=ë§ë ˆì´ì‹œì•„
+ Name[lo]=ມàºàº¥àº•າ
+@@ -51,7 +50,6 @@
+ Name[uk]=МалайзіÑ
+ Name[uz]=МалайзиÑ
+ Name[wa]=Malaizeye
+-Name[xx]=xxMalaysiaxx
+ Name[zh_CN]=马æ¥è¥¿äºš
+ Name[zh_TW]=馬來西亞
+ Region=southeastasia
+diff -Nru kdebase-release-3.4.0/l10n/mz/entry.desktop kdebase-branch-3.4/l10n/mz/entry.desktop
+--- kdebase-release-3.4.0/l10n/mz/entry.desktop 2005-02-04 23:16:10.000000000 -0500
++++ kdebase-branch-3.4/l10n/mz/entry.desktop 2005-03-07 09:17:00.000000000 -0500
+@@ -50,7 +50,6 @@
+ Name[uk]=Мозамбік
+ Name[uz]=Мозамбик
+ Name[wa]=Mozambike
+-Name[xx]=xxMozambiquexx
+ Name[zh_TW]=莫三比克
+ Region=southafrica
+ Languages=pt
+diff -Nru kdebase-release-3.4.0/l10n/na/entry.desktop kdebase-branch-3.4/l10n/na/entry.desktop
+--- kdebase-release-3.4.0/l10n/na/entry.desktop 2005-01-31 03:36:15.000000000 -0500
++++ kdebase-branch-3.4/l10n/na/entry.desktop 2005-03-07 09:17:00.000000000 -0500
+@@ -43,7 +43,6 @@
+ Name[uk]=ÐамібіÑ
+ Name[uz]=ÐамибиÑ
+ Name[wa]=Namibeye
+-Name[xx]=xxNamibiaxx
+ Name[zh_TW]=那米比亞
+ Region=southafrica
+ Languages=af,de,en_GB
+diff -Nru kdebase-release-3.4.0/l10n/nc/entry.desktop kdebase-branch-3.4/l10n/nc/entry.desktop
+--- kdebase-release-3.4.0/l10n/nc/entry.desktop 2005-02-04 23:16:10.000000000 -0500
++++ kdebase-branch-3.4/l10n/nc/entry.desktop 2005-03-07 09:17:00.000000000 -0500
+@@ -56,7 +56,6 @@
+ Name[uk]=Ðова КаледоніÑ
+ Name[uz]=Янги КаледониÑ
+ Name[wa]=Nouve Caledonreye
+-Name[xx]=xxNew Caledoniaxx
+ Name[zh_TW]=新喀里多尼亞
+ Region=oceania
+ Languages=fr
+diff -Nru kdebase-release-3.4.0/l10n/ne/entry.desktop kdebase-branch-3.4/l10n/ne/entry.desktop
+--- kdebase-release-3.4.0/l10n/ne/entry.desktop 2004-12-11 01:37:52.000000000 -0500
++++ kdebase-branch-3.4/l10n/ne/entry.desktop 2005-03-07 09:17:00.000000000 -0500
+@@ -33,7 +33,6 @@
+ Name[uk]=Ðігер
+ Name[uz]=Ðигер
+ Name[wa]=Nidjer
+-Name[xx]=xxNigerxx
+ Name[zh_TW]=尼日
+ Region=westafrica
+ Languages=fr,ar
+diff -Nru kdebase-release-3.4.0/l10n/nf/entry.desktop kdebase-branch-3.4/l10n/nf/entry.desktop
+--- kdebase-release-3.4.0/l10n/nf/entry.desktop 2005-02-04 23:16:11.000000000 -0500
++++ kdebase-branch-3.4/l10n/nf/entry.desktop 2005-03-07 09:17:01.000000000 -0500
+@@ -55,7 +55,6 @@
+ Name[uk]=ОÑтрів Ðорфолк
+ Name[uz]=Ðорфолк Ороли
+ Name[wa]=Iye di Norfolk
+-Name[xx]=xxNorfolk Islandxx
+ Name[zh_TW]=諾ç¦å…‹å³¶
+ Region=oceania
+ Languages=en_GB
+diff -Nru kdebase-release-3.4.0/l10n/ng/entry.desktop kdebase-branch-3.4/l10n/ng/entry.desktop
+--- kdebase-release-3.4.0/l10n/ng/entry.desktop 2005-01-31 03:36:16.000000000 -0500
++++ kdebase-branch-3.4/l10n/ng/entry.desktop 2005-03-07 09:17:01.000000000 -0500
+@@ -42,7 +42,6 @@
+ Name[uk]=ÐігеріÑ
+ Name[uz]=ÐигериÑ
+ Name[wa]=Nidjeria
+-Name[xx]=xxNigeriaxx
+ Name[zh_TW]=奈åŠåˆ©äºž
+ Region=westafrica
+ Languages=en_GB
+diff -Nru kdebase-release-3.4.0/l10n/ni/entry.desktop kdebase-branch-3.4/l10n/ni/entry.desktop
+--- kdebase-release-3.4.0/l10n/ni/entry.desktop 2005-01-31 03:36:16.000000000 -0500
++++ kdebase-branch-3.4/l10n/ni/entry.desktop 2005-03-07 09:17:01.000000000 -0500
+@@ -44,7 +44,6 @@
+ Name[uk]=Ðікарагуа
+ Name[uz]=Ðикарагуа
+ Name[wa]=Nicaragwa
+-Name[xx]=xxNicaraguaxx
+ Name[zh_TW]=å°¼åŠ æ‹‰ç“œ
+ Region=centralamerica
+ Languages=es
+diff -Nru kdebase-release-3.4.0/l10n/nl/entry.desktop kdebase-branch-3.4/l10n/nl/entry.desktop
+--- kdebase-release-3.4.0/l10n/nl/entry.desktop 2005-02-04 23:16:11.000000000 -0500
++++ kdebase-branch-3.4/l10n/nl/entry.desktop 2005-03-07 09:17:02.000000000 -0500
+@@ -66,7 +66,6 @@
+ Name[uz]=Ðидерландлар
+ Name[vi]=HÃ Lan
+ Name[wa]=Bas Payis
+-Name[xx]=xxNetherlandsxx
+ Name[zh_TW]=è·è˜
+ Region=westeurope
+ Languages=nl
+diff -Nru kdebase-release-3.4.0/l10n/no/entry.desktop kdebase-branch-3.4/l10n/no/entry.desktop
+--- kdebase-release-3.4.0/l10n/no/entry.desktop 2005-02-04 23:16:11.000000000 -0500
++++ kdebase-branch-3.4/l10n/no/entry.desktop 2005-03-07 09:17:02.000000000 -0500
+@@ -67,7 +67,6 @@
+ Name[uz]=ÐорвегиÑ
+ Name[vi]=Na uy
+ Name[wa]=Norvedje
+-Name[xx]=xxNorwayxx
+ Name[zh_CN]=挪å¨
+ Name[zh_TW]=挪å¨
+ Region=northeurope
+diff -Nru kdebase-release-3.4.0/l10n/northafrica.desktop kdebase-branch-3.4/l10n/northafrica.desktop
+--- kdebase-release-3.4.0/l10n/northafrica.desktop 2005-02-18 23:27:17.000000000 -0500
++++ kdebase-branch-3.4/l10n/northafrica.desktop 2005-03-30 01:47:58.000000000 -0500
+@@ -10,6 +10,7 @@
+ Name[cy]=Affrica, Gogledd
+ Name[da]=Nordafrika
+ Name[de]=Afrika, Nördliches
++Name[el]=ΑφÏική, Î’ÏŒÏεια
+ Name[eo]=Afriko norda
+ Name[es]=Africa, del Norte
+ Name[et]=Põhja-Aafrika
+@@ -41,12 +42,11 @@
+ Name[sk]=Severná Afrika
+ Name[sl]=Afrika, Severna
+ Name[sr]=Ðфрика, Ñеверна
+-Name[sr@Latn]=Ðфрика, Ñеверна
++Name[sr@Latn]=Afrika, severna
+ Name[sv]=Afrika, nord
+ Name[ta]=ஆபà¯à®ªà®¿à®°à®¿à®•à¯à®•ா, வடகà¯à®•à¯
+ Name[tr]=Kuzey Afrika
+ Name[uk]=Ðфрика, північна
+ Name[uz]=Ðфрика, Шимолий
+ Name[wa]=Afrike bijhrece
+-Name[xx]=xxAfrica, Northernxx
+ Name[zh_CN]=北éž
+diff -Nru kdebase-release-3.4.0/l10n/northamerica.desktop kdebase-branch-3.4/l10n/northamerica.desktop
+--- kdebase-release-3.4.0/l10n/northamerica.desktop 2005-02-04 23:15:49.000000000 -0500
++++ kdebase-branch-3.4/l10n/northamerica.desktop 2005-03-07 09:16:19.000000000 -0500
+@@ -69,7 +69,6 @@
+ Name[vi]=Bắc Mĩ
+ Name[wa]=Amerike bijhrece
+ Name[xh]=Melika, Mntla
+-Name[xx]=xxAmerica, Northxx
+ Name[zh_CN]=北美
+ Name[zh_TW]=美洲,北部
+ Name[zu]=Melika, Inyakatho
+diff -Nru kdebase-release-3.4.0/l10n/northeurope.desktop kdebase-branch-3.4/l10n/northeurope.desktop
+--- kdebase-release-3.4.0/l10n/northeurope.desktop 2005-02-04 23:15:49.000000000 -0500
++++ kdebase-branch-3.4/l10n/northeurope.desktop 2005-03-07 09:16:19.000000000 -0500
+@@ -69,7 +69,6 @@
+ Name[vi]=Bắc Âu
+ Name[wa]=Urope bijhrece
+ Name[xh]=Yurophu, Esemantla
+-Name[xx]=xxEurope, Northernxx
+ Name[zh_CN]=北欧
+ Name[zh_TW]=ææ´²ï¼ŒåŒ—部
+ Name[zu]=Europe, Inyakatho
+diff -Nru kdebase-release-3.4.0/l10n/np/entry.desktop kdebase-branch-3.4/l10n/np/entry.desktop
+--- kdebase-release-3.4.0/l10n/np/entry.desktop 2005-01-31 03:36:17.000000000 -0500
++++ kdebase-branch-3.4/l10n/np/entry.desktop 2005-03-07 09:17:02.000000000 -0500
+@@ -27,7 +27,6 @@
+ Name[th]=เนปาล
+ Name[uk]=Ðепал
+ Name[uz]=Ðепал
+-Name[xx]=xxNepalxx
+ Name[zh_TW]=尼泊爾
+ Region=southasia
+ Languages=en_GB
+diff -Nru kdebase-release-3.4.0/l10n/nr/entry.desktop kdebase-branch-3.4/l10n/nr/entry.desktop
+--- kdebase-release-3.4.0/l10n/nr/entry.desktop 2005-01-22 23:39:13.000000000 -0500
++++ kdebase-branch-3.4/l10n/nr/entry.desktop 2005-03-07 09:17:02.000000000 -0500
+@@ -4,6 +4,7 @@
+ Name[be]=Ðауру
+ Name[bg]=Ðауру
+ Name[bn]=নাউরà§
++Name[br]=Naurueg
+ Name[cy]=Nawrw
+ Name[el]=ÎαουÏοÏ
+ Name[eo]=NaÅro
+@@ -28,7 +29,6 @@
+ Name[uk]=Ðауру
+ Name[uz]=Ðауру
+ Name[wa]=Nawouro
+-Name[xx]=xxNauruxx
+ Name[zh_CN]=ç‘™é²
+ Name[zh_TW]=諾é¯
+ Region=oceania
+diff -Nru kdebase-release-3.4.0/l10n/nu/entry.desktop kdebase-branch-3.4/l10n/nu/entry.desktop
+--- kdebase-release-3.4.0/l10n/nu/entry.desktop 2004-11-01 23:20:59.000000000 -0500
++++ kdebase-branch-3.4/l10n/nu/entry.desktop 2005-03-07 09:17:03.000000000 -0500
+@@ -25,7 +25,6 @@
+ Name[uk]=Ðіуе
+ Name[uz]=Ðиуе
+ Name[wa]=Niuwé
+-Name[xx]=xxNiuexx
+ Name[zh_TW]=ç´é„‚å³¶
+ Region=oceania
+ Languages=es
+diff -Nru kdebase-release-3.4.0/l10n/nz/entry.desktop kdebase-branch-3.4/l10n/nz/entry.desktop
+--- kdebase-release-3.4.0/l10n/nz/entry.desktop 2005-02-04 23:16:12.000000000 -0500
++++ kdebase-branch-3.4/l10n/nz/entry.desktop 2005-03-07 09:17:03.000000000 -0500
+@@ -62,7 +62,6 @@
+ Name[uk]=Ðова ЗеландіÑ
+ Name[uz]=Янги ЗеландиÑ
+ Name[wa]=Nouve Zelande
+-Name[xx]=xxNew Zealandxx
+ Name[zh_CN]=新西兰
+ Name[zh_TW]=ç´è¥¿è˜
+ Region=oceania
+diff -Nru kdebase-release-3.4.0/l10n/oceania.desktop kdebase-branch-3.4/l10n/oceania.desktop
+--- kdebase-release-3.4.0/l10n/oceania.desktop 2005-01-31 03:36:01.000000000 -0500
++++ kdebase-branch-3.4/l10n/oceania.desktop 2005-03-07 09:16:19.000000000 -0500
+@@ -49,5 +49,4 @@
+ Name[uk]=ОкеаніÑ
+ Name[uz]=ОкеаниÑ
+ Name[wa]=Oceyaneye
+-Name[xx]=xxOceaniaxx
+ Name[zh_TW]=大洋洲
+diff -Nru kdebase-release-3.4.0/l10n/om/entry.desktop kdebase-branch-3.4/l10n/om/entry.desktop
+--- kdebase-release-3.4.0/l10n/om/entry.desktop 2005-01-22 23:39:13.000000000 -0500
++++ kdebase-branch-3.4/l10n/om/entry.desktop 2005-03-07 09:17:03.000000000 -0500
+@@ -33,7 +33,6 @@
+ Name[uk]=Оман
+ Name[uz]=Уммон
+ Name[xh]= Oman
+-Name[xx]=xxOmanxx
+ Name[zh_CN]=阿曼
+ Name[zh_TW]=阿曼
+ Region=middleeast
+diff -Nru kdebase-release-3.4.0/l10n/pa/entry.desktop kdebase-branch-3.4/l10n/pa/entry.desktop
+--- kdebase-release-3.4.0/l10n/pa/entry.desktop 2005-01-22 23:39:14.000000000 -0500
++++ kdebase-branch-3.4/l10n/pa/entry.desktop 2005-03-07 09:17:03.000000000 -0500
+@@ -28,7 +28,6 @@
+ Name[th]=ปานามา
+ Name[uk]=Панама
+ Name[uz]=Панама
+-Name[xx]=xxPanamaxx
+ Name[zh_CN]=巴拿马
+ Name[zh_TW]=巴拿馬
+ Region=centralamerica
+diff -Nru kdebase-release-3.4.0/l10n/pe/entry.desktop kdebase-branch-3.4/l10n/pe/entry.desktop
+--- kdebase-release-3.4.0/l10n/pe/entry.desktop 2004-12-11 01:37:54.000000000 -0500
++++ kdebase-branch-3.4/l10n/pe/entry.desktop 2005-03-07 09:17:04.000000000 -0500
+@@ -37,7 +37,6 @@
+ Name[uk]=Перу
+ Name[uz]=Перу
+ Name[wa]=Perou
+-Name[xx]=xxPeruxx
+ Name[zh_TW]=秘é¯
+ Region=southamerica
+ Languages=es
+diff -Nru kdebase-release-3.4.0/l10n/pf/entry.desktop kdebase-branch-3.4/l10n/pf/entry.desktop
+--- kdebase-release-3.4.0/l10n/pf/entry.desktop 2005-02-04 23:16:12.000000000 -0500
++++ kdebase-branch-3.4/l10n/pf/entry.desktop 2005-03-07 09:17:04.000000000 -0500
+@@ -59,7 +59,6 @@
+ Name[uz]=Француз ПолинезиÑ
+ Name[vi]=Polynesia thuộc Pháp
+ Name[wa]=Polinezeye francesse
+-Name[xx]=xxFrench Polynesiaxx
+ Name[zh_TW]=法屬波利尼西亞
+ Region=oceania
+ Languages=fr
+diff -Nru kdebase-release-3.4.0/l10n/pg/entry.desktop kdebase-branch-3.4/l10n/pg/entry.desktop
+--- kdebase-release-3.4.0/l10n/pg/entry.desktop 2005-02-04 23:16:12.000000000 -0500
++++ kdebase-branch-3.4/l10n/pg/entry.desktop 2005-03-07 09:17:04.000000000 -0500
+@@ -57,7 +57,6 @@
+ Name[uk]=Папуа Ðова ГвінеÑ
+ Name[uz]=Папуа Янги ГвинеÑ
+ Name[wa]=Papouwazeye Nouve Guinêye
+-Name[xx]=xxPapua New Guineaxx
+ Name[zh_TW]=巴布ç´å¹¾å…§äºž
+ Region=oceania
+ Languages=en_GB
+diff -Nru kdebase-release-3.4.0/l10n/ph/entry.desktop kdebase-branch-3.4/l10n/ph/entry.desktop
+--- kdebase-release-3.4.0/l10n/ph/entry.desktop 2005-02-04 23:16:12.000000000 -0500
++++ kdebase-branch-3.4/l10n/ph/entry.desktop 2005-03-07 09:17:05.000000000 -0500
+@@ -58,7 +58,6 @@
+ Name[uk]=Філіппіни
+ Name[uz]=Филиппин
+ Name[wa]=Filipenes
+-Name[xx]=xxPhilippinesxx
+ Name[zh_TW]=è²å¾‹è³“
+ Region=southeastasia
+ Languages=en_GB
+diff -Nru kdebase-release-3.4.0/l10n/pk/entry.desktop kdebase-branch-3.4/l10n/pk/entry.desktop
+--- kdebase-release-3.4.0/l10n/pk/entry.desktop 2005-01-31 03:36:18.000000000 -0500
++++ kdebase-branch-3.4/l10n/pk/entry.desktop 2005-03-07 09:17:05.000000000 -0500
+@@ -30,7 +30,6 @@
+ Name[th]=ปาà¸à¸µà¸ªà¸–าน
+ Name[uk]=ПакиÑтан
+ Name[uz]=ПокиÑтон
+-Name[xx]=xxPakistanxx
+ Name[zh_CN]=巴基斯å¦
+ Name[zh_TW]=巴基斯å¦
+ Region=southasia
+diff -Nru kdebase-release-3.4.0/l10n/pl/entry.desktop kdebase-branch-3.4/l10n/pl/entry.desktop
+--- kdebase-release-3.4.0/l10n/pl/entry.desktop 2005-02-04 23:16:13.000000000 -0500
++++ kdebase-branch-3.4/l10n/pl/entry.desktop 2005-03-07 09:17:05.000000000 -0500
+@@ -67,7 +67,6 @@
+ Name[ven]=Pholandi
+ Name[vi]=Ba Lan
+ Name[wa]=Pologne
+-Name[xx]=xxPolandxx
+ Name[zh_CN]=波兰
+ Name[zh_TW]=æ³¢è˜
+ Region=centraleurope
+diff -Nru kdebase-release-3.4.0/l10n/pm/entry.desktop kdebase-branch-3.4/l10n/pm/entry.desktop
+--- kdebase-release-3.4.0/l10n/pm/entry.desktop 2005-02-04 23:16:13.000000000 -0500
++++ kdebase-branch-3.4/l10n/pm/entry.desktop 2005-03-07 09:17:05.000000000 -0500
+@@ -56,7 +56,6 @@
+ Name[uk]=Сент-П'єр і Мікелон
+ Name[uz]=Сент-Пер ва Микелон
+ Name[wa]=Sint Pire et Miquelon
+-Name[xx]=xxSaint Pierre and Miquelonxx
+ Region=northamerica
+ Languages=es,en_GB
+ #DecimalSymbol=,
+diff -Nru kdebase-release-3.4.0/l10n/pn/entry.desktop kdebase-branch-3.4/l10n/pn/entry.desktop
+--- kdebase-release-3.4.0/l10n/pn/entry.desktop 2004-12-19 23:37:16.000000000 -0500
++++ kdebase-branch-3.4/l10n/pn/entry.desktop 2005-03-07 09:17:06.000000000 -0500
+@@ -21,7 +21,6 @@
+ Name[ta]=பிடà¯à®•ாயà¯à®©à¯
+ Name[tg]=Питкорин
+ Name[uz]=Питкерн
+-Name[xx]=xxPitcairnxx
+ Name[zh_TW]=匹特開æ©å³¶
+ Region=oceania
+ Languages=en_GB
+diff -Nru kdebase-release-3.4.0/l10n/pr/entry.desktop kdebase-branch-3.4/l10n/pr/entry.desktop
+--- kdebase-release-3.4.0/l10n/pr/entry.desktop 2005-01-31 03:36:18.000000000 -0500
++++ kdebase-branch-3.4/l10n/pr/entry.desktop 2005-03-07 09:17:06.000000000 -0500
+@@ -39,7 +39,6 @@
+ Name[uk]=Пуерто-Ріко
+ Name[uz]=ПуÑрто-Рико
+ Name[wa]=Porto Rico
+-Name[xx]=xxPuerto Ricoxx
+ Name[zh_CN]=波多黎å„
+ Name[zh_TW]=波多黎å„
+ Region=caribbean
+diff -Nru kdebase-release-3.4.0/l10n/ps/entry.desktop kdebase-branch-3.4/l10n/ps/entry.desktop
+--- kdebase-release-3.4.0/l10n/ps/entry.desktop 2005-02-04 23:16:13.000000000 -0500
++++ kdebase-branch-3.4/l10n/ps/entry.desktop 2005-03-07 09:17:06.000000000 -0500
+@@ -65,7 +65,6 @@
+ Name[vi]=Lãnh thổ của Palestine
+ Name[wa]=Palestene
+ Name[xh]=Umhlaba wePalestina
+-Name[xx]=xxPalestinian Territoryxx
+ Name[zh_TW]=å·´å‹’æ–¯å¦é ˜åœ°
+ Name[zu]=Indawo yama-Phalesitina
+ Region=middleeast
+diff -Nru kdebase-release-3.4.0/l10n/pt/entry.desktop kdebase-branch-3.4/l10n/pt/entry.desktop
+--- kdebase-release-3.4.0/l10n/pt/entry.desktop 2004-12-11 01:37:56.000000000 -0500
++++ kdebase-branch-3.4/l10n/pt/entry.desktop 2005-03-07 09:17:07.000000000 -0500
+@@ -41,7 +41,6 @@
+ Name[uk]=ПортугаліÑ
+ Name[uz]=ПортугалиÑ
+ Name[vi]=Bồ Äà o Nha
+-Name[xx]=xxPortugalxx
+ Name[zh_TW]=è‘¡è„牙
+ Region=westeurope
+ Languages=pt
+diff -Nru kdebase-release-3.4.0/l10n/pw/entry.desktop kdebase-branch-3.4/l10n/pw/entry.desktop
+--- kdebase-release-3.4.0/l10n/pw/entry.desktop 2005-01-22 23:39:15.000000000 -0500
++++ kdebase-branch-3.4/l10n/pw/entry.desktop 2005-03-07 09:17:07.000000000 -0500
+@@ -23,7 +23,6 @@
+ Name[uk]=Палау
+ Name[uz]=Палау
+ Name[wa]=Palawou
+-Name[xx]=xxPalauxx
+ Name[zh_CN]=帕劳
+ Name[zh_TW]=帛ç‰
+ Region=oceania
+diff -Nru kdebase-release-3.4.0/l10n/py/entry.desktop kdebase-branch-3.4/l10n/py/entry.desktop
+--- kdebase-release-3.4.0/l10n/py/entry.desktop 2004-12-11 01:37:57.000000000 -0500
++++ kdebase-branch-3.4/l10n/py/entry.desktop 2005-03-07 09:17:07.000000000 -0500
+@@ -45,7 +45,6 @@
+ Name[uk]=Парагвай
+ Name[uz]=Парагвай
+ Name[wa]=Paragway
+-Name[xx]=xxParaguayxx
+ Name[zh_TW]=巴拉åœ
+ Region=southamerica
+ Languages=es
+diff -Nru kdebase-release-3.4.0/l10n/qa/entry.desktop kdebase-branch-3.4/l10n/qa/entry.desktop
+--- kdebase-release-3.4.0/l10n/qa/entry.desktop 2005-01-31 03:36:18.000000000 -0500
++++ kdebase-branch-3.4/l10n/qa/entry.desktop 2005-03-07 09:17:07.000000000 -0500
+@@ -41,7 +41,6 @@
+ Name[uk]=Катар
+ Name[uz]=Қатар
+ Name[wa]=Katar
+-Name[xx]=xxQatarxx
+ Name[zh_CN]=å¡å¡”å°”
+ Name[zh_TW]=å¡é”
+ Region=middleeast
+diff -Nru kdebase-release-3.4.0/l10n/ro/entry.desktop kdebase-branch-3.4/l10n/ro/entry.desktop
+--- kdebase-release-3.4.0/l10n/ro/entry.desktop 2005-02-04 23:16:14.000000000 -0500
++++ kdebase-branch-3.4/l10n/ro/entry.desktop 2005-03-07 09:17:08.000000000 -0500
+@@ -58,7 +58,6 @@
+ Name[uk]=РумуніÑ
+ Name[uz]=РуминиÑ
+ Name[wa]=Roumaneye
+-Name[xx]=xxRomaniaxx
+ Name[zh_CN]=罗马尼亚
+ Name[zh_TW]=羅馬尼亞
+ Region=easteurope
+diff -Nru kdebase-release-3.4.0/l10n/ru/entry.desktop kdebase-branch-3.4/l10n/ru/entry.desktop
+--- kdebase-release-3.4.0/l10n/ru/entry.desktop 2005-02-04 23:16:14.000000000 -0500
++++ kdebase-branch-3.4/l10n/ru/entry.desktop 2005-03-07 09:17:08.000000000 -0500
+@@ -67,7 +67,6 @@
+ Name[vi]=Nga
+ Name[wa]=Rûsseye
+ Name[xh]=Rashiya
+-Name[xx]=xxRussiaxx
+ Name[zh_CN]=ä¿„ç½—æ–¯
+ Name[zh_TW]=ä¿„ç¾…æ–¯
+ Region=easteurope
+diff -Nru kdebase-release-3.4.0/l10n/rw/entry.desktop kdebase-branch-3.4/l10n/rw/entry.desktop
+--- kdebase-release-3.4.0/l10n/rw/entry.desktop 2005-01-31 03:36:18.000000000 -0500
++++ kdebase-branch-3.4/l10n/rw/entry.desktop 2005-03-07 09:17:08.000000000 -0500
+@@ -42,7 +42,6 @@
+ Name[tr]=Ruanda
+ Name[uk]=Руанда
+ Name[uz]=Рванда
+-Name[xx]=xxRwandaxx
+ Name[zh_TW]=盧安é”
+ Region=centralafrica
+ Languages=fr,en_GB
+diff -Nru kdebase-release-3.4.0/l10n/sa/entry.desktop kdebase-branch-3.4/l10n/sa/entry.desktop
+--- kdebase-release-3.4.0/l10n/sa/entry.desktop 2005-02-04 23:16:14.000000000 -0500
++++ kdebase-branch-3.4/l10n/sa/entry.desktop 2005-03-07 09:17:09.000000000 -0500
+@@ -60,7 +60,6 @@
+ Name[uz]=Ð¡Ð°ÑƒÐ´Ð¸Ñ ÐрабиÑтони
+ Name[vi]=Ẩráºp Saudi
+ Name[wa]=Arabeye Sawoudite
+-Name[xx]=xxSaudi Arabiaxx
+ Name[zh_TW]=æ²™çƒåœ°é˜¿æ‹‰ä¼¯
+ Region=middleeast
+ Languages=ar
+diff -Nru kdebase-release-3.4.0/l10n/sb/entry.desktop kdebase-branch-3.4/l10n/sb/entry.desktop
+--- kdebase-release-3.4.0/l10n/sb/entry.desktop 2005-02-04 23:16:14.000000000 -0500
++++ kdebase-branch-3.4/l10n/sb/entry.desktop 2005-03-07 09:17:09.000000000 -0500
+@@ -59,7 +59,6 @@
+ Name[uz]=Соломон Ороллари
+ Name[vi]=Quần đảo Solomon
+ Name[wa]=Iyes Salomon
+-Name[xx]=xxSolomon Islandsxx
+ Name[zh_CN]=所罗门群岛
+ Name[zh_TW]=索羅門群島
+ Region=oceania
+diff -Nru kdebase-release-3.4.0/l10n/sc/entry.desktop kdebase-branch-3.4/l10n/sc/entry.desktop
+--- kdebase-release-3.4.0/l10n/sc/entry.desktop 2005-02-04 23:16:15.000000000 -0500
++++ kdebase-branch-3.4/l10n/sc/entry.desktop 2005-03-07 09:17:09.000000000 -0500
+@@ -45,7 +45,6 @@
+ Name[uk]=СейшельÑькі оÑтрови
+ Name[uz]=Сейшел Ороллари
+ Name[wa]=Seycheles
+-Name[xx]=xxSeychellesxx
+ Name[zh_TW]=塞å¸çˆ¾
+ Region=southafrica
+ Languages=en_GB,fr
+diff -Nru kdebase-release-3.4.0/l10n/sd/entry.desktop kdebase-branch-3.4/l10n/sd/entry.desktop
+--- kdebase-release-3.4.0/l10n/sd/entry.desktop 2005-01-22 23:39:16.000000000 -0500
++++ kdebase-branch-3.4/l10n/sd/entry.desktop 2005-03-07 09:17:09.000000000 -0500
+@@ -41,7 +41,6 @@
+ Name[uz]=Судан
+ Name[ven]=Sudani
+ Name[wa]=Soudan
+-Name[xx]=xxSudanxx
+ Name[zh_CN]=è‹ä¸¹
+ Name[zh_TW]=蘇丹
+ Region=northafrica
+diff -Nru kdebase-release-3.4.0/l10n/se/entry.desktop kdebase-branch-3.4/l10n/se/entry.desktop
+--- kdebase-release-3.4.0/l10n/se/entry.desktop 2005-02-04 23:16:15.000000000 -0500
++++ kdebase-branch-3.4/l10n/se/entry.desktop 2005-03-07 09:17:10.000000000 -0500
+@@ -64,7 +64,6 @@
+ Name[ven]=Swidene
+ Name[vi]=Thuỵ Äiển
+ Name[wa]=Suwede
+-Name[xx]=xxSwedenxx
+ Name[zh_TW]=瑞典
+ Region=northeurope
+ Languages=sv,se
+diff -Nru kdebase-release-3.4.0/l10n/sg/entry.desktop kdebase-branch-3.4/l10n/sg/entry.desktop
+--- kdebase-release-3.4.0/l10n/sg/entry.desktop 2005-01-31 03:36:19.000000000 -0500
++++ kdebase-branch-3.4/l10n/sg/entry.desktop 2005-03-07 09:17:10.000000000 -0500
+@@ -47,7 +47,6 @@
+ Name[uk]=Сінгапур
+ Name[uz]=Сингапур
+ Name[wa]=Singapour
+-Name[xx]=xxSingaporexx
+ Name[zh_CN]=æ–°åŠ å¡
+ Name[zh_TW]=æ–°åŠ å¡
+ Region=southeastasia
+diff -Nru kdebase-release-3.4.0/l10n/sh/entry.desktop kdebase-branch-3.4/l10n/sh/entry.desktop
+--- kdebase-release-3.4.0/l10n/sh/entry.desktop 2005-02-04 23:16:15.000000000 -0500
++++ kdebase-branch-3.4/l10n/sh/entry.desktop 2005-03-07 09:17:10.000000000 -0500
+@@ -50,7 +50,6 @@
+ Name[uk]=ОÑтрів СвÑтої Єлени
+ Name[uz]=Ðвлиё Елена Ороли
+ Name[wa]=Sint Elene
+-Name[xx]=xxSaint Helenaxx
+ Name[zh_TW]=è–赫勒拿島
+ Region=southamerica
+ Languages=en_GB
+diff -Nru kdebase-release-3.4.0/l10n/si/entry.desktop kdebase-branch-3.4/l10n/si/entry.desktop
+--- kdebase-release-3.4.0/l10n/si/entry.desktop 2005-01-22 23:39:17.000000000 -0500
++++ kdebase-branch-3.4/l10n/si/entry.desktop 2005-03-07 09:17:11.000000000 -0500
+@@ -57,7 +57,6 @@
+ Name[uk]=СловеніÑ
+ Name[uz]=СловениÑ
+ Name[wa]=Esloveneye
+-Name[xx]=xxSloveniaxx
+ Name[zh_CN]=斯洛文尼亚
+ Name[zh_TW]=斯洛ç¶å°¼äºž
+ Region=centraleurope
+diff -Nru kdebase-release-3.4.0/l10n/sk/entry.desktop kdebase-branch-3.4/l10n/sk/entry.desktop
+--- kdebase-release-3.4.0/l10n/sk/entry.desktop 2005-02-04 23:16:15.000000000 -0500
++++ kdebase-branch-3.4/l10n/sk/entry.desktop 2005-03-07 09:17:11.000000000 -0500
+@@ -59,7 +59,6 @@
+ Name[uk]=СловакіÑ
+ Name[uz]=СловакиÑ
+ Name[wa]=Eslovakeye
+-Name[xx]=xxSlovakiaxx
+ Name[zh_TW]=斯洛ä¼å…‹
+ Region=centraleurope
+ Languages=sk
+diff -Nru kdebase-release-3.4.0/l10n/sm/entry.desktop kdebase-branch-3.4/l10n/sm/entry.desktop
+--- kdebase-release-3.4.0/l10n/sm/entry.desktop 2005-01-31 03:36:20.000000000 -0500
++++ kdebase-branch-3.4/l10n/sm/entry.desktop 2005-03-07 09:17:11.000000000 -0500
+@@ -27,7 +27,6 @@
+ Name[uk]=Сан-Маріно
+ Name[uz]=Сан-Марино
+ Name[wa]=Sint Marin
+-Name[xx]=xxSan Marinoxx
+ Name[zh_TW]=è–馬力諾
+ Region=southeurope
+ Languages=it
+diff -Nru kdebase-release-3.4.0/l10n/sn/entry.desktop kdebase-branch-3.4/l10n/sn/entry.desktop
+--- kdebase-release-3.4.0/l10n/sn/entry.desktop 2005-01-31 03:36:20.000000000 -0500
++++ kdebase-branch-3.4/l10n/sn/entry.desktop 2005-03-07 09:17:12.000000000 -0500
+@@ -30,7 +30,6 @@
+ Name[uk]=Сенегал
+ Name[uz]=Сенегал
+ Name[wa]=Senegål
+-Name[xx]=xxSenegalxx
+ Name[zh_TW]=å¡žå…§åŠ çˆ¾
+ Region=westafrica
+ Languages=fr
+diff -Nru kdebase-release-3.4.0/l10n/so/entry.desktop kdebase-branch-3.4/l10n/so/entry.desktop
+--- kdebase-release-3.4.0/l10n/so/entry.desktop 2005-02-04 23:16:16.000000000 -0500
++++ kdebase-branch-3.4/l10n/so/entry.desktop 2005-03-07 09:17:12.000000000 -0500
+@@ -48,7 +48,6 @@
+ Name[uk]=Сомалі
+ Name[uz]=Сомали
+ Name[wa]=Somaleye
+-Name[xx]=xxSomaliaxx
+ Name[zh_TW]=索馬利亞
+ Region=northafrica
+ Languages=ar
+diff -Nru kdebase-release-3.4.0/l10n/southafrica.desktop kdebase-branch-3.4/l10n/southafrica.desktop
+--- kdebase-release-3.4.0/l10n/southafrica.desktop 2005-02-18 23:27:17.000000000 -0500
++++ kdebase-branch-3.4/l10n/southafrica.desktop 2005-03-30 01:47:58.000000000 -0500
+@@ -11,6 +11,7 @@
+ Name[cy]=Affrica, De
+ Name[da]=Sydafrika
+ Name[de]=Afrika, Südliches
++Name[el]=ΑφÏική, Îότια
+ Name[eo]=Afriko suda
+ Name[es]=Africa, del Sur
+ Name[et]=Lõuna-Aafrika
+@@ -42,12 +43,11 @@
+ Name[sk]=Južná Afrika
+ Name[sl]=Afrika, Južna
+ Name[sr]=Ðфрика, јужна
+-Name[sr@Latn]=Ðфрика, јужна
++Name[sr@Latn]=Afrika, južna
+ Name[sv]=Afrika, syd
+ Name[ta]=ஆபà¯à®ªà®¿à®°à®¿à®•à¯à®•ா, தெனà¯à®©à®¿à®¨à¯à®¤à®¿à®¯
+ Name[tr]=Güney Afrika
+ Name[uk]=Ðфрика, південна
+ Name[uz]=Ðфрика, Жанубий
+ Name[wa]=Afrike nonnrece
+-Name[xx]=xxAfrica, Southernxx
+ Name[zh_CN]=å—éž
+diff -Nru kdebase-release-3.4.0/l10n/southamerica.desktop kdebase-branch-3.4/l10n/southamerica.desktop
+--- kdebase-release-3.4.0/l10n/southamerica.desktop 2005-02-04 23:15:49.000000000 -0500
++++ kdebase-branch-3.4/l10n/southamerica.desktop 2005-03-07 09:16:19.000000000 -0500
+@@ -66,7 +66,6 @@
+ Name[vi]=Nam MÄ©
+ Name[wa]=Amerike nonnrece
+ Name[xh]=Emelika, Ezantsi
+-Name[xx]=xxAmerica, Southxx
+ Name[zh_CN]=å—美
+ Name[zh_TW]=美洲,å—部
+ Name[zu]=Melika, Emzansi
+diff -Nru kdebase-release-3.4.0/l10n/southasia.desktop kdebase-branch-3.4/l10n/southasia.desktop
+--- kdebase-release-3.4.0/l10n/southasia.desktop 2005-02-18 23:27:17.000000000 -0500
++++ kdebase-branch-3.4/l10n/southasia.desktop 2005-03-30 01:47:58.000000000 -0500
+@@ -11,6 +11,7 @@
+ Name[cy]=Asia, De
+ Name[da]=Sydasien
+ Name[de]=Asien, Südliches
++Name[el]=Ασία, Îότια
+ Name[eo]=Azio suda
+ Name[es]=Asia, Sur
+ Name[et]=Lõuna-Aasia
+@@ -42,12 +43,11 @@
+ Name[sk]=Južná Ãzia
+ Name[sl]=Azija, Južna
+ Name[sr]=Ðзија, јужна
+-Name[sr@Latn]=Ðзија, јужна
++Name[sr@Latn]=Azija, južna
+ Name[sv]=Asien, syd
+ Name[ta]=ஆசியா, தெறà¯à®•à¯
+ Name[tr]=Güney Asya
+ Name[uk]=ÐзіÑ, південна
+ Name[uz]=ОÑиё, Жанубий
+ Name[wa]=Azeye nonnrece
+-Name[xx]=xxAsia, Southxx
+ Name[zh_CN]=å—亚
+diff -Nru kdebase-release-3.4.0/l10n/southeastasia.desktop kdebase-branch-3.4/l10n/southeastasia.desktop
+--- kdebase-release-3.4.0/l10n/southeastasia.desktop 2005-02-18 23:27:17.000000000 -0500
++++ kdebase-branch-3.4/l10n/southeastasia.desktop 2005-03-30 01:47:58.000000000 -0500
+@@ -11,6 +11,7 @@
+ Name[cy]=Asia, De-Ddwyrain
+ Name[da]=Sydøstasien
+ Name[de]=Asien, Süd-östliches
++Name[el]=ΑμεÏική, Îοτιοανατολική
+ Name[eo]=Azio sudorienta
+ Name[es]=Asia, Sureste
+ Name[et]=Kagu-Aasia
+@@ -42,12 +43,11 @@
+ Name[sk]=Juhovýchodná Ãzia
+ Name[sl]=Azija, Jugovzhodna
+ Name[sr]=Ðзија, југоиÑточна
+-Name[sr@Latn]=Ðзија, југоиÑточна
++Name[sr@Latn]=Azija, jugoistoÄna
+ Name[sv]=Asien, sydöst
+ Name[ta]=ஆசியா, தெனà¯-கிழகà¯à®•à¯
+ Name[tr]=Güney Doğu Asya
+ Name[uk]=ÐзіÑ, південно-Ñхідна
+ Name[uz]=ОÑиё, Жануби-Шарқий
+ Name[wa]=Azeye do sudouwess
+-Name[xx]=xxAsia, South-Eastxx
+ Name[zh_CN]=东å—亚
+diff -Nru kdebase-release-3.4.0/l10n/southeurope.desktop kdebase-branch-3.4/l10n/southeurope.desktop
+--- kdebase-release-3.4.0/l10n/southeurope.desktop 2005-02-04 23:15:49.000000000 -0500
++++ kdebase-branch-3.4/l10n/southeurope.desktop 2005-03-07 09:16:19.000000000 -0500
+@@ -69,7 +69,6 @@
+ Name[vi]=Nam Âu
+ Name[wa]=Urope nonnrece
+ Name[xh]=Yurophu, Emazantsi
+-Name[xx]=xxEurope, Southernxx
+ Name[zh_CN]=å—æ¬§
+ Name[zh_TW]=ææ´²ï¼Œå—部
+ Name[zu]=Europe, Emzansi
+diff -Nru kdebase-release-3.4.0/l10n/sr/entry.desktop kdebase-branch-3.4/l10n/sr/entry.desktop
+--- kdebase-release-3.4.0/l10n/sr/entry.desktop 2005-02-04 23:16:16.000000000 -0500
++++ kdebase-branch-3.4/l10n/sr/entry.desktop 2005-03-07 09:17:12.000000000 -0500
+@@ -47,7 +47,6 @@
+ Name[tr]=Surinam
+ Name[uk]=Сурінам
+ Name[uz]=Суринам
+-Name[xx]=xxSurinamexx
+ Name[zh_TW]=蘇利å—
+ Region=southamerica
+ Languages=nl,en_GB
+diff -Nru kdebase-release-3.4.0/l10n/st/entry.desktop kdebase-branch-3.4/l10n/st/entry.desktop
+--- kdebase-release-3.4.0/l10n/st/entry.desktop 2005-02-04 23:16:16.000000000 -0500
++++ kdebase-branch-3.4/l10n/st/entry.desktop 2005-03-07 09:17:12.000000000 -0500
+@@ -56,7 +56,6 @@
+ Name[uk]=Сан-Томе Ñ– ПрінÑіпі
+ Name[uz]=Сан-Томе ва ПринÑипи
+ Name[wa]=São Tomé et Prince
+-Name[xx]=xxSao Tome and Principexx
+ Region=centralafrica
+ Languages=pt
+ #DecimalSymbol=,
+diff -Nru kdebase-release-3.4.0/l10n/sv/entry.desktop kdebase-branch-3.4/l10n/sv/entry.desktop
+--- kdebase-release-3.4.0/l10n/sv/entry.desktop 2004-12-11 01:38:01.000000000 -0500
++++ kdebase-branch-3.4/l10n/sv/entry.desktop 2005-03-07 09:17:13.000000000 -0500
+@@ -37,7 +37,6 @@
+ Name[th]=เà¸à¸¥à¸‹à¸±à¸¥à¸§à¸²à¸”à¸à¸£à¹Œ
+ Name[uk]=Ель-Сальвадор
+ Name[uz]=Салвадор
+-Name[xx]=xxEl Salvadorxx
+ Name[zh_TW]=薩爾瓦多
+ Region=centralamerica
+ Languages=es
+diff -Nru kdebase-release-3.4.0/l10n/sy/entry.desktop kdebase-branch-3.4/l10n/sy/entry.desktop
+--- kdebase-release-3.4.0/l10n/sy/entry.desktop 2005-01-10 23:18:21.000000000 -0500
++++ kdebase-branch-3.4/l10n/sy/entry.desktop 2005-03-07 09:17:13.000000000 -0500
+@@ -56,7 +56,6 @@
+ Name[uk]=СиріÑ
+ Name[uz]=СуриÑ
+ Name[wa]=Sireye
+-Name[xx]=xxSyriaxx
+ Name[zh_TW]=敘利亞
+ Region=middleeast
+ Languages=ar
+diff -Nru kdebase-release-3.4.0/l10n/sz/entry.desktop kdebase-branch-3.4/l10n/sz/entry.desktop
+--- kdebase-release-3.4.0/l10n/sz/entry.desktop 2004-12-11 01:38:02.000000000 -0500
++++ kdebase-branch-3.4/l10n/sz/entry.desktop 2005-03-07 09:17:13.000000000 -0500
+@@ -45,7 +45,6 @@
+ Name[uk]=Свазіленд
+ Name[uz]=Свазиленд
+ Name[wa]=Suwazilande
+-Name[xx]=xxSwazilandxx
+ Name[zh_TW]=å²ç“¦æ¿Ÿè˜
+ Region=southafrica
+ Languages=en_GB,ss
+diff -Nru kdebase-release-3.4.0/l10n/tc/entry.desktop kdebase-branch-3.4/l10n/tc/entry.desktop
+--- kdebase-release-3.4.0/l10n/tc/entry.desktop 2005-02-04 23:16:16.000000000 -0500
++++ kdebase-branch-3.4/l10n/tc/entry.desktop 2005-03-07 09:17:13.000000000 -0500
+@@ -55,7 +55,6 @@
+ Name[uz]=Ð¢ÑƒÑ€ÐºÑ Ð²Ð° ÐšÐ°Ð¸ÐºÐ¾Ñ ÐžÑ€Ð¾Ð»Ð»Ð°Ñ€Ð¸
+ Name[vi]=Quần đảo Turks và Caicos
+ Name[wa]=Iyes Turks et Caicos
+-Name[xx]=xxTurks and Caicos Islandsxx
+ Name[zh_TW]=åœŸå…‹æ–¯å’Œé–‹å¡æ–¯ç¾¤å³¶
+ Region=caribbean
+ Languages=ar,en_GB,hi
+diff -Nru kdebase-release-3.4.0/l10n/td/entry.desktop kdebase-branch-3.4/l10n/td/entry.desktop
+--- kdebase-release-3.4.0/l10n/td/entry.desktop 2005-02-04 23:16:17.000000000 -0500
++++ kdebase-branch-3.4/l10n/td/entry.desktop 2005-03-07 09:17:14.000000000 -0500
+@@ -54,7 +54,6 @@
+ Name[uk]=Чад
+ Name[uz]=Чад
+ Name[wa]=Tchad
+-Name[xx]=xxChadxx
+ Name[zh_CN]=ä¹å¾—
+ Name[zh_TW]=查德
+ Region=centralafrica
+diff -Nru kdebase-release-3.4.0/l10n/tg/entry.desktop kdebase-branch-3.4/l10n/tg/entry.desktop
+--- kdebase-release-3.4.0/l10n/tg/entry.desktop 2005-01-22 23:39:17.000000000 -0500
++++ kdebase-branch-3.4/l10n/tg/entry.desktop 2005-03-07 09:17:14.000000000 -0500
+@@ -23,7 +23,6 @@
+ Name[th]=โตโà¸
+ Name[uk]=Того
+ Name[uz]=Того
+-Name[xx]=xxTogoxx
+ Name[zh_CN]=多哥
+ Name[zh_TW]=多哥
+ Region=westafrica
+diff -Nru kdebase-release-3.4.0/l10n/th/entry.desktop kdebase-branch-3.4/l10n/th/entry.desktop
+--- kdebase-release-3.4.0/l10n/th/entry.desktop 2005-01-22 23:39:17.000000000 -0500
++++ kdebase-branch-3.4/l10n/th/entry.desktop 2005-03-07 09:17:14.000000000 -0500
+@@ -55,7 +55,6 @@
+ Name[uz]=Таиланд
+ Name[vi]=Thái Lan
+ Name[wa]=Taylande
+-Name[xx]=xxThailandxx
+ Name[zh_CN]=泰国
+ Name[zh_TW]=泰國
+ Region=southeastasia
+diff -Nru kdebase-release-3.4.0/l10n/tj/entry.desktop kdebase-branch-3.4/l10n/tj/entry.desktop
+--- kdebase-release-3.4.0/l10n/tj/entry.desktop 2005-02-04 23:16:17.000000000 -0500
++++ kdebase-branch-3.4/l10n/tj/entry.desktop 2005-03-07 09:17:15.000000000 -0500
+@@ -51,7 +51,6 @@
+ Name[uk]=ТаджикиÑтан
+ Name[uz]=ТожикиÑтон
+ Name[wa]=Tadjikistan
+-Name[xx]=xxTajikistanxx
+ Name[zh_CN]=å¡”å‰å…‹æ–¯å¦
+ Name[zh_TW]=å¡”å‰å…‹
+ Region=centralasia
+diff -Nru kdebase-release-3.4.0/l10n/tk/entry.desktop kdebase-branch-3.4/l10n/tk/entry.desktop
+--- kdebase-release-3.4.0/l10n/tk/entry.desktop 2004-12-11 01:38:04.000000000 -0500
++++ kdebase-branch-3.4/l10n/tk/entry.desktop 2005-03-07 09:17:15.000000000 -0500
+@@ -25,7 +25,6 @@
+ Name[tg]=Токилау
+ Name[uk]=Токелау
+ Name[uz]=Токелау
+-Name[xx]=xxTokelauxx
+ Name[zh_TW]=托克勞
+ Region=caribbean
+ Languages=en_GB
+diff -Nru kdebase-release-3.4.0/l10n/tm/entry.desktop kdebase-branch-3.4/l10n/tm/entry.desktop
+--- kdebase-release-3.4.0/l10n/tm/entry.desktop 2005-01-22 23:39:18.000000000 -0500
++++ kdebase-branch-3.4/l10n/tm/entry.desktop 2005-03-07 09:17:15.000000000 -0500
+@@ -36,7 +36,6 @@
+ Name[uk]=ТуркменіÑтан
+ Name[uz]=ТуркманиÑтон
+ Name[wa]=Turcmenistan
+-Name[xx]=xxTurkmenistanxx
+ Name[zh_CN]=土库曼斯å¦
+ Name[zh_TW]=土庫曼
+ Region=centralasia
+diff -Nru kdebase-release-3.4.0/l10n/tn/entry.desktop kdebase-branch-3.4/l10n/tn/entry.desktop
+--- kdebase-release-3.4.0/l10n/tn/entry.desktop 2005-01-10 23:18:23.000000000 -0500
++++ kdebase-branch-3.4/l10n/tn/entry.desktop 2005-03-07 09:17:15.000000000 -0500
+@@ -55,7 +55,6 @@
+ Name[uk]=ТуніÑ
+ Name[uz]=ТуниÑ
+ Name[wa]=Tunizeye
+-Name[xx]=xxTunisiaxx
+ Name[zh_TW]=çªå°¼è¥¿äºž
+ Region=northafrica
+ Languages=ar
+diff -Nru kdebase-release-3.4.0/l10n/to/entry.desktop kdebase-branch-3.4/l10n/to/entry.desktop
+--- kdebase-release-3.4.0/l10n/to/entry.desktop 2005-01-22 23:39:18.000000000 -0500
++++ kdebase-branch-3.4/l10n/to/entry.desktop 2005-03-07 09:17:16.000000000 -0500
+@@ -24,7 +24,6 @@
+ Name[th]=ตà¸à¸‡à¸à¹‰à¸²
+ Name[uk]=Тонга
+ Name[uz]=Тонга
+-Name[xx]=xxTongaxx
+ Name[zh_CN]=汤åŠ
+ Name[zh_TW]=æ±åŠ
+ Region=oceania
+diff -Nru kdebase-release-3.4.0/l10n/tp/entry.desktop kdebase-branch-3.4/l10n/tp/entry.desktop
+--- kdebase-release-3.4.0/l10n/tp/entry.desktop 2005-02-04 23:16:17.000000000 -0500
++++ kdebase-branch-3.4/l10n/tp/entry.desktop 2005-03-07 09:17:16.000000000 -0500
+@@ -61,7 +61,6 @@
+ Name[uz]=Шарқий Тимур
+ Name[vi]=Äông Timo
+ Name[wa]=Timor Ess
+-Name[xx]=xxEast Timorxx
+ Name[zh_TW]=æ±å¸æ±¶
+ Region=southeastasia
+ Languages=pt,en_GB
+diff -Nru kdebase-release-3.4.0/l10n/tr/entry.desktop kdebase-branch-3.4/l10n/tr/entry.desktop
+--- kdebase-release-3.4.0/l10n/tr/entry.desktop 2005-02-04 23:16:18.000000000 -0500
++++ kdebase-branch-3.4/l10n/tr/entry.desktop 2005-03-22 05:26:09.000000000 -0500
+@@ -67,14 +67,13 @@
+ Name[uz]=ТуркиÑ
+ Name[vi]=Thổ Nhĩ Kì
+ Name[wa]=Turkeye
+-Name[xx]=xxTurkeyxx
+ Name[zh_CN]=土耳其
+ Name[zh_TW]=土耳其
+ Region=middleeast
+ Languages=tr
+ DecimalSymbol=,
+ ThousandsSeparator=
+-CurrencySymbol=L
++CurrencySymbol=YTL
+ MonetaryDecimalSymbol=,
+ MonetaryThousandsSeparator=.
+ PositiveSign=
+diff -Nru kdebase-release-3.4.0/l10n/tt/entry.desktop kdebase-branch-3.4/l10n/tt/entry.desktop
+--- kdebase-release-3.4.0/l10n/tt/entry.desktop 2005-02-04 23:16:18.000000000 -0500
++++ kdebase-branch-3.4/l10n/tt/entry.desktop 2005-03-07 09:17:16.000000000 -0500
+@@ -70,7 +70,6 @@
+ Name[vi]=Trinidad và Tobago
+ Name[wa]=Trinité et Tobago
+ Name[xh]=Trinidad ne Tobago
+-Name[xx]=xxTrinidad and Tobagoxx
+ Name[zh_TW]=åƒé‡Œé”åŠæ‰˜è²å“¥
+ Name[zu]=Trinidad knaye ne-Tobago
+ Region=caribbean
+diff -Nru kdebase-release-3.4.0/l10n/tv/entry.desktop kdebase-branch-3.4/l10n/tv/entry.desktop
+--- kdebase-release-3.4.0/l10n/tv/entry.desktop 2004-11-01 23:21:18.000000000 -0500
++++ kdebase-branch-3.4/l10n/tv/entry.desktop 2005-03-07 09:17:17.000000000 -0500
+@@ -24,7 +24,6 @@
+ Name[uk]=Тувалу
+ Name[uz]=Тувалу
+ Name[wa]=Touvalou
+-Name[xx]=xxTuvaluxx
+ Name[zh_TW]=å瓦é¯
+ Region=oceania
+ Languages=en_GB
+diff -Nru kdebase-release-3.4.0/l10n/tw/entry.desktop kdebase-branch-3.4/l10n/tw/entry.desktop
+--- kdebase-release-3.4.0/l10n/tw/entry.desktop 2005-01-22 23:39:19.000000000 -0500
++++ kdebase-branch-3.4/l10n/tw/entry.desktop 2005-03-07 09:17:17.000000000 -0500
+@@ -43,7 +43,6 @@
+ Name[uk]=Тайвань
+ Name[uz]=Тайван
+ Name[vi]=ÄÃ i Loan
+-Name[xx]=xxTaiwanxx
+ Name[zh_CN]=ä¸å›½å°æ¹¾
+ Name[zh_TW]=å°ç£
+ Region=eastasia
+diff -Nru kdebase-release-3.4.0/l10n/tz/entry.desktop kdebase-branch-3.4/l10n/tz/entry.desktop
+--- kdebase-release-3.4.0/l10n/tz/entry.desktop 2005-02-04 23:16:18.000000000 -0500
++++ kdebase-branch-3.4/l10n/tz/entry.desktop 2005-03-07 09:17:17.000000000 -0500
+@@ -60,7 +60,6 @@
+ Name[uz]=Ð¢Ð°Ð½Ð·Ð°Ð½Ð¸Ñ Ð‘Ð¸Ñ€Ð»Ð°ÑˆÐ³Ð°Ð½ РеÑпубликаÑи
+ Name[vi]=Tanzania, Cộng hoà thống nhât
+ Name[wa]=Tanzaneye
+-Name[xx]=xxTanzania, United Republic ofxx
+ Name[zh_TW]=å¦å°šå°¼äºž
+ Region=southafrica
+ Languages=en_GB,sw
+diff -Nru kdebase-release-3.4.0/l10n/ua/entry.desktop kdebase-branch-3.4/l10n/ua/entry.desktop
+--- kdebase-release-3.4.0/l10n/ua/entry.desktop 2005-02-04 23:16:18.000000000 -0500
++++ kdebase-branch-3.4/l10n/ua/entry.desktop 2005-03-07 09:17:18.000000000 -0500
+@@ -63,7 +63,6 @@
+ Name[uz]=Украина
+ Name[vi]=Ukraina
+ Name[wa]=Oucrinne
+-Name[xx]=xxUkrainexx
+ Name[zh_CN]=乌克兰
+ Name[zh_TW]=çƒå…‹è˜
+ Region=easteurope
+diff -Nru kdebase-release-3.4.0/l10n/ug/entry.desktop kdebase-branch-3.4/l10n/ug/entry.desktop
+--- kdebase-release-3.4.0/l10n/ug/entry.desktop 2005-01-22 23:39:19.000000000 -0500
++++ kdebase-branch-3.4/l10n/ug/entry.desktop 2005-03-07 09:17:18.000000000 -0500
+@@ -28,7 +28,6 @@
+ Name[uk]=Уганда
+ Name[uz]=Уганда
+ Name[wa]=Ouganda
+-Name[xx]=xxUgandaxx
+ Name[zh_CN]=乌干达
+ Name[zh_TW]=çƒå¹²é”
+ Region=centralafrica
+diff -Nru kdebase-release-3.4.0/l10n/us/entry.desktop kdebase-branch-3.4/l10n/us/entry.desktop
+--- kdebase-release-3.4.0/l10n/us/entry.desktop 2005-02-04 23:16:19.000000000 -0500
++++ kdebase-branch-3.4/l10n/us/entry.desktop 2005-03-07 09:17:19.000000000 -0500
+@@ -69,7 +69,6 @@
+ Name[vi]=Hợp chủng quốc Hoa Kỳ
+ Name[wa]=Estats Unis
+ Name[xh]=United States ye Melika
+-Name[xx]=xxUnited States of Americaxx
+ Name[zh_CN]=美国
+ Name[zh_TW]=ç¾Žåˆ©å …åˆçœ¾åœ‹
+ Region=northamerica
+diff -Nru kdebase-release-3.4.0/l10n/uy/entry.desktop kdebase-branch-3.4/l10n/uy/entry.desktop
+--- kdebase-release-3.4.0/l10n/uy/entry.desktop 2004-12-11 01:38:07.000000000 -0500
++++ kdebase-branch-3.4/l10n/uy/entry.desktop 2005-03-07 09:17:19.000000000 -0500
+@@ -43,7 +43,6 @@
+ Name[uk]=Уругвай
+ Name[uz]=Уругвай
+ Name[wa]=Ourougway
+-Name[xx]=xxUruguayxx
+ Name[zh_TW]=çƒæ‹‰åœ
+ Region=southamerica
+ Languages=es
+diff -Nru kdebase-release-3.4.0/l10n/uz/entry.desktop kdebase-branch-3.4/l10n/uz/entry.desktop
+--- kdebase-release-3.4.0/l10n/uz/entry.desktop 2005-02-04 23:16:19.000000000 -0500
++++ kdebase-branch-3.4/l10n/uz/entry.desktop 2005-03-07 09:17:20.000000000 -0500
+@@ -41,7 +41,6 @@
+ Name[uk]=УзбекіÑтан
+ Name[uz]=ЎзбекиÑтон
+ Name[wa]=Ouzbekistan
+-Name[xx]=xxUzbekistanxx
+ Name[zh_CN]=乌兹别克斯å¦
+ Name[zh_TW]=çƒèŒ²åˆ¥å…‹
+ Region=centralasia
+diff -Nru kdebase-release-3.4.0/l10n/va/entry.desktop kdebase-branch-3.4/l10n/va/entry.desktop
+--- kdebase-release-3.4.0/l10n/va/entry.desktop 2005-02-04 23:16:19.000000000 -0500
++++ kdebase-branch-3.4/l10n/va/entry.desktop 2005-03-07 09:17:20.000000000 -0500
+@@ -59,7 +59,6 @@
+ Name[uz]=Ватикан Шаҳри
+ Name[vi]=Thà nh phố Vatican
+ Name[wa]=Vatican
+-Name[xx]=xxVatican Cityxx
+ Name[zh_CN]=梵蒂冈
+ Name[zh_TW]=梵諦岡城
+ Region=southeurope
+diff -Nru kdebase-release-3.4.0/l10n/vc/entry.desktop kdebase-branch-3.4/l10n/vc/entry.desktop
+--- kdebase-release-3.4.0/l10n/vc/entry.desktop 2005-02-04 23:16:19.000000000 -0500
++++ kdebase-branch-3.4/l10n/vc/entry.desktop 2005-03-07 09:17:20.000000000 -0500
+@@ -69,7 +69,6 @@
+ Name[vi]=St. Vincent và Grenadines
+ Name[wa]=St. Vincint et les Grenadines
+ Name[xh]=St. Vincent ne Grenadines
+-Name[xx]=xxSt. Vincent and the Grenadinesxx
+ Name[zh_TW]=è–æ–‡æ£®åŠæ ¼ç´é‚£ä¸
+ Name[zu]=I-St. Vincent kanye ne-Grenadines
+ Region=caribbean
+diff -Nru kdebase-release-3.4.0/l10n/ve/entry.desktop kdebase-branch-3.4/l10n/ve/entry.desktop
+--- kdebase-release-3.4.0/l10n/ve/entry.desktop 2004-12-11 01:38:07.000000000 -0500
++++ kdebase-branch-3.4/l10n/ve/entry.desktop 2005-03-07 09:17:21.000000000 -0500
+@@ -38,7 +38,6 @@
+ Name[uk]=ВенеÑуела
+ Name[uz]=ВенеÑуÑла
+ Name[wa]=Venezwela
+-Name[xx]=xxVenezuelaxx
+ Name[zh_TW]=委內瑞拉
+ Region=southamerica
+ Languages=es
+diff -Nru kdebase-release-3.4.0/l10n/vg/entry.desktop kdebase-branch-3.4/l10n/vg/entry.desktop
+--- kdebase-release-3.4.0/l10n/vg/entry.desktop 2005-01-10 23:18:25.000000000 -0500
++++ kdebase-branch-3.4/l10n/vg/entry.desktop 2005-03-07 09:17:21.000000000 -0500
+@@ -54,7 +54,6 @@
+ Name[uz]=ÐÐ½Ð³Ð»Ð¸Ñ Ð’Ð¸Ñ€Ð¶Ð¸Ð½ Ороллари
+ Name[vi]=Quần đảo Trinh nữ, Vưong quốc Anh
+ Name[wa]=Iyes Viedjes, britanikes
+-Name[xx]=xxVirgin Islands, Britishxx
+ Region=caribbean
+ #Languages=
+ #DecimalSymbol=,
+diff -Nru kdebase-release-3.4.0/l10n/vi/entry.desktop kdebase-branch-3.4/l10n/vi/entry.desktop
+--- kdebase-release-3.4.0/l10n/vi/entry.desktop 2005-01-31 03:36:21.000000000 -0500
++++ kdebase-branch-3.4/l10n/vi/entry.desktop 2005-03-07 09:17:21.000000000 -0500
+@@ -55,7 +55,6 @@
+ Name[uz]=ÐҚШ Виржин Ороллари
+ Name[vi]=Quần đảo Trinh nữ, Hoa Kỳ
+ Name[wa]=Iyes Viedjes, etazunyinnes
+-Name[xx]=xxVirgin Islands, U.S.xx
+ Region=caribbean
+ Languages=en_GB
+ DecimalSymbol=.
+diff -Nru kdebase-release-3.4.0/l10n/vn/entry.desktop kdebase-branch-3.4/l10n/vn/entry.desktop
+--- kdebase-release-3.4.0/l10n/vn/entry.desktop 2005-01-22 23:39:20.000000000 -0500
++++ kdebase-branch-3.4/l10n/vn/entry.desktop 2005-03-07 09:17:21.000000000 -0500
+@@ -41,7 +41,6 @@
+ Name[uk]=В'єтнам
+ Name[uz]=Ветнам
+ Name[vi]=Việt Nam
+-Name[xx]=xxVietnamxx
+ Name[zh_CN]=è¶Šå—
+ Name[zh_TW]=è¶Šå—
+ Region=southeastasia
+diff -Nru kdebase-release-3.4.0/l10n/vu/entry.desktop kdebase-branch-3.4/l10n/vu/entry.desktop
+--- kdebase-release-3.4.0/l10n/vu/entry.desktop 2005-01-22 23:39:21.000000000 -0500
++++ kdebase-branch-3.4/l10n/vu/entry.desktop 2005-03-07 09:17:22.000000000 -0500
+@@ -24,7 +24,6 @@
+ Name[tg]=Вануату
+ Name[uk]=Вануату
+ Name[uz]=Вануату
+-Name[xx]=xxVanuatuxx
+ Name[zh_CN]=瓦努阿图
+ Name[zh_TW]=è¬é‚£æœ
+ Region=oceania
+diff -Nru kdebase-release-3.4.0/l10n/westafrica.desktop kdebase-branch-3.4/l10n/westafrica.desktop
+--- kdebase-release-3.4.0/l10n/westafrica.desktop 2005-02-18 23:27:17.000000000 -0500
++++ kdebase-branch-3.4/l10n/westafrica.desktop 2005-03-30 01:47:58.000000000 -0500
+@@ -11,6 +11,7 @@
+ Name[cy]=Affrica, Gorllewin
+ Name[da]=Vestafrika
+ Name[de]=Afrika, Westliches
++Name[el]=ΑφÏική, Δυτική
+ Name[eo]=Afriko okcidenta
+ Name[es]=Africa, Oeste
+ Name[et]=Lääne-Aafrika
+@@ -43,12 +44,11 @@
+ Name[sk]=Západná Afrika
+ Name[sl]=Afrika, Zahodna
+ Name[sr]=Ðфрика, западна
+-Name[sr@Latn]=Ðфрика, западна
++Name[sr@Latn]=Afrika, zapadna
+ Name[sv]=Afrika, västra
+ Name[ta]=ஆபà¯à®ªà®¿à®°à®¿à®•à¯à®•ா, மேறà¯à®•à¯
+ Name[tr]=Batı Afrika
+ Name[uk]=Ðфрика, західна
+ Name[uz]=Ðфрика, Ғарбий
+ Name[wa]=Afrike coûtchantrece
+-Name[xx]=xxAfrica, Westernxx
+ Name[zh_CN]=西éž
+diff -Nru kdebase-release-3.4.0/l10n/westeurope.desktop kdebase-branch-3.4/l10n/westeurope.desktop
+--- kdebase-release-3.4.0/l10n/westeurope.desktop 2005-02-04 23:15:49.000000000 -0500
++++ kdebase-branch-3.4/l10n/westeurope.desktop 2005-03-07 09:16:19.000000000 -0500
+@@ -70,7 +70,6 @@
+ Name[vi]=Tây Âu
+ Name[wa]=Urope coûtchantrece
+ Name[xh]=Yurophu, Entshona
+-Name[xx]=xxEurope, Westernxx
+ Name[zh_CN]=西欧
+ Name[zh_TW]=ææ´²ï¼Œè¥¿éƒ¨
+ Name[zu]=Europe, Entshona
+diff -Nru kdebase-release-3.4.0/l10n/wf/entry.desktop kdebase-branch-3.4/l10n/wf/entry.desktop
+--- kdebase-release-3.4.0/l10n/wf/entry.desktop 2005-02-04 23:16:20.000000000 -0500
++++ kdebase-branch-3.4/l10n/wf/entry.desktop 2005-03-07 09:17:22.000000000 -0500
+@@ -58,7 +58,6 @@
+ Name[uz]=Ð£Ð¾Ð»Ð»Ð¸Ñ Ð²Ð° Футуна Ороллари
+ Name[vi]=Wallis và Futuna
+ Name[wa]=Wallis et Futuna
+-Name[xx]=xxWallis and Futunaxx
+ Region=oceania
+ Languages=fr
+ #DecimalSymbol=,
+diff -Nru kdebase-release-3.4.0/l10n/ws/entry.desktop kdebase-branch-3.4/l10n/ws/entry.desktop
+--- kdebase-release-3.4.0/l10n/ws/entry.desktop 2004-12-11 01:38:09.000000000 -0500
++++ kdebase-branch-3.4/l10n/ws/entry.desktop 2005-03-07 09:17:22.000000000 -0500
+@@ -28,7 +28,6 @@
+ Name[uk]=Самоа
+ Name[uz]=Самоа
+ Name[wa]=Samowa
+-Name[xx]=xxSamoaxx
+ Name[zh_TW]=薩摩亞
+ Region=oceania
+ Languages=en_GB
+diff -Nru kdebase-release-3.4.0/l10n/ye/entry.desktop kdebase-branch-3.4/l10n/ye/entry.desktop
+--- kdebase-release-3.4.0/l10n/ye/entry.desktop 2005-02-04 23:16:20.000000000 -0500
++++ kdebase-branch-3.4/l10n/ye/entry.desktop 2005-03-07 09:17:23.000000000 -0500
+@@ -52,7 +52,6 @@
+ Name[th]=เยเมน
+ Name[uk]=Ємен
+ Name[uz]=Яман
+-Name[xx]=xxYemenxx
+ Name[zh_CN]=也门
+ Name[zh_TW]=葉門
+ Region=middleeast
+diff -Nru kdebase-release-3.4.0/l10n/yu/entry.desktop kdebase-branch-3.4/l10n/yu/entry.desktop
+--- kdebase-release-3.4.0/l10n/yu/entry.desktop 2005-02-04 23:16:20.000000000 -0500
++++ kdebase-branch-3.4/l10n/yu/entry.desktop 2005-03-07 09:17:23.000000000 -0500
+@@ -58,7 +58,6 @@
+ Name[uz]=ЮгоÑлавиÑ
+ Name[vi]=Nam Tư
+ Name[wa]=Yougoslaveye
+-Name[xx]=xxYugoslaviaxx
+ Name[zh_TW]=å—æ–¯æ‹‰å¤«
+ Region=southeurope
+ Languages=sr
+diff -Nru kdebase-release-3.4.0/l10n/za/entry.desktop kdebase-branch-3.4/l10n/za/entry.desktop
+--- kdebase-release-3.4.0/l10n/za/entry.desktop 2005-02-04 23:16:20.000000000 -0500
++++ kdebase-branch-3.4/l10n/za/entry.desktop 2005-03-07 09:17:23.000000000 -0500
+@@ -71,7 +71,6 @@
+ Name[vi]=Nam Phi
+ Name[wa]=Nonne Afrike
+ Name[xh]=Mzantsi Afrika
+-Name[xx]=xxSouth Africaxx
+ Name[zh_CN]=å—éž
+ Name[zh_TW]=å—éž
+ Name[zu]=Emzantsi Afrika
+diff -Nru kdebase-release-3.4.0/l10n/zm/entry.desktop kdebase-branch-3.4/l10n/zm/entry.desktop
+--- kdebase-release-3.4.0/l10n/zm/entry.desktop 2005-01-22 23:39:21.000000000 -0500
++++ kdebase-branch-3.4/l10n/zm/entry.desktop 2005-03-07 09:17:24.000000000 -0500
+@@ -41,7 +41,6 @@
+ Name[uk]=ЗамбіÑ
+ Name[uz]=ЗамбиÑ
+ Name[wa]=Zambeye
+-Name[xx]=xxZambiaxx
+ Name[zh_CN]=赞比亚
+ Name[zh_TW]=尚比亞
+ Region=southafrica
+diff -Nru kdebase-release-3.4.0/l10n/zw/entry.desktop kdebase-branch-3.4/l10n/zw/entry.desktop
+--- kdebase-release-3.4.0/l10n/zw/entry.desktop 2004-12-11 01:38:10.000000000 -0500
++++ kdebase-branch-3.4/l10n/zw/entry.desktop 2005-03-07 09:17:24.000000000 -0500
+@@ -34,7 +34,6 @@
+ Name[uk]=Зімбабве
+ Name[uz]=Зимбабве
+ Name[wa]=Zimbabwè
+-Name[xx]=xxZimbabwexx
+ Name[zh_TW]=辛巴å¨
+ Region=southafrica
+ Languages=en_GB
+diff -Nru kdebase-release-3.4.0/libkonq/directory_bookmarkbar.desktop kdebase-branch-3.4/libkonq/directory_bookmarkbar.desktop
+--- kdebase-release-3.4.0/libkonq/directory_bookmarkbar.desktop 2005-02-04 23:16:21.000000000 -0500
++++ kdebase-branch-3.4/libkonq/directory_bookmarkbar.desktop 2005-03-07 09:17:24.000000000 -0500
+@@ -71,7 +71,6 @@
+ Name[vi]=Thanh công cụ Bookmark
+ Name[wa]=Bår ås usteyes des rmåkes
+ Name[xh]=Ibar yesixhobo Senqaku lencwadi
+-Name[xx]=xxBookmark Toolbarxx
+ Name[zh_CN]=书ç¾å·¥å…·æ
+ Name[zh_TW]=書籤工具列
+ Name[zu]=Ibha yamathuluzi yomaka bencwadi
+diff -Nru kdebase-release-3.4.0/libkonq/favicons/favicons.desktop kdebase-branch-3.4/libkonq/favicons/favicons.desktop
+--- kdebase-release-3.4.0/libkonq/favicons/favicons.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/libkonq/favicons/favicons.desktop 2005-03-07 09:17:24.000000000 -0500
+@@ -50,7 +50,7 @@
+ Name[sk]=Modul KDED Favicon
+ Name[sl]=Modul KDED za favicon
+ Name[sr]=Favicon модул, KDED
+-Name[sr@Latn]=KDED Favicon modul
++Name[sr@Latn]=Favicon modul, KDED
+ Name[sv]=KDED-favoritikonmodul
+ Name[ta]=KDED பெவிகான௠பகà¯à®¤à®¿
+ Name[tg]=Бахши пиктограммаи KDED
+@@ -62,7 +62,6 @@
+ Name[vi]=Mô đun KDED Favicon
+ Name[wa]=Module imådjetes KDED
+ Name[xh]=KDED Isichatshulwa se Favicon
+-Name[xx]=xxKDED Favicon Modulexx
+ Name[zh_CN]=KDED æ”¶è—å›¾æ ‡æ¨¡å—
+ Name[zh_TW]=KDED Favicon 測試模組
+ Name[zu]=Ingxenye ye-Favicon ye-KDED
+@@ -107,13 +106,12 @@
+ Comment[sk]=Podpora ikon skratiek
+ Comment[sl]=Podpora ikonam za bližnjice
+ Comment[sr]=Подршка за икону пречице
+-Comment[sr@Latn]=Подршка за икону пречице
++Comment[sr@Latn]=PodrÅ¡ka za ikonu preÄice
+ Comment[sv]=Stöd för genvägsikon
+ Comment[ta]=கà¯à®±à¯à®•à¯à®•௠வழி சினà¯à®© ஆதரவà¯
+ Comment[tr]=Kısayol simge desteği
+ Comment[uk]=Підтримка Ñкорочень піктограм
+ Comment[wa]=Sopoirt imådjetes rascourtis
+-Comment[xx]=xxShortcut icon supportxx
+ Comment[zh_CN]=å¿«æ·å›¾æ ‡æ”¯æŒ
+ ServiceTypes=KDEDModule
+ X-KDE-ModuleType=Library
+diff -Nru kdebase-release-3.4.0/libkonq/konq_operations.cc kdebase-branch-3.4/libkonq/konq_operations.cc
+--- kdebase-release-3.4.0/libkonq/konq_operations.cc 2005-02-09 18:54:24.000000000 -0500
++++ kdebase-branch-3.4/libkonq/konq_operations.cc 2005-04-04 18:26:48.000000000 -0400
+@@ -574,8 +574,9 @@
+ if (iconView && iconView->maySetWallpaper() &&
+ (lst.count() == 1) &&
+ ((!KImageIO::type(lst.first().path()).isEmpty()) ||
+- (KImageIO::isSupported(KMimeType::findByURL(lst.first())->name(),
+- KImageIO::Reading))))
++ (KImageIO::isSupported(KMimeType::findByURL(lst.first())->name(), KImageIO::Reading)) ||
++ lst.first().fileName().endsWith(".svg") ||
++ lst.first().fileName().endsWith(".svgz")))
+ {
+ bSetWallpaper = true;
+ }
+diff -Nru kdebase-release-3.4.0/libkonq/konq_popupmenu.cc kdebase-branch-3.4/libkonq/konq_popupmenu.cc
+--- kdebase-release-3.4.0/libkonq/konq_popupmenu.cc 2005-01-26 18:57:41.000000000 -0500
++++ kdebase-branch-3.4/libkonq/konq_popupmenu.cc 2005-04-05 11:12:48.000000000 -0400
+@@ -540,18 +540,30 @@
+ if ( m_lstItems.count() == 1 && sMoving )
+ addAction( "rename" );
+
++ bool addTrash = false;
++ bool addDel = false;
++
+ if ( sMoving && !isIntoTrash && !isTrashLink )
+- addAction( "trash" );
++ addTrash = true;
+
+ if ( sDeleting ) {
+ if ( !isLocal )
+- addAction( "del" );
++ addDel = true;
++ else if (KApplication::keyboardMouseState() & Qt::ShiftButton) {
++ addTrash = false;
++ addDel = true;
++ }
+ else {
+ KConfigGroup configGroup( kapp->config(), "KDE" );
+ if ( configGroup.readBoolEntry( "ShowDeleteCommand", false ) )
+- addAction( "del" );
++ addDel = true;
+ }
+ }
++
++ if ( addTrash )
++ addAction( "trash" );
++ if ( addDel )
++ addAction( "del" );
+ }
+ }
+ if ( isCurrentTrash )
+diff -Nru kdebase-release-3.4.0/libkonq/konqpopupmenuplugin.desktop kdebase-branch-3.4/libkonq/konqpopupmenuplugin.desktop
+--- kdebase-release-3.4.0/libkonq/konqpopupmenuplugin.desktop 2005-02-10 23:52:25.000000000 -0500
++++ kdebase-branch-3.4/libkonq/konqpopupmenuplugin.desktop 2005-03-26 02:37:46.000000000 -0500
+@@ -49,12 +49,12 @@
+ Comment[pt]='Plugin' para o Menu do Konqueror
+ Comment[pt_BR]=Plug-in do Konqueror para Menus Flutuantes
+ Comment[ro]=Modul pentru meniuri popup Konqueror
+-Comment[ru]=Плагин Ð´Ð»Ñ Ð´Ð¸Ð°Ð»Ð¾Ð³Ð° наÑтроек
++Comment[ru]=Модуль Ð´Ð»Ñ Ð´Ð¸Ð°Ð»Ð¾Ð³Ð° наÑтроек
+ Comment[se]=Lassemoduvla Konquerora báhccanfállui
+ Comment[sk]=Modul pre kontextové menu Konquerora
+ Comment[sl]=Vstavek za Konquerorjev pojavni menu
+ Comment[sr]=Прикључак за Konqueror-ов иÑкачући мени
+-Comment[sr@Latn]=Dodatak za Konqueror-ov iskaÄući meni
++Comment[sr@Latn]=PrikljuÄak za Konqueror-ov iskaÄući meni
+ Comment[sv]=Insticksprogram för Konquerors popupmeny
+ Comment[ta]=கானà¯à®•ொரர௠தோனà¯à®±à¯à®®à¯ படà¯à®Ÿà®¿à®•à¯à®•ான செரà¯à®•லà¯à®•ளà¯
+ Comment[tg]=МутаÑÑалкунандаи меню ҷиҳандаи Konqueror
+@@ -65,6 +65,5 @@
+ Comment[vi]=Plugin cho thực đơn Popup Konqueror
+ Comment[wa]=Tchôke-divins po l' aspitant menu di Konqueror
+ Comment[xh]=Iplagi efakiweyo ye Konqueror ye Popup Menu
+-Comment[xx]=xxPlugin for the Konqueror Popup Menuxx
+ Comment[zh_TW]=Konqueror å°è©±é¸å–®çš„外掛程å¼
+ Comment[zu]=I-Plugin yemenu egxumayo ye-Konqueror
+diff -Nru kdebase-release-3.4.0/nsplugins/khtml_plugins.desktop kdebase-branch-3.4/nsplugins/khtml_plugins.desktop
+--- kdebase-release-3.4.0/nsplugins/khtml_plugins.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/nsplugins/khtml_plugins.desktop 2005-03-26 02:37:46.000000000 -0500
+@@ -55,12 +55,12 @@
+ Name[pt]='Plugins'
+ Name[pt_BR]=Plug-ins
+ Name[ro]=Module
+-Name[ru]=Плагины
++Name[ru]=Модули
+ Name[se]=Lassemoduvllat
+ Name[sk]=Moduly
+ Name[sl]=Vstavki
+ Name[sr]=Прикључци
+-Name[sr@Latn]=Dodaci
++Name[sr@Latn]=PrikljuÄci
+ Name[ss]=Ema- Plugin
+ Name[sv]=Insticksprogram
+ Name[ta]=செரà¯à®•லà¯à®•ளà¯
+@@ -71,7 +71,6 @@
+ Name[uz]=Плагинлар
+ Name[wa]=Tchôke-divins
+ Name[xh]=Iiplagi ezingaphakathi
+-Name[xx]=xxPluginsxx
+ Name[zh_CN]=æ’ä»¶
+ Name[zh_TW]=外掛程å¼
+ Name[zu]=Ama-Plugin
+@@ -123,12 +122,12 @@
+ Comment[pt]=Configurar os 'plugins' do navegador
+ Comment[pt_BR]=Configura os plug-ins do navegador
+ Comment[ro]=Configurează modulele de navigator de web
+-Comment[ru]=ÐаÑтройка плагинов браузера
++Comment[ru]=ÐаÑтройка модулей браузера
+ Comment[se]=Heivet fierpmádatlogana lassemoduvllaid
+ Comment[sk]=Nastavenie modulov prehliadaÄa
+ Comment[sl]=Tu lahko nastavite predpomnilnik
+ Comment[sr]=Подешавање прикључака прегледача
+-Comment[sr@Latn]=PodeÅ¡avanje pretraživaÄevih dodataka
++Comment[sr@Latn]=PodeÅ¡avanje prikljuÄaka pregledaÄa
+ Comment[sv]=Anpassa insticksprogram för webbläsare
+ Comment[ta]= மேலோடியின௠செரà¯à®•லà¯à®•ளை வடிவமைகà¯à®•லாமà¯
+ Comment[tg]=Танзими мутаÑÑалкунандаҳои тафÑир
+@@ -140,7 +139,6 @@
+ Comment[vi]=Cấu hình plugin cho trình duyệt
+ Comment[wa]=Apontyî les tchôke-divins do betchteu
+ Comment[xh]=Qwalasela umkhangheli zincwadi zeplagi ezingaphakathi
+-Comment[xx]=xxConfigure the browser pluginsxx
+ Comment[zh_CN]=é…ç½®æµè§ˆå™¨æ’ä»¶
+ Comment[zh_TW]=è¨å®šç€è¦½å™¨å¤–掛程å¼
+ Comment[zu]=Hlanganisela ama-plugin omcingi
+@@ -189,7 +187,7 @@
+ Keywords[sk]=konqueror,kfm,prehliadaÄ,html,web,www,pÃsma,moduly
+ Keywords[sl]=konqueror,kfm,brskalnik,html,splet,web,pisave,www,vstavki
+ Keywords[sr]=konqueror,kfm,прегледач,html,web,www,фонтови,додаци
+-Keywords[sr@Latn]=konqueror,kfm,pretraživaÄ,html,web,www,fontovi,dodaci
++Keywords[sr@Latn]=konqueror,kfm,pregledaÄ,html,web,www,fontovi,dodaci
+ Keywords[ss]=konqueror,kfm,brawuza,html,web,www,timo tetinhlamvu temagama,ema-plugin
+ Keywords[sv]=konqueror,kfm,webbläsare,html,webb,www,teckensnitt,insticksprogram
+ Keywords[ta]=கானà¯à®•ொரரà¯, கோபà¯à®ªà¯ மேலாளரà¯, மேலோடி, உலாவி, html, இணையமà¯, வலையமà¯, வலை, எழà¯à®¤à¯à®¤à¯à®°à¯, www, செரà¯à®•லà¯à®•ளà¯
+@@ -200,7 +198,6 @@
+ Keywords[vi]=konqueror,kfm,trình duyệt,html,web;www,phông,plugin
+ Keywords[wa]=konqueror,kfm,foyteuse,betchteu,html,waibe,www,fontes,tchôke-divins
+ Keywords[xh]=konqueror,kfm,umkhangeli zincwadi,html,web, www,imigca,iplagi ezingaphakathi
+-Keywords[xx]=xxkonqueror,kfm,browser,html,web,www,fonts,pluginsxx
+ Keywords[zh_CN]=konqueror,kfm,browser,html,web,www,fonts,plugins,æµè§ˆå™¨,å—体,æ’ä»¶
+ Keywords[zh_TW]=konqueror,kfm,browser,html,web,www,fonts,plugins,徿œå®¶,ç€è¦½å™¨,ç¶²é ,å—åž‹,外掛程å¼
+ Keywords[zu]=komqueror,kfm,umcingi,html,web,www,izinhlobo zamagama, ama-plugin
+diff -Nru kdebase-release-3.4.0/nsplugins/viewer/nsplugin.cpp kdebase-branch-3.4/nsplugins/viewer/nsplugin.cpp
+--- kdebase-release-3.4.0/nsplugins/viewer/nsplugin.cpp 2005-02-27 15:51:23.000000000 -0500
++++ kdebase-branch-3.4/nsplugins/viewer/nsplugin.cpp 2005-03-15 14:03:22.000000000 -0500
+@@ -1422,8 +1422,11 @@
+
+ for (unsigned int i=0; i<argc; i++)
+ {
+- const char *n = (const char*)argn[i].ascii();
+- const char *v = (const char*)argv[i].ascii();
++ QCString encN = argn[i].utf8();
++ QCString encV = argv[i].utf8();
++
++ const char *n = encN;
++ const char *v = encV;
+
+ _argn[i] = strdup(n);
+ _argv[i] = strdup(v);
+@@ -1551,7 +1554,7 @@
+
+ // stream into temporary file (use lower() in case the
+ // filename as an upper case X in it)
+- _tempFile = new KTempFile( QString::null, src.fileName().lower() );
++ _tempFile = new KTempFile;
+ _tempFile->setAutoDelete( TRUE );
+ _fileURL = _tempFile->name();
+ kdDebug() << "saving into " << _fileURL << endl;
+@@ -1618,8 +1621,9 @@
+ break;
+ }
+
+- if (_tempFile)
++ if (_tempFile) {
+ _tempFile->dataStream()->writeRawBytes(d, sent);
++ }
+
+ to_sent -= sent;
+ _pos += sent;
+@@ -1641,8 +1645,9 @@
+
+ // handle AS_FILE_ONLY streams
+ if ( _onlyAsFile ) {
+- if ( _tempFile )
++ if (_tempFile) {
+ _tempFile->dataStream()->writeRawBytes( _queue, _queue.size() );
++ }
+ newPos = _queuePos+_queue.size();
+ } else {
+ // normal streams
+@@ -1706,8 +1711,9 @@
+ _instance->NPURLNotify( _url.url(), NPRES_DONE, _notifyData );
+ } else {
+ // close temp file
+- if ( _tempFile )
++ if ( _tempFile ) {
+ _tempFile->close();
++ }
+
+ // destroy stream
+ _instance->NPDestroyStream( _stream, NPRES_NETWORK_ERR );
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/All-Good-People-1.jpg.desktop kdebase-branch-3.4/pics/wallpapers/All-Good-People-1.jpg.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/All-Good-People-1.jpg.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/All-Good-People-1.jpg.desktop 2005-03-30 01:47:59.000000000 -0500
+@@ -5,15 +5,18 @@
+ Name[ca]=La bona gent
+ Name[cs]=Všichni dobřà lidé
+ Name[da]=Alle gode mennesker
++Name[el]=Όλοι οι καλοί άνθÏωποι
+ Name[eo]=Ĉiu bonaj homoj
+ Name[es]=Buena gente
+ Name[et]=Palju toredaid inimesi
++Name[eu]=Pertsona on denak
+ Name[fi]=Kaikki hyvät ihmiset
+ Name[fy]=Alle goede minsken
+ Name[he]=כל ×”×× ×©×™× ×”×˜×•×‘×™×
+ Name[hi]=सà¤à¥€ अचà¥à¤›à¥‡ वà¥à¤¯à¤•à¥à¤¤à¤¿
+ Name[is]=Allt gott fólk
+ Name[it]=Persone buone
++Name[ja]=善良ãªäººãŸã¡
+ Name[lt]=Visi geri žmonės
+ Name[nb]=Alle gode mennesker
+ Name[nl]=Alle goede mensen
+@@ -23,13 +26,13 @@
+ Name[pt_BR]=Todas as Pessoas Boas
+ Name[ru]=Ð’Ñе хорошие люди
+ Name[se]=Buot buori olbmot
++Name[sk]=Všetci dobrà ľudia
+ Name[sl]=Vsi dobri ljudje
+ Name[sr]=Сви добри људи
+-Name[sr@Latn]=Сви добри људи
++Name[sr@Latn]=Svi dobri ljudi
+ Name[sv]=Alla goda människor
+ Name[ta]=எலà¯à®²à®¾ நலà¯à®²à®µà®°à¯à®•ளà¯à®®à¯
+ Name[tr]=Tüm İyi İnsanlar
+ Name[uk]=Ð’ÑÑ– люди браттÑ
+-Name[xx]=xxAll Good Peoplexx
+ ImageType=pixmap
+
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/Blkmarble.jpg.desktop kdebase-branch-3.4/pics/wallpapers/Blkmarble.jpg.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/Blkmarble.jpg.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/Blkmarble.jpg.desktop 2005-03-30 01:47:59.000000000 -0500
+@@ -7,6 +7,7 @@
+ Name[cs]=Černý mramor
+ Name[da]=Sort marmor
+ Name[de]=Schwarzer Marmor
++Name[el]=ΜαÏÏο μάÏμαÏο
+ Name[eo]=Negra marmoro
+ Name[es]=Mármol negro
+ Name[et]=Must marmor
+@@ -26,13 +27,13 @@
+ Name[pt]=Mármore Negro
+ Name[ru]=Черный мрамор
+ Name[se]=Čáhppes márbmor
++Name[sk]=ÄŒierny mramor
+ Name[sl]=ÄŒrn marmor
+ Name[sr]=Црни мермер
+-Name[sr@Latn]=Црни мермер
++Name[sr@Latn]=Crni mermer
+ Name[sv]=Svart marmor
+ Name[ta]=கறà¯à®ªà¯à®ªà¯à®ªà¯ பளிஙà¯à®•à¯
+ Name[tr]=Siyah Misket
+ Name[uk]=Чорний мармур
+-Name[xx]=xxBlack Marblexx
+ ImageType=pixmap
+
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/Chicken-Songs-2.jpg.desktop kdebase-branch-3.4/pics/wallpapers/Chicken-Songs-2.jpg.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/Chicken-Songs-2.jpg.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/Chicken-Songs-2.jpg.desktop 2005-03-07 09:17:25.000000000 -0500
+@@ -27,12 +27,11 @@
+ Name[se]=Vuoncálávlagat
+ Name[sl]=PiÅ¡ÄanÄje pesmi
+ Name[sr]=Пилеће пеÑме
+-Name[sr@Latn]=Пилеће пеÑме
++Name[sr@Latn]=Pileće pesme
+ Name[sv]=Kycklingpip
+ Name[ta]=சிகà¯à®•ன௠பாடலà¯à®•ளà¯
+ Name[tr]=Tavuk Şarkısı
+ Name[uk]=Співи курчат
+-Name[xx]=xxChicken Songsxx
+ ImageType=pixmap
+ Author=Bowie J. Poag / PROPAGANDA
+
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/Circuit.jpg.desktop kdebase-branch-3.4/pics/wallpapers/Circuit.jpg.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/Circuit.jpg.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/Circuit.jpg.desktop 2005-03-30 01:47:59.000000000 -0500
+@@ -5,6 +5,7 @@
+ Name[bn]=সারà§à¦•িট
+ Name[cs]=Obvod
+ Name[cy]=Cylched
++Name[el]=ΚÏκλωμα
+ Name[eo]=Rondo
+ Name[es]=Circuito
+ Name[et]=Vooluvõrk
+@@ -14,6 +15,7 @@
+ Name[hu]=Pálya
+ Name[is]=Rás
+ Name[it]=Circuiti
++Name[ja]=回路
+ Name[lo]=ลายวงจร
+ Name[nb]=Kretskort
+ Name[pa]=ਸਰਕਟ
+@@ -21,14 +23,14 @@
+ Name[pt]=Circuito
+ Name[pt_BR]=Circuito
+ Name[ru]=ÐŸÐµÑ‡Ð°Ñ‚Ð½Ð°Ñ Ð¿Ð»Ð°Ñ‚Ð°
++Name[sk]=Plošný spoj
+ Name[sl]=Vezje
+ Name[sr]=Коло
+-Name[sr@Latn]=Коло
++Name[sr@Latn]=Kolo
+ Name[sv]=Krets
+ Name[ta]=வடà¯à®Ÿà®®à¯
+ Name[tr]=Çember
+ Name[uk]=Електричне коло
+-Name[xx]=xxCircuitxx
+ ImageType=pixmap
+
+
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/Foggy1.jpg.desktop kdebase-branch-3.4/pics/wallpapers/Foggy1.jpg.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/Foggy1.jpg.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/Foggy1.jpg.desktop 2005-03-30 01:47:59.000000000 -0500
+@@ -6,6 +6,7 @@
+ Name[ca]=Boirós
+ Name[cs]=Mlha
+ Name[da]=TÃ¥get
++Name[el]=Ομιχλώδες
+ Name[eo]=Nebule
+ Name[es]=Niebla
+ Name[et]=Udune
+@@ -17,6 +18,7 @@
+ Name[hu]=Ködpaplan
+ Name[is]=Þokukennt
+ Name[it]=Nebbioso
++Name[ja]=霧
+ Name[lt]=Rūkas
+ Name[nb]=TÃ¥kete
+ Name[nl]=Mistig
+@@ -25,14 +27,14 @@
+ Name[pt]=Enevoado
+ Name[ru]=Дымка
+ Name[se]=Skoaddu
++Name[sk]=Hmla
+ Name[sl]=Megleno
+ Name[sr]=Магловито
+-Name[sr@Latn]=Магловито
++Name[sr@Latn]=Maglovito
+ Name[sv]=Dimmigt
+ Name[ta]=பாஃகà¯à®•ி
+ Name[tr]=Sisli
+ Name[uk]=Туман
+-Name[xx]=xxFoggyxx
+ ImageType=pixmap
+
+
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/Island-of-Elba.jpg.desktop kdebase-branch-3.4/pics/wallpapers/Island-of-Elba.jpg.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/Island-of-Elba.jpg.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/Island-of-Elba.jpg.desktop 2005-03-30 01:47:59.000000000 -0500
+@@ -7,9 +7,11 @@
+ Name[cs]=Ostrov Elba
+ Name[da]=Øen Elba
+ Name[de]=Insel Elba
++Name[el]=Îήσος Έλβα
+ Name[eo]=Insulo de Elba
+ Name[es]=Isla de Elba
+ Name[et]=Elba saar
++Name[eu]=Elba
+ Name[fi]=Elban saari
+ Name[fr]=ÃŽle d'Elba
+ Name[fy]=Elba-eilân
+@@ -18,6 +20,7 @@
+ Name[hu]=Elba szigete
+ Name[is]=Eyjan Elba
+ Name[it]=Isola d'Elba
++Name[ja]=エルãƒå³¶
+ Name[lt]=Elbos sala
+ Name[nb]=Øya Elba
+ Name[nl]=Elba-eiland
+@@ -27,14 +30,14 @@
+ Name[pt_BR]=Ilha de Elba
+ Name[ru]=ОÑтров Ðльба
+ Name[se]=Elbasuolu
++Name[sk]=Ostrov Elba
+ Name[sl]=Otok Elba
+ Name[sr]=ОÑтрво Елба
+-Name[sr@Latn]=ОÑтрво Елба
++Name[sr@Latn]=Ostrvo Elba
+ Name[sv]=Ön Elba
+ Name[ta]=எலà¯à®ªà®¾ தீவà¯
+ Name[tr]=Elba Adası
+ Name[uk]=ОÑтров Ельба
+-Name[xx]=xxIsland of Elbaxx
+ ImageType=pixmap
+ Author=Andrea Rizzi
+
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/KDE34.png.desktop kdebase-branch-3.4/pics/wallpapers/KDE34.png.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/KDE34.png.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/KDE34.png.desktop 2005-03-30 01:47:59.000000000 -0500
+@@ -5,14 +5,18 @@
+ Name[ca]=KDE 3.4 per omissió
+ Name[da]=KDE 3.4 standard
+ Name[de]=KDE 3.4 Standard
++Name[el]=Î ÏοκαθοÏισμÎνο του KDE 3.4
+ Name[es]=Predeterminado de KDE 3.4
+ Name[et]=KDE 3.4 vaiketaustapilt
++Name[eu]=KDE 3.4 lehenetsia
+ Name[fr]=KDE 3.4 par défaut
+ Name[fy]=KDE 3.4 standert
+ Name[ga]=Réamhshocrú KDE 3.4
++Name[he]=ברירת מחדל של KDE 3.4
+ Name[hu]=A KDE 3.4 alapértelmezése
+ Name[is]=KDE 3.4 sjálfgefið
+ Name[it]=Predefinito di KDE 3.4
++Name[ja]=KDE3.4標準
+ Name[nb]=KDE 3.4 Standard
+ Name[nl]=KDE 3.4 standaard
+ Name[pa]=KDE 3.4 ਮੂਲ
+@@ -20,9 +24,10 @@
+ Name[pt]=Por Omissão do KDE 3.4
+ Name[pt_BR]=KDE 3.4 Padrão
+ Name[ru]=KDE 3.4 по умолчанию
++Name[sk]=Štandardný KDE 3.4
+ Name[sl]=Privzeta za KDE 3.4
+ Name[sr]=Подразумевано у KDE 3.4
+-Name[sr@Latn]=Подразумевано у KDE 3.4
++Name[sr@Latn]=Podrazumevano u KDE 3.4
+ Name[sv]=KDE 3.4 förval
+ Name[uk]=KDE 3.4 Типовий
+ ImageType=pixmap
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/Marble01.jpg.desktop kdebase-branch-3.4/pics/wallpapers/Marble01.jpg.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/Marble01.jpg.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/Marble01.jpg.desktop 2005-03-30 01:47:59.000000000 -0500
+@@ -9,6 +9,7 @@
+ Name[cy]=Marmor
+ Name[da]=Marmor
+ Name[de]=Marmor
++Name[el]=ΜάÏμαÏο
+ Name[eo]=Marmoro
+ Name[es]=Mármol
+ Name[et]=Marmor
+@@ -21,6 +22,7 @@
+ Name[hu]=Márvány
+ Name[is]=Marmari
+ Name[it]=Marmo
++Name[ja]=マーブル
+ Name[lo]=เมเปิล
+ Name[lt]=Marmuras
+ Name[lv]=Marmors
+@@ -32,16 +34,16 @@
+ Name[pt]=Mármore
+ Name[ru]=Мрамор
+ Name[se]=Márbmor
++Name[sk]=Mramor
+ Name[sl]=Marmor
+ Name[sr]=Мермер
+-Name[sr@Latn]=Мермер
++Name[sr@Latn]=Mermer
+ Name[sv]=Marmor
+ Name[ta]=பளிஙà¯à®•à¯
+ Name[tr]=Mermer(Misket)
+ Name[uk]=Мармур
+ Name[ven]=Mavhula
+ Name[xh]=Ibhastile
+-Name[xx]=xxMarblexx
+ ImageType=pixmap
+
+
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/No-Ones-Laughing-3.jpg.desktop kdebase-branch-3.4/pics/wallpapers/No-Ones-Laughing-3.jpg.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/No-Ones-Laughing-3.jpg.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/No-Ones-Laughing-3.jpg.desktop 2005-03-30 01:47:59.000000000 -0500
+@@ -6,6 +6,7 @@
+ Name[ca]=No fa grà cia
+ Name[cs]=Nikdo se nesměje
+ Name[da]=Der er ingen der griner
++Name[el]=Κανείς δεν γελάει
+ Name[eo]=Rido de neniu
+ Name[es]=Nadie se rie
+ Name[et]=Keegi ei naera
+@@ -16,6 +17,7 @@
+ Name[hu]=Csak semmi nevetés
+ Name[is]=Það er enginn sem hlær
+ Name[it]=Non ride nessuno
++Name[ja]=笑ã†äººãªã—
+ Name[lt]=Niekas nesijuokia
+ Name[nb]=Ingen ler
+ Name[nl]=Niemand lacht
+@@ -25,13 +27,13 @@
+ Name[pt_BR]=Ninguém Rindo
+ Name[ru]=Ðикто не ÑмеетÑÑ
+ Name[se]=Ii oktage boagus
++Name[sk]=Už sa nikto nesmeje
+ Name[sl]=NihÄe se ne smeje
+ Name[sr]=Ðико Ñе не Ñмеје
+-Name[sr@Latn]=Ðико Ñе не Ñмеје
++Name[sr@Latn]=Niko se ne smeje
+ Name[sv]=Ingen skrattar
+ Name[ta]=யாரà¯à®®à¯ சிரிகà¯à®•விலà¯à®²à¯ˆ
+ Name[tr]=Kimse Gülmüyor
+ Name[uk]=Ðіхто не ÑмієтьÑÑ
+-Name[xx]=xxNo One's Laughingxx
+ ImageType=pixmap
+ Author=Bowie J. Poag / PROPAGANDA
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/Paper01.jpg.desktop kdebase-branch-3.4/pics/wallpapers/Paper01.jpg.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/Paper01.jpg.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/Paper01.jpg.desktop 2005-03-30 01:47:59.000000000 -0500
+@@ -8,9 +8,11 @@
+ Name[cy]=Papur
+ Name[da]=Papir
+ Name[de]=Papier
++Name[el]=ΧαÏτί
+ Name[eo]=Papero
+ Name[es]=Papel
+ Name[et]=Paber
++Name[eu]=Papera
+ Name[fi]=Paperi
+ Name[fr]=Papier
+ Name[fy]=Papier
+@@ -20,6 +22,7 @@
+ Name[hu]=PapÃr
+ Name[is]=Pappi
+ Name[it]=Carta
++Name[ja]=ç´™
+ Name[lt]=Popierius
+ Name[nb]=Papir
+ Name[nl]=Papier
+@@ -29,13 +32,13 @@
+ Name[pt_BR]=Papel
+ Name[ru]=Бумага
+ Name[se]=Bábir
++Name[sk]=Papier
+ Name[sl]=Papir
+ Name[sr]=Папир
+-Name[sr@Latn]=Папир
++Name[sr@Latn]=Papir
+ Name[sv]=Papper
+ Name[ta]=தாளà¯
+ Name[tr]=Kağıt
+ Name[uk]=Папір
+-Name[xx]=xxPaperxx
+ ImageType=pixmap
+
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/Planning-And-Probing-1.jpg.desktop kdebase-branch-3.4/pics/wallpapers/Planning-And-Probing-1.jpg.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/Planning-And-Probing-1.jpg.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/Planning-And-Probing-1.jpg.desktop 2005-03-22 12:38:22.000000000 -0500
+@@ -8,6 +8,7 @@
+ Name[eo]=Plani kaj testi
+ Name[es]=Planear y probar
+ Name[et]=Plaanime ja proovime
++Name[eu]=Antolatzen eta probak egiten
+ Name[fi]=Suunnittelu ja luotaus
+ Name[fy]=Planne en sykje
+ Name[he]=×ª×™×›× ×•×Ÿ וביצוע
+@@ -23,13 +24,13 @@
+ Name[pt]=Planear e Procurar
+ Name[pt_BR]=Planejamento e Pesquisa
+ Name[ru]=Планируем и пробуем
++Name[sk]=Plánovanie a skúšanie
+ Name[sl]=NaÄrtovanje in preizkuÅ¡anje
+ Name[sr]=Планирање и иÑпитивање
+-Name[sr@Latn]=Планирање и иÑпитивање
++Name[sr@Latn]=Planiranje i ispitivanje
+ Name[sv]=Planering och utforskning
+ Name[ta]=திடà¯à®Ÿà®®à®¿à®Ÿà¯à®¤à®²à¯à®®à¯
+ Name[tr]=Planlanama Ve Araştırma
+ Name[uk]=ÐŸÐ»Ð°Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ñ‚Ð° доÑлідженнÑ
+-Name[xx]=xxPlanning And Probingxx
+ ImageType=pixmap
+ Author=Bowie J. Poag / PROPAGANDA
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/Time-For-Lunch-2.jpg.desktop kdebase-branch-3.4/pics/wallpapers/Time-For-Lunch-2.jpg.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/Time-For-Lunch-2.jpg.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/Time-For-Lunch-2.jpg.desktop 2005-03-22 12:38:22.000000000 -0500
+@@ -11,6 +11,7 @@
+ Name[eo]=Tempopunkto por tagmanÄo
+ Name[es]=Hora de comer
+ Name[et]=Aeg lõunat võtta
++Name[eu]=Bazkaltzeko ordua
+ Name[fi]=Lounasaika
+ Name[fy]=Tiid foar lunch
+ Name[he]=זמן ×רוחת צהריי×
+@@ -27,13 +28,13 @@
+ Name[pt_BR]=Hora do Almoço
+ Name[ru]=Ð’Ñ€ÐµÐ¼Ñ Ð»Ð°Ð½Ñ‡Ð°
+ Name[se]=Gaskabeaiáigi
++Name[sk]=ÄŒas na obed
+ Name[sl]=ÄŒas za kosilo
+ Name[sr]=Време за ручак
+-Name[sr@Latn]=Време за ручак
++Name[sr@Latn]=Vreme za ruÄak
+ Name[sv]=Tid för lunch
+ Name[ta]=மதிய உணவ௠வேளை
+ Name[tr]=Yemek Vakti
+ Name[uk]=Ð§Ð°Ñ Ð´Ð»Ñ Ð¾Ð±Ñ–Ð´Ð°
+-Name[xx]=xxTime For Lunchxx
+ ImageType=pixmap
+ Author=Bowie J. Poag / PROPAGANDA
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/Totally-New-Product-1.jpg.desktop kdebase-branch-3.4/pics/wallpapers/Totally-New-Product-1.jpg.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/Totally-New-Product-1.jpg.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/Totally-New-Product-1.jpg.desktop 2005-03-30 01:47:59.000000000 -0500
+@@ -7,8 +7,10 @@
+ Name[cs]=Úplně nový produkt
+ Name[cy]=Cynnyrch Hollol Newydd
+ Name[da]=Totalt nyt produkt
++Name[el]=Εντελώς νÎο Ï€Ïοϊόν
+ Name[es]=Producto totalmente nuevo
+ Name[et]=Täiesti uus toode
++Name[eu]=Produktu erabat berria
+ Name[fi]=Kokonaan uusi tuote
+ Name[fy]=Gloednij produkt
+ Name[he]=מוצר חדש לחלוטין
+@@ -27,16 +29,16 @@
+ Name[pt_BR]=Produto Totalmente Novo
+ Name[ru]=ÐбÑолютно новый продукт
+ Name[se]=Aibbas ođđa buvtta
++Name[sk]=Úplne nový produkt
+ Name[sl]=Popolnoma nov izdelek
+ Name[sr]=Потпуно нов производ
+-Name[sr@Latn]=Потпуно нов производ
++Name[sr@Latn]=Potpuno nov proizvod
+ Name[sv]=Helt ny produkt
+ Name[ta]=பà¯à®¤à®¿à®¯ பொரà¯à®³à¯
+ Name[tr]=Toplam Yeni Ürün
+ Name[uk]=Ðовий товар на вÑÑ– Ñто
+ Name[ven]=Tshiitwa tshiswa
+ Name[xh]=Imveliso entsha ngokupheleleyo
+-Name[xx]=xxTotally New Productxx
+ Name[zu]=Entsha sha Iprodakhti
+ ImageType=pixmap
+ Author=Bowie J. Poag / PROPAGANDA
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/Won-Ton-Soup-3.jpg.desktop kdebase-branch-3.4/pics/wallpapers/Won-Ton-Soup-3.jpg.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/Won-Ton-Soup-3.jpg.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/Won-Ton-Soup-3.jpg.desktop 2005-03-22 12:38:22.000000000 -0500
+@@ -11,12 +11,14 @@
+ Name[eo]=Wontonsupo
+ Name[es]=Sopa Won Ton
+ Name[et]=Won toni supp
++Name[eu]=Won Ton zopa
+ Name[fi]=Won Ton -keitto
+ Name[fy]=Won Ton-sop
+ Name[he]=מרק וון טופ
+ Name[hi]=वॉन टन सूप
+ Name[hu]=Won Ton leves
+ Name[is]=Won Ton Súpa
++Name[ja]=ワンタンスープ
+ Name[nb]=Won Ton suppe
+ Name[nl]=Won Ton-soep
+ Name[pa]=ਵੋਨ ਟੋਨ ਸੋਪ
+@@ -24,13 +26,13 @@
+ Name[pt]=Sopa Won Ton
+ Name[ru]=Вон-Тон-Суп
+ Name[se]=Won Ton-mális
++Name[sk]=Polievka Won Ton
+ Name[sl]=Juha Won Ton
+ Name[sr]=Супа вон-тон
+-Name[sr@Latn]=Супа вон-тон
++Name[sr@Latn]=Supa von-ton
+ Name[sv]=Won Ton-soppa
+ Name[ta]=டான௠சூபà¯à®ªà¯ˆ வெனà¯à®±à¯à®µà®¿à®Ÿà¯à®Ÿà¯€à®°à¯à®•ளà¯
+ Name[tr]=Won Ton Çorbası
+ Name[uk]=Он той Ñуп
+-Name[xx]=xxWon Ton Soupxx
+ ImageType=pixmap
+ Author=Bowie J. Poag / PROPAGANDA
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/andes-venezolanos.svgz.desktop kdebase-branch-3.4/pics/wallpapers/andes-venezolanos.svgz.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/andes-venezolanos.svgz.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/andes-venezolanos.svgz.desktop 2005-03-07 09:17:25.000000000 -0500
+@@ -13,7 +13,7 @@
+ Name[pt]=Andes Venezuelanos
+ Name[pt_BR]=Andes Venezuelanos
+ Name[sr]=ÐÐ½Ð´Ð¾Ñ Ð’ÐµÐ½ÐµÑ†Ð¾Ð»Ð°Ð½Ð¾Ñ
+-Name[sr@Latn]=ÐÐ½Ð´Ð¾Ñ Ð’ÐµÐ½ÐµÑ†Ð¾Ð»Ð°Ð½Ð¾Ñ
++Name[sr@Latn]=Andos Venecolanos
+ Name[sv]=Anderna i Venezuela
+ Author=Xavier Araque Arguello
+ ImageType=scalable
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/aurora.svgz.desktop kdebase-branch-3.4/pics/wallpapers/aurora.svgz.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/aurora.svgz.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/aurora.svgz.desktop 2005-03-08 04:28:45.000000000 -0500
+@@ -6,12 +6,12 @@
+ Name[cs]=Jitřenka
+ Name[fr]=Aurore
+ Name[is]=Norðurljós
++Name[ja]=オーãƒãƒ©
+ Name[pa]=ਔਰੋਰਾ
+ Name[ru]=Ðврора
+ Name[se]=Guovssahas
+ Name[sl]=Polarni sij
+ Name[sr]=Ðурора
+-Name[sr@Latn]=Ðурора
+ Name[sv]=Norrsken
+ Name[ta]=அரோரா
+ Name[uk]=Ðврора
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/blue-bend.jpg.desktop kdebase-branch-3.4/pics/wallpapers/blue-bend.jpg.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/blue-bend.jpg.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/blue-bend.jpg.desktop 2005-03-30 01:47:59.000000000 -0500
+@@ -8,6 +8,7 @@
+ Name[cs]=Modrá směs
+ Name[da]=Blå blanding
+ Name[de]=Blaue Mischung
++Name[el]=Ανάμειξη του μπλε
+ Name[eo]=Blua mikso
+ Name[es]=Azul claro
+ Name[et]=Sinine ühtesulamine
+@@ -19,6 +20,7 @@
+ Name[hu]=Kékes árnyalat
+ Name[is]=Blá blöndun
+ Name[it]=Miscele di blu
++Name[ja]=ブルー ブレンド
+ Name[nb]=Blå blanding
+ Name[nl]=Blauw mengsel
+ Name[pa]=ਨੀਲਾ à¨à¨²à¨•ਾ
+@@ -27,13 +29,13 @@
+ Name[pt_BR]=Azul Misturado
+ Name[ru]=Ð“Ð¾Ð»ÑƒÐ±Ð°Ñ ÑмеÑÑŒ
+ Name[se]=Alit geavli
++Name[sk]=Modrá nálada
+ Name[sl]=Modro mešanje
+ Name[sr]=Плаво Ñтапање
+-Name[sr@Latn]=Плаво Ñтапање
++Name[sr@Latn]=Plavo stapanje
+ Name[sv]=Blå blandning
+ Name[ta]=நீல கலபà¯à®ªà¯
+ Name[tr]=Mavi Harman
+ Name[uk]=Ð¡Ð¸Ð½Ñ Ñуміш
+-Name[xx]=xxBlue Blendxx
+ ImageType=pixmap
+ Author=Everaldo Coelho
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/celtic.svgz.desktop kdebase-branch-3.4/pics/wallpapers/celtic.svgz.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/celtic.svgz.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/celtic.svgz.desktop 2005-03-22 12:38:22.000000000 -0500
+@@ -7,10 +7,12 @@
+ Name[cs]=Keltský
+ Name[da]=Keltisk
+ Name[es]=Céltico
++Name[eu]=Keltikoa
+ Name[fr]=Celtique
+ Name[ga]=Ceilteach
+ Name[hu]=Kelta
+ Name[it]=Celtico
++Name[ja]=ケルト
+ Name[nb]=Keltisk
+ Name[nl]=Keltisch
+ Name[pa]=ਸੀਲਟਿਕ
+@@ -19,9 +21,10 @@
+ Name[pt_BR]=Celta
+ Name[ru]=КельтÑкий
+ Name[se]=Keltalaš
++Name[sk]=Keltské
+ Name[sl]=Keltika
+ Name[sr]=КелтÑки
+-Name[sr@Latn]=КелтÑки
++Name[sr@Latn]=Keltski
+ Name[sv]=Keltiskt
+ Name[uk]=КельтÑький
+ Author=Mark Ger
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/default_blue.jpg.desktop kdebase-branch-3.4/pics/wallpapers/default_blue.jpg.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/default_blue.jpg.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/default_blue.jpg.desktop 2005-03-30 01:47:59.000000000 -0500
+@@ -8,9 +8,11 @@
+ Name[cs]=Výchozà modrá
+ Name[da]=Standardblå
+ Name[de]=Standard-Blau
++Name[el]=Î ÏοκαθοÏισμÎνο μπλε
+ Name[eo]=Norma bluo
+ Name[es]=Azul predeterminado
+ Name[et]=Vaikimisi sinine
++Name[eu]=Urdin lehenetsia
+ Name[fi]=Oletussininen
+ Name[fr]=Bleu par défaut
+ Name[fy]=Standertblau
+@@ -19,6 +21,7 @@
+ Name[hu]=Alapértelmezett kék
+ Name[is]=Sjálfgefið blátt
+ Name[it]=Predefinito blu
++Name[ja]=標準ブルー
+ Name[nb]=Standard blå
+ Name[nl]=Standaardblauw
+ Name[pa]=ਮੂਲ ਨੀਲਾ
+@@ -27,13 +30,13 @@
+ Name[pt_BR]=Azul Padrão
+ Name[ru]=Синий по умолчанию
+ Name[se]=Standárdalit
++Name[sk]=Štandardná modrá
+ Name[sl]=Privzeta modra
+ Name[sr]=Подразумевано плаво
+-Name[sr@Latn]=Подразумевано плаво
++Name[sr@Latn]=Podrazumevano plavo
+ Name[sv]=Standardblå
+ Name[ta]=à®®à¯à®©à¯à®©à®¿à®°à¯à®ªà¯à®ªà¯ நீலமà¯
+ Name[tr]=Öntanımlı Mavi
+ Name[uk]=Типовий Ñиній
+-Name[xx]=xxDefault Bluexx
+ ImageType=pixmap
+ Author=Qwertz
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/default_gears.jpg.desktop kdebase-branch-3.4/pics/wallpapers/default_gears.jpg.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/default_gears.jpg.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/default_gears.jpg.desktop 2005-03-22 12:38:22.000000000 -0500
+@@ -11,6 +11,7 @@
+ Name[eo]=Norma aparato
+ Name[es]=Engranajes predeterminados
+ Name[et]=Vaikimisi hammasrattad
++Name[eu]=Gurpil lehenetsiak
+ Name[fi]=KDE:n oletushammasrattaat
+ Name[fr]=Roues par défaut
+ Name[fy]=Standert kamrêd
+@@ -19,6 +20,7 @@
+ Name[hu]=Alapértelmezett fogaskerekek
+ Name[is]=Sjálfgefnir gÃrar
+ Name[it]=Rotelle predefinite
++Name[ja]=標準ギア
+ Name[nb]=Standard tannhjul
+ Name[nl]=Standaardtandwielen
+ Name[pa]=ਮੂਲ ਗੇਅਰ
+@@ -26,13 +28,13 @@
+ Name[pt]=Roldanas Predefinidas
+ Name[pt_BR]=Gears Padrão
+ Name[ru]=ШеÑтеренки по умолчанию
++Name[sk]=Štandardné kolesá
+ Name[sl]=Privzeti zobniki
+ Name[sr]=Подразумевни зупчаници
+-Name[sr@Latn]=Подразумевни зупчаници
++Name[sr@Latn]=Podrazumevni zupÄanici
+ Name[sv]=Standardkugghjul
+ Name[ta]=à®®à¯à®©à¯à®©à®¿à®°à¯à®¨à¯à®¤ விளைவà¯
+ Name[tr]=Öntanımlı Çarklar
+ Name[uk]=Типові шеÑтерні
+-Name[xx]=xxDefault Gearsxx
+ ImageType=pixmap
+
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/fulmine.jpg.desktop kdebase-branch-3.4/pics/wallpapers/fulmine.jpg.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/fulmine.jpg.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/fulmine.jpg.desktop 2005-03-07 09:17:25.000000000 -0500
+@@ -16,11 +16,10 @@
+ Name[ru]=Гром
+ Name[sl]=Nevihta
+ Name[sr]=Гнев
+-Name[sr@Latn]=Гнев
++Name[sr@Latn]=Gnev
+ Name[sv]=Dundra
+ Name[ta]=பà¯à®²à¯à®®à¯ˆà®©à¯
+ Name[tr]=Yıldırım
+ Name[uk]=БлиÑкавка
+-Name[xx]=xxFulminexx
+ ImageType=pixmap
+ Author=Andrea Rizzi
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/gear-flowers.svgz.desktop kdebase-branch-3.4/pics/wallpapers/gear-flowers.svgz.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/gear-flowers.svgz.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/gear-flowers.svgz.desktop 2005-03-22 12:38:22.000000000 -0500
+@@ -7,6 +7,7 @@
+ Name[de]=Zahnräder mit Blumen
+ Name[es]=Flores dentadas
+ Name[et]=Hammasrataslilled
++Name[eu]=Gurpil loredunak
+ Name[fi]=Rataskukat
+ Name[fr]=Fleurs engrenages
+ Name[hu]=Fogaskerék-virág
+@@ -19,9 +20,10 @@
+ Name[pt]=Flores e Roldanas
+ Name[pt_BR]=Flores
+ Name[ru]=Цветы-шеÑтеренки
++Name[sk]=Ozubené kvety
+ Name[sl]=Zobniške rože
+ Name[sr]=Цветни зупчаници
+-Name[sr@Latn]=Цветни зупчаници
++Name[sr@Latn]=Cvetni zupÄanici
+ Name[sv]=Kugghjulsblommor
+ Name[ta]=கியர௠பூகà¯à®•ளà¯
+ Name[uk]=Квіти-шеÑтерні
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/globe.svgz.desktop kdebase-branch-3.4/pics/wallpapers/globe.svgz.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/globe.svgz.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/globe.svgz.desktop 2005-03-07 09:17:25.000000000 -0500
+@@ -19,9 +19,10 @@
+ Name[pt]=Globo e Roldanas
+ Name[pt_BR]=Globo
+ Name[ru]=Земной шар в шеÑтерне
++Name[sk]=Ozubený glóbus
+ Name[sl]=Zobniška krogla
+ Name[sr]=Озупчен глобуÑ
+-Name[sr@Latn]=Озупчен глобуÑ
++Name[sr@Latn]=OzupÄen globus
+ Name[sv]=Klot med kuggar
+ Name[uk]=Земна ÐºÑƒÐ»Ñ Ð² шеÑтерні
+ Author=Jakob Kohl
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/here-gear.svgz.desktop kdebase-branch-3.4/pics/wallpapers/here-gear.svgz.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/here-gear.svgz.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/here-gear.svgz.desktop 2005-03-22 12:38:22.000000000 -0500
+@@ -6,6 +6,7 @@
+ Name[da]=Vi er gear
+ Name[es]=Todos somos engranajes
+ Name[et]=Me hammasrattad oleme...
++Name[eu]=Gurpilak gara
+ Name[fi]=Olemme hammasratas
+ Name[fr]=Tous dans l'engrenage
+ Name[hu]=We are Gear
+@@ -17,9 +18,10 @@
+ Name[pl]=To my
+ Name[pt]=Nós Somos Roldanas
+ Name[pt_BR]=Engrenagem
++Name[sk]=Pohon sme my
+ Name[sl]=Smo zobniki
+ Name[sr]=Ми Ñмо зупчаник
+-Name[sr@Latn]=Ми Ñмо зупчаник
++Name[sr@Latn]=Mi smo zupÄanik
+ Name[sv]=Vi är kuggar
+ Author=Tony
+ ImageType=scalable
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/kde_box.png.desktop kdebase-branch-3.4/pics/wallpapers/kde_box.png.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/kde_box.png.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/kde_box.png.desktop 2005-03-22 12:38:22.000000000 -0500
+@@ -10,6 +10,7 @@
+ Name[eo]=KDEujo
+ Name[es]=Caja KDE
+ Name[et]=KDE karp
++Name[eu]=KDE kutxa
+ Name[fi]=KDE laatikko
+ Name[fr]=Boîte KDE
+ Name[fy]=KDE-boks
+@@ -18,6 +19,7 @@
+ Name[hu]=KDE doboz
+ Name[is]=KDE kassi
+ Name[it]=Scatola di KDE
++Name[ja]=KDE ボックス
+ Name[nb]=KDE-boks
+ Name[nl]=KDE-box
+ Name[pa]=KDE ਬਕਸਾ
+@@ -25,13 +27,13 @@
+ Name[pt]=Caixa KDE
+ Name[ru]=Коробка KDE
+ Name[se]=KDE boksa
++Name[sk]=Krabica KDE
+ Name[sl]=Å katla s KDE
+ Name[sr]=KDE кутија
+-Name[sr@Latn]=KDE кутија
++Name[sr@Latn]=KDE kutija
+ Name[sv]=KDE-låda
+ Name[ta]=கேடியி பெடà¯à®Ÿà®¿
+ Name[tr]=KDE Kutusu
+ Name[uk]=Скринька KDE
+-Name[xx]=xxKDE Boxxx
+ ImageType=pixmap
+ Author=Francesco Hermanitosverdes
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/kde_passion.jpg.desktop kdebase-branch-3.4/pics/wallpapers/kde_passion.jpg.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/kde_passion.jpg.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/kde_passion.jpg.desktop 2005-03-08 04:28:45.000000000 -0500
+@@ -16,6 +16,7 @@
+ Name[hu]=KDE szenvedély
+ Name[is]=KDE ást
+ Name[it]=Passione per KDE
++Name[ja]=KDE パッション
+ Name[nb]=KDE-følelsen
+ Name[nl]=KDE-passie
+ Name[pa]=KDE ਚਾਅ
+@@ -23,13 +24,13 @@
+ Name[pt]=Paixão KDE
+ Name[ru]=СтраÑть KDE
+ Name[se]=KDE pašuvdna
++Name[sk]=Vášeň KDE
+ Name[sl]=Strast KDE
+ Name[sr]=KDE ÑтраÑÑ‚
+-Name[sr@Latn]=KDE ÑтраÑÑ‚
++Name[sr@Latn]=KDE strast
+ Name[sv]=KDE-passion
+ Name[ta]=KDE பலகமà¯
+ Name[tr]=KDE Tutkusu
+ Name[uk]=Ð‘Ð°Ð¶Ð°Ð½Ð½Ñ KDE
+-Name[xx]=xxKDE Passionxx
+ ImageType=pixmap
+ Author=Benjamin Keating
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/konqui.svgz.desktop kdebase-branch-3.4/pics/wallpapers/konqui.svgz.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/konqui.svgz.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/konqui.svgz.desktop 2005-03-07 09:17:25.000000000 -0500
+@@ -7,7 +7,7 @@
+ Name[pa]=ਕੋਨਕਿਊਈ
+ Name[ru]=Конкви
+ Name[sr]=Конки
+-Name[sr@Latn]=Конки
++Name[sr@Latn]=Konki
+ Name[uk]=Конкві
+ Author=Pedro Carbajal
+ ImageType=scalable
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/lineart.svgz.desktop kdebase-branch-3.4/pics/wallpapers/lineart.svgz.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/lineart.svgz.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/lineart.svgz.desktop 2005-03-22 12:38:22.000000000 -0500
+@@ -8,6 +8,7 @@
+ Name[da]=Lineart logo
+ Name[es]=Logo artÃstico
+ Name[et]=Joongraafiline logo
++Name[eu]=Lineart logoa
+ Name[fi]=Suorien logo
+ Name[fr]=Logo lineart
+ Name[hu]=Rajzolt embléma
+@@ -19,9 +20,10 @@
+ Name[pl]=Logo z linii
+ Name[pt]=Logotipo em Linhas
+ Name[ru]=ГрафичеÑкий логотип
++Name[sk]=Logo v Äiarach
+ Name[sl]=ÄŒrtna slika
+ Name[sr]=Лого као цртеж
+-Name[sr@Latn]=Лого као цртеж
++Name[sr@Latn]=Logo kao crtež
+ Name[sv]=Logotyp med streckteckning
+ Name[uk]=Графічний логотип
+ Author=Jan-Victor Krille
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/moon.svgz.desktop kdebase-branch-3.4/pics/wallpapers/moon.svgz.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/moon.svgz.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/moon.svgz.desktop 2005-03-30 01:47:59.000000000 -0500
+@@ -8,8 +8,10 @@
+ Name[cs]=MÄ›sÃc
+ Name[da]=MÃ¥ne
+ Name[de]=Mond
++Name[el]=ΦεγγάÏι
+ Name[es]=Luna
+ Name[et]=Kuu
++Name[eu]=Ilargia
+ Name[fi]=Kuu
+ Name[fr]=Lune
+ Name[fy]=Moanne
+@@ -18,6 +20,7 @@
+ Name[hu]=Hold
+ Name[is]=Tungl
+ Name[it]=Luna
++Name[ja]=ムーン
+ Name[nb]=MÃ¥ne
+ Name[nl]=Maan
+ Name[pa]=ਚੰਦ
+@@ -26,9 +29,10 @@
+ Name[pt_BR]=Lua
+ Name[ru]=Луна
+ Name[se]=Mánnu
++Name[sk]=Mesiac
+ Name[sl]=Luna
+ Name[sr]=МеÑец
+-Name[sr@Latn]=МеÑец
++Name[sr@Latn]=Mesec
+ Name[sv]=MÃ¥ne
+ Name[ta]=நிலா
+ Name[uk]=МіÑÑць
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/only_k.jpg.desktop kdebase-branch-3.4/pics/wallpapers/only_k.jpg.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/only_k.jpg.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/only_k.jpg.desktop 2005-03-22 12:38:22.000000000 -0500
+@@ -10,6 +10,7 @@
+ Name[eo]=Nurko
+ Name[es]=Sólo K
+ Name[et]=Ainult K
++Name[eu]=K bakarrik
+ Name[fi]=Vain K
+ Name[fr]=Seulement K
+ Name[fy]=Allinnich K
+@@ -18,6 +19,7 @@
+ Name[hu]=Csak egy K
+ Name[is]=Bara K
+ Name[it]=Solo K
++Name[ja]=オンリー K
+ Name[nb]=Bare K
+ Name[nl]=Alleen K
+ Name[pa]=ਸਿਰਫ਼ ਕੇ
+@@ -26,13 +28,13 @@
+ Name[pt_BR]=Somente K
+ Name[ru]=Только К
+ Name[se]=Dušše K
++Name[sk]=Iba K
+ Name[sl]=Samo K
+ Name[sr]=Само К
+-Name[sr@Latn]=Само К
++Name[sr@Latn]=Samo K
+ Name[sv]=Bara K
+ Name[ta]=கே மடà¯à®Ÿà¯à®®à¯
+ Name[tr]=Sadece K
+ Name[uk]=Тільки K
+-Name[xx]=xxOnly Kxx
+ ImageType=pixmap
+ Author=Sven Müller
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/seaofconero.jpg.desktop kdebase-branch-3.4/pics/wallpapers/seaofconero.jpg.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/seaofconero.jpg.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/seaofconero.jpg.desktop 2005-03-22 12:38:22.000000000 -0500
+@@ -11,6 +11,7 @@
+ Name[eo]=Konera maro
+ Name[es]=Mar de Conero
+ Name[et]=Coneri järv
++Name[eu]=Conero itsasoa
+ Name[fi]=Coneron meri
+ Name[fr]=Mer de Conero
+ Name[fy]=See fan Conero
+@@ -19,6 +20,7 @@
+ Name[hu]=Conero-tenger
+ Name[is]=Sjórinn við Conero
+ Name[it]=Mare del Conero
++Name[ja]=コーãƒãƒã®æµ·
+ Name[nb]=Conerosjøen
+ Name[nl]=Zee van Conero
+ Name[pa]=ਕੋਨਰੀਓ ਸਮà©à©°à¨¦à¨°
+@@ -27,13 +29,13 @@
+ Name[pt_BR]=Mar de Conero
+ Name[ru]=Море Конеро
+ Name[se]=Conerojávri
++Name[sk]=Conero
+ Name[sl]=Morje Conero
+ Name[sr]=КонерÑко море
+-Name[sr@Latn]=КонерÑко море
++Name[sr@Latn]=Konersko more
+ Name[sv]=Conerosjön
+ Name[ta]=கோனேரோ கடலà¯
+ Name[tr]=Conero Denizi
+ Name[uk]=Море поблизу Конеро
+-Name[xx]=xxSea of Coneroxx
+ ImageType=pixmap
+ Author=Andrea Rizzi
+diff -Nru kdebase-release-3.4.0/pics/wallpapers/triplegears.jpg.desktop kdebase-branch-3.4/pics/wallpapers/triplegears.jpg.desktop
+--- kdebase-release-3.4.0/pics/wallpapers/triplegears.jpg.desktop 2005-02-23 00:06:02.000000000 -0500
++++ kdebase-branch-3.4/pics/wallpapers/triplegears.jpg.desktop 2005-03-22 12:38:22.000000000 -0500
+@@ -10,6 +10,7 @@
+ Name[eo]=Tria aparato
+ Name[es]=Triple engranaje
+ Name[et]=Kolm hammasratast
++Name[eu]=Hiru gurpil
+ Name[fi]=Kolmoishammasrattaat
+ Name[fr]=Les trois roues
+ Name[fy]=Trijefâldige kamrêd
+@@ -18,6 +19,7 @@
+ Name[hu]=Tripla fogaskerék
+ Name[is]=Þrefaldir gÃrar
+ Name[it]=Triple ruote
++Name[ja]=トリプル ギア
+ Name[nb]=Triple tannhjul
+ Name[nl]=Drievoudige tandwielen
+ Name[pa]=ਤਿੰਨ ਗੇਅਰ
+@@ -25,13 +27,13 @@
+ Name[pt]=Triplas Roldanas
+ Name[pt_BR]=Gears Triplo
+ Name[ru]=Тройные шеÑтеренки
++Name[sk]=Tri ozubené kolesá
+ Name[sl]=Trojni zobnik
+ Name[sr]=ТроÑтруки зупчаници
+-Name[sr@Latn]=ТроÑтруки зупчаници
++Name[sr@Latn]=Trostruki zupÄanici
+ Name[sv]=Tredubbla kugghjul
+ Name[ta]=மூனà¯à®±à¯ கியரà¯à®•ளà¯
+ Name[tr]=Üçlü Çarklar
+ Name[uk]=Потрийні шеÑтерні
+-Name[xx]=xxTriple Gearsxx
+ ImageType=pixmap
+ Author=Jörg Gastner
Deleted: branches/kde-3.4.0/packages/kdebase/debian/patches/13_kdm_configure.diff
Added: branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff 2005-04-06 22:56:40 UTC (rev 977)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff 2005-04-06 22:57:49 UTC (rev 978)
@@ -0,0 +1,120 @@
+diff -Nrua kde.orig/kcontrol/fonts/fonts.cpp kde.patched/kcontrol/fonts/fonts.cpp
+--- kde.orig/kcontrol/fonts/fonts.cpp 2005-02-23 06:25:06.000000000 -0500
++++ kde.patched/kcontrol/fonts/fonts.cpp 2005-04-05 17:46:24.000000000 -0400
+@@ -524,17 +524,17 @@
+
+ // Keep in sync with kdelibs/kdecore/kglobalsettings.cpp
+
+- QFont f0("helvetica", 12);
+- QFont f1("courier", 12);
+- QFont f2("helvetica", 10);
+- QFont f3("helvetica", 12, QFont::Bold);
+- QFont f4("helvetica", 11);
++ QFont f0("sans serif", 10);
++ QFont f1("monospace", 10);
++ QFont f2("sans serif", 10);
++ QFont f3("sans serif", 10, QFont::Bold);
++ QFont f4("sans serif", 10);
+
+- f0.setPointSize(12);
+- f1.setPointSize(12);
++ f0.setPointSize(10);
++ f1.setPointSize(10);
+ f2.setPointSize(10);
+- f3.setPointSize(12);
+- f4.setPointSize(11);
++ f3.setPointSize(10);
++ f4.setPointSize(10);
+
+ defaultFontList << f0 << f1 << f2 << f0 << f3 << f4 << f0;
+
+diff -Nrua kde.orig/kcontrol/kdm/kdm-font.cpp kde.patched/kcontrol/kdm/kdm-font.cpp
+--- kde.orig/kcontrol/kdm/kdm-font.cpp 2004-07-16 09:17:48.000000000 -0400
++++ kde.patched/kcontrol/kdm/kdm-font.cpp 2005-04-05 17:53:04.000000000 -0400
+@@ -90,9 +90,9 @@
+
+ void KDMFontWidget::set_def()
+ {
+- stdFontChooser->setFont(QFont("helvetica", 12));
++ stdFontChooser->setFont(QFont("sans serif", 10));
+ failFontChooser->setFont(QFont("helvetica", 12, QFont::Bold));
+- greetingFontChooser->setFont(QFont("charter", 24));
++ greetingFontChooser->setFont(QFont("sans serif", 22));
+ }
+
+ void KDMFontWidget::save()
+diff -Nrua kde.orig/kcontrol/krdb/themes/Plastik/Plastik.xml kde.patched/kcontrol/krdb/themes/Plastik/Plastik.xml
+--- kde.orig/kcontrol/krdb/themes/Plastik/Plastik.xml 2005-02-23 05:54:22.000000000 -0500
++++ kde.patched/kcontrol/krdb/themes/Plastik/Plastik.xml 2005-04-05 14:33:51.000000000 -0400
+@@ -113,12 +113,12 @@
+ </panel>
+ <widgets name="Plastik" />
+ <fonts>
+- <font value="Arial,12,-1,5,50,0,0,0,0,0" object="General" />
+- <fixed value="Courier New,10,-1,5,50,0,0,0,0,0" object="General" />
+- <toolBarFont value="Arial,12,-1,5,50,0,0,0,0,0" object="General" />
+- <menuFont value="Arial,12,-1,5,50,0,0,0,0,0" object="General" />
+- <activeFont value="Arial,12,-1,5,75,0,0,0,0,0" object="WM" />
+- <taskbarFont value="Arial,11,-1,5,50,0,0,0,0,0" object="General" />
++ <font value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="General" />
++ <fixed value="Monospace,10,-1,5,50,0,0,0,0,0" object="General" />
++ <toolBarFont value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="General" />
++ <menuFont value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="General" />
++ <activeFont value="Sans Serif,10,-1,5,75,0,0,0,0,0" object="WM" />
++ <taskbarFont value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="General" />
+ <StandardFont value="" object="FMSettings" />
+ </fonts>
+ </ktheme>
+diff -Nrua kde.orig/kdm/config.def kde.patched/kdm/config.def
+--- kde.orig/kdm/config.def 2005-03-24 15:48:02.000000000 -0500
++++ kde.patched/kdm/config.def 2005-04-05 17:51:11.000000000 -0400
+@@ -2051,7 +2051,7 @@
+ Default: "charter,24,5,0,50,0"
+ CDefault: "charter,24,bold"
+ User: greeter:font
+-Instance: #*/"charter,20,5,0,50,0"
++Instance: */"Sans Serif,22,5,0,50,0"
+ Comment: &
+ Description:
+ The font for the greeter headline.
+@@ -2061,7 +2061,7 @@
+ Default: "helvetica,12,5,0,50,0"
+ CDefault: "helvetica,12"
+ User: greeter(normalFont):font
+-Instance: #*/"helvetica,10,5,0,50,0"
++Instance: */"Sans Serif,10,5,0,50,0"
+ Comment: &
+ Description:
+ The normal font used in the greeter.
+@@ -2080,7 +2080,7 @@
+ Type: bool
+ Default: false
+ User: greeter-c
+-Instance: #*/!
++Instance: */!
+ Comment: &
+ Description:
+ Whether the fonts used in the greeter should be antialiased.
+diff -Nrua kde.orig/kpersonalizer/keyecandypage.cpp kde.patched/kpersonalizer/keyecandypage.cpp
+--- kde.orig/kpersonalizer/keyecandypage.cpp 2005-02-23 06:27:14.000000000 -0500
++++ kde.patched/kpersonalizer/keyecandypage.cpp 2005-04-05 17:52:04.000000000 -0400
+@@ -717,13 +717,13 @@
+ b_useXft=QSettings().readBoolEntry("/qt/useXft");
+ b_enableXft=QSettings().readBoolEntry("/qt/enableXft");
+ KGlobal::config()->setGroup("General");
+- userFonts.append(KGlobal::config()->readEntry("fixed", "courier,10,-1,5,50,0,0,0,0,0"));
+- userFonts.append(KGlobal::config()->readEntry("font", "helvetica,12,-1,5,50,0,0,0,0,0"));
+- userFonts.append(KGlobal::config()->readEntry("menuFont", "helvetica,12,-1,5,50,0,0,0,0,0"));
+- userFonts.append(KGlobal::config()->readEntry("taskbarFont", "helvetica,11,-1,5,50,0,0,0,0,0"));
+- userFonts.append(KGlobal::config()->readEntry("toolBarFont", "helvetica,12,-1,5,50,0,0,0,0,0"));
++ userFonts.append(KGlobal::config()->readEntry("fixed", "monospace,10,-1,5,50,0,0,0,0,0"));
++ userFonts.append(KGlobal::config()->readEntry("font", "sans serif,10,-1,5,50,0,0,0,0,0"));
++ userFonts.append(KGlobal::config()->readEntry("menuFont", "sans serif,10,-1,5,50,0,0,0,0,0"));
++ userFonts.append(KGlobal::config()->readEntry("taskbarFont", "sans serif,10,-1,5,50,0,0,0,0,0"));
++ userFonts.append(KGlobal::config()->readEntry("toolBarFont", "sans serif,10,-1,5,50,0,0,0,0,0"));
+ KGlobal::config()->setGroup("WM");
+- userFonts.append(KGlobal::config()->readEntry("activeFont", "helvetica,12,-1,5,75,0,0,0,0,0"));
++ userFonts.append(KGlobal::config()->readEntry("activeFont", "sans serif,10,-1,5,75,0,0,0,0,0"));
+
+ KGlobal::config()->setGroup("PanelIcons");
+ st_UserGamma.EffectPanel=KGlobal::config()->readEntry("ActiveEffect", "none");
Modified: branches/kde-3.4.0/packages/kdebase/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/98_buildprep.diff 2005-04-06 22:56:40 UTC (rev 977)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/98_buildprep.diff 2005-04-06 22:57:49 UTC (rev 978)
@@ -1,12 +1,12 @@
#DPATCHLEVEL=1
-diff -Nrua kdebase-3.4.0.orig/Makefile.in kdebase-3.4.0/Makefile.in
+diff -Nru kdebase-3.4.0.orig/Makefile.in kdebase-3.4.0/Makefile.in
--- kdebase-3.4.0.orig/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/Makefile.in 2005-03-18 14:34:05.000000000 -0500
++++ kdebase-3.4.0/Makefile.in 2005-04-06 13:31: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,
@@ -124,10 +124,27 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/acinclude.m4 kdebase-3.4.0/acinclude.m4
+diff -Nru kdebase-3.4.0.orig/acinclude.m4 kdebase-3.4.0/acinclude.m4
--- kdebase-3.4.0.orig/acinclude.m4 2005-03-04 08:11:03.000000000 -0500
-+++ kdebase-3.4.0/acinclude.m4 2005-03-18 14:26:44.000000000 -0500
-@@ -1682,15 +1682,6 @@
++++ kdebase-3.4.0/acinclude.m4 2005-04-06 13:16:26.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 kdebase-3.4.0.orig/aclocal.m4 kdebase-3.4.0/aclocal.m4
+diff -Nru kdebase-3.4.0.orig/aclocal.m4 kdebase-3.4.0/aclocal.m4
--- kdebase-3.4.0.orig/aclocal.m4 2005-03-04 08:11:28.000000000 -0500
-+++ kdebase-3.4.0/aclocal.m4 2005-03-18 14:27:19.000000000 -0500
++++ kdebase-3.4.0/aclocal.m4 2005-04-06 13:17:49.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 kdebase-3.4.0.orig/applnk/Makefile.in kdebase-3.4.0/applnk/Makefile.in
+diff -Nru kdebase-3.4.0.orig/applnk/Makefile.in kdebase-3.4.0/applnk/Makefile.in
--- kdebase-3.4.0.orig/applnk/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/applnk/Makefile.in 2005-03-18 14:34:05.000000000 -0500
++++ kdebase-3.4.0/applnk/Makefile.in 2005-04-06 13:31:05.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 kdebase-3.4.0.orig/applnk/compat/Makefile.in kdebase-3.4.0/applnk/compat/Makefile.in
+diff -Nru kdebase-3.4.0.orig/applnk/compat/Makefile.in kdebase-3.4.0/applnk/compat/Makefile.in
--- kdebase-3.4.0.orig/applnk/compat/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/applnk/compat/Makefile.in 2005-03-18 14:34:05.000000000 -0500
++++ kdebase-3.4.0/applnk/compat/Makefile.in 2005-04-06 13:31:05.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,
@@ -2393,9 +2420,9 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/config.h.in kdebase-3.4.0/config.h.in
+diff -Nru kdebase-3.4.0.orig/config.h.in kdebase-3.4.0/config.h.in
--- kdebase-3.4.0.orig/config.h.in 2005-03-04 08:11:44.000000000 -0500
-+++ kdebase-3.4.0/config.h.in 2005-03-18 14:27:44.000000000 -0500
++++ kdebase-3.4.0/config.h.in 2005-04-06 13:18:41.000000000 -0400
@@ -131,9 +131,6 @@
/* Defines if you have GL (Mesa, OpenGL, ...) */
#undef HAVE_GL
@@ -2406,9 +2433,19 @@
/* Define to 1 if you have the `grantpt' function. */
#undef HAVE_GRANTPT
-diff -Nrua kdebase-3.4.0.orig/configure kdebase-3.4.0/configure
+@@ -415,6 +412,9 @@
+ /* Define to 1 if you have the <sys/ioctl.h> header file. */
+ #undef HAVE_SYS_IOCTL_H
+
++/* Define to 1 if you have the <sys/loadavg.h> header file. */
++#undef HAVE_SYS_LOADAVG_H
++
+ /* Define to 1 if you have the <sys/mount.h> header file. */
+ #undef HAVE_SYS_MOUNT_H
+
+diff -Nru kdebase-3.4.0.orig/configure kdebase-3.4.0/configure
--- kdebase-3.4.0.orig/configure 2005-03-04 08:15:11.000000000 -0500
-+++ kdebase-3.4.0/configure 2005-03-18 14:34:46.000000000 -0500
++++ kdebase-3.4.0/configure 2005-04-06 13:31:52.000000000 -0400
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
@@ -2688,6 +2725,22 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
+@@ -5383,6 +5388,7 @@
+ fi
+ rm -f conftest.h conftest.h.gch
+ fi
++ fi
+
+
+ if test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes"; then
+@@ -5393,7 +5399,6 @@
+ unsermake_enable_pch_FALSE=
+ fi
+
+- fi
+ if test "$CXX" = "KCC"; then
+
+ if test "$kde_use_pch" = "yes"; then
@@ -5442,8 +5447,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7417,16 +7470,43 @@
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -32037,7 +31951,7 @@
+@@ -30694,8 +30608,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
+@@ -32037,7 +31967,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
- echo "configure: 32040: $i/$j" >&5
-+ echo "configure: 31954: $i/$j" >&5
++ echo "configure: 31970: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32234,8 +32148,7 @@
+@@ -32234,8 +32164,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7436,7 +7516,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32322,8 +32235,7 @@
+@@ -32322,8 +32251,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7446,7 +7526,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32410,8 +32322,7 @@
+@@ -32410,8 +32338,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7456,7 +7536,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32498,8 +32409,7 @@
+@@ -32498,8 +32425,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7466,7 +7546,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32534,7 +32444,114 @@
+@@ -32534,7 +32460,114 @@
echo "${ECHO_T}yes" >&6
:
@@ -7582,7 +7662,7 @@
HAVE_GCC_VISIBILITY=1
cat >>confdefs.h <<_ACEOF
-@@ -32618,8 +32635,7 @@
+@@ -32618,8 +32651,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7592,7 +7672,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32676,8 +32692,7 @@
+@@ -32676,8 +32708,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7602,7 +7682,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32816,8 +32831,7 @@
+@@ -32816,8 +32847,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7612,7 +7692,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33057,8 +33071,7 @@
+@@ -33057,8 +33087,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7622,7 +7702,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33126,8 +33139,7 @@
+@@ -33126,8 +33155,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7632,7 +7712,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33222,8 +33234,7 @@
+@@ -33222,8 +33250,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7642,7 +7722,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33466,8 +33477,7 @@
+@@ -33466,8 +33493,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7652,7 +7732,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33539,8 +33549,7 @@
+@@ -33539,8 +33565,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7662,7 +7742,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33594,8 +33603,7 @@
+@@ -33594,8 +33619,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7672,7 +7752,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33666,8 +33674,7 @@
+@@ -33666,8 +33690,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7682,7 +7762,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33721,8 +33728,7 @@
+@@ -33721,8 +33744,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7692,7 +7772,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33789,8 +33795,7 @@
+@@ -33789,8 +33811,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7702,7 +7782,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33996,8 +34001,7 @@
+@@ -33996,8 +34017,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7712,7 +7792,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34142,8 +34146,7 @@
+@@ -34142,8 +34162,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7722,7 +7802,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34316,8 +34319,7 @@
+@@ -34316,8 +34335,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7732,7 +7812,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34376,8 +34378,7 @@
+@@ -34376,8 +34394,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7742,7 +7822,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34472,8 +34473,7 @@
+@@ -34472,8 +34489,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7752,7 +7832,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34539,8 +34539,7 @@
+@@ -34539,8 +34555,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7762,7 +7842,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34605,8 +34604,7 @@
+@@ -34605,8 +34620,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7772,7 +7852,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34669,8 +34667,7 @@
+@@ -34669,8 +34683,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7782,7 +7862,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34731,8 +34728,7 @@
+@@ -34731,8 +34744,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7792,7 +7872,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34802,8 +34798,7 @@
+@@ -34802,8 +34814,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7802,7 +7882,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34869,8 +34864,7 @@
+@@ -34869,8 +34880,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7812,7 +7892,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34936,8 +34930,7 @@
+@@ -34936,8 +34946,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7822,7 +7902,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35022,8 +35015,7 @@
+@@ -35022,8 +35031,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7832,7 +7912,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35128,8 +35120,7 @@
+@@ -35128,8 +35136,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7842,7 +7922,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35194,8 +35185,7 @@
+@@ -35194,8 +35201,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7852,7 +7932,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35270,8 +35260,7 @@
+@@ -35270,8 +35276,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7862,7 +7942,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35350,8 +35339,7 @@
+@@ -35350,8 +35355,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7872,7 +7952,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35540,8 +35528,7 @@
+@@ -35540,8 +35544,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7882,7 +7962,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35603,8 +35590,7 @@
+@@ -35603,8 +35606,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7892,7 +7972,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35644,8 +35630,7 @@
+@@ -35644,8 +35646,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7902,7 +7982,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35701,8 +35686,7 @@
+@@ -35701,8 +35702,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7912,7 +7992,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35742,8 +35726,7 @@
+@@ -35742,8 +35742,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7922,7 +8002,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35807,8 +35790,7 @@
+@@ -35807,8 +35806,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7932,7 +8012,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35839,10 +35821,8 @@
+@@ -35839,10 +35837,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7945,7 +8025,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -35954,8 +35934,7 @@
+@@ -35954,8 +35950,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7955,7 +8035,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36017,8 +35996,7 @@
+@@ -36017,8 +36012,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7965,7 +8045,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36058,8 +36036,7 @@
+@@ -36058,8 +36052,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7975,7 +8055,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36115,8 +36092,7 @@
+@@ -36115,8 +36108,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7985,7 +8065,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36156,8 +36132,7 @@
+@@ -36156,8 +36148,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7995,7 +8075,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36221,8 +36196,7 @@
+@@ -36221,8 +36212,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8005,7 +8085,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36253,10 +36227,8 @@
+@@ -36253,10 +36243,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -8018,7 +8098,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -36368,8 +36340,7 @@
+@@ -36368,8 +36356,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8028,7 +8108,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36431,8 +36402,7 @@
+@@ -36431,8 +36418,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8038,7 +8118,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36472,8 +36442,7 @@
+@@ -36472,8 +36458,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8048,7 +8128,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36529,8 +36498,7 @@
+@@ -36529,8 +36514,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8058,7 +8138,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36570,8 +36538,7 @@
+@@ -36570,8 +36554,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8068,7 +8148,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36635,8 +36602,7 @@
+@@ -36635,8 +36618,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8078,7 +8158,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36667,10 +36633,8 @@
+@@ -36667,10 +36649,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -8091,7 +8171,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -36782,8 +36746,7 @@
+@@ -36782,8 +36762,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8101,7 +8181,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36845,8 +36808,7 @@
+@@ -36845,8 +36824,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8111,7 +8191,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36886,8 +36848,7 @@
+@@ -36886,8 +36864,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8121,7 +8201,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36943,8 +36904,7 @@
+@@ -36943,8 +36920,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8131,7 +8211,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36984,8 +36944,7 @@
+@@ -36984,8 +36960,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8141,7 +8221,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37049,8 +37008,7 @@
+@@ -37049,8 +37024,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8151,7 +8231,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37081,10 +37039,8 @@
+@@ -37081,10 +37055,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -8164,7 +8244,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -37199,8 +37155,7 @@
+@@ -37199,8 +37171,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8174,7 +8254,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37242,8 +37197,7 @@
+@@ -37242,8 +37213,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8184,7 +8264,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37300,8 +37254,7 @@
+@@ -37300,8 +37270,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8194,7 +8274,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37482,8 +37435,7 @@
+@@ -37482,8 +37451,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8204,7 +8284,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37537,9 +37489,6 @@
+@@ -37537,9 +37505,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8214,7 +8294,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37573,8 +37522,7 @@
+@@ -37573,8 +37538,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8224,7 +8304,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37678,8 +37626,7 @@
+@@ -37678,8 +37642,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8234,7 +8314,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37758,9 +37705,6 @@
+@@ -37758,9 +37721,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8244,7 +8324,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37791,8 +37735,7 @@
+@@ -37791,8 +37751,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8254,7 +8334,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37893,8 +37836,7 @@
+@@ -37893,8 +37852,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8264,7 +8344,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37973,9 +37915,6 @@
+@@ -37973,9 +37931,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8274,7 +8354,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38006,8 +37945,7 @@
+@@ -38006,8 +37961,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8284,7 +8364,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38108,8 +38046,7 @@
+@@ -38108,8 +38062,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8294,7 +8374,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38188,9 +38125,6 @@
+@@ -38188,9 +38141,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8304,7 +8384,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38226,8 +38160,7 @@
+@@ -38226,8 +38176,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8314,7 +8394,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38334,8 +38267,7 @@
+@@ -38334,8 +38283,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8324,7 +8404,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38414,9 +38346,6 @@
+@@ -38414,9 +38362,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8334,7 +8414,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38451,8 +38380,7 @@
+@@ -38451,8 +38396,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8344,7 +8424,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38557,8 +38485,7 @@
+@@ -38557,8 +38501,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8354,7 +8434,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38637,9 +38564,6 @@
+@@ -38637,9 +38580,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8364,7 +8444,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38672,8 +38596,7 @@
+@@ -38672,8 +38612,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8374,7 +8454,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38776,8 +38699,7 @@
+@@ -38776,8 +38715,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8384,7 +8464,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38856,9 +38778,6 @@
+@@ -38856,9 +38794,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8394,7 +8474,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38891,8 +38810,7 @@
+@@ -38891,8 +38826,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8404,7 +8484,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38995,8 +38913,7 @@
+@@ -38995,8 +38929,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8414,7 +8494,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39074,9 +38991,6 @@
+@@ -39074,9 +39007,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8424,7 +8504,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39109,8 +39023,7 @@
+@@ -39109,8 +39039,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8434,7 +8514,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39213,8 +39126,7 @@
+@@ -39213,8 +39142,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8444,7 +8524,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39308,8 +39220,7 @@
+@@ -39308,8 +39236,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8454,7 +8534,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39496,8 +39407,7 @@
+@@ -39496,8 +39423,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8464,7 +8544,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39567,8 +39477,7 @@
+@@ -39567,8 +39493,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8474,7 +8554,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39721,8 +39630,7 @@
+@@ -39721,8 +39646,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8484,7 +8564,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40256,8 +40164,7 @@
+@@ -40256,8 +40180,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8494,7 +8574,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40549,8 +40456,7 @@
+@@ -40549,8 +40472,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8504,7 +8584,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40695,8 +40601,7 @@
+@@ -40695,8 +40617,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8514,7 +8594,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40782,8 +40687,7 @@
+@@ -40782,8 +40703,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8524,7 +8604,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40845,8 +40749,7 @@
+@@ -40845,8 +40765,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8534,7 +8614,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40917,8 +40820,7 @@
+@@ -40917,8 +40836,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8544,7 +8624,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41008,8 +40910,7 @@
+@@ -41008,8 +40926,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8554,7 +8634,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41083,8 +40984,7 @@
+@@ -41083,8 +41000,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8564,7 +8644,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41194,8 +41094,7 @@
+@@ -41194,8 +41110,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8574,7 +8654,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41364,8 +41263,7 @@
+@@ -41364,8 +41279,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8584,16 +8664,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41427,7 +41325,7 @@
+@@ -41427,7 +41341,7 @@
do
for j in qsql.html;
do
- echo "configure: 41430: $i/$j" >&5
-+ echo "configure: 41328: $i/$j" >&5
++ echo "configure: 41344: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -41637,8 +41535,7 @@
+@@ -41637,8 +41551,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8603,7 +8683,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41731,8 +41628,7 @@
+@@ -41731,8 +41644,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8613,16 +8693,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41904,7 +41800,7 @@
+@@ -41904,7 +41816,7 @@
do
for j in openssl/ssl.h;
do
- echo "configure: 41907: $i/$j" >&5
-+ echo "configure: 41803: $i/$j" >&5
++ echo "configure: 41819: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -41959,8 +41855,7 @@
+@@ -41959,8 +41871,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8632,7 +8712,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42208,8 +42103,7 @@
+@@ -42208,8 +42119,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8642,7 +8722,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42263,8 +42157,7 @@
+@@ -42263,8 +42173,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8652,7 +8732,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42366,8 +42259,7 @@
+@@ -42366,8 +42275,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8662,7 +8742,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42432,8 +42324,7 @@
+@@ -42432,8 +42340,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8672,7 +8752,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42691,8 +42582,7 @@
+@@ -42691,8 +42598,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8682,7 +8762,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42757,8 +42647,7 @@
+@@ -42757,8 +42663,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8692,7 +8772,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42908,8 +42797,7 @@
+@@ -42908,8 +42813,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8702,7 +8782,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43062,8 +42950,7 @@
+@@ -43062,8 +42966,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8712,7 +8792,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43165,8 +43052,7 @@
+@@ -43165,8 +43068,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8722,7 +8802,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43284,8 +43170,7 @@
+@@ -43284,8 +43186,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8732,7 +8812,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43410,8 +43295,7 @@
+@@ -43410,8 +43311,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8742,7 +8822,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43798,8 +43682,7 @@
+@@ -43798,8 +43698,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8752,7 +8832,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43969,8 +43852,7 @@
+@@ -43969,8 +43868,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8762,7 +8842,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44022,13 +43904,13 @@
+@@ -44022,13 +43920,13 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -8780,7 +8860,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -44060,8 +43942,7 @@
+@@ -44060,8 +43958,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8790,7 +8870,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44073,20 +43954,20 @@
+@@ -44073,20 +43970,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -8816,7 +8896,7 @@
ac_font_enc_lib=1
else
ac_font_enc_lib=0
-@@ -44096,7 +43977,7 @@
+@@ -44096,7 +43993,7 @@
LIBS="$kde_save_LIBS"
if test "$ac_font_enc_lib" = "1"; then
@@ -8825,7 +8905,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_FONT_ENC 1
-@@ -44147,8 +44028,7 @@
+@@ -44147,8 +44044,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8835,7 +8915,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44378,8 +44258,7 @@
+@@ -44378,8 +44274,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8845,7 +8925,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44445,8 +44324,7 @@
+@@ -44445,8 +44340,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8855,7 +8935,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44492,8 +44370,7 @@
+@@ -44492,8 +44386,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8865,7 +8945,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44573,8 +44450,7 @@
+@@ -44573,8 +44466,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8875,7 +8955,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44664,8 +44540,7 @@
+@@ -44664,8 +44556,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8885,7 +8965,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44768,8 +44643,7 @@
+@@ -44768,8 +44659,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8895,7 +8975,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44966,8 +44840,7 @@
+@@ -44966,8 +44856,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8905,7 +8985,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45168,8 +45041,7 @@
+@@ -45168,8 +45057,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8915,7 +8995,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45247,8 +45119,7 @@
+@@ -45247,8 +45135,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8925,7 +9005,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45311,8 +45182,7 @@
+@@ -45311,8 +45198,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8935,7 +9015,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45396,8 +45266,7 @@
+@@ -45396,8 +45282,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8945,7 +9025,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45439,13 +45308,13 @@
+@@ -45439,13 +45324,13 @@
fi
@@ -8963,7 +9043,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -45477,8 +45346,7 @@
+@@ -45477,8 +45362,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8973,7 +9053,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45490,27 +45358,27 @@
+@@ -45490,27 +45374,27 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -9007,7 +9087,7 @@
fi
-@@ -45579,8 +45447,7 @@
+@@ -45579,8 +45463,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9017,7 +9097,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45605,13 +45472,13 @@
+@@ -45605,13 +45488,13 @@
echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86misc_h" >&6
if test $ac_cv_header_X11_extensions_xf86misc_h = yes; then
@@ -9035,7 +9115,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -45643,8 +45510,7 @@
+@@ -45643,8 +45526,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9045,7 +9125,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45656,27 +45522,27 @@
+@@ -45656,27 +45538,27 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -9079,7 +9159,7 @@
fi
-@@ -45695,13 +45561,13 @@
+@@ -45695,13 +45577,13 @@
if test -n "$LIB_XF86MISC"; then
@@ -9097,7 +9177,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -45733,8 +45599,7 @@
+@@ -45733,8 +45615,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9107,7 +9187,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45746,20 +45611,20 @@
+@@ -45746,20 +45627,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -9133,7 +9213,7 @@
cat >>confdefs.h <<\_ACEOF
-@@ -45962,8 +45827,7 @@
+@@ -45962,8 +45843,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9143,16 +9223,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46118,7 +45982,7 @@
+@@ -46102,7 +45982,7 @@
+ echo "$as_me:$LINENO: checking X paths" >&5
+ echo $ECHO_N "checking X paths... $ECHO_C" >&6
+-imkv=7
++imkv=8
+ test "$kde_cv_defines_imake_version" = $imkv || unset kde_cv_defines_imake
+ if test "${kde_cv_defines_imake+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -46118,7 +45998,7 @@
+
EOF
if $XMKMF >&5 2>&1 && test -f Makefile; then
- kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null`
-+ kde_cv_defines_imake=`${MAKE-make} -s acimake 2> /dev/null`
++ kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null | grep -v "^make"`
kde_cv_defines_imake_version=$imkv
else
echo "$as_me:$LINENO: result: failed" >&5
-@@ -46234,8 +46098,7 @@
+@@ -46234,8 +46114,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9162,7 +9251,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46269,6 +46132,7 @@
+@@ -46269,6 +46148,7 @@
case $host_os in
linux*) ac_cv_func_getutxent=no;;
@@ -9170,7 +9259,7 @@
*) echo "$as_me:$LINENO: checking for getutxent" >&5
echo $ECHO_N "checking for getutxent... $ECHO_C" >&6
if test "${ac_cv_func_getutxent+set}" = set; then
-@@ -46334,8 +46198,7 @@
+@@ -46334,8 +46214,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9180,7 +9269,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46433,8 +46296,7 @@
+@@ -46433,8 +46312,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9190,7 +9279,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46502,8 +46364,7 @@
+@@ -46502,8 +46380,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9200,7 +9289,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46547,8 +46408,7 @@
+@@ -46547,8 +46424,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9210,7 +9299,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46614,8 +46474,7 @@
+@@ -46614,8 +46490,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9220,7 +9309,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46659,8 +46518,7 @@
+@@ -46659,8 +46534,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9230,7 +9319,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46729,8 +46587,7 @@
+@@ -46729,8 +46603,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9240,7 +9329,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46777,8 +46634,7 @@
+@@ -46777,8 +46650,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9250,7 +9339,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46888,8 +46744,7 @@
+@@ -46888,8 +46760,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9260,7 +9349,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46927,7 +46782,8 @@
+@@ -46927,7 +46798,8 @@
@@ -9270,7 +9359,7 @@
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -46995,8 +46851,7 @@
+@@ -46995,8 +46867,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9280,7 +9369,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47029,89 +46884,6 @@
+@@ -47029,89 +46900,6 @@
done
@@ -9370,7 +9459,7 @@
for ac_func in arc4random
do
-@@ -47181,8 +46953,7 @@
+@@ -47181,8 +46969,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9380,7 +9469,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47293,8 +47064,7 @@
+@@ -47293,8 +47080,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9390,7 +9479,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47328,13 +47098,13 @@
+@@ -47328,13 +47114,13 @@
fi
@@ -9408,7 +9497,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -47360,8 +47130,7 @@
+@@ -47360,8 +47146,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9418,7 +9507,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47373,20 +47142,20 @@
+@@ -47373,20 +47158,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -9444,7 +9533,7 @@
:
else
-@@ -47406,13 +47175,13 @@
+@@ -47406,13 +47191,13 @@
with_xdmcp=yes
fi;
if test "x$with_xdmcp" = xyes; then
@@ -9462,7 +9551,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -47438,8 +47207,7 @@
+@@ -47438,8 +47223,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9472,7 +9561,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47451,21 +47219,21 @@
+@@ -47451,21 +47235,21 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -9500,7 +9589,7 @@
fi
if test -n "$LIBXDMCP"; then
-@@ -47495,8 +47263,7 @@
+@@ -47495,8 +47279,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9510,7 +9599,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47605,8 +47372,7 @@
+@@ -47605,8 +47388,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9520,7 +9609,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47715,8 +47481,7 @@
+@@ -47715,8 +47497,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9530,7 +9619,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47819,8 +47584,7 @@
+@@ -47819,8 +47600,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9540,7 +9629,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47888,8 +47652,7 @@
+@@ -47888,8 +47668,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9550,7 +9639,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47979,8 +47742,7 @@
+@@ -47979,8 +47758,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9560,7 +9649,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48156,8 +47918,7 @@
+@@ -48156,8 +47934,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9570,7 +9659,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48463,8 +48224,7 @@
+@@ -48463,8 +48240,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9580,16 +9669,174 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48555,7 +48315,7 @@
+@@ -48514,6 +48290,157 @@
+
+
+
++for ac_header in sys/loadavg.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++else
++ # Is the header compilable?
++echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++#include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++ (eval $ac_compile) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest.$ac_objext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ ac_header_compiler=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null; then
++ if test -s conftest.err; then
++ ac_cpp_err=$ac_c_preproc_warn_flag
++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++ else
++ ac_cpp_err=
++ fi
++else
++ ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++ ac_header_preproc=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So? What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++ yes:no: )
++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++ ac_header_preproc=yes
++ ;;
++ no:yes:* )
++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++ (
++ cat <<\_ASBOX
++## ------------------------------------------ ##
++## Report this to the AC_PACKAGE_NAME lists. ##
++## ------------------------------------------ ##
++_ASBOX
++ ) |
++ sed "s/^/$as_me: WARNING: /" >&2
++ ;;
++esac
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ eval "$as_ac_Header=\$ac_header_preproc"
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++ cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++
++done
++
++
++
++
+ LIBSSL="-lssl -lcrypto"
+
+
+@@ -48555,7 +48482,7 @@
do
for j in openssl/ssl.h;
do
- echo "configure: 48558: $i/$j" >&5
-+ echo "configure: 48318: $i/$j" >&5
++ echo "configure: 48485: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -48610,8 +48370,7 @@
+@@ -48610,8 +48537,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9599,7 +9846,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48848,8 +48607,7 @@
+@@ -48848,8 +48774,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9609,7 +9856,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49021,8 +48779,7 @@
+@@ -49021,8 +48946,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9619,7 +9866,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49193,8 +48950,7 @@
+@@ -49193,8 +49117,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9629,7 +9876,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49286,8 +49042,7 @@
+@@ -49286,8 +49209,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9639,7 +9886,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49376,8 +49131,7 @@
+@@ -49376,8 +49298,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9649,7 +9896,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49466,8 +49220,7 @@
+@@ -49466,8 +49387,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9659,7 +9906,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49561,8 +49314,7 @@
+@@ -49561,8 +49481,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9669,7 +9916,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49667,8 +49419,7 @@
+@@ -49667,8 +49586,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9679,7 +9926,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49857,8 +49608,7 @@
+@@ -49857,8 +49775,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9689,25 +9936,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49916,7 +49666,7 @@
+@@ -49916,7 +49833,7 @@
do
for j in ldap.h;
do
- echo "configure: 49919: $i/$j" >&5
-+ echo "configure: 49669: $i/$j" >&5
++ echo "configure: 49836: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ldap_incdir=$i
-@@ -49938,7 +49688,7 @@
+@@ -49938,7 +49855,7 @@
do
for j in libldap.$ext;
do
- echo "configure: 49941: $i/$j" >&5
-+ echo "configure: 49691: $i/$j" >&5
++ echo "configure: 49858: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ldap_libdir=$i
-@@ -50035,8 +49785,7 @@
+@@ -50035,8 +49952,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9717,7 +9964,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50133,8 +49882,7 @@
+@@ -50133,8 +50049,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9727,70 +9974,100 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50292,7 +50040,7 @@
+@@ -50276,10 +50191,10 @@
+
+ if test "x$hal_test" = "xyes" ; then
+
+-########### Check for the HAL
++########### Check for the HAL, version 0.4.x
+
+- echo "$as_me:$LINENO: checking for the HAL" >&5
+-echo $ECHO_N "checking for the HAL... $ECHO_C" >&6
++ echo "$as_me:$LINENO: checking for the HAL 0.4" >&5
++echo $ECHO_N "checking for the HAL 0.4... $ECHO_C" >&6
+
+ hal_inc=NOTFOUND
+ hal_lib=NOTFOUND
+@@ -50292,7 +50207,7 @@
do
for j in libhal.h libhal-storage.h;
do
- echo "configure: 50295: $i/$j" >&5
-+ echo "configure: 50043: $i/$j" >&5
++ echo "configure: 50210: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
hal_incdir=$i
-@@ -50314,7 +50062,7 @@
+@@ -50314,7 +50229,7 @@
do
for j in libhal.so libhal-storage.so;
do
- echo "configure: 50317: $i/$j" >&5
-+ echo "configure: 50065: $i/$j" >&5
++ echo "configure: 50232: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
hal_libdir=$i
-@@ -50359,7 +50107,7 @@
+@@ -50329,6 +50244,15 @@
+ hal_lib=FOUND
+ fi
+
++ if test -r $hal_incdir/libhal.h ; then
++ hal_version=5
++ grep LibHalFunctions $hal_incdir/libhal.h \
++ > /dev/null 2>&1 && hal_version=4
++ if test $hal_version = 5 ; then
++ hal_lib=NOT_FOUND
++ fi
++ fi
++
+
+ if test $hal_inc = FOUND && test $hal_lib = FOUND ; then
+ echo "$as_me:$LINENO: result: headers $hal_incdir libraries $hal_libdir" >&5
+@@ -50359,7 +50283,7 @@
do
for j in dbus/dbus.h;
do
- echo "configure: 50362: $i/$j" >&5
-+ echo "configure: 50110: $i/$j" >&5
++ echo "configure: 50286: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbus_incdir=$i
-@@ -50376,7 +50124,7 @@
+@@ -50376,7 +50300,7 @@
do
for j in dbus/dbus-arch-deps.h;
do
- echo "configure: 50379: $i/$j" >&5
-+ echo "configure: 50127: $i/$j" >&5
++ echo "configure: 50303: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbus_incdir_arch_deps=$i
-@@ -50398,7 +50146,7 @@
+@@ -50398,7 +50322,7 @@
do
for j in libdbus-1.so;
do
- echo "configure: 50401: $i/$j" >&5
-+ echo "configure: 50149: $i/$j" >&5
++ echo "configure: 50325: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbus_libdir=$i
-@@ -50441,7 +50189,7 @@
+@@ -50441,7 +50365,7 @@
do
for j in dbus/connection.h;
do
- echo "configure: 50444: $i/$j" >&5
-+ echo "configure: 50192: $i/$j" >&5
++ echo "configure: 50368: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbusqt_incdir=$i
-@@ -50468,7 +50216,7 @@
+@@ -50468,7 +50392,7 @@
do
for j in libdbus-qt-1.so;
do
- echo "configure: 50471: $i/$j" >&5
-+ echo "configure: 50219: $i/$j" >&5
++ echo "configure: 50395: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbusqt_libdir=$i
-@@ -50582,8 +50330,7 @@
+@@ -50582,8 +50506,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9800,7 +10077,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50612,8 +50359,7 @@
+@@ -50612,8 +50535,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9810,7 +10087,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50683,8 +50429,7 @@
+@@ -50683,8 +50605,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9820,7 +10097,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50736,8 +50481,7 @@
+@@ -50736,8 +50657,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9830,7 +10107,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50808,8 +50552,7 @@
+@@ -50808,8 +50728,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9840,7 +10117,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50861,8 +50604,7 @@
+@@ -50861,8 +50780,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9850,7 +10127,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50952,8 +50694,7 @@
+@@ -50952,8 +50870,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9860,7 +10137,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51122,8 +50863,7 @@
+@@ -51122,8 +51039,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9870,7 +10147,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51240,8 +50980,7 @@
+@@ -51240,8 +51156,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9880,7 +10157,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51316,8 +51055,7 @@
+@@ -51316,8 +51231,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9890,7 +10167,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51577,8 +51315,7 @@
+@@ -51577,8 +51491,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9900,7 +10177,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51700,8 +51437,7 @@
+@@ -51700,8 +51613,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9910,7 +10187,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51787,8 +51523,7 @@
+@@ -51787,8 +51699,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9920,7 +10197,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51856,8 +51591,7 @@
+@@ -51856,8 +51767,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9930,7 +10207,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51912,8 +51646,7 @@
+@@ -51912,8 +51822,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9940,7 +10217,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52537,8 +52270,7 @@
+@@ -52537,8 +52446,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9950,7 +10227,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52617,8 +52349,7 @@
+@@ -52617,8 +52525,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9960,7 +10237,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52681,8 +52412,7 @@
+@@ -52681,8 +52588,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9970,7 +10247,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52879,8 +52609,7 @@
+@@ -52879,8 +52785,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9980,7 +10257,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52982,8 +52711,7 @@
+@@ -52982,8 +52887,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9990,7 +10267,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53152,8 +52880,7 @@
+@@ -53152,8 +53056,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10000,7 +10277,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53239,8 +52966,7 @@
+@@ -53239,8 +53142,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10010,7 +10287,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53326,8 +53052,7 @@
+@@ -53326,8 +53228,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10020,7 +10297,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53425,8 +53150,7 @@
+@@ -53425,8 +53326,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10030,7 +10307,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53582,8 +53306,7 @@
+@@ -53582,8 +53482,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10040,7 +10317,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53663,8 +53386,7 @@
+@@ -53663,8 +53562,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10050,7 +10327,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -55229,6 +54951,13 @@
+@@ -55229,6 +55127,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -10064,7 +10341,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
-@@ -56806,6 +56535,9 @@
+@@ -56806,6 +56711,9 @@
s,@AMTAR@,$AMTAR,;t t
s,@am__tar@,$am__tar,;t t
s,@am__untar@,$am__untar,;t t
@@ -10074,7 +10351,7 @@
s,@KDECONFIG@,$KDECONFIG,;t t
s,@kde_libs_prefix@,$kde_libs_prefix,;t t
s,@kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -57374,11 +57106,6 @@
+@@ -57374,11 +57282,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -10086,7 +10363,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. */
-@@ -57417,6 +57144,12 @@
+@@ -57417,6 +57320,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -10099,9 +10376,20 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
-diff -Nrua kdebase-3.4.0.orig/configure.in kdebase-3.4.0/configure.in
+diff -Nru kdebase-3.4.0.orig/configure.files kdebase-3.4.0/configure.files
+--- kdebase-3.4.0.orig/configure.files 2005-03-04 08:11:04.000000000 -0500
++++ kdebase-3.4.0/configure.files 2005-04-06 13:16:29.000000000 -0400
+@@ -26,6 +26,7 @@
+ ./kdm/configure.in.in
+ ./khotkeys/configure.in.in
+ ./kicker/applets/naughty/configure.in.in
++./kicker/extensions/kasbar/configure.in.in
+ ./kioslave/configure.in.bot
+ ./kioslave/configure.in.in
+ ./kioslave/filter/configure.in.in
+diff -Nru kdebase-3.4.0.orig/configure.in kdebase-3.4.0/configure.in
--- kdebase-3.4.0.orig/configure.in 2005-03-04 08:11:05.000000000 -0500
-+++ kdebase-3.4.0/configure.in 2005-03-18 14:26:47.000000000 -0500
++++ kdebase-3.4.0/configure.in 2005-04-06 13:16:39.000000000 -0400
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(kdebase, "3.4.0") dnl searches for some needed programs
@@ -10158,12 +10446,21 @@
[
AC_DEFINE(HAVE_XF86MISCSETGRABKEYSSTATE, 1, [Define if you have XF86MiscSetGrabKeysState()])
],
+@@ -806,7 +808,7 @@
+
+ dnl ask imake about various X settings
+ AC_MSG_CHECKING([X paths])
+-imkv=7
++imkv=8
+ test "$kde_cv_defines_imake_version" = $imkv || unset kde_cv_defines_imake
+ AC_CACHE_VAL(kde_cv_defines_imake, [
+ rm -fr conftestdir
@@ -819,7 +821,7 @@
]EOF
if $XMKMF >&5 2>&1 && test -f Makefile; then
- kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null`
-+ kde_cv_defines_imake=`${MAKE-make} -s acimake 2> /dev/null`
++ kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null | grep -v "^make"`
kde_cv_defines_imake_version=$imkv
else
AC_MSG_RESULT([failed])
@@ -10242,14 +10539,55 @@
if test -n "$LIBXDMCP"; then
cppflags_safe=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $X_INCLUDES"
-diff -Nrua kdebase-3.4.0.orig/doc/Makefile.in kdebase-3.4.0/doc/Makefile.in
+@@ -1168,6 +1133,12 @@
+ AC_SUBST(LIB_KVM)
+
+ dnl =======================================================
++dnl FILE: ./kicker/extensions/kasbar/configure.in.in
++dnl =======================================================
++
++AC_CHECK_HEADERS(sys/loadavg.h)
++
++dnl =======================================================
+ dnl FILE: ./kioslave/configure.in.in
+ dnl =======================================================
+
+@@ -1330,9 +1301,9 @@
+
+ if test "x$hal_test" = "xyes" ; then
+
+-########### Check for the HAL
++########### Check for the HAL, version 0.4.x
+
+- AC_MSG_CHECKING(for the HAL)
++ AC_MSG_CHECKING(for the HAL 0.4)
+
+ hal_inc=NOTFOUND
+ hal_lib=NOTFOUND
+@@ -1354,6 +1325,15 @@
+ hal_lib=FOUND
+ fi
+
++ if test -r $hal_incdir/libhal.h ; then
++ hal_version=5
++ grep LibHalFunctions $hal_incdir/libhal.h \
++ > /dev/null 2>&1 && hal_version=4
++ if test $hal_version = 5 ; then
++ hal_lib=NOT_FOUND
++ fi
++ fi
++
+
+ if [test $hal_inc = FOUND] && [test $hal_lib = FOUND] ; then
+ AC_MSG_RESULT(headers $hal_incdir libraries $hal_libdir)
+diff -Nru kdebase-3.4.0.orig/doc/Makefile.in kdebase-3.4.0/doc/Makefile.in
--- kdebase-3.4.0.orig/doc/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/Makefile.in 2005-03-18 14:34:05.000000000 -0500
++++ kdebase-3.4.0/doc/Makefile.in 2005-04-06 13:31:05.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,
@@ -10353,14 +10691,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/faq/Makefile.in kdebase-3.4.0/doc/faq/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/faq/Makefile.in kdebase-3.4.0/doc/faq/Makefile.in
--- kdebase-3.4.0.orig/doc/faq/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/faq/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/faq/Makefile.in 2005-04-06 13:31:05.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,
@@ -10442,14 +10780,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/glossary/Makefile.in kdebase-3.4.0/doc/glossary/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/glossary/Makefile.in kdebase-3.4.0/doc/glossary/Makefile.in
--- kdebase-3.4.0.orig/doc/glossary/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/glossary/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/glossary/Makefile.in 2005-04-06 13:31:05.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,
@@ -10498,14 +10836,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kappfinder/Makefile.in kdebase-3.4.0/doc/kappfinder/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kappfinder/Makefile.in kdebase-3.4.0/doc/kappfinder/Makefile.in
--- kdebase-3.4.0.orig/doc/kappfinder/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kappfinder/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kappfinder/Makefile.in 2005-04-06 13:31:05.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,
@@ -10554,14 +10892,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kate/Makefile.in kdebase-3.4.0/doc/kate/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kate/Makefile.in kdebase-3.4.0/doc/kate/Makefile.in
--- kdebase-3.4.0.orig/doc/kate/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kate/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kate/Makefile.in 2005-04-06 13:31:05.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,
@@ -10647,14 +10985,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/Makefile.in kdebase-3.4.0/doc/kcontrol/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/Makefile.in kdebase-3.4.0/doc/kcontrol/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/Makefile.in 2005-04-06 13:31:05.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,
@@ -10793,14 +11131,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/arts/Makefile.in kdebase-3.4.0/doc/kcontrol/arts/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/arts/Makefile.in kdebase-3.4.0/doc/kcontrol/arts/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/arts/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/arts/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/arts/Makefile.in 2005-04-06 13:31:05.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,
@@ -10882,14 +11220,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/background/Makefile.in kdebase-3.4.0/doc/kcontrol/background/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/background/Makefile.in kdebase-3.4.0/doc/kcontrol/background/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/background/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/background/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/background/Makefile.in 2005-04-06 13:31:05.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,
@@ -10938,14 +11276,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/bell/Makefile.in kdebase-3.4.0/doc/kcontrol/bell/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/bell/Makefile.in kdebase-3.4.0/doc/kcontrol/bell/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/bell/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/bell/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/bell/Makefile.in 2005-04-06 13:31:05.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,
@@ -10994,14 +11332,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/cache/Makefile.in kdebase-3.4.0/doc/kcontrol/cache/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/cache/Makefile.in kdebase-3.4.0/doc/kcontrol/cache/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/cache/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/cache/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/cache/Makefile.in 2005-04-06 13:31:05.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,
@@ -11050,14 +11388,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/clock/Makefile.in kdebase-3.4.0/doc/kcontrol/clock/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/clock/Makefile.in kdebase-3.4.0/doc/kcontrol/clock/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/clock/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/clock/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/clock/Makefile.in 2005-04-06 13:31:05.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,
@@ -11106,14 +11444,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/colors/Makefile.in kdebase-3.4.0/doc/kcontrol/colors/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/colors/Makefile.in kdebase-3.4.0/doc/kcontrol/colors/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/colors/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/colors/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/colors/Makefile.in 2005-04-06 13:31:05.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,
@@ -11162,14 +11500,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/cookies/Makefile.in kdebase-3.4.0/doc/kcontrol/cookies/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/cookies/Makefile.in kdebase-3.4.0/doc/kcontrol/cookies/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/cookies/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/cookies/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/cookies/Makefile.in 2005-04-06 13:31:05.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,
@@ -11218,14 +11556,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/crypto/Makefile.in kdebase-3.4.0/doc/kcontrol/crypto/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/crypto/Makefile.in kdebase-3.4.0/doc/kcontrol/crypto/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/crypto/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/crypto/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/crypto/Makefile.in 2005-04-06 13:31:05.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,
@@ -11274,14 +11612,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/desktop/Makefile.in kdebase-3.4.0/doc/kcontrol/desktop/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/desktop/Makefile.in kdebase-3.4.0/doc/kcontrol/desktop/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/desktop/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/desktop/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/desktop/Makefile.in 2005-04-06 13:31:05.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,
@@ -11330,14 +11668,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/desktopbehavior/Makefile.in kdebase-3.4.0/doc/kcontrol/desktopbehavior/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/desktopbehavior/Makefile.in kdebase-3.4.0/doc/kcontrol/desktopbehavior/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/desktopbehavior/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/desktopbehavior/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/desktopbehavior/Makefile.in 2005-04-06 13:31:05.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,
@@ -11386,14 +11724,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/ebrowsing/Makefile.in kdebase-3.4.0/doc/kcontrol/ebrowsing/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/ebrowsing/Makefile.in kdebase-3.4.0/doc/kcontrol/ebrowsing/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/ebrowsing/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/ebrowsing/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/ebrowsing/Makefile.in 2005-04-06 13:31:05.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,
@@ -11442,14 +11780,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/email/Makefile.in kdebase-3.4.0/doc/kcontrol/email/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/email/Makefile.in kdebase-3.4.0/doc/kcontrol/email/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/email/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/email/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/email/Makefile.in 2005-04-06 13:31:05.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,
@@ -11498,14 +11836,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/energy/Makefile.in kdebase-3.4.0/doc/kcontrol/energy/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/energy/Makefile.in kdebase-3.4.0/doc/kcontrol/energy/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/energy/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/energy/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/energy/Makefile.in 2005-04-06 13:31:05.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,
@@ -11554,14 +11892,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/filemanager/Makefile.in kdebase-3.4.0/doc/kcontrol/filemanager/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/filemanager/Makefile.in kdebase-3.4.0/doc/kcontrol/filemanager/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/filemanager/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/filemanager/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/filemanager/Makefile.in 2005-04-06 13:31:05.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,
@@ -11643,14 +11981,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/filetypes/Makefile.in kdebase-3.4.0/doc/kcontrol/filetypes/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/filetypes/Makefile.in kdebase-3.4.0/doc/kcontrol/filetypes/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/filetypes/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/filetypes/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/filetypes/Makefile.in 2005-04-06 13:31:05.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,
@@ -11699,14 +12037,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/fonts/Makefile.in kdebase-3.4.0/doc/kcontrol/fonts/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/fonts/Makefile.in kdebase-3.4.0/doc/kcontrol/fonts/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/fonts/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/fonts/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/fonts/Makefile.in 2005-04-06 13:31:05.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,
@@ -11755,14 +12093,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/helpindex/Makefile.in kdebase-3.4.0/doc/kcontrol/helpindex/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/helpindex/Makefile.in kdebase-3.4.0/doc/kcontrol/helpindex/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/helpindex/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/helpindex/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/helpindex/Makefile.in 2005-04-06 13:31:05.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,
@@ -11811,14 +12149,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/icons/Makefile.in kdebase-3.4.0/doc/kcontrol/icons/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/icons/Makefile.in kdebase-3.4.0/doc/kcontrol/icons/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/icons/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/icons/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/icons/Makefile.in 2005-04-06 13:31: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,
@@ -11867,14 +12205,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kcmaccess/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmaccess/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/kcmaccess/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmaccess/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/kcmaccess/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kcmaccess/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kcmaccess/Makefile.in 2005-04-06 13:31: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,
@@ -11923,14 +12261,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kcmcss/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmcss/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/kcmcss/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmcss/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/kcmcss/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kcmcss/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kcmcss/Makefile.in 2005-04-06 13:31: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,
@@ -11979,14 +12317,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kcmfontinst/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmfontinst/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/kcmfontinst/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmfontinst/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/kcmfontinst/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kcmfontinst/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kcmfontinst/Makefile.in 2005-04-06 13:31: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,
@@ -12035,14 +12373,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kcmkonsole/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmkonsole/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/kcmkonsole/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmkonsole/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/kcmkonsole/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kcmkonsole/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kcmkonsole/Makefile.in 2005-04-06 13:31: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,
@@ -12091,14 +12429,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kcmlaunch/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmlaunch/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/kcmlaunch/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmlaunch/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/kcmlaunch/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kcmlaunch/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kcmlaunch/Makefile.in 2005-04-06 13:31: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,
@@ -12147,14 +12485,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kcmnotify/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmnotify/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/kcmnotify/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmnotify/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/kcmnotify/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kcmnotify/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kcmnotify/Makefile.in 2005-04-06 13:31: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,
@@ -12203,14 +12541,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kcmsmserver/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmsmserver/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/kcmsmserver/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmsmserver/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/kcmsmserver/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kcmsmserver/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kcmsmserver/Makefile.in 2005-04-06 13:31: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,
@@ -12259,14 +12597,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kcmstyle/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmstyle/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/kcmstyle/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmstyle/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/kcmstyle/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kcmstyle/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kcmstyle/Makefile.in 2005-04-06 13:31: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,
@@ -12315,14 +12653,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kcmtaskbar/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmtaskbar/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/kcmtaskbar/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmtaskbar/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/kcmtaskbar/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kcmtaskbar/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kcmtaskbar/Makefile.in 2005-04-06 13:31: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,
@@ -12371,14 +12709,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kdm/Makefile.in kdebase-3.4.0/doc/kcontrol/kdm/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/kdm/Makefile.in kdebase-3.4.0/doc/kcontrol/kdm/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/kdm/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kdm/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kdm/Makefile.in 2005-04-06 13:31: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,
@@ -12427,14 +12765,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/keyboard/Makefile.in kdebase-3.4.0/doc/kcontrol/keyboard/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/keyboard/Makefile.in kdebase-3.4.0/doc/kcontrol/keyboard/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/keyboard/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/keyboard/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/keyboard/Makefile.in 2005-04-06 13:31: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,
@@ -12483,14 +12821,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/keys/Makefile.in kdebase-3.4.0/doc/kcontrol/keys/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/keys/Makefile.in kdebase-3.4.0/doc/kcontrol/keys/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/keys/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/keys/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/keys/Makefile.in 2005-04-06 13:31: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,
@@ -12539,14 +12877,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/khtml/Makefile.in kdebase-3.4.0/doc/kcontrol/khtml/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/khtml/Makefile.in kdebase-3.4.0/doc/kcontrol/khtml/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/khtml/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/khtml/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/khtml/Makefile.in 2005-04-06 13:31: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,
@@ -12628,14 +12966,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kwindecoration/Makefile.in kdebase-3.4.0/doc/kcontrol/kwindecoration/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/kwindecoration/Makefile.in kdebase-3.4.0/doc/kcontrol/kwindecoration/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/kwindecoration/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/kwindecoration/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kwindecoration/Makefile.in 2005-04-06 13:31: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,
@@ -12684,14 +13022,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/language/Makefile.in kdebase-3.4.0/doc/kcontrol/language/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/language/Makefile.in kdebase-3.4.0/doc/kcontrol/language/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/language/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/language/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/language/Makefile.in 2005-04-06 13:31: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,
@@ -12740,14 +13078,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/mouse/Makefile.in kdebase-3.4.0/doc/kcontrol/mouse/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/mouse/Makefile.in kdebase-3.4.0/doc/kcontrol/mouse/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/mouse/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/mouse/Makefile.in 2005-03-18 14:34:06.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/mouse/Makefile.in 2005-04-06 13:31: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,
@@ -12796,14 +13134,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/netpref/Makefile.in kdebase-3.4.0/doc/kcontrol/netpref/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/netpref/Makefile.in kdebase-3.4.0/doc/kcontrol/netpref/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/netpref/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/netpref/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/netpref/Makefile.in 2005-04-06 13:31: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,
@@ -12852,14 +13190,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/panel/Makefile.in kdebase-3.4.0/doc/kcontrol/panel/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/panel/Makefile.in kdebase-3.4.0/doc/kcontrol/panel/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/panel/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/panel/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/panel/Makefile.in 2005-04-06 13:31: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,
@@ -12908,14 +13246,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/panelappearance/Makefile.in kdebase-3.4.0/doc/kcontrol/panelappearance/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/panelappearance/Makefile.in kdebase-3.4.0/doc/kcontrol/panelappearance/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/panelappearance/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/panelappearance/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/panelappearance/Makefile.in 2005-04-06 13:31: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,
@@ -12964,14 +13302,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/passwords/Makefile.in kdebase-3.4.0/doc/kcontrol/passwords/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/passwords/Makefile.in kdebase-3.4.0/doc/kcontrol/passwords/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/passwords/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/passwords/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/passwords/Makefile.in 2005-04-06 13:31: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,
@@ -13020,14 +13358,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/proxy/Makefile.in kdebase-3.4.0/doc/kcontrol/proxy/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/proxy/Makefile.in kdebase-3.4.0/doc/kcontrol/proxy/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/proxy/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/proxy/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/proxy/Makefile.in 2005-04-06 13:31: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,
@@ -13109,14 +13447,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/screensaver/Makefile.in kdebase-3.4.0/doc/kcontrol/screensaver/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/screensaver/Makefile.in kdebase-3.4.0/doc/kcontrol/screensaver/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/screensaver/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/screensaver/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/screensaver/Makefile.in 2005-04-06 13:31: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,
@@ -13165,14 +13503,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/smb/Makefile.in kdebase-3.4.0/doc/kcontrol/smb/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/smb/Makefile.in kdebase-3.4.0/doc/kcontrol/smb/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/smb/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/smb/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/smb/Makefile.in 2005-04-06 13:31: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,
@@ -13221,14 +13559,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/spellchecking/Makefile.in kdebase-3.4.0/doc/kcontrol/spellchecking/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/spellchecking/Makefile.in kdebase-3.4.0/doc/kcontrol/spellchecking/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/spellchecking/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/spellchecking/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/spellchecking/Makefile.in 2005-04-06 13:31: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,
@@ -13277,14 +13615,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/useragent/Makefile.in kdebase-3.4.0/doc/kcontrol/useragent/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/useragent/Makefile.in kdebase-3.4.0/doc/kcontrol/useragent/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/useragent/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/useragent/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/useragent/Makefile.in 2005-04-06 13:31: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,
@@ -13333,14 +13671,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/windowmanagement/Makefile.in kdebase-3.4.0/doc/kcontrol/windowmanagement/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kcontrol/windowmanagement/Makefile.in kdebase-3.4.0/doc/kcontrol/windowmanagement/Makefile.in
--- kdebase-3.4.0.orig/doc/kcontrol/windowmanagement/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kcontrol/windowmanagement/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/windowmanagement/Makefile.in 2005-04-06 13:31: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,
@@ -13389,14 +13727,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kdcop/Makefile.in kdebase-3.4.0/doc/kdcop/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kdcop/Makefile.in kdebase-3.4.0/doc/kdcop/Makefile.in
--- kdebase-3.4.0.orig/doc/kdcop/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kdcop/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kdcop/Makefile.in 2005-04-06 13:31: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,
@@ -13445,14 +13783,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kdebugdialog/Makefile.in kdebase-3.4.0/doc/kdebugdialog/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kdebugdialog/Makefile.in kdebase-3.4.0/doc/kdebugdialog/Makefile.in
--- kdebase-3.4.0.orig/doc/kdebugdialog/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kdebugdialog/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kdebugdialog/Makefile.in 2005-04-06 13:31: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,
@@ -13501,14 +13839,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kdeprint/Makefile.in kdebase-3.4.0/doc/kdeprint/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kdeprint/Makefile.in kdebase-3.4.0/doc/kdeprint/Makefile.in
--- kdebase-3.4.0.orig/doc/kdeprint/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kdeprint/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kdeprint/Makefile.in 2005-04-06 13:31: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,
@@ -13594,14 +13932,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kdesu/Makefile.in kdebase-3.4.0/doc/kdesu/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kdesu/Makefile.in kdebase-3.4.0/doc/kdesu/Makefile.in
--- kdebase-3.4.0.orig/doc/kdesu/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kdesu/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kdesu/Makefile.in 2005-04-06 13:31: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,
@@ -13650,14 +13988,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kdm/Makefile.in kdebase-3.4.0/doc/kdm/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kdm/Makefile.in kdebase-3.4.0/doc/kdm/Makefile.in
--- kdebase-3.4.0.orig/doc/kdm/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kdm/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kdm/Makefile.in 2005-04-06 13:31: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,
@@ -13739,14 +14077,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kfind/Makefile.in kdebase-3.4.0/doc/kfind/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kfind/Makefile.in kdebase-3.4.0/doc/kfind/Makefile.in
--- kdebase-3.4.0.orig/doc/kfind/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kfind/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kfind/Makefile.in 2005-04-06 13:31: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,
@@ -13795,14 +14133,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/khelpcenter/Makefile.in kdebase-3.4.0/doc/khelpcenter/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/khelpcenter/Makefile.in kdebase-3.4.0/doc/khelpcenter/Makefile.in
--- kdebase-3.4.0.orig/doc/khelpcenter/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/khelpcenter/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/khelpcenter/Makefile.in 2005-04-06 13:31: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,
@@ -13932,14 +14270,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kicker/Makefile.in kdebase-3.4.0/doc/kicker/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kicker/Makefile.in kdebase-3.4.0/doc/kicker/Makefile.in
--- kdebase-3.4.0.orig/doc/kicker/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kicker/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kicker/Makefile.in 2005-04-06 13:31: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,
@@ -14025,14 +14363,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/Makefile.in kdebase-3.4.0/doc/kinfocenter/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/Makefile.in kdebase-3.4.0/doc/kinfocenter/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/Makefile.in 2005-04-06 13:31: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,
@@ -14138,14 +14476,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/devices/Makefile.in kdebase-3.4.0/doc/kinfocenter/devices/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/devices/Makefile.in kdebase-3.4.0/doc/kinfocenter/devices/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/devices/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/devices/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/devices/Makefile.in 2005-04-06 13:31: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,
@@ -14194,14 +14532,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/dma/Makefile.in kdebase-3.4.0/doc/kinfocenter/dma/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/dma/Makefile.in kdebase-3.4.0/doc/kinfocenter/dma/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/dma/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/dma/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/dma/Makefile.in 2005-04-06 13:31: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,
@@ -14250,14 +14588,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/interrupts/Makefile.in kdebase-3.4.0/doc/kinfocenter/interrupts/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/interrupts/Makefile.in kdebase-3.4.0/doc/kinfocenter/interrupts/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/interrupts/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/interrupts/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/interrupts/Makefile.in 2005-04-06 13:31: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,
@@ -14306,14 +14644,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/ioports/Makefile.in kdebase-3.4.0/doc/kinfocenter/ioports/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/ioports/Makefile.in kdebase-3.4.0/doc/kinfocenter/ioports/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/ioports/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/ioports/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/ioports/Makefile.in 2005-04-06 13:31: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,
@@ -14362,14 +14700,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/memory/Makefile.in kdebase-3.4.0/doc/kinfocenter/memory/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/memory/Makefile.in kdebase-3.4.0/doc/kinfocenter/memory/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/memory/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/memory/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/memory/Makefile.in 2005-04-06 13:31: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,
@@ -14418,14 +14756,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/nics/Makefile.in kdebase-3.4.0/doc/kinfocenter/nics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/nics/Makefile.in kdebase-3.4.0/doc/kinfocenter/nics/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/nics/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/nics/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/nics/Makefile.in 2005-04-06 13:31: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,
@@ -14474,14 +14812,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/opengl/Makefile.in kdebase-3.4.0/doc/kinfocenter/opengl/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/opengl/Makefile.in kdebase-3.4.0/doc/kinfocenter/opengl/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/opengl/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/opengl/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/opengl/Makefile.in 2005-04-06 13:31: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,
@@ -14530,14 +14868,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/partitions/Makefile.in kdebase-3.4.0/doc/kinfocenter/partitions/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/partitions/Makefile.in kdebase-3.4.0/doc/kinfocenter/partitions/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/partitions/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/partitions/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/partitions/Makefile.in 2005-04-06 13:31: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,
@@ -14586,14 +14924,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/pci/Makefile.in kdebase-3.4.0/doc/kinfocenter/pci/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/pci/Makefile.in kdebase-3.4.0/doc/kinfocenter/pci/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/pci/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/pci/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/pci/Makefile.in 2005-04-06 13:31: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,
@@ -14642,14 +14980,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/pcmcia/Makefile.in kdebase-3.4.0/doc/kinfocenter/pcmcia/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/pcmcia/Makefile.in kdebase-3.4.0/doc/kinfocenter/pcmcia/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/pcmcia/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/pcmcia/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/pcmcia/Makefile.in 2005-04-06 13:31: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,
@@ -14698,14 +15036,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/processor/Makefile.in kdebase-3.4.0/doc/kinfocenter/processor/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/processor/Makefile.in kdebase-3.4.0/doc/kinfocenter/processor/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/processor/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/processor/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/processor/Makefile.in 2005-04-06 13:31: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,
@@ -14754,14 +15092,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/protocols/Makefile.in kdebase-3.4.0/doc/kinfocenter/protocols/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/protocols/Makefile.in kdebase-3.4.0/doc/kinfocenter/protocols/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/protocols/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/protocols/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/protocols/Makefile.in 2005-04-06 13:31: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,
@@ -14810,14 +15148,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/samba/Makefile.in kdebase-3.4.0/doc/kinfocenter/samba/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/samba/Makefile.in kdebase-3.4.0/doc/kinfocenter/samba/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/samba/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/samba/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/samba/Makefile.in 2005-04-06 13:31: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,
@@ -14866,14 +15204,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/scsi/Makefile.in kdebase-3.4.0/doc/kinfocenter/scsi/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/scsi/Makefile.in kdebase-3.4.0/doc/kinfocenter/scsi/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/scsi/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/scsi/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/scsi/Makefile.in 2005-04-06 13:31: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,
@@ -14922,14 +15260,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/sound/Makefile.in kdebase-3.4.0/doc/kinfocenter/sound/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/sound/Makefile.in kdebase-3.4.0/doc/kinfocenter/sound/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/sound/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/sound/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/sound/Makefile.in 2005-04-06 13:31: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,
@@ -14978,14 +15316,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/usb/Makefile.in kdebase-3.4.0/doc/kinfocenter/usb/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/usb/Makefile.in kdebase-3.4.0/doc/kinfocenter/usb/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/usb/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/usb/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/usb/Makefile.in 2005-04-06 13:31: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,
@@ -15034,14 +15372,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/xserver/Makefile.in kdebase-3.4.0/doc/kinfocenter/xserver/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kinfocenter/xserver/Makefile.in kdebase-3.4.0/doc/kinfocenter/xserver/Makefile.in
--- kdebase-3.4.0.orig/doc/kinfocenter/xserver/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kinfocenter/xserver/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/xserver/Makefile.in 2005-04-06 13:31: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,
@@ -15090,14 +15428,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kioslave/Makefile.in kdebase-3.4.0/doc/kioslave/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kioslave/Makefile.in kdebase-3.4.0/doc/kioslave/Makefile.in
--- kdebase-3.4.0.orig/doc/kioslave/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kioslave/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kioslave/Makefile.in 2005-04-06 13:31: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,
@@ -15183,14 +15521,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/klipper/Makefile.in kdebase-3.4.0/doc/klipper/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/klipper/Makefile.in kdebase-3.4.0/doc/klipper/Makefile.in
--- kdebase-3.4.0.orig/doc/klipper/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/klipper/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/klipper/Makefile.in 2005-04-06 13:31: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,
@@ -15272,14 +15610,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kmenuedit/Makefile.in kdebase-3.4.0/doc/kmenuedit/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kmenuedit/Makefile.in kdebase-3.4.0/doc/kmenuedit/Makefile.in
--- kdebase-3.4.0.orig/doc/kmenuedit/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/kmenuedit/Makefile.in 2005-03-18 14:34:07.000000000 -0500
++++ kdebase-3.4.0/doc/kmenuedit/Makefile.in 2005-04-06 13:31: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,
@@ -15361,14 +15699,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/knetattach/Makefile.in kdebase-3.4.0/doc/knetattach/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/knetattach/Makefile.in kdebase-3.4.0/doc/knetattach/Makefile.in
--- kdebase-3.4.0.orig/doc/knetattach/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/knetattach/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/doc/knetattach/Makefile.in 2005-04-06 13:31: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,
@@ -15450,14 +15788,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/konqueror/Makefile.in kdebase-3.4.0/doc/konqueror/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/konqueror/Makefile.in kdebase-3.4.0/doc/konqueror/Makefile.in
--- kdebase-3.4.0.orig/doc/konqueror/Makefile.in 2005-03-04 08:14:43.000000000 -0500
-+++ kdebase-3.4.0/doc/konqueror/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/doc/konqueror/Makefile.in 2005-04-06 13:31: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,
@@ -15543,14 +15881,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/konsole/Makefile.in kdebase-3.4.0/doc/konsole/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/konsole/Makefile.in kdebase-3.4.0/doc/konsole/Makefile.in
--- kdebase-3.4.0.orig/doc/konsole/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/doc/konsole/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/doc/konsole/Makefile.in 2005-04-06 13:31: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,
@@ -15632,14 +15970,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kpager/Makefile.in kdebase-3.4.0/doc/kpager/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kpager/Makefile.in kdebase-3.4.0/doc/kpager/Makefile.in
--- kdebase-3.4.0.orig/doc/kpager/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/doc/kpager/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/doc/kpager/Makefile.in 2005-04-06 13:31: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,
@@ -15721,14 +16059,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/ksplashml/Makefile.in kdebase-3.4.0/doc/ksplashml/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/ksplashml/Makefile.in kdebase-3.4.0/doc/ksplashml/Makefile.in
--- kdebase-3.4.0.orig/doc/ksplashml/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/doc/ksplashml/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/doc/ksplashml/Makefile.in 2005-04-06 13:31: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,
@@ -15777,14 +16115,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/ksysguard/Makefile.in kdebase-3.4.0/doc/ksysguard/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/ksysguard/Makefile.in kdebase-3.4.0/doc/ksysguard/Makefile.in
--- kdebase-3.4.0.orig/doc/ksysguard/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/doc/ksysguard/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/doc/ksysguard/Makefile.in 2005-04-06 13:31: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,
@@ -15833,14 +16171,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kwrite/Makefile.in kdebase-3.4.0/doc/kwrite/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kwrite/Makefile.in kdebase-3.4.0/doc/kwrite/Makefile.in
--- kdebase-3.4.0.orig/doc/kwrite/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/doc/kwrite/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/doc/kwrite/Makefile.in 2005-04-06 13:31: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,
@@ -15889,14 +16227,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/kxkb/Makefile.in kdebase-3.4.0/doc/kxkb/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/kxkb/Makefile.in kdebase-3.4.0/doc/kxkb/Makefile.in
--- kdebase-3.4.0.orig/doc/kxkb/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/doc/kxkb/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/doc/kxkb/Makefile.in 2005-04-06 13:31: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,
@@ -15945,14 +16283,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/quickstart/Makefile.in kdebase-3.4.0/doc/quickstart/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/quickstart/Makefile.in kdebase-3.4.0/doc/quickstart/Makefile.in
--- kdebase-3.4.0.orig/doc/quickstart/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/doc/quickstart/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/doc/quickstart/Makefile.in 2005-04-06 13:31: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,
@@ -16001,14 +16339,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/userguide/Makefile.in kdebase-3.4.0/doc/userguide/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/userguide/Makefile.in kdebase-3.4.0/doc/userguide/Makefile.in
--- kdebase-3.4.0.orig/doc/userguide/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/doc/userguide/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/doc/userguide/Makefile.in 2005-04-06 13:31: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,
@@ -16094,14 +16432,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/doc/visualdict/Makefile.in kdebase-3.4.0/doc/visualdict/Makefile.in
+diff -Nru kdebase-3.4.0.orig/doc/visualdict/Makefile.in kdebase-3.4.0/doc/visualdict/Makefile.in
--- kdebase-3.4.0.orig/doc/visualdict/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/doc/visualdict/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/doc/visualdict/Makefile.in 2005-04-06 13:31: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,
@@ -16187,14 +16525,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/drkonqi/Makefile.in kdebase-3.4.0/drkonqi/Makefile.in
+diff -Nru kdebase-3.4.0.orig/drkonqi/Makefile.in kdebase-3.4.0/drkonqi/Makefile.in
--- kdebase-3.4.0.orig/drkonqi/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/drkonqi/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/drkonqi/Makefile.in 2005-04-06 13:31: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,
@@ -16351,14 +16689,14 @@
@echo 'creating drkonqi.all_cpp.cpp ...'; \
rm -f drkonqi.all_cpp.files drkonqi.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> drkonqi.all_cpp.final; \
-diff -Nrua kdebase-3.4.0.orig/drkonqi/debuggers/Makefile.in kdebase-3.4.0/drkonqi/debuggers/Makefile.in
+diff -Nru kdebase-3.4.0.orig/drkonqi/debuggers/Makefile.in kdebase-3.4.0/drkonqi/debuggers/Makefile.in
--- kdebase-3.4.0.orig/drkonqi/debuggers/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/drkonqi/debuggers/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/drkonqi/debuggers/Makefile.in 2005-04-06 13:31: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,
@@ -16407,14 +16745,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/drkonqi/pics/Makefile.in kdebase-3.4.0/drkonqi/pics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/drkonqi/pics/Makefile.in kdebase-3.4.0/drkonqi/pics/Makefile.in
--- kdebase-3.4.0.orig/drkonqi/pics/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/drkonqi/pics/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/drkonqi/pics/Makefile.in 2005-04-06 13:31: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,
@@ -16463,14 +16801,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/drkonqi/presets/Makefile.in kdebase-3.4.0/drkonqi/presets/Makefile.in
+diff -Nru kdebase-3.4.0.orig/drkonqi/presets/Makefile.in kdebase-3.4.0/drkonqi/presets/Makefile.in
--- kdebase-3.4.0.orig/drkonqi/presets/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/drkonqi/presets/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/drkonqi/presets/Makefile.in 2005-04-06 13:31: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,
@@ -16519,14 +16857,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kappfinder/Makefile.in kdebase-3.4.0/kappfinder/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kappfinder/Makefile.in kdebase-3.4.0/kappfinder/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/kappfinder/Makefile.in 2005-04-06 13:31: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,
@@ -16667,14 +17005,14 @@
#>+ 15
force-reedit:
-diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Development/Makefile.in kdebase-3.4.0/kappfinder/apps/Development/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Development/Makefile.in kdebase-3.4.0/kappfinder/apps/Development/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Development/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Development/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Development/Makefile.in 2005-04-06 13:31: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,
@@ -16723,14 +17061,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Editors/Makefile.in kdebase-3.4.0/kappfinder/apps/Editors/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Editors/Makefile.in kdebase-3.4.0/kappfinder/apps/Editors/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Editors/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Editors/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Editors/Makefile.in 2005-04-06 13:31: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,
@@ -16788,14 +17126,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Games/Arcade/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Arcade/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Games/Arcade/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Arcade/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Games/Arcade/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Games/Arcade/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Games/Arcade/Makefile.in 2005-04-06 13:31: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,
@@ -16844,14 +17182,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Games/Board/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Board/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Games/Board/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Board/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Games/Board/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Games/Board/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Games/Board/Makefile.in 2005-04-06 13:31: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,
@@ -16900,14 +17238,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Games/Card/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Card/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Games/Card/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Card/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Games/Card/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Games/Card/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Games/Card/Makefile.in 2005-04-06 13:31: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,
@@ -16956,14 +17294,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Games/Emulators/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Emulators/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Games/Emulators/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Emulators/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Games/Emulators/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Games/Emulators/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Games/Emulators/Makefile.in 2005-04-06 13:31: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,
@@ -17012,14 +17350,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Games/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Games/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Games/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Games/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Games/Makefile.in 2005-04-06 13:31: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,
@@ -17116,14 +17454,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Games/Roguelikes/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Roguelikes/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Games/Roguelikes/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Roguelikes/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Games/Roguelikes/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Games/Roguelikes/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Games/Roguelikes/Makefile.in 2005-04-06 13:31: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,
@@ -17172,14 +17510,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Games/TacticStrategy/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/TacticStrategy/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Games/TacticStrategy/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/TacticStrategy/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Games/TacticStrategy/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Games/TacticStrategy/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Games/TacticStrategy/Makefile.in 2005-04-06 13:31: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,
@@ -17228,14 +17566,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Graphics/Makefile.in kdebase-3.4.0/kappfinder/apps/Graphics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Graphics/Makefile.in kdebase-3.4.0/kappfinder/apps/Graphics/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Graphics/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Graphics/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Graphics/Makefile.in 2005-04-06 13:31: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,
@@ -17284,14 +17622,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Internet/Makefile.in kdebase-3.4.0/kappfinder/apps/Internet/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Internet/Makefile.in kdebase-3.4.0/kappfinder/apps/Internet/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Internet/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Internet/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Internet/Makefile.in 2005-04-06 13:31: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,
@@ -17397,14 +17735,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Internet/Terminal/Makefile.in kdebase-3.4.0/kappfinder/apps/Internet/Terminal/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Internet/Terminal/Makefile.in kdebase-3.4.0/kappfinder/apps/Internet/Terminal/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Internet/Terminal/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Internet/Terminal/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Internet/Terminal/Makefile.in 2005-04-06 13:31: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,
@@ -17453,14 +17791,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Makefile.in kdebase-3.4.0/kappfinder/apps/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Makefile.in kdebase-3.4.0/kappfinder/apps/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Makefile.in 2005-04-06 13:31: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,
@@ -17557,14 +17895,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Multimedia/Makefile.in kdebase-3.4.0/kappfinder/apps/Multimedia/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Multimedia/Makefile.in kdebase-3.4.0/kappfinder/apps/Multimedia/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Multimedia/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Multimedia/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Multimedia/Makefile.in 2005-04-06 13:31: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,
@@ -17622,14 +17960,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Office/Makefile.in kdebase-3.4.0/kappfinder/apps/Office/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Office/Makefile.in kdebase-3.4.0/kappfinder/apps/Office/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Office/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Office/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Office/Makefile.in 2005-04-06 13:31: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,
@@ -17687,14 +18025,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/System/Makefile.in kdebase-3.4.0/kappfinder/apps/System/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kappfinder/apps/System/Makefile.in kdebase-3.4.0/kappfinder/apps/System/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/System/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/System/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/System/Makefile.in 2005-04-06 13:31: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,
@@ -17791,14 +18129,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/System/Terminal/Makefile.in kdebase-3.4.0/kappfinder/apps/System/Terminal/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kappfinder/apps/System/Terminal/Makefile.in kdebase-3.4.0/kappfinder/apps/System/Terminal/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/System/Terminal/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/System/Terminal/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/System/Terminal/Makefile.in 2005-04-06 13:31: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,
@@ -17847,14 +18185,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Toys/Makefile.in kdebase-3.4.0/kappfinder/apps/Toys/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Toys/Makefile.in kdebase-3.4.0/kappfinder/apps/Toys/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Toys/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Toys/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Toys/Makefile.in 2005-04-06 13:31: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,
@@ -17903,14 +18241,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Utilities/Makefile.in kdebase-3.4.0/kappfinder/apps/Utilities/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Utilities/Makefile.in kdebase-3.4.0/kappfinder/apps/Utilities/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Utilities/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Utilities/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Utilities/Makefile.in 2005-04-06 13:31: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,
@@ -18007,14 +18345,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Utilities/xutils/Makefile.in kdebase-3.4.0/kappfinder/apps/Utilities/xutils/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kappfinder/apps/Utilities/xutils/Makefile.in kdebase-3.4.0/kappfinder/apps/Utilities/xutils/Makefile.in
--- kdebase-3.4.0.orig/kappfinder/apps/Utilities/xutils/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kappfinder/apps/Utilities/xutils/Makefile.in 2005-03-18 14:34:08.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Utilities/xutils/Makefile.in 2005-04-06 13:31: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,
@@ -18063,14 +18401,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kate/Makefile.in kdebase-3.4.0/kate/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kate/Makefile.in kdebase-3.4.0/kate/Makefile.in
--- kdebase-3.4.0.orig/kate/Makefile.in 2005-03-04 08:14:44.000000000 -0500
-+++ kdebase-3.4.0/kate/Makefile.in 2005-03-18 14:34:09.000000000 -0500
++++ kdebase-3.4.0/kate/Makefile.in 2005-04-06 13:31: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,
@@ -18167,14 +18505,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kate/app/Makefile.in kdebase-3.4.0/kate/app/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kate/app/Makefile.in kdebase-3.4.0/kate/app/Makefile.in
--- kdebase-3.4.0.orig/kate/app/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kate/app/Makefile.in 2005-03-18 14:34:09.000000000 -0500
++++ kdebase-3.4.0/kate/app/Makefile.in 2005-04-06 13:31: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,
@@ -18312,14 +18650,14 @@
@echo 'creating libkateinterfaces_la.all_cpp.cpp ...'; \
rm -f libkateinterfaces_la.all_cpp.files libkateinterfaces_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkateinterfaces_la.all_cpp.final; \
-diff -Nrua kdebase-3.4.0.orig/kate/data/Makefile.in kdebase-3.4.0/kate/data/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kate/data/Makefile.in kdebase-3.4.0/kate/data/Makefile.in
--- kdebase-3.4.0.orig/kate/data/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kate/data/Makefile.in 2005-03-18 14:34:09.000000000 -0500
++++ kdebase-3.4.0/kate/data/Makefile.in 2005-04-06 13:31: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,
@@ -18377,14 +18715,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kate/interfaces/Makefile.in kdebase-3.4.0/kate/interfaces/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kate/interfaces/Makefile.in kdebase-3.4.0/kate/interfaces/Makefile.in
--- kdebase-3.4.0.orig/kate/interfaces/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kate/interfaces/Makefile.in 2005-03-18 14:34:10.000000000 -0500
++++ kdebase-3.4.0/kate/interfaces/Makefile.in 2005-04-06 13:31: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,
@@ -18447,14 +18785,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nrua kdebase-3.4.0.orig/kate/pics/Makefile.in kdebase-3.4.0/kate/pics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kate/pics/Makefile.in kdebase-3.4.0/kate/pics/Makefile.in
--- kdebase-3.4.0.orig/kate/pics/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kate/pics/Makefile.in 2005-03-18 14:34:10.000000000 -0500
++++ kdebase-3.4.0/kate/pics/Makefile.in 2005-04-06 13:31: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,
@@ -18606,14 +18944,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kate/pics/actions/Makefile.in kdebase-3.4.0/kate/pics/actions/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kate/pics/actions/Makefile.in kdebase-3.4.0/kate/pics/actions/Makefile.in
--- kdebase-3.4.0.orig/kate/pics/actions/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kate/pics/actions/Makefile.in 2005-03-18 14:34:10.000000000 -0500
++++ kdebase-3.4.0/kate/pics/actions/Makefile.in 2005-04-06 13:31: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,
@@ -18726,14 +19064,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kate/plugins/Makefile.in kdebase-3.4.0/kate/plugins/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kate/plugins/Makefile.in kdebase-3.4.0/kate/plugins/Makefile.in
--- kdebase-3.4.0.orig/kate/plugins/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kate/plugins/Makefile.in 2005-03-18 14:34:10.000000000 -0500
++++ kdebase-3.4.0/kate/plugins/Makefile.in 2005-04-06 13:31: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,
@@ -18830,14 +19168,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kate/plugins/defaultproject/Makefile.in kdebase-3.4.0/kate/plugins/defaultproject/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kate/plugins/defaultproject/Makefile.in kdebase-3.4.0/kate/plugins/defaultproject/Makefile.in
--- kdebase-3.4.0.orig/kate/plugins/defaultproject/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kate/plugins/defaultproject/Makefile.in 2005-03-18 14:34:10.000000000 -0500
++++ kdebase-3.4.0/kate/plugins/defaultproject/Makefile.in 2005-04-06 13:31: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,
@@ -18900,14 +19238,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kate/utils/Makefile.in kdebase-3.4.0/kate/utils/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kate/utils/Makefile.in kdebase-3.4.0/kate/utils/Makefile.in
--- kdebase-3.4.0.orig/kate/utils/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kate/utils/Makefile.in 2005-03-18 14:34:10.000000000 -0500
++++ kdebase-3.4.0/kate/utils/Makefile.in 2005-04-06 13:31: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,
@@ -18970,14 +19308,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcheckpass/Makefile.in kdebase-3.4.0/kcheckpass/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcheckpass/Makefile.in kdebase-3.4.0/kcheckpass/Makefile.in
--- kdebase-3.4.0.orig/kcheckpass/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kcheckpass/Makefile.in 2005-03-18 14:34:10.000000000 -0500
++++ kdebase-3.4.0/kcheckpass/Makefile.in 2005-04-06 13:31: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,
@@ -19040,14 +19378,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcminit/Makefile.in kdebase-3.4.0/kcminit/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcminit/Makefile.in kdebase-3.4.0/kcminit/Makefile.in
--- kdebase-3.4.0.orig/kcminit/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kcminit/Makefile.in 2005-03-18 14:34:10.000000000 -0500
++++ kdebase-3.4.0/kcminit/Makefile.in 2005-04-06 13:31: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,
@@ -19110,14 +19448,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/Makefile.in kdebase-3.4.0/kcontrol/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/Makefile.in kdebase-3.4.0/kcontrol/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/Makefile.in 2005-03-04 08:14:45.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/Makefile.in 2005-03-18 14:34:11.000000000 -0500
++++ kdebase-3.4.0/kcontrol/Makefile.in 2005-04-06 13:31: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,
@@ -19214,14 +19552,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/access/Makefile.in kdebase-3.4.0/kcontrol/access/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/access/Makefile.in kdebase-3.4.0/kcontrol/access/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/access/Makefile.in 2005-03-04 08:14:46.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/access/Makefile.in 2005-03-18 14:34:11.000000000 -0500
++++ kdebase-3.4.0/kcontrol/access/Makefile.in 2005-04-06 13:31: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,
@@ -19284,14 +19622,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/accessibility/Makefile.in kdebase-3.4.0/kcontrol/accessibility/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/accessibility/Makefile.in kdebase-3.4.0/kcontrol/accessibility/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/accessibility/Makefile.in 2005-03-04 08:14:46.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/accessibility/Makefile.in 2005-03-18 14:34:11.000000000 -0500
++++ kdebase-3.4.0/kcontrol/accessibility/Makefile.in 2005-04-06 13:31: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,
@@ -19354,14 +19692,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/arts/Makefile.in kdebase-3.4.0/kcontrol/arts/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/arts/Makefile.in kdebase-3.4.0/kcontrol/arts/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/arts/Makefile.in 2005-03-04 08:14:46.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/arts/Makefile.in 2005-03-18 14:34:11.000000000 -0500
++++ kdebase-3.4.0/kcontrol/arts/Makefile.in 2005-04-06 13:31: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,
@@ -19424,14 +19762,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/background/Makefile.in kdebase-3.4.0/kcontrol/background/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/background/Makefile.in kdebase-3.4.0/kcontrol/background/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/background/Makefile.in 2005-03-04 08:14:47.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/background/Makefile.in 2005-03-18 14:34:11.000000000 -0500
++++ kdebase-3.4.0/kcontrol/background/Makefile.in 2005-04-06 13:31: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,
@@ -19576,14 +19914,14 @@
#>+ 2
KDE_DIST=background.desktop bgwallpaper_ui.ui bgdialog_ui.ui Makefile.in bgadvanced_ui.ui Makefile.am
-diff -Nrua kdebase-3.4.0.orig/kcontrol/background/pics/Makefile.in kdebase-3.4.0/kcontrol/background/pics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/background/pics/Makefile.in kdebase-3.4.0/kcontrol/background/pics/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/background/pics/Makefile.in 2005-03-04 08:14:47.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/background/pics/Makefile.in 2005-03-18 14:34:11.000000000 -0500
++++ kdebase-3.4.0/kcontrol/background/pics/Makefile.in 2005-04-06 13:31: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,
@@ -19632,14 +19970,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/bell/Makefile.in kdebase-3.4.0/kcontrol/bell/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/bell/Makefile.in kdebase-3.4.0/kcontrol/bell/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/bell/Makefile.in 2005-03-04 08:14:47.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/bell/Makefile.in 2005-03-18 14:34:11.000000000 -0500
++++ kdebase-3.4.0/kcontrol/bell/Makefile.in 2005-04-06 13:31: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,
@@ -19702,14 +20040,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/clock/Makefile.in kdebase-3.4.0/kcontrol/clock/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/clock/Makefile.in kdebase-3.4.0/kcontrol/clock/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/clock/Makefile.in 2005-03-04 08:14:47.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/clock/Makefile.in 2005-03-18 14:34:11.000000000 -0500
++++ kdebase-3.4.0/kcontrol/clock/Makefile.in 2005-04-06 13:31: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,
@@ -19772,14 +20110,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/colors/Makefile.in kdebase-3.4.0/kcontrol/colors/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/colors/Makefile.in kdebase-3.4.0/kcontrol/colors/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/colors/Makefile.in 2005-03-04 08:14:47.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/colors/Makefile.in 2005-03-18 14:34:11.000000000 -0500
++++ kdebase-3.4.0/kcontrol/colors/Makefile.in 2005-04-06 13:31: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,
@@ -19842,14 +20180,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/componentchooser/Makefile.in kdebase-3.4.0/kcontrol/componentchooser/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/componentchooser/Makefile.in kdebase-3.4.0/kcontrol/componentchooser/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/componentchooser/Makefile.in 2005-03-04 08:14:47.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/componentchooser/Makefile.in 2005-03-18 14:34:11.000000000 -0500
++++ kdebase-3.4.0/kcontrol/componentchooser/Makefile.in 2005-04-06 13:31: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,
@@ -19969,14 +20307,14 @@
#>+ 8
clean-ui:
-diff -Nrua kdebase-3.4.0.orig/kcontrol/componentchooser/componentservices/Makefile.in kdebase-3.4.0/kcontrol/componentchooser/componentservices/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/componentchooser/componentservices/Makefile.in kdebase-3.4.0/kcontrol/componentchooser/componentservices/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/componentchooser/componentservices/Makefile.in 2005-03-04 08:14:47.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/componentchooser/componentservices/Makefile.in 2005-03-18 14:34:11.000000000 -0500
++++ kdebase-3.4.0/kcontrol/componentchooser/componentservices/Makefile.in 2005-04-06 13:31: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,
@@ -20025,14 +20363,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/crypto/Makefile.in kdebase-3.4.0/kcontrol/crypto/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/crypto/Makefile.in kdebase-3.4.0/kcontrol/crypto/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/crypto/Makefile.in 2005-03-04 08:14:47.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/crypto/Makefile.in 2005-03-18 14:34:11.000000000 -0500
++++ kdebase-3.4.0/kcontrol/crypto/Makefile.in 2005-04-06 13:31: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,
@@ -20095,14 +20433,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/css/Makefile.in kdebase-3.4.0/kcontrol/css/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/css/Makefile.in kdebase-3.4.0/kcontrol/css/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/css/Makefile.in 2005-03-04 08:14:48.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/css/Makefile.in 2005-03-18 14:34:11.000000000 -0500
++++ kdebase-3.4.0/kcontrol/css/Makefile.in 2005-04-06 13:31: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,
@@ -20165,14 +20503,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/display/Makefile.in kdebase-3.4.0/kcontrol/display/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/display/Makefile.in kdebase-3.4.0/kcontrol/display/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/display/Makefile.in 2005-03-04 08:14:48.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/display/Makefile.in 2005-03-18 14:34:11.000000000 -0500
++++ kdebase-3.4.0/kcontrol/display/Makefile.in 2005-04-06 13:31: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,
@@ -20235,14 +20573,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/dnssd/Makefile.in kdebase-3.4.0/kcontrol/dnssd/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/dnssd/Makefile.in kdebase-3.4.0/kcontrol/dnssd/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/dnssd/Makefile.in 2005-03-04 08:14:48.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/dnssd/Makefile.in 2005-03-18 14:34:11.000000000 -0500
++++ kdebase-3.4.0/kcontrol/dnssd/Makefile.in 2005-04-06 13:31: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,
@@ -20315,14 +20653,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/ebrowsing/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/ebrowsing/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/ebrowsing/Makefile.in 2005-03-04 08:14:48.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/ebrowsing/Makefile.in 2005-03-18 14:34:12.000000000 -0500
++++ kdebase-3.4.0/kcontrol/ebrowsing/Makefile.in 2005-04-06 13:31: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,
@@ -20433,14 +20771,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/plugins/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/plugins/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/Makefile.in 2005-03-04 08:14:48.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/Makefile.in 2005-03-18 14:34:12.000000000 -0500
++++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/Makefile.in 2005-04-06 13:31: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,
@@ -20537,14 +20875,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/ikws/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/plugins/ikws/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/ikws/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/plugins/ikws/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/ikws/Makefile.in 2005-03-04 08:14:49.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/ikws/Makefile.in 2005-03-18 14:34:12.000000000 -0500
++++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/ikws/Makefile.in 2005-04-06 13:31: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,
@@ -20655,14 +20993,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in 2005-03-04 08:14:49.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in 2005-03-18 14:34:12.000000000 -0500
++++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in 2005-04-06 13:31:13.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,
@@ -20720,14 +21058,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/localdomain/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/plugins/localdomain/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/localdomain/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/plugins/localdomain/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/localdomain/Makefile.in 2005-03-04 08:14:49.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/localdomain/Makefile.in 2005-03-18 14:34:12.000000000 -0500
++++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/localdomain/Makefile.in 2005-04-06 13:31:13.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,
@@ -20803,14 +21141,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/shorturi/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/plugins/shorturi/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/shorturi/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/plugins/shorturi/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/shorturi/Makefile.in 2005-03-04 08:14:49.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/shorturi/Makefile.in 2005-03-18 14:34:12.000000000 -0500
++++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/shorturi/Makefile.in 2005-04-06 13:31:13.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,
@@ -20873,14 +21211,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/energy/Makefile.in kdebase-3.4.0/kcontrol/energy/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/energy/Makefile.in kdebase-3.4.0/kcontrol/energy/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/energy/Makefile.in 2005-03-04 08:14:49.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/energy/Makefile.in 2005-03-18 14:34:12.000000000 -0500
++++ kdebase-3.4.0/kcontrol/energy/Makefile.in 2005-04-06 13:31:13.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,
@@ -20991,14 +21329,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/energy/pics/Makefile.in kdebase-3.4.0/kcontrol/energy/pics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/energy/pics/Makefile.in kdebase-3.4.0/kcontrol/energy/pics/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/energy/pics/Makefile.in 2005-03-04 08:14:49.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/energy/pics/Makefile.in 2005-03-18 14:34:12.000000000 -0500
++++ kdebase-3.4.0/kcontrol/energy/pics/Makefile.in 2005-04-06 13:31:13.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,
@@ -21047,14 +21385,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/filetypes/Makefile.in kdebase-3.4.0/kcontrol/filetypes/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/filetypes/Makefile.in kdebase-3.4.0/kcontrol/filetypes/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/filetypes/Makefile.in 2005-03-04 08:14:49.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/filetypes/Makefile.in 2005-03-18 14:34:12.000000000 -0500
++++ kdebase-3.4.0/kcontrol/filetypes/Makefile.in 2005-04-06 13:31:13.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,
@@ -21151,14 +21489,14 @@
#>+ 2
KDE_DIST=filetypes.desktop keditfiletype.h Makefile.in Makefile.am
-diff -Nrua kdebase-3.4.0.orig/kcontrol/fonts/Makefile.in kdebase-3.4.0/kcontrol/fonts/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/fonts/Makefile.in kdebase-3.4.0/kcontrol/fonts/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/fonts/Makefile.in 2005-03-04 08:14:49.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/fonts/Makefile.in 2005-03-18 14:34:12.000000000 -0500
++++ kdebase-3.4.0/kcontrol/fonts/Makefile.in 2005-04-06 13:31:13.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,
@@ -21221,14 +21559,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/icons/Makefile.in kdebase-3.4.0/kcontrol/icons/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/icons/Makefile.in kdebase-3.4.0/kcontrol/icons/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/icons/Makefile.in 2005-03-04 08:14:50.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/icons/Makefile.in 2005-03-18 14:34:12.000000000 -0500
++++ kdebase-3.4.0/kcontrol/icons/Makefile.in 2005-04-06 13:31:13.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,
@@ -21334,14 +21672,14 @@
@echo 'creating kcm_icons_la.all_cpp.cpp ...'; \
rm -f kcm_icons_la.all_cpp.files kcm_icons_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kcm_icons_la.all_cpp.final; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/info/Makefile.in kdebase-3.4.0/kcontrol/info/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/info/Makefile.in kdebase-3.4.0/kcontrol/info/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/info/Makefile.in 2005-03-04 08:14:50.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/info/Makefile.in 2005-03-18 14:34:12.000000000 -0500
++++ kdebase-3.4.0/kcontrol/info/Makefile.in 2005-04-06 13:31:14.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,
@@ -21413,14 +21751,14 @@
#>+ 3
clean-closures:
-diff -Nrua kdebase-3.4.0.orig/kcontrol/input/Makefile.in kdebase-3.4.0/kcontrol/input/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/input/Makefile.in kdebase-3.4.0/kcontrol/input/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/input/Makefile.in 2005-03-04 08:14:50.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/input/Makefile.in 2005-03-18 14:34:12.000000000 -0500
++++ kdebase-3.4.0/kcontrol/input/Makefile.in 2005-04-06 13:31:14.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,
@@ -21531,14 +21869,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/input/core/Makefile.in kdebase-3.4.0/kcontrol/input/core/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/input/core/Makefile.in kdebase-3.4.0/kcontrol/input/core/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/input/core/Makefile.in 2005-03-04 08:14:51.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/input/core/Makefile.in 2005-03-18 14:34:12.000000000 -0500
++++ kdebase-3.4.0/kcontrol/input/core/Makefile.in 2005-04-06 13:31:14.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,
@@ -21601,14 +21939,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nrua kdebase-3.4.0.orig/kcontrol/input/pics/Makefile.in kdebase-3.4.0/kcontrol/input/pics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/input/pics/Makefile.in kdebase-3.4.0/kcontrol/input/pics/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/input/pics/Makefile.in 2005-03-04 08:14:51.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/input/pics/Makefile.in 2005-03-18 14:34:12.000000000 -0500
++++ kdebase-3.4.0/kcontrol/input/pics/Makefile.in 2005-04-06 13:31:14.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,
@@ -21657,14 +21995,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/input/xcursor/Makefile.in kdebase-3.4.0/kcontrol/input/xcursor/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/input/xcursor/Makefile.in kdebase-3.4.0/kcontrol/input/xcursor/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/input/xcursor/Makefile.in 2005-03-04 08:14:51.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/input/xcursor/Makefile.in 2005-03-18 14:34:12.000000000 -0500
++++ kdebase-3.4.0/kcontrol/input/xcursor/Makefile.in 2005-04-06 13:31:14.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,
@@ -21727,14 +22065,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nrua kdebase-3.4.0.orig/kcontrol/ioslaveinfo/Makefile.in kdebase-3.4.0/kcontrol/ioslaveinfo/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/ioslaveinfo/Makefile.in kdebase-3.4.0/kcontrol/ioslaveinfo/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/ioslaveinfo/Makefile.in 2005-03-04 08:14:51.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/ioslaveinfo/Makefile.in 2005-03-18 14:34:12.000000000 -0500
++++ kdebase-3.4.0/kcontrol/ioslaveinfo/Makefile.in 2005-04-06 13:31:14.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,
@@ -21797,14 +22135,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/joystick/Makefile.in kdebase-3.4.0/kcontrol/joystick/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/joystick/Makefile.in kdebase-3.4.0/kcontrol/joystick/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/joystick/Makefile.in 2005-03-04 08:14:52.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/joystick/Makefile.in 2005-03-18 14:34:13.000000000 -0500
++++ kdebase-3.4.0/kcontrol/joystick/Makefile.in 2005-04-06 13:31:14.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,
@@ -21867,14 +22205,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/kcontrol/Makefile.in kdebase-3.4.0/kcontrol/kcontrol/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/kcontrol/Makefile.in kdebase-3.4.0/kcontrol/kcontrol/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kcontrol/Makefile.in 2005-03-04 08:14:52.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kcontrol/Makefile.in 2005-03-18 14:34:13.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kcontrol/Makefile.in 2005-04-06 13:31:14.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,
@@ -22061,14 +22399,14 @@
@echo 'creating libkdeinit_kcontrol_la.all_cpp.cpp ...'; \
rm -f libkdeinit_kcontrol_la.all_cpp.files libkdeinit_kcontrol_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkdeinit_kcontrol_la.all_cpp.final; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/kcontrol/about/Makefile.in kdebase-3.4.0/kcontrol/kcontrol/about/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/kcontrol/about/Makefile.in kdebase-3.4.0/kcontrol/kcontrol/about/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kcontrol/about/Makefile.in 2005-03-04 08:14:52.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kcontrol/about/Makefile.in 2005-03-18 14:34:13.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kcontrol/about/Makefile.in 2005-04-06 13:31:14.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,
@@ -22117,14 +22455,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/kded/Makefile.in kdebase-3.4.0/kcontrol/kded/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/kded/Makefile.in kdebase-3.4.0/kcontrol/kded/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kded/Makefile.in 2005-03-04 08:14:52.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kded/Makefile.in 2005-03-18 14:34:13.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kded/Makefile.in 2005-04-06 13:31:14.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,
@@ -22196,14 +22534,14 @@
#>+ 3
clean-closures:
-diff -Nrua kdebase-3.4.0.orig/kcontrol/kdm/Makefile.in kdebase-3.4.0/kcontrol/kdm/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/kdm/Makefile.in kdebase-3.4.0/kcontrol/kdm/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kdm/Makefile.in 2005-03-04 08:14:52.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kdm/Makefile.in 2005-03-18 14:34:13.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kdm/Makefile.in 2005-04-06 13:31:14.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,
@@ -22319,14 +22657,14 @@
main.o: main.moc
kdm-appear.o: kdm-appear.moc
kdm-sess.lo: kdm-sess.moc
-diff -Nrua kdebase-3.4.0.orig/kcontrol/keys/Makefile.in kdebase-3.4.0/kcontrol/keys/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/keys/Makefile.in kdebase-3.4.0/kcontrol/keys/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/keys/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/keys/Makefile.in 2005-03-18 14:34:13.000000000 -0500
++++ kdebase-3.4.0/kcontrol/keys/Makefile.in 2005-04-06 13:31:14.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,
@@ -22389,14 +22727,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/kfontinst/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/kfontinst/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kfontinst/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kfontinst/Makefile.in 2005-03-18 14:34:13.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kfontinst/Makefile.in 2005-04-06 13:31:14.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,
@@ -22493,14 +22831,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/kfontinst/kcmfontinst/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/kcmfontinst/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/kfontinst/kcmfontinst/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/kcmfontinst/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kfontinst/kcmfontinst/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kfontinst/kcmfontinst/Makefile.in 2005-03-18 14:34:13.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kfontinst/kcmfontinst/Makefile.in 2005-04-06 13:31:14.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,
@@ -22587,14 +22925,14 @@
#>+ 15
force-reedit:
-diff -Nrua kdebase-3.4.0.orig/kcontrol/kfontinst/kfile-plugin/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/kfile-plugin/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/kfontinst/kfile-plugin/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/kfile-plugin/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kfontinst/kfile-plugin/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kfontinst/kfile-plugin/Makefile.in 2005-03-18 14:34:13.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kfontinst/kfile-plugin/Makefile.in 2005-04-06 13:31:14.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,
@@ -22657,14 +22995,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/kfontinst/kfontinst/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/kfontinst/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/kfontinst/kfontinst/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/kfontinst/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kfontinst/kfontinst/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kfontinst/kfontinst/Makefile.in 2005-03-18 14:34:13.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kfontinst/kfontinst/Makefile.in 2005-04-06 13:31:15.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,
@@ -22740,14 +23078,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/kfontinst/kio/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/kio/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/kfontinst/kio/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/kio/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kfontinst/kio/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kfontinst/kio/Makefile.in 2005-03-18 14:34:13.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kfontinst/kio/Makefile.in 2005-04-06 13:31:15.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,
@@ -22810,14 +23148,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/kfontinst/lib/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/lib/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/kfontinst/lib/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/lib/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kfontinst/lib/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kfontinst/lib/Makefile.in 2005-03-18 14:34:13.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kfontinst/lib/Makefile.in 2005-04-06 13:31:15.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,
@@ -22880,14 +23218,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/kfontinst/thumbnail/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/thumbnail/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/kfontinst/thumbnail/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/thumbnail/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kfontinst/thumbnail/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kfontinst/thumbnail/Makefile.in 2005-03-18 14:34:13.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kfontinst/thumbnail/Makefile.in 2005-04-06 13:31:15.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,
@@ -22950,14 +23288,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/kfontinst/viewpart/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/viewpart/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/kfontinst/viewpart/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/viewpart/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kfontinst/viewpart/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kfontinst/viewpart/Makefile.in 2005-03-18 14:34:14.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kfontinst/viewpart/Makefile.in 2005-04-06 13:31:15.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,
@@ -23020,14 +23358,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/kicker/Makefile.in kdebase-3.4.0/kcontrol/kicker/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/kicker/Makefile.in kdebase-3.4.0/kcontrol/kicker/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kicker/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kicker/Makefile.in 2005-03-18 14:34:14.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kicker/Makefile.in 2005-04-06 13:31:15.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,
@@ -23124,14 +23462,14 @@
#>+ 2
KDE_DIST=applettab_impl.h lookandfeeltab.ui lookandfeeltab_kcm.h advancedOptions.ui panel.desktop positiontab.ui kicker_config_appearance.desktop applettab_impl.cpp kicker_config.desktop menutab.ui applettab.ui Makefile.in hidingtab.ui uninstall.desktop lookandfeeltab_kcm.cpp Makefile.am
-diff -Nrua kdebase-3.4.0.orig/kcontrol/kio/Makefile.in kdebase-3.4.0/kcontrol/kio/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/kio/Makefile.in kdebase-3.4.0/kcontrol/kio/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kio/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kio/Makefile.in 2005-03-18 14:34:14.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kio/Makefile.in 2005-04-06 13:31:15.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,
@@ -23314,14 +23652,14 @@
@echo 'creating kcm_kio_la.all_cpp.cpp ...'; \
rm -f kcm_kio_la.all_cpp.files kcm_kio_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kcm_kio_la.all_cpp.final; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/kio/uasproviders/Makefile.in kdebase-3.4.0/kcontrol/kio/uasproviders/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/kio/uasproviders/Makefile.in kdebase-3.4.0/kcontrol/kio/uasproviders/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kio/uasproviders/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kio/uasproviders/Makefile.in 2005-03-18 14:34:14.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kio/uasproviders/Makefile.in 2005-04-06 13:31:15.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,
@@ -23379,14 +23717,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/knotify/Makefile.in kdebase-3.4.0/kcontrol/knotify/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/knotify/Makefile.in kdebase-3.4.0/kcontrol/knotify/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/knotify/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/knotify/Makefile.in 2005-03-18 14:34:14.000000000 -0500
++++ kdebase-3.4.0/kcontrol/knotify/Makefile.in 2005-04-06 13:31:15.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,
@@ -23497,14 +23835,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/knotify/sounds/Makefile.in kdebase-3.4.0/kcontrol/knotify/sounds/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/knotify/sounds/Makefile.in kdebase-3.4.0/kcontrol/knotify/sounds/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/knotify/sounds/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/knotify/sounds/Makefile.in 2005-03-18 14:34:14.000000000 -0500
++++ kdebase-3.4.0/kcontrol/knotify/sounds/Makefile.in 2005-04-06 13:31:15.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,
@@ -23562,14 +23900,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/konq/Makefile.in kdebase-3.4.0/kcontrol/konq/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/konq/Makefile.in kdebase-3.4.0/kcontrol/konq/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/konq/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/konq/Makefile.in 2005-03-18 14:34:14.000000000 -0500
++++ kdebase-3.4.0/kcontrol/konq/Makefile.in 2005-04-06 13:31:15.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,
@@ -23679,14 +24017,14 @@
@echo 'creating kcm_konq_la.all_cpp.cpp ...'; \
rm -f kcm_konq_la.all_cpp.files kcm_konq_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kcm_konq_la.all_cpp.final; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/konqhtml/Makefile.in kdebase-3.4.0/kcontrol/konqhtml/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/konqhtml/Makefile.in kdebase-3.4.0/kcontrol/konqhtml/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/konqhtml/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/konqhtml/Makefile.in 2005-03-18 14:34:14.000000000 -0500
++++ kdebase-3.4.0/kcontrol/konqhtml/Makefile.in 2005-04-06 13:31:15.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,
@@ -23788,14 +24126,14 @@
@echo 'creating kcm_konqhtml_la.all_cpp.cpp ...'; \
rm -f kcm_konqhtml_la.all_cpp.files kcm_konqhtml_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kcm_konqhtml_la.all_cpp.final; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/konsole/Makefile.in kdebase-3.4.0/kcontrol/konsole/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/konsole/Makefile.in kdebase-3.4.0/kcontrol/konsole/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/konsole/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/konsole/Makefile.in 2005-03-18 14:34:14.000000000 -0500
++++ kdebase-3.4.0/kcontrol/konsole/Makefile.in 2005-04-06 13:31:15.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,
@@ -23858,14 +24196,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/Makefile.in kdebase-3.4.0/kcontrol/krdb/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/Makefile.in kdebase-3.4.0/kcontrol/krdb/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/Makefile.in 2005-03-18 14:34:14.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/Makefile.in 2005-04-06 13:31:15.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,
@@ -23976,14 +24314,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/ad/Makefile.in kdebase-3.4.0/kcontrol/krdb/ad/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/ad/Makefile.in kdebase-3.4.0/kcontrol/krdb/ad/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/ad/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/ad/Makefile.in 2005-03-18 14:34:14.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/ad/Makefile.in 2005-04-06 13:31:15.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,
@@ -24041,14 +24379,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/kcs/Makefile.in kdebase-3.4.0/kcontrol/krdb/kcs/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/kcs/Makefile.in kdebase-3.4.0/kcontrol/krdb/kcs/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/kcs/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/kcs/Makefile.in 2005-03-18 14:34:15.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/kcs/Makefile.in 2005-04-06 13:31:15.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,
@@ -24106,14 +24444,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/pics/Makefile.in kdebase-3.4.0/kcontrol/krdb/pics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/pics/Makefile.in kdebase-3.4.0/kcontrol/krdb/pics/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/pics/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/pics/Makefile.in 2005-03-18 14:34:15.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/pics/Makefile.in 2005-04-06 13:31:16.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,
@@ -24162,14 +24500,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastDark/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/HighContrastDark/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastDark/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/HighContrastDark/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastDark/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/HighContrastDark/Makefile.in 2005-03-18 14:34:15.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/HighContrastDark/Makefile.in 2005-04-06 13:31:16.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,
@@ -24218,14 +24556,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in 2005-03-04 08:14:53.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in 2005-03-18 14:34:15.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in 2005-04-06 13:31:16.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,
@@ -24274,14 +24612,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastLight/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/HighContrastLight/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastLight/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/HighContrastLight/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastLight/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/HighContrastLight/Makefile.in 2005-03-18 14:34:15.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/HighContrastLight/Makefile.in 2005-04-06 13:31:16.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,
@@ -24330,14 +24668,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in 2005-03-18 14:34:15.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in 2005-04-06 13:31:16.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,
@@ -24386,14 +24724,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/KDE_Classic/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/KDE_Classic/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/themes/KDE_Classic/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/KDE_Classic/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/themes/KDE_Classic/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/KDE_Classic/Makefile.in 2005-03-18 14:34:15.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/KDE_Classic/Makefile.in 2005-04-06 13:31:16.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,
@@ -24442,14 +24780,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/Keramik/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Keramik/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/themes/Keramik/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Keramik/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/themes/Keramik/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/Keramik/Makefile.in 2005-03-18 14:34:15.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/Keramik/Makefile.in 2005-04-06 13:31:16.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,
@@ -24498,14 +24836,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/themes/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/themes/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/Makefile.in 2005-03-18 14:34:15.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/Makefile.in 2005-04-06 13:31:16.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,
@@ -24602,14 +24940,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/Plastik/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Plastik/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/themes/Plastik/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Plastik/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/themes/Plastik/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/Plastik/Makefile.in 2005-03-18 14:34:15.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/Plastik/Makefile.in 2005-04-06 13:31:16.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,
@@ -24658,14 +24996,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/Platinum/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Platinum/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/themes/Platinum/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Platinum/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/themes/Platinum/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/Platinum/Makefile.in 2005-03-18 14:34:15.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/Platinum/Makefile.in 2005-04-06 13:31:16.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,
@@ -24714,14 +25052,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/Redmond/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Redmond/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/themes/Redmond/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Redmond/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/themes/Redmond/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/Redmond/Makefile.in 2005-03-18 14:34:15.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/Redmond/Makefile.in 2005-04-06 13:31:16.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,
@@ -24770,14 +25108,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/Sunshine/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Sunshine/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/themes/Sunshine/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Sunshine/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/themes/Sunshine/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/Sunshine/Makefile.in 2005-03-18 14:34:15.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/Sunshine/Makefile.in 2005-04-06 13:31:16.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,
@@ -24826,14 +25164,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/YellowOnBlue/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/YellowOnBlue/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/themes/YellowOnBlue/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/YellowOnBlue/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/themes/YellowOnBlue/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/YellowOnBlue/Makefile.in 2005-03-18 14:34:15.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/YellowOnBlue/Makefile.in 2005-04-06 13:31:16.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,
@@ -24882,14 +25220,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in 2005-03-18 14:34:15.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in 2005-04-06 13:31:16.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,
@@ -24938,14 +25276,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/kthememanager/Makefile.in kdebase-3.4.0/kcontrol/kthememanager/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/kthememanager/Makefile.in kdebase-3.4.0/kcontrol/kthememanager/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/kthememanager/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/kthememanager/Makefile.in 2005-03-18 14:34:15.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kthememanager/Makefile.in 2005-04-06 13:31:16.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,
@@ -25008,14 +25346,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/launch/Makefile.in kdebase-3.4.0/kcontrol/launch/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/launch/Makefile.in kdebase-3.4.0/kcontrol/launch/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/launch/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/launch/Makefile.in 2005-03-18 14:34:15.000000000 -0500
++++ kdebase-3.4.0/kcontrol/launch/Makefile.in 2005-04-06 13:31:16.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,
@@ -25078,14 +25416,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/locale/Makefile.in kdebase-3.4.0/kcontrol/locale/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/locale/Makefile.in kdebase-3.4.0/kcontrol/locale/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/locale/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/locale/Makefile.in 2005-03-18 14:34:16.000000000 -0500
++++ kdebase-3.4.0/kcontrol/locale/Makefile.in 2005-04-06 13:31:16.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,
@@ -25239,14 +25577,14 @@
@echo 'creating kcm_locale_la.all_cpp.cpp ...'; \
rm -f kcm_locale_la.all_cpp.files kcm_locale_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kcm_locale_la.all_cpp.final; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/locale/default/Makefile.in kdebase-3.4.0/kcontrol/locale/default/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/locale/default/Makefile.in kdebase-3.4.0/kcontrol/locale/default/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/locale/default/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/locale/default/Makefile.in 2005-03-18 14:34:16.000000000 -0500
++++ kdebase-3.4.0/kcontrol/locale/default/Makefile.in 2005-04-06 13:31:16.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,
@@ -25295,14 +25633,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/locale/pics/Makefile.in kdebase-3.4.0/kcontrol/locale/pics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/locale/pics/Makefile.in kdebase-3.4.0/kcontrol/locale/pics/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/locale/pics/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/locale/pics/Makefile.in 2005-03-18 14:34:16.000000000 -0500
++++ kdebase-3.4.0/kcontrol/locale/pics/Makefile.in 2005-04-06 13:31:16.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,
@@ -25351,14 +25689,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/nics/Makefile.in kdebase-3.4.0/kcontrol/nics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/nics/Makefile.in kdebase-3.4.0/kcontrol/nics/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/nics/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/nics/Makefile.in 2005-03-18 14:34:16.000000000 -0500
++++ kdebase-3.4.0/kcontrol/nics/Makefile.in 2005-04-06 13:31:16.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,
@@ -25421,14 +25759,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/performance/Makefile.in kdebase-3.4.0/kcontrol/performance/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/performance/Makefile.in kdebase-3.4.0/kcontrol/performance/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/performance/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/performance/Makefile.in 2005-03-18 14:34:16.000000000 -0500
++++ kdebase-3.4.0/kcontrol/performance/Makefile.in 2005-04-06 13:31:16.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,
@@ -25534,14 +25872,14 @@
@echo 'creating kcm_performance_la.all_cpp.cpp ...'; \
rm -f kcm_performance_la.all_cpp.files kcm_performance_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kcm_performance_la.all_cpp.final; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/pics/Makefile.in kdebase-3.4.0/kcontrol/pics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/pics/Makefile.in kdebase-3.4.0/kcontrol/pics/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/pics/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/pics/Makefile.in 2005-03-18 14:34:16.000000000 -0500
++++ kdebase-3.4.0/kcontrol/pics/Makefile.in 2005-04-06 13:31:16.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,
@@ -26617,14 +26955,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/privacy/Makefile.in kdebase-3.4.0/kcontrol/privacy/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/privacy/Makefile.in kdebase-3.4.0/kcontrol/privacy/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/privacy/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/privacy/Makefile.in 2005-03-18 14:34:17.000000000 -0500
++++ kdebase-3.4.0/kcontrol/privacy/Makefile.in 2005-04-06 13:31:16.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,
@@ -26687,14 +27025,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/randr/Makefile.in kdebase-3.4.0/kcontrol/randr/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/randr/Makefile.in kdebase-3.4.0/kcontrol/randr/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/randr/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/randr/Makefile.in 2005-03-18 14:34:17.000000000 -0500
++++ kdebase-3.4.0/kcontrol/randr/Makefile.in 2005-04-06 13:31:16.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,
@@ -26757,14 +27095,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/samba/Makefile.in kdebase-3.4.0/kcontrol/samba/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/samba/Makefile.in kdebase-3.4.0/kcontrol/samba/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/samba/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/samba/Makefile.in 2005-03-18 14:34:17.000000000 -0500
++++ kdebase-3.4.0/kcontrol/samba/Makefile.in 2005-04-06 13:31:16.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,
@@ -26827,14 +27165,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/screensaver/Makefile.in kdebase-3.4.0/kcontrol/screensaver/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/screensaver/Makefile.in kdebase-3.4.0/kcontrol/screensaver/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/screensaver/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/screensaver/Makefile.in 2005-03-18 14:34:17.000000000 -0500
++++ kdebase-3.4.0/kcontrol/screensaver/Makefile.in 2005-04-06 13:31:17.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,
@@ -26897,14 +27235,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/smartcard/Makefile.in kdebase-3.4.0/kcontrol/smartcard/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/smartcard/Makefile.in kdebase-3.4.0/kcontrol/smartcard/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/smartcard/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/smartcard/Makefile.in 2005-03-18 14:34:17.000000000 -0500
++++ kdebase-3.4.0/kcontrol/smartcard/Makefile.in 2005-04-06 13:31:17.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,
@@ -26967,14 +27305,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/smserver/Makefile.in kdebase-3.4.0/kcontrol/smserver/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/smserver/Makefile.in kdebase-3.4.0/kcontrol/smserver/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/smserver/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/smserver/Makefile.in 2005-03-18 14:34:17.000000000 -0500
++++ kdebase-3.4.0/kcontrol/smserver/Makefile.in 2005-04-06 13:31:17.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,
@@ -27037,14 +27375,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/spellchecking/Makefile.in kdebase-3.4.0/kcontrol/spellchecking/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/spellchecking/Makefile.in kdebase-3.4.0/kcontrol/spellchecking/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/spellchecking/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/spellchecking/Makefile.in 2005-03-18 14:34:17.000000000 -0500
++++ kdebase-3.4.0/kcontrol/spellchecking/Makefile.in 2005-04-06 13:31:17.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,
@@ -27107,14 +27445,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/style/Makefile.in kdebase-3.4.0/kcontrol/style/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/style/Makefile.in kdebase-3.4.0/kcontrol/style/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/style/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/style/Makefile.in 2005-03-18 14:34:17.000000000 -0500
++++ kdebase-3.4.0/kcontrol/style/Makefile.in 2005-04-06 13:31:17.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,
@@ -27225,14 +27563,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/kcontrol/style/keramik/Makefile.in kdebase-3.4.0/kcontrol/style/keramik/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/style/keramik/Makefile.in kdebase-3.4.0/kcontrol/style/keramik/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/style/keramik/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/style/keramik/Makefile.in 2005-03-18 14:34:17.000000000 -0500
++++ kdebase-3.4.0/kcontrol/style/keramik/Makefile.in 2005-04-06 13:31:17.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,
@@ -27295,14 +27633,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/taskbar/Makefile.in kdebase-3.4.0/kcontrol/taskbar/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/taskbar/Makefile.in kdebase-3.4.0/kcontrol/taskbar/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/taskbar/Makefile.in 2005-03-04 08:14:54.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/taskbar/Makefile.in 2005-03-18 14:34:17.000000000 -0500
++++ kdebase-3.4.0/kcontrol/taskbar/Makefile.in 2005-04-06 13:31:17.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,
@@ -27365,14 +27703,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/usbview/Makefile.in kdebase-3.4.0/kcontrol/usbview/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/usbview/Makefile.in kdebase-3.4.0/kcontrol/usbview/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/usbview/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/usbview/Makefile.in 2005-03-18 14:34:17.000000000 -0500
++++ kdebase-3.4.0/kcontrol/usbview/Makefile.in 2005-04-06 13:31:17.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,
@@ -27435,14 +27773,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/view1394/Makefile.in kdebase-3.4.0/kcontrol/view1394/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/view1394/Makefile.in kdebase-3.4.0/kcontrol/view1394/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/view1394/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/view1394/Makefile.in 2005-03-18 14:34:17.000000000 -0500
++++ kdebase-3.4.0/kcontrol/view1394/Makefile.in 2005-04-06 13:31:17.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,
@@ -27505,14 +27843,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kcontrol/xinerama/Makefile.in kdebase-3.4.0/kcontrol/xinerama/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kcontrol/xinerama/Makefile.in kdebase-3.4.0/kcontrol/xinerama/Makefile.in
--- kdebase-3.4.0.orig/kcontrol/xinerama/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kcontrol/xinerama/Makefile.in 2005-03-18 14:34:17.000000000 -0500
++++ kdebase-3.4.0/kcontrol/xinerama/Makefile.in 2005-04-06 13:31:17.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,
@@ -27575,14 +27913,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kdcop/Makefile.in kdebase-3.4.0/kdcop/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdcop/Makefile.in kdebase-3.4.0/kdcop/Makefile.in
--- kdebase-3.4.0.orig/kdcop/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdcop/Makefile.in 2005-03-18 14:34:17.000000000 -0500
++++ kdebase-3.4.0/kdcop/Makefile.in 2005-04-06 13:31:17.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,
@@ -27645,14 +27983,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kdebugdialog/Makefile.in kdebase-3.4.0/kdebugdialog/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdebugdialog/Makefile.in kdebase-3.4.0/kdebugdialog/Makefile.in
--- kdebase-3.4.0.orig/kdebugdialog/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdebugdialog/Makefile.in 2005-03-18 14:34:17.000000000 -0500
++++ kdebase-3.4.0/kdebugdialog/Makefile.in 2005-04-06 13:31:17.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,
@@ -27715,14 +28053,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kdepasswd/Makefile.in kdebase-3.4.0/kdepasswd/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdepasswd/Makefile.in kdebase-3.4.0/kdepasswd/Makefile.in
--- kdebase-3.4.0.orig/kdepasswd/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdepasswd/Makefile.in 2005-03-18 14:34:17.000000000 -0500
++++ kdebase-3.4.0/kdepasswd/Makefile.in 2005-04-06 13:31:17.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,
@@ -27833,14 +28171,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/kdepasswd/kcm/Makefile.in kdebase-3.4.0/kdepasswd/kcm/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdepasswd/kcm/Makefile.in kdebase-3.4.0/kdepasswd/kcm/Makefile.in
--- kdebase-3.4.0.orig/kdepasswd/kcm/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdepasswd/kcm/Makefile.in 2005-03-18 14:34:18.000000000 -0500
++++ kdebase-3.4.0/kdepasswd/kcm/Makefile.in 2005-04-06 13:31:17.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,
@@ -27951,14 +28289,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/kdepasswd/kcm/pics/Makefile.in kdebase-3.4.0/kdepasswd/kcm/pics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdepasswd/kcm/pics/Makefile.in kdebase-3.4.0/kdepasswd/kcm/pics/Makefile.in
--- kdebase-3.4.0.orig/kdepasswd/kcm/pics/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdepasswd/kcm/pics/Makefile.in 2005-03-18 14:34:18.000000000 -0500
++++ kdebase-3.4.0/kdepasswd/kcm/pics/Makefile.in 2005-04-06 13:31:17.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,
@@ -28007,14 +28345,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kdeprint/Makefile.in kdebase-3.4.0/kdeprint/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdeprint/Makefile.in kdebase-3.4.0/kdeprint/Makefile.in
--- kdebase-3.4.0.orig/kdeprint/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/Makefile.in 2005-03-18 14:34:18.000000000 -0500
++++ kdebase-3.4.0/kdeprint/Makefile.in 2005-04-06 13:31:17.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,
@@ -28111,14 +28449,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kdeprint/descriptions/Makefile.in kdebase-3.4.0/kdeprint/descriptions/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdeprint/descriptions/Makefile.in kdebase-3.4.0/kdeprint/descriptions/Makefile.in
--- kdebase-3.4.0.orig/kdeprint/descriptions/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/descriptions/Makefile.in 2005-03-18 14:34:18.000000000 -0500
++++ kdebase-3.4.0/kdeprint/descriptions/Makefile.in 2005-04-06 13:31:17.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,
@@ -28181,14 +28519,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
sortthem$(EXEEXT): $(sortthem_OBJECTS) $(sortthem_DEPENDENCIES)
@rm -f sortthem$(EXEEXT)
-diff -Nrua kdebase-3.4.0.orig/kdeprint/kdeprint_part/Makefile.in kdebase-3.4.0/kdeprint/kdeprint_part/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdeprint/kdeprint_part/Makefile.in kdebase-3.4.0/kdeprint/kdeprint_part/Makefile.in
--- kdebase-3.4.0.orig/kdeprint/kdeprint_part/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/kdeprint_part/Makefile.in 2005-03-18 14:34:18.000000000 -0500
++++ kdebase-3.4.0/kdeprint/kdeprint_part/Makefile.in 2005-04-06 13:31:17.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,
@@ -28251,14 +28589,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kdeprint/kdeprintfax/Makefile.in kdebase-3.4.0/kdeprint/kdeprintfax/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdeprint/kdeprintfax/Makefile.in kdebase-3.4.0/kdeprint/kdeprintfax/Makefile.in
--- kdebase-3.4.0.orig/kdeprint/kdeprintfax/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/kdeprintfax/Makefile.in 2005-03-18 14:34:18.000000000 -0500
++++ kdebase-3.4.0/kdeprint/kdeprintfax/Makefile.in 2005-04-06 13:31:17.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,
@@ -28408,14 +28746,14 @@
@echo 'creating kdeprintfax.all_cpp.cpp ...'; \
rm -f kdeprintfax.all_cpp.files kdeprintfax.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kdeprintfax.all_cpp.final; \
-diff -Nrua kdebase-3.4.0.orig/kdeprint/kjobviewer/Makefile.in kdebase-3.4.0/kdeprint/kjobviewer/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdeprint/kjobviewer/Makefile.in kdebase-3.4.0/kdeprint/kjobviewer/Makefile.in
--- kdebase-3.4.0.orig/kdeprint/kjobviewer/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/kjobviewer/Makefile.in 2005-03-18 14:34:18.000000000 -0500
++++ kdebase-3.4.0/kdeprint/kjobviewer/Makefile.in 2005-04-06 13:31:18.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,
@@ -28517,14 +28855,14 @@
#>+ 15
force-reedit:
-diff -Nrua kdebase-3.4.0.orig/kdeprint/kprinter/Makefile.in kdebase-3.4.0/kdeprint/kprinter/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdeprint/kprinter/Makefile.in kdebase-3.4.0/kdeprint/kprinter/Makefile.in
--- kdebase-3.4.0.orig/kdeprint/kprinter/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/kprinter/Makefile.in 2005-03-18 14:34:18.000000000 -0500
++++ kdebase-3.4.0/kdeprint/kprinter/Makefile.in 2005-04-06 13:31:18.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,
@@ -28587,14 +28925,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kdeprint/printmgr/Makefile.in kdebase-3.4.0/kdeprint/printmgr/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdeprint/printmgr/Makefile.in kdebase-3.4.0/kdeprint/printmgr/Makefile.in
--- kdebase-3.4.0.orig/kdeprint/printmgr/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/printmgr/Makefile.in 2005-03-18 14:34:18.000000000 -0500
++++ kdebase-3.4.0/kdeprint/printmgr/Makefile.in 2005-04-06 13:31:18.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,
@@ -28708,14 +29046,14 @@
#>+ 15
force-reedit:
-diff -Nrua kdebase-3.4.0.orig/kdeprint/slave/Makefile.in kdebase-3.4.0/kdeprint/slave/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdeprint/slave/Makefile.in kdebase-3.4.0/kdeprint/slave/Makefile.in
--- kdebase-3.4.0.orig/kdeprint/slave/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/slave/Makefile.in 2005-03-18 14:34:18.000000000 -0500
++++ kdebase-3.4.0/kdeprint/slave/Makefile.in 2005-04-06 13:31:18.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,
@@ -28826,14 +29164,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/kdeprint/slave/mimetypes/Makefile.in kdebase-3.4.0/kdeprint/slave/mimetypes/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdeprint/slave/mimetypes/Makefile.in kdebase-3.4.0/kdeprint/slave/mimetypes/Makefile.in
--- kdebase-3.4.0.orig/kdeprint/slave/mimetypes/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/slave/mimetypes/Makefile.in 2005-03-18 14:34:18.000000000 -0500
++++ kdebase-3.4.0/kdeprint/slave/mimetypes/Makefile.in 2005-04-06 13:31:18.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,
@@ -28882,14 +29220,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kdeprint/slave/templates/Makefile.in kdebase-3.4.0/kdeprint/slave/templates/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdeprint/slave/templates/Makefile.in kdebase-3.4.0/kdeprint/slave/templates/Makefile.in
--- kdebase-3.4.0.orig/kdeprint/slave/templates/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdeprint/slave/templates/Makefile.in 2005-03-18 14:34:18.000000000 -0500
++++ kdebase-3.4.0/kdeprint/slave/templates/Makefile.in 2005-04-06 13:31:18.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,
@@ -28938,14 +29276,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kdesktop/Makefile.in kdebase-3.4.0/kdesktop/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdesktop/Makefile.in kdebase-3.4.0/kdesktop/Makefile.in
--- kdebase-3.4.0.orig/kdesktop/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdesktop/Makefile.in 2005-03-18 14:34:18.000000000 -0500
++++ kdebase-3.4.0/kdesktop/Makefile.in 2005-04-06 13:31:19.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,
@@ -29149,14 +29487,14 @@
@echo 'creating libkdeinit_kdesktop_la.all_cpp.cpp ...'; \
rm -f libkdeinit_kdesktop_la.all_cpp.files libkdeinit_kdesktop_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkdeinit_kdesktop_la.all_cpp.final; \
-diff -Nrua kdebase-3.4.0.orig/kdesktop/init/Makefile.in kdebase-3.4.0/kdesktop/init/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdesktop/init/Makefile.in kdebase-3.4.0/kdesktop/init/Makefile.in
--- kdebase-3.4.0.orig/kdesktop/init/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdesktop/init/Makefile.in 2005-03-18 14:34:18.000000000 -0500
++++ kdebase-3.4.0/kdesktop/init/Makefile.in 2005-04-06 13:31:19.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,
@@ -29253,14 +29591,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kdesktop/init/Templates/Makefile.in kdebase-3.4.0/kdesktop/init/Templates/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdesktop/init/Templates/Makefile.in kdebase-3.4.0/kdesktop/init/Templates/Makefile.in
--- kdebase-3.4.0.orig/kdesktop/init/Templates/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdesktop/init/Templates/Makefile.in 2005-03-18 14:34:18.000000000 -0500
++++ kdebase-3.4.0/kdesktop/init/Templates/Makefile.in 2005-04-06 13:31:19.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,
@@ -29318,14 +29656,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kdesktop/kwebdesktop/Makefile.in kdebase-3.4.0/kdesktop/kwebdesktop/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdesktop/kwebdesktop/Makefile.in kdebase-3.4.0/kdesktop/kwebdesktop/Makefile.in
--- kdebase-3.4.0.orig/kdesktop/kwebdesktop/Makefile.in 2005-03-04 08:14:55.000000000 -0500
-+++ kdebase-3.4.0/kdesktop/kwebdesktop/Makefile.in 2005-03-18 14:34:19.000000000 -0500
++++ kdebase-3.4.0/kdesktop/kwebdesktop/Makefile.in 2005-04-06 13:31:19.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,
@@ -29388,14 +29726,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kdesktop/lock/Makefile.in kdebase-3.4.0/kdesktop/lock/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdesktop/lock/Makefile.in kdebase-3.4.0/kdesktop/lock/Makefile.in
--- kdebase-3.4.0.orig/kdesktop/lock/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdesktop/lock/Makefile.in 2005-03-18 14:34:19.000000000 -0500
++++ kdebase-3.4.0/kdesktop/lock/Makefile.in 2005-04-06 13:31:19.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,
@@ -29458,14 +29796,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kdesktop/patterns/Makefile.in kdebase-3.4.0/kdesktop/patterns/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdesktop/patterns/Makefile.in kdebase-3.4.0/kdesktop/patterns/Makefile.in
--- kdebase-3.4.0.orig/kdesktop/patterns/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdesktop/patterns/Makefile.in 2005-03-18 14:34:19.000000000 -0500
++++ kdebase-3.4.0/kdesktop/patterns/Makefile.in 2005-04-06 13:31:19.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,
@@ -29514,14 +29852,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kdesktop/pics/Makefile.in kdebase-3.4.0/kdesktop/pics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdesktop/pics/Makefile.in kdebase-3.4.0/kdesktop/pics/Makefile.in
--- kdebase-3.4.0.orig/kdesktop/pics/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdesktop/pics/Makefile.in 2005-03-18 14:34:19.000000000 -0500
++++ kdebase-3.4.0/kdesktop/pics/Makefile.in 2005-04-06 13:31:19.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,
@@ -29570,14 +29908,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kdesktop/programs/Makefile.in kdebase-3.4.0/kdesktop/programs/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdesktop/programs/Makefile.in kdebase-3.4.0/kdesktop/programs/Makefile.in
--- kdebase-3.4.0.orig/kdesktop/programs/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdesktop/programs/Makefile.in 2005-03-18 14:34:19.000000000 -0500
++++ kdebase-3.4.0/kdesktop/programs/Makefile.in 2005-04-06 13:31:19.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,
@@ -29626,14 +29964,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kdesu/Makefile.in kdebase-3.4.0/kdesu/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdesu/Makefile.in kdebase-3.4.0/kdesu/Makefile.in
--- kdebase-3.4.0.orig/kdesu/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdesu/Makefile.in 2005-03-18 14:34:19.000000000 -0500
++++ kdebase-3.4.0/kdesu/Makefile.in 2005-04-06 13:31:19.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,
@@ -29730,14 +30068,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kdesu/kdesu/Makefile.in kdebase-3.4.0/kdesu/kdesu/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdesu/kdesu/Makefile.in kdebase-3.4.0/kdesu/kdesu/Makefile.in
--- kdebase-3.4.0.orig/kdesu/kdesu/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdesu/kdesu/Makefile.in 2005-03-18 14:34:19.000000000 -0500
++++ kdebase-3.4.0/kdesu/kdesu/Makefile.in 2005-04-06 13:31:19.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,
@@ -29800,14 +30138,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kdesu/kdesud/Makefile.in kdebase-3.4.0/kdesu/kdesud/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdesu/kdesud/Makefile.in kdebase-3.4.0/kdesu/kdesud/Makefile.in
--- kdebase-3.4.0.orig/kdesu/kdesud/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdesu/kdesud/Makefile.in 2005-03-18 14:34:19.000000000 -0500
++++ kdebase-3.4.0/kdesu/kdesud/Makefile.in 2005-04-06 13:31:19.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,
@@ -29870,14 +30208,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kdialog/Makefile.in kdebase-3.4.0/kdialog/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdialog/Makefile.in kdebase-3.4.0/kdialog/Makefile.in
--- kdebase-3.4.0.orig/kdialog/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdialog/Makefile.in 2005-03-18 14:34:19.000000000 -0500
++++ kdebase-3.4.0/kdialog/Makefile.in 2005-04-06 13:31:19.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,
@@ -29940,14 +30278,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kdm/Makefile.in kdebase-3.4.0/kdm/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdm/Makefile.in kdebase-3.4.0/kdm/Makefile.in
--- kdebase-3.4.0.orig/kdm/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdm/Makefile.in 2005-03-18 14:34:19.000000000 -0500
++++ kdebase-3.4.0/kdm/Makefile.in 2005-04-06 13:31:19.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,
@@ -30044,14 +30382,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kdm/backend/Makefile.in kdebase-3.4.0/kdm/backend/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdm/backend/Makefile.in kdebase-3.4.0/kdm/backend/Makefile.in
--- kdebase-3.4.0.orig/kdm/backend/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdm/backend/Makefile.in 2005-03-18 14:34:19.000000000 -0500
++++ kdebase-3.4.0/kdm/backend/Makefile.in 2005-04-06 13:31:19.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,
@@ -30123,14 +30461,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kdm/kfrontend/Makefile.in kdebase-3.4.0/kdm/kfrontend/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdm/kfrontend/Makefile.in kdebase-3.4.0/kdm/kfrontend/Makefile.in
--- kdebase-3.4.0.orig/kdm/kfrontend/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdm/kfrontend/Makefile.in 2005-03-18 14:34:19.000000000 -0500
++++ kdebase-3.4.0/kdm/kfrontend/Makefile.in 2005-04-06 13:31:19.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,
@@ -30313,14 +30651,14 @@
#>+ 2
KDE_DIST=Makefile.in Makefile.am
-diff -Nrua kdebase-3.4.0.orig/kdm/kfrontend/pics/Makefile.in kdebase-3.4.0/kdm/kfrontend/pics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdm/kfrontend/pics/Makefile.in kdebase-3.4.0/kdm/kfrontend/pics/Makefile.in
--- kdebase-3.4.0.orig/kdm/kfrontend/pics/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdm/kfrontend/pics/Makefile.in 2005-03-18 14:34:19.000000000 -0500
++++ kdebase-3.4.0/kdm/kfrontend/pics/Makefile.in 2005-04-06 13:31:19.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,
@@ -30369,14 +30707,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kdm/kfrontend/sessions/Makefile.in kdebase-3.4.0/kdm/kfrontend/sessions/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdm/kfrontend/sessions/Makefile.in kdebase-3.4.0/kdm/kfrontend/sessions/Makefile.in
--- kdebase-3.4.0.orig/kdm/kfrontend/sessions/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdm/kfrontend/sessions/Makefile.in 2005-03-18 14:34:19.000000000 -0500
++++ kdebase-3.4.0/kdm/kfrontend/sessions/Makefile.in 2005-04-06 13:31:19.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,
@@ -30434,14 +30772,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kdm/kfrontend/themer/Makefile.in kdebase-3.4.0/kdm/kfrontend/themer/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdm/kfrontend/themer/Makefile.in kdebase-3.4.0/kdm/kfrontend/themer/Makefile.in
--- kdebase-3.4.0.orig/kdm/kfrontend/themer/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdm/kfrontend/themer/Makefile.in 2005-03-18 14:34:19.000000000 -0500
++++ kdebase-3.4.0/kdm/kfrontend/themer/Makefile.in 2005-04-06 13:31:20.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,
@@ -30557,14 +30895,14 @@
kdmitem.lo: kdmitem.moc
kdmpixmap.lo: kdmpixmap.moc
nmcheck:
-diff -Nrua kdebase-3.4.0.orig/kdm/kfrontend/themes/Makefile.in kdebase-3.4.0/kdm/kfrontend/themes/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdm/kfrontend/themes/Makefile.in kdebase-3.4.0/kdm/kfrontend/themes/Makefile.in
--- kdebase-3.4.0.orig/kdm/kfrontend/themes/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdm/kfrontend/themes/Makefile.in 2005-03-18 14:34:19.000000000 -0500
++++ kdebase-3.4.0/kdm/kfrontend/themes/Makefile.in 2005-04-06 13:31:20.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,
@@ -30661,14 +30999,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kdm/kfrontend/themes/circles/Makefile.in kdebase-3.4.0/kdm/kfrontend/themes/circles/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdm/kfrontend/themes/circles/Makefile.in kdebase-3.4.0/kdm/kfrontend/themes/circles/Makefile.in
--- kdebase-3.4.0.orig/kdm/kfrontend/themes/circles/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdm/kfrontend/themes/circles/Makefile.in 2005-03-18 14:34:19.000000000 -0500
++++ kdebase-3.4.0/kdm/kfrontend/themes/circles/Makefile.in 2005-04-06 13:31:20.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,
@@ -30717,14 +31055,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kdmlib/Makefile.in kdebase-3.4.0/kdmlib/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kdmlib/Makefile.in kdebase-3.4.0/kdmlib/Makefile.in
--- kdebase-3.4.0.orig/kdmlib/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kdmlib/Makefile.in 2005-03-18 14:34:19.000000000 -0500
++++ kdebase-3.4.0/kdmlib/Makefile.in 2005-04-06 13:31:20.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,
@@ -30787,14 +31125,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kfind/Makefile.in kdebase-3.4.0/kfind/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kfind/Makefile.in kdebase-3.4.0/kfind/Makefile.in
--- kdebase-3.4.0.orig/kfind/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kfind/Makefile.in 2005-03-18 14:34:20.000000000 -0500
++++ kdebase-3.4.0/kfind/Makefile.in 2005-04-06 13:31:20.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,
@@ -30975,14 +31313,14 @@
@echo 'creating libkfind_common_la.all_cpp.cpp ...'; \
rm -f libkfind_common_la.all_cpp.files libkfind_common_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkfind_common_la.all_cpp.final; \
-diff -Nrua kdebase-3.4.0.orig/kfind/pics/Makefile.in kdebase-3.4.0/kfind/pics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kfind/pics/Makefile.in kdebase-3.4.0/kfind/pics/Makefile.in
--- kdebase-3.4.0.orig/kfind/pics/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/kfind/pics/Makefile.in 2005-03-18 14:34:20.000000000 -0500
++++ kdebase-3.4.0/kfind/pics/Makefile.in 2005-04-06 13:31:20.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,
@@ -31057,14 +31395,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/khelpcenter/Makefile.in kdebase-3.4.0/khelpcenter/Makefile.in
+diff -Nru kdebase-3.4.0.orig/khelpcenter/Makefile.in kdebase-3.4.0/khelpcenter/Makefile.in
--- kdebase-3.4.0.orig/khelpcenter/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khelpcenter/Makefile.in 2005-03-18 14:34:20.000000000 -0500
++++ kdebase-3.4.0/khelpcenter/Makefile.in 2005-04-06 13:31:20.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,
@@ -31388,14 +31726,14 @@
$(srcdir)/htmlsearchconfig.cpp: prefs.h
infotree.o: infotree.moc
mainwindow.o: mainwindow.moc
-diff -Nrua kdebase-3.4.0.orig/khelpcenter/htmlsearch/Makefile.in kdebase-3.4.0/khelpcenter/htmlsearch/Makefile.in
+diff -Nru kdebase-3.4.0.orig/khelpcenter/htmlsearch/Makefile.in kdebase-3.4.0/khelpcenter/htmlsearch/Makefile.in
--- kdebase-3.4.0.orig/khelpcenter/htmlsearch/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khelpcenter/htmlsearch/Makefile.in 2005-03-18 14:34:20.000000000 -0500
++++ kdebase-3.4.0/khelpcenter/htmlsearch/Makefile.in 2005-04-06 13:31:20.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,
@@ -31458,14 +31796,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/khelpcenter/pics/Makefile.in kdebase-3.4.0/khelpcenter/pics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/khelpcenter/pics/Makefile.in kdebase-3.4.0/khelpcenter/pics/Makefile.in
--- kdebase-3.4.0.orig/khelpcenter/pics/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khelpcenter/pics/Makefile.in 2005-03-18 14:34:20.000000000 -0500
++++ kdebase-3.4.0/khelpcenter/pics/Makefile.in 2005-04-06 13:31:20.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,
@@ -31556,14 +31894,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/khelpcenter/plugins/Applications/Makefile.in kdebase-3.4.0/khelpcenter/plugins/Applications/Makefile.in
+diff -Nru kdebase-3.4.0.orig/khelpcenter/plugins/Applications/Makefile.in kdebase-3.4.0/khelpcenter/plugins/Applications/Makefile.in
--- kdebase-3.4.0.orig/khelpcenter/plugins/Applications/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khelpcenter/plugins/Applications/Makefile.in 2005-03-18 14:34:20.000000000 -0500
++++ kdebase-3.4.0/khelpcenter/plugins/Applications/Makefile.in 2005-04-06 13:31:20.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,
@@ -31612,14 +31950,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/khelpcenter/plugins/Makefile.in kdebase-3.4.0/khelpcenter/plugins/Makefile.in
+diff -Nru kdebase-3.4.0.orig/khelpcenter/plugins/Makefile.in kdebase-3.4.0/khelpcenter/plugins/Makefile.in
--- kdebase-3.4.0.orig/khelpcenter/plugins/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khelpcenter/plugins/Makefile.in 2005-03-18 14:34:20.000000000 -0500
++++ kdebase-3.4.0/khelpcenter/plugins/Makefile.in 2005-04-06 13:31:20.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,
@@ -31716,14 +32054,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/khelpcenter/plugins/Manpages/Makefile.in kdebase-3.4.0/khelpcenter/plugins/Manpages/Makefile.in
+diff -Nru kdebase-3.4.0.orig/khelpcenter/plugins/Manpages/Makefile.in kdebase-3.4.0/khelpcenter/plugins/Manpages/Makefile.in
--- kdebase-3.4.0.orig/khelpcenter/plugins/Manpages/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khelpcenter/plugins/Manpages/Makefile.in 2005-03-18 14:34:20.000000000 -0500
++++ kdebase-3.4.0/khelpcenter/plugins/Manpages/Makefile.in 2005-04-06 13:31:20.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,
@@ -31772,14 +32110,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/khelpcenter/plugins/Scrollkeeper/Makefile.in kdebase-3.4.0/khelpcenter/plugins/Scrollkeeper/Makefile.in
+diff -Nru kdebase-3.4.0.orig/khelpcenter/plugins/Scrollkeeper/Makefile.in kdebase-3.4.0/khelpcenter/plugins/Scrollkeeper/Makefile.in
--- kdebase-3.4.0.orig/khelpcenter/plugins/Scrollkeeper/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khelpcenter/plugins/Scrollkeeper/Makefile.in 2005-03-18 14:34:20.000000000 -0500
++++ kdebase-3.4.0/khelpcenter/plugins/Scrollkeeper/Makefile.in 2005-04-06 13:31:20.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,
@@ -31828,14 +32166,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/khelpcenter/plugins/Tutorials/Makefile.in kdebase-3.4.0/khelpcenter/plugins/Tutorials/Makefile.in
+diff -Nru kdebase-3.4.0.orig/khelpcenter/plugins/Tutorials/Makefile.in kdebase-3.4.0/khelpcenter/plugins/Tutorials/Makefile.in
--- kdebase-3.4.0.orig/khelpcenter/plugins/Tutorials/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khelpcenter/plugins/Tutorials/Makefile.in 2005-03-18 14:34:20.000000000 -0500
++++ kdebase-3.4.0/khelpcenter/plugins/Tutorials/Makefile.in 2005-04-06 13:31:20.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,
@@ -31884,14 +32222,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/khelpcenter/searchhandlers/Makefile.in kdebase-3.4.0/khelpcenter/searchhandlers/Makefile.in
+diff -Nru kdebase-3.4.0.orig/khelpcenter/searchhandlers/Makefile.in kdebase-3.4.0/khelpcenter/searchhandlers/Makefile.in
--- kdebase-3.4.0.orig/khelpcenter/searchhandlers/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khelpcenter/searchhandlers/Makefile.in 2005-03-18 14:34:20.000000000 -0500
++++ kdebase-3.4.0/khelpcenter/searchhandlers/Makefile.in 2005-04-06 13:31:20.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,
@@ -31940,14 +32278,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/khotkeys/Makefile.in kdebase-3.4.0/khotkeys/Makefile.in
+diff -Nru kdebase-3.4.0.orig/khotkeys/Makefile.in kdebase-3.4.0/khotkeys/Makefile.in
--- kdebase-3.4.0.orig/khotkeys/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khotkeys/Makefile.in 2005-03-18 14:34:20.000000000 -0500
++++ kdebase-3.4.0/khotkeys/Makefile.in 2005-04-06 13:31:20.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,
@@ -32044,14 +32382,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/khotkeys/app/Makefile.in kdebase-3.4.0/khotkeys/app/Makefile.in
+diff -Nru kdebase-3.4.0.orig/khotkeys/app/Makefile.in kdebase-3.4.0/khotkeys/app/Makefile.in
--- kdebase-3.4.0.orig/khotkeys/app/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khotkeys/app/Makefile.in 2005-03-18 14:34:21.000000000 -0500
++++ kdebase-3.4.0/khotkeys/app/Makefile.in 2005-04-06 13:31:20.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,
@@ -32114,14 +32452,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/khotkeys/data/Makefile.in kdebase-3.4.0/khotkeys/data/Makefile.in
+diff -Nru kdebase-3.4.0.orig/khotkeys/data/Makefile.in kdebase-3.4.0/khotkeys/data/Makefile.in
--- kdebase-3.4.0.orig/khotkeys/data/Makefile.in 2005-03-04 08:14:56.000000000 -0500
-+++ kdebase-3.4.0/khotkeys/data/Makefile.in 2005-03-18 14:34:21.000000000 -0500
++++ kdebase-3.4.0/khotkeys/data/Makefile.in 2005-04-06 13:31:20.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,
@@ -32170,14 +32508,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/khotkeys/kcontrol/Makefile.in kdebase-3.4.0/khotkeys/kcontrol/Makefile.in
+diff -Nru kdebase-3.4.0.orig/khotkeys/kcontrol/Makefile.in kdebase-3.4.0/khotkeys/kcontrol/Makefile.in
--- kdebase-3.4.0.orig/khotkeys/kcontrol/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/khotkeys/kcontrol/Makefile.in 2005-03-18 14:34:22.000000000 -0500
++++ kdebase-3.4.0/khotkeys/kcontrol/Makefile.in 2005-04-06 13:31:21.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,
@@ -32430,14 +32768,14 @@
tab_widget.lo: tab_widget.moc
+condition_list_widget.o: condition_list_widget.moc
windowselector.o: windowselector.moc
-diff -Nrua kdebase-3.4.0.orig/khotkeys/kcontrol/ui/Makefile.in kdebase-3.4.0/khotkeys/kcontrol/ui/Makefile.in
+diff -Nru kdebase-3.4.0.orig/khotkeys/kcontrol/ui/Makefile.in kdebase-3.4.0/khotkeys/kcontrol/ui/Makefile.in
--- kdebase-3.4.0.orig/khotkeys/kcontrol/ui/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/khotkeys/kcontrol/ui/Makefile.in 2005-03-18 14:34:22.000000000 -0500
++++ kdebase-3.4.0/khotkeys/kcontrol/ui/Makefile.in 2005-04-06 13:31:21.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,
@@ -32509,14 +32847,14 @@
#>+ 21
clean-ui:
-diff -Nrua kdebase-3.4.0.orig/khotkeys/shared/Makefile.in kdebase-3.4.0/khotkeys/shared/Makefile.in
+diff -Nru kdebase-3.4.0.orig/khotkeys/shared/Makefile.in kdebase-3.4.0/khotkeys/shared/Makefile.in
--- kdebase-3.4.0.orig/khotkeys/shared/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/khotkeys/shared/Makefile.in 2005-03-18 14:34:23.000000000 -0500
++++ kdebase-3.4.0/khotkeys/shared/Makefile.in 2005-04-06 13:31:21.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,
@@ -32618,14 +32956,14 @@
@echo 'creating libshared_la.all_cpp.cpp ...'; \
rm -f libshared_la.all_cpp.files libshared_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libshared_la.all_cpp.final; \
-diff -Nrua kdebase-3.4.0.orig/khotkeys/update/Makefile.in kdebase-3.4.0/khotkeys/update/Makefile.in
+diff -Nru kdebase-3.4.0.orig/khotkeys/update/Makefile.in kdebase-3.4.0/khotkeys/update/Makefile.in
--- kdebase-3.4.0.orig/khotkeys/update/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/khotkeys/update/Makefile.in 2005-03-18 14:34:23.000000000 -0500
++++ kdebase-3.4.0/khotkeys/update/Makefile.in 2005-04-06 13:31:21.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,
@@ -32688,14 +33026,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kconfPROGRAMS: $(kconf_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kicker/Makefile.in kdebase-3.4.0/kicker/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/Makefile.in kdebase-3.4.0/kicker/Makefile.in
--- kdebase-3.4.0.orig/kicker/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/Makefile.in 2005-03-18 14:34:23.000000000 -0500
++++ kdebase-3.4.0/kicker/Makefile.in 2005-04-06 13:31:21.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,
@@ -32806,14 +33144,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/kicker/applets/Makefile.in kdebase-3.4.0/kicker/applets/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/applets/Makefile.in kdebase-3.4.0/kicker/applets/Makefile.in
--- kdebase-3.4.0.orig/kicker/applets/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/Makefile.in 2005-03-18 14:34:23.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/Makefile.in 2005-04-06 13:31:21.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,
@@ -32910,14 +33248,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kicker/applets/clock/Makefile.in kdebase-3.4.0/kicker/applets/clock/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/applets/clock/Makefile.in kdebase-3.4.0/kicker/applets/clock/Makefile.in
--- kdebase-3.4.0.orig/kicker/applets/clock/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/clock/Makefile.in 2005-03-18 14:34:23.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/clock/Makefile.in 2005-04-06 13:31:21.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,
@@ -32980,14 +33318,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kicker/applets/launcher/Makefile.in kdebase-3.4.0/kicker/applets/launcher/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/applets/launcher/Makefile.in kdebase-3.4.0/kicker/applets/launcher/Makefile.in
--- kdebase-3.4.0.orig/kicker/applets/launcher/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/launcher/Makefile.in 2005-03-18 14:34:23.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/launcher/Makefile.in 2005-04-06 13:31:21.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,
@@ -33050,14 +33388,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kicker/applets/lockout/Makefile.in kdebase-3.4.0/kicker/applets/lockout/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/applets/lockout/Makefile.in kdebase-3.4.0/kicker/applets/lockout/Makefile.in
--- kdebase-3.4.0.orig/kicker/applets/lockout/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/lockout/Makefile.in 2005-03-18 14:34:23.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/lockout/Makefile.in 2005-04-06 13:31:21.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,
@@ -33120,14 +33458,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kicker/applets/media/Makefile.in kdebase-3.4.0/kicker/applets/media/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/applets/media/Makefile.in kdebase-3.4.0/kicker/applets/media/Makefile.in
--- kdebase-3.4.0.orig/kicker/applets/media/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/media/Makefile.in 2005-03-18 14:34:23.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/media/Makefile.in 2005-04-06 13:31:21.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,
@@ -33233,14 +33571,14 @@
@echo 'creating media_panelapplet_la.all_cpp.cpp ...'; \
rm -f media_panelapplet_la.all_cpp.files media_panelapplet_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> media_panelapplet_la.all_cpp.final; \
-diff -Nrua kdebase-3.4.0.orig/kicker/applets/menu/Makefile.in kdebase-3.4.0/kicker/applets/menu/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/applets/menu/Makefile.in kdebase-3.4.0/kicker/applets/menu/Makefile.in
--- kdebase-3.4.0.orig/kicker/applets/menu/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/menu/Makefile.in 2005-03-18 14:34:23.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/menu/Makefile.in 2005-04-06 13:31:21.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,
@@ -33303,14 +33641,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kicker/applets/minipager/Makefile.in kdebase-3.4.0/kicker/applets/minipager/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/applets/minipager/Makefile.in kdebase-3.4.0/kicker/applets/minipager/Makefile.in
--- kdebase-3.4.0.orig/kicker/applets/minipager/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/minipager/Makefile.in 2005-03-18 14:34:23.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/minipager/Makefile.in 2005-04-06 13:31:21.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,
@@ -33373,14 +33711,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kicker/applets/naughty/Makefile.in kdebase-3.4.0/kicker/applets/naughty/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/applets/naughty/Makefile.in kdebase-3.4.0/kicker/applets/naughty/Makefile.in
--- kdebase-3.4.0.orig/kicker/applets/naughty/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/naughty/Makefile.in 2005-03-18 14:34:23.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/naughty/Makefile.in 2005-04-06 13:31:21.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,
@@ -33443,14 +33781,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kicker/applets/run/Makefile.in kdebase-3.4.0/kicker/applets/run/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/applets/run/Makefile.in kdebase-3.4.0/kicker/applets/run/Makefile.in
--- kdebase-3.4.0.orig/kicker/applets/run/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/run/Makefile.in 2005-03-18 14:34:23.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/run/Makefile.in 2005-04-06 13:31:21.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,
@@ -33513,14 +33851,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kicker/applets/swallow/Makefile.in kdebase-3.4.0/kicker/applets/swallow/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/applets/swallow/Makefile.in kdebase-3.4.0/kicker/applets/swallow/Makefile.in
--- kdebase-3.4.0.orig/kicker/applets/swallow/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/swallow/Makefile.in 2005-03-18 14:34:23.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/swallow/Makefile.in 2005-04-06 13:31:21.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,
@@ -33632,14 +33970,14 @@
$(srcdir)/swallow.cpp: prefwidgetbase.h
prefwidget.o: prefwidget.moc
-diff -Nrua kdebase-3.4.0.orig/kicker/applets/systemtray/Makefile.in kdebase-3.4.0/kicker/applets/systemtray/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/applets/systemtray/Makefile.in kdebase-3.4.0/kicker/applets/systemtray/Makefile.in
--- kdebase-3.4.0.orig/kicker/applets/systemtray/Makefile.in 2005-03-04 08:14:57.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/systemtray/Makefile.in 2005-03-18 14:34:23.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/systemtray/Makefile.in 2005-04-06 13:31:21.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,
@@ -33702,14 +34040,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kicker/applets/taskbar/Makefile.in kdebase-3.4.0/kicker/applets/taskbar/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/applets/taskbar/Makefile.in kdebase-3.4.0/kicker/applets/taskbar/Makefile.in
--- kdebase-3.4.0.orig/kicker/applets/taskbar/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/taskbar/Makefile.in 2005-03-18 14:34:23.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/taskbar/Makefile.in 2005-04-06 13:31:21.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,
@@ -33772,14 +34110,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kicker/applets/trash/Makefile.in kdebase-3.4.0/kicker/applets/trash/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/applets/trash/Makefile.in kdebase-3.4.0/kicker/applets/trash/Makefile.in
--- kdebase-3.4.0.orig/kicker/applets/trash/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/applets/trash/Makefile.in 2005-03-18 14:34:23.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/trash/Makefile.in 2005-04-06 13:31:21.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,
@@ -33842,14 +34180,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kicker/buttons/Makefile.in kdebase-3.4.0/kicker/buttons/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/buttons/Makefile.in kdebase-3.4.0/kicker/buttons/Makefile.in
--- kdebase-3.4.0.orig/kicker/buttons/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/buttons/Makefile.in 2005-03-18 14:34:23.000000000 -0500
++++ kdebase-3.4.0/kicker/buttons/Makefile.in 2005-04-06 13:31:22.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,
@@ -33993,14 +34331,14 @@
extensionbutton.lo: extensionbutton.moc
bookmarksbutton.lo: bookmarksbutton.moc
kbutton.o: kbutton.moc
-diff -Nrua kdebase-3.4.0.orig/kicker/core/Makefile.in kdebase-3.4.0/kicker/core/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/core/Makefile.in kdebase-3.4.0/kicker/core/Makefile.in
--- kdebase-3.4.0.orig/kicker/core/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/core/Makefile.in 2005-03-18 14:34:24.000000000 -0500
++++ kdebase-3.4.0/kicker/core/Makefile.in 2005-04-06 13:31:22.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,
@@ -34131,14 +34469,14 @@
@echo 'creating libkicker_core_la.all_cpp.cpp ...'; \
rm -f libkicker_core_la.all_cpp.files libkicker_core_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkicker_core_la.all_cpp.final; \
-diff -Nrua kdebase-3.4.0.orig/kicker/data/Makefile.in kdebase-3.4.0/kicker/data/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/data/Makefile.in kdebase-3.4.0/kicker/data/Makefile.in
--- kdebase-3.4.0.orig/kicker/data/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/data/Makefile.in 2005-03-18 14:34:24.000000000 -0500
++++ kdebase-3.4.0/kicker/data/Makefile.in 2005-04-06 13:31:22.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,
@@ -34235,14 +34573,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kicker/data/app_start_anim/Makefile.in kdebase-3.4.0/kicker/data/app_start_anim/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/data/app_start_anim/Makefile.in kdebase-3.4.0/kicker/data/app_start_anim/Makefile.in
--- kdebase-3.4.0.orig/kicker/data/app_start_anim/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/data/app_start_anim/Makefile.in 2005-03-18 14:34:24.000000000 -0500
++++ kdebase-3.4.0/kicker/data/app_start_anim/Makefile.in 2005-04-06 13:31:22.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,
@@ -34291,14 +34629,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kicker/data/icons/Makefile.in kdebase-3.4.0/kicker/data/icons/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/data/icons/Makefile.in kdebase-3.4.0/kicker/data/icons/Makefile.in
--- kdebase-3.4.0.orig/kicker/data/icons/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/data/icons/Makefile.in 2005-03-18 14:34:24.000000000 -0500
++++ kdebase-3.4.0/kicker/data/icons/Makefile.in 2005-04-06 13:31:22.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,
@@ -34467,14 +34805,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kicker/data/icons/actions/Makefile.in kdebase-3.4.0/kicker/data/icons/actions/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/data/icons/actions/Makefile.in kdebase-3.4.0/kicker/data/icons/actions/Makefile.in
--- kdebase-3.4.0.orig/kicker/data/icons/actions/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/data/icons/actions/Makefile.in 2005-03-18 14:34:24.000000000 -0500
++++ kdebase-3.4.0/kicker/data/icons/actions/Makefile.in 2005-04-06 13:31:22.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,
@@ -34523,14 +34861,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kicker/data/kmenu_side/Makefile.in kdebase-3.4.0/kicker/data/kmenu_side/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/data/kmenu_side/Makefile.in kdebase-3.4.0/kicker/data/kmenu_side/Makefile.in
--- kdebase-3.4.0.orig/kicker/data/kmenu_side/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/data/kmenu_side/Makefile.in 2005-03-18 14:34:24.000000000 -0500
++++ kdebase-3.4.0/kicker/data/kmenu_side/Makefile.in 2005-04-06 13:31:22.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,
@@ -34579,14 +34917,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kicker/data/tiles/Makefile.in kdebase-3.4.0/kicker/data/tiles/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/data/tiles/Makefile.in kdebase-3.4.0/kicker/data/tiles/Makefile.in
--- kdebase-3.4.0.orig/kicker/data/tiles/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/data/tiles/Makefile.in 2005-03-18 14:34:24.000000000 -0500
++++ kdebase-3.4.0/kicker/data/tiles/Makefile.in 2005-04-06 13:31:22.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,
@@ -34644,14 +34982,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kicker/data/wallpaper/Makefile.in kdebase-3.4.0/kicker/data/wallpaper/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/data/wallpaper/Makefile.in kdebase-3.4.0/kicker/data/wallpaper/Makefile.in
--- kdebase-3.4.0.orig/kicker/data/wallpaper/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/data/wallpaper/Makefile.in 2005-03-18 14:34:24.000000000 -0500
++++ kdebase-3.4.0/kicker/data/wallpaper/Makefile.in 2005-04-06 13:31:22.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,
@@ -34700,14 +35038,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kicker/extensions/Makefile.in kdebase-3.4.0/kicker/extensions/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/extensions/Makefile.in kdebase-3.4.0/kicker/extensions/Makefile.in
--- kdebase-3.4.0.orig/kicker/extensions/Makefile.in 2005-03-04 08:14:58.000000000 -0500
-+++ kdebase-3.4.0/kicker/extensions/Makefile.in 2005-03-18 14:34:24.000000000 -0500
++++ kdebase-3.4.0/kicker/extensions/Makefile.in 2005-04-06 13:31:22.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,
@@ -34804,14 +35142,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kicker/extensions/dockbar/Makefile.in kdebase-3.4.0/kicker/extensions/dockbar/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/extensions/dockbar/Makefile.in kdebase-3.4.0/kicker/extensions/dockbar/Makefile.in
--- kdebase-3.4.0.orig/kicker/extensions/dockbar/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/extensions/dockbar/Makefile.in 2005-03-18 14:34:24.000000000 -0500
++++ kdebase-3.4.0/kicker/extensions/dockbar/Makefile.in 2005-04-06 13:31:22.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,
@@ -34874,14 +35212,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kicker/extensions/kasbar/Makefile.in kdebase-3.4.0/kicker/extensions/kasbar/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/extensions/kasbar/Makefile.in kdebase-3.4.0/kicker/extensions/kasbar/Makefile.in
--- kdebase-3.4.0.orig/kicker/extensions/kasbar/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/extensions/kasbar/Makefile.in 2005-03-18 14:34:24.000000000 -0500
++++ kdebase-3.4.0/kicker/extensions/kasbar/Makefile.in 2005-04-06 13:31:22.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,
@@ -34974,7 +35312,7 @@
#>+ 3
kasresources.moc: $(srcdir)/kasresources.h
-@@ -1166,7 +1169,7 @@
+@@ -1166,10 +1169,10 @@
#>+ 3
clean-metasources:
@@ -34982,7 +35320,11 @@
+ -rm -f kasgroupitem.moc kastaskitem.moc kastasker.moc kasbarextension.moc kasaboutdlg.moc kasclockitem.moc kasitem.moc kasresources.moc kaspopup.moc kasloaditem.moc kasbar.moc kasprefsdlg.moc kastaskpopup.moc kasstartupitem.moc
#>+ 2
- KDE_DIST=DESIGN Makefile.in kasclockitem.h kasloaditem.h Doxyfile docs.h kastaskpopup.h kasbarextension.desktop Makefile.am
+-KDE_DIST=DESIGN Makefile.in kasclockitem.h kasloaditem.h Doxyfile docs.h kastaskpopup.h kasbarextension.desktop Makefile.am
++KDE_DIST=DESIGN Makefile.in kasclockitem.h kasloaditem.h Doxyfile configure.in.in docs.h kastaskpopup.h kasbarextension.desktop Makefile.am
+
+ #>+ 3
+ clean-closures:
@@ -1217,7 +1220,7 @@
@@ -34992,14 +35334,14 @@
@echo 'creating libkasbar_la.all_cpp.cpp ...'; \
rm -f libkasbar_la.all_cpp.files libkasbar_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkasbar_la.all_cpp.final; \
-diff -Nrua kdebase-3.4.0.orig/kicker/extensions/sidebar/Makefile.in kdebase-3.4.0/kicker/extensions/sidebar/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/extensions/sidebar/Makefile.in kdebase-3.4.0/kicker/extensions/sidebar/Makefile.in
--- kdebase-3.4.0.orig/kicker/extensions/sidebar/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/extensions/sidebar/Makefile.in 2005-03-18 14:34:24.000000000 -0500
++++ kdebase-3.4.0/kicker/extensions/sidebar/Makefile.in 2005-04-06 13:31:22.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,
@@ -35062,14 +35404,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kicker/extensions/taskbar/Makefile.in kdebase-3.4.0/kicker/extensions/taskbar/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/extensions/taskbar/Makefile.in kdebase-3.4.0/kicker/extensions/taskbar/Makefile.in
--- kdebase-3.4.0.orig/kicker/extensions/taskbar/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/extensions/taskbar/Makefile.in 2005-03-18 14:34:24.000000000 -0500
++++ kdebase-3.4.0/kicker/extensions/taskbar/Makefile.in 2005-04-06 13:31:22.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,
@@ -35132,14 +35474,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kicker/menuext/Makefile.in kdebase-3.4.0/kicker/menuext/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/menuext/Makefile.in kdebase-3.4.0/kicker/menuext/Makefile.in
--- kdebase-3.4.0.orig/kicker/menuext/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/Makefile.in 2005-03-18 14:34:24.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/Makefile.in 2005-04-06 13:31:22.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,
@@ -35236,14 +35578,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kicker/menuext/find/Makefile.in kdebase-3.4.0/kicker/menuext/find/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/menuext/find/Makefile.in kdebase-3.4.0/kicker/menuext/find/Makefile.in
--- kdebase-3.4.0.orig/kicker/menuext/find/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/find/Makefile.in 2005-03-18 14:34:24.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/find/Makefile.in 2005-04-06 13:31:22.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,
@@ -35306,14 +35648,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kicker/menuext/kdeprint/Makefile.in kdebase-3.4.0/kicker/menuext/kdeprint/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/menuext/kdeprint/Makefile.in kdebase-3.4.0/kicker/menuext/kdeprint/Makefile.in
--- kdebase-3.4.0.orig/kicker/menuext/kdeprint/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/kdeprint/Makefile.in 2005-03-18 14:34:24.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/kdeprint/Makefile.in 2005-04-06 13:31:22.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,
@@ -35376,14 +35718,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kicker/menuext/konq-profiles/Makefile.in kdebase-3.4.0/kicker/menuext/konq-profiles/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/menuext/konq-profiles/Makefile.in kdebase-3.4.0/kicker/menuext/konq-profiles/Makefile.in
--- kdebase-3.4.0.orig/kicker/menuext/konq-profiles/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/konq-profiles/Makefile.in 2005-03-18 14:34:24.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/konq-profiles/Makefile.in 2005-04-06 13:31:22.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,
@@ -35446,14 +35788,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kicker/menuext/konsole/Makefile.in kdebase-3.4.0/kicker/menuext/konsole/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/menuext/konsole/Makefile.in kdebase-3.4.0/kicker/menuext/konsole/Makefile.in
--- kdebase-3.4.0.orig/kicker/menuext/konsole/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/konsole/Makefile.in 2005-03-18 14:34:24.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/konsole/Makefile.in 2005-04-06 13:31:22.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,
@@ -35516,14 +35858,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kicker/menuext/prefmenu/Makefile.in kdebase-3.4.0/kicker/menuext/prefmenu/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/menuext/prefmenu/Makefile.in kdebase-3.4.0/kicker/menuext/prefmenu/Makefile.in
--- kdebase-3.4.0.orig/kicker/menuext/prefmenu/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/prefmenu/Makefile.in 2005-03-18 14:34:25.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/prefmenu/Makefile.in 2005-04-06 13:31:22.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,
@@ -35586,14 +35928,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kicker/menuext/recentdocs/Makefile.in kdebase-3.4.0/kicker/menuext/recentdocs/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/menuext/recentdocs/Makefile.in kdebase-3.4.0/kicker/menuext/recentdocs/Makefile.in
--- kdebase-3.4.0.orig/kicker/menuext/recentdocs/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/recentdocs/Makefile.in 2005-03-18 14:34:25.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/recentdocs/Makefile.in 2005-04-06 13:31:23.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,
@@ -35656,14 +35998,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kicker/menuext/remote/Makefile.in kdebase-3.4.0/kicker/menuext/remote/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/menuext/remote/Makefile.in kdebase-3.4.0/kicker/menuext/remote/Makefile.in
--- kdebase-3.4.0.orig/kicker/menuext/remote/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/remote/Makefile.in 2005-03-18 14:34:25.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/remote/Makefile.in 2005-04-06 13:31:23.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,
@@ -35726,14 +36068,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kicker/menuext/system/Makefile.in kdebase-3.4.0/kicker/menuext/system/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/menuext/system/Makefile.in kdebase-3.4.0/kicker/menuext/system/Makefile.in
--- kdebase-3.4.0.orig/kicker/menuext/system/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/system/Makefile.in 2005-03-18 14:34:25.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/system/Makefile.in 2005-04-06 13:31:23.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,
@@ -35796,14 +36138,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kicker/menuext/tom/Makefile.in kdebase-3.4.0/kicker/menuext/tom/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/menuext/tom/Makefile.in kdebase-3.4.0/kicker/menuext/tom/Makefile.in
--- kdebase-3.4.0.orig/kicker/menuext/tom/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/menuext/tom/Makefile.in 2005-03-18 14:34:25.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/tom/Makefile.in 2005-04-06 13:31:23.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,
@@ -35866,14 +36208,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kicker/proxy/Makefile.in kdebase-3.4.0/kicker/proxy/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/proxy/Makefile.in kdebase-3.4.0/kicker/proxy/Makefile.in
--- kdebase-3.4.0.orig/kicker/proxy/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/proxy/Makefile.in 2005-03-18 14:34:25.000000000 -0500
++++ kdebase-3.4.0/kicker/proxy/Makefile.in 2005-04-06 13:31:23.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,
@@ -35936,14 +36278,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kicker/share/Makefile.in kdebase-3.4.0/kicker/share/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/share/Makefile.in kdebase-3.4.0/kicker/share/Makefile.in
--- kdebase-3.4.0.orig/kicker/share/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/share/Makefile.in 2005-03-18 14:34:25.000000000 -0500
++++ kdebase-3.4.0/kicker/share/Makefile.in 2005-04-06 13:31:23.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,
@@ -36006,14 +36348,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kicker/taskbar/Makefile.in kdebase-3.4.0/kicker/taskbar/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/taskbar/Makefile.in kdebase-3.4.0/kicker/taskbar/Makefile.in
--- kdebase-3.4.0.orig/kicker/taskbar/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/taskbar/Makefile.in 2005-03-18 14:34:25.000000000 -0500
++++ kdebase-3.4.0/kicker/taskbar/Makefile.in 2005-04-06 13:31:23.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,
@@ -36076,14 +36418,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kicker/taskmanager/Makefile.in kdebase-3.4.0/kicker/taskmanager/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/taskmanager/Makefile.in kdebase-3.4.0/kicker/taskmanager/Makefile.in
--- kdebase-3.4.0.orig/kicker/taskmanager/Makefile.in 2005-03-04 08:14:59.000000000 -0500
-+++ kdebase-3.4.0/kicker/taskmanager/Makefile.in 2005-03-18 14:34:25.000000000 -0500
++++ kdebase-3.4.0/kicker/taskmanager/Makefile.in 2005-04-06 13:31:23.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,
@@ -36146,14 +36488,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kicker/ui/Makefile.in kdebase-3.4.0/kicker/ui/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kicker/ui/Makefile.in kdebase-3.4.0/kicker/ui/Makefile.in
--- kdebase-3.4.0.orig/kicker/ui/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kicker/ui/Makefile.in 2005-03-18 14:34:25.000000000 -0500
++++ kdebase-3.4.0/kicker/ui/Makefile.in 2005-04-06 13:31:23.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,
@@ -36284,14 +36626,14 @@
@echo 'creating libkicker_ui_la.all_cpp.cpp ...'; \
rm -f libkicker_ui_la.all_cpp.files libkicker_ui_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkicker_ui_la.all_cpp.final; \
-diff -Nrua kdebase-3.4.0.orig/kioslave/Makefile.in kdebase-3.4.0/kioslave/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/Makefile.in kdebase-3.4.0/kioslave/Makefile.in
--- kdebase-3.4.0.orig/kioslave/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/Makefile.in 2005-03-18 14:34:25.000000000 -0500
++++ kdebase-3.4.0/kioslave/Makefile.in 2005-04-06 13:31:23.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,
@@ -36388,14 +36730,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kioslave/about/Makefile.in kdebase-3.4.0/kioslave/about/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/about/Makefile.in kdebase-3.4.0/kioslave/about/Makefile.in
--- kdebase-3.4.0.orig/kioslave/about/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/about/Makefile.in 2005-03-18 14:34:25.000000000 -0500
++++ kdebase-3.4.0/kioslave/about/Makefile.in 2005-04-06 13:31:23.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,
@@ -36458,14 +36800,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kioslave/cgi/Makefile.in kdebase-3.4.0/kioslave/cgi/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/cgi/Makefile.in kdebase-3.4.0/kioslave/cgi/Makefile.in
--- kdebase-3.4.0.orig/kioslave/cgi/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/cgi/Makefile.in 2005-03-18 14:34:25.000000000 -0500
++++ kdebase-3.4.0/kioslave/cgi/Makefile.in 2005-04-06 13:31:23.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,
@@ -36576,14 +36918,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/kioslave/cgi/kcmcgi/Makefile.in kdebase-3.4.0/kioslave/cgi/kcmcgi/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/cgi/kcmcgi/Makefile.in kdebase-3.4.0/kioslave/cgi/kcmcgi/Makefile.in
--- kdebase-3.4.0.orig/kioslave/cgi/kcmcgi/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/cgi/kcmcgi/Makefile.in 2005-03-18 14:34:25.000000000 -0500
++++ kdebase-3.4.0/kioslave/cgi/kcmcgi/Makefile.in 2005-04-06 13:31:23.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,
@@ -36646,14 +36988,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kioslave/filter/Makefile.in kdebase-3.4.0/kioslave/filter/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/filter/Makefile.in kdebase-3.4.0/kioslave/filter/Makefile.in
--- kdebase-3.4.0.orig/kioslave/filter/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/filter/Makefile.in 2005-03-18 14:34:25.000000000 -0500
++++ kdebase-3.4.0/kioslave/filter/Makefile.in 2005-04-06 13:31:23.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,
@@ -36716,14 +37058,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kioslave/finger/Makefile.in kdebase-3.4.0/kioslave/finger/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/finger/Makefile.in kdebase-3.4.0/kioslave/finger/Makefile.in
--- kdebase-3.4.0.orig/kioslave/finger/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/finger/Makefile.in 2005-03-18 14:34:25.000000000 -0500
++++ kdebase-3.4.0/kioslave/finger/Makefile.in 2005-04-06 13:31:23.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,
@@ -36786,14 +37128,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kioslave/fish/Makefile.in kdebase-3.4.0/kioslave/fish/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/fish/Makefile.in kdebase-3.4.0/kioslave/fish/Makefile.in
--- kdebase-3.4.0.orig/kioslave/fish/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/fish/Makefile.in 2005-03-18 14:34:25.000000000 -0500
++++ kdebase-3.4.0/kioslave/fish/Makefile.in 2005-04-06 13:31:23.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,
@@ -36856,14 +37198,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kioslave/floppy/Makefile.in kdebase-3.4.0/kioslave/floppy/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/floppy/Makefile.in kdebase-3.4.0/kioslave/floppy/Makefile.in
--- kdebase-3.4.0.orig/kioslave/floppy/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/floppy/Makefile.in 2005-03-18 14:34:26.000000000 -0500
++++ kdebase-3.4.0/kioslave/floppy/Makefile.in 2005-04-06 13:31:23.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,
@@ -36926,14 +37268,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kioslave/info/Makefile.in kdebase-3.4.0/kioslave/info/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/info/Makefile.in kdebase-3.4.0/kioslave/info/Makefile.in
--- kdebase-3.4.0.orig/kioslave/info/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/info/Makefile.in 2005-03-18 14:34:26.000000000 -0500
++++ kdebase-3.4.0/kioslave/info/Makefile.in 2005-04-06 13:31:24.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,
@@ -36996,14 +37338,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kioslave/ldap/Makefile.in kdebase-3.4.0/kioslave/ldap/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/ldap/Makefile.in kdebase-3.4.0/kioslave/ldap/Makefile.in
--- kdebase-3.4.0.orig/kioslave/ldap/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/ldap/Makefile.in 2005-03-18 14:34:26.000000000 -0500
++++ kdebase-3.4.0/kioslave/ldap/Makefile.in 2005-04-06 13:31:24.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,
@@ -37066,14 +37408,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kioslave/mac/Makefile.in kdebase-3.4.0/kioslave/mac/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/mac/Makefile.in kdebase-3.4.0/kioslave/mac/Makefile.in
--- kdebase-3.4.0.orig/kioslave/mac/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/mac/Makefile.in 2005-03-18 14:34:26.000000000 -0500
++++ kdebase-3.4.0/kioslave/mac/Makefile.in 2005-04-06 13:31:24.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,
@@ -37136,14 +37478,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kioslave/man/Makefile.in kdebase-3.4.0/kioslave/man/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/man/Makefile.in kdebase-3.4.0/kioslave/man/Makefile.in
--- kdebase-3.4.0.orig/kioslave/man/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/man/Makefile.in 2005-03-18 14:34:26.000000000 -0500
++++ kdebase-3.4.0/kioslave/man/Makefile.in 2005-04-06 13:31:24.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,
@@ -37206,14 +37548,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kioslave/media/Makefile.in kdebase-3.4.0/kioslave/media/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/media/Makefile.in kdebase-3.4.0/kioslave/media/Makefile.in
--- kdebase-3.4.0.orig/kioslave/media/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/media/Makefile.in 2005-03-18 14:34:26.000000000 -0500
++++ kdebase-3.4.0/kioslave/media/Makefile.in 2005-04-06 13:31:24.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,
@@ -37324,14 +37666,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/kioslave/media/kdedmodule/Makefile.in kdebase-3.4.0/kioslave/media/kdedmodule/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/media/kdedmodule/Makefile.in kdebase-3.4.0/kioslave/media/kdedmodule/Makefile.in
--- kdebase-3.4.0.orig/kioslave/media/kdedmodule/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/media/kdedmodule/Makefile.in 2005-03-18 14:34:26.000000000 -0500
++++ kdebase-3.4.0/kioslave/media/kdedmodule/Makefile.in 2005-04-06 13:31: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,
@@ -37394,14 +37736,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kioslave/media/kfile-plugin/Makefile.in kdebase-3.4.0/kioslave/media/kfile-plugin/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/media/kfile-plugin/Makefile.in kdebase-3.4.0/kioslave/media/kfile-plugin/Makefile.in
--- kdebase-3.4.0.orig/kioslave/media/kfile-plugin/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/media/kfile-plugin/Makefile.in 2005-03-18 14:34:26.000000000 -0500
++++ kdebase-3.4.0/kioslave/media/kfile-plugin/Makefile.in 2005-04-06 13:31: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,
@@ -37464,14 +37806,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kioslave/media/libmediacommon/Makefile.in kdebase-3.4.0/kioslave/media/libmediacommon/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/media/libmediacommon/Makefile.in kdebase-3.4.0/kioslave/media/libmediacommon/Makefile.in
--- kdebase-3.4.0.orig/kioslave/media/libmediacommon/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/media/libmediacommon/Makefile.in 2005-03-18 14:34:26.000000000 -0500
++++ kdebase-3.4.0/kioslave/media/libmediacommon/Makefile.in 2005-04-06 13:31: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,
@@ -37534,14 +37876,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nrua kdebase-3.4.0.orig/kioslave/media/mimetypes/Makefile.in kdebase-3.4.0/kioslave/media/mimetypes/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/media/mimetypes/Makefile.in kdebase-3.4.0/kioslave/media/mimetypes/Makefile.in
--- kdebase-3.4.0.orig/kioslave/media/mimetypes/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/media/mimetypes/Makefile.in 2005-03-18 14:34:26.000000000 -0500
++++ kdebase-3.4.0/kioslave/media/mimetypes/Makefile.in 2005-04-06 13:31: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,
@@ -37590,14 +37932,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kioslave/media/mounthelper/Makefile.in kdebase-3.4.0/kioslave/media/mounthelper/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/media/mounthelper/Makefile.in kdebase-3.4.0/kioslave/media/mounthelper/Makefile.in
--- kdebase-3.4.0.orig/kioslave/media/mounthelper/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/media/mounthelper/Makefile.in 2005-03-18 14:34:26.000000000 -0500
++++ kdebase-3.4.0/kioslave/media/mounthelper/Makefile.in 2005-04-06 13:31: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,
@@ -37660,14 +38002,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kioslave/media/services/Makefile.in kdebase-3.4.0/kioslave/media/services/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/media/services/Makefile.in kdebase-3.4.0/kioslave/media/services/Makefile.in
--- kdebase-3.4.0.orig/kioslave/media/services/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/media/services/Makefile.in 2005-03-18 14:34:26.000000000 -0500
++++ kdebase-3.4.0/kioslave/media/services/Makefile.in 2005-04-06 13:31: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,
@@ -37716,14 +38058,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kioslave/nfs/Makefile.in kdebase-3.4.0/kioslave/nfs/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/nfs/Makefile.in kdebase-3.4.0/kioslave/nfs/Makefile.in
--- kdebase-3.4.0.orig/kioslave/nfs/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/nfs/Makefile.in 2005-03-18 14:34:26.000000000 -0500
++++ kdebase-3.4.0/kioslave/nfs/Makefile.in 2005-04-06 13:31: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,
@@ -37799,14 +38141,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kioslave/nntp/Makefile.in kdebase-3.4.0/kioslave/nntp/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/nntp/Makefile.in kdebase-3.4.0/kioslave/nntp/Makefile.in
--- kdebase-3.4.0.orig/kioslave/nntp/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/nntp/Makefile.in 2005-03-18 14:34:26.000000000 -0500
++++ kdebase-3.4.0/kioslave/nntp/Makefile.in 2005-04-06 13:31: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,
@@ -37869,14 +38211,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kioslave/pop3/Makefile.in kdebase-3.4.0/kioslave/pop3/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/pop3/Makefile.in kdebase-3.4.0/kioslave/pop3/Makefile.in
--- kdebase-3.4.0.orig/kioslave/pop3/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/pop3/Makefile.in 2005-03-18 14:34:26.000000000 -0500
++++ kdebase-3.4.0/kioslave/pop3/Makefile.in 2005-04-06 13:31: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,
@@ -37939,14 +38281,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kioslave/remote/Makefile.in kdebase-3.4.0/kioslave/remote/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/remote/Makefile.in kdebase-3.4.0/kioslave/remote/Makefile.in
--- kdebase-3.4.0.orig/kioslave/remote/Makefile.in 2005-03-04 08:15:00.000000000 -0500
-+++ kdebase-3.4.0/kioslave/remote/Makefile.in 2005-03-18 14:34:26.000000000 -0500
++++ kdebase-3.4.0/kioslave/remote/Makefile.in 2005-04-06 13:31: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,
@@ -38057,14 +38399,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/kioslave/remote/kdedmodule/Makefile.in kdebase-3.4.0/kioslave/remote/kdedmodule/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/remote/kdedmodule/Makefile.in kdebase-3.4.0/kioslave/remote/kdedmodule/Makefile.in
--- kdebase-3.4.0.orig/kioslave/remote/kdedmodule/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/remote/kdedmodule/Makefile.in 2005-03-18 14:34:26.000000000 -0500
++++ kdebase-3.4.0/kioslave/remote/kdedmodule/Makefile.in 2005-04-06 13:31: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,
@@ -38127,14 +38469,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kioslave/settings/Makefile.in kdebase-3.4.0/kioslave/settings/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/settings/Makefile.in kdebase-3.4.0/kioslave/settings/Makefile.in
--- kdebase-3.4.0.orig/kioslave/settings/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/settings/Makefile.in 2005-03-18 14:34:26.000000000 -0500
++++ kdebase-3.4.0/kioslave/settings/Makefile.in 2005-04-06 13:31: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,
@@ -38245,14 +38587,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/kioslave/sftp/Makefile.in kdebase-3.4.0/kioslave/sftp/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/sftp/Makefile.in kdebase-3.4.0/kioslave/sftp/Makefile.in
--- kdebase-3.4.0.orig/kioslave/sftp/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/sftp/Makefile.in 2005-03-18 14:34:26.000000000 -0500
++++ kdebase-3.4.0/kioslave/sftp/Makefile.in 2005-04-06 13:31: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,
@@ -38315,14 +38657,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kioslave/smb/Makefile.in kdebase-3.4.0/kioslave/smb/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/smb/Makefile.in kdebase-3.4.0/kioslave/smb/Makefile.in
--- kdebase-3.4.0.orig/kioslave/smb/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/smb/Makefile.in 2005-03-18 14:34:27.000000000 -0500
++++ kdebase-3.4.0/kioslave/smb/Makefile.in 2005-04-06 13:31: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,
@@ -38385,14 +38727,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kioslave/smtp/Makefile.in kdebase-3.4.0/kioslave/smtp/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/smtp/Makefile.in kdebase-3.4.0/kioslave/smtp/Makefile.in
--- kdebase-3.4.0.orig/kioslave/smtp/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/smtp/Makefile.in 2005-03-18 14:34:27.000000000 -0500
++++ kdebase-3.4.0/kioslave/smtp/Makefile.in 2005-04-06 13:31: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,
@@ -38455,14 +38797,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kioslave/system/Makefile.in kdebase-3.4.0/kioslave/system/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/system/Makefile.in kdebase-3.4.0/kioslave/system/Makefile.in
--- kdebase-3.4.0.orig/kioslave/system/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/system/Makefile.in 2005-03-18 14:34:27.000000000 -0500
++++ kdebase-3.4.0/kioslave/system/Makefile.in 2005-04-06 13:31: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,
@@ -38573,14 +38915,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/kioslave/system/entries/Makefile.in kdebase-3.4.0/kioslave/system/entries/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/system/entries/Makefile.in kdebase-3.4.0/kioslave/system/entries/Makefile.in
--- kdebase-3.4.0.orig/kioslave/system/entries/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/system/entries/Makefile.in 2005-03-18 14:34:27.000000000 -0500
++++ kdebase-3.4.0/kioslave/system/entries/Makefile.in 2005-04-06 13:31: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,
@@ -38629,14 +38971,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kioslave/system/kdedmodule/Makefile.in kdebase-3.4.0/kioslave/system/kdedmodule/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/system/kdedmodule/Makefile.in kdebase-3.4.0/kioslave/system/kdedmodule/Makefile.in
--- kdebase-3.4.0.orig/kioslave/system/kdedmodule/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/system/kdedmodule/Makefile.in 2005-03-18 14:34:27.000000000 -0500
++++ kdebase-3.4.0/kioslave/system/kdedmodule/Makefile.in 2005-04-06 13:31: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,
@@ -38699,14 +39041,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kioslave/system/mimetypes/Makefile.in kdebase-3.4.0/kioslave/system/mimetypes/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/system/mimetypes/Makefile.in kdebase-3.4.0/kioslave/system/mimetypes/Makefile.in
--- kdebase-3.4.0.orig/kioslave/system/mimetypes/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/system/mimetypes/Makefile.in 2005-03-18 14:34:27.000000000 -0500
++++ kdebase-3.4.0/kioslave/system/mimetypes/Makefile.in 2005-04-06 13:31: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,
@@ -38755,14 +39097,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kioslave/tar/Makefile.in kdebase-3.4.0/kioslave/tar/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/tar/Makefile.in kdebase-3.4.0/kioslave/tar/Makefile.in
--- kdebase-3.4.0.orig/kioslave/tar/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/tar/Makefile.in 2005-03-18 14:34:27.000000000 -0500
++++ kdebase-3.4.0/kioslave/tar/Makefile.in 2005-04-06 13:31: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,
@@ -38825,14 +39167,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kioslave/thumbnail/Makefile.in kdebase-3.4.0/kioslave/thumbnail/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/thumbnail/Makefile.in kdebase-3.4.0/kioslave/thumbnail/Makefile.in
--- kdebase-3.4.0.orig/kioslave/thumbnail/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/thumbnail/Makefile.in 2005-03-18 14:34:27.000000000 -0500
++++ kdebase-3.4.0/kioslave/thumbnail/Makefile.in 2005-04-06 13:31: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,
@@ -38895,14 +39237,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kioslave/trash/Makefile.in kdebase-3.4.0/kioslave/trash/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/trash/Makefile.in kdebase-3.4.0/kioslave/trash/Makefile.in
--- kdebase-3.4.0.orig/kioslave/trash/Makefile.in 2005-03-04 08:15:01.000000000 -0500
-+++ kdebase-3.4.0/kioslave/trash/Makefile.in 2005-03-18 14:34:27.000000000 -0500
++++ kdebase-3.4.0/kioslave/trash/Makefile.in 2005-04-06 13:31: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,
@@ -39013,14 +39355,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/kioslave/trash/kfile-plugin/Makefile.in kdebase-3.4.0/kioslave/trash/kfile-plugin/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kioslave/trash/kfile-plugin/Makefile.in kdebase-3.4.0/kioslave/trash/kfile-plugin/Makefile.in
--- kdebase-3.4.0.orig/kioslave/trash/kfile-plugin/Makefile.in 2005-03-04 08:15:02.000000000 -0500
-+++ kdebase-3.4.0/kioslave/trash/kfile-plugin/Makefile.in 2005-03-18 14:34:27.000000000 -0500
++++ kdebase-3.4.0/kioslave/trash/kfile-plugin/Makefile.in 2005-04-06 13:31: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,
@@ -39083,14 +39425,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/klipper/Makefile.in kdebase-3.4.0/klipper/Makefile.in
+diff -Nru kdebase-3.4.0.orig/klipper/Makefile.in kdebase-3.4.0/klipper/Makefile.in
--- kdebase-3.4.0.orig/klipper/Makefile.in 2005-03-04 08:15:02.000000000 -0500
-+++ kdebase-3.4.0/klipper/Makefile.in 2005-03-18 14:34:28.000000000 -0500
++++ kdebase-3.4.0/klipper/Makefile.in 2005-04-06 13:31: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,
@@ -39261,14 +39603,14 @@
clipboardpoll.o: clipboardpoll.moc
+klipperpopup.lo: klipperpopup.moc
popupproxy.lo: popupproxy.moc
-diff -Nrua kdebase-3.4.0.orig/kmenuedit/Makefile.in kdebase-3.4.0/kmenuedit/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kmenuedit/Makefile.in kdebase-3.4.0/kmenuedit/Makefile.in
--- kdebase-3.4.0.orig/kmenuedit/Makefile.in 2005-03-04 08:15:02.000000000 -0500
-+++ kdebase-3.4.0/kmenuedit/Makefile.in 2005-03-18 14:34:29.000000000 -0500
++++ kdebase-3.4.0/kmenuedit/Makefile.in 2005-04-06 13:31: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,
@@ -39446,14 +39788,14 @@
@echo 'creating libkmenueditcommon_la.all_cpp.cpp ...'; \
rm -f libkmenueditcommon_la.all_cpp.files libkmenueditcommon_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkmenueditcommon_la.all_cpp.final; \
-diff -Nrua kdebase-3.4.0.orig/kmenuedit/pixmaps/Makefile.in kdebase-3.4.0/kmenuedit/pixmaps/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kmenuedit/pixmaps/Makefile.in kdebase-3.4.0/kmenuedit/pixmaps/Makefile.in
--- kdebase-3.4.0.orig/kmenuedit/pixmaps/Makefile.in 2005-03-04 08:15:02.000000000 -0500
-+++ kdebase-3.4.0/kmenuedit/pixmaps/Makefile.in 2005-03-18 14:34:29.000000000 -0500
++++ kdebase-3.4.0/kmenuedit/pixmaps/Makefile.in 2005-04-06 13:31: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,
@@ -39553,14 +39895,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/knetattach/Makefile.in kdebase-3.4.0/knetattach/Makefile.in
+diff -Nru kdebase-3.4.0.orig/knetattach/Makefile.in kdebase-3.4.0/knetattach/Makefile.in
--- kdebase-3.4.0.orig/knetattach/Makefile.in 2005-03-04 08:15:02.000000000 -0500
-+++ kdebase-3.4.0/knetattach/Makefile.in 2005-03-18 14:34:29.000000000 -0500
++++ kdebase-3.4.0/knetattach/Makefile.in 2005-04-06 13:31: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,
@@ -39665,14 +40007,14 @@
#>+ 15
force-reedit:
-diff -Nrua kdebase-3.4.0.orig/konqueror/Makefile.in kdebase-3.4.0/konqueror/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konqueror/Makefile.in kdebase-3.4.0/konqueror/Makefile.in
--- kdebase-3.4.0.orig/konqueror/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/Makefile.in 2005-03-18 14:34:30.000000000 -0500
++++ kdebase-3.4.0/konqueror/Makefile.in 2005-04-06 13:31: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,
@@ -39830,14 +40172,14 @@
@echo 'creating libkdeinit_konqueror_la.all_cc.cc ...'; \
rm -f libkdeinit_konqueror_la.all_cc.files libkdeinit_konqueror_la.all_cc.final; \
echo "#define KDE_USE_FINAL 1" >> libkdeinit_konqueror_la.all_cc.final; \
-diff -Nrua kdebase-3.4.0.orig/konqueror/about/Makefile.in kdebase-3.4.0/konqueror/about/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konqueror/about/Makefile.in kdebase-3.4.0/konqueror/about/Makefile.in
--- kdebase-3.4.0.orig/konqueror/about/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/about/Makefile.in 2005-03-18 14:34:30.000000000 -0500
++++ kdebase-3.4.0/konqueror/about/Makefile.in 2005-04-06 13:31: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,
@@ -39900,14 +40242,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/konqueror/client/Makefile.in kdebase-3.4.0/konqueror/client/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konqueror/client/Makefile.in kdebase-3.4.0/konqueror/client/Makefile.in
--- kdebase-3.4.0.orig/konqueror/client/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/client/Makefile.in 2005-03-18 14:34:30.000000000 -0500
++++ kdebase-3.4.0/konqueror/client/Makefile.in 2005-04-06 13:31: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,
@@ -39970,14 +40312,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/konqueror/iconview/Makefile.in kdebase-3.4.0/konqueror/iconview/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konqueror/iconview/Makefile.in kdebase-3.4.0/konqueror/iconview/Makefile.in
--- kdebase-3.4.0.orig/konqueror/iconview/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/iconview/Makefile.in 2005-03-18 14:34:31.000000000 -0500
++++ kdebase-3.4.0/konqueror/iconview/Makefile.in 2005-04-06 13:31: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,
@@ -40040,14 +40382,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/konqueror/keditbookmarks/Makefile.in kdebase-3.4.0/konqueror/keditbookmarks/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konqueror/keditbookmarks/Makefile.in kdebase-3.4.0/konqueror/keditbookmarks/Makefile.in
--- kdebase-3.4.0.orig/konqueror/keditbookmarks/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/keditbookmarks/Makefile.in 2005-03-18 14:34:31.000000000 -0500
++++ kdebase-3.4.0/konqueror/keditbookmarks/Makefile.in 2005-04-06 13:31: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,
@@ -40206,14 +40548,14 @@
@echo 'creating libkdeinit_keditbookmarks_la.all_cpp.cpp ...'; \
rm -f libkdeinit_keditbookmarks_la.all_cpp.files libkdeinit_keditbookmarks_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkdeinit_keditbookmarks_la.all_cpp.final; \
-diff -Nrua kdebase-3.4.0.orig/konqueror/kttsplugin/Makefile.in kdebase-3.4.0/konqueror/kttsplugin/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konqueror/kttsplugin/Makefile.in kdebase-3.4.0/konqueror/kttsplugin/Makefile.in
--- kdebase-3.4.0.orig/konqueror/kttsplugin/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/kttsplugin/Makefile.in 2005-03-18 14:34:31.000000000 -0500
++++ kdebase-3.4.0/konqueror/kttsplugin/Makefile.in 2005-04-06 13:31: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,
@@ -40276,14 +40618,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/konqueror/listview/Makefile.in kdebase-3.4.0/konqueror/listview/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konqueror/listview/Makefile.in kdebase-3.4.0/konqueror/listview/Makefile.in
--- kdebase-3.4.0.orig/konqueror/listview/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/listview/Makefile.in 2005-03-18 14:34:31.000000000 -0500
++++ kdebase-3.4.0/konqueror/listview/Makefile.in 2005-04-06 13:31: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,
@@ -40355,14 +40697,14 @@
#>+ 3
clean-closures:
-diff -Nrua kdebase-3.4.0.orig/konqueror/pics/Makefile.in kdebase-3.4.0/konqueror/pics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konqueror/pics/Makefile.in kdebase-3.4.0/konqueror/pics/Makefile.in
--- kdebase-3.4.0.orig/konqueror/pics/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/pics/Makefile.in 2005-03-18 14:34:31.000000000 -0500
++++ kdebase-3.4.0/konqueror/pics/Makefile.in 2005-04-06 13:31: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,
@@ -40519,14 +40861,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/konqueror/pics/actions/Makefile.in kdebase-3.4.0/konqueror/pics/actions/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konqueror/pics/actions/Makefile.in kdebase-3.4.0/konqueror/pics/actions/Makefile.in
--- kdebase-3.4.0.orig/konqueror/pics/actions/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/pics/actions/Makefile.in 2005-03-18 14:34:31.000000000 -0500
++++ kdebase-3.4.0/konqueror/pics/actions/Makefile.in 2005-04-06 13:31: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,
@@ -40575,14 +40917,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/konqueror/pics/indicators/Makefile.in kdebase-3.4.0/konqueror/pics/indicators/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konqueror/pics/indicators/Makefile.in kdebase-3.4.0/konqueror/pics/indicators/Makefile.in
--- kdebase-3.4.0.orig/konqueror/pics/indicators/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/pics/indicators/Makefile.in 2005-03-18 14:34:31.000000000 -0500
++++ kdebase-3.4.0/konqueror/pics/indicators/Makefile.in 2005-04-06 13:31: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,
@@ -40631,14 +40973,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/konqueror/pics/tiles/Makefile.in kdebase-3.4.0/konqueror/pics/tiles/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konqueror/pics/tiles/Makefile.in kdebase-3.4.0/konqueror/pics/tiles/Makefile.in
--- kdebase-3.4.0.orig/konqueror/pics/tiles/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/pics/tiles/Makefile.in 2005-03-18 14:34:31.000000000 -0500
++++ kdebase-3.4.0/konqueror/pics/tiles/Makefile.in 2005-04-06 13:31: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,
@@ -40687,14 +41029,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/konqueror/preloader/Makefile.in kdebase-3.4.0/konqueror/preloader/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konqueror/preloader/Makefile.in kdebase-3.4.0/konqueror/preloader/Makefile.in
--- kdebase-3.4.0.orig/konqueror/preloader/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/preloader/Makefile.in 2005-03-18 14:34:31.000000000 -0500
++++ kdebase-3.4.0/konqueror/preloader/Makefile.in 2005-04-06 13:31: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,
@@ -40757,14 +41099,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/konqueror/quickprint/Makefile.in kdebase-3.4.0/konqueror/quickprint/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konqueror/quickprint/Makefile.in kdebase-3.4.0/konqueror/quickprint/Makefile.in
--- kdebase-3.4.0.orig/konqueror/quickprint/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/quickprint/Makefile.in 2005-03-18 14:34:31.000000000 -0500
++++ kdebase-3.4.0/konqueror/quickprint/Makefile.in 2005-04-06 13:31: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,
@@ -40822,14 +41164,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/konqueror/remoteencodingplugin/Makefile.in kdebase-3.4.0/konqueror/remoteencodingplugin/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konqueror/remoteencodingplugin/Makefile.in kdebase-3.4.0/konqueror/remoteencodingplugin/Makefile.in
--- kdebase-3.4.0.orig/konqueror/remoteencodingplugin/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/remoteencodingplugin/Makefile.in 2005-03-18 14:34:31.000000000 -0500
++++ kdebase-3.4.0/konqueror/remoteencodingplugin/Makefile.in 2005-04-06 13:31:31.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,
@@ -40892,14 +41234,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/konqueror/shellcmdplugin/Makefile.in kdebase-3.4.0/konqueror/shellcmdplugin/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konqueror/shellcmdplugin/Makefile.in kdebase-3.4.0/konqueror/shellcmdplugin/Makefile.in
--- kdebase-3.4.0.orig/konqueror/shellcmdplugin/Makefile.in 2005-03-04 08:15:03.000000000 -0500
-+++ kdebase-3.4.0/konqueror/shellcmdplugin/Makefile.in 2005-03-18 14:34:31.000000000 -0500
++++ kdebase-3.4.0/konqueror/shellcmdplugin/Makefile.in 2005-04-06 13:31:31.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,
@@ -40962,14 +41304,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/Makefile.in kdebase-3.4.0/konqueror/sidebar/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konqueror/sidebar/Makefile.in kdebase-3.4.0/konqueror/sidebar/Makefile.in
--- kdebase-3.4.0.orig/konqueror/sidebar/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/Makefile.in 2005-03-18 14:34:31.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/Makefile.in 2005-04-06 13:31:31.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,
@@ -41080,14 +41422,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/test/Makefile.in kdebase-3.4.0/konqueror/sidebar/test/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konqueror/sidebar/test/Makefile.in kdebase-3.4.0/konqueror/sidebar/test/Makefile.in
--- kdebase-3.4.0.orig/konqueror/sidebar/test/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/test/Makefile.in 2005-03-18 14:34:31.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/test/Makefile.in 2005-04-06 13:31:31.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,
@@ -41198,14 +41540,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/trees/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konqueror/sidebar/trees/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/Makefile.in
--- kdebase-3.4.0.orig/konqueror/sidebar/trees/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/trees/Makefile.in 2005-03-18 14:34:31.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/trees/Makefile.in 2005-04-06 13:31:31.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,
@@ -41316,14 +41658,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/trees/bookmark_module/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/bookmark_module/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konqueror/sidebar/trees/bookmark_module/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/bookmark_module/Makefile.in
--- kdebase-3.4.0.orig/konqueror/sidebar/trees/bookmark_module/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/trees/bookmark_module/Makefile.in 2005-03-18 14:34:31.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/trees/bookmark_module/Makefile.in 2005-04-06 13:31:31.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,
@@ -41386,14 +41728,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/trees/dirtree_module/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/dirtree_module/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konqueror/sidebar/trees/dirtree_module/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/dirtree_module/Makefile.in
--- kdebase-3.4.0.orig/konqueror/sidebar/trees/dirtree_module/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/trees/dirtree_module/Makefile.in 2005-03-18 14:34:32.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/trees/dirtree_module/Makefile.in 2005-04-06 13:31:31.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,
@@ -41456,14 +41798,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/trees/history_module/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/history_module/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konqueror/sidebar/trees/history_module/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/history_module/Makefile.in
--- kdebase-3.4.0.orig/konqueror/sidebar/trees/history_module/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/trees/history_module/Makefile.in 2005-03-18 14:34:32.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/trees/history_module/Makefile.in 2005-04-06 13:31: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,
@@ -41526,14 +41868,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/trees/init/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/init/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konqueror/sidebar/trees/init/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/init/Makefile.in
--- kdebase-3.4.0.orig/konqueror/sidebar/trees/init/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/trees/init/Makefile.in 2005-03-18 14:34:32.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/trees/init/Makefile.in 2005-04-06 13:31: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,
@@ -41630,14 +41972,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/trees/init/remote/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/init/remote/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konqueror/sidebar/trees/init/remote/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/init/remote/Makefile.in
--- kdebase-3.4.0.orig/konqueror/sidebar/trees/init/remote/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/trees/init/remote/Makefile.in 2005-03-18 14:34:32.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/trees/init/remote/Makefile.in 2005-04-06 13:31: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,
@@ -41734,14 +42076,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/trees/init/remote/ftp/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/init/remote/ftp/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konqueror/sidebar/trees/init/remote/ftp/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/init/remote/ftp/Makefile.in
--- kdebase-3.4.0.orig/konqueror/sidebar/trees/init/remote/ftp/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/trees/init/remote/ftp/Makefile.in 2005-03-18 14:34:32.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/trees/init/remote/ftp/Makefile.in 2005-04-06 13:31: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,
@@ -41790,14 +42132,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/trees/init/remote/web/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/init/remote/web/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konqueror/sidebar/trees/init/remote/web/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/init/remote/web/Makefile.in
--- kdebase-3.4.0.orig/konqueror/sidebar/trees/init/remote/web/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/trees/init/remote/web/Makefile.in 2005-03-18 14:34:32.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/trees/init/remote/web/Makefile.in 2005-04-06 13:31: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,
@@ -41846,14 +42188,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/trees/init/services/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/init/services/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konqueror/sidebar/trees/init/services/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/init/services/Makefile.in
--- kdebase-3.4.0.orig/konqueror/sidebar/trees/init/services/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/trees/init/services/Makefile.in 2005-03-18 14:34:32.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/trees/init/services/Makefile.in 2005-04-06 13:31: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,
@@ -41902,14 +42244,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/web_module/Makefile.in kdebase-3.4.0/konqueror/sidebar/web_module/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konqueror/sidebar/web_module/Makefile.in kdebase-3.4.0/konqueror/sidebar/web_module/Makefile.in
--- kdebase-3.4.0.orig/konqueror/sidebar/web_module/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konqueror/sidebar/web_module/Makefile.in 2005-03-18 14:34:33.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/web_module/Makefile.in 2005-04-06 13:31: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,
@@ -41972,14 +42314,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/konsole/Makefile.in kdebase-3.4.0/konsole/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konsole/Makefile.in kdebase-3.4.0/konsole/Makefile.in
--- kdebase-3.4.0.orig/konsole/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konsole/Makefile.in 2005-03-18 14:34:33.000000000 -0500
++++ kdebase-3.4.0/konsole/Makefile.in 2005-04-06 13:31: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,
@@ -42076,14 +42418,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/konsole/doc/Makefile.in kdebase-3.4.0/konsole/doc/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konsole/doc/Makefile.in kdebase-3.4.0/konsole/doc/Makefile.in
--- kdebase-3.4.0.orig/konsole/doc/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konsole/doc/Makefile.in 2005-03-18 14:34:33.000000000 -0500
++++ kdebase-3.4.0/konsole/doc/Makefile.in 2005-04-06 13:31: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,
@@ -42180,14 +42522,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/konsole/doc/VT100/Makefile.in kdebase-3.4.0/konsole/doc/VT100/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konsole/doc/VT100/Makefile.in kdebase-3.4.0/konsole/doc/VT100/Makefile.in
--- kdebase-3.4.0.orig/konsole/doc/VT100/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konsole/doc/VT100/Makefile.in 2005-03-18 14:34:33.000000000 -0500
++++ kdebase-3.4.0/konsole/doc/VT100/Makefile.in 2005-04-06 13:31: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,
@@ -42236,14 +42578,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/konsole/fonts/Makefile.in kdebase-3.4.0/konsole/fonts/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konsole/fonts/Makefile.in kdebase-3.4.0/konsole/fonts/Makefile.in
--- kdebase-3.4.0.orig/konsole/fonts/Makefile.in 2005-03-04 08:15:04.000000000 -0500
-+++ kdebase-3.4.0/konsole/fonts/Makefile.in 2005-03-18 14:34:33.000000000 -0500
++++ kdebase-3.4.0/konsole/fonts/Makefile.in 2005-04-06 13:31: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,
@@ -42292,14 +42634,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/konsole/konsole/Makefile.in kdebase-3.4.0/konsole/konsole/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konsole/konsole/Makefile.in kdebase-3.4.0/konsole/konsole/Makefile.in
--- kdebase-3.4.0.orig/konsole/konsole/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/konsole/konsole/Makefile.in 2005-03-18 14:34:34.000000000 -0500
++++ kdebase-3.4.0/konsole/konsole/Makefile.in 2005-04-06 13:31: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,
@@ -42449,14 +42791,14 @@
konsole_part.o: konsole_part.moc
konsolebookmarkhandler.o: konsolebookmarkhandler.moc
nmcheck-am: nmcheck
-diff -Nrua kdebase-3.4.0.orig/konsole/other/Makefile.in kdebase-3.4.0/konsole/other/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konsole/other/Makefile.in kdebase-3.4.0/konsole/other/Makefile.in
--- kdebase-3.4.0.orig/konsole/other/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/konsole/other/Makefile.in 2005-03-18 14:34:34.000000000 -0500
++++ kdebase-3.4.0/konsole/other/Makefile.in 2005-04-06 13:31: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,
@@ -42595,14 +42937,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/konsole/other/icons/Makefile.in kdebase-3.4.0/konsole/other/icons/Makefile.in
+diff -Nru kdebase-3.4.0.orig/konsole/other/icons/Makefile.in kdebase-3.4.0/konsole/other/icons/Makefile.in
--- kdebase-3.4.0.orig/konsole/other/icons/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/konsole/other/icons/Makefile.in 2005-03-18 14:34:34.000000000 -0500
++++ kdebase-3.4.0/konsole/other/icons/Makefile.in 2005-04-06 13:31: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,
@@ -42692,14 +43034,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kpager/Makefile.in kdebase-3.4.0/kpager/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kpager/Makefile.in kdebase-3.4.0/kpager/Makefile.in
--- kdebase-3.4.0.orig/kpager/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/kpager/Makefile.in 2005-03-18 14:34:34.000000000 -0500
++++ kdebase-3.4.0/kpager/Makefile.in 2005-04-06 13:31: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,
@@ -42782,14 +43124,14 @@
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpager.png
#>+ 15
-diff -Nrua kdebase-3.4.0.orig/kpersonalizer/Makefile.in kdebase-3.4.0/kpersonalizer/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kpersonalizer/Makefile.in kdebase-3.4.0/kpersonalizer/Makefile.in
--- kdebase-3.4.0.orig/kpersonalizer/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/kpersonalizer/Makefile.in 2005-03-18 14:34:34.000000000 -0500
++++ kdebase-3.4.0/kpersonalizer/Makefile.in 2005-04-06 13:31: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,
@@ -42900,14 +43242,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/kpersonalizer/pics/Makefile.in kdebase-3.4.0/kpersonalizer/pics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kpersonalizer/pics/Makefile.in kdebase-3.4.0/kpersonalizer/pics/Makefile.in
--- kdebase-3.4.0.orig/kpersonalizer/pics/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/kpersonalizer/pics/Makefile.in 2005-03-18 14:34:34.000000000 -0500
++++ kdebase-3.4.0/kpersonalizer/pics/Makefile.in 2005-04-06 13:31: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,
@@ -42956,14 +43298,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kreadconfig/Makefile.in kdebase-3.4.0/kreadconfig/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kreadconfig/Makefile.in kdebase-3.4.0/kreadconfig/Makefile.in
--- kdebase-3.4.0.orig/kreadconfig/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/kreadconfig/Makefile.in 2005-03-18 14:34:35.000000000 -0500
++++ kdebase-3.4.0/kreadconfig/Makefile.in 2005-04-06 13:31: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,
@@ -43026,14 +43368,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kscreensaver/Makefile.in kdebase-3.4.0/kscreensaver/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kscreensaver/Makefile.in kdebase-3.4.0/kscreensaver/Makefile.in
--- kdebase-3.4.0.orig/kscreensaver/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/kscreensaver/Makefile.in 2005-03-18 14:34:35.000000000 -0500
++++ kdebase-3.4.0/kscreensaver/Makefile.in 2005-04-06 13:31: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,
@@ -43096,14 +43438,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/ksmserver/Makefile.in kdebase-3.4.0/ksmserver/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksmserver/Makefile.in kdebase-3.4.0/ksmserver/Makefile.in
--- kdebase-3.4.0.orig/ksmserver/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksmserver/Makefile.in 2005-03-18 14:34:35.000000000 -0500
++++ kdebase-3.4.0/ksmserver/Makefile.in 2005-04-06 13:31: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,
@@ -43214,14 +43556,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/ksplashml/Makefile.in kdebase-3.4.0/ksplashml/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksplashml/Makefile.in kdebase-3.4.0/ksplashml/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/Makefile.in 2005-03-18 14:34:35.000000000 -0500
++++ kdebase-3.4.0/ksplashml/Makefile.in 2005-04-06 13:31: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,
@@ -43332,14 +43674,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/ksplashml/kcmksplash/Makefile.in kdebase-3.4.0/ksplashml/kcmksplash/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksplashml/kcmksplash/Makefile.in kdebase-3.4.0/ksplashml/kcmksplash/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/kcmksplash/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/kcmksplash/Makefile.in 2005-03-18 14:34:35.000000000 -0500
++++ kdebase-3.4.0/ksplashml/kcmksplash/Makefile.in 2005-04-06 13:31: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,
@@ -43450,14 +43792,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/ksplashml/kcmksplash/pics/Makefile.in kdebase-3.4.0/ksplashml/kcmksplash/pics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksplashml/kcmksplash/pics/Makefile.in kdebase-3.4.0/ksplashml/kcmksplash/pics/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/kcmksplash/pics/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/kcmksplash/pics/Makefile.in 2005-03-18 14:34:35.000000000 -0500
++++ kdebase-3.4.0/ksplashml/kcmksplash/pics/Makefile.in 2005-04-06 13:31: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,
@@ -43541,14 +43883,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/ksplashml/pics/Makefile.in kdebase-3.4.0/ksplashml/pics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksplashml/pics/Makefile.in kdebase-3.4.0/ksplashml/pics/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/pics/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/pics/Makefile.in 2005-03-18 14:34:35.000000000 -0500
++++ kdebase-3.4.0/ksplashml/pics/Makefile.in 2005-04-06 13:31: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,
@@ -43645,14 +43987,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/ksplashml/pics/themes/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksplashml/pics/themes/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/pics/themes/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/pics/themes/Makefile.in 2005-03-18 14:34:35.000000000 -0500
++++ kdebase-3.4.0/ksplashml/pics/themes/Makefile.in 2005-04-06 13:31: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,
@@ -43756,14 +44098,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/ksplashml/pics/themes/blue-bend/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/blue-bend/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksplashml/pics/themes/blue-bend/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/blue-bend/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/pics/themes/blue-bend/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/pics/themes/blue-bend/Makefile.in 2005-03-18 14:34:35.000000000 -0500
++++ kdebase-3.4.0/ksplashml/pics/themes/blue-bend/Makefile.in 2005-04-06 13:31: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,
@@ -43812,14 +44154,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/ksplashml/pics/themes/default/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/default/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksplashml/pics/themes/default/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/default/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/pics/themes/default/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/pics/themes/default/Makefile.in 2005-03-18 14:34:35.000000000 -0500
++++ kdebase-3.4.0/ksplashml/pics/themes/default/Makefile.in 2005-04-06 13:31: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,
@@ -43916,14 +44258,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/ksplashml/pics/themes/default/locolor/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/default/locolor/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksplashml/pics/themes/default/locolor/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/default/locolor/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/pics/themes/default/locolor/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/pics/themes/default/locolor/Makefile.in 2005-03-18 14:34:35.000000000 -0500
++++ kdebase-3.4.0/ksplashml/pics/themes/default/locolor/Makefile.in 2005-04-06 13:31:34.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,
@@ -43972,14 +44314,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/ksplashml/pics/themes/none/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/none/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksplashml/pics/themes/none/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/none/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/pics/themes/none/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/pics/themes/none/Makefile.in 2005-03-18 14:34:35.000000000 -0500
++++ kdebase-3.4.0/ksplashml/pics/themes/none/Makefile.in 2005-04-06 13:31:34.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,
@@ -44028,14 +44370,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/ksplashml/pics/themes/simple/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/simple/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksplashml/pics/themes/simple/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/simple/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/pics/themes/simple/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/pics/themes/simple/Makefile.in 2005-03-18 14:34:35.000000000 -0500
++++ kdebase-3.4.0/ksplashml/pics/themes/simple/Makefile.in 2005-04-06 13:31:34.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,
@@ -44084,14 +44426,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/ksplashml/themeengine/Makefile.in kdebase-3.4.0/ksplashml/themeengine/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksplashml/themeengine/Makefile.in kdebase-3.4.0/ksplashml/themeengine/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/themeengine/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/themeengine/Makefile.in 2005-03-18 14:34:35.000000000 -0500
++++ kdebase-3.4.0/ksplashml/themeengine/Makefile.in 2005-04-06 13:31:34.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,
@@ -44202,14 +44544,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/ksplashml/themeengine/default/Makefile.in kdebase-3.4.0/ksplashml/themeengine/default/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksplashml/themeengine/default/Makefile.in kdebase-3.4.0/ksplashml/themeengine/default/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/themeengine/default/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/themeengine/default/Makefile.in 2005-03-18 14:34:35.000000000 -0500
++++ kdebase-3.4.0/ksplashml/themeengine/default/Makefile.in 2005-04-06 13:31:34.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,
@@ -44272,14 +44614,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/ksplashml/themeengine/redmond/Makefile.in kdebase-3.4.0/ksplashml/themeengine/redmond/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksplashml/themeengine/redmond/Makefile.in kdebase-3.4.0/ksplashml/themeengine/redmond/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/themeengine/redmond/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/themeengine/redmond/Makefile.in 2005-03-18 14:34:35.000000000 -0500
++++ kdebase-3.4.0/ksplashml/themeengine/redmond/Makefile.in 2005-04-06 13:31:34.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,
@@ -44390,14 +44732,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/ksplashml/themeengine/redmond/pics/Makefile.in kdebase-3.4.0/ksplashml/themeengine/redmond/pics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksplashml/themeengine/redmond/pics/Makefile.in kdebase-3.4.0/ksplashml/themeengine/redmond/pics/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/themeengine/redmond/pics/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/themeengine/redmond/pics/Makefile.in 2005-03-18 14:34:35.000000000 -0500
++++ kdebase-3.4.0/ksplashml/themeengine/redmond/pics/Makefile.in 2005-04-06 13:31:34.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,
@@ -44446,14 +44788,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/ksplashml/themeengine/simple/Makefile.in kdebase-3.4.0/ksplashml/themeengine/simple/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksplashml/themeengine/simple/Makefile.in kdebase-3.4.0/ksplashml/themeengine/simple/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/themeengine/simple/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/themeengine/simple/Makefile.in 2005-03-18 14:34:35.000000000 -0500
++++ kdebase-3.4.0/ksplashml/themeengine/simple/Makefile.in 2005-04-06 13:31:34.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,
@@ -44516,14 +44858,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/ksplashml/themeengine/standard/Makefile.in kdebase-3.4.0/ksplashml/themeengine/standard/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksplashml/themeengine/standard/Makefile.in kdebase-3.4.0/ksplashml/themeengine/standard/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/themeengine/standard/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/themeengine/standard/Makefile.in 2005-03-18 14:34:35.000000000 -0500
++++ kdebase-3.4.0/ksplashml/themeengine/standard/Makefile.in 2005-04-06 13:31:34.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,
@@ -44634,14 +44976,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/ksplashml/themeengine/standard/pics/Makefile.in kdebase-3.4.0/ksplashml/themeengine/standard/pics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksplashml/themeengine/standard/pics/Makefile.in kdebase-3.4.0/ksplashml/themeengine/standard/pics/Makefile.in
--- kdebase-3.4.0.orig/ksplashml/themeengine/standard/pics/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksplashml/themeengine/standard/pics/Makefile.in 2005-03-18 14:34:35.000000000 -0500
++++ kdebase-3.4.0/ksplashml/themeengine/standard/pics/Makefile.in 2005-04-06 13:31:34.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,
@@ -44690,14 +45032,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kstart/Makefile.in kdebase-3.4.0/kstart/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kstart/Makefile.in kdebase-3.4.0/kstart/Makefile.in
--- kdebase-3.4.0.orig/kstart/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/kstart/Makefile.in 2005-03-18 14:34:35.000000000 -0500
++++ kdebase-3.4.0/kstart/Makefile.in 2005-04-06 13:31:34.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,
@@ -44760,14 +45102,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/ksysguard/CContLib/Makefile.in kdebase-3.4.0/ksysguard/CContLib/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksysguard/CContLib/Makefile.in kdebase-3.4.0/ksysguard/CContLib/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/CContLib/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/CContLib/Makefile.in 2005-03-18 14:34:35.000000000 -0500
++++ kdebase-3.4.0/ksysguard/CContLib/Makefile.in 2005-04-06 13:31:34.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,
@@ -44830,14 +45172,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/ksysguard/Makefile.in kdebase-3.4.0/ksysguard/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksysguard/Makefile.in kdebase-3.4.0/ksysguard/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/Makefile.in 2005-03-18 14:34:35.000000000 -0500
++++ kdebase-3.4.0/ksysguard/Makefile.in 2005-04-06 13:31:34.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,
@@ -44956,14 +45298,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/ksysguard/example/Makefile.in kdebase-3.4.0/ksysguard/example/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksysguard/example/Makefile.in kdebase-3.4.0/ksysguard/example/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/example/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/example/Makefile.in 2005-03-18 14:34:35.000000000 -0500
++++ kdebase-3.4.0/ksysguard/example/Makefile.in 2005-04-06 13:31:34.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,
@@ -45012,14 +45354,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/ksysguard/gui/Makefile.in kdebase-3.4.0/ksysguard/gui/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksysguard/gui/Makefile.in kdebase-3.4.0/ksysguard/gui/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/gui/Makefile.in 2005-03-04 08:15:05.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/gui/Makefile.in 2005-03-18 14:34:36.000000000 -0500
++++ kdebase-3.4.0/ksysguard/gui/Makefile.in 2005-04-06 13:31:34.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,
@@ -45143,14 +45485,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/ksysguard/gui/SensorDisplayLib/Makefile.in kdebase-3.4.0/ksysguard/gui/SensorDisplayLib/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksysguard/gui/SensorDisplayLib/Makefile.in kdebase-3.4.0/ksysguard/gui/SensorDisplayLib/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/gui/SensorDisplayLib/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/gui/SensorDisplayLib/Makefile.in 2005-03-18 14:34:36.000000000 -0500
++++ kdebase-3.4.0/ksysguard/gui/SensorDisplayLib/Makefile.in 2005-04-06 13:31:34.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,
@@ -45281,14 +45623,14 @@
@echo 'creating libsensordisplays_la.all_cc.cc ...'; \
rm -f libsensordisplays_la.all_cc.files libsensordisplays_la.all_cc.final; \
echo "#define KDE_USE_FINAL 1" >> libsensordisplays_la.all_cc.final; \
-diff -Nrua kdebase-3.4.0.orig/ksysguard/gui/ksgrd/Makefile.in kdebase-3.4.0/ksysguard/gui/ksgrd/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksysguard/gui/ksgrd/Makefile.in kdebase-3.4.0/ksysguard/gui/ksgrd/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/gui/ksgrd/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/gui/ksgrd/Makefile.in 2005-03-18 14:34:36.000000000 -0500
++++ kdebase-3.4.0/ksysguard/gui/ksgrd/Makefile.in 2005-04-06 13:31:35.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,
@@ -45412,14 +45754,14 @@
@echo 'creating libksgrd_la.all_cc.cc ...'; \
rm -f libksgrd_la.all_cc.files libksgrd_la.all_cc.final; \
echo "#define KDE_USE_FINAL 1" >> libksgrd_la.all_cc.final; \
-diff -Nrua kdebase-3.4.0.orig/ksysguard/ksysguardd/FreeBSD/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/FreeBSD/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksysguard/ksysguardd/FreeBSD/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/FreeBSD/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/ksysguardd/FreeBSD/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/ksysguardd/FreeBSD/Makefile.in 2005-03-18 14:34:36.000000000 -0500
++++ kdebase-3.4.0/ksysguard/ksysguardd/FreeBSD/Makefile.in 2005-04-06 13:31:35.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,
@@ -45482,14 +45824,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/ksysguard/ksysguardd/Irix/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/Irix/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksysguard/ksysguardd/Irix/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/Irix/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/ksysguardd/Irix/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/ksysguardd/Irix/Makefile.in 2005-03-18 14:34:36.000000000 -0500
++++ kdebase-3.4.0/ksysguard/ksysguardd/Irix/Makefile.in 2005-04-06 13:31:35.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,
@@ -45552,14 +45894,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/ksysguard/ksysguardd/Linux/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/Linux/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksysguard/ksysguardd/Linux/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/Linux/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/ksysguardd/Linux/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/ksysguardd/Linux/Makefile.in 2005-03-18 14:34:36.000000000 -0500
++++ kdebase-3.4.0/ksysguard/ksysguardd/Linux/Makefile.in 2005-04-06 13:31:35.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,
@@ -45622,14 +45964,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/ksysguard/ksysguardd/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksysguard/ksysguardd/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/ksysguardd/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/ksysguardd/Makefile.in 2005-03-18 14:34:36.000000000 -0500
++++ kdebase-3.4.0/ksysguard/ksysguardd/Makefile.in 2005-04-06 13:31:35.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,
@@ -45740,14 +46082,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/ksysguard/ksysguardd/NetBSD/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/NetBSD/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksysguard/ksysguardd/NetBSD/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/NetBSD/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/ksysguardd/NetBSD/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/ksysguardd/NetBSD/Makefile.in 2005-03-18 14:34:36.000000000 -0500
++++ kdebase-3.4.0/ksysguard/ksysguardd/NetBSD/Makefile.in 2005-04-06 13:31:35.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,
@@ -45810,14 +46152,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/ksysguard/ksysguardd/OpenBSD/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/OpenBSD/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksysguard/ksysguardd/OpenBSD/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/OpenBSD/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/ksysguardd/OpenBSD/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/ksysguardd/OpenBSD/Makefile.in 2005-03-18 14:34:36.000000000 -0500
++++ kdebase-3.4.0/ksysguard/ksysguardd/OpenBSD/Makefile.in 2005-04-06 13:31:35.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,
@@ -45880,14 +46222,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/ksysguard/ksysguardd/Solaris/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/Solaris/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksysguard/ksysguardd/Solaris/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/Solaris/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/ksysguardd/Solaris/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/ksysguardd/Solaris/Makefile.in 2005-03-18 14:34:36.000000000 -0500
++++ kdebase-3.4.0/ksysguard/ksysguardd/Solaris/Makefile.in 2005-04-06 13:31:35.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,
@@ -45950,14 +46292,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/ksysguard/ksysguardd/Tru64/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/Tru64/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksysguard/ksysguardd/Tru64/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/Tru64/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/ksysguardd/Tru64/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/ksysguardd/Tru64/Makefile.in 2005-03-18 14:34:36.000000000 -0500
++++ kdebase-3.4.0/ksysguard/ksysguardd/Tru64/Makefile.in 2005-04-06 13:31:35.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,
@@ -46020,14 +46362,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/ksysguard/pics/Makefile.in kdebase-3.4.0/ksysguard/pics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksysguard/pics/Makefile.in kdebase-3.4.0/ksysguard/pics/Makefile.in
--- kdebase-3.4.0.orig/ksysguard/pics/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksysguard/pics/Makefile.in 2005-03-18 14:34:36.000000000 -0500
++++ kdebase-3.4.0/ksysguard/pics/Makefile.in 2005-04-06 13:31:35.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,
@@ -46076,14 +46418,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/ksystraycmd/Makefile.in kdebase-3.4.0/ksystraycmd/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ksystraycmd/Makefile.in kdebase-3.4.0/ksystraycmd/Makefile.in
--- kdebase-3.4.0.orig/ksystraycmd/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ksystraycmd/Makefile.in 2005-03-18 14:34:36.000000000 -0500
++++ kdebase-3.4.0/ksystraycmd/Makefile.in 2005-04-06 13:31:35.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,
@@ -46146,14 +46488,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/ktip/Makefile.in kdebase-3.4.0/ktip/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ktip/Makefile.in kdebase-3.4.0/ktip/Makefile.in
--- kdebase-3.4.0.orig/ktip/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ktip/Makefile.in 2005-03-18 14:34:36.000000000 -0500
++++ kdebase-3.4.0/ktip/Makefile.in 2005-04-06 13:31:35.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,
@@ -46298,14 +46640,14 @@
#>+ 15
force-reedit:
-diff -Nrua kdebase-3.4.0.orig/ktip/pics/Makefile.in kdebase-3.4.0/ktip/pics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/ktip/pics/Makefile.in kdebase-3.4.0/ktip/pics/Makefile.in
--- kdebase-3.4.0.orig/ktip/pics/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/ktip/pics/Makefile.in 2005-03-18 14:34:36.000000000 -0500
++++ kdebase-3.4.0/ktip/pics/Makefile.in 2005-04-06 13:31:35.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,
@@ -46354,14 +46696,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kwin/Makefile.in kdebase-3.4.0/kwin/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/Makefile.in kdebase-3.4.0/kwin/Makefile.in
--- kdebase-3.4.0.orig/kwin/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/kwin/Makefile.in 2005-03-18 14:34:37.000000000 -0500
++++ kdebase-3.4.0/kwin/Makefile.in 2005-04-06 13:31: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,
@@ -46540,14 +46882,14 @@
sm.o: sm.moc
+workspace.lo: workspace.moc
popupinfo.lo: popupinfo.moc
-diff -Nrua kdebase-3.4.0.orig/kwin/clients/Makefile.in kdebase-3.4.0/kwin/clients/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/clients/Makefile.in kdebase-3.4.0/kwin/clients/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/Makefile.in 2005-03-18 14:34:37.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/Makefile.in 2005-04-06 13:31: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,
@@ -46644,14 +46986,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kwin/clients/b2/Makefile.in kdebase-3.4.0/kwin/clients/b2/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/clients/b2/Makefile.in kdebase-3.4.0/kwin/clients/b2/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/b2/Makefile.in 2005-03-04 08:15:06.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/b2/Makefile.in 2005-03-18 14:34:37.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/b2/Makefile.in 2005-04-06 13:31: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,
@@ -46762,14 +47104,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/kwin/clients/b2/config/Makefile.in kdebase-3.4.0/kwin/clients/b2/config/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/clients/b2/config/Makefile.in kdebase-3.4.0/kwin/clients/b2/config/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/b2/config/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/b2/config/Makefile.in 2005-03-18 14:34:37.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/b2/config/Makefile.in 2005-04-06 13:31: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,
@@ -46832,14 +47174,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kwin/clients/default/Makefile.in kdebase-3.4.0/kwin/clients/default/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/clients/default/Makefile.in kdebase-3.4.0/kwin/clients/default/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/default/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/default/Makefile.in 2005-03-18 14:34:37.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/default/Makefile.in 2005-04-06 13:31: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,
@@ -46950,14 +47292,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/kwin/clients/default/config/Makefile.in kdebase-3.4.0/kwin/clients/default/config/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/clients/default/config/Makefile.in kdebase-3.4.0/kwin/clients/default/config/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/default/config/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/default/config/Makefile.in 2005-03-18 14:34:37.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/default/config/Makefile.in 2005-04-06 13:31: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,
@@ -47020,14 +47362,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kwin/clients/keramik/Makefile.in kdebase-3.4.0/kwin/clients/keramik/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/clients/keramik/Makefile.in kdebase-3.4.0/kwin/clients/keramik/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/keramik/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/keramik/Makefile.in 2005-03-18 14:34:37.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/keramik/Makefile.in 2005-04-06 13:31: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,
@@ -47138,14 +47480,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/kwin/clients/keramik/config/Makefile.in kdebase-3.4.0/kwin/clients/keramik/config/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/clients/keramik/config/Makefile.in kdebase-3.4.0/kwin/clients/keramik/config/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/keramik/config/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/keramik/config/Makefile.in 2005-03-18 14:34:37.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/keramik/config/Makefile.in 2005-04-06 13:31: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,
@@ -47208,14 +47550,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kwin/clients/kwmtheme/Makefile.in kdebase-3.4.0/kwin/clients/kwmtheme/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/clients/kwmtheme/Makefile.in kdebase-3.4.0/kwin/clients/kwmtheme/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/kwmtheme/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/kwmtheme/Makefile.in 2005-03-18 14:34:37.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/kwmtheme/Makefile.in 2005-04-06 13:31: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,
@@ -47326,14 +47668,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/kwin/clients/kwmtheme/cli_installer/Makefile.in kdebase-3.4.0/kwin/clients/kwmtheme/cli_installer/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/clients/kwmtheme/cli_installer/Makefile.in kdebase-3.4.0/kwin/clients/kwmtheme/cli_installer/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/kwmtheme/cli_installer/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/kwmtheme/cli_installer/Makefile.in 2005-03-18 14:34:37.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/kwmtheme/cli_installer/Makefile.in 2005-04-06 13:31: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,
@@ -47396,14 +47738,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kwin/clients/laptop/Makefile.in kdebase-3.4.0/kwin/clients/laptop/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/clients/laptop/Makefile.in kdebase-3.4.0/kwin/clients/laptop/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/laptop/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/laptop/Makefile.in 2005-03-18 14:34:37.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/laptop/Makefile.in 2005-04-06 13:31: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,
@@ -47466,14 +47808,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kwin/clients/modernsystem/Makefile.in kdebase-3.4.0/kwin/clients/modernsystem/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/clients/modernsystem/Makefile.in kdebase-3.4.0/kwin/clients/modernsystem/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/modernsystem/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/modernsystem/Makefile.in 2005-03-18 14:34:38.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/modernsystem/Makefile.in 2005-04-06 13:31: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,
@@ -47584,14 +47926,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/kwin/clients/modernsystem/config/Makefile.in kdebase-3.4.0/kwin/clients/modernsystem/config/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/clients/modernsystem/config/Makefile.in kdebase-3.4.0/kwin/clients/modernsystem/config/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/modernsystem/config/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/modernsystem/config/Makefile.in 2005-03-18 14:34:38.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/modernsystem/config/Makefile.in 2005-04-06 13:31: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,
@@ -47654,14 +47996,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kwin/clients/plastik/Makefile.in kdebase-3.4.0/kwin/clients/plastik/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/clients/plastik/Makefile.in kdebase-3.4.0/kwin/clients/plastik/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/plastik/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/plastik/Makefile.in 2005-03-18 14:34:38.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/plastik/Makefile.in 2005-04-06 13:31: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,
@@ -47772,14 +48114,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/kwin/clients/plastik/config/Makefile.in kdebase-3.4.0/kwin/clients/plastik/config/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/clients/plastik/config/Makefile.in kdebase-3.4.0/kwin/clients/plastik/config/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/plastik/config/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/plastik/config/Makefile.in 2005-03-18 14:34:38.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/plastik/config/Makefile.in 2005-04-06 13:31: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,
@@ -47842,14 +48184,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kwin/clients/quartz/Makefile.in kdebase-3.4.0/kwin/clients/quartz/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/clients/quartz/Makefile.in kdebase-3.4.0/kwin/clients/quartz/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/quartz/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/quartz/Makefile.in 2005-03-18 14:34:38.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/quartz/Makefile.in 2005-04-06 13:31: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,
@@ -47960,14 +48302,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/kwin/clients/quartz/config/Makefile.in kdebase-3.4.0/kwin/clients/quartz/config/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/clients/quartz/config/Makefile.in kdebase-3.4.0/kwin/clients/quartz/config/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/quartz/config/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/quartz/config/Makefile.in 2005-03-18 14:34:38.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/quartz/config/Makefile.in 2005-04-06 13:31: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,
@@ -48030,14 +48372,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kwin/clients/redmond/Makefile.in kdebase-3.4.0/kwin/clients/redmond/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/clients/redmond/Makefile.in kdebase-3.4.0/kwin/clients/redmond/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/redmond/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/redmond/Makefile.in 2005-03-18 14:34:38.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/redmond/Makefile.in 2005-04-06 13:31: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,
@@ -48100,14 +48442,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kwin/clients/test/Makefile.in kdebase-3.4.0/kwin/clients/test/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/clients/test/Makefile.in kdebase-3.4.0/kwin/clients/test/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/test/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/test/Makefile.in 2005-03-18 14:34:38.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/test/Makefile.in 2005-04-06 13:31: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,
@@ -48170,14 +48512,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kwin/clients/web/Makefile.in kdebase-3.4.0/kwin/clients/web/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/clients/web/Makefile.in kdebase-3.4.0/kwin/clients/web/Makefile.in
--- kdebase-3.4.0.orig/kwin/clients/web/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/clients/web/Makefile.in 2005-03-18 14:34:38.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/web/Makefile.in 2005-04-06 13:31: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,
@@ -48318,14 +48660,14 @@
WebButtonSticky.lo: WebButtonSticky.moc
WebButtonHelp.lo: WebButtonHelp.moc
nmcheck:
-diff -Nrua kdebase-3.4.0.orig/kwin/data/Makefile.in kdebase-3.4.0/kwin/data/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/data/Makefile.in kdebase-3.4.0/kwin/data/Makefile.in
--- kdebase-3.4.0.orig/kwin/data/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/data/Makefile.in 2005-03-18 14:34:38.000000000 -0500
++++ kdebase-3.4.0/kwin/data/Makefile.in 2005-04-06 13:31: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,
@@ -48388,14 +48730,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kconfPROGRAMS: $(kconf_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kwin/kcmkwin/Makefile.in kdebase-3.4.0/kwin/kcmkwin/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/kcmkwin/Makefile.in kdebase-3.4.0/kwin/kcmkwin/Makefile.in
--- kdebase-3.4.0.orig/kwin/kcmkwin/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/kcmkwin/Makefile.in 2005-03-18 14:34:38.000000000 -0500
++++ kdebase-3.4.0/kwin/kcmkwin/Makefile.in 2005-04-06 13:31: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,
@@ -48492,14 +48834,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kwin/kcmkwin/kwindecoration/Makefile.in kdebase-3.4.0/kwin/kcmkwin/kwindecoration/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/kcmkwin/kwindecoration/Makefile.in kdebase-3.4.0/kwin/kcmkwin/kwindecoration/Makefile.in
--- kdebase-3.4.0.orig/kwin/kcmkwin/kwindecoration/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/kcmkwin/kwindecoration/Makefile.in 2005-03-18 14:34:38.000000000 -0500
++++ kdebase-3.4.0/kwin/kcmkwin/kwindecoration/Makefile.in 2005-04-06 13:31: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,
@@ -48562,14 +48904,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kwin/kcmkwin/kwinoptions/Makefile.in kdebase-3.4.0/kwin/kcmkwin/kwinoptions/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/kcmkwin/kwinoptions/Makefile.in kdebase-3.4.0/kwin/kcmkwin/kwinoptions/Makefile.in
--- kdebase-3.4.0.orig/kwin/kcmkwin/kwinoptions/Makefile.in 2005-03-04 08:15:07.000000000 -0500
-+++ kdebase-3.4.0/kwin/kcmkwin/kwinoptions/Makefile.in 2005-03-18 14:34:38.000000000 -0500
++++ kdebase-3.4.0/kwin/kcmkwin/kwinoptions/Makefile.in 2005-04-06 13:31: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,
@@ -48632,14 +48974,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kwin/kcmkwin/kwinrules/Makefile.in kdebase-3.4.0/kwin/kcmkwin/kwinrules/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/kcmkwin/kwinrules/Makefile.in kdebase-3.4.0/kwin/kcmkwin/kwinrules/Makefile.in
--- kdebase-3.4.0.orig/kwin/kcmkwin/kwinrules/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/kwin/kcmkwin/kwinrules/Makefile.in 2005-03-18 14:34:38.000000000 -0500
++++ kdebase-3.4.0/kwin/kcmkwin/kwinrules/Makefile.in 2005-04-06 13:31: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,
@@ -48702,14 +49044,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kwin/killer/Makefile.in kdebase-3.4.0/kwin/killer/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/killer/Makefile.in kdebase-3.4.0/kwin/killer/Makefile.in
--- kdebase-3.4.0.orig/kwin/killer/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/kwin/killer/Makefile.in 2005-03-18 14:34:38.000000000 -0500
++++ kdebase-3.4.0/kwin/killer/Makefile.in 2005-04-06 13:31: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,
@@ -48772,14 +49114,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kwin/kompmgr/Makefile.in kdebase-3.4.0/kwin/kompmgr/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/kompmgr/Makefile.in kdebase-3.4.0/kwin/kompmgr/Makefile.in
--- kdebase-3.4.0.orig/kwin/kompmgr/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/kwin/kompmgr/Makefile.in 2005-03-18 14:34:38.000000000 -0500
++++ kdebase-3.4.0/kwin/kompmgr/Makefile.in 2005-04-06 13:31: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,
@@ -48842,14 +49184,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kwin/lib/Makefile.in kdebase-3.4.0/kwin/lib/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/lib/Makefile.in kdebase-3.4.0/kwin/lib/Makefile.in
--- kdebase-3.4.0.orig/kwin/lib/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/kwin/lib/Makefile.in 2005-03-18 14:34:39.000000000 -0500
++++ kdebase-3.4.0/kwin/lib/Makefile.in 2005-04-06 13:31: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,
@@ -48912,14 +49254,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/kwin/oldheaders/Makefile.in kdebase-3.4.0/kwin/oldheaders/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/oldheaders/Makefile.in kdebase-3.4.0/kwin/oldheaders/Makefile.in
--- kdebase-3.4.0.orig/kwin/oldheaders/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/kwin/oldheaders/Makefile.in 2005-03-18 14:34:39.000000000 -0500
++++ kdebase-3.4.0/kwin/oldheaders/Makefile.in 2005-04-06 13:31: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,
@@ -48968,14 +49310,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kwin/pics/Makefile.in kdebase-3.4.0/kwin/pics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/pics/Makefile.in kdebase-3.4.0/kwin/pics/Makefile.in
--- kdebase-3.4.0.orig/kwin/pics/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/kwin/pics/Makefile.in 2005-03-18 14:34:39.000000000 -0500
++++ kdebase-3.4.0/kwin/pics/Makefile.in 2005-04-06 13:31: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,
@@ -49024,14 +49366,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/kwin/tools/Makefile.in kdebase-3.4.0/kwin/tools/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kwin/tools/Makefile.in kdebase-3.4.0/kwin/tools/Makefile.in
--- kdebase-3.4.0.orig/kwin/tools/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/kwin/tools/Makefile.in 2005-03-18 14:34:39.000000000 -0500
++++ kdebase-3.4.0/kwin/tools/Makefile.in 2005-04-06 13:31: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,
@@ -49094,14 +49436,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-diff -Nrua kdebase-3.4.0.orig/kxkb/Makefile.in kdebase-3.4.0/kxkb/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kxkb/Makefile.in kdebase-3.4.0/kxkb/Makefile.in
--- kdebase-3.4.0.orig/kxkb/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/kxkb/Makefile.in 2005-03-18 14:34:39.000000000 -0500
++++ kdebase-3.4.0/kxkb/Makefile.in 2005-04-06 13:31: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,
@@ -49239,14 +49581,14 @@
#>+ 2
libkdeinit_kxkb_la_LDFLAGS = -no-undefined -avoid-version $(all_libraries)
-diff -Nrua kdebase-3.4.0.orig/kxkb/pics/Makefile.in kdebase-3.4.0/kxkb/pics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/kxkb/pics/Makefile.in kdebase-3.4.0/kxkb/pics/Makefile.in
--- kdebase-3.4.0.orig/kxkb/pics/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/kxkb/pics/Makefile.in 2005-03-18 14:34:39.000000000 -0500
++++ kdebase-3.4.0/kxkb/pics/Makefile.in 2005-04-06 13:31: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,
@@ -49316,14 +49658,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/l10n/Makefile.in kdebase-3.4.0/l10n/Makefile.in
+diff -Nru kdebase-3.4.0.orig/l10n/Makefile.in kdebase-3.4.0/l10n/Makefile.in
--- kdebase-3.4.0.orig/l10n/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/l10n/Makefile.in 2005-03-18 14:34:39.000000000 -0500
++++ kdebase-3.4.0/l10n/Makefile.in 2005-04-06 13:31: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,
@@ -49372,14 +49714,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/libkonq/Makefile.in kdebase-3.4.0/libkonq/Makefile.in
+diff -Nru kdebase-3.4.0.orig/libkonq/Makefile.in kdebase-3.4.0/libkonq/Makefile.in
--- kdebase-3.4.0.orig/libkonq/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/libkonq/Makefile.in 2005-03-18 14:34:41.000000000 -0500
++++ kdebase-3.4.0/libkonq/Makefile.in 2005-04-06 13:31: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,
@@ -49568,14 +49910,14 @@
konq_filetip.lo: konq_filetip.moc
konq_drag.lo: konq_drag.moc
konq_popupmenu.o: konq_popupmenu.moc
-diff -Nrua kdebase-3.4.0.orig/libkonq/favicons/Makefile.in kdebase-3.4.0/libkonq/favicons/Makefile.in
+diff -Nru kdebase-3.4.0.orig/libkonq/favicons/Makefile.in kdebase-3.4.0/libkonq/favicons/Makefile.in
--- kdebase-3.4.0.orig/libkonq/favicons/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/libkonq/favicons/Makefile.in 2005-03-18 14:34:41.000000000 -0500
++++ kdebase-3.4.0/libkonq/favicons/Makefile.in 2005-04-06 13:31: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,
@@ -49638,14 +49980,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/libkonq/pics/Makefile.in kdebase-3.4.0/libkonq/pics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/libkonq/pics/Makefile.in kdebase-3.4.0/libkonq/pics/Makefile.in
--- kdebase-3.4.0.orig/libkonq/pics/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/libkonq/pics/Makefile.in 2005-03-18 14:34:41.000000000 -0500
++++ kdebase-3.4.0/libkonq/pics/Makefile.in 2005-04-06 13:31: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,
@@ -49694,14 +50036,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/nsplugins/Makefile.in kdebase-3.4.0/nsplugins/Makefile.in
+diff -Nru kdebase-3.4.0.orig/nsplugins/Makefile.in kdebase-3.4.0/nsplugins/Makefile.in
--- kdebase-3.4.0.orig/nsplugins/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/nsplugins/Makefile.in 2005-03-18 14:34:41.000000000 -0500
++++ kdebase-3.4.0/nsplugins/Makefile.in 2005-04-06 13:31: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,
@@ -49812,14 +50154,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdebase-3.4.0.orig/nsplugins/test/Makefile.in kdebase-3.4.0/nsplugins/test/Makefile.in
+diff -Nru kdebase-3.4.0.orig/nsplugins/test/Makefile.in kdebase-3.4.0/nsplugins/test/Makefile.in
--- kdebase-3.4.0.orig/nsplugins/test/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/nsplugins/test/Makefile.in 2005-03-18 14:34:41.000000000 -0500
++++ kdebase-3.4.0/nsplugins/test/Makefile.in 2005-04-06 13:31: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,
@@ -49882,14 +50224,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -Nrua kdebase-3.4.0.orig/nsplugins/viewer/Makefile.in kdebase-3.4.0/nsplugins/viewer/Makefile.in
+diff -Nru kdebase-3.4.0.orig/nsplugins/viewer/Makefile.in kdebase-3.4.0/nsplugins/viewer/Makefile.in
--- kdebase-3.4.0.orig/nsplugins/viewer/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/nsplugins/viewer/Makefile.in 2005-03-18 14:34:41.000000000 -0500
++++ kdebase-3.4.0/nsplugins/viewer/Makefile.in 2005-04-06 13:31: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,
@@ -49952,14 +50294,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdebase-3.4.0.orig/nsplugins/wrapper/Makefile.in kdebase-3.4.0/nsplugins/wrapper/Makefile.in
+diff -Nru kdebase-3.4.0.orig/nsplugins/wrapper/Makefile.in kdebase-3.4.0/nsplugins/wrapper/Makefile.in
--- kdebase-3.4.0.orig/nsplugins/wrapper/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/nsplugins/wrapper/Makefile.in 2005-03-18 14:34:41.000000000 -0500
++++ kdebase-3.4.0/nsplugins/wrapper/Makefile.in 2005-04-06 13:31: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,
@@ -50022,14 +50364,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/pics/Makefile.in kdebase-3.4.0/pics/Makefile.in
+diff -Nru kdebase-3.4.0.orig/pics/Makefile.in kdebase-3.4.0/pics/Makefile.in
--- kdebase-3.4.0.orig/pics/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/pics/Makefile.in 2005-03-18 14:34:41.000000000 -0500
++++ kdebase-3.4.0/pics/Makefile.in 2005-04-06 13:31: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,
@@ -50126,14 +50468,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/pics/crystalsvg/Makefile.in kdebase-3.4.0/pics/crystalsvg/Makefile.in
+diff -Nru kdebase-3.4.0.orig/pics/crystalsvg/Makefile.in kdebase-3.4.0/pics/crystalsvg/Makefile.in
--- kdebase-3.4.0.orig/pics/crystalsvg/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/pics/crystalsvg/Makefile.in 2005-03-18 14:34:41.000000000 -0500
++++ kdebase-3.4.0/pics/crystalsvg/Makefile.in 2005-04-06 13:31: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,
@@ -51678,14 +52020,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/pics/hicolor/Makefile.in kdebase-3.4.0/pics/hicolor/Makefile.in
+diff -Nru kdebase-3.4.0.orig/pics/hicolor/Makefile.in kdebase-3.4.0/pics/hicolor/Makefile.in
--- kdebase-3.4.0.orig/pics/hicolor/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/pics/hicolor/Makefile.in 2005-03-18 14:34:41.000000000 -0500
++++ kdebase-3.4.0/pics/hicolor/Makefile.in 2005-04-06 13:31: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,
@@ -51734,14 +52076,14 @@
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
-diff -Nrua kdebase-3.4.0.orig/pics/wallpapers/Makefile.in kdebase-3.4.0/pics/wallpapers/Makefile.in
+diff -Nru kdebase-3.4.0.orig/pics/wallpapers/Makefile.in kdebase-3.4.0/pics/wallpapers/Makefile.in
--- kdebase-3.4.0.orig/pics/wallpapers/Makefile.in 2005-03-04 08:15:08.000000000 -0500
-+++ kdebase-3.4.0/pics/wallpapers/Makefile.in 2005-03-18 14:34:41.000000000 -0500
++++ kdebase-3.4.0/pics/wallpapers/Makefile.in 2005-04-06 13:31: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,