[Pkg-kde-commits] rev 847 - branches/kde-3.4.0/packages/kdelibs/debian/patches

Adeodato Simó dato-guest@costa.debian.org
Fri, 18 Mar 2005 18:33:20 +0100 

Author: dato-guest
Date: 2005-03-18 18:32:58 +0100 (Fri, 18 Mar 2005)
New Revision: 847

Added:
   branches/kde-3.4.0/packages/kdelibs/debian/patches/01_kdelibs_branch_2005-03-18.diff
Log:
Branch pull for kdelibs.


Added: branches/kde-3.4.0/packages/kdelibs/debian/patches/01_kdelibs_branch_2005-03-18.diff
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/patches/01_kdelibs_branch_2005-03-18.diff	2005-03-18 17:25:07 UTC (rev 846)
+++ branches/kde-3.4.0/packages/kdelibs/debian/patches/01_kdelibs_branch_2005-03-18.diff	2005-03-18 17:32:58 UTC (rev 847)
@@ -0,0 +1,12983 @@
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/admin/acinclude.m4.in kdelibs_3_4_BRANCH/admin/acinclude.m4.in
+--- kdelibs_3_4_0_RELEASE/admin/acinclude.m4.in	2005-02-09 23:21:09.000000000 +0100
++++ kdelibs_3_4_BRANCH/admin/acinclude.m4.in	2005-03-12 18:58:39.000000000 +0100
+@@ -3194,6 +3194,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 +3247,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 -x CVS kdelibs_3_4_0_RELEASE/admin/am_edit kdelibs_3_4_BRANCH/admin/am_edit
+--- kdelibs_3_4_0_RELEASE/admin/am_edit	2005-03-04 19:32:46.000000000 +0100
++++ kdelibs_3_4_BRANCH/admin/am_edit	2005-03-03 01:48:58.000000000 +0100
+@@ -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;
+@@ -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.2 $ '."\n";
+     if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) {
+         warn "automake line not found in $makefile\n";
+ 	# Fallback: first line
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/arts/kde/mcop-dcop/kmcop.desktop kdelibs_3_4_BRANCH/arts/kde/mcop-dcop/kmcop.desktop
+--- kdelibs_3_4_0_RELEASE/arts/kde/mcop-dcop/kmcop.desktop	2005-02-23 06:04:12.000000000 +0100
++++ kdelibs_3_4_BRANCH/arts/kde/mcop-dcop/kmcop.desktop	2005-03-12 18:58:40.000000000 +0100
+@@ -2,12 +2,10 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=KMCOP
+-Name[af]=Kmcop
+ Name[hi]=के-एमकॉप 
+-Name[xx]=xxKMCOPxx
+ Exec=kmcop
+ Comment=KDE MCOP-DCOP Bridge
+-Comment[af]=Kde MCOP-DCOP Brug
++Comment[af]=KDE MCOP-DCOP Brug
+ Comment[ar]=جسر KDE MCOP-DCOP
+ Comment[az]=KDE MCOP-DCOP Körpüsü
+ Comment[be]=Мост KDE MCOP-DCOP
+@@ -71,7 +69,6 @@
+ Comment[uz]=KDE MCOP-DCOP кўприги
+ Comment[ven]=KDE MCOP-DCOP Buroho
+ Comment[xh]=KDE MCOP-DCOP Ibhulorho
+-Comment[xx]=xxKDE MCOP-DCOP Bridgexx
+ Comment[zh_CN]=KDED MCOP-DCOP 桥
+ Comment[zh_TW]=KDE MCOP-DCOP 橋樑
+ Comment[zu]=Ibhulogo le-KDE MCOP-DCOP
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/arts/knotify/knotify.cpp kdelibs_3_4_BRANCH/arts/knotify/knotify.cpp
+--- kdelibs_3_4_0_RELEASE/arts/knotify/knotify.cpp	2004-12-15 12:03:57.000000000 +0100
++++ kdelibs_3_4_BRANCH/arts/knotify/knotify.cpp	2005-03-18 18:11:40.625936819 +0100
+@@ -388,11 +388,8 @@
+     if ( present & KNotifyClient::Sound ) // && QFile(sound).isReadable()
+         notifyBySound( sound, fromApp, eventId );
+ 
+-    if ( present & KNotifyClient::PassivePopup )
+-        notifyByPassivePopup( text, fromApp, checkWinId( fromApp, winId ));
+-
+-    else if ( present & KNotifyClient::Messagebox )
+-        notifyByMessagebox( text, level, checkWinId( fromApp, winId ));
++    if ( present & KNotifyClient::Execute )
++        notifyByExecute( commandline, event, fromApp, text, winId, eventId );
+ 
+     if ( present & KNotifyClient::Logfile ) // && QFile(file).isWritable()
+         notifyByLogfile( text, file );
+@@ -400,12 +397,14 @@
+     if ( present & KNotifyClient::Stderr )
+         notifyByStderr( text );
+ 
+-    if ( present & KNotifyClient::Execute )
+-        notifyByExecute( commandline, event, fromApp, text, winId, eventId );
+-
+     if ( present & KNotifyClient::Taskbar )
+         notifyByTaskbar( checkWinId( fromApp, winId ));
+ 
++    if ( present & KNotifyClient::PassivePopup )
++        notifyByPassivePopup( text, fromApp, checkWinId( fromApp, winId ));
++    else if ( present & KNotifyClient::Messagebox )
++        notifyByMessagebox( text, level, checkWinId( fromApp, winId ));
++
+     QByteArray qbd;
+     QDataStream ds(qbd, IO_WriteOnly);
+     ds << event << fromApp << text << sound << file << present << level
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/arts/knotify/knotify.desktop kdelibs_3_4_BRANCH/arts/knotify/knotify.desktop
+--- kdelibs_3_4_0_RELEASE/arts/knotify/knotify.desktop	2005-02-23 06:04:14.000000000 +0100
++++ kdelibs_3_4_BRANCH/arts/knotify/knotify.desktop	2005-03-12 18:58:40.000000000 +0100
+@@ -23,7 +23,6 @@
+ Name[tg]=Хабарҳои системавӣ
+ Name[th]=ระบบแจ้งเตือน - K
+ Name[ven]=U divhadza ha K
+-Name[xx]=xxKNotifyxx
+ Name[zu]=I-KNotify
+ Exec=knotify
+ Comment=KDE Notification Daemon
+@@ -97,7 +96,6 @@
+ Comment[vi]=Daemon thông báo của KDE 
+ Comment[wa]=Démon di notifiaedje di KDE
+ Comment[xh]=Daemon Ulwaziso lwe KDE
+-Comment[xx]=xxKDE Notification Daemonxx
+ Comment[zh_CN]=KDE 通告守护进程
+ Comment[zh_TW]=KDE 通知服務程式
+ Comment[zu]=Isaziso se-Daemon ye-KDE
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/dnssd/configure.in.bot kdelibs_3_4_BRANCH/dnssd/configure.in.bot
+--- kdelibs_3_4_0_RELEASE/dnssd/configure.in.bot	2005-02-10 14:28:45.000000000 +0100
++++ kdelibs_3_4_BRANCH/dnssd/configure.in.bot	2005-03-12 18:58:40.000000000 +0100
+@@ -1,4 +1,4 @@
+-if test -z "$LIB_DNSSD"; then
++if test "$have_libdns_sd" = "no"; then
+   echo ""
+   echo "You're missing Apple mDNSResponder 85 or later, therefore"
+   echo "dnssd will be compiled as stub, without any real functionality."
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/dnssd/configure.in.in kdelibs_3_4_BRANCH/dnssd/configure.in.in
+--- kdelibs_3_4_0_RELEASE/dnssd/configure.in.in	2005-01-15 22:14:28.000000000 +0100
++++ kdelibs_3_4_BRANCH/dnssd/configure.in.in	2005-03-12 18:58:40.000000000 +0100
+@@ -8,7 +8,11 @@
+ save_dnssdtest_CPPFLAGS="$CPPFLAGS"
+ LDFLAGS="$all_libraries $LDFLAGS"
+ CPPFLAGS="$CPPFLAGS $all_includes"
+-LIBS="-ldns_sd"
++case $host_os in
++  darwin*) LIBS="" ;;
++  *) LIBS="-ldns_sd" ;;
++esac
++have_libdns_sd="no"
+ AC_TRY_LINK(	[
+ 			#include <dns_sd.h>
+ 		],[
+@@ -16,7 +20,11 @@
+ 			TXTRecordDeallocate( (TXTRecordRef*) 0);
+ 		],[
+ 			AC_DEFINE(HAVE_DNSSD,1,[Define if dns-sd is available])
+-                        LIB_DNSSD="-ldns_sd"
++			case $host_os in
++				darwin*) LIB_DNSSD="" ;;
++				*) LIB_DNSSD="-ldns_sd" ;;
++			esac
++			have_libdns_sd="yes"
+ 			AC_MSG_RESULT(yes)
+ 		],[
+ 			AC_MSG_RESULT(no)
+@@ -27,5 +35,5 @@
+ LIBS=$save_dnssdtest_LIBS
+ fi
+ AC_SUBST(LIB_DNSSD)
+-AM_CONDITIONAL(HAVE_DNSSD, test -n "$LIB_DNSSD")
++AM_CONDITIONAL(HAVE_DNSSD, test "$have_libdns_sd" = "yes")
+ 
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/interfaces/kimproxy/interface/dcopinstantmessenger.desktop kdelibs_3_4_BRANCH/interfaces/kimproxy/interface/dcopinstantmessenger.desktop
+--- kdelibs_3_4_0_RELEASE/interfaces/kimproxy/interface/dcopinstantmessenger.desktop	2005-02-23 06:04:14.000000000 +0100
++++ kdelibs_3_4_BRANCH/interfaces/kimproxy/interface/dcopinstantmessenger.desktop	2005-03-12 18:58:40.000000000 +0100
+@@ -3,6 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=DCOP/InstantMessenger
+ Comment=Instant Messenger with a DCOP interface
++Comment[af]=Oombliklike Boodskapper met DCOP intervlak
+ Comment[bg]=Програма за съобщения в реално време с интерфейс DCOP
+ Comment[bn]=ডিকপ (DCOP) ইন্টারফেস সহ ইনস্ট্যান্ট মেসেঞ্জার
+ Comment[bs]=Instant poruke sa DCOP interfejsom
+@@ -42,11 +43,10 @@
+ Comment[sk]=Instant Messanger s rozhraním DCOP
+ Comment[sl]=Takojšni sporočilnik z vmesnikom DCOP
+ Comment[sr]=Брзи гласник са DCOP интерфејсом
+-Comment[sr@Latn]=Брзи гласник са DCOP интерфејсом
++Comment[sr@Latn]=Brzi glasnik sa DCOP interfejsom
+ Comment[sv]=Direktmeddelanden med ett DCOP-gränssnitt
+ Comment[ta]=உடனடி செய்தியாளர் DCOP இடைமுகத்தோடு
+ Comment[tg]=Клиенти мубодилаи иттилоот бо интерфейси DCOP
+ Comment[tr]=DCOP arayüzüyle Anında Mesajlaşma
+ Comment[uk]=Програма для миттєвого зв'язку через DCOP
+-Comment[xx]=xxInstant Messenger with a DCOP interfacexx
+ Comment[zh_CN]=带 DCOP 接口的即时通讯程序
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/interfaces/kimproxy/interface/kcm_instantmessenger.desktop kdelibs_3_4_BRANCH/interfaces/kimproxy/interface/kcm_instantmessenger.desktop
+--- kdelibs_3_4_0_RELEASE/interfaces/kimproxy/interface/kcm_instantmessenger.desktop	2005-02-23 06:04:14.000000000 +0100
++++ kdelibs_3_4_BRANCH/interfaces/kimproxy/interface/kcm_instantmessenger.desktop	2005-03-12 18:58:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ Name=Instant Messenger
++Name[af]=Oombliklike Boodskapper
+ Name[bg]=Съобщения в реално време
+ Name[bn]=ইনস্ট্যান্ট মেসেঞ্জার
+ Name[bs]=Instant poruke
+@@ -7,6 +8,7 @@
+ Name[cy]=Negesydd Chwim
+ Name[eo]=Tujmesaĝilo
+ Name[et]=Kiirsuhtlus
++Name[eu]=Berehalako mezularitza
+ Name[fi]=Pikaviestiohjelma
+ Name[fr]=Messagerie instantanée
+ Name[ga]=Clár teachtaireachtaí meandaracha
+@@ -32,16 +34,16 @@
+ Name[se]=Šleađgadieđut
+ Name[sl]=Takojšni sporočilnik
+ Name[sr]=Брзи гласник
+-Name[sr@Latn]=Брзи гласник
++Name[sr@Latn]=Brzi glasnik
+ Name[sv]=Direktmeddelanden
+ Name[ta]=உடனடி செய்தியாளர்
+ Name[tg]=Мубодилаи иттилоотҳо
+ Name[tr]=Anında Mesajlaşma
+ Name[uk]=Програма для миттєвого зв'язку через DCOP
+ Name[uz]=Хабар алмашиш воситаси
+-Name[xx]=xxInstant Messengerxx
+ Name[zh_CN]=即时通讯程序
+ Comment=The instant messenger allows two-way chat between individuals and groups.
++Comment[af]=Die oombliklike boodskappe laat twee rigting kommunikasie tussen individue en groepe toe.
+ Comment[bg]=Разговор между различни хора в реално време.
+ Comment[bn]=ইনস্ট্যান্ট মেসেঞ্জার একাধিক ব্যক্তি বা গোষ্ঠীকে দ্বিমুখী বার্তালাপ বা আড্ডার সুযোগ দেয়। 
+ Comment[bs]=Program za instant poruke omogućuje dvosmjernu komunikaciju između pojedinaca i grupa.
+@@ -81,13 +83,12 @@
+ Comment[sk]=Instant messenger umožňuje rozhovor medzi rôznymi osobami a skupinami.
+ Comment[sl]=Takojšni sporočilnik omogoča dvosmeren klepet med posamezniki in skupinami.
+ Comment[sr]=Брзи гласник вам омогућава двосмерно ћаскање између индивидуа и група.
+-Comment[sr@Latn]=Брзи гласник вам омогућава двосмерно ћаскање између индивидуа и група.
++Comment[sr@Latn]=Brzi glasnik vam omogućava dvosmerno ćaskanje između individua i grupa.
+ Comment[sv]=Direktmeddelanden möjliggör tvåvägschatt mellan individer och grupper.
+ Comment[ta]=உடனடி தகவல் உங்களை இரண்டு வழியில் தனிநபர் மற்றும் குழுக்கள் இடையே அனுமதிக்கும்.
+ Comment[tg]=Клиенти мубодилаи иттилоот барои мубодилаи иттилоот байни одамон ва гурӯҳҳо хизмат мерасонад.
+ Comment[tr]=Anında mesajlaştırıcı iki yollu sohbet sağlar: bireyler ve gruplar.
+ Comment[uk]=Програма для миттєвого зв'язку дозволяє розмовляти з іншою людиною чи групою людей.
+-Comment[xx]=xxThe instant messenger allows two-way chat between individuals and groups.xx
+ Comment[zh_CN]=允许在个人和群组之间双向聊天的即时通讯程序。
+ ServiceTypeToConfigure=DCOP/InstantMessenger
+ MimeTypeOfInterest=DCOP/InstantMessenger
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/interfaces/kscript/sample/shellscript.desktop kdelibs_3_4_BRANCH/interfaces/kscript/sample/shellscript.desktop
+--- kdelibs_3_4_0_RELEASE/interfaces/kscript/sample/shellscript.desktop	2005-02-23 06:04:16.000000000 +0100
++++ kdelibs_3_4_BRANCH/interfaces/kscript/sample/shellscript.desktop	2005-03-12 18:58:40.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Bash Shell Script Runner
++Name[af]=Bash Tolk Skrip Hardloper
+ Name[az]=Bash Qabıq Skripti İcraçısı
+ Name[bn]=ব্যাশ শেল স্ক্রিপ্ট চালক
+ Name[bs]=Izvršavanje Bash shell skripti
+@@ -53,13 +54,13 @@
+ Name[uk]=Виконувач скриптів командної оболонки (bash)
+ Name[uz]=Bash шелл скриптини ишга тушурувчи
+ Name[wa]=Enondeu di scripes shell bash
+-Name[xx]=xxBash Shell Script Runnerxx
+ Name[zh_CN]=Bash Shell 脚本运行程序
+ Type=Service
+ X-KDE-Library=libshellscript
+ X-KDE-Script-Runner=ShellScript/bash
+ ServiceTypes=KScriptRunner/KScriptRunner
+ Comment=Runs bash shell scripts from inside the application.
++Comment[af]=Laai bash tolk skripte vanuit die program.
+ Comment[ar]=يشغَل bash shell scripts من داخل التطبيق
+ Comment[az]=Proqramın içindən bash qabıq skriptlərini icra edin
+ Comment[bg]=Изпълнение на скриптове на bash от друга програма.
+@@ -118,6 +119,5 @@
+ Comment[uk]=Запускає скрипти командної оболонки (bash) з програми.
+ Comment[uz]=Дастурларнинг ичдан bash шелл скриптини ишга туширади
+ Comment[wa]=Enonder des scripes shell bash a pårti do programe
+-Comment[xx]=xxRuns bash shell scripts from inside the application.xx
+ Comment[zh_CN]=在应用程序内运行 bash shell 脚本。
+ Comment[zh_TW]=於程式內執行 bash shell script 檔案
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/interfaces/kscript/scriptinterface.desktop kdelibs_3_4_BRANCH/interfaces/kscript/scriptinterface.desktop
+--- kdelibs_3_4_0_RELEASE/interfaces/kscript/scriptinterface.desktop	2005-02-23 06:04:15.000000000 +0100
++++ kdelibs_3_4_BRANCH/interfaces/kscript/scriptinterface.desktop	2005-03-12 18:58:40.000000000 +0100
+@@ -67,7 +67,6 @@
+ Comment[vi]=Đây là bộ script thử nghiệm chung cho việc thử các script giao diện 
+ Comment[wa]=Çouchal est on programe di saye po vey kimint rote l' eterface di scripes.
+ Comment[xh]=Olu luvavanyo luka wonke-wonke lwenjini yokushicilelweyo yokuvavanya ujongano loshicilelo.
+-Comment[xx]=xxThis is a generic test script engine for testing the script interface.xx
+ Comment[zh_CN]=这是一个用于测试脚本接口的通用脚本测试引擎。
+ Comment[zh_TW]=這是用來測試手稿介面用的一般性測試手稿引擎
+ Comment[zu]=Lena yinjini yesikripti sokuvivinya sawonke wonke yokuvivinya isikripti somxhumanisi.
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/interfaces/kspeech/dcoptexttospeech.desktop kdelibs_3_4_BRANCH/interfaces/kspeech/dcoptexttospeech.desktop
+--- kdelibs_3_4_0_RELEASE/interfaces/kspeech/dcoptexttospeech.desktop	2005-02-23 06:04:16.000000000 +0100
++++ kdelibs_3_4_BRANCH/interfaces/kspeech/dcoptexttospeech.desktop	2005-03-18 18:11:47.936688051 +0100
+@@ -12,12 +12,14 @@
+ Comment[de]=Sprachausgabe mit DCOP-Schnittstelle
+ Comment[es]=Texto a servicio de voz con un interfaz DCOP
+ Comment[et]=Teksti kõneks muutmise teenus DCOP liidesega
++Comment[eu]=DCOP interfazea duen testua-hitz-egitera
+ Comment[fr]=Service de synthèse vocale munie d'une interface DCOP
+ Comment[ga]=Seirbhís Téacs-go-Caint le comhéadan DCOP
++Comment[hi]=डीकॉप इंटरफेस सहित पाठ से ध्वनि
+ Comment[hsb]=konwertowanje teksta na rěč z DCOP-interfejsom
+ Comment[hu]=Szövegfelolvasó szolgáltatás DCOP-felülettel
+ Comment[is]=Texti-í-tal þjónusta með DCOP viðmóti
+-Comment[it]=Servizio di lettura vocale di testi con un'interfaccia DCOP
++Comment[it]=Servizio di pronuncia con un'interfaccia DCOP
+ Comment[lt]=Teksto vertimo kalba tarnyba su DCOP sąsaja
+ Comment[nb]=Tekst til tale-program med DCOP-grensesnitt
+ Comment[nl]=Tekst-tot-spraak-dienst met een DCOP interface
+@@ -31,8 +33,7 @@
+ Comment[sk]=Služba prevodu textu na reč s rozhraním DCOP
+ Comment[sl]=Servis, ki spremeni besedilo v govor, z vmesnikom DCOP
+ Comment[sr]=Текст—у—говор сервис са DCOP интерфејсом
+-Comment[sr@Latn]=Текст—у—говор сервис са DCOP интерфејсом
++Comment[sr@Latn]=Tekst—u—govor servis sa DCOP interfejsom
+ Comment[sv]=Text till tal-tjänst med ett DCOP-gränssnitt
+ Comment[uk]=Служба синтезу мовлення з інтерфейсом DCOP
+-Comment[xx]=xxText-to-Speech Service with a DCOP interfacexx
+ Comment[zh_CN]=带 DCOP 接口的文本到语音服务
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/interfaces/ktexteditor/kcm_ktexteditor.desktop kdelibs_3_4_BRANCH/interfaces/ktexteditor/kcm_ktexteditor.desktop
+--- kdelibs_3_4_0_RELEASE/interfaces/ktexteditor/kcm_ktexteditor.desktop	2005-02-23 06:04:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/interfaces/ktexteditor/kcm_ktexteditor.desktop	2005-03-12 18:58:40.000000000 +0100
+@@ -63,7 +63,6 @@
+ Name[ven]=Musengulusi wa manwalwa o dzheniswaho
+ Name[wa]=Ravalé aspougneu di tecse
+ Name[xh]=Umhleli Wombhalo Olungiselelweyo
+-Name[xx]=xxEmbedded Text Editorxx
+ Name[zh_CN]=嵌入式文本编辑器
+ Name[zh_TW]=嵌入式文字編輯器
+ Name[zu]=Umlungisi Wombhalo Oshuthekiwe
+@@ -129,7 +128,6 @@
+ Comment[uz]=Матн тарҳрирчи хизмати дастурларни матн кўрувчи ва таҳрирчи билан таъминлайди. Матн таҳрирлаш имкониятини яратувчи KDE дастурлари шу хизматни ишлатиши керак.
+ Comment[ven]=Tshumelo ya musengulusi wa manwalwa i diswa apulifikhesheni dzirena na vhavhoni vha manwalwa na musengulusi. Apulifikhesheni ya KDE ine ya disa zwishumiswa zwa u sengulusa manwalwa i fanela u shumisa tshumelo ino.
+ Comment[xh]=Inkonzo yomhleli wombhalo onika izicelo ngombonisi wombhalo nomhleli Izicelo ze KDE ezinikezela ngohlelo lombhalo ekufuneka isebenzise lenkonzo.
+-Comment[xx]=xxThe text editor service provides applications with a text viewer and editor. KDE applications that provide text editing facilities should use this service.xx
+ Comment[zh_CN]=文本编辑器服务提供了文本查看器和编辑器的应用程序。提供文本编辑功能的 KDE 应用程序都应该使用此服务。
+ Comment[zh_TW]=文字編輯服務提供程式一個文字檢視器以及編輯器。提供文字編輯功能的 KDE 程式擁該使用這項服務。
+ Comment[zu]=Umsebenzi womlungisi wombhalo onikeza imiyaleli ngombukisi wombhalo kanye nomhleli.Abayaleli abanikeza izisebenzi zokulungisa umbhalo okumele zisebenzise lomsebenzi.
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/interfaces/ktexteditor/ktexteditor.desktop kdelibs_3_4_BRANCH/interfaces/ktexteditor/ktexteditor.desktop
+--- kdelibs_3_4_0_RELEASE/interfaces/ktexteditor/ktexteditor.desktop	2005-02-23 06:04:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/interfaces/ktexteditor/ktexteditor.desktop	2005-03-12 18:58:40.000000000 +0100
+@@ -69,7 +69,6 @@
+ Comment[ven]=Khomphonente ya musengulusi ya manwalwa (ina Doc/u khethekana ha u vhona)
+ Comment[vi]=Componet của trình soạn thảo văn bản có thể embeđ
+ Comment[xh]=Inxenye Yomhleli Wombhalo Olungiselelweyo (ngo Xwebhu/Ulwahlulo Lwemboniselo)
+-Comment[xx]=xxEmbeddable Text Editor Component (with Doc/View Separation)xx
+ Comment[zh_CN]=可嵌入的文本编辑器部件(带 文档/查看 分离)
+ Comment[zh_TW]=可嵌入的文字編輯器元件 (Doc/View 分開)
+ Comment[zu]=IIunga Lomlungisi Wombhalo (Ngokuhlukana kwe-Doc/Umbukiso)
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/interfaces/ktexteditor/ktexteditoreditor.desktop kdelibs_3_4_BRANCH/interfaces/ktexteditor/ktexteditoreditor.desktop
+--- kdelibs_3_4_0_RELEASE/interfaces/ktexteditor/ktexteditoreditor.desktop	2005-02-23 06:04:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/interfaces/ktexteditor/ktexteditoreditor.desktop	2005-03-12 18:58:40.000000000 +0100
+@@ -69,7 +69,6 @@
+ Comment[ven]=Khomphonente ya musengulusi wa manwalwa (i sina Doc/U khethekana hau vhona)
+ Comment[vi]=Componet của trình soạn thảo văn bản có thể Embed( không phan^ biệtn Doc/ View)
+ Comment[xh]=Ingxenye Yomhleli Wombhalo Olungiselekayo (ngaphandle Koxwebhu/Ulwahlulo Lwemboniselo)
+-Comment[xx]=xxEmbeddable Text Editor Component (without Doc/View Separation)xx
+ Comment[zh_CN]=可嵌入的文本编辑器部件(不带 文档/查看 分离)
+ Comment[zh_TW]=可嵌入的文字編輯器元件 (Doc/View 不分開)
+ Comment[zu]=Ilunga Lomlungisi Wombhalo (ngaphandle Kokuhlukana kwe-Doc/Umbukiso)
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/interfaces/ktexteditor/ktexteditorplugin.desktop kdelibs_3_4_BRANCH/interfaces/ktexteditor/ktexteditorplugin.desktop
+--- kdelibs_3_4_0_RELEASE/interfaces/ktexteditor/ktexteditorplugin.desktop	2005-02-23 06:04:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/interfaces/ktexteditor/ktexteditorplugin.desktop	2005-03-12 18:58:40.000000000 +0100
+@@ -4,6 +4,7 @@
+ X-KDE-ServiceType=KTextEditor/Plugin
+ X-KDE-Derived=
+ Comment=KTextEditor Plugin
++Comment[af]=KTextEditor Inprop Module
+ Comment[ar]=مساعد برنامج KTextEditor
+ Comment[az]=KTextEditor Əlavəsi
+ Comment[be]=Дапаўненьне K Тэкставага рэдактара
+@@ -57,7 +58,7 @@
+ Comment[sl]=Vstavek KTextEditor
+ Comment[sq]=Shtojca KTextEditor
+ Comment[sr]=KTextEditor прикључак
+-Comment[sr@Latn]=KTextEditor dodatak
++Comment[sr@Latn]=KTextEditor priključak
+ Comment[ss]=I-plugini ye KTextEditor 
+ Comment[sv]=Insticksprogram för texteditor
+ Comment[ta]=கேஉரைதொகுப்பி சொருகுப்பொருள்
+@@ -68,7 +69,6 @@
+ Comment[ven]=Pulagini ya musengulusi wa manwalwa a K
+ Comment[wa]=Tchôke-divins KTextEditor
+ Comment[xh]=KTextEditor ye Plagi efakiweyo
+-Comment[xx]=xxKTextEditor Pluginxx
+ Comment[zh_CN]=KTextEditor 插件
+ Comment[zh_TW]=KTextEditor 外掛程式
+ Comment[zu]= Ukungena ngaphakathi kwe-KTextEditor
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kabc/distributionlistdialog.cpp kdelibs_3_4_BRANCH/kabc/distributionlistdialog.cpp
+--- kdelibs_3_4_0_RELEASE/kabc/distributionlistdialog.cpp	2004-07-08 11:55:37.000000000 +0200
++++ kdelibs_3_4_BRANCH/kabc/distributionlistdialog.cpp	2005-03-12 18:58:40.000000000 +0100
+@@ -53,12 +53,15 @@
+ {
+ }
+ 
++static QMap<QWidget*,QString> *sEmailMap = 0;
+ 
+ EmailSelector::EmailSelector( const QStringList &emails, const QString &current,
+                                       QWidget *parent ) :
+   KDialogBase( KDialogBase::Plain, i18n("Select Email Address"), Ok, Ok,
+                parent )
+ {
++  if (!sEmailMap)
++     sEmailMap = new QMap<QWidget*,QString>();
+   QFrame *topFrame = plainPage();
+   QBoxLayout *topLayout = new QVBoxLayout( topFrame );
+ 
+@@ -69,8 +72,9 @@
+   QStringList::ConstIterator it;
+   for( it = emails.begin(); it != emails.end(); ++it ) {
+     QRadioButton *button = new QRadioButton( *it, mButtonGroup );
++    sEmailMap->insert( button, *it );
+     if ( (*it) == current ) {
+-      button->setDown( true );
++      mButtonGroup->setButton(mButtonGroup->id(button));
+     }
+   }
+ }
+@@ -78,7 +82,7 @@
+ QString EmailSelector::selected()
+ {
+   QButton *button = mButtonGroup->selected();
+-  if ( button ) return button->text();
++  if ( button ) return (*sEmailMap)[button];
+   return QString::null;
+ }
+ 
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kabc/formats/binary.desktop kdelibs_3_4_BRANCH/kabc/formats/binary.desktop
+--- kdelibs_3_4_0_RELEASE/kabc/formats/binary.desktop	2005-02-23 06:04:19.000000000 +0100
++++ kdelibs_3_4_BRANCH/kabc/formats/binary.desktop	2005-03-12 18:58:40.000000000 +0100
+@@ -66,7 +66,6 @@
+ Name[ven]=Zwivhili
+ Name[wa]=Binaire
+ Name[xh]=Ephindwe kabini
+-Name[xx]=xxBinaryxx
+ Name[zh_CN]=二进制
+ Name[zh_TW]=二進位
+ Name[zu]=Okuhambisana ngambili
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kabc/kab2kabc.desktop kdelibs_3_4_BRANCH/kabc/kab2kabc.desktop
+--- kdelibs_3_4_0_RELEASE/kabc/kab2kabc.desktop	2005-02-23 06:04:18.000000000 +0100
++++ kdelibs_3_4_BRANCH/kabc/kab2kabc.desktop	2005-03-12 18:58:40.000000000 +0100
+@@ -13,7 +13,6 @@
+ Name[pt_BR]=Conversão de  kab para kabc
+ Name[ro]=Kab2kabc
+ Name[sv]=Kab2kabc
+-Name[xx]=xxkab2kabcxx
+ Name[zu]=i-kab2kabc
+ Exec=kab2kabc --disable-autostart --quiet
+ Icon=misc
+@@ -84,7 +83,6 @@
+ Comment[ven]=Tshishumiswa tsha u shandukisa libkab itshi ya kha libkabc
+ Comment[vi]=Công cụ hoán chuyển libkab thành libkabc .
+ Comment[xh]=libkab kwi libkabc isixhobo sokuguqulela.
+-Comment[xx]=xxlibkab to libkabc conversion tool.xx
+ Comment[zh_CN]=libkab 到 libkabc 的转换工具。
+ Comment[zh_TW]=libkab 至 libkabc 轉換工具
+ Comment[zu]=Ithuluzi lokuguqula le-libkab kuyaku-libkabc
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kabc/kabc_manager.desktop kdelibs_3_4_BRANCH/kabc/kabc_manager.desktop
+--- kdelibs_3_4_0_RELEASE/kabc/kabc_manager.desktop	2005-02-23 06:04:18.000000000 +0100
++++ kdelibs_3_4_BRANCH/kabc/kabc_manager.desktop	2005-03-12 18:58:40.000000000 +0100
+@@ -21,7 +21,7 @@
+ Name[lt]=Kontaktai
+ Name[mk]=Контакти
+ Name[nb]=Kontakter
+-Name[nl]=Contacten
++Name[nl]=Contactpersonen
+ Name[nn]=Kontaktar
+ Name[pa]=ਸੰਪਰਕ
+ Name[pl]=Kontakty
+@@ -33,12 +33,11 @@
+ Name[sk]=Kontakty
+ Name[sl]=Stiki
+ Name[sr]=Контакти
+-Name[sr@Latn]=Контакти
++Name[sr@Latn]=Kontakti
+ Name[sv]=Kontakter
+ Name[ta]=தொடர்புகள்
+ Name[tg]=Алоқаҳо
+ Name[uk]=Контакти
+-Name[xx]=xxContactsxx
+ Name[zh_CN]=联系人
+ Type=Service
+ ServiceTypes=KResources/Manager
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kabc/lock.cpp kdelibs_3_4_BRANCH/kabc/lock.cpp
+--- kdelibs_3_4_0_RELEASE/kabc/lock.cpp	2004-08-02 21:12:30.000000000 +0200
++++ kdelibs_3_4_BRANCH/kabc/lock.cpp	2005-03-12 18:58:40.000000000 +0100
+@@ -99,8 +99,11 @@
+       kdWarning(5700) << "Removed stale lock file from process '" << app << "'"
+                       << endl;
+     } else {
++      QString identifier( mIdentifier );
++      identifier.replace( '_', '/' );
++
+       mError = i18n("The resource '%1' is locked by application '%2'.")
+-               .arg( mIdentifier.replace( '_', '/' ) ).arg( app );
++               .arg( identifier ).arg( app );
+       return false;
+     }
+   }
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kabc/plugins/dir/dir.desktop kdelibs_3_4_BRANCH/kabc/plugins/dir/dir.desktop
+--- kdelibs_3_4_0_RELEASE/kabc/plugins/dir/dir.desktop	2005-02-23 06:04:19.000000000 +0100
++++ kdelibs_3_4_BRANCH/kabc/plugins/dir/dir.desktop	2005-03-12 18:58:40.000000000 +0100
+@@ -71,7 +71,6 @@
+ Name[vi]=Thư mục 
+ Name[wa]=Ridant
+ Name[xh]=Ulawulo
+-Name[xx]=xxDirectoryxx
+ Name[zh_CN]=目录
+ Name[zh_TW]=目錄
+ Name[zu]=Uhlu lwamafayela
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kabc/plugins/evolution/evolution.desktop kdelibs_3_4_BRANCH/kabc/plugins/evolution/evolution.desktop
+--- kdelibs_3_4_0_RELEASE/kabc/plugins/evolution/evolution.desktop	2005-02-23 06:04:20.000000000 +0100
++++ kdelibs_3_4_BRANCH/kabc/plugins/evolution/evolution.desktop	2005-03-12 18:58:40.000000000 +0100
+@@ -15,7 +15,6 @@
+ Name[ven]=Tsikoni
+ Name[wa]=Evolucion
+ Name[xh]=Utshintsho lwendawo ngokwenqanawa
+-Name[xx]=xxEvolutionxx
+ Name[zu]=Evolushini
+ X-KDE-Library=kabc_evo
+ Type=Service
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kabc/plugins/file/file.desktop kdelibs_3_4_BRANCH/kabc/plugins/file/file.desktop
+--- kdelibs_3_4_0_RELEASE/kabc/plugins/file/file.desktop	2005-01-24 05:26:30.000000000 +0100
++++ kdelibs_3_4_BRANCH/kabc/plugins/file/file.desktop	2005-03-12 18:58:40.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=File
++Name[af]=Lêer
+ Name[ar]=ملفّ
+ Name[az]=Fayl
+ Name[be]=Файл
+@@ -60,7 +61,6 @@
+ Name[uk]=Файл
+ Name[uz]=Файл
+ Name[wa]=Fitchî
+-Name[xx]=xxFilexx
+ Name[zh_CN]=文件
+ X-KDE-Library=kabc_file
+ Type=Service
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kabc/plugins/ldapkio/ldapkio.desktop kdelibs_3_4_BRANCH/kabc/plugins/ldapkio/ldapkio.desktop
+--- kdelibs_3_4_0_RELEASE/kabc/plugins/ldapkio/ldapkio.desktop	2004-10-26 04:42:12.000000000 +0200
++++ kdelibs_3_4_BRANCH/kabc/plugins/ldapkio/ldapkio.desktop	2005-03-12 18:58:40.000000000 +0100
+@@ -3,7 +3,6 @@
+ Name=LDAP
+ Name[bn]=এল-ডি-এ-পি (LDAP)
+ Name[hi]=एलडीएपी (LDAP)
+-Name[xx]=xxLDAPxx
+ X-KDE-Library=kabc_ldapkio
+ Type=Service
+ ServiceTypes=KResources/Plugin
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kabc/plugins/net/net.desktop kdelibs_3_4_BRANCH/kabc/plugins/net/net.desktop
+--- kdelibs_3_4_0_RELEASE/kabc/plugins/net/net.desktop	2005-02-23 06:04:20.000000000 +0100
++++ kdelibs_3_4_BRANCH/kabc/plugins/net/net.desktop	2005-03-12 18:58:40.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Network
++Name[af]=Netwerk
+ Name[ar]=الشبكة
+ Name[az]=Şəbəkə
+ Name[be]=Сетка
+@@ -68,7 +69,6 @@
+ Name[vi]=Mạng 
+ Name[wa]=Rantoele
+ Name[xh]=Umsebenzi womnatha
+-Name[xx]=xxNetworkxx
+ Name[zh_CN]=网络
+ Name[zh_TW]=網路
+ Name[zu]=Umsebenzi wokuxhumana okusakazekile
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kabc/plugins/sql/sql.desktop kdelibs_3_4_BRANCH/kabc/plugins/sql/sql.desktop
+--- kdelibs_3_4_0_RELEASE/kabc/plugins/sql/sql.desktop	2004-10-26 04:42:12.000000000 +0200
++++ kdelibs_3_4_BRANCH/kabc/plugins/sql/sql.desktop	2005-03-12 18:58:40.000000000 +0100
+@@ -1,11 +1,9 @@
+ [Misc]
+ Encoding=UTF-8
+ Name=SQL
+-Name[af]=Sql
+ Name[bn]=এস-কিউ-এল (SQL)
+ Name[hi]=एसक्यूएल (SQL)
+ Name[ss]=I-SQL
+-Name[xx]=xxSQLxx
+ 
+ [Plugin]
+ Type=sql
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kate/data/cpp.xml kdelibs_3_4_BRANCH/kate/data/cpp.xml
+--- kdelibs_3_4_0_RELEASE/kate/data/cpp.xml	2004-12-29 21:29:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/kate/data/cpp.xml	2005-03-12 18:58:40.000000000 +0100
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE language SYSTEM "language.dtd">
+-<language name="C++" version="1.29" kateversion="2.4" section="Sources" extensions="*.cxx;*.cpp;*.cc;*.C;*.h;*.H;*.hxx;*.hpp;*.hcc;*.moc" mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr" priority="9">
++<language name="C++" version="1.30" kateversion="2.4" section="Sources" extensions="*.cxx;*.cpp;*.cc;*.C;*.h;*.H;*.hxx;*.hpp;*.hcc;*.moc" mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr" priority="9">
+   <highlighting>
+     <list name="keywords">
+       <item> asm </item>
+@@ -86,6 +86,7 @@
+       <item> emit </item>
+       <item> signals </item>
+       <item> slots </item>
++      <item> foreach </item>
+     </list>
+     <list name="types">
+       <item> auto </item>
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kate/data/fortran.xml kdelibs_3_4_BRANCH/kate/data/fortran.xml
+--- kdelibs_3_4_0_RELEASE/kate/data/fortran.xml	2005-02-14 18:52:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/kate/data/fortran.xml	2005-03-18 18:11:54.646541989 +0100
+@@ -1,8 +1,12 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE language SYSTEM "language.dtd">
+-<language name="Fortran" version="1.08" kateversion="2.4" section="Sources" extensions="*.f;*.F;*.for;*.FOR;*.f90;*.F90;*.fpp;*.FPP;*.f95;*.F95;" mimetype="text/x-fortran-src" casesensitive="0" author="Franchin Matteo (fnch@libero.it)" license="LGPL">
++<language name="Fortran" version="1.09" kateversion="2.4" section="Sources" extensions="*.f;*.F;*.for;*.FOR;*.f90;*.F90;*.fpp;*.FPP;*.f95;*.F95;" mimetype="text/x-fortran-src" casesensitive="0" author="Franchin Matteo (fnch@libero.it)" license="LGPL">
+ <!-- by Franchin Matteo, fnch@libero.it -->
+   <highlighting>
++
++<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *  -->
++<!-- *                              L I S T S                            *  -->
++<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *  -->
+     <list name="keywords">
+       <item> allocate </item>
+       <item> break </item>
+@@ -20,10 +24,17 @@
+       <item> elsewhere </item>
+       <item> elseif </item>
+       <item> else </item>
+-      <item> enddo </item>
+-      <item> endif </item>
+       <item> end </item>
++      <item> endmodule </item>
++      <item> endinterface </item>
++      <item> endprogram </item>
++      <item> endsubroutine </item>
++      <item> endfunction </item>
++      <item> endwhere </item>
++      <item> endforall </item>
+       <item> endselect </item>
++      <item> enddo </item>
++      <item> endif </item>
+       <item> equivalence </item>
+       <item> exit </item>
+       <item> external </item>
+@@ -37,6 +48,7 @@
+       <item> interface </item>
+       <item> intrinsic </item>
+       <item> module </item>
++      <item> namelist </item>
+       <item> none </item>
+       <item> nullify </item>
+       <item> operator </item>
+@@ -51,6 +63,7 @@
+       <item> result </item>
+       <item> return </item>
+       <item> select </item>
++      <item> selectcase </item>
+       <item> stop </item>
+       <item> subroutine </item>
+       <item> then </item>
+@@ -75,7 +88,6 @@
+     <list name="types">
+       <item> double </item>
+       <item> precision </item>
+-      <item> real*8 </item>
+       <item> parameter </item>
+       <item> save </item>
+       <item> pointer </item>
+@@ -84,11 +96,6 @@
+       <item> target </item>
+       <item> allocatable </item>
+       <item> optional </item>
+-      <item> char </item>
+-      <item> cmplx </item>
+-      <item> dble </item>
+-      <item> dcmplx </item>
+-      <item> ichar </item>
+     </list>
+ 
+ <!-- There are 4 types of intrinsic procedures in Fortran 90:
+@@ -116,6 +123,8 @@
+       <item> dnint </item> <!-- Specific name for anint -->
+       <item> ceiling </item>
+       <item> cmplx </item>
++      <item> dcmplx </item> <!-- (non standard) -->
++      <item> dimag </item>  <!-- (non standard) -->
+       <item> floor </item>
+       <item> nint </item>  <!-- Generic form: nint -->
+       <item> idnint </item><!-- Specific name for nint -->
+@@ -125,6 +134,8 @@
+       <item> real </item>  <!-- Generic form: real -->
+       <item> float </item> <!-- Specific names for real -->
+       <item> sngl </item>
++      <item> dble </item>
++      <item> dreal </item> <!-- (non standard) -->
+       <item> aprime </item> <!-- 5 functions from fortran.xml -->      
+       <item> dconjg </item> <!-- I don't know if they really belong to --> 
+       <item> dfloat </item> <!-- the fortran 90/95 standard! -->
+@@ -312,39 +323,76 @@
+       <item> random_seed </item>
+     </list>
+ 
++<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *  -->
++<!-- *                           C O N T E X T S                         *  -->
++<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *  -->
+     <contexts>
+       <context attribute="Normal Text" lineEndContext="#stay" name="default" >
+         <IncludeRules context="find_strings" />
+ 
+-        <RegExpr attribute="Data Type" context="#stay" String="end[ \t]*type" insensitive="TRUE"/>
++        <IncludeRules context="find_decls" />
++
++        <RegExpr attribute="Logical" context="#stay" String="\.(true|false)[.]" insensitive="TRUE"/>
++        <RegExpr attribute="Operator" context="#stay" String="\.[A-Za-z]+\."/>
++        <RegExpr attribute="Operator" context="#stay" String="(==|/=|&lt;|&lt;=|&gt;|&gt;=)"/>
++
++        <IncludeRules context="find_numbers" />
++
++        <RegExpr attribute="Preprocessor" context="#stay" String="(#|cDEC\$|CDEC\$).*$" column="0"/>
++        <RegExpr attribute="Comment" context="#stay" String="[cC\*].*$" column="0"/>
++        <RegExpr attribute="Comment" context="#stay" String="!.*$"/>
++        <Detect2Chars attribute="Keyword" context="#stay" char="*" char1="*"/>
++        <AnyChar attribute="Keyword" context="#stay" String="&amp;+-*/=?[]^{|}~"/>
++        <AnyChar attribute="Symbol" context="#stay" String="(),"/>
++      </context>
++<!--************************END OF THE MAIN CONTEXT*************************-->
++
++
++
++<!-- The following two contexts match declarations -->
++      <context attribute="Normal Text" lineEndContext="#stay" name="find_decls">
++        <RegExpr attribute="Data Type" context="#stay" String="\binteger[\*]2" insensitive="TRUE"/>
++        <RegExpr attribute="Data Type" context="#stay" String="\breal[\*]8" insensitive="TRUE"/>
++        <RegExpr attribute="Data Type" context="#stay" String="\bcomplex[\*]16" insensitive="TRUE"/>
++        <RegExpr attribute="Data Type" context="#stay" String="\bend\s*type\b" insensitive="TRUE"/>
+         <keyword attribute="Data Type" context="#stay" String="types"/>
+-        <RegExpr attribute="Data Type" context="#stay" String="\b(type|integer|real|complex|character|logical|intent|dimension)\b([ \t]*[(][^)]*[)])?" insensitive="TRUE"/>
++        <RegExpr attribute="Data Type" context="find_paren" String="^\s*real\s*[(]" insensitive="TRUE"/>
++        <RegExpr attribute="Data Type" context="#stay" String="^\s*real(?![\w\*])" insensitive="TRUE"/>
++        <RegExpr attribute="Data Type" context="#stay" String="\bcharacter[*][0-9]+\b" insensitive="TRUE"/>
++        <RegExpr attribute="Data Type" context="find_paren" String="\b(type|integer|complex|character|logical|intent|dimension)\b\s*[(]" insensitive="TRUE"/>
++        <RegExpr attribute="Data Type" context="#stay" String="\b(type|integer|complex|character|logical|intent|dimension)\b" insensitive="TRUE"/>
++        <Detect2Chars attribute="Data Type" context="#stay" char=":" char1=":"/>
++      </context>
++<!-- This context matches parenthesis in data type declarations, such as in 'real(...)'-->
++      <context attribute="Data Type" lineEndContext="#pop" name="find_paren">
++        <DetectChar attribute="Data Type" context="find_paren" char="("/>
++        <DetectChar attribute="Data Type" context="#pop" char=")"/>
++      </context>
++
++<!-- The following context matches intrinsic procedures -->
++      <context attribute="Normal Text" lineEndContext="#stay" name="find_intrinsics">
++        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*block\s*data\b" insensitive="TRUE"/> 
++        <RegExpr attribute="Keyword" context="#stay" String="\bblock\s*data\b" insensitive="TRUE"/> 
++        <RegExpr attribute="IO Function" context="#stay" String="\bend\s*file\b" insensitive="TRUE"/> 
+         <keyword attribute="Keyword" context="#stay" String="keywords"/>
+         <keyword attribute="IO Function" context="#stay" String="io_functions"/>
+-
+       <!-- INTRINSIC PROCEDURES -->
+         <keyword attribute="Elemental Procedure"       context="#stay" String="elemental_procs"/>
+         <keyword attribute="Inquiry Function"          context="#stay" String="inquiry_fn"/>
+         <keyword attribute="Transformational Function" context="#stay" String="transform_fn"/>
+         <keyword attribute="Non elemental subroutine"  context="#stay" String="non_elem_subr"/>
++      </context>
+ 
+-        <RegExpr attribute="Logical" context="#stay" String="\.(true|false)\." insensitive="TRUE"/>
+-        <RegExpr attribute="Operator" context="#stay" String="\.[A-Za-z]+[.]"/>
++<!-- The following context matches integer and real numbers -->
++      <context attribute="Normal Text" lineEndContext="#stay" name="find_numbers">
+         <!-- Floating-point numbers with optional kind -->
+-        <RegExpr attribute="Float" context="#stay" String="\b[0-9]*\.[0-9]+([de][+-]?[0-9]+)?([_]([0-9]+|[a-z][\w_]*))?" insensitive="TRUE"/>
+-        <RegExpr attribute="Float" context="#stay" String="\b[0-9]+\.[0-9]*([de][+-]?[0-9]+)?([_]([0-9]+|[a-z][\w_]*))?" insensitive="TRUE"/>
+-        <Float attribute="Float" context="#stay">
+-          <AnyChar attribute="Float" context="#stay" String="fFdD"/>
+-        </Float>
++        <RegExpr attribute="Float" context="#stay" String="[0-9]*\.[0-9]+([de][+-]?[0-9]+)?([_]([0-9]+|[a-z][\w_]*))?" insensitive="TRUE"/>
++        <RegExpr attribute="Float" context="#stay" String="\b[0-9]+\.[0-9]*([de][+-]?[0-9]+)?([_]([0-9]+|[a-z][\w_]*))?(?![a-z])" insensitive="TRUE"/>
++        <RegExpr attribute="Float" context="#stay" String="\b[0-9]+[de][+-]?[0-9]+([_]([0-9]+|[a-z][\w_]*))?" insensitive="TRUE"/>
+         <!-- Integers with optional kind specifier -->
+         <RegExpr attribute="Decimal" context="#stay" String="\b[0-9]+([_]([0-9]+|[a-zA-Z][\w_]*))?"/>
+-        <!-- Integers in binary octal and hexadecimal notations -->
+-        <RegExpr attribute="Decimal" context="#stay" String="\b[boz]([&apos;][0-9a-f]+[&apos;]|[&quot;][0-9a-f]+[&quot;])" insensitive="TRUE"/>
+-        <HlCChar attribute="Char" context="#stay"/>
+-        <RegExpr attribute="Preprocessor" context="#stay" String="(#|cDEC\$|CDEC\$).*$" column="0"/>
+-        <RegExpr attribute="Comment" context="#stay" String="[cC\*].*$" column="0"/>
+-        <RegExpr attribute="Comment" context="#stay" String="!.*$"/>
+-        <AnyChar attribute="Symbol" context="#stay" String="!%&amp;()+,-&lt;=&gt;?[]^{|}~"/>
++        <!-- Integers in binary, octal and hexadecimal notations -->
++        <RegExpr attribute="Decimal" context="#stay" String="\b[bozx]([&apos;][0-9a-f]+[&apos;]|[&quot;][0-9a-f]+[&quot;])" insensitive="TRUE"/>
+       </context>
+ 
+ <!-- The following four contexts implement the complex string multi-line declarations -->
+@@ -365,15 +413,17 @@
+         <RegExpr attribute="Keyword" context="end_of_string" String="&amp;\s*$"/>
+         <RegExpr attribute="String" context="end_of_string" String=".*(?=&amp;\s*$)"/>
+       </context>
+-
++      
+       <context attribute="String" lineEndContext="#stay" name="end_of_string" fallthrough="true" fallthroughContext="#pop#pop">
+         <RegExpr attribute="Keyword" context="#stay" String="&amp;\s*$"/>
+-        <DetectChar attribute="Keyword" context="#pop" char="&amp;" column="0"/>
+-        <RegExpr attribute="Comment" context="#stay" String="(!.*)?$" column="0"/>
++        <DetectChar attribute="Keyword" context="#pop" char="&amp;" firstNonSpace="true" />
++        <RegExpr attribute="Comment" context="#stay" String="(!.*)?$" firstNonSpace="true" />
+       </context>
+-
+-
+     </contexts>
++
++<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *  -->
++<!-- *             S T Y L E   I T E M   D E F I N I T I O N S           *  -->
++<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *  -->
+     <itemDatas>
+       <itemData name="Normal Text" defStyleNum="dsNormal"/>
+       <itemData name="Keyword" defStyleNum="dsKeyword"/>
+@@ -398,10 +448,10 @@
+     </itemDatas>
+   </highlighting>
+   <general>
+-    <keywords casesensitive="0"/>
+     <comments>
+       <comment name="singleLine" start="!"/>
+       <comment name="singleLine" start="c"/>
+     </comments>
++    <keywords casesensitive="0"/>
+   </general>
+ </language>
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kate/data/katepart.desktop kdelibs_3_4_BRANCH/kate/data/katepart.desktop
+--- kdelibs_3_4_0_RELEASE/kate/data/katepart.desktop	2005-02-23 06:04:20.000000000 +0100
++++ kdelibs_3_4_BRANCH/kate/data/katepart.desktop	2005-03-12 18:58:40.000000000 +0100
+@@ -6,6 +6,7 @@
+ Name[az]=Daxili Mütəxəssis Mətn Editoru
+ Name[bg]=Разширен текстов редактор
+ Name[bn]=অভ্যন্তরীন উন্নত টেক্সট সম্পাদক
++Name[br]=Aozer skrid barek enframmet
+ Name[bs]=Umetnuti napredni tekst editor
+ Name[ca]=Editor avançat de text, encastable
+ Name[cs]=Zabudovaný rozšířený editor
+@@ -65,7 +66,6 @@
+ Name[ven]=Musengulusi wa manwalwa a nthesa o dzheniswaho
+ Name[wa]=Ravalé aspougneu di tecse avancî
+ Name[xh]=Umhleli Wombhalo Obhekisa phambili Olungiselweyo
+-Name[xx]=xxEmbedded Advanced Text Editorxx
+ Name[zh_CN]=嵌入式 KDE 高级文本编辑器
+ Name[zh_TW]=嵌入式進階文字編輯器
+ Name[zu]=Umlungisi Wezinga Eliphezulu Oshuthekiwe
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kate/part/katebuffer.cpp kdelibs_3_4_BRANCH/kate/part/katebuffer.cpp
+--- kdelibs_3_4_0_RELEASE/kate/part/katebuffer.cpp	2004-11-22 00:05:32.000000000 +0100
++++ kdelibs_3_4_BRANCH/kate/part/katebuffer.cpp	2005-03-12 18:58:40.000000000 +0100
+@@ -87,7 +87,8 @@
+     KateFileLoader (const QString &filename, QTextCodec *codec)
+       : m_file (filename)
+       , m_buffer (KMIN (m_file.size(), KATE_FILE_LOADER_BS))
+-      , m_decoder (codec->makeDecoder())
++      , m_codec (codec)
++      , m_decoder (m_codec->makeDecoder())
+       , m_position (0)
+       , m_lastLineStart (0)
+       , m_eof (false) // default to not eof
+@@ -115,6 +116,14 @@
+ 
+         if (c > 0)
+         {
++          // fix utf16 LE, stolen from khtml ;)
++          if ((c >= 2) && (m_codec->mibEnum() == 1000) && (m_buffer[1] == 0x00))
++          {
++            // utf16LE, we need to put the decoder in LE mode
++            char reverseUtf16[3] = {0xFF, 0xFE, 0x00};
++            m_decoder->toUnicode(reverseUtf16, 2);
++          }
++
+           processNull (c);
+           m_text = m_decoder->toUnicode (m_buffer, c);
+         }
+@@ -289,6 +298,7 @@
+   private:
+     QFile m_file;
+     QByteArray m_buffer;
++    QTextCodec *m_codec;
+     QTextDecoder *m_decoder;
+     QString m_text;
+     uint m_position;
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kate/part/kateconfig.cpp kdelibs_3_4_BRANCH/kate/part/kateconfig.cpp
+--- kdelibs_3_4_0_RELEASE/kate/part/kateconfig.cpp	2005-01-24 16:32:18.000000000 +0100
++++ kdelibs_3_4_BRANCH/kate/part/kateconfig.cpp	2005-03-12 18:58:40.000000000 +0100
+@@ -1234,13 +1234,17 @@
+ 
+ const QColor& KateRendererConfig::lineMarkerColor(KTextEditor::MarkInterface::MarkTypes type) const
+ {
+-  int index = static_cast<int>( log(static_cast<double>(type)) / log(2.0) );
+-  Q_ASSERT( index >= 0 && index < KTextEditor::MarkInterface::reservedMarkersCount() );
++  int index = 0;
++  if (type > 0) { while((type >> index++) ^ 1) {} }
++  index -= 1;
++
++  if ( index < 0 || index >= KTextEditor::MarkInterface::reservedMarkersCount() )
++    return QColor();
+ 
+   if (m_lineMarkerColorSet[index] || isGlobal())
+     return m_lineMarkerColor[index];
+ 
+-  return s_global->lineMarkerColor();
++  return s_global->lineMarkerColor( type );
+ }
+ 
+ void KateRendererConfig::setLineMarkerColor (const QColor &col, KTextEditor::MarkInterface::MarkTypes type)
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kate/part/katedocument.cpp kdelibs_3_4_BRANCH/kate/part/katedocument.cpp
+--- kdelibs_3_4_0_RELEASE/kate/part/katedocument.cpp	2005-03-03 01:48:59.000000000 +0100
++++ kdelibs_3_4_BRANCH/kate/part/katedocument.cpp	2005-03-18 18:11:56.447234436 +0100
+@@ -3316,8 +3316,12 @@
+     else
+     {
+       // backspace indents: erase to next indent position
+-
+       KateTextLine::Ptr textLine = m_buffer->plainLine(line);
++
++      // don't forget this check!!!! really!!!!
++      if (!textLine)
++        return;
++
+       int colX = textLine->cursorX(col, config()->tabWidth());
+       int pos = textLine->firstChar();
+       if (pos > 0)
+@@ -3330,7 +3334,9 @@
+         int y = line;
+         while (--y >= 0)
+         {
++          // this is save, y <= line, and line was already success
+           textLine = m_buffer->plainLine(y);
++
+           pos = textLine->firstChar();
+ 
+           if (pos >= 0)
+@@ -3358,6 +3364,11 @@
+     if (line >= 1)
+     {
+       KateTextLine::Ptr textLine = m_buffer->plainLine(line-1);
++
++      // don't forget this check!!!! really!!!!
++      if (!textLine)
++        return;
++
+       if (config()->wordWrap() && textLine->endingWith(QString::fromLatin1(" ")))
+       {
+         // gg: in hard wordwrap mode, backspace must also eat the trailing space
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kate/part/katerenderer.cpp kdelibs_3_4_BRANCH/kate/part/katerenderer.cpp
+--- kdelibs_3_4_0_RELEASE/kate/part/katerenderer.cpp	2005-01-23 21:49:01.000000000 +0100
++++ kdelibs_3_4_BRANCH/kate/part/katerenderer.cpp	2005-03-12 18:58:40.000000000 +0100
+@@ -158,19 +158,12 @@
+     uint mrk = m_doc->mark( line );
+     if (mrk)
+     {
+-      // don't try to get colors for non-reserved mark types from the config
+-      uint reserved = (0x1 << KTextEditor::MarkInterface::reservedMarkersCount()) - 1;
+-
+       for (uint bit = 0; bit < 32; bit++)
+       {
+         KTextEditor::MarkInterface::MarkTypes markType = (KTextEditor::MarkInterface::MarkTypes)(1<<bit);
+         if (mrk & markType)
+         {
+-          QColor markColor;
+-          if ( (uint)markType <= reserved)
+-            markColor = config()->lineMarkerColor(markType);
+-          else
+-            markColor =  m_doc->markColor( markType );
++          QColor markColor = config()->lineMarkerColor(markType);
+ 
+           if (markColor.isValid()) {
+             markCount++;
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kate/part/katetextline.h kdelibs_3_4_BRANCH/kate/part/katetextline.h
+--- kdelibs_3_4_0_RELEASE/kate/part/katetextline.h	2005-02-17 22:43:38.000000000 +0100
++++ kdelibs_3_4_BRANCH/kate/part/katetextline.h	2005-03-18 18:11:57.379075282 +0100
+@@ -29,6 +29,7 @@
+ #include <qstring.h>
+ 
+ class KateRenderer;
++class QTextStream;
+ 
+ /**
+  * The KateTextLine represents a line of text. A text line that contains the
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kate/part/kateviewinternal.cpp kdelibs_3_4_BRANCH/kate/part/kateviewinternal.cpp
+--- kdelibs_3_4_0_RELEASE/kate/part/kateviewinternal.cpp	2005-02-21 11:35:36.000000000 +0100
++++ kdelibs_3_4_BRANCH/kate/part/kateviewinternal.cpp	2005-03-12 18:58:40.000000000 +0100
+@@ -67,6 +67,7 @@
+   , m_columnScrollDisplayed(false)
+   , m_selChangedByUser (false)
+   , selectAnchor (-1, -1)
++  , m_selectionMode( Default )
+   , m_preserveMaxX(false)
+   , m_currentMaxX(0)
+   , m_usePlainLines(false)
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop kdelibs_3_4_BRANCH/kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop
+--- kdelibs_3_4_0_RELEASE/kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop	2005-02-23 06:04:21.000000000 +0100
++++ kdelibs_3_4_BRANCH/kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop	2005-03-12 18:58:40.000000000 +0100
+@@ -1,8 +1,10 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=KTextEditor Autobookmarker
++Name[af]=KTextEditor OutoBoekmerker
+ Name[be]=Дапаўненьне "Аўтаматычныя закладкі" K Тэкставага рэдактара
+ Name[bn]=কে-টেক্সট-এডিটর অটো-মুকমার্কার
++Name[br]=Sinedoù emgefreek evit KTextEditor
+ Name[bs]=KTextEditor automatske zabilješke
+ Name[ca]=Punts automàtics per al KTextEditor
+ Name[de]=KTextEditor: Autom. Lesezeichenmarkierung
+@@ -38,15 +40,15 @@
+ Name[sk]=Automatické záložky pre KTextEditor
+ Name[sl]=Samodejni zaznamki za KTextEditor
+ Name[sr]=KTextEditor-ов аутомаркер
+-Name[sr@Latn]=KTextEditor-ов аутомаркер
++Name[sr@Latn]=KTextEditor-ov automarker
+ Name[sv]=Automatiska bokmärken för Ktexteditor
+ Name[ta]=கேஉரைதொகுப்பாளர் தானியக்க புத்தக உருவாக்கி
+ Name[tg]=Замимакунандаи худкори KTextEditor
+ Name[tr]=KTextEditor Otomatik Sıkkullanılanlar Ekleyici
+ Name[uk]=Втулок автоматичних закладок KTextEditor
+-Name[xx]=xxKTextEditor Autobookmarkerxx
+ Name[zh_CN]=KTextEditor 自动书签器
+ Comment=Set bookmarks on lines matching a pattern when documents are loaded
++Comment[af]=Stel 'n boekmerk op lyne wat met 'n patroon ooreenstem wanneer die dokument gelaai word.
+ Comment[bg]=Установяване на отметки на редовете, които отговарят на зададен шаблон по време на зареждане на файла
+ Comment[bn]=ডকুমেন্ট লোড করাকালীন প্রদত্ত নকশার সাথে মেলে এমন সমস্ত লাইন বুকমার্ক করে
+ Comment[bs]=Podešava zabilješke na linijama koje odgovaraju uzorku pri učitavanju dokumenta
+@@ -86,12 +88,11 @@
+ Comment[sk]=Nastavuje záložky pri načítaní dokumentu na riadky zodpovedajúce vzorke
+ Comment[sl]=Nastavi zaznamke v vrsticah, ki se ujemajo vzorcu, ko so dokumenti naloženi
+ Comment[sr]=Поставља маркере на линијама које се уклапају у узорак када се учитавају документи
+-Comment[sr@Latn]=Поставља маркере на линијама које се уклапају у узорак када се учитавају документи
++Comment[sr@Latn]=Postavlja markere na linijama koje se uklapaju u uzorak kada se učitavaju dokumenti
+ Comment[sv]=Lägg till bokmärken på rader som motsvarar ett mönster när dokument laddas
+ Comment[ta]= ஆவணங்கள் பதிவாகும் போது அமைப்பு புத்தகக்குறிப்பு கோடுகள் பொருத்தும் மாதிரி
+ Comment[tg]=Аз рӯи қолиб сабт намудани замимаҳо дар ҳуҷҷат
+ Comment[uk]=Встановлює закладки на рядках, що відповідають взірцю, при завантаженні документів
+-Comment[xx]=xxSet bookmarks on lines matching a pattern when documents are loadedxx
+ Comment[zh_CN]=文档装入时根据匹配模式自动设置书签
+ X-KDE-Library=ktexteditor_autobookmarker
+ ServiceTypes=KTextEditor/Plugin
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kate/plugins/insertfile/ktexteditor_insertfile.desktop kdelibs_3_4_BRANCH/kate/plugins/insertfile/ktexteditor_insertfile.desktop
+--- kdelibs_3_4_0_RELEASE/kate/plugins/insertfile/ktexteditor_insertfile.desktop	2005-02-23 06:04:21.000000000 +0100
++++ kdelibs_3_4_BRANCH/kate/plugins/insertfile/ktexteditor_insertfile.desktop	2005-03-12 18:58:40.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=KTextEditor Insert File Plugin
++Name[af]=KTextEditor Voeg Lêer In Inprop Module
+ Name[ar]=ملحق إدراج ملف لمحرر النصوص
+ Name[az]=KTextEditor Fayl Əlavəsi Daxil El
+ Name[be]=Дапаўненьне "Уставіць файл" K Тэкставага рэдактара
+@@ -52,7 +53,7 @@
+ Name[sl]=Vstavek KTextEditor za vstavljanje datotek
+ Name[sq]=KTextEditor Shtojca: Fute skedën
+ Name[sr]=KTextEditor прикључак за уметање фајла
+-Name[sr@Latn]=KTextEditor dodatak za umetanje fajla.
++Name[sr@Latn]=KTextEditor priključak za umetanje fajla
+ Name[ss]=I-KTextEditor yingenisa i-plugin yelifayela
+ Name[sv]=Ktexteditor-insticksprogram för att infoga filer
+ Name[ta]=கேஉரைதொகுப்பாளர் கோப்பு உள்ளீட்டுச் சொருகுப்பொருள்
+@@ -63,11 +64,11 @@
+ Name[ven]=Musengulusi wa manwalwa K i dzhenisa pulagini ya faela
+ Name[wa]=Tchôke-divins di KTextEditor po stitchî des fitchîs
+ Name[xh]=KTextEditor Faka Ifayile ye Plagi efakiweyo
+-Name[xx]=xxKTextEditor Insert File Pluginxx
+ Name[zh_CN]=KTextEditor 插入文件插件
+ Name[zh_TW]=文字編輯器插入檔案外掛程式
+ Name[zu]=Faka Ifayela Lokungena ngaphakathi le-KTextEditor
+ Comment=Insert any readable file at cursor position
++Comment[af]=Voeg enige leesbare lêer in by die merker posisie
+ Comment[bg]=Вмъкване на файл от мястото на курсора
+ Comment[bn]=কার্সার অবস্থানে যে কোনো (পাঠযোগ্য) ফাইল অন্তর্ভুক্ত করতে পারে
+ Comment[bs]=Ubacuje bilo koju čitljivu datoteku na poziciju kursora
+@@ -79,6 +80,7 @@
+ Comment[eo]=Enmetu iun legeblan dosieron je ĉi tiu posicio
+ Comment[es]=Insertar cualquier archivo legible en la posición del cursor
+ Comment[et]=Suvalise loetava faili lisamine kursori asukohta
++Comment[eu]=Kurtsorearen kokapenean fitxategi irakurgarri bat txertatzen du 
+ Comment[fi]=Lisää mikä tahansa luettava tiedosto kursorin kohdalle
+ Comment[fr]=Insérer tout fichier lisible à la position du curseur
+ Comment[fy]=Els lêsber Triem by it rinnerke ynfoegje
+@@ -105,14 +107,13 @@
+ Comment[sk]=Vloží ľubovoľný súbor na pozíciu kurzora
+ Comment[sl]=Vstavi katerokoli berljivo datoteko na položaju kazalca
+ Comment[sr]=Убаците било који читљиви фајл на положају курсора
+-Comment[sr@Latn]=Убаците било који читљиви фајл на положају курсора
++Comment[sr@Latn]=Ubacite bilo koji čitljivi fajl na položaju kursora
+ Comment[sv]=Infoga vilken läsbar fil som helst vid markörens plats
+ Comment[ta]=சுட்டும் இடத்தில் படிக்கக்கூடிய கோப்பினை உள்ளிடு
+ Comment[tg]=Гузоштани ягон файли хондашаванда дар мавқеъи курсор
+ Comment[tr]=İmleç konumunda herhangi bir dosyanın içeriğini ekle
+ Comment[uk]=Вставляє зміст будь-якого файлу, який можна прочитати, у позицію курсору
+ Comment[uz]=Ҳар қандай ўқиб бўладиган файлни курсорнинг жойидан қўйиш
+-Comment[xx]=xxInsert any readable file at cursor positionxx
+ Comment[zh_CN]=在光标位置插入任何可读文件
+ X-KDE-Library=ktexteditor_insertfile
+ ServiceTypes=KTextEditor/Plugin
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kate/plugins/isearch/ktexteditor_isearch.desktop kdelibs_3_4_BRANCH/kate/plugins/isearch/ktexteditor_isearch.desktop
+--- kdelibs_3_4_0_RELEASE/kate/plugins/isearch/ktexteditor_isearch.desktop	2005-02-23 06:04:22.000000000 +0100
++++ kdelibs_3_4_BRANCH/kate/plugins/isearch/ktexteditor_isearch.desktop	2005-03-12 18:58:40.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=KTextEditor Incremental Search Plugin
++Name[af]=KTextEditor Inkrementele Soektog Inprop Module
+ Name[ar]=ملحق بحث تزايدي لمحرر نصوص كيدي
+ Name[az]=KTextEditor Artan Axtarış Əlavəsi
+ Name[bn]=কে-টেক্সট-এডিটর ধারাবাহিক সন্ধান প্লাগ-ইন
+@@ -50,7 +51,7 @@
+ Name[sl]=Vstavek KTextEditor za postopno iskanje
+ Name[sq]=KTextEditor Shtojca: Kërkim përmes Numrimit
+ Name[sr]=KTextEditor прикључак за инкрементално претраживање
+-Name[sr@Latn]=KTextEditor dodatak za inkrementalno pretraživanje.
++Name[sr@Latn]=KTextEditor priključak za inkrementalno pretraživanje
+ Name[ss]=I-plugin yekusesha lokungetekako kwe KTextEditor 
+ Name[sv]=Ktexteditor-insticksprogram för inkrementell sökning
+ Name[ta]=கேஉரை தொகுப்பாளர் படிப்படியான தேடற் சொருகுப்பொருள்
+@@ -60,11 +61,11 @@
+ Name[uz]=KTextEditor кетма-кет қидириш плагини
+ Name[ven]=Pulagini yau toda yo engedzeaho ya musengulusi wa manwalwa a K
+ Name[xh]=KTextEditor Iplagi yangaphakathi Yokuphendla Ngokunyukayo
+-Name[xx]=xxKTextEditor Incremental Search Pluginxx
+ Name[zh_CN]=KTextEditor 增量搜索插件
+ Name[zh_TW]=KTextEditor 漸進式搜尋外掛程式
+ Name[zu]=I-Plugin Yosesho Lokwenyuka ngezigaba ze-KTextEditor
+ Comment=Also known as "As you type search"
++Comment[af]=Ook bekend as "Soos jy tik soektog"
+ Comment[bg]=Последователно търсене, известно още като търсене по време на въвеждане на низа
+ Comment[bn]="টাইপ করাকালীন সন্ধান" হিসাবেও পরিচিত
+ Comment[bs]=Takođe poznat kao "Pretraga dok kucate"
+@@ -105,13 +106,12 @@
+ Comment[sk]=Známe aj ako "Hľadanie podľa napísaného textu"
+ Comment[sl]=Znano tudi kot »Iskanje med tipkanjem«
+ Comment[sr]=Познато и као „претрага док куцате“
+-Comment[sr@Latn]=Познато и као „претрага док куцате“
++Comment[sr@Latn]=Poznato i kao „pretraga dok kucate“
+ Comment[sv]=Också känt som "Sök medan du skriver"
+ Comment[ta]="தேடு என்று தட்டச்சிட்டவுடன்"  என்றும் அழைக்கப்படும்
+ Comment[tg]=Ҷустуҷӯӣ аз рӯи маҷмӯи ишораҳо
+ Comment[tr]=Ayrıca "Yazarken ararsın" olarak da bilinir
+ Comment[uk]=Також відомий як "Пошук за вводом"
+-Comment[xx]=xxAlso known as "As you type search"xx
+ Comment[zh_CN]=也称为“即输即搜”
+ X-KDE-Library=ktexteditor_isearch
+ ServiceTypes=KTextEditor/Plugin
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kate/plugins/kdatatool/ktexteditor_kdatatool.desktop kdelibs_3_4_BRANCH/kate/plugins/kdatatool/ktexteditor_kdatatool.desktop
+--- kdelibs_3_4_0_RELEASE/kate/plugins/kdatatool/ktexteditor_kdatatool.desktop	2005-02-23 06:04:22.000000000 +0100
++++ kdelibs_3_4_BRANCH/kate/plugins/kdatatool/ktexteditor_kdatatool.desktop	2005-03-12 18:58:40.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=KTextEditor KDataTool Plugin
++Name[af]=KTextEditor KDataTool Inprop Module
+ Name[ar]=ملحق KDataTool لـ KTextEditor
+ Name[az]=KTextEditor KDataVasitəsi Əlavəsi
+ Name[bn]=কে-টেক্সট-এডিটর কে-ডেটা-টুল প্লাগ-ইন
+@@ -50,7 +51,7 @@
+ Name[sl]=Vstavek KTextEditor KDataTool
+ Name[sq]=KTextEditor Shtojca: KDataTool
+ Name[sr]=KTextEditor KDataTool прикључак
+-Name[sr@Latn]=KTextEditor KDataTool dodatak
++Name[sr@Latn]=KTextEditor KDataTool priključak
+ Name[ss]=I-plugin KDataTool ku KTextEditor
+ Name[sv]=Ktexteditor-insticksprogram med dataverktyg
+ Name[ta]=கேஉரைதொகுப்பாளர் கேதகவல் கருவி சொருகுப்பொருள்
+@@ -61,7 +62,6 @@
+ Name[ven]=Pulagini ya tshishumiswa tsha data ya K ya musengulusi wa manwalwa a K
+ Name[wa]=Tchôke-divins KDataTool po KTextEditor
+ Name[xh]=KTextEditor KDataTool Iplagi yangaphakathi
+-Name[xx]=xxKTextEditor KDataTool Pluginxx
+ Name[zh_CN]=KTextEditor KDataTool 插件
+ Name[zh_TW]=KTextEditor KDataTool 外排程式
+ Name[zu]=I-Plugin ye-KDataTool ye-KTextEditor
+@@ -128,7 +128,6 @@
+ Comment[ven]=U konisa zwishumiswa zwa data sa bugu nau sedza ha tshipelini (arali zwo dzheniswa)
+ Comment[wa]=Mete en alaedje les usteyes po manaedjî les dnêyes, come les diccionaires ou les coridjreces (si astalés)
+ Comment[xh]=Yenza izixhobo ze data ezinjenge thesaurus nomkhangeli wopelo (ukuba ifakelwe)
+-Comment[xx]=xxEnable data tools like thesaurus and spell check (if installed)xx
+ Comment[zh_CN]=启用像辞典(thesaurus)和拼写检查(spell check)这样的数据工具(如果安装了的话)
+ Comment[zh_TW]=打開資料工具如同義字典與拼字檢查 (如果有安裝的話)
+ Comment[zu]=Nika amandla amathuluzi edata  anjenge thesaurus kanye nokubheka ukubhalwa kwamagama (uma kufakiwe)
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop kdelibs_3_4_BRANCH/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
+--- kdelibs_3_4_0_RELEASE/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop	2005-02-23 06:04:22.000000000 +0100
++++ kdelibs_3_4_BRANCH/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop	2005-03-12 18:58:40.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=KTextEditor Word Completion Plugin
++Name[af]=KTextEditor Woord Voltooiïng Inprop Module
+ Name[bn]=কে-টেক্সট-এডিটর শব্দ পরিপূরণ প্লাগ-ইন
+ Name[bs]=KTextEditor dodatak za dovršavanje riječi
+ Name[ca]=Endollable de completar paraules del KTextEditor
+@@ -40,15 +41,15 @@
+ Name[sk]=Modul pre doplnenie slov pre KTextEditor
+ Name[sl]=Vstavek KTextEditor za dopolnjevanje besed
+ Name[sr]=KTextEditor прикључак за довршаванје речи
+-Name[sr@Latn]=KTextEditor прикључак за довршаванје речи
++Name[sr@Latn]=KTextEditor priključak za dovršavanje reči
+ Name[sv]=Ktexteditor-insticksprogram för att komplettera ord
+ Name[ta]=கேஉரைதொகுப்பாளர் கோப்பு உள்ளீட்டுச் சொருகுப்பொருள்
+ Name[tg]=Модули худиловакунандаи калимаҳои KTextEditor
+ Name[tr]=KTextEditor Kelime Tamamlama Eklentisi
+ Name[uk]=Втулок KTextEditor для завершення слів
+-Name[xx]=xxKTextEditor Word Completion Pluginxx
+ Name[zh_CN]=KTextEditor 单词补全插件
+ Comment=Directional or popup-based completion from words in the document
++Comment[af]=Direksionele of opspring gebaseerde woord voltooiïng van woorde in die dokument
+ Comment[bg]=Автоматично завършване на думи, базирано на използваните вече думи в документа
+ Comment[bn]=ডকুমেন্ট-এর অন্যান্য শব্দের উপর ভিত্তি করে পরিপূরণ
+ Comment[bs]=Direkcionalno ili popup-bazirano dovršavanje za riječi u dokumentu
+@@ -85,13 +86,12 @@
+ Comment[sk]=Dopĺňanie slov v dokumente priame alebo pomocou dialógu
+ Comment[sl]=Neposredno ali pojavno dopolnjevanje iz besed v dokumentu
+ Comment[sr]=Директна или искачућа допуна од речи у документу
+-Comment[sr@Latn]=Директна или искачућа допуна од речи у документу
++Comment[sr@Latn]=Direktna ili iskačuća dopuna od reči u dokumentu
+ Comment[sv]=Komplettering av ord i dokumentet baserad på ordlista eller dialogruta
+ Comment[ta]=ஆவணத்திலுள்ள வார்த்தைகளிலிருந்து திசைகள் அல்லது மேல்விரி-சார்ந்த நிறைவு 
+ Comment[tg]=Худиловакунандаи калима дар ҳуҷҷат
+ Comment[tr]=Doğrusal veya açılır-kuttu abanlı kelime tamamlama
+ Comment[uk]=Завершення слів у документі. Пряме або на основі вигулькного меню
+-Comment[xx]=xxDirectional or popup-based completion from words in the documentxx
+ Comment[zh_CN]=在文档中基于方向或弹出补全单词
+ X-KDE-Library=ktexteditor_docwordcompletion
+ ServiceTypes=KTextEditor/Plugin
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kcert/kcertpart.desktop kdelibs_3_4_BRANCH/kcert/kcertpart.desktop
+--- kdelibs_3_4_0_RELEASE/kcert/kcertpart.desktop	2005-02-23 06:04:23.000000000 +0100
++++ kdelibs_3_4_BRANCH/kcert/kcertpart.desktop	2005-03-12 18:58:41.000000000 +0100
+@@ -55,7 +55,7 @@
+ Comment[sl]=Vgradljivi osebni upravljalnik certifikatov
+ Comment[sq]=Menagjer për diplomë personale
+ Comment[sr]=Уградиви менаџер личних сертификата
+-Comment[sr@Latn]=Ugradivi menadžer ličnih sertifikata.
++Comment[sr@Latn]=Ugradivi menadžer ličnih sertifikata
+ Comment[ss]=Siphatsi sesithifikethi samuntfu sicu lesinamatselekako
+ Comment[sv]=Inbäddningsbar personlig certifikatshanterare
+ Comment[ta]=உட்பொதிந்த சொந்தச் சான்றிதழ் மேலாளர்
+@@ -67,7 +67,6 @@
+ Comment[ven]=Mulanguli wa sethifikheithi ya vhune
+ Comment[vi]=Embeđable Personal Certificate Manager
+ Comment[xh]=Umphathi Wesiqinisekiso Sobuntu bakho Obulungiselelweyo
+-Comment[xx]=xxEmbeddable Personal Certificate Managerxx
+ Comment[zh_CN]=可嵌入的个人证书管理器
+ Comment[zh_TW]=可嵌入的個人認證管理工具
+ Comment[zu]=Imeneja Yesitifiketi Sobunini Oshuthekiwe
+@@ -82,7 +81,6 @@
+ Name[sv]=Kcertpart
+ Name[ta]=கேசான்றிதழ்பகுதி
+ Name[ven]=Tshipida tsha cert ya K
+-Name[xx]=xxKCertPartxx
+ ServiceTypes=KParts/ReadWritePart
+ X-KDE-Library=libkcertpart
+ InitialPreference=15
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kconf_update/kconf_update.cpp kdelibs_3_4_BRANCH/kconf_update/kconf_update.cpp
+--- kdelibs_3_4_0_RELEASE/kconf_update/kconf_update.cpp	2005-01-21 13:21:54.000000000 +0100
++++ kdelibs_3_4_BRANCH/kconf_update/kconf_update.cpp	2005-03-12 18:58:41.000000000 +0100
+@@ -3,7 +3,7 @@
+  *  This file is part of the KDE libraries
+  *  Copyright (c) 2001 Waldo Bastian <bastian@kde.org>
+  *
+- * $Id: kconf_update.cpp,v 1.34 2005/01/21 12:21:54 waba Exp $
++ * $Id: kconf_update.cpp,v 1.34.2.1 2005/03/09 17:40:04 waba Exp $
+  *
+  *  This library is free software; you can redistribute it and/or
+  *  modify it under the terms of the GNU Library General Public
+@@ -188,7 +188,7 @@
+ {
+    if (!m_textStream)
+    {
+-      QString file = locateLocal("data", "kconf_update/update.log");
++      QString file = locateLocal("data", "kconf_update/log/update.log");
+       m_file = new QFile(file);
+       if (m_file->open(IO_WriteOnly | IO_Append))
+       {
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdecore/all_languages.desktop kdelibs_3_4_BRANCH/kdecore/all_languages.desktop
+--- kdelibs_3_4_0_RELEASE/kdecore/all_languages.desktop	2005-02-23 06:04:23.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdecore/all_languages.desktop	2005-03-12 18:58:42.000000000 +0100
+@@ -31,7 +31,6 @@
+ Name[tg]=Афарӣ
+ Name[uk]=Афар
+ Name[uz]=Афар
+-Name[xx]=xxAfarxx
+ Name[zh_CN]=阿法尔语
+ Name[zh_TW]=阿發爾
+ Name[zu]=Okude kakhulu
+@@ -89,7 +88,6 @@
+ Name[uk]=Абхазька
+ Name[uz]=Абхазча
+ Name[wa]=Abxhaze
+-Name[xx]=xxAbkhazianxx
+ Name[zh_CN]=阿布哈西亚语
+ Name[zh_TW]=阿布哈西亞語
+ Name[zu]=I-Abkhazian
+@@ -137,7 +135,6 @@
+ Name[tg]=Авастоӣ
+ Name[uk]=Авестан
+ Name[uz]=Авеста
+-Name[xx]=xxAvestanxx
+ Name[zh_CN]=阿维斯陀语
+ Name[zh_TW]=阿維斯陀語
+ Name[zu]=Isi-Avestan
+@@ -192,7 +189,6 @@
+ Name[uz]=Африканча
+ Name[ven]=Tshivhuru
+ Name[xh]=Isibhulu
+-Name[xx]=xxAfrikaansxx
+ Name[zh_CN]=南非荷兰语
+ Name[zh_TW]=南非荷蘭語
+ Name[zu]=Isi-Bhunu
+@@ -202,6 +198,7 @@
+ Name[az]=Amharikcə
+ Name[bg]=Амхарски
+ Name[bn]=আমহারিক
++Name[br]=Amhareg
+ Name[bs]=Amharski
+ Name[ca]=Amaric
+ Name[cs]=Amharský
+@@ -250,13 +247,12 @@
+ Name[tg]=Амхарикӣ
+ Name[uk]=Амхарська
+ Name[uz]=Амхарик
+-Name[xx]=xxAmharicxx
+ Name[zh_CN]=阿姆哈拉语
+ Name[zh_TW]=衣索比亞官方語
+ Name[zu]=isi-Amharic
+ [ar]
+ Name=Arabic
+-Name[af]=Arabiese
++Name[af]=Arabies
+ Name[ar]=العربية
+ Name[az]=Ərabcə
+ Name[be]=Арабская
+@@ -326,7 +322,6 @@
+ Name[ven]=Tshiarabiki
+ Name[vi]=Arabic (A? Rập) 
+ Name[wa]=Arabe
+-Name[xx]=xxArabicxx
+ Name[zh_CN]=阿拉伯语
+ Name[zh_TW]=阿拉伯語
+ Name[zu]=Isi-Arabhu
+@@ -378,7 +373,6 @@
+ Name[tg]=Ассамӣ
+ Name[uk]=Асамійська
+ Name[uz]=Ассамесе
+-Name[xx]=xxAssamesexx
+ Name[zh_CN]=阿萨姆语
+ Name[zh_TW]=阿薩姆語
+ Name[zu]=Isi-Assamese
+@@ -418,7 +412,6 @@
+ Name[tg]=Аймарагӣ
+ Name[uk]=Аймарська
+ Name[uz]=Аймара
+-Name[xx]=xxAymaraxx
+ Name[zh_CN]=艾马拉语
+ Name[zh_TW]=愛瑪拉語
+ Name[zu]=Isi-Aymara
+@@ -490,7 +483,6 @@
+ Name[uz]=Озарбайжонча
+ Name[vi]=Agiecbaigiăng 
+ Name[wa]=Azeri
+-Name[xx]=xxAzerbaijanixx
+ Name[zh_CN]=阿塞拜疆语
+ Name[zh_TW]=亞塞拜然語
+ Name[zu]=Isi-Azerbaijani
+@@ -539,7 +531,6 @@
+ Name[tg]=Бошқирдӣ
+ Name[uk]=Башкирська
+ Name[uz]=Бошқирча
+-Name[xx]=xxBashkirxx
+ Name[zh_CN]=巴什基尔语
+ Name[zh_TW]=Bashkir語
+ Name[zu]=Isi-Bashkir
+@@ -611,7 +602,6 @@
+ Name[uz]=Белорусча
+ Name[vi]=SBelarusian 
+ Name[wa]=Bielorûsse
+-Name[xx]=xxBelarusianxx
+ Name[zh_CN]=白俄罗斯语
+ Name[zh_TW]=白俄羅斯語
+ Name[zu]=Isi-Belarusian
+@@ -686,7 +676,6 @@
+ Name[uz]=Болгарча
+ Name[vi]=Tiếng  Bungari 
+ Name[wa]=Bulgåre
+-Name[xx]=xxBulgarianxx
+ Name[zh_CN]=保加利亚语
+ Name[zh_TW]=保加利亞語
+ Name[zu]=Isi-Bulgarian
+@@ -722,7 +711,6 @@
+ Name[tg]=Бихарӣ
+ Name[uk]=Біхарі
+ Name[uz]=Бихари
+-Name[xx]=xxBiharixx
+ Name[zh_CN]=比哈里语
+ Name[zh_TW]=比哈爾語
+ Name[zu]=Isi-Bihari
+@@ -757,7 +745,6 @@
+ Name[tg]=Бислама
+ Name[uk]=Біслама
+ Name[uz]=Бислама
+-Name[xx]=xxBislamaxx
+ Name[zh_CN]=比斯拉马语
+ Name[zh_TW]=Bislama語
+ Name[zu]=Isi-Bislama
+@@ -807,7 +794,6 @@
+ Name[tr]=Bengal
+ Name[uk]=Бенгальська
+ Name[uz]=Бенгалча
+-Name[xx]=xxBengalixx
+ Name[zh_CN]=孟加拉语
+ Name[zh_TW]=孟加拉語
+ Name[zu]=Isi-Bengali
+@@ -873,7 +859,6 @@
+ Name[uk]=Тибетська
+ Name[uz]=Тибетча
+ Name[wa]=Tibetyin
+-Name[xx]=xxTibetanxx
+ Name[zh_CN]=藏语
+ Name[zh_TW]=藏語
+ Name[zu]=Isi-Tibetan
+@@ -941,13 +926,12 @@
+ Name[uk]=Бретонська
+ Name[uz]=Бретонча
+ Name[wa]=Burton
+-Name[xx]=xxBretonxx
+ Name[zh_CN]=布里多尼语
+ Name[zh_TW]=不列塔尼語
+ Name[zu]=Isi-Breton
+ [bs]
+ Name=Bosnian
+-Name[af]=Bosnise
++Name[af]=Bosnies
+ Name[ar]=البوسنية
+ Name[az]=Bosnakca
+ Name[be]=Басьнійская
+@@ -1014,7 +998,6 @@
+ Name[uz]=Боснияча
+ Name[ven]=Mubosinia
+ Name[wa]=Bosnyin
+-Name[xx]=xxBosnianxx
+ Name[zh_CN]=波斯尼亚语
+ Name[zh_TW]=波士尼亞語
+ Name[zu]=Isi-Bosnian
+@@ -1084,7 +1067,6 @@
+ Name[uk]=Каталонська
+ Name[uz]=Каталанча
+ Name[vi]=Tiếng Catalăng 
+-Name[xx]=xxCatalanxx
+ Name[zh_CN]=加泰罗尼亚语
+ Name[zh_TW]=嘉泰羅尼亞語
+ Name[zu]=Isi-Catalan
+@@ -1147,7 +1129,6 @@
+ Name[uk]=Чеченська
+ Name[uz]=Чеченча
+ Name[wa]=Tchetchene
+-Name[xx]=xxChechenxx
+ Name[zh_CN]=车臣语
+ Name[zh_TW]=Chechen語
+ Name[zu]=Isi-Chechen
+@@ -1183,7 +1164,6 @@
+ Name[tg]=Чаморроӣ
+ Name[uk]=Чаморо
+ Name[uz]=Чаморро
+-Name[xx]=xxChamorroxx
+ Name[zh_CN]=查莫罗语
+ Name[zh_TW]=查摩洛語
+ Name[zu]=Isi-Chamorro
+@@ -1246,7 +1226,6 @@
+ Name[uk]=Корсиканська
+ Name[uz]=Корсиканча
+ Name[wa]=Corse
+-Name[xx]=xxCorsicanxx
+ Name[zh_CN]=科西嘉语
+ Name[zh_TW]=科西嘉語
+ Name[zu]=Isi-Corsican
+@@ -1319,7 +1298,6 @@
+ Name[uz]=Чехча
+ Name[vi]=Tiếng Séc 
+ Name[wa]=Tcheke
+-Name[xx]=xxCzechxx
+ Name[zh_CN]=捷克语
+ Name[zh_TW]=捷克語
+ Name[zu]=Isi-Czech
+@@ -1382,7 +1360,6 @@
+ Name[uz]=Черков-словянча
+ Name[ven]=Slavic Zwakereke
+ Name[wa]=Eslave d' eglijhe
+-Name[xx]=xxChurch Slavicxx
+ Name[zh_CN]=宗教斯拉夫语(古代俄语)
+ Name[zh_TW]=教堂斯拉夫語
+ Name[zu]=Isi-Church Slavic
+@@ -1393,6 +1370,7 @@
+ Name[be]=Чувашская
+ Name[bg]=Чувашки
+ Name[bn]=চুভাশ
++Name[br]=Tchuvasheg
+ Name[bs]=Čuvaš
+ Name[cs]=Čuvašský
+ Name[cy]=Chuvasheg
+@@ -1432,7 +1410,6 @@
+ Name[uk]=Чуваська
+ Name[uz]=Чувашча
+ Name[wa]=Tchouvache
+-Name[xx]=xxChuvashxx
+ Name[zh_CN]=楚瓦什语
+ Name[zh_TW]=楚瓦士語
+ Name[zu]=Isi-Chuvash
+@@ -1500,7 +1477,6 @@
+ Name[uk]=Уельська
+ Name[uz]=Уэлсча
+ Name[wa]=Walès
+-Name[xx]=xxWelshxx
+ Name[zh_CN]=威尔士
+ Name[zh_TW]=威爾斯語
+ Name[zu]=Isi-Welsh
+@@ -1574,7 +1550,6 @@
+ Name[uz]=Данияча
+ Name[vi]=Tiếng Đan Mạch 
+ Name[wa]=Daenwès
+-Name[xx]=xxDanishxx
+ Name[zh_CN]=丹麦语
+ Name[zh_TW]=丹麥語
+ Name[zu]=Isi-Danishi
+@@ -1651,7 +1626,6 @@
+ Name[vi]=Tiếng Đức 
+ Name[wa]=Almand
+ Name[xh]=Isijamani
+-Name[xx]=xxGermanxx
+ Name[zh_CN]=德语
+ Name[zh_TW]=德語
+ Name[zu]=Isi-Jalimani
+@@ -1684,7 +1658,6 @@
+ Name[uk]=Дзонгка
+ Name[uz]=Дзонгха
+ Name[wa]=Boutanès
+-Name[xx]=xxDzongkhaxx
+ Name[zh_CN]=不丹宗卡语
+ Name[zh_TW]=Dzongkha語
+ Name[zu]=Isi-Dzongkha
+@@ -1760,7 +1733,6 @@
+ Name[vi]=Tiếng Hy Lạp 
+ Name[wa]=Grek
+ Name[xh]=isigrike
+-Name[xx]=xxGreekxx
+ Name[zh_CN]=希腊语
+ Name[zh_TW]=希臘語
+ Name[zu]=Isi-Grike
+@@ -1837,7 +1809,6 @@
+ Name[vi]=English(Anh) 
+ Name[wa]=Inglès
+ Name[xh]=Isingesi
+-Name[xx]=xxEnglishxx
+ Name[zh_CN]=英语
+ Name[zh_TW]=英語
+ Name[zu]=Isi-Ngisi
+@@ -1857,6 +1828,7 @@
+ Name[fr]=Anglais britannique
+ Name[fy]=Britsk Ingelsk
+ Name[ga]=Béarla na Sasanach
++Name[hi]=ब्रितानी अंग्रेज़ी
+ Name[hsb]=Jendźelsce (WB)
+ Name[hu]=Angol (brit)
+ Name[is]=Bresk enska
+@@ -1875,11 +1847,10 @@
+ Name[sk]=Britský anglický
+ Name[sl]=britansko angleško
+ Name[sr]=Британски енглески
+-Name[sr@Latn]=Британски енглески
++Name[sr@Latn]=Britanski engleski
+ Name[sv]=Brittisk engelska
+ Name[tr]=İngiliz İngilizcesi
+ Name[uk]=Англійська (Великобританія)
+-Name[xx]=xxBritish Englishxx
+ Name[zh_CN]=英国英语
+ [en_US]
+ Name=American English
+@@ -1892,9 +1863,11 @@
+ Name[de]=Amerikanisches Englisch
+ Name[es]=Inglés americano
+ Name[et]=Ameerika inglise
++Name[eu]=Ingeles amerikarra
+ Name[fr]=Anglais américain
+ Name[fy]=Amerikaansk Ingelsk
+ Name[ga]=Béarla Mheiriceá
++Name[hi]=अमेरिकी अंग्रेज़ी
+ Name[hsb]=Jendźelsce (USA)
+ Name[hu]=Angol (amerikai)
+ Name[is]=Bandarísk enska
+@@ -1913,10 +1886,9 @@
+ Name[sk]=Americký anglický
+ Name[sl]=ameriško angleško
+ Name[sr]=Амерички енглески
+-Name[sr@Latn]=Амерички енглески
++Name[sr@Latn]=Američki engleski
+ Name[sv]=Amerikansk engelska
+ Name[uk]=Англійська (США)
+-Name[xx]=xxAmerican Englishxx
+ Name[zh_CN]=美国英语
+ [eo]
+ Name=Esperanto
+@@ -1949,13 +1921,12 @@
+ Name[uk]=Есперанто
+ Name[uz]=Эсперанто
+ Name[vi]=Tiếng Etpêrantô 
+-Name[xx]=xxEsperantoxx
+ Name[zh_CN]=世界语
+ Name[zh_TW]=世界語
+ Name[zu]=Isi-Esperanto
+ [es]
+ Name=Spanish
+-Name[af]=Spaanse
++Name[af]=Spaans
+ Name[ar]=الأسبانية
+ Name[az]=İspanca
+ Name[be]=Гішпанская
+@@ -2025,7 +1996,6 @@
+ Name[vi]=Tiếng Tây Ban Nha 
+ Name[wa]=Castiyan
+ Name[xh]=Isipanishi
+-Name[xx]=xxSpanishxx
+ Name[zh_CN]=西班牙语
+ Name[zh_TW]=西班牙語
+ Name[zu]=Isi-Penishi
+@@ -2099,7 +2069,6 @@
+ Name[uz]=Эстонча
+ Name[vi]=Tiếng Estonian 
+ Name[wa]=Estonyin
+-Name[xx]=xxEstonianxx
+ Name[zh_CN]=爱沙尼亚语
+ Name[zh_TW]=愛沙尼亞語
+ Name[zu]=Isi-Estonian
+@@ -2169,16 +2138,17 @@
+ Name[uz]=Баскча
+ Name[vi]=Tiếng Baxcơ 
+ Name[wa]=Basse
+-Name[xx]=xxBasquexx
+ Name[zh_CN]=巴斯克语
+ Name[zh_TW]=巴斯克語
+ Name[zu]=Isi-Basque
+ [fa]
+ Name=Farsi (Persian)
++Name[af]=Farsi (Persies)
+ Name[ar]=فارسي
+ Name[be]=Пэрсыдзкая
+ Name[bg]=Фарси
+ Name[bn]=ফার্সি (পার্সিয়ান)
++Name[br]=Farsieg (Persieg)
+ Name[bs]=Farsi (Perzijski)
+ Name[ca]=Farsi (Persa)
+ Name[cs]=Farsi (Perský)
+@@ -2230,7 +2200,6 @@
+ Name[uk]=Фризійська (Перська)
+ Name[uz]=Форсча (Персча)
+ Name[wa]=Farsi
+-Name[xx]=xxFarsi (Persian)xx
+ Name[zh_CN]=波斯语
+ [fi]
+ Name=Finnish
+@@ -2302,7 +2271,6 @@
+ Name[uz]=Финча
+ Name[vi]=Tiếng Phần Lan 
+ Name[wa]=Finwès
+-Name[xx]=xxFinnishxx
+ Name[zh_CN]=芬兰语
+ Name[zh_TW]=芬蘭語
+ Name[zu]=Isi-Finishi
+@@ -2364,7 +2332,6 @@
+ Name[uk]=Фіджійська
+ Name[uz]=Фижича
+ Name[wa]=Fidjyin
+-Name[xx]=xxFijianxx
+ Name[zh_CN]=斐济语
+ Name[zh_TW]=斐濟語
+ Name[zu]=Isi-Fijiyani
+@@ -2375,6 +2342,7 @@
+ Name[be]=Фарэрская
+ Name[bg]=Фарьорски
+ Name[bn]=ফারোইস
++Name[br]=Faroeseg
+ Name[bs]=Farski
+ Name[ca]=Feroès
+ Name[cs]=Faerský
+@@ -2422,7 +2390,6 @@
+ Name[uk]=Фарерська
+ Name[uz]=Фарерча
+ Name[wa]=Faeroyès
+-Name[xx]=xxFaroesexx
+ Name[zh_CN]=法罗群岛语
+ Name[zh_TW]=法羅語
+ Name[zu]=Isi-Faroese
+@@ -2499,7 +2466,6 @@
+ Name[vi]=Pháp
+ Name[wa]=Francès
+ Name[xh]=Isifrentshi
+-Name[xx]=xxFrenchxx
+ Name[zh_CN]=法语
+ Name[zh_TW]=法語
+ Name[zu]=Isi-Frentshi
+@@ -2563,7 +2529,6 @@
+ Name[uk]=Фризійська
+ Name[uz]=Фризча
+ Name[wa]=Frizon
+-Name[xx]=xxFrisianxx
+ Name[zh_CN]=弗里斯兰语
+ Name[zh_TW]=弗利然語
+ Name[zu]=Isi-Frisiyani
+@@ -2582,6 +2547,7 @@
+ Name[fr]=Gaélique irlandais
+ Name[fy]=Iersk Gaelic
+ Name[ga]=Gaeilge
++Name[hi]=आइरिश गैलिक
+ Name[hsb]=Gaelisce (Irska)
+ Name[hu]=Gall (ír)
+ Name[is]=Írsk gelíska
+@@ -2599,11 +2565,10 @@
+ Name[sk]=Írsky galský
+ Name[sl]=irsko galsko
+ Name[sr]=Ирски галски
+-Name[sr@Latn]=Ирски галски
++Name[sr@Latn]=Irski galski
+ Name[sv]=Irländsk galiciska
+ Name[tr]=İrlanda Galik
+ Name[uk]=Гальська (Ірландія)
+-Name[xx]=xxIrish Gaelicxx
+ Name[zh_CN]=爱尔兰盖尔语
+ [gd]
+ Name=Gaelic
+@@ -2663,7 +2628,6 @@
+ Name[uk]=Гальська
+ Name[uz]=Галикча
+ Name[wa]=Gayel
+-Name[xx]=xxGaelicxx
+ Name[zh_CN]=盖尔语
+ Name[zh_TW]=蓋爾語
+ Name[zu]=Isi-Gayelikhi
+@@ -2684,6 +2648,7 @@
+ Name[fy]=Galiciaansk
+ Name[ga]=Gailísis
+ Name[gl]=Galego
++Name[hi]=गैलिक
+ Name[hsb]=Galicisce
+ Name[hu]=Galíciai
+ Name[is]=Gelíska
+@@ -2704,14 +2669,13 @@
+ Name[sk]=Galský
+ Name[sl]=galicijsko
+ Name[sr]=Галицијски
+-Name[sr@Latn]=Галицијски
++Name[sr@Latn]=Galicijski
+ Name[sv]=Galiciska
+ Name[tr]=Galce
+ Name[uk]=Галісійська
+ Name[ven]=Mugalata
+ Name[vi]=Tiếng Galician 
+ Name[xh]=isiGalacian
+-Name[xx]=xxGalicianxx
+ Name[zh_CN]=加利西亚语
+ Name[zu]=Isi-Galashiyani
+ [gn]
+@@ -2752,7 +2716,6 @@
+ Name[uk]=Гуарані
+ Name[uz]=Гуарани
+ Name[wa]=Gwarani
+-Name[xx]=xxGuaranixx
+ Name[zh_CN]=瓜拉尼语
+ Name[zh_TW]=瓜拉尼語
+ Name[zu]=Isi-Guarani
+@@ -2762,6 +2725,7 @@
+ Name[az]=Qujaraticə
+ Name[bg]=Гуджарати
+ Name[bn]=গুজরাতী
++Name[br]=Gujaratieg
+ Name[eo]= Guĝarata
+ Name[eu]=Gujeratiera
+ Name[fa]=گوراجاتی
+@@ -2792,7 +2756,6 @@
+ Name[uk]=Гуяраті
+ Name[uz]=Гужарати
+ Name[wa]=Goudjarati
+-Name[xx]=xxGujaratixx
+ Name[zh_CN]=古吉拉特语
+ Name[zh_TW]=古吉拉特語
+ Name[zu]=Isi-Gujarati
+@@ -2834,7 +2797,6 @@
+ Name[uk]=Манкс
+ Name[uz]=Манкс
+ Name[wa]=Gayel del Iye di Man
+-Name[xx]=xxManxxx
+ Name[zh_CN]=马恩岛语
+ Name[zh_TW]=曼島語
+ Name[zu]=Isi-Manx
+@@ -2843,6 +2805,7 @@
+ Name[ar]=الهاوسا
+ Name[bg]=Хауса
+ Name[bn]=হাউসা
++Name[br]=Haousa
+ Name[de]=Haussa-Sprache
+ Name[eo]=Haŭsa
+ Name[fa]=هاوسایی
+@@ -2866,13 +2829,12 @@
+ Name[tg]=Хаусагӣ
+ Name[uk]=Гауса
+ Name[uz]=Хауса
+-Name[xx]=xxHausaxx
+ Name[zh_CN]=豪撒语
+ Name[zh_TW]=豪薩語
+ Name[zu]=Isi-Hausa
+ [he]
+ Name=Hebrew
+-Name[af]=Hibreüse
++Name[af]=Hibreüs
+ Name[ar]=العبرية
+ Name[az]=Yəhudicə
+ Name[be]=Іўрыт
+@@ -2941,7 +2903,6 @@
+ Name[vi]=Tiếng Do Thái 
+ Name[wa]=Ebreu
+ Name[xh]=Isihebhere
+-Name[xx]=xxHebrewxx
+ Name[zh_CN]=希伯来语
+ Name[zh_TW]=希伯來語
+ Name[zu]=Isi-Hebheru
+@@ -2982,7 +2943,6 @@
+ Name[tg]=Ҳиндӣ
+ Name[uk]=Хінді
+ Name[uz]=Ҳиндча
+-Name[xx]=xxHindixx
+ Name[zh_CN]=北印度语
+ Name[zh_TW]=北印度語
+ Name[zu]=Isi-Hindi
+@@ -3019,7 +2979,6 @@
+ Name[tg]=Хири Моту
+ Name[uk]=Хірі Моту
+ Name[uz]=Хири Моту
+-Name[xx]=xxHiri Motuxx
+ Name[zh_CN]=新里木托语
+ Name[zh_TW]=Hiri Motu語
+ Name[zu]=Isi-Hiri Motu
+@@ -3094,7 +3053,6 @@
+ Name[uz]=Хорватча
+ Name[vi]=Tiếng Crô-át 
+ Name[wa]=Crowåte
+-Name[xx]=xxCroatianxx
+ Name[zh_CN]=克罗地亚语
+ Name[zh_TW]=克羅埃西亞語
+ Name[zu]=Isi-Croatian
+@@ -3102,6 +3060,7 @@
+ Name=Upper Sorbian
+ Name[bg]=Горносорбийски
+ Name[bn]=উচ্চ সার্বীয়
++Name[br]=Sorab uhel
+ Name[ca]=Alt sòrab
+ Name[cs]=Hornolužicko srbský
+ Name[cy]=Sorbieg Uchaf
+@@ -3133,17 +3092,16 @@
+ Name[sk]=Lužickosrbský
+ Name[sl]=zgornjesorbijsko
+ Name[sr]=Горње лужичко српски
+-Name[sr@Latn]=Горње лужичко српски
++Name[sr@Latn]=Gornje lužičko srpski
+ Name[sv]=Högsorbiska
+ Name[ta]=அப்பர் செர்பியன்
+ Name[tg]=Лужасагии болоӣ
+ Name[tr]=Yukarı Sırpça
+ Name[uk]=Верхньо-лужицька
+-Name[xx]=xxUpper Sorbianxx
+ Name[zh_CN]=索布语
+ [hu]
+ Name=Hungarian
+-Name[af]=Hongaarse
++Name[af]=Hongaars
+ Name[ar]=الهنغارية (المجرية)
+ Name[az]=Macarca
+ Name[be]=Вугорская
+@@ -3212,13 +3170,12 @@
+ Name[uz]=Венгрча
+ Name[vi]=Tiếng Hung-ga-ri 
+ Name[wa]=Hongrwès
+-Name[xx]=xxHungarianxx
+ Name[zh_CN]=匈牙利语
+ Name[zh_TW]=匈牙利語
+ Name[zu]=Isi-Hangariyani
+ [hy]
+ Name=Armenian
+-Name[af]=Armeense
++Name[af]=Armeens
+ Name[ar]=أرمني
+ Name[az]=Ermənicə
+ Name[be]=Армянская
+@@ -3282,7 +3239,6 @@
+ Name[uk]=Вірменська
+ Name[uz]=Арманча
+ Name[wa]=Årmenyin
+-Name[xx]=xxArmenianxx
+ Name[zh_CN]=亚美尼亚语
+ Name[zh_TW]=亞美尼亞語
+ Name[zu]=Isi-Armenian
+@@ -3316,7 +3272,6 @@
+ Name[tg]=Херэро
+ Name[uk]=Гереро
+ Name[uz]=Хереро
+-Name[xx]=xxHereroxx
+ Name[zh_CN]=赫雷罗语
+ Name[zh_TW]=Herero語
+ Name[zu]=Isi-Herero
+@@ -3348,7 +3303,6 @@
+ Name[uz]=Интерлингуа
+ Name[ven]=Luambo lwa hothe
+ Name[wa]=Interlingua (noû latén)
+-Name[xx]=xxInterlinguaxx
+ Name[zh_CN]=拉丁国际语(国际辅助语)
+ Name[zh_TW]=科技共通語
+ Name[zu]=Ulimi olufanayo
+@@ -3420,7 +3374,6 @@
+ Name[uk]=Індонезійська
+ Name[uz]=Индонезча
+ Name[wa]=Indonezyin
+-Name[xx]=xxIndonesianxx
+ Name[zh_CN]=印度尼西亚语
+ Name[zh_TW]=印尼語
+ Name[zu]=Indoneshiya
+@@ -3453,7 +3406,6 @@
+ Name[uk]=Інтерлінгва
+ Name[uz]=Интерлингуе
+ Name[ven]=Luambo lwa hothe
+-Name[xx]=xxInterlinguexx
+ Name[zh_CN]=语际语
+ Name[zh_TW]=Interlingue語
+ Name[zu]=Izilimi ezifanayo
+@@ -3493,7 +3445,6 @@
+ Name[uk]=Інупіак
+ Name[uz]=Инупиак
+ Name[wa]=Inyupiak
+-Name[xx]=xxInupiaqxx
+ Name[zh_CN]=因纽佩特语
+ Name[zh_TW]=Inupiaq語
+ Name[zu]=Isi-Inupiaq
+@@ -3523,13 +3474,12 @@
+ Name[tg]=Идо
+ Name[uk]=Ідо
+ Name[uz]=Идо
+-Name[xx]=xxIdoxx
+ Name[zh_CN]=伊多语
+ Name[zh_TW]=伊多語
+ Name[zu]=Isi-Ido
+ [is]
+ Name=Icelandic
+-Name[af]=Yslandiese
++Name[af]=Yslandies
+ Name[ar]=الآيسلندية
+ Name[az]=İslandiyaca
+ Name[be]=Ісьляндзкая
+@@ -3597,13 +3547,12 @@
+ Name[uz]=Исландча
+ Name[vi]=Tiếng Ai-xơ-len
+ Name[wa]=Izlandès
+-Name[xx]=xxIcelandicxx
+ Name[zh_CN]=冰岛语
+ Name[zh_TW]=冰島語
+ Name[zu]=isi-Icelandic
+ [it]
+ Name=Italian
+-Name[af]=Italiaanse
++Name[af]=Italiaans
+ Name[ar]=الإيطالية
+ Name[az]=İtalyanca
+ Name[be]=Італьянская
+@@ -3672,7 +3621,6 @@
+ Name[vi]=Tiếng Italia 
+ Name[wa]=Itålyin
+ Name[xh]=isitaliyane
+-Name[xx]=xxItalianxx
+ Name[zh_CN]=意大利语
+ Name[zh_TW]=義大利語
+ Name[zu]=Isi-Ntaliyane
+@@ -3705,12 +3653,12 @@
+ Name[tg]=Инуктитут
+ Name[uk]=Інуктітут
+ Name[uz]=Инуктитут
+-Name[xx]=xxInuktitutxx
+ Name[zh_CN]=因纽特语
+ Name[zh_TW]=Inuktitut語
+ Name[zu]=Isi-Inuktitut
+ [ja]
+ Name=Japanese
++Name[af]=Japanees
+ Name[ar]=اليابانية
+ Name[az]=Yaponca
+ Name[be]=Японская
+@@ -3781,17 +3729,18 @@
+ Name[vi]=Tiếng Nhật 
+ Name[wa]=Djaponès
+ Name[xh]=Isijapani
+-Name[xx]=xxJapanesexx
+ Name[zh_CN]=日语
+ Name[zh_TW]=日語
+ Name[zu]=Isi-Jaliphani
+ [jv]
+ Name=Javanese
++Name[af]=Javanees
+ Name[ar]=جاويه
+ Name[az]=Yavonca
+ Name[be]=Японская
+ Name[bg]=Явайски
+ Name[bn]=জাভানিস
++Name[br]=Javaneg
+ Name[bs]=Javanski
+ Name[ca]=Javanès
+ Name[cs]=Jávský
+@@ -3843,7 +3792,6 @@
+ Name[uk]=Яванська
+ Name[uz]=Яаванез
+ Name[wa]=Djavanès
+-Name[xx]=xxJavanesexx
+ Name[zh_CN]=爪哇语
+ Name[zh_TW]=爪哇語
+ Name[zu]=Isi-Javanisi
+@@ -3911,7 +3859,6 @@
+ Name[uk]=Грузинська
+ Name[uz]=Грузинча
+ Name[wa]=Djeyordjyin
+-Name[xx]=xxGeorgianxx
+ Name[zh_CN]=乔治亚语
+ Name[zh_TW]=喬治亞語
+ Name[zu]=Isi-Jojiyani
+@@ -3947,7 +3894,6 @@
+ Name[tg]=Кикуягӣ
+ Name[uk]=Кікую
+ Name[uz]=Кикуйу
+-Name[xx]=xxKikuyuxx
+ Name[zh_CN]=基库尤语
+ Name[zh_TW]=吉庫猶語
+ Name[zu]=Isi-Kikuyu
+@@ -4000,7 +3946,6 @@
+ Name[uk]=Казахська
+ Name[uz]=Қозоқча
+ Name[wa]=Kazaxh
+-Name[xx]=xxKazakhxx
+ Name[zh_CN]=哈萨克语
+ Name[zh_TW]=哈薩克語
+ Name[zu]=Isi-Kazakhi
+@@ -4036,7 +3981,6 @@
+ Name[tg]=Калаалисутӣ
+ Name[uk]=Калаалісут
+ Name[uz]=Калааллисут
+-Name[xx]=xxKalaallisutxx
+ Name[zh_CN]=格陵兰语
+ Name[zh_TW]=Kalaallisut語
+ Name[zu]=Isi-Kalaallisut
+@@ -4080,12 +4024,12 @@
+ Name[uk]=Кхмерська
+ Name[uz]=Кхмерча
+ Name[wa]=Xhmer
+-Name[xx]=xxKhmerxx
+ Name[zh_CN]=高棉语
+ Name[zh_TW]=高棉語
+ Name[zu]=Isi-Khmer
+ [kn]
+ Name=Kannada
++Name[af]=Kanadees
+ Name[ar]=الكانادا
+ Name[az]=Kannadaca
+ Name[be]=Каннада
+@@ -4115,7 +4059,6 @@
+ Name[tg]=Каннадӣ
+ Name[uk]=Каннада
+ Name[uz]=Каннада
+-Name[xx]=xxKannadaxx
+ Name[zh_CN]=坎纳德语
+ Name[zh_TW]=坎那達語
+ Name[zu]=Isi-Khanada
+@@ -4189,7 +4132,6 @@
+ Name[vi]=Tiếng Hàn Quốc 
+ Name[wa]=Coreyin
+ Name[xh]=Isikorea
+-Name[xx]=xxKoreanxx
+ Name[zh_CN]=朝鲜语
+ Name[zh_TW]=韓國語
+ Name[zu]=Isi-Korean
+@@ -4239,7 +4181,6 @@
+ Name[uk]=Кашмірська
+ Name[uz]=Кашмирча
+ Name[wa]=Cachmiri
+-Name[xx]=xxKashmirixx
+ Name[zh_CN]=克什米尔语
+ Name[zh_TW]=喀什米爾語
+ Name[zu]=Isi-Kashimiri
+@@ -4309,7 +4250,6 @@
+ Name[uk]=Курдська
+ Name[uz]=Курдча
+ Name[wa]=Kurdi
+-Name[xx]=xxKurdishxx
+ Name[zh_CN]=库尔德语
+ Name[zh_TW]=庫德語
+ Name[zu]=isi-Kurdish
+@@ -4344,7 +4284,6 @@
+ Name[tg]=Коми
+ Name[uk]=Комі
+ Name[uz]=Коми
+-Name[xx]=xxKomixx
+ Name[zh_CN]=科米语
+ Name[zh_TW]=Komi語
+ Name[zu]=Isi-Komi
+@@ -4402,7 +4341,6 @@
+ Name[uk]=Корнійська
+ Name[uz]=Корн
+ Name[wa]=Cornike
+-Name[xx]=xxCornishxx
+ Name[zh_CN]=康瓦尔郡语
+ Name[zh_TW]=康瓦耳語
+ Name[zu]=Isi-Khonishi
+@@ -4461,7 +4399,6 @@
+ Name[uk]=Киргизька
+ Name[uz]=Қирғизча
+ Name[wa]=Kirguize
+-Name[xx]=xxKirghizxx
+ Name[zh_CN]=吉尔吉斯语
+ Name[zh_TW]=吉爾吉斯語
+ Name[zu]=Isi-Kirghizi
+@@ -4521,7 +4458,6 @@
+ Name[uk]=Латинська
+ Name[uz]=Лотинча
+ Name[wa]=Latén
+-Name[xx]=xxLatinxx
+ Name[zh_CN]=拉丁语
+ Name[zh_TW]=拉丁語
+ Name[zu]=Isi-Lathini
+@@ -4585,7 +4521,6 @@
+ Name[uk]=Люксембурзька
+ Name[uz]=Люксембургча
+ Name[wa]=Lussimbordjwès
+-Name[xx]=xxLuxembourgishxx
+ Name[zh_CN]=卢森堡语
+ Name[zh_TW]=盧森堡語
+ Name[zu]=Isi-Luxembourgish
+@@ -4595,6 +4530,7 @@
+ Name[az]=Limburqca
+ Name[bg]=Лимбургански
+ Name[bn]=লিমবার্গান
++Name[br]=Limburgeg
+ Name[bs]=Limburški
+ Name[ca]=Limburgà
+ Name[cy]=Limbwrgeg
+@@ -4639,7 +4575,6 @@
+ Name[uk]=Лімбурганська
+ Name[uz]=Лимбурган
+ Name[wa]=Limbordjwès
+-Name[xx]=xxLimburganxx
+ Name[zh_CN]=林堡语
+ Name[zh_TW]=Limburgan語
+ Name[zu]=Isi-Lumburgan
+@@ -4671,7 +4606,6 @@
+ Name[tg]=Лингалӣ
+ Name[uk]=Лінгала
+ Name[uz]=Лингала
+-Name[xx]=xxLingalaxx
+ Name[zh_CN]=林加拉语
+ Name[zh_TW]=Lingala語
+ Name[zu]=Isi-Lingala
+@@ -4713,7 +4647,6 @@
+ Name[uk]=Лаоська
+ Name[uz]=Лаосча
+ Name[wa]=Lawocyin
+-Name[xx]=xxLaoxx
+ Name[zh_CN]=老挝语
+ Name[zh_TW]=寮國語
+ Name[zu]=Isi-Lao
+@@ -4787,7 +4720,6 @@
+ Name[uz]=Литвача
+ Name[vi]=Lithuanian 
+ Name[wa]=Litwanyin
+-Name[xx]=xxLithuanianxx
+ Name[zh_CN]=立陶宛语
+ Name[zh_TW]=立陶宛語
+ Name[zu]=Isi-Lithuanian
+@@ -4859,7 +4791,6 @@
+ Name[vi]=Tiếng Latvia
+ Name[wa]=Letonyin
+ Name[xh]=Isilatvian
+-Name[xx]=xxLatvianxx
+ Name[zh_CN]=拉脱维亚语
+ Name[zh_TW]=拉脫維亞語
+ Name[zu]=Isi-Latvian
+@@ -4868,6 +4799,7 @@
+ Name[az]=Malaqasicə
+ Name[bg]=Малагашки
+ Name[bn]=মালাগাসি
++Name[br]=Malagacheg
+ Name[ca]=Malgaix
+ Name[de]=Madagassisch
+ Name[el]=Μαλγασικά
+@@ -4910,7 +4842,6 @@
+ Name[uk]=Малагська
+ Name[uz]=Малагаси
+ Name[wa]=Malgache
+-Name[xx]=xxMalagasyxx
+ Name[zh_CN]=马尔加什语
+ Name[zh_TW]=馬拉加西語
+ Name[zu]=Isi-Malagasy
+@@ -4921,6 +4852,7 @@
+ Name[be]=Маршальская
+ Name[bg]=Ебон
+ Name[bn]=মার্শালিস
++Name[br]=Yezh an enez Marshall
+ Name[bs]=Maršalski
+ Name[cs]=Marshallský
+ Name[cy]=Marshalleg
+@@ -4968,13 +4900,11 @@
+ Name[uk]=Маршальська
+ Name[uz]=Маршаллез
+ Name[wa]=Marshalès
+-Name[xx]=xxMarshallesexx
+ Name[zh_CN]=马绍尔语
+ Name[zh_TW]=馬紹爾語
+ Name[zu]=Isi-Marshallese
+ [mi]
+ Name=Maori
+-Name[af]=Maoriese
+ Name[ar]=الموري
+ Name[az]=Maoricə
+ Name[be]=Маоры
+@@ -5024,13 +4954,11 @@
+ Name[uz]=Маори
+ Name[vi]=Tiếng Maori 
+ Name[wa]=Mawori
+-Name[xx]=xxMaorixx
+ Name[zh_CN]=毛利语
+ Name[zh_TW]=毛利語
+ Name[zu]=Isi-Maori
+ [mk]
+ Name=Macedonian
+-Name[af]=Makedoniese
+ Name[ar]=المقدونية
+ Name[az]=Makedonca
+ Name[be]=Македонская
+@@ -5098,7 +5026,6 @@
+ Name[uz]=Македонияча
+ Name[vi]=Tiếng Macedonian 
+ Name[wa]=Macedonyin
+-Name[xx]=xxMacedonianxx
+ Name[zh_CN]=马其顿语
+ Name[zh_TW]=馬其頓語
+ Name[zu]=Isi-Makhedoniya
+@@ -5140,7 +5067,6 @@
+ Name[tg]=Малаямӣ
+ Name[uk]=Малайська
+ Name[uz]=Малайалам
+-Name[xx]=xxMalayalamxx
+ Name[zh_CN]=德拉维族语
+ Name[zh_TW]=馬來亞拉姆語
+ Name[zu]=Isi-Malayalam
+@@ -5209,7 +5135,6 @@
+ Name[uk]=Монгольська
+ Name[uz]=Муғулча
+ Name[wa]=Mongol
+-Name[xx]=xxMongolianxx
+ Name[zh_CN]=蒙古语
+ Name[zh_TW]=蒙古語
+ Name[zu]=Isi-Mongolian
+@@ -5277,7 +5202,6 @@
+ Name[uk]=Молдовська
+ Name[uz]=Молдавча
+ Name[wa]=Moldåve
+-Name[xx]=xxMoldavianxx
+ Name[zh_CN]=摩尔多瓦
+ Name[zh_TW]=摩爾達維亞語
+ Name[zu]=Isi-Moldavian
+@@ -5287,6 +5211,7 @@
+ Name[az]=Maraticə
+ Name[bg]=Маратхи
+ Name[bn]=মরাঠী
++Name[br]=Marateg
+ Name[eo]=Marata
+ Name[es]=Maratí
+ Name[fa]=مراتی
+@@ -5316,7 +5241,6 @@
+ Name[uk]=Мараті
+ Name[uz]=Марати
+ Name[wa]=Marati
+-Name[xx]=xxMarathixx
+ Name[zh_CN]=马拉地语
+ Name[zh_TW]=馬拉地語
+ Name[zu]=Isi-Marathi
+@@ -5375,7 +5299,6 @@
+ Name[tg]=Малайӣ
+ Name[uk]=Малайська
+ Name[uz]=Малайча
+-Name[xx]=xxMalayxx
+ Name[zh_CN]=马来西亚语
+ Name[zh_TW]=馬來語
+ Name[zu]=Isi-Malay
+@@ -5446,7 +5369,6 @@
+ Name[uz]=Малтача
+ Name[vi]=Tiếng Mantơ 
+ Name[wa]=Maltès
+-Name[xx]=xxMaltesexx
+ Name[zh_CN]=马耳他语
+ Name[zh_TW]=馬爾他語
+ Name[zu]=Isi-Maltase
+@@ -5457,6 +5379,7 @@
+ Name[az]=Burmaca
+ Name[bg]=Бирмански
+ Name[bn]=বর্মী
++Name[br]=Birmaneg
+ Name[bs]=Burmanski
+ Name[ca]=Burmès
+ Name[cs]=Burmský
+@@ -5507,7 +5430,6 @@
+ Name[tg]=Бурмезӣ
+ Name[uk]=Бірманська
+ Name[uz]=Бурмезча
+-Name[xx]=xxBurmesexx
+ Name[zh_CN]=缅甸语
+ Name[zh_TW]=緬甸語
+ Name[zu]=Isi-Burmese
+@@ -5518,6 +5440,7 @@
+ Name[be]=Науру
+ Name[bg]=Науру
+ Name[bn]=নাউরু
++Name[br]=Naurueg
+ Name[de]=Nauruisch
+ Name[el]=Ναουρού
+ Name[eo]=Naura
+@@ -5546,7 +5469,6 @@
+ Name[tg]=Науру
+ Name[uk]=Науру
+ Name[uz]=Науру
+-Name[xx]=xxNauruxx
+ Name[zh_CN]=瑙鲁语
+ Name[zh_TW]=諾魯語
+ Name[zu]=Isi-Nauru
+@@ -5610,15 +5532,16 @@
+ Name[uk]=Норвезька (Bokmål)
+ Name[uz]=Норвегча (Бокмаал)
+ Name[wa]=Norvedjyin (Bokmål)
+-Name[xx]=xxNorwegian Bokmålxx
+ Name[zh_CN]=挪威语 (博克马尔语)
+ Name[zu]=Isi-Norwegian Bokmaal
+ [nd]
+ Name=Ndebele, North
++Name[af]=Ndebele, Noord
+ Name[ar]=النديبيلي الشمالية
+ Name[az]=Ndebele, Şimal
+ Name[bg]=Северен Ндебеле
+ Name[bn]=ন্‌দেবেলে, উত্তর
++Name[br]=Ndebele, Norzh
+ Name[bs]=Ndebele, Sjeverni
+ Name[ca]=Ndebele, Nord
+ Name[cs]=Ndebele, Severní
+@@ -5672,7 +5595,6 @@
+ Name[ven]=Ndebele, Devhula
+ Name[wa]=Ndebele (bijhe)
+ Name[xh]=Isindebele, Emntla
+-Name[xx]=xxNdebele, Northxx
+ Name[zh_CN]=Ndebele，北部
+ Name[zh_TW]=Ndebele語，北部
+ Name[zu]=Isi-Ndebele, Sase-Ntshonalanga
+@@ -5680,6 +5602,7 @@
+ Name=Low Saxon
+ Name[bg]=Долносаксонски
+ Name[bn]=নিম্ন স্যাক্সন
++Name[br]=Saozeg izel
+ Name[ca]=Baix saxó
+ Name[cs]=Dolnosaský
+ Name[cy]=Sacsoneg Isel
+@@ -5711,13 +5634,12 @@
+ Name[sk]=Dolnosaský
+ Name[sl]=spodnjesaško
+ Name[sr]=Доњи саксонски
+-Name[sr@Latn]=Доњи саксонски
++Name[sr@Latn]=Donji saksonski
+ Name[sv]=Lågsaxiska
+ Name[ta]=லோ சாக்ஸான்
+ Name[tg]=Саксон
+ Name[tr]=Aşağı Sakson
+ Name[uk]=Ніжньо-Саксонська
+-Name[xx]=xxLow Saxonxx
+ Name[zh_CN]=撒克逊语
+ [ne]
+ Name=Nepali
+@@ -5774,7 +5696,6 @@
+ Name[uk]=Непальська
+ Name[uz]=Непалча
+ Name[wa]=Nepalès
+-Name[xx]=xxNepalixx
+ Name[zh_CN]=尼泊尔语
+ Name[zh_TW]=尼泊爾語
+ Name[zu]=Isi-Nepali
+@@ -5801,7 +5722,6 @@
+ Name[tg]=Ндонга
+ Name[uk]=Ндонга
+ Name[uz]=Ндонга
+-Name[xx]=xxNdongaxx
+ Name[zh_TW]=Ndonga語
+ Name[zu]=Isi-Ndonga
+ [nl]
+@@ -5876,7 +5796,6 @@
+ Name[vi]=Tiếng Hà Lan 
+ Name[wa]=Neyerlandès
+ Name[xh]=Isidatshi
+-Name[xx]=xxDutchxx
+ Name[zh_CN]=荷兰语
+ Name[zh_TW]=荷蘭語
+ Name[zu]=Isi-Danishi
+@@ -5943,16 +5862,17 @@
+ Name[uk]=Норвезька (Nynorsk)
+ Name[uz]=Норвегияча (Нйнорск)
+ Name[wa]=Noû-Norvedjyin (Nynorsk)
+-Name[xx]=xxNorwegian Nynorskxx
+ Name[zh_CN]=挪威语 (尼诺斯克语)
+ Name[zh_TW]=挪威 Nynorsk 語
+ Name[zu]=Isi-Norwegian Nynorsk
+ [nr]
+ Name=Ndebele, South
++Name[af]=Ndebele, Suid
+ Name[ar]=النديبيلي الجنوبية
+ Name[az]=Ndebele, Cənub
+ Name[bg]=Южен Ндебеле
+ Name[bn]=ন্‌দেবেলে, দক্ষিণ
++Name[br]=Ndebele, Su
+ Name[bs]=Ndebele, Južni
+ Name[ca]=Ndebele, Sud
+ Name[cs]=Ndebele, Jižní
+@@ -6006,16 +5926,17 @@
+ Name[ven]=Ndebele, Tshipembe
+ Name[wa]=Ndebele (nonne)
+ Name[xh]=Isindebele, Emazantsi
+-Name[xx]=xxNdebele, Southxx
+ Name[zh_CN]=Ndebele，南部
+ Name[zh_TW]=Ndebele語，南部
+ Name[zu]=Isi-Ndebele, Sase-Mzansi
+ [nso]
+ Name=Northern Sotho
++Name[af]=Noord Sotho
+ Name[ar]=السوتو الشمالية
+ Name[az]=Şimali Sotho
+ Name[bg]=Северен Сото
+ Name[bn]=উত্তর সোথো
++Name[br]=Soto, Norzh
+ Name[bs]=Sjeverni Soto
+ Name[ca]=Sotho del nord
+ Name[cs]=Severní Sotho
+@@ -6065,7 +5986,6 @@
+ Name[uk]=Північне Сото
+ Name[uz]=Шимолий Соточа
+ Name[wa]=Soto (bijhe)
+-Name[xx]=xxNorthern Sothoxx
+ Name[zh_CN]=北部梭托语
+ [nv]
+ Name=Navajo
+@@ -6103,7 +6023,6 @@
+ Name[uk]=Навахо
+ Name[uz]=Наважо
+ Name[wa]=Navaxho
+-Name[xx]=xxNavajoxx
+ Name[zh_CN]=纳瓦霍语
+ Name[zh_TW]=納瓦伙語
+ Name[zu]=Isi-Navajo
+@@ -6140,7 +6059,6 @@
+ Name[uk]=Чічеванська
+ Name[uz]=Чичева
+ Name[wa]=Tchitchewa
+-Name[xx]=xxChichewaxx
+ Name[zh_CN]=齐切瓦语
+ Name[zh_TW]=Chichewa語
+ Name[zu]=Isi-Chichewa
+@@ -6201,7 +6119,6 @@
+ Name[tr]=Oksitan dili
+ Name[uk]=Оксітанська
+ Name[uz]=Французча (Осситан шеваси)
+-Name[xx]=xxOccitanxx
+ Name[zh_CN]=奥西坦语
+ Name[zh_TW]=Occitan語
+ Name[zu]=Isi-Osithani
+@@ -6234,7 +6151,6 @@
+ Name[tg]=Оромо
+ Name[uk]=Оромо
+ Name[uz]=Оромо
+-Name[xx]=xxOromoxx
+ Name[zh_CN]=阿曼语
+ Name[zh_TW]=Oromo語
+ Name[zu]=Isi-Oromo
+@@ -6271,7 +6187,6 @@
+ Name[tg]=Ориёӣ
+ Name[uk]=Орія
+ Name[uz]=Ория
+-Name[xx]=xxOriyaxx
+ Name[zh_CN]=欧里亚语
+ Name[zh_TW]=Oriya語
+ Name[zu]=Isi-Oriya
+@@ -6282,6 +6197,7 @@
+ Name[be]=Асецінская
+ Name[bg]=Осетински
+ Name[bn]=ওসেটিয়ান
++Name[br]=Ossetieg
+ Name[bs]=Osetski
+ Name[ca]=Oseti
+ Name[cs]=Osetský
+@@ -6328,7 +6244,6 @@
+ Name[uk]=Осетійська
+ Name[uz]=Оссетинча
+ Name[wa]=Ossete
+-Name[xx]=xxOssetianxx
+ Name[zh_CN]=奥塞梯语
+ Name[zh_TW]=Ossetian語
+ Name[zu]=Isi-Ossethiyani
+@@ -6339,6 +6254,7 @@
+ Name[be]=Панджабі
+ Name[bg]=Панджаби
+ Name[bn]=পাঞ্জাবী
++Name[br]=Pendjabieg
+ Name[cs]=Pandžábský
+ Name[de]=Pandschabi-Sprache
+ Name[eo]=Panĝaba
+@@ -6376,7 +6292,6 @@
+ Name[uk]=Панджабська
+ Name[uz]=Панжабча
+ Name[wa]=Pundjabi
+-Name[xx]=xxPanjabixx
+ Name[zh_CN]=旁遮普语
+ Name[zh_TW]=Panjabi語
+ Name[zu]=Isi-Phanjabi
+@@ -6386,6 +6301,7 @@
+ Name[az]=Palicə
+ Name[bg]=Пали
+ Name[bn]=পালি
++Name[br]=Palieg
+ Name[eo]=Palio
+ Name[es]=Palí
+ Name[et]=Paali
+@@ -6410,7 +6326,6 @@
+ Name[uk]=Палі
+ Name[uz]=Пали
+ Name[wa]=Pâli
+-Name[xx]=xxPalixx
+ Name[zh_CN]=巴利语
+ Name[zh_TW]=巴利語
+ Name[zu]=Isi-Phali
+@@ -6484,7 +6399,6 @@
+ Name[uz]=Полякча
+ Name[vi]=Tiếng Ba Lan 
+ Name[wa]=Polonès
+-Name[xx]=xxPolishxx
+ Name[zh_CN]=波兰语
+ Name[zh_TW]=波蘭語
+ Name[zu]=Isi-Pholishi
+@@ -6527,7 +6441,6 @@
+ Name[uk]=Пуштунська
+ Name[uz]=Пуштунча
+ Name[wa]=Pashto
+-Name[xx]=xxPushtoxx
+ Name[zh_CN]=普什图语
+ Name[zh_TW]=普什圖語
+ Name[zu]=Dudula ku
+@@ -6602,7 +6515,6 @@
+ Name[uz]=Португалча
+ Name[vi]=Tiếng BềEĐào Nha 
+ Name[wa]=Portuguès
+-Name[xx]=xxPortuguesexx
+ Name[zh_CN]=葡萄牙语
+ Name[zh_TW]=葡萄牙語
+ Name[zu]=Isi-Phuthukesi
+@@ -6668,7 +6580,6 @@
+ Name[uk]=Бразильська португальська
+ Name[uz]=Португалча (Бразилия)
+ Name[wa]=Portuguès do Braezi
+-Name[xx]=xxBrazilian Portuguesexx
+ Name[zh_CN]=巴西葡萄牙语
+ [qu]
+ Name=Quechua
+@@ -6705,7 +6616,6 @@
+ Name[uk]=Кечуа
+ Name[uz]=Квечуа
+ Name[wa]=Kitchwa
+-Name[xx]=xxQuechuaxx
+ Name[zh_CN]=盖丘亚语
+ Name[zh_TW]=蓋楚瓦語
+ Name[zu]=Isi-Quechua
+@@ -6739,13 +6649,12 @@
+ Name[uk]=Рунді
+ Name[uz]=Рунди
+ Name[wa]=Kirundi
+-Name[xx]=xxRundixx
+ Name[zh_CN]=基隆迪语
+ Name[zh_TW]=Rundi語
+ Name[zu]=Isi-Rundi
+ [ro]
+ Name=Romanian
+-Name[af]=Romeense
++Name[af]=Romeens
+ Name[ar]=الرومانية
+ Name[az]=Rumınca
+ Name[be]=Румынская
+@@ -6813,13 +6722,12 @@
+ Name[uz]=Руминча
+ Name[vi]=Tiếng BềEĐào Nha 
+ Name[wa]=Roumin
+-Name[xx]=xxRomanianxx
+ Name[zh_CN]=罗马尼亚语
+ Name[zh_TW]=羅馬尼亞語
+ Name[zu]=Isi-Romania
+ [ru]
+ Name=Russian
+-Name[af]=Russiese
++Name[af]=Russies
+ Name[ar]=الروسية
+ Name[az]=Rusca
+ Name[be]=Расейская
+@@ -6889,7 +6797,6 @@
+ Name[vi]=Tiếng Nga 
+ Name[wa]=Rûsse
+ Name[xh]=Isirashiya
+-Name[xx]=xxRussianxx
+ Name[zh_CN]=俄语
+ Name[zh_TW]=俄語
+ Name[zu]=Isi-Rashiya
+@@ -6926,7 +6833,6 @@
+ Name[uk]=Кіньярванда
+ Name[uz]=Кинярванда
+ Name[wa]=Kiniarwanda
+-Name[xx]=xxKinyarwandaxx
+ Name[zh_CN]=卢旺达语
+ Name[zh_TW]=Kinyarwanda語
+ Name[zu]=Isi-Kinyarwanda
+@@ -6971,7 +6877,6 @@
+ Name[tg]=Санскрит
+ Name[uk]=Санскрит
+ Name[uz]=Санскрит
+-Name[xx]=xxSanskritxx
+ Name[zh_CN]=梵语
+ Name[zh_TW]=梵語
+ Name[zu]=Isi-Sanskrit
+@@ -7032,7 +6937,6 @@
+ Name[uk]=Сардинська
+ Name[uz]=Сардинча
+ Name[wa]=Sardinyin
+-Name[xx]=xxSardinianxx
+ Name[zh_CN]=撒丁语
+ Name[zh_TW]=薩丁尼亞語
+ Name[zu]=Isi-Sardinian
+@@ -7041,6 +6945,7 @@
+ Name[ar]=سندي
+ Name[bg]=Синдхи
+ Name[bn]=সিন্ধি
++Name[br]=Sindhieg
+ Name[de]=Sindhi-Sprache
+ Name[eo]=Sinda
+ Name[fa]=سیندهی
+@@ -7068,16 +6973,17 @@
+ Name[uk]=Сіндхі
+ Name[uz]=Синдхи
+ Name[wa]=Sindi
+-Name[xx]=xxSindhixx
+ Name[zh_TW]=Sindhi語
+ Name[zu]=Isi-Sindi
+ [se]
+ Name=Northern Sami
++Name[af]=Noordelike Sami
+ Name[ar]=السامي الشمالية
+ Name[az]=Şimali Sami
+ Name[be]=Паўночная Саамская
+ Name[bg]=Северен Сами
+ Name[bn]=উত্তর সামি
++Name[br]=Sami, Norzh
+ Name[bs]=Sjeverni Sami
+ Name[ca]=Sami del nord
+ Name[cs]=Severní Sami
+@@ -7132,7 +7038,6 @@
+ Name[ven]=Sami ya Devhula
+ Name[wa]=Bijhe såmi
+ Name[xh]=Sami Yasemntla
+-Name[xx]=xxNorthern Samixx
+ Name[zh_CN]=北部沙米语
+ Name[zh_TW]=北薩米語
+ Name[zu]=Isi-Sami Sase-Ntshonalanga
+@@ -7164,7 +7069,6 @@
+ Name[tg]=Санго
+ Name[uk]=Санго
+ Name[uz]=Санго
+-Name[xx]=xxSangoxx
+ Name[zh_CN]=桑戈语
+ Name[zh_TW]=Sango語
+ Name[zu]=Isi-Sango
+@@ -7174,6 +7078,7 @@
+ Name[az]=Sinhalca
+ Name[bg]=Сингалски
+ Name[bn]=সিংহলী
++Name[br]=Singaleg
+ Name[bs]=Sinhaleški
+ Name[ca]=Sinhalès
+ Name[cs]=Sinhalský
+@@ -7222,12 +7127,12 @@
+ Name[uk]=Сингалійська
+ Name[uz]=Синхалесе
+ Name[wa]=Sinhalès
+-Name[xx]=xxSinhalesexx
+ Name[zh_CN]=僧伽罗语
+ Name[zh_TW]=錫蘭語
+ Name[zu]=Isi-Sinhalese
+ [sk]
+ Name=Slovak
++Name[af]=Slovakies
+ Name[ar]=السلوفاكية
+ Name[az]=Slovakca
+ Name[be]=Славацкая
+@@ -7294,7 +7199,6 @@
+ Name[vi]=Tiếng Slô-vác 
+ Name[wa]=Eslovake
+ Name[xh]=isiSlovak
+-Name[xx]=xxSlovakxx
+ Name[zh_CN]=斯洛伐克语
+ Name[zu]=Isi-Silovaki
+ [sl]
+@@ -7366,7 +7270,6 @@
+ Name[uk]=Словенська
+ Name[uz]=Словенианча
+ Name[wa]=Eslovenyin
+-Name[xx]=xxSlovenianxx
+ Name[zh_CN]=斯洛文尼亚语
+ Name[zh_TW]=斯洛維尼亞語
+ Name[zu]=Isi-Slovenian
+@@ -7427,7 +7330,6 @@
+ Name[uk]=Самойська
+ Name[uz]=Самоача
+ Name[wa]=Samowan
+-Name[xx]=xxSamoanxx
+ Name[zh_CN]=萨摩亚语
+ Name[zh_TW]=薩摩牙語
+ Name[zu]=Isi-Samoan
+@@ -7460,7 +7362,6 @@
+ Name[uk]=Шона
+ Name[uz]=Шона
+ Name[xh]=Isishona
+-Name[xx]=xxShonaxx
+ Name[zh_CN]=修纳语
+ Name[zh_TW]=Shona語
+ Name[zu]=Isi-Shona
+@@ -7515,7 +7416,6 @@
+ Name[uk]=Сомалійська
+ Name[uz]=Сомалича
+ Name[wa]=Somalyin
+-Name[xx]=xxSomalixx
+ Name[zh_CN]=索马里语
+ Name[zh_TW]=索馬利語
+ Name[zu]=Isi-Somali
+@@ -7583,7 +7483,6 @@
+ Name[uk]=Албанська
+ Name[uz]=Албанча
+ Name[wa]=Albanyin
+-Name[xx]=xxAlbanianxx
+ Name[zh_CN]=阿尔巴尼亚语
+ Name[zh_TW]=阿爾巴尼亞語
+ Name[zu]=Isi-Albanian
+@@ -7656,7 +7555,6 @@
+ Name[uz]=Сербча
+ Name[vi]=Tiếng Séc bi 
+ Name[wa]=Serbe
+-Name[xx]=xxSerbianxx
+ Name[zh_CN]=塞尔维亚语
+ Name[zh_TW]=塞爾維亞語
+ Name[zu]=Isi-Serbian
+@@ -7694,16 +7592,17 @@
+ Name[uz]=Свати
+ Name[wa]=Suwati
+ Name[xh]=Isiswati
+-Name[xx]=xxSwatixx
+ Name[zh_CN]=斯瓦特语
+ Name[zh_TW]=Swati語
+ Name[zu]=Isi-Swati
+ [st]
+ Name=Sotho, Southern
++Name[af]=Sotho, Suid
+ Name[ar]=السوتو الشمالية
+ Name[az]=Sotho, Cənubi
+ Name[bg]=Южен Сото
+ Name[bn]=সোথো, দক্ষিণ
++Name[br]=Soto, Su
+ Name[bs]=Soto, Južni
+ Name[ca]=Sotho del sud
+ Name[cs]=Sotho, Jižní
+@@ -7757,7 +7656,6 @@
+ Name[ven]=Sotho, Tshipembe
+ Name[wa]=Soto (nonne)
+ Name[xh]=Isisuthu, Sasemzantsi
+-Name[xx]=xxSotho, Southernxx
+ Name[zh_CN]=索托，南部
+ Name[zh_TW]=梭托語，南部
+ Name[zu]=Isi-Suthu, Sase-Mzantsi
+@@ -7767,6 +7665,7 @@
+ Name[az]=Sundanca
+ Name[bg]=Сундански
+ Name[bn]=সুন্দানিজ
++Name[br]=Soudaneg
+ Name[bs]=Sundaneški
+ Name[ca]=Sundanès
+ Name[cs]=Sundanský
+@@ -7817,13 +7716,12 @@
+ Name[uk]=Сунданійська
+ Name[uz]=Сунданча
+ Name[wa]=Soudanès
+-Name[xx]=xxSundanesexx
+ Name[zh_CN]=巽他语
+ Name[zh_TW]=Sundanese語
+ Name[zu]=Isi-Sundanese
+ [sv]
+ Name=Swedish
+-Name[af]=Sweedse
++Name[af]=Sweeds
+ Name[ar]=السويدية
+ Name[az]=İsveçcə
+ Name[be]=Швэдзкая
+@@ -7891,7 +7789,6 @@
+ Name[uz]=Шведча
+ Name[vi]=Tiếng Thuỵ Điển 
+ Name[wa]=Suwedwès
+-Name[xx]=xxSwedishxx
+ Name[zh_CN]=瑞典语
+ Name[zh_TW]=瑞典語
+ Name[zu]=Isi-Swidishi
+@@ -7936,13 +7833,12 @@
+ Name[uk]=Суахілі
+ Name[uz]=Свахили
+ Name[wa]=Suwahili
+-Name[xx]=xxSwahilixx
+ Name[zh_CN]=斯瓦希里语
+ Name[zh_TW]=斯華西里語
+ Name[zu]=Isi-Swahili
+ [ta]
+ Name=Tamil
+-Name[af]=Tamiliese
++Name[af]=Tamilies
+ Name[ar]=التاميلية
+ Name[az]=Tamil Dili
+ Name[be]=Тамільская
+@@ -7993,7 +7889,6 @@
+ Name[uz]=Тамилча
+ Name[vi]=Tiếng Tamil 
+ Name[wa]=Tamoul
+-Name[xx]=xxTamilxx
+ Name[zh_CN]=泰米尔语
+ Name[zh_TW]=坦米爾語
+ Name[zu]=Isi-Tamili
+@@ -8032,7 +7927,6 @@
+ Name[uk]=Телугу
+ Name[uz]=Телугу
+ Name[wa]=Telougou
+-Name[xx]=xxTeluguxx
+ Name[zh_CN]=泰卢固语
+ Name[zh_TW]=特拉古語
+ Name[zu]=Isi-Telugu
+@@ -8091,13 +7985,12 @@
+ Name[uk]=Таджицька
+ Name[uz]=Тожикча
+ Name[wa]=Tadjik
+-Name[xx]=xxTajikxx
+ Name[zh_CN]=塔吉克语
+ Name[zh_TW]=塔吉克語
+ Name[zu]=Isi-Tajik
+ [th]
+ Name=Thai
+-Name[af]=Thaise
++Name[af]=Thaïs
+ Name[ar]=التايلاندية
+ Name[az]=Tayca
+ Name[be]=Тайская
+@@ -8154,7 +8047,6 @@
+ Name[uz]=Тайча
+ Name[vi]=Tiếng Thái Lan 
+ Name[wa]=Taylandès
+-Name[xx]=xxThaixx
+ Name[zh_CN]=泰语
+ Name[zh_TW]=泰國語
+ Name[zu]=Isi-Thayi
+@@ -8198,7 +8090,6 @@
+ Name[uk]=Тигринійська
+ Name[uz]=Тигриня
+ Name[wa]=Tigrinia
+-Name[xx]=xxTigrinyaxx
+ Name[zh_CN]=提格里尼亚语
+ Name[zh_TW]=提格利尼亞語
+ Name[zu]=Isi-Tigrinya
+@@ -8260,7 +8151,6 @@
+ Name[uz]=Туркманча
+ Name[ven]=Munna wa Turkey
+ Name[wa]=Turkmene
+-Name[xx]=xxTurkmenxx
+ Name[zh_CN]=土库曼语
+ Name[zh_TW]=土庫曼語
+ Name[zu]=Amadoda Ase-Thekishi
+@@ -8298,7 +8188,6 @@
+ Name[uk]=Тсвана
+ Name[uz]=Тсвана
+ Name[xh]=Isitswana
+-Name[xx]=xxTswanaxx
+ Name[zh_CN]=茨瓦纳语
+ Name[zh_TW]=班圖語
+ Name[zu]=Isi-Tswana
+@@ -8334,13 +8223,12 @@
+ Name[tg]=Тонгаӣ
+ Name[uk]=Тонга
+ Name[uz]=Тонга
+-Name[xx]=xxTongaxx
+ Name[zh_CN]=汤加语
+ Name[zh_TW]=東加語
+ Name[zu]=Isi-Tonga
+ [tr]
+ Name=Turkish
+-Name[af]=Turkse
++Name[af]=Turks
+ Name[ar]=التركية
+ Name[az]=Türkcə
+ Name[be]=Турэцкая
+@@ -8408,7 +8296,6 @@
+ Name[uz]=Туркча
+ Name[vi]=Tiếng ThềENhĩ Kì 
+ Name[wa]=Turk
+-Name[xx]=xxTurkishxx
+ Name[zh_CN]=土耳其语
+ Name[zh_TW]=土耳其語
+ Name[zu]=Isi-Thekishi
+@@ -8441,7 +8328,6 @@
+ Name[tg]=Сонгавӣ
+ Name[uk]=Цонґа
+ Name[uz]=Цонга
+-Name[xx]=xxTsongaxx
+ Name[zh_CN]=特松加语
+ Name[zh_TW]=Tsonga語
+ Name[zu]=Isi-Tsonga
+@@ -8494,7 +8380,6 @@
+ Name[uk]=Татарська
+ Name[uz]=Тотарча
+ Name[wa]=Tatår
+-Name[xx]=xxTatarxx
+ Name[zh_CN]=鞑靼语
+ Name[zh_TW]=韃靼語
+ Name[zu]=Isi-Tatar
+@@ -8525,7 +8410,6 @@
+ Name[tg]=Твиягӣ
+ Name[uk]=Тві
+ Name[uz]=Тви
+-Name[xx]=xxTwixx
+ Name[zh_CN]=契维语
+ Name[zh_TW]=契維語
+ Name[zu]=Isi-Twi
+@@ -8588,7 +8472,6 @@
+ Name[uk]=Таїтянська
+ Name[uz]=Тахитиан
+ Name[wa]=Tahityin
+-Name[xx]=xxTahitianxx
+ Name[zh_CN]=塔希提语
+ Name[zh_TW]=大溪地語
+ Name[zu]=Isi-Tahitian
+@@ -8634,13 +8517,12 @@
+ Name[uk]=Уйгур
+ Name[uz]=Уйғурча
+ Name[wa]=Ouygour
+-Name[xx]=xxUighurxx
+ Name[zh_CN]=维吾尔语
+ Name[zh_TW]=維吾爾語
+ Name[zu]=Isi-Uighur
+ [uk]
+ Name=Ukrainian
+-Name[af]=Ukraïniese
++Name[af]=Ukraïnies
+ Name[ar]=الأوكرانية
+ Name[az]=Ukrayna Dili
+ Name[be]=Украінская
+@@ -8709,7 +8591,6 @@
+ Name[vi]=Tiếng Ukraina 
+ Name[wa]=Oucrinnyin
+ Name[xh]=Ukranian
+-Name[xx]=xxUkrainianxx
+ Name[zh_CN]=乌克兰语
+ Name[zh_TW]=烏克蘭語
+ Name[zu]=Isi-Ukraniyani
+@@ -8745,7 +8626,6 @@
+ Name[uk]=Урду
+ Name[uz]=Урду
+ Name[wa]=Ourdou
+-Name[xx]=xxUrduxx
+ Name[zh_CN]=乌尔都语
+ Name[zh_TW]=烏都語
+ Name[zu]=Isi-Urdu
+@@ -8805,7 +8685,6 @@
+ Name[uk]=Узбецька
+ Name[uz]=Ўзбекча
+ Name[wa]=Ouzbeke
+-Name[xx]=xxUzbekxx
+ Name[zh_CN]=乌兹别克语
+ Name[zh_TW]=烏茲別克語
+ Name[zu]=Isi-Uzbek
+@@ -8831,11 +8710,10 @@
+ Name[th]=เวนดา
+ Name[uk]=Венда
+ Name[uz]=Венда
+-Name[xx]=xxVendaxx
+ Name[zh_CN]=闻达语
+ [vi]
+ Name=Vietnamese
+-Name[af]=Viëtnamese
++Name[af]=Viëtnamees
+ Name[ar]=الفييتنامية
+ Name[az]=Vyetnamca
+ Name[be]=Віетнамская
+@@ -8901,7 +8779,6 @@
+ Name[uz]=Ветнамча
+ Name[vi]=Tiếng Việt
+ Name[wa]=Vietnamyin
+-Name[xx]=xxVietnamesexx
+ Name[zh_CN]=越南语
+ Name[zh_TW]=越南語
+ Name[zu]=Isi-Vietnamese
+@@ -8936,12 +8813,10 @@
+ Name[tg]=Волапёкӣ
+ Name[uk]=Волап'юк
+ Name[uz]=Волапук
+-Name[xx]=xxVolapükxx
+ Name[zh_CN]=沃拉普克语
+ Name[zu]=Isi-Volapük
+ [wa]
+ Name=Walloon
+-Name[af]=Walloonse
+ Name[ar]=الوالون
+ Name[az]=Valonca
+ Name[be]=Валонская
+@@ -9002,7 +8877,6 @@
+ Name[uz]=Валлонча
+ Name[vi]=Tiếng Wallon 
+ Name[wa]=Walon
+-Name[xx]=xxWalloonxx
+ Name[zh_CN]=瓦龙语
+ Name[zh_TW]=華隆語
+ Name[zu]=Isi-Walloon
+@@ -9040,7 +8914,6 @@
+ Name[tg]=Волофӣ
+ Name[uk]=Волоф
+ Name[uz]=Волоф
+-Name[xx]=xxWolofxx
+ Name[zh_CN]=沃洛夫语
+ Name[zh_TW]=Wolof語
+ Name[zu]=Isi-Wolof
+@@ -9076,7 +8949,6 @@
+ Name[vi]=Xhosa 
+ Name[wa]=Xhossa
+ Name[xh]=isixhosa
+-Name[xx]=xxXhosaxx
+ Name[zh_CN]=科萨语
+ Name[zh_TW]=科薩語
+ Name[zu]=Isi-Xhosa
+@@ -9126,7 +8998,6 @@
+ Name[uk]=Ідиш
+ Name[uz]=Йиддиш
+ Name[wa]=Yidish
+-Name[xx]=xxYiddishxx
+ Name[zh_CN]=依地语
+ Name[zh_TW]=意第緒語
+ Name[zu]=Isi-Yidishi
+@@ -9164,7 +9035,6 @@
+ Name[uk]=Йоруба
+ Name[uz]=Ёруба
+ Name[wa]=Yorouba
+-Name[xx]=xxYorubaxx
+ Name[zh_CN]=约鲁巴语
+ Name[zh_TW]=優魯巴語
+ Name[zu]=Isi-Yoruba
+@@ -9194,7 +9064,6 @@
+ Name[tg]=Жуанг
+ Name[uk]=Жуан
+ Name[uz]=Зхуанг
+-Name[xx]=xxZhuangxx
+ Name[zh_CN]=壮语
+ Name[zh_TW]=Zhuang語
+ Name[zu]=Isi-Zhuang
+@@ -9271,7 +9140,6 @@
+ Name[vi]=Tiếng Trung Quốc 
+ Name[wa]=Chinwès
+ Name[xh]=Isitshayina
+-Name[xx]=xxChinesexx
+ Name[zh_CN]=中文
+ Name[zh_TW]=中文
+ Name[zu]=Isi-Shayina
+@@ -9291,6 +9159,7 @@
+ Name[fr]=Chinois simplifié
+ Name[fy]=Sjineesk (ynfaldich)
+ Name[ga]=Sínis Simplithe
++Name[hi]=चीनी सरल
+ Name[hsb]=Chinsce (zjednorjene)
+ Name[hu]=Kínai (egyszerűsített)
+ Name[is]=Einfölduð kínverska
+@@ -9309,11 +9178,10 @@
+ Name[sk]=Zjednodušený čínsky
+ Name[sl]=poenostavljeno kitajsko
+ Name[sr]=Поједностављени кинески
+-Name[sr@Latn]=Поједностављени кинески
++Name[sr@Latn]=Pojednostavljeni kineski
+ Name[sv]=Förenklad kinesiska
+ Name[tr]=Basitleştirilmiş Çince
+ Name[uk]=Китайська (спрощена)
+-Name[xx]=xxChinese Simplifiedxx
+ Name[zh_CN]=简体中文
+ [zh_TW]
+ Name=Chinese Traditional
+@@ -9331,6 +9199,7 @@
+ Name[fr]=Chinois traditionnel
+ Name[fy]=Sjineesk (tradisjoniel)
+ Name[ga]=Sínis Traidisiúnta
++Name[hi]=पारंपरिक चीनी
+ Name[hsb]=Chinsce (tradicionalnje)
+ Name[hu]=Kínai (hagyományos)
+ Name[is]=Hefðbundin kínverska
+@@ -9349,11 +9218,10 @@
+ Name[sk]=Tradičný čínsky
+ Name[sl]=tradicionalno kitajsko
+ Name[sr]=Традиционални кинески
+-Name[sr@Latn]=Традиционални кинески
++Name[sr@Latn]=Tradicionalni kineski
+ Name[sv]=Traditionell kinesiska
+ Name[tr]=Geleneksel Çince
+ Name[uk]=Китайська (традиційна)
+-Name[xx]=xxChinese Traditionalxx
+ Name[zh_CN]=繁体中文
+ [zu]
+ Name=Zulu
+@@ -9394,7 +9262,6 @@
+ Name[ven]=Muzulu
+ Name[wa]=Zoulou
+ Name[xh]=Isizulu
+-Name[xx]=xxZuluxx
+ Name[zh_CN]=祖鲁语
+ Name[zh_TW]=袓魯語
+ Name[zu]=Isi-Zulu
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdecore/eventsrc kdelibs_3_4_BRANCH/kdecore/eventsrc
+--- kdelibs_3_4_0_RELEASE/kdecore/eventsrc	2005-02-23 06:04:24.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdecore/eventsrc	2005-03-12 18:58:42.000000000 +0100
+@@ -2,7 +2,7 @@
+ # go = The K-icon from kicker
+ IconName=go
+ Comment=KDE System Notifications
+-Comment[af]=Kde Stelsel Inkennistelling
++Comment[af]=KDE Stelsel Inkennistelling
+ Comment[ar]=تنبيهات كيدي
+ Comment[az]=KDE Sistem Bildirişləri
+ Comment[bg]=Системни съобщения
+@@ -71,7 +71,6 @@
+ Comment[vi]=Thông báo hềEthống của KDE 
+ Comment[wa]=Notifiaedjes sistinme di KDE
+ Comment[xh]=Izaziso Zendlela ye KDE
+-Comment[xx]=xxKDE System Notificationsxx
+ Comment[zh_CN]=KDE 系统通知
+ Comment[zh_TW]=KDE 系統通知
+ Comment[zu]=Izaziso Zesistimu ye-KDE
+@@ -88,9 +87,11 @@
+ Name[en_GB]=Wastebin: emptied
+ Name[es]=Papelera: vaciada
+ Name[et]=Prügikast: tühjendatud
++Name[eu]=Zakarontzia: hustuta
+ Name[fr]=Corbeille : vidée
+ Name[fy]=Jiskefet: leech makke
+ Name[ga]=Bruscar: folmhaithe
++Name[hi]=रद्दी ख़ाली
+ Name[hsb]=Papjernik: wuprózdnjeny
+ Name[hu]=Szemétkosár: kiürítve
+ Name[is]=Rusl: tæmt
+@@ -108,10 +109,9 @@
+ Name[sk]=Koš: vyprázdnený
+ Name[sl]=Smeti: izpraznjeno
+ Name[sr]=Смеће: испражњено
+-Name[sr@Latn]=Смеће: испражњено
++Name[sr@Latn]=Smeće: ispražnjeno
+ Name[sv]=Papperskorg: tömd
+ Name[uk]=Смітник: спорожнено
+-Name[xx]=xxTrash: emptiedxx
+ Name[zh_CN]=回收站：已清空
+ Comment=The trash has been emptied
+ Comment[bg]=Съдържанието а кошчето е изтрито
+@@ -124,8 +124,10 @@
+ Comment[en_GB]=The wastebin has been emptied
+ Comment[es]=La papelera se ha vaciado
+ Comment[et]=Prügikast on tühjendatud
++Comment[eu]=Zakarontzia hustu da
+ Comment[fr]=La corbeille a été vidée
+ Comment[fy]=It jiskefet is leech makke
++Comment[hi]=रद्दी ख़ाली किया गया
+ Comment[hsb]=sym papjernik wuprózdnił
+ Comment[hu]=A szemétkosár kiürült
+ Comment[is]=Ruslafatan hefur verið tæmd
+@@ -143,10 +145,9 @@
+ Comment[sk]=Kôš bol vyprázdnený
+ Comment[sl]=Smeti so spraznjene
+ Comment[sr]=Смеће је испражњено
+-Comment[sr@Latn]=Смеће је испражњено
++Comment[sr@Latn]=Smeće je ispražnjeno
+ Comment[sv]=Papperskorgen har tömts
+ Comment[uk]=Смітник було спорожнено
+-Comment[xx]=xxThe trash has been emptiedxx
+ Comment[zh_CN]=回收站已被清空
+ default_presentation=1
+ 
+@@ -220,13 +221,14 @@
+ Name[ven]=U fhela ha manwalwa: U mona
+ Name[vi]=Textcompletion:Quay 
+ Name[xh]=Textcompletion: ujikeleziso
+-Name[xx]=xxTextcompletion: rotationxx
+ Name[zh_CN]=文字补齐：轮转
+ Name[zh_TW]=文字補齊：旋轉
+ Name[zu]=Ukuqedwa kombhalo:ukujikelezisa
+ Comment=The end of the list of matches has been reached
++Comment[af]=Die einde van die lys van ooreenkomste is bereik
+ Comment[bg]=Достигнат е края на списъка от съвпадения
+ Comment[bn]=মিলের তালিকার শেষে উপস্থিত
++Comment[br]=Tizhet eo diwezh roll ar gendoareoù
+ Comment[bs]=Došao sam do kraja liste pogodaka
+ Comment[ca]=S'ha arribat al final de la llista de coincidències
+ Comment[cs]=Dosaženo konce seznamu odpovídajících položek
+@@ -262,13 +264,12 @@
+ Comment[sk]=Bol dosiahnutý koniec zoznamu nájdených položiek
+ Comment[sl]=To je konec seznama zadetkov
+ Comment[sr]=Достигнут је крај листе подударања
+-Comment[sr@Latn]=Достигнут је крај листе подударања
++Comment[sr@Latn]=Dostignut je kraj liste podudaranja
+ Comment[sv]=Slutet på listan med träffar har nåtts
+ Comment[ta]=பொருத்தப் பட்டியலின் முடிவை அடைந்தாயிற்று.
+ Comment[tg]=Охири рӯйхати мувофиқат расид
+ Comment[tr]=Eşleşme listesinin sonuna gelindi
+ Comment[uk]=Досягнуто кінець списку співпадань
+-Comment[xx]=xxThe end of the list of matches has been reachedxx
+ Comment[zh_CN]=已到达匹配项列表的最后
+ default_presentation=1
+ 
+@@ -342,13 +343,14 @@
+ Name[ven]=U fhela ha manwalwa: A huna u fanyisa
+ Name[vi]=Textcompletion: Không phù hợp 
+ Name[xh]=Textcompletion: akukho ntelekiso
+-Name[xx]=xxTextcompletion: no matchxx
+ Name[zh_CN]=文字补齐：没有匹配
+ Name[zh_TW]=文字補齊：沒有匹配
+ Name[zu]=Ukuqedwa kokumbhalo: akukho okufanayo
+ Comment=No matching completion was found
++Comment[af]=Geen ooreenstemming was gevind
+ Comment[bg]=Не е намерено съвпадение
+ Comment[bn]=কোনো যুতসই পরিপূরক পাওয়া যায় নি
++Comment[br]=Kendoare ebet na voe kavet
+ Comment[bs]=Nijedno dovršavanje nije pronađeno
+ Comment[ca]=No s'ha trobat cap coincidència completable
+ Comment[cs]=Nenalezeno žádné vhodné doplnění
+@@ -384,13 +386,12 @@
+ Comment[sk]=Žiadna zhoda nebola nájdená
+ Comment[sl]=Ni najti ujemajočih se zadetkov
+ Comment[sr]=Подударна допуна није пронађена
+-Comment[sr@Latn]=Подударна допуна није пронађена
++Comment[sr@Latn]=Podudarna dopuna nije pronađena
+ Comment[sv]=Ingen matchande komplettering hittades
+ Comment[ta]=பொருத்தமான நிறைவு ஏதுமில்லை.
+ Comment[tg]=Ягон мувофиқат ёфт нашуд.
+ Comment[tr]=Eşleşme bulunamadı
+ Comment[uk]=Відповідного завершення не знайдено
+-Comment[xx]=xxNo matching completion was foundxx
+ Comment[zh_CN]=没有找到匹配的补全项
+ default_presentation=1
+ 
+@@ -464,13 +465,14 @@
+ Name[ven]=U fhela ha manwalwa: U elana hu tukunyana
+ Name[vi]=Textcompletion: Phù hợp một phần 
+ Name[xh]=Ugqibeko lokubhaliweyo: intelekiso engaphelelanga
+-Name[xx]=xxTextcompletion: partial matchxx
+ Name[zh_CN]=文字补齐：部分匹配
+ Name[zh_TW]=文字補齊︰部分匹配
+ Name[zu]=Ukuqedwa kokubhaliweyo: ukufaniswa kwesikhashana
+ Comment=There is more than one possible match
++Comment[af]=Daar is meer as een moontlik ooreenkoms
+ Comment[bg]=Повече от едно съвпадение са намерени
+ Comment[bn]=একাধিক সম্ভাব্য পরিপূরক বর্তমান
++Comment[br]=Tremen ur c'hendoare a zo
+ Comment[bs]=Postoji više od jednog mogućeg pogotka
+ Comment[ca]=Hi ha més d'una possible coincidència
+ Comment[cs]=Existuje více vhodných odpovídajících položek
+@@ -506,13 +508,12 @@
+ Comment[sk]=Existuje viac ako jedna zhoda
+ Comment[sl]=Mogoč je več kakor en zadetek
+ Comment[sr]=Постоји више од једног могућег подударања
+-Comment[sr@Latn]=Постоји више од једног могућег подударања
++Comment[sr@Latn]=Postoji više od jednog mogućeg podudaranja
+ Comment[sv]=Det finns mer än en möjlig träff
+ Comment[ta]=ஒன்றுக்கு மேற்பட்ட பொருத்தங்கள் உள்ளன.
+ Comment[tg]=Зиёд аз як мувофиқат ёфт шуд.
+ Comment[tr]=Birden fazla muhtemel eşleşme var
+ Comment[uk]=Більше одного відповідного значення
+-Comment[xx]=xxThere is more than one possible matchxx
+ Comment[zh_CN]=有多于一个的可能匹配项
+ default_presentation=1
+ 
+@@ -590,7 +591,6 @@
+ Name[vi]=Không thềEmềEfile 
+ Name[wa]=Dji n' sai drovi l' fitchî
+ Name[xh]=Ayinakuyivula Ifayile
+-Name[xx]=xxCannot Open Filexx
+ Name[zh_CN]=无法打开文件
+ Name[zh_TW]=無法打開檔案
+ Name[zu]=Ifayela Alivulekile
+@@ -651,7 +651,7 @@
+ Comment[sl]=Izbrane datoteke ni bilo moč odpreti za branje ali pisanje.
+ Comment[sq]=Skedari i zgjedhur nuk mund të hapet për lexim apo editim
+ Comment[sr]=Изабрани фајл је немогуће отворити ради читања или писања
+-Comment[sr@Latn]=Izabrani fajl je nemoguće otvoriti radi čitanja ili pisanja.
++Comment[sr@Latn]=Izabrani fajl je nemoguće otvoriti radi čitanja ili pisanja
+ Comment[ss]=lifayela lelikhetsiwe akukhonakali kutsi livulwe kutsi lifundvwe kumbe libhalwe
+ Comment[sv]=Den valda filen kan inte öppnas för läsning eller skrivning
+ Comment[ta]=தேர்வு செய்த கோப்பை வாசிக்கவோ எழுதவோ திறக்க முடியாது
+@@ -663,7 +663,6 @@
+ Comment[ven]=Faela yo nangwaho ingasi vulwe u vhala kana u nwala
+ Comment[vi]=File được chọn không thềEmềEđược đềEđọc hay viết 
+ Comment[xh]=Ifayile ekhethiweyo ayinakuvulelwa ukufunda okanye ukubhala
+-Comment[xx]=xxThe selected file cannot be opened for reading or writingxx
+ Comment[zh_CN]=选中的文件不能打开来读或写
+ Comment[zh_TW]=所選取的檔案無法開啟進行讀取或者是寫入
+ Comment[zu]=Ifayela elikhethiwe alingeke livulwe ukuze lifundwe ukufundwa noma ukubhalwa
+@@ -741,13 +740,14 @@
+ Name[vi]=Lỗi nghiêm trọng 
+ Name[wa]=Aroke moirt
+ Name[xh]=Imposiso Enengozi
+-Name[xx]=xxFatal Errorxx
+ Name[zh_CN]=致命错误
+ Name[zh_TW]=嚴重錯誤
+ Name[zu]=Iphutha Lengozi
+ Comment=There was a serious error causing the program to exit
++Comment[af]=Daar was 'n ernstige fout wat veroorsaak het dat die program beïendig is.
+ Comment[bg]=Появи се сериозна грешка, която предизвика прекъсване на програмата
+ Comment[bn]=একটি গুরুতর ত্রুটির দরুণ প্রোগ্রামটি থেমে গেছে
++Comment[br]=Ur fazi grevus a voe pennabeg mont er-maez ar goulev.
+ Comment[bs]=Program je morao završiti zbog ozbiljne greške
+ Comment[ca]=Hi ha hagut un error seriós que ha fet que el programa acabi
+ Comment[cs]=Nastala závažná chyba, která způsobila ukončení programu
+@@ -783,13 +783,12 @@
+ Comment[sk]=Vyskytla sa vážna chyba, ktorá spôsobila ukončenie programu
+ Comment[sl]=Program se je končal zaradi resne napake
+ Comment[sr]=Десила се озбиљна грешка, која је изазвала да се програм затвори
+-Comment[sr@Latn]=Десила се озбиљна грешка, која је изазвала да се програм затвори
++Comment[sr@Latn]=Desila se ozbiljna greška, koja je izazvala da se program zatvori
+ Comment[sv]=Ett allvarligt fel uppstod vilket fick programmet att avslutas
+ Comment[ta]=நிரலை வெளியேறச் செய்கிற அளவில் ஒரு பெரிய தவறுண்டு.
+ Comment[tg]=Нуқсони ҷиддие, ки ба баромадан аз барнома расонид.
+ Comment[tr]=Programın kapanmasına neden olan ciddi bir hata oluştu
+ Comment[uk]=Серйозна помилка стала причиною виходу програми
+-Comment[xx]=xxThere was a serious error causing the program to exitxx
+ Comment[zh_CN]=有一个严重的错误导致程序退出
+ default_presentation=2
+ level=4
+@@ -865,13 +864,14 @@
+ Name[vi]=Thông báo 
+ Name[wa]=Notifiaedje
+ Name[xh]=Isaziso
+-Name[xx]=xxNotificationxx
+ Name[zh_CN]=通知
+ Name[zh_TW]=通知
+ Name[zu]=Isaziso
+ Comment=Something special happened in the program
++Comment[af]=Iets spesiaal het met die program gebeur
+ Comment[bg]=В програмата се случи нещо неочаквано
+ Comment[bn]=প্রোগ্রামে বিশেষ কিছু একটা ঘটেছে
++Comment[br]=Un dra bennak dibar a c'hoarvezas gant ar goulev
+ Comment[bs]=Nešto posebno se desilo u programu
+ Comment[ca]=Ha passat quelcom d'especial al programa
+ Comment[cs]=Něco zvláštního se stalo s programem
+@@ -907,13 +907,12 @@
+ Comment[sk]=V programe sa udialo niečo neočakávané
+ Comment[sl]=V programu se je zgodilo nekaj izrednega
+ Comment[sr]=Нешто посебно се десило у програму
+-Comment[sr@Latn]=Нешто посебно се десило у програму
++Comment[sr@Latn]=Nešto posebno se desilo u programu
+ Comment[sv]=Någonting speciellt inträffade i programmet
+ Comment[ta]=நிரலில் ஏதோ விசேடம் நிகழ்ந்துள்ளது
+ Comment[tg]=Дар барнома ҳолати ногаҳонӣ рӯй дод
+ Comment[tr]=Programda özel bir durum meydana geldi
+ Comment[uk]=Щось особливе сталось у програмі
+-Comment[xx]=xxSomething special happened in the programxx
+ Comment[zh_CN]=程序中发生了特殊情况
+ default_presentation=1
+ default_sound=KDE_Beep.ogg
+@@ -992,13 +991,14 @@
+ Name[vi]=Cảnh cáo 
+ Name[wa]=Adviertixhmint
+ Name[xh]=Isilumkiso
+-Name[xx]=xxWarningxx
+ Name[zh_CN]=警告
+ Name[zh_TW]=警告
+ Name[zu]=Isexwayiso
+ Comment=There was an error in the program which may cause problems
++Comment[af]=Daar was 'n fout in die program wat dalk probleme kan veroorsaak
+ Comment[bg]=Появи се грешка, която може да предизвика проблеми
+ Comment[bn]=প্রোগ্রামে একটি ত্রুটি ছিল যার ফলে সমস্যা হতে পারে
++Comment[br]=Ur fazi a voe er goulev a c'hellfe bezañ pennabeg kudennoù.
+ Comment[bs]=Postoji greška u programu koja možda uzrokuje probleme.
+ Comment[ca]=Hi ha hagut un error en el programa que podria causar problemes
+ Comment[cs]=Nastala chyba v programu, která může způsobit problémy
+@@ -1034,13 +1034,12 @@
+ Comment[sk]=V programe sa vyskytla chyba, ktorá môže spôsobiť problémy
+ Comment[sl]=V programu je nastala napaka, ki lahko povzroči težave
+ Comment[sr]=Десила се грешка у програму која може изазвати проблеме
+-Comment[sr@Latn]=Десила се грешка у програму која може изазвати проблеме
++Comment[sr@Latn]=Desila se greška u programu koja može izazvati probleme
+ Comment[sv]=Det uppstod ett fel i programmet vilket kan orsaka problem
+ Comment[ta]=பிரச்னைகளை ஏற்படுத்தும் அளவிற்கு நிரலில் ஒரு தவறு இருந்தது.
+ Comment[tg]=Хатои барнома, ки метавон ба масъалаҳое оварад
+ Comment[tr]=Programda ciddi bir hata oluştu
+ Comment[uk]=Сталася серйозна помилка, яка може викликати проблеми
+-Comment[xx]=xxThere was an error in the program which may cause problemsxx
+ Comment[zh_CN]=程序中发生了可能导致问题的错误
+ default_presentation=2
+ level=2
+@@ -1114,15 +1113,16 @@
+ Name[ven]=Mutshinyalo
+ Name[vi]=Thảm hoạ 
+ Name[xh]=Ingozi enkulu
+-Name[xx]=xxCatastrophexx
+ Name[zh_CN]=严重问题
+ Name[zh_TW]=嚴重問題
+ Name[zu]=Inhlekelele
+ Comment=A very serious error occurred, at least causing the program to exit
++Comment[af]='n baie ernstige fout het voorgekom. Dit het veroorsaak dat ten minste die program beëindig is
+ Comment[ar]=حدث خطأ كبير سيؤدي على الأقل الى ايقاف البرنامج
+ Comment[az]=Çox ciddi bir xəta yarandə və proqramı çıxmağa məcbur etdi
+ Comment[bg]=Появи се сериозна грешка, която предизвика прекъсване на програмата
+ Comment[bn]=একটি গম্ভীর ত্রুটির ফলে প্রোগ্রামটি থেমে গেছে
++Comment[br]=Ur fazi grevus-tre a c'hoarvezas, a lakas d'an nebeutañ ar goulev da vont er-maez
+ Comment[bs]=Došlo je do vrlo ozbiljne greške koja je uzrokovala najmanje prekid programa
+ Comment[ca]=Hi ha hagut un error molt seriós, com a mínim ha causat la finalitzaciódel programa
+ Comment[cs]=Nastala velmi závažná chyba, která přinejmenším způsobila ukončení programu.
+@@ -1169,7 +1169,7 @@
+ Comment[sl]=Nastala je tako resna napaka, da se bo končal program.
+ Comment[sq]=Një gabim serioz ka ndodhur, së paku do të shkaktoj mbylljen e programit
+ Comment[sr]=Десила се веома озбиљна грешка, која ће у најмању руку проузроковати затварање програма
+-Comment[sr@Latn]=Desila se veoma ozbiljna greška, koja će u najmanju ruku prouzrokovati zatvaranje programa.
++Comment[sr@Latn]=Desila se veoma ozbiljna greška, koja će u najmanju ruku prouzrokovati zatvaranje programa
+ Comment[sv]=Ett väldigt allvarligt fel uppstod som åtminstone fick programmet att avslutas
+ Comment[ta]=நிரலை வெளியேறச் செய்யும் அளவில் ஒரு பெரிய தவறு ஏற்பட்டது
+ Comment[tg]=Нуқсони ҷиддӣ рӯй дод, ки чун минимум ба аз барнома баромадан расонид
+@@ -1177,7 +1177,6 @@
+ Comment[tr]=Programın kapanmasına neden olan ciddi bir hata oluştu ve programdan çıkıldı.
+ Comment[uk]=Сталася дуже серйозна помилка, яка, щонайменше, стала причиною виходу програми
+ Comment[uz]=Дастурнинг ишини якунланишига сабабчи бўлган жиддий хато рўй берди
+-Comment[xx]=xxA very serious error occurred, at least causing the program to exitxx
+ Comment[zh_CN]=出现了一个非常严重的错误，至少使程序退出
+ default_presentation=2
+ level=8
+@@ -1248,13 +1247,14 @@
+ Name[vi]=Đăng nhập 
+ Name[wa]=Elodjaedje
+ Name[xh]=Igama elithile
+-Name[xx]=xxLoginxx
+ Name[zh_CN]=登录
+ Name[zh_TW]=登入
+ Name[zu]=Ukungena ngaphakathi
+ Comment=KDE is starting up
++Comment[af]=Begin KDE Laai
+ Comment[bg]=Стартиране на системата
+ Comment[bn]=কে.ডি.ই. চালু হচ্ছে
++Comment[br]=Emañ o loc'hañ KDE
+ Comment[bs]=KDE se pokreće
+ Comment[ca]=S'està engegant el KDE
+ Comment[cs]=Spouští se prostředí KDE
+@@ -1291,14 +1291,13 @@
+ Comment[sk]=KDE sa spúšťa
+ Comment[sl]=KDE se zaganja
+ Comment[sr]=KDE се покреће
+-Comment[sr@Latn]=KDE се покреће
++Comment[sr@Latn]=KDE se pokreće
+ Comment[sv]=KDE startas
+ Comment[ta]=கேடிஇ ஆரம்பிக்கிறது
+ Comment[tg]=Оғози KDE
+ Comment[tr]=KDE masaüstü başlıyor
+ Comment[uk]=Триває запуск KDE
+ Comment[uz]=KDE ишга тушмоқда
+-Comment[xx]=xxKDE is starting upxx
+ Comment[zh_CN]=KDE 正在启动
+ default_presentation=1
+ default_sound=KDE_Startup_1.ogg
+@@ -1371,13 +1370,14 @@
+ Name[ven]=U litsha u shumisa khomupwutha
+ Name[wa]=Dislodjaedje
+ Name[xh]=Phuma ngaphandle
+-Name[xx]=xxLogoutxx
+ Name[zh_CN]=注消
+ Name[zh_TW]=登出
+ Name[zu]=Phumela ngaphandle
+ Comment=KDE is exiting
++Comment[af]=KDE is besig om toe te maak
+ Comment[bg]=Спиране на системата
+ Comment[bn]=কে.ডি.ই. বন্ধ করা হচ্ছে
++Comment[br]=Emañ o kuitaat KDE
+ Comment[bs]=KDE se zatvara
+ Comment[ca]=S'està aturant el KDE
+ Comment[cs]=Ukončuje se prostředí KDE
+@@ -1414,14 +1414,13 @@
+ Comment[sk]=KDE sa ukončuje
+ Comment[sl]=KDE se končuje
+ Comment[sr]=KDE се завршава
+-Comment[sr@Latn]=KDE се завршава
++Comment[sr@Latn]=KDE se završava
+ Comment[sv]=KDE avslutas
+ Comment[ta]=கேடிஇ வெளிச்செல்கிறது
+ Comment[tg]=Баромад аз KDE
+ Comment[tr]=KDE'den çıkılıyor
+ Comment[uk]=Триває завершення роботи KDE
+ Comment[uz]=KDE ишини якунламоқда
+-Comment[xx]=xxKDE is exitingxx
+ Comment[zh_CN]=KDE 正在退出
+ default_presentation=1
+ default_sound=KDE_Logout_3.ogg
+@@ -1497,15 +1496,16 @@
+ Name[vi]=Lỗi khi in 
+ Name[wa]=Aroke d' imprimaedje
+ Name[xh]=Imposiso yoshicilelo
+-Name[xx]=xxPrint errorxx
+ Name[zh_CN]=打印错误
+ Name[zh_TW]=列印錯誤
+ Name[zu]=Iphutha lokushicelela
+ Comment=A print error has occurred
++Comment[af]='n Druk fout het voorgekom
+ Comment[ar]=حدث خطأ في الطباعة
+ Comment[az]=Çap xətası baş verdi
+ Comment[bg]=Грешка при печат
+ Comment[bn]=ছাপানোয় সমস্যা দেখা দিয়েছে
++Comment[br]=Degouezhet ez eus ar fazi gant ar voullerez
+ Comment[bs]=Došlo je do greške pri štampanju
+ Comment[ca]=Hi ha hagut un error d'impressió
+ Comment[cs]=Došlo k chybě tisku
+@@ -1561,7 +1561,6 @@
+ Comment[uk]=Сталася помилка друку
+ Comment[uz]=Босиб чиқариш хатоси рўй берди
+ Comment[wa]=Åk n' a nén stî tot-z imprimant
+-Comment[xx]=xxA print error has occurredxx
+ Comment[zh_CN]=发生了打印错误
+ Comment[zh_TW]=列印時發生錯誤
+ default_presentation=2
+@@ -1569,6 +1568,7 @@
+ 
+ [messageInformation]
+ Name=Information message
++Name[af]=Inligting boodskap
+ Name[ar]=رسالة المعلومات
+ Name[az]=Mə'lumat ismarışı
+ Name[be]=Інфармацыйнае паведамленьне
+@@ -1629,9 +1629,9 @@
+ Name[uk]=Інформаційне повідомлення
+ Name[uz]=Маълумот хабари
+ Name[wa]=Messaedje d' informåcion
+-Name[xx]=xxInformation messagexx
+ Name[zh_CN]=信息性消息
+ Comment=An information message is being shown
++Comment[af]='n Informasie boodskap word vertoon
+ Comment[ar]=تظهر الآن رسالة معلوماتية
+ Comment[az]=Mə'lumat ismarışı göstərilir
+ Comment[bg]=Показване на уведомително съобщение (Информация)
+@@ -1691,7 +1691,6 @@
+ Comment[uk]=Показується інформативне повідомлення
+ Comment[uz]=Маълумот хабари кўрсатилди
+ Comment[wa]=On messaedje d' informåcion est håyné
+-Comment[xx]=xxAn information message is being shownxx
+ Comment[zh_CN]=正在显示信息性消息
+ default_sound=KDE_Chimes_2.ogg
+ default_presentation=65
+@@ -1699,6 +1698,7 @@
+ 
+ [messageWarning]
+ Name=Warning message
++Name[af]=Waarskuwing boodskap
+ Name[ar]=رسالة تحذيرية
+ Name[az]=Xəbərdarlıq ismarışı
+ Name[be]=Папярэджаньне
+@@ -1759,9 +1759,9 @@
+ Name[uk]=Попередження
+ Name[uz]=Огоҳнома хабари
+ Name[wa]=Messaedje d' adviertixhmint
+-Name[xx]=xxWarning messagexx
+ Name[zh_CN]=警告消息
+ Comment=A warning message is being shown
++Comment[af]='n Waarskuwing boodskap word vertoon
+ Comment[ar]=تظهر الآن رسالة تحذيرية
+ Comment[az]=Xəbərdarlıq ismarışı göstərilir
+ Comment[bg]=Показване на предупредително съобщение (Предупреждение)
+@@ -1820,7 +1820,6 @@
+ Comment[uk]=Показується повідомлення з попередженням
+ Comment[uz]=Огоҳнома хабари кўрсатилди
+ Comment[wa]=On messaedje d' adviertixhmint est håyné
+-Comment[xx]=xxA warning message is being shownxx
+ Comment[zh_CN]=正在显示警告消息
+ Comment[zh_TW]=警告訊息已顯示
+ default_sound=KDE_Error_1.ogg
+@@ -1830,6 +1829,7 @@
+ 
+ [messageCritical]
+ Name=Critical message
++Name[af]=Kritiese boodskap
+ Name[ar]=رسالة هامَة
+ Name[az]=Kritik ismarış
+ Name[bg]=Грешка
+@@ -1887,9 +1887,9 @@
+ Name[uk]=Критична помилка
+ Name[uz]=Муаммо хабари
+ Name[wa]=Messaedje critike
+-Name[xx]=xxCritical messagexx
+ Name[zh_CN]=关键消息
+ Comment=A critical message is being shown
++Comment[af]='n Kritiese boodskap word vertoon
+ Comment[ar]=تظهر الآن رسالة مهمَة
+ Comment[az]=Kritik ismarış göstərilir
+ Comment[bg]=Показване на съобщение за грешка (Грешка)
+@@ -1947,7 +1947,6 @@
+ Comment[uk]=Показується повідомлення про критичну помилку
+ Comment[uz]=Муаммо хабари кўрсатилди
+ Comment[wa]=On messaedje critike est håyné
+-Comment[xx]=xxA critical message is being shownxx
+ Comment[zh_CN]=正在显示关键消息
+ Comment[zh_TW]=嚴重的警告訊息已顯示
+ default_sound=KDE_Glass_Break.ogg
+@@ -1957,6 +1956,7 @@
+ 
+ [messageboxQuestion]
+ Name=Question
++Name[af]=Vraag
+ Name[ar]=سؤال
+ Name[az]=Sual
+ Name[be]=Пытаньне
+@@ -2017,13 +2017,14 @@
+ Name[uk]=Запитання
+ Name[uz]=Савол
+ Name[wa]=Kesse
+-Name[xx]=xxQuestionxx
+ Name[zh_CN]=问题
+ Comment=A question is being asked
++Comment[af]='n Vraag word gevra
+ Comment[ar]=هناك سؤال يتم سؤاله
+ Comment[az]=Sual ismarışı göstərilir
+ Comment[bg]=Показване на въпросително съобщение (Въпрос)
+ Comment[bn]=একটি প্রশ্ন করা হচ্ছে
++Comment[br]=Emañ o c'houlleniñ ur goulenn
+ Comment[bs]=Postavljeno je pitanje
+ Comment[ca]=Farà una pregunta
+ Comment[cs]=Je položena otázka
+@@ -2079,7 +2080,6 @@
+ Comment[uk]=Показується запитання
+ Comment[uz]=Савол берилди
+ Comment[wa]=Ene kesse est dmandêye
+-Comment[xx]=xxA question is being askedxx
+ Comment[zh_CN]=正在提问
+ Comment[zh_TW]=問題已經在詢問中
+ default_sound=KDE_Vox_Ahem.ogg
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdecore/kapplication.h kdelibs_3_4_BRANCH/kdecore/kapplication.h
+--- kdelibs_3_4_0_RELEASE/kdecore/kapplication.h	2005-02-22 10:06:46.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdecore/kapplication.h	2005-03-12 18:58:42.000000000 +0100
+@@ -169,7 +169,7 @@
+ #endif
+ 
+   /**
+-   * @deprecated do not use it at all, it will make your application crash, use KCmdineArgs
++   * @deprecated do not use it at all, it will make your application crash, use KCmdLineArgs
+    *
+    * Constructor. Parses command-line arguments.
+    *
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdecore/kkeynative_x11.cpp kdelibs_3_4_BRANCH/kdecore/kkeynative_x11.cpp
+--- kdelibs_3_4_0_RELEASE/kdecore/kkeynative_x11.cpp	2005-02-11 21:48:51.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdecore/kkeynative_x11.cpp	2005-03-18 18:12:01.540364569 +0100
+@@ -79,9 +79,11 @@
+ #ifdef Q_WS_X11
+ bool KKeyNative::init( const XEvent* pEvent )
+ {
++	KeySym keySym;
+ 	m_code = pEvent->xkey.keycode;
+ 	m_mod = pEvent->xkey.state;
+-	XLookupString( (XKeyEvent*) pEvent, 0, 0, (KeySym*) &m_sym, 0 );
++	XLookupString( (XKeyEvent*) pEvent, 0, 0, &keySym, 0 );
++	m_sym = (uint) keySym;
+ 	return true;
+ }
+ #endif
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdecore/kkeyserver_x11.cpp kdelibs_3_4_BRANCH/kdecore/kkeyserver_x11.cpp
+--- kdelibs_3_4_0_RELEASE/kdecore/kkeyserver_x11.cpp	2005-02-10 18:33:01.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdecore/kkeyserver_x11.cpp	2005-03-18 18:12:01.665343224 +0100
+@@ -756,6 +756,7 @@
+ 
+ bool codeXToSym( uchar codeX, uint modX, uint& sym )
+ {
++	KeySym keySym;
+ 	XKeyPressedEvent event;
+ 
+ 	event.type = KeyPress;
+@@ -763,7 +764,8 @@
+ 	event.state = modX;
+ 	event.keycode = codeX;
+ 
+-	XLookupString( &event, 0, 0, (KeySym*) &sym, 0 );
++	XLookupString( &event, 0, 0, &keySym, 0 );
++	sym = (uint) keySym;
+ 	return true;
+ }
+ #endif //!Q_WS_WIN
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdecore/kwin.h kdelibs_3_4_BRANCH/kdecore/kwin.h
+--- kdelibs_3_4_0_RELEASE/kdecore/kwin.h	2005-01-27 08:33:21.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdecore/kwin.h	2005-03-12 18:58:45.000000000 +0100
+@@ -63,7 +63,7 @@
+ public:
+ 
+     /**
+-     * Requests that window @p is activated.
++     * Requests that window @p win is activated.
+      *
+      * There are two ways how to activate a window, by calling
+      * activateWindow() and forceActiveWindow(). Generally,
+@@ -84,7 +84,7 @@
+      * package (kdebase/kwin/README), or ask on the kwin@kde.org
+      * mailing list.
+      *
+-     * @param win the if of the window to make active
++     * @param win the id of the window to make active
+      * @param time X server timestamp of the user activity that
+      *    caused this request
+      * @since 3.2
+@@ -99,7 +99,7 @@
+      * and similar tools. See the explanation in description
+      * of activateWindow().
+      *
+-     * @param win the if of the window to make active
++     * @param win the id of the window to make active
+      * @param time X server timestamp of the user activity that
+      *    caused this request
+      *
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdecore/network/kresolver.cpp kdelibs_3_4_BRANCH/kdecore/network/kresolver.cpp
+--- kdelibs_3_4_0_RELEASE/kdecore/network/kresolver.cpp	2005-03-04 19:31:24.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdecore/network/kresolver.cpp	2005-03-18 18:12:05.244731914 +0100
+@@ -894,7 +894,7 @@
+ 
+   // Do we allow IDN names for this TLD?
+   if (input.count() && !idnDomains->contains(input[input.count()-1].lower()))
+-    return unicodeDomain.latin1(); // No IDN allowed for this TLD
++    return unicodeDomain.lower().latin1(); // No IDN allowed for this TLD
+ 
+   // 3) decide whether to enforce the STD3 rules for chars < 0x7F
+   // we don't enforce
+@@ -942,7 +942,7 @@
+ 
+   // Do we allow IDN names for this TLD?
+   if (input.count() && !idnDomains->contains(input[input.count()-1].lower()))
+-    return asciiDomain; // No TLDs allowed
++    return asciiDomain.lower(); // No TLDs allowed
+ 
+   // 3) decide whether to enforce the STD3 rules for chars < 0x7F
+   // we don't enforce
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdecore/network/kresolverstandardworkers.cpp kdelibs_3_4_BRANCH/kdecore/network/kresolverstandardworkers.cpp
+--- kdelibs_3_4_0_RELEASE/kdecore/network/kresolverstandardworkers.cpp	2005-03-03 01:48:59.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdecore/network/kresolverstandardworkers.cpp	2005-03-18 18:12:05.336716204 +0100
+@@ -76,18 +76,29 @@
+ }
+ 
+ // blacklist management
++static QMutex blacklistMutex;	// KDE4: change to a QReadWriteLock
+ QStringList KBlacklistWorker::blacklist;
+ 
+ void KBlacklistWorker::init()
+ {
++  // HACK!
++  // FIXME KDE4: How do I detect there is an instance, without triggering
++  // its creation or an assertion fault?
++  if (!KGlobal::_instance)
++    return;
++
++  static bool beenhere = false;
++
++  if (beenhere)
++    return;
++
++  beenhere = true;
+   loadBlacklist();
+ }
+ 
+ void KBlacklistWorker::loadBlacklist()
+ {
+-  if (!kapp)
+-    return;
+-
++  QMutexLocker locker(&blacklistMutex);
+   QStringList filelist = KGlobal::dirs()->findAllResources("config", "ipv6blacklist");
+ 
+   QStringList::ConstIterator it = filelist.constBegin(),
+@@ -122,6 +133,8 @@
+ // it matches the domain ending part
+ bool KBlacklistWorker::isBlacklisted(const QString& host)
+ {
++  KBlacklistWorker::init();
++
+   // empty hostnames cannot be blacklisted
+   if (host.isEmpty())
+     return false;
+@@ -129,6 +142,8 @@
+   // KDE4: QLatin1String
+   QString ascii = QString::fromLatin1(KResolver::domainToAscii(host));
+ 
++  QMutexLocker locker(&blacklistMutex);
++
+   // now find out if this hostname is present
+   QStringList::ConstIterator it = blacklist.constBegin(),
+     end = blacklist.constEnd();
+@@ -1004,8 +1019,6 @@
+ 
+ void KNetwork::Internal::initStandardWorkers()
+ {
+-  KBlacklistWorker::init();
+-
+   //KResolverWorkerFactoryBase::registerNewWorker(new KResolverWorkerFactory<KBlacklistWorker>);
+   KResolverWorkerFactoryBase::registerNewWorker(new KResolverWorkerFactory<KStandardWorker>);
+ 
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdecore/network/ksockssocketdevice.cpp kdelibs_3_4_BRANCH/kdecore/network/ksockssocketdevice.cpp
+--- kdelibs_3_4_0_RELEASE/kdecore/network/ksockssocketdevice.cpp	2004-09-22 17:30:59.000000000 +0200
++++ kdelibs_3_4_BRANCH/kdecore/network/ksockssocketdevice.cpp	2005-03-12 18:58:45.000000000 +0100
+@@ -118,7 +118,23 @@
+   if (m_sockfd == -1 && !create(address))
+     return false;		// failed creating!
+ 
+-  if (KSocks::self()->connect(m_sockfd, address.address(), address.length()) == -1)
++  int retval;
++  if (KSocks::self()->hasWorkingAsyncConnect())
++    retval = KSocks::self()->connect(m_sockfd, address.address(), 
++				     address.length());
++  else
++    {
++      // work around some SOCKS implementation bugs
++      // we will do a *synchronous* connection here!
++      // FIXME: KDE4, write a proper SOCKS implementation
++      bool isBlocking = blocking();
++      setBlocking(true);
++      retval = KSocks::self()->connect(m_sockfd, address.address(), 
++				       address.length());
++      setBlocking(isBlocking);
++    }
++
++  if (retval == -1)
+     {
+       if (errno == EISCONN)
+ 	return true;		// we're already connected
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kded/kdedmodule.desktop kdelibs_3_4_BRANCH/kded/kdedmodule.desktop
+--- kdelibs_3_4_0_RELEASE/kded/kdedmodule.desktop	2005-02-23 06:04:25.000000000 +0100
++++ kdelibs_3_4_BRANCH/kded/kdedmodule.desktop	2005-03-12 18:58:45.000000000 +0100
+@@ -3,7 +3,6 @@
+ Type=ServiceType
+ X-KDE-ServiceType=KDEDModule
+ Comment=KDED Module
+-Comment[af]=Kded Module
+ Comment[ar]=وحدة KDED
+ Comment[az]=KDED Modulu
+ Comment[be]=Модуль KDED
+@@ -70,7 +69,6 @@
+ Comment[ven]=Modulu wa KDED
+ Comment[vi]=Mô đun KDED 
+ Comment[xh]=KDED Isichatshulwa
+-Comment[xx]=xxKDED Modulexx
+ Comment[zh_CN]=KDED 模块
+ Comment[zh_TW]=KDED 模組
+ Comment[zu]=Ingxenye ye-KDED
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kded/test/test.desktop kdelibs_3_4_BRANCH/kded/test/test.desktop
+--- kdelibs_3_4_0_RELEASE/kded/test/test.desktop	2005-02-23 06:04:26.000000000 +0100
++++ kdelibs_3_4_BRANCH/kded/test/test.desktop	2005-03-12 18:58:45.000000000 +0100
+@@ -75,7 +75,6 @@
+ Name[ven]=Modulu ya mulingo wa KDED
+ Name[vi]=Mô đun thử nghiệm KDED 
+ Name[xh]=Isichatshulwa Sovavanyo lwe KDED
+-Name[xx]=xxKDED Test Modulexx
+ Name[zh_CN]=KDED 测试模块
+ Name[zh_TW]=KDED 測試模組
+ Name[zu]=Ingxenye Yokuvivinya ye-KDED
+@@ -146,7 +145,6 @@
+ Comment[ven]=Modulu ya mulingo ya KDED
+ Comment[vi]=Mô đun thử nghiệm cho KDED 
+ Comment[xh]=Isichatshulwa Sovavavanyo lwe KDED
+-Comment[xx]=xxA Test Module for KDEDxx
+ Comment[zh_CN]=KDED 的测试模块
+ Comment[zh_TW]=KDED 的測試模組
+ Comment[zu]=Ingxenye Yokuvivinya ye-KDED
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeprint/cups/cups.print kdelibs_3_4_BRANCH/kdeprint/cups/cups.print
+--- kdelibs_3_4_0_RELEASE/kdeprint/cups/cups.print	2005-02-23 06:04:29.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeprint/cups/cups.print	2005-03-12 18:58:45.000000000 +0100
+@@ -49,7 +49,6 @@
+ Comment[ven]=CUPS (Maitele au phirintha a UNIX zwao)
+ Comment[wa]=CUPS (Comon Sistinme d' Imprimaedje po UNIX)
+ Comment[xh]=CUPS (Indlela Elula Yoshicilelo lwe UNIX)
+-Comment[xx]=xxCUPS (Common UNIX Print System)xx
+ Comment[zh_CN]=CUPS (通用 Unix 打印系统)
+ Comment[zh_TW]=CUPS (通用 Unix 列印系統)
+ Comment[zu]=CUPS (Isistimu Yokushicilela ye-Unix Eyejwayelekile)
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeprint/ext/ext.print kdelibs_3_4_BRANCH/kdeprint/ext/ext.print
+--- kdelibs_3_4_0_RELEASE/kdeprint/ext/ext.print	2005-02-23 06:04:29.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeprint/ext/ext.print	2005-03-12 18:58:45.000000000 +0100
+@@ -65,7 +65,6 @@
+ Comment[ven]=Phirinthani nga Mbekanyamushumo yanga nnda (tshigwada)
+ Comment[wa]=Imprimer åd truviè d' on dfoûtrin programe (djenerike)
+ Comment[xh]=Shicilela Ngapha Kodweliso lwenkqubo olungaphandle (ngokubanzi)
+-Comment[xx]=xxPrint Through an External Program (generic)xx
+ Comment[zh_CN]=通过外部程序打印(通用)
+ Comment[zh_TW]=使用外部程式進行列印 (一般)
+ Comment[zu]=Shicilela Ngokwedlulela Kuhlelo lwemisebenzi Langaphandle (okukawonke wonke)
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeprint/filters/enscript.desktop kdelibs_3_4_BRANCH/kdeprint/filters/enscript.desktop
+--- kdelibs_3_4_0_RELEASE/kdeprint/filters/enscript.desktop	2005-02-23 06:04:29.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeprint/filters/enscript.desktop	2005-03-12 18:58:45.000000000 +0100
+@@ -15,13 +15,13 @@
+ Name[sv]=Enscript
+ Name[ta]=என்ஸ்கிரிப்ட்
+ Name[xh]=okushicilelwe phantsi kuyo
+-Name[xx]=xxenscriptxx
+ Require=exec:/enscript
+ Comment=Enscript Text Filter
+ Comment[af]=Gravering Teks Filter
+ Comment[ar]=مرشح نصوص Enscript
+ Comment[az]=Enscript Mətn Filtri
+ Comment[bn]=enscript টেক্সট ফিল্টার
++Comment[br]=Sil skrid Enscript
+ Comment[bs]=Enscript tekst filter
+ Comment[ca]=Filtre de texts enscript
+ Comment[cs]=Textový filtr Enscript
+@@ -80,7 +80,6 @@
+ Comment[ven]=Nwalani ya filithara ya manwalwa
+ Comment[wa]=Passete po-z imprimer do peur tecse avou enscript
+ Comment[xh]=Enscript Uhluzo Lombhalo
+-Comment[xx]=xxEnscript Text Filterxx
+ Comment[zh_CN]=Enscript 文本过滤程序
+ Comment[zh_TW]=Enscript 文字過濾器
+ Comment[zu]=Qopha Ihluzo Lombhalo
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeprint/filters/imagetops.desktop kdelibs_3_4_BRANCH/kdeprint/filters/imagetops.desktop
+--- kdelibs_3_4_0_RELEASE/kdeprint/filters/imagetops.desktop	2005-02-23 06:04:29.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeprint/filters/imagetops.desktop	2005-03-12 18:58:45.000000000 +0100
+@@ -17,7 +17,6 @@
+ Name[sv]=Bildtoppar
+ Name[ta]=மேல்பிம்பங்கள்
+ Name[ven]=Zwa ntha zwa zwifanyiso
+-Name[xx]=xximagetopsxx
+ Name[zu]=uphahla lwesithombe
+ Require=exec:/imagetops
+ Comment=Generic Image to PS Filter
+@@ -85,7 +84,6 @@
+ Comment[ven]=Tshifanyiso kha tshigwada kha filithara ya PS
+ Comment[wa]=Passete djenerike imådjes viè PostScript
+ Comment[xh]=Umfanekiso ngokubanzi kwicebo lokucoca ulwelo le PS
+-Comment[xx]=xxGeneric Image to PS Filterxx
+ Comment[zh_CN]=通用图像到 PS 过滤程序
+ Comment[zh_TW]=一般圖檔轉成 PS 的過濾器
+ Comment[zu]=Isithombe Sawowonke Sehluzo le-PS
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeprint/filters/pdfwrite.desktop kdelibs_3_4_BRANCH/kdeprint/filters/pdfwrite.desktop
+--- kdelibs_3_4_0_RELEASE/kdeprint/filters/pdfwrite.desktop	2005-02-23 06:04:29.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeprint/filters/pdfwrite.desktop	2005-03-12 18:58:45.000000000 +0100
+@@ -12,7 +12,6 @@
+ Name[ta]=பிடிஎஃப் எழுதி
+ Name[tr]=pdfyaz
+ Name[ven]=pdfnwala
+-Name[xx]=xxpdfwritexx
+ Name[zu]=bhala kwe-pdf
+ Require=exec:/gs
+ Comment=PDF Writer (needs Ghostscript)
+@@ -20,6 +19,7 @@
+ Comment[ar]=كاتب ملفات PDF (يحتاج الى غوست سكريبت)
+ Comment[az]=PDF Yazıcı (Ghostscript-ə ehtiyacı var)
+ Comment[bn]=পি-ডি-এফ (PDF) Writer (ঘোস্টস্ক্রিপ্ট লাগে)
++Comment[br]=Skriver PDF (red eo da endevout Ghostscript)
+ Comment[bs]=Pravljenje PDFa (potreban je GhostScript)
+ Comment[ca]=Escriptor de PDF (necessita Ghostscript)
+ Comment[cs]=PDF writer (vyžaduje GhostScript)
+@@ -80,7 +80,6 @@
+ Comment[ven]=Munwali wa PDF (I toda bammbiri la tshipuku)
+ Comment[wa]=Fijheu di fitchîs PDF (a mezåjhe di Ghostscript)
+ Comment[xh]=Umbhali we PDF (ufuna i Ghostscript)
+-Comment[xx]=xxPDF Writer (needs Ghostscript)xx
+ Comment[zh_CN]=PDF 书写器 (需要 GhostScript)
+ Comment[zh_TW]=PDF 產生器 (需要 GhostScript)
+ Comment[zu]=Umbhali we-PDF (idinga i-Ghostscript)
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeprint/filters/poster.desktop kdelibs_3_4_BRANCH/kdeprint/filters/poster.desktop
+--- kdelibs_3_4_0_RELEASE/kdeprint/filters/poster.desktop	2005-02-23 06:04:29.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeprint/filters/poster.desktop	2005-03-12 18:58:45.000000000 +0100
+@@ -62,11 +62,11 @@
+ Comment[ven]=Phirinthani ya phosithara
+ Comment[wa]=Imprimaedje poster
+ Comment[xh]=Ushicilelo Lwephepha elinomyalezo
+-Comment[xx]=xxPoster Printingxx
+ Comment[zh_CN]=海报打印
+ Comment[zh_TW]=海報列印
+ Comment[zu]=Ukushicilela Kwebhodi lezithombe
+ Description=Utility to print large posters on multiple small paper sheets. To use this command, the <b>poster</b> executable must be accessible in your <tt>PATH</tt>. Source code for this utility can be on the <a href="http://printing.kde.org/downloads">KDEPrint web site</a>. <p><b><u>WARNING:</u></b> The package found on the KDEPrint web site is a modified version of the original one that can be found on any CTAN archive mirror, but the original package will <b>not</b> work with KDE. You <b>must</b> use the package found on the <a href="http://printing.kde.org/downloads">KDEPrint web site</a>.
++Description[af]=Program wat jou toelaat om groot plakate op veelvuldige kleiner blaaie te druk. Om hierdie opdrag te gebruik moet die <b>poster</b> program in jou <tt>soekpad</tt> beskikbaar wees. Bronkode vir hierdie program is beskikbaar vanaf die <a href="http://printing.kde.org/downloads">KDEPrint web bediener</a>. 
+ Description[ar]=أداة لطباعة ملصقات عريضة على أوراق صغيرة عديدة. لإستعمال هذا الأمر، يجب أن يكون البرنامج <b>poster</b> في ال<tt>PATH</tt>. الشفرة المصدرية لهذه الأداة توجد على <a href="http://printing.kde.org/downloads">موقع ويب KDEPrint</a>. <p><b><u>تحذير:</u></b> الحزمة الموجودة على موقع ويب KDEPrint هي نسخة مغيرة من النسخة الأصلية و التي يمكن أن تجدها في أي مرآة ارشيف CTAN، لكن الحزمة الأصلية <b>لن </b> تعمل مع كيدي. يجب استعمال الحزمة الموجودة على <a href="http://printing.kde.org/downloads">موقع ويب KDEPrint</a>.
+ Description[az]=Böyük posterləri kiçik kağızlara çap etməyə yardım edən vasitə.
+ Description[bg]=Програма за печат на големи постери (плакати) на няколко малки листа. За да използвате командата <b>poster</b>, тя трябва да е в директория описана от системната променлива <tt>PATH</tt>. Изходният код на тази програма може да бъде намерен на страницата на <a href="http://printing.kde.org/downloads">системата за печат в КДЕ</a>. <p><b><u>ВНИМАНИЕ:</u></b> Програмата, която се намира на сайта на КДЕ, е модифицирана версия на оригиналната програма, която може да бъде намерена на в архивите на CTAN. Оригиналната програма <b>НЕ</b> работи със системата за печат в КДЕ. Така, че трябва да използвате модифицираната версия на програмата, която се намира на страницата на <a href="http://printing.kde.org/downloads">системата за печат в КДЕ</a>.
+@@ -114,7 +114,7 @@
+ Description[sl]=Orodje za tiskanje velikih posterjev na majhnih listih papirja. Za uporabo tega ukaza mora biti izvedljiva datoteka <b>poster</b> v vaši poti <tt>PATH</tt>. Izvirna koda za to orodje je na voljo na <a href="http://printing.kde.org/downloads">spletni strani KDEPrint</a>. <p><b><u>OPOZORILO:</u></b> Paket, ki je na strani KDEPrint je spremenjena različica originalne, ki je na voljo na vsakem zrcalnem strežniku arhivov CTAN, vendar pa ta <b>ne</b> dela s KDE. Uporabiti <b>morate</b> paket s <a href="http://printing.kde.org/downloads">spletne strani KDEPrint</a>.
+ Description[sq]=Vegël për shtypjen edhe ndarjen e pllakatave në letra të vogla. Për ta përdorur këtë komandë, <b>pllakata</b> ekzekutuese duhet të jetë  e arrijshme në <tt>PATH</tt> e juaj. Kodi burimor për këtë vegël mund të gjindet në <a href="http://printing.kde.org/downloads">Web Faqën KDEPrint</a>. <p><b><u>VËREJTJE:</u></b> Pako e gjetur në web faqën e KDEPrint është verzion i ndryshuar nga origjinali, ky verzion mund të gjindet në çdo web faqe arkivore të CTAN pasqyrave, por verzioni origjinal <b>nuk punon</b> me sistemin KDE. Ju <b>duheni</b> ta përdorni pakon që gjendet në këtë web faqe: <a href="http://printing.kde.org/downloads">Web Faqja KDEPrint</a>.
+ Description[sr]=Алатка за штампање великих постера на више малих папира. Да би сте користили ову наредбу, извршни фајл <b>poster</b> мора бити приступачан кроз ваш <tt>PATH(путању)</tt>. Изворни код овог алата можете наћи на <a href="http=://printing.kde.org/downloads">KDEPrint веб сајту</a>. <p><b><u>Упозорење:</u></b> Пакет који се налази на KDE Print веб сајту је измењена верзија оригинала који се може наћи на било ком CTAN огледалу, али оригинални пакет <b>неће</b> радити са KDE-ом. <b>Морате</b> користити пакет са <a href="http://printing.kde.org/downloads">KDEPrint веб сајта</a>.
+-Description[sr@Latn]=Alatka za štampanje velikih postera na više malih papira. Da bi ste koristili ovu naredbu, <b>poster</b> izvršni fajl mora biti pristupačan kroz vaš <tt>PATH(putanju)</tt>. Izvorni kod ovog alata možete naći na <a href=" http=://printing.kde.org/downloads">KDEPrint veb sajtu</a>. <p><b><u>Upozorenje:</u></b> Paket koji se nalazi na KDE Print veb sajtu je izmenjena verzija originala koji se može naći na bilo kom CTAN ogledalu, ali originalni paket <b>neće</b> raditi sa KDE-om. <b>Morate</b> koristiti paket sa <a href="http://printing.kde.org/downloads">KDEPrint veb sajta</a>.
++Description[sr@Latn]=Alatka za štampanje velikih postera na više malih papira. Da bi ste koristili ovu naredbu, izvršni fajl <b>poster</b> mora biti pristupačan kroz vaš <tt>PATH(putanju)</tt>. Izvorni kod ovog alata možete naći na <a href="http=://printing.kde.org/downloads">KDEPrint veb sajtu</a>. <p><b><u>Upozorenje:</u></b> Paket koji se nalazi na KDE Print veb sajtu je izmenjena verzija originala koji se može naći na bilo kom CTAN ogledalu, ali originalni paket <b>neće</b> raditi sa KDE-om. <b>Morate</b> koristiti paket sa <a href="http://printing.kde.org/downloads">KDEPrint veb sajta</a>.
+ Description[sv]=Verktyg för att skriva ut stora affischer på flera små blad. För att använda kommandot måste det körbara programmet <b>poster</b> vara tillgängligt i <tt>PATH</tt>. Källkod för detta verktyg kan finnas på <a href="http://printing.kde.org/downloads">KDEPrints webbplats</a>. <p><b><u>Varning:</u></b> Paketet som finns på KDEPrints webbplats är en ändrad version av originalet som finns på alla CTAN-arkivplatser. Men originalpaketet fungerar <b>inte</b> med KDE, man <b>måste</b> använda paketet som finns på <a href="http://printing.kde.org/downloads">KDEPrints webbplats</a>.
+ Description[ta]=பலவித சிறிய தாள்களில் பெரிய போஸ்டர்களை அச்சிப்பதற்கான பயன்பாடு. இந்த கட்டளையை பயன்படுத்த <b>போஸ்டர் </b>நிறுவல் அணுகக்கூடியதாக <tt>உங்கள் பாதை இருக்க வேண்டும்</tt>. இந்த பயன்பாட்டுக்கான மூல குறியீடு கேடிஇஅச்சு வலைதளத்தில் <a href="http://printing.kde.org/downloads">இருக்கும்</a>. <p><b><u>எச்சரிக்கை:</u></b>கேடிஇ அச்சு வலைத்தளத்தில் காணப்படும் தொகுப்பு மாற்றப்பட்டுள்ளது. இது எல்லா CTAN காப்பத்திலும் காணப்படும்.ஆனால் அசல் தொகுப்பு கேடிஇயுடன் இயங்காது.நீங்கள் <b></b> <a href="http://printing.kde.org/downloads">கேடிஇஅச்சு வலைதளத்தில்</a> உள்ள தொகுப்பைத்தான் பயன்படுத்த வேண்டும்</a>.
+ Description[tg]=Барномаҳои барои чопи сатроҳои бузург барои сафҳоти коғаз купак барои истифода аз ин дастури<b>poster</b> бояд дар<tt>PATH-и</tt> шумо кобали дастурӣ бошад . Коди марҷа ин обзор метавонад дар<a href="http://printing.kde.org/downloads"> KDEPrint сйти Вэб ёфта шавад.</a>. <p><b><u>Огоҳӣ:</u></b> Пакете, ки нусхаи таъғиршуда буд, дар Вэби KDEPrint ёфта шуд , ва он дар ягон CTAN archive mirror мумкин аст ки ёбад ,лекин нусхаи аслиаш <b>дар KDE</b> кор намекунад. Шумо<b>бояд</b> пакети ёфташударо истифода кунед дар<a href="http://printing.kde.org/downloads">KDEPrint web site</a>.
+@@ -123,7 +123,6 @@
+ Description[ven]=Tshitikedzi khau phirintha dziphosithara khulwane kha ma bammbiri matuku manzhi. U shumisa muthetho uyu, <b>Phosithara</b> zwinotumulea zwi fanela u dzhenea kha <tt>PATH</tt>. Khoudu ya vhubvo ya tshitikedzi itshi ingavha kha <a href="http://printing.kde.org/downloads">KDEPrint web site</a>. <p><b><u>WARNING:</u></b> Tshiputo tshi wanalaho kha KDEPrint web site ndi tshivhumbeo tsho dzudzanywaho tsha vhukuma tshine tshinga wanala kha tshivhoni, fhedzi tshiputo tsha tshavhukuma tshinga <b>si</b> shume nga KDE. Ni <b>u</b> shumisa tshiputo tsho wanalaho kha <a href="http://printing.kde.org/downloads">KDEPrint web site</a>.
+ Description[wa]=Usteye po-z imprimer des lådjes posters so sacwantès foyes pus ptites et les poleur mete eshonne po-z aveur li grand poster. Po-z eployî l' comande, li programe <b>poster</b> doet esse dins vosse tchimin (<tt>PATH</tt>). Li côde sourdant po ciste usteye si trove sol <a href="http://printing.kde.org/downloads">waibe di KDEPrint</a>. <p><b><u>ASTEME:</u></b> Li pacaedje ki s' trove sol waibe da KDEPrint est ene modêye ene miete candjeye di l' oridjinå (ki s' pout trover so tot l' minme li ké muroe d' årtchives do CTAN), ca l' oridjinå n' rote <b>nén</b> avou KDE. Vos <b>dvoz</b> eployî li pacaedje k' est sol <a href="http://printing.kde.org/downloads">waibe di KDEPrint</a>.
+ Description[xh]=Uncedo lokushicilela izazisi eszinkulu kumakhasi amaphepha amaninzi. Ukusebenzisa lomyalelo, <b>isazisi</b> esiphumezekayo kufuneka sikwazi ukufumaneka kowakho <tt>UMENDO<tt>. Ikhowudi yemvelaphi yalento eluncedo inga kwi <a href="http://printing.kde.org/downloads">web site ye KDEPrint</a>. <p><b><u>ISILUMKISO:</u></b> Impahla efumaneke kwi we site ye KDEPrint iluguqulelo kancincane lomsesebenzi woqobo enokwazi ukufumaneka kuso nayiphi indawo yogcino yesipili se CTAN, kodwa impahla yoqobo ayizukusebenzelana ne KDE. Kufuneka usebenzise impahla ifumanwe <a href="http://printing.kde.org/downloads">kwi web site ye KDEPrint</a>.
+-Description[xx]=xxUtility to print large posters on multiple small paper sheets. To use this command, the <b>poster</b> executable must be accessible in your <tt>PATH</tt>. Source code for this utility can be on the <a href="http://printing.kde.org/downloads">KDEPrint web site</a>. <p><b><u>WARNING:</u></b> The package found on the KDEPrint web site is a modified version of the original one that can be found on any CTAN archive mirror, but the original package will <b>not</b> work with KDE. You <b>must</b> use the package found on the <a href="http://printing.kde.org/downloads">KDEPrint web site</a>.xx
+ Description[zh_CN]=此工具用于在多张纸上打印大型的海报。要使用此命令，<b>poster</b> 可执行文件必须可在您的 <tt>PATH</tt> 中访问到。此工具的源代码位于<a href="http://printing.kde.org/downloads">KDEPrint 网站</a>。<p><b><u>警告：</u></b>您虽然可以在任何 CTAN 归档镜像找到的原始版本，但是在 KDEPrint 网站上找到的包对其进行了修改，原因是原始的包<b>无法</b>用于 KDE。您<b>必须</b>使用在 <a href="http://printing.kde.org/downloads">KDEPrint 网站</a>上找到的包。
+ Description[zh_TW]=將大型海報列印在多張小型紙張上的公用程式。要使用這個命令，可執行檔<b>poster</b>必須在您的<tt>PATH</tt>中。這個公用程式的原始碼可以在<a href="http://printing.kde.org/downloads"KDEPrint 網站</a>。<p><b><u>警告：</u></b>在 KDEPrint 網站上找到的套件是修改過的版本，而非在任何 CTAN 檔案庫鏡射站中可以找到的原始版本，其原始套件<b>無法</b>在 KDE 下運作。您<b>必須</b>使用在<a href="http://printing.kde.org/downloads">KDEPrint 網站</a>上的套件。
+ Description[zu]=Insebenziso yokushicicela amabhodi emiyalezo emikhulu kumapheshana ekhasi eliningana elincane. Ukusebenzisa lomyalelo, ibhodi <b> lomyalezo</b> eliphumelelisekayo kumele lingeniswe ngokunemvume kweyakho <tt>Indlela</tt>. Ikhodi lemvelaphi lalokhu k kusebenzisa kungaba kwi <a href="http://printing.kde.org/downloads"> kwindawo yeweb ye KDEPrint</a>. <p><b><u>Isexwayiso:</u></b> Iphakethe elitholakala kwindawo yeweb ye-KDEPrint inguguqulelo olushintshiweyo lwasekuqaleni lolo olungatholakala kunoma yisiphi isibuko somqulu we CTAN, kodwa iphakethe lasekuqaleni <b>angeke </b> lisebenze nge-KDE. Wena<b>kumele</b> usebenzise iphakethe elitholakala e <a href="http://printing.kde.org/downloads">kwindawo yeweb ye-KDEPrint</a>.
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeprint/filters/ps2pdf.desktop kdelibs_3_4_BRANCH/kdeprint/filters/ps2pdf.desktop
+--- kdelibs_3_4_0_RELEASE/kdeprint/filters/ps2pdf.desktop	2005-02-23 06:04:30.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeprint/filters/ps2pdf.desktop	2005-03-12 18:58:45.000000000 +0100
+@@ -4,7 +4,6 @@
+ Name[pl]=Konwersja PS do PDF
+ Name[pt_BR]=Conversão de PS para PDF
+ Name[sv]=Ps2pdf
+-Name[xx]=xxps2pdfxx
+ Require=exec:/gs
+ Comment=PostScript to PDF Converter
+ Comment[af]=Postscript na Pdf Omskakelaar
+@@ -71,7 +70,6 @@
+ Comment[ven]=Bammbiri la poso uya kha mushandukisi wa PDF
+ Comment[wa]=Covierseu di PostScript viè PDF
+ Comment[xh]=PostScript Kumguqili we PDF
+-Comment[xx]=xxPostScript to PDF Converterxx
+ Comment[zh_CN]=PostScript 到 PDF 的转换器
+ Comment[zh_TW]=PostScript 至 PDF 轉換器
+ Comment[zu]=Umguquli we-PostScript se-DPF
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeprint/filters/psbook.desktop kdelibs_3_4_BRANCH/kdeprint/filters/psbook.desktop
+--- kdelibs_3_4_0_RELEASE/kdeprint/filters/psbook.desktop	2005-02-23 06:04:30.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeprint/filters/psbook.desktop	2005-03-12 18:58:45.000000000 +0100
+@@ -10,7 +10,6 @@
+ Name[sv]=broschyr
+ Name[ta]=psபுத்தகம்
+ Name[ven]=Bugu ya ps
+-Name[xx]=xxpsbookxx
+ Name[zu]=incwadi ye-ps
+ Require=exec:/psbook,exec:/psnup
+ Comment=Pamphlet Printing (use with small side duplex printing)
+@@ -70,7 +69,6 @@
+ Comment[uz]=Памфлет босиб чиқариш (кичик тарафлама варақнинг иккита томонига босиб чиқариш)
+ Comment[ven]=U phirintha ha tshibugwana (shumisa na lurumbu lutuku lwa u phirintha a duplex)
+ Comment[xh]=Ushicilelo Lwephetshana (sebenzisa ngoshicilelo oluncinane olusecaleni oluphindwe kabini)
+-Comment[xx]=xxPamphlet Printing (use with small side duplex printing)xx
+ Comment[zh_CN]=打印小册 (使用小张双面打印)
+ Comment[zh_TW]=列印小冊 (使用小張雙面列印)
+ Comment[zu]=Ibhukwana Lokushicilela (sebenzisa ngecala elincane lukushicilela okuphindwe kabili)
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeprint/filters/psbook1.desktop kdelibs_3_4_BRANCH/kdeprint/filters/psbook1.desktop
+--- kdelibs_3_4_0_RELEASE/kdeprint/filters/psbook1.desktop	2005-02-23 06:04:30.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeprint/filters/psbook1.desktop	2005-03-12 18:58:45.000000000 +0100
+@@ -11,7 +11,6 @@
+ Name[sv]=broschyr 1
+ Name[ta]=psபுத்தகம்1
+ Name[ven]=Bugu ya ps yau thoma
+-Name[xx]=xxpsbook1xx
+ Name[zu]=incwadi ye ps yokuqala
+ Require=exec:/psbook,exec:/psnup,exec:/psselect
+ Comment=Pamphlet Printing - Even Pages (step 1)
+@@ -72,7 +71,6 @@
+ Comment[uz]=Памфлет босиб чиқариш - Жуфт бетлар (қадам 1)
+ Comment[ven]=U phirintha ha tshibugwana - masiatari (tshitepe tshau thoma)
+ Comment[xh]=Ushicilelo Lwephetshana - Amaphepha Alinganayo (inyathelo 1) 
+-Comment[xx]=xxPamphlet Printing - Even Pages (step 1)xx
+ Comment[zh_CN]=打印小册 - 偶数页(第一步)
+ Comment[zh_TW]=列印小冊 - 偶數頁(第一步)
+ Comment[zu]=Ukushicilela Ibhukwana - Amaphepha Alinganayo (isiqendu 1)
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeprint/filters/psbook2.desktop kdelibs_3_4_BRANCH/kdeprint/filters/psbook2.desktop
+--- kdelibs_3_4_0_RELEASE/kdeprint/filters/psbook2.desktop	2005-02-23 06:04:30.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeprint/filters/psbook2.desktop	2005-03-12 18:58:45.000000000 +0100
+@@ -11,7 +11,6 @@
+ Name[sv]=broschyr 2
+ Name[ta]=psபுத்தகம்2
+ Name[ven]=Bugu ya ps ya vhuvhili
+-Name[xx]=xxpsbook2xx
+ Name[zu]=incwadi ye ps yesibili
+ Require=exec:/psbook,exec:/psnup,exec:/psselect
+ Comment=Pamphlet Printing - Odd Pages (step 2)
+@@ -73,7 +72,6 @@
+ Comment[uz]=Памфлет босиб чиқариш - Тоқ бетлар (қадам 2)
+ Comment[ven]=U phirintha tshibugwana - masaitari (tshitepe tsha vhuvhili)
+ Comment[xh]=Ushicilelo Lwephetshana - Amaphepha Amnqakathi (inyathelo 2)
+-Comment[xx]=xxPamphlet Printing - Odd Pages (step 2)xx
+ Comment[zh_CN]=打印小册 - 奇数页(第二步)
+ Comment[zh_TW]=列印小冊 - 奇數頁(第二步)
+ Comment[zu]=Ukushicilela Kwebhukwana - Amaphepha Angalingani (isiqendu 2)
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeprint/filters/psnup.desktop kdelibs_3_4_BRANCH/kdeprint/filters/psnup.desktop
+--- kdelibs_3_4_0_RELEASE/kdeprint/filters/psnup.desktop	2005-02-23 06:04:30.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeprint/filters/psnup.desktop	2005-03-12 18:58:45.000000000 +0100
+@@ -1,7 +1,6 @@
+ [KDE Print Filter Entry]
+ Name=psnup
+ Name[sv]=Psnup
+-Name[xx]=xxpsnupxx
+ Require=exec:/psnup
+ Comment=Multiple Pages per Sheet Filter
+ Comment[af]=Veelvuldige Bladsye per Staat Filter
+@@ -66,7 +65,6 @@
+ Comment[ven]=Masiatari manzhi kha filithara ya bammbiri
+ Comment[wa]=Passete pus d' ene pådje par foye
+ Comment[xh]=Amaphepha Amaninzi Ngekhasi Lesihluzi ngasinye 
+-Comment[xx]=xxMultiple Pages per Sheet Filterxx
+ Comment[zh_CN]=每张多页过滤程序
+ Comment[zh_TW]=單張多頁過濾器
+ Comment[zu]=Amakhasi Amaningana Kumhlaziyi Wepheshana ngamunye
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeprint/filters/psresize.desktop kdelibs_3_4_BRANCH/kdeprint/filters/psresize.desktop
+--- kdelibs_3_4_0_RELEASE/kdeprint/filters/psresize.desktop	2005-02-23 06:04:30.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeprint/filters/psresize.desktop	2005-03-12 18:58:45.000000000 +0100
+@@ -10,7 +10,6 @@
+ Name[ta]=psஅளவு மாற்று
+ Name[ven]=U linganisela ps
+ Name[xh]=psresiza
+-Name[xx]=xxpsresizexx
+ Name[zu]=psphinda ushintshe usayizi
+ Require=exec:/psresize
+ Comment=Scale Print Content to Fit on Another Paper Size
+@@ -75,7 +74,6 @@
+ Comment[ven]=Zwirengomu ha tshikeili tshau phirintha uitela u dzhena kha saizi inwe ya siatari
+ Comment[wa]=Mete al schåle çou ki va esse imprimer po k' ça rimplixhe ene pådje d' ene ôte grandeu di papî
+ Comment[xh]=Isikali Soshicelela Somphakati esinokungena Kwelinye Uhlobo Lephepa
+-Comment[xx]=xxScale Print Content to Fit on Another Paper Sizexx
+ Comment[zh_CN]=缩放打印内容以适合其它纸张大小
+ Comment[zh_TW]=調整列印內容以符合其它的紙張大小
+ Comment[zu]=Kala Okuphakathi Kokushicilela Ukugcwalisa Omunye Usayizi Wephepha
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeprint/filters/psselect.desktop kdelibs_3_4_BRANCH/kdeprint/filters/psselect.desktop
+--- kdelibs_3_4_0_RELEASE/kdeprint/filters/psselect.desktop	2005-02-23 06:04:30.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeprint/filters/psselect.desktop	2005-03-12 18:58:45.000000000 +0100
+@@ -8,7 +8,6 @@
+ Name[sv]=Psselect
+ Name[ta]=psதேர்ந்தெடு
+ Name[ven]=U nanga ha ps
+-Name[xx]=xxpsselectxx
+ Name[zu]=pskhetha
+ Require=exec:/psselect
+ Comment=Page Selection/Ordering Filter
+@@ -74,7 +73,6 @@
+ Comment[uz]=Бетларни танлаш/тартиблаш филтери
+ Comment[ven]=U nanga ha siatari/u vhekanya filithara
+ Comment[xh]=Ukhetho Lwephepha/Isihluzi Sokulungisa kakuhle
+-Comment[xx]=xxPage Selection/Ordering Filterxx
+ Comment[zh_CN]=页面选择/排序过滤程序
+ Comment[zh_TW]=紙張選擇/排序過濾器
+ Comment[zu]=Ukhetho Lwephepha/Ukuthumela Isihlaziya samafayela
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeprint/foomatic/foomatic.print kdelibs_3_4_BRANCH/kdeprint/foomatic/foomatic.print
+--- kdelibs_3_4_0_RELEASE/kdeprint/foomatic/foomatic.print	2004-10-26 04:42:18.000000000 +0200
++++ kdelibs_3_4_BRANCH/kdeprint/foomatic/foomatic.print	2005-03-12 18:58:45.000000000 +0100
+@@ -10,6 +10,5 @@
+ Comment[hi]=फूमेटिक (CUPS, LPRng, PDQ)
+ Comment[sq]=Foomatik (CUPS, LPRng, PDQ)
+ Comment[sv]=Foomatic (Cups, LPRng, PDQ)
+-Comment[xx]=xxFoomatic (CUPS, LPRng, PDQ)xx
+ DetectUris=exec:/foomatic-configure,config:/foomatic/
+ DetectPrecedence=0
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeprint/kdeprintd.desktop kdelibs_3_4_BRANCH/kdeprint/kdeprintd.desktop
+--- kdelibs_3_4_0_RELEASE/kdeprint/kdeprintd.desktop	2005-02-23 06:04:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeprint/kdeprintd.desktop	2005-03-12 18:58:45.000000000 +0100
+@@ -73,13 +73,14 @@
+ Name[ven]=Daemon yau phirintha ya KDE
+ Name[wa]=Démon d' imprimaedje di KDE
+ Name[xh]=Daemon Yoshicilelo lwe KDE
+-Name[xx]=xxKDE Print Daemonxx
+ Name[zh_CN]=KDE 打印守护进程
+ Name[zh_TW]=KDE 列印伺服程式
+ Name[zu]= I-Daemon Yokushicilela kwe-KDE
+ Comment=Print daemon for KDE
++Comment[af]=Druk Bediener vir KDE
+ Comment[bg]=Демон за печат в КДЕ
+ Comment[bn]=কে.ডি.ই-র মুদ্রণ ডিমন
++Comment[br]=Diaoul moulañ evit KDE
+ Comment[bs]=Demon za štampu za KDE
+ Comment[ca]=Dimoni d'impressió per al KDE
+ Comment[cs]=Tiskový démon KDE
+@@ -116,12 +117,11 @@
+ Comment[sk]=Démon tlače pre KDE
+ Comment[sl]=Tiskalniški strežnik za KDE
+ Comment[sr]=KDE-ов демон за штампање
+-Comment[sr@Latn]=KDE-ов демон за штампање
++Comment[sr@Latn]=KDE-ov demon za štampanje
+ Comment[sv]=Skrivardemon för KDE
+ Comment[ta]=கேடிஇக்கான ஒரு அச்ச் டெமான்
+ Comment[tg]=Демони чопи KDE
+ Comment[tr]=KDE için bir yazdırma programı
+ Comment[uk]=Демон друку KDE
+ Comment[uz]=KDE учун босиб чиқариш хизмати
+-Comment[xx]=xxPrint daemon for KDExx
+ Comment[zh_CN]=KDE 的打印守护进程
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeprint/lpd/lpd.print kdelibs_3_4_BRANCH/kdeprint/lpd/lpd.print
+--- kdelibs_3_4_0_RELEASE/kdeprint/lpd/lpd.print	2005-02-23 06:04:32.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeprint/lpd/lpd.print	2005-03-12 18:58:45.000000000 +0100
+@@ -6,6 +6,7 @@
+ Comment[az]=LPR (Standard BSD çap sistemi)
+ Comment[be]=LPR (стандартная сыстэма друку BSD)
+ Comment[bn]=এল-পি-আর (স্ট্যাণ্ডার্ড বি-এস-ডি মুদ্রণ ব্যবস্থা)
++Comment[br]=LPR (Reizhiad moulañ reoliek evit BSD)
+ Comment[bs]=LPR (standardni BSD sistem štampe)
+ Comment[ca]=LPR (sistema d'impressió estàndard de BSD)
+ Comment[cs]=LPR (Standardní tiskový systém na BSD)
+@@ -67,7 +68,6 @@
+ Comment[vi]=LPR (Hệ thống chuẩn BSD)
+ Comment[wa]=LPR (Sistinme d' imprimaedje BSD standård)
+ Comment[xh]=LPR (Indlela esezantsi yoshicilelo lwe BSD)
+-Comment[xx]=xxLPR (Standard BSD print system)xx
+ Comment[zh_CN]=LPR (标准 BSD 打印系统)
+ Comment[zh_TW]=LPR (標準 BSD 列印系統)
+ Comment[zu]=LPR (Isistimu yokushicelela evamile ye-BSD)
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeprint/lpdunix/lpdunix.print kdelibs_3_4_BRANCH/kdeprint/lpdunix/lpdunix.print
+--- kdelibs_3_4_0_RELEASE/kdeprint/lpdunix/lpdunix.print	2005-02-23 06:04:34.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeprint/lpdunix/lpdunix.print	2005-03-12 18:58:45.000000000 +0100
+@@ -64,7 +64,6 @@
+ Comment[ven]=Maitele au phirintha a UNIX (default)
+ Comment[wa]=Sistinme d' imprimaedje djenerike LPD po UNIX (prémetou)
+ Comment[xh]=Indlela Yoshicilelo Ngokubanzi ye UNIX LPD (edaliweyo)
+-Comment[xx]=xxGeneric UNIX LPD Print System (default)xx
+ Comment[zh_CN]=通用 UNIX LPD 打印系统(默认)
+ Comment[zh_TW]=通用 UNIX LPD 列印系統(預設)
+ Comment[zu]=Isistimu Yokushicilela ye-UNIX LPD Kawonke wonke (yokwendalo)
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeprint/lpr/lpr.print kdelibs_3_4_BRANCH/kdeprint/lpr/lpr.print
+--- kdelibs_3_4_0_RELEASE/kdeprint/lpr/lpr.print	2005-02-23 06:04:34.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeprint/lpr/lpr.print	2005-03-12 18:58:45.000000000 +0100
+@@ -6,6 +6,7 @@
+ Comment[az]=LPR/LPRng Çap Sistemi
+ Comment[be]=LPR/LPRng сыстэма друку
+ Comment[bn]=এল-পি-আর/এল-পি-আর-এন-জি মুদ্রণ ব্যবস্থা
++Comment[br]=Reizhiad moulañ LPR/LPRng
+ Comment[bs]=LPR/LPRng sistem štampe
+ Comment[ca]=Sistema d'impressió LPR/LPRng
+ Comment[cs]=Tiskový systém LPR/LPRng
+@@ -64,7 +65,6 @@
+ Comment[ven]=LPR/Maitele au phirintha a LPRng
+ Comment[wa]=Sistinme d' imprimaedje LPR/LPRng
+ Comment[xh]=LPR/LPRng Indlela Yokushicilela
+-Comment[xx]=xxLPR/LPRng Print Systemxx
+ Comment[zh_CN]=LPR/LPRng 打印系统
+ Comment[zh_TW]=LPR/LPRng 列印系統
+ Comment[zu]=Isistimu Yokushicilela ye-LPR/LRng
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeprint/management/kmdriverdbwidget.cpp kdelibs_3_4_BRANCH/kdeprint/management/kmdriverdbwidget.cpp
+--- kdelibs_3_4_0_RELEASE/kdeprint/management/kmdriverdbwidget.cpp	2005-03-04 19:32:50.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeprint/management/kmdriverdbwidget.cpp	2005-03-04 19:31:24.000000000 +0100
+@@ -26,7 +26,7 @@
+ #include <klistbox.h>
+ #include <kpushbutton.h>
+ #include <qcheckbox.h>
+-#include <qcursor.h>
++#include <kcursor.h>
+ #include <qapplication.h>
+ #include <kmessagebox.h>
+ #include <qlayout.h>
+@@ -151,7 +151,7 @@
+ {
+ 	if (!m_valid)
+ 	{
+-		QApplication::setOverrideCursor(waitCursor);
++		QApplication::setOverrideCursor(KCursor::waitCursor());
+ 		m_manu->clear();
+ 		m_model->clear();
+ 		m_manu->insertItem(i18n("Loading..."));
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeprint/management/smbview.cpp kdelibs_3_4_BRANCH/kdeprint/management/smbview.cpp
+--- kdelibs_3_4_0_RELEASE/kdeprint/management/smbview.cpp	2005-03-04 19:32:50.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeprint/management/smbview.cpp	2005-03-04 19:31:24.000000000 +0100
+@@ -28,6 +28,7 @@
+ #include <klocale.h>
+ #include <kdebug.h>
+ #include <kmessagebox.h>
++#include <kcursor.h>
+ 
+ //*********************************************************************************************
+ 
+@@ -84,7 +85,7 @@
+ {
+ 	m_buffer = QString::null;
+ 	m_state = state;
+-	QApplication::setOverrideCursor(waitCursor);
++	QApplication::setOverrideCursor(KCursor::waitCursor());
+ 	m_proc->start(KProcess::NotifyOnExit,KProcess::Stdout);
+ 	emit running(true);
+ }
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeprint/marginpreview.cpp kdelibs_3_4_BRANCH/kdeprint/marginpreview.cpp
+--- kdelibs_3_4_0_RELEASE/kdeprint/marginpreview.cpp	2005-03-04 19:32:50.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeprint/marginpreview.cpp	2005-03-04 19:31:24.000000000 +0100
+@@ -22,7 +22,7 @@
+ #include <klocale.h>
+ #include <kdebug.h>
+ #include <qpainter.h>
+-#include <qcursor.h>
++#include <kcursor.h>
+ 
+ #define	A4_WIDTH	595
+ #define	A4_HEIGHT	842
+@@ -195,14 +195,14 @@
+ 		{
+ 			case 1:
+ 			case 2:
+-				setCursor(Qt::SplitHCursor);
++				setCursor(KCursor::sizeVerCursor());
+ 				break;
+ 			case 3:
+ 			case 4:
+-				setCursor(Qt::SplitVCursor);
++				setCursor(KCursor::sizeHorCursor());
+ 				break;
+ 			default:
+-				setCursor(Qt::ArrowCursor);
++				setCursor(KCursor::arrowCursor());
+ 				break;
+ 		}
+ 	}
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeprint/rlpr/rlpr.print kdelibs_3_4_BRANCH/kdeprint/rlpr/rlpr.print
+--- kdelibs_3_4_0_RELEASE/kdeprint/rlpr/rlpr.print	2005-02-23 06:04:34.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeprint/rlpr/rlpr.print	2005-03-12 18:58:45.000000000 +0100
+@@ -62,7 +62,6 @@
+ Comment[ven]=Vhupo ha RLPR (dzisiva dza LPD)
+ Comment[wa]=Evironmint d' imprimaedje RLPR (sierveus LPD å lon)
+ Comment[xh]=RLPR Imeko-bume ye RLPR (Abancedisi be LPD ababeka kude)
+-Comment[xx]=xxRLPR Environment (Remote LPD servers)xx
+ Comment[zh_CN]=RLPR 环境(远程 LPD 服务器)
+ Comment[zh_TW]=RLPR 環境(遠端 LPD 伺服器)
+ Comment[zu]=Ezendalo ze-RLPR (abalekeleli abakude  be-LPD)
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeprint/specials.desktop kdelibs_3_4_BRANCH/kdeprint/specials.desktop
+--- kdelibs_3_4_0_RELEASE/kdeprint/specials.desktop	2005-02-23 06:04:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeprint/specials.desktop	2005-03-12 18:58:45.000000000 +0100
+@@ -69,7 +69,6 @@
+ Name[ven]=Phirinthani kha faela (Bammbiri la poso)
+ Name[wa]=Imprimer en on fitchî (PostScript)
+ Name[xh]=Shicilela Kwifayile (PostScript)
+-Name[xx]=xxPrint to File (PostScript)xx
+ Name[zh_CN]=打印到文件(PostScript)
+ Name[zh_TW]=列印到檔案(PostScript)
+ Name[zu]=Shicilela Efayeleni (PostScript)
+@@ -80,6 +79,7 @@
+ Description[be]=Запісаць у PostScript файл
+ Description[bg]=Запис във файл PostScript
+ Description[bn]=পোস্টস্ক্রিপ্ট ফাইল লেখা হবে
++Description[br]=Moulañ en ur restr PostScript
+ Description[bs]=Piši u PostScript datoteku
+ Description[ca]=Escriure en un fitxer PostScript
+ Description[cs]=Zapisuje do PostScriptového souboru
+@@ -141,7 +141,6 @@
+ Description[vi]=Viết ra file PostScript 
+ Description[wa]=Fé on fitchî PostScript
+ Description[xh]=Bhala ifayile ye PostScript
+-Description[xx]=xxWrite PostScript filexx
+ Description[zh_CN]=写入 PostScript 文件
+ Description[zh_TW]=寫成 PostScript 檔案
+ Description[zu]=Bhala ifayile le-PosrtScript
+@@ -214,7 +213,6 @@
+ Comment[vi]=File địa phương 
+ Comment[wa]=Fitchî locål
+ Comment[xh]=Ifayile yobulali
+-Comment[xx]=xxLocal filexx
+ Comment[zh_CN]=本地文件
+ Comment[zh_TW]=本地檔案
+ Comment[zu]=Ifayela laseduze
+@@ -292,7 +290,6 @@
+ Name[ven]=Phirinthani ni kone u faela (PDF)
+ Name[wa]=Imprimer en on fitchî (PDF)
+ Name[xh]=Shicilela Kwifayile (PDF)
+-Name[xx]=xxPrint to File (PDF)xx
+ Name[zh_CN]=打印到文件(PDF)
+ Name[zh_TW]=列印到文件(PDF)
+ Name[zu]=Shicilela Efayeleni (PDF)
+@@ -303,6 +300,7 @@
+ Description[be]=Запісаць у PDF файл
+ Description[bg]=Запис във файл PDF/Acrobat
+ Description[bn]=পি-ডি-এফ/অ্যাক্রোব্যাট ফাইল লেখা হবে
++Description[br]=Moulañ en ur restr PDF/Acrobat
+ Description[bs]=Piši u PDF/Acrobat datoteku
+ Description[ca]=Escriure en un fitxer PDF/Acrobat
+ Description[cs]=Zapisuje do PDF souboru
+@@ -364,7 +362,6 @@
+ Description[vi]=Viết ra file PDF/Acrobat 
+ Description[wa]=Fé on fitchî PDF/Acrobat
+ Description[xh]=Bhala PDF/Ifayile ye Acrobat
+-Description[xx]=xxWrite PDF/Acrobat filexx
+ Description[zh_CN]=写入 PDF/Acrobat 文件
+ Description[zh_TW]=寫成 PDF/Acrobat 檔案
+ Description[zu]=Bhala  ifayela le-IPDF/Acrobat
+@@ -437,7 +434,6 @@
+ Comment[vi]=File địa phương 
+ Comment[wa]=Fitchî locål
+ Comment[xh]=Ifayile yobulali
+-Comment[xx]=xxLocal filexx
+ Comment[zh_CN]=本地文件
+ Comment[zh_TW]=本地檔案
+ Comment[zu]=Ifayela laseduze
+@@ -516,7 +512,6 @@
+ Name[ven]=Rumela kha fekisi
+ Name[wa]=Evoyî so on facs
+ Name[xh]=Thumela kwi Fax
+-Name[xx]=xxSend to Faxxx
+ Name[zh_CN]=发送至传真
+ Name[zh_TW]=發送至傳真
+ Name[zu]=Thumela kwi-fax
+@@ -586,7 +581,6 @@
+ Description[vi]=Gửi tới hềEthống fax ềEbên ngoài (external) 
+ Description[wa]=Evoyî so on dfoûtrin sistinme di facs
+ Description[xh]=Thumela kwindlela engaphandle ye fax
+-Description[xx]=xxSend to external fax systemxx
+ Description[zh_CN]=发至外部传真系统
+ Description[zh_TW]=發送到外部傳真系統
+ Description[zu]=Thumela kwisistimu yangaphandle ye-fax
+@@ -596,6 +590,7 @@
+ Comment[az]=Xarici
+ Comment[bg]=Външен файл
+ Comment[bn]=বহিঃস্থ
++Comment[br]=Diavaez
+ Comment[bs]=Vanjski
+ Comment[ca]=Extern
+ Comment[cs]=Externí
+@@ -657,7 +652,6 @@
+ Comment[vi]=Bên ngoài(external) 
+ Comment[wa]=Difoûtrin
+ Comment[xh]=Ngaphandle
+-Comment[xx]=xxExternalxx
+ Comment[zh_CN]=外部
+ Comment[zh_TW]=外部
+ Comment[zu]=Ngaphandle
+@@ -733,7 +727,6 @@
+ Comment[ven]=U tangana na mubveledzi wa meili wa K
+ Comment[vi]=Đính vào trình soạn Kmail
+ Comment[xh]=Ufakelo Lomqhambi we KMail
+-Comment[xx]=xxAttachment for KMail Composerxx
+ Comment[zh_CN]=KMail 编写器的附件
+ Comment[zh_TW]=當作 KMail 郵件編輯器的附件
+ Comment[zu]=Ukunamathisela Komsunguli we-KMail
+@@ -804,7 +797,6 @@
+ Description[vi]=Tạo file PDF/Acrobat dưới dạng file đính 
+ Description[wa]=Fé des fitchîs PDF/Acrobat come atatchmints po KMail
+ Description[xh]=Yenza PDF/Ifayile yomenzi womthambo njengofakelelo lwe KMail
+-Description[xx]=xxCreates PDF/Acrobat file as attachment for KMailxx
+ Description[zh_CN]=创建 PDF/Acrobat 文件作为 KMail 附件
+ Description[zh_TW]=建立 PDF/Acrobat 文件作為 KMail 附件
+ Description[zu]=Idala ifayela le-PDF/Acrobat libe njengokunamathisela kwe-KMail
+@@ -813,6 +805,7 @@
+ File=1
+ Icon=kmail
+ Name=Mail PDF File
++Name[af]=Pos PDF Lêer
+ Name[be]=Даслаць PDF файл
+ Name[bg]=Изпращане на файл PDF по е-поща
+ Name[bn]=পি-ডি-এফ ফাইল মেইল করো
+@@ -851,14 +844,13 @@
+ Name[sk]=Poslať súbor PDF
+ Name[sl]=Pošlji datoteko PDF po pošti
+ Name[sr]=Слање PDF фајла поштом
+-Name[sr@Latn]=Слање PDF фајла поштом
++Name[sr@Latn]=Slanje PDF fajla poštom
+ Name[sv]=Skicka PDF-fil
+ Name[ta]=PDF கோப்பை அஞ்சல் அனுப்பு
+ Name[tg]=Файли почтавии PDF
+ Name[tr]=PDF Dosyasını Postala
+ Name[uk]=Відсилання файлу PDF поштою
+ Name[uz]=PDF-файли сифатида хат орқали жўнатиш
+-Name[xx]=xxMail PDF Filexx
+ Name[zh_CN]=邮寄 PDF 文件
+ Require=exec:/ps2pdf,exec:/kmail
+ 
+@@ -880,12 +872,13 @@
+ Comment[th]=ส่งโทรสาร K
+ Comment[uz]=Факс жўнатиш
+ Comment[ven]=K i rumela Fekisi
+-Comment[xx]=xxKSendFaxxx
+ Description=Use ksendfax to fax the current document
++Description[af]=Gebruik ksendfax om die huidige dokument te faks
+ Description[ar]=استخدم ksendfax ﻹرسال المستند الحالي بالفاكس
+ Description[az]=Hazırkı sənədi fakslamaq üçün ksendfax vasitəsini işlədin
+ Description[bg]=Изпращане по факс на документа
+ Description[bn]=বর্তমানে নথীটি ksendfax ব্যবহার করে ফ্যাক্স করো
++Description[br]=Implij ksendfax da gas an teul red
+ Description[bs]=Koristite ksendfax za slanje trenutnog dokumenta na fax
+ Description[ca]=Empra el ksendfax per a enviar per fax l'actual document
+ Description[cs]=Použít ksendfax k odfaxování současného dokumentu
+@@ -931,7 +924,7 @@
+ Description[sl]=Uporabite kdsendfax za faksiranje trenutnega dokumenta
+ Description[sq]=Përdor ksendfax për ta dërguar dokumentin aktual me faks
+ Description[sr]=Користите ksendfax да пошаљте текући документ на факс
+-Description[sr@Latn]=Koristi ksendfax da pošalje tekući dokument na faks.
++Description[sr@Latn]=Koristite ksendfax da pošaljte tekući dokument na faks
+ Description[ss]=Sebentisa i-ksendfax kutfumela ngefax kwelidokhumente lanyalo
+ Description[sv]=Använd Ksendfax för att faxa aktuellt dokument
+ Description[ta]=கேஃபாக்ஸ்அனுப்பு மூலம் நடப்பு ஆவணத்தை தொலைநகலிடு
+@@ -942,7 +935,6 @@
+ Description[ven]=Shumisani fekisi yau rumele kha k u fekisa manwalwa a zwino
+ Description[wa]=Eploye ksendfax po-z evoyî pa facs li documint do moumint
+ Description[xh]=Sebenzisa i ksendfax ukuthumela i fax yoxwebhu lwangoku
+-Description[xx]=xxUse ksendfax to fax the current documentxx
+ Description[zh_CN]=使用 ksendfax 发送当前文档
+ Description[zh_TW]=使用 ksendfax 將目前文件傳真出去
+ Description[zu]=Sebenzisa i-ksendfax ukuthumela i-fax yohlu lwamafayela amanje
+@@ -950,10 +942,12 @@
+ File=0
+ Icon=kdeprintfax
+ Name=Advanced Faxing Tool (ksendfax)
++Name[af]=Gevorderde Faks Program (ksendfax)
+ Name[ar]=أداة إرسال فاكس متقدمة (ksendfax)
+ Name[az]=Təkmilləşmiş Faks Vasitəsi (ksendfax)
+ Name[bg]=Разширена факс програма (ksendfax)
+ Name[bn]=উন্নত ফ্যাক্স ব্যবস্থা (ksendfax)
++Name[br]=Ostilh faks barek (ksendfax)
+ Name[bs]=Napredni alat za slanje faxova (ksendfax)
+ Name[ca]=Eina avançada per a enviar per fax (ksendfax)
+ Name[cs]=Pokročilý faxovací nástroj (ksendfax)
+@@ -1010,7 +1004,6 @@
+ Name[uz]=Факс жўнатиш учун кенгайтирилган восита (ksendfax)
+ Name[ven]=Tshishumiswa tsha fekisi ya khwinesa (ksendfax)
+ Name[xh]=Isixhobo se Fax Esibhekisa phambili (ksendfax)
+-Name[xx]=xxAdvanced Faxing Tool (ksendfax)xx
+ Name[zh_CN]=高级传真工具(ksendfax)
+ Name[zh_TW]=高階傳真工具 (ksendfax)
+ Name[zu]=Ithuluz Lezinga eliphezulu lokuthumela i-fax (ksendfax)
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeprint/tools/escputil/escputil.desktop kdelibs_3_4_BRANCH/kdeprint/tools/escputil/escputil.desktop
+--- kdelibs_3_4_0_RELEASE/kdeprint/tools/escputil/escputil.desktop	2004-10-26 04:42:21.000000000 +0200
++++ kdelibs_3_4_BRANCH/kdeprint/tools/escputil/escputil.desktop	2005-03-12 18:58:46.000000000 +0100
+@@ -24,7 +24,6 @@
+ Name[pt]=Jacto de Tinta da EPSON
+ Name[ta]=EPSON இங்க்ஜெட்
+ Name[th]=เครื่องพิมพ์อิงค์เจตเอปสัน
+-Name[xx]=xxEPSON InkJetxx
+ Name[zh_TW]=EPSON 噴墨印表機
+ Type=Service
+ 
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeui/kactioncollection.h kdelibs_3_4_BRANCH/kdeui/kactioncollection.h
+--- kdelibs_3_4_0_RELEASE/kdeui/kactioncollection.h	2005-01-29 20:20:07.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeui/kactioncollection.h	2005-03-18 18:12:17.225685859 +0100
+@@ -54,6 +54,7 @@
+ class KActionCollection;
+ class KPopupMenu;
+ class KMainWindow;
++class KXMLGUIClient;
+ 
+ typedef QValueList<KAction *> KActionPtrList;
+ 
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeui/kcompletionbox.cpp kdelibs_3_4_BRANCH/kdeui/kcompletionbox.cpp
+--- kdelibs_3_4_0_RELEASE/kdeui/kcompletionbox.cpp	2005-01-08 17:20:44.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeui/kcompletionbox.cpp	2005-03-12 18:58:46.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+    Copyright (c) 2000,2001,2002 Carsten Pfeiffer <pfeiffer@kde.org>
+    Copyright (c) 2000 Stefan Schimanski <1Stein@gmx.de>
+-   Copyright (c) 2000,2001 Dawit Alemayehu <adawit@kde.org>
++   Copyright (c) 2000,2001,2002,2003,2004 Dawit Alemayehu <adawit@kde.org>
+ 
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+@@ -41,6 +41,7 @@
+     bool tabHandling;
+     bool down_workaround;
+     bool upwardBox;
++    bool emitSelected;
+ };
+ 
+ KCompletionBox::KCompletionBox( QWidget *parent, const char *name )
+@@ -51,6 +52,7 @@
+     d->tabHandling     = true;
+     d->down_workaround = false;
+     d->upwardBox       = false;
++    d->emitSelected    = true;
+ 
+     setColumnMode( 1 );
+     setLineWidth( 1 );
+@@ -132,17 +134,14 @@
+                         ev->accept();
+                         return true;
+                     case Key_Up:
+-
+                         // If there is no selected item and we've popped up above
+                         // our parent, select the first item when they press up.
+-
+-			if ( selectedItem() ||
++                        if ( selectedItem() ||
+                              mapToGlobal( QPoint( 0, 0 ) ).y() >
+                              d->m_parent->mapToGlobal( QPoint( 0, 0 ) ).y() )
+                             up();
+                         else
+                             down();
+-
+                         ev->accept();
+                         return true;
+                     case Key_Prior:
+@@ -234,6 +233,14 @@
+         QMouseEvent *ev = static_cast<QMouseEvent *>( e );
+         if ( !rect().contains( ev->pos() )) // this widget
+             hide();
++
++        if ( !d->emitSelected )
++        {
++          emit highlighted( currentText() );
++          hide();
++          ev->accept();  // Consume the mouse click event...
++          return true;
++        }
+     }
+ 
+     return KListBox::eventFilter( o, e );
+@@ -539,6 +546,16 @@
+     }
+ }
+ 
++void KCompletionBox::setActivateOnSelect(bool state)
++{
++    d->emitSelected = state;
++}
++
++bool KCompletionBox::activateOnSelect() const
++{
++    return d->emitSelected;
++}
++
+ void KCompletionBox::virtual_hook( int id, void* data )
+ { KListBox::virtual_hook( id, data ); }
+ 
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeui/kcompletionbox.h kdelibs_3_4_BRANCH/kdeui/kcompletionbox.h
+--- kdelibs_3_4_0_RELEASE/kdeui/kcompletionbox.h	2004-11-11 15:34:06.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeui/kcompletionbox.h	2005-03-12 18:58:46.000000000 +0100
+@@ -2,6 +2,7 @@
+ 
+    Copyright (c) 2000 Carsten Pfeiffer <pfeiffer@kde.org>
+                  2000 Stefan Schimanski <1Stein@gmx.de>
++                 2000,2001,2002,2003,2004 Dawit Alemayehu <adawit@kde.org>
+ 
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+@@ -44,6 +45,7 @@
+     Q_OBJECT
+     Q_PROPERTY( bool isTabHandling READ isTabHandling WRITE setTabHandling )
+     Q_PROPERTY(QString cancelledText READ cancelledText WRITE setCancelledText)
++    Q_PROPERTY( bool activateOnSelect READ activateOnSelect WRITE setActivateOnSelect )
+ 
+ public:
+     /**
+@@ -61,6 +63,13 @@
+ 
+     virtual QSize sizeHint() const;
+ 
++    /**
++     * @returns true if selecting an item results in the emition of the @ref selected signal.
++     *
++     * @since 3.4.1
++     */
++    bool activateOnSelect() const;
++
+ public slots:
+     /**
+      * Returns a list of all items currently in the box.
+@@ -131,6 +140,16 @@
+     QString cancelledText() const;
+ 
+     /**
++     * Set whether or not the selected signal should be emitted when an
++     * item is selected. By default the @ref selevted signal is emitted.
++     *
++     * @param state false if the signal should not be emitted.
++     * @since 3.4.1
++     */
++    void setActivateOnSelect(bool state);
++
++
++    /**
+      * Moves the selection one line down or select the first item if nothing is selected yet.
+      */
+     void down();
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeui/kdetrayproxy/kdetrayproxy.desktop kdelibs_3_4_BRANCH/kdeui/kdetrayproxy/kdetrayproxy.desktop
+--- kdelibs_3_4_0_RELEASE/kdeui/kdetrayproxy/kdetrayproxy.desktop	2005-02-23 06:04:35.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeui/kdetrayproxy/kdetrayproxy.desktop	2005-03-12 18:58:46.000000000 +0100
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=KDE Tray Proxy Module
++Name[af]=KDE Skinkbord Proksie Module
+ Name[bn]=কে.ডি.ই. ট্রে প্রক্সি মডিউল
+ Name[bs]=KDE proxy modul za tray
+ Name[ca]=Mòdul de safata d'intermediari del KDE
+@@ -36,15 +37,15 @@
+ Name[sk]=Modul pre proxy lišty KDE
+ Name[sl]=Modul posrednika sistemske vrstice KDE
+ Name[sr]=Прокси модул KDE-ове касете
+-Name[sr@Latn]=Прокси модул KDE-ове касете
++Name[sr@Latn]=Proksi modul KDE-ove kasete
+ Name[sv]=KDE-proxymodul för systembricka
+ Name[ta]=KDE தட்டு மாற்று பதிலாள் கூறு
+ Name[tg]=Новаи KDE-и модули прокси
+ Name[tr]=KDE Görev Çubuğu Vekil Birimi
+ Name[uk]=Модуль посередника для програм в системному лотку
+-Name[xx]=xxKDE Tray Proxy Modulexx
+ Name[zh_CN]=KDE 托盘代理模块
+ Comment=Proxy enabling KDE systray applications to work without KWin
++Comment[af]=Proksie wat KDE 'systray' programme toelaat om sonder KWin te werk
+ Comment[bg]=Модул, който позволява на програмите от КДЕ да работят в системния поднос с други мениджъри на прозорци
+ Comment[bn]=কে.ডি.ই. সিস-ট্রে অ্যাপলিকেশন কে-উইন ছাড়াই কাজ করাবার জন্য প্রক্সি
+ Comment[bs]=Proxy koji omogućuje KDE systray programima da rade izvan KWin-a
+@@ -80,13 +81,12 @@
+ Comment[sk]=Proxy pre aplikácie z lišty KDE, aby nevyžadovali KWin
+ Comment[sl]=Posrednik, ki omogoča programom sistemske vrstice KDE, da delujejo brez KWin
+ Comment[sr]=Прокси који омогућава KDE програмима за системску касету да раде без KWin-а
+-Comment[sr@Latn]=Прокси који омогућава KDE програмима за системску касету да раде без KWin-а
++Comment[sr@Latn]=Proksi koji omogućava KDE programima za sistemsku kasetu da rade bez KWin-a
+ Comment[sv]=Proxymodul som gör det möjligt för KDE:s program i systembrickan att fungera utan Kwin
+ Comment[ta]=மாற்று பதிலாள் KDE அமைப்பு தட்டு பயன்பாட்டை KWin இல்லாமல் வேலை செய்ய செயல்படுத்துகிறது
+ Comment[tg]=Proxy барномаҳои KDE systray-ро барои корнамоӣ, бидуни KWin фаъол месозад
+ Comment[tr]=Vekil sunucu etkinleştirme KDE sistem çubuğu uygulamalarının KWin olmadan çalıştırır.
+ Comment[uk]=Програма посередник яка дозволяє працювати програмам для KDE, що використовують системний лоток без працюючого KWin
+-Comment[xx]=xxProxy enabling KDE systray applications to work without KWinxx
+ Comment[zh_CN]=允许 KDE 系统托盘应用程序在没有 KWin 的情况下工作
+ ServiceTypes=KDEDModule
+ X-KDE-ModuleType=Library
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeui/kdockwidget.cpp kdelibs_3_4_BRANCH/kdeui/kdockwidget.cpp
+--- kdelibs_3_4_0_RELEASE/kdeui/kdockwidget.cpp	2004-12-11 00:11:55.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeui/kdockwidget.cpp	2005-03-12 18:58:46.000000000 +0100
+@@ -1245,6 +1245,7 @@
+ void KDockWidget::restoreFromForcedFixedSize()
+ {
+ 	d->forcedWidth=-1;
++	d->forcedHeight=-1;
+ 	setMinimumWidth(0);
+ 	setMaximumWidth(32000);
+ 	setMinimumHeight(0);
+@@ -2021,17 +2022,54 @@
+     currentDragWidget->move( QCursor::pos() - d->dragOffset );
+   }
+   else {
++    // curPos is the current target DockPosition.
++    // currentDragWidget->prevSideDockPosBeforeDrag is where the dockwidget comes from.
++    // currentDragWidget->formerDockPos is the position *before* the dockwidget was in
++    // position currentDragWidget->prevSideDockPosBeforeDrag.
+     int splitPos = currentDragWidget->d->splitPosInPercent;
+-    // do we have to calculate 100%-splitPosInPercent?
+-    if( (curPos != currentDragWidget->prevSideDockPosBeforeDrag) && (curPos != KDockWidget::DockCenter) && (curPos != KDockWidget::DockDesktop)) {
+-      switch( currentDragWidget->prevSideDockPosBeforeDrag) {
+-      case KDockWidget::DockLeft:   if(curPos != KDockWidget::DockTop)    splitPos = 100-splitPos; break;
+-      case KDockWidget::DockRight:  if(curPos != KDockWidget::DockBottom) splitPos = 100-splitPos; break;
+-      case KDockWidget::DockTop:    if(curPos != KDockWidget::DockLeft)   splitPos = 100-splitPos; break;
+-      case KDockWidget::DockBottom: if(curPos != KDockWidget::DockRight)  splitPos = 100-splitPos; break;
++    KDockWidget::DockPosition previousPosition = currentDragWidget->prevSideDockPosBeforeDrag;
++
++//    kdDebug() << splitPos << endl;
++//    kdDebug() << "curPos: " << curPos << endl;
++//    kdDebug() << "formerDockPos: " << currentDragWidget->formerDockPos<< endl;
++//    kdDebug() << "prevSideDockPosBeforeDrag: " << currentDragWidget->prevSideDockPosBeforeDrag<< endl;
++
++    // Now we *need* to "invert" the procentual value, if the dockwidget moves from top/left
++    // to bottom/right or vice versa. This keeps the dockwidget's size on its new position.
++    // A special case is, when the dock position was DockNone, then we have to look for the
++    // formerDockPos to get things right.
++    if( (curPos != previousPosition)
++       && (curPos != KDockWidget::DockCenter) && (curPos != KDockWidget::DockDesktop)) {
++
++      if (previousPosition == KDockWidget::DockNone)
++        previousPosition = currentDragWidget->formerDockPos;
++
++      switch( previousPosition ) {
++      case KDockWidget::DockLeft:
++        if(curPos != KDockWidget::DockTop && curPos != KDockWidget::DockLeft)
++          splitPos = 100 - splitPos;
++        break;
++
++      case KDockWidget::DockRight:
++        if(curPos != KDockWidget::DockBottom && curPos != KDockWidget::DockRight)
++          splitPos = 100 - splitPos;
++        break;
++
++      case KDockWidget::DockTop:
++        if(curPos != KDockWidget::DockLeft && curPos != KDockWidget::DockTop )
++          splitPos = 100 - splitPos;
++        break;
++
++      case KDockWidget::DockBottom:
++        if(curPos != KDockWidget::DockRight && curPos != KDockWidget::DockBottom )
++          splitPos = 100 - splitPos;
++        break;
++
+       default: break;
+       }
+     }
++    // set new prevSideDockPosBeforeDrag
++    currentDragWidget->prevSideDockPosBeforeDrag = curPos;
+     currentDragWidget->manualDock( currentMoveWidget, curPos , splitPos, QCursor::pos() - d->dragOffset );
+     currentDragWidget->makeDockVisible();
+   }
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeui/kdockwidget_private.cpp kdelibs_3_4_BRANCH/kdeui/kdockwidget_private.cpp
+--- kdelibs_3_4_0_RELEASE/kdeui/kdockwidget_private.cpp	2005-01-19 17:46:07.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeui/kdockwidget_private.cpp	2005-03-12 18:58:46.000000000 +0100
+@@ -71,8 +71,8 @@
+   updateName();
+   divider->show();
+   resizeEvent(0);
+-  if (fixedWidth0!=-1) restoreFromForcedFixedSize((KDockWidget*)child0);
+-  if (fixedWidth1!=-1) restoreFromForcedFixedSize((KDockWidget*)child1);
++  if (fixedWidth0!=-1 || fixedHeight0!=-1) restoreFromForcedFixedSize((KDockWidget*)child0);
++  if (fixedWidth1!=-1 || fixedHeight1!=-1) restoreFromForcedFixedSize((KDockWidget*)child1);
+   if (((KDockWidget*)child0)->forcedFixedWidth()!=-1)
+   {
+   	setForcedFixedWidth(((KDockWidget*)child0),((KDockWidget*)child0)->forcedFixedWidth());
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeui/kedittoolbar.cpp kdelibs_3_4_BRANCH/kdeui/kedittoolbar.cpp
+--- kdelibs_3_4_0_RELEASE/kdeui/kedittoolbar.cpp	2005-03-03 01:49:00.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeui/kedittoolbar.cpp	2005-03-18 18:12:18.806415924 +0100
+@@ -1082,9 +1082,7 @@
+   // we're modified, so let this change
+   emit enableOk(true);
+ 
+-  //slotToolbarSelected( m_toolbarCombo->currentText() ); causes #97572
+-  delete item;
+-  // TODO loadActionList( ... , ActiveListOnly );
++  slotToolbarSelected( m_toolbarCombo->currentText() );
+ }
+ 
+ void KEditToolbarWidget::slotRemoveButton()
+@@ -1095,10 +1093,7 @@
+   // we're modified, so let this change
+   emit enableOk(true);
+ 
+-  //slotToolbarSelected( m_toolbarCombo->currentText() );
+-  delete item;
+-  // TODO loadActionList ( ..., InactiveListOnly )
+-  //     or just add it to the left again.
++  slotToolbarSelected( m_toolbarCombo->currentText() );
+ }
+ 
+ void KEditToolbarWidget::insertActive(ToolbarItem *item, QListViewItem *before, bool prepend)
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeui/klineedit.cpp kdelibs_3_4_BRANCH/kdeui/klineedit.cpp
+--- kdelibs_3_4_0_RELEASE/kdeui/klineedit.cpp	2005-02-01 12:27:30.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeui/klineedit.cpp	2005-03-12 18:58:46.000000000 +0100
+@@ -1176,6 +1176,14 @@
+             const QString currentSelection = d->completionBox->currentText();
+             d->completionBox->setItems( items );
+             QListBoxItem* item = d->completionBox->findItem( currentSelection, Qt::ExactMatch );
++            // If no item is selected, that means the listbox hasn't been manipulated by the user yet,
++            // because it's not possible otherwise to have no selected item. In such case make
++            // always the first item current and unselected, so that the current item doesn't jump.
++            if( !item || !wasSelected )
++            {
++                wasSelected = false;
++                item = d->completionBox->item( 0 );
++            }
+             if ( item )
+             {
+                 d->completionBox->blockSignals( true );
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeui/kmainwindow.h kdelibs_3_4_BRANCH/kdeui/kmainwindow.h
+--- kdelibs_3_4_0_RELEASE/kdeui/kmainwindow.h	2005-01-29 20:20:08.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeui/kmainwindow.h	2005-03-12 18:58:46.000000000 +0100
+@@ -1037,7 +1037,7 @@
+   const char * classNames[3];
+   classNames[0] = T0::staticMetaObject()->className();
+   classNames[1] = T1::staticMetaObject()->className();
+-  classNames[2] = T1::staticMetaObject()->className();
++  classNames[2] = T2::staticMetaObject()->className();
+   for ( int n = 1 ; KMainWindow::canBeRestored( n ) ; ++n ) {
+     const QString className = KMainWindow::classNameOfToplevel( n );
+     if ( className == QString::fromLatin1( classNames[0] ) )
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeui/kpopupmenu.h kdelibs_3_4_BRANCH/kdeui/kpopupmenu.h
+--- kdelibs_3_4_0_RELEASE/kdeui/kpopupmenu.h	2004-12-19 12:05:29.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeui/kpopupmenu.h	2005-03-12 18:58:46.000000000 +0100
+@@ -16,7 +16,7 @@
+    Boston, MA 02111-1307, USA.
+ */
+ #ifndef _KPOPUP_H
+-#define _KPOPUP_H "$Id: kpopupmenu.h,v 1.35 2004/12/19 11:05:29 faure Exp $"
++#define _KPOPUP_H "$Id: kpopupmenu.h,v 1.35.2.1 2005/03/10 20:21:20 adridg Exp $"
+ 
+ #define INCLUDE_MENUITEM_DEF
+ 
+@@ -64,7 +64,7 @@
+      *
+      * You will want to call this before inserting into a menu.
+      */
+-    void setTitle(const QString &text, const QPixmap *icon=NULL);
++    void setTitle(const QString &text, const QPixmap *icon=0);
+     /**
+      * Returns the current title.
+      */
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeui/ksconfig.cpp kdelibs_3_4_BRANCH/kdeui/ksconfig.cpp
+--- kdelibs_3_4_0_RELEASE/kdeui/ksconfig.cpp	2005-01-31 19:07:49.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeui/ksconfig.cpp	2005-03-18 18:12:20.711090674 +0100
+@@ -647,6 +647,8 @@
+       // FIXME: use "aspell dump config" to find out the dict-dir
+       QFileInfo dir ("/usr/lib/aspell");
+       if (!dir.exists() || !dir.isDir())
++        dir.setFile ("/usr/lib/aspell-0.60");
++      if (!dir.exists() || !dir.isDir())
+         dir.setFile ("/usr/local/lib/aspell");
+       if (!dir.exists() || !dir.isDir())
+         dir.setFile ("/usr/share/aspell");
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdeui/kspell.cpp kdelibs_3_4_BRANCH/kdeui/kspell.cpp
+--- kdelibs_3_4_0_RELEASE/kdeui/kspell.cpp	2005-02-25 14:15:50.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdeui/kspell.cpp	2005-03-18 18:12:20.963047649 +0100
+@@ -1094,14 +1094,18 @@
+ 
+   } while( tempe>0 );
+ 
+-  proc->ackRead();
+-
+-
+   if ( tempe == -1 ) { //we were called, but no data seems to be ready...
++    // Make sure we don't get called directly again and make sure we do get
++    // called when new data arrives.
++    NOOUTPUT( check2 );
++    proc->enableReadSignals(true);
++    OUTPUT( check2 );
+     recursive = false;
+     return;
+   }
+ 
++  proc->ackRead();
++
+   //If there is more to check, then send another line to ISpell.
+   if ( (unsigned int)lastline < origbuffer.length() )
+   {
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdoctools/customization/pt-BR/lang.entities kdelibs_3_4_BRANCH/kdoctools/customization/pt-BR/lang.entities
+--- kdelibs_3_4_0_RELEASE/kdoctools/customization/pt-BR/lang.entities	2005-03-04 19:32:53.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdoctools/customization/pt-BR/lang.entities	2005-02-26 18:42:01.000000000 +0100
+@@ -1,3 +1,5 @@
++<!-- Do NOT change this file: it provides important defaults -->
++
+ <!ENTITY language "pt-BR">
+ 
+ <!-- These entities should be translated, should therefore be stored
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kdoctools/customization/pt-BR/user.entities kdelibs_3_4_BRANCH/kdoctools/customization/pt-BR/user.entities
+--- kdelibs_3_4_0_RELEASE/kdoctools/customization/pt-BR/user.entities	2005-03-04 19:32:53.000000000 +0100
++++ kdelibs_3_4_BRANCH/kdoctools/customization/pt-BR/user.entities	2005-02-26 18:42:01.000000000 +0100
+@@ -7,7 +7,6 @@
+  -->
+ 
+ <!ENTITY Alt    "<keycap>Alt</keycap>">
+-<!ENTITY artsbuilder "construtor arts">
+ <!ENTITY Backspace "<keycap>Esc</keycap>">
+ <!ENTITY cdrom  "<hardware>CD-ROM</hardware>">
+ <!ENTITY Ctrl   "<keycap>Ctrl</keycap>">
+@@ -16,9 +15,7 @@
+ <!ENTITY Enter	"<keycap>Enter</keycap>">
+ <!ENTITY Esc   "<keycap>Esc</keycap>">
+ <!ENTITY etc     "<abbrev>etc</abbrev>">
+-<!ENTITY ex     "<abbrev>por exemplo</abbrev>">
+ <!ENTITY FAQ     "Perguntas Mais Freqüentes (do inglês <acronym>FAQ</acronym>)">
+-<!ENTITY HTML	'<acronym>HTML</acronym>'>
+ <!ENTITY ie     "isto é">
+ <!ENTITY infocenter	"<application>Centro de Informações</application>">
+ <!ENTITY kcontrolcenter "<application>Centro de Controle do &kde;</application>">
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/khtml/css/cssparser.cpp kdelibs_3_4_BRANCH/khtml/css/cssparser.cpp
+--- kdelibs_3_4_0_RELEASE/khtml/css/cssparser.cpp	2005-02-15 16:45:09.000000000 +0100
++++ kdelibs_3_4_BRANCH/khtml/css/cssparser.cpp	2005-03-18 18:12:42.882304989 +0100
+@@ -1313,7 +1313,7 @@
+     inParseShortHand = true;
+ 
+     bool found = false;
+-    bool oldPropIndex = numParsedProperties;
++    int oldPropIndex = numParsedProperties;
+     bool fnd[6]; //Trust me ;)
+     for( int i = 0; i < numProperties; i++ )
+             fnd[i] = false;
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/khtml/ecma/kjs_dom.cpp kdelibs_3_4_BRANCH/khtml/ecma/kjs_dom.cpp
+--- kdelibs_3_4_0_RELEASE/khtml/ecma/kjs_dom.cpp	2005-02-13 23:31:38.000000000 +0100
++++ kdelibs_3_4_BRANCH/khtml/ecma/kjs_dom.cpp	2005-03-18 18:12:44.185082563 +0100
+@@ -292,9 +292,19 @@
+     case ScrollHeight:
+       return rend ? static_cast<Value>( Number(rend->scrollHeight()) ) : Undefined();
+     case ScrollLeft:
+-      return Number( rend && rend->layer() ? rend->layer()->scrollXOffset() : 0 );
++      if (rend && rend->layer()) {
++          if (rend->isRoot() && !rend->style()->hidesOverflow())
++              return Number( node.ownerDocument().view() ? node.ownerDocument().view()->contentsX() : 0);
++          return Number( rend->layer()->scrollXOffset() );
++      }
++      return Number( 0 );
+     case ScrollTop:
+-      return Number( rend && rend->layer() ? rend->layer()->scrollYOffset() : 0 );
++      if (rend && rend->layer()) {
++          if (rend->isRoot() && !rend->style()->hidesOverflow())
++              return Number( node.ownerDocument().view() ? node.ownerDocument().view()->contentsY() : 0);
++          return Number( rend->layer()->scrollYOffset() );
++      }
++      return Number( 0 );
+     default:
+       kdDebug(6070) << "WARNING: Unhandled token in DOMNode::getValueProperty : " << token << endl;
+       break;
+@@ -393,14 +403,28 @@
+     break;
+   case ScrollTop: {
+     khtml::RenderObject *rend = node.handle() ? node.handle()->renderer() : 0L;
+-    if (rend && rend->layer() && rend->style()->hidesOverflow())
+-        rend->layer()->scrollToYOffset(value.toInt32(exec));
++    if (rend && rend->layer()) {
++        if (rend->style()->hidesOverflow())
++            rend->layer()->scrollToYOffset(value.toInt32(exec));
++        else if (rend->isRoot()) {
++            QScrollView* sview = node.ownerDocument().view();
++            if (sview)
++                sview->setContentsPos(sview->contentsX(), value.toInt32(exec));
++        }
++    }       
+     break;
+   }
+   case ScrollLeft: {
+     khtml::RenderObject *rend = node.handle() ? node.handle()->renderer() : 0L;
+-    if (rend && rend->layer() && rend->style()->hidesOverflow())
+-      rend->layer()->scrollToXOffset(value.toInt32(exec));
++    if (rend && rend->layer()) {
++        if (rend->style()->hidesOverflow())
++            rend->layer()->scrollToXOffset(value.toInt32(exec));
++        else if (rend->isRoot()) {
++            QScrollView* sview = node.ownerDocument().view();
++            if (sview)
++                sview->setContentsPos(value.toInt32(exec), sview->contentsY());
++        }
++    }
+     break;
+   }
+   default:
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/khtml/ecma/kjs_window.cpp kdelibs_3_4_BRANCH/khtml/ecma/kjs_window.cpp
+--- kdelibs_3_4_0_RELEASE/khtml/ecma/kjs_window.cpp	2005-02-02 19:27:49.000000000 +0100
++++ kdelibs_3_4_BRANCH/khtml/ecma/kjs_window.cpp	2005-03-12 18:58:47.000000000 +0100
+@@ -1751,11 +1751,11 @@
+   timerId = _timerId;
+ }
+ 
+-void ScheduledAction::execute(Window *window)
++bool ScheduledAction::execute(Window *window)
+ {
+   KHTMLPart *part = ::qt_cast<KHTMLPart *>(window->m_frame->m_part);
+-  if (!part)
+-    return;
++  if (!part || !part->jScriptEnabled())
++    return false;
+   ScriptInterpreter *interpreter = static_cast<ScriptInterpreter *>(part->jScript()->interpreter());
+ 
+   interpreter->setProcessingTimerCallback(true);
+@@ -1785,6 +1785,7 @@
+   }
+ 
+   interpreter->setProcessingTimerCallback(false);
++  return true;
+ }
+ 
+ void ScheduledAction::mark()
+@@ -1910,8 +1911,11 @@
+ 
+     if (action->singleShot)
+       scheduledActions.removeRef(action);
+-    if (parent->part())
+-      action->execute(parent);
++    if (parent->part()) {
++      bool ok = action->execute(parent);
++      if ( !ok ) // e.g. JS disabled
++        scheduledActions.removeRef( action );
++    }
+ 
+     action->executing = false;
+ 
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/khtml/ecma/kjs_window.h kdelibs_3_4_BRANCH/khtml/ecma/kjs_window.h
+--- kdelibs_3_4_0_RELEASE/khtml/ecma/kjs_window.h	2004-09-02 23:07:09.000000000 +0200
++++ kdelibs_3_4_BRANCH/khtml/ecma/kjs_window.h	2005-03-12 18:58:47.000000000 +0100
+@@ -179,7 +179,7 @@
+     ScheduledAction(Object _func, List _args, QTime _nextTime, int _interval, bool _singleShot, int _timerId);
+     ScheduledAction(QString _code, QTime _nextTime, int _interval, bool _singleShot, int _timerId);
+     ~ScheduledAction();
+-    void execute(Window *window);
++    bool execute(Window *window);
+     void mark();
+ 
+     ObjectImp *func;
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/khtml/html/html_baseimpl.cpp kdelibs_3_4_BRANCH/khtml/html/html_baseimpl.cpp
+--- kdelibs_3_4_0_RELEASE/khtml/html/html_baseimpl.cpp	2004-12-21 16:31:18.000000000 +0100
++++ kdelibs_3_4_BRANCH/khtml/html/html_baseimpl.cpp	2005-03-18 18:12:44.895961194 +0100
+@@ -206,7 +206,11 @@
+     RenderStyle* style = getDocument()->styleSelector()->styleForElement(this);
+     style->ref();
+     if (parentNode()->renderer() && style->display() != NONE) {
+-        m_render = new (getDocument()->renderArena()) RenderBody(this);
++        if (style->display() == BLOCK)
++            // only use the quirky class for block display
++            m_render = new (getDocument()->renderArena()) RenderBody(this);
++        else
++            m_render = RenderObject::createObject(this, style);
+         m_render->setStyle(style);
+         parentNode()->renderer()->addChild(m_render, nextRenderer());
+     }
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/khtml/html/html_formimpl.cpp kdelibs_3_4_BRANCH/khtml/html/html_formimpl.cpp
+--- kdelibs_3_4_0_RELEASE/khtml/html/html_formimpl.cpp	2005-02-20 18:36:46.000000000 +0100
++++ kdelibs_3_4_BRANCH/khtml/html/html_formimpl.cpp	2005-03-12 18:58:47.000000000 +0100
+@@ -1604,6 +1604,11 @@
+ 		m_render->absolutePosition(offsetX,offsetY);
+ 		xPos = me->clientX()-offsetX;
+ 		yPos = me->clientY()-offsetY;
++                KHTMLView* v = getDocument()->view();
++                if ( v ) {
++                    xPos += v->contentsX();
++                    yPos += v->contentsY();
++                }
+ 	    }
+ 	}
+ 
+@@ -2463,13 +2468,13 @@
+         if ( m_render && m_initialized ) {
+             RenderTextArea* renderArea = static_cast<RenderTextArea*>( m_render );
+             m_value = renderArea->text();
++            m_dirtyvalue = false; // before onChange (#100963)
+             onChange();
+         } else {
+             m_value = defaultValue().string();
+             m_initialized = true;
++            m_dirtyvalue = false;
+         }
+-
+-        m_dirtyvalue = false;
+     }
+ 
+     if ( m_value.isNull() ) return "";
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/khtml/html/html_imageimpl.cpp kdelibs_3_4_BRANCH/khtml/html/html_imageimpl.cpp
+--- kdelibs_3_4_0_RELEASE/khtml/html/html_imageimpl.cpp	2004-12-31 22:42:24.000000000 +0100
++++ kdelibs_3_4_BRANCH/khtml/html/html_imageimpl.cpp	2005-03-18 18:12:45.107925006 +0100
+@@ -181,13 +181,13 @@
+         _style->display() != NONE)
+     {
+         m_render = new (getDocument()->renderArena()) RenderImage(this);
+-        m_render->setStyle(getDocument()->styleSelector()->styleForElement(this));
++        m_render->setStyle(_style);
+         parentNode()->renderer()->addChild(m_render, nextRenderer());
+-        m_render->updateFromElement();
+     }
+     _style->deref();
+-
+     NodeBaseImpl::attach();
++    if (m_render)
++        m_render->updateFromElement();
+ }
+ 
+ long HTMLImageElementImpl::width() const
+@@ -201,7 +201,8 @@
+             getDocument()->view()->layout();
+     }
+ 
+-    return m_render->contentWidth();
++    return m_render ? m_render->contentWidth() : 
++                      getAttribute(ATTR_WIDTH).toInt();
+ }
+ 
+ long HTMLImageElementImpl::height() const
+@@ -215,7 +216,8 @@
+             getDocument()->view()->layout();
+     }
+ 
+-    return m_render->contentHeight();
++    return m_render ? m_render->contentHeight() :
++                      getAttribute(ATTR_HEIGHT).toInt();
+ }
+ 
+ QImage HTMLImageElementImpl::currentImage() const
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/khtml/java/kjavaappletviewer.desktop kdelibs_3_4_BRANCH/khtml/java/kjavaappletviewer.desktop
+--- kdelibs_3_4_0_RELEASE/khtml/java/kjavaappletviewer.desktop	2005-02-21 10:17:19.000000000 +0100
++++ kdelibs_3_4_BRANCH/khtml/java/kjavaappletviewer.desktop	2005-03-12 18:58:47.000000000 +0100
+@@ -1,10 +1,12 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Embedded Java Applet Viewer
++Name[af]=Ingelegde Java Program Bekyker
+ Name[ar]=عارض بريمجات جافا المدمج
+ Name[az]=Daxili Java Applet Nümayişçisi
+ Name[bg]=Вграден визуализатор на аплети Java
+ Name[bn]=অভ্যন্তরীণ জাভা অ্যাপলেট প্রদর্শক
++Name[br]=Lenner enframmet eus arloadigoù Java
+ Name[ca]=Applet encastable del visor Java
+ Name[cs]=Zabudovaný prohlížeč Java appletů
+ Name[cy]=Gwelydd Rhaglennig Java Mewnadeiladedig
+@@ -57,7 +59,6 @@
+ Name[uk]=Вмонтований переглядач аплетів Java
+ Name[uz]=Ички Java апплетини кўрувчи
+ Name[wa]=Ravalé håyneu d' apliketes Java
+-Name[xx]=xxEmbedded Java Applet Viewerxx
+ Name[zh_CN]=嵌入的 Java 小程序查看器
+ Name[zh_TW]=Embedded Java Applet 檢視器
+ X-KDE-Library=kjavaappletviewer
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/khtml/khtml.desktop kdelibs_3_4_BRANCH/khtml/khtml.desktop
+--- kdelibs_3_4_0_RELEASE/khtml/khtml.desktop	2005-01-21 05:24:08.000000000 +0100
++++ kdelibs_3_4_BRANCH/khtml/khtml.desktop	2005-03-12 18:58:47.000000000 +0100
+@@ -69,16 +69,13 @@
+ Comment[ven]=Khomphonente ya HTML yau vhona
+ Comment[vi]=Component đềExem HTML có thềEembeđ được 
+ Comment[xh]=Inxenye yemboniselo elungisiweyo ye HTML
+-Comment[xx]=xxEmbeddable HTML viewing componentxx
+ Comment[zh_CN]=可嵌入的 HTML 查看部件
+ Comment[zh_TW]=可嵌入的 HTML 檢視元件
+ Comment[zu]= Ilunga lokubuka le-HTML Eshuthekiwe
+ MimeType=text/html;text/xml;application/xhtml+xml;
+ Icon=konqueror
+ Name=KHTML
+-Name[af]=Khtml
+ Name[hi]=केएचटीएमएल (KHTML)
+-Name[xx]=xxKHTMLxx
+ ServiceTypes=KParts/ReadOnlyPart,Browser/View
+ X-KDE-Library=libkhtmlpart
+ InitialPreference=10
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/khtml/khtmlimage.desktop kdelibs_3_4_BRANCH/khtml/khtmlimage.desktop
+--- kdelibs_3_4_0_RELEASE/khtml/khtmlimage.desktop	2005-02-23 22:32:44.000000000 +0100
++++ kdelibs_3_4_BRANCH/khtml/khtmlimage.desktop	2005-03-12 18:58:47.000000000 +0100
+@@ -7,6 +7,7 @@
+ Comment[az]=Daxili Rəsm Nümayiş Vasitəsi
+ Comment[bg]=Компонент за вграждане за преглед на изображения
+ Comment[bn]=অভ্যন্তরীণ চিত্র প্রদর্শক উপাদান
++Comment[br]=Parzh skeudenn gweler enframmus
+ Comment[bs]=Umetljiva komponenta za pregled slika
+ Comment[ca]=Component encastable per a visualitzar imatges
+ Comment[cs]=Komponenta pro zobrazování obrázků
+@@ -67,7 +68,6 @@
+ Comment[ven]=Khomphonente yau vhona tshifanyiso
+ Comment[vi]=Component đềExem ảnh có thềEembeđ được 
+ Comment[xh]=Ingxenye Yemboniselo Yomfanekiso Olungisiweyo
+-Comment[xx]=xxEmbeddable Image Viewing Componentxx
+ Comment[zh_CN]=可嵌入的图像查看部件
+ Comment[zh_TW]=可嵌入的影像檢視元件
+ Comment[zu]=Ilunga Lokubukisa Isithombe Elishuthekayo
+@@ -139,7 +139,6 @@
+ Name[vi]=Trình xem ảnh có thềEembeđ được 
+ Name[wa]=Ravalé håyneu d' imådjes
+ Name[xh]=Umboniseli Womfanekiso Olungisiweyo
+-Name[xx]=xxEmbeddable Image Viewerxx
+ Name[zh_CN]=可嵌入的图像查看器
+ Name[zh_TW]=可嵌入的影像檢視器
+ Name[zu]=Isithombe Sombukisi Oshuthisekayo
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/khtml/kmultipart/kmultipart.cpp kdelibs_3_4_BRANCH/khtml/kmultipart/kmultipart.cpp
+--- kdelibs_3_4_0_RELEASE/khtml/kmultipart/kmultipart.cpp	2004-04-29 23:31:24.000000000 +0200
++++ kdelibs_3_4_BRANCH/khtml/kmultipart/kmultipart.cpp	2005-03-18 18:12:46.593671346 +0100
+@@ -109,6 +109,7 @@
+     // We probably need to use m_extension to get the urlArgs in openURL...
+ 
+     m_part = 0L;
++    m_isHTMLPart = false;
+     m_job = 0L;
+     m_lineParser = new KLineParser;
+     m_tempFile = 0L;
+@@ -242,6 +243,9 @@
+                 {
+                     Q_ASSERT( m_nextMimeType.isNull() );
+                     m_nextMimeType = QString::fromLatin1( line.data() + 14 ).stripWhiteSpace();
++                    int semicolon = m_nextMimeType.find( ';' );
++                    if ( semicolon != -1 )
++                        m_nextMimeType = m_nextMimeType.left( semicolon );
+                     kdDebug() << "m_nextMimeType=" << m_nextMimeType << endl;
+                 }
+                 // Empty line, end of headers (if we had any header line before)
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/khtml/kmultipart/kmultipart.desktop kdelibs_3_4_BRANCH/khtml/kmultipart/kmultipart.desktop
+--- kdelibs_3_4_0_RELEASE/khtml/kmultipart/kmultipart.desktop	2005-02-23 06:04:35.000000000 +0100
++++ kdelibs_3_4_BRANCH/khtml/kmultipart/kmultipart.desktop	2005-03-12 18:58:48.000000000 +0100
+@@ -3,6 +3,7 @@
+ Type=Service
+ MimeType=multipart/mixed;multipart/x-mixed-replace
+ Name=Embeddable Component for multipart/mixed
++Name[af]=Inlegbare Komponent vir multideel/gemeng
+ Name[bg]=Компонент за вграждане за преглед на съобщения multipart/mixed
+ Name[bn]=multipart/mixed-এর জন্য অভ্যন্তরীণ উপাদান
+ Name[bs]=Ugradiva komponenta za multipart/mixed
+@@ -40,13 +41,12 @@
+ Name[sk]=Vložiteľný komponent pre multipart/mixed
+ Name[sl]=Vgradljiva komponenta za multipart/mixed
+ Name[sr]=Уградива компонента за „multipart/mixed“
+-Name[sr@Latn]=Уградива компонента за „multipart/mixed“
++Name[sr@Latn]=Ugradiva komponenta za „multipart/mixed“
+ Name[sv]=Inbyggbar komponent för multipart/mixed
+ Name[ta]=பலப்பகுதி/கலக்கப்பட்ட பகுதிக்குரிய உட்பொதிந்த பகுதி
+ Name[tg]=Компоненти дарунсохт барои қисматҳои зиёд/омезишшуда
+ Name[tr]=Çok parçalı/karışık için Gömülebilir Bileşen
+ Name[uk]=Вбудовна компонента для повідомлень multipart/mixed
+-Name[xx]=xxEmbeddable Component for multipart/mixedxx
+ Name[zh_CN]=可嵌入的 multipart/mixed 组件
+ ServiceTypes=KParts/ReadOnlyPart
+ X-KDE-Library=libkmultipart
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/khtml/rendering/break_lines.cpp kdelibs_3_4_BRANCH/khtml/rendering/break_lines.cpp
+--- kdelibs_3_4_0_RELEASE/khtml/rendering/break_lines.cpp	2004-11-16 15:12:46.000000000 +0100
++++ kdelibs_3_4_BRANCH/khtml/rendering/break_lines.cpp	2005-03-18 18:12:48.133408472 +0100
+@@ -50,6 +50,8 @@
+     void cleanup_thaibreaks()
+     {
+         delete cache;
++        cache = 0;
++        th_brk = 0;
+     }
+ 
+     bool isBreakableThai( const QChar *string, const int pos, const int len)
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/khtml/rendering/render_box.cpp kdelibs_3_4_BRANCH/khtml/rendering/render_box.cpp
+--- kdelibs_3_4_0_RELEASE/khtml/rendering/render_box.cpp	2005-02-18 23:52:51.000000000 +0100
++++ kdelibs_3_4_BRANCH/khtml/rendering/render_box.cpp	2005-03-18 18:12:48.152405228 +0100
+@@ -200,6 +200,8 @@
+ 
+ InlineBox* RenderBox::createInlineBox(bool /*makePlaceHolderBox*/, bool /*isRootLineBox*/)
+ {
++    if (m_placeHolderBox)
++        m_placeHolderBox->detach(renderArena());
+     return (m_placeHolderBox = new (renderArena()) InlineBox(this));
+ }
+ 
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/khtml/rendering/render_flow.cpp kdelibs_3_4_BRANCH/khtml/rendering/render_flow.cpp
+--- kdelibs_3_4_0_RELEASE/khtml/rendering/render_flow.cpp	2005-02-14 23:13:39.000000000 +0100
++++ kdelibs_3_4_BRANCH/khtml/rendering/render_flow.cpp	2005-03-18 18:12:48.155404716 +0100
+@@ -140,7 +140,6 @@
+         m_firstLineBox = 0;
+         m_lastLineBox = 0;  
+     }
+-    RenderBox::deleteInlineBoxes(arena);
+ }
+ 
+ InlineBox* RenderFlow::createInlineBox(bool makePlaceHolderBox, bool isRootLineBox)
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kimgio/bmp.kimgio kdelibs_3_4_BRANCH/kimgio/bmp.kimgio
+--- kdelibs_3_4_0_RELEASE/kimgio/bmp.kimgio	2005-01-21 05:24:09.000000000 +0100
++++ kdelibs_3_4_BRANCH/kimgio/bmp.kimgio	2005-03-12 18:58:48.000000000 +0100
+@@ -2,6 +2,7 @@
+ Type=BMP
+ Header=
+ Name=BMP Image
++Name[af]=BMP Beeld
+ Name[ar]=صورة من نوع BMP
+ Name[az]=BMP Rəsmi
+ Name[be]=Выява BMP
+@@ -62,7 +63,6 @@
+ Name[uk]=Зображення BMP
+ Name[uz]=BMP-расм
+ Name[wa]=Imådje BMP
+-Name[xx]=xxBMP Imagexx
+ Name[zh_CN]=BMP 图像
+ Read=true
+ Write=true
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kimgio/dds.kimgio kdelibs_3_4_BRANCH/kimgio/dds.kimgio
+--- kdelibs_3_4_0_RELEASE/kimgio/dds.kimgio	2005-02-23 06:04:36.000000000 +0100
++++ kdelibs_3_4_BRANCH/kimgio/dds.kimgio	2005-03-12 18:58:48.000000000 +0100
+@@ -2,6 +2,7 @@
+ Type=DDS
+ Header=^DDS
+ Name=Direct Draw Surface
++Name[af]=Direct Draw Oppervlakte
+ Name[be]=Паверхня Draw Surface
+ Name[bg]=Област с директно изчертаване
+ Name[bn]=ডাইরেক্ট ড্র সারফেস
+@@ -32,13 +33,12 @@
+ Name[sk]=Povrch Direct Draw
+ Name[sl]=Površina Direct Draw
+ Name[sr]=Површина за директно цртање
+-Name[sr@Latn]=Површина за директно цртање
++Name[sr@Latn]=Površina za direktno crtanje
+ Name[sv]=Direktrityta
+ Name[ta]=நேரடியாக வரையும் சூழல்
+ Name[tg]=Кашидани сатҳи мустақим
+ Name[tr]=Doğrudan Çizim Yüzeyi
+ Name[uk]=Поверхня Direct Draw
+-Name[xx]=xxDirect Draw Surfacexx
+ Name[zh_CN]=DirectDraw 表面
+ Read=true
+ Write=false
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kimgio/eps.kimgio kdelibs_3_4_BRANCH/kimgio/eps.kimgio
+--- kdelibs_3_4_0_RELEASE/kimgio/eps.kimgio	2005-01-29 04:58:13.000000000 +0100
++++ kdelibs_3_4_BRANCH/kimgio/eps.kimgio	2005-03-12 18:58:48.000000000 +0100
+@@ -2,6 +2,7 @@
+ Type=EPS
+ Header=^(?:%c5%d0%d3%c6|%!PS-Adobe)
+ Name=Encapsulated PostScript Image
++Name[af]=Geënkapsuleerde Postscript Beeld
+ Name[ar]=Encapsulated PostScript صورة
+ Name[az]=Encapsulated PostScript Rəsmi
+ Name[be]=Выява Encapsulated PostScript
+@@ -61,7 +62,6 @@
+ Name[uk]=Вбудоване зображення PostScript
+ Name[uz]=EPS-расм
+ Name[wa]=Imådje PostScript ecapsulêye
+-Name[xx]=xxEncapsulated PostScript Imagexx
+ Name[zh_CN]=封装后的 Postscript 图像
+ Name[zh_TW]=Ensapsulated Postscript 影像
+ Read=true
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kimgio/exr.kimgio kdelibs_3_4_BRANCH/kimgio/exr.kimgio
+--- kdelibs_3_4_0_RELEASE/kimgio/exr.kimgio	2005-02-23 06:04:36.000000000 +0100
++++ kdelibs_3_4_BRANCH/kimgio/exr.kimgio	2005-03-12 18:58:48.000000000 +0100
+@@ -2,7 +2,9 @@
+ Type=EXR
+ Header=^\x76\x2f\x31\01
+ Name=ILM EXR Image Kimgio
++Name[af]=ILM EXR Beeld Kimgio
+ Name[bg]=Изображение ILM EXR Kimgio
++Name[br]=Skeudenn Kimgio ILM EXR
+ Name[ca]=Imatge ILM EXR pel Kimgio
+ Name[da]=ILM EXR billede Kimgio
+ Name[de]=ILM-EXR-Bild
+@@ -37,13 +39,12 @@
+ Name[sk]=Obrázok ILM EXR KImgio
+ Name[sl]=Slika ILM EXR Kimgio
+ Name[sr]=ILM EXR Kimgio слика
+-Name[sr@Latn]=ILM EXR Kimgio слика
++Name[sr@Latn]=ILM EXR Kimgio slika
+ Name[sv]=ILM EXR-bild Kimgio
+ Name[ta]=ILM EXR பிம்ப கிம்ஜியோ
+ Name[tg]=Тасвири ILM EXR Kimgio
+ Name[tr]=ILM EXR Resim Kimgio
+ Name[uk]=Ввід/Вивід для зображень ILM EXR
+-Name[xx]=xxILM EXR Image Kimgioxx
+ Name[zh_CN]=ILM EXR 图像 Kimgio
+ Read=true
+ Write=false
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kimgio/g3.kimgio kdelibs_3_4_BRANCH/kimgio/g3.kimgio
+--- kdelibs_3_4_0_RELEASE/kimgio/g3.kimgio	2005-01-31 09:34:48.000000000 +0100
++++ kdelibs_3_4_BRANCH/kimgio/g3.kimgio	2005-03-12 18:58:48.000000000 +0100
+@@ -2,6 +2,7 @@
+ Type=G3
+ Header=II
+ Name=CCITT G3 Fax
++Name[af]=CCITT G3 Faks
+ Name[ar]=فاكس CCITT G3
+ Name[az]=CCITT G3 Faks
+ Name[be]=CCITT G3 факс
+@@ -55,7 +56,6 @@
+ Name[uk]=Факс CCITT G3
+ Name[uz]=CCITT G3 факс-файли
+ Name[wa]=Facs CCITT G3
+-Name[xx]=xxCCITT G3 Faxxx
+ Name[zh_CN]=CCITT G3 传真
+ Name[zh_TW]=CCITT G3 傳真
+ Read=true
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kimgio/gif.kimgio kdelibs_3_4_BRANCH/kimgio/gif.kimgio
+--- kdelibs_3_4_0_RELEASE/kimgio/gif.kimgio	2005-01-21 05:24:09.000000000 +0100
++++ kdelibs_3_4_BRANCH/kimgio/gif.kimgio	2005-03-12 18:58:48.000000000 +0100
+@@ -2,6 +2,7 @@
+ Type=GIF
+ Header=
+ Name=GIF Image
++Name[af]=GIF Beeld
+ Name[ar]=صورة من نوع GIF
+ Name[az]=GIF Rəsmi
+ Name[be]=Выява GIF
+@@ -62,7 +63,6 @@
+ Name[uk]=Зображення GIF
+ Name[uz]=GIF-расм
+ Name[wa]=Imådje GIF
+-Name[xx]=xxGIF Imagexx
+ Name[zh_CN]=GIF 图像
+ Name[zh_TW]=GIF 影像
+ Read=true
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kimgio/ico.kimgio kdelibs_3_4_BRANCH/kimgio/ico.kimgio
+--- kdelibs_3_4_0_RELEASE/kimgio/ico.kimgio	2005-01-21 05:24:09.000000000 +0100
++++ kdelibs_3_4_BRANCH/kimgio/ico.kimgio	2005-03-12 18:58:48.000000000 +0100
+@@ -2,6 +2,7 @@
+ Type=ICO
+ Header=^\001\001[\001|\002]\001
+ Name=Windows Icon
++Name[af]=Windows Ikoon
+ Name[ar]=أيقونة ويندوز
+ Name[az]=Windows Timsalı
+ Name[be]=Піктаграма Windows
+@@ -62,7 +63,6 @@
+ Name[uk]=Піктограма Windows
+ Name[uz]=Windows нишончаси
+ Name[wa]=Imådjete MS-Windows
+-Name[xx]=xxWindows Iconxx
+ Name[zh_CN]=Windows 图标
+ Name[zh_TW]=Windows 圖示
+ Read=true
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kimgio/jp2.kimgio kdelibs_3_4_BRANCH/kimgio/jp2.kimgio
+--- kdelibs_3_4_0_RELEASE/kimgio/jp2.kimgio	2005-01-21 05:24:09.000000000 +0100
++++ kdelibs_3_4_BRANCH/kimgio/jp2.kimgio	2005-03-12 18:58:48.000000000 +0100
+@@ -2,6 +2,7 @@
+ Type=jp2
+ Header=^\x01\x01\x01\x0C\x6A\x50
+ Name=JPEG 2000 Image
++Name[af]=JPEG 2000 Beeld
+ Name[ar]=صورة من نوع JPEG
+ Name[az]=JPEG 2000 Rəsmi
+ Name[be]=Выява JPEG 2000
+@@ -62,7 +63,6 @@
+ Name[uk]=Зображення JPEG 2000
+ Name[uz]=JPEG 2000-расм
+ Name[wa]=Imådje JPEG 2000
+-Name[xx]=xxJPEG 2000 Imagexx
+ Name[zh_CN]=JPEG 2000 图像
+ Name[zh_TW]=JPEG 2000 影像
+ Read=true
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kimgio/jpeg.kimgio kdelibs_3_4_BRANCH/kimgio/jpeg.kimgio
+--- kdelibs_3_4_0_RELEASE/kimgio/jpeg.kimgio	2005-01-21 05:24:09.000000000 +0100
++++ kdelibs_3_4_BRANCH/kimgio/jpeg.kimgio	2005-03-12 18:58:48.000000000 +0100
+@@ -2,6 +2,7 @@
+ Type=JPEG
+ Header=
+ Name=JPEG Image
++Name[af]=JPEG Beeld
+ Name[ar]=صورة من نوع JPEG
+ Name[az]=JPEG Rəsmi
+ Name[be]=Выява JPEG
+@@ -62,7 +63,6 @@
+ Name[uk]=Зображення JPEG
+ Name[uz]=JPEG-расм
+ Name[wa]=Imådje JPEG
+-Name[xx]=xxJPEG Imagexx
+ Name[zh_CN]=JPEG 图像
+ Name[zh_TW]=JPEG 影像
+ Read=true
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kimgio/mng.kimgio kdelibs_3_4_BRANCH/kimgio/mng.kimgio
+--- kdelibs_3_4_0_RELEASE/kimgio/mng.kimgio	2005-02-23 12:55:40.000000000 +0100
++++ kdelibs_3_4_BRANCH/kimgio/mng.kimgio	2005-03-12 18:58:48.000000000 +0100
+@@ -37,13 +37,12 @@
+ Name[sk]=MNG obrázok
+ Name[sl]=Slika MNG
+ Name[sr]=MNG слика
+-Name[sr@Latn]=MNG слика
++Name[sr@Latn]=MNG slika
+ Name[sv]=MNG-bild
+ Name[ta]=MNG பிம்பம்
+ Name[tg]=Тасвири MNG
+ Name[tr]=MNG Resmi
+ Name[uk]=Зображення MNG
+-Name[xx]=xxMNG Imagexx
+ Name[zh_CN]=MNG 图像
+ Read=true
+ Write=false
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kimgio/pbm.kimgio kdelibs_3_4_BRANCH/kimgio/pbm.kimgio
+--- kdelibs_3_4_0_RELEASE/kimgio/pbm.kimgio	2005-01-21 05:24:09.000000000 +0100
++++ kdelibs_3_4_BRANCH/kimgio/pbm.kimgio	2005-03-12 18:58:48.000000000 +0100
+@@ -2,10 +2,12 @@
+ Type=PBM
+ Header=
+ Name=Portable Bitmap Image
++Name[af]='Portable Bitmap' Beeld
+ Name[ar]=صورة قابلة للنقل PNG
+ Name[az]=Portable Bitmap Rəsmi
+ Name[bg]=Изображение Portable Bitmap Image
+ Name[bn]=পোর্টেবল বিটম্যাপ চিত্র
++Name[br]=Skeudenn Portable Bitmap
+ Name[bs]=Portable Bitmap slika
+ Name[ca]=Imatge portable Bitmap
+ Name[cy]=Delwedd Ddidfap Gludadwy
+@@ -59,7 +61,6 @@
+ Name[uk]=Двокольорове зображення у портативному форматі
+ Name[uz]=PBMP-расм
+ Name[wa]=Imådje PBM
+-Name[xx]=xxPortable Bitmap Imagexx
+ Name[zh_CN]=便携位图图像
+ Name[zh_TW]=可攜式點陣影像 (PNG)
+ Read=true
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kimgio/pcx.kimgio kdelibs_3_4_BRANCH/kimgio/pcx.kimgio
+--- kdelibs_3_4_0_RELEASE/kimgio/pcx.kimgio	2005-01-21 05:24:09.000000000 +0100
++++ kdelibs_3_4_BRANCH/kimgio/pcx.kimgio	2005-03-12 18:58:48.000000000 +0100
+@@ -2,6 +2,7 @@
+ Type=PCX
+ Header=^\012
+ Name=PCX Image
++Name[af]='PCX' Beeld
+ Name[ar]=صورة من نوع PCX
+ Name[az]=PCX Rəsmi
+ Name[be]=Выява PCX
+@@ -62,7 +63,6 @@
+ Name[uk]=Зображення PCX
+ Name[uz]=PCX-расм
+ Name[wa]=Imådje PCX
+-Name[xx]=xxPCX Imagexx
+ Name[zh_CN]=PCX 图像
+ Name[zh_TW]=PCX 影像
+ Read=true
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kimgio/pgm.kimgio kdelibs_3_4_BRANCH/kimgio/pgm.kimgio
+--- kdelibs_3_4_0_RELEASE/kimgio/pgm.kimgio	2005-01-21 05:24:09.000000000 +0100
++++ kdelibs_3_4_BRANCH/kimgio/pgm.kimgio	2005-03-12 18:58:48.000000000 +0100
+@@ -2,6 +2,7 @@
+ Type=PGM
+ Header=
+ Name=Portable Graymap Image
++Name[af]='Portable Graymap' Beeld
+ Name[ar]=صورة ثنائية اللون قابلة للنقل
+ Name[az]=Portable Graymap Rəsmi
+ Name[bg]=Изображение Portable Graymap Image
+@@ -60,7 +61,6 @@
+ Name[uk]=Чорно-біле зображення у портативному форматі
+ Name[uz]=PGM-расм
+ Name[wa]=Imådje PGM
+-Name[xx]=xxPortable Graymap Imagexx
+ Name[zh_CN]=便携灰度图像
+ Read=true
+ Write=true
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kimgio/png.kimgio kdelibs_3_4_BRANCH/kimgio/png.kimgio
+--- kdelibs_3_4_0_RELEASE/kimgio/png.kimgio	2005-01-21 05:24:09.000000000 +0100
++++ kdelibs_3_4_BRANCH/kimgio/png.kimgio	2005-03-12 18:58:48.000000000 +0100
+@@ -2,6 +2,7 @@
+ Type=PNG
+ Header=
+ Name=PNG Image
++Name[af]=Png Beeld
+ Name[ar]=صورة من نوع PNG
+ Name[az]=PNG Rəsmi
+ Name[be]=Выява PNG
+@@ -62,7 +63,6 @@
+ Name[uk]=Зображення PNG
+ Name[uz]=PNG-расм
+ Name[wa]=Imådje PNG
+-Name[xx]=xxPNG Imagexx
+ Name[zh_CN]=PNG 图像
+ Name[zh_TW]=PNG 影像
+ Read=true
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kimgio/ppm.kimgio kdelibs_3_4_BRANCH/kimgio/ppm.kimgio
+--- kdelibs_3_4_0_RELEASE/kimgio/ppm.kimgio	2005-01-21 05:24:09.000000000 +0100
++++ kdelibs_3_4_BRANCH/kimgio/ppm.kimgio	2005-03-12 18:58:48.000000000 +0100
+@@ -2,10 +2,12 @@
+ Type=PPM
+ Header=
+ Name=Portable Pixmap Image
++Name[af]='Portable Pixmap' Beeld
+ Name[ar]=صورة Pixmap قابلة للنقل
+ Name[az]=Portable Pixmap Rəsmi
+ Name[bg]=Изображение Portable Pixmap Image
+ Name[bn]=পোর্টেবল পিক্সম্যাপ চিত্র
++Name[br]=Skeudenn Portable Pixmap
+ Name[bs]=Portable Pixmap slika
+ Name[ca]=Imatge portable mapa de píxels
+ Name[cs]=Obrázek ve formátu "Portable Pixmap"
+@@ -60,7 +62,6 @@
+ Name[uk]=Растрове зображення у портативному форматі
+ Name[uz]=PPMP-расм
+ Name[wa]=Imådje PPM
+-Name[xx]=xxPortable Pixmap Imagexx
+ Name[zh_CN]=便携像素图图像
+ Name[zh_TW]=可攜式像素影像
+ Read=true
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kimgio/psd.kimgio kdelibs_3_4_BRANCH/kimgio/psd.kimgio
+--- kdelibs_3_4_0_RELEASE/kimgio/psd.kimgio	2005-02-23 06:04:36.000000000 +0100
++++ kdelibs_3_4_BRANCH/kimgio/psd.kimgio	2005-03-18 18:12:50.870941109 +0100
+@@ -11,6 +11,7 @@
+ Name[de]=PhotoShop-Dokument
+ Name[es]=Documento de PhotoShop
+ Name[et]=PhotoShopi dokument
++Name[eu]=PostScript dokumentua
+ Name[fr]=Document PhotoShop
+ Name[fy]=PhotoShop-dokumint
+ Name[ga]=Cáipéis PhotoShop
+@@ -26,17 +27,17 @@
+ Name[pl]=Dokument programu PhotoShop
+ Name[pt]=Documento do PhotoShop
+ Name[pt_BR]=Documento do PhotoShop
++Name[ro]=Document PhotoShop
+ Name[ru]=Файл PhotoShop
+ Name[se]=PhotoShop-dokumeanta
+ Name[sk]=PhotoShop dokument
+ Name[sl]=Dokument PhotoShop
+ Name[sr]=PhotoShop-ов документ
+-Name[sr@Latn]=PhotoShop-ов документ
++Name[sr@Latn]=PhotoShop-ov dokument
+ Name[sv]=Photoshop-dokument
+ Name[ta]=போட்டோஷாப் ஆவணம்
+ Name[tg]=Хуҷҷати PhotoShop
+ Name[uk]=Документ PhotoShop
+-Name[xx]=xxPhotoShop Documentxx
+ Name[zh_CN]=PhotoShop 文档
+ Read=true
+ Write=false
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kimgio/rgb.kimgio kdelibs_3_4_BRANCH/kimgio/rgb.kimgio
+--- kdelibs_3_4_0_RELEASE/kimgio/rgb.kimgio	2005-02-23 06:04:36.000000000 +0100
++++ kdelibs_3_4_BRANCH/kimgio/rgb.kimgio	2005-03-12 18:58:48.000000000 +0100
+@@ -2,6 +2,7 @@
+ Type=RGB
+ Header=^\x01\xda\x01[\x01\x02]
+ Name=SGI Image (RGB)
++Name[af]=SGI Beeld (RGB)
+ Name[be]=Выява SGI (RGB)
+ Name[bg]=Изображение SGI (RGB)
+ Name[bn]=এস-জি-আই চিত্র (RGB)
+@@ -46,7 +47,7 @@
+ Name[sk]=SGI obrázok (RGB)
+ Name[sl]=Slika SGI (RGB)
+ Name[sr]=SGI слика (RGB)
+-Name[sr@Latn]=SGI слика (RGB)
++Name[sr@Latn]=SGI slika (RGB)
+ Name[sv]=SGI-bild (RGB)
+ Name[ta]=GIF பிம்பம்
+ Name[tg]=Тасвири SGI (RGB)
+@@ -54,7 +55,6 @@
+ Name[tr]=SGI Resmi (KYM)
+ Name[uk]=Зображення SGI (RGB)
+ Name[uz]=SGI-расм (RGB)
+-Name[xx]=xxSGI Image (RGB)xx
+ Name[zh_CN]=SGI 图像(RGB)
+ Read=true
+ Write=true
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kimgio/tga.kimgio kdelibs_3_4_BRANCH/kimgio/tga.kimgio
+--- kdelibs_3_4_0_RELEASE/kimgio/tga.kimgio	2005-01-21 05:24:09.000000000 +0100
++++ kdelibs_3_4_BRANCH/kimgio/tga.kimgio	2005-03-12 18:58:48.000000000 +0100
+@@ -2,6 +2,7 @@
+ Type=TGA
+ Header=^.\x01[\x01-\x03\x09-\x0b]\x01{3}.[\x01\x18]
+ Name=Truevision Targa Image
++Name[af]='Truevision Targa' Beeld
+ Name[ar]=صورة Truevision Targa
+ Name[az]=Truevision Targa Rəsmi
+ Name[be]=Выява Truevision Targa
+@@ -61,7 +62,6 @@
+ Name[uk]=Зображення Truevision Targa
+ Name[uz]=TGA-расм
+ Name[wa]=Imådje Targa
+-Name[xx]=xxTruevision Targa Imagexx
+ Name[zh_CN]=Truevision Targa 图像
+ Name[zh_TW]=Truevision Targa 圖形
+ Read=true
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kimgio/tiff.kimgio kdelibs_3_4_BRANCH/kimgio/tiff.kimgio
+--- kdelibs_3_4_0_RELEASE/kimgio/tiff.kimgio	2005-01-12 05:28:35.000000000 +0100
++++ kdelibs_3_4_BRANCH/kimgio/tiff.kimgio	2005-03-12 18:58:48.000000000 +0100
+@@ -2,6 +2,7 @@
+ Type=TIFF
+ Header=[MI][MI]
+ Name=TIFF Image
++Name[af]=TIFF Beeld
+ Name[ar]=صورة من نوع TIFF
+ Name[az]=TIFF Rəsmi
+ Name[be]=Выява TIFF
+@@ -62,7 +63,6 @@
+ Name[uk]=Зображення TIFF
+ Name[uz]=TIFF-расм
+ Name[wa]=Imådje TIFF
+-Name[xx]=xxTIFF Imagexx
+ Name[zh_CN]=TIFF 图像
+ Name[zh_TW]=TIFF 影像
+ Read=true
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kimgio/xbm.kimgio kdelibs_3_4_BRANCH/kimgio/xbm.kimgio
+--- kdelibs_3_4_0_RELEASE/kimgio/xbm.kimgio	2005-01-21 05:24:09.000000000 +0100
++++ kdelibs_3_4_BRANCH/kimgio/xbm.kimgio	2005-03-12 18:58:48.000000000 +0100
+@@ -2,6 +2,7 @@
+ Type=XBM
+ Header=
+ Name=X BitMap Image
++Name[af]='X BitMap' Beeld
+ Name[ar]=صورة من نوع XBitMap
+ Name[az]=X BitMap Rəsmi
+ Name[be]=Выява X BitMap
+@@ -62,7 +63,6 @@
+ Name[uk]=Двокольорове зображення для X
+ Name[uz]=X BMP-расм
+ Name[wa]=Imådje XBM
+-Name[xx]=xxX BitMap Imagexx
+ Name[zh_CN]=X 位图图像
+ Name[zh_TW]=X 點陣影像
+ Read=true
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kimgio/xcf.kimgio kdelibs_3_4_BRANCH/kimgio/xcf.kimgio
+--- kdelibs_3_4_0_RELEASE/kimgio/xcf.kimgio	2005-02-23 06:04:36.000000000 +0100
++++ kdelibs_3_4_BRANCH/kimgio/xcf.kimgio	2005-03-12 18:58:48.000000000 +0100
+@@ -37,13 +37,12 @@
+ Name[sk]=GIMP obrázok
+ Name[sl]=Slika GIMP
+ Name[sr]=GIMP-ова слика
+-Name[sr@Latn]=GIMP-ова слика
++Name[sr@Latn]=GIMP-ova slika
+ Name[sv]=GIMP-bild
+ Name[ta]=GIMP பிம்பம்
+ Name[tg]=Тасвири GIMP
+ Name[tr]=GIMP Resmi
+ Name[uk]=Зображення GIMP
+-Name[xx]=xxGIMP Imagexx
+ Name[zh_CN]=GIMP 图像
+ Read=true
+ Write=false
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kimgio/xpm.kimgio kdelibs_3_4_BRANCH/kimgio/xpm.kimgio
+--- kdelibs_3_4_0_RELEASE/kimgio/xpm.kimgio	2005-01-21 05:24:09.000000000 +0100
++++ kdelibs_3_4_BRANCH/kimgio/xpm.kimgio	2005-03-12 18:58:48.000000000 +0100
+@@ -2,6 +2,7 @@
+ Type=XPM
+ Header=
+ Name=X PixMap Image
++Name[af]='X PixMap' Beeld
+ Name[ar]=صورة من نوع X PixMap
+ Name[az]=X PixMap Rəsmi
+ Name[be]=Выява X PixMap
+@@ -62,7 +63,6 @@
+ Name[uk]=Растрове зображення для X
+ Name[uz]=X PMP-расм
+ Name[wa]=Imådje XPM
+-Name[xx]=xxX PixMap Imagexx
+ Name[zh_CN]=X 像素图图像
+ Name[zh_TW]=X 像素影像
+ Read=true
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kimgio/xv.kimgio kdelibs_3_4_BRANCH/kimgio/xv.kimgio
+--- kdelibs_3_4_0_RELEASE/kimgio/xv.kimgio	2005-01-21 05:24:09.000000000 +0100
++++ kdelibs_3_4_BRANCH/kimgio/xv.kimgio	2005-03-12 18:58:48.000000000 +0100
+@@ -3,6 +3,7 @@
+ Header=^P7 332
+ Flags=T
+ Name=XView Image
++Name[af]=XView Beeld
+ Name[ar]=صورة من نوع XView
+ Name[az]=XView Rəsmi
+ Name[be]=Выява XView
+@@ -63,7 +64,6 @@
+ Name[uk]=Зображення XView
+ Name[uz]=XView-расм
+ Name[wa]=Imådje XView
+-Name[xx]=xxXView Imagexx
+ Name[zh_CN]=XView 图像
+ Name[zh_TW]=XView 影像
+ Read=true
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kinit/kinit.cpp kdelibs_3_4_BRANCH/kinit/kinit.cpp
+--- kdelibs_3_4_0_RELEASE/kinit/kinit.cpp	2005-02-10 18:33:02.000000000 +0100
++++ kdelibs_3_4_BRANCH/kinit/kinit.cpp	2005-03-12 18:58:48.000000000 +0100
+@@ -4,7 +4,7 @@
+  *           (c) 1999 Mario Weilguni <mweilguni@sime.com>
+  *           (c) 2001 Lubos Lunak <l.lunak@kde.org>
+  *
+- * $Id: kinit.cpp,v 1.147 2005/02/10 17:33:02 harald Exp $
++ * $Id: kinit.cpp,v 1.147.2.1 2005/03/07 12:17:58 mueller Exp $
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Library General Public
+@@ -509,7 +509,7 @@
+ #endif
+      {
+        int r;
+-       QCString procTitle( name );
++       QCString procTitle;
+        d.argv = (char **) malloc(sizeof(char *) * (argc+1));
+        d.argv[0] = (char *) _name;
+        for (int i = 1;  i < argc; i++)
+@@ -527,11 +527,11 @@
+        /* set the process name, so that killall works like intended */
+        r = prctl(PR_SET_NAME, (unsigned long) name.data(), 0, 0, 0);
+        if ( r == 0 )
+-           kdeinit_setproctitle( "%s [kdeinit] %s", name.data(), procTitle.data() );
++           kdeinit_setproctitle( "%s [kdeinit]%s", name.data(), procTitle.data() ? procTitle.data() : "" );
+        else
+-           kdeinit_setproctitle( "kdeinit: %s", procTitle.data() );
++           kdeinit_setproctitle( "kdeinit: %s%s", name.data(), procTitle.data() ? procTitle.data() : "" );
+ #else
+-       kdeinit_setproctitle( "kdeinit: %s", procTitle.data() );
++       kdeinit_setproctitle( "kdeinit: %s%s", name.data(), procTitle.data() ? procTitle.data() : "" );
+ #endif
+      }
+ 
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kinit/setproctitle.cpp kdelibs_3_4_BRANCH/kinit/setproctitle.cpp
+--- kdelibs_3_4_0_RELEASE/kinit/setproctitle.cpp	2004-11-13 01:01:44.000000000 +0100
++++ kdelibs_3_4_BRANCH/kinit/setproctitle.cpp	2005-03-12 18:58:48.000000000 +0100
+@@ -76,7 +76,9 @@
+ # endif
+ # if SPT_TYPE == SPT_PSSTRINGS
+ #  include <machine/vmparam.h>
+-#  include <sys/exec.h>
++#  ifdef HAVE_SYS_EXEC_H
++#    include <sys/exec.h>
++#  endif
+ #  ifndef PS_STRINGS	/* hmmmm....  apparently not available after all */
+ #   undef SPT_TYPE
+ #   define SPT_TYPE	SPT_REUSEARGV
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kio/Mainpage.dox kdelibs_3_4_BRANCH/kio/Mainpage.dox
+--- kdelibs_3_4_0_RELEASE/kio/Mainpage.dox	2002-08-02 10:35:37.000000000 +0200
++++ kdelibs_3_4_BRANCH/kio/Mainpage.dox	2005-03-12 18:58:48.000000000 +0100
+@@ -1,5 +1,5 @@
+ /**
+- * @libdoc A network-enabled file management system in a library.
++ * \mainpage A network-enabled file management system in a library
+  *
+  * This library implements almost all the file management functions you
+  * will ever need. In fact, the KDE file manager, Konqueror also uses
+@@ -11,28 +11,28 @@
+  *
+  * This library also implements the System Configuration Cache (KSycoca).
+  *
+- * @ref KMimeType :
++ * @ref KMimeType:
+  *   The notion of a file type, already existing in KDE-1.x
+  *
+- * @ref KService :
++ * @ref KService:
+  *   To a mimetype are bound one or more applications, now called services.
+  *   Services can be applications, but also libraries, dynamically opened.
+  *
+- * @ref KServiceType :
++ * @ref KServiceType:
+  *   A service type allows the same mechanism to be extended to components.
+  *   For instance : the question "what are the koffice plugins" is solved by
+  *   a service type called KOfficePlugin, and by every plugin providing
+  *   a .desktop file stating that it is a service that implements the servicetype
+  *   KOfficePlugin.
+  *
+- * @ref KServiceTypeProfile :
++ * @ref KServiceTypeProfile:
+  *   Stores the user's preferences for services bound to mimetypes/servicetypes.
+  *
+- * @ref KTrader :
++ * @ref KTrader:
+  *   Use it to query for which services implement a given mimetype/servicetype.
+  *   Has its own language, in order to allow complex queries.
+  *
+-
++ *
+  * \section KDE Filedialog widget and associated classes.
+  *
+  * This library also provides the KDE file selector widget,
+@@ -75,45 +75,45 @@
+  * with.
+  *
+  *
+- * @ref KFileDialog :
++ * @ref KFileDialog:
+  *   The class providing the file selector dialog. It combines a KDirOperator,
+  *   KURLBar and several other widgets.
+  *
+- * @ref KDirOperator :
++ * @ref KDirOperator:
+  *   The class encapsulating different KFileViews, offering file browsing and
+  *   file selection. Asynchronous, network transparent reading of directories
+  *   is performed via the @ref KIO library.
+  *
+- * @ref KURLRequester :
++ * @ref KURLRequester:
+  *   A widget to be used for asking for a filename/path/URL. It consists of a
+  *   @ref KLineEdit (or @ref KComboBox) and a button. Activating the button
+  *   will open a @ref KFileDialog. Typing in the lineedit is aided with
+  *   filename completion.
+  *
+- * @ref KURLRequesterDlg  :
++ * @ref KURLRequesterDlg:
+  *   A dialog to ask for a filename/path/URL, using KURLRequester.
+  *
+- * @ref KFileView  :
++ * @ref KFileView:
+  *   The base class for all views to be used with KDirOperator.
+  *
+- * @ref KFileIconView :
++ * @ref KFileIconView:
+  *   The KFileView based on KIconView.
+  *
+- * @ref KFileDetailView :
++ * @ref KFileDetailView:
+  *   The KFileView based on KListView.
+  *
+- * @ref KFilePreview :
++ * @ref KFilePreview:
+  *   The KFileView, combining a widget showing preview for a selected file
+  *   and another KFileView for browsing.
+  *
+- * @ref KURLBar :
++ * @ref KURLBar:
+  *   A widget offering a number of clickable entries which represent a URL,
+  *   aligned horizontally or vertically. The entries are customizable by the
+  *   user both on a per application basis or for all applications (URLs, their
+  *   icon and the description can be added, removed or edited by the user).
+  *   This is the widget used as "sidebar" in the @ref KFileDialog.
+  *
+- * @ref KFileMetaInfoWidget :
++ * @ref KFileMetaInfoWidget:
+  *   A widget that allows viewing and editing of meta data of a file, utilizing
+  *   @ref KFileMetaInfo.
+  *
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kio/application.desktop kdelibs_3_4_BRANCH/kio/application.desktop
+--- kdelibs_3_4_0_RELEASE/kio/application.desktop	2005-01-20 05:59:26.000000000 +0100
++++ kdelibs_3_4_BRANCH/kio/application.desktop	2005-03-12 18:58:48.000000000 +0100
+@@ -3,7 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=Application
+ Name=Application
+-Name[af]=Aansoek
++Name[af]=Program
+ Name[ar]=تطبيق
+ Name[az]=Proqram
+ Name[be]=Дастасаваньне
+@@ -72,7 +72,6 @@
+ Name[vi]=Chương trình 
+ Name[wa]=Programe
+ Name[xh]=Isicelo
+-Name[xx]=xxApplicationxx
+ Name[zh_CN]=应用程序
+ Name[zh_TW]=應用程式
+ Name[zu]=Umyaleli
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kio/bookmarks/kbookmarkmenu.cc kdelibs_3_4_BRANCH/kio/bookmarks/kbookmarkmenu.cc
+--- kdelibs_3_4_0_RELEASE/kio/bookmarks/kbookmarkmenu.cc	2005-01-18 21:39:16.000000000 +0100
++++ kdelibs_3_4_BRANCH/kio/bookmarks/kbookmarkmenu.cc	2005-03-18 18:12:56.212029286 +0100
+@@ -609,7 +609,7 @@
+           new KBookmarkMenu( m_pManager, m_pOwner, actionMenu->popupMenu(),
+                              m_actionCollection, false,
+                              m_bAddBookmark, QString::null );
+-       connect( subMenu, SIGNAL( openBookmark( const QString &, Qt::Buttonstate ) ),
++       connect( subMenu, SIGNAL( openBookmark( const QString &, Qt::ButtonState ) ),
+                 this, SIGNAL( openBookmark( const QString &, Qt::ButtonState ) ));
+        m_lstSubMenus.append(subMenu);
+ 
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kio/data.protocol kdelibs_3_4_BRANCH/kio/data.protocol
+--- kdelibs_3_4_0_RELEASE/kio/data.protocol	2005-02-23 06:04:37.000000000 +0100
++++ kdelibs_3_4_BRANCH/kio/data.protocol	2005-03-12 18:58:48.000000000 +0100
+@@ -6,6 +6,7 @@
+ Icon=www
+ Class=:internet
+ Description=A kioslave for data URIs (rfc2397)
++Description[br]=Ur kioslave evit an URIoù roadoù (rfc2397)
+ Description[ca]=Un kioslave per a URIs de dades (rfc2397)
+ Description[da]=En kioslave for data-URI'er (rfc2397)
+ Description[de]=Ein kioslave für Daten-URIs (rfc2397)
+@@ -33,12 +34,11 @@
+ Description[sk]=IO klient pre dátové URI (rfc2397)
+ Description[sl]=kioslave za podatkovne URI-je (rfc2397)
+ Description[sr]=kioslave за URI-ије података (rfc2397)
+-Description[sr@Latn]=kioslave за URI-ије података (rfc2397)
++Description[sr@Latn]=kioslave za URI-ije podataka (rfc2397)
+ Description[sv]=En I/O-slav för datawebbadresser (RFC 2397)
+ Description[ta]=தரவு வலைமனைகளுக்கான ஒரு kioslave (rfc2397)
+ Description[tg]=kioslave барои URIs (rfc2397)
+ Description[uk]=Підлеглий В/В для адрес (URI) даних (rfc2397)
+-Description[xx]=xxA kioslave for data URIs (rfc2397)xx
+ Description[zh_CN]=data URI(rfc2397) 的 kioslave
+ DocPath=kioslave/data.html
+ URIMode=rawuri
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kio/kcmodule.desktop kdelibs_3_4_BRANCH/kio/kcmodule.desktop
+--- kdelibs_3_4_0_RELEASE/kio/kcmodule.desktop	2005-01-21 05:24:10.000000000 +0100
++++ kdelibs_3_4_BRANCH/kio/kcmodule.desktop	2005-03-12 18:58:48.000000000 +0100
+@@ -3,6 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=KCModule
+ Name=KDE Control Module
++Name[af]=KDE Beheer Module
+ Name[ar]=وحدة تحكم كيدي
+ Name[az]=KDE İdarə Modulu
+ Name[be]=Модуль кіраваньня KDED
+@@ -67,7 +68,6 @@
+ Name[ven]=Phanele ndangula ya phirinthara
+ Name[wa]=Module di contrôle KDE
+ Name[xh]=Ulawulo Lwesicatshulwa we KDE
+-Name[xx]=xxKDE Control Modulexx
+ Name[zh_CN]=KDE 控制模块
+ Name[zh_TW]=KDE 控制模組
+ Name[zu]=Ingxenye ye-KDE Control
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kio/kcomprfilter.desktop kdelibs_3_4_BRANCH/kio/kcomprfilter.desktop
+--- kdelibs_3_4_0_RELEASE/kio/kcomprfilter.desktop	2005-01-21 05:24:10.000000000 +0100
++++ kdelibs_3_4_BRANCH/kio/kcomprfilter.desktop	2005-03-12 18:58:48.000000000 +0100
+@@ -3,7 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=KDECompressionFilter
+ Name=KDE Compression Filter
+-Name[af]=Kde Saampersing Filter
++Name[af]=KDE Kompakteer Filter
+ Name[ar]=فلتر ضغط الملفات لكيدي
+ Name[az]=KDE Sıxışdırma Filtri
+ Name[bg]=Компресиращ филтър
+@@ -68,7 +68,6 @@
+ Name[ven]=Filithara yau tsikeledza ya KDE
+ Name[vi]=Trình lọc nén của KDE 
+ Name[xh]=Isihluzi Sodibaniso se KDE
+-Name[xx]=xxKDE Compression Filterxx
+ Name[zh_CN]=KDE 压缩过滤程序
+ Name[zh_TW]=KDE 壓縮過濾器
+ Name[zu]=Ihluzo Lokunciphisa le-KDE
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kio/kdatatool.desktop kdelibs_3_4_BRANCH/kio/kdatatool.desktop
+--- kdelibs_3_4_0_RELEASE/kio/kdatatool.desktop	2005-01-21 05:24:10.000000000 +0100
++++ kdelibs_3_4_BRANCH/kio/kdatatool.desktop	2005-03-12 18:58:48.000000000 +0100
+@@ -3,10 +3,11 @@
+ Type=ServiceType
+ X-KDE-ServiceType=KDataTool
+ Comment=KDE Data Tool
+-Comment[af]=Kde Data Program
++Comment[af]=KDE Data Program
+ Comment[ar]=أداة كيدي للبيانات
+ Comment[az]=KDE Verilənlər Vasitəsi
+ Comment[bn]=কে.ডি.ই তথ্য টুল
++Comment[br]=Ostilh roadoù evit KDE
+ Comment[bs]=KDE alat za podatke
+ Comment[ca]=Eina per a la gestió de dades per al KDE
+ Comment[cs]=Datový nástroj KDE
+@@ -67,7 +68,6 @@
+ Comment[ven]=Tshishumiswa tsha data tsha KDE
+ Comment[vi]=Công cụ KDE Data
+ Comment[xh]=Isihluzi se Data ye KDE
+-Comment[xx]=xxKDE Data Toolxx
+ Comment[zh_CN]=KDE 数据工具
+ Comment[zh_TW]=KDE 資料工具
+ Comment[zu]=Ithuluzi Ledata le-KDE
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kio/kfile/kdirsize.cpp kdelibs_3_4_BRANCH/kio/kfile/kdirsize.cpp
+--- kdelibs_3_4_0_RELEASE/kio/kfile/kdirsize.cpp	2004-05-10 13:00:08.000000000 +0200
++++ kdelibs_3_4_BRANCH/kio/kfile/kdirsize.cpp	2005-03-18 18:12:56.611961012 +0100
+@@ -75,11 +75,11 @@
+              SLOT( slotEntries( KIO::Job*,
+                                 const KIO::UDSEntryList& )));
+     addSubjob( listJob );
+-    m_totalSubdirs--; //decrement 1 to account for current directory
+ }
+ 
+ void KDirSize::slotEntries( KIO::Job*, const KIO::UDSEntryList & list )
+ {
++    static const QString& dot = KGlobal::staticQString( "." );
+     static const QString& dotdot = KGlobal::staticQString( ".." );
+     KIO::UDSEntryListConstIterator it = list.begin();
+     KIO::UDSEntryListConstIterator end = list.end();
+@@ -107,7 +107,9 @@
+               break;
+           }
+         }
+-        if ( name != dotdot ) // i.e. name != ".."
++        if ( name == dot )
++            m_totalSize += size;
++        else if ( name != dotdot )
+         {
+             if (!isLink)
+               m_totalSize += size;
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kio/kfile/kpropsdlgplugin.desktop kdelibs_3_4_BRANCH/kio/kfile/kpropsdlgplugin.desktop
+--- kdelibs_3_4_0_RELEASE/kio/kfile/kpropsdlgplugin.desktop	2005-02-23 06:04:38.000000000 +0100
++++ kdelibs_3_4_BRANCH/kio/kfile/kpropsdlgplugin.desktop	2005-03-12 18:58:49.000000000 +0100
+@@ -3,7 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=KPropsDlg/Plugin
+ Comment=Plugin for the Properties Dialog
+-Comment[af]=Inplak vir die Eienskappe Dialoog
++Comment[af]=Inprop module vir die Eienskappe Dialoog
+ Comment[ar]=ملحق لمربع حوار خصائص
+ Comment[az]=Seçənəklər Rabitə Qutusu Üçün Əlavə
+ Comment[bg]=Приставка за диалога Информация
+@@ -58,7 +58,7 @@
+ Comment[sl]=Vstavek za pogovorno okno z lastnostmi
+ Comment[sq]=Shtojcë për Dialogun e Rekuizitave
+ Comment[sr]=Прикључак за дијалог са својствима
+-Comment[sr@Latn]=Dodatak za dijalog sa svojstvima
++Comment[sr@Latn]=Priključak za dijalog sa svojstvima
+ Comment[sv]=Insticksprogram för egenskapsdialogen
+ Comment[ta]=பண்புகள் உரையாடலுக்கான சொருகுப்பொருள்
+ Comment[tg]=Штепсели барои Хусусиятҳои Тирезаи Диалогӣ Андохтан
+@@ -69,7 +69,6 @@
+ Comment[ven]=U pulaga ha zwishumiswa zwa nyambedzano
+ Comment[vi]=Plugin cho tính chất của hộp thoại 
+ Comment[xh]=Iplagi yangaphakathi Yezinto zobumnini Zencoko yababini
+-Comment[xx]=xxPlugin for the Properties Dialogxx
+ Comment[zh_CN]=属性对话的插件
+ Comment[zh_TW]=屬性對話盒的外掛程式
+ Comment[zu]=I-plugin Yengxoxo Yezinkomba zobunini
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kio/kfileplugin.desktop kdelibs_3_4_BRANCH/kio/kfileplugin.desktop
+--- kdelibs_3_4_0_RELEASE/kio/kfileplugin.desktop	2005-02-23 06:04:37.000000000 +0100
++++ kdelibs_3_4_BRANCH/kio/kfileplugin.desktop	2005-03-12 18:58:48.000000000 +0100
+@@ -3,7 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=KFilePlugin
+ Name=KFile Meta Data Plugin
+-Name[af]=Klêer Meta Data Inplak
++Name[af]=Klêer Meta Data Inprop module
+ Name[ar]=ملحق KFile Meta Data
+ Name[az]=KFile Meta Data Əlavəsi
+ Name[bg]=Приставка за мета данни
+@@ -54,7 +54,7 @@
+ Name[sl]=Vstavek za meta podatke pri KFile
+ Name[sq]=Shtojca KFile Meta Data
+ Name[sr]=KFile прикључак за мета податке
+-Name[sr@Latn]=KFile dodatak za meta podatke
++Name[sr@Latn]=KFile priključak za meta podatke
+ Name[sv]=Kfil-metadatainsticksprogram
+ Name[ta]=கேகோப்பு மெட்டா தகவல் சொருகுப்பொருள்
+ Name[tg]=KФайли Модули Meta Сана
+@@ -63,7 +63,6 @@
+ Name[uz]=KFile мета маълумот учун плагин
+ Name[ven]=Meta data pulagini ya faela ya K
+ Name[xh]=Iplagi yangaphakathi ye KFile Meta Data
+-Name[xx]=xxKFile Meta Data Pluginxx
+ Name[zh_CN]=KFile 元数据插件
+ Name[zh_TW]=KFile 資料定義外掛程式
+ 
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kio/kio/job.cpp kdelibs_3_4_BRANCH/kio/kio/job.cpp
+--- kdelibs_3_4_0_RELEASE/kio/kio/job.cpp	2005-02-18 18:50:19.000000000 +0100
++++ kdelibs_3_4_BRANCH/kio/kio/job.cpp	2005-03-12 18:58:49.000000000 +0100
+@@ -1565,12 +1565,14 @@
+ void FileCopyJob::setSourceSize( off_t size )
+ {
+     d->m_sourceSize = size;
++    if (size != (off_t) -1)
+     m_totalSize = size;
+ }
+ 
+ void FileCopyJob::setSourceSize64( KIO::filesize_t size )
+ {
+     d->m_sourceSize = size;
++    if (size != (KIO::filesize_t) -1)
+     m_totalSize = size;
+ }
+ 
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kio/kio/kprotocolmanager.cpp kdelibs_3_4_BRANCH/kio/kio/kprotocolmanager.cpp
+--- kdelibs_3_4_0_RELEASE/kio/kio/kprotocolmanager.cpp	2005-02-17 12:18:43.000000000 +0100
++++ kdelibs_3_4_BRANCH/kio/kio/kprotocolmanager.cpp	2005-03-12 18:58:49.000000000 +0100
+@@ -246,9 +246,24 @@
+       case WPADProxy:
+           if (!url.host().isEmpty())
+           {
+-            QString p = url.protocol();
+-            if ( p.startsWith( "http" ) || p == "ftp" || p == "gopher" )
+-              DCOPRef( "kded", "proxyscout" ).call( "proxyForURL", url ).get( proxy );
++            KURL u (url);
++            QString p = u.protocol().lower();
++
++            // webdav is a KDE specific protocol. Look up proxy
++            // information using HTTP instead...
++            if ( p == "webdav" )
++            {
++              p = "http";
++              u.setProtocol( p );
++            }
++            else if ( p == "webdavs" )
++            {
++              p = "https";
++              u.setProtocol( p );
++            }
++
++            if ( p.startsWith("http") || p == "ftp" || p == "gopher" )
++              DCOPRef( "kded", "proxyscout" ).call( "proxyForURL", u ).get( proxy );
+           }
+           break;
+       case EnvVarProxy:
+@@ -267,7 +282,7 @@
+ 
+ void KProtocolManager::badProxy( const QString &proxy )
+ {
+-    DCOPRef( "kded", "proxyscout" ).send( "blackListProxy", proxy );
++  DCOPRef( "kded", "proxyscout" ).send( "blackListProxy", proxy );
+ }
+ 
+ /*
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kio/kpasswdserver.desktop kdelibs_3_4_BRANCH/kio/kpasswdserver.desktop
+--- kdelibs_3_4_0_RELEASE/kio/kpasswdserver.desktop	2005-02-23 06:04:37.000000000 +0100
++++ kdelibs_3_4_BRANCH/kio/kpasswdserver.desktop	2005-03-12 18:58:48.000000000 +0100
+@@ -2,12 +2,13 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=KDED Password Module
+-Name[af]=Kded Wagwoord Module
++Name[af]=KDED Wagwoord Module
+ Name[ar]=وحدة كلمة سر KDED
+ Name[az]=KDED Şifrə Modulu
+ Name[be]=Модуль пароляў KDED
+ Name[bg]=Модул за пароли KDED
+ Name[bn]=KDED পাসওয়ার্ড মডিউল
++Name[br]=Mollad tremenger KDED
+ Name[bs]=KDED šifra modul
+ Name[ca]=Mòdul de contrasenya KDED
+ Name[cs]=KDED modul pro hesla
+@@ -65,11 +66,11 @@
+ Name[ven]=Modulu wa phasewede ya KDED
+ Name[wa]=Module di screts po KDE
+ Name[xh]=Igama lokugqitha le Sicatshulwa se KDED
+-Name[xx]=xxKDED Password Modulexx
+ Name[zh_CN]=KDED 密码模块
+ Name[zh_TW]=KDED 密碼模組
+ Name[zu]=Ingxenye Yegama lokudlula le-KDED
+ Comment=Password caching support
++Comment[af]=Wagwoord Kasberging ondersteuning
+ Comment[bg]=Кеширане на пароли
+ Comment[bn]=পাসওয়ার্ড ক্যাশ-এ রাখা সমর্থন করে
+ Comment[bs]=Podrška za keširanje šifre
+@@ -106,13 +107,12 @@
+ Comment[sk]=Podpora ukladania hesiel
+ Comment[sl]=Podpora prepomnjenju gesel
+ Comment[sr]=Подршка за кеширање лозинки
+-Comment[sr@Latn]=Подршка за кеширање лозинки
++Comment[sr@Latn]=Podrška za keširanje lozinki
+ Comment[sv]=Stöd för lösenordscache
+ Comment[ta]=கடவுச்சொல் சேமிக்க ஆதரவு
+ Comment[tg]=Дастгирии Ҳофизаи Гузарвожа
+ Comment[tr]=Parola önbellekleme desteği
+ Comment[uk]=Підтримка кешування паролів
+-Comment[xx]=xxPassword caching supportxx
+ Comment[zh_CN]=密码缓存支持
+ ServiceTypes=KDEDModule
+ X-KDE-ModuleType=Library
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kio/kscan.desktop kdelibs_3_4_BRANCH/kio/kscan.desktop
+--- kdelibs_3_4_0_RELEASE/kio/kscan.desktop	2004-10-26 04:42:24.000000000 +0200
++++ kdelibs_3_4_BRANCH/kio/kscan.desktop	2005-03-12 18:58:48.000000000 +0100
+@@ -3,7 +3,6 @@
+ Type=ServiceType
+ X-KDE-ServiceType=KScan/KScanDialog
+ Name=KScan
+-Name[af]=Kskandeer
+ Name[bn]=কে-স্ক্যান
+ Name[cy]=KSgan
+ Name[eo]=Bildciferecigo
+@@ -16,4 +15,3 @@
+ Name[ta]=Kவருடல்
+ Name[th]=สแกนภาพ - K
+ Name[ven]=U nanga ha K
+-Name[xx]=xxKScanxx
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kio/kssl/Makefile.am kdelibs_3_4_BRANCH/kio/kssl/Makefile.am
+--- kdelibs_3_4_0_RELEASE/kio/kssl/Makefile.am	2005-03-04 19:32:56.000000000 +0100
++++ kdelibs_3_4_BRANCH/kio/kssl/Makefile.am	2005-03-04 19:31:26.000000000 +0100
+@@ -3,7 +3,7 @@
+ # somewhere else. Another option for the future (needs testing) would be to
+ # change SSL_INCLUDES to .../include/openssl and make the source use #include <foo.h>
+ # instead of #include <openssl/foo.h>
+-INCLUDES=-I$(top_srcdir)/kwallet/client $(all_includes) $(SSL_INCLUDES)
++INCLUDES=-I$(top_srcdir)/kdecore/network -I$(top_srcdir)/kwallet/client $(all_includes) $(SSL_INCLUDES)
+ 
+ noinst_LTLIBRARIES = libkssl.la
+ KSSLVERSION=	3.0.0
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kio/kurifilterplugin.desktop kdelibs_3_4_BRANCH/kio/kurifilterplugin.desktop
+--- kdelibs_3_4_0_RELEASE/kio/kurifilterplugin.desktop	2005-02-23 06:04:37.000000000 +0100
++++ kdelibs_3_4_BRANCH/kio/kurifilterplugin.desktop	2005-03-12 18:58:48.000000000 +0100
+@@ -3,7 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=KURIFilter/Plugin
+ Name=Enhanced Browsing Plugin
+-Name[af]=Verbeterde Blaaiïng Inplak
++Name[af]=Verbeterde Blaaiïng Inprop module
+ Name[ar]=ملحقات التصفح المحسن
+ Name[az]=Təkmilləşmiş Səyyah Əlavəsi
+ Name[bg]=Разширена приставка за преглед
+@@ -57,7 +57,7 @@
+ Name[sl]=Vstavek za izboljšano brskanje
+ Name[sq]=Shtojcë e Përmirësuar për Shfletim
+ Name[sr]=Прикључак за побољшано претраживање
+-Name[sr@Latn]=Dodatak za poboljšano pretraživanje
++Name[sr@Latn]=Priključak za poboljšano pretraživanje
+ Name[sv]=Utökad webbläsning
+ Name[ta]=மேம்படுத்திய உலாவும் சொருகுப்பொருள்
+ Name[tg]=Баланд Кардан
+@@ -68,7 +68,6 @@
+ Name[ven]=Pulagini ya burausu yo engedzhwaho
+ Name[vi]=Các plugin đềEtănt cường duyệt 
+ Name[xh]=Iplagi yangaphakathi Ekhangela iincwadi Enyusiweyo
+-Name[xx]=xxEnhanced Browsing Pluginxx
+ Name[zh_CN]=增强的浏览插件
+ Name[zh_TW]=增強的瀏覽外掛程式
+ Name[zu]=I-plugin Yomcingi Weqophela eliphezulu
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kio/magic kdelibs_3_4_BRANCH/kio/magic
+--- kdelibs_3_4_0_RELEASE/kio/magic	2004-07-21 11:29:11.000000000 +0200
++++ kdelibs_3_4_BRANCH/kio/magic	2005-03-18 18:12:55.206200997 +0100
+@@ -67,6 +67,7 @@
+ >28	string		\x80theora	video/x-theora
+ >28	string		Speex\ \ 	audio/x-speex
+ >29	string		video		video/x-ogm
++>29	string		FLAC		audio/x-oggflac
+ 
+ # FLAC files
+ 0	string		fLaC		audio/x-flac
+@@ -313,7 +314,7 @@
+ 
+ # OpenOffice.org 1.1 puts the mimetype into the header too
+ 0    string   PK\003\004			     application/x-zip
+->30  string   mimetype     
++>30  string   mimetype
+ >>38 string   application/vnd.sun.xml.calc               application/vnd.sun.xml.calc
+ >>38 string   application/vnd.sun.xml.calc.template      application/vnd.sun.xml.calc.template
+ >>38 string   application/vnd.sun.xml.draw               application/vnd.sun.xml.draw
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kio/misc/kio_uiserver.desktop kdelibs_3_4_BRANCH/kio/misc/kio_uiserver.desktop
+--- kdelibs_3_4_0_RELEASE/kio/misc/kio_uiserver.desktop	2005-01-21 05:24:11.000000000 +0100
++++ kdelibs_3_4_BRANCH/kio/misc/kio_uiserver.desktop	2005-03-12 18:58:49.000000000 +0100
+@@ -12,9 +12,9 @@
+ Name[ro]=Kio_uiserver
+ Name[sv]=Kio-gränssnittsserver
+ Name[ta]=kio_uiசேவையகம்
+-Name[xx]=xxkio_uiserverxx
+ Exec=kio_uiserver
+ Comment=KDE's Progress Info UI server
++Comment[af]=KDE se vordering inligting UI bediener
+ Comment[ar]=خادم معلومات تقدم واجهة كيدي
+ Comment[az]=KDE'nin İrəliləmə Bilgisi İstifadaçi Ara Üz Vericisi
+ Comment[bg]=Сървър за отчитане на прогреса (KDE's Progress Info UI server)
+@@ -79,7 +79,6 @@
+ Comment[ven]=UI siva ya mafhungo a mwelaphanda a KDE
+ Comment[vi]=Máy chủ xem tiến trình các thông tin vềEUI của KDE 
+ Comment[xh]=Umcedisi we UI Wenqubela Yenkcukacha we KDE
+-Comment[xx]=xxKDE's Progress Info UI serverxx
+ Comment[zh_CN]=KDE 的进度信息用户界面服务器
+ Comment[zh_TW]=KDE 的進度資訊使用者介面伺服器
+ Comment[zu]=Umlekeleli we-UI Yolwazi Lwenqubo lwe-KDE
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kio/misc/kpac/eventsrc kdelibs_3_4_BRANCH/kio/misc/kpac/eventsrc
+--- kdelibs_3_4_0_RELEASE/kio/misc/kpac/eventsrc	2005-02-21 10:17:20.000000000 +0100
++++ kdelibs_3_4_BRANCH/kio/misc/kpac/eventsrc	2005-03-12 18:58:49.000000000 +0100
+@@ -1,10 +1,12 @@
+ [!Global!]
+ IconName=proxy
+ Comment=Automatic Proxy Configuration
++Comment[af]=Outomatiese Proksie Opstelling
+ Comment[ar]=تهيئة آلية للخادم الوكيل
+ Comment[az]=Avtomatik Vəkil Quraşdırılması
+ Comment[bg]=Автоматично конфигуриране на прокси сървъра
+ Comment[bn]=স্বয়ংক্রিয় প্রক্সি কনফিগারেশন
++Comment[br]=Kefluniadur emgefreekh ar proksi
+ Comment[bs]=Automatsko podešavanje proxy-ja
+ Comment[ca]=Configuració automàtica del servidor d'intercanvi
+ Comment[cs]=Automatické nastavení proxy
+@@ -57,16 +59,17 @@
+ Comment[uk]=Автоматичне визначення проксі сервера
+ Comment[uz]=Проксини автоматик равишда мослаш
+ Comment[wa]=Apontiaedje otomatike do procsi
+-Comment[xx]=xxAutomatic Proxy Configurationxx
+ Comment[zh_CN]=自动代理配置
+ Comment[zh_TW]=自動代理組態
+ 
+ [script-error]
+ Name=Invalid proxy script
++Name[af]=Ongeldige proksie skrip
+ Name[ar]=نص برمجي غير صالح
+ Name[az]=Hökmsüz vəkil skripti
+ Name[bg]=Невалиден скрипт за прокси сървъра
+ Name[bn]=অবৈধ প্রক্সি স্ক্রিপ্ট
++Name[br]=N'eo ket mat an urzhiaoug proksi
+ Name[bs]=Neispravna proxy skripta
+ Name[ca]=Script del servidor intermedi no vàlid
+ Name[cs]=Neplatný proxy skript
+@@ -118,14 +121,15 @@
+ Name[tr]=Geçersiz vekil sunucu betiği
+ Name[uk]=Неправильний скрипт для проксі
+ Name[uz]=Прокси скрипти ҳақиқий эмас
+-Name[xx]=xxInvalid proxy scriptxx
+ Name[zh_CN]=无效的代理脚本
+ Name[zh_TW]=不合法 proxy 命令稿檔案
+ Comment=The downloaded proxy configuration script is invalid
++Comment[af]=Die proksie skipt wat afgelaai was is foutief.
+ Comment[ar]=النص البرمجي الذي تم تنزيله غير صالح
+ Comment[az]=Endirilən vəkil quraşdırma skripti kökmsüzdür
+ Comment[bg]=Изтегленият скрипт за конфигуриране на прокси сървъра е невалиден
+ Comment[bn]=ডাউনলোড করা প্রক্সি কনফিগারেশন স্ক্রিপ্টটি অবৈধ
++Comment[br]=N'eo ket mat urzhiaoug kefluniadur ar proksi
+ Comment[bs]=Downloadovana skripta za podešavanje proxy-ja je neispravna
+ Comment[ca]=L'script de configuració del servidor intermedi descarregat no és vàlid
+ Comment[cs]=Stažený konfigurační skript pro proxy je neplatný
+@@ -176,17 +180,18 @@
+ Comment[tr]=Vekil sunucu yapılandırma dosyası geçersiz
+ Comment[uk]=Звантажений скрипт для визначення проксі сервера неправильний
+ Comment[uz]=Проксини мослаш учун ёзиб олинган скрипт ҳақиқий эмас
+-Comment[xx]=xxThe downloaded proxy configuration script is invalidxx
+ Comment[zh_CN]=下载的代理配置脚本是无效的
+ Comment[zh_TW]=代理組態的 script 檔案語法有誤
+ default_presentation=16
+ 
+ [download-error]
+ Name=Script download error
++Name[af]=Skrip aflaai fout
+ Name[ar]=خطأ أثناء تنزيل النص البرمجي
+ Name[az]=Skript endirmə xətası
+ Name[bg]=Грешка при изтегляне на скрипта
+ Name[bn]=স্ক্রিপ্ট ডাউনলোডে সমস্যা
++Name[br]=Fazi en ur enkargañ an urzhiaoug
+ Name[bs]=Greška pri downloadu skripte
+ Name[ca]=Error descàrrega de l'script
+ Name[cs]=Chyba ve stažení skriptu
+@@ -238,14 +243,15 @@
+ Name[tr]=Betik indirme hatası
+ Name[uk]=Помилка звантаження скрипту
+ Name[uz]=Скриптни ёзиб олишда хато рўй берди
+-Name[xx]=xxScript download errorxx
+ Name[zh_CN]=脚本下载错误
+ Name[zh_TW]=Script 下載錯誤
+ Comment=The proxy configuration script could not be downloaded
++Comment[af]=Die proksie opstelling skrip kon nie afgelaai word nie
+ Comment[ar]=تعذر تنزيل النص البرمجي لإعداد الخادم الوكيل
+ Comment[az]=VƏkil qurğuları skripti endirilə bilmədi
+ Comment[bg]=Скриптът за конфигуриране на прокси сървъра не може да бъде изтеглен
+ Comment[bn]=প্রক্সি কনফিগারেশন স্ক্রিপ্ট ডাউনলোড করা যায়নি
++Comment[br]=Ne m'eus ket enkargañ urzhiaoug kefluniadur ar proksi
+ Comment[bs]=Nisam mogao downloadovati skriptu za podešavanje proxy-ja
+ Comment[ca]=L'script de configuració del servidor intermedi no es pot descarregar
+ Comment[cs]=Nelze stáhnout konfigurační skript pro proxy
+@@ -296,13 +302,13 @@
+ Comment[tr]=Vekil sunucu yapılandırma dosyası indirilemedi
+ Comment[uk]=Не вдається звантажити скрипт для визначення проксі сервера
+ Comment[uz]=Проксини мослаш учун скриптни ёзиб олиб бўлмади
+-Comment[xx]=xxThe proxy configuration script could not be downloadedxx
+ Comment[zh_CN]=代理配置脚本无法下载
+ Comment[zh_TW]=無法取得代理組態 script 檔案
+ default_presentation=16
+ 
+ [evaluation-error]
+ Name=Script evaluation error
++Name[af]=Skrip evaluasie fout
+ Name[ar]=خطأ في تقييم النص البرمجي
+ Name[az]=Skript icra xətası
+ Name[bg]=Грешка при обработка на скрипта
+@@ -357,14 +363,15 @@
+ Name[tr]=Betik çalıştırma hatası
+ Name[uk]=Помилка виконання скрипту
+ Name[uz]=Скриптни текширишда хато рўй берди
+-Name[xx]=xxScript evaluation errorxx
+ Name[zh_CN]=脚本求值错误
+ Name[zh_TW]=Script 執行錯誤
+ Comment=There was an error executing the proxy configuration script
++Comment[af]=Daar was 'n fout met die uitvoer van die proksie opstell skrip
+ Comment[ar]=لقد حصل خطأ كبير أدى الى خروج البرنامج
+ Comment[az]=Vəkil qurğuları skripti işə salınırkən xəta baş verdi
+ Comment[bg]=Грешка по време на изпълнение на скрипта за конфигуриране на прокси сървъра
+ Comment[bn]=প্রক্সি কনফিগারেশন স্ক্রিপ্ট চালাতে সমস্যা দেখা দিয়েছে
++Comment[br]=Degouezhet ez eus ur fazi en ur seveniñ urzhiaoug kefluniadur ar proksi
+ Comment[bs]=Došlo je do greške pri izvršavanju skripte za podešavanje proxy-ja
+ Comment[ca]=Hi ha hagut un error executant l'script de configuració del servidor intermedi
+ Comment[cs]=Nastala chyba při spouštění konfiguračního skriptu proxy
+@@ -415,7 +422,6 @@
+ Comment[tr]=Vekil sunucu yapılandırma dosyası çalıştırılamadı
+ Comment[uk]=Виникла помилка при спробі виконати скрипт для визначення проксі сервера
+ Comment[uz]=Проксини мослаш учун скриптни ишга туширишда хато рўй берди
+-Comment[xx]=xxThere was an error executing the proxy configuration scriptxx
+ Comment[zh_CN]=执行代理配置脚本出现错误
+ Comment[zh_TW]=proxy 代理組態檔案執行錯誤
+ default_presentation=0
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kio/misc/kpac/proxyscout.desktop kdelibs_3_4_BRANCH/kio/misc/kpac/proxyscout.desktop
+--- kdelibs_3_4_0_RELEASE/kio/misc/kpac/proxyscout.desktop	2005-02-23 06:04:40.000000000 +0100
++++ kdelibs_3_4_BRANCH/kio/misc/kpac/proxyscout.desktop	2005-03-12 18:58:49.000000000 +0100
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=Proxy Scout
++Name[af]=Proksie Verkenner
+ Name[az]=Vəkil Skout
+ Name[bg]=Проучване на прокси сървъри
+ Name[bn]=প্রক্সি স্কাউট
+@@ -38,11 +39,12 @@
+ Name[tr]=Vekil Sunucu
+ Name[uk]=Розвідник проксі сервера
+ Name[uz]=Прокси скаут
+-Name[xx]=xxProxy Scoutxx
+ Name[zh_CN]=代理搜索
+ Comment=Automatic proxy configuration
++Comment[af]=Outomatiese proksie opstelling
+ Comment[bg]=Автоматично конфигуриране на прокси сървъра
+ Comment[bn]=স্বয়ংক্রিয় প্রক্সি কনফিগারেশন
++Comment[br]=Kefluniadur emgefreekh ar proksi
+ Comment[bs]=Automatsko podešavanje proxy-ja
+ Comment[ca]=Configuració automàtica de l'intermediari
+ Comment[cs]=Automatické nastavení proxy
+@@ -78,13 +80,12 @@
+ Comment[sk]=Automatická konfigurácia proxy
+ Comment[sl]=Samodejne nastavitve posrednika
+ Comment[sr]=Аутоматско подешавање проксија
+-Comment[sr@Latn]=Аутоматско подешавање проксија
++Comment[sr@Latn]=Automatsko podešavanje proksija
+ Comment[sv]=Automatisk proxyinställning
+ Comment[ta]=தானியக்க பதிலாள் வடிவமைப்பு
+ Comment[tg]=Танзими прокси бо автоматикӣ
+ Comment[tr]=Otomatik vekil sunucu yapılandırması
+ Comment[uk]=Автоматичне визначення проксі сервера
+-Comment[xx]=xxAutomatic proxy configurationxx
+ Comment[zh_CN]=自动代理配置
+ ServiceTypes=KDEDModule
+ X-KDE-ModuleType=Library
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kio/misc/kssld/kssld.desktop kdelibs_3_4_BRANCH/kio/misc/kssld/kssld.desktop
+--- kdelibs_3_4_0_RELEASE/kio/misc/kssld/kssld.desktop	2005-02-23 06:04:41.000000000 +0100
++++ kdelibs_3_4_BRANCH/kio/misc/kssld/kssld.desktop	2005-03-12 18:58:49.000000000 +0100
+@@ -13,6 +13,7 @@
+ Name[az]=KSSL Demon Modulu
+ Name[bg]=Демон KSSL
+ Name[bn]=KSSL ডিমন মডিউল
++Name[br]=Mollad an diaoul KSSL
+ Name[ca]=Mòdul del dimoni KSSL
+ Name[cs]=Modul démona KSSL
+ Name[cy]=Modiwl Daemon KSSL
+@@ -67,13 +68,14 @@
+ Name[uz]=KSSL хизматининг модули
+ Name[ven]=Modulu wa Daemon wa KSSL
+ Name[xh]=Isicatshulwa se KSSL Daemon
+-Name[xx]=xxKSSL Daemon Modulexx
+ Name[zh_CN]=KSSL 守护进程模块
+ Name[zh_TW]=KSSL 伺服程式模組
+ Name[zu]=Ingxenye ye-daemon ye-KSSL
+ Comment=KSSL daemon module for KDED
++Comment[af]=KSSL bediener module vir KDED
+ Comment[bg]=Модул демон за KSSL за KDED
+ Comment[bn]=KDED-র জন্য KSSL ডিমন মডিউল 
++Comment[br]=Mollad an diaoul KSSL evit KDED
+ Comment[bs]=KSSL Daemon Module za KDED
+ Comment[ca]=Mòdul del dimoni KSSL per a KDED
+ Comment[cs]=Modul démona KSSL pro KDED
+@@ -107,11 +109,10 @@
+ Comment[sk]=Modul démona KSSL pre KDED
+ Comment[sl]=Strežniški modul KSSL za KDED
+ Comment[sr]=KSSL демон модул за KDED
+-Comment[sr@Latn]=KSSL демон модул за KDED
++Comment[sr@Latn]=KSSL demon modul za KDED
+ Comment[sv]=KSSL-demonmodul för KDED
+ Comment[ta]=KDEDக்கான KSSL டெமான் பகுதி
+ Comment[tg]=Модули Демон KSSL брои KDED
+ Comment[tr]=KDED için KSSL program biirmi
+ Comment[uk]=Модуль демону KSSL для KDED
+-Comment[xx]=xxKSSL daemon module for KDEDxx
+ Comment[zh_CN]=KDED 的 KSSL 守护进程模块
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kio/misc/kwalletd/kwalletd.desktop kdelibs_3_4_BRANCH/kio/misc/kwalletd/kwalletd.desktop
+--- kdelibs_3_4_0_RELEASE/kio/misc/kwalletd/kwalletd.desktop	2005-02-23 06:04:41.000000000 +0100
++++ kdelibs_3_4_BRANCH/kio/misc/kwalletd/kwalletd.desktop	2005-03-12 18:58:49.000000000 +0100
+@@ -8,10 +8,12 @@
+ X-KDE-Kded-autoload=false
+ X-KDE-Kded-load-on-demand=true
+ Name=KWallet Daemon Module
++Name[af]=KBeursie Bediener Module
+ Name[ar]=مراقب وحدة KWallet
+ Name[az]=KWallet Demon Modulu
+ Name[bg]=Демон Портфейл
+ Name[bn]=কে-ওয়ালেট ডিমন মডিউল
++Name[br]=Mollad an diaoul KWallet
+ Name[ca]=Mòdul del dimoni KWallet
+ Name[cs]=Modul démona KWallet
+ Name[cy]=Modiwl Daemon KWaled
+@@ -60,12 +62,13 @@
+ Name[tr]=KWallet Program Modülü
+ Name[uk]=Модуль демону KWallet
+ Name[uz]=KWallet хизматининг модули
+-Name[xx]=xxKWallet Daemon Modulexx
+ Name[zh_CN]=KWallet 守护进程模块
+ Name[zh_TW]=KWAllet 服務程式模組
+ Comment=KWallet daemon module for KDED
++Comment[af]=KBeursie bediener bodule vir KDED
+ Comment[bg]=Модул демон за системата Портфейл за KDED
+ Comment[bn]=KDED-র জন্য কে-ওয়ালেট ডিমন মডিউল 
++Comment[br]=Mollad an diaoul KWallet evit KDED
+ Comment[bs]=KWallet daemon modul za KDED
+ Comment[ca]=Mòdul del dimoni KWallet per a KDED
+ Comment[cs]=Modul démona KWallet pro KDED
+@@ -99,11 +102,10 @@
+ Comment[sk]=Modul démona KWallet pre KDED
+ Comment[sl]=Modul KWallet demon za KDED
+ Comment[sr]=KWallet демон модул за KDED
+-Comment[sr@Latn]=KWallet демон модул за KDED
++Comment[sr@Latn]=KWallet demon modul za KDED
+ Comment[sv]=Kwallet-demonmodul för KDED
+ Comment[ta]=KDEDக்கான KWallet Daemon  தொகுதி
+ Comment[tg]=Модули Демон KWallet барои KDED
+ Comment[tr]=KDED için KWallet program modülü
+ Comment[uk]=Модуль демону торбинок KWallet для KDED
+-Comment[xx]=xxKWallet daemon module for KDEDxx
+ Comment[zh_CN]=KDED 的 KWallet 守护进程模块
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kio/misc/mms.protocol kdelibs_3_4_BRANCH/kio/misc/mms.protocol
+--- kdelibs_3_4_0_RELEASE/kio/misc/mms.protocol	2005-02-23 06:04:40.000000000 +0100
++++ kdelibs_3_4_BRANCH/kio/misc/mms.protocol	2005-03-12 18:58:49.000000000 +0100
+@@ -36,11 +36,10 @@
+ Description[sk]=Protokol pre Microsoft Media Server
+ Description[sl]=Protokol Microsoft Media Server
+ Description[sr]=Microsoft Media Server протокол
+-Description[sr@Latn]=Microsoft Media Server протокол
++Description[sr@Latn]=Microsoft Media Server protokol
+ Description[sv]=Microsoft mediaserver-protokoll
+ Description[ta]=மைக்ரோசாப்ட் ஊடக சேவக நெறிமுறை
+ Description[tg]=Протоколи медиа сервер барои Microsoft
+ Description[uk]=Протокол медіа сервера Microsoft
+-Description[xx]=xxMicrosoft Media Server Protocolxx
+ Description[zh_CN]=Microsoft 媒体服务器协议
+ URIMode=url
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kio/renamedlgplugin.desktop kdelibs_3_4_BRANCH/kio/renamedlgplugin.desktop
+--- kdelibs_3_4_0_RELEASE/kio/renamedlgplugin.desktop	2005-02-23 06:04:37.000000000 +0100
++++ kdelibs_3_4_BRANCH/kio/renamedlgplugin.desktop	2005-03-12 18:58:49.000000000 +0100
+@@ -56,7 +56,7 @@
+ Comment[sl]=Vstavek za pogovorno okno za preimenovanje
+ Comment[sq]=Shtojca për Dialogun Riemrim
+ Comment[sr]=Прикључак за дијалог за преименовање
+-Comment[sr@Latn]=Dodatak za dijalog za preimenovanje
++Comment[sr@Latn]=Priključak za dijalog za preimenovanje
+ Comment[sv]=Insticksprogram för Byt namn-dialogrutan
+ Comment[ta]=மறுபெயரிடல் உரையாடலுக்கான சொருகுப்பொருள்
+ Comment[tg]=Барои Тирезаи Диалогӣ Номи Нав Гузоштани Пайвастан
+@@ -68,7 +68,6 @@
+ Comment[vi]=Plugin cho Rename Dialog
+ Comment[wa]=Tchôke-divins pol purnea di rlomaedje
+ Comment[xh]=Iplagi yangaphakathi Yencoko yababini Yokunika igama elitsha
+-Comment[xx]=xxPlugin for the Rename Dialogxx
+ Comment[zh_CN]=重命名对话的插件
+ Comment[zh_TW]=更名對話盒的外掛程式
+ Comment[zu]=I-plugin Yengxoxo Yokuqamba kabusha
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kio/tests/dummymeta.desktop kdelibs_3_4_BRANCH/kio/tests/dummymeta.desktop
+--- kdelibs_3_4_0_RELEASE/kio/tests/dummymeta.desktop	2005-02-23 06:04:42.000000000 +0100
++++ kdelibs_3_4_BRANCH/kio/tests/dummymeta.desktop	2005-03-12 18:58:49.000000000 +0100
+@@ -36,7 +36,6 @@
+ Name[uk]=Макет метаданих
+ Name[uz]=Маъносиз мета
+ Name[ven]=Meta isa tshili
+-Name[xx]=xxDummy Metaxx
+ Name[zh_CN]=哑元
+ Name[zh_TW]=空的資料定義
+ ServiceTypes=KFilePlugin
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kioslave/bzip2/kbzip2filter.desktop kdelibs_3_4_BRANCH/kioslave/bzip2/kbzip2filter.desktop
+--- kdelibs_3_4_0_RELEASE/kioslave/bzip2/kbzip2filter.desktop	2005-01-21 05:24:12.000000000 +0100
++++ kdelibs_3_4_BRANCH/kioslave/bzip2/kbzip2filter.desktop	2005-03-12 18:58:49.000000000 +0100
+@@ -68,7 +68,6 @@
+ Name[vi]=Trình lọc BZip2 
+ Name[wa]=Passete BZip2
+ Name[xh]=Isihluzi se BZip2 
+-Name[xx]=xxBZip2 Filterxx
+ Name[zh_CN]=BZip2 过滤程序
+ Name[zh_TW]=BZip2 過濾器
+ Name[zu]=Ihluzo le-BZip2
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kioslave/ftp/ftp.cc kdelibs_3_4_BRANCH/kioslave/ftp/ftp.cc
+--- kdelibs_3_4_0_RELEASE/kioslave/ftp/ftp.cc	2005-02-18 18:20:19.000000000 +0100
++++ kdelibs_3_4_BRANCH/kioslave/ftp/ftp.cc	2005-03-12 18:58:49.000000000 +0100
+@@ -1748,6 +1748,11 @@
+     const char* buffer = m_data->textLine();
+     kdDebug(7102) << "dir > " << buffer << endl;
+ 
++    //Normally the listing looks like
++    // -rw-r--r--   1 dfaure   dfaure        102 Nov  9 12:30 log
++    // but on Netware servers like ftp://ci-1.ci.pwr.wroc.pl/ it looks like (#76442)
++    // d [RWCEAFMS] Admin                     512 Oct 13  2004 PSI
++
+     // we should always get the following 5 fields ...
+     const char *p_access, *p_junk, *p_owner, *p_group, *p_size;
+     if( (p_access = strtok((char*)buffer," ")) == 0) continue;
+@@ -1756,180 +1761,182 @@
+     if( (p_group = strtok(NULL," ")) == 0) continue;
+     if( (p_size  = strtok(NULL," ")) == 0) continue;
+ 
+-    // try to parse it as a directory entry ...
++    //kdDebug(7102) << "p_access=" << p_access << " p_junk=" << p_junk << " p_owner=" << p_owner << " p_group=" << p_group << " p_size=" << p_size << endl;
++
++    de.access = 0;
++    if ( strlen( p_access ) == 1 && p_junk[0] == '[' ) { // Netware
++      de.access = S_IRWXU | S_IRWXG | S_IRWXO; // unknown -> give all permissions
++    }
++
+     const char *p_date_1, *p_date_2, *p_date_3, *p_name;
+ 
+-            // A special hack for "/dev". A listing may look like this:
+-            // crw-rw-rw-   1 root     root       1,   5 Jun 29  1997 zero
+-            // So we just ignore the number in front of the ",". Ok, its a hack :-)
+-            if ( strchr( p_size, ',' ) != 0L )
+-            {
+-              //kdDebug(7102) << "Size contains a ',' -> reading size again (/dev hack)" << endl;
+-              if ((p_size = strtok(NULL," ")) == 0)
+-                continue;
+-            }
+-
+-            // Check whether the size we just read was really the size
+-            // or a month (this happens when the server lists no group)
+-            // Test on sunsite.uio.no, for instance
+-            if ( !isdigit( *p_size ) )
+-            {
+-              p_date_1 = p_size;
+-              p_size = p_group;
+-              p_group = 0;
+-              //kdDebug(7102) << "Size didn't have a digit -> size=" << p_size << " date_1=" << p_date_1 << endl;
+-            }
+-            else
+-            {
+-              p_date_1 = strtok(NULL," ");
+-              //kdDebug(7102) << "Size has a digit -> ok. p_date_1=" << p_date_1 << endl;
+-            }
+-
+-            if ( p_date_1 != 0 )
+-              if ((p_date_2 = strtok(NULL," ")) != 0)
+-                if ((p_date_3 = strtok(NULL," ")) != 0)
+-                  if ((p_name = strtok(NULL,"\r\n")) != 0)
+-                  {
+-
+-                    {
+-                       QCString tmp( p_name );
+-                       if ( p_access[0] == 'l' )
+-                       {
+-                         int i = tmp.findRev( " -> " );
+-                         if ( i != -1 ) {
+-                           de.link = remoteEncoding()->decode(p_name + i + 4);
+-                           tmp.truncate( i );
+-                         }
+-                         else
+-                           de.link = QString::null;
+-                       }
+-                       else
+-                         de.link = QString::null;
+-
+-                       if ( tmp[0] == '/' ) // listing on ftp://ftp.gnupg.org/ starts with '/'
+-                         tmp.remove( 0, 1 );
+-
+-                       if (tmp.find('/') != -1)
+-                         continue; // Don't trick us!
+-                       // Some sites put more than one space between the date and the name
+-                       // e.g. ftp://ftp.uni-marburg.de/mirror/
+-                       de.name     = remoteEncoding()->decode(tmp.stripWhiteSpace());
+-                    }
+-
+-                    de.access = 0;
+-                    de.type = S_IFREG;
+-                    switch ( p_access[0] ) {
+-                        case 'd':
+-                            de.type = S_IFDIR;
+-                            break;
+-                        case 's':
+-                            de.type = S_IFSOCK;
+-                            break;
+-                        case 'b':
+-                            de.type = S_IFBLK;
+-                            break;
+-                        case 'c':
+-                            de.type = S_IFCHR;
+-                            break;
+-                        case 'l':
+-                            de.type = S_IFREG;
+-                            // we don't set S_IFLNK here.  de.link says it.
+-                            break;
+-                        default:
+-                            break;
+-                    }
+-
+-                    if ( p_access[1] == 'r' )
+-                      de.access |= S_IRUSR;
+-                    if ( p_access[2] == 'w' )
+-                      de.access |= S_IWUSR;
+-                    if ( p_access[3] == 'x' || p_access[3] == 's' )
+-                      de.access |= S_IXUSR;
+-                    if ( p_access[4] == 'r' )
+-                      de.access |= S_IRGRP;
+-                    if ( p_access[5] == 'w' )
+-                      de.access |= S_IWGRP;
+-                    if ( p_access[6] == 'x' || p_access[6] == 's' )
+-                      de.access |= S_IXGRP;
+-                    if ( p_access[7] == 'r' )
+-                      de.access |= S_IROTH;
+-                    if ( p_access[8] == 'w' )
+-                      de.access |= S_IWOTH;
+-                    if ( p_access[9] == 'x' || p_access[9] == 't' )
+-                      de.access |= S_IXOTH;
+-                    if ( p_access[3] == 's' || p_access[3] == 'S' )
+-                      de.access |= S_ISUID;
+-                    if ( p_access[6] == 's' || p_access[6] == 'S' )
+-                      de.access |= S_ISGID;
+-                    if ( p_access[9] == 't' || p_access[9] == 'T' )
+-                      de.access |= S_ISVTX;
+-
+-                    // maybe fromLocal8Bit would be better in some cases,
+-                    // but what proves that the ftp server is in the same encoding
+-                    // than the user ??
+-                    de.owner    = remoteEncoding()->decode(p_owner);
+-                    de.group    = remoteEncoding()->decode(p_group);
+-                    de.size     = charToLongLong(p_size);
+-
+-                    // Parsing the date is somewhat tricky
+-                    // Examples : "Oct  6 22:49", "May 13  1999"
+-
+-                    // First get current time - we need the current month and year
+-                    time_t currentTime = time( 0L );
+-                    struct tm * tmptr = gmtime( &currentTime );
+-                    int currentMonth = tmptr->tm_mon;
+-                    //kdDebug(7102) << "Current time :" << asctime( tmptr ) << endl;
+-                    // Reset time fields
+-                    tmptr->tm_sec = 0;
+-                    tmptr->tm_min = 0;
+-                    tmptr->tm_hour = 0;
+-                    // Get day number (always second field)
+-                    tmptr->tm_mday = atoi( p_date_2 );
+-                    // Get month from first field
+-                    // NOTE : no, we don't want to use KLocale here
+-                    // It seems all FTP servers use the English way
+-                    //kdDebug(7102) << "Looking for month " << p_date_1 << endl;
+-                    static const char * s_months[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+-                                                       "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
+-                    for ( int c = 0 ; c < 12 ; c ++ )
+-                      if ( !strcmp( p_date_1, s_months[c]) )
+-                      {
+-                        //kdDebug(7102) << "Found month " << c << " for " << p_date_1 << endl;
+-                        tmptr->tm_mon = c;
+-                        break;
+-                      }
+-
+-                    // Parse third field
+-                    if ( strlen( p_date_3 ) == 4 ) // 4 digits, looks like a year
+-                      tmptr->tm_year = atoi( p_date_3 ) - 1900;
+-                    else
+-                    {
+-                      // otherwise, the year is implicit
+-                      // according to man ls, this happens when it is between than 6 months
+-                      // old and 1 hour in the future.
+-                      // So the year is : current year if tm_mon <= currentMonth+1
+-                      // otherwise current year minus one
+-                      // (The +1 is a security for the "+1 hour" at the end of the month issue)
+-                      if ( tmptr->tm_mon > currentMonth + 1 )
+-                        tmptr->tm_year--;
+-
+-                      // and p_date_3 contains probably a time
+-                      char * semicolon;
+-                      if ( ( semicolon = (char*)strchr( p_date_3, ':' ) ) )
+-                      {
+-                        *semicolon = '\0';
+-                        tmptr->tm_min = atoi( semicolon + 1 );
+-                        tmptr->tm_hour = atoi( p_date_3 );
+-                      }
+-                      else
+-                        kdWarning(7102) << "Can't parse third field " << p_date_3 << endl;
+-                    }
+-
+-                    //kdDebug(7102) << asctime( tmptr ) << endl;
+-                    de.date = mktime( tmptr );
+-                    return true;
+-                  }
+-  }
++    // A special hack for "/dev". A listing may look like this:
++    // crw-rw-rw-   1 root     root       1,   5 Jun 29  1997 zero
++    // So we just ignore the number in front of the ",". Ok, its a hack :-)
++    if ( strchr( p_size, ',' ) != 0L )
++    {
++      //kdDebug(7102) << "Size contains a ',' -> reading size again (/dev hack)" << endl;
++      if ((p_size = strtok(NULL," ")) == 0)
++        continue;
++    }
++
++    // Check whether the size we just read was really the size
++    // or a month (this happens when the server lists no group)
++    // Used to be the case on sunsite.uio.no, but not anymore
++    // This is needed for the Netware case, too.
++    if ( !isdigit( *p_size ) )
++    {
++      p_date_1 = p_size;
++      p_size = p_group;
++      p_group = 0;
++      //kdDebug(7102) << "Size didn't have a digit -> size=" << p_size << " date_1=" << p_date_1 << endl;
++    }
++    else
++    {
++      p_date_1 = strtok(NULL," ");
++      //kdDebug(7102) << "Size has a digit -> ok. p_date_1=" << p_date_1 << endl;
++    }
++
++    if ( p_date_1 != 0 &&
++         (p_date_2 = strtok(NULL," ")) != 0 &&
++         (p_date_3 = strtok(NULL," ")) != 0 &&
++         (p_name = strtok(NULL,"\r\n")) != 0 )
++    {
++      {
++        QCString tmp( p_name );
++        if ( p_access[0] == 'l' )
++        {
++          int i = tmp.findRev( " -> " );
++          if ( i != -1 ) {
++            de.link = remoteEncoding()->decode(p_name + i + 4);
++            tmp.truncate( i );
++          }
++          else
++            de.link = QString::null;
++        }
++        else
++          de.link = QString::null;
++
++        if ( tmp[0] == '/' ) // listing on ftp://ftp.gnupg.org/ starts with '/'
++          tmp.remove( 0, 1 );
++
++        if (tmp.find('/') != -1)
++          continue; // Don't trick us!
++        // Some sites put more than one space between the date and the name
++        // e.g. ftp://ftp.uni-marburg.de/mirror/
++        de.name     = remoteEncoding()->decode(tmp.stripWhiteSpace());
++      }
++
++      de.type = S_IFREG;
++      switch ( p_access[0] ) {
++      case 'd':
++        de.type = S_IFDIR;
++        break;
++      case 's':
++        de.type = S_IFSOCK;
++        break;
++      case 'b':
++        de.type = S_IFBLK;
++        break;
++      case 'c':
++        de.type = S_IFCHR;
++        break;
++      case 'l':
++        de.type = S_IFREG;
++        // we don't set S_IFLNK here.  de.link says it.
++        break;
++      default:
++        break;
++      }
++
++      if ( p_access[1] == 'r' )
++        de.access |= S_IRUSR;
++      if ( p_access[2] == 'w' )
++        de.access |= S_IWUSR;
++      if ( p_access[3] == 'x' || p_access[3] == 's' )
++        de.access |= S_IXUSR;
++      if ( p_access[4] == 'r' )
++        de.access |= S_IRGRP;
++      if ( p_access[5] == 'w' )
++        de.access |= S_IWGRP;
++      if ( p_access[6] == 'x' || p_access[6] == 's' )
++        de.access |= S_IXGRP;
++      if ( p_access[7] == 'r' )
++        de.access |= S_IROTH;
++      if ( p_access[8] == 'w' )
++        de.access |= S_IWOTH;
++      if ( p_access[9] == 'x' || p_access[9] == 't' )
++        de.access |= S_IXOTH;
++      if ( p_access[3] == 's' || p_access[3] == 'S' )
++        de.access |= S_ISUID;
++      if ( p_access[6] == 's' || p_access[6] == 'S' )
++        de.access |= S_ISGID;
++      if ( p_access[9] == 't' || p_access[9] == 'T' )
++        de.access |= S_ISVTX;
++
++      de.owner    = remoteEncoding()->decode(p_owner);
++      de.group    = remoteEncoding()->decode(p_group);
++      de.size     = charToLongLong(p_size);
++
++      // Parsing the date is somewhat tricky
++      // Examples : "Oct  6 22:49", "May 13  1999"
++
++      // First get current time - we need the current month and year
++      time_t currentTime = time( 0L );
++      struct tm * tmptr = gmtime( &currentTime );
++      int currentMonth = tmptr->tm_mon;
++      //kdDebug(7102) << "Current time :" << asctime( tmptr ) << endl;
++      // Reset time fields
++      tmptr->tm_sec = 0;
++      tmptr->tm_min = 0;
++      tmptr->tm_hour = 0;
++      // Get day number (always second field)
++      tmptr->tm_mday = atoi( p_date_2 );
++      // Get month from first field
++      // NOTE : no, we don't want to use KLocale here
++      // It seems all FTP servers use the English way
++      //kdDebug(7102) << "Looking for month " << p_date_1 << endl;
++      static const char * s_months[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
++                                           "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
++      for ( int c = 0 ; c < 12 ; c ++ )
++        if ( !strcmp( p_date_1, s_months[c]) )
++        {
++          //kdDebug(7102) << "Found month " << c << " for " << p_date_1 << endl;
++          tmptr->tm_mon = c;
++          break;
++        }
++
++      // Parse third field
++      if ( strlen( p_date_3 ) == 4 ) // 4 digits, looks like a year
++        tmptr->tm_year = atoi( p_date_3 ) - 1900;
++      else
++      {
++        // otherwise, the year is implicit
++        // according to man ls, this happens when it is between than 6 months
++        // old and 1 hour in the future.
++        // So the year is : current year if tm_mon <= currentMonth+1
++        // otherwise current year minus one
++        // (The +1 is a security for the "+1 hour" at the end of the month issue)
++        if ( tmptr->tm_mon > currentMonth + 1 )
++          tmptr->tm_year--;
++
++        // and p_date_3 contains probably a time
++        char * semicolon;
++        if ( ( semicolon = (char*)strchr( p_date_3, ':' ) ) )
++        {
++          *semicolon = '\0';
++          tmptr->tm_min = atoi( semicolon + 1 );
++          tmptr->tm_hour = atoi( p_date_3 );
++        }
++        else
++          kdWarning(7102) << "Can't parse third field " << p_date_3 << endl;
++      }
++
++      //kdDebug(7102) << asctime( tmptr ) << endl;
++      de.date = mktime( tmptr );
++      return true;
++    }
++  } // line invalid, loop to get another line
+   return false;
+ }
+ 
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kioslave/gzip/kgzipfilter.desktop kdelibs_3_4_BRANCH/kioslave/gzip/kgzipfilter.desktop
+--- kdelibs_3_4_0_RELEASE/kioslave/gzip/kgzipfilter.desktop	2005-01-21 05:24:12.000000000 +0100
++++ kdelibs_3_4_BRANCH/kioslave/gzip/kgzipfilter.desktop	2005-03-12 18:58:49.000000000 +0100
+@@ -68,7 +68,6 @@
+ Name[vi]=Trình lọc Gzip 
+ Name[wa]=Passete GZip
+ Name[xh]=Isihluzi se GZip
+-Name[xx]=xxGZip Filterxx
+ Name[zh_CN]=GZip 过滤程序
+ Name[zh_TW]=GZip 過濾器
+ Name[zu]=Ihluzo le-GZip
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kioslave/http/configure.in.in kdelibs_3_4_BRANCH/kioslave/http/configure.in.in
+--- kdelibs_3_4_0_RELEASE/kioslave/http/configure.in.in	2004-11-04 22:05:13.000000000 +0100
++++ kdelibs_3_4_BRANCH/kioslave/http/configure.in.in	2005-03-12 18:58:49.000000000 +0100
+@@ -69,7 +69,7 @@
+ case "$with_gssapi" in
+ no) AC_MSG_RESULT(no) ;;
+ framework)
+-  GSSAPI_LIBS="-Xlinker -framework -Xlinker GSSAPI"
++  GSSAPI_LIBS="-Xlinker -framework -Xlinker Kerberos"
+   AC_DEFINE_UNQUOTED(HAVE_LIBGSSAPI, 1, [Define if you have GSSAPI libraries])
+   GSSAPI_SUBDIR="gssapi"
+   AC_MSG_RESULT(Apple framework)
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kioslave/http/http.cc kdelibs_3_4_BRANCH/kioslave/http/http.cc
+--- kdelibs_3_4_0_RELEASE/kioslave/http/http.cc	2005-02-25 16:48:22.000000000 +0100
++++ kdelibs_3_4_BRANCH/kioslave/http/http.cc	2005-03-12 18:58:49.000000000 +0100
+@@ -1950,6 +1950,8 @@
+   kdDebug(7113) << "(" << m_pid << ") HTTPProtocol::httpOpenConnection" << endl;
+ 
+   setBlockConnection( true );
++  // kio_http uses its own proxying:
++  KSocks::self()->disableSocks();
+ 
+   if ( m_state.doProxy )
+   {
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kioslave/http/http_cache_cleaner.desktop kdelibs_3_4_BRANCH/kioslave/http/http_cache_cleaner.desktop
+--- kdelibs_3_4_0_RELEASE/kioslave/http/http_cache_cleaner.desktop	2005-01-21 05:24:12.000000000 +0100
++++ kdelibs_3_4_BRANCH/kioslave/http/http_cache_cleaner.desktop	2005-03-12 18:58:49.000000000 +0100
+@@ -68,7 +68,6 @@
+ Name[ven]=Tshikulumagi tsha HTTP Cache
+ Name[vi]=Trình xoá HTTP cache 
+ Name[xh]=Umcoci wendawo efihlakeleyo yokugcina we HTTP
+-Name[xx]=xxHTTP Cache Cleanerxx
+ Name[zh_CN]=HTTP 缓存清除程序
+ Name[zh_TW]=HTTP 快取清除程式
+ Name[zu]=Umhlanzi we-Cache ye-HTTP
+@@ -140,7 +139,6 @@
+ Comment[ven]=I kulumaga zwithu zwakale u bva kha HTTP cache
+ Comment[vi]=Xoá các danh mục cũ trong HTTP cache 
+ Comment[xh]=Icoca amangeno amadala asuka kwindawo efihlakeleyo yokugcina ye HTTP
+-Comment[xx]=xxCleans up old entries from the HTTP cachexx
+ Comment[zh_CN]=从 HTTP 缓存中清除旧条目
+ Comment[zh_TW]=從 HTTP 快取中清除舊的項目
+ Comment[zu]=Ihlanza izingeniso ezindalam ezisuka kwi-cache ye-HTTP
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kioslave/http/kcookiejar/kcookiejar.cpp kdelibs_3_4_BRANCH/kioslave/http/kcookiejar/kcookiejar.cpp
+--- kdelibs_3_4_0_RELEASE/kioslave/http/kcookiejar/kcookiejar.cpp	2005-03-03 01:49:03.000000000 +0100
++++ kdelibs_3_4_BRANCH/kioslave/http/kcookiejar/kcookiejar.cpp	2005-03-12 18:58:49.000000000 +0100
+@@ -23,7 +23,7 @@
+ //----------------------------------------------------------------------------
+ //
+ // KDE File Manager -- HTTP Cookies
+-// $Id: kcookiejar.cpp,v 1.121.2.1 2005/02/28 23:14:49 waba Exp $
++// $Id: kcookiejar.cpp,v 1.121.2.2 2005/03/06 16:04:34 adawit Exp $
+ 
+ //
+ // The cookie protocol is a mess. RFC2109 is a joke since nobody seems to
+@@ -1526,7 +1526,7 @@
+     {
+         const QString &value = *it++;
+ 
+-        int sepPos = value.find(':');
++        int sepPos = value.findRev(':');
+ 
+         if (sepPos <= 0)
+           continue;
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kioslave/http/kcookiejar/kcookiejar.desktop kdelibs_3_4_BRANCH/kioslave/http/kcookiejar/kcookiejar.desktop
+--- kdelibs_3_4_0_RELEASE/kioslave/http/kcookiejar/kcookiejar.desktop	2005-02-23 06:04:43.000000000 +0100
++++ kdelibs_3_4_BRANCH/kioslave/http/kcookiejar/kcookiejar.desktop	2005-03-12 18:58:49.000000000 +0100
+@@ -59,11 +59,11 @@
+ Name[uz]=KDED куки идиш модули
+ Name[ven]=Modulu wa Jar wa Cookie ya KDED
+ Name[xh]=Isicatshulwa se KDED Cookie Jar
+-Name[xx]=xxKDED Cookie Jar Modulexx
+ Name[zh_CN]=KDED Cookie Jar 模块
+ Name[zh_TW]=KDED Cookie Jar 模組
+ Name[zu]=Ingxenye Yojeke ye-Cookie ye-KDED
+ Comment=Keeps track of all cookies in the system
++Comment[af]=Hou tred van al die koekies in die stelsel
+ Comment[bg]=Контрол над всички кукита в системата
+ Comment[bn]=সিস্টেমে সমস্ত কুকি-র খোঁজখবর রাখে
+ Comment[bs]=Prati sve kolačiće (cookije) na sistemu
+@@ -100,13 +100,12 @@
+ Comment[sk]=Sleduje všetky cookie v systéme
+ Comment[sl]=Opazuje vse piškotke v sistemu
+ Comment[sr]=Води евиденцију о свим колачићима на систему
+-Comment[sr@Latn]=Води евиденцију о свим колачићима на систему
++Comment[sr@Latn]=Vodi evidenciju o svim kolačićima na sistemu
+ Comment[sv]=Håller ordning på alla kakor i systemet
+ Comment[ta]=கணினியின் எல்லா தற்காலிக நினைவகங்களையும் கண்காணிக்கிறது
+ Comment[tg]=Гузаргоҳи ҳамаша Cookies дар система муҳофизат кунед
+ Comment[tr]=Sistemdeki tüm çerezleri izler
+ Comment[uk]=Стежить за всіма куками в системі
+-Comment[xx]=xxKeeps track of all cookies in the systemxx
+ Comment[zh_CN]=将全部 cookies 的记录保存在系统中
+ ServiceTypes=KDEDModule
+ Exec=kcookiejar
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kioslave/http/kcookiejar/kcookiewin.cpp kdelibs_3_4_BRANCH/kioslave/http/kcookiejar/kcookiewin.cpp
+--- kdelibs_3_4_0_RELEASE/kioslave/http/kcookiejar/kcookiewin.cpp	2005-02-15 22:27:16.000000000 +0100
++++ kdelibs_3_4_BRANCH/kioslave/http/kcookiejar/kcookiewin.cpp	2005-03-12 18:58:49.000000000 +0100
+@@ -24,7 +24,7 @@
+ //----------------------------------------------------------------------------
+ //
+ // KDE File Manager -- HTTP Cookie Dialogs
+-// $Id: kcookiewin.cpp,v 1.58 2005/02/15 21:27:16 waba Exp $
++// $Id: kcookiewin.cpp,v 1.58.2.1 2005/03/06 14:47:13 waba Exp $
+ 
+ // The purpose of the QT_NO_TOOLTIP and QT_NO_WHATSTHIS ifdefs is because
+ // this file is also used in Konqueror/Embedded. One of the aims of
+@@ -113,7 +113,18 @@
+     QLabel* lbl = new QLabel( txt, vBox );
+     lbl->setAlignment( Qt::AlignCenter );
+     KHttpCookiePtr cookie = cookieList.first();
+-    txt = i18n("<b>%1</b>").arg( KIDNA::toUnicode(cookie->host()) );
++
++    QString host (cookie->host());
++    int pos = host.find(':');
++    if ( pos > 0 )
++    {
++      QString portNum = host.left(pos);
++      host.remove(0, pos+1);
++      host += ':';
++      host += portNum;
++    }
++
++    txt = QString("<b>%1</b>").arg( KIDNA::toUnicode(host) );
+     if (cookie->isCrossDomain())
+        txt += i18n(" <b>[Cross Domain!]</b>");
+     lbl = new QLabel( txt, vBox );
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kioslave/http/kcookiejar/tests/cookie_settings.test kdelibs_3_4_BRANCH/kioslave/http/kcookiejar/tests/cookie_settings.test
+--- kdelibs_3_4_0_RELEASE/kioslave/http/kcookiejar/tests/cookie_settings.test	2005-02-23 16:31:54.000000000 +0100
++++ kdelibs_3_4_BRANCH/kioslave/http/kcookiejar/tests/cookie_settings.test	2005-03-12 18:58:49.000000000 +0100
+@@ -114,3 +114,12 @@
+ COOKIE REJECT http://d.b.c/ Set-Cookie2: some_value=value10; Version=1; Path="/"; max-age="600"
+ COOKIE ACCEPT http://d.b.c/ Set-Cookie: some_value=value11; Path="/"
+ COOKIE ACCEPT http://d.b.c/ Set-Cookie2: some_value=value12; Version=1; Path="/"
++## Check domain policies that contain port numbers
++CONFIG AcceptSessionCookies true
++CONFIG CookieGlobalAdvice Reject
++CONFIG CookieDomainAdvice .8080:localhost:Accept
++COOKIE ACCEPT http://localhost:8080/systems Set-Cookie: some_value=value100; Path="/"
++COOKIE ACCEPT http://localhost:3128/ Set-Cookie: some_value=value200; Path="/"
++CONFIG AcceptSessionCookies false
++COOKIE ACCEPT http://localhost:8080/systems Set-Cookie: some_value=value100; Path="/"
++COOKIE REJECT http://localhost:3128/ Set-Cookie: some_value=value200; Path="/"
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kmdi/kmdi/dockcontainer.cpp kdelibs_3_4_BRANCH/kmdi/kmdi/dockcontainer.cpp
+--- kdelibs_3_4_0_RELEASE/kmdi/kmdi/dockcontainer.cpp	2004-10-27 07:07:10.000000000 +0200
++++ kdelibs_3_4_BRANCH/kmdi/kmdi/dockcontainer.cpp	2005-03-12 18:58:49.000000000 +0100
+@@ -131,6 +131,7 @@
+ 
+ void DockContainer::init()
+ {
++  bool overlap = isOverlapMode();
+   if (m_vertical)
+   {
+     parentDockWidget()->setForcedFixedWidth(m_tb->width());
+@@ -142,6 +143,8 @@
+     activateOverlapMode(m_tb->height());
+   }
+ 
++  if (!overlap) deactivateOverlapMode();
++
+   // try to restore splitter size
+   if ( parentDockWidget() && parentDockWidget()->parent() )
+   {
+@@ -509,7 +512,7 @@
+   cfg->setGroup(group_or_prefix+QString("::%1").arg(parent()->name()));
+ 
+   if (cfg->readBoolEntry("overlapMode"))
+-    activateOverlapMode(m_tb->width());
++    activateOverlapMode( m_vertical?m_tb->width():m_tb->height() );
+   else
+     deactivateOverlapMode();
+ 
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kmdi/kmdi/mainwindow.cpp kdelibs_3_4_BRANCH/kmdi/kmdi/mainwindow.cpp
+--- kdelibs_3_4_0_RELEASE/kmdi/kmdi/mainwindow.cpp	2004-09-11 23:58:43.000000000 +0200
++++ kdelibs_3_4_BRANCH/kmdi/kmdi/mainwindow.cpp	2005-03-18 18:13:06.261313789 +0100
+@@ -244,11 +244,6 @@
+   connect(m_guiClient,SIGNAL(toggleLeft()),this,SIGNAL(toggleLeft()));
+   connect(m_guiClient,SIGNAL(toggleRight()),this,SIGNAL(toggleRight()));
+   connect(m_guiClient,SIGNAL(toggleBottom()),this,SIGNAL(toggleBottom()));
+-
+-  connect(this,SIGNAL(toggleTop()),m_topContainer->getWidget(),SLOT(toggle()));
+-  connect(this,SIGNAL(toggleLeft()),m_leftContainer->getWidget(),SLOT(toggle()));
+-  connect(this,SIGNAL(toggleRight()),m_rightContainer->getWidget(),SLOT(toggle()));
+-  connect(this,SIGNAL(toggleBottom()),m_bottomContainer->getWidget(),SLOT(toggle()));
+ }
+ 
+ TabWidget *MainWindow::tabWidget ()
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kmdi/kmdidockcontainer.cpp kdelibs_3_4_BRANCH/kmdi/kmdidockcontainer.cpp
+--- kdelibs_3_4_0_RELEASE/kmdi/kmdidockcontainer.cpp	2004-12-30 06:25:49.000000000 +0100
++++ kdelibs_3_4_BRANCH/kmdi/kmdidockcontainer.cpp	2005-03-12 18:58:49.000000000 +0100
+@@ -152,6 +152,7 @@
+ 
+ void KMdiDockContainer::init()
+ {
++	bool overlap = isOverlapMode();
+ 	kdDebug( 760 ) << k_funcinfo << endl;
+ 	if ( !m_horizontal )
+ 	{
+@@ -166,6 +167,8 @@
+ 		activateOverlapMode( m_tb->height() );
+ 	}
+ 
++	if (!overlap) deactivateOverlapMode();
++
+ 	// try to restore splitter size
+ 	if ( parentDockWidget() && parentDockWidget()->parent() )
+ 	{
+@@ -563,7 +566,7 @@
+ 		if ( el.tagName() == "overlapMode" )
+ 		{
+ 			if ( el.attribute( "overlapMode" ) != "false" )
+-				activateOverlapMode( m_tb->width() );
++				activateOverlapMode( m_horizontal?m_tb->height():m_tb->width() );
+ 			else
+ 				deactivateOverlapMode();
+ 		}
+@@ -675,7 +678,7 @@
+ 	cfg->setGroup( group_or_prefix + QString( "::%1" ).arg( parent() ->name() ) );
+ 
+ 	if ( cfg->readEntry( "overlapMode" ) != "false" )
+-		activateOverlapMode( m_tb->width() );
++		activateOverlapMode( m_horizontal?m_tb->height():m_tb->width() );
+ 	else
+ 		deactivateOverlapMode();
+ 
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kmdi/kmdimainfrm.cpp kdelibs_3_4_BRANCH/kmdi/kmdimainfrm.cpp
+--- kdelibs_3_4_0_RELEASE/kmdi/kmdimainfrm.cpp	2005-02-06 02:15:57.000000000 +0100
++++ kdelibs_3_4_BRANCH/kmdi/kmdimainfrm.cpp	2005-03-12 18:58:49.000000000 +0100
+@@ -1188,7 +1188,7 @@
+ 		if ( m_pMdi )
+ 		{
+ 			static bool focusTCIsPending = false;
+-			if ( !focusTCIsPending )
++			if ( !focusTCIsPending && m_mdiMode == KMdi::ChildframeMode )
+ 			{
+ 				focusTCIsPending = true;
+ 				m_pMdi->focusTopChild();
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/knewstuff/engine.cpp kdelibs_3_4_BRANCH/knewstuff/engine.cpp
+--- kdelibs_3_4_0_RELEASE/knewstuff/engine.cpp	2005-03-03 01:49:04.000000000 +0100
++++ kdelibs_3_4_BRANCH/knewstuff/engine.cpp	2005-03-12 18:58:49.000000000 +0100
+@@ -411,8 +411,9 @@
+ 
+ void Engine::slotUploadMetaJobResult( KIO::Job *job )
+ {
++  mUploadMetaFile = QString::null;
+   if ( job->error() ) {
+-    kdDebug(5850) << "Error uploading new stuff payload." << endl;
++    kdDebug(5850) << "Error uploading new stuff metadata." << endl;
+     job->showErrorDialog( mParentWidget );
+     emit uploadFinished( false );
+     return;
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/knewstuff/knewstuffsecure.cpp kdelibs_3_4_BRANCH/knewstuff/knewstuffsecure.cpp
+--- kdelibs_3_4_0_RELEASE/knewstuff/knewstuffsecure.cpp	2005-02-08 10:47:41.000000000 +0100
++++ kdelibs_3_4_BRANCH/knewstuff/knewstuffsecure.cpp	2005-03-12 18:58:49.000000000 +0100
+@@ -74,6 +74,7 @@
+       else
+       {
+          m_tarName.prepend(m_tempDir->name());
++         connect(Security::ref(), SIGNAL(validityResult(int)), this, SLOT(slotValidated(int)));
+          Security::ref()->checkValidity(m_tarName);
+       }
+   } else
+@@ -158,7 +159,6 @@
+ 
+ void KNewStuffSecure::downloadResource()
+ {
+-  connect(Security::ref(), SIGNAL(validityResult(int)), this, SLOT(slotValidated(int)));
+   KConfig *cfg = KGlobal::config();
+   m_installedResources = cfg->entryMap("KNewStuffStatus");
+   engine()->ignoreInstallResult(true);
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kparts/browserview.desktop kdelibs_3_4_BRANCH/kparts/browserview.desktop
+--- kdelibs_3_4_0_RELEASE/kparts/browserview.desktop	2005-01-21 05:24:13.000000000 +0100
++++ kdelibs_3_4_BRANCH/kparts/browserview.desktop	2005-03-12 18:58:49.000000000 +0100
+@@ -66,7 +66,6 @@
+ Name[ven]=U vhona ha Burausu
+ Name[vi]=Xem trình duyệt 
+ Name[xh]=Imboniselo Yomkhangeli zincwadi
+-Name[xx]=xxBrowser Viewxx
+ Name[zh_CN]=浏览器视图
+ Name[zh_TW]=瀏覽器視圖
+ Name[zu]=Umbonisi Womgcingi
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kparts/kpart.desktop kdelibs_3_4_BRANCH/kparts/kpart.desktop
+--- kdelibs_3_4_0_RELEASE/kparts/kpart.desktop	2005-01-21 05:24:13.000000000 +0100
++++ kdelibs_3_4_BRANCH/kparts/kpart.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -70,7 +70,6 @@
+ Comment[ven]=Khomphonente ya KDE
+ Comment[vi]=KDE Component 
+ Comment[xh]=Ingxenye ye KDE
+-Comment[xx]=xxKDE Componentxx
+ Comment[zh_CN]=KDE 部件
+ Comment[zh_TW]=KDE 元件
+ Comment[zu]=Ingxenye ye-KDE
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kparts/krop.desktop kdelibs_3_4_BRANCH/kparts/krop.desktop
+--- kdelibs_3_4_0_RELEASE/kparts/krop.desktop	2005-01-21 05:24:13.000000000 +0100
++++ kdelibs_3_4_BRANCH/kparts/krop.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -71,7 +71,6 @@
+ Comment[ven]=Khomphonente ya KDE
+ Comment[vi]=KDE Component 
+ Comment[xh]=Ingxenye ye KDE
+-Comment[xx]=xxKDE Componentxx
+ Comment[zh_CN]=KDE 部件
+ Comment[zh_TW]=KDE 元件
+ Comment[zu]=Ingxenye ye-KDE
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kparts/krwp.desktop kdelibs_3_4_BRANCH/kparts/krwp.desktop
+--- kdelibs_3_4_0_RELEASE/kparts/krwp.desktop	2005-01-21 05:24:13.000000000 +0100
++++ kdelibs_3_4_BRANCH/kparts/krwp.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -71,7 +71,6 @@
+ Comment[ven]=Khomphonente ya KDE
+ Comment[vi]=KDE Component 
+ Comment[xh]=Ingxenye ye KDE
+-Comment[xx]=xxKDE Componentxx
+ Comment[zh_CN]=KDE 部件
+ Comment[zh_TW]=KDE 元件
+ Comment[zu]=Ingxenye ye-KDE
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kparts/tests/notepad.desktop kdelibs_3_4_BRANCH/kparts/tests/notepad.desktop
+--- kdelibs_3_4_0_RELEASE/kparts/tests/notepad.desktop	2005-02-23 06:04:43.000000000 +0100
++++ kdelibs_3_4_BRANCH/kparts/tests/notepad.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -66,7 +66,6 @@
+ Name[ven]=Hau nwalela notsi (Tsumbo)
+ Name[vi]=notepad(ví dụ) 
+ Name[xh]=Iphetshan lokubhala (umzekelo)
+-Name[xx]=xxNotepad (example)xx
+ Name[zh_CN]=记事本(例子)
+ Name[zh_TW]=記事本(範例)
+ Name[zu]=Incwadi yokubhala (umfanekiso)
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kresources/kresources.desktop kdelibs_3_4_BRANCH/kresources/kresources.desktop
+--- kdelibs_3_4_0_RELEASE/kresources/kresources.desktop	2005-02-23 06:04:44.000000000 +0100
++++ kdelibs_3_4_BRANCH/kresources/kresources.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -19,9 +19,11 @@
+ Name[de]=KDE-Ressourcen
+ Name[es]=Recursos de KDE
+ Name[et]=KDE ressursid
++Name[eu]=KDEren baliabideak
+ Name[fr]=Ressources de KDE
+ Name[fy]=KDE Helpboarnen
+ Name[ga]=Acmhainní KDE
++Name[hi]=केडीई संसाधन
+ Name[hu]=KDE-erőforrások
+ Name[is]=KDE auðlindir
+ Name[it]=Risorse di KDE
+@@ -38,13 +40,13 @@
+ Name[sk]=Zdroje KDE
+ Name[sl]=Viri KDE
+ Name[sr]=KDE-ови ресурси
+-Name[sr@Latn]=KDE-ови ресурси
++Name[sr@Latn]=KDE-ovi resursi
+ Name[sv]=KDE-resurser
+ Name[uk]=Ресурси KDE
+-Name[xx]=xxKDE Resourcesxx
+ Name[zh_CN]=KDE 资源
+ 
+ Comment=Configure KDE Resources
++Comment[af]=Stel KDE Hulpbronne op
+ Comment[be]=Настроіць рэсурсы KDE
+ Comment[bg]=Настройки на системните ресурсите
+ Comment[bn]=কে.ডি.ই. রিসোর্সসমূহ কনফিগার করো
+@@ -84,17 +86,17 @@
+ Comment[sk]=Nastavenie zdrojov KDE
+ Comment[sl]=Nastavi vire KDE
+ Comment[sr]=Подешавање KDE-ових ресурса
+-Comment[sr@Latn]=Подешавање KDE-ових ресурса
++Comment[sr@Latn]=Podešavanje KDE-ovih resursa
+ Comment[sv]=Anpassa KDE-resurser
+ Comment[ta]=KDE மூலங்களை கட்டமை
+ Comment[tg]=Танзими манбаъи истифодашуда тавассути китоби адрес
+ Comment[tr]=KDE Kaynaklarını Yapılandır
+ Comment[uk]=Налаштування ресурсів KDE
+ Comment[uz]=KDE манбаларини мослаш
+-Comment[xx]=xxConfigure KDE Resourcesxx
+ Comment[zh_CN]=配置 KDE 资源
+ 
+ Keywords=resources,konnector resource,contact resource,calendar resource,notes resource,imap
++Keywords[af]=hulpbronne,konnector hulpbron,kontak hulpbron,kalender hulpbron, notas hulpbron, imap
+ Keywords[bg]=ресурс, ресурси, настройки, бележки, адресна, адресник, книга, календар, resources, konnector resource, contact resource, calendar resource, notes resource, imap
+ Keywords[bs]=resources,konnector resource,contact resource,calendar resource,notes resource,imap,resursi,konektor resurs,kontakt resurs,kalendar resurs,bilješke resurs
+ Keywords[ca]=recursos,recurs konnector,recurs de contacte,recurs de calendari,recurs de notes,imap
+@@ -127,12 +129,11 @@
+ Keywords[sk]=zdroje,zdroj pre konnector,zdroj kontaktov,zdroj kalendára,zdroj poznámok,imap
+ Keywords[sl]=resurs,vir,stikov vir,koledarski vir,imap,
+ Keywords[sr]=resources,konnector resource,contact resource,calendar resource,notes resource,imap,ресурси,ресурс,повезивач,контакт ресурс, календарски ресурс
+-Keywords[sr@Latn]=resources,konnector resource,contact resource,calendar resource,notes resource,imap,ресурси,ресурс,повезивач,контакт ресурс, календарски ресурс
++Keywords[sr@Latn]=resources,konnector resource,contact resource,calendar resource,notes resource,imap,resursi,resurs,povezivač,kontakt resurs, kalendarski resurs
+ Keywords[sv]=resurser,konnector-resurs,kontaktresurs,kalenderresurs,anteckningsresurs,IMAP
+ Keywords[ta]=மூலங்கள்,இணைப்பு மூலம்,தொடர்பு மூலம்,நாள்காட்டி மூலம்,குறிப்புகள் மூலம்e,imap
+ Keywords[tr]=kaynaklar,bağlantı kaynağı,iletiişm kaynağı,takvim kaynak,not kaynağı,imap
+ Keywords[uk]=ресурси,ресурс для konnector,ресурс контактів,ресурс календаря,ресурс приміток,imap
+-Keywords[xx]=xxresources,konnector resource,contact resource,calendar resource,notes resource,imapxx
+ Keywords[zh_CN]=resources,konnector resource,contact resource,calendar resource,notes resource,imap资源,konnector 资源,联系人资源,日历资源,备忘资源
+ 
+ Categories=Qt;KDE;X-KDE-settings-components;
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kresources/kresources_manager.desktop kdelibs_3_4_BRANCH/kresources/kresources_manager.desktop
+--- kdelibs_3_4_0_RELEASE/kresources/kresources_manager.desktop	2005-02-23 06:04:44.000000000 +0100
++++ kdelibs_3_4_BRANCH/kresources/kresources_manager.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -33,13 +33,12 @@
+ Comment[sk]=Správca KResource
+ Comment[sl]=Upravitelj virov KResource
+ Comment[sr]=KResource менаџер
+-Comment[sr@Latn]=KResource менаџер
++Comment[sr@Latn]=KResource menadžer
+ Comment[sv]=KDE-resurshantering
+ Comment[ta]=கேமூல மேலாளர்
+ Comment[tg]=Менеҷери KResource
+ Comment[tr]=KResource Yöneticisi
+ Comment[uk]=Менеджер KResource
+-Comment[xx]=xxKResource Managerxx
+ Comment[zh_CN]=KResource 管理器
+ 
+ [PropertyDef::X-KDE-ResourceFamily]
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kresources/kresources_plugin.desktop kdelibs_3_4_BRANCH/kresources/kresources_plugin.desktop
+--- kdelibs_3_4_0_RELEASE/kresources/kresources_plugin.desktop	2005-02-23 06:04:44.000000000 +0100
++++ kdelibs_3_4_BRANCH/kresources/kresources_plugin.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -3,6 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=KResources/Plugin
+ Comment=KResource Framework Plugin
++Comment[af]=KHulpbron Raamwerk Inprop module
+ Comment[az]=KResource Əlavəsi
+ Comment[bg]=Приставка за ресурсната системата KResource Framework
+ Comment[bn]=কে-রিসোর্স ফ্রেম-ওয়ার্ক প্লাগ-ইন
+@@ -46,14 +47,13 @@
+ Comment[sl]=Vstavek za ogrodje KResource
+ Comment[sq]=Shtojca KResource Framework
+ Comment[sr]=Прикључак KResource Framework-а
+-Comment[sr@Latn]=Dodatak KResource Framework-a
++Comment[sr@Latn]=Priključak KResource Framework-a
+ Comment[sv]=Insticksprogram för resursramverk
+ Comment[ta]=கேவழிமுறை கட்டமைப்பு சொருகுபொருள்
+ Comment[tg]=Мутассалкунандаи қолабгар барои KResource
+ Comment[tr]=KResource Eklentisi
+ Comment[uk]=Втулок структури KResource
+ Comment[uz]=KResource тўплам плагини
+-Comment[xx]=xxKResource Framework Pluginxx
+ Comment[zh_CN]=KResource 框架插件
+ Comment[zh_TW]=KRsource Framework 外掛程式
+ 
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kspell2/kspellclient.desktop kdelibs_3_4_BRANCH/kspell2/kspellclient.desktop
+--- kdelibs_3_4_0_RELEASE/kspell2/kspellclient.desktop	2005-02-23 06:04:46.000000000 +0100
++++ kdelibs_3_4_BRANCH/kspell2/kspellclient.desktop	2005-03-18 18:13:09.160818844 +0100
+@@ -4,10 +4,11 @@
+ X-KDE-ServiceType=KSpell/Client
+ X-KDE-Derived=KPluginInfo
+ Comment=KSpell Client
++Comment[af]=KSpel Klient
+ Comment[be]=Кліент KSpell
+ Comment[bg]=Клиент на KSpell
+ Comment[bn]=কে-স্পেল ক্লায়েন্ট
+-Comment[br]=Arval KSpell
++Comment[br]=Kliant KSpell
+ Comment[bs]=KSpell klijent
+ Comment[ca]=Client de KSpell
+ Comment[cs]=KSpell klient
+@@ -43,12 +44,11 @@
+ Comment[sk]=Klient KSpell
+ Comment[sl]=Odjemnik KSpell
+ Comment[sr]=KSpell-ов клијент
+-Comment[sr@Latn]=KSpell-ов клијент
++Comment[sr@Latn]=KSpell-ov klijent
+ Comment[sv]=Kspell-klient
+ Comment[ta]=ஓட்டு எழுத்தாக்கம்
+ Comment[tg]=Клиенти KSpell
+ Comment[tr]=KSpell Programcığı
+ Comment[uk]=Клієнт KSpell
+ Comment[uz]=KSpell клиенти
+-Comment[xx]=xxKSpell Clientxx
+ Comment[zh_CN]=KSpell 客户
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kspell2/plugins/aspell/kspell_aspell.desktop kdelibs_3_4_BRANCH/kspell2/plugins/aspell/kspell_aspell.desktop
+--- kdelibs_3_4_0_RELEASE/kspell2/plugins/aspell/kspell_aspell.desktop	2005-02-23 06:04:47.000000000 +0100
++++ kdelibs_3_4_BRANCH/kspell2/plugins/aspell/kspell_aspell.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -18,4 +18,3 @@
+ Name[it]=Aspell
+ Name[sv]=Aspell
+ Name[ta]=psதேர்ந்தெடு
+-Name[xx]=xxASpellxx
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kspell2/plugins/ispell/kspell_ispell.desktop kdelibs_3_4_BRANCH/kspell2/plugins/ispell/kspell_ispell.desktop
+--- kdelibs_3_4_0_RELEASE/kspell2/plugins/ispell/kspell_ispell.desktop	2005-02-23 06:04:48.000000000 +0100
++++ kdelibs_3_4_BRANCH/kspell2/plugins/ispell/kspell_ispell.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -19,4 +19,3 @@
+ Name[sv]=Ispell
+ Name[ta]=psதேர்ந்தெடு
+ Name[tg]=psselect
+-Name[xx]=xxISpellxx
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kstyles/highcontrast/highcontrast.themerc kdelibs_3_4_BRANCH/kstyles/highcontrast/highcontrast.themerc
+--- kdelibs_3_4_0_RELEASE/kstyles/highcontrast/highcontrast.themerc	2005-02-23 06:04:49.000000000 +0100
++++ kdelibs_3_4_BRANCH/kstyles/highcontrast/highcontrast.themerc	2005-03-12 18:58:50.000000000 +0100
+@@ -1,14 +1,17 @@
+ [Misc]
+ Name=HighContrast
+ Name[bn]=হাই কনট্রাস্ট
++Name[br]=Dargemm uhel
+ Name[ca]=Contrast alt
+ Name[cs]=Vysoký kontrast
+ Name[da]=Høj kontrast
+ Name[de]=HoherKontrast
+ Name[es]=ContrasteAlto
+ Name[et]=Tugev kontrast
++Name[eu]=Kontraste handia
+ Name[fr]=Contraste fort
+ Name[fy]=Heechkontrast
++Name[hi]=उच्च विरोधाभास
+ Name[hu]=Erősen kontrasztos
+ Name[is]=Há birtuskil
+ Name[it]=Contrasto elevato
+@@ -25,10 +28,9 @@
+ Name[se]=AllaVuostálasvuohta
+ Name[sl]=VisokKontrast
+ Name[sr]=Високи контраст
+-Name[sr@Latn]=Високи контраст
++Name[sr@Latn]=Visoki kontrast
+ Name[sv]=Hög kontrast
+ Name[uk]=Висока контрастність
+-Name[xx]=xxHighContrastxx
+ Name[zh_CN]=高对比度
+ Comment=A style that works well with high contrast color schemes
+ Comment[bg]=Стил за схеми с висок контраст
+@@ -39,7 +41,9 @@
+ Comment[en_GB]=A style that works well with high contrast colour schemes
+ Comment[es]=Un estilo que funciona con esquemas de color de contraste alto
+ Comment[et]=Stiil, mis sobib hästi tugeva kontrastiga värviskeemidele
++Comment[eu]=Kontraste handiko temekin ongi moldatzen den estiloa
+ Comment[fr]=Un style se combinant bien avec les modèles de couleurs à fort contraste
++Comment[hi]=उच्च विरोधाभासी रंग योजना के साथ कार्य करने वाली शैली
+ Comment[hu]=Erősen kontrasztos színsémákhoz jól illeszkedő stílus
+ Comment[is]=Stíll sem passar vel við litaskemu sem nota há birtuskil
+ Comment[it]=Uno stile che funziona bene con combinazioni di colori ad alto contrasto
+@@ -57,10 +61,9 @@
+ Comment[sk]=Štýl, ktorý funguje dobre pri schémach s vysokým kontrastom
+ Comment[sl]=Slog, ki se dobro obnese z visokokontrastnimi shemami
+ Comment[sr]=Стил који ради са високо контрастним шемама боја
+-Comment[sr@Latn]=Стил који ради са високо контрастним шемама боја
++Comment[sr@Latn]=Stil koji radi sa visoko kontrastnim šemama boja
+ Comment[sv]=En stil som fungerar bra med färgscheman för hög kontrast
+ Comment[uk]=Стиль, який підходить до схем кольорів з високою контрастністю
+-Comment[xx]=xxA style that works well with high contrast color schemesxx
+ Comment[zh_CN]=在高对比度配色方案中适用的样式
+ [KDE]
+ WidgetStyle=HighContrast
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kstyles/plastik/plastik.themerc kdelibs_3_4_BRANCH/kstyles/plastik/plastik.themerc
+--- kdelibs_3_4_0_RELEASE/kstyles/plastik/plastik.themerc	2005-02-23 06:04:50.000000000 +0100
++++ kdelibs_3_4_BRANCH/kstyles/plastik/plastik.themerc	2005-03-12 18:58:50.000000000 +0100
+@@ -11,11 +11,10 @@
+ Name[pa]=ਪਲਾਸਟਿਕ
+ Name[ru]=Пластик
+ Name[sr]=Пластика
+-Name[sr@Latn]=Пластика
++Name[sr@Latn]=Plastika
+ Name[ta]=ப்ளாஸ்டிக்
+ Name[tg]=Пластик
+ Name[uk]=Пластик
+-Name[xx]=xxPlastikxx
+ Name[zh_CN]=白金
+ ConfigPage=kstyle_plastik_config
+ Comment=A simple and clean style
+@@ -53,13 +52,12 @@
+ Comment[sk]=Jednoduchý a čistý štýl
+ Comment[sl]=Preprost in čist slog
+ Comment[sr]=Једноставан и чист стил
+-Comment[sr@Latn]=Једноставан и чист стил
++Comment[sr@Latn]=Jednostavan i čist stil
+ Comment[sv]=En enkel och ren stil
+ Comment[ta]=ஒரு சுலபமானதும் தெளிவானதுமான பாணி
+ Comment[tg]=Услуби осон ва тоза
+ Comment[tr]=Basit ve temiz stil
+ Comment[uk]=Простий та чистий стиль
+-Comment[xx]=xxA simple and clean stylexx
+ Comment[zh_CN]=简洁清爽的样式
+ [KDE]
+ WidgetStyle=Plastik
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kstyles/riscos/riscos.themerc kdelibs_3_4_BRANCH/kstyles/riscos/riscos.themerc
+--- kdelibs_3_4_0_RELEASE/kstyles/riscos/riscos.themerc	2005-01-21 05:24:14.000000000 +0100
++++ kdelibs_3_4_BRANCH/kstyles/riscos/riscos.themerc	2005-03-12 18:58:50.000000000 +0100
+@@ -243,7 +243,6 @@
+ Name[th]=ระบบปฏิบัติการบนชิพ RISC
+ Name[uk]=RISC ОС
+ Name[uz]=RISC ОС
+-Name[xx]=xxRISC OSxx
+ Name[zu]=IRISC OS
+ Comment=RISC OS-like theme
+ Comment[af]=Risc OS-like tema
+@@ -252,6 +251,7 @@
+ Comment[be]=Стыль падобны на RISC OS
+ Comment[bg]=Тема, подобна на RISC OS
+ Comment[bn]=রিস্ক ও.এস.-এর মতন থিম
++Comment[br]=Giz doare ISC OS
+ Comment[bs]=Tema nalik na RISC OS
+ Comment[ca]=Tema tipus RISC OS
+ Comment[cs]=Motiv jako RISC OS
+@@ -311,7 +311,6 @@
+ Comment[vi]=Theme kiểu RISC OS 
+ Comment[wa]=Tinme rishonnant al rivnance do sistinme RISC OS
+ Comment[xh]=RISC OS-Njengo mxholo 
+-Comment[xx]=xxRISC OS-like themexx
+ Comment[zh_CN]=类似 RISC OS 的主题
+ Comment[zh_TW]=類似 RISC 的風格
+ Comment[zu]=I-RISC OS-enjenge thimu
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kstyles/themes/b3.themerc kdelibs_3_4_BRANCH/kstyles/themes/b3.themerc
+--- kdelibs_3_4_0_RELEASE/kstyles/themes/b3.themerc	2005-01-21 05:24:15.000000000 +0100
++++ kdelibs_3_4_BRANCH/kstyles/themes/b3.themerc	2005-03-12 18:58:50.000000000 +0100
+@@ -5,7 +5,6 @@
+ Name[fr]=B3 / KDE
+ Name[hi]=B3/केडीई 
+ Name[ta]=B3/கேடிஇ
+-Name[xx]=xxB3/KDExx
+ Comment=B3/Modification of B2
+ Comment[af]=B3/Verandering van B2
+ Comment[ar]=B3/تعديل من  B2
+@@ -72,7 +71,6 @@
+ Comment[vi]=B3/Modification của B2
+ Comment[wa]=B3/Modifiadje do B2
+ Comment[xh]=B3/Uguqulelo kancinane lwe B2
+-Comment[xx]=xxB3/Modification of B2xx
+ Comment[zh_CN]=B3/修正的 B2
+ Comment[zh_TW]=B3/B2 改良版
+ Comment[zu]=B3/Ukulungisa kwe-B2
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kstyles/themes/beos.themerc kdelibs_3_4_BRANCH/kstyles/themes/beos.themerc
+--- kdelibs_3_4_0_RELEASE/kstyles/themes/beos.themerc	2005-01-21 05:24:15.000000000 +0100
++++ kdelibs_3_4_BRANCH/kstyles/themes/beos.themerc	2005-03-12 18:58:50.000000000 +0100
+@@ -3,8 +3,8 @@
+ Name[af]=Beos
+ Name[hi]=बीईओएस (BeOS)
+ Name[th]=ระบบปฏิบัติการ BeOS
+-Name[xx]=xxBeOSxx
+ Comment=Unthemed BeOS-like style
++Comment[af]=Onbenoemde BeOS-tipe styl
+ Comment[ar]=مظهر مشابه لBeOS
+ Comment[az]=Örtüksüz BeOS bənzəri tərz
+ Comment[be]=Стыль падобны на BeOS (бяз тэм)
+@@ -62,7 +62,6 @@
+ Comment[uk]=Стиль схожий на BeOS без встановленої теми
+ Comment[uz]=BeOS'га ўхшаш мавзусиз услуб
+ Comment[wa]=Tinme rishonnant al rivnance do sistinme BeOS
+-Comment[xx]=xxUnthemed BeOS-like stylexx
+ Comment[zh_CN]=无主题的类似 Beos 的风格
+ Comment[zh_TW]=沒有主題的 BeOS 的風格
+ [KDE]
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kstyles/themes/default.themerc kdelibs_3_4_BRANCH/kstyles/themes/default.themerc
+--- kdelibs_3_4_0_RELEASE/kstyles/themes/default.themerc	2004-12-29 18:52:07.000000000 +0100
++++ kdelibs_3_4_BRANCH/kstyles/themes/default.themerc	2005-03-12 18:58:50.000000000 +0100
+@@ -1,9 +1,11 @@
+ [Misc]
+ Name=KDE Classic
++Name[af]=KDE Klassiek
+ Name[ar]=كيدي كلاسيكي
+ Name[az]=KDE Klassik
+ Name[be]=Клясычны KDE
+ Name[bn]=কে.ডি.ই. ক্লাসিক
++Name[br]=KDE da gustum
+ Name[bs]=KDE klasični
+ Name[ca]=KDE clàssic
+ Name[cs]=Klasické KDE
+@@ -52,10 +54,10 @@
+ Name[tr]=Klasik KDE
+ Name[uk]=Типовий для KDE
+ Name[wa]=KDE Classike
+-Name[xx]=xxKDE Classicxx
+ Name[zh_CN]=KDE 经典
+ Name[zh_TW]=KDE 預設
+ Comment=Classic KDE style
++Comment[af]=Klassieke KDE styl
+ Comment[ar]=مظهر كيدي الكلاسيكي
+ Comment[az]=Klassik KDE tərzi
+ Comment[be]=Клясычны стыль KDE
+@@ -116,7 +118,6 @@
+ Comment[uk]=Класичний стиль KDE
+ Comment[uz]=Классик KDE услуби
+ Comment[wa]=Tinme avou l' rivnance «classike» di KDE
+-Comment[xx]=xxClassic KDE stylexx
+ Comment[zh_CN]=经典的 KDE 风格
+ Comment[zh_TW]=預設的 KDE 風格
+ Highcolor=hcstyle.la
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kstyles/themes/highcolor.themerc kdelibs_3_4_BRANCH/kstyles/themes/highcolor.themerc
+--- kdelibs_3_4_0_RELEASE/kstyles/themes/highcolor.themerc	2005-01-21 05:24:15.000000000 +0100
++++ kdelibs_3_4_BRANCH/kstyles/themes/highcolor.themerc	2005-03-12 18:58:50.000000000 +0100
+@@ -1,5 +1,6 @@
+ [Misc]
+ Name=HighColor Classic
++Name[af]=Hoë-kontras Klassiek
+ Name[ar]=كلاسيكي عالي الألوان
+ Name[az]=Zəngin Rəngli Klassik
+ Name[bn]=হাই-কালার ক্লাসিক
+@@ -53,10 +54,10 @@
+ Name[th]=รูปแบบปริยาย ความละเอียดสีสูง
+ Name[tr]=Klasik Yüksek Renk
+ Name[uk]=Типовий (64K кольорів)
+-Name[xx]=xxHighColor Classicxx
+ Name[zh_CN]=高色彩经典
+ Name[zh_TW]=預設的高彩
+ Comment=Highcolor version of the classic style
++Comment[af]=Hoë-kontras weergawe van die klassieke styl
+ Comment[ar]=نسخة عالية الألوان من المظهر الكلاسيكي
+ Comment[az]=Klassik tərzin zəngin rəngli buraxılışı
+ Comment[bg]=Класически стил на КДЕ с високо качество на цветовете
+@@ -115,7 +116,6 @@
+ Comment[tr]=Klasik stilin yüksek renk versiyonu
+ Comment[uk]=Версія типового стилю для 64К кольорів та більше
+ Comment[uz]=Классик услубининг юқори рангли нусхаси
+-Comment[xx]=xxHighcolor version of the classic stylexx
+ Comment[zh_CN]=经典风格的高色彩版本
+ Comment[zh_TW]=預設風格的高彩版本
+ [KDE]
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kstyles/themes/keramik.themerc kdelibs_3_4_BRANCH/kstyles/themes/keramik.themerc
+--- kdelibs_3_4_0_RELEASE/kstyles/themes/keramik.themerc	2005-01-21 05:24:15.000000000 +0100
++++ kdelibs_3_4_BRANCH/kstyles/themes/keramik.themerc	2005-03-12 18:58:50.000000000 +0100
+@@ -23,9 +23,9 @@
+ Name[tg]=Сафолӣ
+ Name[th]=เครามิก - K
+ Name[uz]=Керамика
+-Name[xx]=xxKeramikxx
+ ConfigPage=kstyle_keramik_config
+ Comment=The default style using alphablending
++Comment[af]=Die standaard styl wat alfa vermenging gebruik
+ Comment[ar]=المظهر الإفتراضي باستعمال alphablending
+ Comment[az]=Alfa şəffaflıq işlədən ön qurğulu tərz
+ Comment[bg]=Стандартния стил, използващ алфа сливане
+@@ -82,7 +82,6 @@
+ Comment[tr]=Alpha karışımı kullanan öntanımlı stil
+ Comment[uk]=Стиль з використанням плавного переходу кольорів
+ Comment[uz]=Alphablending'ли андоза услуб
+-Comment[xx]=xxThe default style using alphablendingxx
+ Comment[zh_CN]=使用 alpha 混和的默认风格
+ Comment[zh_TW]=使用 alphablending 的預設風格
+ 
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kstyles/themes/kstep.themerc kdelibs_3_4_BRANCH/kstyles/themes/kstep.themerc
+--- kdelibs_3_4_0_RELEASE/kstyles/themes/kstep.themerc	2004-12-29 18:52:07.000000000 +0100
++++ kdelibs_3_4_BRANCH/kstyles/themes/kstep.themerc	2005-03-12 18:58:50.000000000 +0100
+@@ -22,7 +22,6 @@
+ Name[th]=KDE สเต็ป
+ Name[ven]=Tshitaela tsha KDE
+ Name[xh]=Inyathelo le KDE
+-Name[xx]=xxKDE Stepxx
+ Name[zu]=Isigaba se-KDE
+ Comment=Unthemed Next-like style
+ Comment[af]=Ongetemade Next-tipe styl
+@@ -89,7 +88,6 @@
+ Comment[ven]=Hu songo newaho thero-sa tshitaela
+ Comment[vi]=Kiểu Next chưa dùng theme 
+ Comment[xh]=Okulandelayo Okungenamxholo-njengo hlobo
+-Comment[xx]=xxUnthemed Next-like stylexx
+ Comment[zh_CN]=无主题的类似 Next 的风格
+ Comment[zh_TW]=沒有主題的類似 Nextstep 的風格
+ Comment[zu]=Okulandelayo Okungenangqikithi-okunjengesitayela
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kstyles/themes/light-v2.themerc kdelibs_3_4_BRANCH/kstyles/themes/light-v2.themerc
+--- kdelibs_3_4_0_RELEASE/kstyles/themes/light-v2.themerc	2004-12-29 18:52:08.000000000 +0100
++++ kdelibs_3_4_BRANCH/kstyles/themes/light-v2.themerc	2005-03-12 18:58:50.000000000 +0100
+@@ -60,7 +60,6 @@
+ Name[ven]=Tshitaela tshisi tshau konda, ndulamiso ya vhuvhili
+ Name[vi]=Light Style, revision thứ 2
+ Name[xh]=Uhlobo Olukhanyayo, 2nd ukhumbuzo kwakhona
+-Name[xx]=xxLight Style, 2nd revisionxx
+ Name[zh_CN]=Light 风格，第二版
+ Name[zh_TW]=輕靈風格，第二版
+ Name[zu]=Ukubuyekezwa oku-2nd, Kwesitayela Esilula
+@@ -124,7 +123,6 @@
+ Comment[ven]=Ndulamiso ya vhuvhili isa kondi na tshitaela tshileluwaho
+ Comment[vi]=Revision thứ 2 của kiểu widget đơn giản
+ Comment[xh]=Ukhumbuzo kwakhona lwesibini lokulula nokubukekayo kwe hlobo lwe widget 'Ekhaphu-khaphu.
+-Comment[xx]=xxSecond revision of the simple and elegant 'Light' widget style.xx
+ Comment[zh_CN]=简约雅致的“Light”风格，第二版。
+ Comment[zh_TW]=簡單高雅的“輕靈”界面工具風格的第二版。
+ Comment[zu]=Ukubuyekezwa kwesibili kwesitayela se-widget 'Esilula' kanye nesiphucuzekile.
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kstyles/themes/light-v3.themerc kdelibs_3_4_BRANCH/kstyles/themes/light-v3.themerc
+--- kdelibs_3_4_0_RELEASE/kstyles/themes/light-v3.themerc	2004-12-29 18:52:08.000000000 +0100
++++ kdelibs_3_4_BRANCH/kstyles/themes/light-v3.themerc	2005-03-12 18:58:50.000000000 +0100
+@@ -60,7 +60,6 @@
+ Name[ven]=Tshitaela tshisa kondi, ndovhololo ya vhuraru
+ Name[vi]=Light Style, revision 3
+ Name[xh]=Uhlobo Olukhanyayo, 3rd ukhumbuzo kwakhona
+-Name[xx]=xxLight Style, 3rd revisionxx
+ Name[zh_CN]=Light 风格，第三版
+ Name[zh_TW]=輕靈風格，第三版
+ Name[zu]=Isitayela Esilula, ukubuyekezwa kwesithathu
+@@ -125,7 +124,6 @@
+ Comment[ven]=Ndovhololo ya vhuraru isa kondi na tshitaela tshisa kondi.
+ Comment[vi]=Revision thứ ba của kiểu widget 'Light' đơn giản và thông minh
+ Comment[xh]=Ukhumbuzo kwakhona lwesithathu lokulula kunye nokubukekayo kohlobo lwe widget 'Ekhaphu-khaphu'.
+-Comment[xx]=xxThird revision of the simple and elegant 'Light' widget style.xx
+ Comment[zh_CN]=简约雅致的“Light”风格，第三版。
+ Comment[zh_TW]=簡單高雅的“輕靈”界面工具風格的第三版。
+ Comment[zu]=Ukubuyekezwa kwesithathu kwesitayela se-widget 'Esilula' kanye nokuphucuzekile.
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kstyles/themes/mega.themerc kdelibs_3_4_BRANCH/kstyles/themes/mega.themerc
+--- kdelibs_3_4_0_RELEASE/kstyles/themes/mega.themerc	2005-02-21 10:17:21.000000000 +0100
++++ kdelibs_3_4_BRANCH/kstyles/themes/mega.themerc	2005-03-12 18:58:50.000000000 +0100
+@@ -57,7 +57,6 @@
+ Name[ven]=Tshitaela tsha muvhala wa ntha  wa MegaGradient
+ Name[vi]=Kiểu màu sáng Megagradient 
+ Name[xh]=Uhlobo lombala ophezulu we MegaGradient
+-Name[xx]=xxMegaGradient highcolor stylexx
+ Name[zh_CN]=MegaGradient 高色彩风格
+ Name[zh_TW]=MegaGradient 高彩風格
+ Name[zu]=Isitayela sombala ophezulu se-MegaGradient
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kstyles/themes/qtcde.themerc kdelibs_3_4_BRANCH/kstyles/themes/qtcde.themerc
+--- kdelibs_3_4_0_RELEASE/kstyles/themes/qtcde.themerc	2004-12-29 18:52:08.000000000 +0100
++++ kdelibs_3_4_BRANCH/kstyles/themes/qtcde.themerc	2005-03-12 18:58:50.000000000 +0100
+@@ -3,7 +3,6 @@
+ Name[bn]=সি-ডি-ই
+ Name[hi]=सीडीई
+ Name[th]=รูปแบบ CDE
+-Name[xx]=xxCDExx
+ Comment=Built-in unthemed CDE style
+ Comment[af]=Ingeboude ongetemade Cde styl
+ Comment[ar]=مظهر مضمن مشابه لCDE
+@@ -69,7 +68,6 @@
+ Comment[ven]=Tshitaela tsha CDE tsho fhatelwaho ngomu
+ Comment[vi]=Kiểu CDE chưa dùng theme có sẵn 
+ Comment[xh]=Uhlobo olungenamxholo olakhelwe-ngaphakathi lwe CDE
+-Comment[xx]=xxBuilt-in unthemed CDE stylexx
+ Comment[zh_CN]=内建的无主题 CDE 风格
+ Comment[zh_TW]=內建的無主題 CDE 風格
+ Comment[zu]=Isitayela Sokwakheka-ngaphakathi okungenagqikithi
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kstyles/themes/qtmotif.themerc kdelibs_3_4_BRANCH/kstyles/themes/qtmotif.themerc
+--- kdelibs_3_4_0_RELEASE/kstyles/themes/qtmotif.themerc	2004-12-29 18:52:08.000000000 +0100
++++ kdelibs_3_4_BRANCH/kstyles/themes/qtmotif.themerc	2005-03-12 18:58:50.000000000 +0100
+@@ -7,7 +7,6 @@
+ Name[pa]=ਮੋਟੀਫ
+ Name[ta]=மோடிஃப்
+ Name[th]=โมทีฟ
+-Name[xx]=xxMotifxx
+ Comment=Built-in unthemed Motif style
+ Comment[af]=Ingeboude ongetemade Motif styl
+ Comment[ar]=مظهر مضمن مشابه لMotif
+@@ -73,7 +72,6 @@
+ Comment[ven]=Tshitaela tsha mothifi tsho fhatelwaho ngomu
+ Comment[vi]=Kiểu Motif chưa dùng theme có sẵn 
+ Comment[xh]=Uhlobo lwe Motir olungenamxholo olakhelwe-ngaphakathi
+-Comment[xx]=xxBuilt-in unthemed Motif stylexx
+ Comment[zh_CN]=内建的无主题 Motif 风格
+ Comment[zh_TW]=內建的無主題 Motif 風格
+ Comment[zu]=Ukwakekha-ngaphakathi okungenagqikithi sesitayela se-Motif
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kstyles/themes/qtmotifplus.themerc kdelibs_3_4_BRANCH/kstyles/themes/qtmotifplus.themerc
+--- kdelibs_3_4_0_RELEASE/kstyles/themes/qtmotifplus.themerc	2005-01-21 05:24:15.000000000 +0100
++++ kdelibs_3_4_BRANCH/kstyles/themes/qtmotifplus.themerc	2005-03-12 18:58:50.000000000 +0100
+@@ -13,7 +13,6 @@
+ Name[pa]=ਮੋਟੀਫ ਨਵਾਂ
+ Name[ta]=மோடிஃப் ப்ளஸ்
+ Name[th]=โมทีฟพลัส
+-Name[xx]=xxMotif Plusxx
+ Comment=Built-in enhanced Motif style
+ Comment[af]=Ingeboude verbeterde Motif styl
+ Comment[ar]=مظهر مضمن محسّن مشابه لMotif
+@@ -78,7 +77,6 @@
+ Comment[ven]=Tshitaela tsho fhatelwaho nga ngomu
+ Comment[vi]=Kiểu Motif cao cấp có sẵn 
+ Comment[xh]=Uhlobo lwe Motif olunyusiweyo olwakhelwe-ngaphakathi
+-Comment[xx]=xxBuilt-in enhanced Motif stylexx
+ Comment[zh_CN]=内建的增强的 Motif 风格
+ Comment[zh_TW]=內建的增強的 Motif 風格
+ Comment[zu]=Isitayela se-Mofit esenziwe ngcono
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kstyles/themes/qtplatinum.themerc kdelibs_3_4_BRANCH/kstyles/themes/qtplatinum.themerc
+--- kdelibs_3_4_0_RELEASE/kstyles/themes/qtplatinum.themerc	2004-12-29 18:52:08.000000000 +0100
++++ kdelibs_3_4_BRANCH/kstyles/themes/qtplatinum.themerc	2005-03-12 18:58:50.000000000 +0100
+@@ -19,7 +19,6 @@
+ Name[th]=แพลตตินัม
+ Name[tr]=Platin
+ Name[wa]=Platene
+-Name[xx]=xxPlatinumxx
+ Name[zh_CN]=白金
+ Comment=Built-in unthemed Platinum style
+ Comment[af]=Ingeboude ongetemade Platinum styl
+@@ -86,7 +85,6 @@
+ Comment[ven]=Tshitale tsha pulathinamu tsho fhatelwaho nga ngomu
+ Comment[vi]=Kiểu Platinum chưa dùng theme có sẵn 
+ Comment[xh]=Uhloboa lwe Platinum olungenamxholo olwakhelwe-ngaphakathi
+-Comment[xx]=xxBuilt-in unthemed Platinum stylexx
+ Comment[zh_CN]=内建的无主题白金风格
+ Comment[zh_TW]=內建的無主題 Platinum 風格
+ Comment[zu]=Yakhelwe-kuhlobo lwesingenabizogama isitayelaPlatinum 
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kstyles/themes/qtsgi.themerc kdelibs_3_4_BRANCH/kstyles/themes/qtsgi.themerc
+--- kdelibs_3_4_0_RELEASE/kstyles/themes/qtsgi.themerc	2005-01-21 05:24:15.000000000 +0100
++++ kdelibs_3_4_BRANCH/kstyles/themes/qtsgi.themerc	2005-03-12 18:58:50.000000000 +0100
+@@ -4,7 +4,6 @@
+ Name[hi]=एसजीआई
+ Name[nl]=SIG
+ Name[th]=รูปแบบ SGI
+-Name[xx]=xxSGIxx
+ Comment=Built-in SGI style
+ Comment[af]=Ingeboude Sgi styl
+ Comment[ar]=مظهر مضمن مشابه لSGI
+@@ -71,7 +70,6 @@
+ Comment[ven]=Tshitaela tsha SGI tsho fhatelwaho nga ngomu
+ Comment[vi]=Kiểu SGI có sẵn 
+ Comment[xh]=Uhlobo lwe SGI olwakhelwe-ngaphakathi
+-Comment[xx]=xxBuilt-in SGI stylexx
+ Comment[zh_CN]=内建的 SGI 风格
+ Comment[zh_TW]=內建的 SGI 風格
+ Comment[zu]=Yakhelwe-kwisitayela se SGI
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kstyles/themes/qtwindows.themerc kdelibs_3_4_BRANCH/kstyles/themes/qtwindows.themerc
+--- kdelibs_3_4_0_RELEASE/kstyles/themes/qtwindows.themerc	2005-02-23 06:04:50.000000000 +0100
++++ kdelibs_3_4_BRANCH/kstyles/themes/qtwindows.themerc	2005-03-12 18:58:50.000000000 +0100
+@@ -9,7 +9,6 @@
+ Name[lt]=MSWindows 9x
+ Name[se]=Windows
+ Name[th]=วินโดว์ส 9x
+-Name[xx]=xxMS Windows 9xxx
+ Comment=Built-in unthemed Windows 9x style
+ Comment[af]=Ingeboude ongetemade Vensters 9x styl
+ Comment[ar]=مظهر مضمن مشابه لويندوز
+@@ -75,7 +74,6 @@
+ Comment[ven]=Tshitaela tsha 9x tsha windo i songo bulwaho tsho fhatelwaho nga ngomu
+ Comment[vi]=Kiểu Windows 9x chưa dùng theme có sẵn 
+ Comment[xh]=Uhlobo lwe Windows 9x olungenamxholo olwakhelwe-ngaphakathi
+-Comment[xx]=xxBuilt-in unthemed Windows 9x stylexx
+ Comment[zh_CN]=内建的无主题 Windows 9x 风格
+ Comment[zh_TW]=內建的無主題 Windows 9x 風格
+ Comment[zu]=Yakhelwe-kuhlobo kwisitayela samawindi 9x
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kstyles/web/web.themerc kdelibs_3_4_BRANCH/kstyles/web/web.themerc
+--- kdelibs_3_4_0_RELEASE/kstyles/web/web.themerc	2005-02-23 06:04:52.000000000 +0100
++++ kdelibs_3_4_BRANCH/kstyles/web/web.themerc	2005-03-12 18:58:50.000000000 +0100
+@@ -62,7 +62,6 @@
+ Name[ven]=Tshitaela tsha webu
+ Name[vi]=Kiểu Web 
+ Name[xh]=Uhlobo lwe Web
+-Name[xx]=xxWeb stylexx
+ Name[zh_CN]=网络风格
+ Name[zh_TW]=網站風格
+ Name[zu]=Uhlobo lwe-web
+@@ -128,7 +127,6 @@
+ Comment[ven]=Tshitaela tsha webe ya Widget
+ Comment[vi]=Kiểu Wed widget 
+ Comment[xh]=Uhlobo lwe widget ye Web
+-Comment[xx]=xxWeb widget stylexx
+ Comment[zh_CN]=网络部件风格
+ Comment[zh_TW]=Web 元件風格
+ Comment[zu]=Uhlobo lwe-widget ye-web
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kutils/kcmoduleproxy.cpp kdelibs_3_4_BRANCH/kutils/kcmoduleproxy.cpp
+--- kdelibs_3_4_0_RELEASE/kutils/kcmoduleproxy.cpp	2005-02-01 05:47:23.000000000 +0100
++++ kdelibs_3_4_BRANCH/kutils/kcmoduleproxy.cpp	2005-03-12 18:58:50.000000000 +0100
+@@ -80,13 +80,13 @@
+ 
+ 		~KCModuleProxyPrivate()
+ 		{
++			delete rootInfo; // Delete before embedWidget!
++			delete embedWidget; // Delete before embedFrame!
+ 			delete embedFrame;
+ 			delete dcopClient;
+ 			delete dcopObject;
+-			delete embedWidget;
+ 			delete rootCommunicator;
+ 			delete rootProcess;
+-			delete rootInfo;
+ 			delete kcm;
+ 		}
+ 
+@@ -386,11 +386,10 @@
+ 	}
+ 
+ 	/* Clean up in case of failure */
+-	delete d->embedFrame;
+-	d->embedFrame = 0;
+ 	delete d->embedWidget;
+ 	d->embedWidget = 0;
+-	delete lblBusy;
++	delete d->embedFrame;
++	d->embedFrame = 0;
+ 
+ 	QApplication::restoreOverrideCursor();
+ }
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kutils/kplugininfo.desktop kdelibs_3_4_BRANCH/kutils/kplugininfo.desktop
+--- kdelibs_3_4_0_RELEASE/kutils/kplugininfo.desktop	2005-02-23 06:04:53.000000000 +0100
++++ kdelibs_3_4_BRANCH/kutils/kplugininfo.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -3,11 +3,13 @@
+ Type=ServiceType
+ X-KDE-ServiceType=KPluginInfo
+ Name=KDE Plugin Information
++Name[af]=KDE Inprop module Informasie
+ Name[ar]=معلومات ملحقات كيدي
+ Name[az]=KDE Əlavə Mə'lumatı
+ Name[be]=Інфармацыя аб дапаўненьні KDE
+ Name[bg]=Информация за приставките в КДЕ
+ Name[bn]=কে.ডি.ই. প্লাগ-ইন তথ্য
++Name[br]=Titouroù al lugent KDE
+ Name[bs]=KDE informacije o dodatku
+ Name[ca]=Connector informatiu de KDE
+ Name[cs]=Informace o pluginu KDE
+@@ -61,7 +63,6 @@
+ Name[uk]=Інформація про втулок KDE
+ Name[uz]=KDE плагин ҳақида маълумот
+ Name[wa]=Informåcion sol tchôke-divins di KDE
+-Name[xx]=xxKDE Plugin Informationxx
+ Name[zh_CN]=KDE 打印信息
+ Name[zh_TW]=KDE 外掛資訊
+ 
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/kutils/ksettings/README.dox kdelibs_3_4_BRANCH/kutils/ksettings/README.dox
+--- kdelibs_3_4_0_RELEASE/kutils/ksettings/README.dox	2004-08-09 21:20:35.000000000 +0200
++++ kdelibs_3_4_BRANCH/kutils/ksettings/README.dox	2005-03-12 18:58:50.000000000 +0100
+@@ -1,6 +1,9 @@
+ /** 
+ 
+-\page KSettings The KSettings classes
++\namespace KSettings
++
++\short A collection of classes to create configuration dialogs that work over
++component boundaries
+ 
+ <h2>How to use KSettings::Dialog in your application.</h2>
+ 
+@@ -166,8 +169,14 @@
+ - The group name (id) is the name you use in the .desktop file of the page:
+   If your page's .desktop file says "X-KDE-CfgDlgHierarchy=id" then it will be
+   inserted as a child of this entry.
+-- The Name
+-
++- \p Name: The name of the section. It will appear in the listview.
++- \p Comment: A description of what the modules in this section are. It will
++  appear in the place where the KCMs are placed when the user clicks on the item
++  in the listview.
++- \p Icon: An icon for the item.
++- \p Weight: Defines the position in the listview. See X-KDE-Weight above.
++- \p Parent: If this group should be a child of another group write the parent's
++  group id here.
+ 
+ <hr>
+ <h3>5. The Pluginselector</h3>
+@@ -217,42 +226,50 @@
+ \verbatim
+ [Desktop Entry]
+ Encoding=UTF-8
+-Icon=myplugin
+ Type=Service
++Icon=<iconname>
+ ServiceTypes=KPluginInfo
+ 
++Name=MyPlugin
++Comment=My plugin is cool and does foo and bar.
++
++X-KDE-PluginInfo-Name=myplugin
++
+ X-KDE-PluginInfo-Author=<your name>
+ X-KDE-PluginInfo-Email=<your email>
+ X-KDE-PluginInfo-Website=http://www.myplugin.org/
+-X-KDE-PluginInfo-Name=myplugin
+ X-KDE-PluginInfo-Category=CoolPlugins
+ X-KDE-PluginInfo-Version=0.1
+ X-KDE-PluginInfo-License=GPL
+ X-KDE-PluginInfo-EnabledByDefault=true
+ X-KDE-PluginInfo-Depends=myotherplugin
+-
+-Name=MyPlugin
+-Comment=My plugin is cool and does foo and bar.
++X-KDE-CfgDlgHierarchy=GroupID
+ \endverbatim
+ 
+-
+ Explanation:
+ mandatory entries:
+-- Name
+-- Comment
+-- X-KDE-PluginInfo-Name is the "internal name" of the plugin.
+-- You need to have KPluginInfo in ServiceTypes but of course you may have more
++- leave \p Type and \p Encoding like in the example
++- \p Name
++- \p Comment
++- \p X-KDE-PluginInfo-Name is the "internal name" of the plugin.
++- You need to have \p KPluginInfo in \p ServiceTypes but of course you may have more
+   entries in there.
+-- leave Type and Encoding like in the example
+ 
+ optional entries:
+-- Icon is the icon used for your plugin (it's shown in the pluginselector if you
+-  set one)
+-- Author and Email is some information about the author of the plugin.
+-- Website is the address for a webpage for this plugin
+-- Category is used if your application has different categories of plugins.
+-- Depends can be used to tell the application that you need to have
++- \p Icon is the icon used for your plugin (it's shown in the pluginselector if you
++  set one).
++- \p X-KDE-PluginInfo-Author and \p X-KDE-PluginInfo-Email is some information about the author of the plugin.
++- \p X-KDE-PluginInfo-Website is the address for a webpage for this plugin.
++- \p X-KDE-PluginInfo-Category is used if your application has different categories of plugins.
++- \p X-KDE-PluginInfo-Version is the version of this plugin.
++- \p X-KDE-PluginInfo-License is the license of this plugin.
++- \p X-KDE-PluginInfo-EnabledByDefault tells the program whether the plugin
++  should be enabled on first startup or not.
++- \p X-KDE-PluginInfo-Depends can be used to tell the application that you need to have
+   myotherplugin enabled for your plugin to work.
++- \p X-KDE-CfgDlgHierarchy is used if you use a \p KSettings::Dialog::ConfigurableInline
++  KSettings::Dialog to put the plugin checkbox into the group with the GroupID
++  you set here.
+ 
+ If you have questions contact Matthias Kretz <kretz@kde.org>.
+ */
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/all.desktop kdelibs_3_4_BRANCH/mimetypes/all.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/all.desktop	2005-02-23 06:04:54.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/all.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -3,6 +3,7 @@
+ Type=MimeType
+ MimeType=all/all
+ Comment=All Files and Folders
++Comment[af]=Alle Lêers en Gidse
+ Comment[ar]=كل الملفات واﻷدلة
+ Comment[az]=Bütün Fayl və Qovluqlar
+ Comment[be]=Усе файлы і тэчкі
+@@ -62,6 +63,5 @@
+ Comment[uk]=Всі файли та теки
+ Comment[uz]=Ҳамма файл ва жилдлар
+ Comment[wa]=Tos les fitchîs et tos les ridants
+-Comment[xx]=xxAll Files and Foldersxx
+ Comment[zh_CN]=全部文件和文件夹
+ Comment[zh_TW]=所有的檔案與目錄目錄
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/allfiles.desktop kdelibs_3_4_BRANCH/mimetypes/allfiles.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/allfiles.desktop	2005-02-23 06:04:54.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/allfiles.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -68,7 +68,6 @@
+ Comment[ven]=Faela dzothe
+ Comment[wa]=Tos les fitchîs
+ Comment[xh]=Zonke IifayiIe
+-Comment[xx]=xxAll Filesxx
+ Comment[zh_CN]=全部文件
+ Comment[zh_TW]=所有的檔案
+ Comment[zu]=Wonke Amafayela
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/illustrator.desktop kdelibs_3_4_BRANCH/mimetypes/application/illustrator.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/illustrator.desktop	2005-01-21 05:24:16.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/illustrator.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -71,7 +71,6 @@
+ Comment[vi]=Tài liệu Adobe Illustrator
+ Comment[wa]=Documint Adobe Illustrator
+ Comment[xh]=Uxwebhu lwe Adobe Illustrator
+-Comment[xx]=xxAdobe Illustrator Documentxx
+ Comment[zh_CN]=Adobe Illustrator 文档
+ Comment[zh_TW]=Adobe Illustrator 文件
+ Comment[zu]=Umkhombisi Wohlu lwamafayela e-Adobe
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/java.desktop kdelibs_3_4_BRANCH/mimetypes/application/java.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/java.desktop	2005-01-21 05:24:16.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/java.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -10,6 +10,7 @@
+ Comment[be]=Кляса Java
+ Comment[bg]=Клас на Java
+ Comment[bn]=জাভা ক্লাস
++Comment[br]=Renkad Java
+ Comment[bs]=Java klasa
+ Comment[ca]=Classe Java
+ Comment[cs]=Java třída
+@@ -71,7 +72,6 @@
+ Comment[vi]=Lớp Java 
+ Comment[wa]=Classe Java
+ Comment[xh]=Uhlobo lwe Java
+-Comment[xx]=xxJava Classxx
+ Comment[zh_CN]=Java 类
+ Comment[zu]=Ikilasi lwe-Java
+ X-KDE-IsAlso=application/x-java
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/mathml+xml.desktop kdelibs_3_4_BRANCH/mimetypes/application/mathml+xml.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/mathml+xml.desktop	2005-01-21 05:24:16.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/mathml+xml.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -6,6 +6,7 @@
+ Hidden=false
+ X-KDE-IsAlso=text/xml
+ Comment=MathML Document
++Comment[af]=MathML Dokument
+ Comment[ar]=مستند MathML
+ Comment[az]=MathML Sənədi
+ Comment[be]=Дакумэнт MathML
+@@ -65,6 +66,5 @@
+ Comment[uk]=Документ MathML (математичні формули)
+ Comment[uz]=MathML ҳужжати
+ Comment[wa]=Documint MathML
+-Comment[xx]=xxMathML Documentxx
+ Comment[zh_CN]=MathML 文档
+ Comment[zh_TW]=MathML 文件
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/msexcel.desktop kdelibs_3_4_BRANCH/mimetypes/application/msexcel.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/msexcel.desktop	2005-01-28 05:03:18.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/msexcel.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -68,7 +68,6 @@
+ Comment[uz]=Microsoft Excel электрон жадвали
+ Comment[ven]=Bammbiri lo navhaho la microsoft Excel
+ Comment[wa]=Fitchî tåvleu Microsoft Excel
+-Comment[xx]=xxMicrosoft Excel Spreadsheetxx
+ Comment[zh_CN]=Microsoft Excel 电子表格
+ Comment[zh_TW]=微軟 Excel 表格
+ Comment[zu]= Ipheshana lesitayela le-Microsoft Excel
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/mspowerpoint.desktop kdelibs_3_4_BRANCH/mimetypes/application/mspowerpoint.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/mspowerpoint.desktop	2005-01-21 05:24:16.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/mspowerpoint.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=presentation
+ Patterns=*.ppz;*.PPZ;*.ppt;*.PPT;*.pps;*.PPS;
+ Comment=Microsoft PowerPoint Presentation
++Comment[af]=Microsoft Powerpoint Voorlegging
+ Comment[ar]=مستند مايكروسوفت باوربوينت
+ Comment[az]=Microsoft PowerPoint Sənədi
+ Comment[be]=Прэзэнтацыя Microsoft PowerPoint
+@@ -62,6 +63,5 @@
+ Comment[uk]=Презентація MS PowerPoint
+ Comment[uz]=Microsoft PowerPoint намунаси
+ Comment[wa]=Prezintaedje Microsoft PowerPoint
+-Comment[xx]=xxMicrosoft PowerPoint Presentationxx
+ Comment[zh_CN]=Microsoft PowerPoint 演示文稿
+ Comment[zh_TW]=微軟 PowerPoint 文件
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/msword.desktop kdelibs_3_4_BRANCH/mimetypes/application/msword.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/msword.desktop	2005-01-21 05:24:16.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/msword.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -70,7 +70,6 @@
+ Comment[ven]=Manwalwa a Microsoft Word
+ Comment[wa]=Documint Microsoft Word
+ Comment[xh]=Uxwebhhu LweMicrosoft Word
+-Comment[xx]=xxMicrosoft Word Documentxx
+ Comment[zh_CN]=Microsoft Word 文档
+ Comment[zh_TW]=微軟 Word 文件
+ Comment[zu]=Uhlu Lwamafayela lwe-Microsoft Word
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/octet-stream.desktop kdelibs_3_4_BRANCH/mimetypes/application/octet-stream.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/octet-stream.desktop	2005-02-23 06:04:54.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/octet-stream.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -73,7 +73,6 @@
+ Comment[vi]=Không biết 
+ Comment[wa]=Nén cnoxhou
+ Comment[xh]=Engaziwayo
+-Comment[xx]=xxUnknownxx
+ Comment[zh_CN]=未知
+ Comment[zh_TW]=未知
+ Comment[zu]=Okungaziwa
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/ogg.desktop kdelibs_3_4_BRANCH/mimetypes/application/ogg.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/ogg.desktop	2005-01-29 04:58:14.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/ogg.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -66,7 +66,6 @@
+ Comment[uz]=Ogg мултимедиа
+ Comment[ven]=Zwavhukwamani ha Ogg
+ Comment[wa]=Fitchî multimedia Ogg
+-Comment[xx]=xxOgg Multimediaxx
+ Comment[zh_CN]=Ogg 多媒体
+ Comment[zh_TW]=Ogg 多媒體
+ Comment[zu]=Onozindaba be-Ogg
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/pdf.desktop kdelibs_3_4_BRANCH/mimetypes/application/pdf.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/pdf.desktop	2005-01-21 05:24:16.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/pdf.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -70,7 +70,6 @@
+ Comment[ven]=Manwalwa a pdf
+ Comment[wa]=Documint PDF
+ Comment[xh]=Uxwebhu lwe PDF
+-Comment[xx]=xxPDF Documentxx
+ Comment[zh_CN]=PDF 文档
+ Comment[zh_TW]=PDF 文件
+ Comment[zu]=Uhlu lwamafayela e-PDF
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/pgp-encrypted.desktop kdelibs_3_4_BRANCH/mimetypes/application/pgp-encrypted.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/pgp-encrypted.desktop	2005-01-21 05:24:16.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/pgp-encrypted.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -66,7 +66,6 @@
+ Comment[ven]=Thoho ya mulaedza ya PGP/MIME
+ Comment[wa]=Tiestire d' on messaedje ecripté avou PGP/MIME
+ Comment[xh]=PGP/MIME Umbhalo ophezulu ephepheni Womyalezo Ofihliweyo
+-Comment[xx]=xxPGP/MIME Encrypted Message Headerxx
+ Comment[zh_CN]=PGP/MIME 加密邮件头
+ Comment[zh_TW]=PGP/MIME 加密的郵件檔頭
+ Comment[zu]=Umyalezo Wenhloko Wolwazi olungaqondakali lwe-PGP/MIME
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/pgp-keys.desktop kdelibs_3_4_BRANCH/mimetypes/application/pgp-keys.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/pgp-keys.desktop	2005-02-23 06:04:54.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/pgp-keys.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -5,9 +5,11 @@
+ Icon=certificate
+ Patterns=*.pgp;*.gpg;*.asc
+ Comment=OpenPGP Key Bundle
++Comment[af]=OpenPGP Sleutel Bundel
+ Comment[az]=OpenPGP Açar Düyünü
+ Comment[bg]=Пакет с ключове за OpenPGP
+ Comment[bn]=ওপেন-পি.জি.পি কী (Key) সংকলন
++Comment[br]=Dastumad alc'hwezioù OpenPGP
+ Comment[bs]=OpenPGP skup ključeva
+ Comment[ca]=Paquet de claus OpenPGP
+ Comment[cs]=Svazek OpenPGP klíčů
+@@ -55,7 +57,6 @@
+ Comment[tr]=OpenPGP Anahtar Çifti
+ Comment[uk]=Клунок ключа OpenPGP
+ Comment[uz]=OpenPGP калитлар тўплами
+-Comment[xx]=xxOpenPGP Key Bundlexx
+ Comment[zh_CN]=OpenPGP 秘钥束
+ X-KDE-AutoEmbed=true
+ 
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/pgp-signature.desktop kdelibs_3_4_BRANCH/mimetypes/application/pgp-signature.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/pgp-signature.desktop	2005-01-29 04:58:14.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/pgp-signature.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -65,7 +65,6 @@
+ Comment[ven]=Tsaino ya tumanywaho na PGP yo vuleaho
+ Comment[wa]=Sinateure OpenPGP distaetcheye
+ Comment[xh]=Utyikityo lwe OpenPGP Olusikiweyo
+-Comment[xx]=xxDetached OpenPGP Signaturexx
+ Comment[zh_CN]=分离的 OpenPGP 签名
+ Comment[zh_TW]=分離的 OpenPGP 簽名
+ Comment[zu]=Uphawu lokusayina lwe-OpenPGP Oluxebukile
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/pgp.desktop kdelibs_3_4_BRANCH/mimetypes/application/pgp.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/pgp.desktop	2005-01-21 05:24:16.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/pgp.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -4,6 +4,7 @@
+ MimeType=application/pgp
+ Icon=encrypted
+ Comment=PGP Encrypted or Signed Message
++Comment[af]=PGP Geënkripteerde of Getekende Boodskap
+ Comment[az]=PGP ilə Şifrələnmiş ya da İmzalanmış İsmarış
+ Comment[be]=Зашыфраванае PGP ці падпісанае паведамленьне
+ Comment[bg]=Шифровано или подписано съобщение PGP
+@@ -59,6 +60,5 @@
+ Comment[uk]=Повідомлення зашифроване або підписане PGP
+ Comment[uz]=PGP билан кодланган ёки имзоланган хабар
+ Comment[wa]=Messaedje ecripté ou siné avou PGP
+-Comment[xx]=xxPGP Encrypted or Signed Messagexx
+ Comment[zh_CN]=PGP 加密或签名的信件
+ Comment[zh_TW]=PGP 加密或簽名的訊息
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/pkcs10.desktop kdelibs_3_4_BRANCH/mimetypes/application/pkcs10.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/pkcs10.desktop	2005-01-21 05:24:16.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/pkcs10.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=certificate
+ Patterns=*.p10;*.P10
+ Comment=S/MIME Certification Request
++Comment[af]=S/MIME Sertifikaat Aanvraag
+ Comment[ar]=طلب شهادة S/MIME
+ Comment[az]=S/MIME Vəsiqələndirmə İstəyi
+ Comment[bg]=Заявка за удостоверение S/MIME
+@@ -64,7 +65,6 @@
+ Comment[ven]=Khumbelo ya sethifikheithi tsha PKCS#12
+ Comment[wa]=Dimande d' acertinaedje S/MIME
+ Comment[xh]=S/MIME Isicelo Soqinisekiso
+-Comment[xx]=xxS/MIME Certification Requestxx
+ Comment[zh_CN]=S/MIME 认证请求
+ Comment[zh_TW]=S/MIME 認證請求
+ Comment[zu]=Isitifiketi Sesicelo se-S/MIME
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/pkcs7-mime.desktop kdelibs_3_4_BRANCH/mimetypes/application/pkcs7-mime.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/pkcs7-mime.desktop	2005-01-21 05:24:16.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/pkcs7-mime.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -64,7 +64,6 @@
+ Comment[uz]=PKCS#7 (S/MIME) форматланган маълумот
+ Comment[ven]=PKCS#7 (S/MIME) Data yo vhumbeaho
+ Comment[xh]=PKCS#7 (S/MIME) Data Efomatiweyo
+-Comment[xx]=xxPKCS#7 (S/MIME) Formatted Dataxx
+ Comment[zh_CN]=PKCS#7 (S/MIME) 格式化数据
+ Comment[zh_TW]=PKCS#7 (S/MIME) 格式資料
+ Comment[zu]=Idata Efakwe kwisakhelo ye-PKCS#7 (S/MIME) 
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/pkcs7-signature.desktop kdelibs_3_4_BRANCH/mimetypes/application/pkcs7-signature.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/pkcs7-signature.desktop	2005-01-29 04:58:14.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/pkcs7-signature.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -66,7 +66,6 @@
+ Comment[ven]=Tsaino yo tumanywaho ya S/MIME
+ Comment[wa]=Sinateure S/MIME distaetcheye
+ Comment[xh]=Utyikityo lwe S/MIME Esikiweyo
+-Comment[xx]=xxDetached S/MIME Signaturexx
+ Comment[zh_CN]=分离的 S/MIME 签名
+ Comment[zh_TW]=分離的 S/MIME 簽名
+ Comment[zu]=Uphawu lokusayina lwe-S/MIME Oluxebukile
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/postscript.desktop kdelibs_3_4_BRANCH/mimetypes/application/postscript.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/postscript.desktop	2005-01-21 05:24:16.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/postscript.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -75,7 +75,6 @@
+ Comment[vi]=Tài liệu PostScript 
+ Comment[wa]=Documint PostScript
+ Comment[xh]=Uxwebhu lwe PostScript
+-Comment[xx]=xxPostScript Documentxx
+ Comment[zh_CN]=PostScript 文档
+ Comment[zh_TW]=PostScript 文件
+ Comment[zu]=Uhlu lwamafayela lwe-PostScript
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/relaxng.desktop kdelibs_3_4_BRANCH/mimetypes/application/relaxng.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/relaxng.desktop	2005-02-23 06:04:54.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/relaxng.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -2,7 +2,6 @@
+ Encoding=UTF-8
+ Comment=RELAX NG
+ Comment[hi]=रीलेक्स एनजी
+-Comment[xx]=xxRELAX NGxx
+ Icon=html
+ Type=MimeType
+ MimeType=application/xml
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/sieve.desktop kdelibs_3_4_BRANCH/mimetypes/application/sieve.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/sieve.desktop	2005-02-21 10:17:21.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/sieve.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -4,6 +4,7 @@
+ MimeType=application/sieve
+ Patterns=*.sieve;*.siv
+ Comment=SIEVE Mail Filter Script
++Comment[af]=SIEVE Pos Filter Skrip
+ Comment[ar]=نص برمجي لمرشح بريد SIEVE
+ Comment[az]=SIEVE Poçt Filtr Skripti
+ Comment[bg]=Скрипт за филтриране на е-поща SIEVE
+@@ -62,7 +63,6 @@
+ Comment[uz]=SIEVE хатни филтерлаш скрипти
+ Comment[ven]=Tshikiputi tsha filithara ya meili ya SIEVE
+ Comment[xh]=Isihluzi Sombhalo oshicilwe phantsi Seposi se SIEVE
+-Comment[xx]=xxSIEVE Mail Filter Scriptxx
+ Comment[zh_CN]=SIEVE 邮件过滤脚本
+ Comment[zh_TW]=SIEVE 郵件過濾程式
+ Comment[zu]=Isikripti Sohluzo Lweposi le-SIEVE
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/smil.desktop kdelibs_3_4_BRANCH/mimetypes/application/smil.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/smil.desktop	2005-01-31 09:34:52.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/smil.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -61,7 +61,6 @@
+ Comment[ven]=Luambo lwo tangananaho lwa zwishumiswa zwa vhudavhidzani
+ Comment[vi]=Ngôn ngữ giải tích đa phương tiện đồng bềEhoá 
+ Comment[xh]=Ulwimi oluhamba ngendlela enye lodityaniso lwe Multimedia
+-Comment[xx]=xxSynchronized Multimedia Integration Languagexx
+ Comment[zh_CN]=同步多媒体集成语言
+ Comment[zh_TW]=同步多媒體整合式語言
+ Comment[zu]=Ukuqoqelwa ndawonye Kolimi Lwabasiki bebunda Abahambiswa ndawonye
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.mozilla.xul+xml.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.mozilla.xul+xml.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.mozilla.xul+xml.desktop	2005-02-23 06:04:54.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.mozilla.xul+xml.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -6,6 +6,7 @@
+ Icon=netscape_doc
+ Patterns=*.xul;*.XUL;
+ Comment=Mozilla XUL File
++Comment[af]=Mozilla XUL Lêer
+ Comment[be]=Файл Mozilla XUL
+ Comment[bg]=Файл XUL на Мозила
+ Comment[bn]=মোজিলা এক্স-ইউ-এল ফাইল
+@@ -44,12 +45,11 @@
+ Comment[sk]=Súbor Mozilla XUL
+ Comment[sl]=Datoteka Mozilla XUL
+ Comment[sr]=Mozilla XUL фајл
+-Comment[sr@Latn]=Mozilla XUL фајл
++Comment[sr@Latn]=Mozilla XUL fajl
+ Comment[sv]=Mozilla XUL-fil
+ Comment[ta]=மோசில்லா XUL ஆவணம்
+ Comment[tg]=Файли Mozilla XUL 
+ Comment[tr]=Mozilla XUL Dosyası
+ Comment[uk]=Файл Mozilla XUL
+ Comment[uz]=Mozilla XUL-файли
+-Comment[xx]=xxMozilla XUL Filexx
+ Comment[zh_CN]=Mozilla XUL 文件
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.ms-asf.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.ms-asf.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.ms-asf.desktop	2005-01-21 05:24:16.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.ms-asf.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -59,7 +59,6 @@
+ Comment[tr]=ASF dosyası
+ Comment[uk]=Носій ASF
+ Comment[uz]=ASF медиа-файли
+-Comment[xx]=xxASF Mediaxx
+ Comment[zh_CN]=ASF 媒体
+ Comment[zh_TW]=ASF 媒體
+ Comment[zu]=Abasiki bebunda be-ASF
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.ms-excel.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.ms-excel.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.ms-excel.desktop	2005-01-28 05:03:18.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.ms-excel.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -66,7 +66,6 @@
+ Comment[uz]=Microsoft Excel электрон жадвали
+ Comment[ven]=Bammbiri lo navhaho la microsoft Excel
+ Comment[wa]=Fitchî tåvleu Microsoft Excel
+-Comment[xx]=xxMicrosoft Excel Spreadsheetxx
+ Comment[zh_CN]=Microsoft Excel 电子表格
+ Comment[zh_TW]=微軟 Excel 表格
+ Comment[zu]= Ipheshana lesitayela le-Microsoft Excel
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.ms-word.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.ms-word.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.ms-word.desktop	2005-01-21 05:24:16.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.ms-word.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -67,7 +67,6 @@
+ Comment[ven]=Manwalwa a Microsoft Word
+ Comment[wa]=Documint Microsoft Word
+ Comment[xh]=Uxwebhhu LweMicrosoft Word
+-Comment[xx]=xxMicrosoft Word Documentxx
+ Comment[zh_CN]=Microsoft Word 文档
+ Comment[zh_TW]=微軟 Word 文件
+ Comment[zu]=Uhlu Lwamafayela lwe-Microsoft Word
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.oasis.opendocument.chart.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.oasis.opendocument.chart.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.oasis.opendocument.chart.desktop	2005-02-23 06:04:54.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.oasis.opendocument.chart.desktop	2005-03-12 18:58:50.000000000 +0100
+@@ -7,6 +7,7 @@
+ Comment=OASIS OpenDocument Chart
+ Comment[bg]=Диаграма на OASIS OpenDocument
+ Comment[bn]=OASIS ওপেন-ডকুমেন্ট চার্ট
++Comment[br]=Treser grafoù OpenDocument OASIS
+ Comment[ca]=Gràfic OASIS OpenDocument
+ Comment[cs]=OASIS OpenDocument graf
+ Comment[da]=OASIS OpenDocument diagram
+@@ -34,13 +35,12 @@
+ Comment[sk]=Graf OASIS OpenDocument
+ Comment[sl]=Graf OASIS OpenDocument
+ Comment[sr]=OASIS OpenDocument карта
+-Comment[sr@Latn]=OASIS OpenDocument карта
++Comment[sr@Latn]=OASIS OpenDocument karta
+ Comment[sv]=OASIS OpenDocument diagram
+ Comment[ta]=OASIS திறந்த ஆவண வரைபடம்
+ Comment[tg]=ХуҷҷатиКушод OASIS
+ Comment[tr]=OASIS OpenDocument Çizelgesi
+ Comment[uk]=Діаграма OASIS OpenDocument
+-Comment[xx]=xxOASIS OpenDocument Chartxx
+ Comment[zh_CN]=OASIS OpenDocument 图表
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.oasis.opendocument.formula.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.oasis.opendocument.formula.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.oasis.opendocument.formula.desktop	2005-02-23 06:04:54.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.oasis.opendocument.formula.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -36,13 +36,12 @@
+ Comment[sk]=Vzorec OASIS OpenDocument
+ Comment[sl]=Formula OASIS OpenDocument
+ Comment[sr]=OASIS OpenDocument формула
+-Comment[sr@Latn]=OASIS OpenDocument формула
++Comment[sr@Latn]=OASIS OpenDocument formula
+ Comment[sv]=OASIS OpenDocument formel
+ Comment[ta]=OASIS திறந்த ஆவண சமன்பாடு
+ Comment[tg]=Формулаи Хуҷҷати OASIS
+ Comment[tr]=OASIS OpenDocument Formülü
+ Comment[uk]=Формула OASIS OpenDocument
+-Comment[xx]=xxOASIS OpenDocument Formulaxx
+ Comment[zh_CN]=OASIS OpenDocument 公式
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop	2005-02-23 06:04:54.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -7,6 +7,7 @@
+ Comment=OASIS OpenDocument Graphics Template
+ Comment[bg]=Шаблон за графика на OASIS OpenDocument
+ Comment[bn]=OASIS ওপেন-ডকুমেন্ট গ্রাফিক্স টেমপ্লেট
++Comment[br]=Patrom skeudenn OpenOffice.org OASIS
+ Comment[ca]=Plantilla de gràfic OASIS OpenDocument
+ Comment[cs]=OASIS OpenDocument šablona obrázku
+ Comment[da]=OASIS OpenDocument grafikskabelon
+@@ -34,13 +35,12 @@
+ Comment[sk]=Šablóna grafiky OASIS OpenDocument
+ Comment[sl]=Predloga grafike OASIS OpenDocument
+ Comment[sr]=OASIS OpenDocument графички шаблон
+-Comment[sr@Latn]=OASIS OpenDocument графички шаблон
++Comment[sr@Latn]=OASIS OpenDocument grafički šablon
+ Comment[sv]=OASIS OpenDocument grafikmall
+ Comment[ta]=OASIS திறந்த ஆவண சித்திரங்கள் வார்ப்புரு
+ Comment[tg]=Санади Ҳуҷҷати OASIS 
+ Comment[tr]=OASIS OpenDocument Grafik Şablonu
+ Comment[uk]=Шаблон графічного зображення OASIS OpenDocument
+-Comment[xx]=xxOASIS OpenDocument Graphics Templatexx
+ Comment[zh_CN]=OASIS OpenDocument 图形模板
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.oasis.opendocument.graphics.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.oasis.opendocument.graphics.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.oasis.opendocument.graphics.desktop	2005-02-23 06:04:54.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.oasis.opendocument.graphics.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -7,6 +7,7 @@
+ Comment=OASIS OpenDocument Graphics
+ Comment[bg]=Графика на OASIS OpenDocument
+ Comment[bn]=OASIS ওপেন-ডকুমেন্ট গ্রাফিক্স
++Comment[br]=Skeudenn OpenOffice.org OASIS
+ Comment[ca]=Gràfic OASIS OpenDocument
+ Comment[cs]=OASIS OpenDocument kresba
+ Comment[da]=OASIS OpenDocument-grafik
+@@ -34,13 +35,12 @@
+ Comment[sk]=Grafika OASIS OpenDocument
+ Comment[sl]=Grafika OASIS OpenDocument
+ Comment[sr]=OASIS OpenDocument графика
+-Comment[sr@Latn]=OASIS OpenDocument графика
++Comment[sr@Latn]=OASIS OpenDocument grafika
+ Comment[sv]=OASIS OpenDocument grafik
+ Comment[ta]=OASIS திறந்த ஆவண சித்திரங்கள்
+ Comment[tg]=Хуҷҷати графикии OASIS
+ Comment[tr]=OASIS OpenDocument Grafik
+ Comment[uk]=Графічне зображення OASIS OpenDocument
+-Comment[xx]=xxOASIS OpenDocument Graphicsxx
+ Comment[zh_CN]=OASIS OpenDocument 图形
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.oasis.opendocument.image.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.oasis.opendocument.image.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.oasis.opendocument.image.desktop	2005-02-23 06:04:54.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.oasis.opendocument.image.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -35,13 +35,12 @@
+ Comment[sk]=Obrázok OASIS OpenDocument
+ Comment[sl]=Slika OASIS OpenDocument
+ Comment[sr]=OASIS OpenDocument слика
+-Comment[sr@Latn]=OASIS OpenDocument слика
++Comment[sr@Latn]=OASIS OpenDocument slika
+ Comment[sv]=OASIS OpenDocument bild
+ Comment[ta]=OASIS திறந்த ஆவண பிம்பம்
+ Comment[tg]=Хуҷҷати тасвирии OASIS
+ Comment[tr]=OASIS OpenDocument Resim
+ Comment[uk]=Зображення OASIS OpenDocument
+-Comment[xx]=xxOASIS OpenDocument Imagexx
+ Comment[zh_CN]=OASIS OpenDocument 图像
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.oasis.opendocument.presentation-template.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.oasis.opendocument.presentation-template.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.oasis.opendocument.presentation-template.desktop	2005-02-23 06:04:54.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.oasis.opendocument.presentation-template.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -34,13 +34,12 @@
+ Comment[sk]=Šablóna prezentácie OASIS OpenDocument
+ Comment[sl]=Predloga predstavitve OASIS OpenDocument
+ Comment[sr]=OASIS OpenDocument шаблон презентације
+-Comment[sr@Latn]=OASIS OpenDocument шаблон презентације
++Comment[sr@Latn]=OASIS OpenDocument šablon prezentacije
+ Comment[sv]=OASIS OpenDocument presentationsmall
+ Comment[ta]=OASIS திறந்த ஆவண முன்வைப்பு வார்ப்புரு
+ Comment[tg]=Ҳуҷҷати Тақдимоти OASIS
+ Comment[tr]=OASIS OpenDocument Sunum Şablonu
+ Comment[uk]=Шаблон презентації OASIS OpenDocument
+-Comment[xx]=xxOASIS OpenDocument Presentation Templatexx
+ Comment[zh_CN]=OASIS OpenDocument 演示文稿模板
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.oasis.opendocument.presentation.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.oasis.opendocument.presentation.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.oasis.opendocument.presentation.desktop	2005-02-23 06:04:54.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.oasis.opendocument.presentation.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -34,13 +34,12 @@
+ Comment[sk]=Prezentácia OASIS OpenDocument
+ Comment[sl]=Predstavitev OASIS OpenDocument
+ Comment[sr]=OASIS OpenDocument презентација
+-Comment[sr@Latn]=OASIS OpenDocument презентација
++Comment[sr@Latn]=OASIS OpenDocument prezentacija
+ Comment[sv]=OASIS OpenDocument presentation
+ Comment[ta]=OASIS திறந்த ஆவண முன்வைப்பு
+ Comment[tg]=Ҳуҷҷати Тақдимоти OASIS
+ Comment[tr]=OASIS OpenDocument Sunum
+ Comment[uk]=Презентація OASIS OpenDocument
+-Comment[xx]=xxOASIS OpenDocument Presentationxx
+ Comment[zh_CN]=OASIS OpenDocument 演示文稿
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.oasis.opendocument.spreadsheet-template.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.oasis.opendocument.spreadsheet-template.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.oasis.opendocument.spreadsheet-template.desktop	2005-02-23 06:04:54.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.oasis.opendocument.spreadsheet-template.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -7,6 +7,7 @@
+ Comment=OASIS OpenDocument SpreadSheet Template
+ Comment[bg]=Шаблон за електронна таблица на OASIS OpenDocument
+ Comment[bn]=OASIS ওপেন-ডকুমেন্ট স্প্রেডশিট টেম্‌প্লেট
++Comment[br]=Patrom loger OpenOffice.org OASIS
+ Comment[ca]=Plantilla de full de càlcul OASIS OpenDocument
+ Comment[cs]=OASIS OpenDocument šablona tabulky
+ Comment[da]=OASIS OpenDocument regnearkskabelon
+@@ -34,13 +35,12 @@
+ Comment[sk]=Šablóna tabuľky OASIS OpenDocument
+ Comment[sl]=Predloga preglednice OASIS OpenDocument
+ Comment[sr]=OASIS OpenDocument шаблон табеле
+-Comment[sr@Latn]=OASIS OpenDocument шаблон табеле
++Comment[sr@Latn]=OASIS OpenDocument šablon tabele
+ Comment[sv]=OASIS OpenDocument kalkylarksmall
+ Comment[ta]=OASIS திறந்த ஆவண விரிதாள் வார்ப்புரு
+ Comment[tg]=Ҷадвали электронии OASIS
+ Comment[tr]=OASIS OpenDocument Hesap Tablosu Şablonu
+ Comment[uk]=Шаблон електронної таблиці OASIS OpenDocument
+-Comment[xx]=xxOASIS OpenDocument SpreadSheet Templatexx
+ Comment[zh_CN]=OASIS OpenDocument 电子表格模板
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.oasis.opendocument.spreadsheet.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.oasis.opendocument.spreadsheet.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.oasis.opendocument.spreadsheet.desktop	2005-02-23 06:04:54.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.oasis.opendocument.spreadsheet.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -7,6 +7,7 @@
+ Comment=OASIS OpenDocument SpreadSheet
+ Comment[bg]=Електронна таблица на OASIS OpenDocument
+ Comment[bn]=OASIS ওপেন-ডকুমেন্ট স্প্রেডশিট
++Comment[br]=Loger OpenOffice.org OASIS
+ Comment[ca]=Full de càlcul OASIS OpenDocument
+ Comment[cs]=OASIS OpenDocument tabulka
+ Comment[da]=OASIS OpenDocument regneark
+@@ -34,13 +35,12 @@
+ Comment[sk]=Tabuľka OASIS OpenDocument
+ Comment[sl]=Preglednica OASIS OpenDocument
+ Comment[sr]=OASIS OpenDocument табела
+-Comment[sr@Latn]=OASIS OpenDocument табела
++Comment[sr@Latn]=OASIS OpenDocument tabela
+ Comment[sv]=OASIS OpenDocument kalkylark
+ Comment[ta]=OASIS திறந்த ஆவண விரிதாள்
+ Comment[tg]=Ҷадвали Электронии OASIS 
+ Comment[tr]=OASIS OpenDocument Hesap Tablosu
+ Comment[uk]=Електронна таблиця OASIS OpenDocument
+-Comment[xx]=xxOASIS OpenDocument SpreadSheetxx
+ Comment[zh_CN]=OASIS OpenDocument 电子表格
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.oasis.opendocument.text-template.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.oasis.opendocument.text-template.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.oasis.opendocument.text-template.desktop	2005-02-23 06:04:54.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.oasis.opendocument.text-template.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -7,6 +7,7 @@
+ Comment=OASIS OpenDocument Text Template
+ Comment[bg]=Шаблон за текстов документ на OASIS OpenDocument
+ Comment[bn]=OASIS ওপেন-ডকুমেন্ট টেক্সট নথী টেম্‌প্লেট
++Comment[br]=Patrom skrid OpenOffice.org OASIS
+ Comment[ca]=Plantilla de text OASIS OpenDocument
+ Comment[cs]=OASIS OpenDocument šablona textu
+ Comment[da]=OASIS OpenDocument tekstskabelon
+@@ -34,13 +35,12 @@
+ Comment[sk]=Šablóna textového dokumentu OASIS OpenDocument
+ Comment[sl]=Predloga besedilnega dokumenta OASIS OpenDocument
+ Comment[sr]=OASIS OpenDocument шаблон текста
+-Comment[sr@Latn]=OASIS OpenDocument шаблон текста
++Comment[sr@Latn]=OASIS OpenDocument šablon teksta
+ Comment[sv]=OASIS OpenDocument textmall
+ Comment[ta]=OASIS திறந்த ஆவண உரை வார்ப்புரு
+ Comment[tg]=Ҳуҷҷати Матнии OASIS
+ Comment[tr]=OASIS OpenDocument Metin Şablonu
+ Comment[uk]=Шаблон текстового документу OASIS OpenDocument
+-Comment[xx]=xxOASIS OpenDocument Text Templatexx
+ Comment[zh_CN]=OASIS OpenDocument 文本文档模板
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.oasis.opendocument.text.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.oasis.opendocument.text.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.oasis.opendocument.text.desktop	2005-02-23 06:04:54.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.oasis.opendocument.text.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -34,13 +34,12 @@
+ Comment[sk]=Textový dokument OASIS OpenDocument
+ Comment[sl]=Dokument OASIS OpenDocument
+ Comment[sr]=OASIS OpenDocument текст
+-Comment[sr@Latn]=OASIS OpenDocument текст
++Comment[sr@Latn]=OASIS OpenDocument tekst
+ Comment[sv]=OASIS OpenDocument text
+ Comment[ta]=OASIS திறந்த ஆவண உரை
+ Comment[tg]=Хуҷҷати Матнии OASIS
+ Comment[tr]=OASIS OpenDocument Metin
+ Comment[uk]=Текстовий документ OASIS OpenDocument
+-Comment[xx]=xxOASIS OpenDocument Textxx
+ Comment[zh_CN]=OASIS OpenDocument 文本
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.palm.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.palm.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.palm.desktop	2005-01-21 05:24:16.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.palm.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -4,6 +4,7 @@
+ Icon=wordprocessing
+ Patterns=*.pdb;*.PDB;*.prc;*.PRC;
+ Comment=Palm Document
++Comment[af]=Palm Dokument
+ Comment[ar]=مستند Palm
+ Comment[az]=Palm Sənədi
+ Comment[be]=Дакумэнт Palm
+@@ -63,6 +64,5 @@
+ Comment[uk]=Документ Palm
+ Comment[uz]=Palm ҳужжати
+ Comment[wa]=Documint Palm
+-Comment[xx]=xxPalm Documentxx
+ Comment[zh_CN]=Palm 文档
+ Comment[zh_TW]=Palm 文件
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.rn-realmedia.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.rn-realmedia.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.rn-realmedia.desktop	2005-01-06 04:45:44.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.rn-realmedia.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=video
+ Patterns=*.rm;*.RM;
+ Comment=RealMedia File
++Comment[af]=RealMedia Lêer
+ Comment[ar]=وسيط RealMedia
+ Comment[az]=RealMedia Faylı
+ Comment[be]=Файл RealMedia
+@@ -64,6 +65,5 @@
+ Comment[uk]=Файл RealMedia
+ Comment[uz]=RealMedia-файли
+ Comment[wa]=Fitchî RealMedia
+-Comment[xx]=xxRealMedia Filexx
+ Comment[zh_CN]=RealMedia 文件
+ Comment[zh_TW]=RealMedia 檔案
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.stardivision.calc.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.stardivision.calc.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.stardivision.calc.desktop	2005-02-02 06:14:06.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.stardivision.calc.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -5,6 +5,7 @@
+ Patterns=*.sdc;*.SDC;
+ Icon=spreadsheet
+ Comment=StarOffice Calc Spreadsheet
++Comment[af]=StarOffice Calc Spreiblad
+ Comment[ar]=مستند StarOffice Calc
+ Comment[az]=StarOffice Calc Sənədi
+ Comment[be]=Электронная табліца StarOffice Calc
+@@ -63,7 +64,6 @@
+ Comment[uk]=Електронна таблиця StarOffice Calc
+ Comment[uz]=StarOffice Calc электрон жадвали
+ Comment[ven]=U phadaladza ha bammbiri la Calc ya StarOffice
+-Comment[xx]=xxStarOffice Calc Spreadsheetxx
+ Comment[zh_CN]=StarOffice Calc 电子表格
+ Comment[zh_TW]=StarOffice Calc 電子表格
+ [Property::X-KDE-NativeExtension]
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.stardivision.chart.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.stardivision.chart.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.stardivision.chart.desktop	2005-02-23 06:04:54.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.stardivision.chart.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -5,8 +5,10 @@
+ Patterns=*.sds;*.SDS;
+ Icon=kchart_chrt
+ Comment=StarOffice Chart
++Comment[af]=StarOffice Kaart
+ Comment[bg]=Документ на StarOffice Chart
+ Comment[bn]=স্টার-অফিস চার্ট
++Comment[br]=Treser grafoù StarOffice
+ Comment[bs]=StarOffice grafikon
+ Comment[ca]=Gràfic de StarOffice
+ Comment[cs]=Graf aplikace StarOffice
+@@ -41,12 +43,11 @@
+ Comment[sk]=Graf StarOffice
+ Comment[sl]=Preglednica StarOffice
+ Comment[sr]=StarOffice-ов графикон
+-Comment[sr@Latn]=StarOffice-ов графикон
++Comment[sr@Latn]=StarOffice-ov grafikon
+ Comment[sv]=StarOffice diagram
+ Comment[ta]=ஸ்டார்ஆபீஸ் வரைபடம்
+ Comment[tr]=StarOffice Hesap Tablosu
+ Comment[uk]=Діаграма StarOffice
+-Comment[xx]=xxStarOffice Chartxx
+ Comment[zh_CN]=StarOffice 图表
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.stardivision.draw.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.stardivision.draw.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.stardivision.draw.desktop	2005-02-23 06:04:55.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.stardivision.draw.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -5,6 +5,7 @@
+ Patterns=*.sda;*.SDA;
+ Icon=image
+ Comment=StarOffice Drawing
++Comment[af]=StarOffice Tekening
+ Comment[be]=Малюнак StarOffice
+ Comment[bg]=Изображение на StarOffice Drawing
+ Comment[bn]=স্টার-অফিস ড্রয়িং
+@@ -44,14 +45,13 @@
+ Comment[sk]=Kresba StarOffice
+ Comment[sl]=Risanje StarOffice
+ Comment[sr]=StarOffice-ов цртеж
+-Comment[sr@Latn]=StarOffice-ов цртеж
++Comment[sr@Latn]=StarOffice-ov crtež
+ Comment[sv]=StarOffice teckning
+ Comment[ta]=மைக்ரோசாப்ட் ஆபிஸ் சித்திரம்
+ Comment[tg]=Расмкашӣ Microsoft Office
+ Comment[tr]=StarOffice Çizimi
+ Comment[uk]=Малюнок StarOffice
+ Comment[uz]=StarOffice чизмаси
+-Comment[xx]=xxStarOffice Drawingxx
+ Comment[zh_CN]=StarOffice 绘图
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.stardivision.impress.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.stardivision.impress.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.stardivision.impress.desktop	2005-02-02 06:14:06.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.stardivision.impress.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -5,6 +5,7 @@
+ Patterns=*.sdd;*.SDD;
+ Icon=presentation
+ Comment=StarOffice Impress Presentation
++Comment[af]=StarOffice Impress Voorlegging
+ Comment[ar]=عرض StarOffice Impress
+ Comment[az]=StarOffice Impress Sənədi
+ Comment[be]=Прэзэнтацыя StarOffice Impress
+@@ -60,7 +61,6 @@
+ Comment[uk]=Презентація StarOffice Impress
+ Comment[uz]=StarOffice Impress намойиши
+ Comment[xh]=Umboniso Wokuphawula we StarOffice
+-Comment[xx]=xxStarOffice Impress Presentationxx
+ Comment[zh_CN]=StarOffice Impress 演示文稿
+ Comment[zh_TW]=StarOffice Impress 簡報
+ Comment[zu]=Ukunikezwa kwe-StarOffice Impress
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.stardivision.math.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.stardivision.math.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.stardivision.math.desktop	2005-02-23 06:04:55.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.stardivision.math.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -5,6 +5,7 @@
+ Patterns=*.sdf;*.SDF;
+ Icon=kformula_kfo
+ Comment=StarOffice Math Document
++Comment[af]=StarOffice Wiskunde Dokument
+ Comment[be]=Дакумэнт StarOffice Math
+ Comment[bg]=Документ на StarOffice Math
+ Comment[bn]=স্টার-অফিস ম্যাথ নথী
+@@ -45,14 +46,13 @@
+ Comment[sk]=Dokument StarOffice Math
+ Comment[sl]=Dokument StarOffice Math
+ Comment[sr]=StarOffice-ов математички документ
+-Comment[sr@Latn]=StarOffice-ов математички документ
++Comment[sr@Latn]=StarOffice-ov matematički dokument
+ Comment[sv]=StarOffice matematikdokument
+ Comment[ta]=ஸ்டார்ஆபீஸ் ரைட்டர் ஆவணம்
+ Comment[tg]=Санади математикии StarOffice
+ Comment[tr]=StarOffice Math Belgesi
+ Comment[uk]=Документ StarOffice Math
+ Comment[uz]=StarOffice Math ҳужжати
+-Comment[xx]=xxStarOffice Math Documentxx
+ Comment[zh_CN]=StarOffice Math 文档
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.stardivision.writer-global.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.stardivision.writer-global.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.stardivision.writer-global.desktop	2005-02-23 06:04:55.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.stardivision.writer-global.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -5,6 +5,7 @@
+ Patterns=*.sgl;*.SGL;
+ Icon=wordprocessing
+ Comment=StarOffice Writer Master Document
++Comment[af]=StarOffice Writer Meester Dokument
+ Comment[bg]=Главен документ на StarOffice Writer
+ Comment[bn]=স্টার-অফিস রাইটার মাস্টার নথী
+ Comment[bs]=StarOffice Writer glavni dokument
+@@ -44,14 +45,13 @@
+ Comment[sk]=Hlavný dokument StarOffice Writer
+ Comment[sl]=Glavni dokument StarOffice Writer
+ Comment[sr]=StarOffice Writer-ов главни документ
+-Comment[sr@Latn]=StarOffice Writer-ов главни документ
++Comment[sr@Latn]=StarOffice Writer-ov glavni dokument
+ Comment[sv]=StarOffice Writer-huvuddokument
+ Comment[ta]=ஸ்டார்ஆபீஸ் ரைட்டர் மூல ஆவணம்
+ Comment[tg]=Санади устоди нависаи StarOffice
+ Comment[tr]=StarOffice Writer Ana Belgesi
+ Comment[uk]=Головний документ StarOffice Writer
+ Comment[uz]=StarOffice Writer бош ҳужжати
+-Comment[xx]=xxStarOffice Writer Master Documentxx
+ Comment[zh_CN]=StarOffice Writer 主文档
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.stardivision.writer.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.stardivision.writer.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.stardivision.writer.desktop	2005-02-02 06:14:06.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.stardivision.writer.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -5,6 +5,7 @@
+ Patterns=*.sdw;*.SDW;
+ Icon=wordprocessing
+ Comment=StarOffice Writer Document
++Comment[af]=StarOffice Writer Dokument
+ Comment[ar]=مستند StarOffice Writer
+ Comment[az]=StarOffice Writer Sənədi
+ Comment[be]=Дакумэнт StarOffice Writer
+@@ -65,7 +66,6 @@
+ Comment[uz]=StarOffice Writer ҳужжати
+ Comment[ven]=Manwalwa a munwali wa StarOffice
+ Comment[xh]=Umbhali Woxwebhhu lwe StarOffice
+-Comment[xx]=xxStarOffice Writer Documentxx
+ Comment[zh_CN]=StarOffice Writer 文档
+ Comment[zh_TW]=StarOffice Writer 文件
+ Comment[zu]=Umbhali Wohlu lwamafayela e-StarOffice
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.sun.xml.calc.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.sun.xml.calc.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.sun.xml.calc.desktop	2005-02-02 06:14:06.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.sun.xml.calc.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=OpenOffice.org Spreadsheet
++Comment[af]=OpenOffice.org Spreiblad
+ Comment[ar]=مستند OpenOffice.org Spreasheet
+ Comment[az]=OpenOffice.org Hesab Cədvəli
+ Comment[be]=Электронная табліца OpenOffice.org
+@@ -57,7 +58,6 @@
+ Comment[uk]=Електронна таблиця OpenOffice.org
+ Comment[uz]=OpenOffice.org электрон жадвали
+ Comment[wa]=Foye di tåvleu OpenOffice.org
+-Comment[xx]=xxOpenOffice.org Spreadsheetxx
+ Comment[zh_CN]=OpenOffice.org 电子表格
+ Comment[zh_TW]=OpenOffice.org 試算表
+ Icon=spreadsheet
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.sun.xml.calc.template.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.sun.xml.calc.template.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.sun.xml.calc.template.desktop	2005-02-23 06:04:55.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.sun.xml.calc.template.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -1,9 +1,11 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=OpenOffice.org Spreadsheet Template
++Comment[af]=OpenOffice.org Spreiblad Voorbeeld
+ Comment[be]=Шаблён электроннай табліцы OpenOffice.org
+ Comment[bg]=Шаблон на OpenOffice.org Spreadsheet
+ Comment[bn]=ওপেন-অফিস.অর্গ স্প্রেডশিট টেম্‌প্লেট
++Comment[br]=Patrom loger OpenOffice.org
+ Comment[bs]=OpenOffice.org šablon za proračunsku tablicu
+ Comment[ca]=Plantilla de full de càlcul d'OpenOffice.org
+ Comment[cs]=Šablona tabulky aplikace OpenOffice.org
+@@ -41,14 +43,13 @@
+ Comment[sk]=Šablóna tabuľky OpenOffice.org
+ Comment[sl]=Predloga preglednice OpenOffice.org
+ Comment[sr]=OpenOffice.org-ов шаблон табеле
+-Comment[sr@Latn]=OpenOffice.org-ов шаблон табеле
++Comment[sr@Latn]=OpenOffice.org-ov šablon tabele
+ Comment[sv]=OpenOffice.org kalkylarksmall
+ Comment[ta]=ழ-ஓப்பன்ஆபீஸ் விரிதாள்
+ Comment[tg]=Ҷадвали OpenOffice.org
+ Comment[tr]=OpenOffice.org Hesap Şablonu
+ Comment[uk]=Шаблон електронної таблиці OpenOffice.org
+ Comment[uz]=OpenOffice.org электрон жадвал намунаси
+-Comment[xx]=xxOpenOffice.org Spreadsheet Templatexx
+ Comment[zh_CN]=OpenOffice.org 电子表格模板
+ Icon=spreadsheet
+ Type=MimeType
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.sun.xml.draw.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.sun.xml.draw.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.sun.xml.draw.desktop	2005-02-02 06:14:06.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.sun.xml.draw.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -1,11 +1,13 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=OpenOffice.org Drawing
++Comment[af]=OpenOffice.org Tekening
+ Comment[ar]=مستند OpenOffice.org Drawing
+ Comment[az]=OpenOffice.org Rəsmi
+ Comment[be]=Малюнак OpenOffice.org
+ Comment[bg]=Изображение на OpenOffice.org Drawing
+ Comment[bn]=ওপেন-অফিস.অর্গ ড্রয়িং
++Comment[br]=Tresaner OpenOffice.org
+ Comment[bs]=OpenOffice.org crtež
+ Comment[ca]=Dibuix d'OpenOffice.org
+ Comment[cs]=Kresba OpenOffice.org
+@@ -55,7 +57,6 @@
+ Comment[uk]=Малюнок OpenOffice.org
+ Comment[uz]=OpenOffice.org чизма
+ Comment[wa]=Documint di dessinaedje OpenOffice.org
+-Comment[xx]=xxOpenOffice.org Drawingxx
+ Comment[zh_CN]=OpenOffice.org 绘图
+ Comment[zh_TW]=StarOffice.org 繪圖
+ MimeType=application/vnd.sun.xml.draw
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.sun.xml.draw.template.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.sun.xml.draw.template.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.sun.xml.draw.template.desktop	2005-02-23 06:04:55.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.sun.xml.draw.template.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -1,9 +1,11 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=OpenOffice.org Drawing Template
++Comment[af]=OpenOffice.org Tekening Voorbeeld
+ Comment[be]=Шаблён малюнку OpenOffice.org
+ Comment[bg]=Шаблон на OpenOffice.org Drawing
+ Comment[bn]=ওপেন-অফিস.অর্গ ড্রয়িং টেম্‌প্লেট
++Comment[br]=Patrom tresaner OpenOffice.org
+ Comment[bs]=OpenOffice.org šablon za crtež
+ Comment[ca]=Plantilla de dibuix d'OpenOffice.org
+ Comment[cs]=Šablona kresby aplikace OpenOffice.org
+@@ -41,14 +43,13 @@
+ Comment[sk]=Šablóna kresby OpenOffice.org
+ Comment[sl]=Predloga risanja OpenOffice.org
+ Comment[sr]=OpenOffice.org-ов шаблон цртежа
+-Comment[sr@Latn]=OpenOffice.org-ов шаблон цртежа
++Comment[sr@Latn]=OpenOffice.org-ov šablon crteža
+ Comment[sv]=OpenOffice.org teckningsmall
+ Comment[ta]=ழ-ஓப்பன்ஆபீஸ் வரைபடம்
+ Comment[tg]=Нақши OpenOffice.org
+ Comment[tr]=OpenOffice.org Çizim Şablonu
+ Comment[uk]=Шаблон малюнка OpenOffice.org
+ Comment[uz]=OpenOffice.org чизма намунаси
+-Comment[xx]=xxOpenOffice.org Drawing Templatexx
+ Comment[zh_CN]=OpenOffice.org 绘图模板
+ MimeType=application/vnd.sun.xml.draw.template
+ Type=MimeType
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.sun.xml.impress.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.sun.xml.impress.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.sun.xml.impress.desktop	2005-02-02 06:14:06.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.sun.xml.impress.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=OpenOffice.org Presentation
++Comment[af]=OpenOffice.org Voorlegging
+ Comment[ar]=مستند OpenOffice.org Presentation
+ Comment[az]=OpenOffice.org Təqdimatı
+ Comment[be]=Прэзэнтацыя OpenOffice.org
+@@ -56,7 +57,6 @@
+ Comment[uk]=Презентація OpenOffice.org
+ Comment[uz]=OpenOffice.org Намойиш
+ Comment[wa]=Documint di prezintaedje OpenOffice.org
+-Comment[xx]=xxOpenOffice.org Presentationxx
+ Comment[zh_CN]=OpenOffice.org 演示文稿
+ MimeType=application/vnd.sun.xml.impress
+ Type=MimeType
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.sun.xml.impress.template.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.sun.xml.impress.template.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.sun.xml.impress.template.desktop	2005-02-23 06:04:55.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.sun.xml.impress.template.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=OpenOffice.org Presentation Template
++Comment[af]=OpenOffice.org Voorlegging 
+ Comment[be]=Шаблён прэзэнтацыі OpenOffice.org
+ Comment[bg]=Шаблон на OpenOffice.org Presentation
+ Comment[bn]=ওপেন-অফিস.অর্গ প্রেসেন্টেশন টেম্‌প্লেট
+@@ -41,14 +42,13 @@
+ Comment[sk]=Šablóna prezentácie OpenOffice.org
+ Comment[sl]=Predloga predstavitve OpenOffice.org
+ Comment[sr]=OpenOffice.org-ов шаблон презентације
+-Comment[sr@Latn]=OpenOffice.org-ов шаблон презентације
++Comment[sr@Latn]=OpenOffice.org-ov šablon prezentacije
+ Comment[sv]=OpenOffice.org presentationsmall
+ Comment[ta]=ழ-ஓப்பன்ஆபீஸ் அளிக்கை
+ Comment[tg]=Тақдимоти OpenOffice.org
+ Comment[tr]=OpenOffice.org Sunum Şablonu
+ Comment[uk]=Шаблон презентації OpenOffice.org
+ Comment[uz]=OpenOffice.org намойиш намунаси
+-Comment[xx]=xxOpenOffice.org Presentation Templatexx
+ Comment[zh_CN]=OpenOffice.org 演示文稿模板
+ MimeType=application/vnd.sun.xml.impress.template
+ Type=MimeType
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.sun.xml.writer.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.sun.xml.writer.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.sun.xml.writer.desktop	2005-02-02 06:14:06.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.sun.xml.writer.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=OpenOffice.org Text Document
++Comment[af]=OpenOffice.org Teks Dokument
+ Comment[ar]=مستند نصَي OpenOffice.org 
+ Comment[az]=OpenOffice.org Mətn Sənədi
+ Comment[be]=Тэкставы дакумэнт OpenOffice.org
+@@ -59,7 +60,6 @@
+ Comment[uk]=Текстовий документ OpenOffice.org
+ Comment[uz]=OpenOffice.org матн ҳужжати
+ Comment[wa]=Documint tecse OpenOffice.org
+-Comment[xx]=xxOpenOffice.org Text Documentxx
+ Comment[zh_CN]=OpenOffice.org 文本文档
+ Comment[zh_TW]=OpenOffice.org Text 文件
+ MimeType=application/vnd.sun.xml.writer
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.sun.xml.writer.master.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.sun.xml.writer.master.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.sun.xml.writer.master.desktop	2005-02-23 06:04:55.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.sun.xml.writer.master.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=OpenOffice.org Master Text Document
++Comment[af]=OpenOffice.org Meester Teks Dokument
+ Comment[bg]=Главен документ на OpenOffice.org Writer
+ Comment[bn]=ওপেন-অফিস.অর্গ মাস্টার টেক্সট নথী
+ Comment[bs]=OpenOffice.org glavni tekst dokument
+@@ -39,14 +40,13 @@
+ Comment[sk]=Hlavný textový dokument OpenOffice.org
+ Comment[sl]=Glavni besedilni dokument OpenOffice.org
+ Comment[sr]=OpenOffice.org-ов главни текстуални документ
+-Comment[sr@Latn]=OpenOffice.org-ов главни текстуални документ
++Comment[sr@Latn]=OpenOffice.org-ov glavni tekstualni dokument
+ Comment[sv]=OpenOffice.org huvudtextdokument
+ Comment[ta]=OpenOffice.org ஆசிரியர் உரை ஆவணம்
+ Comment[tg]=Устоди санади OpenOffice.org
+ Comment[tr]=OpenOffice.org Ana Metin Belgesi
+ Comment[uk]=Головний текстовий документ OpenOffice.org
+ Comment[uz]=OpenOffice.org бош матн ҳужжати
+-Comment[xx]=xxOpenOffice.org Master Text Documentxx
+ Comment[zh_CN]=OpenOffice.org 主文本文档
+ MimeType=application/vnd.sun.xml.writer.master
+ Type=MimeType
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.sun.xml.writer.template.desktop kdelibs_3_4_BRANCH/mimetypes/application/vnd.sun.xml.writer.template.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/vnd.sun.xml.writer.template.desktop	2005-02-23 06:04:55.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/vnd.sun.xml.writer.template.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -1,9 +1,11 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=OpenOffice.org Text Document Template
++Comment[af]=OpenOffice.org Teks Dokument Voorbeeld
+ Comment[be]=Шаблён тэкставы дакумэнт OpenOffice.org
+ Comment[bg]=Шаблон на OpenOffice.org Text Document
+ Comment[bn]=ওপেন-অফিস.অর্গ টেক্সট নথী টেম্‌প্লেট
++Comment[br]=Patrom teul skrid OpenOffice.org
+ Comment[bs]=OpenOffice.org šablon za tekst dokument
+ Comment[ca]=Plantilla de document de text d'OpenOffice.org
+ Comment[cs]=Šablona textového dokumentu aplikace OpenOffice.org
+@@ -41,14 +43,13 @@
+ Comment[sk]=Šablóna textového dokumentu OpenOffice.org
+ Comment[sl]=Predloga besedilnega dokumenta OpenOffice.org
+ Comment[sr]=OpenOffice.org-ов шаблон текстуалног документа
+-Comment[sr@Latn]=OpenOffice.org-ов шаблон текстуалног документа
++Comment[sr@Latn]=OpenOffice.org-ov šablon tekstualnog dokumenta
+ Comment[sv]=OpenOffice.org textdokumentmall
+ Comment[ta]=ழ-ஓப்பன்ஆபீஸ் உரை ஆவணம்
+ Comment[tg]=Санади OpenOffice.org
+ Comment[tr]=OpenOffice.org Metin Belgesi Şablonu
+ Comment[uk]=Шаблон текстового документу OpenOffice.org
+ Comment[uz]=OpenOffice.org матн ҳужжати намунаси
+-Comment[xx]=xxOpenOffice.org Text Document Templatexx
+ Comment[zh_CN]=OpenOffice.org 文本文档模板
+ MimeType=application/vnd.sun.xml.writer.template
+ Type=MimeType
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/wordperfect.desktop kdelibs_3_4_BRANCH/mimetypes/application/wordperfect.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/wordperfect.desktop	2005-01-21 05:24:16.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/wordperfect.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -5,7 +5,7 @@
+ Icon=wordprocessing
+ Patterns=*.wpd;*.WPD;
+ Comment=WordPerfect Document
+-Comment[af]=Wordperfect Dokument
++Comment[af]=WordPerfect Dokument
+ Comment[ar]=مستند Word Perfect
+ Comment[az]=WordPerfect Sənədi
+ Comment[be]=Дакумэнт WordPerfect
+@@ -70,7 +70,6 @@
+ Comment[ven]=Manwalwa a fhungo vhukuma
+ Comment[wa]=Documint WordPerfect
+ Comment[xh]=Uxwebhu lwe WordPerfect
+-Comment[xx]=xxWordPerfect Documentxx
+ Comment[zh_CN]=WordPerfect 文档
+ Comment[zh_TW]=WordPerfect 文件
+ Comment[zu]=Uhlu lwmafayela lwe-S/MIME
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-7z.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-7z.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-7z.desktop	2005-02-23 06:04:55.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-7z.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -37,11 +37,10 @@
+ Comment[sk]=7-Zip archív
+ Comment[sl]=Arhiv 7-Zip
+ Comment[sr]=7-Zip архива
+-Comment[sr@Latn]=7-Zip архива
++Comment[sr@Latn]=7-Zip arhiva
+ Comment[sv]=7-zip-arkiv
+ Comment[ta]=7-Zip பின்காப்பு
+ Comment[tg]=Архиви 7-Zip
+ Comment[tr]=7-Zip Arşivi
+ Comment[uk]=Архів 7-Zip
+-Comment[xx]=xx7-Zip Archivexx
+ Comment[zh_CN]=7-Zip 归档
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-abiword.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-abiword.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-abiword.desktop	2005-02-12 15:20:41.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-abiword.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -3,7 +3,7 @@
+ Type=MimeType
+ MimeType=application/x-abiword
+ Comment=AbiWord Document
+-Comment[af]=Abiword Dokument
++Comment[af]=AbiWord Dokument
+ Comment[ar]=مستند AbiWord
+ Comment[az]=AbiWord Sənədi
+ Comment[be]=Дакумэнт AbiWord
+@@ -71,7 +71,6 @@
+ Comment[vi]=Tài liệu AbiWord 
+ Comment[wa]=Documint Abiword
+ Comment[xh]=Uxwebhu lwe AbiWord
+-Comment[xx]=xxAbiWord Documentxx
+ Comment[zh_CN]=AbiWord 文档
+ Comment[zh_TW]=AbiWord 文件
+ Comment[zu]=Uhlu lwamafayela e-AbiWord
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-ace.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-ace.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-ace.desktop	2004-12-29 18:52:10.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-ace.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=tgz
+ Patterns=*.ace;*.ACE;
+ Comment=ACE Archive
++Comment[af]=ACE Argief
+ Comment[ar]=أرشيف ACE
+ Comment[az]=ACE Arxivi
+ Comment[be]=Архіў ACE
+@@ -64,6 +65,5 @@
+ Comment[uk]=Архіви ACE
+ Comment[uz]=ACE архиви
+ Comment[wa]=Årtchive «ACE»
+-Comment[xx]=xxACE Archivexx
+ Comment[zh_CN]=ACE 归档
+ Comment[zh_TW]=Arc 壓縮檔案 
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-afm.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-afm.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-afm.desktop	2005-01-21 05:24:16.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-afm.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=PostScript Font Metrics
++Comment[af]=PostScript Skrif tipe Afmetings
+ Comment[ar]=قياسات خط بوستسكريبت
+ Comment[az]=PostScript Yazı Növü Metrikləri
+ Comment[be]=Мэтрыкі шрыфту PostScript
+@@ -56,7 +57,6 @@
+ Comment[tr]=PostScript Yazıtipi Ölçütleri
+ Comment[uk]=Метрика шрифту PostScript
+ Comment[wa]=Metrikes di fonte PostScript
+-Comment[xx]=xxPostScript Font Metricsxx
+ Comment[zh_CN]=PostScript 字型
+ Comment[zh_TW]=PostScript 字體 Merics
+ Icon=font_type1
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-amipro.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-amipro.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-amipro.desktop	2005-01-21 05:24:16.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-amipro.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -70,7 +70,6 @@
+ Comment[ven]=Manwalwa a Lotus AmiPro
+ Comment[wa]=Documint Lotus AmiPro
+ Comment[xh]=Uxwebhu lwe Lotus AmiPro
+-Comment[xx]=xxLotus AmiPro Documentxx
+ Comment[zh_CN]=Lotus AmiPro 文档
+ Comment[zh_TW]=Lotus AmiPro 文件
+ Comment[zu]=Uhlu lwamafayela lwe-Lotus AmiPro
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-applixgraphics.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-applixgraphics.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-applixgraphics.desktop	2005-01-21 05:24:16.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-applixgraphics.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -70,7 +70,6 @@
+ Comment[ven]=Manwalwa a Applix Graphics
+ Comment[wa]=Documint grafike Applix
+ Comment[xh]=Uxwebhu Lwemizobo ye Applix
+-Comment[xx]=xxApplix Graphics Documentxx
+ Comment[zh_CN]=Applix 图形文档
+ Comment[zh_TW]=Applix 影像文件
+ Comment[zu]=Uhlu lwamafayela Lwemidwebo ye-Applix
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-applixspread.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-applixspread.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-applixspread.desktop	2005-01-28 05:03:18.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-applixspread.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -70,7 +70,6 @@
+ Comment[ven]=Manwalwa a Applix Spreadsheets
+ Comment[wa]=Documint tåvleu Applix
+ Comment[xh]=Uxwebhu lwe Applix Spreadsheets
+-Comment[xx]=xxApplix Spreadsheets Documentxx
+ Comment[zh_CN]=Applix 电子表格文档
+ Comment[zh_TW]=Applix 電子表格文件
+ Comment[zu]=Uhlu lwamafayela Lwamapheshana anwebekayo e-Applix
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-applixword.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-applixword.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-applixword.desktop	2005-01-21 05:24:16.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-applixword.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -70,7 +70,6 @@
+ Comment[ven]=Manwalwa a maipfi a Applix
+ Comment[wa]=Documint tecse Applix
+ Comment[xh]=Uxwebhu Lwamagama lwe Applix
+-Comment[xx]=xxApplix Words Documentxx
+ Comment[zh_CN]=Applix 文字处理文档
+ Comment[zh_TW]=Applix 文書處理文件
+ Comment[zu]=Uhlu lwamafayela Lamagama lwe-Applix
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-arc.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-arc.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-arc.desktop	2005-01-21 05:24:16.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-arc.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=tgz
+ Patterns=*.arc;*.ARC;
+ Comment=ARC Archive
++Comment[af]=ARC Argief
+ Comment[ar]=أرشيف ARC
+ Comment[az]=ARC Arxivi
+ Comment[be]=Архіў ARC
+@@ -64,6 +65,5 @@
+ Comment[uk]=Архів ARC
+ Comment[uz]=ARC архиви
+ Comment[wa]=Årtchive ARC
+-Comment[xx]=xxARC Archivexx
+ Comment[zh_CN]=ARC 归档
+ Comment[zh_TW]=ARC 壓縮檔案
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-archive.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-archive.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-archive.desktop	2005-01-21 05:24:16.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-archive.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -66,7 +66,6 @@
+ Comment[ven]=Fhethu huno vhulungwa hone zwithu zwa kale ha Ar
+ Comment[wa]=Årtchive «ar»
+ Comment[xh]=Ar Indawo yokugcina
+-Comment[xx]=xxAr Archivexx
+ Comment[zh_CN]=Ar 归档
+ Comment[zh_TW]=Ar 壓縮文件
+ Comment[zu]=Umqulu we-Ar
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-arj.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-arj.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-arj.desktop	2005-01-21 05:24:16.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-arj.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -70,7 +70,6 @@
+ Comment[ven]=Fhethu huno vhulungwa hone zwithu zwa kale ha ARJ
+ Comment[wa]=Årtchive ARJ
+ Comment[xh]=ARJ Indawo yokugcina
+-Comment[xx]=xxARJ Archivexx
+ Comment[zh_CN]=ARJ 归档
+ Comment[zh_TW]=ARJ 壓縮檔案
+ Comment[zu]=Umqulu we-ARJ
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-awk.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-awk.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-awk.desktop	2005-02-21 10:17:21.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-awk.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -66,7 +66,6 @@
+ Comment[ven]=Bammbiri la AWK
+ Comment[wa]=Sicripe AWK
+ Comment[xh]=Ushicilelo phantsi lwe AWK
+-Comment[xx]=xxAWK Scriptxx
+ Comment[zh_CN]=AWK 脚本
+ Comment[zh_TW]=AWK 程式
+ Comment[zu]=Isikripti se-AWK
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-bittorrent.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-bittorrent.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-bittorrent.desktop	2004-12-29 18:52:10.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-bittorrent.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=BitTorrent Download
++Comment[af]=BitTorrent Aflaai
+ Comment[ar]=ملف تنزيل BitTorrent
+ Comment[az]=BitTorrent Faylı
+ Comment[bg]=Изтеглен файл на BitTorrent
+@@ -53,7 +54,6 @@
+ Comment[uk]=Звантаження BitTorrent
+ Comment[uz]=BitTorrent олиш
+ Comment[wa]=Aberwetaedje avou BitTorrent
+-Comment[xx]=xxBitTorrent Downloadxx
+ Comment[zh_CN]=BitTorrent 下载
+ Comment[zh_TW]=BitTorrent 下載
+ Hidden=false
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-bz2dvi.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-bz2dvi.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-bz2dvi.desktop	2005-02-23 06:04:55.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-bz2dvi.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=Bzip2 Compressed DVI File
++Comment[af]=Bzip2 gekompakteerde DVI Lêer
+ Comment[bg]=Компресиран файл DVI с bzip2
+ Comment[bn]=বি-জিপ-২ (Bzip2) কম্প্রেসকৃত ডি-ভি-আই ফাইল
+ Comment[br]=Restr DVI moustret gant bzip2
+@@ -38,14 +39,13 @@
+ Comment[sk]=Komprimovaný súbor DVI pomocou bzip2
+ Comment[sl]=Datoteka DVI, stisnjena s bzip2
+ Comment[sr]=Bzip2 компресовани DVI фајл
+-Comment[sr@Latn]=Bzip2 компресовани DVI фајл
++Comment[sr@Latn]=Bzip2 kompresovani DVI fajl
+ Comment[sv]=Bzip2-komprimerad DVI-fil
+ Comment[ta]=Bzip2 அழுத்திய DVI கோப்பு
+ Comment[tg]=Bzip2 Файли DVI фушурдашуда
+ Comment[tr]=Bzip2 Sıkıştırılmış DVI Dosyası
+ Comment[uk]=Файл DVI, стиснутий bzip2
+ Comment[uz]=Bzip2 билан қисилган DVI-файли
+-Comment[xx]=xxBzip2 Compressed DVI Filexx
+ Comment[zh_CN]=Bzip2 压缩的 DVI 文件
+ Hidden=false
+ Icon=tgz
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-bzip.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-bzip.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-bzip.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-bzip.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -67,7 +67,6 @@
+ Comment[ven]=Faela ya Bzip
+ Comment[wa]=Fitchî bzip
+ Comment[xh]=Ifayile ye Bzip
+-Comment[xx]=xxBzip Filexx
+ Comment[zh_CN]=Bzip 文件
+ Comment[zh_TW]=Bzip 檔案
+ Comment[zu]=Ifayela le-Bzip
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-bzip2.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-bzip2.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-bzip2.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-bzip2.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -67,7 +67,6 @@
+ Comment[ven]=Faela ya Bzip2
+ Comment[wa]=Fitchî bzip2
+ Comment[xh]=Ifayile ye Bzip2
+-Comment[xx]=xxBzip2 Filexx
+ Comment[zh_CN]=Bzip2 文件
+ Comment[zh_TW]=Bzip2 檔案
+ Comment[zu]=Ifayela le-Bzip2
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-cda.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-cda.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-cda.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-cda.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -59,7 +59,6 @@
+ Comment[uz]=Аудио компакт-диск
+ Comment[ven]=Zwinopfiwa zwa CD
+ Comment[wa]=CD odio
+-Comment[xx]=xxCD Audioxx
+ Comment[zh_CN]=CD 音频
+ Comment[zh_TW]=CD 音效
+ Comment[zu]=Umsindo we-CD
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-compress.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-compress.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-compress.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-compress.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -68,7 +68,6 @@
+ Comment[uz]=UNIX қисилган файли
+ Comment[ven]=Faela yo tsikeledzwaho ya UNIX
+ Comment[xh]=Ifayile Edityaniswe ndawonye ye UNIX
+-Comment[xx]=xxUNIX Compressed Filexx
+ Comment[zh_CN]=UNIX 压缩文件
+ Comment[zh_TW]=UNIX 壓縮檔案
+ Comment[zu]=Ifayela Elicindezelwe lwe-Unix
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-core.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-core.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-core.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-core.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -67,7 +67,6 @@
+ Comment[uz]=Дастурдаги носозликлар ҳақида маълумот
+ Comment[ven]=Data ya mbekanyamushumo yo kwashekanaho
+ Comment[xh]=Data Yongqubano lodweliso lwenkqubo
+-Comment[xx]=xxProgram Crash Dataxx
+ Comment[zh_CN]=程序崩溃数据
+ Comment[zh_TW]=程式 crash 資料
+ Comment[zu]=Idata Yohlelo lwendlela Ephahlazekile
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-cpio.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-cpio.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-cpio.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-cpio.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -70,7 +70,6 @@
+ Comment[ven]=Fhethu hau vhulunga hone zwithu zwa kale ha CPIO
+ Comment[wa]=Årtchive cpio
+ Comment[xh]=Indawo yokugcina ye CPIO
+-Comment[xx]=xxCPIO Archivexx
+ Comment[zh_CN]=CPIO 归档
+ Comment[zh_TW]=CPIO 壓縮檔案
+ Comment[zu]=Umqulu we-CPIO
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-cue.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-cue.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-cue.desktop	2005-02-23 06:04:55.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-cue.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -4,6 +4,7 @@
+ MimeType=application/x-cue
+ Icon=cdimage
+ Comment=CDRWIN Cue-Sheet
++Comment[af]=CDRWIN Cue-Bladsy
+ Comment[bg]=Документ CDRWIN
+ Comment[bn]=CDRWIN কিউ-শিট
+ Comment[bs]=CDRWIN cue-sheet
+@@ -41,4 +42,3 @@
+ Comment[ta]=CRDWIN முன்னோடித்தாள்
+ Comment[tg]=Феҳристи CDRWIN
+ Comment[uk]=Файл диску CDRWIN
+-Comment[xx]=xxCDRWIN Cue-Sheetxx
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-dbase.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-dbase.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-dbase.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-dbase.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=database
+ Patterns=*.dbf;*.DBF;
+ Comment=dBASE Document
++Comment[af]=dBASE Dokument
+ Comment[ar]=مستند dBASE
+ Comment[az]=dBASE Sənədi
+ Comment[be]=Дакумэнт dBASE
+@@ -69,7 +70,6 @@
+ Comment[ven]=Manwalwa a dBASE
+ Comment[wa]=Documint dBASE
+ Comment[xh]=Uxwebhu lwe dBASE
+-Comment[xx]=xxdBASE Documentxx
+ Comment[zh_CN]=dBASE 文档
+ Comment[zh_TW]=dBASE 文件
+ Comment[zu]=Uhlu lwamafayela dBASE
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-deb.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-deb.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-deb.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-deb.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=deb
+ Patterns=*.deb;*.DEB;
+ Comment=Debian Package
++Comment[af]=Debian Pakkie
+ Comment[ar]=حزمة ديبيان
+ Comment[az]=Debian Paketi
+ Comment[bg]=Пакет на Дебиан
+@@ -63,6 +64,5 @@
+ Comment[uk]=Пакунок Debian
+ Comment[uz]=Debian пакети
+ Comment[wa]=Fitchî pacaedje Debian
+-Comment[xx]=xxDebian Packagexx
+ Comment[zh_CN]=Debian 包
+ Comment[zh_TW]=Debian 軟體包
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-designer.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-designer.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-designer.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-designer.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -67,7 +67,6 @@
+ Comment[ven]=Faela yau khavhisedza ya Qt
+ Comment[vi]=File Qt Designer 
+ Comment[xh]=Ifayile yo Mzobi we Qt
+-Comment[xx]=xxQt Designer Filexx
+ Comment[zh_CN]=Qt Designer 文件
+ Comment[zh_TW]=Qt Designer 檔案
+ Comment[zu]=Ifayela Lomdwebi lwe-Qt
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-desktop.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-desktop.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-desktop.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-desktop.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -64,7 +64,6 @@
+ Comment[ven]=Faela yau lugisela desikithopo
+ Comment[wa]=Fitchî d' apontiaedje pol sicribanne
+ Comment[xh]=Ifayile Yoqwalaselo ye Desktop
+-Comment[xx]=xxDesktop Config Filexx
+ Comment[zh_CN]=桌面配置文件
+ Comment[zh_TW]=桌面設定檔
+ Comment[zu]=Ifayela Lokuhlanganisela Ledesktop
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-dvi.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-dvi.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-dvi.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-dvi.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -63,7 +63,6 @@
+ Comment[ven]=Faela ya di imisaho nga yothe ya maano a TeX
+ Comment[wa]=Fitchî DVI
+ Comment[xh]=Ifayile Ezimeleyo Yecebo le TeX
+-Comment[xx]=xxTeX Device Independent Filexx
+ Comment[zh_CN]=TeX 设备无关文件
+ Comment[zh_TW]=與裝置無關的 Tex 檔案
+ Comment[zu]=Ifayela Lethuluzi lokusebenza Elizimele le-TeX
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-egon.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-egon.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-egon.desktop	2005-01-29 04:58:14.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-egon.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -51,4 +51,3 @@
+ Comment[ven]=Zwipuka zwa Egon
+ Comment[vi]=Hoạt hoạ Egon 
+ Comment[xh]=Umphilisi we Egon
+-Comment[xx]=xxEgon Animatorxx
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-executable-script.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-executable-script.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-executable-script.desktop	2005-02-23 06:04:55.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-executable-script.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=Script (possibly executable)
++Comment[af]=Skrip (moointlik uitvoerbaar)
+ Comment[bg]=Скрипт (вероятно изпълним)
+ Comment[bn]=স্ক্রিপ্ট (সম্ভবত এক্সিকিউটেবল)
+ Comment[bs]=Skripta (možda izvršiva)
+@@ -37,14 +38,13 @@
+ Comment[sk]=Skript (možno spustiteľný)
+ Comment[sl]=Skript (verjetno izvedljiv)
+ Comment[sr]=Скрипта (можда извршна)
+-Comment[sr@Latn]=Скрипта (можда извршна)
++Comment[sr@Latn]=Skripta (možda izvršna)
+ Comment[sv]=Skript (möjligen körbart)
+ Comment[ta]=சிறுநிரல் (இயக்க முடிந்த)
+ Comment[tg]=Скрипт (мумкин аст, ки ба кор бурда бошад)
+ Comment[tr]=Betik (çalıştırılabilir)
+ Comment[uk]=Скрипт, який, можливо, можна виконати
+ Comment[uz]=Эҳтимол ишга тушириб бўладиган скрипт
+-Comment[xx]=xxScript (possibly executable)xx
+ Comment[zh_CN]=脚本(可能可执行)
+ Icon=exec
+ Type=MimeType
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-executable.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-executable.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-executable.desktop	2004-12-29 18:52:10.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-executable.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -63,7 +63,6 @@
+ Comment[ven]=Faela ino tumulea
+ Comment[wa]=Fitchî enondåve
+ Comment[xh]=Ifayile Ephumezekayo
+-Comment[xx]=xxExecutable Filexx
+ Comment[zh_CN]=可执行文件
+ Comment[zh_TW]=可執行檔
+ Comment[zu]=Ifayela Eliphumelelisekayo
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-font-bdf.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-font-bdf.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-font-bdf.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-font-bdf.desktop	2005-03-12 18:58:51.000000000 +0100
+@@ -10,6 +10,7 @@
+ Comment[az]=BDF Bitmap Yazı Növü
+ Comment[bg]=Шрифт BDF Bitmap
+ Comment[bn]=বি-ডি-এফ বিটম্যাপ ফন্ট
++Comment[br]=Nodrezh Bitmap BDF
+ Comment[bs]=BDF bitmap font
+ Comment[ca]=Font bitmap BDF
+ Comment[cs]=Bitmapové písmo BDF
+@@ -67,7 +68,6 @@
+ Comment[ven]=Fontu ya Bitmap BDF
+ Comment[wa]=Fonte bitmap BDF
+ Comment[xh]=Uhlobo lwamagama lwe BDF Bitmap
+-Comment[xx]=xxBDF Bitmap Fontxx
+ Comment[zh_CN]=BDF 位图字体
+ Comment[zh_TW]=BDF 點陣字形
+ Comment[zu]=Uhlobo lwamagama Lwe-Bitmap ye-BDF
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-font-ghostscript.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-font-ghostscript.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-font-ghostscript.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-font-ghostscript.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -68,7 +68,6 @@
+ Comment[ven]=Fontu ya tshikiriputi tsha poso
+ Comment[wa]=Fonte Ghostscript
+ Comment[xh]=Uhlobo lwamagama lwe Ghostscript
+-Comment[xx]=xxGhostscript Fontxx
+ Comment[zh_CN]=Ghostscript 字体
+ Comment[zh_TW]=Ghostscript 字形
+ Comment[zu]=Uhlobo lwamagama lwama-Ghostscripts
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-font-otf.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-font-otf.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-font-otf.desktop	2004-12-29 18:52:10.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-font-otf.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=OpenType Font
++Comment[af]=OpenType Skrif tipe
+ Comment[ar]=خط OpenType
+ Comment[az]=OpenType Yazı Növü
+ Comment[be]=Шрыфт OpenType
+@@ -60,7 +61,6 @@
+ Comment[uk]=Шрифт OpenType
+ Comment[uz]=OpenType шрифти
+ Comment[wa]=Fonte OpenType
+-Comment[xx]=xxOpenType Fontxx
+ Comment[zh_CN]=OpenType 字体
+ Comment[zh_TW]=OpenType 字型
+ Icon=font_truetype
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-font-pcf.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-font-pcf.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-font-pcf.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-font-pcf.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -10,6 +10,7 @@
+ Comment[az]=PCF Bitmap Yazı Növü
+ Comment[bg]=Шрифт PCF
+ Comment[bn]=পি-সি-এফ (PCF) বিটম্যাপ ফন্ট
++Comment[br]=Nodrezh Bitmap PCF
+ Comment[bs]=PCF bitmap font
+ Comment[ca]=Font bitmap PCF
+ Comment[cs]=Bitmapové písmo PCF
+@@ -67,7 +68,6 @@
+ Comment[ven]=Vhuhulu ha mafhungo ha Bitmap ya PCF
+ Comment[wa]=Fonte bitmap PCF
+ Comment[xh]=Uhlobo lwamagama lwe PCF Bitmap
+-Comment[xx]=xxPCF Bitmap Fontxx
+ Comment[zh_CN]=PCF 位图字体
+ Comment[zh_TW]=PCF 點陣字形
+ Comment[zu]=Uhlobo lwamagama lwe-Bitmap ye-PCF
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-font-snf.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-font-snf.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-font-snf.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-font-snf.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -10,6 +10,7 @@
+ Comment[az]=SNF Bitmap Yazı Növü
+ Comment[bg]=Шрифт SNF Bitmap
+ Comment[bn]=SNF বিটম্যাপ ফন্ট
++Comment[br]=Nodrezh Bitmap SNF
+ Comment[bs]=SNF bitmap font
+ Comment[ca]=Font bitmap SNF
+ Comment[cs]=Bitmapové písmo SNF
+@@ -67,7 +68,6 @@
+ Comment[ven]=Fontu ya Bitmap ya SNF
+ Comment[wa]=Fonte bitmap SNF
+ Comment[xh]=Uhlobo lwamagama lwe SNF Bitmap
+-Comment[xx]=xxSNF Bitmap Fontxx
+ Comment[zh_CN]=SNF 位图字体
+ Comment[zh_TW]=SNF 點陣字形
+ Comment[zu]=Uhlobo lwamagama lwe-Bitmap ye-SNF
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-font-speedo.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-font-speedo.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-font-speedo.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-font-speedo.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -68,7 +68,6 @@
+ Comment[ven]=Fontu ya luvhilo
+ Comment[wa]=Fonte Speedo
+ Comment[xh]=Uhlobo lwamagama lwe Speedo
+-Comment[xx]=xxSpeedo Fontxx
+ Comment[zh_CN]=Speedo 字体
+ Comment[zh_TW]=Speedo 字形
+ Comment[zu]=Uhlobo lwamagama lwe-Speedo
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-font-ttc.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-font-ttc.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-font-ttc.desktop	2004-12-29 18:52:10.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-font-ttc.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=TrueType Font Collection
++Comment[af]=Truetype Skrif Versameling
+ Comment[ar]=مجموعة خطوط TrueType
+ Comment[az]=TrueType Yazı Növü Kolleksiyası
+ Comment[be]=Калекцыя шрыфтоў TrueType
+@@ -59,7 +60,6 @@
+ Comment[uk]=Колекція шрифтів Truetype
+ Comment[uz]=TrueType шрифт тўплами
+ Comment[wa]=Ramexhnêye di fontes TrueType
+-Comment[xx]=xxTrueType Font Collectionxx
+ Comment[zh_CN]=Truetype 字体集合
+ Comment[zh_TW]=Truetype 字型集合
+ Icon=font_truetype
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-font-ttf.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-font-ttf.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-font-ttf.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-font-ttf.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=TrueType Font
++Comment[af]=Truetype Skrif tipe
+ Comment[ar]=خط TrueType
+ Comment[az]=TrueType Yazı Növü
+ Comment[be]=Шрыфт TrueType
+@@ -60,7 +61,6 @@
+ Comment[uk]=Шрифт TrueType
+ Comment[uz]=TrueType шрифти
+ Comment[wa]=Fonte TrueType
+-Comment[xx]=xxTrueType Fontxx
+ Comment[zh_CN]=TrueType 字体
+ Comment[zh_TW]=Truetype 字型
+ Icon=font_truetype
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-font-type1.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-font-type1.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-font-type1.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-font-type1.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -69,7 +69,6 @@
+ Comment[ven]=Fontu ya lushaka lwau thoma ya tshikiriputi tsha poso
+ Comment[wa]=Fonte PostScript Type1
+ Comment[xh]=Uhlobo lwamagama lwe PostScritp Type1
+-Comment[xx]=xxPostScript Type1 Fontxx
+ Comment[zh_CN]=PostScript Type1 字体
+ Comment[zh_TW]=PostScript Type1 字形
+ Comment[zu]=Uhlobo lwamagama 1 lwe-PostScript Esidlulile Sohlobo
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-gettext.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-gettext.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-gettext.desktop	2005-02-07 05:54:44.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-gettext.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=GNU Gettext Message Catalog
++Comment[af]=GNU Gettext Boodskap Katalogus
+ Comment[ar]=ملف ترجمة
+ Comment[az]=GNU Gettext İsmarış Kataloqu
+ Comment[bg]=Съобщения за превод (GNU Gettext)
+@@ -58,7 +59,6 @@
+ Comment[uk]=Каталог повідомлень GNU Gettext
+ Comment[uz]=GNU Gettext хабарлар каталоги
+ Comment[wa]=Catalogue di messaedjes po GNU gettext
+-Comment[xx]=xxGNU Gettext Message Catalogxx
+ Comment[zh_CN]=GNU Gettext 消息编目
+ Comment[zh_TW]=GNU Gettext 訊息型錄
+ Icon=gettext
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-gnumeric.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-gnumeric.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-gnumeric.desktop	2005-01-28 05:03:18.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-gnumeric.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -68,7 +68,6 @@
+ Comment[uz]=GNUmeric электрон жадвали
+ Comment[ven]=U phadaladza ha siatari ha GNUmeric 
+ Comment[wa]=Documint tåvleu GNUmeric
+-Comment[xx]=xxGNUmeric Spreadsheetxx
+ Comment[zh_CN]=GNUmeric 电子表格
+ Comment[zh_TW]=GNUmeric 試算表
+ Comment[zu]=Iphephashana elinwebekayo le-GNUmeric
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-graphite.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-graphite.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-graphite.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-graphite.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -66,7 +66,6 @@
+ Comment[ven]=Girafaiti - Girafu ya zwa dzi santsi
+ Comment[wa]=Grafikes syintifikes di Graphite
+ Comment[xh]=Imizobo Yobunzulu Lwazi ye Graphite
+-Comment[xx]=xxGraphite Scientific Graphxx
+ Comment[zh_CN]=Graphite 科学图表
+ Comment[zh_TW]=Graphite - 科學繪圖
+ Comment[zu]=Umdwebo Wezesayensi Womdwebo
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-gzdvi.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-gzdvi.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-gzdvi.desktop	2005-02-23 06:04:55.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-gzdvi.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=Gzip Compressed DVI File
++Comment[af]=Gzip Gekompakteerde DVI Lêer
+ Comment[bg]=Компресиран файл DVI с gzip
+ Comment[bn]=জি-জিপকৃত (gzipped) ডি-ভি-আই ফাইল
+ Comment[br]=Restr DVI moustret gant gzip
+@@ -38,14 +39,13 @@
+ Comment[sk]=Komprimovaný súbor DVI pomocou gzip
+ Comment[sl]=Datoteka DVI, stisnjena s gzip-om
+ Comment[sr]=Gzip компресовани DVI фајл
+-Comment[sr@Latn]=Gzip компресовани DVI фајл
++Comment[sr@Latn]=Gzip kompresovani DVI fajl
+ Comment[sv]=Gzip-komprimerad DVI-fil
+ Comment[ta]=Gzip அழுத்திய கோப்பு
+ Comment[tg]=Gzip Файли DVI фушурдашуда
+ Comment[tr]=Gzip Sıkıştırılmış DVI Dosyası
+ Comment[uk]=Файл DVI, стиснутий gzip
+ Comment[uz]=Gzip билан қисилган DVI-файли
+-Comment[xx]=xxGzip Compressed DVI Filexx
+ Comment[zh_CN]=Gzip 压缩的 DVI 文件
+ Hidden=false
+ Icon=tgz
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-gzip.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-gzip.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-gzip.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-gzip.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -67,7 +67,6 @@
+ Comment[ven]=Faela ya Gzip
+ Comment[wa]=Fitchî gzip
+ Comment[xh]=Ifayile ye Gzip
+-Comment[xx]=xxGzip Filexx
+ Comment[zh_CN]=Gzip 文件
+ Comment[zh_TW]=Gzip 檔案
+ Comment[zu]=Ifayela le-Gzip
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-gzpostscript.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-gzpostscript.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-gzpostscript.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-gzpostscript.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -64,7 +64,6 @@
+ Comment[ven]=Faela ya tshikiriputi tsha poso ya Gzipped
+ Comment[wa]=Fitchî Postscript gzip-rastrindou
+ Comment[xh]=Ifayile ye PostScript Gzipped
+-Comment[xx]=xxGzipped PostScript Filexx
+ Comment[zh_CN]=Gzip 压缩的 Postscript 文件
+ Comment[zh_TW]=Gzip 壓縮的 Postscript 檔案
+ Comment[zu]=Ifayela le-PostScript ye-Gzipped
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-hancomword.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-hancomword.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-hancomword.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-hancomword.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=wordprocessing
+ Patterns=*.hwp;*.HWP;
+ Comment=HancomWord Document
++Comment[af]=HancomWord Dokument
+ Comment[ar]=مستند هانكوم وورد
+ Comment[az]=HancomWord Sənədi
+ Comment[be]=Дакумэнт HancomWord
+@@ -67,7 +68,6 @@
+ Comment[ven]=Manwalwa a fhungo la Hamcon
+ Comment[wa]=Documint HancomWord
+ Comment[xh]=Uxwebhu lwe HancomWord
+-Comment[xx]=xxHancomWord Documentxx
+ Comment[zh_CN]=HancomWord 文档
+ Comment[zh_TW]=HancomWord 文件
+ Comment[zu]=Uhlu lwamafayela lwe-HancomWord
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-ica.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-ica.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-ica.desktop	2005-02-23 06:04:55.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-ica.desktop	2005-03-18 18:13:20.378904025 +0100
+@@ -2,8 +2,10 @@
+ Encoding=UTF-8
+ MimeType=application/x-ica
+ Comment=Citrix ICA Client Configuration
++Comment[af]=Citrix ICA Klient Opstelling
+ Comment[bg]=Конфигурация на клиент Citrix ICA
+ Comment[bn]=সাইট্রিক্স ICA ক্লায়েন্ট কনফিগারেশন
++Comment[br]=Kefluniadur ar c'hliant Citrix ICA
+ Comment[bs]=Citrix ICA Client postavke
+ Comment[ca]=Configuració de client Citrix ICA
+ Comment[cs]=Nastavení Citrix ICA klienta
+@@ -41,13 +43,12 @@
+ Comment[sk]=Konfigurácia klienta Citrix ICA
+ Comment[sl]=Nastavitve vmesnika Citrix ICA
+ Comment[sr]=Подешавање Citrix-овог ICA клијента
+-Comment[sr@Latn]=Подешавање Citrix-овог ICA клијента
++Comment[sr@Latn]=Podešavanje Citrix-ovog ICA klijenta
+ Comment[sv]=Citrix ICA-klientanpassning
+ Comment[ta]=Citrix ICA உறுப்பினம் வடிவமைப்பு
+ Comment[tg]=Танзимоти коргири Citrix ICA
+ Comment[tr]=Citrix ICA Yapılandırması
+ Comment[uk]=Конфігурація клієнта Citrix ICA
+-Comment[xx]=xxCitrix ICA Client Configurationxx
+ Comment[zh_CN]=Citrix ICA 客户配置
+ Icon=wordprocessing
+ Type=MimeType
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-iso.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-iso.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-iso.desktop	2005-02-23 06:04:56.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-iso.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -4,6 +4,7 @@
+ MimeType=application/x-iso
+ Icon=cdtrack
+ Comment=ISO9660 Image File
++Comment[af]=ISO9660 CD-Beeld Leêr
+ Comment[be]=Файл вобразу ISO9660
+ Comment[bg]=Файл снимка ISO9660
+ Comment[bn]=ISO9660 ইমেজ ফাইল
+@@ -41,12 +42,11 @@
+ Comment[sk]=Obraz disku ISO9660
+ Comment[sl]=Podoba plošče ISO9660
+ Comment[sr]=Фајл ISO9660 слике
+-Comment[sr@Latn]=Фајл ISO9660 слике
++Comment[sr@Latn]=Fajl ISO9660 slike
+ Comment[sv]=ISO9660-avbildsfil
+ Comment[ta]=ISO9660 பிம்பக் கோப்பு
+ Comment[tg]=Файли тасвири ISO9660
+ Comment[tr]=ISO9660 Resim Dosyası
+ Comment[uk]=Файл штампа ISO9660
+ Comment[uz]=ISO9660-тасвир файли
+-Comment[xx]=xxISO9660 Image Filexx
+ Comment[zh_CN]=ISO9660 映像文件
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-jar.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-jar.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-jar.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-jar.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -75,7 +75,6 @@
+ Comment[vi]=Nén Java 
+ Comment[wa]=Årtchive Java
+ Comment[xh]=Indawo efihlakeleyo ye Java
+-Comment[xx]=xxJava Archivexx
+ Comment[zh_CN]=Java 归档
+ Comment[zh_TW]=Java 壓縮檔案
+ Comment[zu]=Umqulu we-Java
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-java-applet.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-java-applet.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-java-applet.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-java-applet.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=MimeType
+ Comment=Java Applet
++Comment[af]=Java Program
+ Comment[ar]=بريمج جافا
+ Comment[az]=Java Appleti
+ Comment[bg]=Аплет на Java
+@@ -55,7 +56,6 @@
+ Comment[uk]=Аплет Java
+ Comment[uz]=Java апплети
+ Comment[wa]=Aplikete Java
+-Comment[xx]=xxJava Appletxx
+ Comment[zh_CN]=Java 小程序
+ MimeType=application/x-java-applet
+ Icon=exec
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-java.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-java.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-java.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-java.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -11,6 +11,7 @@
+ Comment[be]=Кляса Java
+ Comment[bg]=Клас на Java
+ Comment[bn]=জাভা ক্লাস
++Comment[br]=Renkad Java
+ Comment[bs]=Java klasa
+ Comment[ca]=Classe Java
+ Comment[cs]=Java třída
+@@ -72,6 +73,5 @@
+ Comment[vi]=Lớp Java 
+ Comment[wa]=Classe Java
+ Comment[xh]=Uhlobo lwe Java
+-Comment[xx]=xxJava Classxx
+ Comment[zh_CN]=Java 类
+ Comment[zu]=Ikilasi lwe-Java
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-javascript.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-javascript.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-javascript.desktop	2005-02-23 06:04:56.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-javascript.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -4,6 +4,7 @@
+ Icon=Script
+ Patterns=*.js;
+ Comment=JavaScript File
++Comment[af]=JavaScript Lêer
+ Comment[be]=Файл JavaScript
+ Comment[bg]=Изходен код на JavaScript
+ Comment[bn]=জাভাস্ক্রিপ্ট ফাইল
+@@ -44,13 +45,12 @@
+ Comment[sk]=Zdrojový kód JavaScript
+ Comment[sl]=Datoteka JavaScript
+ Comment[sr]=JavaScript фајл
+-Comment[sr@Latn]=JavaScript фајл
++Comment[sr@Latn]=JavaScript fajl
+ Comment[sv]=Javaskript-fil
+ Comment[ta]=ஜாவா மூலக் கோப்பு
+ Comment[tg]=Файли барномавии Java
+ Comment[tr]=JavaScript Dosyası
+ Comment[uk]=Файл JavaScript
+ Comment[uz]=JavaScript-файли
+-Comment[xx]=xxJavaScript Filexx
+ Comment[zh_CN]=JavaScript 文件
+ X-KDE-IsAlso=application/x-executable-script
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-karbon.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-karbon.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-karbon.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-karbon.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -71,7 +71,6 @@
+ Comment[ven]=Manwalwa a Karbon14
+ Comment[wa]=Documint Karbon14
+ Comment[xh]=Uxwebhu lwe Karbon14
+-Comment[xx]=xxKarbon14 Documentxx
+ Comment[zh_CN]=Karbon14 文档
+ Comment[zh_TW]=Karbon14 文件
+ Comment[zu]=Uhlu lwamafayela lwe-Karbon14
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-kchart.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-kchart.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-kchart.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-kchart.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -69,7 +69,6 @@
+ Comment[ven]=Manwalwa a KChart
+ Comment[wa]=Documint KChart
+ Comment[xh]=Uxwebhu lwe KChart
+-Comment[xx]=xxKChart Documentxx
+ Comment[zh_CN]=KChart 文档
+ Comment[zh_TW]=KChart 文件
+ Comment[zu]=Uhlu lwamafayela ye-KChart
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-kcsrc.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-kcsrc.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-kcsrc.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-kcsrc.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=colorscm
+ Patterns=*.kcsrc;*.KCSRC
+ Comment=KDE Color Theme
++Comment[af]=KDE Kleur Tema
+ Comment[ar]=سمة الألوان لKDE
+ Comment[az]=KDE Rəng Örtüyü
+ Comment[be]=Тэма колераў KDE
+@@ -64,6 +65,5 @@
+ Comment[uk]=Тема кольорів KDE
+ Comment[uz]=KDE ранг мавзуси
+ Comment[wa]=Tinme di coleurs KDE
+-Comment[xx]=xxKDE Color Themexx
+ Comment[zh_CN]=KDE 色彩主题
+ Comment[zh_TW]=KDE 色彩佈景
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-kde-wallet.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-kde-wallet.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-kde-wallet.desktop	2005-01-05 04:58:39.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-kde-wallet.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -3,6 +3,7 @@
+ Type=MimeType
+ MimeType=application/x-kde-wallet
+ Comment=KDE Wallet File
++Comment[af]=KDE Beursie Lêer
+ Comment[ar]=ملف محفظة KDE
+ Comment[az]=KDE Wallet Faylı
+ Comment[bg]=Файл на системата Портфейл
+@@ -58,7 +59,6 @@
+ Comment[tr]=KDE Cüzdan Dosyası
+ Comment[uk]=Файл торбинки KDE
+ Comment[uz]=KDE Wallet-файли
+-Comment[xx]=xxKDE Wallet Filexx
+ Comment[zh_CN]=KDE 钱包文件
+ Comment[zh_TW]=KDE  公事包檔案
+ Patterns=*.kwl
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-kformula.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-kformula.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-kformula.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-kformula.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -5,7 +5,7 @@
+ Icon=kformula_kfo
+ Patterns=*.kfo;
+ Comment=KFormula Document
+-Comment[af]=Kformula Dokument
++Comment[af]=KFormula Dokument
+ Comment[ar]=مستند KFormula
+ Comment[az]=KFormula Sənədi
+ Comment[be]=Дакумэнт KFormula
+@@ -69,7 +69,6 @@
+ Comment[ven]=Manwalwa a tshivhumbeo tsha K
+ Comment[wa]=Documint KFormula
+ Comment[xh]=Uxwebhu lwe KFormula
+-Comment[xx]=xxKFormula Documentxx
+ Comment[zh_CN]=KFormula 文档
+ Comment[zh_TW]=KFormula 文件
+ Comment[zu]=Uhlu lwamafayela ye-KFormula
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-kivio.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-kivio.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-kivio.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-kivio.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -70,7 +70,6 @@
+ Comment[ven]=Manwalwa a Kivio
+ Comment[wa]=Documint Kivio
+ Comment[xh]=Uxwebhu lwe Kivio
+-Comment[xx]=xxKivio Documentxx
+ Comment[zh_CN]=Kivio 文档
+ Comment[zh_TW]=Kivio 文件
+ Comment[zu]=Uhlu lwamafayela lwe-Kivio
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-kontour.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-kontour.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-kontour.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-kontour.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -66,7 +66,6 @@
+ Comment[ven]=Manwalwa a Kontour
+ Comment[wa]=Documint Kontour
+ Comment[xh]=Uxwebhu lwe Kontour
+-Comment[xx]=xxKontour Documentxx
+ Comment[zh_CN]=Kontour 文档
+ Comment[zh_TW]=Kontour 文件
+ Comment[zu]=Uhlu lwamafayela lwe-Kontour
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-kpovmodeler.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-kpovmodeler.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-kpovmodeler.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-kpovmodeler.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -65,7 +65,6 @@
+ Comment[ven]=Faela ya KPovModeler
+ Comment[vi]=File KPovModeler
+ Comment[xh]=Ifayile ye KPovModeler
+-Comment[xx]=xxKPovModeler Filexx
+ Comment[zh_CN]=KPovModeler 文件
+ Comment[zh_TW]=KPovModeler 檔案
+ Comment[zu]=Ifayela le-KPovModeler
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-kpresenter.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-kpresenter.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-kpresenter.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-kpresenter.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -69,7 +69,6 @@
+ Comment[ven]=Manwalwa a Muimeleli wa K
+ Comment[wa]=Documint di prezintaedje KPresenter
+ Comment[xh]=Uxwebhu lwe KPresenter
+-Comment[xx]=xxKPresenter Documentxx
+ Comment[zh_CN]=KPresenter 文档
+ Comment[zh_TW]=KPresenter 文件
+ Comment[zu]=Uhlu lwamafayela lwe-KPresenter
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-krita.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-krita.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-krita.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-krita.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -69,7 +69,6 @@
+ Comment[ven]=Manwalwa a Krita
+ Comment[wa]=Documint Krita
+ Comment[xh]=Uxwebhu lwe Krita
+-Comment[xx]=xxKrita Documentxx
+ Comment[zh_CN]=Krita 文档
+ Comment[zh_TW]=Krita 文件
+ Comment[zu]=Uhlu lwamafayela lwer-Krita
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-kspread.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-kspread.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-kspread.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-kspread.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -69,7 +69,6 @@
+ Comment[ven]=Manwalwa a phathaladzo ya K
+ Comment[wa]=Documint tåvleu KSpread
+ Comment[xh]=Uxwebhu lwe KSpread
+-Comment[xx]=xxKSpread Documentxx
+ Comment[zh_CN]=KSpread 文档
+ Comment[zh_TW]=KSpread 文件
+ Comment[zu]=Uhlu lwamafayela lwe-KSpread
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-kudesigner.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-kudesigner.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-kudesigner.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-kudesigner.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -3,6 +3,7 @@
+ Encoding=UTF-8
+ MimeType=application/x-kudesigner
+ Comment=Kugar Report Template
++Comment[af]=Kugar Raport Voorbeeld
+ Comment[ar]=قالب تقارير كوغار
+ Comment[az]=Kugar Report Sənədi
+ Comment[be]=Шаблён справаздачы Kugar
+@@ -58,7 +59,6 @@
+ Comment[tr]=Kugar Rapor Şablonu
+ Comment[uk]=Шаблон звіту Kugar
+ Comment[uz]=Kugar ҳисобот намунаси
+-Comment[xx]=xxKugar Report Templatexx
+ Comment[zh_CN]=Kugar 报告模板
+ Comment[zh_TW]=Kugar 報表樣本
+ Icon=kugardata
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-kugar.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-kugar.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-kugar.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-kugar.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -69,7 +69,6 @@
+ Comment[ven]=Data ya faela ya Kugar
+ Comment[vi]=File dữ liệu Kugar 
+ Comment[xh]=Ifayile ye Data ye Kugar
+-Comment[xx]=xxKugar Data Filexx
+ Comment[zh_CN]=Kugar 数据文件
+ Comment[zh_TW]=Kugar 資料檔案
+ Comment[zu]=Ifayela Ledata ye-Kugar
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-kword.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-kword.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-kword.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-kword.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -70,7 +70,6 @@
+ Comment[ven]=Manwalwa fhungo la K
+ Comment[wa]=Documint KWord
+ Comment[xh]=Uxwebhu lwe KWord
+-Comment[xx]=xxKWord Documentxx
+ Comment[zh_CN]=KWord 文档
+ Comment[zh_TW]=KWord 文件
+ Comment[zu]=Uhlu lwamafayela lwe-KWord
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-lha.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-lha.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-lha.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-lha.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -66,7 +66,6 @@
+ Comment[ven]=Fhethu hau vhulungela hone zwithu zwa kale ha Lha
+ Comment[wa]=Årtchive LHA
+ Comment[xh]=Lha Indawo yogcino
+-Comment[xx]=xxLha Archivexx
+ Comment[zh_CN]=Lha 归档
+ Comment[zh_TW]=Lha 壓縮檔案
+ Comment[zu]=Umqulu we-Lha
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-linguist.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-linguist.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-linguist.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-linguist.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=gettext
+ Patterns=*.ts;
+ Comment=Qt Translation Source File
++Comment[af]=Qt Vertaal Bronlêer
+ Comment[ar]=ملف ترجمة QT مصدري
+ Comment[az]=Qt Tərcümə Mənbəsi Faylı
+ Comment[bg]=Съобщения за превод (Qt)
+@@ -60,6 +61,5 @@
+ Comment[tr]=Qt Çeviri Kaynak Dosyası
+ Comment[uk]=Вихідний файл перекладу зовнішнього вигляду для Qt
+ Comment[uz]=Qt таржима қилишнинг коди
+-Comment[xx]=xxQt Translation Source Filexx
+ Comment[zh_CN]=Qt 翻译源文件
+ Comment[zh_TW]=QT Translation 原始檔案
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-lyx.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-lyx.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-lyx.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-lyx.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -68,7 +68,6 @@
+ Comment[vi]=Tài liệu LYX
+ Comment[wa]=Documint LyX
+ Comment[xh]=Uxwebhu lwe LyX
+-Comment[xx]=xxLyX Documentxx
+ Comment[zh_CN]=LyX 文档
+ Comment[zh_TW]=LyX 文件
+ Comment[zu]=Uhlu lwamafayela lwe-LyX
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-lzop.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-lzop.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-lzop.desktop	2005-02-03 06:06:48.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-lzop.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -73,7 +73,6 @@
+ Comment[ven]=Faela ya Lzopped
+ Comment[vi]=File Lzopped 
+ Comment[xh]=Ifayile ye Lzopped
+-Comment[xx]=xxLzopped Filexx
+ Comment[zh_CN]=Lzopped 文件
+ Comment[zh_TW]=Lzopped 檔案
+ Comment[zu]=Ifayela le-Lzopped
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-magicpoint.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-magicpoint.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-magicpoint.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-magicpoint.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=presentation
+ Patterns=*.mgp;*.MGP;
+ Comment=MagicPoint Presentation
++Comment[af]=MagicPoint Voorlegging
+ Comment[ar]=مستند MagicPoint
+ Comment[az]=MagicPoint Sənədi
+ Comment[be]=Прэзэнтацыя MagicPoint
+@@ -61,5 +62,4 @@
+ Comment[uk]=Презентація MagicPoint
+ Comment[uz]=MagicPoint намойиши
+ Comment[wa]=Documint di prezintaedje Magicpoint
+-Comment[xx]=xxMagicPoint Presentationxx
+ Comment[zh_CN]=MagicPoint 演示文稿
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-mimearchive.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-mimearchive.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-mimearchive.desktop	2005-02-23 06:04:56.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-mimearchive.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -33,12 +33,11 @@
+ Comment[sk]=Zabalený webový archív
+ Comment[sl]=MIME za enkapsuliran spletni arhiv
+ Comment[sr]=МИМЕ учаурена веб архива
+-Comment[sr@Latn]=МИМЕ учаурена веб архива
++Comment[sr@Latn]=MIME učaurena veb arhiva
+ Comment[sv]=MIME-inbäddat webbarkiv
+ Comment[ta]=மைம் என்காப்சுலேட்டட் வலை காப்பகம்
+ Comment[tg]=Архиви Веб Tar Фушурдашуда
+ Comment[uk]=Архів Тенет з інформацією про mine
+-Comment[xx]=xxMime Encapsulated Web Archivexx
+ Comment[zh_CN]=MIME 封装的 Web 归档
+ 
+ [Property::X-KDE-LocalProtocol]
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-msaccess.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-msaccess.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-msaccess.desktop	2004-12-29 18:52:10.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-msaccess.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -5,11 +5,13 @@
+ Icon=database
+ Patterns=*.mdb;*.MDB;*.mda;*.MDA;*.mde;*.MDE;
+ Comment=Microsoft Access Database
++Comment[af]=Microsoft Access Databasis
+ Comment[ar]=قاعدة بيانات مايكروسوفت أكسيس
+ Comment[az]=Microsoft Access Databeyzi
+ Comment[be]=База дадзеных Microsoft Access
+ Comment[bg]=Документ на Microsoft Access
+ Comment[bn]=মাইক্রোসফট অ্যাকসেস ডেটাবেস
++Comment[br]=Stlennvon Microsoft Access
+ Comment[bs]=Microsoft Access baza podataka
+ Comment[ca]=Base de dades de Microsoft Access
+ Comment[cs]=Databáze Microsoft Access
+@@ -61,6 +63,5 @@
+ Comment[uk]=База даних Microsoft Access
+ Comment[uz]=Microsoft Access маълумот базаси
+ Comment[wa]=Båze di dnêyes Microsoft Access
+-Comment[xx]=xxMicrosoft Access Databasexx
+ Comment[zh_CN]=Microsoft Access 数据库
+ Comment[zh_TW]=Microsoft Access 資料庫
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-msdos-program.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-msdos-program.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-msdos-program.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-msdos-program.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -1,10 +1,11 @@
+ [KDE Desktop Entry]
+ Comment=Windows Executable
+-Comment[af]=Vensters Uitvoerbare
++Comment[af]=Windows Uitvoerbare
+ Comment[ar]=ملف وندوز تشغيلي
+ Comment[az]=Windows İcraçısı
+ Comment[bg]=Изпълним файл на Windows
+ Comment[bn]=উইন্ডোস এক্সিকিউটেবল
++Comment[br]=Goulev Windows
+ Comment[bs]=Windows izvršna datoteka
+ Comment[ca]=Executable Windows
+ Comment[cs]=Spustitelný soubor z Windows
+@@ -61,7 +62,6 @@
+ Comment[ven]=U tumulea ha dziwindo
+ Comment[wa]=Fitchî enondåve po MS-Windows
+ Comment[xh]=Windows Eziphumezekayo
+-Comment[xx]=xxWindows Executablexx
+ Comment[zh_CN]=Windows 可执行文件
+ Comment[zh_TW]=Windows 可執行檔
+ Comment[zu]=Ama-window Aphumelelanga
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-mswrite.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-mswrite.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-mswrite.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-mswrite.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -69,7 +69,6 @@
+ Comment[ven]=Manwalwa a microsoft au nwala
+ Comment[wa]=Documint Microsoft Write
+ Comment[xh]=Uxwebhhu Lokubhala le Microsoft
+-Comment[xx]=xxMicrosoft Write Documentxx
+ Comment[zh_CN]=Microsoft 书写器文档
+ Comment[zh_TW]=微軟小作家文件
+ Comment[zu]=Uhlu lwamafayela Lokubhala lwe-Microsoft
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-object.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-object.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-object.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-object.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -71,7 +71,6 @@
+ Comment[ven]=Khoudu ya tshithu
+ Comment[vi]=Mã đối tượng 
+ Comment[xh]=Ikhowudi yento
+-Comment[xx]=xxObject Codexx
+ Comment[zh_CN]=目标代码
+ Comment[zh_TW]=目標代碼
+ Comment[zu]=Ikhodi Yenhloso
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-ogg.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-ogg.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-ogg.desktop	2005-01-29 04:58:14.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-ogg.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -65,7 +65,6 @@
+ Comment[uz]=Ogg мултимедиа
+ Comment[ven]=Zwavhukwamani ha Ogg
+ Comment[wa]=Fitchî multimedia Ogg
+-Comment[xx]=xxOgg Multimediaxx
+ Comment[zh_CN]=Ogg 多媒体
+ Comment[zh_TW]=Ogg 多媒體
+ Comment[zu]=Onozindaba be-Ogg
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-pak.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-pak.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-pak.desktop	2005-02-23 06:04:57.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-pak.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -5,9 +5,11 @@
+ Icon=tgz
+ Patterns=*.pak;*.PAK;
+ Comment=PAK File Archive
++Comment[af]=PAK Argief
+ Comment[be]=Архіў PAK
+ Comment[bg]=Архив PAK
+ Comment[bn]=PAK ফাইল আর্কাইভ
++Comment[br]=Restr diell PAK
+ Comment[bs]=PAK arhiva
+ Comment[ca]=Arxiu de fitxers PAK
+ Comment[cs]=Archív souborů PAK
+@@ -41,12 +43,11 @@
+ Comment[sk]=Archív PAK
+ Comment[sl]=Datotečni arhiv PAK
+ Comment[sr]=Фајл PAK архиве
+-Comment[sr@Latn]=Фајл PAK архиве
++Comment[sr@Latn]=Fajl PAK arhive
+ Comment[sv]=PAK-filarkiv
+ Comment[ta]=PAK கோப்பு காப்பகம்
+ Comment[tg]=Файли архивии PAK
+ Comment[tr]=PAK Dosya Arşivi
+ Comment[uk]=Файл архіву PAK
+ Comment[uz]=PAK архиви
+-Comment[xx]=xxPAK File Archivexx
+ Comment[zh_CN]=PAK 文件归档
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-perl-module.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-perl-module.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-perl-module.desktop	2005-02-23 06:04:57.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-perl-module.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -33,13 +33,12 @@
+ Comment[sk]=Perl modul
+ Comment[sl]=Modul Perl
+ Comment[sr]=Perl модул
+-Comment[sr@Latn]=Perl модул
++Comment[sr@Latn]=Perl modul
+ Comment[sv]=Perl-modul
+ Comment[ta]=Perl கூறு
+ Comment[tg]=Модули Perl
+ Comment[tr]=Perl Modülü
+ Comment[uk]=Модуль мови програмування Perl
+-Comment[xx]=xxPerl Modulexx
+ Comment[zh_CN]=Perl 模块
+ Icon=source_pl
+ Type=MimeType
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-perl.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-perl.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-perl.desktop	2005-02-23 06:04:57.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-perl.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -33,13 +33,12 @@
+ Comment[sk]=Perl program
+ Comment[sl]=Program v perlu
+ Comment[sr]=Perl програм
+-Comment[sr@Latn]=Perl програм
++Comment[sr@Latn]=Perl program
+ Comment[sv]=Perl-program
+ Comment[ta]=Perl நிரல்
+ Comment[tg]=Программаи Perl
+ Comment[tr]=Perl Programı
+ Comment[uk]=Програма PERL
+-Comment[xx]=xxPerl Programxx
+ Comment[zh_CN]=Perl 程序
+ Icon=source_pl
+ Type=MimeType
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-php.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-php.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-php.desktop	2005-02-21 10:17:21.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-php.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=PHP Script
++Comment[af]=PHP Skrip
+ Comment[ar]=ملف PHP
+ Comment[az]=PHP Skripti
+ Comment[be]=Скрыпт PHP
+@@ -60,7 +61,6 @@
+ Comment[uk]=Скрипт мови програмування PHP
+ Comment[uz]=PHP скрипти
+ Comment[wa]=Sicripe PHP
+-Comment[xx]=xxPHP Scriptxx
+ Comment[zh_CN]=PHP 脚本
+ 
+ Icon=source_php
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-pkcs12.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-pkcs12.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-pkcs12.desktop	2005-02-23 06:04:57.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-pkcs12.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -62,7 +62,6 @@
+ Comment[uz]=PKCS#12 сертификатлар тўплами
+ Comment[ven]=Nanda ya sethifikheithi tsha PKCS#12
+ Comment[xh]=PKCS#12 Uqokelelo lwe Siqinisekiso
+-Comment[xx]=xxPKCS#12 Certificate Bundlexx
+ Comment[zh_CN]=PKCS#12 证书束
+ Comment[zh_TW]=PKCS#12 認證
+ Comment[zu]=Isigaxa Sezitifiketi se-PKCS#12
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-pw.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-pw.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-pw.desktop	2004-12-29 18:52:10.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-pw.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -2,11 +2,13 @@
+ Encoding=UTF-8
+ MimeType=application/x-pw
+ Comment=Pathetic Writer Document
++Comment[af]='Pathetic Writer' Dokument
+ Comment[ar]=مستند Pathetic Writer
+ Comment[az]=Pathetic Writer Sənədi
+ Comment[be]=Дакумэнт Pathetic Writer
+ Comment[bg]=Документ на Pathetic Writer
+ Comment[bn]=প্যাথেটিক রাইটার নথী
++Comment[br]=Teul Pathetic Writer
+ Comment[bs]=Pathetic Writer dokument
+ Comment[ca]=Document de Pathetic Writer
+ Comment[cs]=Dokument aplikace Pathetic Writer
+@@ -59,7 +61,6 @@
+ Comment[uk]=Документ Pathetic Writer
+ Comment[uz]=Pathetic Writer ҳужжати
+ Comment[wa]=Documint «Pathetic Writer»
+-Comment[xx]=xxPathetic Writer Documentxx
+ Comment[zh_CN]=Pathetic Writer 文档
+ Comment[zh_TW]=Pathetic Writer 文件
+ Icon=wordprocessing
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-python-bytecode.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-python-bytecode.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-python-bytecode.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-python-bytecode.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -67,7 +67,6 @@
+ Comment[uz]=Python байт-коди
+ Comment[ven]=Python bytecode
+ Comment[wa]=Programe e python (bytecode)
+-Comment[xx]=xxPython Bytecodexx
+ Comment[zh_CN]=Python 字节码
+ Comment[zh_TW]=Python 位元碼
+ Comment[zu]=Ikhodi le-byte le-Python
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-python.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-python.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-python.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-python.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -65,7 +65,6 @@
+ Comment[ven]=Mbekanyamushumo ya Python
+ Comment[wa]=Programe e python
+ Comment[xh]=Udweliso lwenkqubo lwe Python
+-Comment[xx]=xxPython Programxx
+ Comment[zh_CN]=Python 程序
+ Comment[zh_TW]=Python 程式
+ Comment[zu]=Uhlelo lwamafayela lwe-Python
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-quattropro.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-quattropro.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-quattropro.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-quattropro.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -70,7 +70,6 @@
+ Comment[ven]=Faela ya Quattro Pro 
+ Comment[wa]=Documint Quattro Pro
+ Comment[xh]=Uxwebhu lwe Quattro Pro
+-Comment[xx]=xxQuattro Pro Documentxx
+ Comment[zh_CN]=Quattro Pro 文件
+ Comment[zh_TW]=Quattro Pro 文件
+ Comment[zu]=Uhlu lwamafayela lwe-Quattro Pro
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-rar.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-rar.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-rar.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-rar.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -70,7 +70,6 @@
+ Comment[ven]=Fhethu ha u vhulunga zwithu zwa kale ha Rar
+ Comment[wa]=Årtchive RAR
+ Comment[xh]=Indawo yogcino ye Rar
+-Comment[xx]=xxRar Archivexx
+ Comment[zh_CN]=Rar 归档
+ Comment[zh_TW]=Rar 壓縮檔案
+ Comment[zu]=Umqulu we-Rar
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-rpm.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-rpm.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-rpm.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-rpm.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -68,7 +68,6 @@
+ Comment[ven]=Faela ya zwiputa zwa RPM
+ Comment[wa]=Fitchî pacaedje RPM
+ Comment[xh]=Ifayile Yempahla ye RPM
+-Comment[xx]=xxRPM Package Filexx
+ Comment[zh_CN]=RPM 包文件
+ Comment[zh_TW]=RPM 套件檔案
+ Comment[zu]=Ifayela Lephakethe le-RPM
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-ruby.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-ruby.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-ruby.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-ruby.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -59,7 +59,6 @@
+ Comment[uk]=Програма на мові програмування Ruby
+ Comment[uz]=Ruby'да тузилган дастур
+ Comment[wa]=Programe Ruby
+-Comment[xx]=xxRuby Programxx
+ Comment[zh_CN]=Ruby 程序
+ Comment[zh_TW]=Ruby 程式
+ # A source_rb icon is missing...
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-sharedlib.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-sharedlib.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-sharedlib.desktop	2005-02-23 06:04:57.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-sharedlib.desktop	2005-03-12 18:58:52.000000000 +0100
+@@ -64,7 +64,6 @@
+ Comment[ven]=Laiburari yo kovhiwaho
+ Comment[wa]=Pårteye livreye
+ Comment[xh]=Ilayibrari Eyahluliweyo
+-Comment[xx]=xxShared Libraryxx
+ Comment[zh_CN]=共享库
+ Comment[zh_TW]=共用程式庫
+ Comment[zu]=Umtapo wolwazi Osetshenziswa ngokuhlanganyela
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-shellscript.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-shellscript.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-shellscript.desktop	2005-02-21 10:17:21.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-shellscript.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -64,7 +64,6 @@
+ Comment[ven]=Tshikiriputi tsha shell
+ Comment[wa]=Sicripe shell
+ Comment[xh]=Ushicilelo phantsi Lweqokobhe
+-Comment[xx]=xxShell Scriptxx
+ Comment[zh_CN]=Shell 脚本
+ Comment[zh_TW]=Shell 程式
+ Comment[zu]=Isikripti Segobolondo
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-shockwave-flash.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-shockwave-flash.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-shockwave-flash.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-shockwave-flash.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -47,7 +47,6 @@
+ Comment[uz]=Shockwave Flash медиа-файли
+ Comment[ven]=Lupenyo lwa media lua khamadzaho
+ Comment[vi]=Shockwave Flash 
+-Comment[xx]=xxShockwave Flash Mediaxx
+ Comment[zh_CN]=Shockwave Flash 媒体文件
+ Comment[zh_TW]=Shockwave Flash 媒體檔案
+ Comment[zu]=Igagasi lokuthuka le-Flash Media
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-siag.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-siag.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-siag.desktop	2005-01-28 05:03:18.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-siag.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -66,7 +66,6 @@
+ Comment[uz]=Siag электрон жадвали
+ Comment[ven]=U phadaladza ha bammbiri ha Siag
+ Comment[wa]=Documint tåvleu Siag
+-Comment[xx]=xxSiag Spreadsheetxx
+ Comment[zh_CN]=Siag 电子表格
+ Comment[zh_TW]=Siag 電子表格
+ Icon=spreadsheet
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-tar.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-tar.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-tar.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-tar.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -70,7 +70,6 @@
+ Comment[ven]=Fhethu hau vhulungela zwithu zwa kale ha Tar
+ Comment[wa]=Årtchive TAR
+ Comment[xh]=Indawo yogcino ye Tar
+-Comment[xx]=xxTar Archivexx
+ Comment[zh_CN]=Tar 归档
+ Comment[zh_TW]=Tar 壓縮文件
+ Comment[zu]=Umqulu we-Tar
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-tarz.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-tarz.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-tarz.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-tarz.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -70,7 +70,6 @@
+ Comment[vi]=File nén compressed tar 
+ Comment[wa]=Årtchive TAR rastrindowe
+ Comment[xh]=Indawo yokugcina ye Tar Edityanisiweyo
+-Comment[xx]=xxCompressed Tar Archivexx
+ Comment[zh_CN]=压缩的 Tar 归档
+ Comment[zh_TW]=壓縮的 Tar 壓縮文件
+ Comment[zu]=Umqulu we-Tar Elicindezelwe
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-tbz.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-tbz.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-tbz.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-tbz.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -65,7 +65,6 @@
+ Comment[ven]=Fhethu hau vhulungela zwithu zwa kale ha Tar ya Bzipped
+ Comment[wa]=Årtchive TAR rastrindowe avou bzip
+ Comment[xh]=Indawo yogcino ye Tar Bzipped
+-Comment[xx]=xxBzipped Tar Archivexx
+ Comment[zh_CN]=Bzip 压缩的 Tar 归档
+ Comment[zh_TW]=Bzip 壓縮的 Tar 壓縮文件
+ Comment[zu]=Umqulu we-Tar lwe-Bzipped
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-tex-gf.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-tex-gf.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-tex-gf.desktop	2005-01-21 05:24:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-tex-gf.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -64,7 +64,6 @@
+ Comment[ven]=Fontu ya vhukuma
+ Comment[wa]=Fonte djenerike
+ Comment[xh]=Uhlobo lwamagama Elisetyenziswa ngumntu wonke
+-Comment[xx]=xxGeneric Fontxx
+ Comment[zh_CN]=普通字体文件
+ Comment[zh_TW]=一般字型檔案
+ Comment[zu]=Uhlobo lwamagama Lawonke wonke
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-tex-pk.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-tex-pk.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-tex-pk.desktop	2005-01-21 05:24:19.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-tex-pk.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -64,7 +64,6 @@
+ Comment[ven]=Fontu yo dzudzanywaho
+ Comment[wa]=Fontes PK po TeX
+ Comment[xh]=Umgca Opakishiweyo
+-Comment[xx]=xxPacked Fontxx
+ Comment[zh_CN]=打包的字体
+ Comment[zh_TW]=壓縮的字型檔案
+ Comment[zu]=Uhlobo lwamafayela Olupakishiwe
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-tgif.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-tgif.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-tgif.desktop	2005-01-21 05:24:19.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-tgif.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -68,7 +68,6 @@
+ Comment[vi]=Tài liệu TGIF
+ Comment[wa]=Documint TGIF
+ Comment[xh]=TGIF Uxwebhu
+-Comment[xx]=xxTGIF Documentxx
+ Comment[zh_CN]=TGIF 文档
+ Comment[zh_TW]=TGIF 文件
+ Comment[zu]=Uhlu lwamafayela lwe-TGIF
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-tgz.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-tgz.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-tgz.desktop	2005-01-21 05:24:19.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-tgz.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -74,7 +74,6 @@
+ Comment[vi]=File nén gzipped tar 
+ Comment[wa]=Årtchive TAR rastrindowe avou gzip
+ Comment[xh]=Indawo yogcino ye Gzipped Tar
+-Comment[xx]=xxGzipped Tar Archivexx
+ Comment[zh_CN]=Gzip 压缩的 Tar 归档
+ Comment[zh_TW]=Gzip 壓縮的 Tar 壓縮文件
+ Comment[zu]=Umqulu we-Gzipped Tar
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-trash.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-trash.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-trash.desktop	2005-01-21 05:24:19.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-trash.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -68,7 +68,6 @@
+ Comment[ven]=Faela yau tikedza
+ Comment[wa]=Fitchî copeye di såvrité
+ Comment[xh]=Ifayile Yogcino lwasemva
+-Comment[xx]=xxBackup Filexx
+ Comment[zh_CN]=备份文件
+ Comment[zh_TW]=備份檔案
+ Comment[zu]=Ifayela Lokugcina okwesibili
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-troff-man.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-troff-man.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-troff-man.desktop	2005-01-21 05:24:19.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-troff-man.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -63,7 +63,6 @@
+ Comment[ven]=Manwalwa a Troff a rena siatari la macros
+ Comment[wa]=Documint troff (pådje di man)
+ Comment[xh]=Uxwebhu lwe Troff ene Manpage Macros
+-Comment[xx]=xxTroff Document with Manpage Macrosxx
+ Comment[zh_CN]=带有 Manpage 宏的 Troff 文档
+ Comment[zh_TW]=帶有 Manpage 巨集 Troff 文件
+ Comment[zu]=Faka kuhlu lwamafayela lwe-Troff nge-Manpage Macros
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-troff.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-troff.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-troff.desktop	2005-01-21 05:24:19.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-troff.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -66,7 +66,6 @@
+ Comment[ven]=Manwalwa a Troff
+ Comment[wa]=Documint troff
+ Comment[xh]=Uxwebhu lwe Troff
+-Comment[xx]=xxTroff Documentxx
+ Comment[zh_CN]=Troff 文档
+ Comment[zh_TW]=Troff 文件
+ Comment[zu]=Uhlu lwamafayela lwe-Troff
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-tzo.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-tzo.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-tzo.desktop	2005-01-21 05:24:19.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-tzo.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -71,7 +71,6 @@
+ Comment[vi]=File nén Lzopped Tar 
+ Comment[wa]=Årtchive TAR rastrindowe avou lzop
+ Comment[xh]=Ugcino lwasecaleni lwe Tar Lzopped
+-Comment[xx]=xxLzopped Tar Archivexx
+ Comment[zh_CN]=Lzopped 压缩的 Tar 归档
+ Comment[zh_TW]=Lzop 壓縮的 Tar 壓縮文件
+ Comment[zu]=Umquu lwe-Lzopped Tar
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-vnd.kde.kexi.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-vnd.kde.kexi.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-vnd.kde.kexi.desktop	2005-01-26 05:15:07.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-vnd.kde.kexi.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -6,6 +6,7 @@
+ Patterns=*.kexi;
+ X-KDE-AutoEmbed=false
+ Comment=Kexi Project File
++Comment[af]=Kexi Projek Lêer
+ Comment[ar]=ملف مشروع Kexi
+ Comment[az]=Kexi Layihə Faylı
+ Comment[be]=Файл праекту Kexi
+@@ -63,7 +64,6 @@
+ Comment[uk]=Файл проекту Kexi
+ Comment[uz]=Kexi лойиҳа файли
+ Comment[wa]=Fitchî di prodjet Kexi
+-Comment[xx]=xxKexi Project Filexx
+ Comment[zh_CN]=Kexi 项目文件
+ Comment[zh_TW]=Kexi 專案檔案
+ [Property::X-KDE-NativeExtension]
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-vnd.kde.kplato.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-vnd.kde.kplato.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-vnd.kde.kplato.desktop	2005-02-23 06:04:58.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-vnd.kde.kplato.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -3,6 +3,7 @@
+ Encoding=UTF-8
+ MimeType=application/x-vnd.kde.kplato
+ Comment=KPlato Project Management Document
++Comment[af]=KPlato Projek Bestuur Dokument
+ Comment[bg]=Документ на KPlato Project Management
+ Comment[bn]=কে-প্লেটো প্রোজেক্ট ম্যানেজমেন্ট নথী
+ Comment[bs]=KPlato Menadžment projektima dokument
+@@ -41,14 +42,13 @@
+ Comment[sk]=KPlato dokument pre správu projektov
+ Comment[sl]=Dokument za projektno upravljanje KPlato
+ Comment[sr]=KPlato-ов документ пројекта управљања
+-Comment[sr@Latn]=KPlato-ов документ пројекта управљања
++Comment[sr@Latn]=KPlato-ov dokument projekta upravljanja
+ Comment[sv]=Kplato projekthanteringsdokument
+ Comment[ta]=கேப்ளாட்டோ திட்ட மேலாண்மை ஆவணம்
+ Comment[tg]=Сохти идоракунии санади KPlato
+ Comment[tr]=KPlato Proje Yönetim Dökümanı
+ Comment[uk]=Документ керування проектом KPlato
+ Comment[uz]=KPlato ҳужжати
+-Comment[xx]=xxKPlato Project Management Documentxx
+ Comment[zh_CN]=KPlato 项目管理文档
+ Type=MimeType
+ Patterns=*.kplato;*.kplatot;
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-vnd.kde.kugar.mixed.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-vnd.kde.kugar.mixed.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-vnd.kde.kugar.mixed.desktop	2005-01-21 05:24:19.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-vnd.kde.kugar.mixed.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=kugar_kud
+ Patterns=*.kug
+ Comment=Kugar Archive File
++Comment[af]=Kugar Argief Lêer
+ Comment[ar]=ملف أرشيف كوغار
+ Comment[az]=Kugar Arxiv Faylı
+ Comment[be]=Архіўны файл Kugar
+@@ -62,7 +63,6 @@
+ Comment[uk]=Архів Kugar
+ Comment[uz]=Kugar архив файли
+ Comment[wa]=Fitchî årtchive Kugar
+-Comment[xx]=xxKugar Archive Filexx
+ Comment[zh_CN]=Kugar 归档文件
+ Comment[zh_TW]=Kugar 壓縮檔案
+ [Property::X-KDE-NativeExtension]
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-webarchive.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-webarchive.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-webarchive.desktop	2005-02-23 06:04:58.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-webarchive.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -36,7 +36,7 @@
+ Comment[sk]=Webový archív
+ Comment[sl]=Spletni arhiv
+ Comment[sr]=Веб архива
+-Comment[sr@Latn]=Веб архива
++Comment[sr@Latn]=Veb arhiva
+ Comment[sv]=Webbarkiv
+ Comment[ta]=வலைக் காப்பகம்
+ Comment[tg]=Архиви Web
+@@ -45,7 +45,6 @@
+ Comment[ven]=Webu yau vhulunga zwakale
+ Comment[vi]=Lưu trữ web 
+ Comment[xh]=Ushicilelo lukawonke-wonke kunye nexwebhu leMbali
+-Comment[xx]=xxWeb Archivexx
+ Comment[zh_CN]=Web 归档
+ Comment[zu]=Ushicilelo layoyonke imiqulu ye Web
+ Icon=www
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-x509-ca-cert.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-x509-ca-cert.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-x509-ca-cert.desktop	2005-01-21 05:24:19.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-x509-ca-cert.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -65,7 +65,6 @@
+ Comment[ven]=DER, PEM, kana Netscape encoded X.509 Sethifikheithi
+ Comment[wa]=Acertineure X.509 DER, PEM ou ecôdêye pa Netscape
+ Comment[xh]=DER, PEM, okanye Netscape Esikhowudiweyo Isiqinisekiso se X.509
+-Comment[xx]=xxDER, PEM, or Netscape Encoded X.509 Certificatexx
+ Comment[zh_CN]=DER，PEM 或 Netscape 编码的 X.509 证书
+ Comment[zh_TW]=DER、PEM、或 Netscape 編碼的 X.509 認證
+ Comment[zu]=DER, PEM, noma Isitifiketi Esifakwe ikhodi se X.509
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-xliff.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-xliff.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-xliff.desktop	2005-02-23 06:04:58.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-xliff.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -36,11 +36,10 @@
+ Comment[sk]=Prekladový súbor XLIFF
+ Comment[sl]=Datoteka s prevodi XLIFF
+ Comment[sr]=XLIFF фајл са преводима
+-Comment[sr@Latn]=XLIFF фајл са преводима
++Comment[sr@Latn]=XLIFF fajl sa prevodima
+ Comment[sv]=XLIFF-översättningsfil
+ Comment[ta]=XLIFF மொழிப்பெயர்ப்பு கோப்பு
+ Comment[tg]=Файли Тарҷумаи XLIFF
+ Comment[tr]=XLIFF Çeviri Dosyası
+ Comment[uk]=Файл перекладу XLIFF
+-Comment[xx]=xxXLIFF Translation Filexx
+ Comment[zh_CN]=XLIFF 翻译文件
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-zerosize.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-zerosize.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-zerosize.desktop	2005-01-21 05:24:19.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-zerosize.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -68,7 +68,6 @@
+ Comment[vi]=Tài liệu trống
+ Comment[wa]=Documint vude
+ Comment[xh]=Uxwebh Olungenanto
+-Comment[xx]=xxEmpty Documentxx
+ Comment[zh_CN]=空文档
+ Comment[zh_TW]=空的文件
+ Comment[zu]=Uhlu lwamafayela Olungenalutho
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-zip-compressed.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-zip-compressed.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-zip-compressed.desktop	2005-01-21 05:24:19.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-zip-compressed.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -69,7 +69,6 @@
+ Comment[ven]=Fhethu hau vhulungela zwithu zwa kale ha Zip
+ Comment[wa]=Årtchive ZIP
+ Comment[xh]=Indawo yogcino ye Zip
+-Comment[xx]=xxZip Archivexx
+ Comment[zh_CN]=Zip 归档
+ Comment[zh_TW]=Zip 壓縮文件
+ Comment[zu]=Umqulu we-Zip
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-zip.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-zip.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-zip.desktop	2005-01-21 05:24:19.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-zip.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -70,7 +70,6 @@
+ Comment[ven]=Fhethu hau vhulungela zwithu zwa kale ha Zip
+ Comment[wa]=Årtchive ZIP
+ Comment[xh]=Indawo yogcino ye Zip
+-Comment[xx]=xxZip Archivexx
+ Comment[zh_CN]=Zip 归档
+ Comment[zh_TW]=Zip 壓縮文件
+ Comment[zu]=Umqulu we-Zip
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/x-zoo.desktop kdelibs_3_4_BRANCH/mimetypes/application/x-zoo.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/x-zoo.desktop	2005-01-21 05:24:19.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/x-zoo.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -70,7 +70,6 @@
+ Comment[ven]=Fhethu hau vhulungela zwithu zwa kale ho vhewaho zwipuka
+ Comment[wa]=Årtchive ZOO
+ Comment[xh]=Indawo yogcino ye Zoo
+-Comment[xx]=xxZoo Archivexx
+ Comment[zh_CN]=Zoo 归档
+ Comment[zh_TW]=Zoo 壓縮文件
+ Comment[zu]=Umqulu We-zoo
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/xhtml+xml.desktop kdelibs_3_4_BRANCH/mimetypes/application/xhtml+xml.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/xhtml+xml.desktop	2005-01-21 05:24:19.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/xhtml+xml.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=XHTML Family Document
++Comment[af]=XHTML Familie Dokument
+ Comment[ar]=مستند XHTML
+ Comment[az]=XHTML Ailəsi Sənədi
+ Comment[be]=Дакумэнт XHTML
+@@ -60,7 +61,6 @@
+ Comment[uk]=Документ XHTML
+ Comment[uz]=XHTML оиласига оид ҳужжат
+ Comment[wa]=Documint XHTML
+-Comment[xx]=xxXHTML Family Documentxx
+ Comment[zh_CN]=XHTML 及类似文档
+ Comment[zh_TW]=XHTML Family 文件
+ Type=MimeType
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/xml.desktop kdelibs_3_4_BRANCH/mimetypes/application/xml.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/xml.desktop	2004-12-29 18:52:10.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/xml.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=XML Document
++Comment[af]=XML Dokument
+ Comment[ar]=مستند XML
+ Comment[az]=XML Sənədi
+ Comment[be]=Дакумэнт XML
+@@ -60,7 +61,6 @@
+ Comment[uk]=Документ XML
+ Comment[uz]=XML ҳужжати
+ Comment[wa]=Documint XML
+-Comment[xx]=xxXML Documentxx
+ Comment[zh_CN]=XML 文档
+ Comment[zh_TW]=XML 文件
+ Icon=html
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/application/xsd.desktop kdelibs_3_4_BRANCH/mimetypes/application/xsd.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/application/xsd.desktop	2005-02-23 06:04:58.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/application/xsd.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -30,13 +30,12 @@
+ Comment[sk]=XML schéma W3C
+ Comment[sl]=Shema W3C XML
+ Comment[sr]=W3C XML шема
+-Comment[sr@Latn]=W3C XML шема
++Comment[sr@Latn]=W3C XML šema
+ Comment[sv]=W3C XML-schema
+ Comment[ta]=W3C XML திட்டம்
+ Comment[tg]=Нақшаи W3C XML
+ Comment[tr]=W3C XML Şeması
+ Comment[uk]=Схема W3C XML
+-Comment[xx]=xxW3C XML Schemaxx
+ Comment[zh_CN]=W3C WML 大纲
+ Icon=html
+ Type=MimeType
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/audio/aac.desktop kdelibs_3_4_BRANCH/mimetypes/audio/aac.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/audio/aac.desktop	2004-12-29 18:52:16.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/audio/aac.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=sound
+ Patterns=*.aac;*.AAC;
+ Comment=AAC Sound
++Comment[af]=AAC Klank
+ Comment[ar]=ملف AAC صوتي
+ Comment[az]=AAC Səsi
+ Comment[be]=AAC аўдыё
+@@ -63,6 +64,5 @@
+ Comment[uk]=Аудіо AAC
+ Comment[uz]=AAC аудио
+ Comment[wa]=Son AAC
+-Comment[xx]=xxAAC Soundxx
+ Comment[zh_CN]=AAC 声音
+ Comment[zh_TW]=AAC 音效
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/audio/ac3.desktop kdelibs_3_4_BRANCH/mimetypes/audio/ac3.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/audio/ac3.desktop	2005-01-21 05:24:24.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/audio/ac3.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=sound
+ Patterns=*.ac3;*.AC3;
+ Comment=Dolby AC3 Sound
++Comment[af]=Dolby AC3 Klank
+ Comment[ar]=ملف صوتي Dolby AC3
+ Comment[az]=Dolby AC3 Səsi
+ Comment[be]=Dolby AC3 аўдыё
+@@ -62,6 +63,5 @@
+ Comment[uk]=Аудіо Dolby AC3
+ Comment[uz]=Dolby AC3 аудио
+ Comment[wa]=Son AC3 Dolby
+-Comment[xx]=xxDolby AC3 Soundxx
+ Comment[zh_CN]=杜比 AC3 声音
+ Comment[zh_TW]=Dolby AC3 音效
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/audio/basic.desktop kdelibs_3_4_BRANCH/mimetypes/audio/basic.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/audio/basic.desktop	2005-01-21 05:24:24.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/audio/basic.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -62,7 +62,6 @@
+ Comment[ven]=ULAW (Duvha) Zwinopfiwa
+ Comment[wa]=Son ULAW (Sun)
+ Comment[xh]=ULAW (Sun) Evakalayo
+-Comment[xx]=xxULAW (Sun) Audioxx
+ Comment[zh_CN]=ULAW (Sun) 音频
+ Comment[zh_TW]=ULAW (Sun) 聲音文件
+ Comment[zu]=Okuzwakalayo kwe-ULAW (Ilanga)
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/audio/mp4.desktop kdelibs_3_4_BRANCH/mimetypes/audio/mp4.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/audio/mp4.desktop	2005-01-21 05:24:24.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/audio/mp4.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=sound
+ Patterns=*.m4a;*.M4A;
+ Comment=MPEG-4 Audio
++Comment[af]=MPEG-4 Klank
+ Comment[ar]=صوت MPEG-4
+ Comment[be]=MPEG-4 аўдыё
+ Comment[bg]=Аудио файл MPEG-4
+@@ -60,6 +61,5 @@
+ Comment[uk]=Аудіо MPEG-4
+ Comment[uz]=MPEG-4 аудио
+ Comment[wa]=Fitchî odio MPEG-4
+-Comment[xx]=xxMPEG-4 Audioxx
+ Comment[zh_CN]=MPEG4 音频
+ X-KDE-IsAlso=video/quicktime
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/audio/mpeg.desktop kdelibs_3_4_BRANCH/mimetypes/audio/mpeg.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/audio/mpeg.desktop	2005-02-23 06:05:02.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/audio/mpeg.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -7,6 +7,7 @@
+ MimeType=audio/mpeg
+ Icon=sound
+ Comment=MPEG Audio
++Comment[af]=MPEG Klank
+ Comment[be]=MPEG аўдыё
+ Comment[bg]=Аудио файл MPEG
+ Comment[bn]=এমপেগ অডিও
+@@ -48,12 +49,11 @@
+ Comment[sk]=Zvuk MPEG
+ Comment[sl]=Zvok MPEG
+ Comment[sr]=MPEG аудио
+-Comment[sr@Latn]=MPEG аудио
++Comment[sr@Latn]=MPEG audio
+ Comment[sv]=MPEG-ljud
+ Comment[ta]=MPEG கேட்பொலி
+ Comment[th]=แฟ้มเสียง MPEG
+ Comment[tr]=MPEG Sesi
+ Comment[uk]=Аудіо запис MPEG
+ Comment[uz]=MPEG аудио
+-Comment[xx]=xxMPEG Audioxx
+ Comment[zh_CN]=MPEG 音频
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/audio/mpegurl.desktop kdelibs_3_4_BRANCH/mimetypes/audio/mpegurl.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/audio/mpegurl.desktop	2005-02-21 10:17:21.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/audio/mpegurl.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -67,7 +67,6 @@
+ Comment[uz]=Streaming MPEG Layer 3 аудио
+ Comment[ven]=Mbemba tharu dzi elelaho dza MPEG dzino pfiwa
+ Comment[xh]=Ulwaleko Lwesithathu Oluqukuqelayo lwe MPEG
+-Comment[xx]=xxStreaming MPEG Layer 3 Audioxx
+ Comment[zh_CN]=流式 MP3 音频文件
+ Comment[zh_TW]=串流 MP3 音樂
+ Comment[zu]=Ontantayo Ozwakalayo Ugqinsi 3 we-MPEG
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/audio/prs.sid.desktop kdelibs_3_4_BRANCH/mimetypes/audio/prs.sid.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/audio/prs.sid.desktop	2005-02-23 06:05:02.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/audio/prs.sid.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=sound
+ Patterns=*.sid;*.SID;*.psid;*.PSID
+ Comment=C64 SID Music
++Comment[af]=C64 SID Musiek
+ Comment[be]=Музыка C64 SID
+ Comment[bg]=Аудио файл C64 SID
+ Comment[bn]=C64 SID মিউসিক
+@@ -44,12 +45,11 @@
+ Comment[sk]=Zvuk C64 SID
+ Comment[sl]=Glasba C64 SID
+ Comment[sr]=C64 SID музика
+-Comment[sr@Latn]=C64 SID музика
++Comment[sr@Latn]=C64 SID muzika
+ Comment[sv]=C64 SID-musik
+ Comment[ta]=குறுந்தட்டு ஒலி
+ Comment[tg]=Мусиқии C64 SID
+ Comment[tr]=C64 SID Müziği
+ Comment[uk]=Аудіо C64 SID
+ Comment[uz]=C64 SID мусиқа
+-Comment[xx]=xxC64 SID Musicxx
+ Comment[zh_CN]=C64 SID 音频
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/audio/vnd.rn-realaudio.desktop kdelibs_3_4_BRANCH/mimetypes/audio/vnd.rn-realaudio.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/audio/vnd.rn-realaudio.desktop	2005-01-05 04:58:40.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/audio/vnd.rn-realaudio.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -6,6 +6,7 @@
+ Patterns=*.ra;*.ram;*.RA;*.RAM;
+ X-KDE-IsAlso=audio/x-pn-realaudio
+ Comment=RealAudio File
++Comment[af]=RealAudio Lêer
+ Comment[ar]=ملف Real Audio
+ Comment[az]=RealAudio Faylı
+ Comment[be]=Файл RealAudio
+@@ -65,7 +66,6 @@
+ Comment[uk]=Файл RealAudio
+ Comment[uz]=RealAudio-файли
+ Comment[wa]=Fitchî RealAudio
+-Comment[xx]=xxRealAudio Filexx
+ Comment[zh_CN]=RealAudio 文件
+ Comment[zh_TW]=RealAudio 檔案
+ [Property::X-KDE-NativeExtension]
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/audio/vorbis.desktop kdelibs_3_4_BRANCH/mimetypes/audio/vorbis.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/audio/vorbis.desktop	2005-01-21 05:24:24.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/audio/vorbis.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=sound
+ X-KDE-IsAlso=audio/x-vorbis
+ Comment=Ogg Vorbis Audio
++Comment[af]=Ogg Vorbis Klank
+ Comment[ar]=ملف Ogg Vorbis صوتي
+ Comment[be]=Ogg Vorbis аўдыё
+ Comment[bg]=Аудио файл Ogg Vorbis
+@@ -62,6 +63,5 @@
+ Comment[uk]=Аудіо Ogg Vorbis
+ Comment[uz]=Ogg Vorbis аудио
+ Comment[wa]=Fitchî odio Ogg Vorbis
+-Comment[xx]=xxOgg Vorbis Audioxx
+ Comment[zh_CN]=Ogg Vorbis 音频
+ Comment[zh_TW]=Ogg Vorbis 音效
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/audio/x-adpcm.desktop kdelibs_3_4_BRANCH/mimetypes/audio/x-adpcm.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/audio/x-adpcm.desktop	2005-01-21 05:24:24.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/audio/x-adpcm.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -2,7 +2,7 @@
+ Encoding=UTF-8
+ Type=MimeType
+ Comment=PCM Audio
+-Comment[af]=Pcm Audio
++Comment[af]=PCM Klank
+ Comment[ar]=صوت PCM
+ Comment[be]=PCM аўдыё
+ Comment[bg]=Аудио файл PCM
+@@ -64,7 +64,6 @@
+ Comment[ven]=Zwinopfiwa zwa PCM
+ Comment[wa]=Son PCM
+ Comment[xh]=PCM Evakalayo
+-Comment[xx]=xxPCM Audioxx
+ Comment[zh_CN]=PCM 音频文件
+ Comment[zh_TW]=PCM 聲音文件
+ Comment[zu]=Okuzwakalayo kwe-PCM
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/audio/x-aiff.desktop kdelibs_3_4_BRANCH/mimetypes/audio/x-aiff.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/audio/x-aiff.desktop	2005-01-21 05:24:24.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/audio/x-aiff.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -2,7 +2,7 @@
+ Encoding=UTF-8
+ Type=MimeType
+ Comment=AIFF/Amiga Audio
+-Comment[af]=Aiff/Amiga Audio
++Comment[af]=Aiff/Amiga Klank
+ Comment[ar]=صوت AIFF/Amiga
+ Comment[be]=AIFF/Amiga аўдыё
+ Comment[bg]=Аудио файл AIFF/Amiga
+@@ -64,7 +64,6 @@
+ Comment[ven]=Zwinopfiwa zwa AIFF/Amiga
+ Comment[wa]=Son AIFF/Amiga
+ Comment[xh]=AIFF/Amiga Evakalayo
+-Comment[xx]=xxAIFF/Amiga Audioxx
+ Comment[zh_CN]=AIFF/Amiga 音频
+ Comment[zh_TW]=AIFF/Amiga 聲音文件
+ Comment[zu]=Okuzwakalayo kwe-AIFF/Amiga
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/audio/x-flac.desktop kdelibs_3_4_BRANCH/mimetypes/audio/x-flac.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/audio/x-flac.desktop	2005-01-21 05:24:24.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/audio/x-flac.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=MimeType
+ Comment=FLAC Audio
++Comment[af]=FLAC Klank
+ Comment[ar]=ملف FLAC صوتي
+ Comment[be]=FLAC аўдыё
+ Comment[bg]=Аудио файл FLAC
+@@ -58,7 +59,6 @@
+ Comment[uk]=Аудіо FLAC
+ Comment[uz]=FLAC аудио
+ Comment[wa]=Fitchî odio FLAC
+-Comment[xx]=xxFLAC Audioxx
+ Comment[zh_CN]=FLAC 音频
+ Comment[zh_TW]=FLAC 聲音
+ MimeType=audio/x-flac
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/audio/x-matroska.desktop kdelibs_3_4_BRANCH/mimetypes/audio/x-matroska.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/audio/x-matroska.desktop	2005-01-21 05:24:24.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/audio/x-matroska.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=sound
+ Patterns=*.mka;*.MKA;
+ Comment=Matroska Audio
++Comment[af]=Matroska Klank
+ Comment[ar]=ملف ماتروسكا صوتي
+ Comment[be]=Матрошка аўдыё
+ Comment[bg]=Аудио файл Matroska
+@@ -59,6 +60,5 @@
+ Comment[uk]=Аудіо Матрьошка
+ Comment[uz]=Matroska аудио
+ Comment[wa]=Fitchî odio Matroska
+-Comment[xx]=xxMatroska Audioxx
+ Comment[zh_CN]=Matroska 音频
+ Comment[zh_TW]=Matroska 聲音
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/audio/x-midi.desktop kdelibs_3_4_BRANCH/mimetypes/audio/x-midi.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/audio/x-midi.desktop	2005-01-21 05:24:24.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/audio/x-midi.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -5,7 +5,7 @@
+ Icon=midi
+ Patterns=*.mid;*.MID;
+ Comment=MIDI Audio
+-Comment[af]=Midi Audio
++Comment[af]=MIDI Klank
+ Comment[ar]=صوت MIDI
+ Comment[be]=MIDI аўдыё
+ Comment[bg]=Аудио файл MIDI
+@@ -67,7 +67,6 @@
+ Comment[ven]=Zwinopfiwa zwa MIDI
+ Comment[wa]=Son MIDI
+ Comment[xh]=MIDI Evakalayo
+-Comment[xx]=xxMIDI Audioxx
+ Comment[zh_CN]=MIDI 音频
+ Comment[zh_TW]=MIDI 聲音文件
+ Comment[zu]=Okuzwakalayo kwe-MIDI
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/audio/x-mod.desktop kdelibs_3_4_BRANCH/mimetypes/audio/x-mod.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/audio/x-mod.desktop	2005-01-21 05:24:24.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/audio/x-mod.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -64,7 +64,6 @@
+ Comment[uk]=Amiga Soundtracker-аудіо
+ Comment[uz]=Amiga Soundtracker аудио
+ Comment[ven]=Zwinopfiwa zwa mubvumo ya luimbo zwa Amiga
+-Comment[xx]=xxAmiga Soundtracker Audioxx
+ Comment[zh_CN]=Amiga soundtracker 音频文件
+ Comment[zh_TW]=Amiga 聲軌聲音文件
+ Comment[zu]=Ozwakalayo Umlandeli womsindo we-Amiga
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/audio/x-mp2.desktop kdelibs_3_4_BRANCH/mimetypes/audio/x-mp2.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/audio/x-mp2.desktop	2005-02-23 06:05:02.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/audio/x-mp2.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -6,6 +6,7 @@
+ Patterns=*.mp2;*.MP2;
+ X-KDE-IsAlso=audio/mpeg
+ Comment=MPEG Layer 2 Audio
++Comment[af]=MPEG Vlak 2 Klank
+ Comment[be]=MPEG Layer 2 аўдыё
+ Comment[bg]=Аудио файл MP2
+ Comment[bn]=এমপেগ লেয়ার ২ অডিও
+@@ -44,12 +45,11 @@
+ Comment[sk]=Zvuk MPEG layer 2
+ Comment[sl]=Zvok oblike MPEG layer 2
+ Comment[sr]=MPEG ниво 2 аудио
+-Comment[sr@Latn]=MPEG ниво 2 аудио
++Comment[sr@Latn]=MPEG nivo 2 audio
+ Comment[sv]=MPEG lager 2-ljud
+ Comment[ta]=MPEG அடுக்கு 3  கேட்பொலி
+ Comment[tg]=Файли садои лояи 2 барои MPEG
+ Comment[tr]=MPEG Seviye 2 Ses
+ Comment[uk]=Аудіо запис MPEG Layer 2
+ Comment[uz]=MPEG Layer 2 аудио
+-Comment[xx]=xxMPEG Layer 2 Audioxx
+ Comment[zh_CN]=MP2 音频文件
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/audio/x-mp3.desktop kdelibs_3_4_BRANCH/mimetypes/audio/x-mp3.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/audio/x-mp3.desktop	2005-01-21 05:24:24.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/audio/x-mp3.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -6,7 +6,7 @@
+ Patterns=*.mp3;*.MP3;*.Mp3;
+ X-KDE-IsAlso=audio/mpeg
+ Comment=MPEG Layer 3 Audio
+-Comment[af]=Mpeg Laag 3 Audio
++Comment[af]=MPEG Vlak 3 Klank
+ Comment[ar]=صوت MPEG الطبقة 3
+ Comment[be]=MPEG Layer 3 аўдыё
+ Comment[bg]=Аудио файл MP3
+@@ -68,7 +68,6 @@
+ Comment[ven]=Zwinopfiwa zwa mbemba tharu zwa MPEG
+ Comment[wa]=Son MP3
+ Comment[xh]=MPEG Ulwaleko 3 Evakalayo
+-Comment[xx]=xxMPEG Layer 3 Audioxx
+ Comment[zh_CN]=MP3 音频文件
+ Comment[zh_TW]=MP3 音樂
+ Comment[zu]=Ozwakalayo Ugqinsi 3 we-MPEG
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/audio/x-mpegurl.desktop kdelibs_3_4_BRANCH/mimetypes/audio/x-mpegurl.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/audio/x-mpegurl.desktop	2005-02-21 10:17:21.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/audio/x-mpegurl.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -65,7 +65,6 @@
+ Comment[uz]=Streaming MPEG Layer 3 аудио
+ Comment[ven]=Mbemba tharu dzi elelaho dza MPEG dzino pfiwa
+ Comment[xh]=Ulwaleko Lwesithathu Oluqukuqelayo lwe MPEG
+-Comment[xx]=xxStreaming MPEG Layer 3 Audioxx
+ Comment[zh_CN]=流式 MP3 音频文件
+ Comment[zh_TW]=串流 MP3 音樂
+ Comment[zu]=Ontantayo Ozwakalayo Ugqinsi 3 we-MPEG
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/audio/x-ms-wma.desktop kdelibs_3_4_BRANCH/mimetypes/audio/x-ms-wma.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/audio/x-ms-wma.desktop	2005-02-23 06:05:02.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/audio/x-ms-wma.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=audio
+ Patterns=*.wma;*.WMA
+ Comment=Windows Media Audio
++Comment[af]=Windows Media Klank
+ Comment[be]=Windows Media аўдыё
+ Comment[bg]=Аудио файл Windows Media
+ Comment[bn]=উইন্ডোস মিডিয়া অডিও
+@@ -41,12 +42,11 @@
+ Comment[se]=Windows Media-jietna
+ Comment[sl]=Avdio Windows Media
+ Comment[sr]=Windows медија аудио
+-Comment[sr@Latn]=Windows медија аудио
++Comment[sr@Latn]=Windows medija audio
+ Comment[sv]=Windows-medialjud
+ Comment[ta]=சாளரங்களின் ஊடக கேட்பொலி
+ Comment[tg]=Аудиофайли Windows Media
+ Comment[tr]=Windows Çoklu Ortam Sesi
+ Comment[uk]=Аудіо запис Windows Media
+ Comment[uz]=Windows Media аудио
+-Comment[xx]=xxWindows Media Audioxx
+ Comment[zh_CN]=Windows Media 音频
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/audio/x-musepack.desktop kdelibs_3_4_BRANCH/mimetypes/audio/x-musepack.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/audio/x-musepack.desktop	2005-02-23 06:05:02.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/audio/x-musepack.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=sound
+ Patterns=*.mpc;*.MPC;*.mp+;*.MP+
+ Comment=Musepack Audio
++Comment[af]=Musepack Klank
+ Comment[be]=Musepack аўдыё
+ Comment[bg]=Аудио файл Musepack
+ Comment[bn]=মিউস-প্যাক অডিও
+@@ -42,12 +43,11 @@
+ Comment[sk]=Zvuk Musepack
+ Comment[sl]=Zvok Musepack
+ Comment[sr]=Musepack аудио
+-Comment[sr@Latn]=Musepack аудио
++Comment[sr@Latn]=Musepack audio
+ Comment[sv]=Musepack-ljud
+ Comment[ta]= மியுஸ்பேக் ஒலி
+ Comment[tg]=Файли садоии Musepack
+ Comment[tr]=Musepack Sesi
+ Comment[uk]=Аудіо запис Musepack
+ Comment[uz]=Musepack аудио
+-Comment[xx]=xxMusepack Audioxx
+ Comment[zh_CN]=Musepack 音频
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/audio/x-oggflac.desktop kdelibs_3_4_BRANCH/mimetypes/audio/x-oggflac.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/audio/x-oggflac.desktop	2005-01-21 05:24:24.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/audio/x-oggflac.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=sound
+ X-KDE-IsAlso=application/ogg
+ Comment=Ogg FLAC Audio
++Comment[af]=Ogg FLAC Klank
+ Comment[ar]=ملف Ogg FLAC صوتي
+ Comment[be]=Ogg FLAC аўдыё
+ Comment[bg]=Аудио файл Ogg FLAC
+@@ -60,6 +61,5 @@
+ Comment[uk]=Аудіо Ogg FLAC
+ Comment[uz]=Ogg FLAC аудио
+ Comment[wa]=Fitchî odio Ogg FLAC
+-Comment[xx]=xxOgg FLAC Audioxx
+ Comment[zh_CN]=Ogg FLAC 音频
+ Comment[zh_TW]=Ogg FLAC 聲音
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/audio/x-pn-realaudio.desktop kdelibs_3_4_BRANCH/mimetypes/audio/x-pn-realaudio.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/audio/x-pn-realaudio.desktop	2005-01-05 04:58:40.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/audio/x-pn-realaudio.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -4,6 +4,7 @@
+ MimeType=audio/x-pn-realaudio
+ Icon=sound
+ Comment=RealAudio File
++Comment[af]=RealAudio Lêer
+ Comment[ar]=ملف Real Audio
+ Comment[az]=RealAudio Faylı
+ Comment[be]=Файл RealAudio
+@@ -63,6 +64,5 @@
+ Comment[uk]=Файл RealAudio
+ Comment[uz]=RealAudio-файли
+ Comment[wa]=Fitchî RealAudio
+-Comment[xx]=xxRealAudio Filexx
+ Comment[zh_CN]=RealAudio 文件
+ Comment[zh_TW]=RealAudio 檔案
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/audio/x-scpls.desktop kdelibs_3_4_BRANCH/mimetypes/audio/x-scpls.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/audio/x-scpls.desktop	2005-01-21 05:24:24.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/audio/x-scpls.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -68,7 +68,6 @@
+ Comment[ven]=Mutevhe uno tambiwa wa MP3
+ Comment[vi]=Danh sách MP3 ShoutCast 
+ Comment[xh]=MP3 Uluhlu lokudlala lwe ShoutCast
+-Comment[xx]=xxMP3 ShoutCast Playlistxx
+ Comment[zh_CN]=MP3 ShoutCast 播放列表
+ Comment[zh_TW]=MP3 ShoutCast 播放列表
+ Patterns=*.pls;*.PLS;
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/audio/x-speex.desktop kdelibs_3_4_BRANCH/mimetypes/audio/x-speex.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/audio/x-speex.desktop	2005-01-21 05:24:24.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/audio/x-speex.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=sound
+ Patterns=*.spx;*.SPX;
+ Comment=Speex Audio
++Comment[af]=Speex Klank
+ Comment[ar]=ملف Speex صوتي
+ Comment[be]=Speex аўдыё
+ Comment[bg]=Аудио файл Speex
+@@ -59,6 +60,5 @@
+ Comment[uk]=Аудіо Speex
+ Comment[uz]=Speex аудио
+ Comment[wa]=Fitchî odio speex
+-Comment[xx]=xxSpeex Audioxx
+ Comment[zh_CN]=Speex 音频
+ Comment[zh_TW]=Speex 聲音
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/audio/x-vorbis.desktop kdelibs_3_4_BRANCH/mimetypes/audio/x-vorbis.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/audio/x-vorbis.desktop	2005-01-21 05:24:24.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/audio/x-vorbis.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=sound
+ X-KDE-IsAlso=application/ogg
+ Comment=Ogg Vorbis Audio
++Comment[af]=Ogg Vorbis Klank
+ Comment[ar]=ملف Ogg Vorbis صوتي
+ Comment[be]=Ogg Vorbis аўдыё
+ Comment[bg]=Аудио файл Ogg Vorbis
+@@ -62,6 +63,5 @@
+ Comment[uk]=Аудіо Ogg Vorbis
+ Comment[uz]=Ogg Vorbis аудио
+ Comment[wa]=Fitchî odio Ogg Vorbis
+-Comment[xx]=xxOgg Vorbis Audioxx
+ Comment[zh_CN]=Ogg Vorbis 音频
+ Comment[zh_TW]=Ogg Vorbis 音效
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/audio/x-wav.desktop kdelibs_3_4_BRANCH/mimetypes/audio/x-wav.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/audio/x-wav.desktop	2005-01-21 05:24:24.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/audio/x-wav.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -67,7 +67,6 @@
+ Comment[ven]=Zwinopfiwa zwa WAV
+ Comment[wa]=Son WAV
+ Comment[xh]=WAV Evakalayo
+-Comment[xx]=xxWAV Audioxx
+ Comment[zh_CN]=WAV 音频文件
+ Comment[zh_TW]=WAV 聲音文件
+ Comment[zu]=Okuzwakalayo kwe-WAV
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/cgm.desktop kdelibs_3_4_BRANCH/mimetypes/image/cgm.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/cgm.desktop	2005-01-21 05:24:25.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/cgm.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -60,7 +60,6 @@
+ Comment[ven]=Faela ya khompwutha Graphics
+ Comment[vi]=Metafile của đềEhoạ máy tính 
+ Comment[xh]=Ifayile ye Meta Yemizobo ye Khompyutha
+-Comment[xx]=xxComputer Graphics Metafilexx
+ Comment[zh_CN]=计算机图形元文件
+ Comment[zh_TW]=電腦繪圖檔案
+ Comment[zu]=Ifayela leMeta Lemidwebo Yekhomputha
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/fax-g3.desktop kdelibs_3_4_BRANCH/mimetypes/image/fax-g3.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/fax-g3.desktop	2005-01-21 05:24:25.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/fax-g3.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -66,7 +66,6 @@
+ Comment[uz]=CCITT G3 факс-файли
+ Comment[ven]=Fekisi ya CCITT G3
+ Comment[wa]=Facs CCITT G3
+-Comment[xx]=xxCCITT G3 Faxxx
+ Comment[zh_CN]=CCITT G3 传真
+ Comment[zh_TW]=CCITT G3 傳真
+ Comment[zu]=I-fax le-CCITT
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/gif.desktop kdelibs_3_4_BRANCH/mimetypes/image/gif.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/gif.desktop	2005-01-21 05:24:25.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/gif.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -69,7 +69,6 @@
+ Comment[ven]=Tshifanyiso tsha GIF
+ Comment[wa]=Imådje GIF
+ Comment[xh]=Umfanekiso we GIF
+-Comment[xx]=xxGIF Imagexx
+ Comment[zh_CN]=GIF 图像
+ Comment[zh_TW]=GIF 影像
+ Comment[zu]=Isithombe se-GIF
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/jp2.desktop kdelibs_3_4_BRANCH/mimetypes/image/jp2.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/jp2.desktop	2005-01-21 05:24:25.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/jp2.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=image
+ Patterns=*.jp2;*.JP2
+ Comment=JPEG 2000 Image
++Comment[af]=JPEG 2000 Beeld
+ Comment[ar]=صورة JPEG 2000
+ Comment[az]=JPEG 2000 Rəsmi
+ Comment[be]=Выява JPEG 2000
+@@ -63,6 +64,5 @@
+ Comment[uk]=Зображення JPEG 2000
+ Comment[uz]=JPEG 2000-расм
+ Comment[wa]=Imådje JPEG 2000
+-Comment[xx]=xxJPEG 2000 Imagexx
+ Comment[zh_CN]=JPEG 2000 图像
+ Comment[zh_TW]=JPEG 200 影像
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/jpeg.desktop kdelibs_3_4_BRANCH/mimetypes/image/jpeg.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/jpeg.desktop	2005-01-21 05:24:25.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/jpeg.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -5,7 +5,7 @@
+ Icon=image
+ Patterns=*.jpg;*.JPG;*.jpeg;*.JPEG;
+ Comment=JPEG Image
+-Comment[af]=Jpeg Beeld
++Comment[af]=JPEG Beeld
+ Comment[ar]=صورة JPEG
+ Comment[az]=JPEG Rəsmi
+ Comment[be]=Выява JPEG
+@@ -69,7 +69,6 @@
+ Comment[ven]=Tshifanyiso tsha JPEG
+ Comment[wa]=Imådje JPEG
+ Comment[xh]=Umfanekiso we JPEG
+-Comment[xx]=xxJPEG Imagexx
+ Comment[zh_CN]=JPEG 图像
+ Comment[zh_TW]=JPEG 影像
+ Comment[zu]=Isithombe se-JPEG
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/pjpeg.desktop kdelibs_3_4_BRANCH/mimetypes/image/pjpeg.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/pjpeg.desktop	2005-01-21 05:24:25.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/pjpeg.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -6,7 +6,7 @@
+ Icon=image
+ X-KDE-IsAlso=image/jpeg
+ Comment=JPEG Image
+-Comment[af]=Jpeg Beeld
++Comment[af]=JPEG Beeld
+ Comment[ar]=صورة JPEG
+ Comment[az]=JPEG Rəsmi
+ Comment[be]=Выява JPEG
+@@ -70,7 +70,6 @@
+ Comment[ven]=Tshifanyiso tsha JPEG
+ Comment[wa]=Imådje JPEG
+ Comment[xh]=Umfanekiso we JPEG
+-Comment[xx]=xxJPEG Imagexx
+ Comment[zh_CN]=JPEG 图像
+ Comment[zh_TW]=JPEG 影像
+ Comment[zu]=Isithombe se-JPEG
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/png.desktop kdelibs_3_4_BRANCH/mimetypes/image/png.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/png.desktop	2005-01-21 05:24:25.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/png.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -69,7 +69,6 @@
+ Comment[ven]=Tshifanyiso tsha PNG
+ Comment[wa]=Imådje PNG
+ Comment[xh]=Umfanekiso we PNG
+-Comment[xx]=xxPNG Imagexx
+ Comment[zh_CN]=PNG 图像
+ Comment[zh_TW]=PNG 影像
+ Comment[zu]=Isithombe se-PNG
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/svg+xml.desktop kdelibs_3_4_BRANCH/mimetypes/image/svg+xml.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/svg+xml.desktop	2005-01-21 05:24:25.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/svg+xml.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -57,7 +57,6 @@
+ Comment[ven]=Zwadzigirafu zwi kaliwaho zwa Vekitha
+ Comment[vi]=ĐềEhoạ véc-tơ tềElềEđược (scalable) 
+ Comment[xh]=Imizobo Elinganiselekayo Enesalathisi
+-Comment[xx]=xxScalable Vector Graphicsxx
+ Comment[zh_CN]=可缩放向量图
+ Comment[zh_TW]=可縮放向量圖
+ Comment[zu]=Imidwebo ekalekayo ye-Vector
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/tiff.desktop kdelibs_3_4_BRANCH/mimetypes/image/tiff.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/tiff.desktop	2004-12-29 18:52:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/tiff.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -74,7 +74,6 @@
+ Comment[vi]=A?nh TIFF 
+ Comment[wa]=Imådje TIFF
+ Comment[xh]=Umfanekiso we TIFF
+-Comment[xx]=xxTIFF Imagexx
+ Comment[zh_CN]=TIFF 图像
+ Comment[zh_TW]=TIFF 影像
+ Comment[zu]=Isithombe se-TIFF
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/x-bmp.desktop kdelibs_3_4_BRANCH/mimetypes/image/x-bmp.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/x-bmp.desktop	2004-12-29 18:52:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/x-bmp.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=image
+ Patterns=*.bmp;*.BMP;
+ Comment=BMP Image
++Comment[af]=BMP Beeld
+ Comment[ar]=صورة BMP
+ Comment[az]=BMP Rəsmi
+ Comment[be]=Выява BMP
+@@ -63,6 +64,5 @@
+ Comment[uk]=Зображення BMP
+ Comment[uz]=BMP-расм
+ Comment[wa]=Imådje BMP
+-Comment[xx]=xxBMP Imagexx
+ Comment[zh_CN]=BMP 图像
+ Comment[zh_TW]=BMP 影像
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/x-dds.desktop kdelibs_3_4_BRANCH/mimetypes/image/x-dds.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/x-dds.desktop	2005-02-23 06:05:03.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/x-dds.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=image
+ Patterns=*.dds;*.DDS;
+ Comment=DirectDraw Surface
++Comment[af]=DirectDraw Oppervlakte
+ Comment[be]=Паверхня DirectDraw
+ Comment[bg]=Област с директно изчертаване
+ Comment[bn]=ডায়রেক্ট-ড্র সারফেস
+@@ -34,11 +35,10 @@
+ Comment[sk]=Povrch DirectDraw
+ Comment[sl]=Površina DirectDraw
+ Comment[sr]=Површина за директно цртање
+-Comment[sr@Latn]=Површина за директно цртање
++Comment[sr@Latn]=Površina za direktno crtanje
+ Comment[sv]=Direktrityta
+ Comment[ta]=நேரடி வரையும் சூழல்
+ Comment[tg]=Кашидани сатҳи мустақим
+ Comment[tr]=DirectDraw Yüzeyi
+ Comment[uk]=Поверхня DirectDraw
+-Comment[xx]=xxDirectDraw Surfacexx
+ Comment[zh_CN]=DirectDraw 表面
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/x-eps.desktop kdelibs_3_4_BRANCH/mimetypes/image/x-eps.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/x-eps.desktop	2005-01-21 05:24:25.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/x-eps.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -66,7 +66,6 @@
+ Comment[ven]=Tshifanyiso tsha tshikiriputi tsha poso
+ Comment[wa]=Imådje PostScript ecapsulêye
+ Comment[xh]=Umfanekiso we PostScript Wokuvalelweyo
+-Comment[xx]=xxEncapsulated PostScript Imagexx
+ Comment[zh_CN]=封装的 PostScript 图像
+ Comment[zh_TW]=封裝的 PostScript 影像
+ Comment[zu]=Isithombe Esifakwe ephaketheni Lesithombe Sesikripti Esidlulele
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/x-exr.desktop kdelibs_3_4_BRANCH/mimetypes/image/x-exr.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/x-exr.desktop	2005-02-23 06:05:03.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/x-exr.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=image
+ Patterns=*.exr;*.EXR;
+ Comment=ILM EXR Image
++Comment[af]=ILM EXR Beeld
+ Comment[be]=Выява ILM EXR
+ Comment[bg]=Изображение ILM EXR
+ Comment[bn]=ILM EXR ইমেজ
+@@ -48,13 +49,12 @@
+ Comment[sk]=ILM EXR obrázok
+ Comment[sl]=Slika ILM EXR
+ Comment[sr]=ILM EXR слика
+-Comment[sr@Latn]=ILM EXR слика
++Comment[sr@Latn]=ILM EXR slika
+ Comment[sv]=ILM EXR-bild
+ Comment[ta]=ILM EXR பிம்பம்
+ Comment[tg]=Тасвири ILM EXR
+ Comment[tr]=ILM EXR Resmi
+ Comment[uk]=Зображення ILM EXR
+ Comment[uz]=ILM EXR-расм
+-Comment[xx]=xxILM EXR Imagexx
+ Comment[zh_CN]=ILM EXR 图像
+ 
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/x-ico.desktop kdelibs_3_4_BRANCH/mimetypes/image/x-ico.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/x-ico.desktop	2005-01-21 05:24:25.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/x-ico.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -68,7 +68,6 @@
+ Comment[uz]=Windows нишончаси
+ Comment[ven]=Dziaikhono dza Dziwindo
+ Comment[wa]=Imådjete MS-Windows
+-Comment[xx]=xxWindows Iconxx
+ Comment[zh_CN]=Windows 图标
+ Comment[zh_TW]=MSWindows 圖示
+ Comment[zu]=Uphawu lwesithombe Lama-window
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/x-jng.desktop kdelibs_3_4_BRANCH/mimetypes/image/x-jng.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/x-jng.desktop	2005-01-21 05:24:25.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/x-jng.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -69,7 +69,6 @@
+ Comment[ven]=Tshifanyiso tsha JNG
+ Comment[wa]=Imådje JNG
+ Comment[xh]=Umfanekiso we JNG
+-Comment[xx]=xxJNG Imagexx
+ Comment[zh_CN]=JNG 图像
+ Comment[zh_TW]=JNG 影像
+ Comment[zu]=Isithombe se-JNG
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/x-msod.desktop kdelibs_3_4_BRANCH/mimetypes/image/x-msod.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/x-msod.desktop	2005-02-21 10:17:22.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/x-msod.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -11,6 +11,7 @@
+ Comment[be]=Малюнак Microsoft Office
+ Comment[bg]=Изображение на Microsoft Office Drawing
+ Comment[bn]=মাইক্রোসফট অফিস ড্রয়িং
++Comment[br]=Tresaner Microsoft Office
+ Comment[bs]=Microsoft Office crtež
+ Comment[ca]=Dibuix de Microsoft Office
+ Comment[cs]=Kreslení MS Office
+@@ -64,7 +65,6 @@
+ Comment[ven]=Miolo ya ofisi ya MS
+ Comment[wa]=Documint MS-Office
+ Comment[xh]=Umzobo we Microsoft Office
+-Comment[xx]=xxMicrosoft Office Drawingxx
+ Comment[zh_CN]=Microsoft Office 绘图
+ Comment[zh_TW]=MS Office 圖片
+ Comment[zu]=Umdwebo we-Microsoft Office
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/x-pcx.desktop kdelibs_3_4_BRANCH/mimetypes/image/x-pcx.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/x-pcx.desktop	2005-01-21 05:24:25.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/x-pcx.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=image
+ Patterns=*.pcx;*.PCX;
+ Comment=PCX Image
++Comment[af]=PCX Beeld
+ Comment[ar]=صورة PNG
+ Comment[az]=PCX Rəsmi
+ Comment[be]=Выява PCX
+@@ -68,7 +69,6 @@
+ Comment[ven]=Tshifanyiso tsha PNG
+ Comment[wa]=Imådje PCX
+ Comment[xh]=Umfanekiso we PCX
+-Comment[xx]=xxPCX Imagexx
+ Comment[zh_CN]=PCX 图像
+ Comment[zh_TW]=PCX 影像
+ Comment[zu]=Isithombe se-PCX
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/x-photo-cd.desktop kdelibs_3_4_BRANCH/mimetypes/image/x-photo-cd.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/x-photo-cd.desktop	2005-01-21 05:24:25.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/x-photo-cd.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -69,7 +69,6 @@
+ Comment[ven]=Tshifanyiso tsha tshinepe tsha CD
+ Comment[wa]=Imådje PhotoCD
+ Comment[xh]=Umfanekiso we PhotoCD
+-Comment[xx]=xxPhotoCD Imagexx
+ Comment[zh_CN]=PhotoCD 图像
+ Comment[zh_TW]=PhotoCD 影像
+ Comment[zu]=Isithombe Sesithombe se-CD
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/x-portable-bitmap.desktop kdelibs_3_4_BRANCH/mimetypes/image/x-portable-bitmap.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/x-portable-bitmap.desktop	2005-01-21 05:24:25.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/x-portable-bitmap.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -10,6 +10,7 @@
+ Comment[az]=Portable Bitmap Rəsmi
+ Comment[bg]=Изображение Portable Bitmap
+ Comment[bn]=পোর্টেবল বিটম্যাপ চিত্র
++Comment[br]=Skeudenn Portable Bitmap
+ Comment[bs]=Portable Bitmap slika
+ Comment[ca]=Imatge portable mapa de píxels
+ Comment[cs]= Formát "Portable Bitmap"
+@@ -66,7 +67,6 @@
+ Comment[ven]=Tshifanyiso tsha Bitmap i fareaho
+ Comment[wa]=Imådje PBM
+ Comment[xh]=Umfaneksio Ophathekayo we Bitmap
+-Comment[xx]=xxPortable Bitmap Imagexx
+ Comment[zh_CN]=便携位图图像
+ Comment[zh_TW]=可攜式點陣檔案格式
+ Comment[zu]=Isithombe Semephu yebit Esiphathekayo
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/x-portable-greymap.desktop kdelibs_3_4_BRANCH/mimetypes/image/x-portable-greymap.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/x-portable-greymap.desktop	2005-01-21 05:24:25.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/x-portable-greymap.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -66,7 +66,6 @@
+ Comment[ven]=Tshifanyiso Graymap i farea
+ Comment[wa]=Imådje PPM
+ Comment[xh]=Umfanekiso Ophathekayo we Graymap
+-Comment[xx]=xxPortable Graymap Imagexx
+ Comment[zh_CN]=便携灰度图图像
+ Comment[zh_TW]=可攜式灰階檔案格式
+ Comment[zu]=Isithombe se-Graymap Esiphathekayo
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/x-portable-pixmap.desktop kdelibs_3_4_BRANCH/mimetypes/image/x-portable-pixmap.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/x-portable-pixmap.desktop	2005-01-21 05:24:25.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/x-portable-pixmap.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -10,6 +10,7 @@
+ Comment[az]=Portable Pixmap Rəsmi
+ Comment[bg]=Изображение Portable Pixmap
+ Comment[bn]=পোর্টেবল পিক্সম্যাপ চিত্র
++Comment[br]=Skeudenn Portable Pixmap
+ Comment[bs]=Portable Pixmap slika
+ Comment[ca]=Imatge portable mapa de píxels
+ Comment[cs]=Formát "Portable Pixmap"
+@@ -66,7 +67,6 @@
+ Comment[ven]=Tshifanyiso tsha Pixmap yau farea
+ Comment[wa]=Imådje XPM
+ Comment[xh]=Umfanekiso Ophathekayo we Pixmap
+-Comment[xx]=xxPortable Pixmap Imagexx
+ Comment[zh_CN]=便携像素图图像
+ Comment[zh_TW]=可攜式像素檔案格式
+ Comment[zu]=Isithombe se-Pixmap Esiphathekayo
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/x-rgb.desktop kdelibs_3_4_BRANCH/mimetypes/image/x-rgb.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/x-rgb.desktop	2005-02-23 06:05:03.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/x-rgb.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=image
+ Patterns=*.rgb;*.RGB;*.rgba;*.RGBA;*.bw;*.BW;*.sgi;*.SGI
+ Comment=SGI Image (RGB)
++Comment[af]=SGI Beeld (RGB)
+ Comment[be]=Выява SGI (RGB)
+ Comment[bg]=Изображение SGI (RGB)
+ Comment[bn]=এস-জি-আই চিত্র (RGB)
+@@ -49,7 +50,7 @@
+ Comment[sk]=Obrázok SGI (RGB)
+ Comment[sl]=Slika SGI (RGB)
+ Comment[sr]=SGI слика (RGB)
+-Comment[sr@Latn]=SGI слика (RGB)
++Comment[sr@Latn]=SGI slika (RGB)
+ Comment[sv]=SGI-bild (RGB)
+ Comment[ta]=GIF பிம்பம்
+ Comment[tg]=Тасвири SGI (RGB)
+@@ -57,5 +58,4 @@
+ Comment[tr]=SGI Resmi (KYM)
+ Comment[uk]=Зображення SGI (RGB)
+ Comment[uz]=SGI-расм (RGB)
+-Comment[xx]=xxSGI Image (RGB)xx
+ Comment[zh_CN]=SGI 图像(RGB)
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/x-targa.desktop kdelibs_3_4_BRANCH/mimetypes/image/x-targa.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/x-targa.desktop	2005-01-21 05:24:25.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/x-targa.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=image
+ Patterns=*.tga;*.TGA;
+ Comment=Truevision Targa Image
++Comment[af]=Truevision Targa Beeld
+ Comment[ar]=صورة Truevision Targa
+ Comment[az]=Truevision Targa Rəsmi
+ Comment[be]=Выява Truevision Targa
+@@ -66,7 +67,6 @@
+ Comment[ven]=Tshifanyiso tsha Targa tsha mbonalelo ya vhukuma ya TIFF
+ Comment[wa]=Imådje Targa
+ Comment[xh]=Umfanekiso we Truevision Targa
+-Comment[xx]=xxTruevision Targa Imagexx
+ Comment[zh_CN]=Truevision Targa 图像
+ Comment[zh_TW]=Truevision Targa 圖形
+ Comment[zu]=Isithombe Sombono wangempela we-Targa
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/x-vnd.adobe.photoshop.desktop kdelibs_3_4_BRANCH/mimetypes/image/x-vnd.adobe.photoshop.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/x-vnd.adobe.photoshop.desktop	2005-01-21 05:24:25.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/x-vnd.adobe.photoshop.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -5,6 +5,7 @@
+ MimeType=image/x-vnd.adobe.photoshop
+ Patterns=*.psd;*.PSD;
+ Comment=Adobe Photoshop Image
++Comment[af]=Adobe Photoshop Beeld
+ Comment[ar]=صورة أدوبي فوتوشوب
+ Comment[az]=Adobe Photoshop Rəsmi
+ Comment[be]=Выява Adobe Photoshop
+@@ -63,6 +64,5 @@
+ Comment[uk]=Зображення Adobe Photoshop
+ Comment[uz]=Adobe Photoshop-расм
+ Comment[wa]=Imådje Adobe Photoshop
+-Comment[xx]=xxAdobe Photoshop Imagexx
+ Comment[zh_CN]=Adobe Photoshop 图像
+ Comment[zh_TW]=Adobe Photoshop 影像
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/x-vnd.trolltech.qpicture.desktop kdelibs_3_4_BRANCH/mimetypes/image/x-vnd.trolltech.qpicture.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/x-vnd.trolltech.qpicture.desktop	2005-01-21 05:24:25.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/x-vnd.trolltech.qpicture.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -5,10 +5,12 @@
+ MimeType=image/x-vnd.trolltech.qpicture
+ Patterns=*.qpic;
+ Comment=QPicture Metafile
++Comment[af]=QPicture Meta-Lêer
+ Comment[ar]=ملف QPicture
+ Comment[az]=QPicture Meta Faylı
+ Comment[bg]=Мета файл на QPicture
+ Comment[bn]=কিউ-পিকচার মেটা-ফাইল
++Comment[br]=Meta-restr QPicture
+ Comment[bs]=QPicture metadatoteka
+ Comment[ca]=Metafitxer de QPicture
+ Comment[cs]=Meta soubor QPicture
+@@ -58,6 +60,5 @@
+ Comment[tr]=QPicture Meta Dosyası
+ Comment[uk]=Мета-файл QPicture (дані що містять опис даних)
+ Comment[uz]=QPicture мета-файли
+-Comment[xx]=xxQPicture Metafilexx
+ Comment[zh_CN]=QPicture 元文件
+ Comment[zh_TW]=QPicture Meta 檔案
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/x-wmf.desktop kdelibs_3_4_BRANCH/mimetypes/image/x-wmf.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/x-wmf.desktop	2005-01-21 05:24:25.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/x-wmf.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -8,6 +8,7 @@
+ Comment[af]=Vensters Metaleêr
+ Comment[bg]=Мета файл на Windows
+ Comment[bn]=উইন্ডোস মেটাফাইল
++Comment[br]=Meta-restr Windows 
+ Comment[ca]=Metafitxer de Windows
+ Comment[cs]=Metasoubor Windows
+ Comment[cy]=Metafile Windows
+@@ -57,6 +58,5 @@
+ Comment[uz]=Windows мета-файли
+ Comment[ven]=Matafaela ya dziwindo
+ Comment[xh]=Ifayile ye Meta ye Windows
+-Comment[xx]=xxWindows MetaFilexx
+ Comment[zh_CN]=Windows 元文件
+ Comment[zu]=Ama-window eMetaFayela
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/x-xbm.desktop kdelibs_3_4_BRANCH/mimetypes/image/x-xbm.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/x-xbm.desktop	2005-02-17 05:18:43.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/x-xbm.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -69,7 +69,6 @@
+ Comment[ven]=Tshifanyiso tsha Bitmap tsha X
+ Comment[wa]=Imådje XBM
+ Comment[xh]=Umfanekiso we X BitMap
+-Comment[xx]=xxX BitMap Imagexx
+ Comment[zh_CN]=X 位图图像
+ Comment[zh_TW]=X 點陣影像
+ Comment[zu]=Isithombe se-X BitMap
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/x-xcf-gimp.desktop kdelibs_3_4_BRANCH/mimetypes/image/x-xcf-gimp.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/x-xcf-gimp.desktop	2005-02-21 10:17:22.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/x-xcf-gimp.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -61,7 +61,6 @@
+ Comment[ven]=Tshivhumbeo tsha tshifanyiso tsha henefho tsha GIMP
+ Comment[wa]=Imådje native GIMP
+ Comment[xh]=Ufomato Lomfanekiso Wendawo ye GIMP
+-Comment[xx]=xxGIMP Native Image Formatxx
+ Comment[zh_CN]=GIMP 本地图像格式
+ Comment[zh_TW]=GIMP 原聲影像格式
+ Comment[zu]=Isakhiwo Sesithombe Sasendulo se-GIMP
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/x-xcursor.desktop kdelibs_3_4_BRANCH/mimetypes/image/x-xcursor.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/x-xcursor.desktop	2004-12-29 18:52:17.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/x-xcursor.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -4,6 +4,7 @@
+ MimeType=image/x-xcursor
+ Icon=cursor
+ Comment=X11 Mouse Cursor
++Comment[af]=X11 Muis Wyser
+ Comment[ar]=مؤشر فأرة
+ Comment[az]=X11 Siçan Kursoru
+ Comment[bg]=Показалец на мишката
+@@ -61,7 +62,6 @@
+ Comment[uk]=Курсор мишки для X11
+ Comment[uz]=X11 сичқонча курсори
+ Comment[wa]=Cursoe X11 pol sori
+-Comment[xx]=xxX11 Mouse Cursorxx
+ Comment[zh_CN]=X11 鼠标光标
+ Comment[zh_TW]=X11 滑鼠游標
+ 
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/x-xfig.desktop kdelibs_3_4_BRANCH/mimetypes/image/x-xfig.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/x-xfig.desktop	2005-01-21 05:24:25.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/x-xfig.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -72,7 +72,6 @@
+ Comment[vi]=File XFig 
+ Comment[wa]=Fitchî XFig
+ Comment[xh]=Ifayile ye XFig
+-Comment[xx]=xxXFig Filexx
+ Comment[zh_CN]=XFig 文件
+ Comment[zh_TW]=XFig 檔案
+ Comment[zu]=Ifayela le-XFig
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/image/x-xpm.desktop kdelibs_3_4_BRANCH/mimetypes/image/x-xpm.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/image/x-xpm.desktop	2005-02-17 05:18:43.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/image/x-xpm.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -69,7 +69,6 @@
+ Comment[ven]=Tshifanyiso tsha Pixmap tsha X
+ Comment[wa]=Imådje XPM
+ Comment[xh]=Umfanekiso we X PixMap
+-Comment[xx]=xxX PixMap Imagexx
+ Comment[zh_CN]=X 象素图图像
+ Comment[zh_TW]=X 像素影像
+ Comment[zu]=Isithombe se-XPixMap
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/inode/block.desktop kdelibs_3_4_BRANCH/mimetypes/inode/block.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/inode/block.desktop	2005-01-21 05:24:26.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/inode/block.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -69,7 +69,6 @@
+ Comment[ven]=Maano a Buloko
+ Comment[vi]=Thiết bềEkhối(block device) 
+ Comment[wa]=Éndjin blok
+-Comment[xx]=xxBlock Devicexx
+ Comment[zh_CN]=块设备
+ Comment[zh_TW]=區塊設備
+ Comment[zu]=Ithuluzi Lebhulogo
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/inode/chardevice.desktop kdelibs_3_4_BRANCH/mimetypes/inode/chardevice.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/inode/chardevice.desktop	2005-01-21 05:24:26.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/inode/chardevice.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -68,7 +68,6 @@
+ Comment[vi]=Thiết bềEđặc tính(character device) 
+ Comment[wa]=Éndjin caractere
+ Comment[xh]=Icebo Lophawu
+-Comment[xx]=xxCharacter Devicexx
+ Comment[zh_CN]=字符设备
+ Comment[zh_TW]=字元設備
+ Comment[zu]=Ithuluzi Lophawu
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/inode/directory-locked.desktop kdelibs_3_4_BRANCH/mimetypes/inode/directory-locked.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/inode/directory-locked.desktop	2005-02-21 10:17:22.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/inode/directory-locked.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=Locked Folder
++Comment[af]=Toegesluitte Gids
+ Comment[ar]=مجلد مقفل
+ Comment[az]=Qıfıllanmış Qovluq
+ Comment[bg]=Заключена директория
+@@ -59,7 +60,6 @@
+ Comment[uk]=Заблокована тека
+ Comment[uz]=Қулфланган жилд
+ Comment[wa]=Resseré ridant
+-Comment[xx]=xxLocked Folderxx
+ Comment[zh_CN]=锁定的文件夹
+ Comment[zh_TW]=鎖住的資料夾
+ Icon=folder_locked
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/inode/directory.desktop kdelibs_3_4_BRANCH/mimetypes/inode/directory.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/inode/directory.desktop	2004-12-29 18:52:18.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/inode/directory.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=Folder
++Comment[af]=Gids
+ Comment[ar]=مجلد
+ Comment[az]=Qovluq
+ Comment[be]=Тэчка
+@@ -58,7 +59,6 @@
+ Comment[uk]=Тека
+ Comment[uz]=Жилд
+ Comment[wa]=Ridant
+-Comment[xx]=xxFolderxx
+ Comment[zh_CN]=文件夹
+ Comment[zh_TW]=資料夾
+ Icon=folder
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/inode/fifo.desktop kdelibs_3_4_BRANCH/mimetypes/inode/fifo.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/inode/fifo.desktop	2005-01-21 05:24:26.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/inode/fifo.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -64,7 +64,6 @@
+ Comment[vi]=Ô'ng dẫn (pipe) 
+ Comment[wa]=Buze
+ Comment[xh]=Umbhobho
+-Comment[xx]=xxPipexx
+ Comment[zh_CN]=管道
+ Comment[zh_TW]=管線
+ Comment[zu]=Ipayipi
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/inode/socket.desktop kdelibs_3_4_BRANCH/mimetypes/inode/socket.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/inode/socket.desktop	2005-01-21 05:24:26.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/inode/socket.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -54,7 +54,6 @@
+ Comment[vi]=Socket 
+ Comment[wa]=Soket
+ Comment[xh]=Umngxunya
+-Comment[xx]=xxSocketxx
+ Comment[zh_CN]=套接字
+ Comment[zu]=Isokethi
+ Icon=socket
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/message/news.desktop kdelibs_3_4_BRANCH/mimetypes/message/news.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/message/news.desktop	2005-02-23 06:05:04.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/message/news.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -65,7 +65,6 @@
+ Comment[uz]=Usenet янгиликлар хабари
+ Comment[ven]=Mulaedza wa mafhungo a vhukwamani hau shumisa
+ Comment[xh]=Umyalezo Weendaba we Usenet
+-Comment[xx]=xxUsenet News Messagexx
+ Comment[zh_CN]=新闻组新闻消息
+ Comment[zh_TW]=Usenet 新聞訊息
+ Comment[zu]=Umyalezo Wezindaba Zoxhumano lokusebenzisa
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/message/rfc822.desktop kdelibs_3_4_BRANCH/mimetypes/message/rfc822.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/message/rfc822.desktop	2005-01-31 09:34:54.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/message/rfc822.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -70,7 +70,6 @@
+ Comment[ven]=Mulaedza wa Email
+ Comment[wa]=Emilaedje
+ Comment[xh]=Umyalezo we Email
+-Comment[xx]=xxEmail Messagexx
+ Comment[zh_CN]=电子邮件消息
+ Comment[zh_TW]=電子郵件
+ Comment[zu]=Umyalezo Weposi lekhomputha
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/model/vrml.desktop kdelibs_3_4_BRANCH/mimetypes/model/vrml.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/model/vrml.desktop	2004-12-12 04:49:07.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/model/vrml.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -3,6 +3,7 @@
+ Type=MimeType
+ MimeType=model/vrml
+ Comment=VRML Model
++Comment[af]=VRML Module
+ Comment[ar]=نمودج VRML
+ Comment[az]=VRML Modeli
+ Comment[be]=VRML мадэль
+@@ -59,7 +60,6 @@
+ Comment[uk]=Модель VRML (тривимірні моделі)
+ Comment[uz]=VRML модели
+ Comment[wa]=Modele VRML
+-Comment[xx]=xxVRML Modelxx
+ Comment[zh_CN]=VRML 模块
+ Comment[zh_TW]=VRML 模型
+ Patterns=*.wrl;*.wrl.gz
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/multipart/mixed.desktop kdelibs_3_4_BRANCH/mimetypes/multipart/mixed.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/multipart/mixed.desktop	2005-01-21 05:24:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/multipart/mixed.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -63,7 +63,6 @@
+ Comment[uz]=Compound ҳужжати
+ Comment[ven]=Manwalwa a Tshigwada
+ Comment[xh]=Uxwebhu Lwembumba
+-Comment[xx]=xxCompound Documentxx
+ Comment[zh_CN]=复合文档
+ Comment[zh_TW]=複合文件
+ Comment[zu]=Uhlu lwamafayela Eliphindwe kabili
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/multipart/x-mixed-replace.desktop kdelibs_3_4_BRANCH/mimetypes/multipart/x-mixed-replace.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/multipart/x-mixed-replace.desktop	2005-02-21 10:17:23.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/multipart/x-mixed-replace.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -61,7 +61,6 @@
+ Comment[uz]=Маълумот оқими (Server Push)
+ Comment[ven]=Milambo ya data (U phusha ha data)
+ Comment[xh]=Umpompozo lwe Data (Utyilizo Lomncedisi)
+-Comment[xx]=xxStream of Data (Server Push)xx
+ Comment[zh_CN]=数据流(服务器推送)
+ Comment[zh_TW]=資料串流（伺服器推送）
+ Comment[zu]=Ukutanta kwe-Data (Ukududula Komlekeleli)
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/calendar.desktop kdelibs_3_4_BRANCH/mimetypes/text/calendar.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/calendar.desktop	2005-01-21 05:24:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/calendar.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -65,7 +65,6 @@
+ Comment[ven]=Faela ya Khalenda
+ Comment[wa]=Fitchî calindrî iCalendar
+ Comment[xh]=Ifayile ye iCalendar
+-Comment[xx]=xxiCalendar Filexx
+ Comment[zh_CN]=iCalendar 文件
+ Comment[zh_TW]=iCalendar 文件
+ Comment[zu]=Ifayela Lekhalenda
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/css.desktop kdelibs_3_4_BRANCH/mimetypes/text/css.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/css.desktop	2005-01-28 05:03:18.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/css.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -52,7 +52,6 @@
+ Comment[ven]=Tshitaela tshau peta kana u khavhisa bammbiri
+ Comment[vi]=CSS(Cascading Style Sheet) 
+ Comment[xh]=Uhlobo lwekhasi Elingxangxazayo
+-Comment[xx]=xxCascading Style Sheetxx
+ Comment[zh_CN]=层叠样式表单
+ Comment[zu]=Iphepha Lesitayela Lokulandelanisa
+ Icon=txt
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/docbook.desktop kdelibs_3_4_BRANCH/mimetypes/text/docbook.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/docbook.desktop	2005-01-21 05:24:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/docbook.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=DocBook Document
++Comment[af]=DocBook Dokument
+ Comment[ar]=مستند DocBook
+ Comment[az]=DocBook Sənədi
+ Comment[be]=Дакумэнт DocBook
+@@ -60,7 +61,6 @@
+ Comment[uk]=Документ DocBook
+ Comment[uz]=DocBook ҳужжати
+ Comment[wa]=Documint DocBook
+-Comment[xx]=xxDocBook Documentxx
+ Comment[zh_CN]=DocBook 文档
+ Comment[zh_TW]=DocBook 文件
+ Icon=wordprocessing
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/enriched.desktop kdelibs_3_4_BRANCH/mimetypes/text/enriched.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/enriched.desktop	2005-01-21 05:24:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/enriched.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ MimeType=text/enriched
+ Comment=Lightly Enriched Text Document
++Comment[af]='Lightly Enriched' Teks Dokument
+ Comment[az]=Həfifcə Zənginləşdirilmiş Mətn Sənədi
+ Comment[bg]=Леко разширен текстов файл (Lightly Enriched)
+ Comment[bs]=Lightly Enriched tekst dokument
+@@ -52,7 +53,6 @@
+ Comment[tr]=Biraz Zenginleştirilmiş Metin Dosyası
+ Comment[uk]=Злегка збагачений текстовий документ
+ Comment[wa]=Documint tecse ledjirmint eritchî
+-Comment[xx]=xxLightly Enriched Text Documentxx
+ Comment[zh_CN]=轻装的丰富文本文档
+ Comment[zh_TW]=Lightly Enriched 文件檔案
+ Icon=txt
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/html.desktop kdelibs_3_4_BRANCH/mimetypes/text/html.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/html.desktop	2004-12-29 18:52:19.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/html.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=HTML Document
++Comment[af]=HTML Dokument
+ Comment[ar]=مستند HTML
+ Comment[az]=HTML Sənədi
+ Comment[be]=Дакумэнт HTML
+@@ -60,7 +61,6 @@
+ Comment[uk]=Документ HTML
+ Comment[uz]=HTML ҳужжати
+ Comment[wa]=Documint HTML
+-Comment[xx]=xxHTML Documentxx
+ Comment[zh_CN]=HTML 文档
+ Comment[zh_TW]=HTML 文件
+ Icon=html
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/javascript.desktop kdelibs_3_4_BRANCH/mimetypes/text/javascript.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/javascript.desktop	2005-02-23 06:05:05.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/javascript.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -3,6 +3,7 @@
+ MimeType=text/javascript
+ Icon=Script
+ Comment=JavaScript File
++Comment[af]=JavaScript Lêer
+ Comment[be]=Файл JavaScript
+ Comment[bg]=Изходен код на JavaScript
+ Comment[bn]=জাভাস্ক্রিপ্ট ফাইল
+@@ -43,13 +44,12 @@
+ Comment[sk]=Zdrojový kód JavaScript
+ Comment[sl]=Datoteka JavaScript
+ Comment[sr]=JavaScript фајл
+-Comment[sr@Latn]=JavaScript фајл
++Comment[sr@Latn]=JavaScript fajl
+ Comment[sv]=Javaskript-fil
+ Comment[ta]=ஜாவா மூலக் கோப்பு
+ Comment[tg]=Файли барномавии Java
+ Comment[tr]=JavaScript Dosyası
+ Comment[uk]=Файл JavaScript
+ Comment[uz]=JavaScript-файли
+-Comment[xx]=xxJavaScript Filexx
+ Comment[zh_CN]=JavaScript 文件
+ X-KDE-IsAlso=application/x-javascript
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/plain.desktop kdelibs_3_4_BRANCH/mimetypes/text/plain.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/plain.desktop	2005-01-21 05:24:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/plain.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -2,10 +2,12 @@
+ Encoding=UTF-8
+ MimeType=text/plain
+ Comment=Plain Text Document
++Comment[af]=Eenvoudig Teks Dokument
+ Comment[ar]=مستند نصي
+ Comment[az]=Xam Mətn Sənədi
+ Comment[bg]=Текстов файл
+ Comment[bn]=প্লেইন টেক্সট নথী
++Comment[br]=Teul skrid eeun
+ Comment[bs]=Dokument sa čistim tekstom
+ Comment[ca]=Document de text pla
+ Comment[cs]=Prostý text
+@@ -59,7 +61,6 @@
+ Comment[uk]=Звичайний текст
+ Comment[uz]=Оддий матн файли
+ Comment[wa]=Documint e peur tecse
+-Comment[xx]=xxPlain Text Documentxx
+ Comment[zh_CN]=纯文本文档
+ Comment[zh_TW]=純文字檔案
+ Icon=txt
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/rdf.desktop kdelibs_3_4_BRANCH/mimetypes/text/rdf.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/rdf.desktop	2005-01-27 05:09:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/rdf.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ MimeType=text/rdf
+ Comment=Resource Description Framework File
++Comment[af]=Hulpbron Beskrywing Raamwerk Lêer
+ Comment[ar]=ملف إطار عمل لوصف الموارد
+ Comment[az]=Ehtiyat İzahatı Faylı
+ Comment[bg]=Файл за описание на ресурси (RDF)
+@@ -53,7 +54,6 @@
+ Comment[tr]=Kaynak Tanımlı Çerçeve Çalışma Dosyası
+ Comment[uk]=Файл структури опису ресурсів
+ Comment[uz]=RDF-файли
+-Comment[xx]=xxResource Description Framework Filexx
+ Comment[zh_CN]=资源描述框架文件
+ Comment[zh_TW]=資源描述框架 (RDF) 檔案
+ Icon=news
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/rss.desktop kdelibs_3_4_BRANCH/mimetypes/text/rss.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/rss.desktop	2005-01-21 05:24:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/rss.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -61,7 +61,6 @@
+ Comment[ven]=Fhethu ha samari ha RDF
+ Comment[vi]=Tổng kết site RDF 
+ Comment[xh]=Isishwankathelo Senxuwa le RDF
+-Comment[xx]=xxRDF Site Summaryxx
+ Comment[zh_CN]=RDF 站点摘要
+ Comment[zh_TW]=RDF 站台摘要
+ Comment[zu]=Ukubuyekezwa Sokubuyekezwa kwe-RDF
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/rtf.desktop kdelibs_3_4_BRANCH/mimetypes/text/rtf.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/rtf.desktop	2004-12-29 18:52:19.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/rtf.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ MimeType=text/rtf
+ Comment=RTF Document
++Comment[af]=RTF Dokument
+ Comment[ar]=مستند RTF
+ Comment[az]=RTF Sənədi
+ Comment[be]=Дакумэнт RTF
+@@ -61,7 +62,6 @@
+ Comment[uk]=Документ RTF
+ Comment[uz]=RTF ҳужжати
+ Comment[wa]=Documint RTF
+-Comment[xx]=xxRTF Documentxx
+ Comment[zh_CN]=RTF 文档
+ Comment[zh_TW]=RTF 文件
+ Icon=wordprocessing
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/sgml.desktop kdelibs_3_4_BRANCH/mimetypes/text/sgml.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/sgml.desktop	2005-01-21 05:24:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/sgml.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -67,7 +67,6 @@
+ Comment[ven]=Manwalwa a SGML
+ Comment[wa]=Documint SGML
+ Comment[xh]=Uxwebhu lwe SGML
+-Comment[xx]=xxSGML Documentxx
+ Comment[zh_CN]=SGML 文档
+ Comment[zh_TW]=SGML 文件
+ Comment[zu]=Uhlu lwamafayela lwe-SGML
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/vnd.abc.desktop kdelibs_3_4_BRANCH/mimetypes/text/vnd.abc.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/vnd.abc.desktop	2005-02-23 06:05:05.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/vnd.abc.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -33,13 +33,12 @@
+ Comment[sk]=Hudobný súbor ABC
+ Comment[sl]=Glasbena datoteka ABC
+ Comment[sr]=ABC музички фајл
+-Comment[sr@Latn]=ABC музички фајл
++Comment[sr@Latn]=ABC muzički fajl
+ Comment[sv]=ABC-musikfil
+ Comment[ta]=ஏபிசி இசை கோப்பு
+ Comment[tg]=Файли Мусикии ABC
+ Comment[tr]=ABC Müzik Dosyası
+ Comment[uk]=Файл музики ABC
+-Comment[xx]=xxABC Music Filexx
+ Comment[zh_CN]=ABC 音乐文件
+ Icon=sound
+ Type=MimeType
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/vnd.wap.wml.desktop kdelibs_3_4_BRANCH/mimetypes/text/vnd.wap.wml.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/vnd.wap.wml.desktop	2005-01-21 05:24:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/vnd.wap.wml.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -5,6 +5,7 @@
+ MimeType=text/vnd.wap.wml
+ Patterns=*.wml;*.WML;
+ Comment=WML Document
++Comment[af]=WML Dokument
+ Comment[ar]=مستند WML
+ Comment[az]=WML Sənədi
+ Comment[be]=Дакумэнт WML
+@@ -69,7 +70,6 @@
+ Comment[ven]=Manwalwa a WML
+ Comment[wa]=Documint WML
+ Comment[xh]=Uxwebhu lwe WML
+-Comment[xx]=xxWML Documentxx
+ Comment[zh_CN]=WML 文档
+ Comment[zh_TW]=WML 文件
+ Comment[zu]=Uhlu lwamafayela lwe-WML
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/x-adasrc.desktop kdelibs_3_4_BRANCH/mimetypes/text/x-adasrc.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/x-adasrc.desktop	2005-01-21 05:24:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/x-adasrc.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -65,7 +65,6 @@
+ Comment[ven]=Faela ya vhubvo ha Ada
+ Comment[wa]=Fitchî sourdant Ada
+ Comment[xh]=Ifayile Yemvelaphi ye Ada
+-Comment[xx]=xxAda Source Filexx
+ Comment[zh_CN]=Ada 源文件
+ Comment[zh_TW]=Ada 原始檔
+ Comment[zu]=Ifayela Lemvelaphi le-Ada
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/x-bibtex.desktop kdelibs_3_4_BRANCH/mimetypes/text/x-bibtex.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/x-bibtex.desktop	2005-01-21 05:24:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/x-bibtex.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -63,7 +63,6 @@
+ Comment[ven]=Data yau talutshedza he wa wana hone zwishumiswa (bibtex)
+ Comment[wa]=Dinêyes bibiografikes (Bibtex)
+ Comment[xh]=Idata Yoluhlu lweencwadi zombhali nawuphi na (Bibtex)
+-Comment[xx]=xxBibliographic Data (Bibtex)xx
+ Comment[zh_CN]=书目数据(Bibtex)
+ Comment[zh_TW]=作者資料 (bibtex)
+ Comment[zu]=Idata Yokuqukethwe umlando (Bibtex)
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/x-c++hdr.desktop kdelibs_3_4_BRANCH/mimetypes/text/x-c++hdr.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/x-c++hdr.desktop	2005-01-21 05:24:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/x-c++hdr.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -64,7 +64,6 @@
+ Comment[ven]=C++ Faela ya thoho
+ Comment[wa]=Fitchî di tiestire C++
+ Comment[xh]=C++ Ifayile Yokubhaliweyo okuphezulu kwephepa
+-Comment[xx]=xxC++ Header Filexx
+ Comment[zh_CN]=C++ 头文件
+ Comment[zh_TW]=C++ 標頭檔
+ Comment[zu]=Ifayela Lenhloko le-C++
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/x-c++src.desktop kdelibs_3_4_BRANCH/mimetypes/text/x-c++src.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/x-c++src.desktop	2005-01-21 05:24:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/x-c++src.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -64,7 +64,6 @@
+ Comment[ven]=C++ Faela ya vhubvo
+ Comment[wa]=Fitchî sourdant C++
+ Comment[xh]=C++ Ifayile Yemvelaphi
+-Comment[xx]=xxC++ Source Filexx
+ Comment[zh_CN]=C++ 源文件
+ Comment[zh_TW]=C++ 原始檔
+ Comment[zu]=Ifayela Lemvelaphi le-C++
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/x-chdr.desktop kdelibs_3_4_BRANCH/mimetypes/text/x-chdr.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/x-chdr.desktop	2005-01-21 05:24:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/x-chdr.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -64,7 +64,6 @@
+ Comment[ven]=C Faela ya Thoho
+ Comment[wa]=Fitchî tiestire C
+ Comment[xh]=C Ifayile Yokubhaliweyo okuphezulu kwephepha
+-Comment[xx]=xxC Header Filexx
+ Comment[zh_CN]=C 头文件
+ Comment[zh_TW]=C 標頭檔
+ Comment[zu]=Ifayela Lenhloko le-C
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/x-csrc.desktop kdelibs_3_4_BRANCH/mimetypes/text/x-csrc.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/x-csrc.desktop	2005-01-21 05:24:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/x-csrc.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -64,7 +64,6 @@
+ Comment[ven]=C Faela ya Vhubvo
+ Comment[wa]=Fitchî sourdant C
+ Comment[xh]=C Ifayile Yemvelaphi
+-Comment[xx]=xxC Source Filexx
+ Comment[zh_CN]=C 源文件
+ Comment[zh_TW]=C 原始程式
+ Comment[zu]=Ifayela Lemvelaphi le-C
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/x-csv.desktop kdelibs_3_4_BRANCH/mimetypes/text/x-csv.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/x-csv.desktop	2005-01-21 05:24:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/x-csv.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -68,7 +68,6 @@
+ Comment[ven]=Manwalwa a faela arena khoma yo fhandekanywaho nga maitele
+ Comment[wa]=Fitchî tecse avou les valixhances separêyes pa des comas
+ Comment[xh]=Ifayile Yombhalo Enamaxabiso Ohlulwe Ngesiphumlisi
+-Comment[xx]=xxText File with Comma Separated Valuesxx
+ Comment[zh_CN]=用逗号分隔值的文本文件
+ Comment[zh_TW]=用逗號分隔值的文字文件
+ Comment[zu]=Ifayela lombhalo ngamanani ahlukaniswe ngokhefane
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/x-diff.desktop kdelibs_3_4_BRANCH/mimetypes/text/x-diff.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/x-diff.desktop	2005-01-21 05:24:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/x-diff.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -65,7 +65,6 @@
+ Comment[ven]=Phambano vhukati ha dzifaela
+ Comment[wa]=Diferinces etur des fitchîs
+ Comment[xh]=Iyantlukwano Phakathi Kweefayile
+-Comment[xx]=xxDifferences Between Filesxx
+ Comment[zh_CN]=文件的差异
+ Comment[zh_TW]=在檔案間的差異
+ Comment[zu]=Amafayela phakathi komehluko
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/x-hex.desktop kdelibs_3_4_BRANCH/mimetypes/text/x-hex.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/x-hex.desktop	2005-02-23 06:05:05.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/x-hex.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -6,6 +6,7 @@
+ X-KDE-IsAlso=text/plain
+ Patterns=*.HEX;*.hex;
+ Comment=Intel® Hexadecimal Object File Format
++Comment[af]=Intel® Heksadesimale Voorwerp Lêer Formaat
+ Comment[bg]=Шестнадесетичен обектен файлов формат на Intel®
+ Comment[bn]=ইনটেল® হেক্সাডেসিমাল অবজেক্ট ফাইল ফর্ম্যাট
+ Comment[ca]=Format de fitxer objecte hexadecimal Intel®
+@@ -40,11 +41,10 @@
+ Comment[sk]=Intel® hexadecimalný objektový súbor
+ Comment[sl]=Datotečna vrsta Intel® Hexadecimal Object
+ Comment[sr]=Intel® хексадецимални формат објектног фајла
+-Comment[sr@Latn]=Intel® хексадецимални формат објектног фајла
++Comment[sr@Latn]=Intel® heksadecimalni format objektnog fajla
+ Comment[sv]=Intel® hexadecimalt objektfilformat
+ Comment[ta]=Qt மெடா பொருள் கோப்பு
+ Comment[tg]=Андозаи Файли Объекти Intel® Hexadecimal
+ Comment[tr]=Intel® Onaltılık Nesne Dosya Biçimi
+ Comment[uk]=Файл в форматі Intel® Hexadecimal Object
+-Comment[xx]=xxIntel® Hexadecimal Object File Formatxx
+ Comment[zh_CN]=Intel® 十六进制目标文件
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/x-java.desktop kdelibs_3_4_BRANCH/mimetypes/text/x-java.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/x-java.desktop	2005-01-21 05:24:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/x-java.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -64,7 +64,6 @@
+ Comment[ven]=Faela ya Vhubvo ha Java
+ Comment[wa]=Fitchî sourdant Java
+ Comment[xh]=Ifayile Yemvelaphi ye Java
+-Comment[xx]=xxJava Source Filexx
+ Comment[zh_CN]=Java 源文件
+ Comment[zh_TW]=Java 原始程式
+ Comment[zu]=Ifayela Lemvelaphi ye-Java
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/x-katefilelist.desktop kdelibs_3_4_BRANCH/mimetypes/text/x-katefilelist.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/x-katefilelist.desktop	2005-02-23 06:05:05.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/x-katefilelist.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -51,7 +51,7 @@
+ Comment[sl]=Seznam datotek (za vstavek seznama datotek Kate)
+ Comment[sq]=Lista e Skedarëve (për Shtojcën Kate File List Loader)
+ Comment[sr]=Листа фајлова (за Kate-ов прикључак за учитавање листе фајлова)
+-Comment[sr@Latn]=Lista fajlova (za Kate-ov dodatak za učitavanje liste fajlova)
++Comment[sr@Latn]=Lista fajlova (za Kate-ov priključak za učitavanje liste fajlova)
+ Comment[sv]=Fillista för (insticksprogram för Kates fillistladdare)
+ Comment[ta]=கோப்புப் பட்டியல் (கேட் கோப்புப் பட்டியல் ஏற்றச் செருகுப்பொருளுக்கு)
+ Comment[tg]=Рӯйхати Файл ( барои Файли Kate Модули Пурборкуни)
+@@ -61,7 +61,6 @@
+ Comment[ven]=Mutevhe wa Faela (Uitela pulagini ya tshihwesi tsha mutevhe wa faela wa Kate)
+ Comment[wa]=Djivêye di fitchîs (pol tchôke-divins tcherdjeu d' fitchî di Kate)
+ Comment[xh]=Uluhlu Lwefayile (zoluhlu Yomlayishi Weplagi efakwayo Yefayile ka Kate) 
+-Comment[xx]=xxFile List (for the Kate File List Loader Plugin)xx
+ Comment[zh_CN]=文件列表(用于 Kate 文件列表装入器插件)
+ Comment[zh_TW]=檔案清單 (供 Kate 檔案清單載入器)
+ Comment[zu]=Uhlu Lwamafayela (Ukungena ngaphakathi Komlayishi Kwefayela Lohlu)
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/x-latex.desktop kdelibs_3_4_BRANCH/mimetypes/text/x-latex.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/x-latex.desktop	2004-12-29 18:52:19.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/x-latex.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=LaTeX Document
++Comment[af]=LaTeX Dokument
+ Comment[ar]=مستند LaTeX
+ Comment[az]=LaTeX Sənədi
+ Comment[be]=Дакумэнт LaTeX
+@@ -60,7 +61,6 @@
+ Comment[uk]=Документ LaTeX
+ Comment[uz]=LaTeX ҳужжати
+ Comment[wa]=Documint LaTeX
+-Comment[xx]=xxLaTeX Documentxx
+ Comment[zh_CN]=LaTeX 文档
+ Comment[zh_TW]=LaTex 文件
+ Icon=tex
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/x-ldif.desktop kdelibs_3_4_BRANCH/mimetypes/text/x-ldif.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/x-ldif.desktop	2004-12-29 18:52:19.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/x-ldif.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=LDAP Addressbook
++Comment[af]=LDAP Adresboek
+ Comment[ar]=دفتر عناوين LDAP
+ Comment[az]=LDAP Ünvan Kitabçası
+ Comment[be]=Адрасная кніга LDAP
+@@ -60,7 +61,6 @@
+ Comment[uk]=Адресна книга LDAP
+ Comment[uz]=LDAP манзиллар дафтари
+ Comment[wa]=Calpin d' adresses LDAP
+-Comment[xx]=xxLDAP Addressbookxx
+ Comment[zh_CN]=LDAP 地址簿
+ Comment[zh_TW]=LDAP 地址簿
+ Icon=vcard
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/x-log.desktop kdelibs_3_4_BRANCH/mimetypes/text/x-log.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/x-log.desktop	2005-01-21 05:24:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/x-log.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -63,7 +63,6 @@
+ Comment[ven]=Faela yau apulifikhesheni yau loga
+ Comment[wa]=Fitchî djournå d' on programe
+ Comment[xh]=Isicelo Sefayile Yokungena
+-Comment[xx]=xxApplication Log Filexx
+ Comment[zh_CN]=应用程序日志文件
+ Comment[zh_TW]=應用程式日誌檔案
+ Comment[zu]=Ifayela Lokungena Lomyaleli
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/x-makefile.desktop kdelibs_3_4_BRANCH/mimetypes/text/x-makefile.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/x-makefile.desktop	2004-12-29 18:52:19.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/x-makefile.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -26,7 +26,6 @@
+ Comment[uk]=Файл Makefile
+ Comment[ven]=Itanifaela
+ Comment[xh]=Yenza ifayile
+-Comment[xx]=xxMakefilexx
+ Comment[zu]=Yenza ifayela
+ Type=MimeType
+ Patterns=GNUmakefile;Makefile;makefile;Makefile.*;makefile.*
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/x-moc.desktop kdelibs_3_4_BRANCH/mimetypes/text/x-moc.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/x-moc.desktop	2005-01-21 05:24:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/x-moc.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -65,7 +65,6 @@
+ Comment[ven]=Meta faela ya tshithu ya Qt
+ Comment[vi]=File siêu đối tượng của Qt(meta object file) 
+ Comment[xh]=Qt Meta Ifayile Yenjongo
+-Comment[xx]=xxQt Meta Object Filexx
+ Comment[zh_CN]=Qt 元目标文件
+ Comment[zh_TW]=Qt Meta 目標文件
+ Comment[zu]=Ifayela Lento ye-Meta lwe-Qt
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/x-mswinurl.desktop kdelibs_3_4_BRANCH/mimetypes/text/x-mswinurl.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/x-mswinurl.desktop	2005-01-21 05:24:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/x-mswinurl.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -65,7 +65,6 @@
+ Comment[uz]=Интернет қисқартмаси
+ Comment[ven]=Tshikhau tsha Inithanete
+ Comment[xh]=Indlela ezimfutshane ze Internet
+-Comment[xx]=xxInternet Shortcutxx
+ Comment[zh_CN]=Internet 快捷方式
+ Comment[zh_TW]=網路捷徑
+ Comment[zu]=Indlela emfushane ye-Internet
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/x-objchdr.desktop kdelibs_3_4_BRANCH/mimetypes/text/x-objchdr.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/x-objchdr.desktop	2005-02-23 06:05:05.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/x-objchdr.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -33,13 +33,12 @@
+ Comment[sk]=Hlavičkový súbor Objective-C
+ Comment[sl]=Datoteka z glavo v Objective-C
+ Comment[sr]=Заглавље Objective-C-а
+-Comment[sr@Latn]=Заглавље Objective-C-а
++Comment[sr@Latn]=Zaglavlje Objective-C-a
+ Comment[sv]=Objective-C-deklarationsfil
+ Comment[ta]=Objective-C தலைப்பு கோப்பு
+ Comment[tg]=Сармояи Файли Objective-C
+ Comment[tr]=Objective-C Başlık Dosyası
+ Comment[uk]=Файл заголовків Objective-C
+-Comment[xx]=xxObjective-C Header Filexx
+ Comment[zh_CN]=Objective-C 头文件
+ Icon=source_h
+ Type=MimeType
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/x-objcsrc.desktop kdelibs_3_4_BRANCH/mimetypes/text/x-objcsrc.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/x-objcsrc.desktop	2005-02-17 05:18:43.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/x-objcsrc.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -65,7 +65,6 @@
+ Comment[ven]=Faela ya Vhubvo ha C ha vhudi
+ Comment[wa]=Fitchî sourdant Objective C
+ Comment[xh]=Ifayile Yemvelaphi Yenjongo-C
+-Comment[xx]=xxObjective-C Source Filexx
+ Comment[zh_CN]=Objective-C 源文件
+ Comment[zh_TW]=Objective-C 原始碼
+ Comment[zu]=Ifayela lemvelaphi Lenhloso ka-C
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/x-pascal.desktop kdelibs_3_4_BRANCH/mimetypes/text/x-pascal.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/x-pascal.desktop	2005-01-21 05:24:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/x-pascal.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -64,7 +64,6 @@
+ Comment[ven]=Faela ya Vhubvo ha Pascal
+ Comment[wa]=Fitchî sourdant Pascal
+ Comment[xh]=Ifayile Zemvelaphi ze Pascal
+-Comment[xx]=xxPascal Source Filexx
+ Comment[zh_CN]=Pascal 源文件
+ Comment[zh_TW]=Pascal 源碼
+ Comment[zu]=Ifayela Lemvelaphi ye-Pascal
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/x-tcl.desktop kdelibs_3_4_BRANCH/mimetypes/text/x-tcl.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/x-tcl.desktop	2005-01-21 05:24:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/x-tcl.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -66,7 +66,6 @@
+ Comment[ven]=Faela ya Tcl
+ Comment[wa]=Fitchî Tcl
+ Comment[xh]=Ifayile ye Tcl
+-Comment[xx]=xxTcl Filexx
+ Comment[zh_CN]=Tcl 文件
+ Comment[zh_TW]=Tcl 檔案
+ Comment[zu]=Ifayela le-Tcl
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/x-tex.desktop kdelibs_3_4_BRANCH/mimetypes/text/x-tex.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/x-tex.desktop	2005-01-21 05:24:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/x-tex.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -66,7 +66,6 @@
+ Comment[ven]=Faela ya TeX
+ Comment[wa]=Fitchî TeX
+ Comment[xh]=Ifayile ye TeX
+-Comment[xx]=xxTeX Filexx
+ Comment[zh_CN]=TeX 文件
+ Comment[zh_TW]=TeX 檔案
+ Comment[zu]=Ifayela le-TeX
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/x-vcalendar.desktop kdelibs_3_4_BRANCH/mimetypes/text/x-vcalendar.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/x-vcalendar.desktop	2005-01-21 05:24:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/x-vcalendar.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -6,6 +6,7 @@
+ Comment[az]=vCalendar Dəyişdirmə Faylı
+ Comment[bg]=Файл за обмяна на vCalendar
+ Comment[bn]=vCalendar ইন্টারচেঞ্জ ফাইল
++Comment[br]=Restr eskemm vCalendar
+ Comment[bs]=vCalendar datoteka za razmjenu
+ Comment[ca]=Fitxer d'intercanvi del vCalendar
+ Comment[cs]=Výměnný soubor vCalendar
+@@ -59,7 +60,6 @@
+ Comment[uz]=vCalendar-файли
+ Comment[ven]=Faela ya shandukea ya khalenda ya v
+ Comment[xh]=Ifayile Etshintsha ngaphakathi ye vCalendar
+-Comment[xx]=xxvCalendar Interchange Filexx
+ Comment[zh_CN]=vCalendar 交换文件
+ Comment[zh_TW]=vCalendar 交換檔案
+ Comment[zu]=Ifayela Elinokushintsha ngaphakathi le-vCalendar
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/x-vcard.desktop kdelibs_3_4_BRANCH/mimetypes/text/x-vcard.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/x-vcard.desktop	2005-01-21 05:24:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/x-vcard.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -67,7 +67,6 @@
+ Comment[ven]=Garata ya vhubindudzi ya Elekithironiki
+ Comment[vi]=Thẻ tín dụng điện tử (EBC) 
+ Comment[xh]=Ikhadi Leshishini Lombane
+-Comment[xx]=xxElectronic Business Cardxx
+ Comment[zh_CN]=电子商业卡片
+ Comment[zh_TW]=電子商業卡片
+ Comment[zu]= Ikhadi Lebhizinisi Likagesi
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/x-xslfo.desktop kdelibs_3_4_BRANCH/mimetypes/text/x-xslfo.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/x-xslfo.desktop	2005-01-21 05:24:27.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/x-xslfo.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -58,7 +58,6 @@
+ Comment[uz]=XSL формат қилиш объект файли
+ Comment[ven]=XSL yau vhumba tshithu tshga faela
+ Comment[xh]=XSL Ifomata Injongo Yefayile 
+-Comment[xx]=xxXSL Formating Object Filexx
+ Comment[zh_CN]=XSL 格式对象文件
+ Comment[zh_TW]=XSL 格式物件檔案
+ Comment[zu]=Ifayela Lokubonisa Lesakhiwo se-XSL
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/x-xslt.desktop kdelibs_3_4_BRANCH/mimetypes/text/x-xslt.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/x-xslt.desktop	2005-01-28 05:03:18.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/x-xslt.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -61,7 +61,6 @@
+ Comment[uz]=XSLT Stylesheet-файли
+ Comment[ven]=Faela ya tshitaela tsha bammbiri ya XSLT
+ Comment[xh]=XSLT Ifayile Yohlobo lwekhasi
+-Comment[xx]=xxXSLT Stylesheet Filexx
+ Comment[zh_CN]=XSLT 样式表文件
+ Comment[zh_TW]=XSLT 樣式表格檔案
+ Comment[zu]=Ifayela Lepheshana lesitayela lika-XSLT
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/text/xml.desktop kdelibs_3_4_BRANCH/mimetypes/text/xml.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/text/xml.desktop	2004-12-29 18:52:19.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/text/xml.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=XML Document
++Comment[af]=XML Dokument
+ Comment[ar]=مستند XML
+ Comment[az]=XML Sənədi
+ Comment[be]=Дакумэнт XML
+@@ -60,7 +61,6 @@
+ Comment[uk]=Документ XML
+ Comment[uz]=XML ҳужжати
+ Comment[wa]=Documint XML
+-Comment[xx]=xxXML Documentxx
+ Comment[zh_CN]=XML 文档
+ Comment[zh_TW]=XML 文件
+ Icon=html
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/uri/mms.desktop kdelibs_3_4_BRANCH/mimetypes/uri/mms.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/uri/mms.desktop	2005-02-21 19:17:36.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/uri/mms.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -4,9 +4,11 @@
+ MimeType=uri/mms
+ Icon=video
+ Comment=mms: URIs
++Comment[br]=URIoù mms:
+ Comment[cs]=mms: URI
+ Comment[da]=mms: URI'er
+ Comment[et]=mms: URI-d
++Comment[eu]=mms: URIak
+ Comment[fr]=URIs mms:
+ Comment[fy]=mms: URI-adresse
+ Comment[hu]=mms: URI-k
+@@ -25,8 +27,7 @@
+ Comment[sk]=URI typu mms:
+ Comment[sl]=mms: URI-ji
+ Comment[sr]=mms: URI-ји
+-Comment[sr@Latn]=mms: URI-ји
++Comment[sr@Latn]=mms: URI-ji
+ Comment[sv]=mms: webbadresser
+ Comment[uk]=mms: URI
+-Comment[xx]=xxmms: URIsxx
+ Comment[zh_CN]=mms: URI
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/uri/mmst.desktop kdelibs_3_4_BRANCH/mimetypes/uri/mmst.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/uri/mmst.desktop	2005-02-21 19:17:36.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/uri/mmst.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -4,9 +4,11 @@
+ MimeType=uri/mmst
+ Icon=video
+ Comment=mmst: URIs
++Comment[br]=URIoù mmst:
+ Comment[cs]=mmst: URI
+ Comment[da]=mmst: URI'er
+ Comment[et]=mmst: URI-d
++Comment[eu]=mmst: URIak
+ Comment[fr]=URIs mmst:
+ Comment[fy]=mmst: URI-adresse
+ Comment[hu]=mmst: URI-k
+@@ -25,8 +27,7 @@
+ Comment[sk]=URI typu mmst:
+ Comment[sl]=mmst: URI-ji
+ Comment[sr]=mmst: URI-ји
+-Comment[sr@Latn]=mmst: URI-ји
++Comment[sr@Latn]=mmst: URI-ji
+ Comment[sv]=mmst: webbadresser
+ Comment[uk]=mmst: URI
+-Comment[xx]=xxmmst: URIsxx
+ Comment[zh_CN]=mmst: URI
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/uri/mmsu.desktop kdelibs_3_4_BRANCH/mimetypes/uri/mmsu.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/uri/mmsu.desktop	2005-02-21 19:17:36.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/uri/mmsu.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -4,9 +4,11 @@
+ MimeType=uri/mmsu
+ Icon=video
+ Comment=mmsu: URIs
++Comment[br]=URIoù mmsu:
+ Comment[cs]=mmsu: URI
+ Comment[da]=mmsu: URI'er
+ Comment[et]=mmsu: URI-d
++Comment[eu]=mmsu: URIak
+ Comment[fr]=URIs mmsu:
+ Comment[fy]=mmsu: URI-adresse
+ Comment[hu]=mmsu: URI-k
+@@ -25,8 +27,7 @@
+ Comment[sk]=URI typu mmsu:
+ Comment[sl]=mmsu: URI-ji
+ Comment[sr]=mmsu: URI-ји
+-Comment[sr@Latn]=mmsu: URI-ји
++Comment[sr@Latn]=mmsu: URI-ji
+ Comment[sv]=mmsu: webbadresser
+ Comment[uk]=mmsu: URI
+-Comment[xx]=xxmmsu: URIsxx
+ Comment[zh_CN]=mmsu: URI
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/uri/pnm.desktop kdelibs_3_4_BRANCH/mimetypes/uri/pnm.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/uri/pnm.desktop	2005-02-21 19:17:36.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/uri/pnm.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -4,9 +4,11 @@
+ MimeType=uri/pnm
+ Icon=video
+ Comment=pnm: URIs
++Comment[br]=URIoù pnm:
+ Comment[cs]=pnm: URI
+ Comment[da]=pnm: URI'er
+ Comment[et]=pnm: URI-d
++Comment[eu]=pnm: URIak
+ Comment[fr]=URIs pnm:
+ Comment[fy]=pnm: URI-adresse
+ Comment[hu]=pnm: URI-k
+@@ -24,8 +26,7 @@
+ Comment[sk]=URI typu pnm:
+ Comment[sl]=pnm: URI-ji
+ Comment[sr]=pnm: URI-ији
+-Comment[sr@Latn]=pnm: URI-ији
++Comment[sr@Latn]=pnm: URI-iji
+ Comment[sv]=pnm: webbadresser
+ Comment[uk]=pnm: URI
+-Comment[xx]=xxpnm: URIsxx
+ Comment[zh_CN]=pnm: URI
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/uri/rtspt.desktop kdelibs_3_4_BRANCH/mimetypes/uri/rtspt.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/uri/rtspt.desktop	2005-02-21 19:17:36.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/uri/rtspt.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -4,9 +4,11 @@
+ MimeType=uri/rtspt
+ Icon=video
+ Comment=rtspt: URIs
++Comment[br]=URIoù rtspt:
+ Comment[cs]=rtspt: URI
+ Comment[da]=rtspt: URI'er
+ Comment[et]=rtspt: URI-d
++Comment[eu]=rtspt: URIak
+ Comment[fr]=URIs rtspt:
+ Comment[fy]=rtspt: URI-adresse
+ Comment[hu]=rtspt: URI-k
+@@ -25,8 +27,7 @@
+ Comment[sk]=URI typu rtspt:
+ Comment[sl]=rtspt: URI-ji
+ Comment[sr]=rtspt: URI-ији
+-Comment[sr@Latn]=rtspt: URI-ији
++Comment[sr@Latn]=rtspt: URI-iji
+ Comment[sv]=rtspt: webbadresser
+ Comment[uk]=rtspt: URI
+-Comment[xx]=xxrtspt: URIsxx
+ Comment[zh_CN]=rtspt: URI
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/uri/rtspu.desktop kdelibs_3_4_BRANCH/mimetypes/uri/rtspu.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/uri/rtspu.desktop	2005-02-21 19:17:36.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/uri/rtspu.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -4,9 +4,11 @@
+ MimeType=uri/rtspu
+ Icon=video
+ Comment=rtspu: URIs
++Comment[br]=URIoù rtspu:
+ Comment[cs]=rtspu: URI
+ Comment[da]=rtspu: URI'er
+ Comment[et]=rtspu: URI-d
++Comment[eu]=rtspu: URIak
+ Comment[fr]=URIs rtspu:
+ Comment[fy]=rtspu: URI-adresse
+ Comment[hu]=rtspu: URI-k
+@@ -25,8 +27,7 @@
+ Comment[sk]=URI typu rtspu:
+ Comment[sl]=rtspu: URI-ji
+ Comment[sr]=rtspu: URI-ији
+-Comment[sr@Latn]=rtspu: URI-ији
++Comment[sr@Latn]=rtspu: URI-iji
+ Comment[sv]=rtspu: webbadresser
+ Comment[uk]=rtspu: URI
+-Comment[xx]=xxrtspu: URIsxx
+ Comment[zh_CN]=rtspu: URI
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/video/avi.desktop kdelibs_3_4_BRANCH/mimetypes/video/avi.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/video/avi.desktop	2005-01-21 05:24:29.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/video/avi.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -67,7 +67,6 @@
+ Comment[ven]=Vidio ya AVI ya microsoft
+ Comment[vi]=Video AVI của Microsoft 
+ Comment[wa]=Videyo AVI
+-Comment[xx]=xxMicrosoft AVI Videoxx
+ Comment[zh_CN]=Microsoft AVI 视频
+ Comment[zh_TW]=微軟 AVI 視頻文件
+ Comment[zu]=Ividiyo le-Microsoft AVI
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/video/mp4.desktop kdelibs_3_4_BRANCH/mimetypes/video/mp4.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/video/mp4.desktop	2005-02-02 06:14:07.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/video/mp4.desktop	2005-03-12 18:58:53.000000000 +0100
+@@ -60,7 +60,6 @@
+ Comment[uk]=Відео MPEG-4
+ Comment[uz]=MPEG-4 видео
+ Comment[wa]=Videyo MPEG-4
+-Comment[xx]=xxMPEG-4 Videoxx
+ Comment[zh_CN]=MPEG4 视频
+ Comment[zh_TW]=MPEG 視頻檔案
+ X-KDE-IsAlso=video/quicktime
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/video/mpeg.desktop kdelibs_3_4_BRANCH/mimetypes/video/mpeg.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/video/mpeg.desktop	2005-02-02 06:14:07.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/video/mpeg.desktop	2005-03-12 18:58:54.000000000 +0100
+@@ -65,7 +65,6 @@
+ Comment[ven]=Vidio ya MPEG
+ Comment[vi]=Video MPEG 
+ Comment[wa]=Videyo MPEG
+-Comment[xx]=xxMPEG Videoxx
+ Comment[zh_CN]=MPEG 视频
+ Comment[zh_TW]=MPEG 視頻文件
+ Comment[zu]=Ividiyo lwe-MPEG
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/video/quicktime.desktop kdelibs_3_4_BRANCH/mimetypes/video/quicktime.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/video/quicktime.desktop	2005-02-02 06:14:07.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/video/quicktime.desktop	2005-03-12 18:58:54.000000000 +0100
+@@ -63,7 +63,6 @@
+ Comment[ven]=Vidio ya Tshifhinga tshau tavhanya
+ Comment[vi]=Video QuickTime 
+ Comment[wa]=Videyo Quicktime
+-Comment[xx]=xxQuicktime Videoxx
+ Comment[zh_CN]=Quicktime 视频
+ Comment[zh_TW]=Quicktime 視頻文件
+ Comment[zu]=Ividiyo Yesikhathi Esheshayo
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/video/vnd.rn-realvideo.desktop kdelibs_3_4_BRANCH/mimetypes/video/vnd.rn-realvideo.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/video/vnd.rn-realvideo.desktop	2005-01-05 04:58:40.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/video/vnd.rn-realvideo.desktop	2005-03-12 18:58:54.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=video
+ Patterns=*.rv;*.RV;
+ Comment=RealVideo File
++Comment[af]=RealVideo Lêer
+ Comment[ar]=ملف RealVideo
+ Comment[az]=RealVideo Faylı
+ Comment[be]=Файл RealAudio
+@@ -64,7 +65,6 @@
+ Comment[uk]=Файл RealVideo
+ Comment[uz]=RealVideo-файли
+ Comment[wa]=Fitchî RealVideo
+-Comment[xx]=xxRealVideo Filexx
+ Comment[zh_CN]=RealVideo 文件
+ Comment[zh_TW]=RealVideo 檔案
+ 
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/video/x-flic.desktop kdelibs_3_4_BRANCH/mimetypes/video/x-flic.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/video/x-flic.desktop	2005-01-21 05:24:29.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/video/x-flic.desktop	2005-03-12 18:58:54.000000000 +0100
+@@ -5,6 +5,7 @@
+ Icon=video
+ Patterns=*.fli;*.flc;*.FLI;*.FLC;
+ Comment=Autodesk's FLIC File
++Comment[af]=Autodesk se FLIC Lêer
+ Comment[ar]=ملف FLIC لأوتوديسك
+ Comment[az]=Autodesk FLIC Faylı
+ Comment[be]=Autodesk FLIC файл
+@@ -67,7 +68,6 @@
+ Comment[ven]=Faela ya FLIC Autodesk
+ Comment[wa]=Fitchî FLIC d' Autodesk
+ Comment[xh]=Iifayile ezenzekelayo ye FLIC
+-Comment[xx]=xxAutodesk's FLIC Filexx
+ Comment[zh_CN]=Autodesk FLIC 文件
+ Comment[zh_TW]=Autodesk 的 FLIC 文件
+ Comment[zu]=Ifayela Ledeski elizenzekelayo le-FLIC
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/video/x-matroska.desktop kdelibs_3_4_BRANCH/mimetypes/video/x-matroska.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/video/x-matroska.desktop	2005-02-02 06:14:07.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/video/x-matroska.desktop	2005-03-12 18:58:54.000000000 +0100
+@@ -58,6 +58,5 @@
+ Comment[uk]=Відео "Матрьошка"
+ Comment[uz]=Matroska видео
+ Comment[wa]=Videyo Matroska
+-Comment[xx]=xxMatroska Videoxx
+ Comment[zh_CN]=Matroska 视频
+ Comment[zh_TW]=Matroska 視頻檔案
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/video/x-mng.desktop kdelibs_3_4_BRANCH/mimetypes/video/x-mng.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/video/x-mng.desktop	2005-01-21 05:24:29.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/video/x-mng.desktop	2005-03-12 18:58:54.000000000 +0100
+@@ -70,7 +70,6 @@
+ Comment[ven]=Tshifanyiso tsha MNG
+ Comment[wa]=Imådje MNG
+ Comment[xh]=Umfanekiso we MNG
+-Comment[xx]=xxMNG Imagexx
+ Comment[zh_CN]=MNG 图像
+ Comment[zh_TW]=MNG 影像
+ Comment[zu]=Isithombe se-MNG
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/video/x-ms-asf.desktop kdelibs_3_4_BRANCH/mimetypes/video/x-ms-asf.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/video/x-ms-asf.desktop	2005-01-21 05:24:29.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/video/x-ms-asf.desktop	2005-03-12 18:58:54.000000000 +0100
+@@ -61,7 +61,6 @@
+ Comment[tr]=ASF dosyası
+ Comment[uk]=Носій ASF
+ Comment[uz]=ASF медиа-файли
+-Comment[xx]=xxASF Mediaxx
+ Comment[zh_CN]=ASF 媒体
+ Comment[zh_TW]=ASF 媒體
+ Comment[zu]=Abasiki bebunda be-ASF
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/video/x-ms-wmv.desktop kdelibs_3_4_BRANCH/mimetypes/video/x-ms-wmv.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/video/x-ms-wmv.desktop	2005-02-02 06:14:08.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/video/x-ms-wmv.desktop	2005-03-12 18:58:54.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=Windows Media Video
++Comment[af]=Windows Media Lêer
+ Comment[ar]=ملف فيديو Windows Media
+ Comment[az]=Windows Mediya Video Faylı
+ Comment[be]=Windows Media відэа
+@@ -57,7 +58,6 @@
+ Comment[uk]=Відео кліп Windows Media
+ Comment[uz]=Windows Media видео
+ Comment[wa]=Videyo Windows Media
+-Comment[xx]=xxWindows Media Videoxx
+ Comment[zh_CN]=Windows Media 视频
+ Comment[zh_TW]=WIndows Media 視頻檔案
+ Hidden=false
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/video/x-msvideo.desktop kdelibs_3_4_BRANCH/mimetypes/video/x-msvideo.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/video/x-msvideo.desktop	2005-01-21 05:24:29.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/video/x-msvideo.desktop	2005-03-12 18:58:54.000000000 +0100
+@@ -66,7 +66,6 @@
+ Comment[ven]=Vidio ya AVI ya microsoft
+ Comment[vi]=Video AVI của Microsoft 
+ Comment[wa]=Videyo AVI
+-Comment[xx]=xxMicrosoft AVI Videoxx
+ Comment[zh_CN]=Microsoft AVI 视频
+ Comment[zh_TW]=微軟 AVI 視頻文件
+ Comment[zu]=Ividiyo le-Microsoft AVI
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/video/x-ogm.desktop kdelibs_3_4_BRANCH/mimetypes/video/x-ogm.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/video/x-ogm.desktop	2005-02-02 06:14:08.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/video/x-ogm.desktop	2005-03-12 18:58:54.000000000 +0100
+@@ -61,6 +61,5 @@
+ Comment[uk]=Відео Ogg/Ogm
+ Comment[uz]=Ogg/Ogm видео
+ Comment[wa]=Videyo Ogg/Ogm
+-Comment[xx]=xxOgg/Ogm Videoxx
+ Comment[zh_CN]=Ogg/Ogm 视频
+ Comment[zh_TW]=Ogg/Ogm 視頻檔案
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/mimetypes/video/x-theora.desktop kdelibs_3_4_BRANCH/mimetypes/video/x-theora.desktop
+--- kdelibs_3_4_0_RELEASE/mimetypes/video/x-theora.desktop	2005-02-02 06:14:08.000000000 +0100
++++ kdelibs_3_4_BRANCH/mimetypes/video/x-theora.desktop	2005-03-12 18:58:54.000000000 +0100
+@@ -59,6 +59,5 @@
+ Comment[uk]=Відео Theora
+ Comment[uz]=Theora видео
+ Comment[wa]=Videyo Theora
+-Comment[xx]=xxTheora Videoxx
+ Comment[zh_CN]=Theora 文件
+ Comment[zh_TW]=Theora 視頻檔案
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/pics/crystalsvg/index.theme kdelibs_3_4_BRANCH/pics/crystalsvg/index.theme
+--- kdelibs_3_4_0_RELEASE/pics/crystalsvg/index.theme	2005-02-23 06:05:06.000000000 +0100
++++ kdelibs_3_4_BRANCH/pics/crystalsvg/index.theme	2005-03-12 18:58:54.000000000 +0100
+@@ -8,15 +8,16 @@
+ Name[ro]=Cristal SVG
+ Name[ru]=Изображение Crystal SVG
+ Name[sr]=Кристалl СВГ
+-Name[sr@Latn]=Кристалl СВГ
++Name[sr@Latn]=Kristall SVG
+ Name[sv]=Kristall SVG
+ Name[ta]=க்ரிஸ்டல் எஸ்விஜி
+-Name[xx]=xxCrystal SVGxx
+ Name[zh_CN]=水晶 SVG
+ Comment=Icon Theme by Everaldo.com Design Studio
++Comment[af]=Ikoon Tema deur Everaldo.com Design Studio
+ Comment[be]=Тэма піктаграмаў ад студыі дызайну Everaldo.com
+ Comment[bg]=Тема с икони от Евералдо (www.everaldo.com)
+ Comment[bn]=এভারাল্ডোর (www.everaldo.com) তৈরি আইকন থিম
++Comment[br]=Giz arlun gant Everaldo.com Design Studio
+ Comment[bs]=Tema ikona, pravio Everaldo.com dizajn studio
+ Comment[ca]=Tema d'icones de l'estudi de disseny Everaldo.com
+ Comment[cs]=Motiv ikon studia Everaldo.com
+@@ -55,14 +56,13 @@
+ Comment[sk]=Téma ikon od Everaldo.com Design Studio
+ Comment[sl]=Ikonska tema od oblikovalskega sutida Everaldo.com
+ Comment[sr]=Тема икона Everaldo.com дизајнерског студија
+-Comment[sr@Latn]=Тема икона Everaldo.com дизајнерског студија
++Comment[sr@Latn]=Tema ikona Everaldo.com dizajnerskog studija
+ Comment[sv]=Ikontema av Everaldo.com designstudio
+ Comment[ta]=எவரால்டோ.காம் வடிவமைப்பு படப்பிடிப்பகத்தின் சின்னம்
+ Comment[tg]=Мавзӯъҳои нишонаҳо аз Эвералдо мебошад (www.everaldo.com)
+ Comment[tr]=Simge Teması: Everaldo.com Tasarım Stüdyosu
+ Comment[uk]=Тема піктограм від студії дизайну Everaldo.com
+ Comment[uz]=Everaldo.com дизайн студиоси томонидан нишончалар мавзуси
+-Comment[xx]=xxIcon Theme by Everaldo.com Design Studioxx
+ Comment[zh_CN]=Everaldo 设计工作室制作的图标主题
+ DisplayDepth=32
+ 
+diff -Nru -x CVS kdelibs_3_4_0_RELEASE/pics/hicolor/index.theme kdelibs_3_4_BRANCH/pics/hicolor/index.theme
+--- kdelibs_3_4_0_RELEASE/pics/hicolor/index.theme	2005-02-23 06:05:07.000000000 +0100
++++ kdelibs_3_4_BRANCH/pics/hicolor/index.theme	2005-03-12 18:58:55.000000000 +0100
+@@ -43,7 +43,6 @@
+ Name[uk]=Багатокольорова KDE
+ Name[ven]=Muvhala wa ntha wa-KDE
+ Name[wa]=KDE-HôtèsColeurs
+-Name[xx]=xxKDE-HiColorxx
+ Name[zh_CN]=KDE 高色彩
+ Name[zh_TW]=KDE 高彩
+ Name[zu]=Umbala Ophezulu lwe-KDE
+@@ -76,12 +75,11 @@
+ Comment[sk]=Náhradná téma ikon
+ Comment[sl]=Ikonska tema Fallback
+ Comment[sr]=Резервна тема икона
+-Comment[sr@Latn]=Резервна тема икона
++Comment[sr@Latn]=Rezervna tema ikona
+ Comment[sv]=Reservikontema
+ Comment[ta]=பின்விழும் சின்ன தலைப்பு
+ Comment[tg]=Мавзӯъи рангбаландии нишонаҳо
+ Comment[uk]=Основна тема піктограм
+-Comment[xx]=xxFallback icon themexx
+ Comment[zh_CN]=默认图标主题
+ DisplayDepth=32
+ Example=exec