[pkg-kde-commits] rev 2635 - trunk/packages/kdelibs/debian/patches

[Christopher Martin]

Author: chrsmrtn
Date: 2005-12-15 03:58:52 +0000 (Thu, 15 Dec 2005)
New Revision: 2635

Added:
   trunk/packages/kdelibs/debian/patches/01_kdelibs_branch_r488534.diff
Log:
Branch pull for kdelibs.


Added: trunk/packages/kdelibs/debian/patches/01_kdelibs_branch_r488534.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/01_kdelibs_branch_r488534.diff	2005-12-14 22:13:09 UTC (rev 2634)
+++ trunk/packages/kdelibs/debian/patches/01_kdelibs_branch_r488534.diff	2005-12-15 03:58:52 UTC (rev 2635)
@@ -0,0 +1,15865 @@
+#DPATCHLEVEL=0
+--- interfaces/kscript/sample/shellscript.desktop	(revision 484194)
++++ interfaces/kscript/sample/shellscript.desktop	(revision 488534)
+@@ -28,7 +28,6 @@
+ Name[is]=Keyrsluforrit bash skeljaforrita
+ Name[it]=Esecutore script bash
+ Name[ja]=Bash シェルスクリプト 実行
+-Name[ka]=bash სკრიპტების შესრულება
+ Name[km]=កម្មវិធី​រត់​ស្គ្រីប​សែល Bash
+ Name[ko]=배쉬 쉘 스크립트 실행기
+ Name[lb]=Ausféierer fir Bash-Kommandozeil-Skripter
+@@ -61,7 +60,6 @@
+ 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
+@@ -99,7 +97,6 @@
+ Comment[is]=Keyrir bash skeljaforrit innan forritsins
+ Comment[it]=Esegue gli script bash all'interno dell'applicazione.
+ Comment[ja]=アプリケーション内部からの Bash シェルスクリプトを実行します
+-Comment[ka]=bash სკრიპტების პროგრამებში შესრულება.
+ Comment[km]=រត់​ស្គ្រីប​សែល bash ពី​ក្នុង​កម្មវិធី ។
+ Comment[ko]=응용 프로그램에서 배쉬 쉘 스크립트를 실행합니다.
+ Comment[lb]=Féiert Skripter fir d'Bash-Kommandozeil aus dem Programm selwer aus.
+@@ -133,6 +130,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 檔案
+--- interfaces/kscript/scriptinterface.desktop	(revision 484194)
++++ interfaces/kscript/scriptinterface.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=Þetta er almennur þýðandi til að prófa skriftuviðmótið.
+ Comment[it]=Questo è un motore di script generico per provare l'interfaccia di script.
+ Comment[ja]=これはスクリプトインターフェイスをテストする一般的なテストスクリプトです。
+-Comment[ka]=ეს ძრავი სკრიპტების ინტერფეისის შესამოწმებლად გამოიყენება
+ Comment[km]=នេះ​ជា0​ម៉ាស៊ីន​ស្គ្រីប​សាកល្បង​ទូទៅ​មួយ ដើម្បី​សាកល្បង​ចំណុច​ប្រទាក់​ស្គ្រីប ។
+ Comment[ko]=스크립트 인터페이스를 시험하는데 쓰이는 일반 시험 스크립트 엔진입니다.
+ Comment[lb]=Dësst ass eng allgemeng Test-Skript-Engine fir de Skript-Interface ze testen.
+@@ -72,7 +71,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.
+--- interfaces/kimproxy/interface/dcopinstantmessenger.desktop	(revision 484194)
++++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop	(revision 488534)
+@@ -29,7 +29,6 @@
+ Comment[is]=Spjallforrit með DCOP viðmóti
+ Comment[it]=Messaggistica istantanea con un'interfaccia DCOP
+ Comment[ja]=DCOP インターフェースをもつインスタントメッセンジャー
+-Comment[ka]=DCOP ინტერფეისთან შეტყობინებების გაცვლის შიკრიკი
+ Comment[km]=​កម្មវិធី​ជជែក​កំសាន្ត​ដែល​មាន​ចំណុច​ប្រទាក់ DCOP
+ Comment[lb]=Instant Messenger mat engem DCOP-Interface
+ Comment[lt]=Momentinių žinučių klientas su DCOP sąsaja
+@@ -57,5 +56,4 @@
+ Comment[tr]=DCOP arayüzüyle Anında Mesajlaşma
+ Comment[tt]=DCOP protokolı belän Aşığıç Xäbärçe
+ Comment[uk]=Програма для миттєвого зв'язку через DCOP
+-Comment[xx]=xxInstant Messenger with a DCOP interfacexx
+ Comment[zh_CN]=带 DCOP 接口的即时通讯程序
+--- interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(revision 484194)
++++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(revision 488534)
+@@ -20,7 +20,6 @@
+ Name[is]=Spjallforrit
+ Name[it]=Messaggistica istantanea
+ Name[ja]=インスタントメッセンジャー
+-Name[ka]=შიკრიკი
+ Name[km]=កម្មវិធី​វិធីជជែក​កំសាន្ត
+ Name[lt]=Momentinių žinučių klientas
+ Name[mk]=Инстант Гласник (Messenger)
+@@ -46,7 +45,6 @@
+ Name[tt]=Aşığıç Xäbärçe
+ 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.
+@@ -74,7 +72,6 @@
+ Comment[is]=Spjallforritið gerir einstaklingum og hópum kleyft að spjalla saman á einfaldan máta.
+ Comment[it]=La messaggistica istantanea permette di chiacchierare tra due persone o in gruppo.
+ Comment[ja]=インスタントメッセンジャーは個人とグループとの双方向チャットを可能にします。
+-Comment[ka]=შიკრიკი პიროვნებებსა და ჯგუფებს შორის მყისი შეტყობინებების გაცვლის საშუალებას იძლევა.
+ Comment[km]=កម្មវិធី​ជជែក​កំសាន្ត​អនុញ្ញាត​ឲ្យ​ជជែក​តាម​របៀប​ពីរ​បែប​រវាង​បុគ្គល និង ក្រុម ។
+ Comment[lb]=Den Instant Messenger erlaabt eng zwee-Weeër Kommunikatioun tëschent eenzelne Persounen a Gruppen.
+ Comment[lt]=Momentinių žinučių klientas kalbėtis individams ir grupėms.
+@@ -102,7 +99,6 @@
+ Comment[tr]=Anında mesajlaştırıcı iki yollu sohbet sağlar: bireyler ve gruplar.
+ Comment[tt]=Bu aşığıç xäbärçe aşa keşe-törkemnär arasında ike-yaqlı aralaşu mömkinlegen birä.
+ 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
+--- interfaces/kspeech/dcoptexttospeech.desktop	(revision 484194)
++++ interfaces/kspeech/dcoptexttospeech.desktop	(revision 488534)
+@@ -26,7 +26,6 @@
+ Comment[is]=Texti-í-tal þjónusta með DCOP viðmóti
+ Comment[it]=Servizio di pronuncia con un'interfaccia DCOP
+ Comment[ja]=DCOP インターフェースと動作するテキストの読み上げサービス
+-Comment[ka]=ტექსტის სინთეზის ძრავი DCOP ინტერფეისით
+ Comment[km]=សេវា​ អត្ថបទ-ទៅ-សំដី ដែល​មាន​​ចំណុចប្រទាក់ DCOP
+ Comment[lb]=Sproochausgab-Service mat engem DCOP-Interface
+ Comment[lt]=Teksto vertimo kalba tarnyba su DCOP sÄ…saja
+@@ -51,5 +50,4 @@
+ Comment[tg]=Хизматгузории Мант-ба-Талаффуз бо интерфейси DCOP
+ Comment[tt]=DCOP protokolı aşa eşläwçe Mäten-Uquçı Xezmät
+ Comment[uk]=Служба синтезу мовлення з інтерфейсом DCOP
+-Comment[xx]=xxText-to-Speech Service with a DCOP interfacexx
+ Comment[zh_CN]=带 DCOP 接口的文本到语音服务
+--- interfaces/ktexteditor/ktexteditoreditor.desktop	(revision 484194)
++++ interfaces/ktexteditor/ktexteditoreditor.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Comment[is]=Ívafinn textaritill (án skjal/sýn aðskilnaðar)
+ Comment[it]=Componente integrabile per l'elaborazione di testi (senza separazione documento/vista)
+ Comment[ja]=埋め込み可能なテキストエディタコンポーネント (Doc/View 分離なし)
+-Comment[ka]=ტექსტის რედაქტირების ჩადგმადი კომპონენტი (დოკუმენტი/ჩვენება მოდელის მხარდაჭერის გარეშე)
+ Comment[km]=សមាសភាគ​កម្មវិធីនិពន្ធ​អត្ថបទ​ដែល​អាច​បង្កប់ (ដោយ​គ្មាន​ការបំបែក Doc/View)
+ Comment[ko]=끼워넣는 글월 편집기 구성 요소 (Doc/View 나누지 않음)
+ Comment[lb]=Abettbar Texteditor-Komponent (ouni Dokument/Usiicht Trennung)
+@@ -74,7 +73,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)
+--- interfaces/ktexteditor/kcm_ktexteditor.desktop	(revision 484194)
++++ interfaces/ktexteditor/kcm_ktexteditor.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Name[is]=Ívafinn textaritill
+ Name[it]=Editor di testi integrato
+ Name[ja]=埋め込みテキストエディタ
+-Name[ka]=ტექსტის ჩადგმული რედაქტორი
+ Name[km]=កម្មវិធី​និពន្ធ​អត្ថបទ​ដែល​បាន​បង្កប់
+ Name[ko]=끼워넣은 글월 편집기
+ Name[lb]=Agebauten Texteditor
+@@ -69,7 +68,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
+@@ -104,7 +102,6 @@
+ Comment[is]=Ívafni ritillinn færir forritum texta-skoðara og ritil.  KDE forrit sem birta ritil til textavinnslu ættu að nota þessa þjónustu.
+ Comment[it]=Il servizio di editor di testi fornisce alle applicazioni un visualizzatore ed un editor di testi. Le applicazioni KDE che permettono l'elaborazione di testi dovrebbero usare questo servizio.
+ Comment[ja]=テキストビューアやテキスト編集の機能をアプリケーションに 提供するテキストエディタサービスです。テキスト編集の機能を持つ KDEアプリケーションはこれを使用するべきです。
+-Comment[ka]=პროგრამების ტექსტური რედაქტორი ტექსტების საჩვენებლად და დასარედაქტირებლად. იგი გამოიყენება იმ KDE პროგრამების მიერ, რომელთაც ტექსტის რედაქტირება ესაჭიროებათ.
+ Comment[km]=សេវា​កម្មវិធី​និពន្ធ​អត្ថបទ​ផ្តល់​នូវ​សំណុំ​កម្មវិធី​​រួម​មាន​កម្មវិធី​មើល​អត្ថបទ និង កម្មវិធី​និពន្ធ​អត្ថបទ ។ សំណុំ​កម្មវិធី KDE ដែល​ផ្តល់​មធ្យោបាយ​និពន្ធ​អត្ថបទ​ គួរ​ប្រើ​សេវា​នេះ ។
+ Comment[ko]=이 글월 편집기 서비스는 응용 프로그램이 글월을 보거나 ê³ ì¹  수 있는 기능을 ì œê³µí•©ë‹ˆë‹¤. 글월을 ê³ ì¹  수 있는 KDE 응용 프로그램은 이 서비스를 써야 합니다.
+ Comment[lb]=Den Texeditor-Service stellt Programmer en Textlieser an en Texteditor zur Verfügung.KDE-Programmer, déi Textmanipuléierungsfunktiounen ubidden, sollen dëse Service benotzen.
+@@ -141,7 +138,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.
+--- interfaces/ktexteditor/ktexteditor.desktop	(revision 484194)
++++ interfaces/ktexteditor/ktexteditor.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Comment[is]=Ívafinn textaritill (með skjal/sýn aðskilnaði)
+ Comment[it]=Componente integrabile per l'elaborazione di testi (con separazione documento/vista)
+ Comment[ja]=埋め込み可能なテキストエディタコンポーネント (Doc/View 分離)
+-Comment[ka]=ტექსტის რედაქტირების ჩადგმადი კომპონენტი (დოკუმენტი/ჩვენება მოდელის მხარდაჭერით)
+ Comment[km]=សមាសភាគ​កម្មវិធីនិពន្ធ​អត្ថបទ​​ដែល​អាច​​បង្កប់ (ដោយ​ប្រើ​ការ​បំបែក Doc/View)
+ Comment[ko]=끼워넣는 글월 편집기 구성 요소 (Doc/View 나눔)
+ Comment[lb]=Abettbar Texteditor-Komponent (mat Dokument/Usiicht Trennung)
+@@ -74,7 +73,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)
+--- interfaces/ktexteditor/ktexteditorplugin.desktop	(revision 484194)
++++ interfaces/ktexteditor/ktexteditorplugin.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=KTextEditor-íforrit
+ Comment[it]=Plugin KTextEditor
+ Comment[ja]=KTextEditorプラグイン
+-Comment[ka]=KTextEditor მოდული
+ Comment[km]=កម្មវិធី​ជំនួយ​ខាង​ក្នុង KTextEditor
+ Comment[ko]=K글월편집기 플러그인
+ Comment[lb]=KTextEditor-Plugin
+@@ -75,7 +74,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
+--- kmdi/kmdimainfrm.cpp	(revision 484194)
++++ kmdi/kmdimainfrm.cpp	(revision 488534)
+@@ -49,6 +49,7 @@
+ #include <kdeversion.h>
+ #include <qtabwidget.h>
+ #include <klocale.h>
++#include <kstdaccel.h>
+ 
+ #include <kiconloader.h>
+ #include <kmdidockcontainer.h>
+@@ -216,12 +217,7 @@
+ 
+ 	m_pPlacingMenu = new QPopupMenu( this, "placing_menu" );
+ 
+-	d->closeWindowAction = new KAction(i18n("&Close"),
+-#ifdef Q_WS_WIN
+-		CTRL|Key_F4,
+-#else
+-		0,
+-#endif
++	d->closeWindowAction = new KAction(i18n("&Close"), KStdAccel::close(),
+ 		this, SLOT(closeActiveView()), actionCollection(), "window_close");
+ 
+ 	// the MDI view taskbar
+--- kate/plugins/kdatatool/ktexteditor_kdatatool.desktop	(revision 484194)
++++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop	(revision 488534)
+@@ -30,7 +30,6 @@
+ Name[is]=KTextEditor KDataTool íforrit
+ Name[it]=Plugin KDataTool di KTextEditor
+ Name[ja]=KTextEditor KDataTool プラグイン
+-Name[ka]=მონაცემთა დამუშავების KTextEditor-ის მოდული
+ Name[km]=កម្មវិធី​ជំនួយ​ខាង​ក្នុង KDataTool KTextEditor
+ Name[lb]=KTextEditor-KDataTool-Plugin
+ Name[lt]=KTextEditor KDataTool priedas
+@@ -68,7 +67,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
+@@ -103,7 +101,6 @@
+ Comment[is]=Virkir gagnatól eins og stafsetningaforrit og leiðréttingar (ef uppsett)
+ Comment[it]=Abilita gli strumenti per i dati come il dizionario dei sinonimi e il controllo ortografico (se installati)
+ Comment[ja]=同義語ツールやスペルチェックなどのデータツールを有効にします ï¼ˆã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹å ´åˆï¼‰
+-Comment[ka]=Warktüüch as Thesaurus oder Klookschriever anmaken (wenn op dien Reekner)
+ Comment[km]=ធ្វើ​ឲ្យ​ឧបករណ៍​ទិន្នន័យ​ប្រើ​បាន ដូច​ជា​កម្រង​វេវចនសព្ទ និង​ពិនិត្យ​អក្ខរាវិរុទ្ធ​ជា​ដើម (បើ​បាន​ដំឡើង)
+ Comment[ko]=(ê¹”ë ¤ 있다면) 비슷한 말 ì‚¬ì „ê³¼ 맞춤법 검사기 같은 도구를 씁니다
+ Comment[lb]=Hëllefsprogrammer, wéi Thésaurus an Rechtschreifkontroll, uschalten (wann installéiert)
+@@ -141,7 +138,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)
+--- kate/plugins/insertfile/ktexteditor_insertfile.desktop	(revision 484194)
++++ kate/plugins/insertfile/ktexteditor_insertfile.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Name[is]=KTextEditor setja inn skrá íforrit
+ Name[it]=Plugin inserimento file di KTextEditor
+ Name[ja]=KTextEditorファイル挿入プラグイン
+-Name[ka]=ფაილის ჩადგმის KTextEditor-ის მოდული
+ Name[km]=កម្មវិធី​ជំនួយ​របស់ KTextEditor Insert File
+ Name[ko]=K글월편집기 파일 끼워넣는 플러그인
+ Name[lb]=KTextEditor-Plugin fir Dateien anzefügen
+@@ -70,7 +69,6 @@
+ 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
+@@ -97,7 +95,6 @@
+ Comment[is]=Setur inn hvaða lesanlegu skrá sem er í stöðu bendilsins
+ Comment[it]=Inserisce un qualsiasi file leggibile alla posizione del cursore
+ Comment[ja]=カーソル位置に読み込み可能なファイルを挿入します
+-Comment[ka]=ნებისმიერი კითხვადი ფაილის კურსორის ადგილას ჩამატება
+ Comment[km]=បញ្ចូល​ឯកសារ​ដែល​អាច​អាន​បាន​ណាមួយ​នៅ​ទីតាំង​របស់​ទស្សន៍​ទ្រនិច
+ Comment[ko]=커서가 있는 곳에 읽을 수 있는 파일을 끼워 넣습니다
+ Comment[lb]=Setzt eng liesbar Datei bei der Cursorpositioun an
+@@ -127,7 +124,6 @@
+ Comment[tt]=Kürsär urınına, uqıp bulğan birem eçtälegen tığıp östi
+ Comment[uk]=Вставляє зміст будь-якого файлу, який можна прочитати, у позицію курсору
+ Comment[uz]=Ҳар қандай ўқиб бўладиган файлни курсорнинг жойидан қўйиш
+-Comment[xx]=xxInsert any readable file at cursor positionxx
+ Comment[zh_CN]=åœ¨å…‰æ ‡ä½ç½®æ’å…¥ä»»ä½•å¯è¯»æ–‡ä»¶
+ X-KDE-Library=ktexteditor_insertfile
+ ServiceTypes=KTextEditor/Plugin
+--- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop	(revision 484194)
++++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop	(revision 488534)
+@@ -25,9 +25,8 @@
+ Name[is]=KTextEditor sjálfvirkur bókamerkjari
+ Name[it]=Segnalibri automatici di KTextEditor
+ Name[ja]=KTextEditor 自動ブックマーク
+-Name[ka]=KTextEditor-ის ავტოსანიშნე
+ Name[km]=វត្ថុ​ចំណាំ​ស្វ័យ​ប្រវត្តិ KTextEditor
+-Name[lb]=Automateschen Lieszeechësetzer fir den KTextEditor 
++Name[lb]=Automateschen Lieszeechesetzer fir den KTextEditor 
+ Name[lt]=KTextEditor automatinis žymelių įterpėjas
+ Name[lv]=KTextEditor automātiskais grāmatzīmju licējs
+ Name[mk]=KTextEditor Автообележувач
+@@ -54,7 +53,6 @@
+ Name[tr]=KTextEditor Otomatik Sıkkullanılanlar Ekleyici
+ Name[tt]=KTextEditor'nıñ Aqıllı Bitbilge
+ 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 boekmerke op lyne wat met 'n patroon ooreenstem wanneer dokumente gelaai word.
+@@ -82,7 +80,6 @@
+ Comment[is]=Setur bókamerki á línur sem passa ákveðnu mynstri, þegar skjöl eru lesin
+ Comment[it]=Imposta dei segnalibri sulle righe corrispondendi a uno schema quando si caricano dei documenti
+ Comment[ja]=文書が読み込まれた時、パターンにマッチした行にブックマークを設定します
+-Comment[ka]=დოკუმენტის ჩატვირთვისას სანიშნეების ნიმუშის მიხედვით მითითება
+ Comment[km]=កំណត់​ការចំណាំ​ត្រង់​បន្ទាត់​ដែល​ដូច​នឹង​ឃ្លា ពេល​ឯកសារ​ត្រូវ​បាន​ផ្ទុក
+ Comment[lb]=Setzt Lieszeechen op d'Zeilen, déi ee bestëmmtent Muster enthalen, wann d'Dokument geluede gëtt
+ Comment[lt]=Įterpia žymeles eilutėse, kurios atitinka tam tikrą derinį, dokumento įkėlimo metu
+@@ -110,7 +107,6 @@
+ Comment[tg]=Аз рӯи қолиб сабт намудани замимаҳо дар ҳуҷҷат
+ Comment[tt]=İstälek açqan çaqta sözgeçkä kileşkän yullarına bitbilgelär quya
+ 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
+--- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop	(revision 484194)
++++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop	(revision 488534)
+@@ -25,7 +25,6 @@
+ Name[is]=KTextEditor íforrit til að klára orð
+ Name[it]=Plugin completamento parole di KTextEditor
+ Name[ja]=KTextEditor単語補完プラグイン
+-Name[ka]=სიტყვების თვითშევსების KTextEditor-ის მოდული
+ Name[km]=កម្មវិធី​ជំនួយ​បំពេញ​ពាក្យ​របស់ KTextEditor
+ Name[ko]=K글월편집기 낱말 완성 플러그인
+ Name[lb]=KTextEditor-Wuert-Vervollstännegungs-Plugin
+@@ -55,7 +54,6 @@
+ Name[tr]=KTextEditor Kelime Tamamlama Eklentisi
+ Name[tt]=KTextEditor'nıñ Süz Tulılandıru Östämäse
+ 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
+@@ -82,7 +80,6 @@
+ Comment[is]=Áttvíst forrit sem getur líka opnað glugga með orðatillögum
+ Comment[it]=Completamento direzionale o con finestre a comparsa di parole nel documento
+ Comment[ja]=ドキュメントで単語から指向性またはポップアップベース補完をします
+-Comment[ka]=დოკუმენტში სიტყვების პირდაპირი მეთოდით ან ჩამოშლადი მენიუთი თვითშევსება
+ Comment[km]=ការបំពេញ​ពាក្យ​ដោយ​ផ្ទាល់ ឬ តាម​រយៈ​ការលេចឡើង​នៃ​ពាក្យ​ដែល​មាន​ក្នុង​ឯកសារ
+ Comment[lb]=Direktional oder Opklapp-Fënster-baséiert Vervollstännegung vu Wierder am Dokument
+ Comment[lt]=Žodžių pabaigimas rašant dokumente pasiūlymus teikiant eilutėje arba iššokančiame meniu
+@@ -109,7 +106,6 @@
+ Comment[tr]=Doğrusal veya açılır-kuttu abanlı kelime tamamlama
+ Comment[tt]=İstälek süzlärenä azaqlarnı yözep çığarıp kürsätä torğan närsä
+ 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
+--- kate/plugins/isearch/ktexteditor_isearch.desktop	(revision 484194)
++++ kate/plugins/isearch/ktexteditor_isearch.desktop	(revision 488534)
+@@ -30,7 +30,6 @@
+ Name[is]=KTextEditor þrepaleitar-íforrit
+ Name[it]=Plugin ricerca incrementale di KTextEditor
+ Name[ja]=KTextEditor インクリメンタル検索プラグイン
+-Name[ka]=ნამატი ძიების KTextEditor მოდული
+ Name[km]=កម្មវិធី​ជំនួយ​ខាង​ក្នុង ​KTextEditor Incremental Search
+ Name[lb]=Inkrementellen Sich-Plugin fir de KTextEditor
+ Name[lt]=KTextEditor augančios paieškos priedas
+@@ -67,7 +66,6 @@
+ 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
+@@ -98,7 +96,6 @@
+ Comment[is]=Einnig þekkt sem "Leita meðan þú pikkar"
+ Comment[it]=Noto anche come "Ricerca mentre scrivi"
+ Comment[ja]="打ったものそのまま検索"としても知られています
+-Comment[ka]=იგივეა, რაც ძიება აკრეფის პროცესში
+ Comment[km]=​ក៏​ស្គាល់​ជា "ស្វែងរក ពេល​អ្នក​វាយ"
+ Comment[lb]=Och bekannt als "Sichen, wärend dir antippt"
+ Comment[lt]=Taip pat žinomas kaip „paieška spausdinimo metu“
+@@ -127,7 +124,6 @@
+ Comment[tr]=Ayrıca "Yazarken ararsın" olarak da bilinir
+ Comment[tt]=Cıyılu belän beryulı ezli
+ Comment[uk]=Також відомий як "Пошук за вводом"
+-Comment[xx]=xxAlso known as "As you type search"xx
+ Comment[zh_CN]=也称为“即输即搜”
+ X-KDE-Library=ktexteditor_isearch
+ ServiceTypes=KTextEditor/Plugin
+--- kate/scripts/jstest.desktop	(revision 484194)
++++ kate/scripts/jstest.desktop	(revision 488534)
+@@ -16,7 +16,7 @@
+ Name[hu]=Kate objektum, Javascript-teszt
+ Name[is]=Kate hluti JavaScript prófun
+ Name[it]=Prova componente JavaScript per Kate
+-Name[ka]=JavaScript-ის შემოწმება Kate-ში
++Name[ja]=Kate Part JavaScript テスト
+ Name[km]=ការ​សាកល្បង Kate Part JavaScript
+ Name[lb]=Kate Part JavaScript-Test
+ Name[lt]=Kate Part JavaScript testas
+@@ -39,7 +39,6 @@
+ Name[tg]=Санҷиши Қисми Kate-и JavaScript
+ Name[tt]=Kate Part JavaScript Sınaw
+ Name[uk]=Перевірка скриптів JavaScript в компоненті Kate
+-Name[xx]=xxKate Part JavaScript Testxx
+ Name[zh_CN]=Kate 部件 JavaScript 测试
+ Comment=Script for testing kate part's scripting
+ Comment[af]=Skript om te toets of Kate se skript masjien werk
+@@ -59,7 +58,7 @@
+ Comment[hu]=Szkript a Kate objektum szkriptkezelőjének ellenőrzéséhez
+ Comment[is]=Skrifta til að prófa skriftueiginleika Kate hluta
+ Comment[it]=Script per provare il componente di scripting di kate
+-Comment[ka]=სკრიპტი Kate-ში სკრიპტების შესამოწმებლად
++Comment[ja]=kate part のスクリプト機能のテスト用スクリプト
+ Comment[km]=ស្គ្រីប​សម្រាប់​សាកល្បង​ការ​សរសេរ​របស់ kate part
+ Comment[lb]=Skript fir d'Skriptfunktioune vum Kate part ze testen
+ Comment[nb]=Skript til å teste kate parts skripting
+@@ -81,7 +80,6 @@
+ Comment[tg]=Скрипт барои санҷидани скриптгузории қисми kate
+ Comment[tt]=Kate Part'nıñ ämerleklären sınawçı qoral
+ Comment[uk]=Скрипт для перевірки підтримки скриптів в компоненті Kate
+-Comment[xx]=xxScript for testing kate part's scriptingxx
+ Comment[zh_CN]=测试 kate 部件脚本的脚本
+ X-Kate-Command=jstest
+ X-Kate-Help=<p>Usage: <code>jstest</code></p>
+--- kate/data/katepart.desktop	(revision 484194)
++++ kate/data/katepart.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Name[is]=Ívefjanlegur þróaður textaritill
+ Name[it]=Editor di testi avanzato integrato
+ Name[ja]=埋め込み高機能テキストエディタ
+-Name[ka]=ჩადგმული ტექსტური რედაქტორი
+ Name[km]=កម្មវិធី​និពន្ធ​អត្ថបទ​កម្រិត​ខ្ពស់​ដែល​បាន​បង្កប់
+ Name[ko]=끼워넣은 ê³ ê¸‰ 글월 편집기
+ Name[lb]=Agebetteten erweiderten Texteditor
+@@ -72,7 +71,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
+--- kdefx/kimageeffect.cpp	(revision 484194)
++++ kdefx/kimageeffect.cpp	(revision 488534)
+@@ -89,12 +89,13 @@
+                            0.1140000000000001*qBlue(color))));
+ }
+ 
+-static inline void liberateMemory(void **memory)
++template<typename T>
++static inline void liberateMemory(T **memory)
+ {
+-    assert(memory != (void **)NULL);
+-    if(*memory == (void *)NULL) return;
+-    free(*memory);
+-    *memory=(void *) NULL;
++    assert(memory != NULL);
++    if(*memory == NULL) return;
++    free((char*)*memory);
++    *memory=NULL;
+ }
+ 
+ struct double_packet
+@@ -3698,7 +3699,7 @@
+             *q++ = (*s);
+         }
+     }
+-    /* liberateMemory((void **)histogram); */
++    /* liberateMemory((histogram); */
+     return(dest);
+ }
+ 
+@@ -3739,9 +3740,9 @@
+ 
+     if(!histogram || !normalize_map){
+         if(histogram)
+-            liberateMemory((void **) &histogram);
++            liberateMemory(&histogram);
+         if(normalize_map)
+-            liberateMemory((void **) &normalize_map);
++            liberateMemory(&normalize_map);
+         qWarning("KImageEffect::normalize(): Unable to allocate memory!");
+         return;
+     }
+@@ -3860,7 +3861,7 @@
+                 break;
+         }
+     }
+-    liberateMemory((void **) &histogram);
++    liberateMemory(&histogram);
+ 
+     /*
+      Stretch the histogram to create the normalized image mapping.
+@@ -3925,7 +3926,7 @@
+             q[x] = qRgba(r, g, b, a);
+         }
+     }
+-    liberateMemory((void **) &normalize_map);
++    liberateMemory(&normalize_map);
+ }
+ 
+ void KImageEffect::equalize(QImage &image)
+@@ -3945,11 +3946,11 @@
+     equalize_map=(struct short_packet *)malloc(256*sizeof(struct short_packet));
+     if(!histogram || !map || !equalize_map){
+         if(histogram)
+-            liberateMemory((void **) &histogram);
++            liberateMemory(&histogram);
+         if(map)
+-            liberateMemory((void **) &map);
++            liberateMemory(&map);
+         if(equalize_map)
+-            liberateMemory((void **) &equalize_map);
++            liberateMemory(&equalize_map);
+         qWarning("KImageEffect::equalize(): Unable to allocate memory!");
+         return;
+     }
+@@ -3996,8 +3997,8 @@
+             equalize_map[i].alpha=(unsigned short)
+                 ((65535*(map[i].alpha-low.alpha))/(high.alpha-low.alpha));
+     }
+-    liberateMemory((void **) &histogram);
+-    liberateMemory((void **) &map);
++    liberateMemory(&histogram);
++    liberateMemory(&map);
+ 
+     /*
+      Stretch the histogram.
+@@ -4024,7 +4025,7 @@
+             q[x] = qRgba(r, g, b, a);
+         }
+     }
+-    liberateMemory((void **) &equalize_map);
++    liberateMemory(&equalize_map);
+ 
+ }
+ 
+@@ -4056,7 +4057,7 @@
+         kernel[i]=(-1.0);
+     kernel[i/2]=width*width-1.0;
+     convolveImage(&image, &dest, width, kernel);
+-    liberateMemory((void **)&kernel);
++    free(kernel);
+     return(dest);
+ }
+ 
+@@ -4105,7 +4106,7 @@
+         j--;
+     }
+     convolveImage(&image, &dest, width, kernel);
+-    liberateMemory((void **)&kernel);
++    liberateMemory(&kernel);
+ 
+     equalize(dest);
+     return(dest);
+@@ -4311,14 +4312,14 @@
+ 
+         while ((long) (MaxRGB*kernel[0]) > 0){
+             if(last_kernel != (double *)NULL){
+-                liberateMemory((void **) &last_kernel);
++                liberateMemory(&last_kernel);
+             }
+             last_kernel=kernel;
+             kernel = (double *)NULL;
+             width = getBlurKernel(width+2, sigma, &kernel);
+         }
+         if(last_kernel != (double *) NULL){
+-            liberateMemory((void **) &kernel);
++            liberateMemory(&kernel);
+             width-=2;
+             kernel = last_kernel;
+         }
+@@ -4326,7 +4327,7 @@
+ 
+     if(width < 3){
+         qWarning("KImageEffect::blur(): Kernel radius is too small!");
+-        liberateMemory((void **) &kernel);
++        liberateMemory(&kernel);
+         return(dest);
+     }
+ 
+@@ -4351,9 +4352,9 @@
+             destTable[y][x] = temp[y];
+         }
+     }
+-    liberateMemory((void **) &scanline);
+-    liberateMemory((void **) &temp);
+-    liberateMemory((void **) &kernel);
++    free(scanline);
++    free(temp);
++    free(kernel);
+     return(dest);
+ }
+ 
+@@ -4495,7 +4496,7 @@
+     }
+     kernel[i/2]=(-2.0)*normalize;
+     convolveImage(&image, &dest, width, kernel);
+-    liberateMemory((void **) &kernel);
++    free(kernel);
+     return(dest);
+ }
+ 
+--- arts/kde/mcop-dcop/kmcop.desktop	(revision 484194)
++++ arts/kde/mcop-dcop/kmcop.desktop	(revision 488534)
+@@ -3,7 +3,6 @@
+ Type=Service
+ Name=KMCOP
+ Name[hi]=के-एमकॉप 
+-Name[xx]=xxKMCOPxx
+ Exec=kmcop
+ Comment=KDE MCOP-DCOP Bridge
+ Comment[af]=KDE MCOP-DCOP Brug
+@@ -38,7 +37,6 @@
+ Comment[is]=KDE MCOP-DCOP brú
+ Comment[it]=Ponte MCOP-DCOP per KDE
+ Comment[ja]=KDE MCOP-DCOP ブリッジ
+-Comment[ka]=KDE MCOP-DCOP ხიდი
+ Comment[ko]=KDE MCOP-DCOP 브릿지
+ Comment[lb]=KDE-MCOP-DCOP-Bréck
+ Comment[lt]=KDE MCOP-DCOP tiltas
+@@ -74,7 +72,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]=KDE MCOP-DCOP æ¡¥
+ Comment[zh_TW]=KDE MCOP-DCOP 橋樑
+ Comment[zu]=Ibhulogo le-KDE MCOP-DCOP
+--- arts/knotify/knotify.desktop	(revision 484194)
++++ arts/knotify/knotify.desktop	(revision 488534)
+@@ -9,7 +9,6 @@
+ Name[eo]=Atentigilo
+ Name[fo]=KÁminning
+ Name[hi]=के-नोटिफाई
+-Name[ka]=სისტემური შეტყობინება
+ Name[ko]=K알림이
+ Name[mn]=Сонордуулга
+ Name[nso]=KLemosa
+@@ -23,7 +22,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
+@@ -59,7 +57,6 @@
+ Comment[is]=KDE tilkynningapúkinn
+ Comment[it]=Demone avvisi di KDE
+ Comment[ja]=KDE通知デーモン
+-Comment[ka]=KDE შეტყობინებების შიკრიკი
+ Comment[ko]=KDE용 알림 서버
+ Comment[lb]=KDE-Norichtendämon
+ Comment[lt]=KDE pranešimų tarnyba
+@@ -101,7 +98,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
+--- mimetypes/uri/pnm.desktop	(revision 484194)
++++ mimetypes/uri/pnm.desktop	(revision 488534)
+@@ -15,7 +15,6 @@
+ Comment[hu]=pnm: URI-k
+ Comment[is]=pnm: slóðir
+ Comment[it]=URI pnm:
+-Comment[ka]=pnm: ბმები
+ Comment[lt]=pnm: URI
+ Comment[nb]=pnm: nettadresse
+ Comment[nl]=pnm: URI-adressen
+@@ -35,5 +34,4 @@
+ Comment[tr]=pnm: adresi
+ Comment[tt]=pnm: URI'lar
+ Comment[uk]=pnm: URI
+-Comment[xx]=xxpnm: URIsxx
+ Comment[zh_CN]=pnm: URI
+--- mimetypes/uri/mms.desktop	(revision 484194)
++++ mimetypes/uri/mms.desktop	(revision 488534)
+@@ -15,7 +15,6 @@
+ Comment[hu]=mms: URI-k
+ Comment[is]=mms: slóðir
+ Comment[it]=URI mms:
+-Comment[ka]=mms: ссылки
+ Comment[lt]=mms: URI
+ Comment[nb]=mms: nettadresse
+ Comment[nl]=mms: URI-adressen
+@@ -36,5 +35,4 @@
+ Comment[tr]=mms: adresi
+ Comment[tt]=mms: URI'lar
+ Comment[uk]=mms: URI
+-Comment[xx]=xxmms: URIsxx
+ Comment[zh_CN]=mms: URI
+--- mimetypes/uri/rtspt.desktop	(revision 484194)
++++ mimetypes/uri/rtspt.desktop	(revision 488534)
+@@ -15,7 +15,6 @@
+ Comment[hu]=rtspt: URI-k
+ Comment[is]=rtspt: slóðir
+ Comment[it]=URI rtspt:
+-Comment[ka]=rtspt: ბმები
+ Comment[lt]=rtspt: URI
+ Comment[nb]=rtspt: nettadresse
+ Comment[nl]=rtspt: URI-adressen
+@@ -36,5 +35,4 @@
+ Comment[tr]=rtspt: adresi
+ Comment[tt]=rtspt: URI'lar
+ Comment[uk]=rtspt: URI
+-Comment[xx]=xxrtspt: URIsxx
+ Comment[zh_CN]=rtspt: URI
+--- mimetypes/uri/rtspu.desktop	(revision 484194)
++++ mimetypes/uri/rtspu.desktop	(revision 488534)
+@@ -15,7 +15,6 @@
+ Comment[hu]=rtspu: URI-k
+ Comment[is]=rtspu: slóðir
+ Comment[it]=URI rtspu:
+-Comment[ka]=rtspu: ბმები
+ Comment[lt]=rtspu: URI
+ Comment[nb]=rtspu: nettadresse
+ Comment[nl]=rtspu: URI-adressen
+@@ -36,5 +35,4 @@
+ Comment[tr]=rtspu: adresi
+ Comment[tt]=rtspu: URI'lar
+ Comment[uk]=rtspu: URI
+-Comment[xx]=xxrtspu: URIsxx
+ Comment[zh_CN]=rtspu: URI
+--- mimetypes/uri/mmst.desktop	(revision 484194)
++++ mimetypes/uri/mmst.desktop	(revision 488534)
+@@ -15,7 +15,6 @@
+ Comment[hu]=mmst: URI-k
+ Comment[is]=mmst: slóðir
+ Comment[it]=URI mmst:
+-Comment[ka]=mmst: ბმები
+ Comment[lt]=mmst: URI
+ Comment[nb]=mmst: nettadresse
+ Comment[nl]=mmst: URI-adressen
+@@ -36,5 +35,4 @@
+ Comment[tr]=mmst: adresi
+ Comment[tt]=mmst: URI'lar
+ Comment[uk]=mmst: URI
+-Comment[xx]=xxmmst: URIsxx
+ Comment[zh_CN]=mmst: URI
+--- mimetypes/uri/mmsu.desktop	(revision 484194)
++++ mimetypes/uri/mmsu.desktop	(revision 488534)
+@@ -15,7 +15,6 @@
+ Comment[hu]=mmsu: URI-k
+ Comment[is]=mmsu: slóðir
+ Comment[it]=URI mmsu:
+-Comment[ka]=mmsu: ბმები
+ Comment[lt]=mmsu: URI
+ Comment[nb]=mmsu: nettadresse
+ Comment[nl]=mmsu: URI-adressen
+@@ -36,5 +35,4 @@
+ Comment[tr]=mmsu: adresi
+ Comment[tt]=mmsu: URI'lar
+ Comment[uk]=mmsu: URI
+-Comment[xx]=xxmmsu: URIsxx
+ Comment[zh_CN]=mmsu: URI
+--- mimetypes/all.desktop	(revision 484194)
++++ mimetypes/all.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Comment[is]=Allar skrár og möppur
+ Comment[it]=Tutti i file e le cartelle
+ Comment[ja]=全てのファイルとディレクトリ
+-Comment[ka]=ყველა ფაილი და დასტა
+ Comment[km]=ឯកសារ និង ​ថត​ទាំងអស់
+ Comment[ko]=ëª¨ë“  파일과 자료방
+ Comment[lb]=All Dateien an Dossieren
+@@ -69,6 +68,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]=所有的檔案與目錄目錄
+--- mimetypes/model/vrml.desktop	(revision 484194)
++++ mimetypes/model/vrml.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=VRML eining
+ Comment[it]=Modello VRML
+ Comment[ja]=VRML モジュール
+-Comment[ka]=VRML მოდელი
+ Comment[km]=គំរូ VRML
+ Comment[ko]=VRML 모델
+ Comment[lb]=VRML-Modell
+@@ -67,7 +66,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
+--- mimetypes/audio/x-oggflac.desktop	(revision 484194)
++++ mimetypes/audio/x-oggflac.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Comment[is]=Ogg FLAC hljóðskrá
+ Comment[it]=Audio Ogg FLAC
+ Comment[ja]=Ogg FLAC オーディオ
+-Comment[ka]=Ogg FLAC ხმოვანი ფაილი
+ Comment[km]=Ogg FLAC អូឌីយ៉ូ
+ Comment[ko]=Ogg FLAC 오디오
+ Comment[lb]=Ogg-FLAC-Audio
+@@ -66,6 +65,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 聲音
+--- mimetypes/audio/vnd.rn-realaudio.desktop	(revision 484194)
++++ mimetypes/audio/vnd.rn-realaudio.desktop	(revision 488534)
+@@ -37,7 +37,6 @@
+ Comment[is]=RealAudio skrá
+ Comment[it]=File RealAudio
+ Comment[ja]=RealAudio ファイル
+-Comment[ka]=RealAudio ფაილი
+ Comment[km]=ឯកសារ RealAudio
+ Comment[ko]=리얼오디오 파일
+ Comment[lb]=RealAudio-Datei
+@@ -72,7 +71,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]
+--- mimetypes/audio/x-vorbis.desktop	(revision 484194)
++++ mimetypes/audio/x-vorbis.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Comment[is]=Ogg Vorbis hljóðskrá
+ Comment[it]=Audio Ogg Vorbis
+ Comment[ja]=Ogg Vorbis オーディオ
+-Comment[ka]=Ogg Vorbis ხმოვანი ფაილი
+ Comment[km]=Ogg Vorbis អូឌីយ៉ូ
+ Comment[ko]=Ogg Vorbis 오디오
+ Comment[lb]=Ogg-Vorbis-Audio
+@@ -68,6 +67,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 音效
+--- mimetypes/audio/x-flac.desktop	(revision 484194)
++++ mimetypes/audio/x-flac.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=FLAC hljóðskrá
+ Comment[it]=Audio FLAC
+ Comment[ja]=FLAC オーディオ
+-Comment[ka]=FLAC ხმოვანი ფაილი
+ Comment[km]=FLAC អូឌីយ៉ូ
+ Comment[ko]=FLAC 오디오
+ Comment[lb]=FLAC-Audio
+@@ -64,7 +63,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
+--- mimetypes/audio/x-aiff.desktop	(revision 484194)
++++ mimetypes/audio/x-aiff.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=AIFF/Amiga hljóðskrá
+ Comment[it]=Audio AIFF/Amiga
+ Comment[ja]=AIFF/Amiga オーディオ
+-Comment[ka]=AIFF/Amiga ხმოვანი ფაილი
+ Comment[km]=AIFF/Amiga អូឌីយ៉ូ
+ Comment[ko]=AIFF/아미가 오디오
+ Comment[lb]=AIFF/Amiga-Audio
+@@ -70,7 +69,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
+--- mimetypes/audio/mpegurl.desktop	(revision 484194)
++++ mimetypes/audio/mpegurl.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=Mp3 hljóðstraumur
+ Comment[it]=Audio MPEG layer 3 in streaming
+ Comment[ja]=ストリーミング MPEG Layer 3 オーディオ
+-Comment[ka]=MP3 ხმოვანი ფაილი
+ Comment[km]=Streaming MPEG Layer 3 អូឌីយ៉ូ
+ Comment[ko]=스트리밍 MPEG ë ˆì´ì–´ 3 오디오
+ Comment[lb]=Streaming-MPEG-Layer 3-Audio
+@@ -72,7 +71,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
+--- mimetypes/audio/x-musepack.desktop	(revision 484194)
++++ mimetypes/audio/x-musepack.desktop	(revision 488534)
+@@ -29,7 +29,6 @@
+ Comment[is]=Musepack hljóðskrá
+ Comment[it]=Audio Musepack
+ Comment[ja]=Musepack オーディオ
+-Comment[ka]=Musepack ხმოვანი ფაილი
+ Comment[km]=Musepack អូឌីយ៉ូ
+ Comment[lb]=Musepack-Audio
+ Comment[mk]=Musepack аудио
+@@ -57,5 +56,4 @@
+ Comment[tt]=Musepack Tawışı
+ Comment[uk]=Аудіо запис Musepack
+ Comment[uz]=Musepack аудио
+-Comment[xx]=xxMusepack Audioxx
+ Comment[zh_CN]=Musepack 音频
+--- mimetypes/audio/x-mpegurl.desktop	(revision 484194)
++++ mimetypes/audio/x-mpegurl.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=Mp3 hljóðstraumur
+ Comment[it]=Audio MPEG layer 3 in streaming
+ Comment[ja]=ストリーミング MPEG Layer 3 オーディオ
+-Comment[ka]=MP3 ხმოვანი ფაილი
+ Comment[km]=Streaming MPEG Layer 3 អូឌីយ៉ូ
+ Comment[ko]=스트리밍 MPEG ë ˆì´ì–´ 3 오디오
+ Comment[lb]=Streaming-MPEG-Layer 3-Audio
+@@ -70,7 +69,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
+--- mimetypes/audio/basic.desktop	(revision 484194)
++++ mimetypes/audio/basic.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=ULAW hljóðskrá (Sun)
+ Comment[it]=Audio ULAW (Sun)
+ Comment[ja]=ULAW (Sun) オーディオ
+-Comment[ka]=ULAW (Sun) ხმოვანი ფაილი
+ Comment[km]=ULAW (Sun) អូឌីយ៉ូ
+ Comment[ko]=ULAW (ì„ ) 오디오
+ Comment[lb]=ULAW (Sun)-Audio
+@@ -69,7 +68,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)
+--- mimetypes/audio/prs.sid.desktop	(revision 484194)
++++ mimetypes/audio/prs.sid.desktop	(revision 488534)
+@@ -30,7 +30,6 @@
+ Comment[is]=C64 SID hljóðskrá
+ Comment[it]=Musica SID C64
+ Comment[ja]=C64 SIDミュージック
+-Comment[ka]=C64 SID ხმოვანი ფაილი
+ Comment[km]=តន្ត្រី C64 SID
+ Comment[lb]=C64-SID-Musék
+ Comment[lt]=C64 SID muzika
+@@ -60,5 +59,4 @@
+ Comment[tt]=C64 SID Köye
+ Comment[uk]=Аудіо C64 SID
+ Comment[uz]=C64 SID мусиқа
+-Comment[xx]=xxC64 SID Musicxx
+ Comment[zh_CN]=C64 SID 音频
+--- mimetypes/audio/x-mod.desktop	(revision 484194)
++++ mimetypes/audio/x-mod.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Comment[is]=Amiga soundtracker hljóðskrá
+ Comment[it]=Audio Amiga Soundtracker
+ Comment[ja]=Amiga Soundtracker オーディオ
+-Comment[ka]=Amiga Soundtracker ხმოვანი ფაილი
+ Comment[km]=Amiga Soundtracker អូឌីយ៉ូ
+ Comment[ko]=아미가 사운트 트랙커 오디오
+ Comment[lb]=Amiga-Soundtracker-Audio
+@@ -69,7 +68,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
+--- mimetypes/audio/aac.desktop	(revision 484194)
++++ mimetypes/audio/aac.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=AAC hljóðskrá
+ Comment[it]=Suono AAC
+ Comment[ja]=ACC サウンド
+-Comment[ka]=AAC ხმოვანი ფაილი
+ Comment[km]=សម្លេង AAC
+ Comment[ko]=AAC 소리
+ Comment[lb]=AAC-Sound
+@@ -70,6 +69,5 @@
+ Comment[uk]=Аудіо AAC
+ Comment[uz]=AAC аудио
+ Comment[wa]=Son AAC
+-Comment[xx]=xxAAC Soundxx
+ Comment[zh_CN]=AAC 声音
+ Comment[zh_TW]=AAC 音效
+--- mimetypes/audio/x-pn-realaudio.desktop	(revision 484194)
++++ mimetypes/audio/x-pn-realaudio.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=RealAudio skrá
+ Comment[it]=File RealAudio
+ Comment[ja]=RealAudio ファイル
+-Comment[ka]=RealAudio ფაილი
+ Comment[km]=ឯកសារ RealAudio
+ Comment[ko]=리얼오디오 파일
+ Comment[lb]=RealAudio-Datei
+@@ -70,6 +69,5 @@
+ Comment[uk]=Файл RealAudio
+ Comment[uz]=RealAudio-файли
+ Comment[wa]=Fitchî RealAudio
+-Comment[xx]=xxRealAudio Filexx
+ Comment[zh_CN]=RealAudio 文件
+ Comment[zh_TW]=RealAudio 檔案
+--- mimetypes/audio/x-matroska.desktop	(revision 484194)
++++ mimetypes/audio/x-matroska.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Comment[is]=Matroska hljóðskrá
+ Comment[it]=Audio Matroska
+ Comment[ja]=Matroska オーディオ
+-Comment[ka]=Matroska ხმოვანი ფაილი
+ Comment[km]=Matroska អូឌីយ៉ូ
+ Comment[lb]=Matroska-Audio
+ Comment[lt]=Matroska audio
+@@ -65,6 +64,5 @@
+ Comment[uk]=Аудіо Матрьошка
+ Comment[uz]=Matroska аудио
+ Comment[wa]=Fitchî odio Matroska
+-Comment[xx]=xxMatroska Audioxx
+ Comment[zh_CN]=Matroska 音频
+ Comment[zh_TW]=Matroska 聲音
+--- mimetypes/audio/x-midi.desktop	(revision 484194)
++++ mimetypes/audio/x-midi.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=MIDI hljóðskrá
+ Comment[it]=Audio MIDI
+ Comment[ja]=MIDI オーディオ
+-Comment[ka]=MIDI ხმოვანი ფაილი
+ Comment[km]=MIDI អូឌីយ៉ូ
+ Comment[ko]=미디 오디오
+ Comment[lb]=MIDI-Audio
+@@ -73,7 +72,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
+--- mimetypes/audio/mpeg.desktop	(revision 484194)
++++ mimetypes/audio/mpeg.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=MPEG hljóðskrá
+ Comment[it]=Audio MPEG
+ Comment[ja]=MPEG オーディオ
+-Comment[ka]=MPEG ხმოვანი ფაილი
+ Comment[km]=MPEG អូឌីយ៉ូ
+ Comment[ko]=MPEG 오디오
+ Comment[lb]=MPEG-Audio
+@@ -63,5 +62,4 @@
+ Comment[tt]=MPEG Tawış
+ Comment[uk]=Аудіо запис MPEG
+ Comment[uz]=MPEG аудио
+-Comment[xx]=xxMPEG Audioxx
+ Comment[zh_CN]=MPEG 音频
+--- mimetypes/audio/x-adpcm.desktop	(revision 484194)
++++ mimetypes/audio/x-adpcm.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=PCM hljóðskrá
+ Comment[it]=Audio PCM
+ Comment[ja]=PCM オーディオ
+-Comment[ka]=PCM ხმოვანი ფაილი
+ Comment[km]=PCM អូឌីយ៉ូ
+ Comment[ko]=PCM 오디오
+ Comment[lb]=PCM-Audio
+@@ -70,7 +69,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
+--- mimetypes/audio/x-scpls.desktop	(revision 484194)
++++ mimetypes/audio/x-scpls.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=Mp3 ShoutCast lagalisti
+ Comment[it]=Scaletta MP3 ShoutCast
+ Comment[ja]=MP3 ShoutCast プレイリスト
+-Comment[ka]=MP3 ShoutCast ჩანაწერთა სია
+ Comment[km]=បញ្ជីលេង MP3 ShoutCast
+ Comment[ko]=MP3 샤우트캐스트 연주 목록
+ Comment[lb]=MP3-ShoutCast-Spillëscht
+@@ -73,7 +72,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;
+--- mimetypes/audio/x-speex.desktop	(revision 484194)
++++ mimetypes/audio/x-speex.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Comment[is]=Speex hljóðskrá
+ Comment[it]=Audio Speex
+ Comment[ja]=Speex オーディオ
+-Comment[ka]=Speex ხმოვანი ფაილი
+ Comment[km]=Speex អូឌីយ៉ូ
+ Comment[lb]=Speex-Audio
+ Comment[lt]=Speex audio
+@@ -65,6 +64,5 @@
+ Comment[uk]=Аудіо Speex
+ Comment[uz]=Speex аудио
+ Comment[wa]=Fitchî odio speex
+-Comment[xx]=xxSpeex Audioxx
+ Comment[zh_CN]=Speex 音频
+ Comment[zh_TW]=Speex 聲音
+--- mimetypes/audio/mp4.desktop	(revision 484194)
++++ mimetypes/audio/mp4.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Comment[is]=MPEG-4 hljóðskrá
+ Comment[it]=Audio MPEG-4
+ Comment[ja]=MPEG-4 オーディオ
+-Comment[ka]=MPEG-4 ხმოვანი ფაილი
+ Comment[km]=MPEG-4 អូឌីយ៉ូ
+ Comment[ko]=MPEG-4 오디오
+ Comment[lb]=MPEG-4-Audio
+@@ -66,6 +65,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
+--- mimetypes/audio/x-wav.desktop	(revision 484194)
++++ mimetypes/audio/x-wav.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=WAV hljóðskrá
+ Comment[it]=Audio WAV
+ Comment[ja]=WAV オーディオ
+-Comment[ka]=WAV ხმოვანი ფაილი
+ Comment[km]=WAV អូឌីយ៉ូ
+ Comment[ko]=WAV 오디오
+ Comment[lb]=WAV-Audio
+@@ -73,7 +72,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
+--- mimetypes/audio/x-mp2.desktop	(revision 484194)
++++ mimetypes/audio/x-mp2.desktop	(revision 488534)
+@@ -30,7 +30,6 @@
+ Comment[is]=MPEG teg. 2 hljóðskrá
+ Comment[it]=Audio MPEG layer 2
+ Comment[ja]=MPEG Layer 2 オーディオ
+-Comment[ka]=MPEG Layer 2 ხმოვანი ფაილი
+ Comment[km]=MPEG Layer 2 អូឌីយ៉ូ
+ Comment[lb]=MPEG-Layer 2-Audio
+ Comment[lt]=MPEG Layer 2 audio
+@@ -59,5 +58,4 @@
+ Comment[tt]=MPEG-2 Tawış
+ Comment[uk]=Аудіо запис MPEG Layer 2
+ Comment[uz]=MPEG Layer 2 аудио
+-Comment[xx]=xxMPEG Layer 2 Audioxx
+ Comment[zh_CN]=MP2 音频文件
+--- mimetypes/audio/vorbis.desktop	(revision 484194)
++++ mimetypes/audio/vorbis.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Comment[is]=Ogg Vorbis hljóðskrá
+ Comment[it]=Audio Ogg Vorbis
+ Comment[ja]=Ogg Vorbis オーディオ
+-Comment[ka]=Ogg Vorbis ხმოვანი ფაილი
+ Comment[km]=Ogg Vorbis អូឌីយ៉ូ
+ Comment[ko]=Ogg Vorbis 오디오
+ Comment[lb]=Ogg-Vorbis-Audio
+@@ -68,6 +67,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 音效
+--- mimetypes/audio/x-mp3.desktop	(revision 484194)
++++ mimetypes/audio/x-mp3.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Mp3 hljóðskrá
+ Comment[it]=Audio MPEG layer 3
+ Comment[ja]=MPEG Layer 3 オーディオ
+-Comment[ka]=MP3 ხმოვანი ფაილი
+ Comment[km]=MPEG Layer 3 អូឌីយ៉ូ
+ Comment[ko]=MPEG ë ˆì´ì–´ 3 오디오
+ Comment[lb]=MPEG-Layer 3-Audio
+@@ -73,7 +72,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
+--- mimetypes/audio/ac3.desktop	(revision 484194)
++++ mimetypes/audio/ac3.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Dolby AC3 hljóðskrá
+ Comment[it]=Suono Dolby AC3
+ Comment[ja]=ドルビー AC3 サウンド
+-Comment[ka]=Dolby AC3 ხმოვანი ფაილი
+ Comment[km]=សម្លេង Dolby AC3
+ Comment[ko]=돌비 AC3 소리
+ Comment[lb]=Dolby-AC3-Sound
+@@ -69,6 +68,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 音效
+--- mimetypes/audio/x-ms-wma.desktop	(revision 484194)
++++ mimetypes/audio/x-ms-wma.desktop	(revision 488534)
+@@ -27,7 +27,6 @@
+ Comment[hu]=WMA-hangfájl
+ Comment[is]=Windows Media hljóðskrá
+ Comment[it]=Audio Windows Media
+-Comment[ka]=Windows Media ხმოვანი ფაილი
+ Comment[km]=Windows Media អូឌីយ៉ូ" 
+ Comment[ko]=윈도우즈 메타 오디오
+ Comment[lb]=Windows-Media-Audio
+@@ -54,5 +53,4 @@
+ Comment[tt]=Windows Media Tawışı
+ Comment[uk]=Аудіо запис Windows Media
+ Comment[uz]=Windows Media аудио
+-Comment[xx]=xxWindows Media Audioxx
+ Comment[zh_CN]=Windows Media 音频
+--- mimetypes/multipart/x-mixed-replace.desktop	(revision 484194)
++++ mimetypes/multipart/x-mixed-replace.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=Gagnastraumur
+ Comment[it]=Flusso di dati (Server Push)
+ Comment[ja]=データストリーム (サーバプッシュ)
+-Comment[ka]=სერვერის მონაცემთა ნაკადი
+ Comment[ko]=(서버에서 보내는) 자료 스트림
+ Comment[lb]=Floss vun Donnéeën (Server-Push)
+ Comment[lt]=Duomenų srautas (inicijuojamas serverio)
+@@ -67,7 +66,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)
+--- mimetypes/multipart/mixed.desktop	(revision 484194)
++++ mimetypes/multipart/mixed.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=Samsett skjal
+ Comment[it]=Documento composto
+ Comment[ja]=合成ドキュメント
+-Comment[ka]=Compound დოკუმენტი
+ Comment[km]=ឯកសារសមាស
+ Comment[lb]=Zesummegesatent Dokument
+ Comment[lt]=SudÄ—tinis dokumentas
+@@ -68,7 +67,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
+--- mimetypes/image/x-portable-pixmap.desktop	(revision 484194)
++++ mimetypes/image/x-portable-pixmap.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=Skráarsnið GIMP forritsins (PPI)
+ Comment[it]=Immagine Portable Pixmap
+ Comment[ja]=ポータブルピックスマップイメージ
+-Comment[ka]=Portable Pixmap ნახატი
+ Comment[km]=រូបភាព Portable Pixmap
+ Comment[ko]=포터블 픽스맵 그림
+ Comment[lb]=Portéierbart Pixmap-Bild
+@@ -73,7 +72,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
+--- mimetypes/image/x-dds.desktop	(revision 484194)
++++ mimetypes/image/x-dds.desktop	(revision 488534)
+@@ -22,7 +22,6 @@
+ Comment[hu]=DirectDraw-felület
+ Comment[is]=DirectDraw yfirborð
+ Comment[it]=Superficie DirectDraw
+-Comment[ka]=DirectDraw ზედაპირი
+ Comment[lb]=DirectDraw-Uewerfläch
+ Comment[lv]=DirectDraw virsma
+ Comment[ms]=Permukaan DirectDraw
+@@ -47,5 +46,4 @@
+ Comment[tr]=DirectDraw Yüzeyi
+ Comment[tt]=DirectDraw Öslege
+ Comment[uk]=Поверхня DirectDraw
+-Comment[xx]=xxDirectDraw Surfacexx
+ Comment[zh_CN]=DirectDraw 表面
+--- mimetypes/image/x-xcf-gimp.desktop	(revision 484194)
++++ mimetypes/image/x-xcf-gimp.desktop	(revision 488534)
+@@ -30,7 +30,6 @@
+ Comment[is]=Skráarsnið GIMP forritsins
+ Comment[it]=Immagine in formato nativo GIMP
+ Comment[ja]=GIMP ネイティブ画像フォーマット
+-Comment[ka]=GIMP ნახატი
+ Comment[km]=ទ្រង់ទ្រាយ​រូបភាព​ដើម GIMP
+ Comment[lb]=GIMP-eegent Bildformat
+ Comment[lt]=GIMP nuosavas paveiksliukų formatas
+@@ -45,7 +44,7 @@
+ Comment[nn]=GIMP-bilete
+ Comment[nso]=Thlolego ya Ponagalo ya Matswalo a GIMP
+ Comment[pa]=GIMP ਮੂਲ ਚਿੱਤਰ ਫਾਰਮਿਟ
+-Comment[pl]=Oryginalny format obrazu GIMP-a
++Comment[pl]=Oryginalny format obrazka GIMP-a
+ Comment[pt]=Formato nativo de imagens do GIMP
+ Comment[pt_BR]=Formato nativo de Imagem do GIMP
+ Comment[ro]=Imagine format nativ GIMP
+@@ -67,7 +66,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
+--- mimetypes/image/x-hdr.desktop	(revision 484194)
++++ mimetypes/image/x-hdr.desktop	(revision 488534)
+@@ -5,6 +5,7 @@
+ Icon=image
+ Patterns=*.hdr;*.HDR;*.pic;*.PIC
+ Comment=High Dynamic Range Image
++Comment[af]=Hoog Dinamiese Reeks Beeld
+ Comment[bg]=Изображение с висока динамичност (High Dynamic Range Image)
+ Comment[ca]=Imatge de rang altament dinà mic
+ Comment[cs]=Obrázek ve formátu HDRI
+@@ -17,8 +18,9 @@
+ Comment[fy]=High Dynamic Range-ôfbylding
+ Comment[gl]=Imaxe de Alto Rango Dinámico (HDR)
+ Comment[hu]=HDR-kép
++Comment[is]=High Dynamic Range mynd
+ Comment[it]=Immagine High Dynamic Range
+-Comment[ka]=HDR ნახატი
++Comment[ja]=HDR 画像
+ Comment[km]=រូបភាព​ជួរ​ថាមវណ្ដ​ខ្ពស់
+ Comment[lb]=High-Dynamic-Range-Bild
+ Comment[lt]=High Dynamic Range paveiksliukas
+@@ -38,5 +40,4 @@
+ Comment[tg]=Тасвир бо андозаи динамикии балад
+ Comment[tt]=Bik Tere Aralı Sürät
+ Comment[uk]=Зображення HDR (High Dynamic Range)
+-Comment[xx]=xxHigh Dynamic Range Imagexx
+ Comment[zh_CN]=高动态范围图像
+--- mimetypes/image/x-jng.desktop	(revision 484194)
++++ mimetypes/image/x-jng.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=JNG mynd
+ Comment[it]=Immagine JNG
+ Comment[ja]=JNG イメージ
+-Comment[ka]=JNG ნახატი
+ Comment[km]=រូបភាព JNG
+ Comment[ko]=JNG 그림
+ Comment[lb]=JNG-Bild
+@@ -52,7 +51,7 @@
+ Comment[nn]=JNG-bilete
+ Comment[nso]=Ponagalo ya JNG
+ Comment[pa]=JNG ਚਿੱਤਰ
+-Comment[pl]=Obraz JNG
++Comment[pl]=Obrazek JNG
+ Comment[pt]=Imagem JNG
+ Comment[pt_BR]=Imagem JNG
+ Comment[ro]=Imagine JNG
+@@ -75,7 +74,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
+--- mimetypes/image/png.desktop	(revision 484194)
++++ mimetypes/image/png.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=PNG mynd
+ Comment[it]=Immagine PNG
+ Comment[ja]=PNG 画像
+-Comment[ka]=PNG ნახატი
+ Comment[km]=រូបភាព PNG
+ Comment[ko]=PNG 그림
+ Comment[lb]=PNG-Bild
+@@ -52,7 +51,7 @@
+ Comment[nn]=PNG-bilete
+ Comment[nso]=Ponagalo ya PNG
+ Comment[pa]=PNG ਚਿੱਤਰ
+-Comment[pl]=Obraz PNG
++Comment[pl]=Obrazek PNG
+ Comment[pt]=Imagem PNG
+ Comment[pt_BR]=Imagem PNG
+ Comment[ro]=Imagine PNG
+@@ -75,7 +74,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
+--- mimetypes/image/jpeg.desktop	(revision 484194)
++++ mimetypes/image/jpeg.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=JPEG mynd
+ Comment[it]=Immagine JPEG
+ Comment[ja]=JPEG 画像
+-Comment[ka]=JPEG ნახატი
+ Comment[km]=រូបភាព JPEG
+ Comment[ko]=JPEG 그림
+ Comment[lb]=JPEG-Bild
+@@ -52,7 +51,7 @@
+ Comment[nn]=JPEG-bilete
+ Comment[nso]=Ponagalo ya JPEG
+ Comment[pa]=JPEG ਚਿੱਤਰ
+-Comment[pl]=Obraz JPEG
++Comment[pl]=Obrazek JPEG
+ Comment[pt]=Imagem JPEG
+ Comment[pt_BR]=Imagem JPEG
+ Comment[ro]=Imagine JPEG
+@@ -75,7 +74,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
+--- mimetypes/image/x-vnd.trolltech.qpicture.desktop	(revision 484194)
++++ mimetypes/image/x-vnd.trolltech.qpicture.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=QPicture lýsiskrá
+ Comment[it]=Metafile QPicture
+ Comment[ja]=QPicture メタファイル
+-Comment[ka]=QPicture მეტაფაილი
+ Comment[km]=ឯកសារ​មេតា QPicture
+ Comment[ko]=QPicture 메타 파일
+ Comment[lb]=QPicture-Metadatei
+@@ -65,6 +64,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 檔案
+--- mimetypes/image/x-vnd.adobe.photoshop.desktop	(revision 484194)
++++ mimetypes/image/x-vnd.adobe.photoshop.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Adobe Photoshop mynd
+ Comment[it]=Immagine Adobe Photoshop
+ Comment[ja]=Adobe Photoshop 画像
+-Comment[ka]=Adobe Photoshop ნახატი
+ Comment[km]=រូបភាព Adobe Photoshop
+ Comment[ko]=어도비 í¬í† ìƒµ 그림
+ Comment[lb]=Adobe-Photoshop-Bild
+@@ -70,6 +69,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 影像
+--- mimetypes/image/jp2.desktop	(revision 484194)
++++ mimetypes/image/jp2.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=JPEG 2000 mynd
+ Comment[it]=Immagine JPEG 2000
+ Comment[ja]=JPEG 2000 画像
+-Comment[ka]=JPEG 2000 ნახატი
+ Comment[km]=រូបភាព JPEG 2000
+ Comment[ko]=JPEG 2000 그림
+ Comment[lb]=JPEG 2000-Bild
+@@ -70,6 +69,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 影像
+--- mimetypes/image/svg+xml.desktop	(revision 484194)
++++ mimetypes/image/svg+xml.desktop	(revision 488534)
+@@ -29,7 +29,6 @@
+ Comment[hu]=SVG-fájl
+ Comment[it]=Grafica vettoriale riscalabile (SVG)
+ Comment[ja]=スケーラブルベクトルグラフィックス
+-Comment[ka]=SVG ვექტორული გრაფიკა
+ Comment[km]=ក្រាហ្វិក​វ៉ិចទ័រ​ដែល​អាច​កំណត់​មាត្រ​ដ្ឋាន
+ Comment[lb]=Skaléierbar Vektorgrafik (SVG)
+ Comment[lt]=Keičiamo dydžio vektorinė grafika
+@@ -63,7 +62,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
+--- mimetypes/image/x-xbm.desktop	(revision 484194)
++++ mimetypes/image/x-xbm.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=X BitMap mynd
+ Comment[it]=Immagine X BitMap
+ Comment[ja]=X ビットマップ画像
+-Comment[ka]=X Bitmap ნახატი
+ Comment[km]=រូបភាព X BitMap
+ Comment[ko]=X용 비트맵 그림
+ Comment[lb]=X-BitMap-Bild
+@@ -75,7 +74,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
+--- mimetypes/image/x-eps.desktop	(revision 484194)
++++ mimetypes/image/x-eps.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Postscript skjal (encapsulated)
+ Comment[it]=Immagine Encapsulated PostScript
+ Comment[ja]=Encapsulated PostScript イメージ
+-Comment[ka]=EPS ნახატი
+ Comment[km]=រូបភាព Encapsulated PostScript
+ Comment[ko]=암호화된 포스트스크립트 그림
+ Comment[lb]=Gekapselt PostScript-Bild
+@@ -52,7 +51,7 @@
+ Comment[nn]=Encapsulated PostScript-bilete
+ Comment[nso]=Ponagalo ya Tshwaelo ya Poso yeo elego Encapsulated
+ Comment[pa]=Encapsulated PostScript ਚਿੱਤਰ
+-Comment[pl]=Obraz EPS
++Comment[pl]=Obrazek EPS
+ Comment[pt]=Imagem PostScript Encapsulado
+ Comment[pt_BR]=Imagem PostScript Encapsulada
+ Comment[ro]=Imagine EPS
+@@ -73,7 +72,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
+--- mimetypes/image/x-targa.desktop	(revision 484194)
++++ mimetypes/image/x-targa.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Truevision Targa mynd
+ Comment[it]=Immagine Truevision Targa
+ Comment[ja]=トゥルービジョン Targa イメージ
+-Comment[ka]=Truevision Targa ნახატი
+ Comment[km]=រូបភាព Truevision Targa
+ Comment[ko]=íŠ¸ë£¨ë¹„ì „ 타가 그림
+ Comment[lb]=Truevision-Targa-Bild
+@@ -52,7 +51,7 @@
+ Comment[nn]=Truevision Targa-bilete
+ Comment[nso]=Ponagalo ya Pono ya Nnete ya Targa
+ Comment[pa]=Truevision Targa ਚਿੱਤਰ
+-Comment[pl]=Obraz Truevision Targa
++Comment[pl]=Obrazek Truevision Targa
+ Comment[pt]=Imagem Truevision Targa
+ Comment[pt_BR]=Imagem Truevision Targa
+ Comment[ro]=Imagine Targa Truevision
+@@ -73,7 +72,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
+--- mimetypes/image/x-exr.desktop	(revision 484194)
++++ mimetypes/image/x-exr.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=ILM EXR mynd
+ Comment[it]=Immagine EXR ILM
+ Comment[ja]=ILM EXR イメージ
+-Comment[ka]=ILM EXR ნახატი
+ Comment[km]=រូបភាព ILM EXR
+ Comment[ko]=ILM EXR 그림
+ Comment[lb]=ILM-EXR-Bild
+@@ -63,6 +62,5 @@
+ Comment[tt]=ILM EXR Süräte
+ Comment[uk]=Зображення ILM EXR
+ Comment[uz]=ILM EXR-расм
+-Comment[xx]=xxILM EXR Imagexx
+ Comment[zh_CN]=ILM EXR 图像
+ 
+--- mimetypes/image/gif.desktop	(revision 484194)
++++ mimetypes/image/gif.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=GIF mynd
+ Comment[it]=Immagine GIF
+ Comment[ja]=GIF 画像
+-Comment[ka]=GIF ნახატი
+ Comment[km]=រូបភាព GIF
+ Comment[ko]=GIF 그림
+ Comment[lb]=GIF-Bild
+@@ -75,7 +74,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
+--- mimetypes/image/cgm.desktop	(revision 484194)
++++ mimetypes/image/cgm.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[hu]=CGM-fájl
+ Comment[is]='Computer Graphics Metafile' (mynd)
+ Comment[ja]=コンピューターグラフィックスメタファイル
+-Comment[ka]=CGM ნახატი
+ Comment[km]=ឯកសារ​មេតា​ក្រាហ្វិក​កុំព្យូទ័រ
+ Comment[ko]=컴퓨터 그림 메타 파일
+ Comment[lb]=Computergrafik-Metadatei
+@@ -64,7 +63,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
+--- mimetypes/image/x-msod.desktop	(revision 484194)
++++ mimetypes/image/x-msod.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[hu]=Microsoft Office-ábra
+ Comment[is]=Microsoft Office teikning
+ Comment[it]=Disegno Microsoft Office
+-Comment[ka]=MS Office ნახაზი
+ Comment[km]=គំនូរ Microsoft Office
+ Comment[ko]=마이크로소프트 오피스 그림
+ Comment[lb]=Microsoft-Office-Zeechnung
+@@ -70,7 +69,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
+--- mimetypes/image/x-xpm.desktop	(revision 484194)
++++ mimetypes/image/x-xpm.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=X PixMap mynd
+ Comment[it]=Immagine X PixMap
+ Comment[ja]=X ピックスマップ画像
+-Comment[ka]=X PixMap ნახატი
+ Comment[km]=រូបភាព X PixMap
+ Comment[ko]=X용 픽스맵 그림
+ Comment[lb]=X-PixMap-Bild
+@@ -52,7 +51,7 @@
+ Comment[nn]=X PixMap-bilete
+ Comment[nso]=Ponagalo ya PixMap ya X
+ Comment[pa]=X PixMap ਚਿੱਤਰ
+-Comment[pl]=Obraz X PixMap
++Comment[pl]=Obrazek X PixMap
+ Comment[pt]=Imagem X PixMap
+ Comment[pt_BR]=Imagem X Pixmap
+ Comment[ro]=Imagine XPM
+@@ -75,7 +74,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
+--- mimetypes/image/x-xcursor.desktop	(revision 484194)
++++ mimetypes/image/x-xcursor.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=X11 músarbendill
+ Comment[it]=Cursore mouse X11
+ Comment[ja]=X11 マウス カーソル
+-Comment[ka]=X11 თაგუნას კურსორი
+ Comment[km]=ទស្សន៍​ទ្រនិច​កណ្តុរ X11
+ Comment[ko]=X11 마우스 커서
+ Comment[lb]=X11-Mauscursor
+@@ -68,7 +67,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 æ»‘é¼ æ¸¸æ¨™
+ 
+--- mimetypes/image/x-djvu.desktop	(revision 484194)
++++ mimetypes/image/x-djvu.desktop	(revision 488534)
+@@ -5,6 +5,7 @@
+ Icon=djvu
+ Patterns=*.djvu;*.DJVU;*.djv;*.DJV;
+ Comment=DjVu Document
++Comment[af]=DjVu Dokument
+ Comment[bg]=Документ DjVu
+ Comment[ca]=Document DjVu
+ Comment[cs]=DjVu dokument
+@@ -22,7 +23,7 @@
+ Comment[hu]=DjVu-dokumentum
+ Comment[is]=DjVu skjal
+ Comment[it]=Documento DjVu
+-Comment[ka]=DjVu დოკუმენტი
++Comment[ja]=DjVu ドキュメント
+ Comment[km]=ឯកសារ DjVu
+ Comment[ko]=DjVu 문서
+ Comment[lb]=DjVu-Dokument
+@@ -46,5 +47,4 @@
+ Comment[tt]=DjVu İstälege
+ Comment[uk]=Документ DjVu
+ Comment[uz]=DjVu ҳужжати
+-Comment[xx]=xxDjVu Documentxx
+ Comment[zh_CN]=DjVu 文档
+--- mimetypes/image/x-rgb.desktop	(revision 484194)
++++ mimetypes/image/x-rgb.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=SGI mynd (RGB)
+ Comment[it]=Immagine SGI (RGB)
+ Comment[ja]=SGI イメージ (RGB)
+-Comment[ka]=SGI ნახატი (RGB)
+ Comment[km]=រូបភាព SGI (RGB)
+ Comment[ko]=SGI 그림 (RGB)
+ Comment[lb]=SGI-Bild (RGB)
+@@ -65,5 +64,4 @@
+ Comment[tt]=SGI Sürät (RGB)
+ Comment[uk]=Зображення SGI (RGB)
+ Comment[uz]=SGI-расм (RGB)
+-Comment[xx]=xxSGI Image (RGB)xx
+ Comment[zh_CN]=SGI 图像(RGB)
+--- mimetypes/image/x-portable-greymap.desktop	(revision 484194)
++++ mimetypes/image/x-portable-greymap.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=Skráarsnið GIMP forritsins (PGI)
+ Comment[it]=Immagine Portable Graymap
+ Comment[ja]=ポータブルグレイマップイメージ
+-Comment[ka]=Portable Greymap ნახატი
+ Comment[km]=រូបភាព Portable Graymap
+ Comment[lb]=Portéierbart Graymap-Bild
+ Comment[lt]=Perkeliamas pilkų pustonių (greymap) paveiksliukas
+@@ -72,7 +71,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
+--- mimetypes/image/x-ico.desktop	(revision 484194)
++++ mimetypes/image/x-ico.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Windows táknmynd
+ Comment[it]=Icona Windows
+ Comment[ja]=ウィンドウズアイコン
+-Comment[ka]=Windows პიქტოგრამა
+ Comment[km]=រូបតំណាង Windows
+ Comment[ko]=윈도우즈 아이콘
+ Comment[lb]=Windows Symbol
+@@ -74,7 +73,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
+--- mimetypes/image/x-photo-cd.desktop	(revision 484194)
++++ mimetypes/image/x-photo-cd.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=PhotoCD mynd
+ Comment[it]=Immagine PhotoCD
+ Comment[ja]=PhotoCD 画像
+-Comment[ka]=PhotoCD ნახატი
+ Comment[km]=រូបភាព PhotoCD
+ Comment[ko]=í¬í† CD 그림
+ Comment[lb]=PhotoCD-Bild
+@@ -52,7 +51,7 @@
+ Comment[nn]=PhotoCD-bilete
+ Comment[nso]=Ponagalo ya CD ya Seswantsho
+ Comment[pa]=PhotoCD ਚਿੱਤਰ
+-Comment[pl]=Obraz PhotoCD
++Comment[pl]=Obrazek PhotoCD
+ Comment[pt]=Imagem PhotoCD
+ Comment[pt_BR]=Imagem PhotoCD
+ Comment[ro]=Imagine PhotoCD
+@@ -75,7 +74,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
+--- mimetypes/image/x-bmp.desktop	(revision 484194)
++++ mimetypes/image/x-bmp.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=BMP mynd
+ Comment[it]=Immagine BMP
+ Comment[ja]=BMP 画像
+-Comment[ka]=BMP ნახატი
+ Comment[km]=រូបភាព BMP
+ Comment[ko]=BMP 그림
+ Comment[lb]=BMP-Bild
+@@ -70,6 +69,5 @@
+ Comment[uk]=Зображення BMP
+ Comment[uz]=BMP-расм
+ Comment[wa]=Imådje BMP
+-Comment[xx]=xxBMP Imagexx
+ Comment[zh_CN]=BMP 图像
+ Comment[zh_TW]=BMP 影像
+--- mimetypes/image/fax-g3.desktop	(revision 484194)
++++ mimetypes/image/fax-g3.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=CCITT G3 fax
+ Comment[it]=Fax CCITT G3
+ Comment[ja]=CCITT G3 fax
+-Comment[ka]=CCITT G3 ფაქსის ფაილი
+ Comment[km]=ទូរសារ CCITT G3
+ Comment[ko]=CCITT G3 팩스
+ Comment[lb]=CCITT-G3-Fax
+@@ -72,7 +71,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
+--- mimetypes/image/x-portable-bitmap.desktop	(revision 484194)
++++ mimetypes/image/x-portable-bitmap.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=Skráarsnið GIMP forritsins (PBI)
+ Comment[it]=Immagine Portable Bitmap
+ Comment[ja]=ポータブルビットマップイメージ
+-Comment[ka]=Portable Bitmap ნახატი
+ Comment[km]=រូបភាព Portable Bitmap
+ Comment[ko]=포터블 비트맵 그림
+ Comment[lb]=Portéierbart Bitmapbild
+@@ -74,7 +73,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
+--- mimetypes/image/tiff.desktop	(revision 484194)
++++ mimetypes/image/tiff.desktop	(revision 488534)
+@@ -37,7 +37,6 @@
+ Comment[is]=TIFF mynd
+ Comment[it]=Immagine TIFF
+ Comment[ja]=TIFF 画像
+-Comment[ka]=TIFF ნახატი
+ Comment[km]=រូបភាព TIFF
+ Comment[ko]=TIFF 그림
+ Comment[lb]=TIFF-Bild
+@@ -55,7 +54,7 @@
+ Comment[nso]=Ponagalo ya TIFF
+ Comment[oc]=Image TIFF
+ Comment[pa]=TIFF ਚਿੱਤਰ
+-Comment[pl]=Obraz TIFF
++Comment[pl]=Obrazek TIFF
+ Comment[pt]=Imagem TIFF
+ Comment[pt_BR]=Imagem TIFF
+ Comment[ro]=Imagine TIFF
+@@ -79,7 +78,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
+--- mimetypes/image/x-wmf.desktop	(revision 484194)
++++ mimetypes/image/x-wmf.desktop	(revision 488534)
+@@ -30,7 +30,6 @@
+ Comment[is]=Windows lýsiskrá
+ Comment[it]=Metafile Windows
+ Comment[ja]=Windows Metaファイル
+-Comment[ka]=Windows მეტაფაილი
+ Comment[km]=ឯកសារ​មេតា Windows
+ Comment[ko]=윈도우즈 메타 파일
+ Comment[lb]=Windows-Metadatei
+@@ -62,6 +61,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
+--- mimetypes/image/x-pcx.desktop	(revision 484194)
++++ mimetypes/image/x-pcx.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=PCX mynd
+ Comment[it]=Immagine PCX
+ Comment[ja]=PCX 画像
+-Comment[ka]=PCX ნახატი
+ Comment[km]=រូបភាព PCX
+ Comment[ko]=PCX 그림
+ Comment[lb]=PCX-Bild
+@@ -52,7 +51,7 @@
+ Comment[nn]=PCX-bilete
+ Comment[nso]=Ponagalo ya PCX
+ Comment[pa]=PCX ਚਿੱਤਰ
+-Comment[pl]=Obraz PCX
++Comment[pl]=Obrazek PCX
+ Comment[pt]=Imagem PCX
+ Comment[pt_BR]=Imagem PCX
+ Comment[ro]=Imagine PCX
+@@ -75,7 +74,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
+--- mimetypes/image/x-xfig.desktop	(revision 484194)
++++ mimetypes/image/x-xfig.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=XFig skrá
+ Comment[it]=File XFig
+ Comment[ja]=XFigファイル
+-Comment[ka]=XFig ფაილი
+ Comment[km]=ឯកសារ XFig
+ Comment[ko]=XFig 파일
+ Comment[lb]=XFig-Datei
+@@ -77,7 +76,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
+--- mimetypes/image/fits.desktop	(revision 484194)
++++ mimetypes/image/fits.desktop	(revision 488534)
+@@ -5,6 +5,7 @@
+ MimeType=image/fits
+ Icon=image
+ Comment=FITS Image
++Comment[af]=FITS Beeld
+ Comment[bg]=Изображение FITS
+ Comment[ca]=Imatge FITS
+ Comment[cs]=FITS obrázek
+@@ -21,7 +22,7 @@
+ Comment[hu]=FITS-kép
+ Comment[is]=FITS mynd
+ Comment[it]=Immagine FITS
+-Comment[ka]=FITS ნახატი
++Comment[ja]=FITS 画像
+ Comment[km]=រូបភាព FITS
+ Comment[lb]=FITS-Bild
+ Comment[lt]=FITS paveiksliukas
+@@ -42,7 +43,6 @@
+ Comment[tg]=Тасвири FITS
+ Comment[uk]=Зображення FITS
+ Comment[uz]=FITS-расм
+-Comment[xx]=xxFITS Imagexx
+ Comment[zh_CN]=FITS 图像
+ ### TODO: what file patterns, especially that application/fits has the same
+ # RFC 4047 tells that image/fits are also application/fits
+--- mimetypes/image/pjpeg.desktop	(revision 484194)
++++ mimetypes/image/pjpeg.desktop	(revision 488534)
+@@ -37,7 +37,6 @@
+ Comment[is]=JPEG mynd
+ Comment[it]=Immagine JPEG
+ Comment[ja]=JPEG 画像
+-Comment[ka]=JPEG ნახატი
+ Comment[km]=រូបភាព JPEG
+ Comment[ko]=JPEG 그림
+ Comment[lb]=JPEG-Bild
+@@ -53,7 +52,7 @@
+ Comment[nn]=JPEG-bilete
+ Comment[nso]=Ponagalo ya JPEG
+ Comment[pa]=JPEG ਚਿੱਤਰ
+-Comment[pl]=Obraz JPEG
++Comment[pl]=Obrazek JPEG
+ Comment[pt]=Imagem JPEG
+ Comment[pt_BR]=Imagem JPEG
+ Comment[ro]=Imagine JPEG
+@@ -76,7 +75,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
+--- mimetypes/allfiles.desktop	(revision 484194)
++++ mimetypes/allfiles.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Comment[is]=Allar skrár
+ Comment[it]=Tutti i file
+ Comment[ja]=全てのファイル
+-Comment[ka]=ყველა ფაილი
+ Comment[km]=ឯកសារ​ទាំងអស់
+ Comment[ko]=ëª¨ë“  파일
+ Comment[lb]=All Dateien
+@@ -74,7 +73,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
+--- mimetypes/application/chm.desktop	(revision 484194)
++++ mimetypes/application/chm.desktop	(revision 488534)
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Comment=HTML Help Document
++Comment[af]=HTML Hulp Dokument
+ Comment[bg]=Помощна информация HTML
+ Comment[br]=Teul skoazell HTML
+ Comment[ca]=Document d'ajuda HTML
+@@ -17,7 +18,7 @@
+ Comment[hu]=HTML formátumú dokumentáció
+ Comment[is]=HTML hjálparskrá
+ Comment[it]=Documento HTML della guida
+-Comment[ka]=HTML დახმარების დოკუმენტი
++Comment[ja]=HTML ヘルプドキュメント
+ Comment[km]=ឯកសារ​ជំនួយ HTML
+ Comment[lb]=HTML-Hëllefsdokument
+ Comment[lt]=HTML pagalbos dokumentas
+@@ -38,7 +39,6 @@
+ Comment[tg]=Ҳуҷҷати Ёрмандии HTML
+ Comment[uk]=Документ довідки в HTML
+ Comment[uz]=HTML ёрдам ҳужжати
+-Comment[xx]=xxHTML Help Documentxx
+ Comment[zh_CN]=HTML 帮助文档
+ Hidden=false
+ Icon=help
+--- mimetypes/application/octet-stream.desktop	(revision 484194)
++++ mimetypes/application/octet-stream.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=Óþekkt
+ Comment[it]=Sconosciuto
+ Comment[ja]=未知
+-Comment[ka]=უცნობი
+ Comment[km]=មិន​ស្គាល់
+ Comment[ko]=모름
+ Comment[lb]=Onbekannt
+@@ -78,7 +77,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
+--- mimetypes/application/x-graphite.desktop	(revision 484194)
++++ mimetypes/application/x-graphite.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Comment[is]=Graphite gröf - myndræn framsetning gagna
+ Comment[it]=Grafico scientifico Graphite
+ Comment[ja]=Graphite 科学技術用グラフ
+-Comment[ka]=Graphite Scientific დიაგრამა
+ Comment[km]=គំនូសតាង​​វិទ្យាសាស្រ្ត Graphite
+ Comment[ko]=그래파이트 과학 그래프
+ Comment[lb]=Wëssenschaftleche Graph vu Graphite
+@@ -72,7 +71,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
+--- mimetypes/application/x-pkcs12.desktop	(revision 484194)
++++ mimetypes/application/x-pkcs12.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[hu]=PKCS#12 tanúsítványcsomag
+ Comment[it]=Insieme di certificati PKCS#12
+ Comment[ja]=PKCS#12 証明書バンドル
+-Comment[ka]=PKCS#12 სერთიფიკატების ნაკრები
+ Comment[km]=បាច់​វិញ្ញាបនបត្រ PKCS#12
+ Comment[lb]=PKCS#12-Zertifikatspak
+ Comment[lt]=PKCS#12 sertifikatų rinkinys
+@@ -68,7 +67,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
+--- mimetypes/application/sieve.desktop	(revision 484194)
++++ mimetypes/application/sieve.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=SIEVE Póstsíu skrifta
+ Comment[it]=Script filtro di posta SIEVE
+ Comment[ja]=SIEVEメールフィルタスクリプト
+-Comment[ka]=SIEVE საფოსტო ფილტრის სკრიპტი
+ Comment[km]=ស្គ្រីប​ SIEVE Mail Filter
+ Comment[ko]=SIEVE 편지 거르개 스크립트
+ Comment[lb]=Skript fir den SIEVE-Mailfilter
+@@ -69,7 +68,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
+--- mimetypes/application/x-tex-pk.desktop	(revision 484194)
++++ mimetypes/application/x-tex-pk.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=Þjöppuð leturskrá
+ Comment[it]=Tipo di carattere compresso
+ Comment[ja]=パックされたフォント
+-Comment[ka]=შეკუმშული ფონტი
+ Comment[km]=ពុម្ពអក្សរ Packed
+ Comment[ko]=묶어놓은 글꼴
+ Comment[lb]=Agepaakte Schrëft
+@@ -70,7 +69,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
+--- mimetypes/application/mathml+xml.desktop	(revision 484194)
++++ mimetypes/application/mathml+xml.desktop	(revision 488534)
+@@ -37,7 +37,6 @@
+ Comment[is]=MathML skjal
+ Comment[it]=Documento MathML
+ Comment[ja]=MathML ドキュメント
+-Comment[ka]=MathML დოკუმენტი
+ Comment[km]=ឯកសារ MathML
+ Comment[ko]=MathML 문서
+ Comment[lb]=MathML-Dokument
+@@ -72,6 +71,5 @@
+ Comment[uk]=Документ MathML (математичні формули)
+ Comment[uz]=MathML ҳужжати
+ Comment[wa]=Documint MathML
+-Comment[xx]=xxMathML Documentxx
+ Comment[zh_CN]=MathML 文档
+ Comment[zh_TW]=MathML 文件
+--- mimetypes/application/x-zerosize.desktop	(revision 484194)
++++ mimetypes/application/x-zerosize.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=Tómt skjal
+ Comment[it]=Documento vuoto
+ Comment[ja]=空のドキュメント
+-Comment[ka]=ცარიელი დოკუმენტი
+ Comment[km]=ឯកសារ​ទទេ
+ Comment[ko]=빈 문서
+ Comment[lb]=Eidelt Dokument
+@@ -73,7 +72,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
+--- mimetypes/application/x-lyx.desktop	(revision 484194)
++++ mimetypes/application/x-lyx.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=LyX skjal
+ Comment[it]=Documento LyX
+ Comment[ja]=Lyx ドキュメント
+-Comment[ka]=LyX დოკუმენტი
+ Comment[km]=ឯកសារ LyX
+ Comment[ko]=LyX 문서
+ Comment[lb]=LyX-Dokument
+@@ -73,7 +72,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
+--- mimetypes/application/x-font-speedo.desktop	(revision 484194)
++++ mimetypes/application/x-font-speedo.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=Speedo letur
+ Comment[it]=Tipo di carattere Speedo
+ Comment[ja]=Speedo フォント
+-Comment[ka]=Speedo ფონტი
+ Comment[km]=ពុម្ពអក្សរ Speedo
+ Comment[ko]=스피도 글꼴
+ Comment[lb]=Speedo-Schrëft
+@@ -74,7 +73,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
+--- mimetypes/application/x-kword.desktop	(revision 484194)
++++ mimetypes/application/x-kword.desktop	(revision 488534)
+@@ -37,7 +37,6 @@
+ Comment[is]=KWord skjal
+ Comment[it]=Documento KWord
+ Comment[ja]=KWord ドキュメント
+-Comment[ka]=KWord დოკუმენტი
+ Comment[km]=ឯកសារ KWord
+ Comment[ko]=K워드 문서
+ Comment[lb]=KWord-Dokument
+@@ -76,7 +75,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
+--- mimetypes/application/x-abiword.desktop	(revision 484194)
++++ mimetypes/application/x-abiword.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=AbiWord skjal
+ Comment[it]=Documento AbiWord
+ Comment[ja]=AbiWord ドキュメント
+-Comment[ka]=AbiWord დოკუმენტი
+ Comment[km]=ឯកសារ AbiWord
+ Comment[ko]=아비워드 문서
+ Comment[lb]=AbiWord-Dokument
+@@ -76,7 +75,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
+--- mimetypes/application/x-vnd.kde.kexi.desktop	(revision 484194)
++++ mimetypes/application/x-vnd.kde.kexi.desktop	(revision 488534)
+@@ -37,7 +37,6 @@
+ Comment[is]=Kexi Verkefnaskjal
+ Comment[it]=File di progetto Kexi
+ Comment[ja]=Kexi プロジェクト ファイル
+-Comment[ka]=Kexi პროექტის ფაილი
+ Comment[km]=ឯកសារ​គម្រោង Kexi
+ Comment[lb]=Kexi-Projektdatei
+ Comment[lt]=Kexi Project byla
+@@ -70,7 +69,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]
+--- mimetypes/application/x-cpio.desktop	(revision 484194)
++++ mimetypes/application/x-cpio.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=CPIO safnskrá
+ Comment[it]=Archivio CPIO
+ Comment[ja]=CPIO アーカイブ
+-Comment[ka]=CPIO არქივი
+ Comment[km]=ប័ណ្ណសារ CPIO
+ Comment[ko]=CPIO ì €ìž¥ê³ 
+ Comment[lb]=CPIO-Archiv
+@@ -76,7 +75,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
+--- mimetypes/application/x-magicpoint.desktop	(revision 484194)
++++ mimetypes/application/x-magicpoint.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Magicpoint kynning
+ Comment[it]=Presentazione MagicPoint
+ Comment[ja]=MagicPoint プレゼンテーション
+-Comment[ka]=MagicPoint პრეზენტაცია
+ Comment[km]=ការ​បង្ហាញ MagicPoint
+ Comment[lb]=MagicPoint-Präsentatioun
+ Comment[lt]=MagicPoint pristatymas
+@@ -69,5 +68,4 @@
+ Comment[uk]=Презентація MagicPoint
+ Comment[uz]=MagicPoint намойиши
+ Comment[wa]=Documint di prezintaedje Magicpoint
+-Comment[xx]=xxMagicPoint Presentationxx
+ Comment[zh_CN]=MagicPoint 演示文稿
+--- mimetypes/application/vnd.mozilla.xul+xml.desktop	(revision 484194)
++++ mimetypes/application/vnd.mozilla.xul+xml.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=Mozilla XUL skrá
+ Comment[it]=File XUL Mozilla
+ Comment[ja]=Mozilla XUL ファイル
+-Comment[ka]=Mozilla XUL ფაილი
+ Comment[km]=ឯកសារ Mozilla XUL
+ Comment[lb]=Mozilla-XUL-Datei
+ Comment[lt]=Mozilla XUL byla
+@@ -61,5 +60,4 @@
+ Comment[tt]=Mozilla XUL Bireme
+ Comment[uk]=Файл Mozilla XUL
+ Comment[uz]=Mozilla XUL-файли
+-Comment[xx]=xxMozilla XUL Filexx
+ Comment[zh_CN]=Mozilla XUL 文件
+--- mimetypes/application/x-bittorrent.desktop	(revision 484194)
++++ mimetypes/application/x-bittorrent.desktop	(revision 488534)
+@@ -29,7 +29,6 @@
+ Comment[is]=BitTorrent niðurhal
+ Comment[it]=Scaricamento BitTorrent
+ Comment[ja]=BitTorrent ダウンロード
+-Comment[ka]=BitTorrent ჩამოტვირთვა
+ Comment[km]=ការទាញយក BitTorrent
+ Comment[lb]=BitTorrent-Download
+ Comment[lt]=BitTorrent atsisiuntimas
+@@ -61,7 +60,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
+--- mimetypes/application/x-sharedlib.desktop	(revision 484194)
++++ mimetypes/application/x-sharedlib.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=Samnýtt stefjusafn
+ Comment[it]=Libreria condivisa
+ Comment[ja]=共有ライブラリ
+-Comment[ka]=საზიარო ბიბლიოთეკა
+ Comment[km]=បណ្ណាល័យ​រួម
+ Comment[ko]=ê³µìœ  라이브러리
+ Comment[lb]=Bibliothéiksdatei
+@@ -70,7 +69,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
+--- mimetypes/application/vnd.sun.xml.base.desktop	(revision 484194)
++++ mimetypes/application/vnd.sun.xml.base.desktop	(revision 488534)
+@@ -20,7 +20,7 @@
+ Comment[hu]=OpenOffice.org-adatbázis
+ Comment[is]=OpenOffice.org gagnagrunnur
+ Comment[it]=Banca dati OpenOffice.org
+-Comment[ka]=OpenOffice.org მონაცემთა ბაზა
++Comment[ja]=OpenOffice.org データベース
+ Comment[km]=មូលដ្ឋាន​ទិន្នន័យ OpenOffice.org
+ Comment[lb]=OpenOffice.org-Datebank
+ Comment[lt]=OpenOffice.org duomenų bazė
+@@ -45,7 +45,6 @@
+ Comment[tt]=OpenOffice.org Biremlege
+ Comment[uk]=База даних OpenOffice.org
+ Comment[uz]=OpenOffice.org маълумот база
+-Comment[xx]=xxOpenOffice.org Databasexx
+ Comment[zh_CN]=OpenOffice.org 数据库
+ Icon=spreadsheet
+ Type=MimeType
+--- mimetypes/application/x-linguist.desktop	(revision 484194)
++++ mimetypes/application/x-linguist.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Comment[is]=Qt Translation frumforrit
+ Comment[it]=File sorgente traduzioni Qt
+ Comment[ja]=Qt 翻訳 ソースファイル
+-Comment[ka]=Qt თარგმანის პირველწყარო ფაილი
+ Comment[km]=ឯកសារ Qt Translation Source
+ Comment[ko]=Qt 번역 밑그림 파일
+ Comment[lb]=Qt-Iwwersetzungsquelldatei
+@@ -65,8 +64,7 @@
+ Comment[tg]=Файли Сарчашмаи Тарҷумаи Qt
+ Comment[tr]=Qt Çeviri Kaynak Dosyası
+ Comment[tt]=Qt Tärcemä Çığanağınıñ Bireme
+-Comment[uk]=Вихідний файл перекладу зовнішнього вигляду для Qt
++Comment[uk]=Вихідний файл перекладу для Qt
+ Comment[uz]=Qt таржима қилишнинг коди
+-Comment[xx]=xxQt Translation Source Filexx
+ Comment[zh_CN]=Qt 翻译源文件
+ Comment[zh_TW]=QT Translation 原始檔案
+--- mimetypes/application/x-tbz.desktop	(revision 484194)
++++ mimetypes/application/x-tbz.desktop	(revision 488534)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=Bzip2-ed Tar Archive
++Comment[af]=Bzip2-ed Tar Argief
+ Comment[bg]=Компресиран архив Tar с Bzip2
+ Comment[br]=Diell Tar Bzip2et
+ Comment[ca]=Arxiu tar i bzip2
+@@ -18,7 +19,7 @@
+ Comment[hu]=Bzip2.tar-archívum
+ Comment[is]=Bzip2 þjappað tar-safn
+ Comment[it]=Archivio Tar compresso con Bzip2
+-Comment[ka]=Bzip2 შეკუმშული Tar არქივი
++Comment[ja]=Bzip2 圧縮された Tar アーカイブ
+ Comment[km]=ប័ណ្ណសារ Bzip2-ed Tar
+ Comment[lb]=Mat Bzip2 kompriméierten Tar-Archiv
+ Comment[lt]=Tar archyvas, suglaudintas su bzip2
+@@ -39,7 +40,6 @@
+ Comment[tg]=Архиви Tar Bzip2-карда шуд
+ Comment[uk]=Архів Tar, стиснутий Bzip2
+ Comment[uz]=Bzip билан қисилган Tar архиви
+-Comment[xx]=xxBzip2-ed Tar Archivexx
+ Comment[zh_CN]=Bzip 压缩的 Tar 归档
+ MimeType=application/x-tbz
+ Icon=tgz
+--- mimetypes/application/x-hancomword.desktop	(revision 484194)
++++ mimetypes/application/x-hancomword.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=HancomWord skjal
+ Comment[it]=Documento HancomWord
+ Comment[ja]=HancomWord ドキュメント
+-Comment[ka]=HancomWord დოკუმენტი
+ Comment[km]=ឯកសារ HancomWord
+ Comment[ko]=한컴 글틀 문서
+ Comment[lb]=HancomWord-Dokument
+@@ -74,7 +73,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
+--- mimetypes/application/x-zip-compressed.desktop	(revision 484194)
++++ mimetypes/application/x-zip-compressed.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=Zip safnskrá
+ Comment[it]=Archivio Zip
+ Comment[ja]=Zip アーカイブ
+-Comment[ka]=Zip არქივი
+ Comment[km]=ប័ណ្ណសារ Zip
+ Comment[ko]=Zip ì €ìž¥ê³ 
+ Comment[lb]=Zip-Archiv
+@@ -75,7 +74,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
+--- mimetypes/application/x-kugar.desktop	(revision 484194)
++++ mimetypes/application/x-kugar.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Kugar gagnaskrá
+ Comment[it]=File di dati Kugar
+ Comment[ja]=Kugar データファイル
+-Comment[ka]=Kugar მონაცემთა ფაილი
+ Comment[km]=ឯកសារ​ទិន្នន័យ Kugar
+ Comment[lb]=Kugar-Donnéen-Datei
+ Comment[lt]=Kugar duomenų byla
+@@ -74,7 +73,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
+--- mimetypes/application/x-gzip.desktop	(revision 484194)
++++ mimetypes/application/x-gzip.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=Þjöppuð skrá (gzip)
+ Comment[it]=File Gzip
+ Comment[ja]=Gzip ファイル
+-Comment[ka]=Gzip არქივი
+ Comment[km]=ឯកសារ Gzip
+ Comment[ko]=Gzip 파일
+ Comment[lb]=Gzip-Datei
+@@ -73,7 +72,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
+--- mimetypes/application/vnd.palm.desktop	(revision 484194)
++++ mimetypes/application/vnd.palm.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=Palm skjal
+ Comment[it]=Documento Palm
+ Comment[ja]=Palm ドキュメント
+-Comment[ka]=Palm დოკუმენტი
+ Comment[km]=ឯកសារ Palm
+ Comment[ko]=팜 문서
+ Comment[lb]=Palm-Dokument
+@@ -70,6 +69,5 @@
+ Comment[uk]=Документ Palm
+ Comment[uz]=Palm ҳужжати
+ Comment[wa]=Documint Palm
+-Comment[xx]=xxPalm Documentxx
+ Comment[zh_CN]=Palm 文档
+ Comment[zh_TW]=Palm 文件
+--- mimetypes/application/x-cue.desktop	(revision 484194)
++++ mimetypes/application/x-cue.desktop	(revision 488534)
+@@ -23,7 +23,6 @@
+ Comment[hu]=CDRWIN-es Cue-fájl
+ Comment[is]=CDRWIN cue-skjal
+ Comment[it]=Cuesheet di CDRWin
+-Comment[ka]=CDRWIN cue ცხრილი
+ Comment[lb]=CDRWIN-Cue-Datei
+ Comment[mk]=CDRWIN табела со ознаки
+ Comment[ms]=Lembaran CDRWIN Cue
+@@ -48,4 +47,3 @@
+ Comment[tg]=Феҳристи CDRWIN
+ Comment[tt]=CDRWIN Cue-Cäymäse
+ Comment[uk]=Файл диску CDRWIN
+-Comment[xx]=xxCDRWIN Cue-Sheetxx
+--- mimetypes/application/x-tzo.desktop	(revision 484194)
++++ mimetypes/application/x-tzo.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=Lzop-þjappað tar-safn
+ Comment[it]=Archivio Tar compresso con Lz
+ Comment[ja]=LzopされたTarアーカイブ
+-Comment[ka]=Lzop შეკუმშული Tar არქივი
+ Comment[km]=ប័ណ្ណសារ Lzopped Tar
+ Comment[ko]=Lzop으로 압축한 TAR ì €ìž¥ê³ 
+ Comment[lb]=Mat Lzop kompriméierten Tar-Archiv
+@@ -76,7 +75,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
+--- mimetypes/application/x-font-ghostscript.desktop	(revision 484194)
++++ mimetypes/application/x-font-ghostscript.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=Gostscript letur
+ Comment[it]=Tipo di carattere Ghostscript
+ Comment[ja]=GhostScript フォント
+-Comment[ka]=Ghostscript ფონტი
+ Comment[km]=ពុម្ពអក្សរ Ghostscript
+ Comment[ko]=ê³ ìŠ¤íŠ¸ìŠ¤í¬ë¦½íŠ¸ 글꼴
+ Comment[lb]=Ghostscript-Schrëft
+@@ -74,7 +73,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
+--- mimetypes/application/vnd.oasis.opendocument.spreadsheet-template.desktop	(revision 484194)
++++ mimetypes/application/vnd.oasis.opendocument.spreadsheet-template.desktop	(revision 488534)
+@@ -27,7 +27,6 @@
+ Comment[is]=OASIS OpenDocument töflureikningsnið
+ Comment[it]=Modello di foglio di calcolo OASIS OpenDocument
+ Comment[ja]=OASIS OpenDocument 表計算テンプレート
+-Comment[ka]=OASIS OpenDocument ცხრილის თარგი
+ Comment[km]=ពុម្ព​សៀវភៅបញ្ជី OASIS OpenDocument
+ Comment[lb]=OASIS-OpenDocument-Tabellëkalkulatiounsvirlag
+ Comment[lt]=OASIS OpenDocument elektroninÄ—s lentelÄ—s Å¡ablonas
+@@ -54,7 +53,6 @@
+ Comment[tt]=OASIS OpenDocument İsäpcäymä Ürçetmäse
+ Comment[uk]=Шаблон електронної таблиці OASIS OpenDocument
+ Comment[uz]=OASIS OpenDocument электрон жадвал намунаси
+-Comment[xx]=xxOASIS OpenDocument SpreadSheet Templatexx
+ Comment[zh_CN]=OASIS OpenDocument ç”µå­è¡¨æ ¼æ¨¡æ¿
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+--- mimetypes/application/x-python-bytecode.desktop	(revision 484194)
++++ mimetypes/application/x-python-bytecode.desktop	(revision 488534)
+@@ -71,7 +71,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
+--- mimetypes/application/x-dbase.desktop	(revision 484194)
++++ mimetypes/application/x-dbase.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=dBASE skjal
+ Comment[it]=Documento dBASE
+ Comment[ja]=dBASE ドキュメント
+-Comment[ka]=dBASE დოკუმენტი
+ Comment[km]=ឯកសារ dBASE
+ Comment[ko]=dBASE 문서
+ Comment[lb]=dBASE-Dokument
+@@ -76,7 +75,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
+--- mimetypes/application/x-webarchive.desktop	(revision 484194)
++++ mimetypes/application/x-webarchive.desktop	(revision 488534)
+@@ -25,7 +25,6 @@
+ Comment[is]=Vef safnskrá
+ Comment[it]=Archivio Web
+ Comment[ja]=Web アーカイブ
+-Comment[ka]=ვებ არქივი
+ Comment[km]=ប័ណ្ណសារគេហទំព័រ
+ Comment[lb]=Webarchiv
+ Comment[lt]=Web Archyvas
+@@ -57,7 +56,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
+--- mimetypes/application/x-kformula.desktop	(revision 484194)
++++ mimetypes/application/x-kformula.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=KFormula skjal
+ Comment[it]=Documento KFormula
+ Comment[ja]=KFormula ドキュメント
+-Comment[ka]=KFormula დოკუმენტი
+ Comment[km]=ឯកសារ KFormula
+ Comment[ko]=K포뮬라 문서
+ Comment[lb]=KFormula-Dokument
+@@ -75,7 +74,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
+--- mimetypes/application/x-troff.desktop	(revision 484194)
++++ mimetypes/application/x-troff.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=Troff skjal
+ Comment[it]=Documento Troff
+ Comment[ja]=Troff ドキュメント
+-Comment[ka]=Troff დოკუმენტი
+ Comment[km]=ឯកសារ Troff
+ Comment[ko]=Troff 문서
+ Comment[lb]=Troff-Dokument
+@@ -72,7 +71,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
+--- mimetypes/application/pkcs7-signature.desktop	(revision 484194)
++++ mimetypes/application/pkcs7-signature.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Comment[is]=Aðskilin S/MIME undirskrift
+ Comment[it]=Firma S/MIME separata
+ Comment[ja]=切り離されたS/MIME 署名
+-Comment[ka]=S/MIME მოხსნილი ხელმოწერები
+ Comment[km]=ហត្ថលេខា Detached S/MIME
+ Comment[ko]=ë‚˜ëˆ ì§„ S/마임 서명
+ Comment[lb]=Ofgetrennten S/MIME-Signatur
+@@ -72,7 +71,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
+--- mimetypes/application/pgp.desktop	(revision 484194)
++++ mimetypes/application/pgp.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=PGP dulritað eða undirritað skeyti
+ Comment[it]=Messaggio cifrato o firmato PGP
+ Comment[ja]=PGP 符号化された又は、署名されたメッセージ
+-Comment[ka]=PGP დაშიფრული ან ხელმოწერილი შეტყობინება
+ Comment[km]=សារ​ដែល​បាន​​ចុះ​ហត្ថលេខា ឬ បម្លែង​ជា​កូដ​ដោយ PGP
+ Comment[ko]=PGP로 암호화하거나 서명한 메세지
+ Comment[lb]=PGP-verschlësselt oder PGP-signéiert Noricht
+@@ -67,6 +66,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 åŠ å¯†æˆ–ç°½åçš„è¨Šæ¯
+--- mimetypes/application/vnd.oasis.opendocument.text.desktop	(revision 484194)
++++ mimetypes/application/vnd.oasis.opendocument.text.desktop	(revision 488534)
+@@ -27,7 +27,6 @@
+ Comment[is]=OASIS OpenDocument texti
+ Comment[it]=Documento OASIS OpenDocument
+ Comment[ja]=OASIS OpenDocument テキスト
+-Comment[ka]=OASIS OpenDocument ტექსტური დოკუმენტი
+ Comment[km]=អត្ថបទ OASIS OpenDocument
+ Comment[lb]=OASIS-OpenDocument-Text
+ Comment[lt]=OASIS OpenDocument tekstas
+@@ -54,7 +53,6 @@
+ Comment[tt]=OASIS OpenDocument Mätene
+ Comment[uk]=Текстовий документ OASIS OpenDocument
+ Comment[uz]=OASIS OpenDocument матн ҳужжати
+-Comment[xx]=xxOASIS OpenDocument Textxx
+ Comment[zh_CN]=OASIS OpenDocument 文本
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+--- mimetypes/application/x-ruby.desktop	(revision 484194)
++++ mimetypes/application/x-ruby.desktop	(revision 488534)
+@@ -30,7 +30,6 @@
+ Comment[is]=Ruby forrit
+ Comment[it]=Programma Ruby
+ Comment[ja]=Ruby プログラム
+-Comment[ka]=Ruby პროგრამა
+ Comment[km]=កម្មវិធី Ruby
+ Comment[ko]=루비 프로그램
+ Comment[lb]=Ruby-Programm
+@@ -65,7 +64,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...
+--- mimetypes/application/x-gettext.desktop	(revision 484194)
++++ mimetypes/application/x-gettext.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=GNU þýðingarskrá
+ Comment[it]=Catalogo messaggi GNU Gettext
+ Comment[ja]=GNU Gettext メッセージ カタログ
+-Comment[ka]=GNU Gettext შეტყობინებათა კატალოგი
+ Comment[ko]=GNU Gettext 메세지 일람표
+ Comment[lb]=GNU-Gettext-Messagesammlung
+ Comment[lt]=GNU Gettext pranešimų katalogas
+@@ -65,7 +64,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
+--- mimetypes/application/x-kspread.desktop	(revision 484194)
++++ mimetypes/application/x-kspread.desktop	(revision 488534)
+@@ -37,7 +37,6 @@
+ Comment[is]=KSpread skjal
+ Comment[it]=Documento KSpread
+ Comment[ja]=KSpread ドキュメント
+-Comment[ka]=KSpread დოკუმენტი
+ Comment[km]=ឯកសារ KSpread
+ Comment[lb]=KSpread-Dokument
+ Comment[lt]=KSpread dokumentas
+@@ -75,7 +74,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
+--- mimetypes/application/x-tgif.desktop	(revision 484194)
++++ mimetypes/application/x-tgif.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=TIGF skjal
+ Comment[it]=Documento TGIF
+ Comment[ja]=TGIF ドキュメント
+-Comment[ka]=TGIF დოკუმენტი
+ Comment[km]=ឯកសារ TGIF
+ Comment[ko]=TGIF 문서
+ Comment[lb]=TGIF-Dokument
+@@ -73,7 +72,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
+--- mimetypes/application/vnd.oasis.opendocument.text-template.desktop	(revision 484194)
++++ mimetypes/application/vnd.oasis.opendocument.text-template.desktop	(revision 488534)
+@@ -27,7 +27,6 @@
+ Comment[is]=OASIS OpenDocument textasnið
+ Comment[it]=Modello di documento di testo OASIS OpenDocument
+ Comment[ja]=OASIS OpenDocument テキストテンプレート
+-Comment[ka]=OASIS OpenDocument ტექსტის თარგი
+ Comment[km]=ពុម្ព​អត្ថបទ OASIS OpenDocument
+ Comment[lb]=OASIS-OpenDocument-Textvirlag
+ Comment[lt]=OASIS OpenDocument teksto dokumento Å¡ablonas
+@@ -54,7 +53,6 @@
+ Comment[tt]=OASIS OpenDocument Mäten Üzçetmäse
+ Comment[uk]=Шаблон текстового документу OASIS OpenDocument
+ Comment[uz]=OASIS OpenDocument матн ҳужжати намунаси
+-Comment[xx]=xxOASIS OpenDocument Text Templatexx
+ Comment[zh_CN]=OASIS OpenDocument 文本文档模板
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+--- mimetypes/application/vnd.sun.xml.writer.master.desktop	(revision 484194)
++++ mimetypes/application/vnd.sun.xml.writer.master.desktop	(revision 488534)
+@@ -26,7 +26,6 @@
+ Comment[is]=OpenOffice.org yfirtextaskjal
+ Comment[it]=Documento di testo master OpenOffice.org
+ Comment[ja]=OpenOffice.org マスターテキストドキュメント
+-Comment[ka]=OpenOffice.org თარგის დოკუმენტი
+ Comment[km]=ឯកសារ​អត្ថបទ​មេ OpenOffice.org
+ Comment[lb]=OpenOffice.org-Haapttextdokument
+ Comment[lt]=OpenOffice.org teksto dokumentas
+@@ -55,7 +54,6 @@
+ Comment[tt]=OpenOffice.org'nıñ Master-İstälege
+ 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
+--- mimetypes/application/x-font-otf.desktop	(revision 484194)
++++ mimetypes/application/x-font-otf.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=OpenType letur
+ Comment[it]=Tipo di carattere OpenType
+ Comment[ja]=OpenType フォント
+-Comment[ka]=OpenType ფონტი
+ Comment[km]=ពុម្ពអក្សរ OpenType
+ Comment[ko]=오픈타입 글꼴
+ Comment[lb]=OpenType-Schrëft
+@@ -67,7 +66,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
+--- mimetypes/application/smil.desktop	(revision 484194)
++++ mimetypes/application/smil.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=SMIL-skjal (Synchronized Multimedia Integration Language)
+ Comment[it]=Linguaggio d'integrazione multimediale sincronizzata
+ Comment[ja]=同期マルチメディア統合言語
+-Comment[ka]=სინქრონიზებული მულტიმედია ინტეგრირების ენა
+ Comment[km]=ភាសា​សមាហរណកម្ម​​ពហុព័ត៌មាន​ដែល​បាន​ធ្វើ​សមកាលកម្ម
+ Comment[ko]=동기화된 멀티미디어 통합 언어
+ Comment[lb]=Synchroniséiert Multimedia-Integratiounssprooch
+@@ -66,7 +65,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
+--- mimetypes/application/vnd.sun.xml.calc.template.desktop	(revision 484194)
++++ mimetypes/application/vnd.sun.xml.calc.template.desktop	(revision 488534)
+@@ -27,7 +27,6 @@
+ Comment[is]=OpenOffice.org töflusniðmát
+ Comment[it]=Modello di foglio di calcolo OpenOffice.org
+ Comment[ja]=OpenOffice.org 表計算テンプレート
+-Comment[ka]=OpenOffice.org ცხრილის თარგი
+ Comment[km]=ពុម្ព​សៀវភៅ​បញ្ជី OpenOffice.org
+ Comment[ko]=Openoffice.org ìŠ¤í”„ë ˆë“œì‹œíŠ¸ 본
+ Comment[lb]=OpenOffice.org-Tabellëblatvirlag
+@@ -57,7 +56,6 @@
+ Comment[tt]=OpenOffice.org İsäpcäymä Ürçetmäse
+ Comment[uk]=Шаблон електронної таблиці OpenOffice.org
+ Comment[uz]=OpenOffice.org электрон жадвал намунаси
+-Comment[xx]=xxOpenOffice.org Spreadsheet Templatexx
+ Comment[zh_CN]=OpenOffice.org ç”µå­è¡¨æ ¼æ¨¡æ¿
+ Icon=spreadsheet
+ Type=MimeType
+--- mimetypes/application/x-bzip.desktop	(revision 484194)
++++ mimetypes/application/x-bzip.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=Þjöppuð skrá (bzip)
+ Comment[it]=File Bzip
+ Comment[ja]=Bzip ファイル
+-Comment[ka]=Bzip არქივი
+ Comment[km]=ឯកសារ Bzip
+ Comment[ko]=Bzip 파일
+ Comment[lb]=Bzip-Datei
+@@ -73,7 +72,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
+--- mimetypes/application/xml-dtd.desktop	(revision 484194)
++++ mimetypes/application/xml-dtd.desktop	(revision 488534)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Comment=XML DTD Document
++Comment[af]=XML DTD Dokument
+ Comment[bg]=Документ XML DTD
+ Comment[br]=Teul DTD XML
+ Comment[ca]=Document XML DTD
+@@ -18,7 +19,7 @@
+ Comment[hu]=XML DTD-dokumentum
+ Comment[is]=XML DTD skjal
+ Comment[it]=Documento XML DTD
+-Comment[ka]=XML DTD დოკუმენტი
++Comment[ja]=XML DTD ドキュメント
+ Comment[km]=ឯកសារ XML DTD
+ Comment[lb]=XML-DTD-Dokument
+ Comment[lt]=XML DTD dokumentas
+@@ -39,7 +40,6 @@
+ Comment[tg]=Ҳуҷҷати XML DTD
+ Comment[uk]=Документ DTD XML
+ Comment[uz]=XML DTD ҳужжати
+-Comment[xx]=xxXML DTD Documentxx
+ Comment[zh_CN]=XML DTD 文档
+ Icon=html
+ Type=MimeType
+--- mimetypes/application/x-arc.desktop	(revision 484194)
++++ mimetypes/application/x-arc.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=ARC safnskrá
+ Comment[it]=Archivio ARC
+ Comment[ja]=ARC アーカイブ
+-Comment[ka]=ARC არქივი
+ Comment[km]=ប័ណ្ណសារ ARC
+ Comment[ko]=ARC ì €ìž¥ê³ 
+ Comment[lb]=ARC-Archiv
+@@ -71,6 +70,5 @@
+ Comment[uk]=Архів ARC
+ Comment[uz]=ARC архиви
+ Comment[wa]=Ã…rtchive ARC
+-Comment[xx]=xxARC Archivexx
+ Comment[zh_CN]=ARC å½’æ¡£
+ Comment[zh_TW]=ARC 壓縮檔案
+--- mimetypes/application/pkcs7-mime.desktop	(revision 484194)
++++ mimetypes/application/pkcs7-mime.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Comment[is]=PKCS#7 (S/MIME) formuð gögn
+ Comment[it]=Dati formattati PKCS#7 (S/MIME)
+ Comment[ja]=PKCS#7 (S/MIME) フォーマットデータ
+-Comment[ka]=PKCS#7 (S/MIME) დაფორმატებული მონაცემები
+ Comment[km]=ទិន្នន័យទ្រង់ទ្រាយ PKCS#7 (S/MIME)
+ Comment[ko]=PKCS#7 (S/마임) 형식 자료
+ Comment[lb]=PKCS#7 (S/MIME)-formatéiert Donnéeën
+@@ -70,7 +69,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) 
+--- mimetypes/application/x-zoo.desktop	(revision 484194)
++++ mimetypes/application/x-zoo.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Zoo safnskrá
+ Comment[it]=Archivio Zoo
+ Comment[ja]=Zoo アーカイブ
+-Comment[ka]=Zoo არქივი
+ Comment[km]=ប័ណ្ណសារ Zoo
+ Comment[ko]=Zoo ì €ìž¥ê³ 
+ Comment[lb]=Zoo-Archiv
+@@ -76,7 +75,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
+--- mimetypes/application/vnd.sun.xml.writer.template.desktop	(revision 484194)
++++ mimetypes/application/vnd.sun.xml.writer.template.desktop	(revision 488534)
+@@ -27,7 +27,6 @@
+ Comment[is]=OpenOffice.org textaskjalssniðmát
+ Comment[it]=Modello di documento di testo OpenOffice.org
+ Comment[ja]=OpenOffice.org テキストドキュメントテンプレート
+-Comment[ka]=OpenOffice.org ტექსტური დოკუმენტის თარგი
+ Comment[km]=ពុម្ព​ឯកសារ​អត្ថបទ OpenOffice.org
+ Comment[ko]=OpenOffice.org 글월 문서 본
+ Comment[lb]=OpenOffice.org-Textdokumentvirlag
+@@ -58,7 +57,6 @@
+ Comment[tt]=OpenOffice.org Mäten İstälege öçen Ürçetmä
+ 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
+--- mimetypes/application/x-font-pcf.desktop	(revision 484194)
++++ mimetypes/application/x-font-pcf.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=PCF bitamynda letur
+ Comment[it]=Tipo di carattere bitmap PCF
+ Comment[ja]=PCF ビットマップフォント
+-Comment[ka]=PCF რასტრული ფონტი
+ Comment[km]=ពុម្ពអក្សរ PCF Bitmap
+ Comment[ko]=PCF 비트맵 글꼴
+ Comment[lb]=PCF-Bitmapschrëft
+@@ -74,7 +73,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
+--- mimetypes/application/x-arj.desktop	(revision 484194)
++++ mimetypes/application/x-arj.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=ARJ safnskrá
+ Comment[it]=Archivio ARJ
+ Comment[ja]=ARJ アーカイブ
+-Comment[ka]=ARJ არქივი
+ Comment[km]=ប័ណ្ណសារ ARJ
+ Comment[ko]=ARJ ì €ìž¥ê³ 
+ Comment[lb]=ARJ-Archiv
+@@ -76,7 +75,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
+--- mimetypes/application/vnd.oasis.opendocument.presentation-template.desktop	(revision 484194)
++++ mimetypes/application/vnd.oasis.opendocument.presentation-template.desktop	(revision 488534)
+@@ -27,7 +27,6 @@
+ Comment[is]=OASIS OpenDocument kynningarsnið
+ Comment[it]=Modello di presentazione OASIS OpenDocument
+ Comment[ja]=OASIS OpenDocument プレゼンテーションテンプレート
+-Comment[ka]=OASIS OpenDocument პრეზენტაციის თარგი
+ Comment[km]=ពុម្ព​ការបង្ហាញ OASIS OpenDocument
+ Comment[lb]=OASIS-OpenDocument-Präsentatiounsvirlag
+ Comment[lt]=OASIS OpenDocument pateikčių šablonas
+@@ -54,7 +53,6 @@
+ Comment[tt]=OASIS OpenDocument Täqbir Ürçetmäse
+ Comment[uk]=Шаблон презентації OASIS OpenDocument
+ Comment[uz]=OASIS OpenDocument намойиш намунаси
+-Comment[xx]=xxOASIS OpenDocument Presentation Templatexx
+ Comment[zh_CN]=OASIS OpenDocument 演示文稿模板
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+--- mimetypes/application/x-trash.desktop	(revision 484194)
++++ mimetypes/application/x-trash.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=Öryggisafrit
+ Comment[it]=File di backup
+ Comment[ja]=バックアップファイル
+-Comment[ka]=სამარაგო ფაილი
+ Comment[km]=ឯកសារ​ Backup
+ Comment[ko]=여벌 파일 (백업)
+ Comment[lb]=Sëcherungsdatei
+@@ -74,7 +73,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
+--- mimetypes/application/x-kpresenter.desktop	(revision 484194)
++++ mimetypes/application/x-kpresenter.desktop	(revision 488534)
+@@ -37,7 +37,6 @@
+ Comment[is]=KPresenter kynningarskjal
+ Comment[it]=Documento KPresenter
+ Comment[ja]=KPresenter ファイル
+-Comment[ka]=KPresenter დოკუმენტი
+ Comment[km]=ឯកសារ KPresenter
+ Comment[lb]=KPresenter-Dokument
+ Comment[lt]=KPresenter dokumentas
+@@ -75,7 +74,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
+--- mimetypes/application/x-siag.desktop	(revision 484194)
++++ mimetypes/application/x-siag.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=Siag tafla
+ Comment[it]=Foglio di calcolo Siag
+ Comment[ja]=Siag スプレッドシート
+-Comment[ka]=Siag ელცხრილი
+ Comment[km]=សៀវភៅ​បញ្ជី Siag
+ Comment[ko]=Siag ìŠ¤í”„ë ˆë“œì‹œíŠ¸
+ Comment[lb]=Siag-Tabellëblat
+@@ -71,7 +70,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
+--- mimetypes/application/x-egon.desktop	(revision 484194)
++++ mimetypes/application/x-egon.desktop	(revision 488534)
+@@ -28,7 +28,6 @@
+ Comment[id]=Animator Egon
+ Comment[is]=Egon teiknimyndaforritið
+ Comment[ja]=Egon アニメータ
+-Comment[ka]=Egon ანიმატორი
+ Comment[km]=ជីវចល Egon
+ Comment[ko]=에곤 ì• ë‹ˆë©”ì´í„°
+ Comment[lb]=Egon-Animator
+@@ -55,4 +54,3 @@
+ Comment[ven]=Zwipuka zwa Egon
+ Comment[vi]=Hoạt hoạ Egon 
+ Comment[xh]=Umphilisi we Egon
+-Comment[xx]=xxEgon Animatorxx
+--- mimetypes/application/x-ace.desktop	(revision 484194)
++++ mimetypes/application/x-ace.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=ACE safnskrá
+ Comment[it]=Archivio ACE
+ Comment[ja]=ACE アーカイブ
+-Comment[ka]=ACE არქივი
+ Comment[km]=ប័ណ្ណសារ ACE
+ Comment[ko]=ACE ì €ìž¥ê³ 
+ Comment[lb]=ACE-Archiv
+@@ -71,6 +70,5 @@
+ Comment[uk]=Архіви ACE
+ Comment[uz]=ACE архиви
+ Comment[wa]=Årtchive «ACE»
+-Comment[xx]=xxACE Archivexx
+ Comment[zh_CN]=ACE å½’æ¡£
+ Comment[zh_TW]=Arc 壓縮檔案 
+--- mimetypes/application/x-kde-wallet.desktop	(revision 484194)
++++ mimetypes/application/x-kde-wallet.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=KDE veski
+ Comment[it]=File portafogli di KDE
+ Comment[ja]=KDE ウォレット ファイル
+-Comment[ka]=KDE ქისის ფაილი
+ Comment[km]=ឯកសារ KDE Wallet
+ Comment[ko]=KDE 지갑 파일
+ Comment[lb]=KDE-Portmonnisdatei
+@@ -65,7 +64,6 @@
+ Comment[tt]=KDE Wallet Bireme
+ Comment[uk]=Файл торбинки KDE
+ Comment[uz]=KDE Wallet-файли
+-Comment[xx]=xxKDE Wallet Filexx
+ Comment[zh_CN]=KDE 钱包文件
+ Comment[zh_TW]=KDE  公事包檔案
+ Patterns=*.kwl
+--- mimetypes/application/x-mimearchive.desktop	(revision 484194)
++++ mimetypes/application/x-mimearchive.desktop	(revision 488534)
+@@ -23,7 +23,6 @@
+ Comment[hu]=MIME-webarchívum
+ Comment[is]=Mime innifalinn vef safnskrá
+ Comment[it]=Archivio Web incapsulato MIME
+-Comment[ka]=MIME ფორმატის შეკუმშული ვებ არქივი
+ Comment[km]=ប័ណ្ណសារ​ Mime Encapsulated Web
+ Comment[lb]=Mime-gekapselt Webarchiv
+ Comment[lt]=Mime įsiūtas žiniatinklio archyvas
+@@ -49,7 +48,6 @@
+ Comment[tg]=Архиви Веб Tar Фушурдашуда
+ Comment[tt]=Web beteneñ Mime-Tuplaması
+ Comment[uk]=Архів Тенет з інформацією про mine
+-Comment[xx]=xxMime Encapsulated Web Archivexx
+ Comment[zh_CN]=MIME 封装的 Web 归档
+ 
+ [Property::X-KDE-LocalProtocol]
+--- mimetypes/application/x-deb.desktop	(revision 484194)
++++ mimetypes/application/x-deb.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=Debian pakki
+ Comment[it]=Pacchetto Debian
+ Comment[ja]=Debian パッケージ
+-Comment[ka]=Debian-ის პაკეტი
+ Comment[km]=កញ្ចប់ Debian
+ Comment[ko]=데비안 꾸러미
+ Comment[lb]=Debian-Päckchen
+@@ -70,6 +69,5 @@
+ Comment[uk]=Пакунок Debian
+ Comment[uz]=Debian пакети
+ Comment[wa]=Fitchî pacaedje Debian
+-Comment[xx]=xxDebian Packagexx
+ Comment[zh_CN]=Debian 包
+ Comment[zh_TW]=Debian 軟體包
+--- mimetypes/application/x-ica.desktop	(revision 484194)
++++ mimetypes/application/x-ica.desktop	(revision 488534)
+@@ -26,7 +26,6 @@
+ Comment[is]=Stillingar Citrix ICA biðlarans
+ Comment[it]=Configurazione client Citrix ICA
+ Comment[ja]=Citrix ICA クライアント設定
+-Comment[ka]=Citrix ICA კლიენტის კონფიგურაცია
+ Comment[ko]=Citrix ICA 클라이언트 ì„¤ì •
+ Comment[lb]=Citrix-ICA-Zougëffsprogramm-Configuratioun
+ Comment[lt]=Citrix ICA kliento derinimas
+@@ -55,7 +54,6 @@
+ Comment[tr]=Citrix ICA Yapılandırması
+ Comment[tt]=Citrix ICA Klient Caylawı
+ Comment[uk]=Конфігурація клієнта Citrix ICA
+-Comment[xx]=xxCitrix ICA Client Configurationxx
+ Comment[zh_CN]=Citrix ICA 客户配置
+ Icon=wordprocessing
+ Type=MimeType
+--- mimetypes/application/x-rpm.desktop	(revision 484194)
++++ mimetypes/application/x-rpm.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=RPM pakki
+ Comment[it]=File pacchetto RPM
+ Comment[ja]=RPM パッケージファイル
+-Comment[ka]=RPM პაკეტი
+ Comment[km]=ឯកសារ​កញ្ចប់ RPM
+ Comment[ko]=RPM 꾸러미 파일
+ Comment[lb]=RPM-Päckchendatei
+@@ -74,7 +73,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
+--- mimetypes/application/x-java-jnlp-file.desktop	(revision 484194)
++++ mimetypes/application/x-java-jnlp-file.desktop	(revision 488534)
+@@ -18,7 +18,7 @@
+ Comment[hu]=Java Web Start-alkalmazás
+ Comment[is]=Java Web Start forrit
+ Comment[it]=Applicazione Java Web Start
+-Comment[ka]=Java Web Start პროგრამა
++Comment[ja]=Java Web Start アプリケーション
+ Comment[km]=កម្មវិធី​ចាប់ផ្ដើម​បណ្ដាញ Java
+ Comment[lb]=Java-Web-Start Programm
+ Comment[lt]=Java Web Start programa
+@@ -42,6 +42,5 @@
+ Comment[tr]=Java Web Start uygulaması
+ Comment[tt]=Java Web Start yazılımı
+ Comment[uk]=Програма Java з мережі
+-Comment[xx]=xxJava Web Start applicationxx
+ Comment[zh_CN]=Java Web Start 应用程序
+ MimeType=application/x-java-jnlp-file
+--- mimetypes/application/x-designer.desktop	(revision 484194)
++++ mimetypes/application/x-designer.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=Qt Designer skrá
+ Comment[it]=File Qt Designer
+ Comment[ja]=Qt Designer ファイル
+-Comment[ka]=Qt Designer ფაილი
+ Comment[km]=ឯកសារ​​រចនា Qt
+ Comment[ko]=Qt 디자이너 파일
+ Comment[lb]=Qt-Designer-Datei
+@@ -72,7 +71,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
+--- mimetypes/application/vnd.sun.xml.writer.desktop	(revision 484194)
++++ mimetypes/application/vnd.sun.xml.writer.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=OpenOffice.org textaskjal
+ Comment[it]=Documento di testo OpenOffice.org
+ Comment[ja]=OpenOffice.org テキストドキュメント
+-Comment[ka]=OpenOffice.org დოკუმენტი
+ Comment[km]=ឯកសារ​អត្ថបទ OpenOffice.org
+ Comment[ko]=Openoffice.org 글월 문서
+ Comment[lb]=OpenOffice.org-Textdokument
+@@ -66,7 +65,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
+--- mimetypes/application/x-perl.desktop	(revision 484194)
++++ mimetypes/application/x-perl.desktop	(revision 488534)
+@@ -24,7 +24,6 @@
+ Comment[is]=Perl forrit
+ Comment[it]=Programma Perl
+ Comment[ja]=Perl プログラム
+-Comment[ka]=Perl პროგრამა
+ Comment[km]=កម្មវិធី Perl
+ Comment[lb]=Perl-Programm
+ Comment[lt]=Perl programa
+@@ -52,7 +51,6 @@
+ Comment[tt]=Perl Yazılım
+ Comment[uk]=Програма PERL
+ Comment[uz]=Perl'да тузилган дастур
+-Comment[xx]=xxPerl Programxx
+ Comment[zh_CN]=Perl 程序
+ Icon=source_pl
+ Type=MimeType
+--- mimetypes/application/x-java-applet.desktop	(revision 484194)
++++ mimetypes/application/x-java-applet.desktop	(revision 488534)
+@@ -30,7 +30,6 @@
+ Comment[hu]=Java-kisalkalmazás
+ Comment[it]=Applet Java
+ Comment[ja]=Java アプレット
+-Comment[ka]=Java აპლეტი
+ Comment[km]=Java អាប់ភ្លេត
+ Comment[ko]=자바 ì• í”Œë¦¿
+ Comment[lb]=Java-Applet
+@@ -62,7 +61,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=java_jar
+--- mimetypes/application/postscript.desktop	(revision 484194)
++++ mimetypes/application/postscript.desktop	(revision 488534)
+@@ -38,7 +38,6 @@
+ Comment[is]=Postscript skjal
+ Comment[it]=Documento PostScript
+ Comment[ja]=PostScriptドキュメント
+-Comment[ka]=PostScript დოკუმენტი
+ Comment[km]=ឯកសារ PostScript
+ Comment[ko]=PostScript 문서
+ Comment[lb]=PostScript-Dokument
+@@ -80,7 +79,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
+--- mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop	(revision 484194)
++++ mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop	(revision 488534)
+@@ -27,7 +27,6 @@
+ Comment[is]=OASIS OpenDocument grafísksnið
+ Comment[it]=Modello di disegno OASIS OpenDocument
+ Comment[ja]=OASIS OpenDocument 図形描画テンプレート
+-Comment[ka]=OASIS OpenDocument დიაგრამის თარგი
+ Comment[km]=ពុម្ព​ក្រាហ្វិក OASIS OpenDocument
+ Comment[lb]=OASIS-OpenDocument-Grafikvirlag
+ Comment[lt]=OASIS OpenDocument grafikos Å¡ablonas
+@@ -53,7 +52,6 @@
+ Comment[tr]=OASIS OpenDocument Grafik Åžablonu
+ Comment[tt]=OASIS OpenDocument Sızımı öçen Ürçetmä
+ Comment[uk]=Шаблон графічного зображення OASIS OpenDocument
+-Comment[xx]=xxOASIS OpenDocument Graphics Templatexx
+ Comment[zh_CN]=OASIS OpenDocument 图形模板
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+--- mimetypes/application/vnd.oasis.opendocument.presentation.desktop	(revision 484194)
++++ mimetypes/application/vnd.oasis.opendocument.presentation.desktop	(revision 488534)
+@@ -27,7 +27,6 @@
+ Comment[is]=OASIS OpenDocument kynning
+ Comment[it]=Presentazione OASIS OpenDocument
+ Comment[ja]=OASIS OpenDocument プレゼンテーション
+-Comment[ka]=OASIS OpenDocument პრეზენტაცია
+ Comment[km]=ការ​បង្ហាញ OASIS OpenDocument
+ Comment[lb]=OASIS-OpenDocument-Präsentatioun
+ Comment[lt]=OASIS OpenDocument pateiktis
+@@ -54,7 +53,6 @@
+ Comment[tt]=OASIS OpenDocument Täqbire
+ Comment[uk]=Презентація OASIS OpenDocument
+ Comment[uz]=OASIS OpenDocument намойиш
+-Comment[xx]=xxOASIS OpenDocument Presentationxx
+ Comment[zh_CN]=OASIS OpenDocument 演示文稿
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+--- mimetypes/application/x-xliff.desktop	(revision 484194)
++++ mimetypes/application/x-xliff.desktop	(revision 488534)
+@@ -26,7 +26,6 @@
+ Comment[is]=XLIFF þýðingarskrá
+ Comment[it]=File di traduzione XLIFF
+ Comment[ja]=XLIFF 翻訳ファイル
+-Comment[ka]=XLIFF თარგმნის ფაილი
+ Comment[km]=ឯកសារ​បកប្រែ XLIFF
+ Comment[lb]=XLIFF-Iwwersetzungsdatei
+ Comment[lt]=XLIFF vertimo byla
+@@ -55,7 +54,6 @@
+ Comment[tt]=XLIFF Tärcemä Bireme
+ Comment[uk]=Файл перекладу XLIFF
+ Comment[uz]=XLIFF таржима қилиш файли
+-Comment[xx]=xxXLIFF Translation Filexx
+ Comment[zh_CN]=XLIFF 翻译文件
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+--- mimetypes/application/x-karbon.desktop	(revision 484194)
++++ mimetypes/application/x-karbon.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Karbon14 skjal
+ Comment[it]=Documento Karbon14
+ Comment[ja]=Karbon14 ドキュメント
+-Comment[ka]=Karbon14 დოკუმენტი
+ Comment[km]=ឯកសារ Karbon14
+ Comment[ko]=Karbon14 문서
+ Comment[lb]=Karbon14-Dokument
+@@ -76,7 +75,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
+--- mimetypes/application/x-jar.desktop	(revision 484194)
++++ mimetypes/application/x-jar.desktop	(revision 488534)
+@@ -37,7 +37,6 @@
+ Comment[is]=Java safnskrá
+ Comment[it]=Archivio Java
+ Comment[ja]=Javaアーカイブ
+-Comment[ka]=Java არქივი
+ Comment[km]=ប័ណ្ណសារ Java
+ Comment[ko]=자바 ì €ìž¥ê³ 
+ Comment[lb]=Java-Archiv
+@@ -80,7 +79,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
+--- mimetypes/application/java.desktop	(revision 484194)
++++ mimetypes/application/java.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Java klasi
+ Comment[it]=Classe Java
+ Comment[ja]=Java クラス
+-Comment[ka]=Java კლასი
+ Comment[km]=ថ្នាក់ Java
+ Comment[ko]=자바 클래스
+ Comment[lb]=Java Klass
+@@ -77,7 +76,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
+--- mimetypes/application/pgp-encrypted.desktop	(revision 484194)
++++ mimetypes/application/pgp-encrypted.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Comment[is]=PGP/MIME dulritaður skeytahaus
+ Comment[it]=Intestazione messaggio cifrato PGP/MIME
+ Comment[ja]=PGP/MIME 符号化されたメッセージヘッダー
+-Comment[ka]=PGP/MIME შეტყობინების დაშიფრული თავსართი
+ Comment[km]=បឋមកថា​របស់​សារ​ដែល​បាន​បម្លែង​ជាកូដ​ដោយ PGP/MIME
+ Comment[ko]=PGP/마임으로 암호화한 메세지 머리글
+ Comment[lb]=PGP/MIME-verschlësselten Norichtekapp
+@@ -72,7 +71,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
+--- mimetypes/application/x-ogg.desktop	(revision 484194)
++++ mimetypes/application/x-ogg.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=Ogg hljóðskrá
+ Comment[it]=File multimediale Ogg
+ Comment[ja]=Ogg マルチメディア
+-Comment[ka]=OGG მულტიმედია ფაილი
+ Comment[km]=ពហុព័ត៌មាន Ogg
+ Comment[ko]=Ogg 멀티미디어
+ Comment[lb]=Ogg-Multimedia
+@@ -69,7 +68,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
+--- mimetypes/application/vnd.oasis.opendocument.image.desktop	(revision 484194)
++++ mimetypes/application/vnd.oasis.opendocument.image.desktop	(revision 488534)
+@@ -27,7 +27,6 @@
+ Comment[is]=OASIS OpenDocument mynd
+ Comment[it]=Immagine OASIS OpenDocument
+ Comment[ja]=OASIS OpenDocument 画像
+-Comment[ka]=OASIS OpenDocument ნახატი
+ Comment[km]=រូបភាព OASIS OpenDocument
+ Comment[lb]=OASIS-OpenDocument-Bild
+ Comment[lt]=OASIS OpenDocument paveikslÄ—lis
+@@ -54,7 +53,6 @@
+ Comment[tt]=OASIS OpenDocument Süräte
+ Comment[uk]=Зображення OASIS OpenDocument
+ Comment[uz]=OASIS OpenDocument расм
+-Comment[xx]=xxOASIS OpenDocument Imagexx
+ Comment[zh_CN]=OASIS OpenDocument 图像
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+--- mimetypes/application/vnd.sun.xml.impress.template.desktop	(revision 484194)
++++ mimetypes/application/vnd.sun.xml.impress.template.desktop	(revision 488534)
+@@ -27,7 +27,6 @@
+ Comment[is]=OpenOffice.org kynningarsniðmát
+ Comment[it]=Modello di presentazione OpenOffice.org
+ Comment[ja]=OpenOffice.org プレゼンテーションテンプレート
+-Comment[ka]=OpenOffice.org პრეზენტაციის თარგი
+ Comment[km]=ពុម្ព​ការ​បង្ហាញ OpenOffice.org
+ Comment[ko]=OpenOffice.org í”„ë¦¬ì  í…Œì´ì…˜ 본
+ Comment[lb]=OpenOffice.org-Präsentatiounsvirlag
+@@ -58,7 +57,6 @@
+ Comment[tt]=OpenOffice.org Täqbir Ürçetmäse
+ 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
+--- mimetypes/application/x-kivio.desktop	(revision 484194)
++++ mimetypes/application/x-kivio.desktop	(revision 488534)
+@@ -37,7 +37,6 @@
+ Comment[is]=Kivio skjal
+ Comment[it]=Documento Kivio
+ Comment[ja]=Kivio ドキュメント
+-Comment[ka]=Kivio დოკუმენტი
+ Comment[km]=ឯកសារ Kivio
+ Comment[ko]=키비오 문서
+ Comment[lb]=Kivio-Dokument
+@@ -76,7 +75,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
+--- mimetypes/application/x-archive.desktop	(revision 484194)
++++ mimetypes/application/x-archive.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=Ar safnskrá
+ Comment[it]=Archivio Ar
+ Comment[ja]=Ar アーカイブ
+-Comment[ka]=Ar არქივი
+ Comment[km]=ប័ណ្ណសារ Ar
+ Comment[ko]=Ar ì €ìž¥ê³ 
+ Comment[lb]=Ar-Archiv
+@@ -72,7 +71,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
+--- mimetypes/application/vnd.rn-realmedia.desktop	(revision 484194)
++++ mimetypes/application/vnd.rn-realmedia.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=RealMedia skrá
+ Comment[it]=File RealMedia
+ Comment[ja]=リアルメディア ファイル
+-Comment[ka]=RealMedia ფაილი
+ Comment[km]=ឯកសារ RealMedia
+ Comment[ko]=리얼미디어 파일
+ Comment[lb]=RealMedia-Datei
+@@ -71,6 +70,5 @@
+ Comment[uk]=Файл RealMedia
+ Comment[uz]=RealMedia-файли
+ Comment[wa]=Fitchî RealMedia
+-Comment[xx]=xxRealMedia Filexx
+ Comment[zh_CN]=RealMedia 文件
+ Comment[zh_TW]=RealMedia 檔案
+--- mimetypes/application/x-rar.desktop	(revision 484194)
++++ mimetypes/application/x-rar.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Rar safnskrá
+ Comment[it]=Archivio Rar
+ Comment[ja]=Rar アーカイブ
+-Comment[ka]=Rar არქივი
+ Comment[km]=ប័ណ្ណសារ Rar
+ Comment[ko]=RAR ì €ìž¥ê³ 
+ Comment[lb]=Rar-Archiv
+@@ -76,7 +75,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
+--- mimetypes/application/vnd.stardivision.math.desktop	(revision 484194)
++++ mimetypes/application/vnd.stardivision.math.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=StarOffice Math skjal
+ Comment[it]=Documento matematico StarOffice
+ Comment[ja]=StarOffice Math ドキュメント
+-Comment[ka]=StarOffice Math ფორმულა
+ Comment[km]=ឯកសារ StarOffice Math
+ Comment[lb]=Mathematescht StarOffice-Dokument
+ Comment[lt]=StarOffice Math dokumentas
+@@ -61,7 +60,6 @@
+ Comment[tt]=StarOffice Math İstälege
+ Comment[uk]=Документ StarOffice Math
+ Comment[uz]=StarOffice Math ҳужжати
+-Comment[xx]=xxStarOffice Math Documentxx
+ Comment[zh_CN]=StarOffice Math 文档
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+--- mimetypes/application/x-iso.desktop	(revision 484194)
++++ mimetypes/application/x-iso.desktop	(revision 488534)
+@@ -28,7 +28,6 @@
+ Comment[is]=ISO9660 diskmynd
+ Comment[it]=File immagine ISO9660
+ Comment[ja]=ISO9660 イメージ ファイル
+-Comment[ka]=ISO9660 ასლის ფაილი
+ Comment[km]=ឯកសារ​រូបភាព ISO9660
+ Comment[lb]=ISO9660-Bilddatei
+ Comment[lt]=ISO9660 atvaizdo byla
+@@ -58,5 +57,4 @@
+ Comment[tt]=ISO9660 Sürät Bireme
+ Comment[uk]=Файл штампа ISO9660
+ Comment[uz]=ISO9660-тасвир файли
+-Comment[xx]=xxISO9660 Image Filexx
+ Comment[zh_CN]=ISO9660 æ˜ åƒæ–‡ä»¶
+--- mimetypes/application/x-font-snf.desktop	(revision 484194)
++++ mimetypes/application/x-font-snf.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=SNF Bitamynda letur
+ Comment[it]=Tipo di carattere bitmap SNF
+ Comment[ja]=SNF ビットマップフォント
+-Comment[ka]=SNF რასტრული ფონტი
+ Comment[km]=ពុម្ពអក្សរ SNF Bitmap
+ Comment[ko]=SNF 비트맵 글꼴
+ Comment[lb]=SNF-Bitmapschrëft
+@@ -74,7 +73,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
+--- mimetypes/application/pgp-keys.desktop	(revision 484194)
++++ mimetypes/application/pgp-keys.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=OpenPGP lyklakyppa
+ Comment[it]=Mazzo di chiavi OpenPGP
+ Comment[ja]=OpenPGP キーバンドル
+-Comment[ka]=OpenPGP გასაღებების აცმა
+ Comment[km]=បាច់​កូនសោ OpenPGP
+ Comment[lb]=OpenPGP-Schlëssel-Pak
+ Comment[lt]=OpenPGP raktų ryšulys
+@@ -64,7 +63,6 @@
+ Comment[tt]=OpenPGP Açqıç Bäyläme
+ Comment[uk]=Клунок ключа OpenPGP
+ Comment[uz]=OpenPGP калитлар тўплами
+-Comment[xx]=xxOpenPGP Key Bundlexx
+ Comment[zh_CN]=OpenPGP 秘钥束
+ X-KDE-AutoEmbed=true
+ 
+--- mimetypes/application/x-compress.desktop	(revision 484194)
++++ mimetypes/application/x-compress.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=Þjöppuð skrá (compress)
+ Comment[it]=File compresso UNIX
+ Comment[ja]=UNIX 圧縮ファイル
+-Comment[ka]=შეკუმშული UNIX ფაილი
+ Comment[km]=ឯកសារ​បង្ហាប់​របស់ UNIX
+ Comment[ko]=UNIX 기본 압축한 파일
+ Comment[lb]=Kompriméiert UNIX-Datei
+@@ -74,7 +73,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
+--- mimetypes/application/msexcel.desktop	(revision 484194)
++++ mimetypes/application/msexcel.desktop	(revision 488534)
+@@ -37,7 +37,6 @@
+ Comment[is]=Microsoft Excel tafla
+ Comment[it]=Foglio di calcolo Microsoft Excel
+ Comment[ja]=Microsoft Excel スプレッドシート
+-Comment[ka]=Microsoft Excel–ის ცხრილი
+ Comment[km]=សៀវភៅ​បញ្ជី Microsoft Excel
+ Comment[ko]=마이크로소프트 ì—‘ì…€ ìŠ¤í”„ë ˆë“œì‹œíŠ¸
+ Comment[lb]=Microsoft-Excel-Tabellëblat
+@@ -75,7 +74,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
+--- mimetypes/application/x-applixspread.desktop	(revision 484194)
++++ mimetypes/application/x-applixspread.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Applix töflureiknisskjal
+ Comment[it]=Documento Applix Spreadsheets
+ Comment[ja]=Applix スプレッドシートドキュメント
+-Comment[ka]=Applix Spreadsheets დოკუმენტი
+ Comment[km]=ឯកសារ​សៀវភៅ​បញ្ជី Applix
+ Comment[ko]=ì• í”Œë¦­ìŠ¤ ìŠ¤í”„ë ˆë“œì‹œíŠ¸ 문서
+ Comment[lb]=Applix-Spreadsheets-Dokument
+@@ -76,7 +75,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
+--- mimetypes/application/x-font-ttc.desktop	(revision 484194)
++++ mimetypes/application/x-font-ttc.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=TrueType letursafn
+ Comment[it]=Raccolta tipi di carattere TrueType
+ Comment[ja]=Truetype フォント コレクション
+-Comment[ka]=TrueType ფონტების ნაკრები
+ Comment[ko]=트루타입 글꼴 모음
+ Comment[lb]=TrueType-Schrëftësammlung
+ Comment[lt]=TrueType šriftų rinkinys
+@@ -65,7 +64,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
+--- mimetypes/application/vnd.ms-excel.desktop	(revision 484194)
++++ mimetypes/application/vnd.ms-excel.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=Microsoft Excel tafla
+ Comment[it]=Foglio di calcolo Microsoft Excel
+ Comment[ja]=Microsoft Excel スプレッドシート
+-Comment[ka]=Microsoft Excel–ის ცხრილი
+ Comment[km]=សៀវភៅ​បញ្ជី Microsoft Excel
+ Comment[ko]=마이크로소프트 ì—‘ì…€ ìŠ¤í”„ë ˆë“œì‹œíŠ¸
+ Comment[lb]=Microsoft-Excel-Tabellëblat
+@@ -73,7 +72,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
+--- mimetypes/application/x-bz2dvi.desktop	(revision 484194)
++++ mimetypes/application/x-bz2dvi.desktop	(revision 488534)
+@@ -25,7 +25,6 @@
+ Comment[is]=Bzip2 þjöppuð DVI skrá
+ Comment[it]=File DVI compresso con Bzip2
+ Comment[ja]=Bzip2 圧縮 DVI ファイル
+-Comment[ka]=Bzip2 შეკუმშული DVI ფაილი
+ Comment[km]=ឯកសារ DVI ដែល​បាន​បង្ហាប់ដោយ Bzip2
+ Comment[lb]=Bzip2-kompriméiert DVI-Datei
+ Comment[lt]=Bzip2 suspausta DVI byla
+@@ -55,7 +54,6 @@
+ Comment[tt]=Bzip2'lı DVI Birem
+ Comment[uk]=Файл DVI, стиснутий bzip2
+ Comment[uz]=Bzip2 билан қисилган DVI-файли
+-Comment[xx]=xxBzip2 Compressed DVI Filexx
+ Comment[zh_CN]=Bzip2 压缩的 DVI 文件
+ Hidden=false
+ Icon=tgz
+--- mimetypes/application/x-7z.desktop	(revision 484194)
++++ mimetypes/application/x-7z.desktop	(revision 488534)
+@@ -27,7 +27,6 @@
+ Comment[is]=7-Zip safnskrá
+ Comment[it]=Archivio 7-Zip
+ Comment[ja]=7-Zip アーカイブ
+-Comment[ka]=7-zip არქივი
+ Comment[km]=ប័ណ្ណសារ 7-Zip
+ Comment[lb]=7-Zip-Archiv
+ Comment[lt]=7-Zip archyvas
+@@ -56,5 +55,4 @@
+ Comment[tt]=7-Zip Tuplama
+ Comment[uk]=Архів 7-Zip
+ Comment[uz]=7-Zip архиви
+-Comment[xx]=xx7-Zip Archivexx
+ Comment[zh_CN]=7-Zip å½’æ¡£
+--- mimetypes/application/x-font-ttf.desktop	(revision 484194)
++++ mimetypes/application/x-font-ttf.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=TrueType letur
+ Comment[it]=Tipo di carattere TrueType
+ Comment[ja]=TrueTypeフォント
+-Comment[ka]=TrueType ფონტი
+ Comment[km]=ពុម្ពអក្សរ TrueType
+ Comment[ko]=트루타입 글꼴
+ Comment[lb]=TrueType-Schrëft
+@@ -67,7 +66,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
+--- mimetypes/application/x-msaccess.desktop	(revision 484194)
++++ mimetypes/application/x-msaccess.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=Microsoft Access gagnagrunnur
+ Comment[it]=Banca dati Microsoft Access
+ Comment[ja]=Microsoft Access データベース
+-Comment[ka]=Microsoft Access მონაცემთა ბაზა
+ Comment[km]=មូល​ដ្ឋាន​ទិន្នន័យ Microsoft Access
+ Comment[ko]=마이크로소프트 엑세스 ë°ì´íƒ€ë² ì´ìŠ¤
+ Comment[lb]=Microsoft-Access-Datebank
+@@ -69,6 +68,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 資料庫
+--- mimetypes/application/x-zip.desktop	(revision 484194)
++++ mimetypes/application/x-zip.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Zip safnskrá
+ Comment[it]=Archivio Zip
+ Comment[ja]=Zip アーカイブ
+-Comment[ka]=Zip არქივი
+ Comment[km]=ប័ណ្ណសារ Zip
+ Comment[ko]=Zip ì €ìž¥ê³ 
+ Comment[lb]=Zip-Archiv
+@@ -76,7 +75,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
+--- mimetypes/application/vnd.ms-powerpoint.desktop	(revision 484194)
++++ mimetypes/application/vnd.ms-powerpoint.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=Microsoft PowerPoint kynning
+ Comment[it]=Presentazione Microsoft PowerPoint
+ Comment[ja]=Microsoft PowerPoint プレゼンテーション
+-Comment[ka]=Microsoft PowerPoint–ის დოკუმენტი
+ Comment[km]=ការ​បង្ហាញ Microsoft PowerPoint
+ Comment[ko]=마이크로소프트 파워포인트 í”„ë¦¬ì  í…Œì´ì…˜
+ Comment[lb]=Microsoft-PowerPoint-Präsentatioun
+@@ -70,7 +69,6 @@
+ 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 文件
+ 
+--- mimetypes/application/x-kcsrc.desktop	(revision 484194)
++++ mimetypes/application/x-kcsrc.desktop	(revision 488534)
+@@ -37,7 +37,6 @@
+ Comment[is]=KDE litaþema
+ Comment[it]=Tema di colori KDE
+ Comment[ja]=KDE カラー テーマ
+-Comment[ka]=KDE პალიტრები
+ Comment[km]=ស្បែក​ពណ៌ KDE
+ Comment[ko]=KDE 색 테마
+ Comment[lb]=KDE-Faarfthema
+@@ -72,6 +71,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 色彩佈景
+--- mimetypes/application/vnd.ms-word.desktop	(revision 484194)
++++ mimetypes/application/vnd.ms-word.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=Microsoft Word skjal
+ Comment[it]=Documento Microsoft Word
+ Comment[ja]=Microsoft Word ドキュメント
+-Comment[ka]=Microsoft Word–ის დოკუმენტი
+ Comment[km]=ឯកសារ Microsoft Word
+ Comment[ko]=마이크로소프트 글틀 문서
+ Comment[lb]=Microsoft-Word-Dokument
+@@ -74,7 +73,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
+--- mimetypes/application/x-gzpostscript.desktop	(revision 484194)
++++ mimetypes/application/x-gzpostscript.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=gzip-þjappað Postscript skjal
+ Comment[it]=File PostScript compresso con Gzip
+ Comment[ja]=Gzip された Postscript ファイル
+-Comment[ka]=Gzip შეკუმშული PostScript ფაილი
+ Comment[km]=ឯកសារ Gzipped PostScript
+ Comment[ko]=Gzip으로 압축한 포스트스크립트 파일
+ Comment[lb]=Mat Gzip kompriméiert PostScript-Datei
+@@ -70,7 +69,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
+--- mimetypes/application/vnd.stardivision.impress.desktop	(revision 484194)
++++ mimetypes/application/vnd.stardivision.impress.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=StarOffice Impress kynning
+ Comment[it]=Presentazione StarOffice Impress
+ Comment[ja]=StarOffice Impress プレゼンテーション
+-Comment[ka]=StarOffice Impress პრეზენტაცია
+ Comment[km]=ការ​បង្ហាញ StarOffice Impress
+ Comment[lb]=StarOffice-Impress-Präsentatioun
+ Comment[lt]=StarOffice Impress pristatymas
+@@ -69,7 +68,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
+--- mimetypes/application/x-java.desktop	(revision 484194)
++++ mimetypes/application/x-java.desktop	(revision 488534)
+@@ -37,7 +37,6 @@
+ Comment[is]=Java klasi
+ Comment[it]=Classe Java
+ Comment[ja]=Java クラス
+-Comment[ka]=Java კლასი
+ Comment[km]=ថ្នាក់ Java
+ Comment[ko]=자바 클래스
+ Comment[lb]=Java Klass
+@@ -78,6 +77,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
+--- mimetypes/application/x-dvi.desktop	(revision 484194)
++++ mimetypes/application/x-dvi.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=TeX DVI skjal
+ Comment[it]=File TeX DVI
+ Comment[ja]=TeX Device Independen ファイル
+-Comment[ka]=მოწყობილობისგან დამოუკიდებელი TeX ფაილი
+ Comment[km]=ឯកសារ​ឯករាជ្យ​ឧបករណ៍ TeX
+ Comment[ko]=텍 장치에서 독립된 파일
+ Comment[lb]=Gerät-onofhängeg Datei vun TeX (DVI)
+@@ -69,7 +68,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
+--- mimetypes/application/xhtml+xml.desktop	(revision 484194)
++++ mimetypes/application/xhtml+xml.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=XHTML skjal
+ Comment[it]=Documento famiglia XHTML
+ Comment[ja]=XHTML ファミリドキュメント
+-Comment[ka]=XHTML დოკუმენტი
+ Comment[km]=ឯកសារ​គ្រួសារ XHTML
+ Comment[ko]=XHTML군 문서
+ Comment[lb]=Dokument aus der XHTML-Famill
+@@ -67,7 +66,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
+--- mimetypes/application/vnd.sun.xml.calc.desktop	(revision 484194)
++++ mimetypes/application/vnd.sun.xml.calc.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=OpenOffice.org tafla
+ Comment[it]=Foglio di calcolo OpenOffice.org
+ Comment[ja]=OpenOffice.org 表計算
+-Comment[ka]=OpenOffice.org ცხრილი
+ Comment[km]=សៀវភៅ​បញ្ជី OpenOffice.org
+ Comment[ko]=Openoffice.org ìŠ¤í”„ë ˆë“œì‹œíŠ¸
+ Comment[lb]=OpenOffice.org-Tabellëblat
+@@ -64,7 +63,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
+--- mimetypes/application/x-applixword.desktop	(revision 484194)
++++ mimetypes/application/x-applixword.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Applix Words skjal
+ Comment[it]=Documento Applix Words
+ Comment[ja]=Applix ワードドキュメント
+-Comment[ka]=Applix Words დოკუმენტი
+ Comment[km]=ឯកសារ Applix Words
+ Comment[ko]=ì• í”Œë¦­ìŠ¤ 글틀 문서
+ Comment[lb]=Applix-Words-Dokument
+@@ -76,7 +75,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
+--- mimetypes/application/pkcs10.desktop	(revision 484194)
++++ mimetypes/application/pkcs10.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Comment[is]=S/MIME skírteinisbeiðni
+ Comment[it]=Richiesta di certificazione S/MIME
+ Comment[ja]=S/MIME 証明書要求
+-Comment[ka]=S/MIME სერთიფიკატის მოთხოვნა
+ Comment[km]=សំណើ​បញ្ជាក់ S/MIME
+ Comment[ko]=S/마임 증명 요청
+ Comment[lb]=S/MIME-Zertifizéierungsufro
+@@ -71,7 +70,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
+--- mimetypes/application/vnd.stardivision.chart.desktop	(revision 484194)
++++ mimetypes/application/vnd.stardivision.chart.desktop	(revision 488534)
+@@ -29,7 +29,6 @@
+ Comment[is]=StarOffice tafla
+ Comment[it]=Diagramma StarOffice
+ Comment[ja]=StarOffice チャート
+-Comment[ka]=StarOffice დიაგრამა
+ Comment[km]=គំនូសតាង StarOffice
+ Comment[ko]=스타오피스 도표
+ Comment[lb]=StarOffice-Diagramm
+@@ -58,7 +57,6 @@
+ Comment[tr]=StarOffice Hesap Tablosu
+ Comment[tt]=StarOffice Grafiğı
+ Comment[uk]=Діаграма StarOffice
+-Comment[xx]=xxStarOffice Chartxx
+ Comment[zh_CN]=StarOffice 图表
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+--- mimetypes/application/vnd.stardivision.calc.desktop	(revision 484194)
++++ mimetypes/application/vnd.stardivision.calc.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=StarOffice Calc tafla
+ Comment[it]=Foglio di calcolo StarOffice Calc
+ Comment[ja]=StarOffice Calc 表計算
+-Comment[ka]=StarOffice Calc ცხრილი
+ Comment[km]=សៀវភៅ​បញ្ជី StarOffice Calc
+ Comment[ko]=스타오피스 계산기 ìŠ¤í”„ë ˆë“œì‹œíŠ¸
+ Comment[lb]=StarOffice-Calc-Tabellëblat
+@@ -70,7 +69,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]
+--- mimetypes/application/x-kontour.desktop	(revision 484194)
++++ mimetypes/application/x-kontour.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Comment[is]=Kontour skjal
+ Comment[it]=Documento Kontour
+ Comment[ja]=Kontour ドキュメント
+-Comment[ka]=Kontour დოკუმენტი
+ Comment[km]=ឯកសារ Kontour
+ Comment[lb]=Kontour-Dokument
+ Comment[lt]=Kontour dokumentas
+@@ -72,7 +71,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
+--- mimetypes/application/mspowerpoint.desktop	(revision 484194)
++++ mimetypes/application/mspowerpoint.desktop	(revision 488534)
+@@ -37,7 +37,6 @@
+ Comment[is]=Microsoft PowerPoint kynning
+ Comment[it]=Presentazione Microsoft PowerPoint
+ Comment[ja]=Microsoft PowerPoint プレゼンテーション
+-Comment[ka]=Microsoft PowerPoint–ის დოკუმენტი
+ Comment[km]=ការ​បង្ហាញ Microsoft PowerPoint
+ Comment[ko]=마이크로소프트 파워포인트 í”„ë¦¬ì  í…Œì´ì…˜
+ Comment[lb]=Microsoft-PowerPoint-Präsentatioun
+@@ -72,6 +71,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 文件
+--- mimetypes/application/x-object.desktop	(revision 484194)
++++ mimetypes/application/x-object.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Vélamál (object code)
+ Comment[it]=Codice oggetto
+ Comment[ja]=オブジェクトコード
+-Comment[ka]=ობიექტური კოდი
+ Comment[ko]=ì˜¤ë¸Œì íŠ¸ 코드
+ Comment[lb]=Objetscode
+ Comment[lt]=Objektinis kodas
+@@ -75,7 +74,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
+--- mimetypes/application/vnd.ms-asf.desktop	(revision 484194)
++++ mimetypes/application/vnd.ms-asf.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=ASF miðill
+ Comment[it]=File multimediale ASF
+ Comment[ja]=ASF メディア
+-Comment[ka]=ASF მედიაფაილი
+ Comment[ko]=ASF 파일
+ Comment[lb]=ASF-Media
+ Comment[lv]=ASF multimēdijas fails
+@@ -63,7 +62,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
+--- mimetypes/application/x-desktop.desktop	(revision 484194)
++++ mimetypes/application/x-desktop.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=Stillingar skjáborðsins
+ Comment[it]=File di configurazione del desktop
+ Comment[ja]=デスクトップ設定ファイル
+-Comment[ka]=Desktop-ის გამართვის ფილი
+ Comment[km]=ឯកសារ​ Desktop Config
+ Comment[ko]=일터 ì„¤ì • 파일
+ Comment[lb]=Desktop-Configuratiounsdatei
+@@ -70,7 +69,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
+--- mimetypes/application/x-debian-package.desktop	(revision 484194)
++++ mimetypes/application/x-debian-package.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Debian pakki
+ Comment[it]=Pacchetto Debian
+ Comment[ja]=Debian パッケージ
+-Comment[ka]=Debian-ის პაკეტი
+ Comment[km]=កញ្ចប់ Debian
+ Comment[ko]=데비안 꾸러미
+ Comment[lb]=Debian-Päckchen
+@@ -71,6 +70,5 @@
+ Comment[uk]=Пакунок Debian
+ Comment[uz]=Debian пакети
+ Comment[wa]=Fitchî pacaedje Debian
+-Comment[xx]=xxDebian Packagexx
+ Comment[zh_CN]=Debian 包
+ Comment[zh_TW]=Debian 軟體包
+--- mimetypes/application/x-quattropro.desktop	(revision 484194)
++++ mimetypes/application/x-quattropro.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Quattro Pro skjal
+ Comment[it]=Documento Quattro Pro
+ Comment[ja]=Quattro Pro ドキュメント
+-Comment[ka]=Quattro Pro დოკუმენტი
+ Comment[km]=ឯកសារ Quattro Pro
+ Comment[ko]=쿼트로 프로 문서
+ Comment[lb]=Quattro-Pro-Dokument
+@@ -76,7 +75,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
+--- mimetypes/application/x-x509-ca-cert.desktop	(revision 484194)
++++ mimetypes/application/x-x509-ca-cert.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=DER, PEM eða Netscape kóðað X.509 skírteini
+ Comment[it]=Certificato X.509 codificato DER, PEM o Netscape
+ Comment[ja]=DER, PEM, Netscape エンコードされた X.509 証明書
+-Comment[ka]=DER, PEM, ან Netscape-ს დაშიფრული X.509 სერთიფიკატი
+ Comment[km]=DER, PEM, or វិញ្ញាបនបត្រ Netscape Encoded X.509
+ Comment[lb]=DER, PEM, oder Netscape-kodéiert X.509 Zertifikat
+ Comment[lt]=DER, PEM, ar Netscape koduotas X.509 sertifikatas
+@@ -71,7 +70,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
+--- mimetypes/application/x-sqlite2.desktop	(revision 484194)
++++ mimetypes/application/x-sqlite2.desktop	(revision 488534)
+@@ -5,6 +5,7 @@
+ Icon=empty
+ Patterns=
+ Comment=SQLite2 Database File
++Comment[af]=SQLite2 Databasis Lêer
+ Comment[bg]=Файл за данни на SQLite2
+ Comment[br]=Restr stlennvon SQLite2
+ Comment[ca]=Fitxer base de dades SQLite2
+@@ -23,7 +24,7 @@
+ Comment[hu]=SQLite2-adatbázisfájl
+ Comment[is]=SQLite2 gagnagrunns skrá
+ Comment[it]=File banca dati SQLite2
+-Comment[ka]=SQLite2 მონაცემთა ბაზის ფაილი
++Comment[ja]=SQLite2 データベースファイル
+ Comment[km]=ឯកសារ​មូលដ្ឋាន​ទិន្នន័យ SQLite2
+ Comment[lb]=SQLite2-Datebankdatei
+ Comment[lt]=SQLite2 duomenų bazės byla
+@@ -44,5 +45,4 @@
+ Comment[tg]=Файли Базаи Маълумотии SQLite2
+ Comment[uk]=Файл бази даних SQLite2
+ Comment[uz]=SQLite2 маълумот база файли
+-Comment[xx]=xxSQLite2 Database Filexx
+ Comment[zh_CN]=SQLite2 数据库文件
+--- mimetypes/application/x-sqlite3.desktop	(revision 484194)
++++ mimetypes/application/x-sqlite3.desktop	(revision 488534)
+@@ -5,6 +5,7 @@
+ Icon=empty
+ Patterns=
+ Comment=SQLite3 Database File
++Comment[af]=SQLite3 Databasis Lêer
+ Comment[bg]=Файл за данни на SQLite3
+ Comment[br]=Restr stlennvon SQLite3
+ Comment[ca]=Fitxer base de dades SQLite3
+@@ -23,7 +24,7 @@
+ Comment[hu]=SQLite3-adatbázisfájl
+ Comment[is]=SQLite3 gagnagrunns skrá
+ Comment[it]=File banca dati SQLite3
+-Comment[ka]=Qt Designer ფაილი
++Comment[ja]=SQLite3 データベースファイル
+ Comment[km]=ឯកសារ​មូលដ្ឋាន​ទិន្នន័យ SQLite3
+ Comment[lb]=SQLite3-Datebankdatei
+ Comment[lt]=SQLite3 duomenų bazės byla
+@@ -44,5 +45,4 @@
+ Comment[tg]=Файли Базаи Маълумотии SQLite3
+ Comment[uk]=Файл бази даних SQLite3
+ Comment[uz]=SQLite3 маълумот база файли
+-Comment[xx]=xxSQLite3 Database Filexx
+ Comment[zh_CN]=SQLite3 数据库文件
+--- mimetypes/application/x-perl-module.desktop	(revision 484194)
++++ mimetypes/application/x-perl-module.desktop	(revision 488534)
+@@ -24,7 +24,6 @@
+ Comment[is]=Perl eining
+ Comment[it]=Modulo Perl
+ Comment[ja]=Perl モジュール
+-Comment[ka]=Perl მოდული
+ Comment[km]=ម៉ូឌុល Perl
+ Comment[lb]=Perl-Modul
+ Comment[lt]=PERL modulis
+@@ -52,7 +51,6 @@
+ Comment[tt]=Perl Modulı
+ Comment[uk]=Модуль мови програмування Perl
+ Comment[uz]=Perl модули
+-Comment[xx]=xxPerl Modulexx
+ Comment[zh_CN]=Perl 模块
+ Icon=source_pl
+ Type=MimeType
+--- mimetypes/application/x-bzip2.desktop	(revision 484194)
++++ mimetypes/application/x-bzip2.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=Þjöppuð skrá (bzip2)
+ Comment[it]=File Bzip2
+ Comment[ja]=Bzip2 ファイル
+-Comment[ka]=Bzip2 არქივი
+ Comment[km]=ឯកសារ Bzip2
+ Comment[ko]=Bzip2 파일
+ Comment[lb]=Bzip2-Datei
+@@ -73,7 +72,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
+--- mimetypes/application/x-amipro.desktop	(revision 484194)
++++ mimetypes/application/x-amipro.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Lotus AmiPro skjal
+ Comment[it]=Documento Lotus AmiPro
+ Comment[ja]=Lotus AmiPro ドキュメント
+-Comment[ka]=Lotus AmiPro დოკუმენტი
+ Comment[km]=ឯកសារ Lotus AmiPro
+ Comment[ko]=로터스 아미프로 문서
+ Comment[lb]=Lotus-AmiPro-Dokument
+@@ -76,7 +75,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
+--- mimetypes/application/xsd.desktop	(revision 484194)
++++ mimetypes/application/xsd.desktop	(revision 488534)
+@@ -22,7 +22,6 @@
+ Comment[is]=W3C XML skema
+ Comment[it]=Schema XML W3C
+ Comment[ja]=W3C XML スキーマ
+-Comment[ka]=W3C XML სქემა
+ Comment[lb]=W3C-XML-Schema
+ Comment[lt]=W3C XML schema
+ Comment[lv]=W3C XML shēma
+@@ -49,7 +48,6 @@
+ Comment[tt]=W3C XML Tözeleşe
+ Comment[uk]=Схема W3C XML
+ Comment[uz]=W3C XML ҳужжати
+-Comment[xx]=xxW3C XML Schemaxx
+ Comment[zh_CN]=W3C WML 大纲
+ Icon=html
+ Type=MimeType
+--- mimetypes/application/x-mswrite.desktop	(revision 484194)
++++ mimetypes/application/x-mswrite.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Microsoft Write skjal
+ Comment[it]=Documento Microsoft Write
+ Comment[ja]=Microsoft Write ドキュメント
+-Comment[ka]=Microsoft Write დოკუმენტი
+ Comment[km]=ឯកសារ Microsoft Write
+ Comment[ko]=마이크로소프트 글틀 문서
+ Comment[lb]=Microsoft-Write-Dokument
+@@ -75,7 +74,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
+--- mimetypes/application/relaxng.desktop	(revision 484194)
++++ mimetypes/application/relaxng.desktop	(revision 488534)
+@@ -3,7 +3,6 @@
+ Comment=RELAX NG
+ Comment[af]=Ontspannende NG
+ Comment[hi]=रीलेक्स एनजी
+-Comment[xx]=xxRELAX NGxx
+ Icon=html
+ Type=MimeType
+ MimeType=application/xml
+--- mimetypes/application/fits.desktop	(revision 484194)
++++ mimetypes/application/fits.desktop	(revision 488534)
+@@ -18,7 +18,7 @@
+ Comment[hu]=FITS-adatok
+ Comment[is]=FITS gögn
+ Comment[it]=Dati FITS
+-Comment[ka]=FITS მონაცემები
++Comment[ja]=FITS データ
+ Comment[km]=ទិន្នន័យ FITS
+ Comment[lb]=FITS-Donnéeën
+ Comment[nds]=FITS-Daten
+@@ -37,7 +37,6 @@
+ Comment[tg]=Маълумоти FITS
+ Comment[uk]=Дані FITS
+ Comment[uz]=FITS маълумот
+-Comment[xx]=xxFITS Dataxx
+ Comment[zh_CN]=FITs 数据
+ Icon=binary
+ # Note: application/fits is for any kind of FITS, so also for non-images
+--- mimetypes/application/x-afm.desktop	(revision 484194)
++++ mimetypes/application/x-afm.desktop	(revision 488534)
+@@ -30,7 +30,6 @@
+ Comment[is]=Postscript leturupplýsingar
+ Comment[it]=Metriche tipi di carattere PostScript
+ Comment[ja]=PostScript フォント メトリクス
+-Comment[ka]=PostScript შრიფტის მეტრიკა
+ Comment[km]=ប្រព័ន្ធ​ម៉ែត្រ​របស់​ពុម្ពអក្សរ PostScript
+ Comment[ko]=포스트스크립트 글꼴 메트릭
+ Comment[lb]=PostScript-Fontmetriken
+@@ -62,7 +61,6 @@
+ Comment[tt]=PostScript Yazunıñ Ülçämnäre
+ 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
+--- mimetypes/application/x-lha.desktop	(revision 484194)
++++ mimetypes/application/x-lha.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=Lha safnskrá
+ Comment[it]=Archivio Lha
+ Comment[ja]=Lha アーカイブ
+-Comment[ka]=LHA არქივი
+ Comment[km]=ប័ណ្ណសារ Lha
+ Comment[ko]=LHA ì €ìž¥ê³ 
+ Comment[lb]=Lha-Archiv
+@@ -72,7 +71,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
+--- mimetypes/application/pdf.desktop	(revision 484194)
++++ mimetypes/application/pdf.desktop	(revision 488534)
+@@ -37,7 +37,6 @@
+ Comment[is]=PDF skjal
+ Comment[it]=Documento PDF
+ Comment[ja]=PDF ドキュメント
+-Comment[ka]=PDF დოკუმენტი
+ Comment[km]=ឯកសារ PDF
+ Comment[ko]=PDF 문서
+ Comment[lb]=PDF-Dokument
+@@ -76,7 +75,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
+--- mimetypes/application/vnd.oasis.opendocument.spreadsheet.desktop	(revision 484194)
++++ mimetypes/application/vnd.oasis.opendocument.spreadsheet.desktop	(revision 488534)
+@@ -27,7 +27,6 @@
+ Comment[is]=OASIS OpenDocument töflureiknir
+ Comment[it]=Foglio di calcolo OASIS OpenDocument
+ Comment[ja]=OASIS OpenDocument 表計算
+-Comment[ka]=OASIS OpenDocument ცხრილი
+ Comment[km]=សៀវភៅបញ្ជី OASIS OpenDocument
+ Comment[lb]=OASIS-OpenDocument-Tabellëblat
+ Comment[lt]=OASIS OpenDocument elektroninÄ— lentelÄ—
+@@ -54,7 +53,6 @@
+ Comment[tt]=OASIS OpenDocument İsäpcäymäse
+ Comment[uk]=Електронна таблиця OASIS OpenDocument
+ Comment[uz]=OASIS OpenDocument электрон жадвали
+-Comment[xx]=xxOASIS OpenDocument SpreadSheetxx
+ Comment[zh_CN]=OASIS OpenDocument ç”µå­è¡¨æ ¼
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+--- mimetypes/application/x-tgz.desktop	(revision 484194)
++++ mimetypes/application/x-tgz.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Gzip þjappað tar-safn
+ Comment[it]=Archivio Tar compresso con Gzip
+ Comment[ja]=GzipされたTarアーカイブ
+-Comment[ka]=Gzip შეკუმშული Tar არქივი
+ Comment[km]=ប័ណ្ណសារ Gzipped Tar
+ Comment[ko]=Gzip으로 압축한 TAR ì €ìž¥ê³ 
+ Comment[lb]=Mat Gzip kompriméierten Tar-Archiv
+@@ -79,7 +78,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
+--- mimetypes/application/x-javascript.desktop	(revision 484194)
++++ mimetypes/application/x-javascript.desktop	(revision 488534)
+@@ -30,7 +30,6 @@
+ Comment[is]=JavaScript-skrá
+ Comment[it]=File JavaScript
+ Comment[ja]=JavaScript ファイル
+-Comment[ka]=JavaScript ფაილი
+ Comment[km]=ឯកសារ JavaScript
+ Comment[lb]=JavaScript-Datei
+ Comment[lt]=JavaScript byla
+@@ -60,6 +59,5 @@
+ Comment[tt]=JavaScript Bireme
+ Comment[uk]=Файл JavaScript
+ Comment[uz]=JavaScript-файли
+-Comment[xx]=xxJavaScript Filexx
+ Comment[zh_CN]=JavaScript 文件
+ X-KDE-IsAlso=application/x-executable-script
+--- mimetypes/application/vnd.sun.xml.impress.desktop	(revision 484194)
++++ mimetypes/application/vnd.sun.xml.impress.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=OpenOffice.org kynning
+ Comment[it]=Presentazione OpenOffice.org
+ Comment[ja]=OpenOffice.org プレゼンテーション
+-Comment[ka]=OpenOffice.org პრეზენტაცია
+ Comment[km]=ការ​បង្ហាញ OpenOffice.org
+ Comment[ko]=OpenOffice.org í”„ë¦¬ì  í…Œì´ì…˜
+ Comment[lb]=OpenOffice.org-Präsentatioun
+@@ -65,7 +64,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
+--- mimetypes/application/x-vnd.kde.kugar.mixed.desktop	(revision 484194)
++++ mimetypes/application/x-vnd.kde.kugar.mixed.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Kugar safnskrá
+ Comment[it]=File di archivio Kugar
+ Comment[ja]=Kugar アーカイブ ファイル
+-Comment[ka]=Kugar არქივი
+ Comment[km]=ឯកសារ​ប័ណ្ណសារ Kugar
+ Comment[lb]=Kugar-Archivdatei
+ Comment[lt]=Kugar archyvo byla
+@@ -69,7 +68,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]
+--- mimetypes/application/x-gnumeric.desktop	(revision 484194)
++++ mimetypes/application/x-gnumeric.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=GNUmeric töflureikniskjal
+ Comment[it]=Foglio di calcolo GNUmeric
+ Comment[ja]=GNUmeric スプレッドシート
+-Comment[ka]=GNUmeric ცხრილი
+ Comment[km]=សៀវភៅ​បញ្ជី GNUmeric
+ Comment[ko]=그누메릭(GNUmeric) ìŠ¤í”„ë ˆë“œì‹œíŠ¸
+ Comment[lb]=GNUmeric-Tabellëblat
+@@ -74,7 +73,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
+--- mimetypes/application/x-kchart.desktop	(revision 484194)
++++ mimetypes/application/x-kchart.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=KChart skjal
+ Comment[it]=Documento KChart
+ Comment[ja]=KChart ドキュメント
+-Comment[ka]=KChart დოკუმენტი
+ Comment[km]=ឯកសារ KChart
+ Comment[ko]=K도표 문서
+ Comment[lb]=KChart-Dokument
+@@ -75,7 +74,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
+--- mimetypes/application/wordperfect.desktop	(revision 484194)
++++ mimetypes/application/wordperfect.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=WordPerfect skjal
+ Comment[it]=Documento WordPerfect
+ Comment[ja]=WordPerfect ドキュメント
+-Comment[ka]=WordPerfect დოკუმენტი
+ Comment[km]=ឯកសារ WordPerfect
+ Comment[ko]=워드퍼펙트 문서
+ Comment[lb]=WordPerfect-Dokument
+@@ -76,7 +75,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
+--- mimetypes/application/x-executable.desktop	(revision 484194)
++++ mimetypes/application/x-executable.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=Keyrsluforrit
+ Comment[it]=File eseguibile
+ Comment[ja]=実行可能ファイル
+-Comment[ka]=პროგრამა
+ Comment[km]=ឯកសារ​ប្រតិបត្តិ
+ Comment[ko]=실행 파일
+ Comment[lb]=Ausféierbar Datei
+@@ -70,7 +69,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
+--- mimetypes/application/x-executable-script.desktop	(revision 484194)
++++ mimetypes/application/x-executable-script.desktop	(revision 488534)
+@@ -25,7 +25,6 @@
+ Comment[is]=Skeljaforrit (sem er ef til vill keyranlegt)
+ Comment[it]=Script (eventualmente eseguibile)
+ Comment[ja]=スクリプト (おそらく実行可能)
+-Comment[ka]=სკრიპტი (შესაძლოა პროგრამული)
+ Comment[km]=ស្គ្រីប (អាច​ប្រតិបត្តិ​បាន)
+ Comment[lb]=Skript (eventuell ausféierbar)
+ Comment[lt]=Scenarijus (gal būt - vykdomoji byla)
+@@ -55,7 +54,6 @@
+ Comment[tt]=Ämerlek (eşçän buluı bar)
+ Comment[uk]=Скрипт, який, можливо, можна виконати
+ Comment[uz]=Эҳтимол ишга тушириб бўладиган скрипт
+-Comment[xx]=xxScript (possibly executable)xx
+ Comment[zh_CN]=脚本(可能可执行)
+ Icon=exec
+ Type=MimeType
+--- mimetypes/application/x-lzop.desktop	(revision 484194)
++++ mimetypes/application/x-lzop.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Þjöppuð skrá (lzop)
+ Comment[it]=File compresso con Lz
+ Comment[ja]=Lzopされたファイル
+-Comment[ka]=Lzop არქივი
+ Comment[km]=ឯកសារ Lzopped
+ Comment[ko]=Lzop으로 압축한 파일
+ Comment[lb]=Mat Lzop kompriméiert Datei
+@@ -78,7 +77,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
+--- mimetypes/application/x-shockwave-flash.desktop	(revision 484194)
++++ mimetypes/application/x-shockwave-flash.desktop	(revision 488534)
+@@ -25,7 +25,6 @@
+ Comment[is]=Shockwave Flash gögn
+ Comment[it]=File multimediale Shockwave Flash
+ Comment[ja]=Shockwave Flash メディア
+-Comment[ka]=Shockwave Flash მედიაფაილი
+ Comment[ko]=쇽 웨이브 플래시 미디어
+ Comment[lb]=Shockwave-Flash-Media
+ Comment[lv]=Shockwave Flash MÄ“dija
+@@ -50,7 +49,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
+--- mimetypes/application/x-pw.desktop	(revision 484194)
++++ mimetypes/application/x-pw.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=Pathetic Writer skjal
+ Comment[it]=Documento Pathetic Writer
+ Comment[ja]=Pathetic Writer ドキュメント
+-Comment[ka]=Pathetic Writer ფაილი
+ Comment[km]=ឯកសារ Pathetic Writer
+ Comment[ko]=패스틱 라이터 문서
+ Comment[lb]=Pathetic-Writer-Dokument
+@@ -67,7 +66,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
+--- mimetypes/application/x-rar-compressed.desktop	(revision 484194)
++++ mimetypes/application/x-rar-compressed.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Rar safnskrá
+ Comment[it]=Archivio Rar
+ Comment[ja]=Rar アーカイブ
+-Comment[ka]=Rar არქივი
+ Comment[km]=ប័ណ្ណសារ Rar
+ Comment[ko]=RAR ì €ìž¥ê³ 
+ Comment[lb]=Rar-Archiv
+@@ -76,7 +75,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
+--- mimetypes/application/x-kpovmodeler.desktop	(revision 484194)
++++ mimetypes/application/x-kpovmodeler.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=KPovModeler skrá
+ Comment[it]=File KPovModeler
+ Comment[ja]=KPovModeler ファイル
+-Comment[ka]=KPovModeler ფაილი
+ Comment[km]=ឯកសារ KPovModeler
+ Comment[lb]=KPovModeler-Datei
+ Comment[lt]=KPovModeler byla
+@@ -70,7 +69,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
+--- mimetypes/application/x-php.desktop	(revision 484194)
++++ mimetypes/application/x-php.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=PHP forrit
+ Comment[it]=Script PHP
+ Comment[ja]=PHP スクリプト
+-Comment[ka]=PHP სკრიპტი
+ Comment[km]=ស្គ្រីប PHP
+ Comment[ko]=PHP 스크립트
+ Comment[lb]=PHP-Skript
+@@ -67,7 +66,6 @@
+ Comment[uk]=Скрипт мови програмування PHP
+ Comment[uz]=PHP скрипти
+ Comment[wa]=Sicripe PHP
+-Comment[xx]=xxPHP Scriptxx
+ Comment[zh_CN]=PHP 脚本
+ 
+ Icon=source_php
+--- mimetypes/application/x-troff-man.desktop	(revision 484194)
++++ mimetypes/application/x-troff-man.desktop	(revision 488534)
+@@ -30,7 +30,6 @@
+ Comment[is]=Troff skjal með mansíðufjölvum
+ Comment[it]=Documento Troff con macro per pagine di manuale
+ Comment[ja]=Manpage マクロの Troff ドキュメント
+-Comment[ka]=Troff დოკუმენტი Manpage Macros–ით
+ Comment[km]=ឯកសារ Troff ដែល​មាន​ម៉ាក្រូ​ទំព័រ​សៀវភៅ​ដៃ
+ Comment[ko]=맨페이지 매크로가 담겨 있는 Troff 문서
+ Comment[lb]=Troff-Dokument mat Handbuch-Makroen
+@@ -69,7 +68,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
+--- mimetypes/application/x-tex-gf.desktop	(revision 484194)
++++ mimetypes/application/x-tex-gf.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=Almennar leturskrár
+ Comment[it]=Tipo di carattere generico
+ Comment[ja]=一般フォント
+-Comment[ka]=ძირითადი ფონტი
+ Comment[km]=ពុម្ពអក្សរ Generic
+ Comment[ko]=보통 글꼴
+ Comment[lb]=Allgemeng Schrëft
+@@ -70,7 +69,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
+--- mimetypes/application/x-shellscript.desktop	(revision 484194)
++++ mimetypes/application/x-shellscript.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=Skeljaforrit
+ Comment[it]=Script per la shell
+ Comment[ja]=シェルスクリプト
+-Comment[ka]=Shell სკრიპტი
+ Comment[km]=ស្គ្រីប​សែល
+ Comment[ko]=쉘 스크립트
+ Comment[lb]=Kommandozeilëskript
+@@ -70,7 +69,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
+--- mimetypes/application/vnd.oasis.opendocument.graphics.desktop	(revision 484194)
++++ mimetypes/application/vnd.oasis.opendocument.graphics.desktop	(revision 488534)
+@@ -27,7 +27,6 @@
+ Comment[is]=OASIS OpenDocument grafík
+ Comment[it]=Disegno OASIS OpenDocument
+ Comment[ja]=OASIS OpenDocument 図形描画
+-Comment[ka]=OASIS OpenDocument დიაგრამები
+ Comment[km]=ក្រាហ្វិក OASIS OpenDocument
+ Comment[lb]=OASIS-OpenDocument-Grafik
+ Comment[lt]=OASIS OpenDocument grafika
+@@ -54,7 +53,6 @@
+ Comment[tt]=OASIS OpenDocument Sızımı
+ Comment[uk]=Графічне зображення OASIS OpenDocument
+ Comment[uz]=OASIS OpenDocument графика
+-Comment[xx]=xxOASIS OpenDocument Graphicsxx
+ Comment[zh_CN]=OASIS OpenDocument 图形
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+--- mimetypes/application/x-font-bdf.desktop	(revision 484194)
++++ mimetypes/application/x-font-bdf.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=BDF bitamyndaletur
+ Comment[it]=Tipo di carattere bitmap BDF
+ Comment[ja]=BDF ビットマップフォント
+-Comment[ka]=BDF რასტრული ფონტი
+ Comment[km]=ពុម្ពអក្សរ BDF Bitmap
+ Comment[ko]=BDF 비트맵 글꼴
+ Comment[lb]=BDF-Bitmapschrëft
+@@ -74,7 +73,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
+--- mimetypes/application/x-kudesigner.desktop	(revision 484194)
++++ mimetypes/application/x-kudesigner.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=Kugar skýrslusnið
+ Comment[it]=Modello di rapporti Kugar
+ Comment[ja]=Kugar リポートテンプレート
+-Comment[ka]=Kugar ოქმის თარგი
+ Comment[km]=ពុម្ព​របាយការណ៍ Kugar
+ Comment[lb]=Kugar-Report-Virlag
+ Comment[lt]=Kugar ataskaitų byla
+@@ -65,7 +64,6 @@
+ Comment[tt]=Kugar Yomğağı öçen Ürçetmä
+ Comment[uk]=Шаблон звіту Kugar
+ Comment[uz]=Kugar ҳисобот намунаси
+-Comment[xx]=xxKugar Report Templatexx
+ Comment[zh_CN]=Kugar 报告模板
+ Comment[zh_TW]=Kugar å ±è¡¨æ¨£æœ¬
+ Icon=kugardata
+--- mimetypes/application/vnd.oasis.opendocument.formula.desktop	(revision 484194)
++++ mimetypes/application/vnd.oasis.opendocument.formula.desktop	(revision 488534)
+@@ -27,7 +27,6 @@
+ Comment[is]=OASIS OpenDocument formúla
+ Comment[it]=Formula OASIS OpenDocument
+ Comment[ja]=OASIS OpenDocument 数式
+-Comment[ka]=OASIS OpenDocument ფორმულა
+ Comment[km]=រូបមន្ត OASIS OpenDocument
+ Comment[lb]=OASIS-OpenDocument-Formel
+ Comment[lt]=OASIS OpenDocument rormulÄ—
+@@ -54,7 +53,6 @@
+ Comment[tt]=OASIS OpenDocument Formulı
+ Comment[uk]=Формула OASIS OpenDocument
+ Comment[uz]=OASIS OpenDocument формула
+-Comment[xx]=xxOASIS OpenDocument Formulaxx
+ Comment[zh_CN]=OASIS OpenDocument 公式
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+--- mimetypes/application/x-font-type1.desktop	(revision 484194)
++++ mimetypes/application/x-font-type1.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Postscript Type1 letur
+ Comment[it]=Tipo di carattere PostScript Type1
+ Comment[ja]=PostScript Type1 フォント
+-Comment[ka]=PostScript Type1 ფონტი
+ Comment[km]=ពុម្ពអក្សរ PostScript Type1
+ Comment[ko]=포스트스크립트 타입1 글꼴
+ Comment[lb]=PostScript-Type1-Schrëft
+@@ -74,7 +73,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
+--- mimetypes/application/msword.desktop	(revision 484194)
++++ mimetypes/application/msword.desktop	(revision 488534)
+@@ -38,7 +38,6 @@
+ Comment[is]=Microsoft Word skjal
+ Comment[it]=Documento Microsoft Word
+ Comment[ja]=Microsoft Word ドキュメント
+-Comment[ka]=Microsoft Word–ის დოკუმენტი
+ Comment[km]=ឯកសារ Microsoft Word
+ Comment[ko]=마이크로소프트 글틀 문서
+ Comment[lb]=Microsoft-Word-Dokument
+@@ -77,7 +76,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
+--- mimetypes/application/ogg.desktop	(revision 484194)
++++ mimetypes/application/ogg.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Ogg hljóðskrá
+ Comment[it]=File multimediale Ogg
+ Comment[ja]=Ogg マルチメディア
+-Comment[ka]=OGG მულტიმედია ფაილი
+ Comment[km]=ពហុព័ត៌មាន Ogg
+ Comment[ko]=Ogg 멀티미디어
+ Comment[lb]=Ogg-Multimedia
+@@ -70,7 +69,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
+--- mimetypes/application/vnd.stardivision.writer-global.desktop	(revision 484194)
++++ mimetypes/application/vnd.stardivision.writer-global.desktop	(revision 488534)
+@@ -30,7 +30,6 @@
+ Comment[is]=StarOffice Writer yfirskjal
+ Comment[it]=Documento master StarOffice Writer
+ Comment[ja]=StarOffice Writer マスタードキュメント
+-Comment[ka]=StarOffice Writer თარგის დოკუმენტი
+ Comment[km]=ឯកសារ​មេ StarOffice Writer
+ Comment[ko]=스타오피스 글틀 기본 문서
+ Comment[lb]=StarOffice-Writer-Haaptdokument
+@@ -60,7 +59,6 @@
+ Comment[tt]=StarOffice Writer'nıñ Master-İstälege
+ 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
+--- mimetypes/application/x-krita.desktop	(revision 484194)
++++ mimetypes/application/x-krita.desktop	(revision 488534)
+@@ -37,7 +37,6 @@
+ Comment[is]=Krita skjal
+ Comment[it]=Documento Krita
+ Comment[ja]=Krita ドキュメント
+-Comment[ka]=Krita დოკუმენტი
+ Comment[km]=ឯកសារ Krita
+ Comment[lb]=Krita-Dokument
+ Comment[lt]=Krita dokumentas
+@@ -75,7 +74,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
+--- mimetypes/application/vnd.stardivision.writer.desktop	(revision 484194)
++++ mimetypes/application/vnd.stardivision.writer.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=StarOffice Writer skjal
+ Comment[it]=Documento StarOffice Writer
+ Comment[ja]=StarOffice Writer ドキュメント
+-Comment[ka]=StarOffice Writer დოკუმენტი
+ Comment[km]=ឯកសារ StarOffice Writer
+ Comment[ko]=스타오피스 글틀 문서
+ Comment[lb]=StarOffice-Writer-Dokument
+@@ -72,7 +71,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
+--- mimetypes/application/x-pak.desktop	(revision 484194)
++++ mimetypes/application/x-pak.desktop	(revision 488534)
+@@ -29,7 +29,6 @@
+ Comment[is]=PAK safnskrá
+ Comment[it]=Archivio file PAK
+ Comment[ja]=PAK ファイルアーカイブ
+-Comment[ka]=PAK არქივი
+ Comment[km]=ប័ណ្ណសារ​ឯកសារ PAK
+ Comment[lb]=PAK-Dateiarchiv
+ Comment[lt]=PAK bylos archyvas
+@@ -59,5 +58,4 @@
+ Comment[tt]=PAK Tuplama
+ Comment[uk]=Файл архіву PAK
+ Comment[uz]=PAK архиви
+-Comment[xx]=xxPAK File Archivexx
+ Comment[zh_CN]=PAK 文件归档
+--- mimetypes/application/x-applixgraphics.desktop	(revision 484194)
++++ mimetypes/application/x-applixgraphics.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Applix mynd
+ Comment[it]=Documento Applix Graphics
+ Comment[ja]=Applix グラフィックスドキュメント
+-Comment[ka]=Applix Graphics დოკუმენტი
+ Comment[km]=ឯកសារ​ក្រាហ្វិក Applix
+ Comment[ko]=ì• í”Œë¦­ìŠ¤ 그림
+ Comment[lb]=Applix-Graphics-Dokument
+@@ -76,7 +75,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
+--- mimetypes/application/illustrator.desktop	(revision 484194)
++++ mimetypes/application/illustrator.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Adobe Illustrator skjal
+ Comment[it]=Documento Adobe Illustrator
+ Comment[ja]=Adobe Illustrator ドキュメント
+-Comment[ka]=Adobe Ilustrator–ის დოკუმენტი
+ Comment[km]=ឯកសារ Adobe Illustrator
+ Comment[ko]=어도비 ì¼ëŸ¬ìŠ¤íŠ¸ë ˆì´í„° 문서
+ Comment[lb]=Adobe-Illustrator-Dokument
+@@ -76,7 +75,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
+--- mimetypes/application/pgp-signature.desktop	(revision 484194)
++++ mimetypes/application/pgp-signature.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=Aðskilin OpenPGP undirskrift
+ Comment[it]=Firma OpenPGP separata
+ Comment[ja]=切り離されたOpenPGP署名
+-Comment[ka]=მოხსნილი OpenPGP ხელმოწერა
+ Comment[km]=ហត្ថលេខា Detached OpenPGP
+ Comment[ko]=ë‚˜ëˆ ì§„ 오픈PGP 서명
+ Comment[lb]=Ofgetrennten OpenPGP-Signatur
+@@ -71,7 +70,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
+--- mimetypes/application/x-tarz.desktop	(revision 484194)
++++ mimetypes/application/x-tarz.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=Þjappað tar-safn
+ Comment[it]=Archivio Tar compresso
+ Comment[ja]=CompressされたTarアーカイブ
+-Comment[ka]=შეკუმშული Tar არქივი
+ Comment[km]=ប័ណ្ណសារ​បង្ហាប់ Tar
+ Comment[ko]=압축한 TAR ì €ìž¥ê³ 
+ Comment[lb]=Kompriméierten Tar-Archiv
+@@ -75,7 +74,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
+--- mimetypes/application/vnd.sun.xml.draw.desktop	(revision 484194)
++++ mimetypes/application/vnd.sun.xml.draw.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=OpenOffice.org teikning
+ Comment[it]=Disegno OpenOffice.org
+ Comment[ja]=OpenOffice.org 図形描画
+-Comment[ka]=OpenOffice.org ნახატი
+ Comment[km]=គំនូរ OpenOffice.org
+ Comment[ko]=OpenOffice.org 그림
+ Comment[lb]=OpenOffice.org-Zeechnung
+@@ -63,7 +62,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
+--- mimetypes/application/x-python.desktop	(revision 484194)
++++ mimetypes/application/x-python.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=Python forrit
+ Comment[it]=Programma Python
+ Comment[ja]=Python プログラム
+-Comment[ka]=Python პროგრამა
+ Comment[km]=កម្មវិធី Python
+ Comment[ko]=파이썬 프로그램
+ Comment[lb]=Python-Programm
+@@ -71,7 +70,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
+--- mimetypes/application/x-awk.desktop	(revision 484194)
++++ mimetypes/application/x-awk.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=AWK forrit
+ Comment[it]=Script AWK
+ Comment[ja]=AWK スクリプト
+-Comment[ka]=AWK სკრიპტი
+ Comment[km]=ស្គ្រីប AWK
+ Comment[ko]=AWK 스크립트
+ Comment[lb]=AWK-Skript
+@@ -72,7 +71,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
+--- mimetypes/application/x-vnd.kde.kplato.desktop	(revision 484194)
++++ mimetypes/application/x-vnd.kde.kplato.desktop	(revision 488534)
+@@ -27,7 +27,6 @@
+ Comment[is]=KPlato verkefnisskjal
+ Comment[it]=Documento di gestione progetti KPlato
+ Comment[ja]=KPlato プロジェクトマネージメントドキュメント
+-Comment[ka]=KPlato პროექტის მართვის დოკუმენტი
+ Comment[km]=ឯកសារ​គ្រប់គ្រង​គម្រោង KPlato
+ Comment[lb]=KPlato-Projetsverwaltungsdokument
+ Comment[lt]=KPlato projektų valdymo dokumentas
+@@ -57,7 +56,6 @@
+ Comment[tt]=KPlato Sölge İdärä İstälege
+ Comment[uk]=Документ керування проектом KPlato
+ Comment[uz]=KPlato ҳужжати
+-Comment[xx]=xxKPlato Project Management Documentxx
+ Comment[zh_CN]=KPlato 项目管理文档
+ Type=MimeType
+ Patterns=*.kplato;*.kplatot;
+--- mimetypes/application/x-gzdvi.desktop	(revision 484194)
++++ mimetypes/application/x-gzdvi.desktop	(revision 488534)
+@@ -25,7 +25,6 @@
+ Comment[is]=Gzip þjöppuð DVI skrá
+ Comment[it]=File DVI compresso con Gzip
+ Comment[ja]=Gzip 圧縮 DVI ファイル
+-Comment[ka]=Gzip შეკუმშული DVI ფაილი
+ Comment[km]=ឯកសារ DVI ដែល​បាន​បង្ហាប់ដោយ Gzip
+ Comment[lb]=Gzip-kompriméiert DVI-Datei
+ Comment[lt]=Gzip suspausta DVI byla
+@@ -55,7 +54,6 @@
+ Comment[tt]=Gzip'le DVI Birem
+ Comment[uk]=Файл DVI, стиснутий gzip
+ Comment[uz]=Gzip билан қисилган DVI-файли
+-Comment[xx]=xxGzip Compressed DVI Filexx
+ Comment[zh_CN]=Gzip 压缩的 DVI 文件
+ Hidden=false
+ Icon=tgz
+--- mimetypes/application/x-tar.desktop	(revision 484194)
++++ mimetypes/application/x-tar.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Tar safnskrá
+ Comment[it]=Archivio Tar
+ Comment[ja]=Tar アーカイブ
+-Comment[ka]=Tar არქივი
+ Comment[km]=ប័ណ្ណសារ Tar
+ Comment[ko]=TAR ì €ìž¥ê³ 
+ Comment[lb]=Tar-Archiv
+@@ -76,7 +75,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
+--- mimetypes/application/x-cda.desktop	(revision 484194)
++++ mimetypes/application/x-cda.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=CD hljóðskrá
+ Comment[it]=Audio CD
+ Comment[ja]=CD オーディオ
+-Comment[ka]=აუდიო CD
+ Comment[km]=ស៊ីឌីអូឌីយ៉ូ
+ Comment[ko]=CD 오디오
+ Comment[lt]=CD audio
+@@ -65,7 +64,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
+--- mimetypes/application/x-core.desktop	(revision 484194)
++++ mimetypes/application/x-core.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Comment[is]=Vísbendingar um orsök hruns
+ Comment[it]=Dati del crash di un programma
+ Comment[ja]=プログラムクラッシュデータ
+-Comment[ka]=პროგრამის კრახის შეცდომა
+ Comment[km]=ទិន្នន័យ​គាំង​របស់​កម្មវិធី
+ Comment[ko]=프로그램이 죽을 때 남긴 자료
+ Comment[lb]=Donnéeën zum Ofstuerz vum Programm
+@@ -73,7 +72,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
+--- mimetypes/application/x-msdos-program.desktop	(revision 484194)
++++ mimetypes/application/x-msdos-program.desktop	(revision 488534)
+@@ -30,7 +30,6 @@
+ Comment[is]=Windows keyrsluforrit
+ Comment[it]=Eseguibile Windows
+ Comment[ja]=Windows 実行ファイル
+-Comment[ka]=Windows-ის პროგრამა
+ Comment[ko]=윈도우즈 실행 파일
+ Comment[lb]=Ausféierbar Datei vu Windows
+ Comment[lt]=Windows vykdoma byla
+@@ -67,7 +66,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
+--- mimetypes/application/vnd.stardivision.draw.desktop	(revision 484194)
++++ mimetypes/application/vnd.stardivision.draw.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=StarOffice teikning
+ Comment[it]=Disegno StarOffice
+ Comment[ja]=StarOffice 図形描画
+-Comment[ka]=StarOffice ნახატი
+ Comment[km]=គំនូរ StarOffice
+ Comment[ko]=스타오피스 그림
+ Comment[lb]=StarOffice-Zeechnung
+@@ -61,7 +60,6 @@
+ Comment[tt]=StarOffice Sızımı
+ Comment[uk]=Малюнок StarOffice
+ Comment[uz]=StarOffice чизмаси
+-Comment[xx]=xxStarOffice Drawingxx
+ Comment[zh_CN]=StarOffice 绘图
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+--- mimetypes/application/vnd.sun.xml.draw.template.desktop	(revision 484194)
++++ mimetypes/application/vnd.sun.xml.draw.template.desktop	(revision 488534)
+@@ -27,7 +27,6 @@
+ Comment[is]=OpenOffice.org teikningarsniðmát
+ Comment[it]=Modello di disegno OpenOffice.org
+ Comment[ja]=OpenOffice.org 図形描画テンプレート
+-Comment[ka]=OpenOffice.org ნახატის თარგი
+ Comment[km]=ពុម្ព​គំនូរ OpenOffice.org
+ Comment[ko]=OpenOffice.org 그림 본
+ Comment[lb]=OpenOffice.org-Zeechnungsvirlag
+@@ -58,7 +57,6 @@
+ Comment[tt]=OpenOffice.org Sızımı öçen Ürçetmä
+ 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
+--- mimetypes/application/xml.desktop	(revision 484194)
++++ mimetypes/application/xml.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=XML skjal
+ Comment[it]=Documento XML
+ Comment[ja]=XML ドキュメント
+-Comment[ka]=XML დოკუმენტი
+ Comment[km]=ឯកសារ XML
+ Comment[ko]=XML 문서
+ Comment[lb]=XML-Dokument
+@@ -67,7 +66,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
+--- mimetypes/application/vnd.oasis.opendocument.chart.desktop	(revision 484194)
++++ mimetypes/application/vnd.oasis.opendocument.chart.desktop	(revision 488534)
+@@ -27,7 +27,6 @@
+ Comment[is]=OASIS OpenDocument graf
+ Comment[it]=Diagramma OASIS OpenDocument
+ Comment[ja]=OpenDocument チャート
+-Comment[ka]=OASIS OpenDocument დიაგრამა
+ Comment[km]=គំនូសតាង OASIS OpenDocument
+ Comment[lb]=OASIS-OpenDocument-Diagramm
+ Comment[lt]=OASIS OpenDocument grafikas
+@@ -53,7 +52,6 @@
+ Comment[tr]=OASIS OpenDocument Çizelgesi
+ Comment[tt]=OASIS OpenDocument Grafiğı
+ Comment[uk]=Діаграма OASIS OpenDocument
+-Comment[xx]=xxOASIS OpenDocument Chartxx
+ Comment[zh_CN]=OASIS OpenDocument 图表
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+--- mimetypes/message/news.desktop	(revision 484194)
++++ mimetypes/message/news.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Comment[is]=Bréf af Usenet ráðstefnum
+ Comment[it]=Messaggio di news Usenet
+ Comment[ja]=Usenet ニュースメッセージ
+-Comment[ka]=Usenet სიახლე
+ Comment[km]=សារ​ដំណឹង Usenet
+ Comment[ko]=ìœ ì¦ˆë„· 새소식 메세지
+ Comment[lb]=Usenet-News-Noricht
+@@ -72,7 +71,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
+--- mimetypes/message/rfc822.desktop	(revision 484194)
++++ mimetypes/message/rfc822.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Tölvupóstskeyti
+ Comment[it]=Messaggio di posta elettronica
+ Comment[ja]=Eメールメッセージ
+-Comment[ka]=ელფოსტის შეტყობინება
+ Comment[km]=សារ​អ៊ីម៉ែល
+ Comment[ko]=편지 메세지
+ Comment[lb]=E-Mail-Message
+@@ -76,7 +75,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
+--- mimetypes/text/rss.desktop	(revision 484194)
++++ mimetypes/text/rss.desktop	(revision 488534)
+@@ -28,7 +28,6 @@
+ Comment[is]=RDF summa
+ Comment[it]=Sommario sito RDF
+ Comment[ja]=RDF サイトサマリ
+-Comment[ka]=RDF საიტის რეზიუმე
+ Comment[km]=ការសង្ខេប​តំបន់​បណ្តាញ RDF
+ Comment[ko]=RDF 사이트 머리글
+ Comment[lb]=Zesummefaassung vun der RDF-Säit
+@@ -66,7 +65,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
+--- mimetypes/text/calendar.desktop	(revision 484194)
++++ mimetypes/text/calendar.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=iCalendar skrá
+ Comment[it]=File iCalendar
+ Comment[ja]=iCalendar ファイル
+-Comment[ka]=iCalendar ფაილი
+ Comment[km]=ឯកសារ iCalendar
+ Comment[ko]=ië‹¬ë ¥ 파일
+ Comment[lb]=iCalendar-Datei
+@@ -71,7 +70,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
+--- mimetypes/text/rdf.desktop	(revision 484194)
++++ mimetypes/text/rdf.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=Skilgreiningaskrá auðlinda (RDF skrá)
+ Comment[it]=File RDF
+ Comment[ja]=Resource Description Framework ファイル
+-Comment[ka]=რესურსების აღწერის (RDF) ფაილი
+ Comment[km]=ឯកសារ Resource Description Framework
+ Comment[lb]=Resource-Description-Framework-Datei
+ Comment[lt]=Resursų aprašymo struktūros (RDF) byla
+@@ -61,7 +60,6 @@
+ Comment[tt]=Resursnıñ Açıqlama-Bireme (RDF)
+ Comment[uk]=Файл структури опису ресурсів
+ Comment[uz]=RDF-файли
+-Comment[xx]=xxResource Description Framework Filexx
+ Comment[zh_CN]=资源描述框架文件
+ Comment[zh_TW]=資源描述框架 (RDF) 檔案
+ Icon=news
+--- mimetypes/text/vnd.wap.wml.desktop	(revision 484194)
++++ mimetypes/text/vnd.wap.wml.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=WML skjal
+ Comment[it]=Documento WML
+ Comment[ja]=WMLドキュメント
+-Comment[ka]=WML დოკუმენტი
+ Comment[km]=ឯកសារ WML
+ Comment[ko]=WML 문서
+ Comment[lb]=WML-Dokument
+@@ -76,7 +75,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
+--- mimetypes/text/x-diff.desktop	(revision 484194)
++++ mimetypes/text/x-diff.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=Skjal sem lýsir mun tveggja annarra skráa
+ Comment[it]=Differenze tra file
+ Comment[ja]=2つのファイルの差分
+-Comment[ka]=DIFF განსხვავების ფაილი
+ Comment[km]=ភាព​ខុស​គ្នា​រវាង​ឯកសារ
+ Comment[ko]=두 파일 차이를 기록한 파일
+ Comment[lb]=Ënnerscheeder zwëschen Dateien
+@@ -71,7 +70,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
+--- mimetypes/text/x-objchdr.desktop	(revision 484194)
++++ mimetypes/text/x-objchdr.desktop	(revision 488534)
+@@ -24,7 +24,6 @@
+ Comment[is]=Objective-C header skrá
+ Comment[it]=File header Objective-C
+ Comment[ja]=Objective-C ヘッダファイル
+-Comment[ka]=Objective-C თავსართი
+ Comment[km]=ឯកសារ Objective-C Header
+ Comment[lb]=Objective-C-Header-Datei
+ Comment[lt]=Objective-C header byla
+@@ -50,7 +49,6 @@
+ Comment[tr]=Objective-C Başlık Dosyası
+ Comment[tt]=Objective-C Başlıqınıñ Bireme
+ Comment[uk]=Файл заголовків Objective-C
+-Comment[xx]=xxObjective-C Header Filexx
+ Comment[zh_CN]=Objective-C 头文件
+ Icon=source_h
+ Type=MimeType
+--- mimetypes/text/x-bibtex.desktop	(revision 484194)
++++ mimetypes/text/x-bibtex.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=Heimildir (bibtex)
+ Comment[it]=Dati bibliografici (bibtex)
+ Comment[ja]=Bibliographic データ (Bibtex)
+-Comment[ka]=Bibtex ბიბლიოგრაფიული მონაცემები
+ Comment[km]=ទិន្នន័យ​គន្ថនិទ្ទេស (Bibtex)
+ Comment[ko]=서지학 자료 (Bibtex)
+ Comment[lb]=Bibliographesch Donnéeën (Bibtex)
+@@ -69,7 +68,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)
+--- mimetypes/text/x-java.desktop	(revision 484194)
++++ mimetypes/text/x-java.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=Java-frumforrit
+ Comment[it]=File sorgente Java
+ Comment[ja]=Java ソースファイル
+-Comment[ka]=Java პროგრამული კოდი
+ Comment[km]=ឯកសារ Java Source
+ Comment[ko]=자바 밑그림 파일
+ Comment[lb]=Java-Quellcodedatei
+@@ -70,7 +69,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
+--- mimetypes/text/x-objcsrc.desktop	(revision 484194)
++++ mimetypes/text/x-objcsrc.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=Objective-C frumforrit
+ Comment[it]=File sorgente Objective-C
+ Comment[ja]=Objective-C ソースファイル
+-Comment[ka]=Objective-C პროგრამული კოდი
+ Comment[km]=ឯកសារ Objective-C Source
+ Comment[ko]=ì˜¤ë¸Œì í‹°ë¸Œ-C 밑그림 파일
+ Comment[lb]=Objective-C-Quellcodedatei
+@@ -71,7 +70,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
+--- mimetypes/text/rtf.desktop	(revision 484194)
++++ mimetypes/text/rtf.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=RTF skjal
+ Comment[it]=Documento RTF
+ Comment[ja]=RTF ドキュメント
+-Comment[ka]=RTF დოკუმენტი
+ Comment[km]=ឯកសារ RTF
+ Comment[ko]=RTF 문서
+ Comment[lb]=RTF-Dokument
+@@ -68,7 +67,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
+--- mimetypes/text/x-xslfo.desktop	(revision 484194)
++++ mimetypes/text/x-xslfo.desktop	(revision 488534)
+@@ -28,7 +28,6 @@
+ Comment[is]=XSL Sniðskrá
+ Comment[it]=File XSL Formatting Object
+ Comment[ja]=XSL フォーマットオブジェクトファイル
+-Comment[ka]=XSL ფორმატირების ფაილი
+ Comment[km]=ឯកសារ​វត្ថុ​ធ្វើ​ទ្រង់ទ្រាយ XSL
+ Comment[ko]=XSL 형식 ì˜¤í”„ì íŠ¸ 파일
+ Comment[lb]=XSL-Formatéierungsobjetsdatei
+@@ -65,7 +64,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
+--- mimetypes/text/x-adasrc.desktop	(revision 484194)
++++ mimetypes/text/x-adasrc.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=Ada frumforrit
+ Comment[it]=File sorgente Ada
+ Comment[ja]=Ada ソースソース
+-Comment[ka]=Ada პირველწყარო ფაილი
+ Comment[km]=ឯកសារ​ Ada Source
+ Comment[ko]=에이다(Ada) 밑그림 파일
+ Comment[lb]=Ada-Quellcodedatei
+@@ -71,7 +70,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
+--- mimetypes/text/html.desktop	(revision 484194)
++++ mimetypes/text/html.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=HTML skjal
+ Comment[it]=Documento HTML
+ Comment[ja]=HTML ドキュメント
+-Comment[ka]=HTML დოკუმენტი
+ Comment[km]=ឯកសារ HTML
+ Comment[ko]=HTML 문서
+ Comment[lb]=HTML-Dokument
+@@ -67,7 +66,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
+--- mimetypes/text/javascript.desktop	(revision 484194)
++++ mimetypes/text/javascript.desktop	(revision 488534)
+@@ -29,7 +29,6 @@
+ Comment[is]=JavaScript-skrá
+ Comment[it]=File JavaScript
+ Comment[ja]=JavaScript ファイル
+-Comment[ka]=JavaScript ფაილი
+ Comment[km]=ឯកសារ JavaScript
+ Comment[lb]=JavaScript-Datei
+ Comment[lt]=JavaScript byla
+@@ -59,6 +58,5 @@
+ Comment[tt]=JavaScript Bireme
+ Comment[uk]=Файл JavaScript
+ Comment[uz]=JavaScript-файли
+-Comment[xx]=xxJavaScript Filexx
+ Comment[zh_CN]=JavaScript 文件
+ X-KDE-IsAlso=application/x-javascript
+--- mimetypes/text/x-pascal.desktop	(revision 484194)
++++ mimetypes/text/x-pascal.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=Pascal-frumforrit
+ Comment[it]=File sorgente Pascal
+ Comment[ja]=Pascal ソースファイル
+-Comment[ka]=Pascal პროგრამული კოდი
+ Comment[km]=ឯកសារ Pascal Source
+ Comment[ko]=파스칼 밑그림 파일
+ Comment[lb]=Pascal-Quellcodedatei
+@@ -70,7 +69,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
+--- mimetypes/text/x-c++hdr.desktop	(revision 484194)
++++ mimetypes/text/x-c++hdr.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=C++ skilgreiningar
+ Comment[it]=File header C++
+ Comment[ja]=C++ ヘッダーファイル
+-Comment[ka]=C++ თავსართი ფაილი
+ Comment[km]=ឯកសារ C++ Header
+ Comment[ko]=C++ 머리글 파일
+ Comment[lb]=C++-Header-Datei
+@@ -69,7 +68,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++
+--- mimetypes/text/vnd.abc.desktop	(revision 484194)
++++ mimetypes/text/vnd.abc.desktop	(revision 488534)
+@@ -23,7 +23,6 @@
+ Comment[is]=ABC tónlistarskrá
+ Comment[it]=File ABC Music
+ Comment[ja]=ABC 音楽ファイル
+-Comment[ka]=ABC ხმოვანი ფაილი
+ Comment[km]=ឯកសារ​តន្ត្រី ABC
+ Comment[lb]=ABC-Muséksdatei
+ Comment[lt]=ABC muzikos byla
+@@ -52,7 +51,6 @@
+ Comment[tt]=ABC Köy Bireme
+ Comment[uk]=Файл музики ABC
+ Comment[uz]=ABC аудио-файл
+-Comment[xx]=xxABC Music Filexx
+ Comment[zh_CN]=ABC 音乐文件
+ Icon=sound
+ Type=MimeType
+--- mimetypes/text/docbook.desktop	(revision 484194)
++++ mimetypes/text/docbook.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=DocBook skjal
+ Comment[it]=Documento DocBook
+ Comment[ja]=DocBook ドキュメント
+-Comment[ka]=DocBook დოკუმენტი
+ Comment[km]=ឯកសារ DocBook
+ Comment[ko]=닥북 문서
+ Comment[lb]=DocBook-Dokument
+@@ -67,7 +66,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
+--- mimetypes/text/enriched.desktop	(revision 484194)
++++ mimetypes/text/enriched.desktop	(revision 488534)
+@@ -28,7 +28,6 @@
+ Comment[is]=Lítillega viðbætt textaskjal
+ Comment[it]=Documento di testo arricchito semplicemente
+ Comment[ja]=Lightly Enriched テキストドキュメント
+-Comment[ka]=Lightly Enriched დოკუმენტი
+ Comment[km]=ឯកសារ​អត្ថបទ Lightly Enriched
+ Comment[lb]=Textdokument mat zousätzleche Formatéierungen
+ Comment[lt]=Lengvai raiškus teksto dokumentas
+@@ -59,7 +58,6 @@
+ Comment[tt]=Lightly Enriched İstälege
+ Comment[uk]=Злегка збагачений текстовий документ
+ Comment[wa]=Documint tecse ledjirmint eritchî
+-Comment[xx]=xxLightly Enriched Text Documentxx
+ Comment[zh_CN]=轻装的丰富文本文档
+ Comment[zh_TW]=Lightly Enriched 文件檔案
+ Icon=txt
+--- mimetypes/text/x-makefile.desktop	(revision 484194)
++++ mimetypes/text/x-makefile.desktop	(revision 488534)
+@@ -27,7 +27,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.*
+--- mimetypes/text/x-latex.desktop	(revision 484194)
++++ mimetypes/text/x-latex.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=LaTeX skjal
+ Comment[it]=Documento LaTeX
+ Comment[ja]=LaTeX ドキュメント
+-Comment[ka]=LaTeX დოკუმენტი
+ Comment[km]=ឯកសារ LaTeX
+ Comment[ko]=ë ˆì´í… 문서
+ Comment[lb]=LaTeX-Dokument
+@@ -67,7 +66,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
+--- mimetypes/text/x-moc.desktop	(revision 484194)
++++ mimetypes/text/x-moc.desktop	(revision 488534)
+@@ -30,7 +30,6 @@
+ Comment[hu]=Qt metaobjektum-fájl
+ Comment[is]=Qt-metahlutarskrá (meta object)
+ Comment[it]=File meta-oggetto Qt
+-Comment[ka]=Qt მეტაობიექტის ფაილი
+ Comment[km]=ឯកសារ​វត្ថុ Qt Meta
+ Comment[ko]=Qt 메타 ì˜¤ë¸Œì íŠ¸ 파일
+ Comment[lb]=Qt-Metaobjetsdatei
+@@ -70,7 +69,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
+--- mimetypes/text/x-ldif.desktop	(revision 484194)
++++ mimetypes/text/x-ldif.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=LDAP vistfangaskrá
+ Comment[it]=Rubrica LDAP
+ Comment[ja]=LDAP ドキュメント
+-Comment[ka]=LDAP წიგნაკი
+ Comment[km]=សៀវភៅ​អាសយដ្ឋាន LDAP
+ Comment[ko]=LDAP 주소록
+ Comment[lb]=LDAP-Adressbuch
+@@ -67,7 +66,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
+--- mimetypes/text/x-mswinurl.desktop	(revision 484194)
++++ mimetypes/text/x-mswinurl.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Comment[is]=Internet tilvísun
+ Comment[it]=Scorciatoia Internet
+ Comment[ja]=インターネットショートカット
+-Comment[ka]=ინტერნეტის ბმა
+ Comment[km]=ផ្លូវកាត់​អ៊ិនធឺណិត
+ Comment[ko]=인터넷 바로가기
+ Comment[lb]=Internet-Kierzel
+@@ -71,7 +70,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
+--- mimetypes/text/x-katefilelist.desktop	(revision 484194)
++++ mimetypes/text/x-katefilelist.desktop	(revision 488534)
+@@ -29,7 +29,6 @@
+ Comment[is]=Skráarlisti (Fyrir Kate skráarlista íforrit)
+ Comment[it]=Lista di file (per il plugin Caricamento lista file di Kate)
+ Comment[ja]=ファイルリスト(Kate ファイルリスト読み込みプラグイン)
+-Comment[ka]=ფაილების სია (Kate ფაილების სიის ჩატვირთვის მოდულისთვის)
+ Comment[km]=បញ្ជី​ឯកសារ (សម្រាប់​ Kate File List Loader Plugin)
+ Comment[ko]=(카테용 파일 목록 부름이 플러그인에서 쓰는) 파일 목록
+ Comment[lb]=Dateilëscht (fir de Kate-Dateilëschtlueder-Plugin)
+@@ -66,7 +65,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)
+--- mimetypes/text/x-chdr.desktop	(revision 484194)
++++ mimetypes/text/x-chdr.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=C skilgreiningar
+ Comment[it]=File header C
+ Comment[ja]=C ヘッダファイル
+-Comment[ka]=C თავსართი ფაილი
+ Comment[km]=ឯកសារ C Header
+ Comment[ko]=C 머리글 파일
+ Comment[lb]=C-Header-Datei
+@@ -69,7 +68,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
+--- mimetypes/text/x-c++src.desktop	(revision 484194)
++++ mimetypes/text/x-c++src.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=C++ frumforrit
+ Comment[it]=File sorgente C++
+ Comment[ja]=C++ ソースファイル
+-Comment[ka]=C++ პროგრამული კოდი
+ Comment[km]=ឯកសារ C++ Source
+ Comment[ko]=C++ 밑그림 파일
+ Comment[lb]=C++-Quellcodedatei
+@@ -70,7 +69,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++
+--- mimetypes/text/x-log.desktop	(revision 484194)
++++ mimetypes/text/x-log.desktop	(revision 488534)
+@@ -30,7 +30,6 @@
+ Comment[is]=Keyrsluannálar forrits
+ Comment[it]=File di registro di un'applicazione
+ Comment[ja]=アプリケーションログファイル
+-Comment[ka]=პროგრამების ჟურნალი
+ Comment[km]=ឯកសារ​កំណត់ហេតុ​របស់​កម្មវិធី
+ Comment[ko]=응용 프로그램 기록 파일
+ Comment[lb]=Protokolldatei vu Programmer
+@@ -69,7 +68,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
+--- mimetypes/text/x-tcl.desktop	(revision 484194)
++++ mimetypes/text/x-tcl.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=Tcl-skrá
+ Comment[it]=File Tcl
+ Comment[ja]=Tcl ファイル
+-Comment[ka]=Tcl ფაილი
+ Comment[km]=ឯកសារ Tcl
+ Comment[ko]=티클 파일
+ Comment[lb]=Tcl-Datei
+@@ -72,7 +71,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
+--- mimetypes/text/css.desktop	(revision 484194)
++++ mimetypes/text/css.desktop	(revision 488534)
+@@ -24,7 +24,6 @@
+ Comment[hu]=CSS-stíluslap
+ Comment[is]=CSS skjal
+ Comment[it]=Foglio di stile a cascata (CSS)
+-Comment[ka]=CSS სტილი
+ Comment[km]=CSS
+ Comment[ko]=계단형 스타일시트
+ Comment[lt]=Pakopinis stiliaus aprašymas (CSS)
+@@ -56,7 +55,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
+--- mimetypes/text/x-hex.desktop	(revision 484194)
++++ mimetypes/text/x-hex.desktop	(revision 488534)
+@@ -28,7 +28,6 @@
+ Comment[is]=Intel® Hexadecimal hlutsskráarsnið
+ Comment[it]=Formato file oggetto esadecimale Intel®
+ Comment[ja]=Intel® 16進数オブジェクトファイルフォーマット
+-Comment[ka]=Intel® თექვსმეტობითი ფორმატის ფაილი
+ Comment[km]=ទ្រង់ទ្រាយ​ឯកសារ​វត្ថុ​គោល​ដប់​ប្រាំមួយ Intel®
+ Comment[lb]=Hexadezimalt Objetsdateiformat vun Intel®
+ Comment[lv]=Intel® heksadecimālo objektu failu formāts
+@@ -56,5 +55,4 @@
+ Comment[tr]=Intel® Onaltılık Nesne Dosya Biçimi
+ Comment[tt]=Intel® Cisemeneñ Bireme
+ Comment[uk]=Файл в форматі Intel® Hexadecimal Object
+-Comment[xx]=xxIntel® Hexadecimal Object File Formatxx
+ Comment[zh_CN]=Intel® åå…­è¿›åˆ¶ç›®æ ‡æ–‡ä»¶
+--- mimetypes/text/x-csrc.desktop	(revision 484194)
++++ mimetypes/text/x-csrc.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=C frumforrit
+ Comment[it]=File sorgente C
+ Comment[ja]=C ソースファイル
+-Comment[ka]=C პროგრამული კოდი
+ Comment[km]=ឯកសារ C Source
+ Comment[ko]=C 밑그림 파일
+ Comment[lb]=C-Quellcodedatei
+@@ -70,7 +69,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
+--- mimetypes/text/x-xslt.desktop	(revision 484194)
++++ mimetypes/text/x-xslt.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=XSLT stílskrá
+ Comment[it]=Foglio di stile XSLT
+ Comment[ja]=XSLT スタイルシートファイル
+-Comment[ka]=XSLT ცხრილის ფორმატის ფაილი
+ Comment[km]=ឯកសារ​សន្លឹក​រចនាប័ទ្ម XSLT
+ Comment[ko]=XSLT 스타일시트 파일
+ Comment[lb]=XSLT-Stilvirlagsdatei
+@@ -68,7 +67,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
+--- mimetypes/text/x-csv.desktop	(revision 484194)
++++ mimetypes/text/x-csv.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=Dálkskipt textaskjal (CSV)
+ Comment[it]=File di testo con valori separati da virgole
+ Comment[ja]=値がコンマで区切られたテキストファイル (CSV)
+-Comment[ka]=CSV მძიმით დაყოფილი ტექსტური ფაილი
+ Comment[km]=ឯកសារ​អត្ថបទ​ដែល​មាន​តម្លៃ​បំបែក​ដោយ​សញ្ញា​ក្បៀស
+ Comment[ko]=쉼표로 값이 ë‚˜ëˆ ì ¸ìžˆëŠ” 글월 파일
+ Comment[lb]=Textdatei mat Werter, déi duerch Kommaë getrennt sinn
+@@ -74,7 +73,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
+--- mimetypes/text/xml.desktop	(revision 484194)
++++ mimetypes/text/xml.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=XML skjal
+ Comment[it]=Documento XML
+ Comment[ja]=XML ドキュメント
+-Comment[ka]=XML დოკუმენტი
+ Comment[km]=ឯកសារ XML
+ Comment[ko]=XML 문서
+ Comment[lb]=XML-Dokument
+@@ -67,7 +66,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
+--- mimetypes/text/sgml.desktop	(revision 484194)
++++ mimetypes/text/sgml.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=SGML skjal
+ Comment[it]=Documento SGML
+ Comment[ja]=SGML ドキュメント
+-Comment[ka]=SGML დოკუმენტი
+ Comment[km]=ឯកសារ SGML
+ Comment[ko]=SGML 문서
+ Comment[lb]=SGML-Dokument
+@@ -73,7 +72,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
+--- mimetypes/text/plain.desktop	(revision 484194)
++++ mimetypes/text/plain.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=Textaskjal
+ Comment[it]=Documento di testo semplice
+ Comment[ja]=プレーン テキスト ドキュメント
+-Comment[ka]=ჩვეულებრივი ტექსტური დოკუმენტი
+ Comment[km]=ឯកសារ​អត្ថបទ​ធម្មតា
+ Comment[ko]=보통 글월 문서
+ Comment[lb]=Einfachen Text
+@@ -67,7 +66,6 @@
+ Comment[uk]=Звичайний текст
+ Comment[uz]=Оддий матн файли
+ Comment[wa]=Documint e peur tecse
+-Comment[xx]=xxPlain Text Documentxx
+ Comment[zh_CN]=纯文本文档
+ Comment[zh_TW]=純文字檔案
+ Icon=txt
+--- mimetypes/text/x-vcalendar.desktop	(revision 484194)
++++ mimetypes/text/x-vcalendar.desktop	(revision 488534)
+@@ -30,7 +30,6 @@
+ Comment[is]=vCalendar gagnaskrá
+ Comment[it]=File di interscambio vCalendar
+ Comment[ja]=vCalendar 交換ファイル
+-Comment[ka]=vCalendar ფაილი
+ Comment[km]=ឯកសារ​ vCalendar Interchange
+ Comment[lb]=vCalendar-Austauschdatei
+ Comment[lt]=vCalendar apsikeitimų byla
+@@ -66,7 +65,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
+--- mimetypes/text/x-vcard.desktop	(revision 484194)
++++ mimetypes/text/x-vcard.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=Rafrænt nafnspjald
+ Comment[it]=Biglietto da visita elettronico
+ Comment[ja]=電子ビジネスカード
+-Comment[ka]=ელექტრონული სავიზიტო ბარათი
+ Comment[km]=នាម​ប័ណ្ណ​អេឡិចត្រូនិច
+ Comment[ko]=ì „ìž 비즈니스 ì¹´ë“œ
+ Comment[lb]=Elektronesch Visitekaart
+@@ -72,7 +71,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
+--- mimetypes/text/x-tex.desktop	(revision 484194)
++++ mimetypes/text/x-tex.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=TeX-skjal
+ Comment[it]=File TeX
+ Comment[ja]=TeX ファイル
+-Comment[ka]=TeX დოკუმენტი
+ Comment[km]=ឯកសារ TeX
+ Comment[ko]=텍 파일
+ Comment[lb]=TeX-Datei
+@@ -72,7 +71,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
+--- mimetypes/video/x-ogm.desktop	(revision 484194)
++++ mimetypes/video/x-ogm.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Comment[is]=Ogg/Ogm kvikmynd
+ Comment[it]=Video Ogg/Ogm
+ Comment[ja]=Ogg/Ogm ビデオ
+-Comment[ka]=Ogg/Ogm ვიდეოფაილი
+ Comment[km]=Ogg/Ogm វីដេអូ
+ Comment[ko]=Ogg/Ogm 비디오
+ Comment[lb]=Ogg/Ogm-Video
+@@ -65,6 +64,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 è¦–é »æª”æ¡ˆ
+--- mimetypes/video/x-theora.desktop	(revision 484194)
++++ mimetypes/video/x-theora.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=Theora kvikmynd
+ Comment[it]=Video Theora
+ Comment[ja]=Theora ビデオ
+-Comment[ka]=Theora ვიდეოფაილი
+ Comment[km]=Theora វីដេអូ
+ Comment[lb]=Theora-Video
+ Comment[mk]=Theora видео
+@@ -63,6 +62,5 @@
+ Comment[uk]=Відео Theora
+ Comment[uz]=Theora видео
+ Comment[wa]=Videyo Theora
+-Comment[xx]=xxTheora Videoxx
+ Comment[zh_CN]=Theora 文件
+ Comment[zh_TW]=Theora è¦–é »æª”æ¡ˆ
+--- mimetypes/video/mpeg.desktop	(revision 484194)
++++ mimetypes/video/mpeg.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=MPEG-kvikmynd
+ Comment[it]=Video MPEG
+ Comment[ja]=MPEGビデオ
+-Comment[ka]=MPEG ვიდეოფაილი
+ Comment[km]=MPEG វីដេអូ
+ Comment[ko]=MPEG 비디오
+ Comment[lb]=MPEG-Video
+@@ -69,7 +68,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
+--- mimetypes/video/quicktime.desktop	(revision 484194)
++++ mimetypes/video/quicktime.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=Quicktime-kvikmynd
+ Comment[it]=Video Quicktime
+ Comment[ja]=Quicktimeビデオ
+-Comment[ka]=Quicktime ვიდეოფაილი
+ Comment[km]=Quicktime វីដេអូ 
+ Comment[ko]=퀵타임 비디오
+ Comment[lb]=Quicktime-Video
+@@ -67,7 +66,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
+--- mimetypes/video/x-ms-asf.desktop	(revision 484194)
++++ mimetypes/video/x-ms-asf.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=ASF miðill
+ Comment[it]=File multimediale ASF
+ Comment[ja]=ASF メディア
+-Comment[ka]=ASF მედიაფაილი
+ Comment[ko]=ASF 파일
+ Comment[lb]=ASF-Media
+ Comment[lv]=ASF multimēdijas fails
+@@ -65,7 +64,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
+--- mimetypes/video/x-ms-wmv.desktop	(revision 484194)
++++ mimetypes/video/x-ms-wmv.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=Windows Metamyndir
+ Comment[it]=Video Windows Media
+ Comment[ja]=Windows Media ファイル
+-Comment[ka]=Windows Media ვიდეოფაილი
+ Comment[km]=Windows Media វីដេអូ
+ Comment[ko]=윈도우즈 미디어 비디오
+ Comment[lb]=Windows-Media-Video
+@@ -62,7 +61,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
+--- mimetypes/video/x-msvideo.desktop	(revision 484194)
++++ mimetypes/video/x-msvideo.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=Microsoft AVI-kvikmynd
+ Comment[it]=Video Microsoft AVI
+ Comment[ja]=MS AVIビデオ
+-Comment[ka]=Microsoft AVI ვიდეოფაილი
+ Comment[km]=Microsoft AVI វីដេអូ
+ Comment[ko]=마이크로소프트 AVI 비디오 파일
+ Comment[lb]=Microsoft-AVI-Video
+@@ -70,7 +69,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
+--- mimetypes/video/vnd.rn-realvideo.desktop	(revision 484194)
++++ mimetypes/video/vnd.rn-realvideo.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=RealVideo skrá
+ Comment[it]=File RealVideo
+ Comment[ja]=RealVideo ファイル
+-Comment[ka]=RealVideo ფაილი
+ Comment[km]=ឯកសារ RealVideo
+ Comment[ko]=리얼비디오 파일
+ Comment[lb]=RealVideo-Datei
+@@ -71,7 +70,6 @@
+ Comment[uk]=Файл RealVideo
+ Comment[uz]=RealVideo-файли
+ Comment[wa]=Fitchî RealVideo
+-Comment[xx]=xxRealVideo Filexx
+ Comment[zh_CN]=RealVideo 文件
+ Comment[zh_TW]=RealVideo 檔案
+ 
+--- mimetypes/video/avi.desktop	(revision 484194)
++++ mimetypes/video/avi.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Microsoft AVI-kvikmynd
+ Comment[it]=Video Microsoft AVI
+ Comment[ja]=MS AVIビデオ
+-Comment[ka]=Microsoft AVI ვიდეოფაილი
+ Comment[km]=Microsoft AVI វីដេអូ
+ Comment[ko]=마이크로소프트 AVI 비디오 파일
+ Comment[lb]=Microsoft-AVI-Video
+@@ -71,7 +70,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
+--- mimetypes/video/mp4.desktop	(revision 484194)
++++ mimetypes/video/mp4.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Comment[is]=MPEG-4 kvikmynd
+ Comment[it]=Video MPEG-4
+ Comment[ja]=MPEG-4 ビデオ
+-Comment[ka]=MPEG-4 ვიდეოფაილი
+ Comment[km]=MPEG-4 វីដេអូ
+ Comment[ko]=MPEG-4 비디오
+ Comment[lb]=MPEG-4-Video
+@@ -64,7 +63,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
+--- mimetypes/video/x-flic.desktop	(revision 484194)
++++ mimetypes/video/x-flic.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=Autodesk FLIC-skrár
+ Comment[it]=File FLIC di Autodesk
+ Comment[ja]=Autodesk's FLIC ファイル
+-Comment[ka]=Autodesk's FLIC ფაილი
+ Comment[km]=ឯកសារ Autodesk's FLIC
+ Comment[ko]=ì˜¤í† ë°ìŠ¤í¬ì—ì„œ ë§Œë“  FLIC 파일
+ Comment[lb]=Autodesk's FLIC-Datei
+@@ -74,7 +73,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
+--- mimetypes/video/x-matroska.desktop	(revision 484194)
++++ mimetypes/video/x-matroska.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=Matroska kvikmynd
+ Comment[it]=Video Matroska
+ Comment[ja]=Matroska ビデオ
+-Comment[ka]=Matroska ვიდეოფაილი
+ Comment[km]=Matroska វីដេអូ 
+ Comment[lb]=Matroska-Video
+ Comment[mk]=Matroska видео
+@@ -62,6 +61,5 @@
+ Comment[uk]=Відео "Матрьошка"
+ Comment[uz]=Matroska видео
+ Comment[wa]=Videyo Matroska
+-Comment[xx]=xxMatroska Videoxx
+ Comment[zh_CN]=Matroska 视频
+ Comment[zh_TW]=Matroska è¦–é »æª”æ¡ˆ
+--- mimetypes/video/x-mng.desktop	(revision 484194)
++++ mimetypes/video/x-mng.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Comment[is]=MNG-mynd
+ Comment[it]=Immagine MNG
+ Comment[ja]=MNG 画像
+-Comment[ka]=MNG ნახატი
+ Comment[km]=រូបភាព MNG
+ Comment[ko]=MNG 그림 (움직이는 PNG)
+ Comment[lb]=MNG-Bild
+@@ -52,7 +51,7 @@
+ Comment[nn]=MNG-bilete
+ Comment[nso]=Ponagalo ya MNG
+ Comment[pa]=MNG ਚਿੱਤਰ
+-Comment[pl]=Obraz MNG
++Comment[pl]=Obrazek MNG
+ Comment[pt]=Imagem MNG
+ Comment[pt_BR]=Imagem MNG
+ Comment[ro]=Imagine MNG
+@@ -76,7 +75,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
+--- mimetypes/inode/socket.desktop	(revision 484194)
++++ mimetypes/inode/socket.desktop	(revision 488534)
+@@ -25,7 +25,6 @@
+ Comment[id]=Soket
+ Comment[is]=Sökkull
+ Comment[ja]=ソケット
+-Comment[ka]=ბუდე
+ Comment[km]=រន្ធ
+ Comment[ko]=소켓
+ Comment[lv]=Ligzda
+@@ -58,7 +57,6 @@
+ Comment[vi]=Socket 
+ Comment[wa]=Soket
+ Comment[xh]=Umngxunya
+-Comment[xx]=xxSocketxx
+ Comment[zh_CN]=套接字
+ Comment[zu]=Isokethi
+ Icon=socket
+--- mimetypes/inode/block.desktop	(revision 484194)
++++ mimetypes/inode/block.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=Blokkatæki
+ Comment[it]=Dispositivo a blocchi
+ Comment[ja]=ブロックデバイス
+-Comment[ka]=ბლოკური მოწყობილობა
+ Comment[km]=ឧបករណ៍​ប្លុក
+ Comment[ko]=블록 장치
+ Comment[lb]=Blockgerät
+@@ -74,7 +73,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
+--- mimetypes/inode/chardevice.desktop	(revision 484194)
++++ mimetypes/inode/chardevice.desktop	(revision 488534)
+@@ -32,10 +32,9 @@
+ Comment[is]=Stafatæki
+ Comment[it]=Dispositivo a caratteri
+ Comment[ja]=キャラクターデバイス
+-Comment[ka]=სიმბოლოების მოწყობილობა
+ Comment[km]=ឧបករណ៍​តួអក្សរ
+ Comment[ko]=캐릭터 장치
+-Comment[lb]=Zeechëgerät
++Comment[lb]=Zeechegerät
+ Comment[lt]=Simbolių įrenginys
+ Comment[lv]=Simbolu iekārta
+ Comment[mi]=Taonga Mahi Tohu
+@@ -73,7 +72,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
+--- mimetypes/inode/directory-locked.desktop	(revision 484194)
++++ mimetypes/inode/directory-locked.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=Læst mappa
+ Comment[it]=Cartella bloccata
+ Comment[ja]=ロックされたフォルダ
+-Comment[ka]=დაბლოკილი დასტა
+ Comment[km]=ថត​ជាប់​សោ
+ Comment[ko]=ìž ê¸´ 자료방
+ Comment[lb]=Gespaarten Dossier
+@@ -66,7 +65,6 @@
+ Comment[uk]=Заблокована тека
+ Comment[uz]=Қулфланган жилд
+ Comment[wa]=Resseré ridant
+-Comment[xx]=xxLocked Folderxx
+ Comment[zh_CN]=锁定的文件夹
+ Comment[zh_TW]=鎖住的資料夾
+ Icon=folder_locked
+--- mimetypes/inode/fifo.desktop	(revision 484194)
++++ mimetypes/inode/fifo.desktop	(revision 488534)
+@@ -29,7 +29,6 @@
+ Comment[id]=Pipa
+ Comment[is]=Pípa
+ Comment[ja]=パイプ
+-Comment[ka]=არხი
+ Comment[km]=បំពង់
+ Comment[ko]=파이프
+ Comment[lb]=Rouer
+@@ -69,7 +68,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
+--- mimetypes/inode/directory.desktop	(revision 484194)
++++ mimetypes/inode/directory.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=Mappa
+ Comment[it]=Cartella
+ Comment[ja]=フォルダ
+-Comment[ka]=დასტა
+ Comment[km]=ថត
+ Comment[ko]=자료방
+ Comment[lb]=Dossier
+@@ -65,7 +64,6 @@
+ Comment[uk]=Тека
+ Comment[uz]=Жилд
+ Comment[wa]=Ridant
+-Comment[xx]=xxFolderxx
+ Comment[zh_CN]=文件夹
+ Comment[zh_TW]=資料夾
+ Icon=folder
+--- kioslave/http/kcookiejar/kcookiejar.desktop	(revision 484194)
++++ kioslave/http/kcookiejar/kcookiejar.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Name[is]=KDED smákökukrukka
+ Name[it]=Modulo Jar dei cookie per KDED
+ Name[ja]=KDED クッキー Jar モジュール
+-Name[ka]=KDED-ის ბმულების Jar მოდული
+ Name[km]=ម៉ូឌុល Jar នៃ​ខូគី KDED
+ Name[ko]=KDED ì¿ í‚¤ JAR 모듈
+ Name[lb]=KDED-Modul fir d'Verwaltung vun de Cookien
+@@ -66,7 +65,6 @@
+ 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
+@@ -93,7 +91,6 @@
+ Comment[is]=Heldur utanum allar smákökur í kerfinu
+ Comment[it]=Tiene traccia di tutti i cookie del sistema
+ Comment[ja]=システムのすべてのクッキーの残します
+-Comment[ka]=სისტემის ყველა ბმულის თვალმიდევნება
+ Comment[km]=រក្សា​ការតាមដាន​ខូគី​ទាំងអស់​ក្នុង​ប្រព័ន្ធ
+ Comment[lb]=Iwwerwaacht all d'Cookie vum System
+ Comment[lt]=Seka visus slapukus sistemoje
+@@ -123,7 +120,6 @@
+ Comment[tt]=Sistemdäge bar cookie'larnı küz astında tota
+ Comment[uk]=Стежить за всіма куками в системі
+ Comment[uz]=Тизимдаги ҳамма кукиларни кузатади
+-Comment[xx]=xxKeeps track of all cookies in the systemxx
+ Comment[zh_CN]=将全部 cookies 的记录保存在系统中
+ ServiceTypes=KDEDModule
+ Exec=kcookiejar
+--- kioslave/http/http_cache_cleaner.desktop	(revision 484194)
++++ kioslave/http/http_cache_cleaner.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Name[is]=Hreinsiforrit HTTP skyndiminnis
+ Name[it]=Ripulitore della cache HTTP
+ Name[ja]=HTTPキャッシュマネージャ
+-Name[ka]=HTTP ბუფერის გასუფთავება
+ Name[km]=កម្មវិធី​សម្អាត​ឃ្លាំង​សម្ងាត់ HTTP
+ Name[ko]=HTTP 캐시 ì •ë¦¬
+ Name[lb]=Opraumer fir den HTTP-Zwëschespäicher
+@@ -73,7 +72,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
+@@ -110,7 +108,6 @@
+ Comment[is]=Hreinsar gamlar færslur úr HTTP skyndiminninu
+ Comment[it]=Ripulisce la cache HTTP dalle voci vecchie
+ Comment[ja]=HTTPキャッシュから古いエントリを削除する
+-Comment[ka]=HTTP ბუფერის მოძველებელი ელემენტების 
+ Comment[km]=សម្អាត​ធាតុ​ចាស់ៗ​ពី​ឃ្លាំង​សម្ងាត់ HTTP
+ Comment[ko]=HTTP 캐시에서 오래된 것들을 ì •ë¦¬í•©ë‹ˆë‹¤
+ Comment[lb]=Entfernt al Entréen aus dem HTTP-Zwëschespäicher
+@@ -150,7 +147,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
+--- kioslave/bzip2/kbzip2filter.desktop	(revision 484194)
++++ kioslave/bzip2/kbzip2filter.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Name[is]=BZip2 sía
+ Name[it]=Filtro Bzip2
+ Name[ja]=BZip2フィルタ
+-Name[ka]=Bzip2 ფილტრი
+ Name[km]=តម្រង BZip2
+ Name[ko]=BZip2 거르개
+ Name[lb]=BZip2-Filter
+@@ -73,7 +72,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
+--- kioslave/gzip/kgzipfilter.desktop	(revision 484194)
++++ kioslave/gzip/kgzipfilter.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Name[is]=GZip sía
+ Name[it]=Filtro Gzip
+ Name[ja]=GZipフィルタ
+-Name[ka]=GZip ფილტრი
+ Name[km]=តម្រង GZip
+ Name[ko]=GZip 거르개
+ Name[lb]=GZip-Filter
+@@ -73,7 +72,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
+--- kimgio/xpm.kimgio	(revision 484194)
++++ kimgio/xpm.kimgio	(revision 488534)
+@@ -34,7 +34,6 @@
+ Name[is]=X PixMap mynd
+ Name[it]=Immagine X PixMap
+ Name[ja]=Xピックスマップ画像
+-Name[ka]=X PixMap ნახატი
+ Name[km]=រូបភាព X PixMap
+ Name[ko]=X용 픽스맵 그림
+ Name[lb]=X-PixMap-Bild
+@@ -69,7 +68,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
+--- kimgio/g3.kimgio	(revision 484194)
++++ kimgio/g3.kimgio	(revision 488534)
+@@ -30,7 +30,6 @@
+ Name[id]=Faks CCITT G3
+ Name[is]=CCITT G3 fax
+ Name[it]=Fax CCITT G3
+-Name[ka]=ფაქსის ფაილი CCITT G3 ფორმატში
+ Name[km]=ទូរសារ CCITT G3
+ Name[ko]=CCITT G3 팩스
+ Name[lb]=CCITT-G3-Fax
+@@ -60,7 +59,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
+--- kimgio/ico.kimgio	(revision 484194)
++++ kimgio/ico.kimgio	(revision 488534)
+@@ -34,7 +34,6 @@
+ Name[is]=Windows táknmynd
+ Name[it]=Icona Windows
+ Name[ja]=Windowsアイコン
+-Name[ka]=Windows-ის პიქტოგრამა
+ Name[km]=រូបតំណាង​បង្អួច
+ Name[ko]=윈도우즈 아이콘
+ Name[lb]=Windows-Symbol
+@@ -69,7 +68,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
+--- kimgio/rgb.kimgio	(revision 484194)
++++ kimgio/rgb.kimgio	(revision 488534)
+@@ -30,7 +30,6 @@
+ Name[is]=SGI mynd (RGB)
+ Name[it]=Immagine SGI (RGB)
+ Name[ja]=SGI イメージ (RGB)
+-Name[ka]=SGI (RGB) ნახატი
+ Name[km]=រូបភាព SGI (RGB)
+ Name[ko]=CGI 그림 (RGB)
+ Name[lb]=SGI-Bild (RGB)
+@@ -62,7 +61,6 @@
+ Name[tt]=SGI Sürät (RGB)
+ Name[uk]=Зображення SGI (RGB)
+ Name[uz]=SGI-расм (RGB)
+-Name[xx]=xxSGI Image (RGB)xx
+ Name[zh_CN]=SGI 图像(RGB)
+ Read=true
+ Write=true
+--- kimgio/hdr.kimgio	(revision 484194)
++++ kimgio/hdr.kimgio	(revision 488534)
+@@ -2,6 +2,7 @@
+ Type=HDR
+ Header=^\x23\x3f(RGBE|RADIANCE)
+ Name=High Dynamic Range Image
++Name[af]=Hoe Dinamiese Reeks Beeld
+ Name[bg]=Изображение с висока динамичност (High Dynamic Range)
+ Name[ca]=Imatge de rang altament dinà mic
+ Name[cs]=Obrázek ve formátu HDRI
+@@ -14,8 +15,9 @@
+ Name[fy]=High Dynamic Range-ôfbylding
+ Name[gl]=Imaxe de Alto Rango Dinámico (HDR)
+ Name[hu]=HDR-kép
++Name[is]=High Dynamic Range mynd
+ Name[it]=Immagine High Dynamic Range
+-Name[ka]=HDR ნახატი
++Name[ja]=High Dynamic Range 画像
+ Name[km]=រូបភាព​ជួរ​ថាមវណ្ដ​ខ្ពស់
+ Name[lb]=High-Dynamic-Range-Bild
+ Name[nb]=Bilde med høyt dynamisk område
+@@ -34,7 +36,6 @@
+ Name[tg]=Тасвири динамикии баландқатор
+ Name[tt]=Bik Tere Aralı Sürät
+ Name[uk]=Зображення HDR (High Dynamic Range)
+-Name[xx]=xxHigh Dynamic Range Imagexx
+ Name[zh_CN]=高动态范围图像
+ Read=true
+ Write=false
+--- kimgio/bmp.kimgio	(revision 484194)
++++ kimgio/bmp.kimgio	(revision 488534)
+@@ -34,7 +34,6 @@
+ Name[is]=BMP myndir
+ Name[it]=Immagine BMP
+ Name[ja]=BMP画像
+-Name[ka]=BMP ნახატი
+ Name[km]=រូបភាព BMP
+ Name[ko]=BMP 그림
+ Name[lb]=BMP-Bild
+@@ -69,7 +68,6 @@
+ Name[uk]=Зображення BMP
+ Name[uz]=BMP-расм
+ Name[wa]=Imådje BMP
+-Name[xx]=xxBMP Imagexx
+ Name[zh_CN]=BMP 图像
+ Read=true
+ Write=true
+--- kimgio/xcf.kimgio	(revision 484194)
++++ kimgio/xcf.kimgio	(revision 488534)
+@@ -25,7 +25,6 @@
+ Name[is]=GIMP mynd
+ Name[it]=Immagine GIMP
+ Name[ja]=GIMP画像
+-Name[ka]=GIMP ნახატი
+ Name[km]=រូបភាព GIMP
+ Name[lb]=GIMP-Bild
+ Name[lt]=GIMP paveiksliukas
+@@ -55,7 +54,6 @@
+ Name[tt]=GIMP Sürät
+ Name[uk]=Зображення GIMP
+ Name[uz]=GIMP-расм
+-Name[xx]=xxGIMP Imagexx
+ Name[zh_CN]=GIMP 图像
+ Read=true
+ Write=false
+--- kimgio/mng.kimgio	(revision 484194)
++++ kimgio/mng.kimgio	(revision 488534)
+@@ -26,7 +26,6 @@
+ Name[is]=MNG mynd
+ Name[it]=Immagine MNG
+ Name[ja]=MNG画像
+-Name[ka]=MNG ნახატი
+ Name[km]=រូបភាព MNG
+ Name[lb]=MNG-Bild
+ Name[lt]=MNG paveiksliukas
+@@ -55,7 +54,6 @@
+ Name[tt]=MNG Sürät
+ Name[uk]=Зображення MNG
+ Name[uz]=MNG-расм
+-Name[xx]=xxMNG Imagexx
+ Name[zh_CN]=MNG 图像
+ Read=true
+ Write=false
+--- kimgio/jpeg.kimgio	(revision 484194)
++++ kimgio/jpeg.kimgio	(revision 488534)
+@@ -34,7 +34,6 @@
+ Name[is]=JPEG mynd
+ Name[it]=Immagine JPEG
+ Name[ja]=JPEG画像
+-Name[ka]=JPEG ნახატი
+ Name[km]=រូបភាព JPEG
+ Name[ko]=JPEG 그림
+ Name[lb]=JPEG-Bild
+@@ -69,7 +68,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
+--- kimgio/psd.kimgio	(revision 484194)
++++ kimgio/psd.kimgio	(revision 488534)
+@@ -3,6 +3,7 @@
+ Header=^8BPS
+ Name=Adobe Photoshop Image
+ Name[bg]=Изображение на Adobe Photoshop
++Name[bn]=অ্যাডোব ফোটোশপ চিত্র
+ Name[br]=Skeudenn Adobe Photoshop
+ Name[ca]=Imatge Adobe Photoshop
+ Name[cs]=Obrázek Adobe Photoshop
+@@ -10,6 +11,7 @@
+ Name[da]=Adobe Photoshop-billede
+ Name[de]=Adobe-Photoshop-Bild
+ Name[el]=Εικόνα Adobe Photoshop
++Name[es]=Imagen Photoshop de Adobe
+ Name[et]=Adobe Photoshop pildifail
+ Name[fi]=Adobe Photoshop -kuva
+ Name[fr]=Image Adobe Photoshop
+@@ -18,6 +20,7 @@
+ Name[hu]=Adobe Photoshop-kép
+ Name[is]=Adobe Photoshop mynd
+ Name[it]=Immagine Adobe Photoshop
++Name[ja]=Adobe Photoshop 画像
+ Name[km]= រូបភាព​របស់ Adobe Photoshop
+ Name[lb]=Adobe-Photoshop-Bild
+ Name[nds]=Adobe-Photoshop-Bild
+@@ -35,7 +38,6 @@
+ Name[tg]=Тасвири Adobe Photoshop
+ Name[uk]=Зображення Adobe Photoshop
+ Name[uz]=Adobe Photoshop-расм
+-Name[xx]=xxAdobe Photoshop Imagexx
+ Name[zh_CN]=Adobe Photoshop 图像
+ Read=true
+ Write=false
+--- kimgio/eps.kimgio	(revision 484194)
++++ kimgio/eps.kimgio	(revision 488534)
+@@ -34,7 +34,6 @@
+ Name[is]=Postscript-myndir (encapsulated)
+ Name[it]=Immagine Encapsulated PostScript
+ Name[ja]=Encapsulated PostScriptイメージ
+-Name[ka]=EPS ნახატი
+ Name[km]=រូបភាព Encapsulated PostScript
+ Name[ko]=암호화된 포스트스크립트 그림
+ Name[lb]=Gekapselt PostScript-Bild
+@@ -68,7 +67,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
+--- kimgio/tiff.kimgio	(revision 484194)
++++ kimgio/tiff.kimgio	(revision 488534)
+@@ -34,7 +34,6 @@
+ Name[is]=TIFF mynd
+ Name[it]=Immagine TIFF
+ Name[ja]=TIFF画像
+-Name[ka]=TIFF ნახატი
+ Name[km]=រូបភាព TIFF
+ Name[ko]=TIFF 그림
+ Name[lb]=TIFF-Bild
+@@ -69,7 +68,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
+--- kimgio/pcx.kimgio	(revision 484194)
++++ kimgio/pcx.kimgio	(revision 488534)
+@@ -34,7 +34,6 @@
+ Name[is]=PCX mynd
+ Name[it]=Immagine PCX
+ Name[ja]=PCX画像
+-Name[ka]=PCX ნახატი
+ Name[km]=រូបភាព PCX
+ Name[ko]=PCX 그림
+ Name[lb]=PCX-Bild
+@@ -69,7 +68,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
+--- kimgio/jp2.kimgio	(revision 484194)
++++ kimgio/jp2.kimgio	(revision 488534)
+@@ -34,7 +34,6 @@
+ Name[is]=JPEG 2000 mynd
+ Name[it]=Immagine JPEG 2000
+ Name[ja]=JPEG 2000画像
+-Name[ka]=JPEG 2000 ნახატი
+ Name[km]=រូបភាព JPEG 2000
+ Name[ko]=JPEG 2000 그림
+ Name[lb]=JPEG-2000-Bild
+@@ -69,7 +68,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
+--- kimgio/gif.kimgio	(revision 484194)
++++ kimgio/gif.kimgio	(revision 488534)
+@@ -34,7 +34,6 @@
+ Name[is]=GIF mynd
+ Name[it]=Immagine GIF
+ Name[ja]=GIF画像
+-Name[ka]=GIF ნახატი
+ Name[km]=រូបភាព GIF
+ Name[ko]=GIF 그림
+ Name[lb]=GIF-Bild
+@@ -69,7 +68,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
+--- kimgio/dds.kimgio	(revision 484194)
++++ kimgio/dds.kimgio	(revision 488534)
+@@ -19,7 +19,6 @@
+ Name[hu]=DirectDraw-felület
+ Name[is]=Direct Draw yfirborð
+ Name[it]=Superficie DirectDraw
+-Name[ka]=Direct Draw ზედაპირი
+ Name[lb]=Direct-Draw-Uewerfläch
+ Name[lv]=Direct Draw virsma
+ Name[ms]=Permukaan Direct Draw
+@@ -45,7 +44,6 @@
+ Name[tr]=Doğrudan Çizim Yüzeyi
+ Name[tt]=Direct Draw Öslege
+ Name[uk]=Поверхня Direct Draw
+-Name[xx]=xxDirect Draw Surfacexx
+ Name[zh_CN]=DirectDraw 表面
+ Read=true
+ Write=false
+--- kimgio/tga.kimgio	(revision 484194)
++++ kimgio/tga.kimgio	(revision 488534)
+@@ -34,7 +34,6 @@
+ Name[is]=Truevision Targa mynd
+ Name[it]=Immagine Truevision Targa
+ Name[ja]=トゥルービジョンTargaイメージ
+-Name[ka]=Truevision Targa ნახატი
+ Name[km]=រូបភាព Truevision Targa
+ Name[ko]=íŠ¸ë£¨ë¹„ì „ 타가 그림
+ Name[lb]=Truevision-Targa-Bild
+@@ -68,7 +67,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
+--- kimgio/pbm.kimgio	(revision 484194)
++++ kimgio/pbm.kimgio	(revision 488534)
+@@ -32,7 +32,6 @@
+ Name[is]=Skráarsnið GIMP forritsins (PBI)
+ Name[it]=Immagine Portable Bitmap
+ Name[ja]=ポータブルビットマップ画像
+-Name[ka]=Portable Bitmap ნახატი
+ Name[km]=រូបភាព Portable Bitmap
+ Name[ko]=포터블 비트맵 그림
+ Name[lb]=Portéierbart Bitmap-Bild
+@@ -67,7 +66,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
+--- kimgio/pgm.kimgio	(revision 484194)
++++ kimgio/pgm.kimgio	(revision 488534)
+@@ -33,7 +33,6 @@
+ Name[is]=Skráarsnið GIMP forritsins (PGI)
+ Name[it]=Immagine Portable Graymap
+ Name[ja]=ポータブルグレイマップ画像
+-Name[ka]=Portable Graymap ნახატი
+ Name[km]=រូបភាព​ Portable Graymap
+ Name[lb]=Portéierbart Graymap-Bild
+ Name[lt]=Perkeliamas pilkų pustonių (greymap) paveiksliukas
+@@ -67,7 +66,6 @@
+ Name[uk]=Чорно-біле зображення у портативному форматі
+ Name[uz]=PGM-расм
+ Name[wa]=Imådje PGM
+-Name[xx]=xxPortable Graymap Imagexx
+ Name[zh_CN]=便携灰度图像
+ Read=true
+ Write=true
+--- kimgio/png.kimgio	(revision 484194)
++++ kimgio/png.kimgio	(revision 488534)
+@@ -34,7 +34,6 @@
+ Name[is]=PNG mynd
+ Name[it]=Immagine PNG
+ Name[ja]=PNG画像
+-Name[ka]=PNG ნახატი
+ Name[km]=រូបភាព PNG
+ Name[ko]=PNG 그림
+ Name[lb]=PNG-Bild
+@@ -69,7 +68,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
+--- kimgio/xbm.kimgio	(revision 484194)
++++ kimgio/xbm.kimgio	(revision 488534)
+@@ -34,7 +34,6 @@
+ Name[is]=X BitMap mynd
+ Name[it]=Immagine X BitMap
+ Name[ja]=Xビットマップ画像
+-Name[ka]=X BitMap ნახატი
+ Name[km]=រូបភាព X BitMap
+ Name[ko]=X용 비트맵 그림
+ Name[lb]=X-BitMap-Bild
+@@ -69,7 +68,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
+--- kimgio/ppm.kimgio	(revision 484194)
++++ kimgio/ppm.kimgio	(revision 488534)
+@@ -33,7 +33,6 @@
+ Name[is]=Skráarsnið GIMP forritsins (PPI)
+ Name[it]=Immagine Portable Pixmap
+ Name[ja]=ポータブルピックスマップ画像
+-Name[ka]=Portable Pixmap ნახატი
+ Name[km]=រូបភាព Portable Pixmap
+ Name[ko]=포터블 픽스맵 그림
+ Name[lb]=Portéierbart Pixmap-Bild
+@@ -68,7 +67,6 @@
+ Name[uk]=Растрове зображення у портативному форматі
+ Name[uz]=PPMP-расм
+ Name[wa]=Imådje PPM
+-Name[xx]=xxPortable Pixmap Imagexx
+ Name[zh_CN]=ä¾¿æºåƒç´ å›¾å›¾åƒ
+ Name[zh_TW]=å¯æ”œå¼åƒç´ å½±åƒ
+ Read=true
+--- kimgio/xv.kimgio	(revision 484194)
++++ kimgio/xv.kimgio	(revision 488534)
+@@ -35,7 +35,6 @@
+ Name[is]=XView mynd
+ Name[it]=Immagine XView
+ Name[ja]=XView画像
+-Name[ka]=XView ნახატი
+ Name[km]=រូបភាព XView
+ Name[ko]=XView 그림
+ Name[lb]=XView-Bild
+@@ -70,7 +69,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
+--- kimgio/exr.kimgio	(revision 484194)
++++ kimgio/exr.kimgio	(revision 488534)
+@@ -23,7 +23,6 @@
+ Name[is]=ILM EXR mynd Kimgio
+ Name[it]=Immagine Kimgio ILM EXR
+ Name[ja]=ILM EXR 画像 Kimgio
+-Name[ka]=ILM EXR ნახატი
+ Name[lb]=ILM-EXR-Bild Kimgio
+ Name[lt]=ILM EXR paveiksliukas Kimgio
+ Name[mk]=ILM EXR слика Kimgio
+@@ -50,7 +49,6 @@
+ Name[tr]=ILM EXR Resim Kimgio
+ Name[tt]=ILM EXR Süräte
+ Name[uk]=Ввід/Вивід для зображень ILM EXR
+-Name[xx]=xxILM EXR Image Kimgioxx
+ Name[zh_CN]=ILM EXR 图像 Kimgio
+ Read=true
+ Write=false
+--- kio/kfileplugin.desktop	(revision 484194)
++++ kio/kfileplugin.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Name[is]=KFile lýsiskráar-íforrit
+ Name[it]=Plugin informazioni aggiuntive per KFile
+ Name[ja]=KFileメタデータプラグイン
+-Name[ka]=KFile-ს მეტამონაცემთა მოდული
+ Name[km]=កម្មវិធី​ជំនួយ​ខាង​ក្នុង​នៃ​ទិន្នន័យ​មេតា KFile
+ Name[ko]=K파일 메타 자료 플러그인
+ Name[lb]=KFile-Metadonnéeë-Plugin
+@@ -68,7 +67,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 資料定義外掛程式
+ 
+--- kio/kio/kdirlister_p.h	(revision 484194)
++++ kio/kio/kdirlister_p.h	(revision 488534)
+@@ -181,6 +181,8 @@
+ 
+   static KDirListerCache *self();
+ 
++  static bool exists(); 
++
+ private slots:
+   void slotFileDirty( const QString &_file );
+   void slotFileCreated( const QString &_file );
+--- kio/kio/kdirwatch.h	(revision 484194)
++++ kio/kio/kdirwatch.h	(revision 488534)
+@@ -218,7 +218,7 @@
+     */
+    void setDeleted( const QString &path );
+ 
+-   enum Method { FAM, DNotify, Stat };
++   enum Method { FAM, DNotify, Stat, INotify };
+    /**
+     * Returns the preferred internal method to
+     * watch for changes.
+--- kio/kio/configure.in.in	(revision 484194)
++++ kio/kio/configure.in.in	(revision 488534)
+@@ -101,3 +101,48 @@
+     AC_MSG_RESULT(no)
+   fi
+ fi
++
++dnl ------------------------------------------------------------------------
++dnl Try to find if we have Linux Inode based Dir Notification
++dnl ------------------------------------------------------------------------
++
++AC_ARG_ENABLE(inotify,
++AC_HELP_STRING([--enable-inotify],[enable use of Linux inode notifications]),
++[ kde_enable_inotify=$enableval ], [kde_enable_inotify=yes])dnl
++
++AC_CHECK_GNU_EXTENSIONS
++
++if test "x$kde_enable_inotify" = "xyes"; then
++  AC_MSG_CHECKING([for Linux Inotify Notification])
++  AC_CACHE_VAL(kde_cv_have_inotify,
++  [
++  kde_cv_have_inotify=no
++  AC_LANG_SAVE
++  AC_LANG_C
++
++  AC_TRY_COMPILE(
++  [
++#include <asm/unistd.h>
++#define _S390_BITOPS_H
++#include <linux/inotify.h>
++  ],
++  [
++#ifndef IN_ALL_EVENTS
++#error no inotify notification
++#endif
++#ifndef __NR_inotify_init
++#error no __NR_inotify_init
++#endif
++
++  ],kde_cv_have_inotify=yes,kde_cv_have_inotify=no)
++
++  AC_LANG_RESTORE
++  ])
++
++  if test "$kde_cv_have_inotify" = "yes" ; then
++    AC_DEFINE_UNQUOTED(HAVE_INOTIFY, 1, [Define if your system has Linux Inode Notification])
++    AC_MSG_RESULT(yes)
++  else
++    AC_MSG_RESULT(no)
++  fi
++fi
+--- kio/kio/kdirwatch.cpp	(revision 484194)
++++ kio/kio/kdirwatch.cpp	(revision 488534)
+@@ -19,6 +19,7 @@
+ 
+ 
+ // CHANGES:
++// Oct 4,  2005 - Inotify support (Dirk Mueller)
+ // Februar 2002 - Add file watching and remote mount check for STAT
+ // Mar 30, 2001 - Native support for Linux dir change notification.
+ // Jan 28, 2000 - Usage of FAM service on IRIX (Josef.Weidendorfer at in.tum.de)
+@@ -32,6 +33,7 @@
+ 
+ 
+ #include <config.h>
++#include <errno.h>
+ 
+ #ifdef HAVE_DNOTIFY
+ #include <unistd.h>
+@@ -41,6 +43,7 @@
+ #include <errno.h>
+ #endif
+ 
++
+ #include <sys/stat.h>
+ #include <assert.h>
+ #include <qdir.h>
+@@ -58,6 +61,43 @@
+ #include <kstaticdeleter.h>
+ #include <kde_file.h>
+ 
++// debug
++#include <sys/ioctl.h>
++
++#ifdef HAVE_INOTIFY
++#include <unistd.h>
++#include <fcntl.h>
++#include <sys/syscall.h>
++#include <linux/types.h>
++// Linux kernel headers are documented to not compile
++#define _S390_BITOPS_H
++#include <linux/inotify.h>
++
++static inline int inotify_init (void)
++{
++  return syscall (__NR_inotify_init);
++}
++
++static inline int inotify_add_watch (int fd, const char *name, __u32 mask)
++{
++  return syscall (__NR_inotify_add_watch, fd, name, mask);
++}
++
++static inline int inotify_rm_watch (int fd, __u32 wd)
++{
++  return syscall (__NR_inotify_rm_watch, fd, wd);
++}
++
++#ifndef  IN_ONLYDIR
++#define  IN_ONLYDIR             0x01000000 
++#endif
++
++#ifndef IN_DONT_FOLLOW
++#define IN_DONT_FOLLOW 0x02000000
++#endif
++
++#endif
++
+ #include "kdirwatch.h"
+ #include "kdirwatch_p.h"
+ #include "global.h" //  KIO::probably_slow_mounted
+@@ -93,9 +133,7 @@
+ //  kdDebug(7001) << "DNOTIFY Handler: fd " << si->si_fd << " path "
+ //		<< QString(e ? e->path:"unknown") << endl;
+ 
+-  if(!e || e->dn_fd != si->si_fd) {
+-    qDebug("fatal error in KDirWatch");
+-  } else
++  if(e && e->dn_fd == si->si_fd)
+     e->dirty = true;
+ 
+   char c = 0;
+@@ -165,6 +203,10 @@
+  *   introduced. By opening a directory, you can request for
+  *   UNIX signals to be sent to the process when a directory
+  *   is changed.
++ * - INOTIFY: In LINUX 2.6.13, inode change notification was
++ *   introduced. You're now able to watch arbitrary inode's
++ *   for changes, and even get notification when they're
++ *   unmounted.
+  */
+ 
+ KDirWatchPrivate::KDirWatchPrivate()
+@@ -202,8 +244,46 @@
+   }
+ #endif
+ 
++#ifdef HAVE_INOTIFY
++  supports_inotify = true;
++
++  m_inotify_fd = inotify_init();
++
++  if ( m_inotify_fd <= 0 ) {
++    kdDebug(7001) << "Can't use Inotify, kernel doesn't support it" << endl;
++    supports_inotify = false;
++  }
++
++  if ( supports_inotify ) {
++    int wd = inotify_add_watch ( m_inotify_fd, "/", 0x800 );
++    if (wd > 0) {
++      inotify_rm_watch( m_inotify_fd, wd );
++      available += ", INotify";
++
++      fcntl(m_inotify_fd, F_SETFD, FD_CLOEXEC);
++
++      mSn = new QSocketNotifier( m_inotify_fd, QSocketNotifier::Read, this );
++      connect( mSn, SIGNAL(activated( int )), this, SLOT( slotActivated() ) );
++    }
++    else {
++      kdDebug(7001) << "kernel too old for inotify" << endl;
++      supports_inotify = false;
++      close(m_inotify_fd);
++      m_inotify_fd = -1;
++    }
++  }
++#endif
++
+ #ifdef HAVE_DNOTIFY
+-  supports_dnotify = true; // not guilty until proven guilty
++
++  // if we have inotify, disable dnotify.
++#ifdef HAVE_INOTIFY
++  supports_dnotify = !supports_inotify;
++#else
++  // otherwise, not guilty until proven guilty.
++  supports_dnotify = true;
++#endif
++
+   struct utsname uts;
+   int major, minor, patch;
+   if (uname(&uts) < 0)
+@@ -267,21 +347,118 @@
+     kdDebug(7001) << "KDirWatch deleted (FAM closed)" << endl;
+   }
+ #endif
++#ifdef HAVE_INOTIFY
++  if ( supports_inotify )
++    ::close( m_inotify_fd );
++#endif
+ #ifdef HAVE_DNOTIFY
+   close(mPipe[0]);
+   close(mPipe[1]);
+ #endif
+ }
+ 
++#include <stdlib.h>
++
+ void KDirWatchPrivate::slotActivated()
+ {
+ #ifdef HAVE_DNOTIFY
+-   char dummy_buf[4096];
+-   read(mPipe[0], &dummy_buf, 4096);
++  if ( supports_dnotify )
++  {
++    char dummy_buf[4096];
++    read(mPipe[0], &dummy_buf, 4096);
+ 
+-   if (!rescan_timer.isActive())
+-      rescan_timer.start(m_PollInterval, true);
++    if (!rescan_timer.isActive())
++      rescan_timer.start(m_PollInterval, true /* singleshot */);
++
++    return;
++  }
+ #endif
++
++#ifdef HAVE_INOTIFY
++  if ( !supports_inotify )
++    return;
++
++  int pending = -1;
++  int offset = 0;
++  char buf[4096];
++  assert( m_inotify_fd > -1 );
++  ioctl( m_inotify_fd, FIONREAD, &pending );
++
++  while ( pending > 0 ) {
++
++    if ( pending > (int)sizeof( buf ) )
++      pending = sizeof( buf );
++
++    pending = read( m_inotify_fd, buf, pending);
++
++    while ( pending > 0 ) {
++      struct inotify_event *event = (struct inotify_event *) &buf[offset];
++      pending -= sizeof( struct inotify_event ) + event->len;
++      offset += sizeof( struct inotify_event ) + event->len;
++
++      QString path;
++      if ( event->len )
++        path = QFile::decodeName( QCString( event->name, event->len ) );
++
++      if ( event->mask & IN_IGNORED )
++        continue;
++
++      if ( path.length() && isNoisyFile( path.latin1() ) )
++        continue;
++
++      kdDebug() << "ev wd: " << event->wd << " mask " << event->mask << " path: " << path << endl;
++
++      // now we're in deep trouble of finding the
++      // associated entries
++      // for now, we suck and iterate
++      for ( EntryMap::Iterator it = m_mapEntries.begin();
++            it != m_mapEntries.end(); ++it ) {
++        Entry* e = &( *it );
++        if ( e->wd == event->wd ) {
++          e->dirty = true;
++
++          if ( 1 || e->isDir) {
++            if( event->mask & IN_DELETE_SELF) {
++              kdDebug() << "-->got deleteself signal for " << e->path << endl;
++              e->m_status = NonExistent;
++              //(void) inotify_rm_watch( m_inotify_fd, e->wd );
++              addEntry(0, QDir::cleanDirPath(e->path+"/.."), e, true);
++            }
++            if ( event->mask & IN_CREATE ) {
++              kdDebug() << "-->got create subfile signal for " << e->path << endl;
++
++              Entry *sub_entry = e->m_entries.first();
++              for(;sub_entry; sub_entry = e->m_entries.next())
++                if (sub_entry->path == e->path + "/" + path) break;
++
++              if (sub_entry /*&& sub_entry->isDir*/) {
++                removeEntry(0,e->path, sub_entry);
++                KDE_struct_stat stat_buf;
++                QCString tpath = QFile::encodeName(path);
++                KDE_stat(tpath, &stat_buf);
++
++                //sub_entry->isDir = S_ISDIR(stat_buf.st_mode);
++                //sub_entry->m_ctime = stat_buf.st_ctime;
++                //sub_entry->m_status = Normal;
++                //sub_entry->m_nlink = stat_buf.st_nlink;
++
++                if(!useINotify(sub_entry))
++                  useStat(sub_entry);
++                sub_entry->dirty = true;
++              }
++            }
++          }
++
++          if (!rescan_timer.isActive())
++            rescan_timer.start(m_PollInterval, true /* singleshot */);
++
++          break; // there really should be only one matching wd
++        }
++      }
++
++    }
++  }
++#endif
+ }
+ 
+ /* In DNOTIFY/FAM mode, only entries which are marked dirty are scanned.
+@@ -290,13 +467,13 @@
+  */
+ void KDirWatchPrivate::Entry::propagate_dirty()
+ {
+-  Entry* sub_entry;
+-  for(sub_entry = m_entries.first(); sub_entry; sub_entry = m_entries.next())
++  for (QPtrListIterator<Entry> sub_entry (m_entries); 
++       sub_entry.current(); ++sub_entry)
+   {
+-     if (!sub_entry->dirty)
++     if (!sub_entry.current()->dirty)
+      {
+-        sub_entry->dirty = true;
+-        sub_entry->propagate_dirty();
++        sub_entry.current()->dirty = true;
++        sub_entry.current()->propagate_dirty();
+      }
+   }
+ }
+@@ -385,7 +562,7 @@
+ }
+ 
+ 
+-#if defined(HAVE_FAM)
++#ifdef HAVE_FAM
+ // setup FAM notification, returns false if not possible
+ bool KDirWatchPrivate::useFAM(Entry* e)
+ {
+@@ -517,7 +694,41 @@
+ }
+ #endif
+ 
++#ifdef HAVE_INOTIFY
++// setup INotify notification, returns false if not possible
++bool KDirWatchPrivate::useINotify( Entry* e )
++{
++  e->wd = 0;
++  e->dirty = false;
++  if (!supports_inotify) return false;
+ 
++  e->m_mode = INotifyMode;
++
++  int mask = IN_DELETE|IN_DELETE_SELF|IN_CREATE|IN_MOVE|0x800|IN_DONT_FOLLOW;
++  if(!e->isDir)
++    mask |= IN_MODIFY|IN_ATTRIB|IN_ONLYDIR;
++  // if dependant is a file watch, we check for MODIFY & ATTRIB too
++  for(Entry* dep=e->m_entries.first();dep;dep=e->m_entries.next()) {
++    if (!dep->isDir) { mask |= IN_MODIFY|IN_ATTRIB; break; }
++  }
++
++  if ( ( e->wd = inotify_add_watch( m_inotify_fd,
++        QFile::encodeName( e->path ), mask) ) > 0 )
++  {
++    kdDebug(7001) << "** inotify watching " << e->path << " " << e->wd << endl;
++    return true;
++  } else
++    kdDebug(7001) << "** inotify failed " << e->path << " " << errno << endl;
++
++  if ( e->m_status == NonExistent ) {
++    addEntry(0, QDir::cleanDirPath(e->path+"/.."), e, true);
++    return true;
++  }
++
++  return false;
++}
++#endif
++
+ bool KDirWatchPrivate::useStat(Entry* e)
+ {
+   if (KIO::probably_slow_mounted(e->path))
+@@ -606,9 +817,9 @@
+     e->isDir = S_ISDIR(stat_buf.st_mode);
+ 
+     if (e->isDir && !isDir)
+-      qWarning("KDirWatch: %s is a directory. Use addDir!", path.ascii());
++      kdWarning() << "KDirWatch: " << path << " is a directory. Use addDir!" << endl;
+     else if (!e->isDir && isDir)
+-      qWarning("KDirWatch: %s is a file. Use addFile!", path.ascii());
++      kdWarning() << "KDirWatch: " << path << " is a file. Use addFile!" << endl;
+ 
+     e->m_ctime = stat_buf.st_ctime;
+     e->m_status = Normal;
+@@ -641,10 +852,14 @@
+   if ( isNoisyFile( tpath ) )
+     return;
+ 
+-#if defined(HAVE_FAM)
++#ifdef HAVE_FAM
+   if (useFAM(e)) return;
+ #endif
+ 
++#ifdef HAVE_INOTIFY
++  if (useINotify(e)) return;
++#endif
++
+ #ifdef HAVE_DNOTIFY
+   if (useDNotify(e)) return;
+ #endif
+@@ -667,13 +882,15 @@
+   else
+     e->removeClient(instance);
+ 
+-  if (e->m_clients.count() || e->m_entries.count())
++  if (e->m_clients.count() || e->m_entries.count()) {
++    kdDebug(7001) << "removeEntry: unwatched " << e->path << " " << _path << endl;
+     return;
++  }
+ 
+   if (delayRemove) {
+     // removeList is allowed to contain any entry at most once
+     if (removeList.findRef(e)==-1)
+-    removeList.append(e);
++      removeList.append(e);
+     // now e->isValid() is false
+     return;
+   }
+@@ -695,6 +912,20 @@
+   }
+ #endif
+ 
++#ifdef HAVE_INOTIFY
++  kdDebug() << "inotify remove " << ( e->m_mode == INotifyMode ) << " " << ( e->m_status == Normal )  << endl;
++  if (e->m_mode == INotifyMode) {
++    if ( e->m_status == Normal ) {
++      (void) inotify_rm_watch( m_inotify_fd, e->wd );
++      kdDebug(7001) << "Cancelled INotify (fd " <<
++        m_inotify_fd << ", "  << e->wd <<
++        ") for " << e->path << endl;
++    }
++    else
++      removeEntry( 0, QDir::cleanDirPath( e->path+"/.." ), e );
++  }
++#endif
++
+ #ifdef HAVE_DNOTIFY
+   if (e->m_mode == DNotifyMode) {
+     if (!e->isDir) {
+@@ -787,6 +1018,7 @@
+   if (stillWatching == 0) {
+     // if nobody is interested, we don't watch
+     e->m_ctime = invalid_ctime; // invalid
++    e->m_status = NonExistent;
+     //    e->m_status = Normal;
+   }
+   return true;
+@@ -890,8 +1122,9 @@
+   // Shouldn't happen: Ignore "unknown" notification method
+   if (e->m_mode == UnknownMode) return NoChange;
+ 
+-#ifdef HAVE_DNOTIFY
+-  if (e->m_mode == DNotifyMode) {
++#if defined ( HAVE_DNOTIFY ) || defined( HAVE_INOTIFY )
++  if (e->m_mode == DNotifyMode || e->m_mode == INotifyMode ) {
++    kdDebug(7001) << "scanning " << e->path << " " << e->dirty << " " << e->m_status << " " << e->m_ctime << endl;
+     // we know nothing has changed, no need to stat
+     if(!e->dirty) return NoChange;
+     e->dirty = false;
+@@ -927,13 +1160,25 @@
+       return Changed;
+     }
+ 
++#ifdef HAVE_INOTIFY
++    // for inotify we delay the initial stating till the first event in it
++    if ( e->m_status == Normal && e->m_ctime == invalid_ctime )
++    {
++      e->m_ctime = stat_buf.st_ctime;
++      e->m_nlink = stat_buf.st_nlink;
++    }
++#endif
++
+     return NoChange;
+   }
+ 
+   // dir/file doesn't exist
+ 
+-  if (e->m_ctime == invalid_ctime)
++  if (e->m_ctime == invalid_ctime && e->m_status == NonExistent) {
++    e->m_nlink = 0;
++    e->m_status = NonExistent;
+     return NoChange;
++  }
+ 
+   e->m_ctime = invalid_ctime;
+   e->m_nlink = 0;
+@@ -1040,7 +1285,7 @@
+     // progate dirty flag to dependant entries (e.g. file watches)
+     it = m_mapEntries.begin();
+     for( ; it != m_mapEntries.end(); ++it )
+-      if ( ((*it).m_mode == DNotifyMode) && (*it).dirty )
++      if (((*it).m_mode == INotifyMode || (*it).m_mode == DNotifyMode) && (*it).dirty )
+         (*it).propagate_dirty();
+   }
+ 
+@@ -1132,6 +1377,9 @@
+       it = m_mapEntries.begin();
+       for( ; it != m_mapEntries.end(); ++it )
+ 	if ((*it).m_mode == FAMMode && (*it).m_clients.count()>0) {
++#ifdef HAVE_INOTIFY
++	  if (useINotify( &(*it) )) continue;
++#endif
+ #ifdef HAVE_DNOTIFY
+ 	  if (useDNotify( &(*it) )) continue;
+ #endif
+@@ -1228,7 +1476,10 @@
+             removeEntry(0,e->path,sub_entry); // <e> can be invalid here!!
+             sub_entry->m_status = Normal;
+             if (!useFAM(sub_entry))
+-              useStat(sub_entry);
++#ifdef HAVE_INOTIFY
++              if (!useINotify(sub_entry ))
++#endif
++                useStat(sub_entry);
+           }
+           break;
+         }
+@@ -1258,6 +1509,7 @@
+ 		    << ((e->m_status==Normal)?"":"Nonexistent ")
+ 		    << (e->isDir ? "Dir":"File") << ", using "
+ 		    << ((e->m_mode == FAMMode) ? "FAM" :
++                        (e->m_mode == INotifyMode) ? "INotify" :
+ 			(e->m_mode == DNotifyMode) ? "DNotify" :
+ 			(e->m_mode == StatMode) ? "Stat" : "Unknown Method")
+ 		    << ")" << endl;
+@@ -1454,11 +1706,15 @@
+ {
+ #ifdef HAVE_FAM
+   if (d->use_fam)
+-     return KDirWatch::FAM;
++    return KDirWatch::FAM;
+ #endif
++#ifdef HAVE_INOTIFY
++  if (d->supports_inotify)
++    return KDirWatch::INotify;
++#endif
+ #ifdef HAVE_DNOTIFY
+   if (d->supports_dnotify)
+-     return KDirWatch::DNotify;
++    return KDirWatch::DNotify;
+ #endif
+   return KDirWatch::Stat;
+ }
+--- kio/kio/netaccess.h	(revision 484194)
++++ kio/kio/netaccess.h	(revision 488534)
+@@ -112,6 +112,7 @@
+      *         get the reason it failed.
+      *
+      * @see lastErrorString()
++     * @since 3.2
+      */
+     static bool download(const KURL& src, QString & target, QWidget* window);
+ 
+@@ -150,6 +151,7 @@
+      *               prompted for passwords as needed.
+      *
+      * @return true if successful, false for failure
++     * @since 3.2
+      */
+     static bool upload(const QString& src, const KURL& target, QWidget* window);
+ 
+--- kio/kio/kprotocolmanager.h	(revision 484194)
++++ kio/kio/kprotocolmanager.h	(revision 488534)
+@@ -216,6 +216,16 @@
+   static QString noProxyFor();
+ 
+   /**
++   * Same as above except the environment variable name
++   * is returned instead of the variable value when
++   * @ref proxyType is @p EnvVarProxy.
++   *
++   * @see noProxyFor
++   * @since 3.5.x
++   */
++  static QString noProxyForRaw();
++
++  /**
+    * Returns the proxy server address for a given protocol.
+    *
+    * NOTE: This function does not take the @ref useReverseProxy()
+--- kio/kio/kdirlister.cpp	(revision 484194)
++++ kio/kio/kdirlister.cpp	(revision 488534)
+@@ -820,6 +820,12 @@
+   return s_pSelf;
+ }
+ 
++bool KDirListerCache::exists()
++{
++  return s_pSelf != 0;
++}
++ 
++
+ // private slots
+ 
+ // _file can also be a directory being currently held!
+@@ -1795,9 +1801,12 @@
+ {
+   kdDebug(7003) << "-KDirLister" << endl;
+ 
+-  // Stop all running jobs
+-  stop();
+-  s_pCache->forgetDirs( this );
++  if ( KDirListerCache::exists() )
++  {
++    // Stop all running jobs
++    stop();
++    s_pCache->forgetDirs( this );
++  }
+ 
+   delete d;
+ }
+--- kio/kio/kdirwatch_p.h	(revision 484194)
++++ kio/kio/kdirwatch_p.h	(revision 488534)
+@@ -24,7 +24,7 @@
+ public:
+ 
+   enum entryStatus { Normal = 0, NonExistent };
+-  enum entryMode { UnknownMode = 0, StatMode, DNotifyMode, FAMMode };
++  enum entryMode { UnknownMode = 0, StatMode, DNotifyMode, INotifyMode, FAMMode };
+   enum { NoChange=0, Changed=1, Created=2, Deleted=4 };
+ 
+   struct Client {
+@@ -69,6 +69,9 @@
+ #ifdef HAVE_DNOTIFY
+     int dn_fd;
+ #endif
++#ifdef HAVE_INOTIFY
++    int wd;
++#endif
+   };
+ 
+   typedef QMap<QString,Entry> EntryMap;
+@@ -129,16 +132,26 @@
+   bool useFAM(Entry*);
+ #endif
+ 
++#if defined(HAVE_DNOTIFY) || defined(HAVE_INOTIFY)
++   QSocketNotifier *mSn;
++#endif
++
+ #ifdef HAVE_DNOTIFY
+   bool supports_dnotify;
+   int mPipe[2];
+-  QSocketNotifier *mSn;
+   QIntDict<Entry> fd_Entry;
+ 
+   static void dnotify_handler(int, siginfo_t *si, void *);
+   static void dnotify_sigio_handler(int, siginfo_t *si, void *);
+   bool useDNotify(Entry*);
+ #endif
++
++#ifdef HAVE_INOTIFY
++  bool supports_inotify;
++  int m_inotify_fd;
++
++  bool useINotify(Entry*);
++#endif
+ };
+ 
+ #endif // KDIRWATCH_P_H
+--- kio/kio/kprotocolmanager.cpp	(revision 484194)
++++ kio/kio/kprotocolmanager.cpp	(revision 488534)
+@@ -204,15 +204,18 @@
+   return cfg->readNumEntry( "MaxCacheSize", DEFAULT_MAX_CACHE_SIZE ); // 5 MB
+ }
+ 
+-QString KProtocolManager::noProxyFor()
++QString KProtocolManager::noProxyForRaw()
+ {
+-  KProtocolManager::ProxyType type = proxyType();
+-
+   KConfig *cfg = config();
+   cfg->setGroup( "Proxy Settings" );
+ 
+-  QString noProxy = cfg->readEntry( "NoProxyFor" );
+-  if (type == EnvVarProxy)
++  return cfg->readEntry( "NoProxyFor" );
++}
++
++QString KProtocolManager::noProxyFor()
++{
++  QString noProxy = noProxyForRaw();
++  if (proxyType() == EnvVarProxy)
+     noProxy = QString::fromLocal8Bit(getenv(noProxy.local8Bit()));
+ 
+   return noProxy;
+--- kio/httpfilter/httpfilter.cc	(revision 484194)
++++ kio/httpfilter/httpfilter.cc	(revision 488534)
+@@ -105,7 +105,9 @@
+   zstr.zalloc = Z_NULL;
+   zstr.zfree = Z_NULL;
+   zstr.opaque = Z_NULL;
++
+   inflateInit2(&zstr, -MAX_WBITS);
++
+   iTrailer = 8;
+ #endif
+ }
+@@ -210,6 +212,7 @@
+ 	    return 2;
+ 	}
+     }
++
+     int method = get_byte(); /* method byte */
+     int flags = get_byte(); /* flags byte */
+ 
+--- kio/renamedlgplugin.desktop	(revision 484194)
++++ kio/renamedlgplugin.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=Íforrit fyrir 'endurnefna' gluggann
+ Comment[it]=Plugin per la finestra di dialogo "rinomina"
+ Comment[ja]=名前変更ダイアログ用プラグイン
+-Comment[ka]=გადარქმევის დიალოგის მოდული
+ Comment[km]=កម្មវិធីជំនួយ​ខាងក្នុង​សម្រាប់​ប្រអប់ ប្តូរឈ្មោះ
+ Comment[ko]=이름 바꾸기 대화창용 플러그인
+ Comment[lb]=Plugin fir den Ëmbenennen-Dialog
+@@ -73,7 +72,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
+--- kio/kfile/kpropsdlgplugin.desktop	(revision 484194)
++++ kio/kfile/kpropsdlgplugin.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Comment[is]=Íforrit fyrir stillingarforritið
+ Comment[it]=Plugin per la finestra delle proprietà 
+ Comment[ja]=設定ダイアログプラグイン
+-Comment[ka]=პარამეტრების გამართვის დიალოგის მოდული
+ Comment[km]=កម្មវិធី​ជំនួយ​ខាង​ក្នុង​សម្រាប់​ប្រអប់​ លក្ខណៈ​សម្បត្តិ
+ Comment[ko]=대화창 특성을 위한 플러그인
+ Comment[lb]=Plugin fir den Eegeschaften-Dialog
+@@ -74,7 +73,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
+--- kio/kdatatool.desktop	(revision 484194)
++++ kio/kdatatool.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=KDE gagnatól
+ Comment[it]=Strumenti dati di KDE
+ Comment[ja]=KDEデータツール
+-Comment[ka]=KDE-ს მონაცემების დამმუშავებელი
+ Comment[km]=ឧបករណ៍​ទិន្នន័យ KDE
+ Comment[ko]=KDE 자료 연장
+ Comment[lb]=KDE-Donnéen-Hëllefsprogramm
+@@ -73,7 +72,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
+--- kio/misc/kssld/kssld.desktop	(revision 484194)
++++ kio/misc/kssld/kssld.desktop	(revision 488534)
+@@ -37,7 +37,6 @@
+ Name[is]=KSSL þjónseining
+ Name[it]=Modulo demone KSSL
+ Name[ja]=KSSL デーモンモジュール
+-Name[ka]=KSSL გუშაგის მოდული
+ Name[km]=ម៉ូឌុល Daemon KSSL 
+ Name[ko]=KSSL 데몬 모듈
+ Name[lb]=KSSL-Dämonmodul
+@@ -74,7 +73,6 @@
+ 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
+@@ -103,7 +101,6 @@
+ Comment[is]=KSSL þjónseining fyrir KDED
+ Comment[it]=Modulo demone KSSL per KDED
+ Comment[ja]=KDED用のKSSLデーモンモジュール
+-Comment[ka]=KSSL გუშაგის მოდული KDED-სთვის
+ Comment[km]=ម៉ូឌុល daemon KSSL សម្រាប់ KDED
+ Comment[lb]=KSSL-Dämonmodul fir KDED
+ Comment[lt]=KSSL tarnybos modulis, skirtas KDED
+@@ -133,5 +130,4 @@
+ Comment[tt]=KDED öçen KSSL xezmät
+ Comment[uk]=Модуль демону KSSL для KDED
+ Comment[uz]=KDED учун KSSL хизматининг модули
+-Comment[xx]=xxKSSL daemon module for KDEDxx
+ Comment[zh_CN]=KDED 的 KSSL 守护进程模块
+--- kio/misc/mms.protocol	(revision 484194)
++++ kio/misc/mms.protocol	(revision 488534)
+@@ -27,7 +27,6 @@
+ Description[is]=Microsoft Media Server samskiptaregla
+ Description[it]=Protocollo Microsoft Media Server
+ Description[ja]=Microsoft メディアサーバ プロトコル
+-Description[ka]=Microsoft Media Server პროტოკოლი
+ Description[km]=ពិធីការ​ម៉ាស៊ីន​បម្រី Microsoft Media
+ Description[lb]=Microsoft-Media Server-Protokoll
+ Description[lt]=Microsoft media serverio protokolas
+@@ -53,6 +52,5 @@
+ Description[tr]=Microsoft Media Server Protokolü
+ Description[tt]=Microsoft Media Server Protokolı
+ Description[uk]=Протокол медіа сервера Microsoft
+-Description[xx]=xxMicrosoft Media Server Protocolxx
+ Description[zh_CN]=Microsoft 媒体服务器协议
+ URIMode=url
+--- kio/misc/kwalletd/kwalletd.desktop	(revision 484194)
++++ kio/misc/kwalletd/kwalletd.desktop	(revision 488534)
+@@ -36,7 +36,6 @@
+ Name[is]=KWallet þjónseining
+ Name[it]=Modulo demone KWallet
+ Name[ja]=KWallet デーモンモジュール
+-Name[ka]=KWallet გუშაგის მოდული
+ Name[km]=ម៉ូឌុល Daemon KWallet
+ Name[ko]=K지갑 데몬 모듈
+ Name[lb]=KWallet-Dämonmodul
+@@ -68,7 +67,6 @@
+ Name[tt]=KWallet Xezmäteneñ Modulı
+ 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
+@@ -94,7 +92,6 @@
+ Comment[is]=KWallet þjónseining fyrir KDED
+ Comment[it]=Modulo demone KWallet per KDED
+ Comment[ja]=KDED用のKWallet デーモンモジュール
+-Comment[ka]=KSSL მოდული KDE-სთვის
+ Comment[km]=ម៉ូឌុល daemon KWallet សម្រាប់ KDED
+ Comment[lb]=KWallet-Dämonmodul fir KDED
+ Comment[lt]=KDE slaptažodinių tarnybos modulis skirtas KDED
+@@ -124,5 +121,4 @@
+ Comment[tt]=KDED öçen KWallet xezmäteneñ modulı
+ Comment[uk]=Модуль демону торбинок KWallet для KDED
+ Comment[uz]=KDED учун KWallet хизматининг модули
+-Comment[xx]=xxKWallet daemon module for KDEDxx
+ Comment[zh_CN]=KDED 的 KWallet 守护进程模块
+--- kio/misc/kpac/eventsrc	(revision 484194)
++++ kio/misc/kpac/eventsrc	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=Sjálfvirkar stillingar leppþjóns
+ Comment[it]=Configurazione automatica proxy
+ Comment[ja]=自動プロキシ設定
+-Comment[ka]=პროქსის თვითგამართვა
+ Comment[km]=ការ​កំណត់​រចនាសម្ព័ន្ធ​ប្រូកស៊ី​ដោយ​ស្វ័យ​ប្រវត្តិ
+ Comment[ko]=스스로 프록시 ì„¤ì •
+ Comment[lb]=Automatesch Proxy-Configuratioun
+@@ -65,7 +64,6 @@
+ Comment[uk]=Автоматичне визначення проксі сервера
+ Comment[uz]=Проксини автоматик равишда мослаш
+ Comment[wa]=Apontiaedje otomatike do procsi
+-Comment[xx]=xxAutomatic Proxy Configurationxx
+ Comment[zh_CN]=自动代理配置
+ Comment[zh_TW]=自動代理組態
+ 
+@@ -101,7 +99,6 @@
+ Name[is]=Ógild leppþjónsskrifta
+ Name[it]=Script proxy non valido
+ Name[ja]=無効なプロキシスクリプト
+-Name[ka]=პროქსის მცდარი სკრიპტი
+ Name[km]=ស្គ្រីប​ប្រូកស៊ី​មិន​ត្រឹមត្រូវ
+ Name[ko]=올바르지 않은 프록시 스크립트
+ Name[lb]=Ongültegt Proxy-Skript
+@@ -133,7 +130,6 @@
+ Name[tt]=Proxy ämerlege bozıq
+ Name[uk]=Неправильний скрипт для проксі
+ Name[uz]=Прокси скрипти ҳақиқий эмас
+-Name[xx]=xxInvalid proxy scriptxx
+ Name[zh_CN]=æ— æ•ˆçš„ä»£ç†è„šæœ¬
+ Name[zh_TW]=不合法 proxy 命令稿檔案
+ Comment=The downloaded proxy configuration script is invalid
+@@ -166,7 +162,6 @@
+ Comment[is]=Sótt leppþjónsskrifta er ógild
+ Comment[it]=Lo script di configurazione proxy scaricato non è valido
+ Comment[ja]=ダウンロードされたプロキシ設定スクリプトは無効です。
+-Comment[ka]=პროქსის გამართვის ჩამოტვირთული სკრიპტი მცდარია
+ Comment[km]=ស្គ្រីប​កំណត់​រចនាសម្ព័ន្ធ​​ប្រូកស៊ី​ដែល​បាន​ទាញយក មិន​ត្រឹមត្រូវ​ឡើយ
+ Comment[ko]=ë‚´ë ¤ë°›ì€ 프록시 ì„¤ì • 스크립트가 올바르지 않습니다.
+ Comment[lb]=D'Proxy-Configuratiounsskript, dat erofgelude gouf, ass ongülteg
+@@ -198,7 +193,6 @@
+ Comment[tt]=Proxy caylaw öçen iñderelgän ämerlek bozıq bulğan
+ Comment[uk]=Звантажений скрипт для визначення проксі сервера неправильний
+ Comment[uz]=Проксини мослаш учун ёзиб олинган скрипт ҳақиқий эмас
+-Comment[xx]=xxThe downloaded proxy configuration script is invalidxx
+ Comment[zh_CN]=ä¸‹è½½çš„ä»£ç†é…ç½®è„šæœ¬æ˜¯æ— æ•ˆçš„
+ Comment[zh_TW]=代理組態的 script 檔案語法有誤
+ default_presentation=16
+@@ -236,7 +230,6 @@
+ Name[is]=Villa við hleðslu skriftu
+ Name[it]=Errore di scaricamento script
+ Name[ja]=スクリプトダウンロード エラー
+-Name[ka]=სკრიპტის ჩამოტვირთვის შეცდოამ
+ Name[km]=កំហុស​ទាញយក​ស្គ្រីប
+ Name[ko]=스크립트 ë‚´ë ¤ë°›ê¸° 오류
+ Name[lb]=Feeler beim Erofluede vum Skript
+@@ -269,7 +262,6 @@
+ Name[tt]=Ämerlek iñderü xatarı
+ 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
+@@ -303,7 +295,6 @@
+ Comment[is]=Gat ekki sótt stillingaskriftu leppþjóns
+ Comment[it]=Impossibile scaricare lo script di configurazione proxy
+ Comment[ja]=プロキシ設定スクリプトをダウンロードすることができないかもしれません。
+-Comment[ka]=პროქსის გამართვის სკრიპტის ჩამოტვირთვა ვერ ხერხდება
+ Comment[km]=មិន​អាច​ទាញយក​ស្គ្រីប​កំណត់​រចនាសម្ព័ន្ធ​ប្រូកស៊ី
+ Comment[ko]=프록시 ì„¤ì • 스크립트를 ë‚´ë ¤ë°›ì§€ 못합니다
+ Comment[lb]=D'Proxy-Konfiguratiounsskript konnt net erofgeluede ginn
+@@ -335,7 +326,6 @@
+ Comment[tt]=Bu proxy caylaw ämerlegen iñderep bulmadı
+ Comment[uk]=Не вдається звантажити скрипт для визначення проксі сервера
+ Comment[uz]=Проксини мослаш учун скриптни ёзиб олиб бўлмади
+-Comment[xx]=xxThe proxy configuration script could not be downloadedxx
+ Comment[zh_CN]=ä»£ç†é…ç½®è„šæœ¬æ— æ³•ä¸‹è½½
+ Comment[zh_TW]=無法取得代理組態 script 檔案
+ default_presentation=16
+@@ -371,7 +361,6 @@
+ Name[is]=Túlkunarvilla skriftu
+ Name[it]=Errore di valutazione script
+ Name[ja]=スクリプト評価エラー
+-Name[ka]=სკრიპტის დამუშავების შეცდომა
+ Name[km]=កំហុស​វាយតម្លៃ​​របស់ស្គ្រីប
+ Name[ko]=스크립트 평가 오류
+ Name[lb]=Feeler beim Evaluéieren vum Skript
+@@ -402,7 +391,6 @@
+ Name[tt]=Ämerlek eçtälegen uqığanda xata çıqtı
+ 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
+@@ -435,7 +423,6 @@
+ Comment[is]=Það kom upp villa við keyrslu stillingaskriftu leppþjóns
+ Comment[it]=Si è verificato un errore durante l'esecuzione dello script di configurazione proxy
+ Comment[ja]=プロキシ設定スクリプトを実行中エラーがありました
+-Comment[ka]=პროქსის გამართვის სკრიპტის გამოყენების შეცდომა
+ Comment[km]=មាន​កំហុស​មួយ​ក្នុងការ​​ប្រតិបត្តិ​ស្គ្រីបកំណត់​រចនាសម្ព័ន្ធ​ប្រូកស៊ី
+ Comment[ko]=프록시 ì„¤ì • 스크리트를 실행하는데 ë¬¸ì œê°€ 있습니다
+ Comment[lb]=Et gouf e Feeler beim Ausféiere vum Proxy-Konfiguratiounsskript
+@@ -467,7 +454,6 @@
+ Comment[tt]=Proxy caylaw ämerelegen eşlätkändä xata çıqtı
+ 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
+--- kio/misc/kpac/kpac_dhcp_helper.c	(revision 484194)
++++ kio/misc/kpac/kpac_dhcp_helper.c	(revision 488534)
+@@ -176,7 +176,7 @@
+ 		*offs++ != DHCP_MAGIC4)
+ 		exit(1);
+ 
+-	for ( ; offs < end - 1; offs += *offs++)
++	for ( ; offs < end - 1; offs += *offs+1)
+ 	{
+ 		switch (*offs++)
+ 		{
+--- kio/misc/kpac/proxyscout.desktop	(revision 484194)
++++ kio/misc/kpac/proxyscout.desktop	(revision 488534)
+@@ -20,7 +20,6 @@
+ Name[hr]=Proxy izvidnik
+ Name[it]=Esploratore proxy
+ Name[ja]=プロキシを探す
+-Name[ka]=პროქსის თვითგამართვა
+ Name[ko]=프록시 찾기
+ Name[lb]=Proxy-Scout
+ Name[lt]=Proxy paieška
+@@ -45,7 +44,6 @@
+ Name[tt]=Proxy Saqçısı
+ Name[uk]=Розвідник проксі сервера
+ Name[uz]=Прокси скаут
+-Name[xx]=xxProxy Scoutxx
+ Name[zh_CN]=代理搜索
+ Comment=Automatic proxy configuration
+ Comment[af]=Outomatiese proksie opstelling
+@@ -73,7 +71,6 @@
+ Comment[is]=Sjálfvirkar stillingar leppþjóns
+ Comment[it]=Configurazione automatica proxy
+ Comment[ja]=自動プロキシ設定
+-Comment[ka]=პროქსის თვითგამართვა
+ Comment[km]=ការ​កំណត់​រចនាសម្ព័ន្ធ​ប្រូកស៊ី​ដោយ​ស្វ័យប្រវត្តិ
+ Comment[lb]=Automatesch Proxy-Configuratioun
+ Comment[lt]=Automatinis proxy derinimas
+@@ -102,7 +99,6 @@
+ Comment[tt]=Proxy'nıñ üzzihenle caylanu
+ Comment[uk]=Автоматичне визначення проксі сервера
+ Comment[uz]=Проксини автоматик равишда мослаш
+-Comment[xx]=xxAutomatic proxy configurationxx
+ Comment[zh_CN]=自动代理配置
+ ServiceTypes=KDEDModule
+ X-KDE-ModuleType=Library
+--- kio/misc/kio_uiserver.desktop	(revision 484194)
++++ kio/misc/kio_uiserver.desktop	(revision 488534)
+@@ -12,7 +12,6 @@
+ 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
+@@ -45,7 +44,6 @@
+ Comment[is]=Þjónn sem sýnir framvindu ferla
+ Comment[it]=Server informazioni avanzamento di KDE
+ Comment[ja]=KDEé€²æ—æƒ…å ±UIサーバ
+-Comment[ka]=KDE-ს მონაცემთა გადაცემის სერვერი
+ Comment[km]=ម៉ាស៊ីន​បម្រើ​ UI នៃ​ព័ត៌មាន​វឌ្ឍនភាព​របស់ KDE
+ Comment[ko]=KDE에서 보다 ë°œì „ëœ ì •ë³´ UI 서버
+ Comment[lb]=UI-Server vu KDE, dee Fortschrëttsinformatiounen uweist
+@@ -85,7 +83,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
+--- kio/tests/dummymeta.desktop	(revision 484194)
++++ kio/tests/dummymeta.desktop	(revision 488534)
+@@ -40,7 +40,6 @@
+ Name[uk]=Макет метаданих
+ Name[uz]=Маъносиз мета
+ Name[ven]=Meta isa tshili
+-Name[xx]=xxDummy Metaxx
+ Name[zh_CN]=å“‘å…ƒ
+ Name[zh_TW]=空的資料定義
+ ServiceTypes=KFilePlugin
+--- kio/kscan.desktop	(revision 484194)
++++ kio/kscan.desktop	(revision 488534)
+@@ -7,7 +7,6 @@
+ Name[cy]=KSgan
+ Name[eo]=Bildciferecigo
+ Name[is]=KScan myndlesari
+-Name[ka]=სკანერი
+ Name[ko]=K스캔
+ Name[nso]=KTebelelo
+ Name[pl]=Skan
+@@ -17,4 +16,3 @@
+ Name[ta]=Kவருடல்
+ Name[th]=สแกนภาพ - K
+ Name[ven]=U nanga ha K
+-Name[xx]=xxKScanxx
+--- kio/kurifilterplugin.desktop	(revision 484194)
++++ kio/kurifilterplugin.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Name[is]=Íforrit fyrir vafrara-endurbætur
+ Name[it]=Plugin di navigazione avanzata
+ Name[ja]=拡張ブラウズプラグイン
+-Name[ka]=დეტალური ჩვენების მოდული
+ Name[km]=កម្មវិធី​ជំនួយ​រុករក​ដែល​បាន​ធ្វើ​ឲ្យ​ប្រសើរ
+ Name[ko]=더 나은 찾아가기 플러그인
+ Name[lb]=Erweiderte Browser-Plugin
+@@ -73,7 +72,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
+--- kio/kcomprfilter.desktop	(revision 484194)
++++ kio/kcomprfilter.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Name[is]=KDE þjöppunarsía
+ Name[it]=Filtro di compressione KDE
+ Name[ja]=KDE 圧縮フィルタ
+-Name[ka]=KDE-ს შეკუმშვის ფილტრი
+ Name[km]=តម្រង​បង្ហាប់ KDE
+ Name[ko]=KDE 압축 거르개
+ Name[lb]=KDE-Kompressiounsfilter
+@@ -73,7 +72,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
+--- kio/data.protocol	(revision 484194)
++++ kio/data.protocol	(revision 488534)
+@@ -25,7 +25,6 @@
+ Description[is]=kioslave fyrir gagnaslóðir (rfc2397)
+ Description[it]=Un kioslave per il protocollo di URI di dati (rfc2397)
+ Description[ja]= データ URIs (rfc2397) の kioslave
+-Description[ka]=URI მონაცემთა (rfc2397) დამმუშავებელი
+ Description[km]=kioslave មួយ​សម្រាប់​ទិន្នន័យ URIs (rfc2397)
+ Description[lb]=E kioslave fir Donnéen-URIs (rfc2397)
+ Description[lt]=Antrinė KDE programa duomenų URI (rfc2397)
+@@ -50,7 +49,6 @@
+ Description[tg]=kioslave барои URIs (rfc2397)
+ Description[tt]=Biremle URI öçen kioslave (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
+--- kio/kcmodule.desktop	(revision 484194)
++++ kio/kcmodule.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Name[is]=KDE stjórneining
+ Name[it]=Modulo di controllo KDE
+ Name[ja]=KDE コントロールモジュール
+-Name[ka]=KDE-ს კონტროლის პულტი
+ Name[km]=ម៉ូឌុល​ត្រួត​ពិនិត្យ​របស់ KDE
+ Name[ko]=KDE ì œì–´ 모듈
+ Name[lb]=KDE-Kontrollmodul
+@@ -74,7 +73,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
+--- kio/application.desktop	(revision 484194)
++++ kio/application.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Name[is]=Forrit
+ Name[it]=Applicazione
+ Name[ja]=アプリケーション
+-Name[ka]=პროგრამა
+ Name[km]=កម្មវិធី
+ Name[ko]=응용 프로그램
+ Name[lb]=Programm
+@@ -77,7 +76,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
+--- kio/kpasswdserver.desktop	(revision 484194)
++++ kio/kpasswdserver.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Name[is]=KDED Lykilorðaeining
+ Name[it]=Modulo password di KDED
+ Name[ja]=KDED パスワードモジュール
+-Name[ka]=KDED პაროლების მოდული
+ Name[km]=ម៉ូឌុល​ពាក្យ​សម្ងាត់ KDED
+ Name[ko]=KDED ì—´ì‡ ê¸€ 모듈
+ Name[lb]=KDED-Passwuertmodul
+@@ -72,7 +71,6 @@
+ 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
+@@ -99,7 +97,6 @@
+ Comment[is]=Skyndiminni fyrir lykilorð
+ Comment[it]=Supporto per la memorizzazione temporanea delle password
+ Comment[ja]=パスワードキャッシュサポート
+-Comment[ka]=პაროლის ბუფერირება
+ Comment[km]=ទ្រទ្រង់​ការ​រក្សាទុក​ពាក្យសម្ងាត់​នៅ​ក្នុង​ឃ្លាំង​សម្ងាត់
+ Comment[lb]=Ënnerstëtzung fir d'Zwëschespäichere vu Passwierder
+ Comment[lt]=Slaptažodžių krepšio palaikymas
+@@ -128,7 +125,6 @@
+ Comment[tt]=Sersüz alxäterläw totu
+ Comment[uk]=Підтримка кешування паролів
+ Comment[uz]=Махфий сўзларни кэшда сақлаш
+-Comment[xx]=xxPassword caching supportxx
+ Comment[zh_CN]=å¯†ç ç¼“å­˜æ”¯æŒ
+ ServiceTypes=KDEDModule
+ X-KDE-ModuleType=Library
+--- kstyles/riscos/riscos.themerc	(revision 484194)
++++ kstyles/riscos/riscos.themerc	(revision 488534)
+@@ -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
+@@ -278,7 +277,6 @@
+ Comment[is]=Stíll í anda RiscOS (Archimedes tölvur)
+ Comment[it]=Tema simile a RISC OS
+ Comment[ja]=RISC OS ライクテーマ
+-Comment[ka]=RISC OS-ის მსგავსი სტილი
+ Comment[km]=ស្បែក RISC OS-like
+ Comment[ko]=리스크 OS 같은 테마
+ Comment[lb]=RISC OS-ähnlecht Thema
+@@ -318,7 +316,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
+--- kstyles/themes/light-v2.themerc	(revision 484194)
++++ kstyles/themes/light-v2.themerc	(revision 488534)
+@@ -29,7 +29,6 @@
+ Name[id]=Gaya Ringan, revisi ke-2
+ Name[is]=Léttur stíll, - taka 2
+ Name[it]=Stile Light, seconda versione
+-Name[ka]=Light სტილი, მე-2 რედაქცია
+ Name[km]=រចនាប័ទ្ម​ភ្លឺ ពិនិត្យ​ឡើង​វិញ​លើក​ទី​២
+ Name[ko]=가벼운 꼴, 두번째 판
+ Name[lb]=Liichte Stil, 2. Versioun
+@@ -67,7 +66,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
+@@ -99,7 +97,6 @@
+ Comment[is]=Önnur útgáfa af einföldum og snotrum stíl
+ Comment[it]=Seconda versione dello stile semplice ed elegante "Light".
+ Comment[ja]=シンプルでエレガントな'Light'ウィジェットスタイル第2版。
+-Comment[ka]=მარტივი და ელეგანტური Light მართვის ელემენტის სტილის მე–2 რედაქცია.
+ Comment[km]=ការកែប្រែ​​លើក​ទី ២ ​របស់​រចនាប័ទ្ម​វត្ថុ​មើល​ឃើញ​សាមញ្ញ និង ​ប្រណិត "ភ្លឺ" ។
+ Comment[ko]=뽐 내지 ì•Šê³  멋진 '가벼운' ìœ„ì ¯ ê¼´, 두번째 판.
+ Comment[lb]=Zweet Versioun vum einfachen and eleganten 'liichte' Widget-Stil
+@@ -137,7 +134,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.
+--- kstyles/themes/light-v3.themerc	(revision 484194)
++++ kstyles/themes/light-v3.themerc	(revision 488534)
+@@ -29,7 +29,6 @@
+ Name[id]=Gaya Ringan, revisi ke-3
+ Name[is]=Léttur stíll, - taka 3
+ Name[it]=Stile Light, terza versione
+-Name[ka]=Light სტილი, მე–3 რედაქცია
+ Name[km]=រចនាប័ទ្ម​ភ្លឺ ពិនិត្យ​ឡើង​វិញ​លើក​ទី​៣
+ Name[ko]=가벼운 꼴, 세번째 판
+ Name[lb]=Liichte Stil, 3. Versioun
+@@ -67,7 +66,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
+@@ -99,7 +97,6 @@
+ Comment[is]=Þriðja útgáfa af einföldum og snotrum stíl
+ Comment[it]=Terza versione dello stile semplice ed elegante "Light".
+ Comment[ja]=シンプルでエレガントな'Light'ウィジェットスタイル第3版。
+-Comment[ka]=მარტივი და ელეგანტური Light მართვის ელემენტის სტილის მე–3 რედაქცია.
+ Comment[km]=ការកែប្រែ​​លើក​ទី ៣ ​របស់​រចនាប័ទ្ម​វត្ថុ​មើល​ឃើញ​សាមញ្ញ និង ​ប្រណិត "ភ្លឺ" ។
+ Comment[ko]=뽐 내지 ì•Šê³  멋진 '가벼운' ìœ„ì ¯ ê¼´, 세번째 판.
+ Comment[lb]=Drëtt Versioun vum einfachen and eleganten 'liichte' Widget-Stil
+@@ -138,7 +135,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.
+--- kstyles/themes/qtplatinum.themerc	(revision 484194)
++++ kstyles/themes/qtplatinum.themerc	(revision 488534)
+@@ -20,7 +20,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
+@@ -54,7 +53,6 @@
+ Comment[is]=Innbyggði Platínum stíllinn (án þema)
+ Comment[it]=Stile Platino interno senza tema
+ Comment[ja]=Platinumスタイル
+-Comment[ka]=ჩადგმული Platinum სტილი თემის გარეშე
+ Comment[km]=រចនាប័ទ្ម​ Platinum ដែល​គ្មានស្បែកជាប់
+ Comment[ko]=플래티넘과 같은 꼴을 가진 붙박이 테마
+ Comment[lb]=Agebaute Platinum-Stil ouni Thema
+@@ -93,7 +91,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 
+--- kstyles/themes/qtwindows.themerc	(revision 484194)
++++ kstyles/themes/qtwindows.themerc	(revision 488534)
+@@ -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]=مظهر مضمن مشابه لويندوز
+@@ -42,7 +41,6 @@
+ Comment[is]=Innbyggður stíll sem minnir á Windows 9x (án þema)
+ Comment[it]=Stile Windows 9x interno senza tema
+ Comment[ja]=Windows9xスタイル
+-Comment[ka]=ჩადგმული Windows 9x სტილი თემის გარეშე
+ Comment[km]=រចនាប័ទ្ម​ Windows 9x ដែល​គ្មាន​ស្បែក
+ Comment[ko]=윈도우즈 9X와 비슷한 꼴을 가진 붙박이 테마
+ Comment[lb]=Agebaute Windows 9x-Stil ouni Thema
+@@ -81,7 +79,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
+--- kstyles/themes/qtcde.themerc	(revision 484194)
++++ kstyles/themes/qtcde.themerc	(revision 488534)
+@@ -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
+@@ -36,7 +35,6 @@
+ Comment[is]=Innbyggður stíll sem minnir á CDE notendaskilin (án þema)
+ Comment[it]=Stile CDE interno senza tema
+ Comment[ja]=CDEスタイル
+-Comment[ka]=ჩადგმული CDE სტილი თემის გარეშე
+ Comment[km]=រចនាប័ទ្ម CDE ដែល​គ្មាន​ស្បែក​ជាប់
+ Comment[ko]=CDE와 같은 꼴을 가진 붙박이 테마
+ Comment[lb]=Agebauten CDE-Stil ouni Thema
+@@ -75,7 +73,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
+--- kstyles/themes/b3.themerc	(revision 484194)
++++ kstyles/themes/b3.themerc	(revision 488534)
+@@ -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
+@@ -37,7 +36,6 @@
+ Comment[is]=B3, breytt útgáfa B2
+ Comment[it]=B3/Modifica di B2
+ Comment[ja]=B3 B2の改良版
+-Comment[ka]=B3 - B2-ის მოდიფიკაცია
+ Comment[km]=B3/ការ​កែប្រែរបស់ B2
+ Comment[lb]=B3/Verännerung vu B2
+ Comment[lt]=B3 – B2 modifikacija
+@@ -77,7 +75,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
+--- kstyles/themes/mega.themerc	(revision 484194)
++++ kstyles/themes/mega.themerc	(revision 488534)
+@@ -24,7 +24,6 @@
+ Name[is]=MegaGradient fjöllitastíll
+ Name[it]=Mega sfumature con molti colori
+ Name[ja]=MegaGradient ハイカラースタイル
+-Name[ka]=highcolor გრადიენტული სტილი
+ Name[km]=រចនាប័ទ្ម​ពណ៌​ខ្ពស់​ MegaGradient
+ Name[lb]=MegaGradient-Stil (vill Faarwen)
+ Name[lt]=MegaGradient aukštos spalvų gebos stilius
+@@ -61,7 +60,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
+--- kstyles/themes/highcolor.themerc	(revision 484194)
++++ kstyles/themes/highcolor.themerc	(revision 488534)
+@@ -29,7 +29,6 @@
+ Name[is]=Klassískur hágæða-litastíll
+ Name[it]=Molti colori classico
+ Name[ja]=ハイカラークラシック
+-Name[ka]=HighColor კლასიკური სტილი
+ Name[km]=ពណ៌​ខ្ពស់ បុរាណ
+ Name[ko]=기본 많은 색
+ Name[lb]=VillFaarwe-Klassesch
+@@ -60,7 +59,6 @@
+ Name[tr]=Klasik Yüksek Renk
+ Name[tt]=KüpTösle Klassik
+ Name[uk]=Типовий (64K кольорів)
+-Name[xx]=xxHighColor Classicxx
+ Name[zh_CN]=高色彩经典
+ Name[zh_TW]=é è¨­çš„é«˜å½©
+ Comment=Highcolor version of the classic style
+@@ -96,7 +94,6 @@
+ Comment[is]=Útgáfa klassíska stílsins sem notar hágæðaliti (HighColor)
+ Comment[it]=Versione con molti colori dello stile classico
+ Comment[ja]=クラシックスタイルのハイカラーバージョン
+-Comment[ka]=კლასიკური სტილი ფერების მეტი რაოდენობით
+ Comment[km]=កំណែ​ពណ៌​ខ្ពស់​របស់​រចនាប័ទ្ម​បុរាណ
+ Comment[ko]=기본 모양새를 많은 색으로 ë§Œë“  것
+ Comment[lb]=Versioun mat ville Faarwe vum klassesche Stil
+@@ -130,7 +127,6 @@
+ Comment[tt]=Klassik tışlawnıñ küptösle töre
+ Comment[uk]=Версія типового стилю для 64К кольорів та більше
+ Comment[uz]=Классик услубининг юқори рангли нусхаси
+-Comment[xx]=xxHighcolor version of the classic stylexx
+ Comment[zh_CN]=ç»å…¸é£Žæ ¼çš„é«˜è‰²å½©ç‰ˆæœ¬
+ Comment[zh_TW]=é è¨­é¢¨æ ¼çš„é«˜å½©ç‰ˆæœ¬
+ [KDE]
+--- kstyles/themes/qtmotif.themerc	(revision 484194)
++++ kstyles/themes/qtmotif.themerc	(revision 488534)
+@@ -8,7 +8,6 @@
+ Name[pa]=ਮੋਟੀਫ
+ Name[ta]=மோடிஃப்
+ Name[th]=โมทีฟ
+-Name[xx]=xxMotifxx
+ Comment=Built-in unthemed Motif style
+ Comment[af]=Ingeboude ongetemade motief styl
+ Comment[ar]=مظهر مضمن مشابه لMotif
+@@ -41,7 +40,6 @@
+ Comment[is]=Innbyggður stíll sem minnir á Motif unhverfið (án þema)
+ Comment[it]=Stile Motif interno senza tema
+ Comment[ja]=Motifスタイル
+-Comment[ka]=ჩადგმული Motif სტილი თემის გარეშე
+ Comment[km]=រចនាប័ទ្ម Motif ដែល​គ្មានស្បែក​ជាប់
+ Comment[ko]=모티프와 같은 꼴을 가진 붙박이 테마
+ Comment[lb]=Agebaute Motif-Stil ouni Thema
+@@ -80,7 +78,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
+--- kstyles/themes/keramik.themerc	(revision 484194)
++++ kstyles/themes/keramik.themerc	(revision 488534)
+@@ -9,7 +9,6 @@
+ Name[gl]=Keramic
+ Name[he]=קרמיק
+ Name[hi]=केरमिक
+-Name[ka]=კერამიკა
+ Name[ko]=K세라믹
+ Name[lv]=Keramika
+ Name[mk]=Керамик
+@@ -25,9 +24,9 @@
+ Name[tg]=Сафолӣ
+ Name[th]=เครามิก - K
+ Name[uz]=Керамика
+-Name[xx]=xxKeramikxx
+ ConfigPage=kstyle_keramik_config
+ Comment=A style using alphablending
++Comment[af]='n standaard styl wat alfa vermenging gebruik
+ Comment[bg]=Стил, използващ алфа сливане
+ Comment[ca]=Un estil que usa barreja alfa
+ Comment[cs]=Styl používající alfa kanál
+@@ -43,7 +42,7 @@
+ Comment[hu]=Alfakeverést használó stílus
+ Comment[is]=Stíll sem notar alfa blöndun
+ Comment[it]=Stile con effetti di trasparenza
+-Comment[ka]=სტილი ალფა შერევით
++Comment[ja]=アルファブレンディングを使用したスタイル
+ Comment[km]=រចនាប័ទ្ម​លំនាំដើម​ដោយ​ប្រើ ល្បាយ​អាល់ហ្វា
+ Comment[lb]=E Stil, deen Alphablending benotzt
+ Comment[lt]=Stilius, naudojantis alfa spalvų maišymą
+@@ -64,7 +63,6 @@
+ Comment[tg]=Услуб бо истифодаи тобиши алфа
+ Comment[uk]=Стиль з використанням альфа-змішування
+ Comment[uz]=Алфаблендингли услуб
+-Comment[xx]=xxA style using alphablendingxx
+ Comment[zh_CN]=使用 alpha æ··å’Œçš„é£Žæ ¼
+ 
+ [KDE]
+--- kstyles/themes/default.themerc	(revision 484194)
++++ kstyles/themes/default.themerc	(revision 488534)
+@@ -29,7 +29,6 @@
+ Name[is]=Klassískt KDE
+ Name[it]=KDE classico
+ Name[ja]=KDE クラシック
+-Name[ka]=კლასიკური KDE
+ Name[km]=KDE បុរាណ
+ Name[ko]=KDE 기본
+ Name[lt]=KlasikinÄ— KDE
+@@ -60,7 +59,6 @@
+ Name[tt]=KDE Klassik
+ Name[uk]=Типовий для KDE
+ Name[wa]=KDE Classike
+-Name[xx]=xxKDE Classicxx
+ Name[zh_CN]=KDE 经典
+ Name[zh_TW]=KDE é è¨­
+ Comment=Classic KDE style
+@@ -96,7 +94,6 @@
+ Comment[is]=Klassíski KDE stíllinn
+ Comment[it]=Stile KDE classico
+ Comment[ja]=クラシックKDEスタイル
+-Comment[ka]=KDE-ს კლასიკური სტილი
+ Comment[km]=រចនាប័ទ្ម KDE បុរាណ
+ Comment[ko]=KDE에서 기본으로 쓰는 모양새
+ Comment[lb]=Klassësche KDE-Stil
+@@ -131,7 +128,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
+--- kstyles/themes/kstep.themerc	(revision 484194)
++++ kstyles/themes/kstep.themerc	(revision 488534)
+@@ -23,7 +23,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
+@@ -55,7 +54,6 @@
+ Comment[is]=Stíll sem minnir á Next stýrikerfið (án þema)
+ Comment[it]=Stile senza tema simile a Next
+ Comment[ja]=非テーマNextライクスタイル
+-Comment[ka]=Next-ის მსგავსი სტილი თემების გარეშე
+ Comment[km]=រចនាប័ទ្ម Next-like ដែល​គ្មាន​ស្បែក
+ Comment[ko]=넥스트와 같은 꼴을 가진 테마
+ Comment[lb]=Next-ähnleche Stil ouni Thema
+@@ -95,7 +93,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
+--- kstyles/themes/qtsgi.themerc	(revision 484194)
++++ kstyles/themes/qtsgi.themerc	(revision 488534)
+@@ -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
+@@ -37,7 +36,6 @@
+ Comment[is]=Innbyggður stíll sem minnir á SGI notendaskilin
+ Comment[it]=Stile SGI interno
+ Comment[ja]=内蔵SGIスタイル
+-Comment[ka]=ჩადგმული SGI სტილი
+ Comment[km]=រចនាប័ទ្ម Built-in SGI
+ Comment[ko]=SGI와 같은 꼴을 가진 붙박이 테마
+ Comment[lb]=Agebauten SGI-Stil
+@@ -77,7 +75,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
+--- kstyles/themes/qtmotifplus.themerc	(revision 484194)
++++ kstyles/themes/qtmotifplus.themerc	(revision 488534)
+@@ -15,7 +15,6 @@
+ Name[rw]=Impamvu Nyongera
+ Name[ta]=மோடிஃப் ப்ளஸ்
+ Name[th]=โมทีฟพลัส
+-Name[xx]=xxMotif Plusxx
+ Comment=Built-in enhanced Motif style
+ Comment[af]=Ingeboude verbeterde Motief styl
+ Comment[ar]=مظهر مضمن محسّن مشابه لMotif
+@@ -47,7 +46,6 @@
+ Comment[is]=Innbyggður stíll, endurbætt Motif unhverfi
+ Comment[it]=Stile Motif interno avanzato
+ Comment[ja]=内蔵拡張Motifスタイル
+-Comment[ka]=ჩადგმული გაუმჯობესებული Motif სტილი
+ Comment[km]=រចនាប័ទ្ម​ Motif ​ជាប់
+ Comment[ko]=더 나은 모티프와 같은 꼴을 가진 붙박이 테마
+ Comment[lb]=Agebauten, erweiderte Motif-Stil
+@@ -86,7 +84,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
+--- kstyles/themes/beos.themerc	(revision 484194)
++++ kstyles/themes/beos.themerc	(revision 488534)
+@@ -3,7 +3,6 @@
+ 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
+@@ -35,7 +34,6 @@
+ Comment[is]=Stíll í anda BeOS stýrikerfisins (án þema)
+ Comment[it]=Stile senza tema simile a BeOS
+ Comment[ja]=テーマになっていないBeOSのようなスタイル
+-Comment[ka]=BeOS-ის მსგავსი სტილი თემების გარეშე
+ Comment[km]=រចនាប័ទ្ម BeOS-like ដែល​គ្មាន​ស្បែក
+ Comment[ko]=BeOS와 같은 꼴을 가진 테마
+ Comment[lb]=BeOS-ähnlechen Stil ouni Thema
+@@ -70,7 +68,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]
+--- kstyles/plastik/plastik.themerc	(revision 484194)
++++ kstyles/plastik/plastik.themerc	(revision 488534)
+@@ -5,7 +5,6 @@
+ Name[he]=פלסטיק
+ Name[hi]=प्लास्टिक
+ Name[is]=Plast
+-Name[ka]=პლასტიკი
+ Name[lt]=Plastikinis
+ Name[lv]=Plastika
+ Name[mk]=Пластик
+@@ -19,7 +18,6 @@
+ Name[tg]=Пластик
+ Name[uk]=Пластик
+ Name[uz]=Пластик
+-Name[xx]=xxPlastikxx
+ Name[zh_CN]=å¡‘æ–™
+ ConfigPage=kstyle_plastik_config
+ Comment=A simple and clean style
+@@ -47,7 +45,6 @@
+ Comment[is]=Einfaldur og hreinlegur stíll
+ Comment[it]=Uno stile semplice e pulito
+ Comment[ja]=シンプルできれいなスタイル
+-Comment[ka]=მარტივი და სუფთა სტილი
+ Comment[km]=រចនាប័ទ្ម​សាមញ្ញ ហើយ​​ស្អាត
+ Comment[lb]=En einfachen a schlichte Stil
+ Comment[lt]=Paprastas ir Å¡varus stilius
+@@ -76,7 +73,6 @@
+ Comment[tt]=Ciñel yämle tışlaw
+ Comment[uk]=Простий та чистий стиль
+ Comment[uz]=Оддий ва чиройли услуб
+-Comment[xx]=xxA simple and clean stylexx
+ Comment[zh_CN]=ç®€æ´æ¸…çˆ½çš„æ ·å¼
+ [KDE]
+ WidgetStyle=Plastik
+--- kstyles/highcontrast/highcontrast.themerc	(revision 484194)
++++ kstyles/highcontrast/highcontrast.themerc	(revision 488534)
+@@ -19,7 +19,6 @@
+ Name[is]=Há birtuskil
+ Name[it]=Contrasto elevato
+ Name[ja]=高コントラスト
+-Name[ka]=კონტრასტი
+ Name[km]=កម្រិត​ពណ៌​ខ្ពស់
+ Name[lb]=HéichKontrast
+ Name[lt]=Didelis kontrastas
+@@ -44,7 +43,6 @@
+ Name[tr]=Yüksek Kontrast
+ Name[tt]=KiskenTösle
+ Name[uk]=Висока контрастність
+-Name[xx]=xxHighContrastxx
+ Name[zh_CN]=高对比度
+ ConfigPage=kstyle_highcontrast_config
+ Comment=A style that works well with high contrast color schemes
+@@ -67,7 +65,6 @@
+ 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
+ Comment[ja]=高コントラストの色スキームにふさわしいスタイル
+-Comment[ka]=ფერების მაღალ კონტრასტული სქემების სტილი
+ Comment[km]=រចនាប័ទ្មដែល​ធ្វើការ​យ៉ាង​ល្អ​ជាមួយ​គ្រោង​ពណ៌​កម្រិត​ខ្ពស់
+ Comment[lb]=E Stil, dee gutt bei Faarfschemaë mat engem héiche Kontrast passt
+ Comment[lt]=Stilius, kuris labai tinka didelio kontrasto spalvų schemoms
+@@ -93,7 +90,6 @@
+ Comment[tr]=Yüksek kontrast renk şemalarına uygun bir stil
+ Comment[tt]=Bu tışlaw bik kisken tösle köyläwlärgä yaxşı kileşä
+ Comment[uk]=Стиль, який підходить до схем кольорів з високою контрастністю
+-Comment[xx]=xxA style that works well with high contrast color schemesxx
+ Comment[zh_CN]=åœ¨é«˜å¯¹æ¯”åº¦é…è‰²æ–¹æ¡ˆä¸­é€‚ç”¨çš„æ ·å¼
+ [KDE]
+ WidgetStyle=HighContrast
+--- kstyles/web/web.themerc	(revision 484194)
++++ kstyles/web/web.themerc	(revision 488534)
+@@ -30,7 +30,6 @@
+ Name[is]=Vefstíll
+ Name[it]=Web
+ Name[ja]=ウェブスタイル
+-Name[ka]=Web სტილი
+ Name[km]=រចនាប័ទ្មរបស់​គេហទំព័រ
+ Name[ko]=웹 꼴
+ Name[lb]=Web-Stil
+@@ -69,7 +68,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
+@@ -103,7 +101,6 @@
+ Comment[is]=Vefeiningastíll
+ Comment[it]=Stile Web
+ Comment[ja]=Webウィジェットスタイル
+-Comment[ka]=Web widget სტილი
+ Comment[km]=រចនាប័ទ្ម​​របស់​វត្ថុមើល​ឃើញ​នៃ​គេហទំព័រ
+ Comment[ko]=웹 ìœ„ì ¯ ê¼´
+ Comment[lb]=Web-Widget-Stil
+@@ -142,7 +139,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
+--- kabc/plugins/file/file.desktop	(revision 484194)
++++ kabc/plugins/file/file.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Name[id]=Berkas
+ Name[is]=Skrá
+ Name[ja]=ファイル
+-Name[ka]=ფაილი
+ Name[km]=ឯកសារ
+ Name[ko]=파일
+ Name[lb]=Datei
+@@ -67,7 +66,6 @@
+ Name[uk]=Файл
+ Name[uz]=Файл
+ Name[wa]=Fitchî
+-Name[xx]=xxFilexx
+ Name[zh_CN]=文件
+ X-KDE-Library=kabc_file
+ Type=Service
+--- kabc/plugins/sql/sql.desktop	(revision 484194)
++++ kabc/plugins/sql/sql.desktop	(revision 488534)
+@@ -4,7 +4,6 @@
+ Name[bn]=এস-কিউ-এল (SQL)
+ Name[hi]=एसक्यूएल (SQL)
+ Name[ss]=I-SQL
+-Name[xx]=xxSQLxx
+ 
+ [Plugin]
+ Type=sql
+--- kabc/plugins/ldapkio/ldapkio.desktop	(revision 484194)
++++ kabc/plugins/ldapkio/ldapkio.desktop	(revision 488534)
+@@ -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
+--- kabc/plugins/evolution/evolution.desktop	(revision 484194)
++++ kabc/plugins/evolution/evolution.desktop	(revision 488534)
+@@ -16,7 +16,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
+--- kabc/plugins/net/net.desktop	(revision 484194)
++++ kabc/plugins/net/net.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Name[is]=Net
+ Name[it]=Rete
+ Name[ja]=ネットワーク
+-Name[ka]=ქსელი
+ Name[km]=បណ្តាញ
+ Name[ko]=네트워크
+ Name[lb]=Netzwierk
+@@ -74,7 +73,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
+--- kabc/plugins/dir/dir.desktop	(revision 484194)
++++ kabc/plugins/dir/dir.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Name[is]=Mappa
+ Name[it]=Cartella
+ Name[ja]=ディレクトリ
+-Name[ka]=დასტა
+ Name[km]=ថត
+ Name[ko]=자료방
+ Name[lb]=Verzeechnis
+@@ -76,7 +75,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
+--- kabc/kabc_manager.desktop	(revision 484194)
++++ kabc/kabc_manager.desktop	(revision 488534)
+@@ -23,7 +23,6 @@
+ Name[is]=Tengiliðir
+ Name[it]=Contatti
+ Name[ja]=コンタクト
+-Name[ka]=კონტაქტები
+ Name[km]=ទំនាក់ទំនង
+ Name[lb]=Kontakter
+ Name[lt]=Kontaktai
+@@ -51,7 +50,6 @@
+ Name[tt]=Elemtälär
+ Name[uk]=Контакти
+ Name[uz]=Алоқалар
+-Name[xx]=xxContactsxx
+ Name[zh_CN]=联系人
+ Type=Service
+ ServiceTypes=KResources/Manager
+--- kabc/kab2kabc.desktop	(revision 484194)
++++ kabc/kab2kabc.desktop	(revision 488534)
+@@ -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
+@@ -50,7 +49,6 @@
+ Comment[is]=libkab í libkabc breytingatól.
+ Comment[it]=Strumento di conversione da libkab a libkabc.
+ Comment[ja]=libkab から libkabc への変換ツール
+-Comment[ka]=libkab => libkabc გარდაქმნის ხელსაწყო.
+ Comment[km]=ឧបករណ៍​បម្លែង​ពី libkab ទៅ libkabc
+ Comment[ko]=libkab을 libkabc로 바꿔주는 연장.
+ Comment[lb]=libkab op libkabc Konvertéierungs-Hëllefsmëttel.
+@@ -89,7 +87,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
+--- kabc/formats/binary.desktop	(revision 484194)
++++ kabc/formats/binary.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Name[is]=Tvíunda
+ Name[it]=Binario
+ Name[ja]=バイナリ
+-Name[ka]=ორობითი
+ Name[km]=គោលពីរ
+ Name[ko]=바이너리
+ Name[lb]=Binär
+@@ -72,7 +71,6 @@
+ Name[ven]=Zwivhili
+ Name[wa]=Binaire
+ Name[xh]=Ephindwe kabini
+-Name[xx]=xxBinaryxx
+ Name[zh_CN]=二进制
+ Name[zh_TW]=二進位
+ Name[zu]=Okuhambisana ngambili
+--- kcert/kcertpart.desktop	(revision 484194)
++++ kcert/kcertpart.desktop	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]=Ívefjanlegur einkaskírteina-stjóri
+ Comment[it]=Gestione integrabile dei certificati personali
+ Comment[ja]=埋め込み可能個人証明書マネージャ
+-Comment[ka]=პერსონალური სერთიფიკატების ჩადგმული მმართველი
+ Comment[km]=កម្មវិធី​គ្រប់គ្រង​វិញ្ញាបនបត្រ​ឯកជន​ដែល​អាច​បង្កប់
+ Comment[ko]=끼워넣는 개인용 인증서 관리
+ Comment[lb]=Abettbare perséinlechen Zertifikatsmanager
+@@ -72,7 +71,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
+@@ -87,7 +85,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
+--- kutils/kplugininfo.desktop	(revision 484194)
++++ kutils/kplugininfo.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Name[is]=KDE íforritsupplýsingar
+ Name[it]=Informazioni plugin KDE
+ Name[ja]=KDE ãƒ—ãƒ©ã‚°ã‚¤ãƒ³æƒ…å ±
+-Name[ka]=KDE მოდულის ინფორმაცია
+ Name[km]=ព័ត៌មាន​កម្មវិធី​ជំនួយ​ខាង​ក្នុង KDE
+ Name[ko]=KDE 플러그인 ì •ë³´
+ Name[lb]=KDE-Plugininformatioun
+@@ -69,7 +68,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 外掛資訊
+ 
+--- kspell2/plugins/aspell/kspell_aspell.desktop	(revision 484194)
++++ kspell2/plugins/aspell/kspell_aspell.desktop	(revision 488534)
+@@ -18,4 +18,3 @@
+ Name[it]=Aspell
+ Name[sv]=Aspell
+ Name[ta]=psதேர்ந்தெடு
+-Name[xx]=xxASpellxx
+--- kspell2/plugins/hspell/kspell_hspellclient.h	(revision 484194)
++++ kspell2/plugins/hspell/kspell_hspellclient.h	(revision 488534)
+@@ -25,7 +25,10 @@
+ #include "client.h"
+ #include <qobject.h>
+ 
++/* libhspell is a C library and it does not have #ifdef __cplusplus */
++extern "C" {
+ #include "hspell.h"
++}
+ 
+ namespace KSpell2 {
+     class Dictionary;
+--- kspell2/plugins/hspell/kspell_hspell.desktop	(revision 484194)
++++ kspell2/plugins/hspell/kspell_hspell.desktop	(revision 488534)
+@@ -13,5 +13,5 @@
+ X-KDE-PluginInfo-License=LGPL
+ X-KDE-PluginInfo-EnabledByDefault=true
+ Name=HSpell
++Name[bn]=এইচ-স্পেল
+ Name[sv]=Hspell
+-Name[xx]=xxHSpellxx
+--- kspell2/plugins/ispell/kspell_ispell.desktop	(revision 484194)
++++ kspell2/plugins/ispell/kspell_ispell.desktop	(revision 488534)
+@@ -19,4 +19,3 @@
+ Name[sv]=Ispell
+ Name[ta]=psதேர்ந்தெடு
+ Name[tg]=psselect
+-Name[xx]=xxISpellxx
+--- kspell2/kspellclient.desktop	(revision 484194)
++++ kspell2/kspellclient.desktop	(revision 488534)
+@@ -30,7 +30,6 @@
+ Comment[is]=KSpell biðlarinn
+ Comment[it]=Client KSpell
+ Comment[ja]=KSpell クライアント
+-Comment[ka]=KSpell კლიენტი
+ Comment[lb]=KSpell-Zougrëffsprogramm
+ Comment[lt]=KSpell klientas
+ Comment[lv]=KSpell klients
+@@ -58,5 +57,4 @@
+ Comment[tt]=KSpell Kliente
+ Comment[uk]=Клієнт KSpell
+ Comment[uz]=KSpell клиенти
+-Comment[xx]=xxKSpell Clientxx
+ Comment[zh_CN]=KSpell 客户
+--- knewstuff/downloaddialog.cpp	(revision 484194)
++++ knewstuff/downloaddialog.cpp	(revision 488534)
+@@ -689,6 +689,7 @@
+     desc += QString("<br><i>%1</i>").arg(e->summary(lang));
+     desc += QString("<br>(%1)").arg(e->license());
+ 
++    m_rt->clear();
+     m_rt->setText(desc);
+ 
+     if(installStatus(e) == 1) enabled = false;
+--- kdecore/eventsrc	(revision 484194)
++++ kdecore/eventsrc	(revision 488534)
+@@ -34,7 +34,6 @@
+ Comment[is]=Tilkynningar KDE kerfisins
+ Comment[it]=Avvisi di sistema di KDE
+ Comment[ja]=KDEシステム通知
+-Comment[ka]=KDE სისტემური შეტყობინებები
+ Comment[km]=ការ​ជូន​ដំណឹង​អំពី​ប្រព័ន្ធ​របស់ KDE
+ Comment[ko]=KDE 시스템 알림
+ Comment[lb]=KDE-System-Norichten
+@@ -76,7 +75,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
+@@ -107,7 +105,6 @@
+ Name[is]=Rusl: tæmt
+ Name[it]=Cestino: svuotato
+ Name[ja]=ごみ箱: カラ
+-Name[ka]=ურნა: ცარიელია
+ Name[km]=ធុង​សំរាម ៖ បាន​សម្អាត
+ Name[lb]=Dreckskëscht: eidel
+ Name[lt]=Šiukšliadėžė: ištuštinta
+@@ -134,7 +131,6 @@
+ Name[tt]=Çüplek: buşatıldı
+ Name[uk]=Смітник: спорожнено
+ Name[uz]=Чиқиндилар қутиси бўшатилди
+-Name[xx]=xxTrash: emptiedxx
+ Name[zh_CN]=回收站：已清空
+ Comment=The trash has been emptied
+ Comment[af]=Die gemors is leeggemaak
+@@ -160,7 +156,6 @@
+ Comment[is]=Ruslafatan hefur verið tæmd
+ Comment[it]=Il cestino è stato svuotato
+ Comment[ja]=ごみ箱が空になりました
+-Comment[ka]=ურნა დაცარიელდა
+ Comment[km]=ធុង​សំរាម​ត្រូវ​បាន​សម្អាត
+ Comment[lb]=D'Dreckskëscht ass eidelgemat ginn
+ Comment[lt]=Šiukšliadėžė buvo ištuštinta
+@@ -187,7 +182,6 @@
+ Comment[tt]=Çüplek buşatılğan buldı
+ Comment[uk]=Смітник було спорожнено
+ Comment[uz]=Чиқиндилар қутиси бўшатилди
+-Comment[xx]=xxThe trash has been emptiedxx
+ Comment[zh_CN]=回收站已被清空
+ default_presentation=1
+ 
+@@ -225,7 +219,6 @@
+ Name[is]=Textaklárun: snúningur
+ Name[it]=Completamento testo: rotazione
+ Name[ja]=テキスト補完: 繰り返し
+-Name[ka]=თვითშევსება: მოტრიალება
+ Name[km]=ការ​បំពេញ​អត្ថបទ ៖ ការ​បង្វិល
+ Name[ko]=글월 완성: 맴돌이
+ Name[lb]=Textergänzung: rotéierent
+@@ -266,7 +259,6 @@
+ 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
+@@ -295,9 +287,8 @@
+ Comment[is]=Enda listans yfir atriði sem passa náð
+ Comment[it]=È stata raggiunta la fine della lista delle corrispondenze
+ Comment[ja]=マッチリストの終端に達しました
+-Comment[ka]=თანხვედრათა სიის ბოლო.
+ Comment[km]=បាន​ទៅ​ដល់​ចុង​បញ្ចប់​នៃ​បញ្ជី​ដំណូច
+-Comment[lb]=D'Enn vun der Lëscht mat den Iwwerteneestëmmungen ass erreecht gin
++Comment[lb]=D'Enn vun der Lëscht mat den Iwwerteneestëmmungen ass erreecht ginn
+ Comment[lt]=Pasiektas atitikmenų sąrašo galas
+ Comment[lv]=Sasniegtas atbilstību saraksta beigas
+ Comment[mk]=Достигнат е крајот на листата на совпаѓања
+@@ -325,7 +316,6 @@
+ Comment[tt]=Kileşülär tezmäseneñ azağına cittek
+ Comment[uk]=Досягнуто кінець списку співпадань
+ Comment[uz]=Мос келадиган элементлар рўйхатининг охири
+-Comment[xx]=xxThe end of the list of matches has been reachedxx
+ Comment[zh_CN]=已到达匹配项列表的最后
+ default_presentation=1
+ 
+@@ -363,7 +353,6 @@
+ Name[is]=Textaklárun: ekkert passar
+ Name[it]=Completamento testo: nessuna corrispondenza
+ Name[ja]=テキスト補完: マッチなし
+-Name[ka]=თვითშევსება: თანხვედრები არ არის
+ Name[km]=ការ​បំពេញ​អត្ថបទ ៖ គ្មាន​ដំណូច
+ Name[ko]=글월 완성: 맞는 짝이 없음
+ Name[lb]=Textergänzung: keng Iwwerteneestëmmung
+@@ -404,7 +393,6 @@
+ 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
+@@ -433,7 +421,6 @@
+ Comment[is]=Ekkert passar
+ Comment[it]=Nessun completamento corrispondente trovato
+ Comment[ja]=マッチする補完は見つかりませんでした
+-Comment[ka]=თანხვედერები ვერ მოიძებნა.
+ Comment[km]=រក​មិន​ឃើញ​ការ​បំពេញ​ដែល​ដូច
+ Comment[lb]=Et gouf keng passend Ergänzung fonnt
+ Comment[lt]=Nerasta atitinkanti pabaiga
+@@ -463,7 +450,6 @@
+ Comment[tt]=Kileşkän azaqlar tabılmadı
+ Comment[uk]=Відповідного завершення не знайдено
+ Comment[uz]=Мос келадиган тугатиш топилмади
+-Comment[xx]=xxNo matching completion was foundxx
+ Comment[zh_CN]=没有找到匹配的补全项
+ default_presentation=1
+ 
+@@ -501,7 +487,6 @@
+ Name[is]=Textaklárun: passar næstum því
+ Name[it]=Completamento testo: corrispondenza parziale
+ Name[ja]=テキスト補完: 部分的にマッチ
+-Name[ka]=თვითშევსება: ნაწილობრივი თანხვედრა
+ Name[km]=ការ​បំពេញ​អត្ថបទ ៖ ដូច​ខ្លះៗ
+ Name[ko]=글월 완성: 부분은 짝이 맞음
+ Name[lb]=Textergänzung: deelweis Iwwerteneestëmmung
+@@ -542,7 +527,6 @@
+ 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
+@@ -571,7 +555,6 @@
+ Comment[is]=Það eru fleiri en eitt atriði sem passar
+ Comment[it]=C'è più di una corrispondenza possibile
+ Comment[ja]=1つ以上のマッチがあります
+-Comment[ka]=მოიძებნა ერთზე მეტი თანხვედრა.
+ Comment[km]=អាច​មាន​ដំណូច​ច្រើន​ជាង​មួយ
+ Comment[lb]=Et gëtt méi wéi eng méiglech Iwwerteneestëmmung
+ Comment[lt]=Yra daugiau negu vienas galimas atitikmuo
+@@ -601,7 +584,6 @@
+ Comment[tt]=Kileşkäne berdän dä kübkär
+ Comment[uk]=Більше одного відповідного значення
+ Comment[uz]=Биттадан кўп мослик топилди
+-Comment[xx]=xxThere is more than one possible matchxx
+ Comment[zh_CN]=有多于一个的可能匹配项
+ default_presentation=1
+ 
+@@ -641,7 +623,6 @@
+ Name[is]=Get ekki opnað skrá
+ Name[it]=Impossibile aprire il file
+ Name[ja]=ファイルを開けません
+-Name[ka]=ფაილის გახსნა ვერ ხერხდება
+ Name[km]=មិន​អាច​បើក​ឯកសារ
+ Name[ko]=파일을 열지 못함
+ Name[lb]=Kann d'Datei net opmaachen
+@@ -684,7 +665,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
+@@ -721,7 +701,6 @@
+ Comment[is]=Ekki er hægt að opna völdu skrána til lestrar eða skriftar
+ Comment[it]=Il file selezionato non può essere aperto per la lettura o la scrittura
+ Comment[ja]=選択されたファイルは読み、書き込みのために開けません
+-Comment[ka]=მონიშნული ფაილის გახსნა წასაკითხად ან ჩასაწერად ვერ ხერხდება
+ Comment[km]=មិន​អាច​បើក​អាន​ពី ឬ សរសេរ​ទៅ​ឯកសារ​ដែល​បាន​ជ្រើស
+ Comment[ko]=ê³ ë¥¸ 파일을 읽거나 쓰기위해 ì—´ 수가 없습니다
+ Comment[lb]=Déi ausgewielten Datei kann net opgemat gi fir ze liesen oder ze schreiwen
+@@ -762,7 +741,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
+@@ -803,7 +781,6 @@
+ Name[is]=Banvæn villa
+ Name[it]=Errore fatale
+ Name[ja]=致命的なエラー
+-Name[ka]=ფატალური შეცდომა
+ Name[km]=កំហុស​ធ្ងន់ធ្ងរ
+ Name[ko]=ì¹˜ëª…ì ì¸ 오류
+ Name[lb]=Fatale Feeler
+@@ -845,7 +822,6 @@
+ 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
+@@ -875,7 +851,6 @@
+ Comment[is]=Alvarleg villa stöðvaði keyrslu forritsins.
+ Comment[it]=Si è verificato un errore grave che ha causato la fine del programma
+ Comment[ja]=プログラムが終了する深刻なエラーがあります
+-Comment[ka]=სერიოზული შეცდომა, რომელმაც პროგრამიდან გასვლა გამოიწვია.
+ Comment[km]=មាន​កំហុស​ធ្ងន់ធ្ងរ​មួយ​ដែល​បាន​បណ្តាល​ឲ្យ​កម្មវិធី​បិទ
+ Comment[lb]=Et gouf e schwéiere Feeler, an de Programm gouf zougemat
+ Comment[lt]=Įvyko rimta klaida, privertusi programą užbaigti darbą
+@@ -905,7 +880,6 @@
+ Comment[tt]=Yazılımnan çığuına kitergän citdi xata kilep çıqqan
+ Comment[uk]=Серйозна помилка стала причиною виходу програми
+ Comment[uz]=Дастурнинг ишини якунланишига сабабчи бўлган жиддий хато рўй берди
+-Comment[xx]=xxThere was a serious error causing the program to exitxx
+ Comment[zh_CN]=有一个严重的错误导致程序退出
+ default_presentation=2
+ level=4
+@@ -944,7 +918,6 @@
+ Name[is]=Tilkynning
+ Name[it]=Avviso
+ Name[ja]=通知
+-Name[ka]=შეტყობინება
+ Name[km]=ការ​ជូន​ដំណឹង
+ Name[ko]=알림
+ Name[lb]=Noricht
+@@ -986,7 +959,6 @@
+ Name[vi]=Thông báo 
+ Name[wa]=Notifiaedje
+ Name[xh]=Isaziso
+-Name[xx]=xxNotificationxx
+ Name[zh_CN]=通知
+ Name[zh_TW]=通知
+ Name[zu]=Isaziso
+@@ -1016,7 +988,6 @@
+ Comment[is]=Eitthvað sérstakt gerðist í forritinu
+ Comment[it]=È successo qualcosa di speciale nel programma
+ Comment[ja]=何か特別なことがプログラムにおこりました
+-Comment[ka]=პროგრამაში რაღაც განსაკუთრებული მოხდა
+ Comment[km]=មាន​អ្វី​ពិសេស​មួយ​បាន​កើត​ឡើង​ក្នុង​កម្មវិធី
+ Comment[lb]=Et ass eng speziell Programmsituatioun opgetrueden
+ Comment[lt]=Kažkoks specialus įvykis programoje
+@@ -1046,7 +1017,6 @@
+ Comment[tt]=Yazılımda kötelmägän närsä kilep çıqqan
+ Comment[uk]=Щось особливе сталось у програмі
+ Comment[uz]=Дастурда қандайдир одатдан ташқари ҳодиса рўй берди
+-Comment[xx]=xxSomething special happened in the programxx
+ Comment[zh_CN]=程序中发生了特殊情况
+ default_presentation=1
+ default_sound=KDE_Beep.ogg
+@@ -1088,7 +1058,6 @@
+ Name[is]=Aðvörun
+ Name[it]=Avvertimento
+ Name[ja]=警告
+-Name[ka]=გაფრთხილება
+ Name[km]=ការព្រមាន
+ Name[ko]=ê²½ê³ 
+ Name[lb]=Warnung
+@@ -1130,7 +1099,6 @@
+ Name[vi]=Cảnh cáo 
+ Name[wa]=Adviertixhmint
+ Name[xh]=Isilumkiso
+-Name[xx]=xxWarningxx
+ Name[zh_CN]=警告
+ Name[zh_TW]=警告
+ Name[zu]=Isexwayiso
+@@ -1160,7 +1128,6 @@
+ Comment[is]=Það kom upp villa í forritinu sem gæti valdið vandræðum
+ Comment[it]=Nel programma si è verificato un errore che può causare problemi
+ Comment[ja]=プログラムに問題を引き起こすエラーがあります
+-Comment[ka]=პროგრამის შეცდომა, რომელმაც შესაძლოა პრობლემა შექმნას
+ Comment[km]=មាន​កំហុស​មួយ​ក្នុង​កម្មវិធី​ដែល​អាច​បណ្តាល​ឲ្យ​មាន​បញ្ហា
+ Comment[lb]=Et ass e Feeler am Programm opgetrueden, dee Problemer verursaache kéint
+ Comment[lt]=Įvyko programos klaida, galinti sukelti problemų
+@@ -1190,7 +1157,6 @@
+ Comment[tt]=Qıyınlıqlarğa kiterä ala torğan xatalar kilep çıqqannar
+ Comment[uk]=Сталася серйозна помилка, яка може викликати проблеми
+ Comment[uz]=Дастурда муаммоларга олиб келиши мумкин бўлган хато рўй берди
+-Comment[xx]=xxThere was an error in the program which may cause problemsxx
+ Comment[zh_CN]=程序中发生了可能导致问题的错误
+ default_presentation=2
+ level=2
+@@ -1229,7 +1195,6 @@
+ Name[is]=Stórslys
+ Name[it]=Catastrofe
+ Name[ja]=大惨事
+-Name[ka]=სისტემის კრახი
+ Name[km]=មហន្តរាយ
+ Name[ko]=큰일났습니다
+ Name[lb]=Katastroph
+@@ -1269,7 +1234,6 @@
+ Name[ven]=Mutshinyalo
+ Name[vi]=Thảm hoạ 
+ Name[xh]=Ingozi enkulu
+-Name[xx]=xxCatastrophexx
+ Name[zh_CN]=严重问题
+ Name[zh_TW]=嚴重問題
+ Name[zu]=Inhlekelele
+@@ -1306,7 +1270,6 @@
+ Comment[is]=Mjög alvarleg villa kom upp, sem hefur stöðvað keyrslu forritsins
+ Comment[it]=Si è verificato un errore molto grave, che come minimo ha causato la fine del programma
+ Comment[ja]=少なくともプログラムを終了時に、非常に重大なエラーが生じました。
+-Comment[ka]=სერიოზული შეცდომა, რომელმაც პროგრამიდან გასვლა გამოიწვია
+ Comment[km]=កំហុស​ដ៏​ធ្ងន់ធ្ងរ​បំផុត​មួយ​បាន​កើតឡើង ដែល​យ៉ាង​ហោច​ណាស់ ​វា​បណ្តាល​ឲ្យ​​កម្មវិធី​បិទ
+ Comment[ko]=프로그램이 ëë‚  ë•Œ 아주 심각한 오류가 생겼습니다
+ Comment[lb]=E ganz schlëmme Feeler ass opgetrueden, deen op Mannst zum Ophale vum Programm gefouert huet
+@@ -1340,7 +1303,6 @@
+ Comment[tt]=İñ kimendä,yazılımnan çığuına kitergän bik citdi xata kilep çıqqan
+ 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
+@@ -1376,7 +1338,6 @@
+ Name[is]=Innstimplun
+ Name[it]=Accesso
+ Name[ja]=ログイン
+-Name[ka]=შესვლა
+ Name[km]=ចូល
+ Name[ko]=로그인
+ Name[lb]=Umellen
+@@ -1416,7 +1377,6 @@
+ 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
+@@ -1446,7 +1406,6 @@
+ Comment[is]=KDE er að ræsa
+ Comment[it]=Avvio di KDE
+ Comment[ja]=KDE起動中
+-Comment[ka]=KDE-ს დაწყება
+ Comment[km]=KDE កំពុង​ចាប់ផ្តើម
+ Comment[lb]=KDE gëtt gestart
+ Comment[lt]=KDE pradeda darbÄ…
+@@ -1476,7 +1435,6 @@
+ Comment[tt]=KDE yöklänä
+ 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
+@@ -1513,7 +1471,6 @@
+ Name[is]=Stimpla út
+ Name[it]=Uscita
+ Name[ja]=ログアウト
+-Name[ka]=გამოსვლა
+ Name[km]=ចេញ
+ Name[ko]=로그아웃
+ Name[lb]=Ofmellen
+@@ -1554,7 +1511,6 @@
+ 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
+@@ -1584,7 +1540,6 @@
+ Comment[is]=KDE er að hætta
+ Comment[it]=Uscita da KDE
+ Comment[ja]=KDE終了中
+-Comment[ka]=KDE-დან გამოსვლა
+ Comment[km]=KDE កំពុង​បិទ
+ Comment[lb]=KDE gëtt zougemat
+ Comment[lt]=KDE baigia darbÄ…
+@@ -1614,7 +1569,6 @@
+ Comment[tt]=KDE tuqtatıla
+ Comment[uk]=Триває завершення роботи KDE
+ Comment[uz]=KDE ишини якунламоқда
+-Comment[xx]=xxKDE is exitingxx
+ Comment[zh_CN]=KDE 正在退出
+ default_presentation=1
+ default_sound=KDE_Logout_3.ogg
+@@ -1654,7 +1608,6 @@
+ Name[is]=Prentunarvilla
+ Name[it]=Errore di stampa
+ Name[ja]=印刷エラー
+-Name[ka]=ბეჭდვის შეცდომა
+ Name[km]=កំហុស​បោះពុម្ព
+ Name[ko]=인쇄 오류
+ Name[lb]=Dréckfeeler
+@@ -1695,7 +1648,6 @@
+ 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
+@@ -1732,7 +1684,6 @@
+ Comment[is]=Prentunarvilla átti sér stað
+ Comment[it]=Si è verificato un errore di stampa
+ Comment[ja]=印刷エラーが発生しました
+-Comment[ka]=ბეჭდვის შეცდომა
+ Comment[km]=កំហុស​បោះពុម្ព​មួយ​បាន​កើតឡើង
+ Comment[ko]=인쇄 오류가 생겼습니다
+ Comment[lb]=En Dréckfeeler ass opgetrueden
+@@ -1767,7 +1718,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
+@@ -1808,7 +1758,6 @@
+ Name[is]=Til fróðleiks
+ Name[it]=Messaggio informativo
+ Name[ja]=æƒ…å ±ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸
+-Name[ka]=საინფორმაციო შეტყობინება
+ Name[km]=សារ​ដំណឹង
+ Name[ko]=ì •ë³´ 메세지
+ Name[lb]=Informatioun
+@@ -1843,7 +1792,6 @@
+ 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
+@@ -1877,7 +1825,6 @@
+ Comment[is]=Skilaboð notandanum til fróðleiks
+ Comment[it]=Viene mostrato un messaggio informativo
+ Comment[ja]=æƒ…å ±ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’è¡¨ç¤ºã—ã¾ã™
+-Comment[ka]=საინფორმაციო შეტყობინების ჩვენება
+ Comment[km]=កំពុង​បង្ហាញ​សារ​ដំណឹង​មួយ
+ Comment[ko]=ì •ë³´ 메세지가 보입니다
+ Comment[lb]=Eng Informatiounsnoricht gëtt ugewisen
+@@ -1912,7 +1859,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
+@@ -1952,7 +1898,6 @@
+ Name[is]=Aðvörun
+ Name[it]=Messaggio di avvertimento
+ Name[ja]=警告メッセージ
+-Name[ka]=გაფრთხილება
+ Name[km]=សារ​ព្រមាន
+ Name[ko]=ê²½ê³  메세지
+ Name[lb]=Warnung
+@@ -1987,7 +1932,6 @@
+ 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
+@@ -2021,7 +1965,6 @@
+ Comment[is]=Aðvörun til notanda
+ Comment[it]=Viene mostrato un messaggio di avvertimento
+ Comment[ja]=警告メッセージを表示します
+-Comment[ka]=გაფრთხილების ჩვენება
+ Comment[km]=កំពុង​បង្ហាញ​សារ​ព្រមាន​មួយ
+ Comment[ko]=ê²½ê³  메세지가 보입니다
+ Comment[lb]=Eng Warnungsnoricht gëtt ugewisen
+@@ -2056,7 +1999,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
+@@ -2097,7 +2039,6 @@
+ Name[is]=Alvarleg aðvörun
+ Name[it]=Messaggio critico
+ Name[ja]=クリティカルメッセージ
+-Name[ka]=კრიტიკული შეცდომა
+ Name[km]=សារ​សំខាន់
+ Name[ko]=중요 메세지
+ Name[lb]=Kritesch Noricht
+@@ -2131,7 +2072,6 @@
+ 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
+@@ -2165,7 +2105,6 @@
+ Comment[is]=Alvarleg skilaboð
+ Comment[it]=Viene mostrato un messaggio critico
+ Comment[ja]=クリティカルメッセージを表示します
+-Comment[ka]=კრიტიკული შეცდომის ჩვენება
+ Comment[km]=កំពុង​បង្ហាញ​សារ​សំខាន់​មួយ
+ Comment[ko]=중요 메세지가 보입니다
+ Comment[lb]=Eng kritesch Noricht gëtt ugewisen
+@@ -2199,7 +2138,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
+@@ -2241,7 +2179,6 @@
+ Name[is]=Spurning
+ Name[it]=Domanda
+ Name[ja]=質問
+-Name[ka]=შეკითხვა
+ Name[km]=សំណួរ
+ Name[ko]=물음
+ Name[lb]=Fro
+@@ -2276,7 +2213,6 @@
+ 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
+@@ -2311,7 +2247,6 @@
+ Comment[is]=Spurt er
+ Comment[it]=Viene posta una domanda
+ Comment[ja]=質問が出されています
+-Comment[ka]=შეკითხვის დასმა
+ Comment[km]=កំពុង​សួរ​សំណួរ​មួយ
+ Comment[ko]=ë¬¼ì–´ë³´ê² ìŠµë‹ˆë‹¤
+ Comment[lb]=Eng Fro gëtt ugewisen
+@@ -2346,7 +2281,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
+--- kdecore/all_languages.desktop	(revision 484194)
++++ kdecore/all_languages.desktop	(revision 488534)
+@@ -11,7 +11,6 @@
+ Name[hi]=अफ्र
+ Name[hr]=Afarski
+ Name[ja]=アファル語
+-Name[ka]=აფარული
+ Name[km]=អាហ្វារ
+ Name[ko]=아파르어
+ Name[lt]=Afarų
+@@ -36,7 +35,6 @@
+ Name[tt]=Afarça
+ Name[uk]=Афар
+ Name[uz]=Афар
+-Name[xx]=xxAfarxx
+ Name[zh_CN]=阿法尔语
+ Name[zh_TW]=阿發爾
+ Name[zu]=Okude kakhulu
+@@ -69,7 +67,6 @@
+ Name[hu]=Abház
+ Name[it]=Abkhaziano
+ Name[ja]=アブハーズ語
+-Name[ka]=აფხაზური
+ Name[km]=អាប់ខាហ្ស៊ាន
+ Name[ko]=아브하지아어
+ Name[lb]=Abhasesch
+@@ -101,7 +98,6 @@
+ Name[uk]=Абхазька
+ Name[uz]=Абхазча
+ Name[wa]=Abxhaze
+-Name[xx]=xxAbkhazianxx
+ Name[zh_CN]=阿布哈西亚语
+ Name[zh_TW]=阿布哈西亞語
+ Name[zu]=I-Abkhazian
+@@ -129,7 +125,6 @@
+ Name[hu]=Avesztáni
+ Name[it]=Avestano
+ Name[ja]=アヴェスター語
+-Name[ka]=ავესტური
+ Name[km]=អាវែស្តង់
+ Name[ko]=ì•„ë² ìŠ¤íƒ„ì–´
+ Name[mk]=Авестан
+@@ -155,7 +150,6 @@
+ Name[tt]=Avestança
+ Name[uk]=Авестан
+ Name[uz]=Авеста
+-Name[xx]=xxAvestanxx
+ Name[zh_CN]=阿维斯陀语
+ Name[zh_TW]=阿維斯陀語
+ Name[zu]=Isi-Avestan
+@@ -180,7 +174,6 @@
+ Name[hr]=Afrički
+ Name[id]=Afrika
+ Name[ja]=アフリカーンス語
+-Name[ka]=აფრიკაანსი
+ Name[km]=អាហ្វ្រីកាអាន
+ Name[ko]=남아프리카 공용어
+ Name[lt]=Afrikanso 
+@@ -215,7 +208,6 @@
+ Name[uz]=Африканча
+ Name[ven]=Tshivhuru
+ Name[xh]=Isibhulu
+-Name[xx]=xxAfrikaansxx
+ Name[zh_CN]=南非荷兰语
+ Name[zh_TW]=南非荷蘭語
+ Name[zu]=Isi-Bhunu
+@@ -247,7 +239,6 @@
+ Name[hu]=Amhár
+ Name[it]=Amarico
+ Name[ja]=アムハラ語
+-Name[ka]=ამჰარული
+ Name[km]=អាមហារី
+ Name[ko]=암하라어
+ Name[lb]=Amharesch
+@@ -280,7 +271,6 @@
+ Name[tt]=Amharça
+ Name[uk]=Амхарська
+ Name[uz]=Амхарик
+-Name[xx]=xxAmharicxx
+ Name[zh_CN]=阿姆哈拉语
+ Name[zh_TW]=衣索比亞官方語
+ Name[zu]=isi-Amharic
+@@ -319,7 +309,6 @@
+ Name[is]=Arabíska
+ Name[it]=Arabo
+ Name[ja]=アラビア語
+-Name[ka]=არაბული
+ Name[km]=អារ៉ាប់
+ Name[ko]=아라비아어
+ Name[lb]=Arabesch
+@@ -361,7 +350,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
+@@ -389,7 +377,6 @@
+ Name[hsb]=Asamezisce
+ Name[hu]=Asszámi
+ Name[ja]=アッサム語
+-Name[ka]=ასამესე
+ Name[km]=អាសាមីស
+ Name[ko]=아삼어
+ Name[lb]=Assamesesch
+@@ -420,7 +407,6 @@
+ Name[tt]=Assamesçä
+ Name[uk]=Асамійська
+ Name[uz]=Ассамесе
+-Name[xx]=xxAssamesexx
+ Name[zh_CN]=阿萨姆语
+ Name[zh_TW]=阿薩姆語
+ Name[zu]=Isi-Assamese
+@@ -443,7 +429,6 @@
+ Name[hr]=Ajmarski
+ Name[hu]=Ajmara
+ Name[ja]=アイマラ語
+-Name[ka]=აიმარა
+ Name[km]=អីម៉ារ៉ា
+ Name[ko]=아이마라어
+ Name[lb]=Aimara
+@@ -466,7 +451,6 @@
+ Name[tt]=Aymarça
+ Name[uk]=Аймарська
+ Name[uz]=Аймара
+-Name[xx]=xxAymaraxx
+ Name[zh_CN]=艾马拉语
+ Name[zh_TW]=愛瑪拉語
+ Name[zu]=Isi-Aymara
+@@ -504,7 +488,6 @@
+ Name[is]=Azerbaijanska
+ Name[it]=Azerbaigiano
+ Name[ja]=アゼルバイジャン語
+-Name[ka]=აზერბაიჯანული
+ Name[km]=អាហ្ស៊ែរបែហ្សង់
+ Name[ko]=ì•„ì œë¥´ë°”ì´ìž”ì–´
+ Name[lb]=Asserbaidschanesch
+@@ -543,7 +526,6 @@
+ Name[uz]=Озарбайжонча
+ Name[vi]=Agiecbaigiăng 
+ Name[wa]=Azeri
+-Name[xx]=xxAzerbaijanixx
+ Name[zh_CN]=阿塞拜疆语
+ Name[zh_TW]=亞塞拜然語
+ Name[zu]=Isi-Azerbaijani
+@@ -570,7 +552,6 @@
+ Name[hr]=Baškirski
+ Name[hu]=Baskír
+ Name[ja]=バシキール語
+-Name[ka]=ბაშკირული
+ Name[km]=បាសគៀរ
+ Name[ko]=바시킬어
+ Name[lb]=Baschkiresch
+@@ -598,7 +579,6 @@
+ Name[tt]=Başqortça
+ Name[uk]=Башкирська
+ Name[uz]=Бошқирча
+-Name[xx]=xxBashkirxx
+ Name[zh_CN]=巴什基尔语
+ Name[zh_TW]=Bashkir語
+ Name[zu]=Isi-Bashkir
+@@ -636,7 +616,6 @@
+ Name[is]=Hvíta-Rússneska
+ Name[it]=Bielorusso
+ Name[ja]=ベラルーシ語
+-Name[ka]=ბელორუსული
+ Name[km]=បេឡារុស្ស
+ Name[ko]=백러시아어
+ Name[lb]=Wéisrussesch
+@@ -675,7 +654,6 @@
+ Name[uz]=Белорусча
+ Name[vi]=SBelarusian 
+ Name[wa]=Bielorûsse
+-Name[xx]=xxBelarusianxx
+ Name[zh_CN]=白俄罗斯语
+ Name[zh_TW]=白俄羅斯語
+ Name[zu]=Isi-Belarusian
+@@ -714,7 +692,6 @@
+ Name[is]=Búlgarska
+ Name[it]=Bulgaro
+ Name[ja]=ブルガリア語
+-Name[ka]=ბულგარული
+ Name[km]=ប៊ុលហ្ការី
+ Name[ko]=불가리아어
+ Name[lb]=Bulgaresch
+@@ -755,7 +732,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
+@@ -775,7 +751,6 @@
+ Name[hi]=बिहारी
+ Name[hr]=Biharski
+ Name[ja]=ビハール語
+-Name[ka]=ბიჰარი
+ Name[km]=បិហារ
+ Name[ko]=비하르어
+ Name[lb]=Biharesch
+@@ -796,7 +771,6 @@
+ Name[tt]=Biharça
+ Name[uk]=Біхарі
+ Name[uz]=Бихари
+-Name[xx]=xxBiharixx
+ Name[zh_CN]=比哈里语
+ Name[zh_TW]=比哈爾語
+ Name[zu]=Isi-Bihari
+@@ -815,7 +789,6 @@
+ Name[hr]=Bislamski
+ Name[hu]=Biszlama
+ Name[ja]=ビスラマ語
+-Name[ka]=ბისლამა
+ Name[km]=បីសឡាម៉ា
+ Name[ko]=비슬라마어
+ Name[mk]=Бислама
+@@ -835,7 +808,6 @@
+ Name[tt]=Bislamaça
+ Name[uk]=Біслама
+ Name[uz]=Бислама
+-Name[xx]=xxBislamaxx
+ Name[zh_CN]=比斯拉马语
+ Name[zh_TW]=Bislama語
+ Name[zu]=Isi-Bislama
+@@ -863,7 +835,6 @@
+ Name[is]=Bengalst
+ Name[it]=Bengalese
+ Name[ja]=ベンガル語
+-Name[ka]=ბენგალი
+ Name[km]=បេន្កាលី
+ Name[ko]=벵갈어
+ Name[lb]=Bengalesch
+@@ -890,7 +861,6 @@
+ Name[tt]=Bengalça
+ Name[uk]=Бенгальська
+ Name[uz]=Бенгалча
+-Name[xx]=xxBengalixx
+ Name[zh_CN]=å­ŸåŠ æ‹‰è¯­
+ Name[zh_TW]=å­ŸåŠ æ‹‰èªž
+ Name[zu]=Isi-Bengali
+@@ -928,7 +898,6 @@
+ Name[is]=Tíbeska
+ Name[it]=Tibetano
+ Name[ja]=チベット語
+-Name[ka]=ტიბეტური
+ Name[km]=ទីបេ
+ Name[ko]=티벳어
+ Name[lb]=Tibetanesch
+@@ -963,7 +932,6 @@
+ Name[uk]=Тибетська
+ Name[uz]=Тибетча
+ Name[wa]=Tibetyin
+-Name[xx]=xxTibetanxx
+ Name[zh_CN]=藏语
+ Name[zh_TW]=藏語
+ Name[zu]=Isi-Tibetan
+@@ -998,7 +966,6 @@
+ Name[is]=Bretánska
+ Name[it]=Bretone
+ Name[ja]=ブルトン語
+-Name[ka]=ბრეტონული
+ Name[km]=ប្រឺតុង
+ Name[ko]=브르타뉴어
+ Name[lb]=Britesch
+@@ -1036,7 +1003,6 @@
+ Name[uk]=Бретонська
+ Name[uz]=Бретонча
+ Name[wa]=Burton
+-Name[xx]=xxBretonxx
+ Name[zh_CN]=布里多尼语
+ Name[zh_TW]=不列塔尼語
+ Name[zu]=Isi-Breton
+@@ -1075,7 +1041,6 @@
+ Name[is]=Bosníska
+ Name[it]=Bosniaco
+ Name[ja]=ボスニア語
+-Name[ka]=ბოსნიური
+ Name[km]=បូស្នី
+ Name[ko]=보스니아어
+ Name[lb]=Bosnesch
+@@ -1114,7 +1079,6 @@
+ Name[uz]=Боснияча
+ Name[ven]=Mubosinia
+ Name[wa]=Bosnyin
+-Name[xx]=xxBosnianxx
+ Name[zh_CN]=波斯尼亚语
+ Name[zh_TW]=波士尼亞語
+ Name[zu]=Isi-Bosnian
+@@ -1151,7 +1115,6 @@
+ Name[is]=Katalánska
+ Name[it]=Catalano
+ Name[ja]=カタロニア語
+-Name[ka]=კატალონური
+ Name[km]=កាតាឡាន
+ Name[ko]=카탈로니아어
+ Name[lb]=Katalanesch
+@@ -1189,7 +1152,6 @@
+ Name[uk]=Каталонська
+ Name[uz]=Каталанча
+ Name[vi]=Tiếng Catalăng 
+-Name[xx]=xxCatalanxx
+ Name[zh_CN]=åŠ æ³°ç½—å°¼äºšè¯­
+ Name[zh_TW]=嘉泰羅尼亞語
+ Name[zu]=Isi-Catalan
+@@ -1224,7 +1186,6 @@
+ Name[is]=Tékkneska
+ Name[it]=Ceceno
+ Name[ja]=チェチェン語
+-Name[ka]=ჩეჩნური
+ Name[km]=ឆេកឈិន
+ Name[ko]=체첸어
+ Name[lb]=Tschetschenesch
+@@ -1258,7 +1219,6 @@
+ Name[uk]=Чеченська
+ Name[uz]=Чеченча
+ Name[wa]=Tchetchene
+-Name[xx]=xxChechenxx
+ Name[zh_CN]=车臣语
+ Name[zh_TW]=Chechen語
+ Name[zu]=Isi-Chechen
+@@ -1279,7 +1239,6 @@
+ Name[hr]=ÄŒamorski
+ Name[is]=Chamorró
+ Name[ja]=チャモロ語
+-Name[ka]=ჩამორო
+ Name[km]=ចាមូរូ
+ Name[mk]=Чаморо
+ Name[mn]=Чаморро
+@@ -1299,7 +1258,6 @@
+ Name[tt]=Çamorroça
+ Name[uk]=Чаморо
+ Name[uz]=Чаморро
+-Name[xx]=xxChamorroxx
+ Name[zh_CN]=查莫罗语
+ Name[zh_TW]=查摩洛語
+ Name[zu]=Isi-Chamorro
+@@ -1336,7 +1294,6 @@
+ Name[is]=Korsíkanska
+ Name[it]=Corso
+ Name[ja]=コルシカ方言
+-Name[ka]=კორსიკული
+ Name[km]=កូស៊ីកា
+ Name[lb]=Korsesch
+ Name[lt]=Korsikiečių
+@@ -1368,7 +1325,6 @@
+ Name[uk]=Корсиканська
+ Name[uz]=Корсиканча
+ Name[wa]=Corse
+-Name[xx]=xxCorsicanxx
+ Name[zh_CN]=科西嘉语
+ Name[zh_TW]=科西嘉語
+ Name[zu]=Isi-Corsican
+@@ -1407,7 +1363,6 @@
+ Name[is]=Tékkneska
+ Name[it]=Ceco
+ Name[ja]=チェコ語
+-Name[ka]=ჩეხური
+ Name[km]=ឆេក
+ Name[ko]=체코어
+ Name[lb]=Tschechesch
+@@ -1446,7 +1401,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
+@@ -1482,7 +1436,6 @@
+ Name[is]=Kirkju-slavneska
+ Name[it]=Slavo della Chiesa
+ Name[ja]=教会スラヴ語
+-Name[ka]=საეკლესიო სლავური
+ Name[km]=ឆឺច ស្លាវិច
+ Name[ko]=교회 슬라브어
+ Name[lb]=Kiircheslawesch
+@@ -1516,7 +1469,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
+@@ -1544,7 +1496,6 @@
+ Name[hsb]=Čuwašisce
+ Name[hu]=Csuvas
+ Name[ja]=チュヴァシ語
+-Name[ka]=ჩუვაშური
+ Name[km]=ចូវ៉ាស
+ Name[ko]=추바시어
+ Name[lb]=Chuvas
+@@ -1573,7 +1524,6 @@
+ Name[uk]=Чуваська
+ Name[uz]=Чувашча
+ Name[wa]=Tchouvache
+-Name[xx]=xxChuvashxx
+ Name[zh_CN]=楚瓦什语
+ Name[zh_TW]=楚瓦士語
+ Name[zu]=Isi-Chuvash
+@@ -1611,7 +1561,6 @@
+ Name[is]=Velska
+ Name[it]=Gallese
+ Name[ja]=ウェールズ語
+-Name[ka]=უელსური
+ Name[km]=វែល
+ Name[ko]=웨일스어
+ Name[lb]=Walisesch
+@@ -1647,7 +1596,6 @@
+ Name[uk]=Уельська
+ Name[uz]=Уэлсча
+ Name[wa]=Walès
+-Name[xx]=xxWelshxx
+ Name[zh_CN]=威尔士
+ Name[zh_TW]=威爾斯語
+ Name[zu]=Isi-Welsh
+@@ -1686,7 +1634,6 @@
+ Name[is]=Danska
+ Name[it]=Danese
+ Name[ja]=デンマーク語
+-Name[ka]=დანიური
+ Name[km]=ដាណឺម៉ាក
+ Name[ko]=덴마크어
+ Name[lb]=Dänesch
+@@ -1726,7 +1673,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
+@@ -1765,7 +1711,6 @@
+ Name[is]=Þýska
+ Name[it]=Tedesco
+ Name[ja]=ドイツ語
+-Name[ka]=გერმანული
+ Name[km]=អាល្លឺម៉ង់
+ Name[ko]=독일어
+ Name[lb]=Däitsch
+@@ -1808,7 +1753,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
+@@ -1824,7 +1768,6 @@
+ Name[he]=×’'×•× ×§×”
+ Name[hi]=झोंखा
+ Name[ja]=ゾンカ語
+-Name[ka]=ჯონკა (ბუტანი)
+ Name[km]=ដុងហ្កា
+ Name[ko]=부탄어
+ Name[mk]=Џонгха
+@@ -1845,7 +1788,6 @@
+ Name[uk]=Дзонгка
+ Name[uz]=Дзонгха
+ Name[wa]=Boutanès
+-Name[xx]=xxDzongkhaxx
+ Name[zh_CN]=不丹宗卡语
+ Name[zh_TW]=Dzongkha語
+ Name[zu]=Isi-Dzongkha
+@@ -1884,7 +1826,6 @@
+ Name[is]=Gríska
+ Name[it]=Greco
+ Name[ja]=ギリシャ語
+-Name[ka]=ბერძნული
+ Name[km]=ក្រិច
+ Name[ko]=그리스어
+ Name[lb]=Griichesch
+@@ -1926,7 +1867,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
+@@ -1965,7 +1905,6 @@
+ Name[is]=Enska
+ Name[it]=Inglese
+ Name[ja]=英語
+-Name[ka]=ინგლისური
+ Name[km]=អង់គ្លេស
+ Name[ko]=영어
+ Name[lb]=Englesch
+@@ -2008,7 +1947,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
+@@ -2038,7 +1976,6 @@
+ Name[is]=Bresk enska
+ Name[it]=Inglese britannico
+ Name[ja]=イギリス英語
+-Name[ka]=ინგლისური (დიდი ბრიტანეთი)
+ Name[km]=អង់គ្លេស (អង់គ្លេស)
+ Name[lb]=Britescht Englesch
+ Name[lt]=Anglų (D.Britanijos)
+@@ -2066,7 +2003,6 @@
+ Name[tt]=İnglizçä (Britania)
+ Name[uk]=Англійська (Великобританія)
+ Name[uz]=Инглизча (Англия)
+-Name[xx]=xxBritish Englishxx
+ Name[zh_CN]=英国英语
+ [en_US]
+ Name=American English
+@@ -2093,7 +2029,6 @@
+ Name[is]=Bandarísk enska
+ Name[it]=Inglese americano
+ Name[ja]=アメリカ英語
+-Name[ka]=ინგლისური (აშშ)
+ Name[km]=អង់គ្លេស អាមេរិក
+ Name[lb]=Amerikanescht Englesch
+ Name[lt]=Anglų (JAV)
+@@ -2120,7 +2055,6 @@
+ Name[tt]=İnglizçä (Amerika)
+ Name[uk]=Англійська (США)
+ Name[uz]=Инглизча (АҚШ)
+-Name[xx]=xxAmerican Englishxx
+ Name[zh_CN]=美国英语
+ [eo]
+ Name=Esperanto
+@@ -2137,7 +2071,6 @@
+ Name[hi]=एस्परेंतो
+ Name[hu]=Eszperantó
+ Name[ja]=エスペラント
+-Name[ka]=ესპერანტო
+ Name[km]=អេស្ពេរ៉ាន់តូ
+ Name[ko]=ì—ìŠ¤íŽ˜ëž€í† 
+ Name[mk]=Есперанто
+@@ -2157,7 +2090,6 @@
+ Name[uk]=Есперанто
+ Name[uz]=Эсперанто
+ Name[vi]=Tiếng Etpêrantô 
+-Name[xx]=xxEsperantoxx
+ Name[zh_CN]=世界语
+ Name[zh_TW]=世界語
+ Name[zu]=Isi-Esperanto
+@@ -2196,7 +2128,6 @@
+ Name[is]=Spánska
+ Name[it]=Spagnolo
+ Name[ja]=スペイン語
+-Name[ka]=ესპანური
+ Name[km]=អេស្ប៉ាញ
+ Name[ko]=스페인어
+ Name[lb]=Spuenesch
+@@ -2238,7 +2169,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
+@@ -2277,7 +2207,6 @@
+ Name[is]=Eistneska
+ Name[it]=Estone
+ Name[ja]=エストニア語
+-Name[ka]=ესტონური
+ Name[km]=អេស្តូនី
+ Name[ko]=ì—ìŠ¤í† ë‹ˆì•„ì–´
+ Name[lb]=Estnesch
+@@ -2317,7 +2246,6 @@
+ Name[uz]=Эстонча
+ Name[vi]=Tiếng Estonian 
+ Name[wa]=Estonyin
+-Name[xx]=xxEstonianxx
+ Name[zh_CN]=爱沙尼亚语
+ Name[zh_TW]=愛沙尼亞語
+ Name[zu]=Isi-Estonian
+@@ -2353,7 +2281,6 @@
+ Name[is]=Baskamál
+ Name[it]=Basco
+ Name[ja]=バスク語
+-Name[ka]=ბასკური
+ Name[km]=បាស្កេ
+ Name[ko]=바스크어
+ Name[lb]=Baskesch
+@@ -2392,7 +2319,6 @@
+ Name[uz]=Баскча
+ Name[vi]=Tiếng Baxcơ 
+ Name[wa]=Basse
+-Name[xx]=xxBasquexx
+ Name[zh_CN]=巴斯克语
+ Name[zh_TW]=巴斯克語
+ Name[zu]=Isi-Basque
+@@ -2429,7 +2355,6 @@
+ Name[is]=Farsi (Persneska)
+ Name[it]=Farsi (Persiano)
+ Name[ja]=ファルシ語(ペルシア語)
+-Name[ka]=სპარსული (ფარსი)
+ Name[km]=ហ្វាស៊ី (ពឺស៊ាន)
+ Name[ko]=팔시 (페르시아어)
+ Name[lb]=Farsi (Persesch)
+@@ -2462,7 +2387,6 @@
+ Name[uk]=Фризійська (Перська)
+ Name[uz]=Форсча (Персча)
+ Name[wa]=Farsi
+-Name[xx]=xxFarsi (Persian)xx
+ Name[zh_CN]=波斯语
+ [fi]
+ Name=Finnish
+@@ -2499,7 +2423,6 @@
+ Name[is]=Finnska
+ Name[it]=Finlandese
+ Name[ja]=フィンランド語
+-Name[ka]=ფინური
+ Name[km]=ហ្វាំងឡង់
+ Name[ko]=핀란드어
+ Name[lb]=Finnesch
+@@ -2539,7 +2462,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
+@@ -2574,7 +2496,6 @@
+ Name[hu]=Fidzsi
+ Name[it]=Figiano
+ Name[ja]=フィジー語
+-Name[ka]=ფიჯი
+ Name[km]=ហ្វ៊ីហ្ស៊ី
+ Name[ko]=피지어
+ Name[lb]=Fidschi-Sprooch
+@@ -2607,7 +2528,6 @@
+ Name[uk]=Фіджійська
+ Name[uz]=Фижича
+ Name[wa]=Fidjyin
+-Name[xx]=xxFijianxx
+ Name[zh_CN]=斐济语
+ Name[zh_TW]=斐濟語
+ Name[zu]=Isi-Fijiyani
+@@ -2641,7 +2561,6 @@
+ Name[hu]=Faröei
+ Name[is]=Færeyska
+ Name[ja]=フェロー語
+-Name[ka]=ფარერული
+ Name[km]=ហ្វាអេរូសឺ
+ Name[lb]=Faröesch
+ Name[lt]=Farerų
+@@ -2672,7 +2591,6 @@
+ Name[uk]=Фарерська
+ Name[uz]=Фарерча
+ Name[wa]=Faeroyès
+-Name[xx]=xxFaroesexx
+ Name[zh_CN]=法罗群岛语
+ Name[zh_TW]=法羅語
+ Name[zu]=Isi-Faroese
+@@ -2711,7 +2629,6 @@
+ Name[is]=Franska
+ Name[it]=Francese
+ Name[ja]=フランス語
+-Name[ka]=ფრანგული
+ Name[km]=បារាំង
+ Name[ko]=불어
+ Name[lb]=Franzéisch
+@@ -2754,7 +2671,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
+@@ -2790,7 +2706,6 @@
+ Name[is]=Frísneska
+ Name[it]=Frisone
+ Name[ja]=フリースランド語
+-Name[ka]=ფრიზიული
+ Name[km]=ហ្វ្រីស៊ាន
+ Name[ko]=프리시안어
+ Name[lb]=Friesesch
+@@ -2823,7 +2738,6 @@
+ Name[uk]=Фризійська
+ Name[uz]=Фризча
+ Name[wa]=Frizon
+-Name[xx]=xxFrisianxx
+ Name[zh_CN]=弗里斯兰语
+ Name[zh_TW]=弗利然語
+ Name[zu]=Isi-Frisiyani
+@@ -2851,7 +2765,6 @@
+ Name[is]=Írsk gelíska
+ Name[it]=Gaelico irlandese
+ Name[ja]=アイルランド系ゲール語
+-Name[ka]=ირლანდიური (გალური)
+ Name[km]=អៀរឡង់ ហ្កែលិគ
+ Name[lb]=Irescht Gällesch
+ Name[nb]=Irsk gaelisk
+@@ -2876,7 +2789,6 @@
+ Name[tr]=Ä°rlanda Galik
+ Name[tt]=Galça (İrland)
+ Name[uk]=Гальська (Ірландія)
+-Name[xx]=xxIrish Gaelicxx
+ Name[zh_CN]=爱尔兰盖尔语
+ [gd]
+ Name=Gaelic
+@@ -2909,7 +2821,6 @@
+ Name[is]=Gelíska
+ Name[it]=Gaelico
+ Name[ja]=ゲール語
+-Name[ka]=გალური
+ Name[km]=ហ្កែលិគ
+ Name[lb]=Gällesch
+ Name[lt]=Galų
+@@ -2940,7 +2851,6 @@
+ Name[tt]=Galça
+ Name[uk]=Гальська
+ Name[wa]=Gayel
+-Name[xx]=xxGaelicxx
+ Name[zh_CN]=盖尔语
+ Name[zh_TW]=蓋爾語
+ Name[zu]=Isi-Gayelikhi
+@@ -2968,7 +2878,6 @@
+ Name[is]=Gelíska
+ Name[it]=Gallego
+ Name[ja]=ガリシア語
+-Name[ka]=გალიციური
+ Name[km]=ហ្កាលីស៊ី
+ Name[lb]=Galizesch
+ Name[lt]=Galiciečių
+@@ -3000,7 +2909,6 @@
+ Name[ven]=Mugalata
+ Name[vi]=Tiếng Galician 
+ Name[xh]=isiGalacian
+-Name[xx]=xxGalicianxx
+ Name[zh_CN]=åŠ åˆ©è¥¿äºšè¯­
+ Name[zu]=Isi-Galashiyani
+ [gn]
+@@ -3021,7 +2929,6 @@
+ Name[hi]=गौरानी
+ Name[hr]=Gvaranski
+ Name[ja]=グアラニー語
+-Name[ka]=გვარანი
+ Name[km]=ហ្កួរ៉ានី
+ Name[ko]=과라니어
+ Name[mk]=Гоарани
+@@ -3044,7 +2951,6 @@
+ Name[uk]=Гуарані
+ Name[uz]=Гуарани
+ Name[wa]=Gwarani
+-Name[xx]=xxGuaranixx
+ Name[zh_CN]=瓜拉尼语
+ Name[zh_TW]=瓜拉尼語
+ Name[zu]=Isi-Guarani
+@@ -3067,7 +2973,6 @@
+ Name[hu]=Gudzsarati
+ Name[id]=Gujarat
+ Name[ja]=グジャラート語
+-Name[ka]=გუჯარათი
+ Name[km]=ហ្កុយ៉ារាទី
+ Name[ko]=구자라트어
+ Name[lt]=Gudžarati
+@@ -3089,7 +2994,6 @@
+ Name[uk]=Гуяраті
+ Name[uz]=Гужарати
+ Name[wa]=Goudjarati
+-Name[xx]=xxGujaratixx
+ Name[zh_CN]=古吉拉特语
+ Name[zh_TW]=古吉拉特語
+ Name[zu]=Isi-Gujarati
+@@ -3113,7 +3017,6 @@
+ Name[hsb]=Manxowsce
+ Name[it]=Man, lingua dell'isola di
+ Name[ja]=マン島語
+-Name[ka]=მანქსი
+ Name[km]=ម៉ុង
+ Name[ko]=망스어
+ Name[mk]=Манкс
+@@ -3135,7 +3038,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
+@@ -3153,7 +3055,6 @@
+ Name[he]=האוסה
+ Name[hi]=हौसा
+ Name[ja]=ハウサ語
+-Name[ka]=ჰაუსა
+ Name[km]=ហូសា
+ Name[ko]=하우사어
+ Name[lb]=Haussa-Sprooch
+@@ -3175,7 +3076,6 @@
+ Name[tt]=Hausça
+ Name[uk]=Гауса
+ Name[uz]=Хауса
+-Name[xx]=xxHausaxx
+ Name[zh_CN]=豪撒语
+ Name[zh_TW]=豪薩語
+ Name[zu]=Isi-Hausa
+@@ -3214,7 +3114,6 @@
+ Name[is]=Hebreska
+ Name[it]=Ebraico
+ Name[ja]=ヘブライ語
+-Name[ka]=ივრითი
+ Name[km]=ហេប្រូ
+ Name[ko]=히브리어
+ Name[lb]=Hebräesch
+@@ -3255,7 +3154,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
+@@ -3277,7 +3175,6 @@
+ Name[hi]=हिन्दी
+ Name[hr]=Hindu
+ Name[ja]=ヒンディー語
+-Name[ka]=ჰინდი
+ Name[km]=ហិណ្ឌូ
+ Name[ko]=힌디어
+ Name[lv]=Hindu
+@@ -3301,7 +3198,6 @@
+ Name[tt]=Hindçä
+ Name[uk]=Хінді
+ Name[uz]=Ҳиндча
+-Name[xx]=xxHindixx
+ Name[zh_CN]=北印度语
+ Name[zh_TW]=北印度語
+ Name[zu]=Isi-Hindi
+@@ -3322,7 +3218,6 @@
+ Name[hu]=Hiri motu
+ Name[it]=Hiri motu
+ Name[ja]=モツ語
+-Name[ka]=ჰირი მოტუ
+ Name[km]=ហ៊ីរី ម៉ូទូ
+ Name[ko]=히리 모투어
+ Name[lb]=Hiri-Motu
+@@ -3343,7 +3238,6 @@
+ Name[tg]=Хири Моту
+ Name[uk]=Хірі Моту
+ Name[uz]=Хири Моту
+-Name[xx]=xxHiri Motuxx
+ Name[zh_CN]=新里木托语
+ Name[zh_TW]=Hiri Motu語
+ Name[zu]=Isi-Hiri Motu
+@@ -3382,7 +3276,6 @@
+ Name[is]=Króatíska
+ Name[it]=Croato
+ Name[ja]=クロアチア語
+-Name[ka]=ხორვატული
+ Name[km]=ក្រូអាស៊ី
+ Name[ko]=크로아티아어
+ Name[lb]=Kroatesch
+@@ -3423,7 +3316,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
+@@ -3452,7 +3344,6 @@
+ Name[hu]=Felső szorb
+ Name[it]=Alto sorabo
+ Name[ja]=ソルブ語
+-Name[ka]=ზედასორბული
+ Name[km]=សូបៀន ​លើ
+ Name[lb]=Uewersorbesch
+ Name[nb]=Øvresorbisk
+@@ -3478,7 +3369,6 @@
+ Name[tt]=Sorbça, Öske
+ Name[uk]=Верхньо-лужицька
+ Name[uz]=Юқори Сорбча
+-Name[xx]=xxUpper Sorbianxx
+ Name[zh_CN]=索布语
+ [hu]
+ Name=Hungarian
+@@ -3515,7 +3405,6 @@
+ Name[is]=Ungverska
+ Name[it]=Ungherese
+ Name[ja]=ハンガリー語
+-Name[ka]=უნგრული
+ Name[km]=ហុងគ្រី
+ Name[ko]=헝가리어
+ Name[lb]=Ungaresch
+@@ -3556,7 +3445,6 @@
+ 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
+@@ -3595,7 +3483,6 @@
+ Name[is]=Armeskt
+ Name[it]=Armeno
+ Name[ja]=アルメニア語
+-Name[ka]=სომხური
+ Name[km]=អារមេនី
+ Name[ko]=아르메니아어
+ Name[lb]=Armenesch
+@@ -3632,7 +3519,6 @@
+ Name[uk]=Вірменська
+ Name[uz]=Арманча
+ Name[wa]=Ã…rmenyin
+-Name[xx]=xxArmenianxx
+ Name[zh_CN]=亚美尼亚语
+ Name[zh_TW]=亞美尼亞語
+ Name[zu]=Isi-Armenian
+@@ -3650,7 +3536,6 @@
+ Name[hr]=Hererski
+ Name[hu]=Hereró
+ Name[ja]=ヘレロ語
+-Name[ka]=ჰერერო
+ Name[km]=ហេរេអូ
+ Name[ko]=í—¤ë ˆë¡œì–´
+ Name[mk]=Хереро
+@@ -3671,7 +3556,6 @@
+ Name[tt]=Hereroça
+ Name[uk]=Гереро
+ Name[uz]=Хереро
+-Name[xx]=xxHereroxx
+ Name[zh_CN]=赫雷罗语
+ Name[zh_TW]=Herero語
+ Name[zu]=Isi-Herero
+@@ -3688,7 +3572,6 @@
+ Name[hi]=इंटरलिंगुआ
+ Name[hr]=Interlingvanski
+ Name[ja]=インターリングア
+-Name[ka]=ინტერლინგვა
+ Name[km]=អ៊ីងតឺលីងគ័រ
+ Name[ko]=êµ­ì œì–´ (Interlingua)
+ Name[lv]=Interlingva
+@@ -3710,7 +3593,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
+@@ -3749,7 +3631,6 @@
+ Name[is]=Indónesíska
+ Name[it]=Indonesiano
+ Name[ja]=インドネシア語
+-Name[ka]=ინდონეზიური
+ Name[km]=ឥណ្ឌូនេស៊ី
+ Name[ko]=인도네시아어
+ Name[lb]=Indonesesch
+@@ -3787,7 +3668,6 @@
+ Name[uk]=Індонезійська
+ Name[uz]=Индонезча
+ Name[wa]=Indonezyin
+-Name[xx]=xxIndonesianxx
+ Name[zh_CN]=印度尼西亚语
+ Name[zh_TW]=印尼語
+ Name[zu]=Indoneshiya
+@@ -3808,7 +3688,6 @@
+ Name[hi]=इंटरलिंग
+ Name[hr]=Interlingvijski
+ Name[ja]=インターリング
+-Name[ka]=ინტერლინგვე
+ Name[km]=អ៊ីងតឺលីងគឹ
+ Name[ko]=êµ­ì œì–´ (Interlingue)
+ Name[lb]=Interlingua
+@@ -3829,7 +3708,6 @@
+ Name[uk]=Інтерлінгва
+ Name[uz]=Интерлингуе
+ Name[ven]=Luambo lwa hothe
+-Name[xx]=xxInterlinguexx
+ Name[zh_CN]=语际语
+ Name[zh_TW]=Interlingue語
+ Name[zu]=Izilimi ezifanayo
+@@ -3851,7 +3729,6 @@
+ Name[hu]=Inupiak
+ Name[it]=Inupiak
+ Name[ja]=イヌピアク語
+-Name[ka]=ინუპიაკი
+ Name[km]=អ៊ីនូភាគ
+ Name[mk]=Инупиак
+ Name[mn]=Инупиак
+@@ -3873,7 +3750,6 @@
+ Name[uk]=Інупіак
+ Name[uz]=Инупиак
+ Name[wa]=Inyupiak
+-Name[xx]=xxInupiaqxx
+ Name[zh_CN]=å› çº½ä½©ç‰¹è¯­
+ Name[zh_TW]=Inupiaq語
+ Name[zu]=Isi-Inupiaq
+@@ -3887,7 +3763,6 @@
+ Name[hi]=इडो
+ Name[hr]=Idoski
+ Name[ja]=イド語
+-Name[ka]=იდო
+ Name[km]=អ៊ីឌូ
+ Name[ko]=이도어
+ Name[mk]=Идо
+@@ -3907,7 +3782,6 @@
+ Name[tt]=İdoça
+ Name[uk]=Ідо
+ Name[uz]=Идо
+-Name[xx]=xxIdoxx
+ Name[zh_CN]=伊多语
+ Name[zh_TW]=伊多語
+ Name[zu]=Isi-Ido
+@@ -3946,7 +3820,6 @@
+ Name[is]=Íslenska
+ Name[it]=Islandese
+ Name[ja]=アイスランド語
+-Name[ka]=ისლანდიური
+ Name[km]=អ៊ីស្លង់
+ Name[ko]=아이슬란드어
+ Name[lb]=Islännesch
+@@ -3986,7 +3859,6 @@
+ 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
+@@ -4025,7 +3897,6 @@
+ Name[is]=Ítalska
+ Name[it]=Italiano
+ Name[ja]=イタリア語
+-Name[ka]=იტალიური
+ Name[km]=អ៊ីតាលី
+ Name[ko]=이탈리아어
+ Name[lb]=Italienesch
+@@ -4066,7 +3937,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
+@@ -4083,7 +3953,6 @@
+ Name[hi]=इनुक्तितु
+ Name[hr]=Inuktitutski
+ Name[ja]=イヌイト語
+-Name[ka]=ინუქტიუტუტი
+ Name[km]=អ៊ីនូកទីទូត
+ Name[mk]=Инуктитут
+ Name[mn]=Инуктитут
+@@ -4103,7 +3972,6 @@
+ Name[tt]=İnuktitutça
+ Name[uk]=Інуктітут
+ Name[uz]=Инуктитут
+-Name[xx]=xxInuktitutxx
+ Name[zh_CN]=å› çº½ç‰¹è¯­
+ Name[zh_TW]=Inuktitut語
+ Name[zu]=Isi-Inuktitut
+@@ -4142,7 +4010,6 @@
+ Name[is]=Japanska
+ Name[it]=Giapponese
+ Name[ja]=日本語
+-Name[ka]=იაპონური
+ Name[km]=ជប៉ុន
+ Name[ko]=일본어
+ Name[lb]=Japanesch
+@@ -4185,7 +4052,6 @@
+ 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
+@@ -4221,7 +4087,6 @@
+ Name[id]=Jawa
+ Name[it]=Giavanese
+ Name[ja]=ジャワ語
+-Name[ka]=იავა
+ Name[km]=យ៉ាវា
+ Name[ko]=자바어
+ Name[lb]=Javanesesch
+@@ -4256,7 +4121,6 @@
+ Name[uk]=Яванська
+ Name[uz]=Яаванез
+ Name[wa]=Djavanès
+-Name[xx]=xxJavanesexx
+ Name[zh_CN]=爪哇语
+ Name[zh_TW]=爪哇語
+ Name[zu]=Isi-Javanisi
+@@ -4294,7 +4158,6 @@
+ Name[is]=Georgíska
+ Name[it]=Georgiano
+ Name[ja]=グルジア語
+-Name[ka]=ქართული
+ Name[km]=ហ្សកហ្ស៉ី
+ Name[ko]=그루지안어
+ Name[lb]=Georgesch
+@@ -4330,7 +4193,6 @@
+ Name[uk]=Грузинська
+ Name[uz]=Грузинча
+ Name[wa]=Djeyordjyin
+-Name[xx]=xxGeorgianxx
+ Name[zh_CN]=乔治亚语
+ Name[zh_TW]=喬治亞語
+ Name[zu]=Isi-Jojiyani
+@@ -4350,7 +4212,6 @@
+ Name[hr]=Kikujski
+ Name[hu]=Kikuju
+ Name[ja]=キクーユ語
+-Name[ka]=კიკუიუ
+ Name[km]=គីគូយូ
+ Name[ko]=í‚¤ì¿ ìœ ì–´
+ Name[lb]=Kikuyu-Sprooch
+@@ -4371,7 +4232,6 @@
+ Name[tt]=Kikuyuça
+ Name[uk]=Кікую
+ Name[uz]=Кикуйу
+-Name[xx]=xxKikuyuxx
+ Name[zh_CN]=基库尤语
+ Name[zh_TW]=吉庫猶語
+ Name[zu]=Isi-Kikuyu
+@@ -4401,8 +4261,7 @@
+ Name[hu]=Kazah
+ Name[it]=Kazako
+ Name[ja]=カザフ語
+-Name[ka]=ყაზახური
+-Name[km]=កាហ្សាក់ស្តង់់
++Name[km]=កាហ្សាក់ស្តង់
+ Name[ko]=카자크어
+ Name[lb]=Kasachesch
+ Name[lt]=Kazachų
+@@ -4431,7 +4290,6 @@
+ Name[uk]=Казахська
+ Name[uz]=Қозоқча
+ Name[wa]=Kazaxh
+-Name[xx]=xxKazakhxx
+ Name[zh_CN]=哈萨克语
+ Name[zh_TW]=哈薩克語
+ Name[zu]=Isi-Kazakhi
+@@ -4450,7 +4308,6 @@
+ Name[hi]=कलालिसुत
+ Name[hr]=Kalalisutski
+ Name[hu]=Kalaalliszut
+-Name[ka]=კალაალისუტი
+ Name[km]=កាឡាលីសាត់
+ Name[ko]=그린란드어
+ Name[mk]=Калалисут
+@@ -4473,7 +4330,6 @@
+ Name[tt]=Kalaallisutça
+ Name[uk]=Калаалісут
+ Name[uz]=Калааллисут
+-Name[xx]=xxKalaallisutxx
+ Name[zh_CN]=æ ¼é™µå…°è¯­
+ Name[zh_TW]=Kalaallisut語
+ Name[zu]=Isi-Kalaallisut
+@@ -4495,7 +4351,6 @@
+ Name[hi]=ख्मेर
+ Name[hr]=Kmerski
+ Name[ja]=クメール語
+-Name[ka]=ქჰმერული
+ Name[km]=ខ្មែរ
+ Name[ko]=캄보디아어
+ Name[lt]=Khmerų
+@@ -4522,7 +4377,6 @@
+ Name[uk]=Кхмерська
+ Name[uz]=Кхмерча
+ Name[wa]=Xhmer
+-Name[xx]=xxKhmerxx
+ Name[zh_CN]=高棉语
+ Name[zh_TW]=高棉語
+ Name[zu]=Isi-Khmer
+@@ -4540,7 +4394,6 @@
+ Name[he]=×§× ××“×”
+ Name[hi]=कन्नड़
+ Name[ja]=カナラ語
+-Name[ka]=კანნადა
+ Name[km]=កិណាដា
+ Name[mk]=Канада
+ Name[mn]=Канад
+@@ -4562,7 +4415,6 @@
+ Name[tt]=Kannadça
+ Name[uk]=Каннада
+ Name[uz]=Каннада
+-Name[xx]=xxKannadaxx
+ Name[zh_CN]=坎纳德语
+ Name[zh_TW]=坎那達語
+ Name[zu]=Isi-Khanada
+@@ -4601,7 +4453,6 @@
+ Name[is]=Kóreska
+ Name[it]=Coreano
+ Name[ja]=韓国語
+-Name[ka]=კორეული
+ Name[km]=កូរ៉េ
+ Name[ko]=한국어
+ Name[lb]=Koreanesch
+@@ -4641,7 +4492,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
+@@ -4668,7 +4518,6 @@
+ Name[id]=Kashmir
+ Name[it]=Cachemire, lingua del
+ Name[ja]=カシミール語
+-Name[ka]=ქაშმირული
+ Name[km]=កាស្មៀរ
+ Name[ko]=카슈미르어
+ Name[lt]=Kašmiro
+@@ -4697,7 +4546,6 @@
+ Name[uk]=Кашмірська
+ Name[uz]=Кашмирча
+ Name[wa]=Cachmiri
+-Name[xx]=xxKashmirixx
+ Name[zh_CN]=克什米尔语
+ Name[zh_TW]=喀什米爾語
+ Name[zu]=Isi-Kashimiri
+@@ -4735,7 +4583,6 @@
+ Name[is]=Kúrdíska
+ Name[it]=Curdo
+ Name[ja]=クルド語
+-Name[ka]=ქურთული
+ Name[km]=ឃឺដ
+ Name[ko]=ì¿ ë¥´ë“œì–´
+ Name[lb]=Kurdesch
+@@ -4772,7 +4619,6 @@
+ Name[uk]=Курдська
+ Name[uz]=Курдча
+ Name[wa]=Kurdi
+-Name[xx]=xxKurdishxx
+ Name[zh_CN]=库尔德语
+ Name[zh_TW]=庫德語
+ Name[zu]=isi-Kurdish
+@@ -4791,7 +4637,6 @@
+ Name[hi]=कोमी
+ Name[hr]=Komski
+ Name[ja]=コミ語
+-Name[ka]=კომი
+ Name[km]=កូមី
+ Name[ko]=코미어
+ Name[lb]=Komi-Sprooch
+@@ -4813,7 +4658,6 @@
+ Name[tt]=Komiçä
+ Name[uk]=Комі
+ Name[uz]=Коми
+-Name[xx]=xxKomixx
+ Name[zh_CN]=科米语
+ Name[zh_TW]=Komi語
+ Name[zu]=Isi-Komi
+@@ -4846,7 +4690,6 @@
+ Name[hu]=Korn
+ Name[it]=Cornovaglia, lingua della
+ Name[ja]=コーンウォール語
+-Name[ka]=კორნუელური
+ Name[km]=កូនីស
+ Name[ko]=콘월어
+ Name[lb]=Kornesch
+@@ -4877,7 +4720,6 @@
+ Name[uk]=Корнійська
+ Name[uz]=Корн
+ Name[wa]=Cornike
+-Name[xx]=xxCornishxx
+ Name[zh_CN]=康瓦尔郡语
+ Name[zh_TW]=康瓦耳語
+ Name[zu]=Isi-Khonishi
+@@ -4909,7 +4751,6 @@
+ Name[is]=Kirgíska
+ Name[it]=Chirghiso
+ Name[ja]=キルギス語
+-Name[ka]=ყირგიზული
+ Name[km]=គៀរហ្គីស្តង់
+ Name[ko]=키르키즈어
+ Name[lb]=Kirghisesch
+@@ -4943,7 +4784,6 @@
+ Name[uk]=Киргизька
+ Name[uz]=Қирғизча
+ Name[wa]=Kirguize
+-Name[xx]=xxKirghizxx
+ Name[zh_CN]=吉尔吉斯语
+ Name[zh_TW]=吉爾吉斯語
+ Name[zu]=Isi-Kirghizi
+@@ -4976,7 +4816,6 @@
+ Name[is]=Latína
+ Name[it]=Latino
+ Name[ja]=ラテン語
+-Name[ka]=ლათინური
+ Name[km]=ឡាតាំង
+ Name[ko]=라틴어
+ Name[lb]=Latéin
+@@ -5007,7 +4846,6 @@
+ Name[uk]=Латинська
+ Name[uz]=Лотинча
+ Name[wa]=Latén
+-Name[xx]=xxLatinxx
+ Name[zh_CN]=拉丁语
+ Name[zh_TW]=拉丁語
+ Name[zu]=Isi-Lathini
+@@ -5044,7 +4882,6 @@
+ Name[is]=Lúxemborgiska
+ Name[it]=Lussemburghese
+ Name[ja]=ルクセンブルグ語
+-Name[ka]=ლუქსემბურგული
+ Name[km]=លុចហ្សំបួរ
+ Name[lb]=Lëtzebuergesch
+ Name[lt]=Liuksemburgiečių
+@@ -5077,7 +4914,6 @@
+ Name[uk]=Люксембурзька
+ Name[uz]=Люксембургча
+ Name[wa]=Lussimbordjwès
+-Name[xx]=xxLuxembourgishxx
+ Name[zh_CN]=å¢æ£®å ¡è¯­
+ Name[zh_TW]=ç›§æ£®å ¡èªž
+ Name[zu]=Isi-Luxembourgish
+@@ -5110,7 +4946,6 @@
+ Name[is]=Limburgian
+ Name[it]=Limburghese
+ Name[ja]=リンブルク語
+-Name[ka]=ლიმბურგული
+ Name[km]=លីបួគ
+ Name[lb]=Limburgesch
+ Name[mk]=Лимбургански
+@@ -5139,7 +4974,6 @@
+ Name[uk]=Лімбурганська
+ Name[uz]=Лимбурган
+ Name[wa]=Limbordjwès
+-Name[xx]=xxLimburganxx
+ Name[zh_CN]=æž—å ¡è¯­
+ Name[zh_TW]=Limburgan語
+ Name[zu]=Isi-Lumburgan
+@@ -5155,7 +4989,6 @@
+ Name[hi]=लिंगला
+ Name[hr]=Lingalski
+ Name[ja]=リンガラ語
+-Name[ka]=ლინგალა
+ Name[km]=លីនហ្កាឡា
+ Name[mk]=Лингала
+ Name[mn]=Лингала
+@@ -5175,7 +5008,6 @@
+ Name[tt]=Lingalaça
+ Name[uk]=Лінгала
+ Name[uz]=Лингала
+-Name[xx]=xxLingalaxx
+ Name[zh_CN]=æž—åŠ æ‹‰è¯­
+ Name[zh_TW]=Lingala語
+ Name[zu]=Isi-Lingala
+@@ -5195,7 +5027,6 @@
+ Name[hi]=लाओ
+ Name[hsb]=Laotisce
+ Name[ja]=ラオ語
+-Name[ka]=ლაო
+ Name[km]=ឡាវ
+ Name[ko]=라오어
+ Name[lt]=Laosiečių
+@@ -5222,7 +5053,6 @@
+ Name[uk]=Лаоська
+ Name[uz]=Лаосча
+ Name[wa]=Lawocyin
+-Name[xx]=xxLaoxx
+ Name[zh_CN]=老挝语
+ Name[zh_TW]=寮國語
+ Name[zu]=Isi-Lao
+@@ -5261,7 +5091,6 @@
+ Name[is]=Litháíska
+ Name[it]=Lituano
+ Name[ja]=リトアニア語
+-Name[ka]=ლიტვური
+ Name[km]=លីទុយអានី
+ Name[ko]=리투아니아어
+ Name[lb]=Litauesch
+@@ -5301,7 +5130,6 @@
+ Name[uz]=Литвача
+ Name[vi]=Lithuanian 
+ Name[wa]=Litwanyin
+-Name[xx]=xxLithuanianxx
+ Name[zh_CN]=立陶宛语
+ Name[zh_TW]=立陶宛語
+ Name[zu]=Isi-Lithuanian
+@@ -5339,7 +5167,6 @@
+ Name[is]=Lettneska
+ Name[it]=Lettone
+ Name[ja]=ラトビア語
+-Name[ka]=ლატვიური
+ Name[km]=ឡាតវីយ៉ា
+ Name[ko]=라트비아어
+ Name[lb]=Lettesch
+@@ -5379,7 +5206,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
+@@ -5408,7 +5234,6 @@
+ Name[id]=Malagasi
+ Name[it]=Malgascio
+ Name[ja]=マダガスカル語
+-Name[ka]=მალაგასური
+ Name[km]=ម៉ាដាហ្កាសការ
+ Name[ko]=말라가시어
+ Name[lb]=Madagassesch
+@@ -5438,7 +5263,6 @@
+ Name[uk]=Малагська
+ Name[uz]=Малагаси
+ Name[wa]=Malgache
+-Name[xx]=xxMalagasyxx
+ Name[zh_CN]=é©¬å°”åŠ ä»€è¯­
+ Name[zh_TW]=é¦¬æ‹‰åŠ è¥¿èªž
+ Name[zu]=Isi-Malagasy
+@@ -5473,7 +5297,6 @@
+ Name[is]=Maltneska
+ Name[it]=Marshall, lingua delle isole
+ Name[ja]=マーシャル諸島言語
+-Name[ka]=მარშალური
+ Name[km]=ម៉ាស្យលីស
+ Name[lb]=Marschallesesch
+ Name[lt]=Maršaliečių
+@@ -5505,7 +5328,6 @@
+ Name[uk]=Маршальська
+ Name[uz]=Маршаллез
+ Name[wa]=Marshalès
+-Name[xx]=xxMarshallesexx
+ Name[zh_CN]=马绍尔语
+ Name[zh_TW]=馬紹爾語
+ Name[zu]=Isi-Marshallese
+@@ -5531,7 +5353,6 @@
+ Name[hr]=Maorski
+ Name[hsb]=Maorisce
+ Name[ja]=マオリ語
+-Name[ka]=მაორი
+ Name[km]=ម៉ោរី
+ Name[ko]=마오리어
+ Name[lb]=Maoresch
+@@ -5564,7 +5385,6 @@
+ Name[uz]=Маори
+ Name[vi]=Tiếng Maori 
+ Name[wa]=Mawori
+-Name[xx]=xxMaorixx
+ Name[zh_CN]=毛利语
+ Name[zh_TW]=毛利語
+ Name[zu]=Isi-Maori
+@@ -5602,7 +5422,6 @@
+ Name[is]=Makedóníska
+ Name[it]=Macedone
+ Name[ja]=マケドニア語
+-Name[ka]=მაკედონური
+ Name[km]=ម៉ាសេដូនី
+ Name[ko]=마케도니아어
+ Name[lb]=Mazedonesch
+@@ -5642,7 +5461,6 @@
+ Name[uz]=Македонияча
+ Name[vi]=Tiếng Macedonian 
+ Name[wa]=Macedonyin
+-Name[xx]=xxMacedonianxx
+ Name[zh_CN]=马其顿语
+ Name[zh_TW]=é¦¬å…¶é “èªž
+ Name[zu]=Isi-Makhedoniya
+@@ -5666,7 +5484,6 @@
+ Name[hu]=Malajalam
+ Name[it]=Kerala, lingua del
+ Name[ja]=マラヤーラム語
+-Name[ka]=მალაილამი
+ Name[km]=ម៉ាឡាយ៉ាឡាម
+ Name[lb]=Malajalam
+ Name[lt]=Malajiečių
+@@ -5689,7 +5506,6 @@
+ Name[tg]=Малаямӣ
+ Name[uk]=Малайська
+ Name[uz]=Малайалам
+-Name[xx]=xxMalayalamxx
+ Name[zh_CN]=德拉维族语
+ Name[zh_TW]=馬來亞拉姆語
+ Name[zu]=Isi-Malayalam
+@@ -5728,7 +5544,6 @@
+ Name[is]=Bosníska
+ Name[it]=Mongolo
+ Name[ja]=モンゴル語
+-Name[ka]=მონღოლური
+ Name[km]=ម៉ុងហ្គោលី
+ Name[ko]=몽골어
+ Name[lb]=Mongolesch
+@@ -5764,7 +5579,6 @@
+ Name[uk]=Монгольська
+ Name[uz]=Муғулча
+ Name[wa]=Mongol
+-Name[xx]=xxMongolianxx
+ Name[zh_CN]=蒙古语
+ Name[zh_TW]=蒙古語
+ Name[zu]=Isi-Mongolian
+@@ -5802,7 +5616,6 @@
+ Name[is]=Moldóvíska
+ Name[it]=Moldavo
+ Name[ja]=モルダヴィア語
+-Name[ka]=მოლდავური
+ Name[km]=ម៉ុលដាវី
+ Name[ko]=몰다비어
+ Name[lb]=Moldawesch
+@@ -5838,7 +5651,6 @@
+ Name[uk]=Молдовська
+ Name[uz]=Молдавча
+ Name[wa]=Moldåve
+-Name[xx]=xxMoldavianxx
+ Name[zh_CN]=摩尔多瓦
+ Name[zh_TW]=摩爾達維亞語
+ Name[zu]=Isi-Moldavian
+@@ -5861,7 +5673,6 @@
+ Name[hsb]=Marati
+ Name[hu]=Marati
+ Name[ja]=マラーティー語
+-Name[ka]=მარათი
+ Name[km]=ម៉ារាធី
+ Name[ko]=마라티어
+ Name[lv]=Maratu
+@@ -5884,7 +5695,6 @@
+ Name[uk]=Мараті
+ Name[uz]=Марати
+ Name[wa]=Marati
+-Name[xx]=xxMarathixx
+ Name[zh_CN]=马拉地语
+ Name[zh_TW]=馬拉地語
+ Name[zu]=Isi-Marathi
+@@ -5918,7 +5728,6 @@
+ Name[id]=Melayu
+ Name[it]=Malese
+ Name[ja]=マレー語
+-Name[ka]=მალაური
+ Name[km]=ម៉ាឡេស៊ី
+ Name[ko]=ë§ë ˆì´ì–´
+ Name[lb]=Malaiesch
+@@ -5950,7 +5759,6 @@
+ Name[tt]=Malayça
+ Name[uk]=Малайська
+ Name[uz]=Малайча
+-Name[xx]=xxMalayxx
+ Name[zh_CN]=马来西亚语
+ Name[zh_TW]=馬來語
+ Name[zu]=Isi-Malay
+@@ -5988,7 +5796,6 @@
+ Name[id]=Malta
+ Name[is]=Maltneska
+ Name[ja]=マルタ語
+-Name[ka]=მალტური
+ Name[km]=ម៉ាល់តា
+ Name[ko]=몰타어
+ Name[lb]=Maltesesch
+@@ -6026,7 +5833,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
+@@ -6062,7 +5868,6 @@
+ Name[is]=Búrmenska
+ Name[it]=Birmano
+ Name[ja]=ビルマ語
+-Name[ka]=ბირმული
+ Name[km]=ភូមា
+ Name[ko]=버마어
+ Name[lb]=Burmesesch
+@@ -6094,7 +5899,6 @@
+ Name[tt]=Burmesçä
+ Name[uk]=Бірманська
+ Name[uz]=Бурмезча
+-Name[xx]=xxBurmesexx
+ Name[zh_CN]=缅甸语
+ Name[zh_TW]=緬甸語
+ Name[zu]=Isi-Burmese
+@@ -6117,7 +5921,6 @@
+ Name[hi]=नौरू
+ Name[hr]=Naurski
+ Name[ja]=ナウル語
+-Name[ka]=ნაურუ
+ Name[km]=ណូរុ
+ Name[ko]=나우루
+ Name[lb]=Nauruesch
+@@ -6138,7 +5941,6 @@
+ Name[tg]=Науру
+ Name[uk]=Науру
+ Name[uz]=Науру
+-Name[xx]=xxNauruxx
+ Name[zh_CN]=瑙鲁语
+ Name[zh_TW]=諾魯語
+ Name[zu]=Isi-Nauru
+@@ -6175,7 +5977,6 @@
+ Name[is]=Norska (bókmál)
+ Name[it]=Norvegese Bokmål
+ Name[ja]=ノルウェー語 (Bokmål)
+-Name[ka]=ნორვეგიული (ბიოკმალი)
+ Name[km]=ន័រវែស បុកម៉ាល់
+ Name[ko]=노르웨이어 (Bokmaal)
+ Name[lb]=Norwegesch (Bokmål)
+@@ -6209,7 +6010,6 @@
+ 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]
+@@ -6244,7 +6044,6 @@
+ Name[is]=Ndebele, norður
+ Name[it]=Ndebele settentrionale
+ Name[ja]=ヌデベレ語、北
+-Name[ka]=ჩრდილო ნდებელე
+ Name[km]=នដិបិលិ​ខាង​ជើង
+ Name[ko]=북부 ì€ë°ë²¨ë ˆ
+ Name[lb]=Ndebele (nördlech)
+@@ -6279,7 +6078,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
+@@ -6307,7 +6105,6 @@
+ Name[hu]=Alsószász
+ Name[it]=Basso sassone
+ Name[ja]=低地ドイツ語
+-Name[ka]=ქვედა საქსონური
+ Name[km]=ឡូសាក់សុង
+ Name[lb]=Niddersächsesch
+ Name[lt]=Žemutinių saksonų
+@@ -6335,7 +6132,6 @@
+ Name[tt]=Saksonça, Asqı
+ Name[uk]=Ніжньо-Саксонська
+ Name[uz]=Паст Саксонча
+-Name[xx]=xxLow Saxonxx
+ Name[zh_CN]=撒克逊语
+ [ne]
+ Name=Nepali
+@@ -6365,7 +6161,6 @@
+ Name[id]=Nepal
+ Name[it]=Nepalese
+ Name[ja]=ネパール語
+-Name[ka]=ნეპალური
+ Name[km]=នេប៉ាល់
+ Name[ko]=네팔어
+ Name[lb]=Nepalesesch
+@@ -6397,7 +6192,6 @@
+ Name[uk]=Непальська
+ Name[uz]=Непалча
+ Name[wa]=Nepalès
+-Name[xx]=xxNepalixx
+ Name[zh_CN]=尼泊尔语
+ Name[zh_TW]=尼泊爾語
+ Name[zu]=Isi-Nepali
+@@ -6410,7 +6204,6 @@
+ Name[ga]=Ndongais
+ Name[he]=× ×“×•× ×’×”
+ Name[hi]=नदोन्गा
+-Name[ka]=ნდონგა
+ Name[km]=នដុងហ្កា
+ Name[mk]=Ндонга
+ Name[mn]=Ндонга
+@@ -6429,7 +6222,6 @@
+ Name[tt]=Ndongaça
+ Name[uk]=Ндонга
+ Name[uz]=Ндонга
+-Name[xx]=xxNdongaxx
+ Name[zh_TW]=Ndonga語
+ Name[zu]=Isi-Ndonga
+ [nl]
+@@ -6467,7 +6259,6 @@
+ Name[is]=Hollenska
+ Name[it]=Olandese
+ Name[ja]=オランダ語
+-Name[ka]=ჰოლანდიური
+ Name[km]=ហុល្លង់
+ Name[ko]=네덜란드어
+ Name[lb]=Hollännesch
+@@ -6509,7 +6300,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
+@@ -6548,7 +6338,6 @@
+ Name[is]=Norska (nýnorska)
+ Name[it]=Norvegese Nynorsk
+ Name[ja]=ノルウェー語 (Nynorsk)
+-Name[ka]=ნორვეგიული (ნინორსკი)
+ Name[km]=ន័រវែស នីនូស
+ Name[ko]=노르웨이어 (Nynorsk)
+ Name[lb]=Norwegesch (Nynorsk)
+@@ -6583,7 +6372,6 @@
+ 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
+@@ -6619,7 +6407,6 @@
+ Name[is]=Ndebele, suður
+ Name[it]=Ndebele meridionale
+ Name[ja]=ヌデベレ語、南
+-Name[ka]=სამხრეთ ნდებელე
+ Name[km]=នដិបិលិ​ខាង​ត្បូង
+ Name[ko]=남부 ì€ë°ë²¨ë ˆ
+ Name[lb]=Ndebele (südlecht)
+@@ -6654,7 +6441,6 @@
+ 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
+@@ -6689,7 +6475,6 @@
+ Name[is]=Norður Sotho
+ Name[it]=Sotho settentrionale
+ Name[ja]=北ソト語
+-Name[ka]=ჩრდილო სოტო
+ Name[km]=សូធូ​ជើង
+ Name[ko]=북부 ì†Œí† ì–´
+ Name[lb]=Nördlecht Sotho
+@@ -6721,7 +6506,6 @@
+ Name[uk]=Північне Сото
+ Name[uz]=Шимолий Соточа
+ Name[wa]=Soto (bijhe)
+-Name[xx]=xxNorthern Sothoxx
+ Name[zh_CN]=北部梭托语
+ [nv]
+ Name=Navajo
+@@ -6741,7 +6525,6 @@
+ Name[hi]=नवाजो
+ Name[hr]=Navaho
+ Name[ja]=ナヴァホ語
+-Name[ka]=ნავახო
+ Name[km]=ណាវាហ្សូ
+ Name[ko]=나바조어
+ Name[mk]=Навахо
+@@ -6763,7 +6546,6 @@
+ Name[uk]=Навахо
+ Name[uz]=Наважо
+ Name[wa]=Navaxho
+-Name[xx]=xxNavajoxx
+ Name[zh_CN]=纳瓦霍语
+ Name[zh_TW]=納瓦伙語
+ Name[zu]=Isi-Navajo
+@@ -6783,7 +6565,6 @@
+ Name[hr]=Čičevski
+ Name[hu]=Csicseva
+ Name[ja]=チチェワ語
+-Name[ka]=ჩიჩევა
+ Name[km]=ចីចិវ៉ា
+ Name[lb]=Nyanja
+ Name[lv]=Čičeviešu
+@@ -6807,7 +6588,6 @@
+ Name[uk]=Чічеванська
+ Name[uz]=Чичева
+ Name[wa]=Tchitchewa
+-Name[xx]=xxChichewaxx
+ Name[zh_CN]=齐切瓦语
+ Name[zh_TW]=Chichewa語
+ Name[zu]=Isi-Chichewa
+@@ -6839,7 +6619,6 @@
+ Name[hu]=Okcitán
+ Name[it]=Occitano
+ Name[ja]=プロヴァンス語
+-Name[ka]=ოქიტანური (ფრანგული დიალექტი)
+ Name[km]=អុកស៊ីតង់
+ Name[ko]=오크어
+ Name[lb]=Okzitanesch
+@@ -6873,7 +6652,6 @@
+ Name[tt]=Okkitança
+ Name[uk]=Оксітанська
+ Name[uz]=Французча (Осситан шеваси)
+-Name[xx]=xxOccitanxx
+ Name[zh_CN]=奥西坦语
+ Name[zh_TW]=Occitan語
+ Name[zu]=Isi-Osithani
+@@ -6890,7 +6668,6 @@
+ Name[hi]=ओरोमो
+ Name[hr]=Oromski
+ Name[ja]=オロモ語
+-Name[ka]=ორომო
+ Name[km]=អុរុមុ
+ Name[ko]=오로모어
+ Name[mk]=Оромо
+@@ -6911,7 +6688,6 @@
+ Name[tt]=Oromoça
+ Name[uk]=Оромо
+ Name[uz]=Оромо
+-Name[xx]=xxOromoxx
+ Name[zh_CN]=阿曼语
+ Name[zh_TW]=Oromo語
+ Name[zu]=Isi-Oromo
+@@ -6933,7 +6709,6 @@
+ Name[hr]=Orijski
+ Name[hu]=Orija
+ Name[ja]=オリヤー語
+-Name[ka]=ორია
+ Name[km]=អូរីយ៉ា
+ Name[ko]=오리야어
+ Name[lb]=Orija
+@@ -6954,7 +6729,6 @@
+ Name[tg]=Ориёӣ
+ Name[uk]=Орія
+ Name[uz]=Ория
+-Name[xx]=xxOriyaxx
+ Name[zh_CN]=欧里亚语
+ Name[zh_TW]=Oriya語
+ Name[zu]=Isi-Oriya
+@@ -6988,7 +6762,6 @@
+ Name[hu]=Oszét
+ Name[it]=Ossetiano
+ Name[ja]=オセット語
+-Name[ka]=ოსური
+ Name[km]=អូសសិត្យុង
+ Name[ko]=오세티안어
+ Name[lb]=Ossetesch
+@@ -7021,7 +6794,6 @@
+ Name[uk]=Осетійська
+ Name[uz]=Оссетинча
+ Name[wa]=Ossete
+-Name[xx]=xxOssetianxx
+ Name[zh_CN]=奥塞梯语
+ Name[zh_TW]=Ossetian語
+ Name[zu]=Isi-Ossethiyani
+@@ -7050,7 +6822,6 @@
+ Name[hu]=Pandzsabi
+ Name[it]=Punjabi
+ Name[ja]=バンジャブ語
+-Name[ka]=პენჯაბი
+ Name[km]=ពូនយ៉ាប៊ី
+ Name[ko]=펀잡어
+ Name[lb]=Panjabi-Sprooch
+@@ -7077,7 +6848,6 @@
+ Name[uk]=Панджабська
+ Name[uz]=Панжабча
+ Name[wa]=Pundjabi
+-Name[xx]=xxPanjabixx
+ Name[zh_CN]=旁遮普语
+ Name[zh_TW]=Panjabi語
+ Name[zu]=Isi-Phanjabi
+@@ -7097,7 +6867,6 @@
+ Name[hi]=पाली
+ Name[hr]=Palijski
+ Name[ja]=パーリ語
+-Name[ka]=ფალაური
+ Name[km]=បាលី
+ Name[mk]=Пали
+ Name[mn]=Пали
+@@ -7117,7 +6886,6 @@
+ Name[uk]=Палі
+ Name[uz]=Пали
+ Name[wa]=Pâli
+-Name[xx]=xxPalixx
+ Name[zh_CN]=巴利语
+ Name[zh_TW]=巴利語
+ Name[zu]=Isi-Phali
+@@ -7156,7 +6924,6 @@
+ Name[is]=Pólska
+ Name[it]=Polacco
+ Name[ja]=ポーランド語
+-Name[ka]=პოლონური
+ Name[km]=ប៉ូឡូញ
+ Name[ko]=폴란드어
+ Name[lb]=Polnesch
+@@ -7196,7 +6963,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
+@@ -7220,7 +6986,6 @@
+ Name[hu]=Pusto
+ Name[it]=Pashto
+ Name[ja]=パシュトゥ語
+-Name[ka]=პუშტუ
+ Name[km]=ប៉ាសតូ
+ Name[ko]=í‘¸ì‹œí† ì–´
+ Name[lb]=Paschtu
+@@ -7246,7 +7011,6 @@
+ Name[uk]=Пуштунська
+ Name[uz]=Пуштунча
+ Name[wa]=Pashto
+-Name[xx]=xxPushtoxx
+ Name[zh_CN]=普什图语
+ Name[zh_TW]=普什圖語
+ Name[zu]=Dudula ku
+@@ -7285,7 +7049,6 @@
+ Name[is]=Portúgalska
+ Name[it]=Portoghese
+ Name[ja]=ポルトガル語
+-Name[ka]=პორტუგალური
+ Name[km]=ព័រទុយហ្គាល់
+ Name[ko]=포르투갈어
+ Name[lb]=Portugisesch
+@@ -7326,7 +7089,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
+@@ -7364,7 +7126,6 @@
+ Name[is]=Brasílísk Portúgalska
+ Name[it]=Portoghese brasiliano
+ Name[ja]=ブラジル ポルトガル語
+-Name[ka]=ბრაზილიური (პორტუგალური)
+ Name[km]=ប្រេស៊ីល ព័រទុយហ្គាល់
+ Name[ko]=브라질식 포르투갈어
+ Name[lb]=Brazilianescht Portugisesch
+@@ -7398,7 +7159,6 @@
+ Name[uk]=Бразильська португальська
+ Name[uz]=Португалча (Бразилия)
+ Name[wa]=Portuguès do Braezi
+-Name[xx]=xxBrazilian Portuguesexx
+ Name[zh_CN]=巴西葡萄牙语
+ [qu]
+ Name=Quechua
+@@ -7418,7 +7178,6 @@
+ Name[hi]=क्वेचुआ
+ Name[hu]=Kecsua
+ Name[ja]=ケチュア語
+-Name[ka]=კეჩუა
+ Name[km]=កេទ្ជូអា
+ Name[ko]=케추아어
+ Name[lb]=Quechua-Sprooch
+@@ -7440,7 +7199,6 @@
+ Name[uk]=Кечуа
+ Name[uz]=Квечуа
+ Name[wa]=Kitchwa
+-Name[xx]=xxQuechuaxx
+ Name[zh_CN]=盖丘亚语
+ Name[zh_TW]=蓋楚瓦語
+ Name[zu]=Isi-Quechua
+@@ -7458,7 +7216,6 @@
+ Name[he]=×¨×•× ×“×™
+ Name[hi]=रून्डी
+ Name[ja]=ルンディ語
+-Name[ka]=რუნდი
+ Name[km]=រូន្ឌី
+ Name[ko]=룬디어
+ Name[lb]=Rundi-Sprooch
+@@ -7479,7 +7236,6 @@
+ Name[uk]=Рунді
+ Name[uz]=Рунди
+ Name[wa]=Kirundi
+-Name[xx]=xxRundixx
+ Name[zh_CN]=基隆迪语
+ Name[zh_TW]=Rundi語
+ Name[zu]=Isi-Rundi
+@@ -7518,7 +7274,6 @@
+ Name[is]=Rúmenska
+ Name[it]=Rumeno
+ Name[ja]=ルーマニア語
+-Name[ka]=რუმინული
+ Name[km]=រូម៉ានី
+ Name[ko]=루마니아어
+ Name[lb]=Rumänesch
+@@ -7558,7 +7313,6 @@
+ 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
+@@ -7597,7 +7351,6 @@
+ Name[is]=Rússneska
+ Name[it]=Russo
+ Name[ja]=ロシア語
+-Name[ka]=რუსული
+ Name[km]=រុស្សី
+ Name[ko]=러시아어
+ Name[lb]=Russesch
+@@ -7639,7 +7392,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
+@@ -7660,7 +7412,6 @@
+ Name[hr]=Kinijarvandaski
+ Name[hu]=Kinjarvanda
+ Name[ja]=キヌヤルワンダ語
+-Name[ka]=კინიარვანდა
+ Name[km]=គីនយ៉ាវ៉ាន់ដា
+ Name[ko]=키냐르완다어
+ Name[lb]=Ruanda-Sprooch
+@@ -7684,7 +7435,6 @@
+ Name[uk]=Кіньярванда
+ Name[uz]=Кинярванда
+ Name[wa]=Kiniarwanda
+-Name[xx]=xxKinyarwandaxx
+ Name[zh_CN]=卢旺达语
+ Name[zh_TW]=Kinyarwanda語
+ Name[zu]=Isi-Kinyarwanda
+@@ -7711,7 +7461,6 @@
+ Name[is]=Sanskrít
+ Name[it]=Sanscrito
+ Name[ja]=サンスクリット
+-Name[ka]=სანსკრიტი
+ Name[km]=សំស្ក្រឹត
+ Name[ko]=범어
+ Name[lt]=Sanskritas
+@@ -7735,7 +7484,6 @@
+ Name[tt]=Sanskritçä
+ Name[uk]=Санскрит
+ Name[uz]=Санскрит
+-Name[xx]=xxSanskritxx
+ Name[zh_CN]=梵语
+ Name[zh_TW]=梵語
+ Name[zu]=Isi-Sanskrit
+@@ -7770,7 +7518,6 @@
+ Name[is]=Sardíníska
+ Name[it]=Sardo
+ Name[ja]=サルデーニャ語
+-Name[ka]=სარდინიული
+ Name[km]=សារឌីណង់
+ Name[ko]=사르디니아어
+ Name[lb]=Sardinesch
+@@ -7803,7 +7550,6 @@
+ Name[uk]=Сардинська
+ Name[uz]=Сардинча
+ Name[wa]=Sardinyin
+-Name[xx]=xxSardinianxx
+ Name[zh_CN]=撒丁语
+ Name[zh_TW]=薩丁尼亞語
+ Name[zu]=Isi-Sardinian
+@@ -7822,7 +7568,6 @@
+ Name[hu]=Szindi
+ Name[is]=Shindi
+ Name[ja]=シンド語
+-Name[ka]=სინდჰი
+ Name[km]=ស៊ីន្ដី
+ Name[ko]=ì‹ ë””ì–´
+ Name[lb]=Sindhi-Sprooch
+@@ -7845,7 +7590,6 @@
+ Name[uk]=Сіндхі
+ Name[uz]=Синдхи
+ Name[wa]=Sindi
+-Name[xx]=xxSindhixx
+ Name[zh_TW]=Sindhi語
+ Name[zu]=Isi-Sindi
+ [se]
+@@ -7881,7 +7625,6 @@
+ Name[is]=Norður Sami
+ Name[it]=Sami settentrionale
+ Name[ja]=北サモス語
+-Name[ka]=ჩრდილო საამი
+ Name[km]=សាមីជើង
+ Name[ko]=북부 사미어
+ Name[lb]=Nördlecht Sami
+@@ -7917,7 +7660,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
+@@ -7935,7 +7677,6 @@
+ Name[hi]=सैन्गो
+ Name[hu]=Szangó
+ Name[ja]=サンゴ語
+-Name[ka]=სანგო
+ Name[km]=សង់ហ្គោ
+ Name[lb]=Sango-Sprooch
+ Name[mk]=Санго
+@@ -7955,7 +7696,6 @@
+ Name[tt]=Sangoça
+ Name[uk]=Санго
+ Name[uz]=Санго
+-Name[xx]=xxSangoxx
+ Name[zh_CN]=桑戈语
+ Name[zh_TW]=Sango語
+ Name[zu]=Isi-Sango
+@@ -7989,7 +7729,6 @@
+ Name[is]=Shinhalese
+ Name[it]=Cingalese
+ Name[ja]=シンハラ語
+-Name[ka]=სენეგალური
+ Name[km]=ស៊ីងហាលីស
+ Name[ko]=ì‹ í• ë¼ì–´
+ Name[lb]=Singhalesesch
+@@ -8020,7 +7759,6 @@
+ Name[uk]=Сингалійська
+ Name[uz]=Синхалесе
+ Name[wa]=Sinhalès
+-Name[xx]=xxSinhalesexx
+ Name[zh_CN]=僧伽罗语
+ Name[zh_TW]=錫蘭語
+ Name[zu]=Isi-Sinhalese
+@@ -8059,7 +7797,6 @@
+ Name[is]=Slóvenska
+ Name[it]=Slovacco
+ Name[ja]=スロバキア語
+-Name[ka]=სლოვაკური
+ Name[km]=ស្លូវ៉ាគី
+ Name[ko]=슬로바키아어
+ Name[lb]=Slowakesch
+@@ -8098,7 +7835,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]
+@@ -8136,7 +7872,6 @@
+ Name[is]=Slóvenska
+ Name[it]=Sloveno
+ Name[ja]=スロベニア語
+-Name[ka]=სლოვენური
+ Name[km]=ស្លូវ៉ានី
+ Name[ko]=ìŠ¬ë¡œë² ë‹ˆì•„ì–´
+ Name[lb]=Slowenesch
+@@ -8175,7 +7910,6 @@
+ Name[uk]=Словенська
+ Name[uz]=Словенианча
+ Name[wa]=Eslovenyin
+-Name[xx]=xxSlovenianxx
+ Name[zh_CN]=斯洛文尼亚语
+ Name[zh_TW]=斯洛維尼亞語
+ Name[zu]=Isi-Slovenian
+@@ -8209,7 +7943,6 @@
+ Name[id]=Samoa
+ Name[it]=Samoano
+ Name[ja]=サモア語
+-Name[ka]=სამოა
+ Name[km]=សាមូអា
+ Name[ko]=사모아어
+ Name[lb]=Samoanesch
+@@ -8243,7 +7976,6 @@
+ Name[uk]=Самойська
+ Name[uz]=Самоача
+ Name[wa]=Samowan
+-Name[xx]=xxSamoanxx
+ Name[zh_CN]=萨摩亚语
+ Name[zh_TW]=薩摩牙語
+ Name[zu]=Isi-Samoan
+@@ -8259,7 +7991,6 @@
+ Name[hi]=शोना
+ Name[hu]=Sona
+ Name[ja]=ショナ語
+-Name[ka]=შონა
+ Name[km]=សូណា
+ Name[ko]=쇼나어
+ Name[mk]=Шона
+@@ -8281,7 +8012,6 @@
+ Name[uk]=Шона
+ Name[uz]=Шона
+ Name[xh]=Isishona
+-Name[xx]=xxShonaxx
+ Name[zh_CN]=修纳语
+ Name[zh_TW]=Shona語
+ Name[zu]=Isi-Shona
+@@ -8313,7 +8043,6 @@
+ Name[is]=Sómalska
+ Name[it]=Somalo
+ Name[ja]=ソマリ語
+-Name[ka]=სომალური
+ Name[km]=សូម៉ាលី
+ Name[ko]=소말리아어
+ Name[lb]=Somalesch
+@@ -8341,7 +8070,6 @@
+ Name[uk]=Сомалійська
+ Name[uz]=Сомалича
+ Name[wa]=Somalyin
+-Name[xx]=xxSomalixx
+ Name[zh_CN]=索马里语
+ Name[zh_TW]=索馬利語
+ Name[zu]=Isi-Somali
+@@ -8380,7 +8108,6 @@
+ Name[is]=Albanskur
+ Name[it]=Albanese
+ Name[ja]=アルバニア語
+-Name[ka]=ალბანური
+ Name[km]=អាល់បានី
+ Name[ko]=알바니아어
+ Name[lb]=Albanesch
+@@ -8415,7 +8142,6 @@
+ Name[uk]=Албанська
+ Name[uz]=Албанча
+ Name[wa]=Albanyin
+-Name[xx]=xxAlbanianxx
+ Name[zh_CN]=阿尔巴尼亚语
+ Name[zh_TW]=阿爾巴尼亞語
+ Name[zu]=Isi-Albanian
+@@ -8454,7 +8180,6 @@
+ Name[is]=Serbneska
+ Name[it]=Serbo
+ Name[ja]=セルビア語
+-Name[ka]=სერბული
+ Name[km]=សែប៊ី
+ Name[ko]=세르비아어
+ Name[lb]=Serbesch
+@@ -8493,7 +8218,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
+@@ -8512,7 +8236,6 @@
+ Name[hi]=स्वाती
+ Name[hu]=Szvati
+ Name[ja]=スワート語
+-Name[ka]=სვატი
+ Name[km]=ស្វាទី
+ Name[ko]=스와티어
+ Name[lb]=Swazi
+@@ -8537,7 +8260,6 @@
+ Name[uz]=Свати
+ Name[wa]=Suwati
+ Name[xh]=Isiswati
+-Name[xx]=xxSwatixx
+ Name[zh_CN]=斯瓦特语
+ Name[zh_TW]=Swati語
+ Name[zu]=Isi-Swati
+@@ -8573,7 +8295,6 @@
+ Name[is]=Sotho, suður
+ Name[it]=Sotho meridionale
+ Name[ja]=ソト語、南
+-Name[ka]=სამხრეთ სოტო
+ Name[km]=សូធូ​ខាង​ត្បូង
+ Name[ko]=남부 ì†Œí† ì–´
+ Name[lb]=Südlecht Sotho
+@@ -8608,7 +8329,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
+@@ -8642,7 +8362,6 @@
+ Name[id]=Sunda
+ Name[it]=Sudanese
+ Name[ja]=スンダ語
+-Name[ka]=სუდანური
+ Name[km]=ស៊ូដង់
+ Name[ko]=수단어
+ Name[lb]=Sudanesesch
+@@ -8676,7 +8395,6 @@
+ Name[uk]=Сунданійська
+ Name[uz]=Сунданча
+ Name[wa]=Soudanès
+-Name[xx]=xxSundanesexx
+ Name[zh_CN]=巽他语
+ Name[zh_TW]=Sundanese語
+ Name[zu]=Isi-Sundanese
+@@ -8715,7 +8433,6 @@
+ Name[is]=Sænska
+ Name[it]=Svedese
+ Name[ja]=スウェーデン語
+-Name[ka]=შვედური
+ Name[km]=ស៊ុយអែដ
+ Name[ko]=스웨덴어
+ Name[lb]=Schwedesch
+@@ -8755,7 +8472,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
+@@ -8780,7 +8496,6 @@
+ Name[hr]=Svahili
+ Name[hu]=Szvahili
+ Name[ja]=スワヒリ語
+-Name[ka]=სუაჰილი
+ Name[km]=ស្វាហ៊ីលី
+ Name[ko]=스와힐리어
+ Name[lt]=Suahili
+@@ -8805,7 +8520,6 @@
+ Name[uk]=Суахілі
+ Name[uz]=Свахили
+ Name[wa]=Suwahili
+-Name[xx]=xxSwahilixx
+ Name[zh_CN]=斯瓦希里语
+ Name[zh_TW]=斯華西里語
+ Name[zu]=Isi-Swahili
+@@ -8834,7 +8548,6 @@
+ Name[hsb]=Tamilsce
+ Name[is]=Tamílska
+ Name[ja]=タミール語
+-Name[ka]=თამილური
+ Name[km]=តាមីល
+ Name[ko]=타밀어
+ Name[lt]=Tamilų
+@@ -8866,7 +8579,6 @@
+ Name[uz]=Тамилча
+ Name[vi]=Tiếng Tamil 
+ Name[wa]=Tamoul
+-Name[xx]=xxTamilxx
+ Name[zh_CN]=泰米尔语
+ Name[zh_TW]=坦米爾語
+ Name[zu]=Isi-Tamili
+@@ -8887,7 +8599,6 @@
+ Name[hi]=तेलुगु
+ Name[hr]=Telugski
+ Name[ja]=テルグ語
+-Name[ka]=ტელუგუ
+ Name[km]=តេលូហ្គូ
+ Name[ko]=테루그어
+ Name[mk]=Телугу
+@@ -8909,7 +8620,6 @@
+ Name[uk]=Телугу
+ Name[uz]=Телугу
+ Name[wa]=Telougou
+-Name[xx]=xxTeluguxx
+ Name[zh_CN]=泰卢固语
+ Name[zh_TW]=特拉古語
+ Name[zu]=Isi-Telugu
+@@ -8943,7 +8653,6 @@
+ Name[hu]=Tadzsik
+ Name[it]=Tagicco
+ Name[ja]=タジク語
+-Name[ka]=ტაჯიკური
+ Name[km]=តាដហ្ស៊ីគីស្តង់
+ Name[ko]=타직어
+ Name[lb]=Tadschikesch
+@@ -8975,7 +8684,6 @@
+ Name[uk]=Таджицька
+ Name[uz]=Тожикча
+ Name[wa]=Tadjik
+-Name[xx]=xxTajikxx
+ Name[zh_CN]=塔吉克语
+ Name[zh_TW]=塔吉克語
+ Name[zu]=Isi-Tajik
+@@ -9009,7 +8717,6 @@
+ Name[is]=Tælenska
+ Name[it]=Thailandese
+ Name[ja]=タイ語
+-Name[ka]=ტაი
+ Name[km]=ថៃ
+ Name[ko]=타이어
+ Name[lt]=Tailandiečių
+@@ -9043,7 +8750,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
+@@ -9068,7 +8774,6 @@
+ Name[hsb]=Tigrinja
+ Name[hu]=Tigrinja
+ Name[ja]=ティグリニャ語
+-Name[ka]=ტიგრინია
+ Name[km]=ទីក្រីនយ៉ា
+ Name[ko]=티그리냐어
+ Name[lb]=Tigrinja-Sprooch
+@@ -9093,7 +8798,6 @@
+ Name[uk]=Тигринійська
+ Name[uz]=Тигриня
+ Name[wa]=Tigrinia
+-Name[xx]=xxTigrinyaxx
+ Name[zh_CN]=ææ ¼é‡Œå°¼äºšè¯­
+ Name[zh_TW]=ææ ¼åˆ©å°¼äºžèªž
+ Name[zu]=Isi-Tigrinya
+@@ -9127,7 +8831,6 @@
+ Name[hu]=Türkmén
+ Name[it]=Turkmeno
+ Name[ja]=トルクメン語
+-Name[ka]=თურქმენული
+ Name[km]=ទួគមេនីស្តង់
+ Name[lb]=Turkmenesch
+ Name[lt]=Turkmėnų
+@@ -9162,7 +8865,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
+@@ -9183,7 +8885,6 @@
+ Name[hi]=तस्वाना
+ Name[hu]=Tszvana
+ Name[ja]=ツワナ語
+-Name[ka]=ტსვანა
+ Name[km]=វ៉ាន់ណា
+ Name[lb]=Tswana-Sprooch
+ Name[mk]=Цвана
+@@ -9206,7 +8907,6 @@
+ Name[uk]=Тсвана
+ Name[uz]=Тсвана
+ Name[xh]=Isitswana
+-Name[xx]=xxTswanaxx
+ Name[zh_CN]=茨瓦纳语
+ Name[zh_TW]=班圖語
+ Name[zu]=Isi-Tswana
+@@ -9225,7 +8925,6 @@
+ Name[he]=×˜×•× ×’×”
+ Name[hi]=टोन्गा
+ Name[ja]=トンガ語
+-Name[ka]=ცონგა
+ Name[km]=តុងហ្គោ
+ Name[ko]=통가어
+ Name[lv]=Tongiešu
+@@ -9245,7 +8944,6 @@
+ Name[tg]=Тонгаӣ
+ Name[uk]=Тонга
+ Name[uz]=Тонга
+-Name[xx]=xxTongaxx
+ Name[zh_CN]=æ±¤åŠ è¯­
+ Name[zh_TW]=æ±åŠ èªž
+ Name[zu]=Isi-Tonga
+@@ -9284,7 +8982,6 @@
+ Name[is]=Tyrkneska
+ Name[it]=Turco
+ Name[ja]=トルコ語
+-Name[ka]=თურქული
+ Name[km]=ទួរគី
+ Name[ko]=터키어
+ Name[lb]=Türkesch
+@@ -9324,7 +9021,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
+@@ -9342,7 +9038,6 @@
+ Name[he]=×¦×•× ×’×”
+ Name[hi]=त्सोन्गा
+ Name[ja]=ツォンガ語
+-Name[ka]=ცონგა
+ Name[km]=សុងហ្កា
+ Name[lb]=Tsonga-Sprooch
+ Name[mk]=Цонга
+@@ -9363,7 +9058,6 @@
+ Name[tt]=Tsongaça
+ Name[uk]=Цонґа
+ Name[uz]=Цонга
+-Name[xx]=xxTsongaxx
+ Name[zh_CN]=ç‰¹æ¾åŠ è¯­
+ Name[zh_TW]=Tsonga語
+ Name[zu]=Isi-Tsonga
+@@ -9392,7 +9086,6 @@
+ Name[hu]=Tatár
+ Name[it]=Tartaro
+ Name[ja]=タタール語
+-Name[ka]=თათრული
+ Name[km]=តាតារ
+ Name[ko]=타타르어
+ Name[lb]=Tataresch
+@@ -9422,7 +9115,6 @@
+ Name[uk]=Татарська
+ Name[uz]=Тотарча
+ Name[wa]=Tatår
+-Name[xx]=xxTatarxx
+ Name[zh_CN]=鞑靼语
+ Name[zh_TW]=韃靼語
+ Name[zu]=Isi-Tatar
+@@ -9439,7 +9131,6 @@
+ Name[hi]=त्वी
+ Name[hu]=Tvi
+ Name[ja]=トウィ語
+-Name[ka]=ტვი
+ Name[km]=ទ្វី
+ Name[lb]=Akan-Sprooch
+ Name[mk]=Тви
+@@ -9459,7 +9150,6 @@
+ Name[tt]=Twiçä
+ Name[uk]=Тві
+ Name[uz]=Тви
+-Name[xx]=xxTwixx
+ Name[zh_CN]=契维语
+ Name[zh_TW]=契維語
+ Name[zu]=Isi-Twi
+@@ -9494,7 +9184,6 @@
+ Name[id]=Tahiti
+ Name[it]=Tahitiano
+ Name[ja]=タヒティ語
+-Name[ka]=ტაიტი
+ Name[km]=តាហិតង់
+ Name[ko]=타히티어
+ Name[lb]=Tahitesch
+@@ -9528,7 +9217,6 @@
+ Name[uk]=Таїтянська
+ Name[uz]=Тахитиан
+ Name[wa]=Tahityin
+-Name[xx]=xxTahitianxx
+ Name[zh_CN]=塔希提语
+ Name[zh_TW]=大溪地語
+ Name[zu]=Isi-Tahitian
+@@ -9552,7 +9240,6 @@
+ Name[hsb]=Ujgursce
+ Name[hu]=Ujgur
+ Name[ja]=ウイグル語
+-Name[ka]=უიგურული
+ Name[km]=វីហ្គៀរ
+ Name[lb]=Uiguresch
+ Name[lv]=Uiguru
+@@ -9581,7 +9268,6 @@
+ Name[uk]=Уйгур
+ Name[uz]=Уйғурча
+ Name[wa]=Ouygour
+-Name[xx]=xxUighurxx
+ Name[zh_CN]=维吾尔语
+ Name[zh_TW]=維吾爾語
+ Name[zu]=Isi-Uighur
+@@ -9620,7 +9306,6 @@
+ Name[is]=Úkraínska
+ Name[it]=Ucraino
+ Name[ja]=ウクライナ語
+-Name[ka]=უკრაინული
+ Name[km]=អ៊ុយក្រែន
+ Name[ko]=우크라이나어
+ Name[lb]=Ukrainesch
+@@ -9661,7 +9346,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
+@@ -9681,7 +9365,6 @@
+ Name[he]=אורדו
+ Name[hi]=उर्दू
+ Name[ja]=ウルドゥー語
+-Name[ka]=ურდუ
+ Name[km]=អ៊ូរ្ឌូ
+ Name[ko]=울두어
+ Name[mk]=Урду
+@@ -9701,7 +9384,6 @@
+ Name[uk]=Урду
+ Name[uz]=Урду
+ Name[wa]=Ourdou
+-Name[xx]=xxUrduxx
+ Name[zh_CN]=乌尔都语
+ Name[zh_TW]=烏都語
+ Name[zu]=Isi-Urdu
+@@ -9734,7 +9416,6 @@
+ Name[hu]=Üzbég
+ Name[it]=Uzbeco
+ Name[ja]=ウズベク語
+-Name[ka]=უზბეკური
+ Name[km]=អ៊ូហ្សបេគីស្តង់
+ Name[ko]=ìš°ì¦ˆë² í¬ì–´
+ Name[lb]=Usbekesch
+@@ -9768,7 +9449,6 @@
+ Name[uk]=Узбецька
+ Name[uz]=Ўзбекча
+ Name[wa]=Ouzbeke
+-Name[xx]=xxUzbekxx
+ Name[zh_CN]=乌兹别克语
+ Name[zh_TW]=烏茲別克語
+ Name[zu]=Isi-Uzbek
+@@ -9781,7 +9461,6 @@
+ Name[ga]=Veindis
+ Name[hi]=वेंडा
+ Name[ja]=ヴェンダ語
+-Name[ka]=ვენდა
+ Name[km]=វង់ដា
+ Name[ko]=벤다어
+ Name[mk]=Венда
+@@ -9799,7 +9478,6 @@
+ Name[tt]=Vendaça
+ Name[uk]=Венда
+ Name[uz]=Венда
+-Name[xx]=xxVendaxx
+ Name[zh_CN]=闻达语
+ [vi]
+ Name=Vietnamese
+@@ -9836,7 +9514,6 @@
+ Name[is]=Víetnamska
+ Name[it]=Vietnamita
+ Name[ja]=ベトナム語
+-Name[ka]=ვიეტნამური
+ Name[km]=វៀតណាម
+ Name[ko]=ë² íŠ¸ë‚¨ì–´
+ Name[lb]=Vietnamesesch
+@@ -9875,7 +9552,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
+@@ -9892,7 +9568,6 @@
+ Name[he]=וולפיק
+ Name[hi]=वोलापक
+ Name[ja]=ヴォラピューク語
+-Name[ka]=ვოლაპიუკი
+ Name[km]=វូឡាភូក
+ Name[mk]=Волапук
+ Name[mn]=Волапүк
+@@ -9914,7 +9589,6 @@
+ Name[tt]=Volapükçä
+ Name[uk]=Волап'юк
+ Name[uz]=Волапук
+-Name[xx]=xxVolapükxx
+ Name[zh_CN]=沃拉普克语
+ Name[zu]=Isi-Volapük
+ [wa]
+@@ -9947,7 +9621,6 @@
+ Name[is]=Vallónska
+ Name[it]=Vallone
+ Name[ja]=ワロン語
+-Name[ka]=ვალონური
+ Name[km]=វ៉ាឡុង
+ Name[ko]=ì™ˆë¡ ì–´
+ Name[lb]=Wallounesch
+@@ -9984,7 +9657,6 @@
+ Name[uz]=Валлонча
+ Name[vi]=Tiếng Wallon 
+ Name[wa]=Walon
+-Name[xx]=xxWalloonxx
+ Name[zh_CN]=瓦龙语
+ Name[zh_TW]=華隆語
+ Name[zu]=Isi-Walloon
+@@ -10006,7 +9678,6 @@
+ Name[hr]=Volofski
+ Name[hu]=Volof
+ Name[ja]=ウォロフ語
+-Name[ka]=უოლოფი
+ Name[km]=វូឡុហ្វ
+ Name[lb]=Wolof-Sprooch
+ Name[mk]=Волоф
+@@ -10027,7 +9698,6 @@
+ Name[tt]=Wolofça
+ Name[uk]=Волоф
+ Name[uz]=Волоф
+-Name[xx]=xxWolofxx
+ Name[zh_CN]=沃洛夫语
+ Name[zh_TW]=Wolof語
+ Name[zu]=Isi-Wolof
+@@ -10043,8 +9713,7 @@
+ Name[hi]=झोसा
+ Name[hu]=Xhosza
+ Name[ja]=コーサ語
+-Name[ka]=ქშოსა
+-Name[km]=ឃសា
++Name[km]=ឃសាLesotho
+ Name[ko]=엑스호사어
+ Name[mk]=Ксоса
+ Name[mn]=Чоса
+@@ -10067,7 +9736,6 @@
+ Name[vi]=Xhosa 
+ Name[wa]=Xhossa
+ Name[xh]=isixhosa
+-Name[xx]=xxXhosaxx
+ Name[zh_CN]=科萨语
+ Name[zh_TW]=科薩語
+ Name[zu]=Isi-Xhosa
+@@ -10095,7 +9763,6 @@
+ Name[hu]=Jiddis
+ Name[is]=Jiddíska
+ Name[ja]=イディッシュ語
+-Name[ka]=იდიში
+ Name[km]=យីឌីហ្ស
+ Name[ko]=이디시어
+ Name[lb]=Jiddesch
+@@ -10124,7 +9791,6 @@
+ Name[uk]=Ідиш
+ Name[uz]=Йиддиш
+ Name[wa]=Yidish
+-Name[xx]=xxYiddishxx
+ Name[zh_CN]=依地语
+ Name[zh_TW]=意第緒語
+ Name[zu]=Isi-Yidishi
+@@ -10145,7 +9811,6 @@
+ Name[hi]=योरुबा
+ Name[hu]=Joruba
+ Name[ja]=ヨルバ語
+-Name[ka]=იორუბა
+ Name[km]=យរូបា
+ Name[ko]=요루바어
+ Name[lb]=Yoruba-Sprooch
+@@ -10170,7 +9835,6 @@
+ Name[uk]=Йоруба
+ Name[uz]=Ёруба
+ Name[wa]=Yorouba
+-Name[xx]=xxYorubaxx
+ Name[zh_CN]=约鲁巴语
+ Name[zh_TW]=優魯巴語
+ Name[zu]=Isi-Yoruba
+@@ -10187,7 +9851,6 @@
+ Name[he]=×’'×•×× ×’
+ Name[hi]=झुआंग
+ Name[ja]=荘
+-Name[ka]=ჩჟუანი
+ Name[km]=ចួង
+ Name[mk]=Жуанг
+ Name[mn]=Жунгаа
+@@ -10206,7 +9869,6 @@
+ Name[tt]=Cuañça
+ Name[uk]=Жуан
+ Name[uz]=Зхуанг
+-Name[xx]=xxZhuangxx
+ Name[zh_CN]=壮语
+ Name[zh_TW]=Zhuang語
+ Name[zu]=Isi-Zhuang
+@@ -10245,7 +9907,6 @@
+ Name[is]=Kínverska
+ Name[it]=Cinese
+ Name[ja]=中国語
+-Name[ka]=ჩინური
+ Name[km]=áž…áž·áž“
+ Name[ko]=중국어
+ Name[lb]=Chinesesch
+@@ -10288,7 +9949,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
+@@ -10318,7 +9978,6 @@
+ Name[is]=Einfölduð kínverska
+ Name[it]=Cinese semplificato
+ Name[ja]=中国語 簡体字
+-Name[ka]=ჩინური გამარტივებული
+ Name[km]=ចិនសាមញ្ញ
+ Name[lb]=Einfacht Chinesesch
+ Name[lt]=Kinų supaprastinta
+@@ -10346,7 +10005,6 @@
+ Name[tt]=Çinçä (Ciñel)
+ Name[uk]=Китайська (спрощена)
+ Name[uz]=Соддалаштирилган Хитойча
+-Name[xx]=xxChinese Simplifiedxx
+ Name[zh_CN]=简体中文
+ [zh_TW]
+ Name=Chinese Traditional
+@@ -10374,7 +10032,6 @@
+ Name[is]=Hefðbundin kínverska
+ Name[it]=Cinese tradizionale
+ Name[ja]=中国語 繁体字
+-Name[ka]=ჩინური ტრადიციული
+ Name[km]=ចិន​បុរាណ
+ Name[lb]=Traditionellt Chinesesch
+ Name[lt]=Kinų tradicinė
+@@ -10402,7 +10059,6 @@
+ Name[tt]=Çinçä (Ğädäti)
+ Name[uk]=Китайська (традиційна)
+ Name[uz]=Анъанавий Хитойча
+-Name[xx]=xxChinese Traditionalxx
+ Name[zh_CN]=繁体中文
+ [zu]
+ Name=Zulu
+@@ -10423,7 +10079,6 @@
+ Name[hi]=ज़ुलु
+ Name[is]=Zúlú
+ Name[ja]=ズールー語
+-Name[ka]=ზულუსური
+ Name[km]=ហ្ស៊ូលូ
+ Name[ko]=줄루어
+ Name[lv]=Zulusu
+@@ -10448,7 +10103,6 @@
+ Name[ven]=Muzulu
+ Name[wa]=Zoulou
+ Name[xh]=Isizulu
+-Name[xx]=xxZuluxx
+ Name[zh_CN]=祖鲁语
+ Name[zh_TW]=袓魯語
+ Name[zu]=Isi-Zulu
+--- khtml/khtml_part.cpp	(revision 484194)
++++ khtml/khtml_part.cpp	(revision 488534)
+@@ -251,6 +251,7 @@
+   d->m_paDebugScript = 0;
+   d->m_bMousePressed = false;
+   d->m_bRightMousePressed = false;
++  d->m_bCleared = false;
+   d->m_paViewDocument = new KAction( i18n( "View Do&cument Source" ), CTRL + Key_U, this, SLOT( slotViewDocumentSource() ), actionCollection(), "viewDocumentSource" );
+   d->m_paViewFrame = new KAction( i18n( "View Frame Source" ), 0, this, SLOT( slotViewFrameSource() ), actionCollection(), "viewFrameSource" );
+   d->m_paViewInfo = new KAction( i18n( "View Document Information" ), CTRL+Key_I, this, SLOT( slotViewPageInfo() ), actionCollection(), "viewPageInfo" );
+@@ -1667,7 +1668,9 @@
+   {
+      long saveCacheId = d->m_cacheId;
+      QString savePageReferrer = d->m_pageReferrer;
++     QString saveEncoding     = d->m_encoding;
+      begin( d->m_workingURL, d->m_extension->urlArgs().xOffset, d->m_extension->urlArgs().yOffset );
++     d->m_encoding     = saveEncoding;
+      d->m_pageReferrer = savePageReferrer;
+      d->m_cacheId = saveCacheId;
+      d->m_workingURL = KURL();
+@@ -1872,12 +1875,11 @@
+     }
+   }
+ 
++  clear();
+   d->m_bCleared = false;
+   d->m_cacheId = 0;
+   d->m_bComplete = false;
+   d->m_bLoadEventEmitted = false;
+-  clear();
+-  d->m_bCleared = false;
+ 
+   if(url.isValid()) {
+       QString urlString = url.url();
+@@ -2924,6 +2926,7 @@
+ 
+ void KHTMLPart::slotFindAheadText()
+ {
++#ifndef KHTML_NO_TYPE_AHEAD_FIND
+   KParts::ReadOnlyPart *part = currentFrame();
+   if (!part)
+     return;
+@@ -2933,10 +2936,12 @@
+       return;
+   }
+   static_cast<KHTMLPart *>( part )->view()->startFindAhead( false );
++#endif // KHTML_NO_TYPE_AHEAD_FIND
+ }
+ 
+ void KHTMLPart::slotFindAheadLink()
+ {
++#ifndef KHTML_NO_TYPE_AHEAD_FIND
+   KParts::ReadOnlyPart *part = currentFrame();
+   if (!part)
+     return;
+@@ -2946,6 +2951,7 @@
+       return;
+   }
+   static_cast<KHTMLPart *>( part )->view()->startFindAhead( true );
++#endif // KHTML_NO_TYPE_AHEAD_FIND
+ }
+ 
+ void KHTMLPart::enableFindAheadActions( bool enable )
+--- khtml/khtml.desktop	(revision 484194)
++++ khtml/khtml.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=Ívafin HTML-skoðunar eining
+ Comment[it]=Componente integrabile per la visualizzazione di HTML
+ Comment[ja]=埋め込み可能なHTMLビューコンポーネント
+-Comment[ka]=ჩადგმადი კომპონენტი HTML-ის საჩვენებლად
+ Comment[km]=សមាសភាគ​មើល HTML ដែល​អាច​បង្កប់
+ Comment[ko]=끼워넣는 HTML 보기 구성 요소
+ Comment[lb]=Abettbar HTML-Uweisungskomponent
+@@ -74,7 +73,6 @@
+ 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
+@@ -82,7 +80,6 @@
+ Icon=konqueror
+ Name=KHTML
+ Name[hi]=केएचटीएमएल (KHTML)
+-Name[xx]=xxKHTMLxx
+ ServiceTypes=KParts/ReadOnlyPart,Browser/View
+ X-KDE-Library=libkhtmlpart
+ InitialPreference=10
+--- khtml/khtmlimage.desktop	(revision 484194)
++++ khtml/khtmlimage.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Comment[is]=Ívefjanleg myndsjáreining
+ Comment[it]=Componente integrabile per la visualizzazione di immagini
+ Comment[ja]=埋め込み可能な画像表示コンポーネント
+-Comment[ka]=ნახატების ჩვენების ჩადგმადი კომპონენტი
+ Comment[km]=សមាសភាគ​មើល​រូបភាព​ដែល​អាច​បង្កប់
+ Comment[ko]=끼워넣는 그림 보기 구성 요소
+ Comment[lb]=Abettbar Bild-Uweisungskomponent
+@@ -49,7 +48,7 @@
+ Comment[nn]=Inkluderbart komponent for biletvising
+ Comment[nso]=Seripa seo se Robatsegsgo sa Pono ya Ponagalo
+ Comment[pa]=ਸ਼ਾਮਿਲਯੋਗ ਚਿੱਤਰ ਦਰਸ਼ਕ ਹਿੱਸਾ
+-Comment[pl]=Składnik do przeglądania obrazów
++Comment[pl]=Składnik do przeglądania obrazków
+ Comment[pt]=Componente incorporada para visualizar imagens
+ Comment[pt_BR]=Componente integrado de visualização de imagens
+ Comment[ro]=Componentă înglobată de vizualizare imagini
+@@ -73,7 +72,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
+@@ -109,7 +107,6 @@
+ Name[is]=Ívefjanleg myndsjá
+ Name[it]=Visualizzatore integrabile di immagini
+ Name[ja]=埋め込み画像ビューア
+-Name[ka]=ნახატების ჩვენების ჩადგმადი მოდული
+ Name[km]=កម្មវិធី​មើល​រូបភាព​ដែល​អាច​បង្កប់
+ Name[ko]=끼워넣는 그림 보기
+ Name[lb]=Abettbare Bild-Uweiser
+@@ -125,7 +122,7 @@
+ Name[nn]=Innebygd biletvisar
+ Name[nso]=Molebeledi yo a Robatsegago wa Ponagalo
+ Name[pa]=ਸ਼ਾਮਿਲ ਚਿੱਤਰ ਦਰਸ਼ਕ
+-Name[pl]=Wbudowana przeglądarka obrazów
++Name[pl]=Wbudowana przeglądarka obrazków
+ Name[pt]=Visualizador de Imagens Embebido
+ Name[pt_BR]=Visualizador embutido de imagens
+ Name[ro]=Vizualizor înglobat de imagini
+@@ -150,7 +147,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
+--- khtml/khtmlview.cpp	(revision 484194)
++++ khtml/khtmlview.cpp	(revision 488534)
+@@ -5,7 +5,7 @@
+  *                     1999 Antti Koivisto <koivisto at kde.org>
+  *                     2000-2004 Dirk Mueller <mueller at kde.org>
+  *                     2003 Leo Savernik <l.savernik at aon.at>
+- *                     2003 Apple Computer, Inc.
++ *                     2003-2004 Apple Computer, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Library General Public
+@@ -93,8 +93,10 @@
+ 
+ //#define DEBUG_PIXEL
+ 
++#ifdef Q_WS_X11
+ #include <X11/Xlib.h>
+ #include <fixx11h.h>
++#endif
+ 
+ #define PAINT_BUFFER_HEIGHT 128
+ 
+@@ -547,8 +549,10 @@
+     if (!m_part->isCaretMode() && !m_part->isEditable()) caretOff();
+ #endif
+ 
++#ifndef KHTML_NO_TYPE_AHEAD_FIND
+     if( d->typeAheadActivated )
+         findTimeout();
++#endif
+     if (d->accessKeysEnabled && d->accessKeysActivated)
+         accessKeysTimeout();
+     viewport()->unsetCursor();
+@@ -1180,6 +1184,7 @@
+     }
+ 
+     if ( mailtoCursor && isVisible() && hasFocus() ) {
++#ifdef Q_WS_X11
+         if( !d->cursor_icon_widget ) {
+             QPixmap icon_pixmap = KGlobal::iconLoader()->loadIcon( "mail_generic", KIcon::Small, 0, KIcon::DefaultState, 0, true );
+             d->cursor_icon_widget = new QWidget( NULL, NULL, WX11BypassWM );
+@@ -1199,6 +1204,7 @@
+         XRaiseWindow( qt_xdisplay(), d->cursor_icon_widget->winId());
+         QApplication::flushX();
+         d->cursor_icon_widget->show();
++#endif
+     }
+     else if ( d->cursor_icon_widget )
+         d->cursor_icon_widget->hide();
+@@ -3037,6 +3043,10 @@
+ 				   int detail,QMouseEvent *_mouse, bool setUnder,
+ 				   int mouseEventType)
+ {
++    // if the target node is a text node, dispatch on the parent node - rdar://4196646 (and #76948)
++    if (targetNode && targetNode->isTextNode())
++        targetNode = targetNode->parentNode();
++
+     if (d->underMouse)
+ 	d->underMouse->deref();
+     d->underMouse = targetNode;
+@@ -3089,6 +3099,9 @@
+ 	    NodeImpl::MouseEvent mev( _mouse->stateAfter(), static_cast<NodeImpl::MouseEventType>(mouseEventType));
+ 	    m_part->xmlDocImpl()->prepareMouseEvent( true, d->prevMouseX, d->prevMouseY, &mev );
+ 	    oldUnder = mev.innerNode.handle();
++
++            if (oldUnder && oldUnder->isTextNode())
++                oldUnder = oldUnder->parentNode();
+ 	}
+ // 	qDebug("oldunder=%p (%s), target=%p (%s) x/y=%d/%d", oldUnder, oldUnder ? oldUnder->renderer()->renderName() : 0, targetNode,  targetNode ? targetNode->renderer()->renderName() : 0, _mouse->x(), _mouse->y());
+ 	if (oldUnder != targetNode) {
+@@ -3408,7 +3421,7 @@
+     killTimer(d->repaintTimerId);
+     d->repaintTimerId = 0;
+ 
+-    QRegion updateRegion;
++    QRect updateRegion;
+     QMemArray<QRect> rects = d->updateRegion.rects();
+ 
+     d->updateRegion = QRegion();
+@@ -3417,11 +3430,10 @@
+         updateRegion = rects[0];
+ 
+     for ( unsigned i = 1; i < rects.size(); ++i ) {
+-        QRect obR = updateRegion.boundingRect();
+-        QRegion newRegion = updateRegion.unite(rects[i]);
+-        if (2*newRegion.boundingRect().height() > 3*obR.height() )
++        QRect newRegion = updateRegion.unite(rects[i]);
++        if (2*newRegion.height() > 3*updateRegion.height() )
+         {
+-            repaintContents( obR );
++            repaintContents( updateRegion );
+             updateRegion = rects[i];
+         }
+         else
+@@ -3429,7 +3441,7 @@
+     }
+ 
+     if ( !updateRegion.isNull() )
+-        repaintContents( updateRegion.boundingRect() );
++        repaintContents( updateRegion );
+ 
+     if (d->dirtyLayout && !d->visibleWidgets.isEmpty()) {
+         QWidget* w;
+--- khtml/kmultipart/kmultipart.desktop	(revision 484194)
++++ khtml/kmultipart/kmultipart.desktop	(revision 488534)
+@@ -26,7 +26,6 @@
+ Name[is]=Ívefjanleg eining fyrir MIME multipart/mixed
+ Name[it]=Componente integrabile per multipart/mixed
+ Name[ja]=マルチパート/混合 の埋め込み可能なコンポーネント
+-Name[ka]=ჩადგმადი კომპონენტი მრავალნაწილიანი/შერეულისთვის
+ Name[km]=សមាសភាគ​ដែល​អាច​បង្កប់ សម្រាប់​ផ្នែកជាច្រើន/លាយ
+ Name[lb]=Abettbar Komponent fir de MIME-Genre multipart/mixed
+ Name[lt]=Įdedamas komponentas multipart/mixed tipui
+@@ -55,7 +54,6 @@
+ Name[tr]=Çok parçalı/karışık için Gömülebilir Bileşen
+ Name[uk]=Вбудовна компонента для повідомлень multipart/mixed
+ Name[uz]=Multipart/mixed учун ичига ўрнатиб бўладиган компонент
+-Name[xx]=xxEmbeddable Component for multipart/mixedxx
+ Name[zh_CN]=可嵌入的 multipart/mixed 组件
+ ServiceTypes=KParts/ReadOnlyPart
+ X-KDE-Library=libkmultipart
+--- khtml/html/htmltokenizer.cpp	(revision 484194)
++++ khtml/html/htmltokenizer.cpp	(revision 488534)
+@@ -339,7 +339,7 @@
+                 else if ( title ) { currToken.tid = ID_TITLE + ID_CLOSE_TAG; }
+                 else if ( xmp )  { currToken.tid = ID_XMP + ID_CLOSE_TAG; }
+                 processToken();
+-                style = script = style = textarea = title = xmp = false;
++                script = style = textarea = title = xmp = false;
+                 tquote = NoQuote;
+                 scriptCodeSize = scriptCodeResync = 0;
+             }
+@@ -446,7 +446,7 @@
+ void HTMLTokenizer::parseComment(TokenizerString &src)
+ {
+     // SGML strict
+-    bool strict = parser->doc()->inStrictMode() && parser->doc()->htmlMode() != DocumentImpl::XHtml;
++    bool strict = parser->doc()->inStrictMode() && parser->doc()->htmlMode() != DocumentImpl::XHtml && !script && !style;
+     int delimiterCount = 0;
+     bool canClose = false;
+ 
+@@ -455,8 +455,7 @@
+         scriptCode[ scriptCodeSize++ ] = *src;
+ 
+ #if defined(TOKEN_DEBUG) && TOKEN_DEBUG > 1
+-        qDebug("comment is now: *%s*",
+-               QConstString((QChar*)src.current(), kMin(16U, src.length())).string().latin1());
++        qDebug("comment is now: *%s*", src.toString().left(16).latin1());
+ #endif
+ 
+         if (strict)
+@@ -746,10 +745,10 @@
+         checkBuffer();
+ #if defined(TOKEN_DEBUG) && TOKEN_DEBUG > 1
+         uint l = 0;
+-        while(l < src.length() && (*(src.current()+l)).latin1() != '>')
++        while(l < src.length() && (src.toString()[l]).latin1() != '>')
+             l++;
+         qDebug("src is now: *%s*, tquote: %d",
+-               QConstString((QChar*)src.current(), l).string().latin1(), tquote);
++               src.toString().left(l).latin1(), tquote);
+ #endif
+         switch(tag) {
+         case NoTag:
+@@ -775,10 +774,6 @@
+                         tag = NoTag;
+ 
+                         comment = true;
+-                        // push what we parsed so far upon the stack. helps for <!-->
+-                        checkScriptBuffer();
+-                        scriptCode[0] = scriptCode[1] = '-';
+-                        scriptCodeSize = 2;
+                         parseComment(src);
+                         return; // Finished parsing tag!
+                     }
+--- khtml/html/html_headimpl.cpp	(revision 484194)
++++ khtml/html/html_headimpl.cpp	(revision 488534)
+@@ -298,8 +298,6 @@
+ 	m_content = attr->value();
+ 	process();
+ 	break;
+-    case ATTR_NAME:
+-      break;
+     default:
+         HTMLElementImpl::parseAttribute(attr);
+     }
+@@ -393,10 +391,12 @@
+ 
+     assert(cs == m_cachedScript);
+ 
+-    evaluateScript(cs->url().string(), cs->script());
+-
++    QString   URL    = cs->url().string();
++    DOMString script = cs->script();
+     cs->deref(this);
+     m_cachedScript = 0;
++
++    evaluateScript(URL, script);
+ }
+ 
+ void HTMLScriptElementImpl::evaluateScript(const QString &URL, const DOMString &script)
+--- khtml/html/html_formimpl.cpp	(revision 484194)
++++ khtml/html/html_formimpl.cpp	(revision 488534)
+@@ -574,6 +574,7 @@
+         if (m_walletMap.isEmpty()) {
+             gatherWalletData();
+         }
++#ifndef KHTML_NO_WALLET
+         if (m_havePassword && !m_haveTextarea && KWallet::Wallet::isEnabled()) {
+             const QString key = calculateAutoFillKey(*this);
+             const bool doesnotexist = KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(), KWallet::Wallet::FormDataFolder(), key);
+@@ -600,7 +601,6 @@
+                 }
+             }
+ 
+-#ifndef KHTML_NO_WALLET
+             if ( doesnotexist || !w || login_changed ) {
+                 // TODO use KMessageBox::questionYesNoCancel() again, if you can pass a KGuiItem for Cancel
+                 KDialogBase* const dialog = new KDialogBase(i18n("Save Login Information"),
+@@ -634,8 +634,8 @@
+                     view->addNonPasswordStorableSite(formUrl.host());
+                 }
+             }
+-#endif // KHTML_NO_WALLET
+         }
++#endif // KHTML_NO_WALLET
+ 
+         const DOMString url(khtml::parseURL(getAttribute(ATTR_ACTION)));
+         if(m_post) {
+@@ -713,16 +713,13 @@
+         setHTMLEventListener(EventImpl::RESET_EVENT,
+ 	    getDocument()->createHTMLEventListener(attr->value().string(), "onreset", this));
+         break;
+-    case ATTR_ID:
+-	break;
+     case ATTR_NAME:
+-        //### why doesn't this call down?
+         if (inDocument() && m_name != attr->value()) {
+             getDocument()->underDocNamedCache().remove(m_name.string(),        this);
+             getDocument()->underDocNamedCache().add   (attr->value().string(), this);
+         }
+         m_name = attr->value();
+-	break;
++        //Fallthrough intentional
+     default:
+         HTMLElementImpl::parseAttribute(attr);
+     }
+@@ -821,8 +818,6 @@
+ {
+     switch(attr->id())
+     {
+-    case ATTR_NAME:
+-        break;
+     case ATTR_DISABLED:
+         setDisabled( attr->val() != 0 );
+         break;
+--- khtml/html/html_objectimpl.cpp	(revision 484194)
++++ khtml/html/html_objectimpl.cpp	(revision 488534)
+@@ -211,7 +211,6 @@
+     case ATTR_CODE:
+     case ATTR_OBJECT:
+     case ATTR_ALT:
+-    case ATTR_ID:
+         break;
+     case ATTR_ALIGN:
+ 	addHTMLAlignment( attr->value() );
+@@ -233,7 +232,7 @@
+             getDocument()->underDocNamedCache().add   (attr->value().string(), this);
+         }
+         m_name = attr->value();
+-        break;
++        //fallthrough
+     default:
+         HTMLObjectBaseElementImpl::parseAttribute(attr);
+     }
+@@ -437,15 +436,17 @@
+ {
+     switch( attr->id() )
+     {
++    case ATTR_VALUE:
++        m_value = attr->value().string();
++        break;
+     case ATTR_ID:
+         if (getDocument()->htmlMode() != DocumentImpl::XHtml) break;
+         // fall through
+     case ATTR_NAME:
+         m_name = attr->value().string();
+-        break;
+-    case ATTR_VALUE:
+-        m_value = attr->value().string();
+-        break;
++        // fall through
++    default:
++        HTMLElementImpl::parseAttribute(attr);
+     }
+ }
+ 
+--- khtml/html/html_baseimpl.cpp	(revision 484194)
++++ khtml/html/html_baseimpl.cpp	(revision 488534)
+@@ -249,12 +249,6 @@
+     case ATTR_SRC:
+         setLocation(khtml::parseURL(attr->val()));
+         break;
+-    case ATTR_ID:
+-    case ATTR_NAME:
+-        // FIXME: if already attached, doesn't change the frame name
+-        // FIXME: frame name conflicts, no unique frame name anymore
+-        name = attr->value();
+-        break;
+     case ATTR_FRAMEBORDER:
+     {
+         frameBorder = attr->value().toInt();
+@@ -291,7 +285,12 @@
+         setHTMLEventListener(EventImpl::UNLOAD_EVENT,
+             getDocument()->createHTMLEventListener(attr->value().string(), "onunload", this));
+         break;
+-
++    case ATTR_ID:
++    case ATTR_NAME:
++        // FIXME: if already attached, doesn't change the frame name
++        // FIXME: frame name conflicts, no unique frame name anymore
++        name = attr->value();
++        //fallthrough intentional, let the base handle it
+     default:
+         HTMLElementImpl::parseAttribute(attr);
+     }
+@@ -627,16 +626,16 @@
+         if(w && (name.isEmpty() || w->part()->frameExists( name.string() )))
+             name = DOMString(w->part()->requestFrameName());
+ 
+-        static_cast<RenderPartObject*>(m_render)->updateWidget();
+         needWidgetUpdate = false;
++        static_cast<RenderPartObject*>(m_render)->updateWidget();
+     }
+ }
+ 
+ void HTMLIFrameElementImpl::recalcStyle( StyleChange ch )
+ {
+     if (needWidgetUpdate) {
+-        if(m_render)  static_cast<RenderPartObject*>(m_render)->updateWidget();
+         needWidgetUpdate = false;
++        if(m_render)  static_cast<RenderPartObject*>(m_render)->updateWidget();
+     }
+     HTMLElementImpl::recalcStyle( ch );
+ }
+--- khtml/html/html_imageimpl.cpp	(revision 484194)
++++ khtml/html/html_imageimpl.cpp	(revision 488534)
+@@ -175,7 +175,7 @@
+             getDocument()->underDocNamedCache().add   (attr->value().string(), this);
+         }
+         m_name = attr->value();
+-        break;
++        //fallthrough
+     default:
+         HTMLElementImpl::parseAttribute(attr);
+     }
+@@ -390,7 +390,10 @@
+     switch (attr->id())
+     {
+     case ATTR_ID:
+-        if (getDocument()->htmlMode() != DocumentImpl::XHtml) break;
++        if (getDocument()->htmlMode() != DocumentImpl::XHtml) {
++            HTMLElementImpl::parseAttribute(attr);
++            break;
++        }
+         // fall through
+     case ATTR_NAME:
+     {
+@@ -402,7 +405,8 @@
+ 	// ### make this work for XML documents, e.g. in case of <html:map...>
+         if(getDocument()->isHTMLDocument())
+             static_cast<HTMLDocumentImpl*>(getDocument())->mapMap[name] = this;
+-        break;
++
++        //fallthrough
+     }
+     default:
+         HTMLElementImpl::parseAttribute(attr);
+--- khtml/html/html_elementimpl.cpp	(revision 484194)
++++ khtml/html/html_elementimpl.cpp	(revision 488534)
+@@ -172,10 +172,12 @@
+         // unique id
+         setHasID();
+         setChanged(); // in case of a CSS selector on id
++        getDocument()->incDOMTreeVersion();
+         break;
+     case ATTR_CLASS:
+     case ATTR_NAME:
+         setChanged(); // in case of a CSS selector on class/name
++        getDocument()->incDOMTreeVersion();
+         break;
+     case ATTR_STYLE:
+         setHasStyle();
+--- khtml/html/html_inlineimpl.cpp	(revision 484194)
++++ khtml/html/html_inlineimpl.cpp	(revision 488534)
+@@ -176,11 +176,11 @@
+     {
+     case ATTR_HREF:
+         m_hasAnchor = attr->val() != 0;
++        getDocument()->incDOMTreeVersion();
+         break;
+     case ATTR_TARGET:
+         m_hasTarget = attr->val() != 0;
+         break;
+-    case ATTR_NAME:
+     case ATTR_TITLE:
+     case ATTR_REL:
+ 	break;
+--- khtml/html/html_tableimpl.cpp	(revision 484194)
++++ khtml/html/html_tableimpl.cpp	(revision 488534)
+@@ -490,10 +490,7 @@
+ 
+     }
+     case ATTR_ALIGN:
+-        if (!attr->value().isEmpty())
+-            addCSSProperty(CSS_PROP_FLOAT, attr->value().lower());
+-        else
+-            removeCSSProperty(CSS_PROP_FLOAT);
++        setChanged();
+         break;
+     case ATTR_VALIGN:
+         if (!attr->value().isEmpty())
+--- khtml/ecma/kjs_html.h	(revision 484194)
++++ khtml/ecma/kjs_html.h	(revision 488534)
+@@ -228,7 +228,7 @@
+   class NamedTagLengthDeterminer {
+   public:
+     struct TagLength {
+-      DOM::NodeImpl::Id id; unsigned long length; DOM::NodeImpl *last;
++      DOM::NodeImpl::Id id; unsigned long length; DOM::ElementImpl *last;
+     };
+     NamedTagLengthDeterminer(const DOM::DOMString& n, TagLength *t, int l)
+       : name(n), tags(t), nrTags(l) {}
+--- khtml/ecma/kjs_debugwin.h	(revision 484194)
++++ khtml/ecma/kjs_debugwin.h	(revision 488534)
+@@ -88,6 +88,9 @@
+     int baseLine;
+     int errorLine;
+     SourceFile *sourceFile;
++  private:
++    SourceFragment(const SourceFragment& other);
++    SourceFragment& operator = (const SourceFragment& other);
+   };
+ 
+   class KJSErrorDialog : public KDialogBase {
+--- khtml/ecma/kjs_dom.cpp	(revision 484194)
++++ khtml/ecma/kjs_dom.cpp	(revision 488534)
+@@ -1088,7 +1088,10 @@
+ 
+   switch(id) {
+     case DOMElement::GetAttribute:
+-      return String(element.getAttribute(args[0].toString(exec).string()));
++      /** In theory, we should not return null here, as per DOM. In practice, that 
++       breaks websites
++      */
++      return getString(element.getAttribute(args[0].toString(exec).string()));
+     case DOMElement::SetAttribute:
+       element.setAttribute(args[0].toString(exec).string(),args[1].toString(exec).string());
+       return Undefined();
+--- khtml/ecma/kjs_html.cpp	(revision 484194)
++++ khtml/ecma/kjs_html.cpp	(revision 488534)
+@@ -185,7 +185,7 @@
+         if (n->id() == tags[i].id &&
+             static_cast<ElementImpl *>(n)->getAttribute(ATTR_NAME) == name) {
+           tags[i].length++;
+-          tags[i].last = n;   // cache this NodeImpl*
++          tags[i].last = static_cast<ElementImpl*>(n); // cache this ElementImpl*
+           nrTags = i+1;       // forget about Tags with lower preference
+           break;
+         }
+--- khtml/ecma/kjs_debugwin.cpp	(revision 484194)
++++ khtml/ecma/kjs_debugwin.cpp	(revision 488534)
+@@ -956,12 +956,17 @@
+ void KJSDebugWin::setSourceFile(Interpreter *interpreter, QString url, SourceFile *sourceFile)
+ {
+   QString key = QString("%1|%2").arg((long)interpreter).arg(url);
++  sourceFile->ref();
++  if (SourceFile* oldFile = m_sourceFiles[key])
++    oldFile->deref();
+   m_sourceFiles[key] = sourceFile;
+ }
+ 
+ void KJSDebugWin::removeSourceFile(Interpreter *interpreter, QString url)
+ {
+   QString key = QString("%1|%2").arg((long)interpreter).arg(url);
++  if (SourceFile* oldFile = m_sourceFiles[key])
++    oldFile->deref();
+   m_sourceFiles.remove(key);
+ }
+ 
+--- khtml/ecma/kjs_window.cpp	(revision 484194)
++++ khtml/ecma/kjs_window.cpp	(revision 488534)
+@@ -260,6 +260,8 @@
+   scroll	Window::Scroll		DontDelete|Function 2
+   scrollBy	Window::ScrollBy	DontDelete|Function 2
+   scrollTo	Window::ScrollTo	DontDelete|Function 2
++  scrollX       Window::ScrollX         DontDelete|ReadOnly
++  scrollY       Window::ScrollY         DontDelete|ReadOnly
+   moveBy	Window::MoveBy		DontDelete|Function 2
+   moveTo	Window::MoveTo		DontDelete|Function 2
+   resizeBy	Window::ResizeBy	DontDelete|Function 2
+--- khtml/rendering/bidi.cpp	(revision 484194)
++++ khtml/rendering/bidi.cpp	(revision 488534)
+@@ -2006,7 +2006,7 @@
+         RenderObject* next = Bidinext(start.par, o, bidi);
+         bool isNormal = o->style()->autoWrap();
+         bool checkForBreak = isNormal;
+-        if (w && w + tmpW > width+1 && lBreak.obj && !o->style()->preserveLF())
++        if (w && w + tmpW > width && lBreak.obj && !o->style()->preserveLF())
+             checkForBreak = true;
+         else if (next && o->isText() && next->isText() && !next->isBR()) {
+             if (isNormal || next->style()->autoWrap()) {
+@@ -2035,7 +2035,7 @@
+             }
+         }
+ 
+-        if (checkForBreak && (w + tmpW > width+1)) {
++        if (checkForBreak && (w + tmpW > width)) {
+             //kdDebug() << " too wide w=" << w << " tmpW = " << tmpW << " width = " << width << endl;
+             //kdDebug() << "start=" << start.obj << " current=" << o << endl;
+             // if we have floats, try to get below them.
+@@ -2063,7 +2063,7 @@
+             // |width| may have been adjusted because we got shoved down past a float (thus
+             // giving us more room), so we need to retest, and only jump to
+             // the end label if we still don't fit on the line. -dwh
+-            if (w + tmpW > width+1)
++            if (w + tmpW > width)
+                 goto end;
+         }
+ 
+--- khtml/rendering/render_line.cpp	(revision 484194)
++++ khtml/rendering/render_line.cpp	(revision 488534)
+@@ -47,6 +47,8 @@
+ 
+ void InlineBox::detach(RenderArena* renderArena)
+ {
++    if (m_parent)
++        m_parent->removeFromLine(this);
+ #ifndef NDEBUG
+     inInlineBoxDetach = true;
+ #endif
+@@ -80,6 +82,13 @@
+     return static_cast<RootInlineBox*>(this);
+ }
+ 
++InlineFlowBox::~InlineFlowBox()
++{
++    /* If we're destroyed, set the children free, and break their links */
++    while (m_firstChild)
++        removeFromLine(m_firstChild);
++}
++
+ void InlineFlowBox::removeFromLine(InlineBox *child)
+ {
+     if (child == m_firstChild) {
+@@ -94,6 +103,8 @@
+     if (child->prevOnLine()) {
+         child->prevOnLine()->m_next = child->nextOnLine();
+     }
++
++    child->setParent(0);
+ }
+ 
+ int InlineFlowBox::marginLeft() const
+--- khtml/rendering/render_block.h	(revision 484194)
++++ khtml/rendering/render_block.h	(revision 488534)
+@@ -139,7 +139,7 @@
+     inline int leftBottom();
+     inline int rightBottom();
+ 
+-    virtual unsigned short lineWidth(int y) const;
++    virtual unsigned short lineWidth(int y, bool *canClearLine = 0) const;
+     virtual int lowestPosition(bool includeOverflowInterior=true, bool includeSelf=true) const;
+     virtual int rightmostPosition(bool includeOverflowInterior=true, bool includeSelf=true) const;
+     virtual int leftmostPosition(bool includeOverflowInterior=true, bool includeSelf=true) const;
+@@ -148,12 +148,12 @@
+     int rightmostAbsolutePosition() const;
+ 
+     int rightOffset() const;
+-    int rightRelOffset(int y, int fixedOffset, bool applyTextIndent=true, int *heightRemaining = 0) const;
+-    int rightOffset(int y) const { return rightRelOffset(y, rightOffset()); }
++    int rightRelOffset(int y, int fixedOffset, bool applyTextIndent=true, int *heightRemaining = 0, bool *canClearLine = 0) const;
++    int rightOffset(int y, bool *canClearLine = 0) const { return rightRelOffset(y, rightOffset(), true, 0, canClearLine); }
+ 
+     int leftOffset() const;
+-    int leftRelOffset(int y, int fixedOffset, bool applyTextIndent=true, int *heightRemaining = 0) const;
+-    int leftOffset(int y) const { return leftRelOffset(y, leftOffset()); }
++    int leftRelOffset(int y, int fixedOffset, bool applyTextIndent=true, int *heightRemaining = 0, bool *canClearLine = 0) const;
++    int leftOffset(int y, bool *canClearLine = 0) const { return leftRelOffset(y, leftOffset(), true, 0, canClearLine); }
+ 
+     virtual bool nodeAtPoint(NodeInfo& info, int x, int y, int _tx, int _ty, HitTestAction hitTestAction = HitTestAll, bool inside=false);
+ 
+--- khtml/rendering/render_style.h	(revision 484194)
++++ khtml/rendering/render_style.h	(revision 488534)
+@@ -189,7 +189,7 @@
+ };
+ 
+ enum EFloat {
+-    FNONE = 0, FLEFT, FRIGHT
++    FNONE = 0, FLEFT = 0x01, FRIGHT = 0x02, FLEFT_ALIGN = 0x05, FRIGHT_ALIGN = 0x06
+ };
+ 
+ 
+@@ -815,7 +815,7 @@
+                 EVerticalAlign _vertical_align : 4;
+                 EClear _clear : 2;
+                 EPosition _position : 2;
+-                EFloat _floating : 2;
++                EFloat _floating : 3;
+                 ETableLayout _table_layout : 1;
+                 bool _flowAroundFloats :1;
+ 
+@@ -828,7 +828,7 @@
+                 bool _hasClip : 1;
+                 EUnicodeBidi _unicodeBidi : 2;
+ 
+-                unsigned int unused : 23;
++                unsigned int unused : 22;
+             } f;
+             Q_UINT64 _niflags;
+         };
+--- khtml/rendering/render_text.cpp	(revision 484194)
++++ khtml/rendering/render_text.cpp	(revision 488534)
+@@ -64,6 +64,9 @@
+ 
+ void InlineTextBox::detach(RenderArena* renderArena)
+ {
++    if (m_parent)
++        m_parent->removeFromLine(this);
++
+ #ifndef NDEBUG
+     inInlineTextBoxDetach = true;
+ #endif
+@@ -208,7 +211,7 @@
+         p.end();
+         QImage img = pixmap.convertToImage().convertDepth(32);
+ 
+-        int md = thickness*thickness; // max-dist²
++        int md = thickness*thickness; // max-dist^2
+ 
+         // blur map (division cache)
+         float *bmap = (float*)alloca(sizeof(float)*(md+1));
+--- khtml/rendering/render_table.cpp	(revision 484194)
++++ khtml/rendering/render_table.cpp	(revision 488534)
+@@ -1980,6 +1980,7 @@
+   _bottomExtra = 0;
+   m_percentageHeight = -1;
+   m_hasFlexedAnonymous = false;
++  m_widthChanged = false;
+ }
+ 
+ void RenderTableCell::detach()
+--- khtml/rendering/render_block.cpp	(revision 484194)
++++ khtml/rendering/render_block.cpp	(revision 488534)
+@@ -187,7 +187,8 @@
+             while ( length < oldText->l &&
+                     ( (oldText->s+length)->isSpace() || (oldText->s+length)->isPunct() ) )
+                 length++;
+-            if (!( (oldText->s+length)->isSpace() || (oldText->s+length)->isPunct() ))
++            if ( length < oldText->l && 
++                    !( (oldText->s+length)->isSpace() || (oldText->s+length)->isPunct() ))
+                 length++;
+             RenderTextFragment* remainingText =
+                 new (renderArena()) RenderTextFragment(textObj->node(), oldText, length, oldText->l-length);
+@@ -1718,7 +1719,7 @@
+         // floating object
+         o->layoutIfNeeded();
+ 
+-        if(o->style()->floating() == FLEFT)
++        if(o->style()->floating() & FLEFT)
+             newObj = new FloatingObject(FloatingObject::FloatLeft);
+         else
+             newObj = new FloatingObject(FloatingObject::FloatRight);
+@@ -1812,15 +1813,19 @@
+         if ( o->style()->clear() & CRIGHT )
+             y = kMax( rightBottom(), y );
+ 
+-        if (o->style()->floating() == FLEFT)
++        bool canClearLine;
++        if (o->style()->floating() & FLEFT)
+         {
+             int heightRemainingLeft = 1;
+             int heightRemainingRight = 1;
+-            int fx = leftRelOffset(y,lo, false, &heightRemainingLeft);
+-            while (rightRelOffset(y,ro, false, &heightRemainingRight)-fx < fwidth)
++            int fx = leftRelOffset(y,lo, false, &heightRemainingLeft, &canClearLine);
++            if (canClearLine)
+             {
+-                y += kMin( heightRemainingLeft, heightRemainingRight );
+-                fx = leftRelOffset(y,lo, false, &heightRemainingLeft);
++                while (rightRelOffset(y,ro, false, &heightRemainingRight)-fx < fwidth)
++                {
++                    y += kMin( heightRemainingLeft, heightRemainingRight );
++                    fx = leftRelOffset(y,lo, false, &heightRemainingLeft);
++                }
+             }
+             if (fx<0) fx=0;
+             f->left = fx;
+@@ -1831,11 +1836,14 @@
+         {
+             int heightRemainingLeft = 1;
+             int heightRemainingRight = 1;
+-            int fx = rightRelOffset(y,ro, false, &heightRemainingRight);
+-            while (fx - leftRelOffset(y,lo, false, &heightRemainingLeft) < fwidth)
++            int fx = rightRelOffset(y,ro, false, &heightRemainingRight, &canClearLine);
++            if (canClearLine)
+             {
+-                y += kMin(heightRemainingLeft, heightRemainingRight);
+-                fx = rightRelOffset(y,ro, false, &heightRemainingRight);
++                while (fx - leftRelOffset(y,lo, false, &heightRemainingLeft) < fwidth)
++                {
++                    y += kMin(heightRemainingLeft, heightRemainingRight);
++                    fx = rightRelOffset(y,ro, false, &heightRemainingRight);
++                }
+             }
+             if (fx<f->width) fx=f->width;
+             f->left = fx - f->width;
+@@ -1889,9 +1897,11 @@
+ }
+ 
+ int
+-RenderBlock::leftRelOffset(int y, int fixedOffset, bool applyTextIndent, int *heightRemaining ) const
++RenderBlock::leftRelOffset(int y, int fixedOffset, bool applyTextIndent, int *heightRemaining, bool *canClearLine ) const
+ {
+     int left = fixedOffset;
++    if (canClearLine) *canClearLine = true;
++    
+     if (m_floatingObjects) {
+         if ( heightRemaining ) *heightRemaining = 1;
+         FloatingObject* r;
+@@ -1904,6 +1914,7 @@
+                 r->left + r->width > left) {
+                 left = r->left + r->width;
+                 if ( heightRemaining ) *heightRemaining = r->endY - y;
++                if ( canClearLine ) *canClearLine = (r->node->style()->floating() != FLEFT_ALIGN);
+             }
+         }
+     }
+@@ -1929,9 +1940,10 @@
+ }
+ 
+ int
+-RenderBlock::rightRelOffset(int y, int fixedOffset, bool applyTextIndent, int *heightRemaining ) const
++RenderBlock::rightRelOffset(int y, int fixedOffset, bool applyTextIndent, int *heightRemaining, bool *canClearLine ) const
+ {
+     int right = fixedOffset;
++    if (canClearLine) *canClearLine = true;
+ 
+     if (m_floatingObjects) {
+         if (heightRemaining) *heightRemaining = 1;
+@@ -1945,6 +1957,7 @@
+                 r->left < right) {
+                 right = r->left;
+                 if ( heightRemaining ) *heightRemaining = r->endY - y;
++                if ( canClearLine ) *canClearLine = (r->node->style()->floating() != FRIGHT_ALIGN);
+             }
+         }
+     }
+@@ -1961,10 +1974,17 @@
+ }
+ 
+ unsigned short
+-RenderBlock::lineWidth(int y) const
++RenderBlock::lineWidth(int y, bool *canClearLine) const
+ {
+     //kdDebug( 6040 ) << "lineWidth(" << y << ")=" << rightOffset(y) - leftOffset(y) << endl;
+-    int result = rightOffset(y) - leftOffset(y);
++    int result;
++    if (canClearLine) {
++        bool rightCanClearLine;
++        bool leftCanClearLine;
++        result = rightOffset(y, &rightCanClearLine) - leftOffset(y, &leftCanClearLine);
++        *canClearLine = rightCanClearLine && leftCanClearLine;
++    } else
++        result = rightOffset(y) - leftOffset(y);
+     return (result < 0) ? 0 : result;
+ }
+ 
+@@ -2329,11 +2349,14 @@
+     // We also clear floats if we are too big to sit on the same line as a float, and happen to flow around floats.
+     // FIXME: Note that the remaining space checks aren't quite accurate, since you should be able to clear only some floats (the minimum # needed
+     // to fit) and not all (we should be using nearestFloatBottom and looping).
++
+     int result = clearSet ? kMax(0, bottom - child->yPos()) : 0;
+     if (!result && child->flowAroundFloats() && !style()->width().isVariable()) {
+-        if ((child->style()->width().isPercent() && child->width() > lineWidth(child->yPos())) ||
+-            (child->style()->width().isFixed() && child->minWidth() > lineWidth(child->yPos()) &&
+-              child->minWidth() <= contentWidth()))
++        bool canClearLine;
++        int lw = lineWidth(child->yPos(), &canClearLine);
++        if (((child->style()->width().isPercent() && child->width() > lw) ||
++            (child->style()->width().isFixed() && child->minWidth() > lw)) &&
++              child->minWidth() <= contentWidth() && canClearLine)
+             result = kMax(0, floatBottom() - child->yPos());
+     }
+     return result;
+@@ -2676,8 +2699,8 @@
+                 // go ahead and terminate maxwidth as well.
+                 if (child->isFloating()) {
+                     if (prevFloat &&
+-                        ((prevFloat->style()->floating() == FLEFT && (child->style()->clear() & CLEFT)) ||
+-                         (prevFloat->style()->floating() == FRIGHT && (child->style()->clear() & CRIGHT)))) {
++                        (((prevFloat->style()->floating() & FLEFT) && (child->style()->clear() & CLEFT)) ||
++                         ((prevFloat->style()->floating() & FRIGHT) && (child->style()->clear() & CRIGHT)))) {
+                         m_maxWidth = kMax(inlineMax, (int)m_maxWidth);
+                         inlineMax = 0;
+                     }
+@@ -2832,8 +2855,8 @@
+         }
+ 
+         if (prevFloat && (!child->isFloating() ||
+-                          (prevFloat->style()->floating() == FLEFT && (child->style()->clear() & CLEFT)) ||
+-                          (prevFloat->style()->floating() == FRIGHT && (child->style()->clear() & CRIGHT)))) {
++                          ((prevFloat->style()->floating() & FLEFT) && (child->style()->clear() & CLEFT)) ||
++                          ((prevFloat->style()->floating() & FRIGHT) && (child->style()->clear() & CRIGHT)))) {
+             m_maxWidth = kMax(floatWidths, m_maxWidth);
+             floatWidths = 0;
+         }
+--- khtml/rendering/render_line.h	(revision 484194)
++++ khtml/rendering/render_line.h	(revision 488534)
+@@ -158,6 +158,8 @@
+         m_afterPageBreak = false;
+     }
+ 
++    ~InlineFlowBox();
++
+     virtual bool isInlineFlowBox() const { return true; }
+ 
+     InlineBox* firstChild() const  { return m_firstChild; }
+--- khtml/java/kjavaappletviewer.desktop	(revision 484194)
++++ khtml/java/kjavaappletviewer.desktop	(revision 488534)
+@@ -30,7 +30,6 @@
+ Name[is]=Ívefjanlegur Java Applet skoðari
+ Name[it]=Visualizzatore integrato di applet Java
+ Name[ja]=埋め込み Java アプレットビューア
+-Name[ka]=ჩადგმული კომპონენტი Java აპლეტების საჩვენებლად
+ Name[km]=កម្មវិធី​មើល​អាប់ភ្លេត Java ដែលបាន​បង្កប់
+ Name[ko]=끼워넣은 자바 ì• í”Œë¦¿ 보기
+ Name[lb]=Agebetteten Java-Applet-Uweiser
+@@ -65,7 +64,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
+--- khtml/ChangeLog	(revision 484194)
++++ khtml/ChangeLog	(revision 488534)
+@@ -1,3 +1,26 @@
++2005-12-09  Germain Garand  <germain at ebooksfrance.org>
++
++        implement quirky HTML alignment ; introduce special float values
++        -khtml-left/-khtml-right to this effect.
++
++        * css/cssparser.cpp: ditto. Fix memory leak from Function struct deletion also.
++        * css/cssstyleselector.cpp: ditto.
++        * css/html4.css: set as default style for table[align="left/right"]
++        * html/html_tableimpl.cpp (parseAttribute): remove setting of float property
++        * rendering/render_block{h,cpp}: quirky HTML alignment never clears, and never cause fafs to clear.
++          Only examine the last floating object on line, so as to match MSIE behaviour.
++        * rendering/render_style.h: extra float enumeration values
++        * css/css_renderstyledeclarationimpl.cpp (getPropertyCSSValue): adjust
++
++2005-12-06  Dirk Mueller  <mueller at kde.org>
++
++	* html/htmltokenizer.cpp: don't treat <!---> specially. 
++        fixes bug 93799.
++
++2005-12-02  Charles Samuels  <charles at kde.org>
++	rendering/bidi.cpp: don't sometimes take text far past the end
++	of the block's margin on justified text.  bug #106081
++
+ 2005-11-08  Germain Garand  <germain at ebooksfrance.org>
+ 
+         sizing of percent objects within table cells
+--- khtml/css/html4.css	(revision 484194)
++++ khtml/css/html4.css	(revision 488534)
+@@ -180,6 +180,14 @@
+ 	margin-right: auto;
+ }
+ 
++TABLE[align="left"] {
++	float: -khtml-left;
++}
++
++TABLE[align="right"] {
++	float: -khtml-right;
++}
++
+ THEAD {
+ 	display: table-header-group;
+         border-color: inherit;
+--- khtml/css/cssparser.cpp	(revision 484194)
++++ khtml/css/cssparser.cpp	(revision 488534)
+@@ -63,8 +63,10 @@
+ #ifdef CSS_DEBUG
+         kdDebug( 6080 ) << "       value: (unit=" << values[i].unit <<")"<< endl;
+ #endif
+-        if ( values[i].unit == Value::Function )
++        if ( values[i].unit == Value::Function ) {
++            delete values[i].function->args;
+             delete values[i].function;
++        }
+     }
+     free( values );
+ }
+@@ -570,9 +572,9 @@
+             valid_primitive = true;
+         break;
+ 
+-    case CSS_PROP_FLOAT:                // left | right | none | inherit + center for buggy CSS
+-        if ( id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT ||
+-             id == CSS_VAL_NONE || id == CSS_VAL_CENTER)
++    case CSS_PROP_FLOAT:                // left | right | none | khtml_left | khtml_right | inherit + center for buggy CSS
++        if ( id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || id == CSS_VAL__KHTML_LEFT ||
++             id == CSS_VAL__KHTML_RIGHT ||id == CSS_VAL_NONE || id == CSS_VAL_CENTER)
+             valid_primitive = true;
+         break;
+ 
+--- khtml/css/css_renderstyledeclarationimpl.cpp	(revision 484194)
++++ khtml/css/css_renderstyledeclarationimpl.cpp	(revision 488534)
+@@ -384,6 +384,10 @@
+             return new CSSPrimitiveValueImpl("left", CSSPrimitiveValue::CSS_STRING);
+         case khtml::FRIGHT:
+             return new CSSPrimitiveValueImpl("right", CSSPrimitiveValue::CSS_STRING);
++        case khtml::FLEFT_ALIGN:
++            return new CSSPrimitiveValueImpl("-khtml-left", CSSPrimitiveValue::CSS_STRING);
++        case khtml::FRIGHT_ALIGN:
++            return new CSSPrimitiveValueImpl("-khtml-right", CSSPrimitiveValue::CSS_STRING);
+         }
+     }
+     case CSS_PROP_FONT_FAMILY:
+--- khtml/css/cssstyleselector.cpp	(revision 484194)
++++ khtml/css/cssstyleselector.cpp	(revision 488534)
+@@ -2128,8 +2128,12 @@
+         EFloat f;
+         switch(primitiveValue->getIdent())
+         {
++        case CSS_VAL__KHTML_LEFT:
++            f = FLEFT_ALIGN; break;
+         case CSS_VAL_LEFT:
+             f = FLEFT; break;
++        case CSS_VAL__KHTML_RIGHT:
++            f = FRIGHT_ALIGN; break;
+         case CSS_VAL_RIGHT:
+             f = FRIGHT; break;
+         case CSS_VAL_NONE:
+--- khtml/misc/loader.cpp	(revision 484194)
++++ khtml/misc/loader.cpp	(revision 488534)
+@@ -938,32 +938,30 @@
+         m_docObjects.resize(khtml::nextSeed( m_docObjects.size() ) );
+ }
+ 
+-bool DocLoader::needReload(const KURL &fullURL)
++bool DocLoader::needReload(CachedObject *existing, const QString& fullURL)
+ {
+     bool reload = false;
+     if (m_cachePolicy == KIO::CC_Verify)
+     {
+-       if (!m_reloadedURLs.contains(fullURL.url()))
++       if (!m_reloadedURLs.contains(fullURL))
+        {
+-          CachedObject *existing = Cache::cache->find(fullURL.url());
+           if (existing && existing->isExpired())
+           {
+              Cache::removeCacheEntry(existing);
+-             m_reloadedURLs.append(fullURL.url());
++             m_reloadedURLs.append(fullURL);
+              reload = true;
+           }
+        }
+     }
+     else if ((m_cachePolicy == KIO::CC_Reload) || (m_cachePolicy == KIO::CC_Refresh))
+     {
+-       if (!m_reloadedURLs.contains(fullURL.url()))
++       if (!m_reloadedURLs.contains(fullURL))
+        {
+-          CachedObject *existing = Cache::cache->find(fullURL.url());
+           if (existing)
+           {
+              Cache::removeCacheEntry(existing);
+           }
+-          m_reloadedURLs.append(fullURL.url());
++          m_reloadedURLs.append(fullURL);
+           reload = true;
+        }
+     }
+@@ -1330,16 +1328,17 @@
+ {
+     KIO::CacheControl cachePolicy = dl ? dl->cachePolicy() : KIO::CC_Verify;
+ 
+-    CachedObject* o = cache->find(kurl.url());
++    QString url = kurl.url();
++    CachedObject* o = cache->find(url);
+ 
+     if ( o && o->type() != CachedType ) {
+         removeCacheEntry( o );
+         o = 0;
+     }
+ 
+-    if ( o && dl->needReload( kurl ) ) {
++    if ( o && dl->needReload( o, url ) ) {
+         o = 0;
+-        assert( cache->find( kurl.url() ) == 0 );
++        assert( cache->find( url ) == 0 );
+     }
+ 
+     if(!o)
+@@ -1347,8 +1346,8 @@
+ #ifdef CACHE_DEBUG
+         kdDebug( 6060 ) << "Cache: new: " << kurl.url() << endl;
+ #endif
+-        CachedObjectType* cot = new CachedObjectType(dl, kurl.url(), cachePolicy, accept);
+-        cache->insert( kurl.url(), cot );
++        CachedObjectType* cot = new CachedObjectType(dl, url, cachePolicy, accept);
++        cache->insert( url, cot );
+         if ( cot->allowInLRUList() )
+             insertInLRUList( cot );
+         o = cot;
+--- khtml/misc/loader.h	(revision 484194)
++++ khtml/misc/loader.h	(revision 488534)
+@@ -357,7 +357,7 @@
+         void removeCachedObject( CachedObject* o) const { m_docObjects.remove( o ); }
+ 
+     private:
+-        bool needReload(const KURL &fullUrl);
++        bool needReload(CachedObject *existing, const QString &fullUrl);
+ 
+         friend class Cache;
+         friend class DOM::DocumentImpl;
+--- khtml/xml/dom2_viewsimpl.cpp	(revision 484194)
++++ khtml/xml/dom2_viewsimpl.cpp	(revision 488534)
+@@ -45,8 +45,6 @@
+         return 0;
+ 
+     CSSStyleDeclarationImpl* style = new RenderStyleDeclarationImpl( elt );
+-    style->setParent( elt->getDocument()->elementSheet() );
+-
+     return style;
+ }
+ 
+--- khtml/xml/dom_nodeimpl.cpp	(revision 484194)
++++ khtml/xml/dom_nodeimpl.cpp	(revision 488534)
+@@ -57,7 +57,6 @@
+       m_previous(0),
+       m_next(0),
+       m_render(0),
+-      m_regdListeners( 0 ),
+       m_tabIndex( 0 ),
+       m_hasId( false ),
+       m_hasStyle( false ),
+@@ -83,7 +82,6 @@
+ {
+     if (m_render)
+         detach();
+-    delete m_regdListeners;
+     if (document)
+         document->deref();
+     if (m_previous)
+@@ -319,89 +317,24 @@
+ 	    break;
+     }
+ 
+-    RegisteredEventListener *rl = new RegisteredEventListener(static_cast<EventImpl::EventId>(id),listener,useCapture);
+-    if (!m_regdListeners) {
+-        m_regdListeners = new QPtrList<RegisteredEventListener>;
+-	m_regdListeners->setAutoDelete(true);
+-    }
+-
+-    // if this id/listener/useCapture combination is already registered, do nothing.
+-    // the DOM2 spec says that "duplicate instances are discarded", and this keeps
+-    // the listener order intact.
+-    QPtrListIterator<RegisteredEventListener> it(*m_regdListeners);
+-    for (; it.current(); ++it)
+-        if (*(it.current()) == *rl) {
+-            delete rl;
+-            return;
+-        }
+-
+-    m_regdListeners->append(rl);
++    m_regdListeners.addEventListener(id, listener, useCapture);
+ }
+ 
+ void NodeImpl::removeEventListener(int id, EventListener *listener, bool useCapture)
+ {
+-    if (!m_regdListeners) // nothing to remove
+-        return;
+-
+-    RegisteredEventListener rl(static_cast<EventImpl::EventId>(id),listener,useCapture);
+-
+-    QPtrListIterator<RegisteredEventListener> it(*m_regdListeners);
+-    for (; it.current(); ++it)
+-        if (*(it.current()) == rl) {
+-            m_regdListeners->removeRef(it.current());
+-            return;
+-        }
++    m_regdListeners.removeEventListener(id, listener, useCapture);
+ }
+ 
+ void NodeImpl::setHTMLEventListener(int id, EventListener *listener)
+ {
+-    if (!m_regdListeners) {
+-        m_regdListeners = new QPtrList<RegisteredEventListener>;
+-        m_regdListeners->setAutoDelete(true);
+-    }
+-
+-    QPtrListIterator<RegisteredEventListener> it(*m_regdListeners);
+-
+-    if (!listener) {
+-        for (; it.current(); ++it)
+-            if (it.current()->id == id &&
+-                it.current()->listener->eventListenerType() == "_khtml_HTMLEventListener") {
+-                m_regdListeners->removeRef(it.current());
+-                break;
+-            }
+-            return;
+-    }
+-
+-    // if this event already has a registered handler, insert the new one in
+-    // place of the old one, to preserve the order.
+-    RegisteredEventListener *rl = new RegisteredEventListener(static_cast<EventImpl::EventId>(id),listener,false);
+-
+-    for (int i = 0; it.current(); ++it, ++i)
+-        if (it.current()->id == id &&
+-            it.current()->listener->eventListenerType() == "_khtml_HTMLEventListener") {
+-            // Qt4: don't forget to delete the old one first
+-            m_regdListeners->replace(i, rl);
+-            return;
+-        }
+-
+-    m_regdListeners->append(rl);
++    m_regdListeners.setHTMLEventListener(id, listener);
+ }
+ 
+ EventListener *NodeImpl::getHTMLEventListener(int id)
+ {
+-    if (!m_regdListeners)
+-        return 0;
+-
+-    QPtrListIterator<RegisteredEventListener> it(*m_regdListeners);
+-    for (; it.current(); ++it)
+-        if (it.current()->id == id &&
+-            it.current()->listener->eventListenerType() == "_khtml_HTMLEventListener") {
+-            return it.current()->listener;
+-        }
+-    return 0;
++    return m_regdListeners.getHTMLEventListener(id);
+ }
+ 
+-
+ void NodeImpl::dispatchEvent(EventImpl *evt, int &exceptioncode, bool tempEvent)
+ {
+     evt->setTarget(this);
+@@ -624,6 +557,7 @@
+ void NodeImpl::dispatchSubtreeModifiedEvent()
+ {
+     childrenChanged();
++    getDocument()->incDOMTreeVersion();
+     if (!getDocument()->hasListenerType(DocumentImpl::DOMSUBTREEMODIFIED_LISTENER))
+         return;
+     int exceptioncode = 0;
+@@ -648,21 +582,26 @@
+ 
+ void NodeImpl::handleLocalEvents(EventImpl *evt, bool useCapture)
+ {
+-    if (!m_regdListeners)
++    if (!m_regdListeners.listeners)
+         return;
+ 
+     Event ev = evt;
+     // removeEventListener (e.g. called from a JS event listener) might
+     // invalidate the item after the current iterator (which "it" is pointing to).
+     // So we make a copy of the list.
+-    QPtrList<RegisteredEventListener> listeners = *m_regdListeners;
+-    for (QPtrListIterator<RegisteredEventListener> it(listeners); it.current();) {
+-        RegisteredEventListener* current = it();
+-        if (current->id == evt->id() && current->useCapture == useCapture)
+-            current->listener->handleEvent(ev);
++    QValueList<RegisteredEventListener> listeners = *m_regdListeners.listeners;
++    QValueList<RegisteredEventListener>::iterator it;
++    for (it = listeners.begin(); it != listeners.end(); ++it) {
++        //Check whether this got removed...KDE4: use Java-style iterators
++        if (!m_regdListeners.stillContainsListener(*it))
++            continue;
+ 
++        RegisteredEventListener& current = (*it);
++        if (current.id == evt->id() && current.useCapture == useCapture)
++            current.listener->handleEvent(ev);
++
+         // ECMA legacy hack
+-        if (current->useCapture == useCapture && evt->id() == EventImpl::CLICK_EVENT) {
++        if (current.useCapture == useCapture && evt->id() == EventImpl::CLICK_EVENT) {
+             MouseEventImpl* me = static_cast<MouseEventImpl*>(evt);
+             if (me->button() == 0) {
+                 // To find whether to call onclick or ondblclick, we can't
+@@ -670,9 +609,9 @@
+                 // * use me->qEvent(), it's not available when using initMouseEvent/dispatchEvent
+                 // So we currently store a bool in MouseEventImpl. If anyone needs to trigger
+                 // dblclicks from the DOM API, we'll need a timer here (well in the doc).
+-                if ( ( !me->isDoubleClick() && current->id == EventImpl::KHTML_ECMA_CLICK_EVENT) ||
+-                  ( me->isDoubleClick() && current->id == EventImpl::KHTML_ECMA_DBLCLICK_EVENT) )
+-                    current->listener->handleEvent(ev);
++                if ( ( !me->isDoubleClick() && current.id == EventImpl::KHTML_ECMA_CLICK_EVENT) ||
++                  ( me->isDoubleClick() && current.id == EventImpl::KHTML_ECMA_DBLCLICK_EVENT) )
++                    current.listener->handleEvent(ev);
+             }
+         }
+     }
+@@ -1936,3 +1875,116 @@
+                         namespaceURI, 0, localName, readonly,
+                         false /*don't lookupHTML*/);
+ }
++
++// -----------------------------------------------------------------------------
++
++void RegisteredListenerList::addEventListener(int id, EventListener *listener, const bool useCapture)
++{
++    RegisteredEventListener rl(static_cast<EventImpl::EventId>(id),listener,useCapture);
++    if (!listeners)
++        listeners = new QValueList<RegisteredEventListener>;
++
++    // if this id/listener/useCapture combination is already registered, do nothing.
++    // the DOM2 spec says that "duplicate instances are discarded", and this keeps
++    // the listener order intact.
++    QValueList<RegisteredEventListener>::iterator it;
++    for (it = listeners->begin(); it != listeners->end(); ++it)
++        if (*it == rl)
++            return;
++
++    listeners->append(rl);
++}
++
++void RegisteredListenerList::removeEventListener(int id, EventListener *listener, bool useCapture)
++{
++    if (!listeners) // nothing to remove
++        return;
++
++    RegisteredEventListener rl(static_cast<EventImpl::EventId>(id),listener,useCapture);
++
++    QValueList<RegisteredEventListener>::iterator it;
++    for (it = listeners->begin(); it != listeners->end(); ++it)
++        if (*it == rl) {
++            listeners->remove(it);
++            return;
++        }
++}
++
++bool RegisteredListenerList::isHTMLEventListener(EventListener* listener)
++{
++    return (listener->eventListenerType() == "_khtml_HTMLEventListener");
++}
++
++void RegisteredListenerList::setHTMLEventListener(int id, EventListener *listener)
++{
++    if (!listeners)
++        listeners = new QValueList<RegisteredEventListener>;
++
++    QValueList<RegisteredEventListener>::iterator it;
++    if (!listener) {
++        for (it = listeners->begin(); it != listeners->end(); ++it) {
++            if ((*it).id == id && isHTMLEventListener((*it).listener)) {
++                listeners->remove(it);
++                break;
++            }
++        }
++        return;
++    }
++
++    // if this event already has a registered handler, insert the new one in
++    // place of the old one, to preserve the order.
++    RegisteredEventListener rl(static_cast<EventImpl::EventId>(id),listener,false);
++
++    int i;
++    for (i = 0, it = listeners->begin(); it != listeners->end(); ++it, ++i)
++        if ((*it).id == id && isHTMLEventListener((*it).listener)) {
++            listeners->insert(it, rl);
++            listeners->remove(it);
++            return;
++        }
++
++    listeners->append(rl);
++}
++
++EventListener *RegisteredListenerList::getHTMLEventListener(int id)
++{
++    if (!listeners)
++        return 0;
++
++    QValueList<RegisteredEventListener>::iterator it;
++    for (it = listeners->begin(); it != listeners->end(); ++it)
++        if ((*it).id == id && isHTMLEventListener((*it).listener)) {
++            return (*it).listener;
++        }
++    return 0;
++}
++
++bool RegisteredListenerList::hasEventListener(int id)
++{
++    if (!listeners)
++        return false;
++
++    QValueList<RegisteredEventListener>::iterator it;
++    for (it = listeners->begin(); it != listeners->end(); ++it)
++        if ((*it).id == id)
++            return true;
++
++    return false;
++}
++
++void RegisteredListenerList::clear()
++{
++    delete listeners;
++    listeners = 0;
++}
++
++bool RegisteredListenerList::stillContainsListener(const RegisteredEventListener& listener)
++{
++    if (!listeners)
++        return false;
++    return listeners->find(listener) != listeners->end();
++}
++
++RegisteredListenerList::~RegisteredListenerList() {
++    delete listeners; listeners = 0;
++}
+--- khtml/xml/dom2_eventsimpl.cpp	(revision 484194)
++++ khtml/xml/dom2_eventsimpl.cpp	(revision 488534)
+@@ -850,3 +850,4 @@
+ {
+     return true;
+ }
++
+--- khtml/xml/dom_elementimpl.cpp	(revision 484194)
++++ khtml/xml/dom_elementimpl.cpp	(revision 488534)
+@@ -166,6 +166,9 @@
+     if (m_value == v.implementation())
+ 	return;
+ 
++    if (m_element && m_attrId == ATTR_ID)
++        m_element->updateId(m_value, v.implementation());
++
+     m_value->deref();
+     m_value = v.implementation();
+     m_value->ref();
+@@ -250,9 +253,14 @@
+     if (m_attrId) {
+ 	if (m_data.value == value)
+ 	    return;
++
++	if (element && m_attrId == ATTR_ID)
++	   element->updateId(m_data.value, value);
++
+ 	m_data.value->deref();
+ 	m_data.value = value;
+ 	m_data.value->ref();
++
+ 	if (element)
+ 	    element->parseAttribute(this);
+     }
+@@ -381,6 +389,15 @@
+ 
+ void ElementImpl::setAttributeMap( NamedAttrMapImpl* list )
+ {
++    // If setting the whole map changes the id attribute, we need to
++    // call updateId.
++    DOMStringImpl *oldId = namedAttrMap ? namedAttrMap->getValue(ATTR_ID) : 0;
++    DOMStringImpl *newId = list ? list->getValue(ATTR_ID) : 0;
++
++    if (oldId || newId) {
++       updateId(oldId, newId);
++    }
++
+     if (namedAttrMap) {
+ 	namedAttrMap->detachFromElement();
+         namedAttrMap->deref();
+@@ -659,6 +676,41 @@
+    //attr->value(),getDocument()->attrName(attr->id()),MutationEvent::ADDITION),exceptioncode);
+ }
+ 
++void ElementImpl::updateId(DOMStringImpl* oldId, DOMStringImpl* newId)
++{
++    if (!inDocument())
++        return;
++
++    DocumentImpl* doc = getDocument();
++    if (oldId && oldId->l)
++        doc->getElementByIdCache().remove(DOMString(oldId).string(), this);
++
++    if (newId && newId->l)
++        doc->getElementByIdCache().add(DOMString(newId).string(), this);
++}
++
++void ElementImpl::insertedIntoDocument()
++{
++    // need to do superclass processing first so inDocument() is true
++    // by the time we reach updateId
++    NodeBaseImpl::insertedIntoDocument();
++
++    if (hasID()) {
++        DOMString id = getAttribute(ATTR_ID);
++        updateId(0, id.implementation());
++    }
++}
++
++void ElementImpl::removedFromDocument()
++{
++    if (hasID()) {
++        DOMString id = getAttribute(ATTR_ID);
++        updateId(id.implementation(), 0);
++    }
++
++    NodeBaseImpl::removedFromDocument();
++}
++
+ DOMString ElementImpl::openTagStartToString(bool expandurls) const
+ {
+     DOMString result = DOMString("<") + tagName();
+@@ -887,6 +939,8 @@
+                 strcasecmp(m_attrs[i].name(), DOMString(qName)))
+                 continue;
+ 	    id = m_attrs[i].id();
++	    if (id == ATTR_ID)
++	       m_element->updateId(m_attrs[i].val(), 0);
+ 	    Node removed(m_attrs[i].createAttr(m_element,m_element->docPtr()));
+ 	    m_attrs[i].free();
+ 	    memmove(m_attrs+i,m_attrs+i+1,(m_attrCount-i-1)*sizeof(AttributeImpl));
+@@ -951,6 +1005,9 @@
+                 strcasecmp(m_attrs[i].name(), DOMString(qName)))
+                 continue;
+ 	    // Attribute exists; replace it
++	    if (id == ATTR_ID)
++	       m_element->updateId(m_attrs[i].val(), attr->val());
++	    
+ 	    Node replaced = m_attrs[i].createAttr(m_element,m_element->docPtr());
+ 	    m_attrs[i].free();
+ 	    m_attrs[i].m_attrId = 0; /* "has implementation" flag */
+@@ -970,6 +1027,8 @@
+     m_attrs[m_attrCount-1].m_data.attr = attr;
+     m_attrs[m_attrCount-1].m_data.attr->ref();
+     attr->setElement(m_element);
++    if (id == ATTR_ID)
++        m_element->updateId(0, attr->val());
+     m_element->parseAttribute(&m_attrs[m_attrCount-1]);
+     // ### dispatch mutation events
+ 
+@@ -1074,8 +1133,11 @@
+         m_attrs[m_attrCount-1].m_data.attr->setHTMLCompat( !hasNS &&
+                                                  m_element->getDocument()->htmlMode() != DocumentImpl::XHtml );
+     }
+-    if (m_element)
++    if (m_element) {
++	if (id == ATTR_ID)
++	    m_element->updateId(0, value);
+ 	m_element->parseAttribute(&m_attrs[m_attrCount-1]);
++    }
+     // ### dispatch mutation events
+ }
+ 
+@@ -1084,6 +1146,8 @@
+     for (unsigned long i = 0; i < m_attrCount; i++) {
+ 	if (m_attrs[i].attr() == attr) {
+ 	    NodeImpl::Id id = m_attrs[i].id();
++	    if (id == ATTR_ID)
++	        m_element->updateId(attr->val(), 0);
+ 	    Node removed(m_attrs[i].createAttr(m_element,m_element->docPtr()));
+ 	    m_attrs[i].free();
+ 	    memmove(m_attrs+i,m_attrs+i+1,(m_attrCount-i-1)*sizeof(AttributeImpl));
+@@ -1112,8 +1176,11 @@
+ {
+     assert(m_element);
+     unsigned long i;
+-    for (i = 0; i < m_attrCount; i++)
++    for (i = 0; i < m_attrCount; i++) {
++        if (m_attrs[i].id() == ATTR_ID)
++            m_element->updateId(m_attrs[i].val(), 0);
+ 	m_attrs[i].free();
++    }
+     m_attrCount = other->m_attrCount;
+     m_attrs = (AttributeImpl*)realloc(m_attrs,m_attrCount*sizeof(AttributeImpl));
+     for (i = 0; i < m_attrCount; i++) {
+@@ -1127,6 +1194,8 @@
+ 	    m_attrs[i].m_data.attr->ref();
+ 	    m_attrs[i].m_data.attr->setElement(m_element);
+ 	}
++	if (m_attrs[i].id() == ATTR_ID)
++	   m_element->updateId(0, m_attrs[i].val());
+ 	m_element->parseAttribute(&m_attrs[i]);
+     }
+ }
+--- khtml/xml/dom_nodeimpl.h	(revision 484194)
++++ khtml/xml/dom_nodeimpl.h	(revision 488534)
+@@ -36,6 +36,7 @@
+ 
+ class QPainter;
+ template <class type> class QPtrList;
++template <class type> class QValueList;
+ class KHTMLView;
+ class QRect;
+ class QMouseEvent;
+@@ -69,6 +70,30 @@
+     DocumentImpl *doc;
+ };
+ 
++struct RegisteredListenerList {
++    RegisteredListenerList() : listeners(0)
++    {}
++
++    ~RegisteredListenerList();
++
++    void addEventListener(int id, EventListener *listener, const bool useCapture);
++    void removeEventListener(int id, EventListener *listener, bool useCapture);
++
++    void setHTMLEventListener(int id, EventListener *listener);
++    EventListener *getHTMLEventListener(int id);
++
++    bool hasEventListener(int id);
++    void clear();
++
++    //### KDE4: should disappear
++    bool stillContainsListener(const RegisteredEventListener& listener);
++
++    QValueList<RegisteredEventListener>* listeners;//The actual listener list - may be 0
++private:
++    bool isHTMLEventListener(EventListener* listener);
++};
++
++
+ // this class implements nodes, which can have a parent but no children:
+ #define NodeImpl_IdNSMask    0xffff0000
+ #define NodeImpl_IdLocalMask 0x0000ffff
+@@ -415,7 +440,7 @@
+     NodeImpl *m_next;
+ protected:
+     khtml::RenderObject *m_render;
+-    QPtrList<RegisteredEventListener> *m_regdListeners;
++    RegisteredListenerList m_regdListeners;
+ 
+     unsigned short m_tabIndex : 15;
+     bool m_hasTabIndex  : 1;
+--- khtml/xml/dom2_eventsimpl.h	(revision 484194)
++++ khtml/xml/dom2_eventsimpl.h	(revision 488534)
+@@ -401,22 +401,38 @@
+ 
+ class RegisteredEventListener {
+ public:
++    RegisteredEventListener() : id(EventImpl::EventId(0)), useCapture(false), listener(0) {}
++
+     RegisteredEventListener(EventImpl::EventId _id, EventListener *_listener, bool _useCapture)
+         : id(_id), useCapture(_useCapture), listener(_listener) { listener->ref(); }
+ 
+-    ~RegisteredEventListener() { listener->deref(); listener = 0; }
++    ~RegisteredEventListener() { if (listener) listener->deref(); listener = 0; }
+ 
+-    bool operator==(const RegisteredEventListener &other)
++    bool operator==(const RegisteredEventListener &other) const
+     { return id == other.id && listener == other.listener && useCapture == other.useCapture; }
+ 
+ 
+     EventImpl::EventId id : 6;
+     bool useCapture;
+     EventListener *listener;
+-private:
+-    RegisteredEventListener( const RegisteredEventListener & );
+-    RegisteredEventListener & operator=( const RegisteredEventListener & );
++
++    RegisteredEventListener( const RegisteredEventListener &other ) : 
++                id(other.id), useCapture(other.useCapture), listener(other.listener) 
++    { if (listener) listener->ref(); }
++
++    RegisteredEventListener & operator=( const RegisteredEventListener &other ) {
++        id         = other.id;
++        useCapture = other.useCapture;
++        if (other.listener)
++            other.listener->ref();
++        if (listener)
++            listener->deref();
++        listener = other.listener;
++        return *this;
++    }
+ };
+ 
++
++
+ } //namespace
+ #endif
+--- khtml/xml/dom_elementimpl.h	(revision 484194)
++++ khtml/xml/dom_elementimpl.h	(revision 488534)
+@@ -158,6 +158,8 @@
+     virtual DOMString nodeName() const;
+     virtual NodeImpl::Id id() const = 0;
+     virtual bool isElementNode() const { return true; }
++    virtual void insertedIntoDocument();
++    virtual void removedFromDocument();
+ 
+     // convenience methods which ignore exceptions
+     void setAttribute (NodeImpl::Id id, const DOMString &value);
+@@ -227,6 +229,7 @@
+     void setRestyleSelfLate() { m_restyleSelfLate = true; };
+     void setRestyleChildrenLate() { m_restyleChildrenLate = true; };
+ 
++    void updateId(DOMStringImpl* oldId, DOMStringImpl* newId);
+ protected:
+     void createAttributeMap() const;
+     void createDecl();
+--- khtml/xml/dom_docimpl.cpp	(revision 484194)
++++ khtml/xml/dom_docimpl.cpp	(revision 488534)
+@@ -173,14 +173,17 @@
+     if (doc->doctype() && dtype)
+         doc->doctype()->copyFrom(*dtype);
+ 
+-    ElementImpl *element = doc->createElementNS(namespaceURI,qualifiedName);
+-    doc->appendChild(element,exceptioncode);
+-    if (exceptioncode) {
+-        delete element;
+-        delete doc;
+-        return 0;
++    // the document must be created empty if all parameters are null 
++    // (or empty for qName/nsURI as a tolerance) - see DOM 3 Core.
++    if (dtype || !qualifiedName.isEmpty() || !namespaceURI.isEmpty()) {
++        ElementImpl *element = doc->createElementNS(namespaceURI,qualifiedName);
++        doc->appendChild(element,exceptioncode);
++        if (exceptioncode) {
++            delete element;
++            delete doc;
++            return 0;
++        }
+     }
+-
+     return doc;
+ }
+ 
+@@ -218,10 +221,10 @@
+ // ------------------------------------------------------------------------
+ 
+ 
+-ElementMappingCache::ElementMappingCache():m_dict(71)
++ElementMappingCache::ElementMappingCache():m_dict(257)
+ {}
+ 
+-void ElementMappingCache::add(const QString& id, NodeImpl* nd)
++void ElementMappingCache::add(const QString& id, ElementImpl* nd)
+ {
+     if (id.isEmpty()) return;
+ 
+@@ -240,7 +243,7 @@
+     }
+ }
+ 
+-void ElementMappingCache::set(const QString& id, NodeImpl* nd)
++void ElementMappingCache::set(const QString& id, ElementImpl* nd)
+ {
+     if (id.isEmpty()) return;
+ 
+@@ -248,7 +251,7 @@
+     info->nd = nd;
+ }
+ 
+-void ElementMappingCache::remove(const QString& id, NodeImpl* nd)
++void ElementMappingCache::remove(const QString& id, ElementImpl* nd)
+ {
+     if (id.isEmpty()) return;
+ 
+@@ -343,7 +346,6 @@
+     m_inDocument = true;
+     m_styleSelectorDirty = false;
+     m_styleSelector = 0;
+-    m_windowEventListeners.setAutoDelete(true);
+     m_counterDict.setAutoDelete(true);
+ 
+     m_inStyleRecalc = false;
+@@ -605,9 +607,20 @@
+     return attr;
+ }
+ 
+-
+ ElementImpl *DocumentImpl::getElementById( const DOMString &elementId ) const
+ {
++    QString stringKey = elementId.string();
++
++    ElementMappingCache::ItemInfo* info = m_getElementByIdCache.get(stringKey);
++
++    if (!info) 
++        return 0;
++
++    //See if cache has an unambiguous answer.
++    if (info->nd)
++        return info->nd;
++
++    //Now we actually have to walk.
+     QPtrStack<NodeImpl> nodeStack;
+     NodeImpl *current = _first;
+ 
+@@ -624,8 +637,10 @@
+             if(current->isElementNode())
+             {
+                 ElementImpl *e = static_cast<ElementImpl *>(current);
+-                if(e->getAttribute(ATTR_ID) == elementId)
++                if(e->getAttribute(ATTR_ID) == elementId) {
++                    info->nd = e;
+                     return e;
++                }
+             }
+ 
+             NodeImpl *child = current->firstChild();
+@@ -641,7 +656,10 @@
+         }
+     }
+ 
++    assert(0); //If there is no item with such an ID, we should never get here
++
+     //kdDebug() << "WARNING: *DocumentImpl::getElementById not found " << elementId.string() << endl;
++
+     return 0;
+ }
+ 
+@@ -846,6 +864,9 @@
+     case ID_OBJECT:
+         n = new HTMLObjectElementImpl(docPtr());
+         break;
++    case ID_EMBED:
++        n = new HTMLEmbedElementImpl(docPtr());
++        break;
+     case ID_PARAM:
+         n = new HTMLParamElementImpl(docPtr());
+         break;
+@@ -1237,11 +1258,8 @@
+     if ( was_attached )
+         attach();
+ 
+-    if (clearEventListeners) {
+-        QPtrListIterator<RegisteredEventListener> it(m_windowEventListeners);
+-        for (; it.current();)
+-            m_windowEventListeners.removeRef(it.current());
+-    }
++    if (clearEventListeners)
++        m_windowEventListeners.clear();
+ 
+     m_tokenizer = createTokenizer();
+     m_decoderMibEnum = 0;
+@@ -2380,100 +2398,52 @@
+ void DocumentImpl::defaultEventHandler(EventImpl *evt)
+ {
+     // if any html event listeners are registered on the window, then dispatch them here
+-    QPtrListIterator<RegisteredEventListener> it(m_windowEventListeners);
++    if (!m_windowEventListeners.listeners)
++        return;
++
++    QValueList<RegisteredEventListener>::iterator it;
++
++    //Grab a copy in case of clear
++    QValueList<RegisteredEventListener> listeners = *m_windowEventListeners.listeners;
+     Event ev(evt);
+-    for (; it.current(); ++it) {
+-        if (it.current()->id == evt->id()) {
++    for (it = listeners.begin(); it != listeners.end(); ++it) {
++        //Check to make sure it didn't get removed. KDE4: use Java-style iterators
++        if (!m_windowEventListeners.stillContainsListener(*it))
++            continue;
++
++        if ((*it).id == evt->id()) {
+             // currentTarget must be 0 in khtml for kjs_events to set "this" correctly.
+             // (this is how we identify events dispatched to the window, like window.onmousedown)
+             // ## currentTarget is unimplemented in IE, and is "window" in Mozilla (how? not a DOM node)
+             evt->setCurrentTarget(0);
+-            it.current()->listener->handleEvent(ev);
++            (*it).listener->handleEvent(ev);
+ 	}
+     }
+ }
+ 
+ void DocumentImpl::setHTMLWindowEventListener(int id, EventListener *listener)
+ {
+-    QPtrListIterator<RegisteredEventListener> it(m_windowEventListeners);
+-
+-    if (!listener) {
+-        for (; it.current(); ++it)
+-            if (it.current()->id == id &&
+-                it.current()->listener->eventListenerType() == "_khtml_HTMLEventListener") {
+-                m_windowEventListeners.removeRef(it.current());
+-                break;
+-            }
+-        return;
+-    }
+-
+-    // if this event already has a registered handler, insert the new one in
+-    // place of the old one, to preserve the order.
+-    RegisteredEventListener *rl = new RegisteredEventListener(static_cast<EventImpl::EventId>(id),listener,false);
+-    for (int i = 0; it.current(); ++it, ++i)
+-        if (it.current()->id == id &&
+-            it.current()->listener->eventListenerType() == "_khtml_HTMLEventListener") {
+-            // Qt4: don't forget to delete the old one first
+-            m_windowEventListeners.replace(i, rl);
+-            return;
+-        }
+-
+-    m_windowEventListeners.append(rl);
++    m_windowEventListeners.setHTMLEventListener(id, listener);
+ }
+ 
+ EventListener *DocumentImpl::getHTMLWindowEventListener(int id)
+ {
+-    QPtrListIterator<RegisteredEventListener> it(m_windowEventListeners);
+-    for (; it.current(); ++it) {
+-	if (it.current()->id == id &&
+-            it.current()->listener->eventListenerType() == "_khtml_HTMLEventListener") {
+-	    return it.current()->listener;
+-	}
+-    }
+-
+-    return 0;
++    return m_windowEventListeners.getHTMLEventListener(id);
+ }
+ 
+ void DocumentImpl::addWindowEventListener(int id, EventListener *listener, const bool useCapture)
+ {
+-    RegisteredEventListener *rl = new RegisteredEventListener(static_cast<EventImpl::EventId>(id), listener, useCapture);
+-
+-    // if this id/listener/useCapture combination is already registered, do nothing.
+-    // the DOM2 spec says that "duplicate instances are discarded", and this keeps
+-    // the listener order intact.
+-    QPtrListIterator<RegisteredEventListener> it(m_windowEventListeners);
+-    for (; it.current(); ++it) {
+-        if (*(it.current()) == *rl) {
+-            delete rl;
+-            return;
+-        }
+-    }
+-
+-    m_windowEventListeners.append(rl);
++    m_windowEventListeners.addEventListener(id, listener, useCapture);
+ }
+ 
+ void DocumentImpl::removeWindowEventListener(int id, EventListener *listener, bool useCapture)
+ {
+-    RegisteredEventListener rl(static_cast<EventImpl::EventId>(id),listener,useCapture);
+-
+-    QPtrListIterator<RegisteredEventListener> it(m_windowEventListeners);
+-    for (; it.current(); ++it)
+-        if (*(it.current()) == rl) {
+-            m_windowEventListeners.removeRef(it.current());
+-            return;
+-        }
++    m_windowEventListeners.removeEventListener(id, listener, useCapture);
+ }
+ 
+ bool DocumentImpl::hasWindowEventListener(int id)
+ {
+-    QPtrListIterator<RegisteredEventListener> it(m_windowEventListeners);
+-    for (; it.current(); ++it) {
+-	if (it.current()->id == id) {
+-	    return true;
+-	}
+-    }
+-
+-    return false;
++    return m_windowEventListeners.hasEventListener(id);
+ }
+ 
+ EventListener *DocumentImpl::createHTMLEventListener(const QString& code, const QString& name, NodeImpl* node)
+--- khtml/xml/dom_docimpl.h	(revision 484194)
++++ khtml/xml/dom_docimpl.h	(revision 488534)
+@@ -140,7 +140,7 @@
+     struct ItemInfo
+     {
+         int       ref;
+-        NodeImpl* nd;
++        ElementImpl* nd;
+     };
+ 
+     ElementMappingCache();
+@@ -148,17 +148,17 @@
+     /**
+      Add a pointer as just one of candidates, not neccesserily the proper one
+     */
+-    void add(const QString& id, NodeImpl* nd);
++    void add(const QString& id, ElementImpl* nd);
+ 
+     /**
+      Set the pointer as the definite mapping; it must have already been added
+     */
+-    void set(const QString& id, NodeImpl* nd);
++    void set(const QString& id, ElementImpl* nd);
+ 
+     /**
+      Remove the item; it must have already been added.
+     */
+-    void remove(const QString& id, NodeImpl* nd);
++    void remove(const QString& id, ElementImpl* nd);
+ 
+     /**
+      Returns true if the item exists
+@@ -517,8 +517,7 @@
+     void removeCounters(const khtml::RenderObject* o) { m_counterDict.remove((void*)o); }
+ 
+ 
+-    ElementMappingCache& underDocNamedCache()
+-    {
++    ElementMappingCache& underDocNamedCache() {
+         return m_underDocNamedCache;
+     }
+ 
+@@ -526,6 +525,10 @@
+                                                    NodeImpl* base, int type);
+     void                 releaseCachedNodeListInfo(NodeListImpl::Cache* cache);
+ 
++    ElementMappingCache& getElementByIdCache() const {
++        return m_getElementByIdCache;
++    }
++
+ signals:
+     void finishedParsing();
+ 
+@@ -593,7 +596,7 @@
+     StyleSheetListImpl* m_styleSheets;
+     StyleSheetListImpl *m_addedStyleSheets; // programmatically added style sheets
+     LocalStyleRefs m_localStyleRefs; // references to inlined style elements
+-    QPtrList<RegisteredEventListener> m_windowEventListeners;
++    RegisteredListenerList m_windowEventListeners;
+     QPtrList<NodeImpl> m_maintainsState;
+ 
+     // ### evaluate for placement in RenderStyle
+@@ -626,6 +629,9 @@
+     QPtrList<HTMLImageElementImpl> m_imageLoadEventDispatchingList;
+     int m_imageLoadEventTimer;
+ 
++    //Cache for getElementById
++    mutable ElementMappingCache m_getElementByIdCache;
++
+     khtml::RenderArena* m_renderArena;
+ private:
+     mutable DOMString m_domain;
+--- khtml/khtmlpart_p.h	(revision 484194)
++++ khtml/khtmlpart_p.h	(revision 488534)
+@@ -132,15 +132,20 @@
+   Q_OBJECT
+   public:
+     KHTMLWalletQueue(QObject *parent) : QObject(parent) {
++#ifndef KHTML_NO_WALLET
+       wallet = 0L;
++#endif // KHTML_NO_WALLET
+     }
+ 
+     virtual ~KHTMLWalletQueue() {
++#ifndef KHTML_NO_WALLET
+       delete wallet;
+       wallet = 0L;
++#endif // KHTML_NO_WALLET
+     }
+-
++#ifndef KHTML_NO_WALLET
+     KWallet::Wallet *wallet;
++#endif // KHTML_NO_WALLET
+     typedef QPair<DOM::HTMLFormElementImpl*, QGuardedPtr<DOM::DocumentImpl> > Caller;
+     typedef QValueList<Caller> CallerList;
+     CallerList callers;
+@@ -151,6 +156,7 @@
+ 
+   public slots:
+     void walletOpened(bool success) {
++#ifndef KHTML_NO_WALLET
+       if (!success) {
+         delete wallet;
+         wallet = 0L;
+@@ -173,6 +179,7 @@
+       callers.clear();
+       savers.clear();
+       wallet = 0L; // gave it away
++#endif // KHTML_NO_WALLET
+     }
+ };
+ 
+@@ -288,7 +295,9 @@
+     delete m_statusBarExtension;
+     delete m_extension;
+     delete m_settings;
++#ifndef KHTML_NO_WALLET
+     delete m_wallet;
++#endif
+ #ifndef Q_WS_QWS
+     //delete m_javaContext;
+ #endif
+--- kresources/kresources_manager.desktop	(revision 484194)
++++ kresources/kresources_manager.desktop	(revision 488534)
+@@ -25,7 +25,6 @@
+ Comment[is]=KResource stjóri
+ Comment[it]=Gestore KResource
+ Comment[ja]=K リソース・マネージャ
+-Comment[ka]=KResource-ის მმართველი
+ Comment[km]=កម្មវិធី​គ្រប់គ្រង KResource
+ Comment[lb]=KResource-Manager
+ Comment[lt]=KResouse tvarkyklÄ—
+@@ -51,7 +50,6 @@
+ Comment[tt]=KResource İdäräçese
+ Comment[uk]=Менеджер KResource
+ Comment[uz]=KResource бошқарувчиси
+-Comment[xx]=xxKResource Managerxx
+ Comment[zh_CN]=KResource 管理器
+ 
+ [PropertyDef::X-KDE-ResourceFamily]
+--- kresources/kresources.desktop	(revision 484194)
++++ kresources/kresources.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Name[is]=KDE auðlindir
+ Name[it]=Risorse di KDE
+ Name[ja]=KDE リソース
+-Name[ka]=KDE რესურსები
+ Name[km]=ធនធាន KDE
+ Name[lb]=KDE-Ressourcen
+ Name[lt]=KDE resursai
+@@ -60,7 +59,6 @@
+ Name[tt]=KDE Resursları
+ Name[uk]=Ресурси KDE
+ Name[uz]=KDE имкониятлари
+-Name[xx]=xxKDE Resourcesxx
+ Name[zh_CN]=KDE 资源
+ 
+ Comment=Configure KDE Resources
+@@ -90,7 +88,6 @@
+ Comment[is]=Stilla KDE auðlindir
+ Comment[it]=Configura le risorse di KDE
+ Comment[ja]=KDE リソースの設定
+-Comment[ka]=KDE რესურსების გამართვა
+ Comment[km]=កំណត់​រចនាសម្ព័ន្ធ​ធនធាន KDE
+ Comment[lb]=KDE-Ressourcen astellen
+ Comment[lt]=Konfigūruoti KDE resursus
+@@ -120,7 +117,6 @@
+ Comment[tt]=KDE Resursların Caylaw
+ 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
+@@ -145,7 +141,6 @@
+ Keywords[hu]=erőforrások,csatoló-erőforrás,névjegy-erőforrás,naptár-erőforrás,feljegyzés-erőforrás,IMAP
+ Keywords[it]=risorse,risorsa konnector,risorsa contatti, risorsa calendario,risorsa note,imap
+ Keywords[ja]=リソース,konnector resource, コネクターリソース,コンタクトリソース,カレンダーリソース, ノートリソース,imap
+-Keywords[ka]=რესურსები,კავშირის რესურსები,საკონტაქტო რესურსები,კალენდრის რესურსები,შენიშვნათა რესურსები,imap
+ Keywords[km]=ធនធាន, ធនធាន konnector, ធនធាន​ទំនាក់ទំនង, ធនធាន​ប្រតិទិន, ធនធាន​ចំណាំ,imap
+ Keywords[lb]=Ressourcen,Konnector-Ressource,Kontakt-Ressource,Kalenner-Ressource,Notizen-Ressource,imap
+ Keywords[lt]=resursai,konnector resursas,kontaktų resursas,kalendoriaus resursas,priminimų resursas,imap
+@@ -168,7 +163,6 @@
+ 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;
+--- kresources/kresources_plugin.desktop	(revision 484194)
++++ kresources/kresources_plugin.desktop	(revision 488534)
+@@ -30,7 +30,6 @@
+ Comment[is]=KResource uppbygginar íforrit
+ Comment[it]=Plugin per l'infrastruttura KResource
+ Comment[ja]=K リソース・フレームワーク・プラグイン
+-Comment[ka]=KResource-ის ბლოკის მოდული
+ Comment[km]=កម្មវិធី​ជំនួយ​ខាង​ក្នុងនៃ​គ្រោង KResource
+ Comment[ko]=K자원 í”„ë ˆìž„ì›Œí¬ 플러그인
+ Comment[lb]=KResource-Framework-Plugin
+@@ -60,7 +59,6 @@
+ Comment[tt]=KResource Eşçara Östämäse
+ Comment[uk]=Втулок структури KResource
+ Comment[uz]=KResource тўплам плагини
+-Comment[xx]=xxKResource Framework Pluginxx
+ Comment[zh_CN]=KResource 框架插件
+ Comment[zh_TW]=KRsource Framework 外掛程式
+ 
+--- dcop/client/marshall.cpp	(revision 484194)
++++ dcop/client/marshall.cpp	(revision 488534)
+@@ -41,10 +41,10 @@
+ {
+     const char *s = str.latin1();
+     char *end;
+-    while(*s && !isdigit(*s)) s++;
++    while(*s && !isdigit(*s) && *s != '-') s++;
+     int x = strtol(s, &end, 10);
+     s = (const char *)end;
+-    while(*s && !isdigit(*s)) s++;
++    while(*s && !isdigit(*s) && *s != '-') s++;
+     int y = strtol(s, &end, 10);
+     return QPoint( x, y );
+ }
+@@ -53,10 +53,10 @@
+ {
+     const char *s = str.latin1();
+     char *end;
+-    while(*s && !isdigit(*s)) s++;
++    while(*s && !isdigit(*s) && *s != '-') s++;
+     int w = strtol(s, &end, 10);
+     s = (const char *)end;
+-    while(*s && !isdigit(*s)) s++;
++    while(*s && !isdigit(*s) && *s != '-') s++;
+     int h = strtol(s, &end, 10);
+     return QSize( w, h );
+ }
+@@ -65,17 +65,17 @@
+ {
+     const char *s = str.latin1();
+     char *end;
+-    while(*s && !isdigit(*s)) s++;
++    while(*s && !isdigit(*s) && *s != '-') s++;
+     int p1 = strtol(s, &end, 10);
+     s = (const char *)end;
+     bool legacy = (*s == 'x');
+-    while(*s && !isdigit(*s)) s++;
++    while(*s && !isdigit(*s) && *s != '-') s++;
+     int p2 = strtol(s, &end, 10);
+     s = (const char *)end;
+-    while(*s && !isdigit(*s)) s++;
++    while(*s && !isdigit(*s) && *s != '-') s++;
+     int p3 = strtol(s, &end, 10);
+     s = (const char *)end;
+-    while(*s && !isdigit(*s)) s++;
++    while(*s && !isdigit(*s) && *s != '-') s++;
+     int p4 = strtol(s, &end, 10);
+     if (legacy)
+     {
+--- pics/hicolor/index.theme	(revision 484194)
++++ pics/hicolor/index.theme	(revision 488534)
+@@ -46,7 +46,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
+@@ -71,7 +70,6 @@
+ Comment[is]=Sjálfgefin táknmyndaþema
+ Comment[it]=Tema icone standard
+ Comment[ja]=フォールバックアイコンテーマ
+-Comment[ka]=პიქტოგრამების სამარაგო თემა
+ Comment[km]=ស្បែក​របស់​រូបតំណាង​ Fallback
+ Comment[lb]=Ersatzsymbolthema
+ Comment[lt]=Fallback ženklelių tema
+@@ -98,7 +96,6 @@
+ Comment[tr]=Yedek simge teması
+ Comment[tt]=Fallback ikon tışlawı
+ Comment[uk]=Основна тема піктограм
+-Comment[xx]=xxFallback icon themexx
+ Comment[zh_CN]=é»˜è®¤å›¾æ ‡ä¸»é¢˜
+ DisplayDepth=32
+ Example=exec
+--- pics/crystalsvg/index.theme	(revision 484194)
++++ pics/crystalsvg/index.theme	(revision 488534)
+@@ -6,7 +6,6 @@
+ Name[es]=SVG estilo Crystal
+ Name[hi]=क्रिस्टल एसवीजी
+ Name[ja]=クリスタル SVG
+-Name[ka]=Crystal SVG ნახატი
+ Name[lb]=Crystal-SVG
+ Name[lt]=Kristalinis SVG
+ Name[lv]=Kristāla SVG
+@@ -17,7 +16,6 @@
+ Name[sv]=Kristall SVG
+ Name[ta]=க்ரிஸ்டல் எஸ்விஜி
+ Name[uz]=Кристал SVG
+-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
+@@ -46,7 +44,6 @@
+ Comment[is]=Táknmyndaþema eftir Everaldo.com Design Studio
+ Comment[it]=Tema icone dello studio di design Everaldo.com
+ Comment[ja]=アイコンテーマ by Everaldo.com Design Studio
+-Comment[ka]=პიქტოგრამების თემა Everaldo.com Design Studio-დან
+ Comment[km]=ស្បែក​របស់​​រូបតំណាង​ដោយ Everaldo.com Design Studio
+ Comment[ko]=Everaldo.com 디자인 스튜디오가 ë§Œë“  아이콘 테마
+ Comment[lb]=Symbolthema vum Everaldo.com Design Studio
+@@ -77,7 +74,6 @@
+ Comment[tt]=Everaldo.com Design Studio tarafınnan İkon Tışlawı
+ Comment[uk]=Тема піктограм від студії дизайну Everaldo.com
+ Comment[uz]=Everaldo.com дизайн студиоси томонидан нишончалар мавзуси
+-Comment[xx]=xxIcon Theme by Everaldo.com Design Studioxx
+ Comment[zh_CN]=Everaldo è®¾è®¡å·¥ä½œå®¤åˆ¶ä½œçš„å›¾æ ‡ä¸»é¢˜
+ DisplayDepth=32
+ 
+--- kdoctools/customization/da/entities/underLGPL.docbook	(revision 0)
++++ kdoctools/customization/da/entities/underLGPL.docbook	(revision 488534)
+@@ -0,0 +1,2 @@
++<para>Dette program er udgivet under betingelserne i <ulink
++url="common/lgpl-license.html">GNU Lesser General Public License</ulink>.</para>
+--- kdoctools/customization/da/entities/lgpl-notice.docbook	(revision 484194)
++++ kdoctools/customization/da/entities/lgpl-notice.docbook	(revision 488534)
+@@ -9,8 +9,8 @@
+ detaljer.</para>
+ 
+ <para>Du skulle have modtaget en kopi af GNU LGPL licensen med dette bibliotek;
+-hvis ikke, skriv til Free Software Foundation, Inc., 59 Temple Place, 
+-Suite 330, Boston, MA
++hvis ikke, skriv til Free Software Foundation, Inc., 51 Franklin Street, 
++Fifth Floor, Boston, MA
+ 02110-1301 USA</para>
+ <!--
+ Local variables:
+--- kdoctools/customization/sr/entities/gpl-notice.docbook	(revision 484194)
++++ kdoctools/customization/sr/entities/gpl-notice.docbook	(revision 488534)
+@@ -23,8 +23,8 @@
+ 
+ <para>Требало би да примите примерак &GNU-gjz; &GPLexp-g; заједно са
+ овим програмом; ако то није случај, пишите Задужбини за слободни
+-софтвер на адресу: Free Software Foundation, Inc., 59 Temple Place -
+-Suite 330, Boston, MA  02110-1301, USA.</para>
++софтвер на адресу: Free Software Foundation, Inc., 51 Franklin Street,
++Fifth Floor, Boston, MA  02110-1301, USA.</para>
+ <!--
+ Local variables:
+ mode: sgml
+--- kdoctools/customization/sr/entities/lgpl-notice.docbook	(revision 484194)
++++ kdoctools/customization/sr/entities/lgpl-notice.docbook	(revision 488534)
+@@ -22,8 +22,8 @@
+ 
+ <para>Требало би да примите примерак &GNU-gjz; &LGPLexp-g; заједно са
+ овом библиотеком; ако то није случај, пишите Задужбини за слободни
+-софтвер на адресу: Free Software Foundation, Inc., 59 Temple Place -
+-Suite 330, Boston, MA  02110-1301, USA.</para>
++софтвер на адресу: Free Software Foundation, Inc., 51 Franklin Street,
++Fifth Floor, Boston, MA  02110-1301, USA.</para>
+ <!--
+ Local variables:
+ mode: sgml
+--- kdoctools/customization/he/entities/lgpl-notice.docbook	(revision 484194)
++++ kdoctools/customization/he/entities/lgpl-notice.docbook	(revision 488534)
+@@ -15,8 +15,8 @@
+ 
+ <para>ספריה זו מופצת בתקווה שהיא תהיה שימושית, אך ללא כל אחריות; אפילו ללא האחריות המשתמעת של סחירות או התאמה למטרה מסויימת. עיין ברישיון הציבורי הפחות כללי של GNU לפרטים × ×•×¡×¤×™×.</para>
+ 
+-<para>היית אמור לקבל עותק של הרישיון הציבורי הפחות כללי של GNU ביחד עם ספריה זו; אם לא כך הדבר, כתוב אל Free Software Foundation, Inc., 59 Temple Place,
+-Suite 330, Boston, MA 02110-1301 USA</para>
++<para>היית אמור לקבל עותק של הרישיון הציבורי הפחות כללי של GNU ביחד עם ספריה זו; אם לא כך הדבר, כתוב אל Free Software Foundation, Inc., 51 Franklin Street,
++Fifth Floor, Boston, MA 02110-1301 USA</para>
+ <!--
+ Local variables:
+ mode: sgml
+--- kdoctools/customization/pl/entities/gpl-notice.docbook	(revision 484194)
++++ kdoctools/customization/pl/entities/gpl-notice.docbook	(revision 488534)
+@@ -11,7 +11,7 @@
+ 
+ <para>Do tego programu powinna zostać dołączona kopia licencji 
+ GNU General Public License. Jeśli nie została, napisz  do: Free Software 
+-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</para>
++Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</para>
+ <!--
+ Local variables:
+ mode: sgml
+--- kdoctools/customization/pl/entities/lgpl-notice.docbook	(revision 484194)
++++ kdoctools/customization/pl/entities/lgpl-notice.docbook	(revision 488534)
+@@ -14,8 +14,8 @@
+ 
+ <para>Do tej biblioteki powinna zostać dołączona kopia licencji GNU Lesser General
+ Public License. Jeśli nie została, napisz  do: Free
+-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+-02111-1307 USA</para>
++Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++02110-1301 USA</para>
+ <!--
+ Local variables:
+ mode: sgml
+--- kdoctools/customization/es/entities/gpl-notice.docbook	(revision 484194)
++++ kdoctools/customization/es/entities/gpl-notice.docbook	(revision 488534)
+@@ -11,7 +11,7 @@
+ 
+ <para>Usted debería haber recibido una copia de la Licencia Pública General GNU
+ junto con este programa, si no es así, escriba a la Free Software
+-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, Estados Unidos.</para>
++Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, Estados Unidos.</para>
+ <!--
+ Local variables:
+ mode: sgml
+--- kdoctools/customization/es/entities/lgpl-notice.docbook	(revision 484194)
++++ kdoctools/customization/es/entities/lgpl-notice.docbook	(revision 488534)
+@@ -11,7 +11,7 @@
+ 
+ <para>Usted debería haber recibido una copia de la Licencia Pública General GNU
+ junto con esta librería, si no es así, escriba a la Free Software
+-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, Estados Unidos.</para>
++Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, Estados Unidos.</para>
+ <!--
+ Local variables:
+ mode: sgml
+--- kdoctools/customization/et/user.entities	(revision 484194)
++++ kdoctools/customization/et/user.entities	(revision 488534)
+@@ -30,8 +30,7 @@
+ <!ENTITY ie          "<abbrev>st.</abbrev>">
+ <!ENTITY etc         "<abbrev>jne.</abbrev>">
+ 
+-<!-- These should be removed later.
+- -->
++<!-- These should be removed later. -->
+ <!ENTITY nt     "<abbrev>nt.</abbrev>">         <!-- English: &eg; -->
+ <!ENTITY st     "<abbrev>st.</abbrev>">         <!-- English: &ie; -->
+ <!ENTITY jne    "<abbrev>jne.</abbrev>">        <!-- English: &etc; -->
+@@ -50,6 +49,12 @@
+ 
+ <!ENTITY dpi    '<acronym>dpi</acronym>'>
+ <!ENTITY FAQ    '<acronym>KKK</acronym>'>
+-<!ENTITY OS     "operatsioonisüsteem"><!-- <acronym>OS</acronym>-->
+-<!ENTITY kaddressbook   "KDE aadressiraamat">
++<!ENTITY OS     "operatsioonisüsteem">		<!-- <acronym>OS</acronym>-->
++<!ENTITY kcontrolcenter	    "KDE juhtimiskeskus">
+ 
++<!-- Custom entities -->
++
++<!ENTITY juhtimiskeskus	    "<application>&kde; juhtimiskeskus</application>">
++<!ENTITY infokeskus	    "<application>&kde; infokeskus</application>">
++<!ENTITY abikeskus	    "<application>&kde; abikeskus</application>">
++<!ENTITY aadressiraamat	    "<application>&kde; aadressiraamat</application>">
+--- kparts/krop.desktop	(revision 484194)
++++ kparts/krop.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=KDE eining
+ Comment[it]=Componente KDE
+ Comment[ja]=KDEコンポーネント
+-Comment[ka]=KDE კომპონენტი
+ Comment[km]=សមាសភាគ KDE
+ Comment[ko]=KDE 구성 요소
+ Comment[lb]=KDE-Komponent
+@@ -76,7 +75,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
+--- kparts/krwp.desktop	(revision 484194)
++++ kparts/krwp.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=KDE eining
+ Comment[it]=Componente KDE
+ Comment[ja]=KDEコンポーネント
+-Comment[ka]=KDE კომპონენტი
+ Comment[km]=សមាសភាគ KDE
+ Comment[ko]=KDE 구성 요소
+ Comment[lb]=KDE-Komponent
+@@ -76,7 +75,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
+--- kparts/tests/notepad.desktop	(revision 484194)
++++ kparts/tests/notepad.desktop	(revision 488534)
+@@ -31,7 +31,6 @@
+ Name[is]=Notepad (sýnishorn)
+ Name[it]=Blocco note (esempio)
+ Name[ja]=ノートパッド (例)
+-Name[ka]=ბლიკნოტი (მაგალითი)
+ Name[km]=Notepad (ឧទាហរណ៍)
+ Name[ko]=쪽지장 (보기)
+ Name[lb]=Notizblock (Beispill)
+@@ -71,7 +70,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)
+--- kparts/browserview.desktop	(revision 484194)
++++ kparts/browserview.desktop	(revision 488534)
+@@ -33,7 +33,6 @@
+ Name[is]=Vafrasýn
+ Name[it]=Vista browser
+ Name[ja]=ブラウズビュー
+-Name[ka]=ნუსხის ხედი
+ Name[km]=ទិដ្ឋភាព​កម្មវិធី​រុករក
+ Name[ko]=탐색기 보기
+ Name[lb]=Browser-Siicht
+@@ -71,7 +70,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
+--- kparts/kpart.desktop	(revision 484194)
++++ kparts/kpart.desktop	(revision 488534)
+@@ -34,7 +34,6 @@
+ Comment[is]=KDE eining
+ Comment[it]=Componente KDE
+ Comment[ja]=KDEコンポーネント
+-Comment[ka]=KDE კომპონენტი
+ Comment[km]=សមាសភាគ KDE
+ Comment[ko]=KDE 구성 요소
+ Comment[lb]=KDE-Komponent
+@@ -75,7 +74,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
+--- kded/test/test.desktop	(revision 484194)
++++ kded/test/test.desktop	(revision 488534)
+@@ -41,7 +41,6 @@
+ Name[is]=KDED prufueining
+ Name[it]=Modulo di prova di KDED
+ Name[ja]=KDED テストモジュール
+-Name[ka]=KDED ტესტური მოდული
+ Name[km]=ម៉ូឌុល​សាកល្បង KDED
+ Name[ko]=KDED 시험 모듈
+ Name[lb]=KDED-Testmodul
+@@ -80,7 +79,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
+@@ -116,7 +114,6 @@
+ Comment[is]=Prufueining fyrir KDED
+ Comment[it]=Modulo di prova per KDED
+ Comment[ja]=KDED用テストモジュール
+-Comment[ka]=KDED-ს ტესტური მოდული
+ Comment[km]=ម៉ូឌុល​សាកល្បង​មួយ​សម្រាប់ KDED
+ Comment[ko]=KDED를 시험하는 모듈
+ Comment[lb]=En Testmodul fir KDED
+@@ -156,7 +153,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
+--- kded/kdedmodule.desktop	(revision 484194)
++++ kded/kdedmodule.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Comment[is]=KDED eining
+ Comment[it]=Modulo di KDED
+ Comment[ja]=KDEDモジュール
+-Comment[ka]=KDED მოდული
+ Comment[km]=ម៉ូឌុល KDED
+ Comment[ko]=KDED 모듈
+ Comment[lb]=KDED-Modul
+@@ -74,7 +73,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
+--- kdeprint/tools/escputil/escputil.desktop	(revision 484194)
++++ kdeprint/tools/escputil/escputil.desktop	(revision 488534)
+@@ -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
+ 
+--- kdeprint/filters/poster.desktop	(revision 484194)
++++ kdeprint/filters/poster.desktop	(revision 488534)
+@@ -29,7 +29,6 @@
+ Comment[is]=Veggspjaldaprentun
+ Comment[it]=Stampa poster
+ Comment[ja]=ポスター印刷
+-Comment[ka]=პლაკატის ბეჭდვა
+ Comment[km]=ការ​បោះពុម្ព​ប័ណ្ណ​ប្រកាស
+ Comment[ko]=포스터 인쇄
+ Comment[lb]=Plakatdrock
+@@ -68,7 +67,6 @@
+ 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
+@@ -100,7 +98,6 @@
+ Description[is]=Forrit til að prenta stór veggspjöld á lítil blöð. Til að nota þessa skipun verður <b>poster</b>forritið að vera aðgengilegt á slóðinni <tt>path</tt> fumkóði að þessu forriti finnst á <a href="http://printing.kde.org/downloads">KDEPrint web site</a> <p><b><u>Aðvörun:</u></b> Forritið sem finnst á KDEPrint vefsíðunni er breytt útgáfa af upprunalegu útgáfunni sem finnst á öllum CTAN vefsvæðum, en upprunalegi pakkinn virkar <b>ekki</b> með KDE. Þú <b>verður</b> að nota pakkann sem er á:<a href="http://printing.kde.org/downloads">KDEPrint web site</a>.
+ Description[it]=Utilità per stampare poster grandi su più fogli piccoli. Per usare questo comando, l'eseguibile <b>poster</b> deve essere accessibile nel tuo <tt>PATH</tt>. È possibile trovare il codice sorgente di questa utilità sul <a href="http://printing.kde.org/downloads">sito Web di KDEPrint</a>. <p><b><u>ATTENZIONE:</u></b> il pacchetto presente sul sito Web di KDEPrint è una versione modificata dell'originale reperibile in un qualsiasi mirror CTAN, ma il pacchetto originale <b>non</b> funziona con KDE. <b>È necessario</b> usare il pacchetto del <a href="http://printing.kde.org/downloads">sito Web di KDEPrint</a>.
+ Description[ja]=複数の小さい用紙で大きなポスターを印刷するユーティリティです。このコマンドを使用するには <tt>PATH</tt>に<b>poster</b>実行可能ファイルが存在する必要があります。このユーティリティの ソースコードは <a href="http://printing.kde.org/downloads">KDEPrint web site</a>にあります。<p><b><u>警告:</u></b> KDEPrint web site にあるパッケージはオリジナルのCTAN アーカイブミラーにあるものの変更されたバージョンで、オリジナルの ものは KDEでは<b>動きません。</b><b>必ず</b> <a href="http://printing.kde.org/downloads">KDEPrint web site</a>にある パッケージを使用して下さい。
+-Description[ka]=პლაკატების მცირე ზომის ქაღალდებზე ბეჭდვის პაკეტი. მის ასამუშავებლად საჭიროა, რომ პროგრამა <b>poster</b> მისაწვდომი იყოს თქვენს <tt>PATH</tt>-ზე. ამ პროგრამის პირველწყარო შესაძლოა მოძებნოთ საიტზე <a href="http://printing.kde.org/downloads">KDEPrint</a>. <p><b><u>ყურადღება:</u></b> პაკეტები KDEPrint საიტზე მოდიფიცირებულია და განსხვავდება მათგან, რომლებიც CTAN არქივშია, თუმცა პირველწყარო პაკეტები KDE-ში <b>არ იმუშავებენ</b>.  <b>აუცილებელია</b> პაკეტები საიტიდან <a href="http://printing.kde.org/downloads">KDEPrint</a>.
+ Description[km]=ឧបករណ៍​បោះពុម្ព​ប័ណ្ណប្រកាស​ធំ​លើ​សន្លឹក​ក្រដាស​តូច​ៗជា​ច្រើន ។ ដើម្បី​ប្រើ​ពាក្យ​បញ្ជា​នេះ <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[ko]=큰 포스터를 작은 종이 여러장에 ë‚˜ëˆ  찍는데 쓰이는 도구입니다. 이 ëª…ë ¹ì„ ì“°ë ¤ë©´ <tt>PATH</tt>에 <b>poster</b>를 ì‹¤í–‰í•  수 있는 경로가 들어 있어야 합니다. 이 ëª…ë ¹ì€ <a href="http://printing.kde.org/downloads">KDE 인쇄 웹 사이트</a>에서 찾을 수 있습니다. <p><b><u>ê²½ê³ :</u></b> KDE 인쇄 웹 사이트에 있는 꾸러미는 CTAN ì €ìž¥ê³  미러에서 ë‚´ë ¤ë°›ì€ 본디 꾸러미를 ê³ ì¹œ 것입니다. 본디 꾸러미는 KDE에서 돌아가지 <b>않습니다</b>. 따라서 <b>ê¼­</b> <a href="http://printing.kde.org/downloads">KDE 인쇄 웹 사이트</a>에 있는 꾸러미를 쓰십시오.
+ Description[lb]=Hëllefsmëttel fir grouss Plakater op kleng Pabeiergréissten ze drécken. Fir dëse Kommando benotzen ze kënnen, muss den <b>poster</b> Programm an ärem <tt>PATH</tt> sinn. Den Quellcode vun dësem Hëllefsprogramm kann een op der <a href="http://printing.kde.org/downloads">KDEPrint-Websäit</a> fannen. <p><b><u>WARNUNG:</u></b>D'Distributioun, déi een op der KDEPrint-Websäit fënnt, ass eng modifizéiert Versioun vun der originaler, déi een op iergend engem CTAN-Archiv Mirror fanne kann. Déi original Distributioun funktionéiert <b>net</b> mat KDE. Dir <b>musst</b> dofir d'Distributioun vun der <a href="http://printing.kde.org/downloads"> KDEPrint web site</a> Websäit benotzen.
+@@ -136,7 +133,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>.
+--- kdeprint/filters/psbook1.desktop	(revision 484194)
++++ kdeprint/filters/psbook1.desktop	(revision 488534)
+@@ -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)
+@@ -44,7 +43,6 @@
+ Comment[is]=Bæklingaprentun - slétttölusíður (skref 1)
+ Comment[it]=Stampa libretto - pagine pari (passo 1)
+ Comment[ja]=小冊子の印刷 - 偶数ページ (ステップ 1)
+-Comment[ka]=პამფლეტური ბეჭდვა - ლუწი გვერდები (ნაბიჯი 1)
+ Comment[km]=ការ​បោះពុម្ព​ខិតប័ណ្ណ - ទំព័រ​គូ (ជំហាន​ទី ១)
+ Comment[lb]=Booklet-Drock - Gerued Säiten (Schrëtt 1)
+ Comment[lt]=Brošiūros spausdinimas – lyginiai puslapiai (1 žingsnis)
+@@ -79,7 +77,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)
+--- kdeprint/filters/psbook2.desktop	(revision 484194)
++++ kdeprint/filters/psbook2.desktop	(revision 488534)
+@@ -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)
+@@ -44,7 +43,6 @@
+ Comment[is]=Bæklingaprentun - oddatölusíður (skref 2)
+ Comment[it]=Stampa libretto - pagine dispari (passo 2)
+ Comment[ja]=小冊子の印刷 - 奇数ページ (ステップ 2)
+-Comment[ka]=პამფლეტური ბეჭდვა - კენტი გვერდები (ნაბიჯი 2)
+ Comment[km]=ការ​បោះពុម្ព​ខិតប័ណ្ណ - ទំព័រ​សេស (ជំហាន​ទី ២)
+ Comment[lb]=Booklet-Drock - Ongerued Säiten (Schrëtt 2)
+ Comment[lt]=Brošiūros spausdinimas – nelyginiai puslapiai (2 žingsnis)
+@@ -80,7 +78,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)
+--- kdeprint/filters/psselect.desktop	(revision 484194)
++++ kdeprint/filters/psselect.desktop	(revision 488534)
+@@ -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
+@@ -41,7 +40,6 @@
+ Comment[is]=Síðuval / röðunarsía
+ Comment[it]=Filtro per la selezione e l'ordinamento delle pagine
+ Comment[ja]=ページ選択/並べ替えフィルタ
+-Comment[ka]=გვერდის არჩევის/რიგის ფილტრი
+ Comment[km]=តម្រង ជ្រើស/រៀប​លំដាប់​ទំព័រ
+ Comment[ko]=쪽을 ê³ ë¥´ê±°ë‚˜ ì •ë ¬í•˜ëŠ” 거르개
+ Comment[lb]=Säitenauswiel-/Sortéierungsfilter
+@@ -80,7 +78,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
+--- kdeprint/filters/pdfwrite.desktop	(revision 484194)
++++ kdeprint/filters/pdfwrite.desktop	(revision 488534)
+@@ -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)
+@@ -47,7 +46,6 @@
+ Comment[is]=PDF skrifari (krefst GhostScript)
+ Comment[it]=Scrittura di PDF (richiede GhostScript)
+ Comment[ja]=PDFライター (GhostScriptが必要)
+-Comment[ka]=PDF ჩამწერი (საჭიროებს GhostScript-ს)
+ Comment[km]=PDF Writer (ត្រូវការ Ghostscript)
+ Comment[ko]=PDF 쓰기 (ê³ ìŠ¤íŠ¸ìŠ¤í¬ë¦½íŠ¸ê°€ 필요함)
+ Comment[lb]=PDF-Schreiwer (brauch Ghostscript)
+@@ -87,7 +85,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)
+--- kdeprint/filters/enscript.desktop	(revision 484194)
++++ kdeprint/filters/enscript.desktop	(revision 488534)
+@@ -15,7 +15,6 @@
+ 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
+@@ -49,7 +48,6 @@
+ Comment[is]=Enscript textasía
+ Comment[it]=Filtro di testi Enscript
+ Comment[ja]=Enscript テキストフィルタ
+-Comment[ka]=Enscript ტექსტის ფილტრი
+ Comment[km]=តម្រង​អត្ថបទ Enscript
+ Comment[lb]=Enscript-Textfilter
+ Comment[lt]=Enscript teksto filtras
+@@ -88,7 +86,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
+--- kdeprint/filters/imagetops.desktop	(revision 484194)
++++ kdeprint/filters/imagetops.desktop	(revision 488534)
+@@ -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
+@@ -52,7 +51,6 @@
+ Comment[is]=Almenn sía til að breyta mynd í Postscript
+ Comment[it]=Filtro generico da immagine a PostScript
+ Comment[ja]=一般的な画像->PSフィルタ
+-Comment[ka]=გამოსახულების PostScript გაფილტვრა
+ Comment[km]=រូបភាព Generic ទៅ​តម្រង PS
+ Comment[ko]=일반 그림을 PS로 바꿔주는 거르개
+ Comment[lb]=Allgemenge Filter vu Biller zu PS
+@@ -92,7 +90,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
+--- kdeprint/filters/psbook.desktop	(revision 484194)
++++ kdeprint/filters/psbook.desktop	(revision 488534)
+@@ -9,7 +9,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)
+@@ -40,7 +39,6 @@
+ Comment[is]=Bæklingaprentun (nota með smárri tvíhliðaprentun)
+ Comment[it]=Stampa libretto (da usare con la stampa fronte/retro dal lato corto)
+ Comment[ja]=小冊子の印刷 - (端の短い折り重ね印刷を使用)
+-Comment[ka]=პამფლეტური ბეჭდვა (ორმხრივი ბეჭდვა მოკლე მხრიდან)
+ Comment[km]=ការបោះពុម្ព​ខិតប័ណ្ណ (ប្រើ​ជាមួយ​នឹង​ការបោះពុម្ព​សងខាង​តូចៗ)
+ Comment[lb]=Booklet-Drock (mat schmuelsäitegem Duplexdrock benotzen)
+ Comment[lt]=Brošiūros spausdinimas (naudokite dvipusiam spausdinimui)
+@@ -76,7 +74,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)
+--- kdeprint/filters/ps2pdf.desktop	(revision 484194)
++++ kdeprint/filters/ps2pdf.desktop	(revision 488534)
+@@ -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
+@@ -37,7 +36,6 @@
+ Comment[is]=Breytir Postscript skjölum í PDF-skjöl
+ Comment[it]=Convertitore da PostScript a PDF
+ Comment[ja]=PostScriptからPDFへの変換ツール
+-Comment[ka]=PostScript-ის PDF-ში გარდაქმნა
+ Comment[km]=កម្មវិធី​បម្លែង​ PostScript ទៅ PDF
+ Comment[ko]=포스트스크립트를 PDF 문서로 바꿔줍니다
+ Comment[lb]=PostScript zu PDF Konvertéierer
+@@ -77,7 +75,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
+--- kdeprint/filters/psresize.desktop	(revision 484194)
++++ kdeprint/filters/psresize.desktop	(revision 488534)
+@@ -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
+@@ -42,7 +41,6 @@
+ Comment[is]=Skala prentun til að setja á aðra pappírsstærð
+ Comment[it]=Adatta il contenuto della stampa ad una diversa dimensione della carta
+ Comment[ja]=用紙サイズに合うように印刷内容を拡大/縮小
+-Comment[ka]=ბეჭდვის მასშტაბირება სხვა ზომის ფურცელზე დასაბეჭდად
+ Comment[km]=ធ្វើ​មាត្រដ្ឋាន​មាតិកា​បោះពុម្ព​ឲ្យ​សម​នឹង​ទំហំ​ក្រដាស​ផ្សេង​ទៀត
+ Comment[ko]=찍을 알맹이를 다른 쪽 크기에 맞춰줍니다
+ Comment[lb]=Gréisst vum Ausdrock op eng aner Pabeiergréisst upassen
+@@ -81,7 +79,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
+--- kdeprint/filters/psnup.desktop	(revision 484194)
++++ kdeprint/filters/psnup.desktop	(revision 488534)
+@@ -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 blaai Filter
+@@ -33,7 +32,6 @@
+ Comment[is]=Sía fyrir margar síður á hvert blað
+ Comment[it]=Più pagine sullo stesso foglio
+ Comment[ja]=シートフィルタ毎に複数ページ
+-Comment[ka]=რამდენიმე გვერდის ერთ ფურცელზე ბეჭდვა
+ Comment[km]=ទំព័រ​ច្រើន​ក្នុង​មួយ​តម្រង​សន្លឹក
+ Comment[ko]=여러 쪽으로 ë‚˜ëˆ ì£¼ëŠ” 거르개
+ Comment[lb]=Filter fir e puer Säiten op ee Blat ze drécken
+@@ -72,7 +70,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
+--- kdeprint/cups/cups.print	(revision 484194)
++++ kdeprint/cups/cups.print	(revision 488534)
+@@ -23,7 +23,6 @@
+ Comment[hr]=CUPS (Common Unix Print System)
+ Comment[is]=CUPS (Common Unix Print System)
+ Comment[ja]=CUPS (Common UNIX Printing System)
+-Comment[ka]=CUPS (საერთო Unix ბეჭდვის სიტემა)
+ Comment[ko]=CUPS (공통 ìœ ë‹‰ìŠ¤ 인쇄 시스템)
+ Comment[lt]=CUPS (Bendra Unix Spausdinimo Sistema)
+ Comment[mn]=CUPS (Юниксын Ерөнхий Хэвлэх Систем)
+@@ -52,7 +51,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)
+--- kdeprint/cups/cupsdconf2/cups-util.c	(revision 484194)
++++ kdeprint/cups/cupsdconf2/cups-util.c	(revision 488534)
+@@ -440,11 +440,16 @@
+ 
+  /*
+   * See if we are accessing localhost...
++	the struct has changed in newer versions - PiggZ (adam at piggz.co.uk)
+   */
+-
+-  if (ntohl(*(int*)&http->hostaddr.sin_addr) != 0x7f000001 &&
++#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
++	if (ntohl(*(int*)&http->_hostaddr.sin_addr) != 0x7f000001 &&
+       strcasecmp(http->hostname, "localhost") != 0)
+-    return (0);
++#else
++	if (ntohl(*(int*)&http->hostaddr.sin_addr) != 0x7f000001 &&
++      strcasecmp(http->hostname, "localhost") != 0)
++#endif
++   return (0);
+ 
+  /*
+   * Try opening a certificate file for this PID.  If that fails,
+--- kdeprint/foomatic/foomatic.print	(revision 484194)
++++ kdeprint/foomatic/foomatic.print	(revision 488534)
+@@ -11,6 +11,5 @@
+ Comment[rw]=Fumatike (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
+--- kdeprint/lpd/lpd.print	(revision 484194)
++++ kdeprint/lpd/lpd.print	(revision 488534)
+@@ -32,7 +32,6 @@
+ Comment[is]= LPR (Venjulega BSD prentkerfið)
+ Comment[it]=LPR (sistema di stampa standard di BSD)
+ Comment[ja]=LPR (標準 BSD 印刷システム)
+-Comment[ka]=LPR (სტანდარტული BSD ბეჭდვის სისტემა)
+ Comment[km]=LPR (ប្រព័ន្ធ​បោះពុម្ព BSD ខ្នាត​គំរូ)
+ Comment[ko]=LPR (표준 BSD 인쇄 시스템)
+ Comment[lb]=LPR (Standard-Drécksystem vu BSD)
+@@ -73,7 +72,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)
+--- kdeprint/lpr/lpr.print	(revision 484194)
++++ kdeprint/lpr/lpr.print	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=LPR/LPRng prentkerfið
+ Comment[it]=Sistema di stampa LPR/LPRng
+ Comment[ja]=LPR/LPRng 印刷システム
+-Comment[ka]=LPR/LPRng ბეჭდვის სისტემა
+ Comment[km]=ប្រព័ន្ធ​បោះពុម្ព LPR/LPRng
+ Comment[ko]=LPR/LPRng 인쇄 시스템
+ Comment[lb]=LPR/LPRng-Drécksystem
+@@ -71,7 +70,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
+--- kdeprint/kdeprintd.desktop	(revision 484194)
++++ kdeprint/kdeprintd.desktop	(revision 488534)
+@@ -42,7 +42,6 @@
+ Name[is]=KDE prentþjónn
+ Name[it]=Demone di stampa KDE
+ Name[ja]=KDE 印刷デーモン
+-Name[ka]=KDE-ს ბეჭდვის მოდული
+ Name[km]=Daemon បោះពុម្ព KDE
+ Name[ko]=KDE 인쇄 데몬
+ Name[lb]=KDE-Dréck-Dämon
+@@ -80,7 +79,6 @@
+ 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
+@@ -110,7 +108,6 @@
+ Comment[is]=Prentþjónn fyrir KDE
+ Comment[it]=Demone di stampa per KDE
+ Comment[ja]=KDE用の印刷デーモン
+-Comment[ka]=KDE-ს ბეჭდვის მოდული
+ Comment[km]=Daemon បោះពុម្ព​របស់ KDE
+ Comment[lb]=Dréck-Dämon fir KDE
+ Comment[lt]=Spausdinimo tarnyba, skirta KDE
+@@ -140,5 +137,4 @@
+ Comment[tt]=KDE öçen bastıru xezmäte
+ Comment[uk]=Демон друку KDE
+ Comment[uz]=KDE учун босиб чиқариш хизмати
+-Comment[xx]=xxPrint daemon for KDExx
+ Comment[zh_CN]=KDE 的打印守护进程
+--- kdeprint/rlpr/rlpr.print	(revision 484194)
++++ kdeprint/rlpr/rlpr.print	(revision 488534)
+@@ -28,7 +28,6 @@
+ Comment[is]=RLPR umhverfi (fjarlægir LPD þjónar)
+ Comment[it]=Ambiente RLPR (server LPD remoti)
+ Comment[ja]=RLPR 環境 (リモートLPDサーバ)
+-Comment[ka]=RLPR გარემო (დაშორებული LPD სერვერები)
+ Comment[km]=បរិស្ថាន RLPR (ម៉ាស៊ីន​បម្រើ LPD ពី​ចម្ងាយ)
+ Comment[ko]=RLPR 환경 (원격지 LPD 서버)
+ Comment[lb]=RLPR  mfeld(LPD-ServeËren op anere Computeren)
+@@ -68,7 +67,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)
+--- kdeprint/lpdunix/lpdunix.print	(revision 484194)
++++ kdeprint/lpdunix/lpdunix.print	(revision 488534)
+@@ -30,7 +30,6 @@
+ Comment[is]=Almennt UNIX LPD prentkerfi (sjálfgefið)
+ Comment[it]=Sistema di stampa UNIX LPD generico (predefinito)
+ Comment[ja]=一般的な UNIX LPD 印刷システム (標準)
+-Comment[ka]=UNIX LPD ბეჭდვის სისტემა (ნაგულისხმები)
+ Comment[km]=ប្រព័ន្ធ​បោះពុម្ព Generic UNIX LPD (លំនាំដើម)
+ Comment[ko]=보통 ìœ ë‹‰ìŠ¤ LPD 인쇄 시스템 (기본)
+ Comment[lb]=Allgemengt UNIX-LPD-Drécksystem (Virastellung)
+@@ -70,7 +69,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)
+--- kdeprint/ext/ext.print	(revision 484194)
++++ kdeprint/ext/ext.print	(revision 488534)
+@@ -31,7 +31,6 @@
+ Comment[is]=Prenta í gegnum utanaðkomandi forrit (almennt)
+ Comment[it]=Stampa attraverso un programma esterno (generico)
+ Comment[ja]=外部プログラムを通して印刷 (一般的)
+-Comment[ka]=ბეჭდვა გარე პროგრამიდან (საზოგადო)
+ Comment[km]=បោះពុម្ព​តាម​រយៈ​កម្មវិធី​ខាង​ក្រៅ​មួយ (ទូទៅ)
+ Comment[ko]=바깥 프로그램을 통해 인쇄 (일반)
+ Comment[lb]=Duerch en externe Programm drécken (allgemeng)
+@@ -71,7 +70,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)
+--- kdeprint/specials.desktop	(revision 484194)
++++ kdeprint/specials.desktop	(revision 488534)
+@@ -35,7 +35,6 @@
+ Name[is]=Prenta í skrá (Postscript)
+ Name[it]=Stampa su file (PostScript)
+ Name[ja]=ファイルに出力 (PostScript)
+-Name[ka]=ბეჭდვა ფაილში (PostScript)
+ Name[km]=បោះពុម្ព​ទៅ​ឯកសារ (PostScript)
+ Name[ko]=(포스트스크립트) 파일로 찍기
+ Name[lb]=An Datei drécken (PostScript)
+@@ -75,7 +74,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)
+@@ -112,7 +110,6 @@
+ Description[is]=Skrifa PostScript skrá
+ Description[it]=Scrive file PostScript
+ Description[ja]=PostScript ファイルの作成
+-Description[ka]=ჩაწერა PostScript ფაილში
+ Description[km]=ឯកសារ Write PostScript
+ Description[ko]=포스트스크립트 파일로 씁니다
+ Description[lb]=PostScript-Datei schreiwen
+@@ -153,7 +150,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
+@@ -190,7 +186,6 @@
+ Comment[is]=Staðvær skrá
+ Comment[it]=File locale
+ Comment[ja]=ローカルファイル
+-Comment[ka]=ლოკალური ფაილი
+ Comment[km]=ឯកសារ​មូលដ្ឋាន
+ Comment[ko]=울 안 파일
+ Comment[lb]=Lokal Datei
+@@ -231,7 +226,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
+@@ -275,7 +269,6 @@
+ Name[is]=Prenta í skrá (PDF/Acrobat)
+ Name[it]=Stampa su file (PDF)
+ Name[ja]=ファイルに出力 (PDF)
+-Name[ka]=ბეჭდვა ფაილში (PDF)
+ Name[km]=បោះពុម្ព​ទៅ​ឯកសារ (PDF)
+ Name[ko]=(PDF) 파일로 찍기
+ Name[lb]=An Datei drécken (PDF)
+@@ -315,7 +308,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)
+@@ -352,7 +344,6 @@
+ Description[is]=Skrifa PDF/Acrobat skrá
+ Description[it]=Scrive file PDF/Acrobat
+ Description[ja]=PDF/Acrobat ファイルの作成
+-Description[ka]=ჩაწერა PDF/Acrobat ფაილში
+ Description[km]=ឯកសារ Write PDF/Acrobat
+ Description[ko]=PDF/아크로뱃 파일로 씁니다
+ Description[lb]=PDF/Acrobat-Datei schreiwen
+@@ -393,7 +384,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
+@@ -430,7 +420,6 @@
+ Comment[is]=Staðvær skrá
+ Comment[it]=File locale
+ Comment[ja]=ローカルファイル
+-Comment[ka]=ლოკალური ფაილი
+ Comment[km]=ឯកសារ​មូលដ្ឋាន
+ Comment[ko]=울 안 파일
+ Comment[lb]=Lokal Datei
+@@ -471,7 +460,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 +504,6 @@
+ Name[is]=Senda á faxið
+ Name[it]=Invia al fax
+ Name[ja]=Faxへ送信
+-Name[ka]=ფაქსით გაგზავნა
+ Name[km]=បញ្ជូន​ទៅ​ទូរសារ
+ Name[ko]=팩스로 보내기
+ Name[lb]=Un e Fax schécken
+@@ -556,7 +543,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
+@@ -590,7 +576,6 @@
+ Description[is]=Senda á utanaðkomandi fax kerfi
+ Description[it]=Invia ad un sistema di fax esterno
+ Description[ja]=外部faxシステムに送信
+-Description[ka]=გაგზავნა გარე ფაქსით
+ Description[km]=បញ្ជូន​​ទៅ​ប្រព័ន្ធ​ទូរសារ​ខាង​ក្រៅ
+ Description[ko]=바깥에 있는 팩스 시스템으로 보냅니다
+ Description[lb]=Un en externt Fax-System schécken
+@@ -631,7 +616,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
+@@ -667,7 +651,6 @@
+ Comment[is]=Utanaðkomandi
+ Comment[it]=Esterno
+ Comment[ja]=外部
+-Comment[ka]=გარე
+ Comment[km]=ខាង​ក្រៅ
+ Comment[ko]=바깥
+ Comment[lb]=Extern
+@@ -708,7 +691,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
+@@ -749,7 +731,6 @@
+ Comment[is]=Viðhengi við KMail póst
+ Comment[it]=Allegato per il compositore di KMail
+ Comment[ja]=KMailコンポーザの添付
+-Comment[ka]=KMail-ის ჩანართი
+ Comment[km]=ឯកសារ​ភ្ជាប់​របស់​កម្មវិធី​តែង KMail
+ Comment[ko]=KDE 편지용 편집기로 덧붙여 보냅니다
+ Comment[lb]=Unhang fir KMail-Verfaasser
+@@ -789,7 +770,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
+@@ -824,7 +804,6 @@
+ Description[is]=Býr til PDF/Acrobat skrá sem viðhengi fyrir KMail
+ Description[it]=Crea un file di allegato PDF/Acrobat per KMail
+ Description[ja]=PDF/Acrobat ファイルをKMailの添付として作成
+-Description[ka]=PDF/Acrobat ფაილის შექმნა KMail-ის ჩანართად
+ Description[km]=បង្កើត​ឯកសារ PDF/Acrobat ជា​ឯកសារ​ភ្ជាប់​សម្រាប់ KMail
+ Description[ko]=KDE 편지에 덧붙일 PDF/어크로뱃 파일로 만듭니다
+ Description[lb]=Erstellt eng PDF/Acrobat-Datei als Unhang fir de KMail
+@@ -865,7 +844,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
+@@ -899,7 +877,6 @@
+ Name[is]=Senda PDF skrá í pósti
+ Name[it]=Spedisci file PDF
+ Name[ja]=PDFファイルをメール
+-Name[ka]=PDF ფაილის გაგზავნა
+ Name[km]=ផ្ញើ​ Mail PDF
+ Name[lb]=PDF-Datei mailen
+ Name[lt]=Pašto PDF byla
+@@ -929,7 +906,6 @@
+ Name[tt]=PDF Birem Cibärü
+ Name[uk]=Відсилання файлу PDF поштою
+ Name[uz]=PDF-файли сифатида хат орқали жўнатиш
+-Name[xx]=xxMail PDF Filexx
+ Name[zh_CN]=邮寄 PDF 文件
+ Require=exec:/ps2pdf,exec:/kmail
+ 
+@@ -950,7 +926,6 @@
+ 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 ﻹرسال المستند الحالي بالفاكس
+@@ -981,7 +956,6 @@
+ Description[is]=Nota ksendfax til að senda skjal á faxtæki
+ Description[it]=Usa ksendfax per inviare come fax il documento corrente
+ Description[ja]=ksendfax は現在のドキュメントをFaxするのに使います
+-Description[ka]=დოკუმენტის ფაქსით გასაგზავნად ksendfax-ის გამოყენება
+ Description[km]=ប្រើ ksendfax ដើម្បី​ផ្ញើ​ឯកសារ​បច្ចុប្បន្ន​តាម​រយៈ​ទូរសារ
+ Description[ko]=현재 문서를 팩스로 보내기 위해 ksendfax를 씁니다
+ Description[lb]=Benotzt de ksendfax fir dat aktuellt Dokument ze faxen
+@@ -1020,7 +994,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
+@@ -1058,7 +1031,6 @@
+ Name[is]=Þróað faxtól (ksendfax)
+ Name[it]=Strumento avanzato per i fax (ksendfax)
+ Name[ja]=高機能 Fax ツール (ksendfax)
+-Name[ka]=ფაქსის გაგზავნის სპეციალური პროგრამა (ksendfax)
+ Name[km]=ឧបករណ៍​ផ្ញើ​ទូរសារ​កម្រិត​ខ្ពស់ (ksendfax)
+ Name[ko]=ê³ ê¸‰ 팩스 도구 (ksendfax)
+ Name[lb]=Erweiderte Faxprogramm (ksendfax)
+@@ -1096,7 +1068,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)
+--- kdeui/kactioncollection.cpp	(revision 484194)
++++ kdeui/kactioncollection.cpp	(revision 488534)
+@@ -297,29 +297,23 @@
+   return d->m_kaccel;
+ }
+ 
+-/*void KActionCollection::findMainWindow( QWidget *w )
++// Return the key to use in d->m_actionDict for the given action.
++// Usually name(), except when unnamed.
++static const char* actionDictKey( KAction* action, char* buffer )
+ {
+-  // Note: topLevelWidget() stops too early, we can't use it.
+-  QWidget * tl = w;
+-  while ( tl->parentWidget() ) // lookup parent and store
+-    tl = tl->parentWidget();
++  const char* name = action->name();
++  if( !qstrcmp( name, "unnamed" ) )
++  {
++     sprintf(buffer, "unnamed-%p", (void *)action);
++     return buffer;
++  }
++  return name;
++}
+ 
+-  KMainWindow * mw = dynamic_cast<KMainWindow *>(tl); // try to see if it's a kmainwindow
+-  if (mw)
+-    d->m_mainwindow = mw;
+-  else
+-    kdDebug(129) << "KAction::plugMainWindowAccel: Toplevel widget isn't a KMainWindow, can't plug accel. " << tl << endl;
+-}*/
+-
+ void KActionCollection::_insert( KAction* action )
+ {
+   char unnamed_name[100];
+-  const char *name = action->name();
+-  if( !qstrcmp( name, "unnamed" ) )
+-  {
+-     sprintf(unnamed_name, "unnamed-%p", (void *)action);
+-     name = unnamed_name;
+-  }
++  const char *name = actionDictKey( action, unnamed_name );
+   KAction *a = d->m_actionDict[ name ];
+   if ( a == action )
+       return;
+@@ -331,18 +325,23 @@
+ 
+ void KActionCollection::_remove( KAction* action )
+ {
+-  delete _take( action );
++  char unnamed_name[100];
++  const char *name = actionDictKey( action, unnamed_name );
++
++  KAction *a = d->m_actionDict.take( name );
++  if ( !a || a != action )
++      return;
++
++  emit removed( action );
++  // note that we delete the action without its parent collection set to 0.
++  // This triggers kaccel::remove, to remove any shortcut.
++  delete a;
+ }
+ 
+ KAction* KActionCollection::_take( KAction* action )
+ {
+   char unnamed_name[100];
+-  const char *name = action->name();
+-  if( !qstrcmp( name, "unnamed" ) )
+-  {
+-     sprintf(unnamed_name, "unnamed-%p", (void *) action);
+-     name = unnamed_name;
+-  }
++  const char *name = actionDictKey( action, unnamed_name );
+ 
+   KAction *a = d->m_actionDict.take( name );
+   if ( !a || a != action )
+@@ -352,6 +351,7 @@
+       a->m_parentCollection = 0;
+ 
+   emit removed( action );
++
+   return a;
+ }
+ 
+--- kdeui/kdetrayproxy/kdetrayproxy.desktop	(revision 484194)
++++ kdeui/kdetrayproxy/kdetrayproxy.desktop	(revision 488534)
+@@ -24,7 +24,6 @@
+ Name[is]=KDE leppstjórneining spjaldsins
+ Name[it]=Modulo proxy per il vassoio di KDE
+ Name[ja]=KDE トレイプロキシモジュール
+-Name[ka]=KDE სისტემური ზოლის პროქსი მოდული
+ Name[km]=ម៉ូឌុល​ប្រូកស៊ី KDE Tray
+ Name[lb]=Proxymodul fir KDE-Symbolleescht
+ Name[lt]=KDE dÄ—klo proxy modulis
+@@ -51,7 +50,6 @@
+ Name[tr]=KDE Görev Çubuğu Vekil Birimi
+ Name[tt]=KDE Tiräsenä Proxy Modulı
+ 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
+@@ -76,7 +74,6 @@
+ Comment[is]=Leppstjórneining fyrir KDE spjaldið sem virkar án KWin
+ Comment[it]=Permette alle applicazioni per il vassoio di KDE di funzionare senza KWin
+ Comment[ja]=KWinなしでKDE systray アプリケーションを動作できるようにプロキシを有効にします。
+-Comment[ka]=KDE სისტემური ზოლის პროქსი მოდული პროგრამებისთვის KWin-ის გარეშე სამუშაოდ
+ Comment[km]=ប្រូកស៊ី​ដែល​អនុញ្ញាត​ឲ្យ​កម្មវិធី KDE systray ធ្វើការ​ដោយ​គ្មាន KWin
+ Comment[lb]=Proxy, deen et erméiglecht, dass Programmer fir d'KDE-Symbolleescht ouni de KWin funktionéieren
+ Comment[lt]=Proxy įgalinantis KDE sistemos dėklo taikomasias programas dirbti be KWin
+@@ -104,7 +101,6 @@
+ Comment[tr]=Vekil sunucu etkinleştirme KDE sistem çubuğu uygulamalarının KWin olmadan çalıştırır.
+ Comment[tt]=KWin'sız eşläwçe yazılımnar öçen KDE sistiräseneñ Proxy
+ 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
+--- kdeui/kstdaction_p.h	(revision 484194)
++++ kdeui/kstdaction_p.h	(revision 488534)
+@@ -79,8 +79,8 @@
+ 	{ Back,          KStdAccel::Back, "go_back", 0, 0, "back" },
+ 	{ Forward,       KStdAccel::Forward, "go_forward", 0, 0, "forward" },
+ 	{ Home,          KStdAccel::Home, "go_home", 0, 0, "gohome" },
+-	{ Prior,         KStdAccel::Prior, "go_previous", I18N_NOOP("&Previous Page"), 0, "previous" },
+-	{ Next,          KStdAccel::Next, "go_next", I18N_NOOP("&Next Page"), 0, "next" },
++	{ Prior,         KStdAccel::Prior, "go_previous", I18N_NOOP("&Previous Page"), 0, "back" },
++	{ Next,          KStdAccel::Next, "go_next", I18N_NOOP("&Next Page"), 0, "forward" },
+ 	{ Goto,          KStdAccel::AccelNone, "go_goto", I18N_NOOP("&Go To..."), 0, 0 },
+ 	{ GotoPage,      KStdAccel::AccelNone, "go_goto_page", I18N_NOOP("&Go to Page..."), 0, "goto" },
+ 	{ GotoLine,      KStdAccel::GotoLine, "go_goto_line", I18N_NOOP("&Go to Line..."), 0, 0 },
+--- kdeui/kstdaction.cpp	(revision 484194)
++++ kdeui/kstdaction.cpp	(revision 488534)
+@@ -80,8 +80,8 @@
+ 		}
+ 
+ 		if (QApplication::reverseLayout()){
+-			if (id == Prior) iconName = "next";
+-			if (id == Next ) iconName = "previous";
++			if (id == Prior) iconName = "forward";
++			if (id == Next ) iconName = "back";
+ 		}
+ 
+ 		KShortcut cut = KStdAccel::shortcut(pInfo->idAccel);
+--- kdeui/kactionclasses.cpp	(revision 484194)
++++ kdeui/kactionclasses.cpp	(revision 488534)
+@@ -640,7 +640,7 @@
+ {
+   if (kapp && !kapp->authorizeKAction(name()))
+     return -1;
+-  kdDebug(129) << "KAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
++  kdDebug(129) << "KSelectAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
+   if ( ::qt_cast<QPopupMenu *>( widget) )
+   {
+     // Create the PopupMenu and store it in m_menu
+@@ -1096,56 +1096,19 @@
+ 
+ void KRecentFilesAction::addURL( const KURL& url )
+ {
+-    if ( url.isLocalFile() && !KGlobal::dirs()->relativeLocation("tmp", url.path()).startsWith("/"))
+-       return;
+-    QString     file = url.pathOrURL();
+-    QStringList lst = KSelectAction::items();
+-    KURL u = url; //make a copy (increase the reference counter?). 
+-                  //Otherwise after d->m_urls.erase( title ) the url will be empty...
+-
+-    // remove file if already in list
+-    QStringList::Iterator end = lst.end();
+-    for ( QStringList::Iterator it = lst.begin(); it != end; ++it )
+-    {
+-      QString title = (*it);
+-      if ( title.endsWith( file + "]" ) )
+-      {
+-        lst.remove( it );
+-        d->m_urls.erase( title );
+-        d->m_shortNames.erase( title );
+-        break;
+-      }
+-    }
+-
+-    // remove last item if already maxitems in list
+-    if( lst.count() == d->m_maxItems )
+-    {
+-        // remove last item
+-        QString lastItem = lst.last();
+-        d->m_shortNames.erase( lastItem );
+-        d->m_urls.erase( lastItem );
+-        lst.remove( lastItem );
+-    }
+-
+-    // add file to list
+-    QString title = url.fileName() + " [" + file + "]";
+-    d->m_shortNames.insert( title, url.fileName() );
+-    d->m_urls.insert( title, u );
+-    lst.prepend( title );
+-    setItems( lst );
++    addURL( url, url.fileName() );
+ }
+ 
+ void KRecentFilesAction::addURL( const KURL& url, const QString& name )
+ {
+     if ( url.isLocalFile() && !KGlobal::dirs()->relativeLocation("tmp", url.path()).startsWith("/"))
+        return;
+-    KURL u = url; //make a copy (increase the reference counter?). 
+-                  //Otherwise after d->m_urls.erase( title ) the url will be empty...
+-    QString     file = url.pathOrURL();
++    const KURL u = url; // make a copy since d->m_urls.erase( title ) could destroy the KURL that "url" references
++    const QString file = url.pathOrURL();
+     QStringList lst = KSelectAction::items();
+ 
+     // remove file if already in list
+-    QStringList::Iterator end = lst.end();
++    const QStringList::Iterator end = lst.end();
+     for ( QStringList::Iterator it = lst.begin(); it != end; ++it )
+     {
+       QString title = (*it);
+@@ -1161,14 +1124,14 @@
+     if( lst.count() == d->m_maxItems )
+     {
+         // remove last item
+-        QString lastItem = lst.last();
++        const QString lastItem = lst.last();
+         d->m_shortNames.erase( lastItem );
+         d->m_urls.erase( lastItem );
+         lst.remove( lastItem );
+     }
+ 
+     // add file to list
+-    QString title = name + " [" + file + "]";
++    const QString title = name + " [" + file + "]";
+     d->m_shortNames.insert( title, name );
+     d->m_urls.insert( title, u );
+     lst.prepend( title );
+@@ -1209,7 +1172,7 @@
+     QString     nameKey;
+     QString     nameValue;
+     QString      title;
+-    QString     oldGroup;    
++    QString     oldGroup;
+     QStringList lst;
+     KURL        url;
+ 
+@@ -1259,7 +1222,7 @@
+     // write file list
+     for( unsigned int i = 1 ; i <= lst.count() ; i++ )
+     {
+-        kdDebug(129) << "Entry for " << lst[i-1] << d->m_urls[ lst[ i - 1 ] ] << endl;
++        //kdDebug(129) << "Entry for " << lst[i-1] << d->m_urls[ lst[ i - 1 ] ] << endl;
+         key = QString( "File%1" ).arg( i );
+         value = d->m_urls[ lst[ i - 1 ] ].pathOrURL();
+         config->writePathEntry( key, value );
+@@ -1804,7 +1767,7 @@
+ {
+   if (kapp && !kapp->authorizeKAction(name()))
+     return -1;
+-  kdDebug(129) << "KAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
++  kdDebug(129) << "KActionMenu::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
+   if ( ::qt_cast<QPopupMenu *>( widget ) )
+   {
+     QPopupMenu* menu = static_cast<QPopupMenu*>( widget );
+--- kdeui/kxmlguifactory.cpp	(revision 484194)
++++ kdeui/kxmlguifactory.cpp	(revision 488534)
+@@ -223,7 +223,7 @@
+ 
+ void KXMLGUIFactory::addClient( KXMLGUIClient *client )
+ {
+-    kdDebug(129) << "KXMLGUIFactory::addClient( " << client << " )" << endl; // ellis
++    kdDebug(1002) << "KXMLGUIFactory::addClient( " << client << " )" << endl; // ellis
+     static const QString &actionPropElementName = KGlobal::staticQString( "ActionProperties" );
+ 
+     if ( client->factory() ) {
+@@ -243,7 +243,7 @@
+     if ( !d->m_clients.containsRef( client ) )
+         d->m_clients.append( client );
+     else
+-        kdDebug(129) << "XMLGUI client already added " << client << endl;
++        kdDebug(1002) << "XMLGUI client already added " << client << endl;
+ 
+     // Tell the client that plugging in is process and
+     //  let it know what builder widget its mainwindow shortcuts
+@@ -320,7 +320,7 @@
+ 
+ void KXMLGUIFactory::removeClient( KXMLGUIClient *client )
+ {
+-    kdDebug(129) << "KXMLGUIFactory::removeClient( " << client << " )" << endl; // ellis
++    kdDebug(1002) << "KXMLGUIFactory::removeClient( " << client << " )" << endl; // ellis
+ 
+     // don't try to remove the client's GUI if we didn't build it
+     if ( !client || client->factory() != this )