[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 Mller
+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=Jrg 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,