File 3_5_BRANCH.diff of Package kdelibs3

Overview Repositories Revisions Requests Users Attributes Meta

File 3_5_BRANCH.diff of Package kdelibs3 (Revision 2e05447571d440b2401d8a0e7716b69d)

Currently displaying revision 2e05447571d440b2401d8a0e7716b69d , Show latest

package: kdelibs-3.5.2.tar.bz2
kdemod: kdelibs
svn di between /tags/KDE/3.5.2 and /branches/KDE//branches/KDE/3.5
Index: libkscreensaver/kscreensaver.cpp
===================================================================
--- libkscreensaver/kscreensaver.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ libkscreensaver/kscreensaver.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -221,7 +221,7 @@
 kapp->flushX();
 
 if ( d->effectProgress >= bx*by ) {
- delete block;
+ delete[] block;
 finished();
 }
 }
Index: interfaces/kscript/sample/shellscript.desktop
===================================================================
--- interfaces/kscript/sample/shellscript.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ interfaces/kscript/sample/shellscript.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -59,6 +59,7 @@
 Name[tt]=Qabıqnıñ Bash Ämerlek Cibärgeçe
 Name[uk]=Виконувач скриптів командної оболонки (bash)
 Name[uz]=Bash шелл скриптини ишга тушурувчи
+Name[vi]=Bộ chạy tập lệnh hệ vỏ Bash
 Name[wa]=Enondeu di scripes shell bash
 Name[zh_CN]=Bash Shell 脚本运行程序
 Type=Service
@@ -96,7 +97,7 @@
 Comment[id]=Menjalankan skrip bash dari aplikasi
 Comment[is]=Keyrir bash skeljaforrit innan forritsins
 Comment[it]=Esegue gli script bash all'interno dell'applicazione.
-Comment[ja]=アプリケーション内部からの Bash シェルスクリプトを実行します
+Comment[ja]=アプリケーション内部からの Bash シェルスクリプトを実行します。
 Comment[km]=រត់ស្គ្រីបសែល bash ពីក្នុងកម្មវិធី ។
 Comment[ko]=응용 프로그램에서 배쉬 쉘 스크립트를 실행합니다.
 Comment[lb]=Féiert Skripter fir d'Bash-Kommandozeil aus dem Programm selwer aus.
@@ -129,6 +130,7 @@
 Comment[tt]=Yazılım eçennän bash ämerleklär cibärä.
 Comment[uk]=Запускає скрипти командної оболонки (bash) з програми.
 Comment[uz]=Дастурларнинг ичдан bash шелл скриптини ишга туширади
+Comment[vi]=Chạy tập lệnh hệ vỏ bash bên trong ứng dụng.
 Comment[wa]=Enonder des scripes shell bash a pårti do programe
 Comment[zh_CN]=在应用程序内运行 bash shell 脚本。
 Comment[zh_HK]=於程式內執行 bash shell script 檔案
Index: interfaces/kscript/scriptinterface.desktop
===================================================================
--- interfaces/kscript/scriptinterface.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ interfaces/kscript/scriptinterface.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -68,7 +68,7 @@
 Comment[uk]=Це - загальна машина тестових скриптів для перевірки інтерфейсу скрипту.
 Comment[uz]=Скриптнинг интерфейсини текшириш учун умумий синов скрипт бошқарувчиси
 Comment[ven]=Heyi ndi inzhini ya bammbiri la mulingo lau linga vhuvha ha bammbiri.
-Comment[vi]=Đây là bộ script thử nghiệm chung cho việc thử các script giao diện 
+Comment[vi]=Đây là cơ chế tập lệnh thử ra giống loài để thử ra giao diện tập lệnh.
 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[zh_CN]=这是一个用于测试脚本接口的通用脚本测试引擎。
Index: interfaces/kimproxy/interface/dcopinstantmessenger.desktop
===================================================================
--- interfaces/kimproxy/interface/dcopinstantmessenger.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -56,5 +56,6 @@
 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[vi]=Bộ tin nhắn tức khắc có giao diện DCOP
 Comment[zh_CN]=带 DCOP 接口的即时通讯程序
 Comment[zh_HK]=附有 DCOP 介面的即時通訊軟件
Index: interfaces/kimproxy/interface/kcm_instantmessenger.desktop
===================================================================
--- interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -45,6 +45,7 @@
 Name[tt]=Aşığıç Xäbärçe
 Name[uk]=Програма для миттєвого зв'язку через DCOP
 Name[uz]=Хабар алмашиш воситаси
+Name[vi]=Bộ tin nhắn tức khắc
 Name[zh_CN]=即时通讯程序
 Name[zh_HK]=即時通訊軟件
 Comment=The instant messenger allows two-way chat between individuals and groups.
@@ -100,6 +101,7 @@
 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[vi]=Bộ tin nhắn tức khắc cho phép trò chuyện hai chiều giữa người riêng và nhóm.
 Comment[zh_CN]=允许在个人和群组之间双向聊天的即时通讯程序。
 Comment[zh_HK]=即時通訊軟件可以讓用戶和別的用戶或羣組通訊。
 ServiceTypeToConfigure=DCOP/InstantMessenger
Index: interfaces/kspeech/dcoptexttospeech.desktop
===================================================================
--- interfaces/kspeech/dcoptexttospeech.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ interfaces/kspeech/dcoptexttospeech.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -6,6 +6,7 @@
 Comment[af]=Tekste-tot-spraak diens met DCOP intervlak
 Comment[bg]=Синтез на глас с интерфейс DCOP
 Comment[bn]=ডিকপ (DCOP) ইন্টারফেস সহ টেক্সট-টু-স্পীচ সার্ভিস
+Comment[bs]=Servis za izgovaranje teksta sa DCOP interfejsom
 Comment[ca]=Servei de síntesi de veu amb una interfície DCOP
 Comment[cs]=Služba text-na-řeč s DCOP rozhraním
 Comment[cy]=Gwasanaeth Testun-i-Lafar efo rhyngwyneb DCOP
@@ -25,7 +26,7 @@
 Comment[hu]=Szövegfelolvasó szolgáltatás DCOP-felülettel
 Comment[is]=Texti-í-tal þjónusta með DCOP viðmóti
 Comment[it]=Servizio di pronuncia con un'interfaccia DCOP
-Comment[ja]=DCOP インターフェースと動作するテキストの読み上げサービス
+Comment[ja]=DCOP インターフェースで動作するテキスト読み上げサービス
 Comment[km]=សេវា អត្ថបទ-ទៅ-សំដី ដែលមានចំណុចប្រទាក់ DCOP
 Comment[lb]=Sproochausgab-Service mat engem DCOP-Interface
 Comment[lt]=Teksto vertimo kalba tarnyba su DCOP sąsaja
@@ -51,5 +52,6 @@
 Comment[tg]=Хизматгузории Мант-ба-Талаффуз бо интерфейси DCOP
 Comment[tt]=DCOP protokolı aşa eşläwçe Mäten-Uquçı Xezmät
 Comment[uk]=Служба синтезу мовлення з інтерфейсом DCOP
+Comment[vi]=Dịch vụ Văn bản sang Tiếng nói có giao diện DCOP
 Comment[zh_CN]=带 DCOP 接口的文本到语音服务
 Comment[zh_HK]=附有 DCOP 介面的文字朗讀工具
Index: interfaces/ktexteditor/ktexteditoreditor.desktop
===================================================================
--- interfaces/ktexteditor/ktexteditoreditor.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ interfaces/ktexteditor/ktexteditoreditor.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -71,7 +71,7 @@
 Comment[uk]=Компонент редактора текстів, який можна вбудовувати (без розділення документ/вигляд)
 Comment[uz]=Ичига ўрнатиб бўладиган матн таҳрирчи компоненти (ҳужжат/кўриниш имкониятсиз)
 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[vi]=Thành phần Soạn thảo Văn bản có nhúng được (không có khả năng phân cách tài liệu/khung xem)
 Comment[xh]=Ingxenye Yomhleli Wombhalo Olungiselekayo (ngaphandle Koxwebhu/Ulwahlulo Lwemboniselo)
 Comment[zh_CN]=可嵌入的文本编辑器部件(不带 文档/查看 分离)
 Comment[zh_HK]=可嵌入的文字編輯器元件 (Doc/View 不分開)
Index: interfaces/ktexteditor/kcm_ktexteditor.desktop
===================================================================
--- interfaces/ktexteditor/kcm_ktexteditor.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ interfaces/ktexteditor/kcm_ktexteditor.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -66,6 +66,7 @@
 Name[uk]=Вмонтований текстовий редактор
 Name[uz]=Ички матн таҳрирчи
 Name[ven]=Musengulusi wa manwalwa o dzheniswaho
+Name[vi]=Bộ Soạn thảo Văn bản nhúng
 Name[wa]=Ravalé aspougneu di tecse
 Name[xh]=Umhleli Wombhalo Olungiselelweyo
 Name[zh_CN]=嵌入式文本编辑器
@@ -102,7 +103,7 @@
 Comment[hu]=A szövegszerkesztő szolgáltatáson keresztül az alkalmazások szövegek megtekintését és szerkesztését végezhetik el. A KDE szövegszerkesztő programjai használhatják.
 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[ja]=テキストエディタサービスはアプリケーションにテキストビューアとテキストエディタを提供します。テキスト編集の機能を持つ 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.
@@ -138,6 +139,7 @@
 Comment[uk]=Служба "Текстовий редактор" постачає програми з переглядачем та редактором тексту. Програми KDE, які надають можливість редагування тексту, повинні користуватись цією службою.
 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[vi]=Dịch vụ soạn thảo văn bản cung cấp cho ứng dụng một bộ xem và soạn thảo văn bản. Các ứng dụng KDE mà cung cấp khả năng soạn thảo văn bản nên dùng dịch vụ này.
 Comment[xh]=Inkonzo yomhleli wombhalo onika izicelo ngombonisi wombhalo nomhleli Izicelo ze KDE ezinikezela ngohlelo lombhalo ekufuneka isebenzise lenkonzo.
 Comment[zh_CN]=文本编辑器服务提供了文本查看器和编辑器的应用程序。提供文本编辑功能的 KDE 应用程序都应该使用此服务。
 Comment[zh_HK]=文字編輯服務為各種程式提供一個檢視和編輯文字的介面。任何提供文字編輯功能的 KDE 程式都應該使用這項服務。
Index: interfaces/ktexteditor/ktexteditor.desktop
===================================================================
--- interfaces/ktexteditor/ktexteditor.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ interfaces/ktexteditor/ktexteditor.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -71,7 +71,7 @@
 Comment[uk]=Компонент редактора текстів, який можна вбудовувати (з розділенням документ/вигляд)
 Comment[uz]=Ичига ўрнатиб бўладиган матн таҳрирчи компоненти (ҳужжат/кўриниш имконияти билан)
 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[vi]=Thành phần Soạn thảo Văn bản có nhúng được (có khả năng phân cách tài liệu/khung xem)
 Comment[xh]=Inxenye Yomhleli Wombhalo Olungiselelweyo (ngo Xwebhu/Ulwahlulo Lwemboniselo)
 Comment[zh_CN]=可嵌入的文本编辑器部件(带 文档/查看 分离)
 Comment[zh_HK]=可嵌入的文字編輯器元件 (Doc/View 分開)
Index: interfaces/ktexteditor/ktexteditorplugin.desktop
===================================================================
--- interfaces/ktexteditor/ktexteditorplugin.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ interfaces/ktexteditor/ktexteditorplugin.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -35,7 +35,7 @@
 Comment[id]=Plugin KTextEditor
 Comment[is]=KTextEditor-íforrit
 Comment[it]=Plugin KTextEditor
-Comment[ja]=KTextEditorプラグイン
+Comment[ja]=KTextEditor プラグイン
 Comment[km]=កម្មវិធីជំនួយខាងក្នុង KTextEditor
 Comment[ko]=K글월편집기 플러그인
 Comment[lb]=KTextEditor-Plugin
@@ -72,6 +72,7 @@
 Comment[uk]=Втулок KTextEditor
 Comment[uz]=KTextEditor плагини
 Comment[ven]=Pulagini ya musengulusi wa manwalwa a K
+Comment[vi]=Bộ cầm phít Soạn thảo Văn bản
 Comment[wa]=Tchôke-divins KTextEditor
 Comment[xh]=KTextEditor ye Plagi efakiweyo
 Comment[zh_CN]=KTextEditor 插件
Index: kate/plugins/kdatatool/ktexteditor_kdatatool.desktop
===================================================================
--- kate/plugins/kdatatool/ktexteditor_kdatatool.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -65,6 +65,7 @@
 Name[uk]=Втулок KTextEditor KDataTool
 Name[uz]=KTextEditor KDataTool плагини
 Name[ven]=Pulagini ya tshishumiswa tsha data ya K ya musengulusi wa manwalwa a K
+Name[vi]=Bộ cầm phít Công cụ KData KTextEditor
 Name[wa]=Tchôke-divins KDataTool po KTextEditor
 Name[xh]=KTextEditor KDataTool Iplagi yangaphakathi
 Name[zh_CN]=KTextEditor KDataTool 插件
@@ -83,7 +84,7 @@
 Comment[cy]=Alluogi offer data fel theawrws a cywirydd sillafu (os maent wedi'u gosod)
 Comment[da]=Aktivér dataværktøjer som begrebsordbog og stavekontrol (hvis installeret)
 Comment[de]=Aktivierung von Dienstprogrammen wie Thesaurus und Rechtschreibprüfung (falls installiert)
-Comment[el]=Ενεργοποίηση εργαλειών δεδομένων όπως ο θησαυρός λέξεων και ο ορθογραφικός έλεγχος (εάν είναι εγκατεστημένα)
+Comment[el]=Ενεργοποίηση εργαλείων δεδομένων όπως ο θησαυρός λέξεων και ο ορθογραφικός έλεγχος (αν είναι εγκατεστημένα)
 Comment[eo]=Enŝaltu datumiloj kiel "thesaurus" kaj literumado (se instalita)
 Comment[es]=Activa herramientas como el thesaurus y el corrector ortográfico (si instalados)
 Comment[et]=Andmete tööriistad, näiteks thesaurus ja õigekirja kontroll
@@ -137,6 +138,7 @@
 Comment[uk]=Надає доступ до засобів на кшталт словників та перевірки правопису (якщо встановлені)
 Comment[uz]=Луғат ва имлони текшириш воситаларни ёқиш (агар ўрнатилган бўлса)
 Comment[ven]=U konisa zwishumiswa zwa data sa bugu nau sedza ha tshipelini (arali zwo dzheniswa)
+Comment[vi]=Hiệu lực công cụ dữ liệu như từ điển đồng nghĩa và bộ bắt lỗi chính tả (nếu được cài đặt).
 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[zh_CN]=启用像辞典(thesaurus)和拼写检查(spell check)这样的数据工具(如果安装了的话)
Index: kate/plugins/insertfile/ktexteditor_insertfile.desktop
===================================================================
--- kate/plugins/insertfile/ktexteditor_insertfile.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kate/plugins/insertfile/ktexteditor_insertfile.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -12,7 +12,7 @@
 Name[cy]=Ategyn Mewnosod Ffeil KTextEditor
 Name[da]=KTextEditor 'indsæt fil'-plugin
 Name[de]=KTextEditor-Plugin zum Einfügen von Dateien
-Name[el]=Προσθέτο εισαγωγής αρχείου του KTextEditor
+Name[el]=Πρόσθετο εισαγωγής αρχείου του KTextEditor
 Name[eo]=KTextEditor Enmetu-Dosieron-kromaĵo
 Name[es]=Plugin de inserción de archivos de KTextEditor
 Name[et]=KTextEditori faili lisamise plugin
@@ -20,7 +20,7 @@
 Name[fa]=متصل‌کننده‌ی پرونده‌ی ورود KTextEditor
 Name[fi]=KTextEditorin 'Lisää tiedosto'-laajennus
 Name[fr]=Module externe du fichier d'insertion de KTextEditor
-Name[fy]=KTextEditor-plugin foar it ynfoegjen fan triemen
+Name[fy]=KTextEditor-plugin foar it ynfoegjen fan triemmen
 Name[ga]=Breiseán KTextEditor chun comhad a ionsá
 Name[gl]=Plugin de Inserzón de Arquivo de KTextEditor
 Name[he]=תוסף הוספת קובץ ל־KTextEditor
@@ -30,7 +30,7 @@
 Name[id]=Plugin Penyisipan Berkas KTextEditor
 Name[is]=KTextEditor setja inn skrá íforrit
 Name[it]=Plugin inserimento file di KTextEditor
-Name[ja]=KTextEditorファイル挿入プラグイン
+Name[ja]=KTextEditor ファイル挿入プラグイン
 Name[km]=កម្មវិធីជំនួយរបស់ KTextEditor Insert File
 Name[ko]=K글월편집기 파일 끼워넣는 플러그인
 Name[lb]=KTextEditor-Plugin fir Dateien anzefügen
@@ -67,6 +67,7 @@
 Name[uk]=Втулок KTextEditor для вставлення файла
 Name[uz]=KTextEditor учун файлдан қўйиш плагин
 Name[ven]=Musengulusi wa manwalwa K i dzhenisa pulagini ya faela
+Name[vi]=Bộ cầm phít Chèn Tập tin KTextEditor
 Name[wa]=Tchôke-divins di KTextEditor po stitchî des fitchîs
 Name[xh]=KTextEditor Faka Ifayile ye Plagi efakiweyo
 Name[zh_CN]=KTextEditor 插入文件插件
@@ -126,6 +127,7 @@
 Comment[tt]=Kürsär urınına, uqıp bulğan birem eçtälegen tığıp östi
 Comment[uk]=Вставляє вміст будь-якого файла, який можна прочитати, у позицію курсора
 Comment[uz]=Ҳар қандай ўқиб бўладиган файлни курсорнинг жойидан қўйиш
+Comment[vi]=Chèn bất kỳ tập tin có khả năng đọc tại vị trí của con chạy.
 Comment[zh_CN]=在光标位置插入任何可读文件
 Comment[zh_HK]=在游標處插入任意的檔案
 X-KDE-Library=ktexteditor_insertfile
Index: kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop
===================================================================
--- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -53,6 +53,7 @@
 Name[tr]=KTextEditor Otomatik Sıkkullanılanlar Ekleyici
 Name[tt]=KTextEditor'nıñ Aqıllı Bitbilge
 Name[uk]=Втулок автоматичних закладок KTextEditor
+Name[vi]=Bộ Tự động Đánh dấu KTextEditor
 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.
@@ -106,7 +107,8 @@
 Comment[ta]= ஆவணங்கள் பதிவாகும் போது அமைப்பு புத்தகக்குறிப்பு கோடுகள் பொருத்தும் மாதிரி
 Comment[tg]=Аз рӯи қолиб сабт намудани замимаҳо дар ҳуҷҷат
 Comment[tt]=İstälek açqan çaqta sözgeçkä kileşkän yullarına bitbilgelär quya
-Comment[uk]=Встановлює закладки на рядках, що відповідають взірцю, при завантаженні документів
+Comment[uk]=Встановлює закладки на рядках, що відповідають взірцю, під час завантаження документів
+Comment[vi]=Đặt đánh dấu trên các dòng khớp một mẫu nào đó khi tải tài liệu.
 Comment[zh_CN]=文档装入时根据匹配模式自动设置书签
 X-KDE-Library=ktexteditor_autobookmarker
 ServiceTypes=KTextEditor/Plugin
Index: kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
===================================================================
--- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -8,7 +8,7 @@
 Name[cs]=Modul pro doplňování slov
 Name[da]=KTextEditor 'ord-kompletterings'-plugin
 Name[de]=KTextEditor-Plugin für Wortergänzungen
-Name[el]=Προσθέτο συμπλήρωσης λέξεων του KTextEditor
+Name[el]=Πρόσθετο συμπλήρωσης λέξεων του KTextEditor
 Name[eo]=KTextEditor Vortotutiga kromaĵo
 Name[es]=Plugin de completado de palabras de KTextEditor
 Name[et]=KTextEditori sõna lõpetamise plugin
@@ -24,7 +24,7 @@
 Name[hu]=KTextEditor szókiegészítő bővítőmodul
 Name[is]=KTextEditor íforrit til að klára orð
 Name[it]=Plugin completamento parole di KTextEditor
-Name[ja]=KTextEditor単語補完プラグイン
+Name[ja]=KTextEditor 単語補完プラグイン
 Name[km]=កម្មវិធីជំនួយបំពេញពាក្យរបស់ KTextEditor
 Name[ko]=K글월편집기 낱말 완성 플러그인
 Name[lb]=KTextEditor-Wuert-Vervollstännegungs-Plugin
@@ -54,6 +54,7 @@
 Name[tr]=KTextEditor Kelime Tamamlama Eklentisi
 Name[tt]=KTextEditor'nıñ Süz Tulılandıru Östämäse
 Name[uk]=Втулок KTextEditor для завершення слів
+Name[vi]=Bộ cầm phít Nhập xong Từ KTextEditor
 Name[zh_CN]=KTextEditor 单词补全插件
 Name[zh_HK]=KTextEditor 文字自動補齊外掛程式
 Comment=Directional or popup-based completion from words in the document
@@ -80,7 +81,7 @@
 Comment[hu]=Irány szerinti vagy felbukkanó kiegészítés dokumentum szavai alapján
 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[ja]=ポップアップまたはユーザの指示によってドキュメントの単語から補完します
 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
@@ -108,6 +109,7 @@
 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[vi]=Khả năng nhập xong từ trong tài liệu, đựa vào chiều hoặc vào bộ bật lên.
 Comment[zh_CN]=在文档中基于方向或弹出补全单词
 X-KDE-Library=ktexteditor_docwordcompletion
 ServiceTypes=KTextEditor/Plugin
Index: kate/plugins/isearch/ktexteditor_isearch.desktop
===================================================================
--- kate/plugins/isearch/ktexteditor_isearch.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kate/plugins/isearch/ktexteditor_isearch.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -65,6 +65,7 @@
 Name[uk]=Втулок KTextEditor для покрокового пошуку
 Name[uz]=KTextEditor кетма-кет қидириш плагини
 Name[ven]=Pulagini yau toda yo engedzeaho ya musengulusi wa manwalwa a K
+Name[vi]=Bộ cầm phít Tìm kiếm Dần dần KTextEditor
 Name[xh]=KTextEditor Iplagi yangaphakathi Yokuphendla Ngokunyukayo
 Name[zh_CN]=KTextEditor 增量搜索插件
 Name[zh_HK]=KTextEditor 漸進式搜尋外掛程式
@@ -125,6 +126,7 @@
 Comment[tr]=Ayrıca "Yazarken ararsın" olarak da bilinir
 Comment[tt]=Cıyılu belän beryulı ezli
 Comment[uk]=Також відомий як "Пошук за вводом"
+Comment[vi]=Cũng được biết như là « Tìm kiếm trong khi gõ ».
 Comment[zh_CN]=也称为“即输即搜”
 X-KDE-Library=ktexteditor_isearch
 ServiceTypes=KTextEditor/Plugin
Index: kate/part/katehighlight.cpp
===================================================================
--- kate/part/katehighlight.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kate/part/katehighlight.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -1331,7 +1331,7 @@
 *
 * @param prevLine The previous line, the context array is picked up from that if present.
 * @param textLine The text line to parse
- * @param foldinglist will be filled
+ * @param foldingList will be filled
 * @param ctxChanged will be set to reflect if the context changed
 */
 void KateHighlighting::doHighlight ( KateTextLine *prevLine,
Index: kate/part/katedocument.cpp
===================================================================
--- kate/part/katedocument.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kate/part/katedocument.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -699,6 +699,10 @@
 
 bool replacetabs = ( config()->configFlags() & KateDocumentConfig::cfReplaceTabsDyn && ! m_isInUndo );
 uint tw = config()->tabWidth();
+ uint insertPosExpanded = insertPos;
+ KateTextLine::Ptr l = m_buffer->line( line );
+ if (l != 0)
+ insertPosExpanded = l->cursorX( insertPos, tw );
 
 for (uint pos = 0; pos < len; pos++)
 {
@@ -706,28 +710,30 @@
 
 if (ch == '\n')
 {
+ editInsertText (line, insertPos, buf);
+
 if ( !blockwise )
 {
- editInsertText (line, insertPos, buf);
 editWrapLine (line, insertPos + buf.length());
+ insertPos = insertPosExpanded = 0;
 }
 else
 {
- editInsertText (line, col, buf);
-
 if ( line == lastLine() )
- editWrapLine (line, col + buf.length());
+ editWrapLine (line, insertPos + buf.length());
 }
 
 line++;
- insertPos = 0;
 buf.truncate(0);
+ l = m_buffer->line( line );
+ if (l)
+ insertPosExpanded = l->cursorX( insertPos, tw );
 }
 else
 {
 if ( replacetabs && ch == '\t' )
 {
- uint tr = tw - ( ((blockwise?col:insertPos)+buf.length())%tw ); //###
+ uint tr = tw - ( insertPosExpanded+buf.length() )%tw;
 for ( uint i=0; i < tr; i++ )
 buf += ' ';
 }
@@ -736,10 +742,7 @@
 }
 }
 
- if ( !blockwise )
- editInsertText (line, insertPos, buf);
- else
- editInsertText (line, col, buf);
+ editInsertText (line, insertPos, buf);
 
 editEnd ();
 emit textInserted(line,insertPos);
@@ -3097,29 +3100,7 @@
 if (pos < 0 || pos >= (int)colX)
 {
 // only spaces on left side of cursor
- // search a line with less spaces
- int y = line;
- while (--y >= 0)
- {
- // this is save, y <= line, and line was already success
- textLine = m_buffer->plainLine(y);
-
- pos = textLine->firstChar();
-
- if (pos >= 0)
- {
- pos = textLine->cursorX(pos, config()->tabWidth());
- if (pos < (int)colX)
- {
- replaceWithOptimizedSpace(line, col, pos, config()->configFlags());
- break;
- }
- }
- }
- if (y < 0) {
- // FIXME: what shoud we do in this case?
- removeText(line, 0, line, col+complement);
- }
+ indent( view, line, -1);
 }
 else
 removeText(line, col-1, line, col+complement);
Index: kate/part/katespell.cpp
===================================================================
--- kate/part/katespell.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kate/part/katespell.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -115,10 +115,13 @@
 
 int enc = ksEncodings.findIndex( m_view->doc()->encoding() );
 if ( enc > -1 )
+ {
 ksc->setEncoding( enc );
+ kdDebug(13020)<<"KateSpell::spellCheck(): using encoding: "<<enc<<" ("<<ksEncodings[enc]<<") and KSpell::Type "<<type<<" (for '"<<mt<<"')"<<endl;
+ }
+ else
+ kdDebug(13020)<<"KateSpell::spellCheck(): using encoding: "<<enc<<" and KSpell::Type "<<type<<" (for '"<<mt<<"')"<<endl;
 
- kdDebug(13020)<<"KateSpell::spellCheck(): using encoding: "<<enc<<" ("<<ksEncodings[enc]<<") and KSpell::Type "<<type<<" (for '"<<mt<<"')"<<endl;
-
 m_kspell = new KSpell( m_view, i18n("Spellcheck"),
 this, SLOT(ready(KSpell *)), ksc, true, true, type );
 
Index: kate/part/katedialogs.cpp
===================================================================
--- kate/part/katedialogs.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kate/part/katedialogs.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -1634,7 +1634,7 @@
 // Start a KProcess that creates a diff
 KProcIO *p = new KProcIO();
 p->setComm( KProcess::All );
- *p << "diff" << "-ub" << "-" << m_doc->url().path();
+ *p << "diff" << "-u" << "-" << m_doc->url().path();
 connect( p, SIGNAL(processExited(KProcess*)), this, SLOT(slotPDone(KProcess*)) );
 connect( p, SIGNAL(readReady(KProcIO*)), this, SLOT(slotPRead(KProcIO*)) );
 
@@ -1644,7 +1644,7 @@
 
 uint lastln = m_doc->numLines();
 for ( uint l = 0; l < lastln; l++ )
- p->writeStdin( m_doc->textLine( l ), l < lastln );
+ p->writeStdin( m_doc->textLine( l ) );
 
 p->closeWhenDone();
 }
@@ -1656,15 +1656,32 @@
 m_tmpfile = new KTempFile();
 // put all the data we have in it
 QString stmp;
+ bool dataRead = false;
 while ( p->readln( stmp, false ) > -1 )
+ {
 *m_tmpfile->textStream() << stmp << endl;
+ dataRead = true;
+ }
 
- p->ackRead();
+ // dominik: only ackRead(), when we *really* read data, otherwise, this slot
+ // is called initity times, which leads to a crash
+ if( dataRead )
+ p->ackRead();
 }
 
 void KateModOnHdPrompt::slotPDone( KProcess *p )
 {
 setCursor( ArrowCursor );
+ if( ! m_tmpfile )
+ {
+ // dominik: there were only whitespace changes, so that the diff returned by
+ // diff(1) has 0 bytes. So slotPRead() is never called, as there is
+ // no data, so that m_tmpfile was never created and thus is NULL.
+ // NOTE: would be nice, if we could produce a fake-diff, so that kompare
+ // tells us "The files are identical". Right now, we get an ugly
+ // "Could not parse diff output".
+ m_tmpfile = new KTempFile();
+ }
 m_tmpfile->close();
 
 if ( ! p->normalExit() /*|| p->exitStatus()*/ )
Index: kate/scripts/jstest.desktop
===================================================================
--- kate/scripts/jstest.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kate/scripts/jstest.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -42,10 +42,12 @@
 Name[tg]=Санҷиши Қисми Kate-и JavaScript
 Name[tt]=Kate Part JavaScript Sınaw
 Name[uk]=Перевірка скриптів JavaScript в компоненті Kate
+Name[vi]=Thử ra JavaScript phần Kate
 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
 Comment[bg]=Скрипт за тестване на модулите за поддръжка на скриптове
+Comment[bs]=Skripta za testiranje podrške Kate part-a za skriptiranje
 Comment[ca]=Guió per a provar l'escriptat de les peces Kate
 Comment[cs]=Skript pro test skriptování Kate
 Comment[da]=Script til at teste katepart scripter
@@ -62,7 +64,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[ja]=kate part のスクリプト機能のテスト用スクリプト
+Comment[ja]=kate part のスクリプトをテストするためのスクリプト
 Comment[km]=ស្គ្រីបសម្រាប់សាកល្បងការសរសេររបស់ kate part
 Comment[lb]=Skript fir d'Skriptfunktioune vum Kate part ze testen
 Comment[lt]=Scenarijus kate part scenarijų patikrinimui
@@ -87,6 +89,7 @@
 Comment[tg]=Скрипт барои санҷидани скриптгузории қисми kate
 Comment[tt]=Kate Part'nıñ ämerleklären sınawçı qoral
 Comment[uk]=Скрипт для перевірки підтримки скриптів в компоненті Kate
+Comment[vi]=Tập lệnh để thử ra khả năng điều khiển bằng tập lệnh của phần Kate.
 Comment[zh_CN]=测试 kate 部件脚本的脚本
 X-Kate-Command=jstest
 X-Kate-Help=Usage: <code>jstest</code>
Index: kate/data/progress.xml
===================================================================
--- kate/data/progress.xml	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kate/data/progress.xml	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="progress" version="1.08" kateversion="2.4" section="Database" extensions="*.p;*.w;*.i" author="Rares Stanciulescu (rstanciu@operamail.com)" license="GPL">
+<language name="progress" version="1.09" kateversion="2.4" section="Database" extensions="*.p;*.w;*.i;*.cls" author="Rares Stanciulescu (rstanciu@operamail.com)" license="GPL">
 
 <highlighting>
 
@@ -31,20 +31,11 @@
 <item> TEMP-TABLE </item>
 <item> BUFFER </item>
 <item> STREAM </item>
+ <item> SAX-WRITER </item>
 <item> MEMPTR </item>
 </list>
 
 <list name="operators">
- <item> + </item>
- <item> - </item>
- <item> * </item>
- <item> / </item>
- <item> = </item>
- <item> &lt; </item>
- <item> &gt; </item>
- <item> &lt;= </item>
- <item> &gt;= </item>
- <item> &lt;&gt; </item>
 <item> AND </item>
 <item> OR </item>
 <item> NOT </item>
@@ -82,6 +73,8 @@
 
 <list name="phrases">
 <item> AS </item>
+ <item> WORD-INDEX </item>
+ <item> LIKE </item>
 <item> ALERT-BOX </item>
 <item> AT </item>
 <item> COLOR </item>
@@ -148,9 +141,17 @@
 <item> NO-ECHO </item>
 <item> NO-MAP </item>
 <item> PRIVATE </item>
+ <item> PUBLIC </item>
+ <item> PROTECTED </item>
 </list>
 
 <list name="functions">
+ <item> output-content-type </item>
+ <item> get-value </item>
+ <item> get-cgi </item>
+ <item> get-field </item>
+ <item> html-encode </item>
+ <item> url-encode </item> 
 <item> ABSOLUTE </item>
 <item> ACCUM </item>
 <item> ADD-INTERVAL </item>
@@ -577,6 +578,7 @@
 <item> DEFAULT-WINDOW </item>
 <item> ERROR-STATUS </item>
 <item> FILE-INFO </item>
+ <item> FIELD </item>
 <item> FOCUS </item>
 <item> FONT-TABLE </item>
 <item> LAST-EVENT </item>
@@ -611,7 +613,6 @@
 <item> HONORPROKEYS </item>
 <item> HONORRETURNKEY </item>
 <item> LEFT </item>
- <item> NAME </item>
 <item> TOP </item>
 <item> WIDTH </item>
 <item> TAG </item>
@@ -934,7 +935,6 @@
 <item> MULTIPLE </item>
 <item> MULTITASKING-INTERVAL </item>
 <item> MUST-UNDERSTAND </item>
- <item> NAME </item>
 <item> NAMESPACE-PREFIX </item>
 <item> NAMESPACE-URI </item>
 <item> NEEDS-APPSERVER-PROMPT </item>
@@ -1163,6 +1163,22 @@
 <item> XML-SUPPRESS-NAMESPACE-PROCESSING </item>
 <item> Y </item>
 <item> YEAR-OFFSET </item>
+ <item> WRITE-XMLSCHEMA </item>
+ <item> WRITE-XML </item>
+ <item> READ-XML </item>
+ <item> NESTED </item>
+ <item> XML-DATA-TYPE </item>
+ <item> XML-NODE-TYPE </item>
+ <item> FORMATTED </item>
+ <item> SET-OUTPUT-DESTINATION </item>
+ <item> START-DOCUMENT </item>
+ <item> START-ELEMENT </item>
+ <item> WRITE-CHARACTERS </item>
+ <item> END-ELEMENT </item>
+ <item> END-DOCUMENT </item>
+ <item> WRITE-DATA-ELEMENT </item>
+ <item> INSERT-ATTRIBUTE </item>
+ 
 </list>
 
 <list name="methods">
@@ -1489,7 +1505,7 @@
 <DetectChar attribute="Comment" context="Identifier" char='"'/>
 <DetectChar attribute="String" context="#stay" char='"'/>
 <DetectChar attribute="String" context="#stay" char="'"/>
- <AnyChar attribute="Symbol" context="#stay" String="{}[]()~:"/>
+ <AnyChar attribute="Symbol" context="#stay" String="+-*=/\?~{}[]():."/>
 
 <StringDetect attribute="Region Marker" context="#stay"
 String="PROCEDURE" insensitive="TRUE"
@@ -1504,7 +1520,27 @@
 <StringDetect attribute="Region Marker" context="#stay"
 String="END FUNCTION" insensitive="TRUE"
 endRegion="F1" firstNonSpace="TRUE"/>
+
+ <StringDetect attribute="Region Marker" context="#stay"
+ String="CLASS" insensitive="TRUE"
+ beginRegion="C1" firstNonSpace="TRUE"/>
+ <StringDetect attribute="Region Marker" context="#stay"
+ String="END CLASS" insensitive="TRUE"
+ endRegion="C1" firstNonSpace="TRUE"/>
 
+ <StringDetect attribute="Region Marker" context="#stay"
+ String="METHOD" insensitive="TRUE"
+ beginRegion="M1" firstNonSpace="TRUE"/>
+ <StringDetect attribute="Region Marker" context="#stay"
+ String="END METHOD" insensitive="TRUE"
+ endRegion="M1" firstNonSpace="TRUE"/> 
+ <StringDetect attribute="Region Marker" context="#stay"
+ String="CONSTRUCTOR" insensitive="TRUE"
+ beginRegion="CN1" firstNonSpace="TRUE"/>
+ <StringDetect attribute="Region Marker" context="#stay"
+ String="END CONSTRUCTOR" insensitive="TRUE"
+ endRegion="CN1" firstNonSpace="TRUE"/> 
+ 
 <StringDetect attribute="Function" context="#stay"
 String="DO:" insensitive="TRUE"
 beginRegion="L1" firstNonSpace="FALSE"/>
@@ -1521,6 +1557,7 @@
 String="END" insensitive="TRUE"
 endRegion="L1" firstNonSpace="TRUE"/>
 
+ 
 </context>
 <context name="String" attribute="String" lineEndContext="#stay">
 <LineContinue attribute="String" context="#pop"/>
Index: kate/data/lua.xml
===================================================================
--- kate/data/lua.xml	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kate/data/lua.xml	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Lua" version="0.22" kateversion="2.3" section="Scripts" extensions="*.lua" mimetype="text/x-lua">
+<language name="Lua" version="0.23" kateversion="2.3" section="Scripts" extensions="*.lua" mimetype="text/x-lua">
 <highlighting>
 <list name="keywords">
 <item> and </item>
@@ -19,7 +19,7 @@
 <item> else </item>
 <item> or </item>
 <item> while </item>
- <item> elsif </item>
+ <item> elseif </item>
 <item> in </item>
 <item> repeat </item>
 </list>
Index: kate/data/katepart.desktop
===================================================================
--- kate/data/katepart.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kate/data/katepart.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,6 +69,7 @@
 Name[uk]=Вмонтований потужний текстовий редактор
 Name[uz]=Матн таҳрирчи
 Name[ven]=Musengulusi wa manwalwa a nthesa o dzheniswaho
+Name[vi]=Bộ Soạn thảo Văn bản Cấp cao Nhúng
 Name[wa]=Ravalé aspougneu di tecse avancî
 Name[xh]=Umhleli Wombhalo Obhekisa phambili Olungiselweyo
 Name[zh_CN]=嵌入式 KDE 高级文本编辑器
Index: kate/data/ada.xml
===================================================================
--- kate/data/ada.xml	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kate/data/ada.xml	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -73,14 +73,16 @@
 <context attribute="Normal Text" lineEndContext="#stay" name="Default">
 <RegExpr attribute="Keyword" context="#stay" String="if " insensitive="TRUE" beginRegion="Region1" firstNonSpace="true"/>
 <StringDetect attribute="Keyword" context="#stay" String="end if" insensitive="TRUE" endRegion="Region1"/>
- <RegExpr attribute="Keyword" context="#stay" String="case " insensitive="TRUE" beginRegion="Region2" firstNonSpace="true"/>
- <StringDetect attribute="Keyword" context="#stay" String="end case" insensitive="TRUE" endRegion="Region2"/>
 <RegExpr attribute="Keyword" context="#stay" String="\sloop\s+" insensitive="TRUE" beginRegion="Region3"/>
 <RegExpr attribute="Keyword" context="#stay" String="\sloop$" insensitive="TRUE" beginRegion="Region3"/>
 <StringDetect attribute="Keyword" context="#stay" String="end loop;" insensitive="TRUE" endRegion="Region3"/>
 <RegExpr attribute="Keyword" context="#stay" String="\sselect\s+" insensitive="TRUE" beginRegion="Region4"/>
 <RegExpr attribute="Keyword" context="#stay" String="\sselect$" insensitive="TRUE" beginRegion="Region4"/>
 <StringDetect attribute="Keyword" context="#stay" String="end select;" insensitive="TRUE" endRegion="Region4"/>
+ <RegExpr attribute="Keyword" context="#stay" String="\b(begin|case|record)\b" insensitive="true" beginRegion="Region5"/>
+ <RegExpr attribute="Keyword" context="#stay" String="\bend(?=((\{[^}]*(\}|$)|$\*.*(\*$|$))*)([.;\s]|$)|//|$)" insensitive="true" endRegion="Region5"/>
+ <StringDetect attribute="Region Marker" context="Region Marker" String="-- BEGIN" beginRegion="RegionMarker" firstNonSpace="true" />
+ <StringDetect attribute="Region Marker" context="Region Marker" String="-- END" endRegion="RegionMarker" firstNonSpace="true" />
 <keyword attribute="Keyword" context="#stay" String="keywords"/>
 <Float attribute="Float" context="#stay"/>
 <Int attribute="Decimal" context="#stay"/>
@@ -88,6 +90,7 @@
 <DetectChar attribute="String" context="String" char="&quot;"/>
 <Detect2Chars attribute="Comment" context="Comment" char="-" char1="-"/>
 </context>
+ <context attribute="Region Marker" lineEndContext="#pop" name="Region Marker"/>
 <context attribute="String" lineEndContext="#pop" name="String">
 <DetectChar attribute="String" context="#pop" char="&quot;"/>
 </context>
@@ -102,6 +105,7 @@
 <itemData name="Char" defStyleNum="dsChar" />
 <itemData name="String" defStyleNum="dsString" />
 <itemData name="Comment" defStyleNum="dsComment" />
+ <itemData name="Region Marker" defStyleNum="dsRegionMarker" />
 </itemDatas>
 </highlighting>
 <general>
Index: kate/data/ruby.xml
===================================================================
--- kate/data/ruby.xml	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kate/data/ruby.xml	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -34,7 +34,7 @@
 -->
 
 
-<language name="Ruby" version="1.17" kateversion="2.4" section="Scripts" extensions="*.rb;*.rxml" mimetype="application/x-ruby" author="Stefan Lang (langstefan@gmx.at), Sebastian Vuorinen (sebastian.vuorinen@helsinki.fi)" license="LGPL">
+<language name="Ruby" version="1.17" kateversion="2.4" section="Scripts" extensions="*.rb;*.rjs;*.rxml" mimetype="application/x-ruby" author="Stefan Lang (langstefan@gmx.at), Sebastian Vuorinen (sebastian.vuorinen@helsinki.fi)" license="LGPL">
 	
 	<highlighting>
 	
Index: kate/data/ilerpg.xml
===================================================================
--- kate/data/ilerpg.xml	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kate/data/ilerpg.xml	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -1,47 +1,262 @@
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="ILERPG" version="1.03" kateversion="2.1" section="Sources" extensions="QRPGLESRC.*" mimetype="text/x-ilerpg-src" casesensitive="0">
+
+
+<language name="ILERPG" version="1.05" kateversion="2.1" section="Sources" extensions="QRPG*.*;qrpg*.*" mimetype="text/x-ilerpg-src" casesensitive="0">
 <highlighting>
+ <list name="dkeywords">
+	 <item> EXTPROC </item>
+	 <item> EXTPGM </item>
+	 <item> OPDESC </item>
+	 <item> DATFMT </item>
+	 <item> DIM </item>
+	 <item> LIKEDS </item>
+	 <item> LIKEREC </item>
+	 <item> LIKE </item>
+	 <item> PROCPTR </item>
+	 <item> TIMFMT </item>
+	 <item> VARYING </item>
+	 <item> ASCEND </item>
+	 <item> CONST </item>
+	 <item> NOOPT </item>
+	 <item> OPTIONS </item>
+	 <item> VALUE </item>
+	 <item> QUALIFIED </item>
+	 <item> INZ </item>
+	 <item> BASED </item>
+ </list> 
+ <list name="pkeywords">
+	 <item> DATFMT </item>
+	 <item> DIM </item>
+	 <item> LIKE </item>
+	 <item> LIKEDS </item>
+	 <item> LIKEREC </item>
+	 <item> PROCPTR </item>
+	 <item> TIMFMT </item>
+ </list> 
+ <list name="directives">
+	 <item> FREE </item>
+	 <item> END-FREE </item>
+	 <item> TITLE </item>
+	 <item> EJECT </item>
+	 <item> SPACE </item>
+	 <item> COPY </item>
+	 <item> INCLUDE </item>
+	 <item> DEFINE </item>
+	 <item> UNDEFINE </item>
+	 <item> IF </item>
+	 <item> ELSE </item>
+	 <item> EXEC </item>
+	 <item> END-EXEC </item>
+	 <item> ELSEIF </item>
+	 <item> ENDIF </item>
+	 <item> EOF </item>
+ </list> 
+ <list name="directives2">
+	 <item> NOT </item>
+	 <item> DEFINED </item>
+ </list> 
+ <list name="directives3">
+	 <item> DEFINED </item>
+ </list> 
 <list name="biffs">
- <item> ABS </item>
- <item> ADDR </item>
- <item> CHAR </item>
- <item> DECH </item>
- <item> DECPOS </item>
- <item> DEC </item>
- <item> EDITC </item>
- <item> EDITFLT </item>
- <item> EDITW </item>
- <item> ELEM </item>
- <item> EOF </item>
- <item> EQUAL </item>
- <item> ERROR </item>
- <item> FLOAT </item>
- <item> FOUND </item>
- <item> INTH </item>
- <item> INT </item>
- <item> LEN </item>
- <item> NULLIND </item>
- <item> OPEN </item>
- <item> PADDR </item>
- <item> PARMS </item>
- <item> REPLACE </item>
- <item> SCAN </item>
- <item> SIZE </item>
- <item> STATUS </item>
- <item> STR </item>
- <item> SUBST </item>
- <item> TRIMR </item>
- <item> TRIML </item>
- <item> TRIM </item>
- <item> UNSH </item>
- <item> UNS </item>
+	 <item> ABS </item>
+	 <item> ADDR </item>
+	 <item> ALLOC </item>
+	 <item> BITAND </item>
+	 <item> BITNOT </item>
+	 <item> BITOR </item>
+	 <item> BITXOR </item>
+	 <item> CHAR </item>
+	 <item> CHECK </item>
+	 <item> CHECKR </item>
+	 <item> DATE </item>
+	 <item> DAYS </item>
+	 <item> DEC </item>
+	 <item> DECH </item>
+	 <item> DECPOS </item>
+	 <item> DIFF </item>
+	 <item> DIV </item>
+	 <item> EDITC </item>
+	 <item> EDITFLT </item>
+	 <item> EDITW </item>
+	 <item> ELEM </item>
+	 <item> EOF </item>
+	 <item> EQUAL </item>
+	 <item> ERROR </item>
+	 <item> FIELDS </item>
+	 <item> FLOAT </item>
+	 <item> FOUND </item>
+	 <item> GRAPH </item>
+	 <item> HOURS </item>
+	 <item> INT </item>
+	 <item> INTH </item>
+	 <item> KDS </item>
+	 <item> LEN </item>
+	 <item> LOOKUP </item>
+	 <item> LOOKUPLT </item>
+	 <item> LOOKUPLE </item>
+	 <item> LOOKUPGT </item>
+	 <item> LOOKUPGE </item>
+	 <item> MINUTES </item>
+	 <item> MONTHS </item>
+	 <item> MSECONDS </item>
+	 <item> NULLIND </item>
+	 <item> OCCUR </item>
+	 <item> OPEN </item>
+	 <item> PADDR </item>
+	 <item> PARMS </item>
+	 <item> REALLOC </item>
+	 <item> REM </item>
+	 <item> REPLACE </item>
+	 <item> SCAN </item>
+	 <item> SECONDS </item>
+	 <item> SHTDN </item>
+	 <item> SIZE </item>
+	 <item> SQRT </item>
+	 <item> STATUS </item>
+	 <item> STR </item>
+	 <item> SUBARR </item>
+	 <item> SUBDT </item>
+	 <item> SUBST </item>
+	 <item> THIS </item>
+	 <item> TIME </item>
+	 <item> TIMESTAMP </item>
+	 <item> TLOOKUP </item>
+	 <item> TLOOKUPLT </item>
+	 <item> TLOOKUPLE </item>
+	 <item> TLOOKUPGT </item>
+	 <item> TLOOKUPGE </item>
+	 <item> TRIM </item>
+	 <item> TRIML </item>
+	 <item> TRIMR </item>
+	 <item> UCS2 </item>
+	 <item> UNS </item>
+	 <item> UNSH </item>
+	 <item> XFOOT </item>
+	 <item> XLATE </item>
+	 <item> YEARS </item>
 </list>
- <list name="opcodes">
- <item> Z-ADD </item>
- <item> Z-SUB </item>
+	 <list name="evalopcodes2">
+		 <item> IF </item>
+	 </list>
+	 <list name="evalopcodes3">
+		 <item> DOW </item>
+		 <item> DOU </item>
+		 <item> FOR </item>
+	 </list>
+	 <list name="evalopcodes4">
+		 <item> WHEN </item>
+		 <item> EVAL </item>
+	 </list>
+	 <list name="evalopcodes5">
+		 <item> EVALR </item>
+	 </list>
+	 <list name="evalopcodes6">
+		 <item> RETURN </item>
+	 </list>
+	 <list name="evalopcodes8">
+		 <item> ON-ERROR </item>
+	 </list>
+ <list name="nonevalopcodes2">
+	 <item> DO </item>
+	 <item> IN </item>
+	 <item> OR </item>
+	 </list>
+	 <list name="nonevalopcodes3">
 <item> ACQ </item>
- <item> ADDDUR </item>
- <item> ADD </item>
+	 <item> ADD </item>
+	 <item> AND </item>
+	 <item> CAB </item>
+	 <item> CAS </item>
+	 <item> CAT </item>
+	 <item> DIV </item>
+	 <item> DOU </item>
+	 <item> END </item>
+	 <item> MVR </item>
+	 <item> OUT </item>
+	 <item> REL </item>
+	 <item> SUB </item>
+	 <item> TAG </item>
+ </list>
+	 <list name="nonevalopcodes4">
+	 <item> CALL </item>
+	 <item> COMP </item>
+	 <item> DUMP </item>
+	 <item> ELSE </item>
+	 <item> EXSR </item>
+	 <item> FEOD </item>
+	 <item> GOTO </item>
+	 <item> IFGT </item>
+	 <item> IFLT </item>
+	 <item> IFEQ </item>
+	 <item> IFNE </item>
+	 <item> IFGE </item>
+	 <item> IFLE </item>
+	 <item> ITER </item>
+	 <item> KFLD </item>
+	 <item> MOVE </item>
+	 <item> MULT </item>
+	 <item> NEXT </item>
+	 <item> OPEN </item>
+	 <item> ORGT </item>
+	 <item> ORLT </item>
+	 <item> OREQ </item>
+	 <item> ORNE </item>
+	 <item> ORGE </item>
+	 <item> ORLE </item>
+	 <item> PARM </item>
+	 <item> POST </item>
+	 <item> READ </item>
+	 <item> SCAN </item>
+	 <item> SQRT </item>
+	 <item> TEST </item>
+	 <item> TIME </item>
+ </list>
+	 <list name="nonevalopcodes5">
 <item> ALLOC </item>
 <item> ANDGT </item>
 <item> ANDLT </item>
@@ -49,9 +264,7 @@
 <item> ANDNE </item>
 <item> ANDGE </item>
 <item> ANDLE </item>
- <item> AND </item>
 <item> BEGSR </item>
- <item> BITOFF </item>
 <item> BITON </item>
 <item> CABGT </item>
 <item> CABLT </item>
@@ -59,126 +272,85 @@
 <item> CABNE </item>
 <item> CABGE </item>
 <item> CABLE </item>
- <item> CAB </item>
 <item> CALLB </item>
 <item> CALLP </item>
- <item> CALL </item>
 <item> CASGT </item>
 <item> CASLT </item>
 <item> CASEQ </item>
 <item> CASNE </item>
 <item> CASGE </item>
 <item> CASLE </item>
- <item> CAS </item>
- <item> CAT </item>
- <item> CHAIN </item>
+	 <item> CHAIN </item>
+	 <item> CHECK </item>
+	 <item> CLEAR </item>
+	 <item> CLOSE </item>
+	 <item> CHECK </item>
+	 <item> CLEAR </item>
+	 <item> CLOSE </item>
+	 <item> DOWGT </item>
+	 <item> DOWLT </item>
+	 <item> DOWEQ </item>
+	 <item> DOWNE </item>
+	 <item> DOWGE </item>
+	 <item> DOWLE </item>
+	 <item> DOUGT </item>
+	 <item> DOULT </item>
+	 <item> DOUEQ </item>
+	 <item> DOUNE </item>
+	 <item> DOUGE </item>
+	 <item> DOULE </item>
+	 <item> DSPLY </item>
+	 <item> ENDCS </item>
+	 <item> ENDDO </item>
+	 <item> ENDIF </item>
+	 <item> ENDSL </item>
+	 <item> ENDSR </item>
+	 <item> EXFMT </item>
+	 <item> FORCE </item>
+	 <item> KLIST </item>
+	 <item> LEAVE </item>
+	 <item> MHHZO </item>
+	 <item> MHLZO </item>
+	 <item> MLHZO </item>
+	 <item> MLLZO </item>
+	 <item> MOVEA </item>
+	 <item> MOVEL </item>
+	 <item> OCCUR </item>
+	 <item> OTHER </item>
+	 <item> PLIST </item>
+	 <item> READC </item>
+	 <item> READE </item>
+	 <item> READP </item>
+	 <item> RESET </item>
+	 <item> ROLBK </item>
+	 <item> SETGT </item>
+	 <item> SETLL </item>
+	 <item> SETON </item>
+	 <item> SHTDN </item>
+	 <item> SORTA </item>
+	 <item> SUBST </item>
+	 <item> TESTB </item>
+	 <item> TESTN </item>
+	 <item> TESTZ </item>
+	 <item> WRITE </item>
+	 <item> XFOOT </item>
+	 <item> XLATE </item>
+ </list>
+	<list name="nonevalopcodes6">
+	 <item> ADDDUR </item>
+	 <item> BITOFF </item>
 <item> CHECKR </item>
- <item> CHECK </item>
- <item> CLEAR </item>
- <item> CLOSE </item>
 <item> COMMIT </item>
- <item> COMP </item>
- <item> DEALLOC </item>
 <item> DEFINE </item>
 <item> DELETE </item>
- <item> DIV </item>
- <item> DOWGT </item>
- <item> DOWLT </item>
- <item> DOWEQ </item>
- <item> DOWNE </item>
- <item> DOWGE </item>
- <item> DOWLE </item>
- <item> DOUGT </item>
- <item> DOULT </item>
- <item> DOUEQ </item>
- <item> DOUNE </item>
- <item> DOUGE </item>
- <item> DOULE </item>
- <item> DOU </item>
- <item> DOW </item>
- <item> DO </item>
- <item> DSPLY </item>
- <item> DUMP </item>
- <item> ELSE </item>
- <item> ENDCS </item>
- <item> ENDDO </item>
- <item> ENDIF </item>
- <item> ENDSL </item>
- <item> ENDSR </item>
- <item> END </item>
- <item> EVAL </item>
- <item> EXCEPT </item>
- <item> EXFMT </item>
- <item> EXSR </item>
- <item> EXTRCT </item>
- <item> FEOD </item>
- <item> FORCE </item>
- <item> GOTO </item>
- <item> IFGT </item>
- <item> IFLT </item>
- <item> IFEQ </item>
- <item> IFNE </item>
- <item> IFGE </item>
- <item> IFLE </item>
- <item> IF </item>
- <item> IN </item>
- <item> ITER </item>
- <item> KFLD </item>
- <item> KLIST </item>
- <item> LEAVE </item>
+	 <item> EXCEPT </item>
+	 <item> EXTRCT </item>
 <item> LOOKUP </item>
- <item> MHHZO </item>
- <item> MHLZO </item>
- <item> MLHZO </item>
- <item> MLLZO </item>
- <item> MOVE </item>
- <item> MOVEA </item>
- <item> MOVEL </item>
- <item> MULT </item>
- <item> MVR </item>
- <item> NEXT </item>
- <item> OCCUR </item>
- <item> OPEN </item>
- <item> ORGT </item>
- <item> ORLT </item>
- <item> OREQ </item>
- <item> ORNE </item>
- <item> ORGE </item>
- <item> ORLE </item>
- <item> OR </item>
- <item> OTHER </item>
- <item> OUT </item>
- <item> PARM </item>
- <item> PLIST </item>
- <item> POST </item>
- <item> READC </item>
- <item> READE </item>
- <item> READPE </item>
- <item> READP </item>
- <item> READ </item>
- <item> REALLOC </item>
- <item> REL </item>
- <item> RESET </item>
- <item> RETURN </item>
- <item> ROLBK </item>
- <item> SCAN </item>
- <item> SELECT </item>
- <item> SETGT </item>
- <item> SETLL </item>
- <item> SETOFF </item>
- <item> SETON </item>
- <item> SHTDN </item>
- <item> SORTA </item>
- <item> SQRT </item>
- <item> SUBDUR </item>
- <item> SUBST </item>
- <item> SUB </item>
- <item> TAG </item>
- <item> TESTB </item>
- <item> TESTN </item>
- <item> TESTZ </item>
- <item> TEST </item>
- <item> TIME </item>
+	 <item> READPE </item>
+	 <item> RETURN </item>
+	 <item> SELECT </item>
+	 <item> SETOFF </item>
+	 <item> SUBDUR </item>
 <item> UNLOCK </item>
 <item> UPDATE </item>
 <item> WHENGT </item>
@@ -187,65 +359,341 @@
 <item> WHENNR </item>
 <item> WHENGE </item>
 <item> WHENLE </item>
- <item> WHEN </item>
- <item> WRITE </item>
- <item> XFOOT </item>
- <item> XLATE </item>
- <item> *BLANKS </item>
- </list>
+ </list>
+	<list name="nonevalopcodes7">
+		<item> DEALLOC </item>
+		<item> REALLOC </item>
+	</list>
+	<list name="freeopcodes">
+		<item> ACQ </item>
+		<item> BEGSR </item>
+		<item> CALLP </item>
+		<item> CHAIN </item>
+		<item> CLEAR </item>
+		<item> CLOSE </item>
+		<item> COMMIT </item>
+		<item> DEALLOC </item>
+		<item> DELETE </item>
+		<item> DOU </item>
+		<item> DOW </item>
+		<item> DSPLY </item>
+		<item> DUMP </item>
+		<item> ELSE </item>
+		<item> ELSEIF</item>
+		<item> ENDDO </item>
+		<item> ENDFOR </item>
+		<item> ENDIF </item>
+		<item> ENDMON </item>
+		<item> ENDSL </item>
+		<item> ENDSR </item>
+		<item> EVAL </item>
+		<item> EVALR </item>
+		<item> EXCEPT </item>
+		<item> EXFMT </item>
+		<item> EXSR </item>
+		<item> FEOD </item>
+		<item> FOR </item>
+		<item> FORCE </item>
+		<item> IF </item>
+		<item> IN </item>
+		<item> ITER </item>
+		<item> LEAVE </item>
+		<item> LEAVESR</item>
+		<item> MONITOR </item>
+		<item> NEXT </item>
+		<item> ON-ERROR </item>
+		<item> OPEN </item>
+		<item> OTHER </item>
+		<item> OUT </item>
+		<item> POST </item>
+		<item> READ </item>
+		<item> READC </item>
+		<item> READE </item>
+		<item> READP </item>
+		<item> READPE </item>
+		<item> REL </item>
+		<item> RESET </item>
+		<item> RETURN </item>
+		<item> ROLBK </item>
+		<item> SELECT </item>
+		<item> SETGT </item>
+		<item> SETLL </item>
+		<item> SORTA </item>
+		<item> TEST </item>
+		<item> UNLOCK </item>
+		<item> UPDATE </item>
+		<item> WHEN </item>
+		<item> WRITE </item>
+	</list>
 
 <contexts>
+ 
+
+	
+	<context name="Default" attribute="Normal Text" lineEndContext="#stay">
+		<RegExpr attribute="Comment" context="Comments" String="[PpOoIiHhFfDdCc ]?\*"/>
+		<RegExpr attribute="Directive" context="Directives" String="[PpOoIiHhFfDdCc ]?/"/>
+		<AnyChar attribute="Keyword" context="AnyCode" String="OoIiHhFf"/>
+		<AnyChar attribute="Keyword" context="D" String="Dd"/>
+		<AnyChar attribute="Keyword" context="P" String="Pp"/>
+		<AnyChar attribute="Keyword" context="CControlLevel" String="Cc"/>
+	</context>
+	
+
+	
+	<context name="CControlLevel" attribute="Normal Text" lineEndContext="#pop">
+		<RegExpr attribute="Indicator" context="CIndicators" String="\ {2}"/>
+		<RegExpr attribute="Indicator" context="CIndicators" String="[L|l][0-9]"/>
+		<RegExpr attribute="Indicator" context="CIndicators" String="[O|o|L|l|S|s][R|r]"/>
+		<RegExpr attribute="Indicator" context="CIndicators" String="[A|a][N|n]"/>
+		<RegExpr attribute="Indicator" context="CIndicators" String="[L|l|S|s][R|r]"/>
+		<RegExpr attribute="Alert" context="CIndicators" String=".{2}"/>
+	</context>
+	
+	
+	<context name="CIndicators" attribute="Normal Text" lineEndContext="#pop#pop">
+		<RegExpr attribute="Indicator" context="CFactor1" String="\ {3}"/>
+		<RegExpr attribute="Indicator" context="CFactor1" String="[\ |N|n][0-9]{2}"/>
+		<RegExpr attribute="Indicator" context="CFactor1" String="[\ |N|n][K|k][A-N|p-y]"/>
+		<RegExpr attribute="Indicator" context="CFactor1" String="[\ |N|n][K|k][P-Y|p-y]}"/>
+		<RegExpr attribute="Indicator" context="CFactor1" String="[\ |N|n][L|l][1-9]"/>
+		<RegExpr attribute="Indicator" context="CFactor1" String="[\ |N|n][L|l|M|m][R|r]"/>
+		<RegExpr attribute="Indicator" context="CFactor1" String="[\ |N|n][R|r][T|t]"/>
+		<RegExpr attribute="Indicator" context="CFactor1" String="[\ |N|n][U|u][1-8]"/>
+		<RegExpr attribute="Indicator" context="CFactor1" String="[\ |N|n][O|o][A-G|a-g]"/>
+		<RegExpr attribute="Indicator" context="CFactor1" String="[\ |N|n][O|o][V|v]"/>
+		<RegExpr attribute="Indicator" context="CFactor1" String="[\ |N|n][H|h][1-9]"/>
+		<RegExpr attribute="Alert" context="CFactor1" String=".{3}"/>
+	</context>
+	
+	
+	<context name="CFactor1" attribute="Normal Text" lineEndContext="#pop#pop#pop">
+		
+		<RegExpr attribute="Normal Text" context="FindOC" String=".{14}"/>
+	</context>
+	
+	
+ <context name="FindOC" attribute="Normal Text" lineEndContext="#pop#pop#pop#pop">
+ <keyword attribute="Keyword" context="NonEvalOC2" String="nonevalopcodes2"/>
+ <keyword attribute="Keyword" context="NonEvalOC3" String="nonevalopcodes3"/>
+ <keyword attribute="Keyword" context="NonEvalOC4" String="nonevalopcodes4"/>
+ <keyword attribute="Keyword" context="NonEvalOC5" String="nonevalopcodes5"/>
+ <keyword attribute="Keyword" context="NonEvalOC6" String="nonevalopcodes6"/>
+ <keyword attribute="Keyword" context="NonEvalOC7" String="nonevalopcodes7"/>
+	<RegExpr attribute="Keyword" context="NonEvalOC5" String="[Z|z]-([A|a][D|d]{2}|[S|s][U|u][B|b])"/>
+	<keyword attribute="Keyword" context="EvalOC2" String="evalopcodes2"/>
+	<keyword attribute="Keyword" context="EvalOC3" String="evalopcodes3"/>
+	<keyword attribute="Keyword" context="EvalOC4" String="evalopcodes4"/>
+	<keyword attribute="Keyword" context="EvalOC5" String="evalopcodes5"/>
+	<keyword attribute="Keyword" context="EvalOC6" String="evalopcodes6"/>
+	<RegExpr attribute="Keyword" context="EvalOC8" String="[O|o][N|n]-([E|e][R|r]{2}|[O|o][R|r])"/>
+	<RegExpr attribute="Normal Text" context="CFactor2" String="\ {10}"/>
+	<RegExpr attribute="Alert" context="CFactor2" String=".{10}"/>
+ </context>
 
- <context attribute="Normal Text" lineEndContext="#stay" name="Default">
- <RegExpr attribute="Comment" context="context3" String="[POIHFDC ]?\*"/>
- <AnyChar attribute="Keyword" context="context1" String="POIHFDC"/>
+ 
+ <context name="NonEvalOC2" attribute="Normal Text" lineEndContext="Default">
+	 <RegExpr attribute="Normal Text" context="CFactor2" String="\ {8}"/>
 </context>
+ <context name="NonEvalOC3" attribute="Normal Text" lineEndContext="Default">
+	 <RegExpr attribute="Normal Text" context="CFactor2" String="\ {7}"/>
+ </context>
+ <context name="NonEvalOC4" attribute="Normal Text" lineEndContext="Default">
+	 <RegExpr attribute="Normal Text" context="CFactor2" String="\ {6}"/>
+ </context>
+ <context name="NonEvalOC5" attribute="Normal Text" lineEndContext="Default">
+	 <RegExpr attribute="Normal Text" context="CFactor2" String="\ {5}"/>
+ </context>
+ <context name="NonEvalOC6" attribute="Normal Text" lineEndContext="Default">
+	 <RegExpr attribute="Normal Text" context="CFactor2" String="\ {4}"/>
+ </context>
+ <context name="NonEvalOC7" attribute="Normal Text" lineEndContext="Default">
+	 <RegExpr attribute="Normal Text" context="CFactor2" String="\ {3}"/>
+ </context>
 
- <context attribute="Normal Text" lineEndContext="#pop" name="context1">
- <keyword attribute="Keyword" context="#stay" String="opcodes"/>
- <DetectChar attribute="Biff" context="context7" char="%"/>
- <DetectChar attribute="Constant" context="context3" char="'"/>
- <Float attribute="Float" context="#stay"/>
- <RegExpr attribute="Hex" context="#stay" String="[Xx]'[0-9a-fA-F]{2,}'"/>
+ <context name="CFactor2" attribute="Normal Text" lineEndContext="Default">
+	 <DetectChar attribute="Biff" context="Biffs" char="%"/>
+	 <IncludeRules context="CommonCode" />
+ </context>
 
- <Int attribute="Decimal" context="#stay">
- <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="TRUE"/>
- <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="TRUE"/>
- <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="TRUE"/>
- <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="TRUE"/>
- <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="TRUE"/>
- <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="TRUE"/>
- <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="TRUE"/>
- <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
- </Int>
+ 
+ <context name="EvalOC2" attribute="Normal Text" lineEndContext="Default">
+	 <RegExpr attribute="Normal Text" context="CExFactor2" String="\ {8}"/>
 </context>
+ <context name="EvalOC3" attribute="Normal Text" lineEndContext="Default">
+	 <RegExpr attribute="Normal Text" context="CExFactor2" String="\ {7}"/>
+ </context>
+ <context name="EvalOC4" attribute="Normal Text" lineEndContext="Default">
+	 <RegExpr attribute="Normal Text" context="CExFactor2" String="\ {6}"/>
+ </context>
+ <context name="EvalOC5" attribute="Normal Text" lineEndContext="Default">
+	 <RegExpr attribute="Normal Text" context="CExFactor2" String="\ {5}"/>
+ </context>
+ <context name="EvalOC6" attribute="Normal Text" lineEndContext="Default">
+	 <RegExpr attribute="Normal Text" context="CExFactor2" String="\ {4}"/>
+ </context>
+ <context name="EvalOC8" attribute="Normal Text" lineEndContext="Default">
+	 <RegExpr attribute="Normal Text" context="CExFactor2" String="\ {2}"/>
+ </context>
+ 
+ <context name="CExFactor2" attribute="Normal Text" lineEndContext="Default">
+	 <DetectChar attribute="Biff" context="Biffs" char="%"/>
+	 <IncludeRules context="CommonCode" />
+ </context>
+ 
+ 
+ <context name="EvalOCCont" attribute="Normal Text" lineEndContext="#stay">
+	 <DetectChar attribute="Biff" context="Biffs" char="%"/>
+	 <IncludeRules context="CommonCode" />
+ </context>
 
- <context attribute="Comment" lineEndContext="#pop" name="context3">
+ 
+ <context name="Comments" attribute="Comment" lineEndContext="#pop">
 <RegExpr attribute="BoldComment" context="#stay" String="$*(FIXME|TODO)$*" />
 <RegExpr attribute="BoldComment" context="#stay" String="$*(NOTE:)$*" />
- <DetectChar attribute="BoldComment" context="context6" char="!"/>
 <RegExpr attribute="DivideComment" context="#stay" String="-|="/>
 </context>
 
- <context attribute="Constant" lineEndContext="#stay" name="context4">
- <DetectChar attribute="Constant" context="#pop" char="'"/>
+ 
+ <context name="StringConstants" attribute="ConstantChar" lineEndContext="#pop">
+	 <DetectChar attribute="ConstantChar" context="#pop" char="'"/>
 </context>
 
- <context attribute="Constant" lineEndContext="#stay" name="context5">
- <AnyChar attribute="Normal Text" context="#stay" String="FHDICO"/>
- <DetectChar attribute="Constant" context="#pop" char=" "/>
+ 
+ <context name="Directives" attribute="Normal Text" lineEndContext="Default">
+	 <RegExpr attribute="Directive" context="Free" String="[F|f][R|r][E|e][E|e]"/>
+	 <RegExpr attribute="Directive" context="Exec" String="[E|e][X|x][E|e][C|c]"/>
+	 <keyword attribute="Directive" context="Directives2" String="directives"/>
 </context>
- <context attribute="Keyword" lineEndContext="#pop#pop" name="context6">
+ <context name="Directives2" attribute="Normal Text" lineEndContext="Default">
+	 <keyword attribute="Directive" context="Directives3" String="directives2"/>
 </context>
- <context attribute="BoldComment" lineEndContext="Default" name="context7">
- <DetectChar attribute="BoldComment" context="context3" char="!"/>
+ <context name="Directives3" attribute="Normal Text" lineEndContext="Default">
+	 <keyword attribute="Directive" context="#stay" String="directives3"/>
 </context>
- <context attribute="Biff" lineEndContext="#pop#pop#pop" name="context8">
- <keyword attribute="Biff" context="#pop#pop" String="biffs"/>
- <DetectChar attribute="Biff" context="#pop#pop" char=" "/>
+
+ 
+ <context name="Free" attribute="Normal Text" lineEndContext="#stay">
+	 <RegExpr attribute="Directive" context="#pop" String="[POIHFDC ]?/[E|e][N|n][D|d]-[F|f][R|r][E|e][E|e]"/>
+	 <IncludeRules context="CommonCode" />
+	 <DetectChar attribute="Biff" context="Biffs" char="%"/>
+	 <RegExpr attribute="Comment" context="Comments" String="//"/>
+	 <keyword attribute="Keyword" context="#stay" String="freeopcodes"/>
 </context>
+ 
+ 
+ <context name="Exec" attribute="Normal Text" lineEndContext="#stay">
+	 <RegExpr attribute="Directive" context="#pop" String="[POIHFDC ]?/[E|e][N|n][D|d]-[E|e][X|x][E|e][C|c]"/>
+ </context>
+ 
+ <context name="Biffs" attribute="Biff" lineEndContext="#pop">
+	 <keyword attribute="Biff" context="#pop" String="biffs"/>
+	 <RegExpr attribute="Normal Text" context="#pop" String="."/>
+ </context>
+
+ 
+ <context name="CommonCode" attribute="Normal Text" lineEndContext="#stay">
+	 <IncludeRules context="ReservedWords" />
+	 <IncludeRules context="Indicators" />
+	 <DetectChar attribute="ConstantChar" context="StringConstants" char="'"/>
+	 <Float attribute="Float" context="#stay"/>
+	 <RegExpr attribute="Hex" context="#stay" String="[Xx]'[0-9a-fA-F]{2,}'"/>
+	 <Int attribute="Decimal" context="#stay">
+		 <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="TRUE"/>
+		 <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="TRUE"/>
+		 <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="TRUE"/>
+		 <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="TRUE"/>
+		 <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="TRUE"/>
+		 <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="TRUE"/>
+		 <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="TRUE"/>
+		 <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
+	 </Int>
+ </context>
+ 
+ 
+ <context name="Indicators" attribute="Normal Text" lineEndContext="#stay">
+	 <RegExpr attribute="Indicator" context="#stay" String="\*[I|i][N|n]$?[0-9][0-9]$?"/>
+	 <RegExpr attribute="Indicator" context="#stay" String="\*[I|i][N|n]$?1[P|p]$?"/>
+	 <RegExpr attribute="Indicator" context="#stay" String="\*[I|i][N|n]$?[H|h|L|l][1-9]$?"/>
+	 <RegExpr attribute="Indicator" context="#stay" String="\*[I|i][N|n]$?[L|l|M|m][R|r]$?"/>
+	 <RegExpr attribute="Indicator" context="#stay" String="\*[I|i][N|n]$?[O|o][A-G|a-g|V|v]$?"/>
+	 <RegExpr attribute="Indicator" context="#stay" String="\*[I|i][N|n]$?[U|u][1-8]$?"/>
+	 <RegExpr attribute="Indicator" context="#stay" String="\*[I|i][N|n]$?[K|k][A-N|a-n|P-Y|p-y]$?"/>
+	 <RegExpr attribute="Indicator" context="#stay" String="\*[I|i][N|n]$?[R|r][T|t]$?"/>
+ </context>
+ 
+ 
+ <context name="ReservedWords" attribute="Normal Text" lineEndContext="#stay">
+	 <RegExpr attribute="Reserved" context="#stay" String="[\*|U|u][D|d][A|a][T|t][E|e]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="[\*|U|u][M|m][O|o][N|n][T|t][H|h]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="[\*|U|u][Y|y][E|e][A|a][R|r]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="[\*|U|u][D|d][A|a][Y|y]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\ [P|p][A|a][G|g][E|e][1-7]?"/>
+	 
+	 <RegExpr attribute="Constant" context="#stay" String="\*([A|a][A|l]{2}[X|x|G|g]?|[B|b][L|l][A|a][N|n][K|k][S|s]?|[O|o][N|n]|[O|o][F|f]{2}|[N|n][U|u][L|l]{2}|[Z|z][E|e][R|r][O|o][S|s]?|[H|h][I|i][V|v][A|a][L|l]|[L|l][O|o][V|v][A|a][L|l]|[P|p][S|s]{2}[R|r]|[E|e][N|n][D|d]|[S|s][T|t][A|a][R|r][T|t])"/>
+	 
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[C|c][D|d][M|m][Y|y]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[C|c][M|m][D|d][Y|y]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[C|c][Y|y][M|m][D|d]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[D|d][M|m][Y|y]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[E|e][U|u][R|r]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[H|h][M|m][S|s]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[I|i][S|s][O|o]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[J|j][I|i][S|s]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[J|j][O|o][B|b]([R|r][U|u][N|n])?"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*([L|l][O|o][N|n][G|g])?[J|j][U|u][L|l]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[M|m][D|d][Y|y]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[S|s][Y|y][S|s]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[U|u][S|s][A|a]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[Y|y][M|m][D|d]"/>
+	 
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[A|a][L|l][T|t][S|s][E|e][Q|q]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[E|e][Q|q][U|u][A|a][T|t][E|e]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[F|f][I|i][L|l][E|e]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[F|f][T|t][R|r][A|a][N|n][S|s]"/>
+
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[I|i][L|l][E|e][R|r][P|p][G|g]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[C|c][R|r][T|t][B|b][N|n][D|d][R|r][P|p][G|g]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[C|c][R|r][T|t][R|r][P|p][G|g][M|m][O|o][D|d]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[V|v][0-9][R|r][0-9][M|m][0-9]"/>
+	 
+ </context>
+
+ 
+ <context name="AnyCode" attribute="Normal Text" lineEndContext="#pop">
+	 <IncludeRules context="CommonCode" />
+ </context>
+ 
+ 
+ <context name="D" attribute="Normal Text" lineEndContext="#pop">
+	 <keyword attribute="Keyword" context="#stay" String="dkeywords"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[N|n][O|o][P|p][A|a][S|s]{2}"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[O|o][M|m][I|i][T|t]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[V|v][A|a][R|r][S|s][I|i][Z|z][E|e]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[R|r][I|i][G|g][H|h][T|t][A|a][D|d][J|j]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[S|s][T|t][R|r][I|i][N|n][G|g]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[T|t][R|r][I|i][M|m]"/>
+	 <DetectChar attribute="Biff" context="Biffs" char="%"/>
+	 <IncludeRules context="CommonCode" />
+ </context>
+ 
+ 
+ <context name="P" attribute="Normal Text" lineEndContext="#pop">
+	 <keyword attribute="Keyword" context="#stay" String="dkeywords"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[N|n][O|o][P|p][A|a][S|s]{2}"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[O|o][M|m][I|i][T|t]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[V|v][A|a][R|r][S|s][I|i][Z|z][E|e]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[R|r][I|i][G|g][H|h][T|t][A|a][D|d][J|j]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[S|s][T|t][R|r][I|i][N|n][G|g]"/>
+	 <RegExpr attribute="Reserved" context="#stay" String="\*[T|t][R|r][I|i][M|m]"/>
+	 <DetectChar attribute="Biff" context="Biffs" char="%"/>
+	 <IncludeRules context="CommonCode" />
+ </context>
+ 
+ 
 </contexts>
 <itemDatas>
+ <itemData name="Alert" 		 defStyleNum="dsAlert" />
 <itemData name="Normal Text" defStyleNum="dsNormal" />
 <itemData name="Keyword" defStyleNum="dsKeyword" />
 <itemData name="Biff" defStyleNum="dsKeyword" />
@@ -259,7 +707,10 @@
 <itemData name="Base-N" defStyleNum="dsBaseN" />
 <itemData name="Float" defStyleNum="dsFloat" />
 <itemData name="Char" defStyleNum="dsChar" />
- <itemData name="Constant" defStyleNum="dsNormal" color="#FF0000" selColor="#000000" bold="0" italic="0"/>
+ <itemData name="ConstantChar" defStyleNum="dsNormal" color="#DD0022" selColor="#000000" bold="0" italic="0"/>
+ <itemData name="Constant" defStyleNum="dsNormal" color="#CC2222" selColor="#000000" bold="0" italic="0"/>
+ <itemData name="Reserved" defStyleNum="dsNormal" color="#BB1133" selColor="#000000" bold="0" italic="0"/>
+ <itemData name="Indicator" defStyleNum="dsNormal" color="#CC0000" selColor="#000000" bold="0" italic="0"/>
 <itemData name="Fill" defStyleNum="dsNormal" color="#FF6347" selColor="#000000" bold="0" italic="0"/>
 <itemData name="Comment" defStyleNum="dsComment"/>
 <itemData name="BoldComment" defStyleNum="dsNormal" color="#CD853F" selColor="#808080" bold="1" italic="1"/>
Index: kate/data/logtalk.xml
===================================================================
--- kate/data/logtalk.xml	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kate/data/logtalk.xml	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 
-<language name="Logtalk" version="1.40" kateversion="2.4" section="Sources" extensions="*.lgt;*.config" mimetype="text/x-logtalk" author="Paulo Moura (pmoura@logtalk.org)" license="Artistic License 2.0">
+<language name="Logtalk" version="1.51" kateversion="2.4" section="Sources" extensions="*.lgt;*.config" mimetype="text/x-logtalk" author="Paulo Moura (pmoura@logtalk.org)" license="Artistic License 2.0">
 
 	<highlighting>
 
@@ -17,11 +17,11 @@
 				
 				<RegExpr String = "\b(current_predicate|predicate_property)(?=[(])" attribute = "Built-in" context = "#stay" />
 				
-				<RegExpr String = "\b(expand_term|phrase)(?=[(])" attribute = "Built-in" context = "#stay" />
+				<RegExpr String = "\b(expand_term|term_expansion|phrase)(?=[(])" attribute = "Built-in" context = "#stay" />
 				
 				<RegExpr String = "\b(abolish|c(reate|urrent))_(object|protocol|category)(?=[(])" attribute = "Built-in" context = "#stay" />
 				<RegExpr String = "\b(object|protocol|category)_property(?=[(])" attribute = "Built-in" context = "#stay" />
-				
+				
 				<RegExpr String = "\bextends_(object|protocol)(?=[(])" attribute = "Built-in" context = "#stay" />
 				<RegExpr String = "\bimplements_protocol(?=[(])" attribute = "Built-in" context = "#stay" />
 				<RegExpr String = "\b(instantiates|specializes)_class(?=[(])" attribute = "Built-in" context = "#stay" />
@@ -48,7 +48,7 @@
 				<RegExpr String = "\b(rem|mod|abs|sign)(?=[(])" attribute = "Built-in" context = "#stay" />
 				<RegExpr String = "\bfloat(_(integer|fractional)_part)?(?=[(])" attribute = "Built-in" context = "#stay" />
 				<RegExpr String = "\b(floor|truncate|round|ceiling)(?=[(])" attribute = "Built-in" context = "#stay" />
-				
+				
 				<RegExpr String = "\b(cos|atan|exp|log|s(in|qrt))(?=[(])" attribute = "Built-in" context = "#stay" />
 				
 				<RegExpr String = "\b(var|atom(ic)?|integer|float|compound|n(onvar|umber))(?=[(])" attribute = "Built-in" context = "#stay" />
@@ -149,15 +149,16 @@
 				
 				<RegExpr String = "\b(category|object|protocol)(?=[(])" attribute = "Directive" context = "entityrelations" beginRegion = "Entity"/>
 				<RegExpr String = "\bend_(category|object|protocol)[.]" attribute = "Directive" context = "#pop" endRegion = "Entity" />
+				<RegExpr String = "\bmodule(?=[(])" attribute = "Directive" context = "#pop"/>
 				
 				<RegExpr String = "\bp(ublic|r(otected|ivate))(?=[(])" attribute = "Directive" context = "#pop" />
 				
-				<RegExpr String = "\bencoding(?=[(])" attribute = "Directive" context = "#pop" />
+				<RegExpr String = "\be(ncoding|xport)(?=[(])" attribute = "Directive" context = "#pop" />
 			 	<RegExpr String = "\bin(fo|itialization)(?=[(])" attribute = "Directive" context = "#pop" />
 				<RegExpr String = "\bdynamic[.]" attribute = "Directive" context = "#pop" />
-				<RegExpr String = "\b(alias|d(ynamic|iscontiguous)|m(etapredicate|ode|ultifile))(?=[(])" attribute = "Directive" context = "#pop" />
+				<RegExpr String = "\b(alias|d(ynamic|iscontiguous)|meta_predicate|m(etapredicate|ode|ultifile))(?=[(])" attribute = "Directive" context = "#pop" />
 				<RegExpr String = "\bop(?=[(])" attribute = "Directive" context = "#pop" />
-				<RegExpr String = "\b(calls|uses)(?=[(])" attribute = "Directive" context = "#pop" />
+				<RegExpr String = "\b(calls|use(s|_module))(?=[(])" attribute = "Directive" context = "#pop" />
 			</context>
 
 			<context name = "entityrelations" attribute = "Normal" lineEndContext = "#stay" >
Index: kate/data/scheme.xml
===================================================================
--- kate/data/scheme.xml	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kate/data/scheme.xml	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -40,7 +40,7 @@
 guile procedures (cause then almost everything would be highlighted) I
 removed some to have a rather small but "senseful" list of highlighted words.
 -->
-<language version="1.11" kateversion="2.4" name="Scheme" section="Scripts" extensions="*.scm;*.ss;*.scheme;*.guile" mimetype="text/x-scheme" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL">
+<language version="1.12" kateversion="2.4" name="Scheme" section="Scripts" extensions="*.scm;*.ss;*.scheme;*.guile" mimetype="text/x-scheme" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL">
 <highlighting>
 <list name="operators">
 <item> &lt;= </item>
@@ -360,11 +360,8 @@
 <context name="MultiLineComment" attribute="Comment" lineEndContext="#stay">
 <RegExpr attribute="Comment" context="#pop" String="!#\s*$" endRegion="region" column="0"/>
 </context>
- <context name="SpecialNumber" attribute="Normal" lineEndContext="#pop">
- <Float attribute="Float" context="#pop"/>
- <Int attribute="Decimal" context="#pop"/>
- <HlCOct attribute="BaseN" context="#pop"/>
- <HlCHex attribute="Float" context="#pop"/>
+ <context name="SpecialNumber" attribute="Normal" fallthrough="true" lineEndContext="#pop">
+ <RegExpr attribute="Decimal" context="#pop" String="\d*(\.\d+)?"/>
 </context>
 <context name="String" attribute="String" lineEndContext="#stay">
 <keyword attribute="Char" context="#stay" String="characters"/>
Index: kate/data/php.xml
===================================================================
--- kate/data/php.xml	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kate/data/php.xml	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="PHP/PHP" version="1.25" kateversion="2.4" section="Scripts" extensions="" priority="5" mimetype="" hidden="true">
+<language name="PHP/PHP" version="1.26" kateversion="2.4" section="Scripts" extensions="" priority="5" mimetype="" hidden="true">
 <highlighting>
 <list name="control structures">
 <item>as</item>
@@ -21,6 +27,11 @@
 <item>include</item>
 <item>require_once</item>
 <item>include_once</item>
+ <item>endif</item>
+ <item>endwhile</item>
+ <item>endfor</item>
+ <item>endforeach</item>
+ <item>endswitch</item>
 </list>
 <list name="keywords">
 <item> abstract </item>
@@ -42,6 +53,9 @@
 <item> public </item>
 <item> throw </item>
 <item> try </item>
+ <item> and </item>
+ <item> or </item>
+ <item> xor </item>
 	<item> var </item>
 	<item> __FILE__ </item>
 	<item> __LINE__ </item>
Index: kate/data/r.xml
===================================================================
--- kate/data/r.xml	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kate/data/r.xml	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 
-<language version="1.04" kateversion="2.1" name="R Script" section="Scripts" extensions="*.R" mimetype="" author="E.L. Willighagen" license="GPL">
+<language version="1.05" kateversion="2.1" name="R Script" section="Scripts" extensions="*.R" mimetype="" author="RKWard Team" license="GPL">
 <highlighting>
 <list name="controls">
 <item> for </item>
@@ -34,9 +36,10 @@
 <keyword attribute="Control Structure" context="#stay" String="controls"/>
 <keyword attribute="Reserved Words" context="#stay" String="words"/>
 <DetectChar attribute="String" context="ctx1" char="&quot;"/>
- <RegExpr attribute="Keyword" context="#stay" String="[a-zA-Z_]+ *\("/>
- <DetectChar attribute="Keyword" context="#stay" char="("/>
- <DetectChar attribute="Keyword" context="#stay" char=")"/>
+ <RegExpr attribute="Keyword" context="#stay" String="[a-zA-Z_]+[a-zA-Z_\.0-9]* *(?=[\s]*[(])"/>
+ <RegExpr attribute="Keyword" context="#stay" String="\.[a-zA-Z_\.]+[a-zA-Z_\.0-9]* *(?=[\s]*[(])"/>
+ <Float attribute="Float" context="#stay"/>
+ <Int attribute="Int" context="#stay"/>
 <RegExpr attribute="Comment" context="#stay" String="#.*$"/>
 <AnyChar attribute="Operators" context="#stay" String="+-*/^:$~!&amp;|=&gt;&lt;@"/>
 <RegExpr attribute="Operators" context="#stay" String="%[a-zA-Z_]*%"/>
@@ -44,19 +47,22 @@
 
 <context attribute="String" lineEndContext="#stay" name="ctx1">
 <DetectChar attribute="String" context="#pop" char="&quot;"/>
+ <HlCStringChar attribute="String Char" context="#stay"/>
 </context>
-
+ 
 </contexts>
 
 <itemDatas>
 <itemData name="Normal Text" defStyleNum="dsNormal"/>
- <itemData name="Keyword" defStyleNum="dsKeyword" bold="0" italic="1"/>
+ <itemData name="Keyword" defStyleNum="dsKeyword" italic="1"/>
 <itemData name="String" defStyleNum="dsString"/>
 <itemData name="Comment" defStyleNum="dsComment"/>
 <itemData name="Control Structure" defStyleNum="dsNormal" color="#0000ff" selColor="#00ff00"/>
 <itemData name="Reserved Words" defStyleNum="dsOthers"/>
 <itemData name="Operators" defStyleNum="dsNormal" color="#aa5500" selColor="#000077"/>
- <itemData name="Infix" defStyleNum="dsNormal" color="#aa5500" selColor="#000077"/>
+ <itemData name="String Char" defStyleNum="dsChar"/>
+ <itemData name="Float" defStyleNum="dsFloat"/>
+ <itemData name="Int" defStyleNum="dsDecVal"/>
 </itemDatas>
 </highlighting>
 
@@ -67,4 +73,3 @@
 <keywords casesensitive="1" />
 </general>
 </language>
-
Index: kate/data/cpp.xml
===================================================================
--- kate/data/cpp.xml	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kate/data/cpp.xml	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="C++" version="1.34" kateversion="2.4" section="Sources" extensions="*.cxx;*.cpp;*.cc;*.C;*.h;*.hh;*.H;*.hxx;*.hpp;*.hcc;*.moc" mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr" priority="9">
+<language name="C++" version="1.36" kateversion="2.4" section="Sources" extensions="*.c++;*.cxx;*.cpp;*.cc;*.C;*.h;*.H;*.h++;*.hxx;*.hpp;*.hcc;*.moc" mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr" priority="9">
 <highlighting>
 <list name="keywords">
 <item> asm </item>
@@ -31,6 +31,7 @@
 <item> private </item>
 <item> protected </item>
 <item> public </item>
+ <item> qobject_cast </item>
 <item> reinterpret_cast </item>
 <item> return </item>
 <item> sizeof </item>
@@ -79,6 +80,33 @@
 <item> Q_OVERRIDE </item>
 <item> Q_PROPERTY </item>
 <item> Q_SETS </item>
+ <item> Q_SIGNALS </item>
+ <item> Q_SLOTS </item>
+ <item> Q_FOREACH </item>
+ <item> Q_DECLARE_FLAGS </item>
+ <item> Q_INIT_RESOURCE </item>
+ <item> Q_CLEANUP_RESOURCE </item>
+ <item> Q_GLOBAL_STATIC </item>
+ <item> Q_GLOBAL_STATIC_WITH_ARGS </item>
+ <item> Q_DECLARE_TYPEINFO </item>
+ <item> Q_DECLARE_SHARED </item>
+ <item> Q_DECLARE_FLAGS </item>
+ <item> Q_DECLARE_OPERATORS_FOR_FLAGS </item>
+ <item> Q_FOREVER </item>
+ <item> Q_DECLARE_PRIVATE </item>
+ <item> Q_DECLARE_PUBLIC </item>
+ <item> Q_D </item>
+ <item> Q_Q </item>
+ <item> Q_DISABLE_COPY </item>
+ <item> Q_INTERFACES </item>
+ <item> Q_FLAGS </item>
+ <item> Q_SCRIPTABLE </item>
+ <item> Q_INVOKABLE </item>
+ <item> Q_GADGET </item>
+ <item> Q_ARG </item>
+ <item> Q_RETURN_ARG </item>
+ <item> Q_ASSERT </item>
+ <item> Q_ASSERT_X </item>
 <item> TRUE </item>
 <item> FALSE </item>
 <item> connect </item>
@@ -87,6 +115,7 @@
 <item> signals </item>
 <item> slots </item>
 <item> foreach </item>
+ <item> forever </item>
 </list>
 <list name="types">
 <item> auto </item>
Index: kdefx/kpixmap.cpp
===================================================================
--- kdefx/kpixmap.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdefx/kpixmap.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -43,34 +43,8 @@
 	return false;
 }
 
- int ncols = 256;
+ dst->setNumColors( 256 );
 
- static uint bm[16][16];
- static int init=0;
- if (!init) {
-
-	// Build a Bayer Matrix for dithering
-	init = 1;
-	int n, i, j;
-
-	bm[0][0]=0;
-
-	for (n=1; n<16; n*=2)
-	 for (i=0; i<n; i++)
-		for (j=0; j<n; j++) {
-		 bm[i][j]*=4;
-		 bm[i+n][j]=bm[i][j]+2;
-		 bm[i][j+n]=bm[i][j]+3;
-		 bm[i+n][j+n]=bm[i][j]+1;
-		}
-
-	for (i=0; i<16; i++)
-	 for (j=0; j<16; j++)
-		bm[i][j]<<=8;
- }
-
- dst->setNumColors( ncols );
-
 #define MAX_R 2
 #define MAX_G 2
 #define MAX_B 2
Index: kdefx/kimageeffect.cpp
===================================================================
--- kdefx/kimageeffect.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdefx/kimageeffect.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -3666,7 +3666,8 @@
 }
 }
 }
- *q++ = (*s);
+ if (s)
+ *q++ = (*s);
 }
 }
 /* liberateMemory((histogram); */
Index: arts/kde/mcop-dcop/kmcop.desktop
===================================================================
--- arts/kde/mcop-dcop/kmcop.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ arts/kde/mcop-dcop/kmcop.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -71,6 +71,7 @@
 Comment[uk]=Міст KDE MCOP-DCOP
 Comment[uz]=KDE MCOP-DCOP кўприги
 Comment[ven]=KDE MCOP-DCOP Buroho
+Comment[vi]=Cầu MCOP-DCOP của KDE
 Comment[xh]=KDE MCOP-DCOP Ibhulorho
 Comment[zh_CN]=KDE MCOP-DCOP 桥
 Comment[zh_HK]=KDE MCOP-DCOP 橋樑
Index: arts/knotify/knotify.desktop
===================================================================
--- arts/knotify/knotify.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ arts/knotify/knotify.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -56,7 +56,7 @@
 Comment[id]=Daemon pemberitahuan KDE
 Comment[is]=KDE tilkynningapúkinn
 Comment[it]=Demone avvisi di KDE
-Comment[ja]=KDE通知デーモン
+Comment[ja]=KDE 通知デーモン
 Comment[ko]=KDE용 알림 서버
 Comment[lb]=KDE-Norichtendämon
 Comment[lt]=KDE pranešimų tarnyba
@@ -95,7 +95,7 @@
 Comment[uk]=Демон сповіщення про нову пошту
 Comment[uz]=KDE хабарномалар хизмати
 Comment[ven]=Daemon yau divhadza ya KDE
-Comment[vi]=Daemon thông báo của KDE 
+Comment[vi]=Trình nền thông báo của KDE
 Comment[wa]=Démon di notifiaedje di KDE
 Comment[xh]=Daemon Ulwaziso lwe KDE
 Comment[zh_CN]=KDE 通告守护进程
Index: mimetypes/uri/pnm.desktop
===================================================================
--- mimetypes/uri/pnm.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/uri/pnm.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -5,6 +5,7 @@
 Icon=video
 Comment=pnm: URIs
 Comment[br]=URIoù pnm:
+Comment[bs]=pnm: URI
 Comment[cs]=pnm: URI
 Comment[da]=pnm: URI'er
 Comment[et]=pnm: URI-d
@@ -35,5 +36,6 @@
 Comment[tr]=pnm: adresi
 Comment[tt]=pnm: URI'lar
 Comment[uk]=pnm: URI
+Comment[vi]=Địa điểm URI pnm:
 Comment[zh_CN]=pnm: URI
 Comment[zh_HK]=pnm: 格式 URI
Index: mimetypes/uri/mms.desktop
===================================================================
--- mimetypes/uri/mms.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/uri/mms.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -5,6 +5,7 @@
 Icon=video
 Comment=mms: URIs
 Comment[br]=URIoù mms:
+Comment[bs]=mms: URI
 Comment[cs]=mms: URI
 Comment[da]=mms: URI'er
 Comment[et]=mms: URI-d
@@ -36,5 +37,6 @@
 Comment[tr]=mms: adresi
 Comment[tt]=mms: URI'lar
 Comment[uk]=mms: URI
+Comment[vi]=Địa điểm URI mms:
 Comment[zh_CN]=mms: URI
 Comment[zh_HK]=mms: 格式 URI
Index: mimetypes/uri/rtspt.desktop
===================================================================
--- mimetypes/uri/rtspt.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/uri/rtspt.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -5,6 +5,7 @@
 Icon=video
 Comment=rtspt: URIs
 Comment[br]=URIoù rtspt:
+Comment[bs]=rtspt: URI
 Comment[cs]=rtspt: URI
 Comment[da]=rtspt: URI'er
 Comment[et]=rtspt: URI-d
@@ -36,5 +37,6 @@
 Comment[tr]=rtspt: adresi
 Comment[tt]=rtspt: URI'lar
 Comment[uk]=rtspt: URI
+Comment[vi]=Địa điểm URI rtspt:
 Comment[zh_CN]=rtspt: URI
 Comment[zh_HK]=rtspt: 格式 URI
Index: mimetypes/uri/rtspu.desktop
===================================================================
--- mimetypes/uri/rtspu.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/uri/rtspu.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -5,6 +5,7 @@
 Icon=video
 Comment=rtspu: URIs
 Comment[br]=URIoù rtspu:
+Comment[bs]=rtspu: URI
 Comment[cs]=rtspu: URI
 Comment[da]=rtspu: URI'er
 Comment[et]=rtspu: URI-d
@@ -36,5 +37,6 @@
 Comment[tr]=rtspu: adresi
 Comment[tt]=rtspu: URI'lar
 Comment[uk]=rtspu: URI
+Comment[vi]=Địa điểm URI rtspu:
 Comment[zh_CN]=rtspu: URI
 Comment[zh_HK]=rtspu: 格式 URI
Index: mimetypes/uri/mmst.desktop
===================================================================
--- mimetypes/uri/mmst.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/uri/mmst.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -5,6 +5,7 @@
 Icon=video
 Comment=mmst: URIs
 Comment[br]=URIoù mmst:
+Comment[bs]=mmst: URI
 Comment[cs]=mmst: URI
 Comment[da]=mmst: URI'er
 Comment[et]=mmst: URI-d
@@ -36,5 +37,6 @@
 Comment[tr]=mmst: adresi
 Comment[tt]=mmst: URI'lar
 Comment[uk]=mmst: URI
+Comment[vi]=Địa điểm URI mmst:
 Comment[zh_CN]=mmst: URI
 Comment[zh_HK]=mmst: 格式 URI
Index: mimetypes/uri/mmsu.desktop
===================================================================
--- mimetypes/uri/mmsu.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/uri/mmsu.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -5,6 +5,7 @@
 Icon=video
 Comment=mmsu: URIs
 Comment[br]=URIoù mmsu:
+Comment[bs]=mmsu: URI
 Comment[cs]=mmsu: URI
 Comment[da]=mmsu: URI'er
 Comment[et]=mmsu: URI-d
@@ -36,5 +37,6 @@
 Comment[tr]=mmsu: adresi
 Comment[tt]=mmsu: URI'lar
 Comment[uk]=mmsu: URI
+Comment[vi]=Địa điểm URI mmsu:
 Comment[zh_CN]=mmsu: URI
 Comment[zh_HK]=mmsu: 格式 URI
Index: mimetypes/all.desktop
===================================================================
--- mimetypes/all.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/all.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -15,7 +15,7 @@
 Comment[cs]=Všechny soubory a složky
 Comment[cy]=Pob Ffeil a Cyfeiriadur
 Comment[da]=Alle filer og mapper
-Comment[de]=Sämtliche Dateien und Ordner
+Comment[de]=Alle Dateien und Ordner
 Comment[el]=Όλα τα αρχεία και οι φάκελοι
 Comment[eo]=Ĉiuj dosieroj kaj dosierujoj
 Comment[es]=Todos los archivos y directorios
@@ -24,7 +24,7 @@
 Comment[fa]=تمام پرونده‌ها و پوشه‌ها
 Comment[fi]=Kaikki tiedostot ja kansiot
 Comment[fr]=Tous les fichiers et dossiers
-Comment[fy]=Alle Triemen en Mappen
+Comment[fy]=Alle Triemmen en Mappen
 Comment[ga]=Gach Comhad agus Comhadlann
 Comment[gl]=Todos os Arquivos e Cartafois
 Comment[he]=כל הקבצים והתיקיות
@@ -67,6 +67,7 @@
 Comment[tt]=Bar Biremnär belän Törgäklär
 Comment[uk]=Всі файли та теки
 Comment[uz]=Ҳамма файл ва жилдлар
+Comment[vi]=Mọi tập tin và thư mục đều
 Comment[wa]=Tos les fitchîs et tos les ridants
 Comment[zh_CN]=全部文件和文件夹
 Comment[zh_HK]=所有的檔案與目錄目錄
Index: mimetypes/model/vrml.desktop
===================================================================
--- mimetypes/model/vrml.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/model/vrml.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -65,6 +65,7 @@
 Comment[tt]=VRML Sölge
 Comment[uk]=Модель VRML (тривимірні моделі)
 Comment[uz]=VRML модели
+Comment[vi]=Mô hình VRML
 Comment[wa]=Modele VRML
 Comment[zh_CN]=VRML 模块
 Comment[zh_HK]=VRML 模型
Index: mimetypes/audio/x-oggflac.desktop
===================================================================
--- mimetypes/audio/x-oggflac.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/audio/x-oggflac.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -64,6 +64,7 @@
 Comment[tt]=Ogg FLAC Tawışı
 Comment[uk]=Аудіо Ogg FLAC
 Comment[uz]=Ogg FLAC аудио
+Comment[vi]=Âm thanh Ogg FLAC
 Comment[wa]=Fitchî odio Ogg FLAC
 Comment[zh_CN]=Ogg FLAC 音频
 Comment[zh_HK]=Ogg FLAC 音效檔
Index: mimetypes/audio/vnd.rn-realaudio.desktop
===================================================================
--- mimetypes/audio/vnd.rn-realaudio.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/audio/vnd.rn-realaudio.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -70,6 +70,7 @@
 Comment[tt]=RealAudio Bireme
 Comment[uk]=Файл RealAudio
 Comment[uz]=RealAudio-файли
+Comment[vi]=Tập tin RealAudio
 Comment[wa]=Fitchî RealAudio
 Comment[zh_CN]=RealAudio 文件
 Comment[zh_HK]=RealAudio 檔案
Index: mimetypes/audio/x-vorbis.desktop
===================================================================
--- mimetypes/audio/x-vorbis.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/audio/x-vorbis.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -66,6 +66,7 @@
 Comment[tt]=Ogg Vorbis Tawışı
 Comment[uk]=Аудіо Ogg Vorbis
 Comment[uz]=Ogg Vorbis аудио
+Comment[vi]=Âm thanh Ogg Vorbix
 Comment[wa]=Fitchî odio Ogg Vorbis
 Comment[zh_CN]=Ogg Vorbis 音频
 Comment[zh_HK]=Ogg Vorbis 音效檔
Index: mimetypes/audio/x-flac.desktop
===================================================================
--- mimetypes/audio/x-flac.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/audio/x-flac.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -62,6 +62,7 @@
 Comment[tt]=FLAC Tawış
 Comment[uk]=Аудіо FLAC
 Comment[uz]=FLAC аудио
+Comment[vi]=Âm thanh FLAC
 Comment[wa]=Fitchî odio FLAC
 Comment[zh_CN]=FLAC 音频
 Comment[zh_HK]=FLAC 音效檔
Index: mimetypes/audio/x-aiff.desktop
===================================================================
--- mimetypes/audio/x-aiff.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/audio/x-aiff.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -67,6 +67,7 @@
 Comment[uk]=AIFF/Amiga-аудіо
 Comment[uz]=AIFF/Amiga аудио
 Comment[ven]=Zwinopfiwa zwa AIFF/Amiga
+Comment[vi]=Âm thanh AIFF/Amiga
 Comment[wa]=Son AIFF/Amiga
 Comment[xh]=AIFF/Amiga Evakalayo
 Comment[zh_CN]=AIFF/Amiga 音频
Index: mimetypes/audio/mpegurl.desktop
===================================================================
--- mimetypes/audio/mpegurl.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/audio/mpegurl.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -70,6 +70,7 @@
 Comment[uk]=Потокове MP3-аудіо
 Comment[uz]=Streaming MPEG Layer 3 аудио
 Comment[ven]=Mbemba tharu dzi elelaho dza MPEG dzino pfiwa
+Comment[vi]=Âm thanh lớp 3 MPEG chạy luồng
 Comment[xh]=Ulwaleko Lwesithathu Oluqukuqelayo lwe MPEG
 Comment[zh_CN]=流式 MP3 音频文件
 Comment[zh_HK]=串流 MP3 音樂
Index: mimetypes/audio/x-musepack.desktop
===================================================================
--- mimetypes/audio/x-musepack.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/audio/x-musepack.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -56,5 +56,6 @@
 Comment[tt]=Musepack Tawışı
 Comment[uk]=Аудіо запис Musepack
 Comment[uz]=Musepack аудио
+Comment[vi]=Âm thanh Musepack
 Comment[zh_CN]=Musepack 音频
 Comment[zh_HK]=Musepack 音效檔
Index: mimetypes/audio/x-mpegurl.desktop
===================================================================
--- mimetypes/audio/x-mpegurl.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/audio/x-mpegurl.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -68,6 +68,7 @@
 Comment[uk]=Потокове MP3-аудіо
 Comment[uz]=Streaming MPEG Layer 3 аудио
 Comment[ven]=Mbemba tharu dzi elelaho dza MPEG dzino pfiwa
+Comment[vi]=Âm thanh lớp 3 MPEG chạy luồng
 Comment[xh]=Ulwaleko Lwesithathu Oluqukuqelayo lwe MPEG
 Comment[zh_CN]=流式 MP3 音频文件
 Comment[zh_HK]=串流 MP3 音樂
Index: mimetypes/audio/basic.desktop
===================================================================
--- mimetypes/audio/basic.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/audio/basic.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -66,6 +66,7 @@
 Comment[uk]=Аудіо ULAW (Sun)
 Comment[uz]=ULAW (Sun) аудио
 Comment[ven]=ULAW (Duvha) Zwinopfiwa
+Comment[vi]=Âm thanh ULAW (Sun)
 Comment[wa]=Son ULAW (Sun)
 Comment[xh]=ULAW (Sun) Evakalayo
 Comment[zh_CN]=ULAW (Sun) 音频
Index: mimetypes/audio/prs.sid.desktop
===================================================================
--- mimetypes/audio/prs.sid.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/audio/prs.sid.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -59,5 +59,6 @@
 Comment[tt]=C64 SID Köye
 Comment[uk]=Аудіо C64 SID
 Comment[uz]=C64 SID мусиқа
+Comment[vi]=Âm nhạc SID C64
 Comment[zh_CN]=C64 SID 音频
 Comment[zh_HK]=C64 SID 音樂
Index: mimetypes/audio/x-mod.desktop
===================================================================
--- mimetypes/audio/x-mod.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/audio/x-mod.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -68,6 +68,7 @@
 Comment[uk]=Amiga Soundtracker-аудіо
 Comment[uz]=Amiga Soundtracker аудио
 Comment[ven]=Zwinopfiwa zwa mubvumo ya luimbo zwa Amiga
+Comment[vi]=Âm thanh Soundtracker của Amiga
 Comment[zh_CN]=Amiga soundtracker 音频文件
 Comment[zh_HK]=Amiga Soundtracker 音效檔
 Comment[zh_TW]=Amiga 聲軌聲音文件
Index: mimetypes/audio/aac.desktop
===================================================================
--- mimetypes/audio/aac.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/audio/aac.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -68,6 +68,7 @@
 Comment[tt]=AAC Tawış
 Comment[uk]=Аудіо AAC
 Comment[uz]=AAC аудио
+Comment[vi]=Âm thanh AAC
 Comment[wa]=Son AAC
 Comment[zh_CN]=AAC 声音
 Comment[zh_HK]=AAC 音效檔
Index: mimetypes/audio/x-pn-realaudio.desktop
===================================================================
--- mimetypes/audio/x-pn-realaudio.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/audio/x-pn-realaudio.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -68,6 +68,7 @@
 Comment[tt]=RealAudio Bireme
 Comment[uk]=Файл RealAudio
 Comment[uz]=RealAudio-файли
+Comment[vi]=Tập tin RealAudio
 Comment[wa]=Fitchî RealAudio
 Comment[zh_CN]=RealAudio 文件
 Comment[zh_HK]=RealAudio 檔案
Index: mimetypes/audio/x-matroska.desktop
===================================================================
--- mimetypes/audio/x-matroska.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/audio/x-matroska.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -63,6 +63,7 @@
 Comment[tt]=Matroska Tawış
 Comment[uk]=Аудіо Матрьошка
 Comment[uz]=Matroska аудио
+Comment[vi]=Âm thanh Matroska
 Comment[wa]=Fitchî odio Matroska
 Comment[zh_CN]=Matroska 音频
 Comment[zh_HK]=Matroska 音效檔
Index: mimetypes/audio/x-midi.desktop
===================================================================
--- mimetypes/audio/x-midi.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/audio/x-midi.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -70,6 +70,7 @@
 Comment[uk]=MIDI-аудіо
 Comment[uz]=MIDI аудио
 Comment[ven]=Zwinopfiwa zwa MIDI
+Comment[vi]=Âm thanh MIDI
 Comment[wa]=Son MIDI
 Comment[xh]=MIDI Evakalayo
 Comment[zh_CN]=MIDI 音频
Index: mimetypes/audio/mpeg.desktop
===================================================================
--- mimetypes/audio/mpeg.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/audio/mpeg.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -62,5 +62,6 @@
 Comment[tt]=MPEG Tawış
 Comment[uk]=Аудіо запис MPEG
 Comment[uz]=MPEG аудио
+Comment[vi]=Âm thanh MPEG
 Comment[zh_CN]=MPEG 音频
 Comment[zh_HK]=MPEG 音效檔
Index: mimetypes/audio/x-adpcm.desktop
===================================================================
--- mimetypes/audio/x-adpcm.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/audio/x-adpcm.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -67,6 +67,7 @@
 Comment[uk]=PCM-аудіо
 Comment[uz]=PCM аудио
 Comment[ven]=Zwinopfiwa zwa PCM
+Comment[vi]=Âm thanh PCM
 Comment[wa]=Son PCM
 Comment[xh]=PCM Evakalayo
 Comment[zh_CN]=PCM 音频文件
Index: mimetypes/audio/x-scpls.desktop
===================================================================
--- mimetypes/audio/x-scpls.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/audio/x-scpls.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -70,7 +70,7 @@
 Comment[uk]=Список MP3-ShoutCast
 Comment[uz]=MP3 ShoutCast қўшиқлар рўйхати
 Comment[ven]=Mutevhe uno tambiwa wa MP3
-Comment[vi]=Danh sách MP3 ShoutCast 
+Comment[vi]=Danh mục nhạc Shoutcast MP3
 Comment[xh]=MP3 Uluhlu lokudlala lwe ShoutCast
 Comment[zh_CN]=MP3 ShoutCast 播放列表
 Comment[zh_HK]=MP3 ShoutCast 播放清單
Index: mimetypes/audio/x-speex.desktop
===================================================================
--- mimetypes/audio/x-speex.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/audio/x-speex.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -63,6 +63,7 @@
 Comment[tt]=Speex Tawışı
 Comment[uk]=Аудіо Speex
 Comment[uz]=Speex аудио
+Comment[vi]=Âm thanh Speex
 Comment[wa]=Fitchî odio speex
 Comment[zh_CN]=Speex 音频
 Comment[zh_HK]=Speex 音效檔
Index: mimetypes/audio/mp4.desktop
===================================================================
--- mimetypes/audio/mp4.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/audio/mp4.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -64,6 +64,7 @@
 Comment[tt]=MPEG4 Tawışı
 Comment[uk]=Аудіо MPEG-4
 Comment[uz]=MPEG-4 аудио
+Comment[vi]=Âm thanh MPEG-4
 Comment[wa]=Fitchî odio MPEG-4
 Comment[zh_CN]=MPEG4 音频
 Comment[zh_HK]=MPEG-4 音效檔
Index: mimetypes/audio/x-wav.desktop
===================================================================
--- mimetypes/audio/x-wav.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/audio/x-wav.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -70,6 +70,7 @@
 Comment[uk]=WAV-аудіо
 Comment[uz]=WAW аудио
 Comment[ven]=Zwinopfiwa zwa WAV
+Comment[vi]=Âm thanh WAV
 Comment[wa]=Son WAV
 Comment[xh]=WAV Evakalayo
 Comment[zh_CN]=WAV 音频文件
Index: mimetypes/audio/x-mp2.desktop
===================================================================
--- mimetypes/audio/x-mp2.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/audio/x-mp2.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -58,5 +58,6 @@
 Comment[tt]=MPEG-2 Tawış
 Comment[uk]=Аудіо запис MPEG Layer 2
 Comment[uz]=MPEG Layer 2 аудио
+Comment[vi]=Âm thanh lớp 2 MPEG
 Comment[zh_CN]=MP2 音频文件
 Comment[zh_HK]=MPEG Layer 2 音效檔
Index: mimetypes/audio/vorbis.desktop
===================================================================
--- mimetypes/audio/vorbis.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/audio/vorbis.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -66,6 +66,7 @@
 Comment[tt]=Ogg Vorbis Tawışı
 Comment[uk]=Аудіо Ogg Vorbis
 Comment[uz]=Ogg Vorbis аудио
+Comment[vi]=Âm thanh Ogg Vorbix
 Comment[wa]=Fitchî odio Ogg Vorbis
 Comment[zh_CN]=Ogg Vorbis 音频
 Comment[zh_HK]=Ogg Vorbis 音效檔
Index: mimetypes/audio/x-mp3.desktop
===================================================================
--- mimetypes/audio/x-mp3.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/audio/x-mp3.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -70,6 +70,7 @@
 Comment[uk]=MP3-аудіо
 Comment[uz]=MPEG Layer 3 аудио
 Comment[ven]=Zwinopfiwa zwa mbemba tharu zwa MPEG
+Comment[vi]=Âm thanh lớp 3 MPEG
 Comment[wa]=Son MP3
 Comment[xh]=MPEG Ulwaleko 3 Evakalayo
 Comment[zh_CN]=MP3 音频文件
Index: mimetypes/audio/ac3.desktop
===================================================================
--- mimetypes/audio/ac3.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/audio/ac3.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -67,6 +67,7 @@
 Comment[tt]=Dolby AC3 Tawış
 Comment[uk]=Аудіо Dolby AC3
 Comment[uz]=Dolby AC3 аудио
+Comment[vi]=Âm thanh AC3 Dolby
 Comment[wa]=Son AC3 Dolby
 Comment[zh_CN]=杜比 AC3 声音
 Comment[zh_HK]=杜比 AC3 音效檔
Index: mimetypes/audio/x-ms-wma.desktop
===================================================================
--- mimetypes/audio/x-ms-wma.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/audio/x-ms-wma.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -27,6 +27,7 @@
 Comment[hu]=WMA-hangfájl
 Comment[is]=Windows Media hljóðskrá
 Comment[it]=Audio Windows Media
+Comment[ja]=Windows Media オーディオ
 Comment[km]=Windows Media អូឌីយ៉ូ" 
 Comment[ko]=윈도우즈 메타 오디오
 Comment[lb]=Windows-Media-Audio
@@ -53,5 +54,6 @@
 Comment[tt]=Windows Media Tawışı
 Comment[uk]=Аудіо запис Windows Media
 Comment[uz]=Windows Media аудио
+Comment[vi]=Âm thanh Windows Media
 Comment[zh_CN]=Windows Media 音频
 Comment[zh_HK]=Windows Media 音效檔
Index: mimetypes/multipart/x-mixed-replace.desktop
===================================================================
--- mimetypes/multipart/x-mixed-replace.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/multipart/x-mixed-replace.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -65,6 +65,7 @@
 Comment[uk]=Потік даних (вивід з сервера)
 Comment[uz]=Маълумот оқими (Server Push)
 Comment[ven]=Milambo ya data (U phusha ha data)
+Comment[vi]=Luồng dữ liệu (trình phục vụ đẩy)
 Comment[xh]=Umpompozo lwe Data (Utyilizo Lomncedisi)
 Comment[zh_CN]=数据流(服务器推送)
 Comment[zh_HK]=資料串流（伺服器推送）
Index: mimetypes/multipart/mixed.desktop
===================================================================
--- mimetypes/multipart/mixed.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/multipart/mixed.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -66,6 +66,7 @@
 Comment[uk]=Складений документи
 Comment[uz]=Compound ҳужжати
 Comment[ven]=Manwalwa a Tshigwada
+Comment[vi]=Tài liệu ghép
 Comment[xh]=Uxwebhu Lwembumba
 Comment[zh_CN]=复合文档
 Comment[zh_HK]=複合文件
Index: mimetypes/image/x-portable-pixmap.desktop
===================================================================
--- mimetypes/image/x-portable-pixmap.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/x-portable-pixmap.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -34,7 +34,7 @@
 Comment[hu]=PPM-kép
 Comment[is]=Skráarsnið GIMP forritsins (PPI)
 Comment[it]=Immagine Portable Pixmap
-Comment[ja]=ポータブルピックスマップイメージ
+Comment[ja]=ポータブルピックスマップ画像
 Comment[km]=រូបភាព Portable Pixmap
 Comment[ko]=포터블 픽스맵 그림
 Comment[lb]=Portéierbart Pixmap-Bild
@@ -70,6 +70,7 @@
 Comment[uk]=Мобільний формат файлів pixmap
 Comment[uz]=PPMP-расм
 Comment[ven]=Tshifanyiso tsha Pixmap yau farea
+Comment[vi]=Ảnh sơ đồ điểm ảnh di động
 Comment[wa]=Imådje XPM
 Comment[xh]=Umfanekiso Ophathekayo we Pixmap
 Comment[zh_CN]=便携像素图图像
Index: mimetypes/image/x-dds.desktop
===================================================================
--- mimetypes/image/x-dds.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/x-dds.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -47,4 +47,5 @@
 Comment[tr]=DirectDraw Yüzeyi
 Comment[tt]=DirectDraw Öslege
 Comment[uk]=Поверхня DirectDraw
+Comment[vi]=Mặt DirectDraw
 Comment[zh_CN]=DirectDraw 表面
Index: mimetypes/image/x-xcf-gimp.desktop
===================================================================
--- mimetypes/image/x-xcf-gimp.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/x-xcf-gimp.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -64,6 +64,7 @@
 Comment[uk]=Рідний формат зображень GIMP
 Comment[uz]=Асл GIMP расм формати
 Comment[ven]=Tshivhumbeo tsha tshifanyiso tsha henefho tsha GIMP
+Comment[vi]=Dạng thức ảnh sở hữu GIMP
 Comment[wa]=Imådje native GIMP
 Comment[xh]=Ufomato Lomfanekiso Wendawo ye GIMP
 Comment[zh_CN]=GIMP 本地图像格式
Index: mimetypes/image/x-hdr.desktop
===================================================================
--- mimetypes/image/x-hdr.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/x-hdr.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -7,6 +7,7 @@
 Comment=High Dynamic Range Image
 Comment[af]=Hoog Dinamiese Reeks Beeld
 Comment[bg]=Изображение с висока динамичност (High Dynamic Range Image)
+Comment[bs]=High Dynamic Range slika
 Comment[ca]=Imatge de rang altament dinàmic
 Comment[cs]=Obrázek ve formátu HDRI
 Comment[da]=Billede med højt dynamisk område
@@ -43,4 +44,5 @@
 Comment[tg]=Тасвир бо андозаи динамикии балад
 Comment[tt]=Bik Tere Aralı Sürät
 Comment[uk]=Зображення HDR (High Dynamic Range)
+Comment[vi]=Ảnh phạm vị động cao
 Comment[zh_CN]=高动态范围图像
Index: mimetypes/image/x-jng.desktop
===================================================================
--- mimetypes/image/x-jng.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/x-jng.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -72,6 +72,7 @@
 Comment[uk]=Зображення JNG
 Comment[uz]=JNG-расм
 Comment[ven]=Tshifanyiso tsha JNG
+Comment[vi]=Ảnh JNG
 Comment[wa]=Imådje JNG
 Comment[xh]=Umfanekiso we JNG
 Comment[zh_CN]=JNG 图像
Index: mimetypes/image/png.desktop
===================================================================
--- mimetypes/image/png.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/png.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -72,6 +72,7 @@
 Comment[uk]=Зображення PNG
 Comment[uz]=PNG-расм
 Comment[ven]=Tshifanyiso tsha PNG
+Comment[vi]=Ảnh PNG
 Comment[wa]=Imådje PNG
 Comment[xh]=Umfanekiso we PNG
 Comment[zh_CN]=PNG 图像
Index: mimetypes/image/jpeg.desktop
===================================================================
--- mimetypes/image/jpeg.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/jpeg.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -72,6 +72,7 @@
 Comment[uk]=Зображення JPEG
 Comment[uz]=JPEG-расм
 Comment[ven]=Tshifanyiso tsha JPEG
+Comment[vi]=Ảnh JPEG
 Comment[wa]=Imådje JPEG
 Comment[xh]=Umfanekiso we JPEG
 Comment[zh_CN]=JPEG 图像
Index: mimetypes/image/x-vnd.trolltech.qpicture.desktop
===================================================================
--- mimetypes/image/x-vnd.trolltech.qpicture.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/x-vnd.trolltech.qpicture.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -64,5 +64,6 @@
 Comment[tr]=QPicture Meta Dosyası
 Comment[uk]=Мета-файл QPicture (дані що містять опис даних)
 Comment[uz]=QPicture мета-файли
+Comment[vi]=Siêu tập tin Qpicture
 Comment[zh_CN]=QPicture 元文件
 Comment[zh_TW]=QPicture Meta 檔案
Index: mimetypes/image/x-vnd.adobe.photoshop.desktop
===================================================================
--- mimetypes/image/x-vnd.adobe.photoshop.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/x-vnd.adobe.photoshop.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -68,6 +68,7 @@
 Comment[tt]=Adobe Photoshop Süräte
 Comment[uk]=Зображення Adobe Photoshop
 Comment[uz]=Adobe Photoshop-расм
+Comment[vi]=Ảnh Photoshop của Adobe
 Comment[wa]=Imådje Adobe Photoshop
 Comment[zh_CN]=Adobe Photoshop 图像
 Comment[zh_HK]=Adobe Photoshop 圖檔
Index: mimetypes/image/jp2.desktop
===================================================================
--- mimetypes/image/jp2.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/jp2.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -68,6 +68,7 @@
 Comment[tt]=JPEG 2000 Sürät
 Comment[uk]=Зображення JPEG 2000
 Comment[uz]=JPEG 2000-расм
+Comment[vi]=Ảnh JPEG 2000
 Comment[wa]=Imådje JPEG 2000
 Comment[zh_CN]=JPEG 2000 图像
 Comment[zh_HK]=JPEG 2000 圖檔
Index: mimetypes/image/svg+xml.desktop
===================================================================
--- mimetypes/image/svg+xml.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/svg+xml.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -60,7 +60,7 @@
 Comment[uk]=Масштабовна векторна графіка
 Comment[uz]=SVG-расм
 Comment[ven]=Zwadzigirafu zwi kaliwaho zwa Vekitha
-Comment[vi]=ĐềEhoạ véc-tơ tềElềEđược (scalable) 
+Comment[vi]=Đồ họa véc-tơ có khả năng co giãn
 Comment[xh]=Imizobo Elinganiselekayo Enesalathisi
 Comment[zh_CN]=可缩放向量图
 Comment[zh_HK]=SVG 圖檔
Index: mimetypes/image/x-xbm.desktop
===================================================================
--- mimetypes/image/x-xbm.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/x-xbm.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -72,6 +72,7 @@
 Comment[uk]=Зображення X Bitmap
 Comment[uz]=X BMP-расм
 Comment[ven]=Tshifanyiso tsha Bitmap tsha X
+Comment[vi]=Ảnh sơ đồ bit X
 Comment[wa]=Imådje XBM
 Comment[xh]=Umfanekiso we X BitMap
 Comment[zh_CN]=X 位图图像
Index: mimetypes/image/x-eps.desktop
===================================================================
--- mimetypes/image/x-eps.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/x-eps.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -17,7 +17,7 @@
 Comment[cs]=Obrázek ve formátu Encapsulated PostScript
 Comment[cy]=Delwedd PostScript wedi'i Ymgrynhoi
 Comment[da]=Encapsulated PostScript-billede
-Comment[de]=EPS-Abbildung
+Comment[de]=EPS-Bild
 Comment[el]=Εικόνα Encapsulated PostScript
 Comment[eo]=EPS-bildo
 Comment[es]=Imagen PostScript encapsulado
@@ -70,6 +70,7 @@
 Comment[uk]=Зображення Encapsulated PostScript
 Comment[uz]=EPS-расм
 Comment[ven]=Tshifanyiso tsha tshikiriputi tsha poso
+Comment[vi]=Ảnh PostScript đã bao bọc (EPI)
 Comment[wa]=Imådje PostScript ecapsulêye
 Comment[xh]=Umfanekiso we PostScript Wokuvalelweyo
 Comment[zh_CN]=封装的 PostScript 图像
Index: mimetypes/image/x-targa.desktop
===================================================================
--- mimetypes/image/x-targa.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/x-targa.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -35,7 +35,7 @@
 Comment[hu]=Truevision Targa-kép
 Comment[is]=Truevision Targa mynd
 Comment[it]=Immagine Truevision Targa
-Comment[ja]=トゥルービジョン Targa イメージ
+Comment[ja]=トゥルービジョン Targa 画像
 Comment[km]=រូបភាព Truevision Targa
 Comment[ko]=트루비전 타가 그림
 Comment[lb]=Truevision-Targa-Bild
@@ -70,6 +70,7 @@
 Comment[uk]=Зображення Truevision Targa
 Comment[uz]=TGA-расм
 Comment[ven]=Tshifanyiso tsha Targa tsha mbonalelo ya vhukuma ya TIFF
+Comment[vi]=Ảnh Truevision Targa
 Comment[wa]=Imådje Targa
 Comment[xh]=Umfanekiso we Truevision Targa
 Comment[zh_CN]=Truevision Targa 图像
Index: mimetypes/image/x-exr.desktop
===================================================================
--- mimetypes/image/x-exr.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/x-exr.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -62,5 +62,6 @@
 Comment[tt]=ILM EXR Süräte
 Comment[uk]=Зображення ILM EXR
 Comment[uz]=ILM EXR-расм
+Comment[vi]=Ảnh ILM EXR
 Comment[zh_CN]=ILM EXR 图像
 
Index: mimetypes/image/gif.desktop
===================================================================
--- mimetypes/image/gif.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/gif.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -72,6 +72,7 @@
 Comment[uk]=Зображення GIF
 Comment[uz]=GIF-расм
 Comment[ven]=Tshifanyiso tsha GIF
+Comment[vi]=Ảnh GIF
 Comment[wa]=Imådje GIF
 Comment[xh]=Umfanekiso we GIF
 Comment[zh_CN]=GIF 图像
Index: mimetypes/image/cgm.desktop
===================================================================
--- mimetypes/image/cgm.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/cgm.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -61,7 +61,7 @@
 Comment[uk]=Мета-файл "Computer Graphics"
 Comment[uz]=Компьютер графика мета-файл
 Comment[ven]=Faela ya khompwutha Graphics
-Comment[vi]=Metafile của đềEhoạ máy tính 
+Comment[vi]=Siêu tập tin đồ họa máy tính
 Comment[xh]=Ifayile ye Meta Yemizobo ye Khompyutha
 Comment[zh_CN]=计算机图形元文件
 Comment[zh_HK]=CGM 圖檔
Index: mimetypes/image/x-msod.desktop
===================================================================
--- mimetypes/image/x-msod.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/x-msod.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -67,6 +67,7 @@
 Comment[uk]=Малюнок MS Office
 Comment[uz]=MS Office чизмаси
 Comment[ven]=Miolo ya ofisi ya MS
+Comment[vi]=Bản vẽ Microsoft™ Office
 Comment[wa]=Documint MS-Office
 Comment[xh]=Umzobo we Microsoft Office
 Comment[zh_CN]=Microsoft Office 绘图
Index: mimetypes/image/x-xpm.desktop
===================================================================
--- mimetypes/image/x-xpm.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/x-xpm.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -72,6 +72,7 @@
 Comment[uk]=Зображення X PixMap
 Comment[uz]=X PMP-расм
 Comment[ven]=Tshifanyiso tsha Pixmap tsha X
+Comment[vi]=Ảnh sơ đồ điểm ảnh X
 Comment[wa]=Imådje XPM
 Comment[xh]=Umfanekiso we X PixMap
 Comment[zh_CN]=X 象素图图像
Index: mimetypes/image/x-xcursor.desktop
===================================================================
--- mimetypes/image/x-xcursor.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/x-xcursor.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -32,7 +32,7 @@
 Comment[hu]=X11-egérmutató
 Comment[is]=X11 músarbendill
 Comment[it]=Cursore mouse X11
-Comment[ja]=X11 マウス カーソル
+Comment[ja]=X11 マウスカーソル
 Comment[km]=ទស្សន៍ទ្រនិចកណ្តុរ X11
 Comment[ko]=X11 마우스 커서
 Comment[lb]=X11-Mauscursor
@@ -66,6 +66,7 @@
 Comment[tt]=X11 Küse Uğı
 Comment[uk]=Курсор мишки для X11
 Comment[uz]=X11 сичқонча курсори
+Comment[vi]=Con chạy chuột X11
 Comment[wa]=Cursoe X11 pol sori
 Comment[zh_CN]=X11 鼠标光标
 Comment[zh_HK]=X11 滑鼠游標
Index: mimetypes/image/x-djvu-2.desktop
===================================================================
--- mimetypes/image/x-djvu-2.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/x-djvu-2.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -7,6 +7,8 @@
 Comment=DjVu Document
 Comment[af]=DjVu Dokument
 Comment[bg]=Документ DjVu
+Comment[br]=Teul DjVu
+Comment[bs]=DjVu dokument
 Comment[ca]=Document DjVu
 Comment[cs]=DjVu dokument
 Comment[da]=DjVU-dokument
@@ -50,5 +52,6 @@
 Comment[tt]=DjVu İstälege
 Comment[uk]=Документ DjVu
 Comment[uz]=DjVu ҳужжати
+Comment[vi]=Tài liệu DjVu
 Comment[zh_CN]=DjVu 文档
 Comment[zh_HK]=DjVu 圖檔
Index: mimetypes/image/x-djvu.desktop
===================================================================
--- mimetypes/image/x-djvu.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/x-djvu.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -7,6 +7,8 @@
 Comment=DjVu Document
 Comment[af]=DjVu Dokument
 Comment[bg]=Документ DjVu
+Comment[br]=Teul DjVu
+Comment[bs]=DjVu dokument
 Comment[ca]=Document DjVu
 Comment[cs]=DjVu dokument
 Comment[da]=DjVU-dokument
@@ -50,5 +52,6 @@
 Comment[tt]=DjVu İstälege
 Comment[uk]=Документ DjVu
 Comment[uz]=DjVu ҳужжати
+Comment[vi]=Tài liệu DjVu
 Comment[zh_CN]=DjVu 文档
 Comment[zh_HK]=DjVu 圖檔
Index: mimetypes/image/x-rgb.desktop
===================================================================
--- mimetypes/image/x-rgb.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/x-rgb.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -32,7 +32,7 @@
 Comment[hu]=SGI-kép (RGB)
 Comment[is]=SGI mynd (RGB)
 Comment[it]=Immagine SGI (RGB)
-Comment[ja]=SGI イメージ (RGB)
+Comment[ja]=SGI 画像 (RGB)
 Comment[km]=រូបភាព SGI (RGB)
 Comment[ko]=SGI 그림 (RGB)
 Comment[lb]=SGI-Bild (RGB)
@@ -64,5 +64,6 @@
 Comment[tt]=SGI Sürät (RGB)
 Comment[uk]=Зображення SGI (RGB)
 Comment[uz]=SGI-расм (RGB)
+Comment[vi]=Ảnh SGI (RGB)
 Comment[zh_CN]=SGI 图像(RGB)
 Comment[zh_HK]=SGI 圖檔 (RGB)
Index: mimetypes/image/x-portable-greymap.desktop
===================================================================
--- mimetypes/image/x-portable-greymap.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/x-portable-greymap.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -34,7 +34,7 @@
 Comment[hu]=PGM-kép
 Comment[is]=Skráarsnið GIMP forritsins (PGI)
 Comment[it]=Immagine Portable Graymap
-Comment[ja]=ポータブルグレイマップイメージ
+Comment[ja]=ポータブルグレイマップ画像
 Comment[km]=រូបភាព Portable Graymap
 Comment[lb]=Portéierbart Graymap-Bild
 Comment[lt]=Perkeliamas pilkų pustonių (greymap) paveiksliukas
@@ -69,6 +69,7 @@
 Comment[uk]=Мобільний формат файлів graymap
 Comment[uz]=PGMP-расм
 Comment[ven]=Tshifanyiso Graymap i farea
+Comment[vi]=Ảnh sơ đồ xám di động
 Comment[wa]=Imådje PPM
 Comment[xh]=Umfanekiso Ophathekayo we Graymap
 Comment[zh_CN]=便携灰度图图像
Index: mimetypes/image/x-ico.desktop
===================================================================
--- mimetypes/image/x-ico.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/x-ico.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -35,7 +35,7 @@
 Comment[hu]=Windows-ikon
 Comment[is]=Windows táknmynd
 Comment[it]=Icona Windows
-Comment[ja]=ウィンドウズアイコン
+Comment[ja]=Windows アイコン
 Comment[km]=រូបតំណាង Windows
 Comment[ko]=윈도우즈 아이콘
 Comment[lb]=Windows Symbol
@@ -72,6 +72,7 @@
 Comment[uk]=Піктограма Windows
 Comment[uz]=Windows нишончаси
 Comment[ven]=Dziaikhono dza Dziwindo
+Comment[vi]=Biểu tượng Windows
 Comment[wa]=Imådjete MS-Windows
 Comment[zh_CN]=Windows 图标
 Comment[zh_HK]=Windows 圖示
Index: mimetypes/image/x-photo-cd.desktop
===================================================================
--- mimetypes/image/x-photo-cd.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/x-photo-cd.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -72,6 +72,7 @@
 Comment[uk]=Зображення Photo-CD
 Comment[uz]=PhotoCD-расм
 Comment[ven]=Tshifanyiso tsha tshinepe tsha CD
+Comment[vi]=Ảnh PhotoCD
 Comment[wa]=Imådje PhotoCD
 Comment[xh]=Umfanekiso we PhotoCD
 Comment[zh_CN]=PhotoCD 图像
Index: mimetypes/image/x-bmp.desktop
===================================================================
--- mimetypes/image/x-bmp.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/x-bmp.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -68,6 +68,7 @@
 Comment[tt]=BMP Sürät
 Comment[uk]=Зображення BMP
 Comment[uz]=BMP-расм
+Comment[vi]=Ảnh BMP
 Comment[wa]=Imådje BMP
 Comment[zh_CN]=BMP 图像
 Comment[zh_HK]=BMP 圖檔
Index: mimetypes/image/fax-g3.desktop
===================================================================
--- mimetypes/image/fax-g3.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/fax-g3.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -70,6 +70,7 @@
 Comment[uk]=Факс CCITT G3
 Comment[uz]=CCITT G3 факс-файли
 Comment[ven]=Fekisi ya CCITT G3
+Comment[vi]=Điện thư G3 CCITT
 Comment[wa]=Facs CCITT G3
 Comment[zh_CN]=CCITT G3 传真
 Comment[zh_HK]=CCITT G3 傳真
Index: mimetypes/image/x-portable-bitmap.desktop
===================================================================
--- mimetypes/image/x-portable-bitmap.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/x-portable-bitmap.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -34,7 +34,7 @@
 Comment[hu]=PBM-kép
 Comment[is]=Skráarsnið GIMP forritsins (PBI)
 Comment[it]=Immagine Portable Bitmap
-Comment[ja]=ポータブルビットマップイメージ
+Comment[ja]=ポータブルビットマップ画像
 Comment[km]=រូបភាព Portable Bitmap
 Comment[ko]=포터블 비트맵 그림
 Comment[lb]=Portéierbart Bitmapbild
@@ -71,6 +71,7 @@
 Comment[uk]=Мобільний формат файлів bitmap
 Comment[uz]=PBMP-расм
 Comment[ven]=Tshifanyiso tsha Bitmap i fareaho
+Comment[vi]=Ảnh sơ đồ bit di động
 Comment[wa]=Imådje PBM
 Comment[xh]=Umfaneksio Ophathekayo we Bitmap
 Comment[zh_CN]=便携位图图像
Index: mimetypes/image/tiff.desktop
===================================================================
--- mimetypes/image/tiff.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/tiff.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -75,7 +75,7 @@
 Comment[uk]=Зображення TIFF
 Comment[uz]=TIFF-расм
 Comment[ven]=Tshifanyiso tsha TIFF
-Comment[vi]=A?nh TIFF 
+Comment[vi]=Ảnh TIFF
 Comment[wa]=Imådje TIFF
 Comment[xh]=Umfanekiso we TIFF
 Comment[zh_CN]=TIFF 图像
Index: mimetypes/image/x-raw.desktop
===================================================================
--- mimetypes/image/x-raw.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/x-raw.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -6,19 +6,22 @@
 Patterns=*.raw;*.RAW;*.dcr;*.DCR;*.dng;*.DNG;*.crw;*.CRW;*.cr2,*.CR2;*.nef;*.NEF;*.mrw;*.MRW;
 Comment=RAW Camera Image
 Comment[ca]=Fitxer de càmera RAW
+Comment[cs]=RAW soubor z fotoaparátu
 Comment[da]=Ubehandlet kamerabillede
 Comment[de]=Kamera-Bild im RAW-Format
 Comment[el]=RAW εικόνα κάμερας
 Comment[es]=Imagen RAW de cámara
 Comment[et]=Kaamera toorpilt
 Comment[eu]=RAW kamara fitxategia
+Comment[fi]=RAW-kameratiedosto
 Comment[fr]=Image RAW d'appareil photo
 Comment[fy]=RAW-fototastelôfbylding
 Comment[hu]=RAW-képfájl
 Comment[is]=RAW ljósmynd
 Comment[it]=Immagine fotocamera grezza
-Comment[ja]=RAW カメラ イメージ
+Comment[ja]=RAW カメラ画像
 Comment[km]=រូបភាពកាមេរា RAW
+Comment[lb]=Onbehandelt Kamerabild (RAW)
 Comment[lt]=RAW foto atvaizdas
 Comment[ms]=Imej Kamera RAW
 Comment[nds]=Kamerbild in RAW-Formaat
@@ -27,8 +30,11 @@
 Comment[pt]=Imagem RAW da Máquina Fotográfica
 Comment[pt_BR]=Imagem RAW da Máquina Fotográfica
 Comment[ro]=Imagine foto brută
+Comment[sl]=Slika RAW s fotoaparata
 Comment[sr]=Сирова слика са камере
 Comment[sr@Latn]=Sirova slika sa kamere
 Comment[sv]=Obehandlad kamerafil
 Comment[tg]=RAW Файли тасвирӣ
 Comment[uk]=Необроблене зображення з фотоапарату
+Comment[vi]=Ảnh PCX
+Comment[zh_CN]=RAW 相机图像
Index: mimetypes/image/x-wmf.desktop
===================================================================
--- mimetypes/image/x-wmf.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/x-wmf.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -29,7 +29,7 @@
 Comment[id]=Berkas meta Windows
 Comment[is]=Windows lýsiskrá
 Comment[it]=Metafile Windows
-Comment[ja]=Windows Metaファイル
+Comment[ja]=Windows メタファイル
 Comment[km]=ឯកសារមេតា Windows
 Comment[ko]=윈도우즈 메타 파일
 Comment[lb]=Windows-Metadatei
@@ -60,6 +60,7 @@
 Comment[tr]=Windows Meta Dosyası
 Comment[uz]=Windows мета-файли
 Comment[ven]=Matafaela ya dziwindo
+Comment[vi]=Siêu tập tin Windows
 Comment[xh]=Ifayile ye Meta ye Windows
 Comment[zh_CN]=Windows 元文件
 Comment[zu]=Ama-window eMetaFayela
Index: mimetypes/image/x-pcx.desktop
===================================================================
--- mimetypes/image/x-pcx.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/x-pcx.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -72,6 +72,7 @@
 Comment[uk]=Зображення PCX
 Comment[uz]=PCX-расм
 Comment[ven]=Tshifanyiso tsha PNG
+Comment[vi]=Ảnh PCX
 Comment[wa]=Imådje PCX
 Comment[xh]=Umfanekiso we PCX
 Comment[zh_CN]=PCX 图像
Index: mimetypes/image/x-xfig.desktop
===================================================================
--- mimetypes/image/x-xfig.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/x-xfig.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -35,7 +35,7 @@
 Comment[hu]=XFig-fájl
 Comment[is]=XFig skrá
 Comment[it]=File XFig
-Comment[ja]=XFigファイル
+Comment[ja]=XFig ファイル
 Comment[km]=ឯកសារ XFig
 Comment[ko]=XFig 파일
 Comment[lb]=XFig-Datei
@@ -73,7 +73,7 @@
 Comment[uk]=Файл XFig
 Comment[uz]=XFig-файли
 Comment[ven]=Faela ya XFig
-Comment[vi]=File XFig 
+Comment[vi]=Tập tin XFig
 Comment[wa]=Fitchî XFig
 Comment[xh]=Ifayile ye XFig
 Comment[zh_CN]=XFig 文件
Index: mimetypes/image/fits.desktop
===================================================================
--- mimetypes/image/fits.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/fits.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -8,6 +8,7 @@
 Comment[af]=FITS Beeld
 Comment[bg]=Изображение FITS
 Comment[br]=Skeudenn FITS
+Comment[bs]=FITS slika
 Comment[ca]=Imatge FITS
 Comment[cs]=FITS obrázek
 Comment[da]=FITS-billede
@@ -47,6 +48,7 @@
 Comment[tg]=Тасвири FITS
 Comment[uk]=Зображення FITS
 Comment[uz]=FITS-расм
+Comment[vi]=Ảnh FITS
 Comment[zh_CN]=FITS 图像
 Comment[zh_HK]=FITS 圖檔
 ### TODO: what file patterns, especially that application/fits has the same
Index: mimetypes/image/pjpeg.desktop
===================================================================
--- mimetypes/image/pjpeg.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/image/pjpeg.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -73,6 +73,7 @@
 Comment[uk]=Зображення JPEG
 Comment[uz]=JPEG-расм
 Comment[ven]=Tshifanyiso tsha JPEG
+Comment[vi]=Ảnh JPEG
 Comment[wa]=Imådje JPEG
 Comment[xh]=Umfanekiso we JPEG
 Comment[zh_CN]=JPEG 图像
Index: mimetypes/allfiles.desktop
===================================================================
--- mimetypes/allfiles.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/allfiles.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -15,7 +15,7 @@
 Comment[cs]=Všechny soubory
 Comment[cy]=Pob Ffeil
 Comment[da]=Alle filer
-Comment[de]=Sämtliche Dateien
+Comment[de]=Alle Dateien
 Comment[el]=Όλα τα αρχεία
 Comment[eo]=Ĉiuj dosieroj
 Comment[es]=Todos los archivos
@@ -24,7 +24,7 @@
 Comment[fa]=تمام پرونده‌ها
 Comment[fi]=Kaikki tiedostot
 Comment[fr]=Tous les fichiers
-Comment[fy]=Alle triemen
+Comment[fy]=Alle triemmen
 Comment[ga]=Gach Comhad
 Comment[gl]=Todos os Arquivos
 Comment[he]=כל הקבצים
Index: mimetypes/application/chm.desktop
===================================================================
--- mimetypes/application/chm.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/chm.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -3,6 +3,7 @@
 Comment[af]=HTML Hulp Dokument
 Comment[bg]=Помощна информация HTML
 Comment[br]=Teul skoazell HTML
+Comment[bs]=HTML Help dokument
 Comment[ca]=Document d'ajuda HTML
 Comment[cs]=Dokument HTML nápovědy
 Comment[da]=HTML-hjælpedokument
@@ -23,6 +24,7 @@
 Comment[km]=ឯកសារជំនួយ HTML
 Comment[lb]=HTML-Hëllefsdokument
 Comment[lt]=HTML pagalbos dokumentas
+Comment[mk]=HTML-документ за помош
 Comment[ms]=Dokumen Bantuan HTML
 Comment[nb]=HTML hjelp-dokument
 Comment[nds]=HTML-Hülpdokment
@@ -42,6 +44,7 @@
 Comment[tg]=Ҳуҷҷати Ёрмандии HTML
 Comment[uk]=Документ довідки в HTML
 Comment[uz]=HTML ёрдам ҳужжати
+Comment[vi]=Tài liệu trợ giúp HTML
 Comment[zh_CN]=HTML 帮助文档
 Comment[zh_HK]=HTML 說明文件
 Hidden=false
Index: mimetypes/application/octet-stream.desktop
===================================================================
--- mimetypes/application/octet-stream.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/octet-stream.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -74,7 +74,7 @@
 Comment[uk]=Невідомий
 Comment[uz]=Номаълум
 Comment[ven]=Zwisadivhei
-Comment[vi]=Không biết 
+Comment[vi]=Không rõ
 Comment[wa]=Nén cnoxhou
 Comment[xh]=Engaziwayo
 Comment[zh_CN]=未知
Index: mimetypes/application/x-graphite.desktop
===================================================================
--- mimetypes/application/x-graphite.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-graphite.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,6 +69,7 @@
 Comment[uk]=Graphite - наукова графіка
 Comment[uz]=Graphite илмий чизма
 Comment[ven]=Girafaiti - Girafu ya zwa dzi santsi
+Comment[vi]=Đồ thị Graphite Scientific
 Comment[wa]=Grafikes syintifikes di Graphite
 Comment[xh]=Imizobo Yobunzulu Lwazi ye Graphite
 Comment[zh_CN]=Graphite 科学图表
Index: mimetypes/application/x-pkcs12.desktop
===================================================================
--- mimetypes/application/x-pkcs12.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-pkcs12.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -63,9 +63,10 @@
 Comment[th]=ใบรับรองที่ให้มาแบบ PKCS#12
 Comment[tr]=PKCS#12 Sertifika Paketi
 Comment[tt]=PKCS#12 Tanıqlıqlar Bäyläme
-Comment[uk]=Клунок сертифікату PKCS#12
+Comment[uk]=Низка сертифікатів PKCS#12
 Comment[uz]=PKCS#12 сертификатлар тўплами
 Comment[ven]=Nanda ya sethifikheithi tsha PKCS#12
+Comment[vi]=Bó chứng nhận PKCS#12
 Comment[xh]=PKCS#12 Uqokelelo lwe Siqinisekiso
 Comment[zh_CN]=PKCS#12 证书束
 Comment[zh_HK]=PKCS#12 認證
Index: mimetypes/application/sieve.desktop
===================================================================
--- mimetypes/application/sieve.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/sieve.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -31,7 +31,7 @@
 Comment[hu]=SIEVE e-mail-szűrő szkript
 Comment[is]=SIEVE Póstsíu skrifta
 Comment[it]=Script filtro di posta SIEVE
-Comment[ja]=SIEVEメールフィルタスクリプト
+Comment[ja]=SIEVE メールフィルタスクリプト
 Comment[km]=ស្គ្រីប SIEVE Mail Filter
 Comment[ko]=SIEVE 편지 거르개 스크립트
 Comment[lb]=Skript fir den SIEVE-Mailfilter
@@ -67,6 +67,7 @@
 Comment[uk]=Сценарій фільтру для електронної пошти SIEVE
 Comment[uz]=SIEVE хатни филтерлаш скрипти
 Comment[ven]=Tshikiputi tsha filithara ya meili ya SIEVE
+Comment[vi]=Tấp lệnh lọc thư SIEVE.
 Comment[xh]=Isihluzi Sombhalo oshicilwe phantsi Seposi se SIEVE
 Comment[zh_CN]=SIEVE 邮件过滤脚本
 Comment[zh_HK]=SIEVE 郵件過濾程式
Index: mimetypes/application/x-tex-pk.desktop
===================================================================
--- mimetypes/application/x-tex-pk.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-tex-pk.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -67,6 +67,7 @@
 Comment[uk]=Упакований шрифт
 Comment[uz]=Жойланган шрифт
 Comment[ven]=Fontu yo dzudzanywaho
+Comment[vi]=Phông chữ đã nén
 Comment[wa]=Fontes PK po TeX
 Comment[xh]=Umgca Opakishiweyo
 Comment[zh_CN]=打包的字体
Index: mimetypes/application/mathml+xml.desktop
===================================================================
--- mimetypes/application/mathml+xml.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/mathml+xml.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -70,6 +70,7 @@
 Comment[tt]=MathML İstälege
 Comment[uk]=Документ MathML (математичні формули)
 Comment[uz]=MathML ҳужжати
+Comment[vi]=Tài liệu MathML
 Comment[wa]=Documint MathML
 Comment[zh_CN]=MathML 文档
 Comment[zh_HK]=MathML 文件
Index: mimetypes/application/x-zerosize.desktop
===================================================================
--- mimetypes/application/x-zerosize.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-zerosize.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,7 +69,7 @@
 Comment[uk]=Порожній документ
 Comment[uz]=Бўш ҳужжат
 Comment[ven]=Manwalwa asi na tshithu
-Comment[vi]=Tài liệu trống
+Comment[vi]=Tài liệu rỗng
 Comment[wa]=Documint vude
 Comment[xh]=Uxwebh Olungenanto
 Comment[zh_CN]=空文档
Index: mimetypes/application/x-lyx.desktop
===================================================================
--- mimetypes/application/x-lyx.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-lyx.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,7 +69,7 @@
 Comment[uk]=Документ LyX
 Comment[uz]=LyX ҳужжати
 Comment[ven]=Manwalwa a LyX
-Comment[vi]=Tài liệu LYX
+Comment[vi]=Tài liệu LyX
 Comment[wa]=Documint LyX
 Comment[xh]=Uxwebhu lwe LyX
 Comment[zh_CN]=LyX 文档
Index: mimetypes/application/x-font-speedo.desktop
===================================================================
--- mimetypes/application/x-font-speedo.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-font-speedo.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -71,6 +71,7 @@
 Comment[uk]=Шрифт Speedo
 Comment[uz]=Speedo шрифти
 Comment[ven]=Fontu ya luvhilo
+Comment[vi]=Phông chữ Speedo
 Comment[wa]=Fonte Speedo
 Comment[xh]=Uhlobo lwamagama lwe Speedo
 Comment[zh_CN]=Speedo 字体
Index: mimetypes/application/x-kword.desktop
===================================================================
--- mimetypes/application/x-kword.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-kword.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -73,6 +73,7 @@
 Comment[uk]=Документ KWord
 Comment[uz]=KWord ҳужжати
 Comment[ven]=Manwalwa fhungo la K
+Comment[vi]=Tài liệu KWord
 Comment[wa]=Documint KWord
 Comment[xh]=Uxwebhu lwe KWord
 Comment[zh_CN]=KWord 文档
Index: mimetypes/application/x-abiword.desktop
===================================================================
--- mimetypes/application/x-abiword.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-abiword.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -72,7 +72,7 @@
 Comment[uk]=Новий документ AbiWord
 Comment[uz]=AbiWord ҳужжати
 Comment[ven]=Manwalwa a maipfi a Abi
-Comment[vi]=Tài liệu AbiWord 
+Comment[vi]=Tài liệu AbiWord
 Comment[wa]=Documint Abiword
 Comment[xh]=Uxwebhu lwe AbiWord
 Comment[zh_CN]=AbiWord 文档
Index: mimetypes/application/x-vnd.kde.kexi.desktop
===================================================================
--- mimetypes/application/x-vnd.kde.kexi.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-vnd.kde.kexi.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -68,6 +68,7 @@
 Comment[tt]=Kexi Sölge Bireme
 Comment[uk]=Файл проекту Kexi
 Comment[uz]=Kexi лойиҳа файли
+Comment[vi]=Tập tin dự án Kexi
 Comment[wa]=Fitchî di prodjet Kexi
 Comment[zh_CN]=Kexi 项目文件
 Comment[zh_HK]=Kexi 計畫檔案
Index: mimetypes/application/x-cpio.desktop
===================================================================
--- mimetypes/application/x-cpio.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-cpio.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -73,6 +73,7 @@
 Comment[uk]=Архів CPIO
 Comment[uz]=CPIO архиви
 Comment[ven]=Fhethu hau vhulunga hone zwithu zwa kale ha CPIO
+Comment[vi]=Bản nén CPIO
 Comment[wa]=Årtchive cpio
 Comment[xh]=Indawo yokugcina ye CPIO
 Comment[zh_CN]=CPIO 归档
Index: mimetypes/application/x-magicpoint.desktop
===================================================================
--- mimetypes/application/x-magicpoint.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-magicpoint.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -67,6 +67,7 @@
 Comment[tt]=MagicPoint Täqbire
 Comment[uk]=Презентація MagicPoint
 Comment[uz]=MagicPoint намойиши
+Comment[vi]=Trình diễn MagicPoint
 Comment[wa]=Documint di prezintaedje Magicpoint
 Comment[zh_CN]=MagicPoint 演示文稿
 Comment[zh_HK]=MagicPoint 簡報
Index: mimetypes/application/vnd.mozilla.xul+xml.desktop
===================================================================
--- mimetypes/application/vnd.mozilla.xul+xml.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.mozilla.xul+xml.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -60,5 +60,6 @@
 Comment[tt]=Mozilla XUL Bireme
 Comment[uk]=Файл Mozilla XUL
 Comment[uz]=Mozilla XUL-файли
+Comment[vi]=Tài liệu XUL Mozilla.
 Comment[zh_CN]=Mozilla XUL 文件
 Comment[zh_HK]=Mozilla XUL 檔案
Index: mimetypes/application/x-bittorrent.desktop
===================================================================
--- mimetypes/application/x-bittorrent.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-bittorrent.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -60,6 +60,7 @@
 Comment[tt]=BitTorrent İñdermäse
 Comment[uk]=Звантаження BitTorrent
 Comment[uz]=BitTorrent олиш
+Comment[vi]=Bản tải xuống BitTorrent
 Comment[wa]=Aberwetaedje avou BitTorrent
 Comment[zh_CN]=BitTorrent 下载
 Comment[zh_HK]=BitTorrent 下載
Index: mimetypes/application/x-sharedlib.desktop
===================================================================
--- mimetypes/application/x-sharedlib.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-sharedlib.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -67,6 +67,7 @@
 Comment[uk]=Спільна бібліотека
 Comment[uz]=Бўлишилган кутубхона
 Comment[ven]=Laiburari yo kovhiwaho
+Comment[vi]=Thư viên dùng chung
 Comment[wa]=Pårteye livreye
 Comment[xh]=Ilayibrari Eyahluliweyo
 Comment[zh_CN]=共享库
Index: mimetypes/application/vnd.sun.xml.base.desktop
===================================================================
--- mimetypes/application/vnd.sun.xml.base.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.sun.xml.base.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -4,6 +4,7 @@
 Comment[af]=OpenOffice.org Databasis
 Comment[bg]=База от данни на OpenOffice.org
 Comment[br]=StlennvonOpenOffice.org
+Comment[bs]=OpenOffice.org baza podataka
 Comment[ca]=Base de dades OpenOffice.org
 Comment[cs]=Databáze OpenOffice.org
 Comment[da]=OpenOffice.org database
@@ -48,6 +49,7 @@
 Comment[tt]=OpenOffice.org Biremlege
 Comment[uk]=База даних OpenOffice.org
 Comment[uz]=OpenOffice.org маълумот база
+Comment[vi]=Cơ sở dữ liệu OpenOffice.org
 Comment[zh_CN]=OpenOffice.org 数据库
 Comment[zh_HK]=OpenOffice.org 資料庫
 Icon=spreadsheet
Index: mimetypes/application/x-linguist.desktop
===================================================================
--- mimetypes/application/x-linguist.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-linguist.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -66,6 +66,7 @@
 Comment[tt]=Qt Tärcemä Çığanağınıñ Bireme
 Comment[uk]=Вихідний файл перекладу для Qt
 Comment[uz]=Qt таржима қилишнинг коди
+Comment[vi]=Tập tin nguồn dịch Qt
 Comment[zh_CN]=Qt 翻译源文件
 Comment[zh_HK]=QT Translation 原始檔案
 Comment[zh_TW]=QT Translation 原始檔案
Index: mimetypes/application/x-tbz.desktop
===================================================================
--- mimetypes/application/x-tbz.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-tbz.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -4,6 +4,7 @@
 Comment[af]=Bzip2-ed Tar Argief
 Comment[bg]=Компресиран архив Tar с Bzip2
 Comment[br]=Diell Tar Bzip2et
+Comment[bs]=Bzip2-ovana Tar arhiva
 Comment[ca]=Arxiu tar i bzip2
 Comment[cs]=Bzipovaný tar archív
 Comment[da]=Bzip2 TAR-arkiver
@@ -43,6 +44,7 @@
 Comment[tg]=Архиви Tar Bzip2-карда шуд
 Comment[uk]=Архів Tar, стиснутий Bzip2
 Comment[uz]=Bzip билан қисилган Tar архиви
+Comment[vi]=Bản Tar đã nén Bzip
 Comment[zh_CN]=Bzip 压缩的 Tar 归档
 Comment[zh_HK]=Bzip2 壓縮的 Tar 保存檔
 MimeType=application/x-tbz
Index: mimetypes/application/x-hancomword.desktop
===================================================================
--- mimetypes/application/x-hancomword.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-hancomword.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -71,6 +71,7 @@
 Comment[uk]=Документ HancomWord
 Comment[uz]=HancomWord ҳужжати
 Comment[ven]=Manwalwa a fhungo la Hamcon
+Comment[vi]=Tài liệu HancomWord
 Comment[wa]=Documint HancomWord
 Comment[xh]=Uxwebhu lwe HancomWord
 Comment[zh_CN]=HancomWord 文档
Index: mimetypes/application/x-zip-compressed.desktop
===================================================================
--- mimetypes/application/x-zip-compressed.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-zip-compressed.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -72,6 +72,7 @@
 Comment[uk]=Архів Zip
 Comment[uz]=Zip архиви
 Comment[ven]=Fhethu hau vhulungela zwithu zwa kale ha Zip
+Comment[vi]=Bản nén Zip
 Comment[wa]=Årtchive ZIP
 Comment[xh]=Indawo yogcino ye Zip
 Comment[zh_CN]=Zip 归档
Index: mimetypes/application/x-kugar.desktop
===================================================================
--- mimetypes/application/x-kugar.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-kugar.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -71,7 +71,7 @@
 Comment[uk]=Файл даних Kugar
 Comment[uz]=Kuvar маълумот файли
 Comment[ven]=Data ya faela ya Kugar
-Comment[vi]=File dữ liệu Kugar 
+Comment[vi]=Tập tin dữ liệu Kugar
 Comment[xh]=Ifayile ye Data ye Kugar
 Comment[zh_CN]=Kugar 数据文件
 Comment[zh_HK]=Kugar 資料檔案
Index: mimetypes/application/x-gzip.desktop
===================================================================
--- mimetypes/application/x-gzip.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-gzip.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -70,6 +70,7 @@
 Comment[uk]=Файл gzip
 Comment[uz]=Gzip-файли
 Comment[ven]=Faela ya Gzip
+Comment[vi]=Tập tin Gzip
 Comment[wa]=Fitchî gzip
 Comment[xh]=Ifayile ye Gzip
 Comment[zh_CN]=Gzip 文件
Index: mimetypes/application/vnd.palm.desktop
===================================================================
--- mimetypes/application/vnd.palm.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.palm.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -68,6 +68,7 @@
 Comment[tt]=Palm İstälege
 Comment[uk]=Документ Palm
 Comment[uz]=Palm ҳужжати
+Comment[vi]=Tài liệu Palm
 Comment[wa]=Documint Palm
 Comment[zh_CN]=Palm 文档
 Comment[zh_HK]=Palm 文件
Index: mimetypes/application/x-cue.desktop
===================================================================
--- mimetypes/application/x-cue.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-cue.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -47,3 +47,4 @@
 Comment[tg]=Феҳристи CDRWIN
 Comment[tt]=CDRWIN Cue-Cäymäse
 Comment[uk]=Файл диску CDRWIN
+Comment[vi]=Tờ hiệu báo CDRWIN
Index: mimetypes/application/x-tzo.desktop
===================================================================
--- mimetypes/application/x-tzo.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-tzo.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -32,7 +32,7 @@
 Comment[id]=Archive Lzopped Tar
 Comment[is]=Lzop-þjappað tar-safn
 Comment[it]=Archivio Tar compresso con Lz
-Comment[ja]=LzopされたTarアーカイブ
+Comment[ja]=Lzop された Tar アーカイブ
 Comment[km]=ប័ណ្ណសារ Lzopped Tar
 Comment[ko]=Lzop으로 압축한 TAR 저장고
 Comment[lb]=Mat Lzop kompriméierten Tar-Archiv
@@ -72,7 +72,7 @@
 Comment[uk]=Архів tar стиснутий lzop
 Comment[uz]=Lzop билан қисилган Tar архиви
 Comment[ven]=Fhethu hau vhulungela zwithu zwa kale ha Tar Lzopped
-Comment[vi]=File nén Lzopped Tar 
+Comment[vi]=Bản Tar đã nén Lzop
 Comment[wa]=Årtchive TAR rastrindowe avou lzop
 Comment[xh]=Ugcino lwasecaleni lwe Tar Lzopped
 Comment[zh_CN]=Lzopped 压缩的 Tar 归档
Index: mimetypes/application/x-font-ghostscript.desktop
===================================================================
--- mimetypes/application/x-font-ghostscript.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-font-ghostscript.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -71,6 +71,7 @@
 Comment[uk]=Шрифт Ghostscript
 Comment[uz]=Ghostscript шрифти
 Comment[ven]=Fontu ya tshikiriputi tsha poso
+Comment[vi]=Phông chữ Ghostscript
 Comment[wa]=Fonte Ghostscript
 Comment[xh]=Uhlobo lwamagama lwe Ghostscript
 Comment[zh_CN]=Ghostscript 字体
Index: mimetypes/application/vnd.oasis.opendocument.spreadsheet-template.desktop
===================================================================
--- mimetypes/application/vnd.oasis.opendocument.spreadsheet-template.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.oasis.opendocument.spreadsheet-template.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -9,6 +9,7 @@
 Comment[bg]=Шаблон за електронна таблица на OASIS OpenDocument
 Comment[bn]=OASIS ওপেন-ডকুমেন্ট স্প্রেডশিট টেম্‌প্লেট
 Comment[br]=Patrom loger OpenOffice.org OASIS
+Comment[bs]=OASIS OpenDocument šablon za proračunsku tablicu
 Comment[ca]=Plantilla de full de càlcul OASIS OpenDocument
 Comment[cs]=OASIS OpenDocument šablona tabulky
 Comment[cy]=Patrymlun Taenlen OASIS OpenDocument
@@ -54,6 +55,7 @@
 Comment[tt]=OASIS OpenDocument İsäpcäymä Ürçetmäse
 Comment[uk]=Шаблон електронної таблиці OASIS OpenDocument
 Comment[uz]=OASIS OpenDocument электрон жадвал намунаси
+Comment[vi]=Biểu mẫu bảng tính OpenDocument OASIS
 Comment[zh_CN]=OASIS OpenDocument 电子表格模板
 Comment[zh_HK]=OASIS OpenDocument 試算表範本
 [Property::X-KDE-NativeExtension]
Index: mimetypes/application/x-python-bytecode.desktop
===================================================================
--- mimetypes/application/x-python-bytecode.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-python-bytecode.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -44,7 +44,7 @@
 Comment[ms]=Kod Bait Python
 Comment[mt]=Bytecode Python
 Comment[nb]=Python-bytecode
-Comment[nds]=Python-Bytecode
+Comment[nds]=Python-Bytekode
 Comment[nl]=Python-bytecode
 Comment[nn]=Python-byte-kode
 Comment[nso]=Khoutu ya Kgemo ya Python
@@ -70,6 +70,7 @@
 Comment[uk]=Байт-код Python
 Comment[uz]=Python байт-коди
 Comment[ven]=Python bytecode
+Comment[vi]=Mã byte Python
 Comment[wa]=Programe e python (bytecode)
 Comment[zh_CN]=Python 字节码
 Comment[zh_HK]=Python 位元碼
Index: mimetypes/application/x-dbase.desktop
===================================================================
--- mimetypes/application/x-dbase.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-dbase.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -73,6 +73,7 @@
 Comment[uk]=Документ dBASE
 Comment[uz]=dBASE ҳужжати
 Comment[ven]=Manwalwa a dBASE
+Comment[vi]=Tài liệu dBase
 Comment[wa]=Documint dBASE
 Comment[xh]=Uxwebhu lwe dBASE
 Comment[zh_CN]=dBASE 文档
Index: mimetypes/application/x-webarchive.desktop
===================================================================
--- mimetypes/application/x-webarchive.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-webarchive.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -5,6 +5,7 @@
 Comment[bg]=Уеб архив
 Comment[bn]=ওয়েব আর্কাইভ
 Comment[br]=Diell ar gwiad
+Comment[bs]=Web arhiva
 Comment[ca]=Arxiu web
 Comment[cs]=Webový archív
 Comment[cy]=Archif o Wefannau
@@ -55,7 +56,7 @@
 Comment[uk]=Архів Тенет
 Comment[uz]=Веб архиви
 Comment[ven]=Webu yau vhulunga zwakale
-Comment[vi]=Lưu trữ web 
+Comment[vi]=Kho Mạng
 Comment[xh]=Ushicilelo lukawonke-wonke kunye nexwebhu leMbali
 Comment[zh_CN]=Web 归档
 Comment[zu]=Ushicilelo layoyonke imiqulu ye Web
Index: mimetypes/application/x-kformula.desktop
===================================================================
--- mimetypes/application/x-kformula.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-kformula.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -72,6 +72,7 @@
 Comment[uk]=Документ KFormula
 Comment[uz]=KFormula ҳужжати
 Comment[ven]=Manwalwa a tshivhumbeo tsha K
+Comment[vi]=Tài liệu KFormula
 Comment[wa]=Documint KFormula
 Comment[xh]=Uxwebhu lwe KFormula
 Comment[zh_CN]=KFormula 文档
Index: mimetypes/application/x-troff.desktop
===================================================================
--- mimetypes/application/x-troff.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-troff.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,6 +69,7 @@
 Comment[uk]=Документ Troff
 Comment[uz]=Troff ҳужжати
 Comment[ven]=Manwalwa a Troff
+Comment[vi]=Tài liệu Troff
 Comment[wa]=Documint troff
 Comment[xh]=Uxwebhu lwe Troff
 Comment[zh_CN]=Troff 文档
Index: mimetypes/application/pkcs7-signature.desktop
===================================================================
--- mimetypes/application/pkcs7-signature.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/pkcs7-signature.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -33,7 +33,7 @@
 Comment[hu]=Leválasztott S/MIME-aláírás
 Comment[is]=Aðskilin S/MIME undirskrift
 Comment[it]=Firma S/MIME separata
-Comment[ja]=切り離されたS/MIME 署名
+Comment[ja]=切り離された S/MIME 署名
 Comment[km]=ហត្ថលេខា Detached S/MIME
 Comment[ko]=나눠진 S/마임 서명
 Comment[lb]=Ofgetrennten S/MIME-Signatur
@@ -69,6 +69,7 @@
 Comment[uk]=Відокремлений підпис S/MIME
 Comment[uz]=Алоҳида S/MIME имзоси
 Comment[ven]=Tsaino yo tumanywaho ya S/MIME
+Comment[vi]=Chữ ký S/MIME đã tách rời.
 Comment[wa]=Sinateure S/MIME distaetcheye
 Comment[xh]=Utyikityo lwe S/MIME Esikiweyo
 Comment[zh_CN]=分离的 S/MIME 签名
Index: mimetypes/application/pgp.desktop
===================================================================
--- mimetypes/application/pgp.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/pgp.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -32,7 +32,7 @@
 Comment[hu]=PGP-vel titkosított vagy aláírt üzenet
 Comment[is]=PGP dulritað eða undirritað skeyti
 Comment[it]=Messaggio cifrato o firmato PGP
-Comment[ja]=PGP 符号化された又は、署名されたメッセージ
+Comment[ja]=PGP で暗号化または署名されたメッセージ
 Comment[km]=សារដែលបានចុះហត្ថលេខា ឬ បម្លែងជាកូដដោយ PGP
 Comment[ko]=PGP로 암호화하거나 서명한 메세지
 Comment[lb]=PGP-verschlësselt oder PGP-signéiert Noricht
@@ -65,6 +65,7 @@
 Comment[tt]=PGP belän Serlängän yä İmzalanğan Xäbär
 Comment[uk]=Повідомлення зашифроване або підписане PGP
 Comment[uz]=PGP билан кодланган ёки имзоланган хабар
+Comment[vi]=Thư đã ký tên hay mật mã PGP.
 Comment[wa]=Messaedje ecripté ou siné avou PGP
 Comment[zh_CN]=PGP 加密或签名的信件
 Comment[zh_HK]=PGP 加密或簽名的訊息
Index: mimetypes/application/vnd.oasis.opendocument.text.desktop
===================================================================
--- mimetypes/application/vnd.oasis.opendocument.text.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.oasis.opendocument.text.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -9,6 +9,7 @@
 Comment[bg]=Текстов документ на OASIS OpenDocument
 Comment[bn]=OASIS ওপেন-ডকুমেন্ট টেক্সট নথী
 Comment[br]=Skrid OpenDocument OASIS
+Comment[bs]=OASIS OpenDocument tekstualni dokument
 Comment[ca]=Text OASIS OpenDocument
 Comment[cs]=OASIS OpenDocument text
 Comment[cy]=Testun OASIS OpenDocument
@@ -54,6 +55,7 @@
 Comment[tt]=OASIS OpenDocument Mätene
 Comment[uk]=Текстовий документ OASIS OpenDocument
 Comment[uz]=OASIS OpenDocument матн ҳужжати
+Comment[vi]=Văn bản OpenDocument OASIS
 Comment[zh_CN]=OASIS OpenDocument 文本
 [Property::X-KDE-NativeExtension]
 Type=QString
Index: mimetypes/application/x-ruby.desktop
===================================================================
--- mimetypes/application/x-ruby.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-ruby.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -63,6 +63,7 @@
 Comment[tt]=Ruby Yazılım
 Comment[uk]=Програма на мові програмування Ruby
 Comment[uz]=Ruby'да тузилган дастур
+Comment[vi]=Chương trình Ruby
 Comment[wa]=Programe Ruby
 Comment[zh_CN]=Ruby 程序
 Comment[zh_HK]=Ruby 程式
Index: mimetypes/application/x-gettext.desktop
===================================================================
--- mimetypes/application/x-gettext.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-gettext.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -63,6 +63,7 @@
 Comment[tt]=GNU Gettext Yazmalar Tuplaması
 Comment[uk]=Каталог повідомлень GNU Gettext
 Comment[uz]=GNU Gettext хабарлар каталоги
+Comment[vi]=Phân loại thông điệp Gettext của GNU
 Comment[wa]=Catalogue di messaedjes po GNU gettext
 Comment[zh_CN]=GNU Gettext 消息编目
 Comment[zh_HK]=GNU Gettext 訊息型錄
Index: mimetypes/application/x-kspread.desktop
===================================================================
--- mimetypes/application/x-kspread.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-kspread.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -72,6 +72,7 @@
 Comment[uk]=Документ KSpread
 Comment[uz]=KSpread ҳужжати
 Comment[ven]=Manwalwa a phathaladzo ya K
+Comment[vi]=Tài liệu KSpread
 Comment[wa]=Documint tåvleu KSpread
 Comment[xh]=Uxwebhu lwe KSpread
 Comment[zh_CN]=KSpread 文档
Index: mimetypes/application/vnd.oasis.opendocument.text-template.desktop
===================================================================
--- mimetypes/application/vnd.oasis.opendocument.text-template.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.oasis.opendocument.text-template.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -9,6 +9,7 @@
 Comment[bg]=Шаблон за текстов документ на OASIS OpenDocument
 Comment[bn]=OASIS ওপেন-ডকুমেন্ট টেক্সট নথী টেম্‌প্লেট
 Comment[br]=Patrom skrid OpenOffice.org OASIS
+Comment[bs]=OASIS OpenDocument šablon za tekstualni dokument
 Comment[ca]=Plantilla de text OASIS OpenDocument
 Comment[cs]=OASIS OpenDocument šablona textu
 Comment[cy]=Patrymlun Testun OASIS OpenDocument
@@ -54,6 +55,7 @@
 Comment[tt]=OASIS OpenDocument Mäten Üzçetmäse
 Comment[uk]=Шаблон текстового документу OASIS OpenDocument
 Comment[uz]=OASIS OpenDocument матн ҳужжати намунаси
+Comment[vi]=Biểu mẫu văn bản OpenDocument OASIS
 Comment[zh_CN]=OASIS OpenDocument 文本文档模板
 [Property::X-KDE-NativeExtension]
 Type=QString
Index: mimetypes/application/vnd.sun.xml.writer.master.desktop
===================================================================
--- mimetypes/application/vnd.sun.xml.writer.master.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.sun.xml.writer.master.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -54,6 +54,7 @@
 Comment[tt]=OpenOffice.org'nıñ Master-İstälege
 Comment[uk]=Головний текстовий документ OpenOffice.org
 Comment[uz]=OpenOffice.org бош матн ҳужжати
+Comment[vi]=Tài liệu văn bản cái OpenOffice.org
 Comment[zh_CN]=OpenOffice.org 主文本文档
 Comment[zh_HK]=OpenOffice.org 主控文字文件
 MimeType=application/vnd.sun.xml.writer.master
Index: mimetypes/application/x-font-otf.desktop
===================================================================
--- mimetypes/application/x-font-otf.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-font-otf.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -65,6 +65,7 @@
 Comment[tt]=OpenType Yazu
 Comment[uk]=Шрифт OpenType
 Comment[uz]=OpenType шрифти
+Comment[vi]=Phông chữ OpenType
 Comment[wa]=Fonte OpenType
 Comment[zh_CN]=OpenType 字体
 Comment[zh_HK]=OpenType 字型
Index: mimetypes/application/smil.desktop
===================================================================
--- mimetypes/application/smil.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/smil.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -63,7 +63,7 @@
 Comment[uk]=Мова для синхронного спілкування мультимедія
 Comment[uz]=SMI тили
 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[vi]=Ngôn ngữ hợp nhất đa phương tiện đã đồng bộ.
 Comment[xh]=Ulwimi oluhamba ngendlela enye lodityaniso lwe Multimedia
 Comment[zh_CN]=同步多媒体集成语言
 Comment[zh_HK]=同步多媒體整合式語言
Index: mimetypes/application/vnd.sun.xml.calc.template.desktop
===================================================================
--- mimetypes/application/vnd.sun.xml.calc.template.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.sun.xml.calc.template.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -56,6 +56,7 @@
 Comment[tt]=OpenOffice.org İsäpcäymä Ürçetmäse
 Comment[uk]=Шаблон електронної таблиці OpenOffice.org
 Comment[uz]=OpenOffice.org электрон жадвал намунаси
+Comment[vi]=Biểu mẫu bảng tính OpenOffice.org
 Comment[zh_CN]=OpenOffice.org 电子表格模板
 Comment[zh_HK]=OpenOffice.org 試算表範本
 Icon=spreadsheet
Index: mimetypes/application/x-bzip.desktop
===================================================================
--- mimetypes/application/x-bzip.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-bzip.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -70,6 +70,7 @@
 Comment[uk]=Файл Bzip
 Comment[uz]=Bzip-файли
 Comment[ven]=Faela ya Bzip
+Comment[vi]=Tập tin Bzip
 Comment[wa]=Fitchî bzip
 Comment[xh]=Ifayile ye Bzip
 Comment[zh_CN]=Bzip 文件
Index: mimetypes/application/xml-dtd.desktop
===================================================================
--- mimetypes/application/xml-dtd.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/xml-dtd.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -4,6 +4,7 @@
 Comment[af]=XML DTD Dokument
 Comment[bg]=Документ XML DTD
 Comment[br]=Teul DTD XML
+Comment[bs]=XML DTD dokument
 Comment[ca]=Document XML DTD
 Comment[cs]=XML DTD dokument
 Comment[da]=XML DTD-dokument
@@ -43,6 +44,7 @@
 Comment[tg]=Ҳуҷҷати XML DTD
 Comment[uk]=Документ DTD XML
 Comment[uz]=XML DTD ҳужжати
+Comment[vi]=Tài liệu DTD XML
 Comment[zh_CN]=XML DTD 文档
 Comment[zh_HK]=XML DTD 文件
 Icon=html
Index: mimetypes/application/x-arc.desktop
===================================================================
--- mimetypes/application/x-arc.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-arc.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,6 +69,7 @@
 Comment[tt]=ARC Tuplama
 Comment[uk]=Архів ARC
 Comment[uz]=ARC архиви
+Comment[vi]=Bản nén ARC
 Comment[wa]=Årtchive ARC
 Comment[zh_CN]=ARC 归档
 Comment[zh_HK]=ARC 壓縮檔
Index: mimetypes/application/pkcs7-mime.desktop
===================================================================
--- mimetypes/application/pkcs7-mime.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/pkcs7-mime.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -68,6 +68,7 @@
 Comment[uk]=Дані у форматі PKCS#7 (S/MIME)
 Comment[uz]=PKCS#7 (S/MIME) форматланган маълумот
 Comment[ven]=PKCS#7 (S/MIME) Data yo vhumbeaho
+Comment[vi]=Dữ liệu đã định dạng PKCS#7 (S/MIME).
 Comment[xh]=PKCS#7 (S/MIME) Data Efomatiweyo
 Comment[zh_CN]=PKCS#7 (S/MIME) 格式化数据
 Comment[zh_HK]=PKCS#7 (S/MIME) 格式資料
Index: mimetypes/application/x-zoo.desktop
===================================================================
--- mimetypes/application/x-zoo.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-zoo.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -73,6 +73,7 @@
 Comment[uk]=Архів Zoo
 Comment[uz]=Zoo архиви
 Comment[ven]=Fhethu hau vhulungela zwithu zwa kale ho vhewaho zwipuka
+Comment[vi]=Bản nén Zoo
 Comment[wa]=Årtchive ZOO
 Comment[xh]=Indawo yogcino ye Zoo
 Comment[zh_CN]=Zoo 归档
Index: mimetypes/application/vnd.sun.xml.writer.template.desktop
===================================================================
--- mimetypes/application/vnd.sun.xml.writer.template.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.sun.xml.writer.template.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -57,6 +57,7 @@
 Comment[tt]=OpenOffice.org Mäten İstälege öçen Ürçetmä
 Comment[uk]=Шаблон текстового документу OpenOffice.org
 Comment[uz]=OpenOffice.org матн ҳужжати намунаси
+Comment[vi]=Biểu mẫu tài liệu văn bản OpenOffice.org
 Comment[zh_CN]=OpenOffice.org 文本文档模板
 Comment[zh_HK]=OpenOffice.org 文字文件範本
 MimeType=application/vnd.sun.xml.writer.template
Index: mimetypes/application/x-font-pcf.desktop
===================================================================
--- mimetypes/application/x-font-pcf.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-font-pcf.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -71,6 +71,7 @@
 Comment[uk]=Растровий шрифт PCF
 Comment[uz]=PCF BMP шрифти
 Comment[ven]=Vhuhulu ha mafhungo ha Bitmap ya PCF
+Comment[vi]=Phông chữ sơ đồ PCF
 Comment[wa]=Fonte bitmap PCF
 Comment[xh]=Uhlobo lwamagama lwe PCF Bitmap
 Comment[zh_CN]=PCF 位图字体
Index: mimetypes/application/x-arj.desktop
===================================================================
--- mimetypes/application/x-arj.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-arj.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -73,6 +73,7 @@
 Comment[uk]=Архів ARJ
 Comment[uz]=ARJ архиви
 Comment[ven]=Fhethu huno vhulungwa hone zwithu zwa kale ha ARJ
+Comment[vi]=Bản nén ARJ
 Comment[wa]=Årtchive ARJ
 Comment[xh]=ARJ Indawo yokugcina
 Comment[zh_CN]=ARJ 归档
Index: mimetypes/application/vnd.oasis.opendocument.presentation-template.desktop
===================================================================
--- mimetypes/application/vnd.oasis.opendocument.presentation-template.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.oasis.opendocument.presentation-template.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -9,6 +9,7 @@
 Comment[bg]=Шаблон за презентация на OASIS OpenDocument
 Comment[bn]=OASIS ওপেন-ডকুমেন্ট প্রেসেন্টেশন টেম্‌প্লেট
 Comment[br]=Patrom un emginnig OASIS OpenDocument
+Comment[bs]=OASIS OpenDocument šablon za prezentaciju
 Comment[ca]=Plantilla de presentació OASIS OpenDocument
 Comment[cs]=OASIS OpenDocument šablona prezentace
 Comment[cy]=Patrymlun Cyflwyniad OASIS OpenDocument
@@ -54,6 +55,7 @@
 Comment[tt]=OASIS OpenDocument Täqbir Ürçetmäse
 Comment[uk]=Шаблон презентації OASIS OpenDocument
 Comment[uz]=OASIS OpenDocument намойиш намунаси
+Comment[vi]=Biểu mẫu trình diễn OpenDocument OASIS
 Comment[zh_CN]=OASIS OpenDocument 演示文稿模板
 Comment[zh_HK]=OASIS OpenDocument 簡報範本
 [Property::X-KDE-NativeExtension]
Index: mimetypes/application/x-trash.desktop
===================================================================
--- mimetypes/application/x-trash.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-trash.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -71,6 +71,7 @@
 Comment[uk]=Файл резервної копії
 Comment[uz]=Эҳтиётдан олиб қўйилган файл
 Comment[ven]=Faela yau tikedza
+Comment[vi]=Tập tin sao lưu
 Comment[wa]=Fitchî copeye di såvrité
 Comment[xh]=Ifayile Yogcino lwasemva
 Comment[zh_CN]=备份文件
Index: mimetypes/application/x-kpresenter.desktop
===================================================================
--- mimetypes/application/x-kpresenter.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-kpresenter.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -72,6 +72,7 @@
 Comment[uk]=Документ KPresenter
 Comment[uz]=KPresenter ҳужжати
 Comment[ven]=Manwalwa a Muimeleli wa K
+Comment[vi]=Tài liệu KPresenter
 Comment[wa]=Documint di prezintaedje KPresenter
 Comment[xh]=Uxwebhu lwe KPresenter
 Comment[zh_CN]=KPresenter 文档
Index: mimetypes/application/x-siag.desktop
===================================================================
--- mimetypes/application/x-siag.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-siag.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,6 +69,7 @@
 Comment[uk]=Електронна таблиця Siag
 Comment[uz]=Siag электрон жадвали
 Comment[ven]=U phadaladza ha bammbiri ha Siag
+Comment[vi]=Bảng tính Siag
 Comment[wa]=Documint tåvleu Siag
 Comment[zh_CN]=Siag 电子表格
 Comment[zh_HK]=Siag 電子表格
Index: mimetypes/application/x-egon.desktop
===================================================================
--- mimetypes/application/x-egon.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-egon.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -52,5 +52,4 @@
 Comment[uk]=Аніматор Egon
 Comment[uz]=Egon аниматор
 Comment[ven]=Zwipuka zwa Egon
-Comment[vi]=Hoạt hoạ Egon 
 Comment[xh]=Umphilisi we Egon
Index: mimetypes/application/x-ace.desktop
===================================================================
--- mimetypes/application/x-ace.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-ace.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,6 +69,7 @@
 Comment[tt]=ACE Tuplama
 Comment[uk]=Архіви ACE
 Comment[uz]=ACE архиви
+Comment[vi]=Bản nén ACE
 Comment[wa]=Årtchive «ACE»
 Comment[zh_CN]=ACE 归档
 Comment[zh_HK]=Arc 壓縮檔 
Index: mimetypes/application/x-kde-wallet.desktop
===================================================================
--- mimetypes/application/x-kde-wallet.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-kde-wallet.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -64,6 +64,7 @@
 Comment[tt]=KDE Wallet Bireme
 Comment[uk]=Файл торбинки KDE
 Comment[uz]=KDE Wallet-файли
+Comment[vi]=Tập tin KDE Wallet
 Comment[zh_CN]=KDE 钱包文件
 Comment[zh_HK]=KDE 公事包檔案
 Comment[zh_TW]=KDE 公事包檔案
Index: mimetypes/application/x-mimearchive.desktop
===================================================================
--- mimetypes/application/x-mimearchive.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-mimearchive.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -7,6 +7,7 @@
 Comment=Mime Encapsulated Web Archive
 Comment[af]=Mimiek Saamgevatte web Argief
 Comment[bg]=Капсулиран уеб архив
+Comment[bs]=MIME enkapsulirana web arhiva
 Comment[ca]=Arxiu web encapsulat mime
 Comment[cs]=Webový archív (MIME)
 Comment[da]=Mime-indkapslet www-arkiv
@@ -49,6 +50,7 @@
 Comment[tg]=Архиви Веб Tar Фушурдашуда
 Comment[tt]=Web beteneñ Mime-Tuplaması
 Comment[uk]=Архів Тенет з інформацією про mine
+Comment[vi]=Bản nén Mạng đã bao bọc MIME
 Comment[zh_CN]=MIME 封装的 Web 归档
 
 [Property::X-KDE-LocalProtocol]
Index: mimetypes/application/x-deb.desktop
===================================================================
--- mimetypes/application/x-deb.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-deb.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -68,6 +68,7 @@
 Comment[tt]=Debian Tuplaması
 Comment[uk]=Пакунок Debian
 Comment[uz]=Debian пакети
+Comment[vi]=Gói Debian
 Comment[wa]=Fitchî pacaedje Debian
 Comment[zh_CN]=Debian 包
 Comment[zh_HK]=Debian 套件
Index: mimetypes/application/x-ica.desktop
===================================================================
--- mimetypes/application/x-ica.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-ica.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -54,6 +54,7 @@
 Comment[tr]=Citrix ICA Yapılandırması
 Comment[tt]=Citrix ICA Klient Caylawı
 Comment[uk]=Конфігурація клієнта Citrix ICA
+Comment[vi]=Cấu hình ứng dụng khách ICA Citrix
 Comment[zh_CN]=Citrix ICA 客户配置
 Comment[zh_HK]=Citrix ICA 客戶端組態
 Icon=wordprocessing
Index: mimetypes/application/x-rpm.desktop
===================================================================
--- mimetypes/application/x-rpm.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-rpm.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -71,6 +71,7 @@
 Comment[uk]=Пакунок RPM
 Comment[uz]=RPM-пакет файли
 Comment[ven]=Faela ya zwiputa zwa RPM
+Comment[vi]=Tập tin gói RPM
 Comment[wa]=Fitchî pacaedje RPM
 Comment[xh]=Ifayile Yempahla ye RPM
 Comment[zh_CN]=RPM 包文件
Index: mimetypes/application/x-java-jnlp-file.desktop
===================================================================
--- mimetypes/application/x-java-jnlp-file.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-java-jnlp-file.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -3,6 +3,7 @@
 Type=MimeType
 Comment=Java Web Start application
 Comment[af]=Java Web Begin program
+Comment[bs]=Java Web Start program
 Comment[ca]=Aplicació Java Web Start
 Comment[cs]=Java Web Start aplikace
 Comment[da]=Java webstart program
@@ -45,6 +46,7 @@
 Comment[tr]=Java Web Start uygulaması
 Comment[tt]=Java Web Start yazılımı
 Comment[uk]=Програма Java з мережі
+Comment[vi]=Ứng dụng Web Start Java
 Comment[zh_CN]=Java Web Start 应用程序
 Comment[zh_HK]=Java Web Start 程式
 MimeType=application/x-java-jnlp-file
Index: mimetypes/application/x-designer.desktop
===================================================================
--- mimetypes/application/x-designer.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-designer.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,7 +69,7 @@
 Comment[uk]=Файл дизайнера Qt
 Comment[uz]=Qt Designer-файли
 Comment[ven]=Faela yau khavhisedza ya Qt
-Comment[vi]=File Qt Designer 
+Comment[vi]=Tập tin Designer của Qt
 Comment[xh]=Ifayile yo Mzobi we Qt
 Comment[zh_CN]=Qt Designer 文件
 Comment[zh_HK]=Qt Designer 檔案
Index: mimetypes/application/vnd.sun.xml.writer.desktop
===================================================================
--- mimetypes/application/vnd.sun.xml.writer.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.sun.xml.writer.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -64,6 +64,7 @@
 Comment[tt]=OpenOffice.org Mäten İstälege
 Comment[uk]=Текстовий документ OpenOffice.org
 Comment[uz]=OpenOffice.org матн ҳужжати
+Comment[vi]=Tài liệu văn bản OpenOffice.org
 Comment[wa]=Documint tecse OpenOffice.org
 Comment[zh_CN]=OpenOffice.org 文本文档
 Comment[zh_HK]=OpenOffice.org 文字文件
Index: mimetypes/application/x-perl.desktop
===================================================================
--- mimetypes/application/x-perl.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-perl.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -4,6 +4,7 @@
 Comment[bg]=Програма на Perl
 Comment[bn]=পার্ল প্রোগ্রাম
 Comment[br]=Goulev Perl
+Comment[bs]=Perl program
 Comment[ca]=Programa Perl
 Comment[cs]=Program v jazyce Perl
 Comment[cy]=Rhaglen PERL
@@ -52,6 +53,7 @@
 Comment[tt]=Perl Yazılım
 Comment[uk]=Програма PERL
 Comment[uz]=Perl'да тузилган дастур
+Comment[vi]=Chương trình Perl
 Comment[zh_CN]=Perl 程序
 Comment[zh_HK]=Perl 程式
 Icon=source_pl
Index: mimetypes/application/x-java-applet.desktop
===================================================================
--- mimetypes/application/x-java-applet.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-java-applet.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -60,6 +60,7 @@
 Comment[tt]=Java Modulı
 Comment[uk]=Аплет Java
 Comment[uz]=Java апплети
+Comment[vi]=Tiểu dụng Java
 Comment[wa]=Aplikete Java
 Comment[zh_CN]=Java 小程序
 MimeType=application/x-java-applet
Index: mimetypes/application/postscript.desktop
===================================================================
--- mimetypes/application/postscript.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/postscript.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -37,7 +37,7 @@
 Comment[id]=Dokumen PostScript
 Comment[is]=Postscript skjal
 Comment[it]=Documento PostScript
-Comment[ja]=PostScriptドキュメント
+Comment[ja]=PostScript ドキュメント
 Comment[km]=ឯកសារ PostScript
 Comment[ko]=PostScript 문서
 Comment[lb]=PostScript-Dokument
@@ -76,7 +76,7 @@
 Comment[uk]=Документ PostScript
 Comment[uz]=PostScript ҳужжати
 Comment[ven]=Manwalwa a tshikiriputi tsha poso
-Comment[vi]=Tài liệu PostScript 
+Comment[vi]=Tài liệu PostScript.
 Comment[wa]=Documint PostScript
 Comment[xh]=Uxwebhu lwe PostScript
 Comment[zh_CN]=PostScript 文档
Index: mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop
===================================================================
--- mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -9,6 +9,7 @@
 Comment[bg]=Шаблон за графика на OASIS OpenDocument
 Comment[bn]=OASIS ওপেন-ডকুমেন্ট গ্রাফিক্স টেমপ্লেট
 Comment[br]=Patrom skeudenn OpenOffice.org OASIS
+Comment[bs]=OASIS OpenDocument šablon za crtež
 Comment[ca]=Plantilla de gràfic OASIS OpenDocument
 Comment[cs]=OASIS OpenDocument šablona obrázku
 Comment[cy]=Patrymlun Graffeg OASIS OpenDocument
@@ -53,6 +54,8 @@
 Comment[tr]=OASIS OpenDocument Grafik Şablonu
 Comment[tt]=OASIS OpenDocument Sızımı öçen Ürçetmä
 Comment[uk]=Шаблон графічного зображення OASIS OpenDocument
+Comment[uz]=OASIS OpenDocument графика намунаси
+Comment[vi]=Biểu mẩu đồ họa OpenDocument OASIS
 Comment[zh_CN]=OASIS OpenDocument 图形模板
 Comment[zh_HK]=OASIS OpenDocument 繪圖範本
 [Property::X-KDE-NativeExtension]
Index: mimetypes/application/vnd.oasis.opendocument.presentation.desktop
===================================================================
--- mimetypes/application/vnd.oasis.opendocument.presentation.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.oasis.opendocument.presentation.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -9,6 +9,7 @@
 Comment[bg]=Презентация на OASIS OpenDocument
 Comment[bn]=OASIS ওপেন-ডকুমেন্ট প্রেসেন্টেশন
 Comment[br]=Emginnig OASIS OpenDocument
+Comment[bs]=OASIS OpenDocument prezentacija
 Comment[ca]=Presentació OASIS OpenDocument
 Comment[cs]=OASIS OpenDocument prezentace
 Comment[cy]=Cyflwyniad OASIS OpenDocument
@@ -54,6 +55,7 @@
 Comment[tt]=OASIS OpenDocument Täqbire
 Comment[uk]=Презентація OASIS OpenDocument
 Comment[uz]=OASIS OpenDocument намойиш
+Comment[vi]=Trình diễn OpenDocument OASIS
 Comment[zh_CN]=OASIS OpenDocument 演示文稿
 Comment[zh_HK]=OASIS OpenDocument 簡報
 [Property::X-KDE-NativeExtension]
Index: mimetypes/application/x-xliff.desktop
===================================================================
--- mimetypes/application/x-xliff.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-xliff.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -8,6 +8,7 @@
 Comment[af]=XLIFF Vertaal Lêer
 Comment[bg]=Съобщения за превод (XLIFF)
 Comment[br]=Restr troidigezh XLIFF
+Comment[bs]=XLIFF datoteka za prijevod
 Comment[ca]=Fitxer de traducció XLIFF
 Comment[cs]=Zdrojový kód překladu XLIFF
 Comment[da]=XLIFF oversættelsesfil
@@ -55,6 +56,7 @@
 Comment[tt]=XLIFF Tärcemä Bireme
 Comment[uk]=Файл перекладу XLIFF
 Comment[uz]=XLIFF таржима қилиш файли
+Comment[vi]=Tập tin dịch XLIFF
 Comment[zh_CN]=XLIFF 翻译文件
 Comment[zh_HK]=XLIFF 翻譯檔
 [Property::X-KDE-NativeExtension]
Index: mimetypes/application/x-karbon.desktop
===================================================================
--- mimetypes/application/x-karbon.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-karbon.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -73,6 +73,7 @@
 Comment[uk]=Документ Karbon14
 Comment[uz]=Karbon14 ҳужжати
 Comment[ven]=Manwalwa a Karbon14
+Comment[vi]=Tài liệu Karbon14
 Comment[wa]=Documint Karbon14
 Comment[xh]=Uxwebhu lwe Karbon14
 Comment[zh_CN]=Karbon14 文档
Index: mimetypes/application/x-jar.desktop
===================================================================
--- mimetypes/application/x-jar.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-jar.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -36,7 +36,7 @@
 Comment[id]=Archive Java
 Comment[is]=Java safnskrá
 Comment[it]=Archivio Java
-Comment[ja]=Javaアーカイブ
+Comment[ja]=Java アーカイブ
 Comment[km]=ប័ណ្ណសារ Java
 Comment[ko]=자바 저장고
 Comment[lb]=Java-Archiv
@@ -76,7 +76,7 @@
 Comment[uk]=Архів Java
 Comment[uz]=Java архиви
 Comment[ven]=Fhethu hau vhulungele hone zwithu zwa kale ha Java
-Comment[vi]=Nén Java 
+Comment[vi]=Bản nén Java
 Comment[wa]=Årtchive Java
 Comment[xh]=Indawo efihlakeleyo ye Java
 Comment[zh_CN]=Java 归档
Index: mimetypes/application/java.desktop
===================================================================
--- mimetypes/application/java.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/java.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -73,7 +73,6 @@
 Comment[uk]=Клас Java
 Comment[uz]=Java синфи
 Comment[ven]=Kilasi ya Java
-Comment[vi]=Lớp Java 
 Comment[wa]=Classe Java
 Comment[xh]=Uhlobo lwe Java
 Comment[zh_CN]=Java 类
Index: mimetypes/application/pgp-encrypted.desktop
===================================================================
--- mimetypes/application/pgp-encrypted.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/pgp-encrypted.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,6 +69,7 @@
 Comment[uk]=Заголовок PGP/MIME зашифрованого повідомлення
 Comment[uz]=PGP/MIME кодланган хабарнинг сарлавҳаси
 Comment[ven]=Thoho ya mulaedza ya PGP/MIME
+Comment[vi]=Phần đầu thư đã mật mã PGP/MIME
 Comment[wa]=Tiestire d' on messaedje ecripté avou PGP/MIME
 Comment[xh]=PGP/MIME Umbhalo ophezulu ephepheni Womyalezo Ofihliweyo
 Comment[zh_CN]=PGP/MIME 加密邮件头
Index: mimetypes/application/x-ogg.desktop
===================================================================
--- mimetypes/application/x-ogg.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-ogg.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -68,6 +68,7 @@
 Comment[uk]=Ogg-аудіо
 Comment[uz]=Ogg мултимедиа
 Comment[ven]=Zwavhukwamani ha Ogg
+Comment[vi]=Đa phương tiện Ogg
 Comment[wa]=Fitchî multimedia Ogg
 Comment[zh_CN]=Ogg 多媒体
 Comment[zh_HK]=Ogg 多媒體
Index: mimetypes/application/vnd.oasis.opendocument.image.desktop
===================================================================
--- mimetypes/application/vnd.oasis.opendocument.image.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.oasis.opendocument.image.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -9,6 +9,7 @@
 Comment[bg]=Изображение на OASIS OpenDocument
 Comment[bn]=OASIS ওপেন-ডকুমেন্ট চিত্র
 Comment[br]=Skeudenn OpenDocument OASIS
+Comment[bs]=OASIS OpenDocument slika
 Comment[ca]=Imatge OASIS OpenDocument
 Comment[cs]=OASIS OpenDocument obrázek
 Comment[cy]=Delwedd OASIS OpenDocument
@@ -54,6 +55,7 @@
 Comment[tt]=OASIS OpenDocument Süräte
 Comment[uk]=Зображення OASIS OpenDocument
 Comment[uz]=OASIS OpenDocument расм
+Comment[vi]=Ảnh OpenDocument OASIS
 Comment[zh_CN]=OASIS OpenDocument 图像
 [Property::X-KDE-NativeExtension]
 Type=QString
Index: mimetypes/application/vnd.sun.xml.impress.template.desktop
===================================================================
--- mimetypes/application/vnd.sun.xml.impress.template.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.sun.xml.impress.template.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -57,6 +57,7 @@
 Comment[tt]=OpenOffice.org Täqbir Ürçetmäse
 Comment[uk]=Шаблон презентації OpenOffice.org
 Comment[uz]=OpenOffice.org намойиш намунаси
+Comment[vi]=Biểu mẫu trình diễn OpenOffice.org
 Comment[zh_CN]=OpenOffice.org 演示文稿模板
 Comment[zh_HK]=OpenOffice.org 簡報範本
 MimeType=application/vnd.sun.xml.impress.template
Index: mimetypes/application/x-kivio.desktop
===================================================================
--- mimetypes/application/x-kivio.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-kivio.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -73,6 +73,7 @@
 Comment[uk]=Документ Kivio
 Comment[uz]=Kivio ҳужжати
 Comment[ven]=Manwalwa a Kivio
+Comment[vi]=Tài liệu Kivio
 Comment[wa]=Documint Kivio
 Comment[xh]=Uxwebhu lwe Kivio
 Comment[zh_CN]=Kivio 文档
Index: mimetypes/application/x-archive.desktop
===================================================================
--- mimetypes/application/x-archive.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-archive.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,6 +69,7 @@
 Comment[uk]=Архіви AR
 Comment[uz]=AR архиви
 Comment[ven]=Fhethu huno vhulungwa hone zwithu zwa kale ha Ar
+Comment[vi]=Bản nén Ar
 Comment[wa]=Årtchive «ar»
 Comment[xh]=Ar Indawo yokugcina
 Comment[zh_CN]=Ar 归档
Index: mimetypes/application/vnd.rn-realmedia.desktop
===================================================================
--- mimetypes/application/vnd.rn-realmedia.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.rn-realmedia.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,6 +69,7 @@
 Comment[tt]=RealMedia Bireme
 Comment[uk]=Файл RealMedia
 Comment[uz]=RealMedia-файли
+Comment[vi]=Tập tin RealMedia
 Comment[wa]=Fitchî RealMedia
 Comment[zh_CN]=RealMedia 文件
 Comment[zh_HK]=RealMedia 檔案
Index: mimetypes/application/x-rar.desktop
===================================================================
--- mimetypes/application/x-rar.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-rar.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -73,6 +73,7 @@
 Comment[uk]=Архів Rar
 Comment[uz]=Rar архиви
 Comment[ven]=Fhethu ha u vhulunga zwithu zwa kale ha Rar
+Comment[vi]=Bản nén Rar
 Comment[wa]=Årtchive RAR
 Comment[xh]=Indawo yogcino ye Rar
 Comment[zh_CN]=Rar 归档
Index: mimetypes/application/vnd.stardivision.math.desktop
===================================================================
--- mimetypes/application/vnd.stardivision.math.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.stardivision.math.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -60,6 +60,7 @@
 Comment[tt]=StarOffice Math İstälege
 Comment[uk]=Документ StarOffice Math
 Comment[uz]=StarOffice Math ҳужжати
+Comment[vi]=Tài liệu Math của StarOffice
 Comment[zh_CN]=StarOffice Math 文档
 Comment[zh_HK]=StarOffice 算式文件
 [Property::X-KDE-NativeExtension]
Index: mimetypes/application/x-iso.desktop
===================================================================
--- mimetypes/application/x-iso.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-iso.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -57,5 +57,6 @@
 Comment[tt]=ISO9660 Sürät Bireme
 Comment[uk]=Файл штампа ISO9660
 Comment[uz]=ISO9660-тасвир файли
+Comment[vi]=Tập tin ảnh ISO9660
 Comment[zh_CN]=ISO9660 映像文件
 Comment[zh_HK]=ISO9660 影像檔
Index: mimetypes/application/x-font-snf.desktop
===================================================================
--- mimetypes/application/x-font-snf.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-font-snf.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -71,6 +71,7 @@
 Comment[uk]=Растровий шрифт SNF
 Comment[uz]=SNF BMP шрифти
 Comment[ven]=Fontu ya Bitmap ya SNF
+Comment[vi]=Phông chữ sơ đồ SNF
 Comment[wa]=Fonte bitmap SNF
 Comment[xh]=Uhlobo lwamagama lwe SNF Bitmap
 Comment[zh_CN]=SNF 位图字体
Index: mimetypes/application/pgp-keys.desktop
===================================================================
--- mimetypes/application/pgp-keys.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/pgp-keys.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -61,8 +61,9 @@
 Comment[tg]=OpenPGP калиди ҳамроҳшуда
 Comment[tr]=OpenPGP Anahtar Çifti
 Comment[tt]=OpenPGP Açqıç Bäyläme
-Comment[uk]=Клунок ключа OpenPGP
+Comment[uk]=Низка ключів OpenPGP
 Comment[uz]=OpenPGP калитлар тўплами
+Comment[vi]=Bó khoá OpenPGP
 Comment[zh_CN]=OpenPGP 秘钥束
 X-KDE-AutoEmbed=true
 
Index: mimetypes/application/x-compress.desktop
===================================================================
--- mimetypes/application/x-compress.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-compress.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -72,6 +72,7 @@
 Comment[uk]=Стиснутий файл UNIX
 Comment[uz]=UNIX қисилган файли
 Comment[ven]=Faela yo tsikeledzwaho ya UNIX
+Comment[vi]=Tập tin đã nén UNIX
 Comment[xh]=Ifayile Edityaniswe ndawonye ye UNIX
 Comment[zh_CN]=UNIX 压缩文件
 Comment[zh_HK]=UNIX 壓縮檔
Index: mimetypes/application/msexcel.desktop
===================================================================
--- mimetypes/application/msexcel.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/msexcel.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -73,6 +73,7 @@
 Comment[uk]=Таблиця MS Excel
 Comment[uz]=Microsoft Excel электрон жадвали
 Comment[ven]=Bammbiri lo navhaho la microsoft Excel
+Comment[vi]=Bảng tính Excel của Microsoft™.
 Comment[wa]=Fitchî tåvleu Microsoft Excel
 Comment[zh_CN]=Microsoft Excel 电子表格
 Comment[zh_HK]=微軟 Excel 表格
Index: mimetypes/application/x-applixspread.desktop
===================================================================
--- mimetypes/application/x-applixspread.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-applixspread.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -73,6 +73,7 @@
 Comment[uk]=Документ Applix Spreadsheets
 Comment[uz]=Applix Spreadsheets ҳужжати
 Comment[ven]=Manwalwa a Applix Spreadsheets
+Comment[vi]=Tài liệu Spreadsheets Applix
 Comment[wa]=Documint tåvleu Applix
 Comment[xh]=Uxwebhu lwe Applix Spreadsheets
 Comment[zh_CN]=Applix 电子表格文档
Index: mimetypes/application/x-font-ttc.desktop
===================================================================
--- mimetypes/application/x-font-ttc.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-font-ttc.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -63,6 +63,7 @@
 Comment[tt]=TrueType Yazu Tuplaması
 Comment[uk]=Колекція шрифтів Truetype
 Comment[uz]=TrueType шрифт тўплами
+Comment[vi]=Tập hợp phông chữ TrueType
 Comment[wa]=Ramexhnêye di fontes TrueType
 Comment[zh_CN]=Truetype 字体集合
 Comment[zh_HK]=TrueType 字型集
Index: mimetypes/application/vnd.ms-excel.desktop
===================================================================
--- mimetypes/application/vnd.ms-excel.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.ms-excel.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -71,6 +71,7 @@
 Comment[uk]=Таблиця MS Excel
 Comment[uz]=Microsoft Excel электрон жадвали
 Comment[ven]=Bammbiri lo navhaho la microsoft Excel
+Comment[vi]=Bảng tính Excel của Microsoft™.
 Comment[wa]=Fitchî tåvleu Microsoft Excel
 Comment[zh_CN]=Microsoft Excel 电子表格
 Comment[zh_HK]=微軟 Excel 表格
Index: mimetypes/application/x-bz2dvi.desktop
===================================================================
--- mimetypes/application/x-bz2dvi.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-bz2dvi.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -54,6 +54,7 @@
 Comment[tt]=Bzip2'lı DVI Birem
 Comment[uk]=Файл DVI, стиснутий bzip2
 Comment[uz]=Bzip2 билан қисилган DVI-файли
+Comment[vi]=Tập tin DVI đã nén Bzip2
 Comment[zh_CN]=Bzip2 压缩的 DVI 文件
 Comment[zh_HK]=Bzip2 格式壓縮的 DVI 檔案
 Hidden=false
Index: mimetypes/application/x-7z.desktop
===================================================================
--- mimetypes/application/x-7z.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-7z.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -9,6 +9,7 @@
 Comment[bg]=Архив 7-Zip
 Comment[bn]=7-জিপ (zip) আর্কাইভ
 Comment[br]=Diell 7-Zip
+Comment[bs]=7-Zip arhiva
 Comment[ca]=Arxiu 7-Zip
 Comment[cs]=7-Zip archív
 Comment[de]=7-Zip-Archiv
@@ -56,5 +57,6 @@
 Comment[tt]=7-Zip Tuplama
 Comment[uk]=Архів 7-Zip
 Comment[uz]=7-Zip архиви
+Comment[vi]=Bản nén 7-Zip
 Comment[zh_CN]=7-Zip 归档
 Comment[zh_HK]=7-Zip 壓縮檔
Index: mimetypes/application/x-font-ttf.desktop
===================================================================
--- mimetypes/application/x-font-ttf.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-font-ttf.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -31,7 +31,7 @@
 Comment[hu]=TrueType-betűtípus
 Comment[is]=TrueType letur
 Comment[it]=Tipo di carattere TrueType
-Comment[ja]=TrueTypeフォント
+Comment[ja]=TrueType フォント
 Comment[km]=ពុម្ពអក្សរ TrueType
 Comment[ko]=트루타입 글꼴
 Comment[lb]=TrueType-Schrëft
@@ -65,6 +65,7 @@
 Comment[tt]=TrueType Yazu
 Comment[uk]=Шрифт TrueType
 Comment[uz]=TrueType шрифти
+Comment[vi]=Phông chữ TrueType
 Comment[wa]=Fonte TrueType
 Comment[zh_CN]=TrueType 字体
 Comment[zh_HK]=TrueType 字型
Index: mimetypes/application/x-msaccess.desktop
===================================================================
--- mimetypes/application/x-msaccess.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-msaccess.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -67,6 +67,7 @@
 Comment[tt]=Microsoft Access Biremlege
 Comment[uk]=База даних Microsoft Access
 Comment[uz]=Microsoft Access маълумот базаси
+Comment[vi]=Cơ sở dữ liệu Access của Microsoft™
 Comment[wa]=Båze di dnêyes Microsoft Access
 Comment[zh_CN]=Microsoft Access 数据库
 Comment[zh_HK]=Microsoft Access 資料庫
Index: mimetypes/application/x-zip.desktop
===================================================================
--- mimetypes/application/x-zip.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-zip.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -73,6 +73,7 @@
 Comment[uk]=Архів Zip
 Comment[uz]=Zip архиви
 Comment[ven]=Fhethu hau vhulungela zwithu zwa kale ha Zip
+Comment[vi]=Bản nén Zip
 Comment[wa]=Årtchive ZIP
 Comment[xh]=Indawo yogcino ye Zip
 Comment[zh_CN]=Zip 归档
Index: mimetypes/application/vnd.ms-powerpoint.desktop
===================================================================
--- mimetypes/application/vnd.ms-powerpoint.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.ms-powerpoint.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -19,7 +19,7 @@
 Comment[de]=MS-PowerPoint-Präsentation
 Comment[el]=Παρουσίαση Microsoft PowerPoint
 Comment[eo]=Mikrosoft-PowerPoint-dokumento
-Comment[es]=Prsentación de Microsoft PowerPoint
+Comment[es]=Presentación de Microsoft PowerPoint
 Comment[et]=Microsoft PowerPointi esitlus
 Comment[eu]=Microsoft PowerPoint aurkezpena
 Comment[fa]=نمایش مایکروسافت پاور پوینت
@@ -68,6 +68,7 @@
 Comment[tt]=Microsoft PowerPoint Täqbire
 Comment[uk]=Презентація MS PowerPoint
 Comment[uz]=Microsoft PowerPoint намунаси
+Comment[vi]=Trình diễn PowerPoint của Microsoft™.
 Comment[wa]=Prezintaedje Microsoft PowerPoint
 Comment[zh_CN]=Microsoft PowerPoint 演示文稿
 Comment[zh_HK]=微軟 PowerPoint 文件
Index: mimetypes/application/x-kcsrc.desktop
===================================================================
--- mimetypes/application/x-kcsrc.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-kcsrc.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -70,6 +70,7 @@
 Comment[tt]=KDE'nıñ Tösle Tışlaw
 Comment[uk]=Тема кольорів KDE
 Comment[uz]=KDE ранг мавзуси
+Comment[vi]=Sắc thái màu KDE
 Comment[wa]=Tinme di coleurs KDE
 Comment[zh_CN]=KDE 色彩主题
 Comment[zh_HK]=KDE 色彩佈景
Index: mimetypes/application/vnd.ms-word.desktop
===================================================================
--- mimetypes/application/vnd.ms-word.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.ms-word.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -71,6 +71,7 @@
 Comment[uk]=Документ MS Word
 Comment[uz]=Microsoft Word ҳужжати
 Comment[ven]=Manwalwa a Microsoft Word
+Comment[vi]=Tài liệu Word của Microsoft™.
 Comment[wa]=Documint Microsoft Word
 Comment[xh]=Uxwebhhu LweMicrosoft Word
 Comment[zh_CN]=Microsoft Word 文档
Index: mimetypes/application/x-gzpostscript.desktop
===================================================================
--- mimetypes/application/x-gzpostscript.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-gzpostscript.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -67,6 +67,7 @@
 Comment[uk]=Файл PostScript стиснутий gzip
 Comment[uz]=Gzip билан қисилган PostScript ҳужжати
 Comment[ven]=Faela ya tshikiriputi tsha poso ya Gzipped
+Comment[vi]=Tập tin PostScript đã nén Gzip
 Comment[wa]=Fitchî Postscript gzip-rastrindou
 Comment[xh]=Ifayile ye PostScript Gzipped
 Comment[zh_CN]=Gzip 压缩的 Postscript 文件
Index: mimetypes/application/vnd.stardivision.impress.desktop
===================================================================
--- mimetypes/application/vnd.stardivision.impress.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.stardivision.impress.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -67,6 +67,7 @@
 Comment[tt]=StarOffice Impress Täqbire
 Comment[uk]=Презентація StarOffice Impress
 Comment[uz]=StarOffice Impress намойиши
+Comment[vi]=Trình diễn Impress của StarOffice
 Comment[xh]=Umboniso Wokuphawula we StarOffice
 Comment[zh_CN]=StarOffice Impress 演示文稿
 Comment[zh_HK]=StarOffice Impress 簡報
Index: mimetypes/application/x-java.desktop
===================================================================
--- mimetypes/application/x-java.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-java.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -74,7 +74,6 @@
 Comment[uk]=Клас Java
 Comment[uz]=Java синфи
 Comment[ven]=Kilasi ya Java
-Comment[vi]=Lớp Java 
 Comment[wa]=Classe Java
 Comment[xh]=Uhlobo lwe Java
 Comment[zh_CN]=Java 类
Index: mimetypes/application/x-dvi.desktop
===================================================================
--- mimetypes/application/x-dvi.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-dvi.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -66,6 +66,7 @@
 Comment[uk]=Незалежний від пристрою файл TeX
 Comment[uz]=Ускунага боғлиқ бўлмаган TeX-файли
 Comment[ven]=Faela ya di imisaho nga yothe ya maano a TeX
+Comment[vi]=Tập tin không phụ thuộc vào thiết bị kiểu TeX
 Comment[wa]=Fitchî DVI
 Comment[xh]=Ifayile Ezimeleyo Yecebo le TeX
 Comment[zh_CN]=TeX 设备无关文件
Index: mimetypes/application/xhtml+xml.desktop
===================================================================
--- mimetypes/application/xhtml+xml.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/xhtml+xml.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -65,6 +65,7 @@
 Comment[tt]=XHTML Törendä İstälek
 Comment[uk]=Документ XHTML
 Comment[uz]=XHTML оиласига оид ҳужжат
+Comment[vi]=Tài liệu nhóm XHTML
 Comment[wa]=Documint XHTML
 Comment[zh_CN]=XHTML 及类似文档
 Comment[zh_HK]=XHTML 類型文件
Index: mimetypes/application/vnd.sun.xml.calc.desktop
===================================================================
--- mimetypes/application/vnd.sun.xml.calc.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.sun.xml.calc.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -62,6 +62,7 @@
 Comment[tt]=OpenOffice.org İsäpcäymäse
 Comment[uk]=Електронна таблиця OpenOffice.org
 Comment[uz]=OpenOffice.org электрон жадвали
+Comment[vi]=Bảng tính OpenOffice.org
 Comment[wa]=Foye di tåvleu OpenOffice.org
 Comment[zh_CN]=OpenOffice.org 电子表格
 Comment[zh_HK]=OpenOffice.org 試算表
Index: mimetypes/application/x-applixword.desktop
===================================================================
--- mimetypes/application/x-applixword.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-applixword.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -73,6 +73,7 @@
 Comment[uk]=Документ Applix Words
 Comment[uz]=Applix Words ҳужжати
 Comment[ven]=Manwalwa a maipfi a Applix
+Comment[vi]=Tài liệu Words Applix
 Comment[wa]=Documint tecse Applix
 Comment[xh]=Uxwebhu Lwamagama lwe Applix
 Comment[zh_CN]=Applix 文字处理文档
Index: mimetypes/application/pkcs10.desktop
===================================================================
--- mimetypes/application/pkcs10.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/pkcs10.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -68,6 +68,7 @@
 Comment[uk]=Запит сертифікації S/MIME
 Comment[uz]=S/MIME сертификат талаби
 Comment[ven]=Khumbelo ya sethifikheithi tsha PKCS#12
+Comment[vi]=Yêu cầu tạo chứng nhận S/MIME.
 Comment[wa]=Dimande d' acertinaedje S/MIME
 Comment[xh]=S/MIME Isicelo Soqinisekiso
 Comment[zh_CN]=S/MIME 认证请求
Index: mimetypes/application/vnd.stardivision.chart.desktop
===================================================================
--- mimetypes/application/vnd.stardivision.chart.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.stardivision.chart.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -57,6 +57,7 @@
 Comment[tr]=StarOffice Hesap Tablosu
 Comment[tt]=StarOffice Grafiğı
 Comment[uk]=Діаграма StarOffice
+Comment[vi]=Biểu đồ StarOffice
 Comment[zh_CN]=StarOffice 图表
 [Property::X-KDE-NativeExtension]
 Type=QString
Index: mimetypes/application/vnd.stardivision.calc.desktop
===================================================================
--- mimetypes/application/vnd.stardivision.calc.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.stardivision.calc.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,6 +69,7 @@
 Comment[uk]=Електронна таблиця StarOffice Calc
 Comment[uz]=StarOffice Calc электрон жадвали
 Comment[ven]=U phadaladza ha bammbiri la Calc ya StarOffice
+Comment[vi]=Bảng tính Calc của StarOffice
 Comment[zh_CN]=StarOffice Calc 电子表格
 Comment[zh_HK]=StarOffice Calc 電子表格
 Comment[zh_TW]=StarOffice Calc 電子表格
Index: mimetypes/application/x-kontour.desktop
===================================================================
--- mimetypes/application/x-kontour.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-kontour.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,6 +69,7 @@
 Comment[uk]=Документ Kontour
 Comment[uz]=Kontour ҳужжати
 Comment[ven]=Manwalwa a Kontour
+Comment[vi]=Tài liệu Kontour
 Comment[wa]=Documint Kontour
 Comment[xh]=Uxwebhu lwe Kontour
 Comment[zh_CN]=Kontour 文档
Index: mimetypes/application/mspowerpoint.desktop
===================================================================
--- mimetypes/application/mspowerpoint.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/mspowerpoint.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -21,7 +21,7 @@
 Comment[de]=MS-PowerPoint-Präsentation
 Comment[el]=Παρουσίαση Microsoft PowerPoint
 Comment[eo]=Mikrosoft-PowerPoint-dokumento
-Comment[es]=Prsentación de Microsoft PowerPoint
+Comment[es]=Presentación de Microsoft PowerPoint
 Comment[et]=Microsoft PowerPointi esitlus
 Comment[eu]=Microsoft PowerPoint aurkezpena
 Comment[fa]=نمایش مایکروسافت پاور پوینت
@@ -70,6 +70,7 @@
 Comment[tt]=Microsoft PowerPoint Täqbire
 Comment[uk]=Презентація MS PowerPoint
 Comment[uz]=Microsoft PowerPoint намунаси
+Comment[vi]=Trình diễn PowerPoint của Microsoft™.
 Comment[wa]=Prezintaedje Microsoft PowerPoint
 Comment[zh_CN]=Microsoft PowerPoint 演示文稿
 Comment[zh_HK]=微軟 PowerPoint 文件
Index: mimetypes/application/x-object.desktop
===================================================================
--- mimetypes/application/x-object.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-object.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -46,7 +46,7 @@
 Comment[ms]=Kod Objek
 Comment[mt]=Kodiċi kkompilat
 Comment[nb]=Objektkode
-Comment[nds]=Objektcode
+Comment[nds]=Objektkode
 Comment[nl]=Object-code
 Comment[nn]=Objektkode
 Comment[nso]=Khoutu ya Sediriswa
@@ -72,7 +72,7 @@
 Comment[uk]=Об'єктний код
 Comment[uz]=Объект коди
 Comment[ven]=Khoudu ya tshithu
-Comment[vi]=Mã đối tượng 
+Comment[vi]=Mã đối tượng
 Comment[xh]=Ikhowudi yento
 Comment[zh_CN]=目标代码
 Comment[zh_HK]=目標代碼
Index: mimetypes/application/vnd.ms-asf.desktop
===================================================================
--- mimetypes/application/vnd.ms-asf.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.ms-asf.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -62,6 +62,7 @@
 Comment[tr]=ASF dosyası
 Comment[uk]=Носій ASF
 Comment[uz]=ASF медиа-файли
+Comment[vi]=Vật chứa ASF
 Comment[zh_CN]=ASF 媒体
 Comment[zh_HK]=ASF 媒體
 Comment[zh_TW]=ASF 媒體
Index: mimetypes/application/x-desktop.desktop
===================================================================
--- mimetypes/application/x-desktop.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-desktop.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -67,6 +67,7 @@
 Comment[uk]=Файл конфігурації стільниць
 Comment[uz]=Desktop мослаш файли
 Comment[ven]=Faela yau lugisela desikithopo
+Comment[vi]=Tập tin cấu hình môi trường
 Comment[wa]=Fitchî d' apontiaedje pol sicribanne
 Comment[xh]=Ifayile Yoqwalaselo ye Desktop
 Comment[zh_CN]=桌面配置文件
Index: mimetypes/application/x-debian-package.desktop
===================================================================
--- mimetypes/application/x-debian-package.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-debian-package.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,6 +69,7 @@
 Comment[tt]=Debian Tuplaması
 Comment[uk]=Пакунок Debian
 Comment[uz]=Debian пакети
+Comment[vi]=Gói Debian
 Comment[wa]=Fitchî pacaedje Debian
 Comment[zh_CN]=Debian 包
 Comment[zh_HK]=Debian 套件
Index: mimetypes/application/x-quattropro.desktop
===================================================================
--- mimetypes/application/x-quattropro.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-quattropro.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -73,6 +73,7 @@
 Comment[uk]=Файл Quattro Pro
 Comment[uz]=Quattro Pro ҳужжати
 Comment[ven]=Faela ya Quattro Pro 
+Comment[vi]=Tài liệu Quattro Pro
 Comment[wa]=Documint Quattro Pro
 Comment[xh]=Uxwebhu lwe Quattro Pro
 Comment[zh_CN]=Quattro Pro 文件
Index: mimetypes/application/x-x509-ca-cert.desktop
===================================================================
--- mimetypes/application/x-x509-ca-cert.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-x509-ca-cert.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -68,6 +68,7 @@
 Comment[uk]=DER, PEM, або закодований Netscape сертифікат X.509
 Comment[uz]=DEP, PEM, ёки Netscape кодланган X.509 сертификат
 Comment[ven]=DER, PEM, kana Netscape encoded X.509 Sethifikheithi
+Comment[vi]=Chứng nhận X.509 đã mã hoá DER, PEM hay Netscape.
 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[zh_CN]=DER，PEM 或 Netscape 编码的 X.509 证书
Index: mimetypes/application/x-sqlite2.desktop
===================================================================
--- mimetypes/application/x-sqlite2.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-sqlite2.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -8,6 +8,7 @@
 Comment[af]=SQLite2 Databasis Lêer
 Comment[bg]=Файл за данни на SQLite2
 Comment[br]=Restr stlennvon SQLite2
+Comment[bs]=SQLite2 baza podataka
 Comment[ca]=Fitxer base de dades SQLite2
 Comment[cs]=Databázový soubor SQLite2
 Comment[cy]=Ffeil Gronfa DdataSQLite2
@@ -48,5 +49,6 @@
 Comment[tg]=Файли Базаи Маълумотии SQLite2
 Comment[uk]=Файл бази даних SQLite2
 Comment[uz]=SQLite2 маълумот база файли
+Comment[vi]=Tập tin cơ sở dữ liệu SQLite2
 Comment[zh_CN]=SQLite2 数据库文件
 Comment[zh_HK]=SQLite2 資料庫檔案
Index: mimetypes/application/x-sqlite3.desktop
===================================================================
--- mimetypes/application/x-sqlite3.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-sqlite3.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -8,6 +8,7 @@
 Comment[af]=SQLite3 Databasis Lêer
 Comment[bg]=Файл за данни на SQLite3
 Comment[br]=Restr stlennvon SQLite3
+Comment[bs]=SQLite3 baza podataka
 Comment[ca]=Fitxer base de dades SQLite3
 Comment[cs]=Databázový soubor SQLite3
 Comment[cy]=Ffeil Gronfa DdataSQLite3
@@ -48,5 +49,6 @@
 Comment[tg]=Файли Базаи Маълумотии SQLite3
 Comment[uk]=Файл бази даних SQLite3
 Comment[uz]=SQLite3 маълумот база файли
+Comment[vi]=Tập tin cơ sở dữ liệu SQLite3
 Comment[zh_CN]=SQLite3 数据库文件
 Comment[zh_HK]=SQLite3 資料庫檔案
Index: mimetypes/application/x-perl-module.desktop
===================================================================
--- mimetypes/application/x-perl-module.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-perl-module.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -4,6 +4,7 @@
 Comment[bg]=Модул на Perl
 Comment[bn]=পার্ল মডিউল
 Comment[br]=Mollad Perl
+Comment[bs]=Perl modul
 Comment[ca]=Mòdul Perl
 Comment[cs]=Modul jazyka Perl
 Comment[cy]=Modiwl Perl
@@ -52,6 +53,7 @@
 Comment[tt]=Perl Modulı
 Comment[uk]=Модуль мови програмування Perl
 Comment[uz]=Perl модули
+Comment[vi]=Mô-đun Perl
 Comment[zh_CN]=Perl 模块
 Comment[zh_HK]=Perl 模組
 Icon=source_pl
Index: mimetypes/application/x-bzip2.desktop
===================================================================
--- mimetypes/application/x-bzip2.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-bzip2.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -70,6 +70,7 @@
 Comment[uk]=Файл Bzip2
 Comment[uz]=Bzip2-файли
 Comment[ven]=Faela ya Bzip2
+Comment[vi]=Tập tin Bzip2
 Comment[wa]=Fitchî bzip2
 Comment[xh]=Ifayile ye Bzip2
 Comment[zh_CN]=Bzip2 文件
Index: mimetypes/application/x-amipro.desktop
===================================================================
--- mimetypes/application/x-amipro.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-amipro.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -73,6 +73,7 @@
 Comment[uk]=Документ Lotus AmiPro
 Comment[uz]=Lotus AmiPro ҳужжати
 Comment[ven]=Manwalwa a Lotus AmiPro
+Comment[vi]=Tài liệu AmiPro Lotus
 Comment[wa]=Documint Lotus AmiPro
 Comment[xh]=Uxwebhu lwe Lotus AmiPro
 Comment[zh_CN]=Lotus AmiPro 文档
Index: mimetypes/application/xsd.desktop
===================================================================
--- mimetypes/application/xsd.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/xsd.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -4,6 +4,7 @@
 Comment[af]=W3C XML Skema
 Comment[bg]=Схема W3C XML
 Comment[br]=Steuñv XML W3C
+Comment[bs]=W3C XML šema
 Comment[ca]=Esquema XML W3C
 Comment[cs]=W3C XML schéma
 Comment[da]=W3C XML Sammensætning
@@ -49,10 +50,11 @@
 Comment[tt]=W3C XML Tözeleşe
 Comment[uk]=Схема W3C XML
 Comment[uz]=W3C XML ҳужжати
+Comment[vi]=Giản đồ XML W3C
 Comment[zh_CN]=W3C WML 大纲
 Icon=html
 Type=MimeType
-MimeType=application/xml
+MimeType=application/xsd
 X-KDE-IsAlso=text/xml
 Patterns=*.xsd;
 
Index: mimetypes/application/x-mswrite.desktop
===================================================================
--- mimetypes/application/x-mswrite.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-mswrite.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -72,6 +72,7 @@
 Comment[uk]=Документ Microsoft Write
 Comment[uz]=Microsoft Write ҳужжати
 Comment[ven]=Manwalwa a microsoft au nwala
+Comment[vi]=Tài liệu Write của Microsoft™
 Comment[wa]=Documint Microsoft Write
 Comment[xh]=Uxwebhhu Lokubhala le Microsoft
 Comment[zh_CN]=Microsoft 书写器文档
Index: mimetypes/application/fits.desktop
===================================================================
--- mimetypes/application/fits.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/fits.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -5,6 +5,7 @@
 Comment=FITS Data
 Comment[bg]=Данни FITS
 Comment[br]=Roadoù FITS
+Comment[bs]=FITS podaci
 Comment[ca]=Dades FITS
 Comment[de]=FITS-Daten
 Comment[el]=Δεδομένα FITS
@@ -22,6 +23,7 @@
 Comment[ja]=FITS データ
 Comment[km]=ទិន្នន័យ FITS
 Comment[lb]=FITS-Donnéeën
+Comment[mk]=FITS-податоци
 Comment[ms]=Data FITS
 Comment[nds]=FITS-Daten
 Comment[nl]=FITS-gegevens
Index: mimetypes/application/x-afm.desktop
===================================================================
--- mimetypes/application/x-afm.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-afm.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -60,6 +60,7 @@
 Comment[tr]=PostScript Yazıtipi Ölçütleri
 Comment[tt]=PostScript Yazunıñ Ülçämnäre
 Comment[uk]=Метрика шрифту PostScript
+Comment[vi]=Cách đo phông chữ PostScript
 Comment[wa]=Metrikes di fonte PostScript
 Comment[zh_CN]=PostScript 字型
 Comment[zh_HK]=PostScript 字體 Merics
Index: mimetypes/application/pdf.desktop
===================================================================
--- mimetypes/application/pdf.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/pdf.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -73,6 +73,7 @@
 Comment[uk]=Документ PDF
 Comment[uz]=PDF ҳужжати
 Comment[ven]=Manwalwa a pdf
+Comment[vi]=Tài liệu PDF
 Comment[wa]=Documint PDF
 Comment[xh]=Uxwebhu lwe PDF
 Comment[zh_CN]=PDF 文档
Index: mimetypes/application/vnd.oasis.opendocument.spreadsheet.desktop
===================================================================
--- mimetypes/application/vnd.oasis.opendocument.spreadsheet.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.oasis.opendocument.spreadsheet.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -9,6 +9,7 @@
 Comment[bg]=Електронна таблица на OASIS OpenDocument
 Comment[bn]=OASIS ওপেন-ডকুমেন্ট স্প্রেডশিট
 Comment[br]=Loger OpenOffice.org OASIS
+Comment[bs]=OASIS OpenDocument proračunska tablica
 Comment[ca]=Full de càlcul OASIS OpenDocument
 Comment[cs]=OASIS OpenDocument tabulka
 Comment[cy]=Taenlen OASIS OpenDocument
@@ -54,6 +55,7 @@
 Comment[tt]=OASIS OpenDocument İsäpcäymäse
 Comment[uk]=Електронна таблиця OASIS OpenDocument
 Comment[uz]=OASIS OpenDocument электрон жадвали
+Comment[vi]=Bảng tính OpenDocument OASIS
 Comment[zh_CN]=OASIS OpenDocument 电子表格
 Comment[zh_HK]=OASIS OpenDocument 試算表
 [Property::X-KDE-NativeExtension]
Index: mimetypes/application/x-lha.desktop
===================================================================
--- mimetypes/application/x-lha.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-lha.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,6 +69,7 @@
 Comment[uk]=Архів LHA
 Comment[uz]=Lha архиви
 Comment[ven]=Fhethu hau vhulungela hone zwithu zwa kale ha Lha
+Comment[vi]=Bản nén Lha
 Comment[wa]=Årtchive LHA
 Comment[xh]=Lha Indawo yogcino
 Comment[zh_CN]=Lha 归档
Index: mimetypes/application/x-tgz.desktop
===================================================================
--- mimetypes/application/x-tgz.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-tgz.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -35,7 +35,7 @@
 Comment[id]=Archive Gzipped Tar
 Comment[is]=Gzip þjappað tar-safn
 Comment[it]=Archivio Tar compresso con Gzip
-Comment[ja]=GzipされたTarアーカイブ
+Comment[ja]=Gzip 圧縮された Tar アーカイブ
 Comment[km]=ប័ណ្ណសារ Gzipped Tar
 Comment[ko]=Gzip으로 압축한 TAR 저장고
 Comment[lb]=Mat Gzip kompriméierten Tar-Archiv
@@ -75,7 +75,7 @@
 Comment[uk]=Архів tar стиснутий gzip
 Comment[uz]=Gzip билан қисилган Tar архиви
 Comment[ven]=Fhethu hau vhulungela hone zwithu zwa kale ha Tar ha Gzipped
-Comment[vi]=File nén gzipped tar 
+Comment[vi]=Bản Tar đã nén Gzip
 Comment[wa]=Årtchive TAR rastrindowe avou gzip
 Comment[xh]=Indawo yogcino ye Gzipped Tar
 Comment[zh_CN]=Gzip 压缩的 Tar 归档
Index: mimetypes/application/x-javascript.desktop
===================================================================
--- mimetypes/application/x-javascript.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-javascript.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -59,6 +59,7 @@
 Comment[tt]=JavaScript Bireme
 Comment[uk]=Файл JavaScript
 Comment[uz]=JavaScript-файли
+Comment[vi]=Tập tin JavaScript
 Comment[zh_CN]=JavaScript 文件
 Comment[zh_HK]=JavaScript 檔案
 X-KDE-IsAlso=application/x-executable-script
Index: mimetypes/application/vnd.sun.xml.impress.desktop
===================================================================
--- mimetypes/application/vnd.sun.xml.impress.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.sun.xml.impress.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -63,6 +63,7 @@
 Comment[tt]=OpenOffice.org Täqbire
 Comment[uk]=Презентація OpenOffice.org
 Comment[uz]=OpenOffice.org Намойиш
+Comment[vi]=Trình diễn OpenOffice.org
 Comment[wa]=Documint di prezintaedje OpenOffice.org
 Comment[zh_CN]=OpenOffice.org 演示文稿
 Comment[zh_HK]=OpenOffice.org 簡報
Index: mimetypes/application/x-vnd.kde.kugar.mixed.desktop
===================================================================
--- mimetypes/application/x-vnd.kde.kugar.mixed.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-vnd.kde.kugar.mixed.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -67,6 +67,7 @@
 Comment[tt]=Kugar Tuplama Bireme
 Comment[uk]=Архів Kugar
 Comment[uz]=Kugar архив файли
+Comment[vi]=Tập tin kho Kugar
 Comment[wa]=Fitchî årtchive Kugar
 Comment[zh_CN]=Kugar 归档文件
 Comment[zh_HK]=Kugar 壓縮檔
Index: mimetypes/application/x-gnumeric.desktop
===================================================================
--- mimetypes/application/x-gnumeric.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-gnumeric.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -72,6 +72,7 @@
 Comment[uk]=Електронна таблиця GNUmeric
 Comment[uz]=GNUmeric электрон жадвали
 Comment[ven]=U phadaladza ha siatari ha GNUmeric 
+Comment[vi]=Bảng tính GNUmeric
 Comment[wa]=Documint tåvleu GNUmeric
 Comment[zh_CN]=GNUmeric 电子表格
 Comment[zh_HK]=GNUmeric 試算表
Index: mimetypes/application/x-kchart.desktop
===================================================================
--- mimetypes/application/x-kchart.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-kchart.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -72,6 +72,7 @@
 Comment[uk]=Документ KChart
 Comment[uz]=KChart ҳужжати
 Comment[ven]=Manwalwa a KChart
+Comment[vi]=Tài liệu KChart
 Comment[wa]=Documint KChart
 Comment[xh]=Uxwebhu lwe KChart
 Comment[zh_CN]=KChart 文档
Index: mimetypes/application/wordperfect.desktop
===================================================================
--- mimetypes/application/wordperfect.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/wordperfect.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -73,6 +73,7 @@
 Comment[uk]=Документ WordPerfect
 Comment[uz]=WordPerfect ҳужжати
 Comment[ven]=Manwalwa a fhungo vhukuma
+Comment[vi]=Tài liệu WordPerfect
 Comment[wa]=Documint WordPerfect
 Comment[xh]=Uxwebhu lwe WordPerfect
 Comment[zh_CN]=WordPerfect 文档
Index: mimetypes/application/x-executable.desktop
===================================================================
--- mimetypes/application/x-executable.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-executable.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -67,6 +67,7 @@
 Comment[uk]=Програма
 Comment[uz]=Ишга тушириб бўладиган файл
 Comment[ven]=Faela ino tumulea
+Comment[vi]=Tập tin có khả năng thực hiện
 Comment[wa]=Fitchî enondåve
 Comment[xh]=Ifayile Ephumezekayo
 Comment[zh_CN]=可执行文件
Index: mimetypes/application/x-executable-script.desktop
===================================================================
--- mimetypes/application/x-executable-script.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-executable-script.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -54,6 +54,7 @@
 Comment[tt]=Ämerlek (eşçän buluı bar)
 Comment[uk]=Скрипт, який, можливо, можна виконати
 Comment[uz]=Эҳтимол ишга тушириб бўладиган скрипт
+Comment[vi]=Tập lệnh (có lẽ có khả năng thực hiện)
 Comment[zh_CN]=脚本(可能可执行)
 Comment[zh_HK]=Script (可能是可執行檔)
 Icon=exec
Index: mimetypes/application/x-lzop.desktop
===================================================================
--- mimetypes/application/x-lzop.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-lzop.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -35,7 +35,7 @@
 Comment[id]=File Lzopped
 Comment[is]=Þjöppuð skrá (lzop)
 Comment[it]=File compresso con Lz
-Comment[ja]=Lzopされたファイル
+Comment[ja]=Lzop されたファイル
 Comment[km]=ឯកសារ Lzopped
 Comment[ko]=Lzop으로 압축한 파일
 Comment[lb]=Mat Lzop kompriméiert Datei
@@ -75,7 +75,7 @@
 Comment[uk]=Файл Lzopp
 Comment[uz]=Lzop билан қисилган файл
 Comment[ven]=Faela ya Lzopped
-Comment[vi]=File Lzopped 
+Comment[vi]=Tập tin đã nén Lzop
 Comment[xh]=Ifayile ye Lzopped
 Comment[zh_CN]=Lzopped 文件
 Comment[zh_HK]=Lzopped 檔案
Index: mimetypes/application/x-shockwave-flash.desktop
===================================================================
--- mimetypes/application/x-shockwave-flash.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-shockwave-flash.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -48,7 +48,7 @@
 Comment[tt]=Shockwave Flash Bireme
 Comment[uz]=Shockwave Flash медиа-файли
 Comment[ven]=Lupenyo lwa media lua khamadzaho
-Comment[vi]=Shockwave Flash 
+Comment[vi]=Phương tiện Flash của Shockwave
 Comment[zh_CN]=Shockwave Flash 媒体文件
 Comment[zh_HK]=Shockwave Flash 媒體檔案
 Comment[zh_TW]=Shockwave Flash 媒體檔案
Index: mimetypes/application/x-pw.desktop
===================================================================
--- mimetypes/application/x-pw.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-pw.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -65,6 +65,7 @@
 Comment[tt]=Pathetic Writer İstälege
 Comment[uk]=Документ Pathetic Writer
 Comment[uz]=Pathetic Writer ҳужжати
+Comment[vi]=Tài liệu Pathetic Writer
 Comment[wa]=Documint «Pathetic Writer»
 Comment[zh_CN]=Pathetic Writer 文档
 Comment[zh_HK]=Pathetic Writer 文件
Index: mimetypes/application/x-rar-compressed.desktop
===================================================================
--- mimetypes/application/x-rar-compressed.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-rar-compressed.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -73,6 +73,7 @@
 Comment[uk]=Архів Rar
 Comment[uz]=Rar архиви
 Comment[ven]=Fhethu ha u vhulunga zwithu zwa kale ha Rar
+Comment[vi]=Bản nén Rar
 Comment[wa]=Årtchive RAR
 Comment[xh]=Indawo yogcino ye Rar
 Comment[zh_CN]=Rar 归档
Index: mimetypes/application/x-kpovmodeler.desktop
===================================================================
--- mimetypes/application/x-kpovmodeler.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-kpovmodeler.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -67,7 +67,7 @@
 Comment[uk]=Файл KPovModeler
 Comment[uz]=KPovModeler-файли
 Comment[ven]=Faela ya KPovModeler
-Comment[vi]=File KPovModeler
+Comment[vi]=Tập tin KPovModeler
 Comment[xh]=Ifayile ye KPovModeler
 Comment[zh_CN]=KPovModeler 文件
 Comment[zh_HK]=KPovModeler 檔案
Index: mimetypes/application/x-php.desktop
===================================================================
--- mimetypes/application/x-php.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-php.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -65,6 +65,7 @@
 Comment[tt]=PHP Ämerlek
 Comment[uk]=Скрипт мови програмування PHP
 Comment[uz]=PHP скрипти
+Comment[vi]=Tập lệnh PHP
 Comment[wa]=Sicripe PHP
 Comment[zh_CN]=PHP 脚本
 
Index: mimetypes/application/x-troff-man.desktop
===================================================================
--- mimetypes/application/x-troff-man.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-troff-man.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -66,6 +66,7 @@
 Comment[uk]=Документ Troff з макросом сторінки довідки
 Comment[uz]=Manpage макросли Troff ҳужжати
 Comment[ven]=Manwalwa a Troff a rena siatari la macros
+Comment[vi]=Tài liệu Troff với bộ lệnh trang hướng dẫn Man
 Comment[wa]=Documint troff (pådje di man)
 Comment[xh]=Uxwebhu lwe Troff ene Manpage Macros
 Comment[zh_CN]=带有 Manpage 宏的 Troff 文档
Index: mimetypes/application/x-tex-gf.desktop
===================================================================
--- mimetypes/application/x-tex-gf.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-tex-gf.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -67,6 +67,7 @@
 Comment[uk]=Загальний шрифт
 Comment[uz]=Умумий шрифт
 Comment[ven]=Fontu ya vhukuma
+Comment[vi]=Phông chữ giống loài
 Comment[wa]=Fonte djenerike
 Comment[xh]=Uhlobo lwamagama Elisetyenziswa ngumntu wonke
 Comment[zh_CN]=普通字体文件
Index: mimetypes/application/x-shellscript.desktop
===================================================================
--- mimetypes/application/x-shellscript.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-shellscript.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -67,6 +67,7 @@
 Comment[uk]=Скрипт командної оболонки
 Comment[uz]=Шелл скрипти
 Comment[ven]=Tshikiriputi tsha shell
+Comment[vi]=Tập lệnh hệ vỏ
 Comment[wa]=Sicripe shell
 Comment[xh]=Ushicilelo phantsi Lweqokobhe
 Comment[zh_CN]=Shell 脚本
Index: mimetypes/application/vnd.oasis.opendocument.graphics.desktop
===================================================================
--- mimetypes/application/vnd.oasis.opendocument.graphics.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.oasis.opendocument.graphics.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -9,6 +9,7 @@
 Comment[bg]=Графика на OASIS OpenDocument
 Comment[bn]=OASIS ওপেন-ডকুমেন্ট গ্রাফিক্স
 Comment[br]=Skeudenn OpenOffice.org OASIS
+Comment[bs]=OASIS OpenDocument crtež
 Comment[ca]=Gràfic OASIS OpenDocument
 Comment[cs]=OASIS OpenDocument kresba
 Comment[cy]=Graffeg OASIS OpenDocument
@@ -54,6 +55,7 @@
 Comment[tt]=OASIS OpenDocument Sızımı
 Comment[uk]=Графічне зображення OASIS OpenDocument
 Comment[uz]=OASIS OpenDocument графика
+Comment[vi]=Đồ họa OpenDocument OASIS
 Comment[zh_CN]=OASIS OpenDocument 图形
 Comment[zh_HK]=OASIS OpenDocument 繪圖
 [Property::X-KDE-NativeExtension]
Index: mimetypes/application/x-font-bdf.desktop
===================================================================
--- mimetypes/application/x-font-bdf.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-font-bdf.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -71,6 +71,7 @@
 Comment[uk]=Растровий шрифт BDF
 Comment[uz]=BDF BMP шрифти
 Comment[ven]=Fontu ya Bitmap BDF
+Comment[vi]=Phông chữ sơ đồ bit BDF
 Comment[wa]=Fonte bitmap BDF
 Comment[xh]=Uhlobo lwamagama lwe BDF Bitmap
 Comment[zh_CN]=BDF 位图字体
Index: mimetypes/application/x-kudesigner.desktop
===================================================================
--- mimetypes/application/x-kudesigner.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-kudesigner.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -64,6 +64,7 @@
 Comment[tt]=Kugar Yomğağı öçen Ürçetmä
 Comment[uk]=Шаблон звіту Kugar
 Comment[uz]=Kugar ҳисобот намунаси
+Comment[vi]=Biểu mẫu thông báo Kugar
 Comment[zh_CN]=Kugar 报告模板
 Comment[zh_HK]=Kugar 報表樣本
 Comment[zh_TW]=Kugar 報表樣本
Index: mimetypes/application/vnd.oasis.opendocument.formula.desktop
===================================================================
--- mimetypes/application/vnd.oasis.opendocument.formula.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.oasis.opendocument.formula.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -9,6 +9,7 @@
 Comment[bg]=Формула на OASIS OpenDocument
 Comment[bn]=OASIS ওপেন-ডকুমেন্ট ফর্মুলা
 Comment[br]=Formulenn OpenDocument OASIS
+Comment[bs]=OASIS OpenDocument formula
 Comment[ca]=Fòrmula OASIS OpenDocument
 Comment[cs]=OASIS OpenDocument vzorec
 Comment[cy]=Fformiwla OASIS OpenDocument
@@ -54,6 +55,7 @@
 Comment[tt]=OASIS OpenDocument Formulı
 Comment[uk]=Формула OASIS OpenDocument
 Comment[uz]=OASIS OpenDocument формула
+Comment[vi]=Công thức OpenDocument OASIS
 Comment[zh_CN]=OASIS OpenDocument 公式
 Comment[zh_HK]=OASIS OpenDocument 算式
 [Property::X-KDE-NativeExtension]
Index: mimetypes/application/x-font-type1.desktop
===================================================================
--- mimetypes/application/x-font-type1.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-font-type1.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -71,6 +71,7 @@
 Comment[uk]=Шрифт PostScript Type1
 Comment[uz]=PostScript Type1 шрифти
 Comment[ven]=Fontu ya lushaka lwau thoma ya tshikiriputi tsha poso
+Comment[vi]=Phông chữ Type1 PostScript
 Comment[wa]=Fonte PostScript Type1
 Comment[xh]=Uhlobo lwamagama lwe PostScritp Type1
 Comment[zh_CN]=PostScript Type1 字体
Index: mimetypes/application/msword.desktop
===================================================================
--- mimetypes/application/msword.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/msword.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -74,6 +74,7 @@
 Comment[uk]=Документ MS Word
 Comment[uz]=Microsoft Word ҳужжати
 Comment[ven]=Manwalwa a Microsoft Word
+Comment[vi]=Tài liệu Word của Microsoft™.
 Comment[wa]=Documint Microsoft Word
 Comment[xh]=Uxwebhhu LweMicrosoft Word
 Comment[zh_CN]=Microsoft Word 文档
Index: mimetypes/application/ogg.desktop
===================================================================
--- mimetypes/application/ogg.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/ogg.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,6 +69,7 @@
 Comment[uk]=Ogg-аудіо
 Comment[uz]=Ogg мултимедиа
 Comment[ven]=Zwavhukwamani ha Ogg
+Comment[vi]=Đa phương tiện Ogg
 Comment[wa]=Fitchî multimedia Ogg
 Comment[zh_CN]=Ogg 多媒体
 Comment[zh_HK]=Ogg 多媒體
Index: mimetypes/application/vnd.stardivision.writer-global.desktop
===================================================================
--- mimetypes/application/vnd.stardivision.writer-global.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.stardivision.writer-global.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -59,6 +59,7 @@
 Comment[tt]=StarOffice Writer'nıñ Master-İstälege
 Comment[uk]=Головний документ StarOffice Writer
 Comment[uz]=StarOffice Writer бош ҳужжати
+Comment[vi]=Tài liệu cái Writer của StarOffice
 Comment[zh_CN]=StarOffice Writer 主文档
 Comment[zh_HK]=StarOffice Writer 主控文件
 [Property::X-KDE-NativeExtension]
Index: mimetypes/application/x-krita.desktop
===================================================================
--- mimetypes/application/x-krita.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-krita.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -72,6 +72,7 @@
 Comment[uk]=Документ Krita
 Comment[uz]=Krita ҳужжати
 Comment[ven]=Manwalwa a Krita
+Comment[vi]=Tài liệu Krita
 Comment[wa]=Documint Krita
 Comment[xh]=Uxwebhu lwe Krita
 Comment[zh_CN]=Krita 文档
Index: mimetypes/application/vnd.stardivision.writer.desktop
===================================================================
--- mimetypes/application/vnd.stardivision.writer.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.stardivision.writer.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -70,6 +70,7 @@
 Comment[uk]=Документ StarOffice Writer
 Comment[uz]=StarOffice Writer ҳужжати
 Comment[ven]=Manwalwa a munwali wa StarOffice
+Comment[vi]=Tài liệu Writer của StarOffice
 Comment[xh]=Umbhali Woxwebhhu lwe StarOffice
 Comment[zh_CN]=StarOffice Writer 文档
 Comment[zh_HK]=StarOffice Writer 文件
Index: mimetypes/application/x-pak.desktop
===================================================================
--- mimetypes/application/x-pak.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-pak.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -58,5 +58,6 @@
 Comment[tt]=PAK Tuplama
 Comment[uk]=Файл архіву PAK
 Comment[uz]=PAK архиви
+Comment[vi]=Bản nén tập tin PAK
 Comment[zh_CN]=PAK 文件归档
 Comment[zh_HK]=PAK 壓縮檔
Index: mimetypes/application/x-applixgraphics.desktop
===================================================================
--- mimetypes/application/x-applixgraphics.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-applixgraphics.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -73,6 +73,7 @@
 Comment[uk]=Документ Applix Graphics
 Comment[uz]=Applix Graphics ҳужжати
 Comment[ven]=Manwalwa a Applix Graphics
+Comment[vi]=Tài liệu Graphics Applix
 Comment[wa]=Documint grafike Applix
 Comment[xh]=Uxwebhu Lwemizobo ye Applix
 Comment[zh_CN]=Applix 图形文档
Index: mimetypes/application/illustrator.desktop
===================================================================
--- mimetypes/application/illustrator.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/illustrator.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -72,7 +72,7 @@
 Comment[uk]=Документ Adobe Illustrator
 Comment[uz]=Adobe Illustrator ҳужжати
 Comment[ven]=Manwalwa a u sumbedzisa a Adobe
-Comment[vi]=Tài liệu Adobe Illustrator
+Comment[vi]=Tài liệu Illustrator của Adobe.
 Comment[wa]=Documint Adobe Illustrator
 Comment[xh]=Uxwebhu lwe Adobe Illustrator
 Comment[zh_CN]=Adobe Illustrator 文档
Index: mimetypes/application/pgp-signature.desktop
===================================================================
--- mimetypes/application/pgp-signature.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/pgp-signature.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -68,6 +68,7 @@
 Comment[uk]=Відокремлений підпис OpenPGP
 Comment[uz]=Алоҳида OpenPGP имзоси
 Comment[ven]=Tsaino ya tumanywaho na PGP yo vuleaho
+Comment[vi]=Chữ ký OpenPGP đã tách rời
 Comment[wa]=Sinateure OpenPGP distaetcheye
 Comment[xh]=Utyikityo lwe OpenPGP Olusikiweyo
 Comment[zh_CN]=分离的 OpenPGP 签名
Index: mimetypes/application/x-tarz.desktop
===================================================================
--- mimetypes/application/x-tarz.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-tarz.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -32,7 +32,7 @@
 Comment[id]=Archive Tar terkompresi
 Comment[is]=Þjappað tar-safn
 Comment[it]=Archivio Tar compresso
-Comment[ja]=CompressされたTarアーカイブ
+Comment[ja]=圧縮された Tar アーカイブ
 Comment[km]=ប័ណ្ណសារបង្ហាប់ Tar
 Comment[ko]=압축한 TAR 저장고
 Comment[lb]=Kompriméierten Tar-Archiv
@@ -71,7 +71,7 @@
 Comment[uk]=Стиснутий архів tar
 Comment[uz]=Қисилган Tar архиви
 Comment[ven]=Fhethu hau vhulungela zwithu zwa kale ho tsikeledzwaho ha Tar
-Comment[vi]=File nén compressed tar 
+Comment[vi]=Bản Tar đã nén
 Comment[wa]=Årtchive TAR rastrindowe
 Comment[xh]=Indawo yokugcina ye Tar Edityanisiweyo
 Comment[zh_CN]=压缩的 Tar 归档
Index: mimetypes/application/vnd.sun.xml.draw.desktop
===================================================================
--- mimetypes/application/vnd.sun.xml.draw.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.sun.xml.draw.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -61,6 +61,7 @@
 Comment[tt]=OpenOffice.org Sızımı
 Comment[uk]=Малюнок OpenOffice.org
 Comment[uz]=OpenOffice.org чизма
+Comment[vi]=Bản vẽ OpenOffice.org
 Comment[wa]=Documint di dessinaedje OpenOffice.org
 Comment[zh_CN]=OpenOffice.org 绘图
 Comment[zh_HK]=OpenOffice.org 繪圖
Index: mimetypes/application/x-python.desktop
===================================================================
--- mimetypes/application/x-python.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-python.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -68,6 +68,7 @@
 Comment[uk]=Програма Python
 Comment[uz]=Pathon'да тузилган дастур
 Comment[ven]=Mbekanyamushumo ya Python
+Comment[vi]=Chương trình Python
 Comment[wa]=Programe e python
 Comment[xh]=Udweliso lwenkqubo lwe Python
 Comment[zh_CN]=Python 程序
Index: mimetypes/application/x-awk.desktop
===================================================================
--- mimetypes/application/x-awk.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-awk.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,6 +69,7 @@
 Comment[uk]=Скрипт AWK
 Comment[uz]=AWK скрипти
 Comment[ven]=Bammbiri la AWK
+Comment[vi]=Tập lệnh AWK
 Comment[wa]=Sicripe AWK
 Comment[xh]=Ushicilelo phantsi lwe AWK
 Comment[zh_CN]=AWK 脚本
Index: mimetypes/application/x-vnd.kde.kplato.desktop
===================================================================
--- mimetypes/application/x-vnd.kde.kplato.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-vnd.kde.kplato.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -56,6 +56,7 @@
 Comment[tt]=KPlato Sölge İdärä İstälege
 Comment[uk]=Документ керування проектом KPlato
 Comment[uz]=KPlato ҳужжати
+Comment[vi]=Tài liệu quản lý dự án KPlato
 Comment[zh_CN]=KPlato 项目管理文档
 Comment[zh_HK]=KPlato 計畫管理文件
 Type=MimeType
Index: mimetypes/application/x-gzdvi.desktop
===================================================================
--- mimetypes/application/x-gzdvi.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-gzdvi.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -54,6 +54,7 @@
 Comment[tt]=Gzip'le DVI Birem
 Comment[uk]=Файл DVI, стиснутий gzip
 Comment[uz]=Gzip билан қисилган DVI-файли
+Comment[vi]=Tập tin DVI đã nén Gzip
 Comment[zh_CN]=Gzip 压缩的 DVI 文件
 Comment[zh_HK]=Gzip 格式壓縮的 DVI 檔案
 Hidden=false
Index: mimetypes/application/x-tar.desktop
===================================================================
--- mimetypes/application/x-tar.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-tar.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -73,6 +73,7 @@
 Comment[uk]=Архів Tar
 Comment[uz]=Tar архиви
 Comment[ven]=Fhethu hau vhulungela zwithu zwa kale ha Tar
+Comment[vi]=Bản Tar
 Comment[wa]=Årtchive TAR
 Comment[xh]=Indawo yogcino ye Tar
 Comment[zh_CN]=Tar 归档
Index: mimetypes/application/x-cda.desktop
===================================================================
--- mimetypes/application/x-cda.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-cda.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -64,6 +64,7 @@
 Comment[uk]=Аудіо на КД
 Comment[uz]=Аудио компакт-диск
 Comment[ven]=Zwinopfiwa zwa CD
+Comment[vi]=Âm thanh đĩa CD
 Comment[wa]=CD odio
 Comment[zh_CN]=CD 音频
 Comment[zh_HK]=CD 音效
Index: mimetypes/application/x-core.desktop
===================================================================
--- mimetypes/application/x-core.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-core.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -71,6 +71,7 @@
 Comment[uk]=Дані щодо аварійного завершення програми
 Comment[uz]=Дастурдаги носозликлар ҳақида маълумот
 Comment[ven]=Data ya mbekanyamushumo yo kwashekanaho
+Comment[vi]=Dữ liệu sụp đổ của chương trình
 Comment[xh]=Data Yongqubano lodweliso lwenkqubo
 Comment[zh_CN]=程序崩溃数据
 Comment[zh_HK]=程式 crash 資料
Index: mimetypes/application/x-msdos-program.desktop
===================================================================
--- mimetypes/application/x-msdos-program.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/x-msdos-program.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -64,6 +64,7 @@
 Comment[uk]=Програма Windows
 Comment[uz]=Windows учун дастур
 Comment[ven]=U tumulea ha dziwindo
+Comment[vi]=Tập tin có khả năng thực hiện trên Windows
 Comment[wa]=Fitchî enondåve po MS-Windows
 Comment[xh]=Windows Eziphumezekayo
 Comment[zh_CN]=Windows 可执行文件
Index: mimetypes/application/vnd.stardivision.draw.desktop
===================================================================
--- mimetypes/application/vnd.stardivision.draw.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.stardivision.draw.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -60,6 +60,7 @@
 Comment[tt]=StarOffice Sızımı
 Comment[uk]=Малюнок StarOffice
 Comment[uz]=StarOffice чизмаси
+Comment[vi]=Bản vẽ StarOffice
 Comment[zh_CN]=StarOffice 绘图
 Comment[zh_HK]=StarOffice 繪圖
 [Property::X-KDE-NativeExtension]
Index: mimetypes/application/vnd.sun.xml.draw.template.desktop
===================================================================
--- mimetypes/application/vnd.sun.xml.draw.template.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.sun.xml.draw.template.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -57,6 +57,7 @@
 Comment[tt]=OpenOffice.org Sızımı öçen Ürçetmä
 Comment[uk]=Шаблон малюнка OpenOffice.org
 Comment[uz]=OpenOffice.org чизма намунаси
+Comment[vi]=Biểu mẫu vẽ OpenOffice.org
 Comment[zh_CN]=OpenOffice.org 绘图模板
 Comment[zh_HK]=OpenOffice.org 繪圖範本
 MimeType=application/vnd.sun.xml.draw.template
Index: mimetypes/application/xml.desktop
===================================================================
--- mimetypes/application/xml.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/xml.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -65,6 +65,7 @@
 Comment[tt]=XML İstälek
 Comment[uk]=Документ XML
 Comment[uz]=XML ҳужжати
+Comment[vi]=Tài liệu XML
 Comment[wa]=Documint XML
 Comment[zh_CN]=XML 文档
 Comment[zh_HK]=XML 文件
Index: mimetypes/application/vnd.oasis.opendocument.chart.desktop
===================================================================
--- mimetypes/application/vnd.oasis.opendocument.chart.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/vnd.oasis.opendocument.chart.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -9,6 +9,7 @@
 Comment[bg]=Диаграма на OASIS OpenDocument
 Comment[bn]=OASIS ওপেন-ডকুমেন্ট চার্ট
 Comment[br]=Treser grafoù OpenDocument OASIS
+Comment[bs]=OASIS OpenDocument grafikon
 Comment[ca]=Gràfic OASIS OpenDocument
 Comment[cs]=OASIS OpenDocument graf
 Comment[cy]=Siart OASIS OpenDocument
@@ -53,6 +54,7 @@
 Comment[tr]=OASIS OpenDocument Çizelgesi
 Comment[tt]=OASIS OpenDocument Grafiğı
 Comment[uk]=Діаграма OASIS OpenDocument
+Comment[vi]=Biểu đồ OpenDocument OASIS
 Comment[zh_CN]=OASIS OpenDocument 图表
 [Property::X-KDE-NativeExtension]
 Type=QString
Index: mimetypes/application/mbox.desktop
===================================================================
--- mimetypes/application/mbox.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/application/mbox.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -4,6 +4,8 @@
 MimeType=application/mbox
 Patterns=
 Comment=MBOX Mail Folder
+Comment[br]=Renkell postel MBOX
+Comment[bs]=MBOX direktorij pošte
 Comment[ca]=Carpeta de correu MBOX
 Comment[cs]=Složka pošty MBOX
 Comment[da]=MBOX mappe til e-mail
@@ -38,6 +40,8 @@
 Comment[sv]=Mbox-brevkorg
 Comment[tg]=MBOX Феҳристи Почта
 Comment[uk]=Поштова тека MBOX
+Comment[uz]=MBOX хат қутиси
+Comment[vi]=Thư mục thư dạng .mbox.
 Comment[zh_CN]=MBOX 邮件文件夹
 
 [Property::X-KDE-text]
Index: mimetypes/message/news.desktop
===================================================================
--- mimetypes/message/news.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/message/news.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -10,6 +10,7 @@
 Comment[az]=Usenet Xəbər İsmarışı
 Comment[bg]=Електронна новина (Usenet)
 Comment[bn]=ইউজনেট সংবাদ বার্তা
+Comment[br]=Kemennad keleier Usenet
 Comment[bs]=Usenet news poruka
 Comment[ca]=Missatge de notícies de Usenet
 Comment[cs]=Zpráva diskuzní skupiny (Usenet news)
@@ -70,6 +71,7 @@
 Comment[uk]=Повідомлення новин Usenet
 Comment[uz]=Usenet янгиликлар хабари
 Comment[ven]=Mulaedza wa mafhungo a vhukwamani hau shumisa
+Comment[vi]=Thông điệp tin tức Usenet
 Comment[xh]=Umyalezo Weendaba we Usenet
 Comment[zh_CN]=新闻组新闻消息
 Comment[zh_HK]=Usenet 新聞組訊息
Index: mimetypes/message/rfc822.desktop
===================================================================
--- mimetypes/message/rfc822.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/message/rfc822.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -73,6 +73,7 @@
 Comment[uk]=Повідомлення електронної пошти
 Comment[uz]=Электрон мактуб
 Comment[ven]=Mulaedza wa Email
+Comment[vi]=Thư điện tử
 Comment[wa]=Emilaedje
 Comment[xh]=Umyalezo we Email
 Comment[zh_CN]=电子邮件消息
Index: mimetypes/text/rss.desktop
===================================================================
--- mimetypes/text/rss.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/rss.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -63,7 +63,7 @@
 Comment[uk]=Конспект сайту RDF
 Comment[uz]=Сайт ҳақида қисқа ҳисобот (RSS)
 Comment[ven]=Fhethu ha samari ha RDF
-Comment[vi]=Tổng kết site RDF 
+Comment[vi]=Bản tóm tắt nơi Mạng RDF
 Comment[xh]=Isishwankathelo Senxuwa le RDF
 Comment[zh_CN]=RDF 站点摘要
 Comment[zh_HK]=RSS 檔案
Index: mimetypes/text/calendar.desktop
===================================================================
--- mimetypes/text/calendar.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/calendar.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -68,6 +68,7 @@
 Comment[uk]=Файл iCalendar
 Comment[uz]=iCalendar-файли
 Comment[ven]=Faela ya Khalenda
+Comment[vi]=Tập tin iCalendar
 Comment[wa]=Fitchî calindrî iCalendar
 Comment[xh]=Ifayile ye iCalendar
 Comment[zh_CN]=iCalendar 文件
Index: mimetypes/text/rdf.desktop
===================================================================
--- mimetypes/text/rdf.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/rdf.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -60,6 +60,7 @@
 Comment[tt]=Resursnıñ Açıqlama-Bireme (RDF)
 Comment[uk]=Файл структури опису ресурсів
 Comment[uz]=RDF-файли
+Comment[vi]=Tập tin khuôn khổ mô tả tài nguyên
 Comment[zh_CN]=资源描述框架文件
 Comment[zh_HK]=RDF 檔案
 Comment[zh_TW]=資源描述框架 (RDF) 檔案
Index: mimetypes/text/vnd.wap.wml.desktop
===================================================================
--- mimetypes/text/vnd.wap.wml.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/vnd.wap.wml.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -35,7 +35,7 @@
 Comment[hu]=WML-dokumentum
 Comment[is]=WML skjal
 Comment[it]=Documento WML
-Comment[ja]=WMLドキュメント
+Comment[ja]=WML ドキュメント
 Comment[km]=ឯកសារ WML
 Comment[ko]=WML 문서
 Comment[lb]=WML-Dokument
@@ -73,6 +73,7 @@
 Comment[uk]=Документ WML
 Comment[uz]=WML ҳужжати
 Comment[ven]=Manwalwa a WML
+Comment[vi]=Tài liệu WML
 Comment[wa]=Documint WML
 Comment[xh]=Uxwebhu lwe WML
 Comment[zh_CN]=WML 文档
Index: mimetypes/text/x-diff.desktop
===================================================================
--- mimetypes/text/x-diff.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/x-diff.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -22,7 +22,7 @@
 Comment[fa]=اختلاف‌های میان پرونده‌ها
 Comment[fi]=Tiedostojen väliset erot
 Comment[fr]=Différences entre fichiers
-Comment[fy]=Ferskil tusken triemen
+Comment[fy]=Ferskil tusken triemmen
 Comment[ga]=Difríochtaí idir chomhaid
 Comment[gl]=Diferéncias Entre Arquivos
 Comment[he]=הבדלים בין קבצים
@@ -68,6 +68,7 @@
 Comment[uk]=Різниця двох файлів
 Comment[uz]=Файллар ўртасидаги фарқ
 Comment[ven]=Phambano vhukati ha dzifaela
+Comment[vi]=Khác biệt giữa hai tập tin
 Comment[wa]=Diferinces etur des fitchîs
 Comment[xh]=Iyantlukwano Phakathi Kweefayile
 Comment[zh_CN]=文件的差异
Index: mimetypes/text/x-objchdr.desktop
===================================================================
--- mimetypes/text/x-objchdr.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/x-objchdr.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -6,6 +6,7 @@
 Comment[bg]=Заглавен файл на Objective-C
 Comment[bn]=অবজেক্টিভ-সি হেডার ফাইল
 Comment[br]=Restr reollin Objective-C
+Comment[bs]=Objective-C header datoteka
 Comment[ca]=Fitxer de capçalera Objective-C
 Comment[cs]=Hlavičkový soubor jazyka Objective C
 Comment[da]=Objective-C Header-fil
@@ -50,6 +51,7 @@
 Comment[tr]=Objective-C Başlık Dosyası
 Comment[tt]=Objective-C Başlıqınıñ Bireme
 Comment[uk]=Файл заголовків Objective-C
+Comment[vi]=Tập tin phần đầu Objective-C
 Comment[zh_CN]=Objective-C 头文件
 Comment[zh_HK]=Objective-C 標頭檔
 Icon=source_h
Index: mimetypes/text/x-bibtex.desktop
===================================================================
--- mimetypes/text/x-bibtex.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/x-bibtex.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -7,6 +7,7 @@
 Comment[be]=Бібліяграфічныя дадзеныя (Bibtex)
 Comment[bg]=Библиографични данни (Bibtex)
 Comment[bn]=গ্রন্থতালিকা (বিবটেক)
+Comment[br]=Levrlennadur roadoù (Bibtex)
 Comment[bs]=Bibliografski podaci (Bibtex)
 Comment[ca]=Dades bibliogràfiques (Bibtex)
 Comment[cs]=Bibliografická data (bibtex)
@@ -66,6 +67,7 @@
 Comment[uk]=Бібліографічні дані (Bibtex)
 Comment[uz]=Bibtex-файли
 Comment[ven]=Data yau talutshedza he wa wana hone zwishumiswa (bibtex)
+Comment[vi]=Dữ liệu thư tịch (Bibtex)
 Comment[wa]=Dinêyes bibiografikes (Bibtex)
 Comment[xh]=Idata Yoluhlu lweencwadi zombhali nawuphi na (Bibtex)
 Comment[zh_CN]=书目数据(Bibtex)
Index: mimetypes/text/x-java.desktop
===================================================================
--- mimetypes/text/x-java.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/x-java.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -67,6 +67,7 @@
 Comment[uk]=Вихідний файл Java
 Comment[uz]=Java тилида ёзилган код
 Comment[ven]=Faela ya Vhubvo ha Java
+Comment[vi]=Tập tin nguồn Java
 Comment[wa]=Fitchî sourdant Java
 Comment[xh]=Ifayile Yemvelaphi ye Java
 Comment[zh_CN]=Java 源文件
Index: mimetypes/text/x-objcsrc.desktop
===================================================================
--- mimetypes/text/x-objcsrc.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/x-objcsrc.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -68,6 +68,7 @@
 Comment[uk]=Вихідний файл Objective-C
 Comment[uz]=Objective-C тилида ёзилган код
 Comment[ven]=Faela ya Vhubvo ha C ha vhudi
+Comment[vi]=Tập tin nguồn Objective-C
 Comment[wa]=Fitchî sourdant Objective C
 Comment[xh]=Ifayile Yemvelaphi Yenjongo-C
 Comment[zh_CN]=Objective-C 源文件
Index: mimetypes/text/rtf.desktop
===================================================================
--- mimetypes/text/rtf.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/rtf.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -66,6 +66,7 @@
 Comment[tt]=RTF İstälek
 Comment[uk]=Документ RTF
 Comment[uz]=RTF ҳужжати
+Comment[vi]=Tài liệu RTF
 Comment[wa]=Documint RTF
 Comment[zh_CN]=RTF 文档
 Comment[zh_HK]=RTF 文件
Index: mimetypes/text/x-xslfo.desktop
===================================================================
--- mimetypes/text/x-xslfo.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/x-xslfo.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -63,6 +63,7 @@
 Comment[uk]=Об'єктний файл форматування XSL
 Comment[uz]=XSL формат қилиш объект файли
 Comment[ven]=XSL yau vhumba tshithu tshga faela
+Comment[vi]=Tập tin đối tượng định dạng XSL
 Comment[xh]=XSL Ifomata Injongo Yefayile 
 Comment[zh_CN]=XSL 格式对象文件
 Comment[zh_HK]=XSL 格式物件檔案
Index: mimetypes/text/x-adasrc.desktop
===================================================================
--- mimetypes/text/x-adasrc.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/x-adasrc.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -68,6 +68,7 @@
 Comment[uk]=Вихідні файли Ada
 Comment[uz]=Ada тилида ёзилган код
 Comment[ven]=Faela ya vhubvo ha Ada
+Comment[vi]=Tập tin nguồn Ada
 Comment[wa]=Fitchî sourdant Ada
 Comment[xh]=Ifayile Yemvelaphi ye Ada
 Comment[zh_CN]=Ada 源文件
Index: mimetypes/text/html.desktop
===================================================================
--- mimetypes/text/html.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/html.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -65,6 +65,7 @@
 Comment[tt]=HTML İstälek
 Comment[uk]=Документ HTML
 Comment[uz]=HTML ҳужжати
+Comment[vi]=Tài liệu HTML
 Comment[wa]=Documint HTML
 Comment[zh_CN]=HTML 文档
 Comment[zh_HK]=HTML 文件
Index: mimetypes/text/javascript.desktop
===================================================================
--- mimetypes/text/javascript.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/javascript.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -58,6 +58,7 @@
 Comment[tt]=JavaScript Bireme
 Comment[uk]=Файл JavaScript
 Comment[uz]=JavaScript-файли
+Comment[vi]=Tập tin JavaScript
 Comment[zh_CN]=JavaScript 文件
 Comment[zh_HK]=JavaScript 檔案
 X-KDE-IsAlso=application/x-javascript
Index: mimetypes/text/x-pascal.desktop
===================================================================
--- mimetypes/text/x-pascal.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/x-pascal.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -67,6 +67,7 @@
 Comment[uk]=Вихідний файл Pascal
 Comment[uz]=Pascal тилида ёзилган код
 Comment[ven]=Faela ya Vhubvo ha Pascal
+Comment[vi]=Tập tin nguồn Pascal
 Comment[wa]=Fitchî sourdant Pascal
 Comment[xh]=Ifayile Zemvelaphi ze Pascal
 Comment[zh_CN]=Pascal 源文件
Index: mimetypes/text/x-c++hdr.desktop
===================================================================
--- mimetypes/text/x-c++hdr.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/x-c++hdr.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -66,6 +66,7 @@
 Comment[uk]=Файл заголовків C++
 Comment[uz]=C++ сарлавҳа файли
 Comment[ven]=C++ Faela ya thoho
+Comment[vi]=Tập tin phần đầu C++
 Comment[wa]=Fitchî di tiestire C++
 Comment[xh]=C++ Ifayile Yokubhaliweyo okuphezulu kwephepa
 Comment[zh_CN]=C++ 头文件
Index: mimetypes/text/vnd.abc.desktop
===================================================================
--- mimetypes/text/vnd.abc.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/vnd.abc.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -5,6 +5,7 @@
 Comment[bg]=Аудио файл ABC
 Comment[bn]=এ-বি-সি মিউজিক ফাইল
 Comment[br]=Restr ar sonerezh ABC
+Comment[bs]=ABC muzička datoteka
 Comment[ca]=Fitxer de música ABC
 Comment[cs]=Hudební soubor ABC
 Comment[da]=ABC Musikfil
@@ -52,6 +53,7 @@
 Comment[tt]=ABC Köy Bireme
 Comment[uk]=Файл музики ABC
 Comment[uz]=ABC аудио-файл
+Comment[vi]=Tập tin âm nhạc ABC
 Comment[zh_CN]=ABC 音乐文件
 Comment[zh_HK]=ABC 音樂原始檔
 Icon=sound
Index: mimetypes/text/docbook.desktop
===================================================================
--- mimetypes/text/docbook.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/docbook.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -65,6 +65,7 @@
 Comment[tt]=DocBook İstälege
 Comment[uk]=Документ DocBook
 Comment[uz]=DocBook ҳужжати
+Comment[vi]=Tài liệu DocBook
 Comment[wa]=Documint DocBook
 Comment[zh_CN]=DocBook 文档
 Comment[zh_HK]=DocBook 文件
Index: mimetypes/text/enriched.desktop
===================================================================
--- mimetypes/text/enriched.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/enriched.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -57,6 +57,7 @@
 Comment[tr]=Biraz Zenginleştirilmiş Metin Dosyası
 Comment[tt]=Lightly Enriched İstälege
 Comment[uk]=Злегка збагачений текстовий документ
+Comment[vi]=Tài liệu văn bản có một ít kiểu dáng
 Comment[wa]=Documint tecse ledjirmint eritchî
 Comment[zh_CN]=轻装的丰富文本文档
 Comment[zh_HK]=Lightly Enriched 文件檔案
Index: mimetypes/text/x-makefile.desktop
===================================================================
--- mimetypes/text/x-makefile.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/x-makefile.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -26,6 +26,7 @@
 Comment[th]=แฟ้ม Makefile
 Comment[uk]=Файл Makefile
 Comment[ven]=Itanifaela
+Comment[vi]=Tập tin tạo (makefile)
 Comment[xh]=Yenza ifayile
 Comment[zu]=Yenza ifayela
 Type=MimeType
Index: mimetypes/text/x-latex.desktop
===================================================================
--- mimetypes/text/x-latex.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/x-latex.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -65,6 +65,7 @@
 Comment[tt]=LaTeX İstälege
 Comment[uk]=Документ LaTeX
 Comment[uz]=LaTeX ҳужжати
+Comment[vi]=Tài liệu LaTeX
 Comment[wa]=Documint LaTeX
 Comment[zh_CN]=LaTeX 文档
 Comment[zh_HK]=LaTex 文件
Index: mimetypes/text/x-moc.desktop
===================================================================
--- mimetypes/text/x-moc.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/x-moc.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -67,7 +67,7 @@
 Comment[uk]=Файл з метаоб'єктами Qt
 Comment[uz]=Qt Meta объект файли
 Comment[ven]=Meta faela ya tshithu ya Qt
-Comment[vi]=File siêu đối tượng của Qt(meta object file) 
+Comment[vi]=Tập tin siêu đối tượng Qt
 Comment[xh]=Qt Meta Ifayile Yenjongo
 Comment[zh_CN]=Qt 元目标文件
 Comment[zh_HK]=Qt Meta Object 檔案
Index: mimetypes/text/x-ldif.desktop
===================================================================
--- mimetypes/text/x-ldif.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/x-ldif.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -65,6 +65,7 @@
 Comment[tt]=LDAP Adres Däftäre
 Comment[uk]=Адресна книга LDAP
 Comment[uz]=LDAP манзиллар дафтари
+Comment[vi]=Sổ địa chỉ LDAP
 Comment[wa]=Calpin d' adresses LDAP
 Comment[zh_CN]=LDAP 地址簿
 Comment[zh_HK]=LDAP 地址簿
Index: mimetypes/text/x-mswinurl.desktop
===================================================================
--- mimetypes/text/x-mswinurl.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/x-mswinurl.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -10,6 +10,7 @@
 Comment[az]=İnternet Qısa Yolu
 Comment[bg]=Връзка към Интернет
 Comment[bn]=ইন্টারনেট শর্টকাট
+Comment[br]=Berradenn kenrouedad
 Comment[bs]=Internet kratica
 Comment[ca]=Accés ràpid a la Internet
 Comment[cs]=Internetová zkratka
@@ -69,6 +70,7 @@
 Comment[uk]=Скорочення Інтернет
 Comment[uz]=Интернет қисқартмаси
 Comment[ven]=Tshikhau tsha Inithanete
+Comment[vi]=Lối tắt Mạng
 Comment[xh]=Indlela ezimfutshane ze Internet
 Comment[zh_CN]=Internet 快捷方式
 Comment[zh_HK]=網址捷徑
Index: mimetypes/text/x-katefilelist.desktop
===================================================================
--- mimetypes/text/x-katefilelist.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/x-katefilelist.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -20,7 +20,7 @@
 Comment[fa]=سیاهه‌ی پرونده (برای متصل‌کننده‌ی بارکننده‌ی سیاهه‌ی پرونده‌ی Kate)
 Comment[fi]=Tiedostolista (Kate-tiedostolistalisäosalle)
 Comment[fr]=Liste de fichiers (pour le chargeur de listes de fichiers de Kate)
-Comment[fy]=Triemenlist (foar de Kate-triemenplugin)
+Comment[fy]=Triemmenlist (foar de Kate-triemmenplugin)
 Comment[gl]=Lista de Arquivos (para o Plugin Carregador de Lista de Arquivos de Kate)
 Comment[he]=רשימת קבצים (עבור תוסף טעינת רשימות הקבצים של Kate)
 Comment[hi]=फ़ाइल सूची(के-एटीई फ़ाइल लिस्ट लोडर प्लगिन के लिए)
@@ -63,6 +63,7 @@
 Comment[uk]=Список файлів (для втулка списку файлів Kate)
 Comment[uz]=Файллар рўйхати (Kate файллар рўйхатини юклайдиган плагин учун)
 Comment[ven]=Mutevhe wa Faela (Uitela pulagini ya tshihwesi tsha mutevhe wa faela wa Kate)
+Comment[vi]=Danh sách tập tin (cho bộ cầm phít tải danh sách tập tin 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[zh_CN]=文件列表(用于 Kate 文件列表装入器插件)
Index: mimetypes/text/x-chdr.desktop
===================================================================
--- mimetypes/text/x-chdr.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/x-chdr.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -66,6 +66,7 @@
 Comment[uk]=Файл заголовків C
 Comment[uz]=C сарлавҳа файли
 Comment[ven]=C Faela ya Thoho
+Comment[vi]=Tập tin phần đầu C
 Comment[wa]=Fitchî tiestire C
 Comment[xh]=C Ifayile Yokubhaliweyo okuphezulu kwephepha
 Comment[zh_CN]=C 头文件
Index: mimetypes/text/x-c++src.desktop
===================================================================
--- mimetypes/text/x-c++src.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/x-c++src.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -67,6 +67,7 @@
 Comment[uk]=Вихідний файл C++
 Comment[uz]=C++ тилида ёзилган код
 Comment[ven]=C++ Faela ya vhubvo
+Comment[vi]=Tập tin nguồn C++
 Comment[wa]=Fitchî sourdant C++
 Comment[xh]=C++ Ifayile Yemvelaphi
 Comment[zh_CN]=C++ 源文件
Index: mimetypes/text/x-log.desktop
===================================================================
--- mimetypes/text/x-log.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/x-log.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -66,6 +66,7 @@
 Comment[uk]=Файл журналу програми
 Comment[uz]=Дастурнинг лог-файли
 Comment[ven]=Faela yau apulifikhesheni yau loga
+Comment[vi]=Tập tin bản ghi ứng dụng
 Comment[wa]=Fitchî djournå d' on programe
 Comment[xh]=Isicelo Sefayile Yokungena
 Comment[zh_CN]=应用程序日志文件
Index: mimetypes/text/x-tcl.desktop
===================================================================
--- mimetypes/text/x-tcl.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/x-tcl.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,6 +69,7 @@
 Comment[uk]=Файл Tcl
 Comment[uz]=Tcl-файли
 Comment[ven]=Faela ya Tcl
+Comment[vi]=Tập tin Tcl
 Comment[wa]=Fitchî Tcl
 Comment[xh]=Ifayile ye Tcl
 Comment[zh_CN]=Tcl 文件
Index: mimetypes/text/css.desktop
===================================================================
--- mimetypes/text/css.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/css.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -24,6 +24,7 @@
 Comment[hu]=CSS-stíluslap
 Comment[is]=CSS skjal
 Comment[it]=Foglio di stile a cascata (CSS)
+Comment[ja]=カスケーディング スタイルシート
 Comment[km]=CSS
 Comment[ko]=계단형 스타일시트
 Comment[lt]=Pakopinis stiliaus aprašymas (CSS)
@@ -53,7 +54,7 @@
 Comment[tt]=CSS-tışlaw Bireme
 Comment[uk]=Таблиця каскадного стилю (CSS)
 Comment[ven]=Tshitaela tshau peta kana u khavhisa bammbiri
-Comment[vi]=CSS(Cascading Style Sheet) 
+Comment[vi]=Tờ kiểu dáng tầng xếp (CSS)
 Comment[xh]=Uhlobo lwekhasi Elingxangxazayo
 Comment[zh_CN]=层叠样式表单
 Comment[zu]=Iphepha Lesitayela Lokulandelanisa
Index: mimetypes/text/x-hex.desktop
===================================================================
--- mimetypes/text/x-hex.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/x-hex.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -55,4 +55,5 @@
 Comment[tr]=Intel® Onaltılık Nesne Dosya Biçimi
 Comment[tt]=Intel® Cisemeneñ Bireme
 Comment[uk]=Файл в форматі Intel® Hexadecimal Object
+Comment[vi]=Dạng thức tập tin đối tượng thập lục Intel®
 Comment[zh_CN]=Intel® 十六进制目标文件
Index: mimetypes/text/x-csrc.desktop
===================================================================
--- mimetypes/text/x-csrc.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/x-csrc.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -67,6 +67,7 @@
 Comment[uk]=Вихідний файл C
 Comment[uz]=C тилида ёзилган код
 Comment[ven]=C Faela ya Vhubvo
+Comment[vi]=Tập tin nguồn C
 Comment[wa]=Fitchî sourdant C
 Comment[xh]=C Ifayile Yemvelaphi
 Comment[zh_CN]=C 源文件
Index: mimetypes/text/x-xslt.desktop
===================================================================
--- mimetypes/text/x-xslt.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/x-xslt.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -66,6 +66,7 @@
 Comment[uk]=Файли таблиці стилів XSLT
 Comment[uz]=XSLT Stylesheet-файли
 Comment[ven]=Faela ya tshitaela tsha bammbiri ya XSLT
+Comment[vi]=Tập tin tờ kiểu dáng XSLT
 Comment[xh]=XSLT Ifayile Yohlobo lwekhasi
 Comment[zh_CN]=XSLT 样式表文件
 Comment[zh_HK]=XSLT 樣式表格檔案
Index: mimetypes/text/x-csv.desktop
===================================================================
--- mimetypes/text/x-csv.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/x-csv.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -71,6 +71,7 @@
 Comment[uk]=Текстовий файл, значення розділено комами
 Comment[uz]=Қийматлар вергул билан ажратилган матн файли
 Comment[ven]=Manwalwa a faela arena khoma yo fhandekanywaho nga maitele
+Comment[vi]=Tập tin văn bản có các giá trị định giới bằng dấu phẩy
 Comment[wa]=Fitchî tecse avou les valixhances separêyes pa des comas
 Comment[xh]=Ifayile Yombhalo Enamaxabiso Ohlulwe Ngesiphumlisi
 Comment[zh_CN]=用逗号分隔值的文本文件
Index: mimetypes/text/xml.desktop
===================================================================
--- mimetypes/text/xml.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/xml.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -65,6 +65,7 @@
 Comment[tt]=XML İstälek
 Comment[uk]=Документ XML
 Comment[uz]=XML ҳужжати
+Comment[vi]=Tài liệu XML
 Comment[wa]=Documint XML
 Comment[zh_CN]=XML 文档
 Comment[zh_HK]=XML 文件
Index: mimetypes/text/sgml.desktop
===================================================================
--- mimetypes/text/sgml.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/sgml.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -70,6 +70,7 @@
 Comment[uk]=Документ SGML
 Comment[uz]=SGML ҳужжати
 Comment[ven]=Manwalwa a SGML
+Comment[vi]=Tài liiệu SGML
 Comment[wa]=Documint SGML
 Comment[xh]=Uxwebhu lwe SGML
 Comment[zh_CN]=SGML 文档
Index: mimetypes/text/plain.desktop
===================================================================
--- mimetypes/text/plain.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/plain.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -65,6 +65,7 @@
 Comment[tt]=Taqır Mäten İstälege
 Comment[uk]=Звичайний текст
 Comment[uz]=Оддий матн файли
+Comment[vi]=Tài liệu văn bản thô
 Comment[wa]=Documint e peur tecse
 Comment[zh_CN]=纯文本文档
 Comment[zh_HK]=純文字檔案
Index: mimetypes/text/x-vcalendar.desktop
===================================================================
--- mimetypes/text/x-vcalendar.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/x-vcalendar.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -64,6 +64,7 @@
 Comment[uk]=Файл обміну даних vCalendar
 Comment[uz]=vCalendar-файли
 Comment[ven]=Faela ya shandukea ya khalenda ya v
+Comment[vi]=Tập tin trao đổi vCalendar
 Comment[xh]=Ifayile Etshintsha ngaphakathi ye vCalendar
 Comment[zh_CN]=vCalendar 交换文件
 Comment[zh_HK]=vCalendar 交換檔
Index: mimetypes/text/x-vcard.desktop
===================================================================
--- mimetypes/text/x-vcard.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/x-vcard.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,7 +69,7 @@
 Comment[uk]=Електронна візитна картка
 Comment[uz]=Электрон визит картаси
 Comment[ven]=Garata ya vhubindudzi ya Elekithironiki
-Comment[vi]=Thẻ tín dụng điện tử (EBC) 
+Comment[vi]=Thẻ kinh doanh điện tử
 Comment[xh]=Ikhadi Leshishini Lombane
 Comment[zh_CN]=电子商业卡片
 Comment[zh_HK]=電子商業卡片
Index: mimetypes/text/x-tex.desktop
===================================================================
--- mimetypes/text/x-tex.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/text/x-tex.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,6 +69,7 @@
 Comment[uk]=Файл TeX
 Comment[uz]=TeX-файли
 Comment[ven]=Faela ya TeX
+Comment[vi]=Tập tin TeX
 Comment[wa]=Fitchî TeX
 Comment[xh]=Ifayile ye TeX
 Comment[zh_CN]=TeX 文件
Index: mimetypes/video/x-ogm.desktop
===================================================================
--- mimetypes/video/x-ogm.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/video/x-ogm.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -63,6 +63,7 @@
 Comment[tr]=Ogg/Ogm Video Dosyası
 Comment[uk]=Відео Ogg/Ogm
 Comment[uz]=Ogg/Ogm видео
+Comment[vi]=Ảnh động Ogg/Ogm
 Comment[wa]=Videyo Ogg/Ogm
 Comment[zh_CN]=Ogg/Ogm 视频
 Comment[zh_HK]=Ogg/Ogm 視像檔
Index: mimetypes/video/x-theora.desktop
===================================================================
--- mimetypes/video/x-theora.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/video/x-theora.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -61,6 +61,7 @@
 Comment[tr]=Theora Video Dosyası
 Comment[uk]=Відео Theora
 Comment[uz]=Theora видео
+Comment[vi]=Ảnh động Theora
 Comment[wa]=Videyo Theora
 Comment[zh_CN]=Theora 文件
 Comment[zh_HK]=Theora 視像檔
Index: mimetypes/video/mpeg.desktop
===================================================================
--- mimetypes/video/mpeg.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/video/mpeg.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -34,7 +34,7 @@
 Comment[id]=Video MPEG
 Comment[is]=MPEG-kvikmynd
 Comment[it]=Video MPEG
-Comment[ja]=MPEGビデオ
+Comment[ja]=MPEG ビデオ
 Comment[km]=MPEG វីដេអូ
 Comment[ko]=MPEG 비디오
 Comment[lb]=MPEG-Video
@@ -67,7 +67,7 @@
 Comment[uk]=MPEG-відео
 Comment[uz]=MPEG видео
 Comment[ven]=Vidio ya MPEG
-Comment[vi]=Video MPEG 
+Comment[vi]=Ảnh động MPEG
 Comment[wa]=Videyo MPEG
 Comment[zh_CN]=MPEG 视频
 Comment[zh_HK]=MPEG 視像檔
Index: mimetypes/video/quicktime.desktop
===================================================================
--- mimetypes/video/quicktime.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/video/quicktime.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -32,7 +32,7 @@
 Comment[id]=Video Quicktime
 Comment[is]=Quicktime-kvikmynd
 Comment[it]=Video Quicktime
-Comment[ja]=Quicktimeビデオ
+Comment[ja]=Quicktime ビデオ
 Comment[km]=Quicktime វីដេអូ 
 Comment[ko]=퀵타임 비디오
 Comment[lb]=Quicktime-Video
@@ -65,7 +65,7 @@
 Comment[uk]=Quicktime-Відео
 Comment[uz]=Quicktime видео
 Comment[ven]=Vidio ya Tshifhinga tshau tavhanya
-Comment[vi]=Video QuickTime 
+Comment[vi]=Ảnh động Quicktime
 Comment[wa]=Videyo Quicktime
 Comment[zh_CN]=Quicktime 视频
 Comment[zh_HK]=Quicktime 視像檔
Index: mimetypes/video/x-ms-asf.desktop
===================================================================
--- mimetypes/video/x-ms-asf.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/video/x-ms-asf.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -64,6 +64,7 @@
 Comment[tr]=ASF dosyası
 Comment[uk]=Носій ASF
 Comment[uz]=ASF медиа-файли
+Comment[vi]=Vật chứa ASF
 Comment[zh_CN]=ASF 媒体
 Comment[zh_HK]=ASF 媒體
 Comment[zh_TW]=ASF 媒體
Index: mimetypes/video/x-ms-wmv.desktop
===================================================================
--- mimetypes/video/x-ms-wmv.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/video/x-ms-wmv.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -31,7 +31,7 @@
 Comment[hu]=Windows Media-videó
 Comment[is]=Windows Metamyndir
 Comment[it]=Video Windows Media
-Comment[ja]=Windows Media ファイル
+Comment[ja]=Windows Media ビデオ
 Comment[km]=Windows Media វីដេអូ
 Comment[ko]=윈도우즈 미디어 비디오
 Comment[lb]=Windows-Media-Video
@@ -60,6 +60,7 @@
 Comment[tr]=Windows Çoklu Ortam Video Dosyası
 Comment[uk]=Відео кліп Windows Media
 Comment[uz]=Windows Media видео
+Comment[vi]=Ảnh động Windows Media
 Comment[wa]=Videyo Windows Media
 Comment[zh_CN]=Windows Media 视频
 Comment[zh_HK]=Windows Media 視像檔
Index: mimetypes/video/x-msvideo.desktop
===================================================================
--- mimetypes/video/x-msvideo.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/video/x-msvideo.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -34,7 +34,7 @@
 Comment[id]=Video Microsoft AVI
 Comment[is]=Microsoft AVI-kvikmynd
 Comment[it]=Video Microsoft AVI
-Comment[ja]=MS AVIビデオ
+Comment[ja]=MS AVI ビデオ
 Comment[km]=Microsoft AVI វីដេអូ
 Comment[ko]=마이크로소프트 AVI 비디오 파일
 Comment[lb]=Microsoft-AVI-Video
@@ -67,7 +67,7 @@
 Comment[uk]=AVI-відео (Microsoft)
 Comment[uz]=Microsoft AVI видео
 Comment[ven]=Vidio ya AVI ya microsoft
-Comment[vi]=Video AVI của Microsoft 
+Comment[vi]=Ảnh động AVI Microsoft™
 Comment[wa]=Videyo AVI
 Comment[zh_CN]=Microsoft AVI 视频
 Comment[zh_HK]=微軟 AVI 視像檔
Index: mimetypes/video/vnd.rn-realvideo.desktop
===================================================================
--- mimetypes/video/vnd.rn-realvideo.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/video/vnd.rn-realvideo.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,6 +69,7 @@
 Comment[tt]=RealVideo Bireme
 Comment[uk]=Файл RealVideo
 Comment[uz]=RealVideo-файли
+Comment[vi]=Tập tin RealVideo
 Comment[wa]=Fitchî RealVideo
 Comment[zh_CN]=RealVideo 文件
 Comment[zh_HK]=RealVideo 視像檔
Index: mimetypes/video/avi.desktop
===================================================================
--- mimetypes/video/avi.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/video/avi.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -35,7 +35,7 @@
 Comment[id]=Video Microsoft AVI
 Comment[is]=Microsoft AVI-kvikmynd
 Comment[it]=Video Microsoft AVI
-Comment[ja]=MS AVIビデオ
+Comment[ja]=MS AVI ビデオ
 Comment[km]=Microsoft AVI វីដេអូ
 Comment[ko]=마이크로소프트 AVI 비디오 파일
 Comment[lb]=Microsoft-AVI-Video
@@ -68,7 +68,7 @@
 Comment[uk]=AVI-відео (Microsoft)
 Comment[uz]=Microsoft AVI видео
 Comment[ven]=Vidio ya AVI ya microsoft
-Comment[vi]=Video AVI của Microsoft 
+Comment[vi]=Ảnh động AVI Microsoft™
 Comment[wa]=Videyo AVI
 Comment[zh_CN]=Microsoft AVI 视频
 Comment[zh_HK]=微軟 AVI 視像檔
Index: mimetypes/video/mp4.desktop
===================================================================
--- mimetypes/video/mp4.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/video/mp4.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -63,6 +63,7 @@
 Comment[tr]=MPEG-4 Video Dosyası
 Comment[uk]=Відео MPEG-4
 Comment[uz]=MPEG-4 видео
+Comment[vi]=Ảnh động MPEG-4
 Comment[wa]=Videyo MPEG-4
 Comment[zh_CN]=MPEG4 视频
 Comment[zh_HK]=MPEG-4 視像檔
Index: mimetypes/video/x-flic.desktop
===================================================================
--- mimetypes/video/x-flic.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/video/x-flic.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -71,6 +71,7 @@
 Comment[uk]=Файли FLIC (Autodesk)
 Comment[uz]=Autodesk'нинг FLIC-файли
 Comment[ven]=Faela ya FLIC Autodesk
+Comment[vi]=Tập tin FLIC của AutoDesk
 Comment[wa]=Fitchî FLIC d' Autodesk
 Comment[xh]=Iifayile ezenzekelayo ye FLIC
 Comment[zh_CN]=Autodesk FLIC 文件
Index: mimetypes/video/x-matroska.desktop
===================================================================
--- mimetypes/video/x-matroska.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/video/x-matroska.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -60,6 +60,7 @@
 Comment[tr]=Matroska Hareketli Görüntüsü
 Comment[uk]=Відео "Матрьошка"
 Comment[uz]=Matroska видео
+Comment[vi]=Ảnh động Matroska
 Comment[wa]=Videyo Matroska
 Comment[zh_CN]=Matroska 视频
 Comment[zh_HK]=Matroska 視像檔
Index: mimetypes/video/x-mng.desktop
===================================================================
--- mimetypes/video/x-mng.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/video/x-mng.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -73,6 +73,7 @@
 Comment[uk]=Зображення MNG
 Comment[uz]=MNG-расм
 Comment[ven]=Tshifanyiso tsha MNG
+Comment[vi]=Ảnh MNG
 Comment[wa]=Imådje MNG
 Comment[xh]=Umfanekiso we MNG
 Comment[zh_CN]=MNG 图像
Index: mimetypes/inode/socket.desktop
===================================================================
--- mimetypes/inode/socket.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/inode/socket.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -53,7 +53,7 @@
 Comment[uk]=Сокет
 Comment[uz]=Сокет
 Comment[ven]=Sokhethe
-Comment[vi]=Socket 
+Comment[vi]=Ổ cắm
 Comment[wa]=Soket
 Comment[xh]=Umngxunya
 Comment[zh_CN]=套接字
Index: mimetypes/inode/block.desktop
===================================================================
--- mimetypes/inode/block.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/inode/block.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -71,7 +71,7 @@
 Comment[uk]=Блоковий пристрій
 Comment[uz]=Блок ускунаси
 Comment[ven]=Maano a Buloko
-Comment[vi]=Thiết bềEkhối(block device) 
+Comment[vi]=Thiết bị khối
 Comment[wa]=Éndjin blok
 Comment[zh_CN]=块设备
 Comment[zh_HK]=區塊設備
Index: mimetypes/inode/chardevice.desktop
===================================================================
--- mimetypes/inode/chardevice.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/inode/chardevice.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,7 +69,7 @@
 Comment[uk]=Символьний пристрій
 Comment[uz]=Белги ускунаси
 Comment[ven]=Maano a muanewa
-Comment[vi]=Thiết bềEđặc tính(character device) 
+Comment[vi]=Thiết bị ký tự
 Comment[wa]=Éndjin caractere
 Comment[xh]=Icebo Lophawu
 Comment[zh_CN]=字符设备
Index: mimetypes/inode/directory-locked.desktop
===================================================================
--- mimetypes/inode/directory-locked.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/inode/directory-locked.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -64,6 +64,7 @@
 Comment[tt]=Biklängän Törgäk
 Comment[uk]=Заблокована тека
 Comment[uz]=Қулфланган жилд
+Comment[vi]=Thư mục đã khoá
 Comment[wa]=Resseré ridant
 Comment[zh_CN]=锁定的文件夹
 Comment[zh_HK]=鎖住的資料夾
Index: mimetypes/inode/fifo.desktop
===================================================================
--- mimetypes/inode/fifo.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/inode/fifo.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -65,7 +65,7 @@
 Comment[uk]=Канал
 Comment[uz]=Боғ (pipe)
 Comment[ven]=Phaiphi
-Comment[vi]=Ô'ng dẫn (pipe) 
+Comment[vi]=Ống dẫn
 Comment[wa]=Buze
 Comment[xh]=Umbhobho
 Comment[zh_CN]=管道
Index: mimetypes/inode/directory.desktop
===================================================================
--- mimetypes/inode/directory.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ mimetypes/inode/directory.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -63,6 +63,7 @@
 Comment[tt]=Törgäk
 Comment[uk]=Тека
 Comment[uz]=Жилд
+Comment[vi]=Thư mục
 Comment[wa]=Ridant
 Comment[zh_CN]=文件夹
 Comment[zh_HK]=資料夾
Index: kioslave/http/kcookiejar/main.cpp
===================================================================
--- kioslave/http/kcookiejar/main.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kioslave/http/kcookiejar/main.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -21,10 +21,6 @@
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-/*
- * To debug add "--nofork" to the commandline!
- */
-
 #include <dcopclient.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>
Index: kioslave/http/kcookiejar/kcookiejar.desktop
===================================================================
--- kioslave/http/kcookiejar/kcookiejar.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kioslave/http/kcookiejar/kcookiejar.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -21,7 +21,7 @@
 Name[fa]=بخش Jar کلوچه‌ی KDED
 Name[fi]=KDED-evästemoduuli
 Name[fr]=Module Jar de cookie KDED 
-Name[fy]=KDED-module foar it opslaan fan Koekjes
+Name[fy]=KDED-module foar it bewarjen fan Koekjes
 Name[gl]=Módulo Jar de cookies de KDED
 Name[he]=מודול צנצנת העוגיות של KDED
 Name[hi]=KDED कुकी जार मॉड्यूल
@@ -64,6 +64,7 @@
 Name[uk]=Модуль глечика з куками KDED
 Name[uz]=KDED куки идиш модули
 Name[ven]=Modulu wa Jar wa Cookie ya KDED
+Name[vi]=Mô-đun Cookie Jar của KDED
 Name[xh]=Isicatshulwa se KDED Cookie Jar
 Name[zh_CN]=KDED Cookie Jar 模块
 Name[zh_HK]=KDED Cookie Jar 模組
@@ -91,7 +92,7 @@
 Comment[hu]=Nyomon követi a rendszerben létrejövő cookie-kat
 Comment[is]=Heldur utanum allar smákökur í kerfinu
 Comment[it]=Tiene traccia di tutti i cookie del sistema
-Comment[ja]=システムのすべてのクッキーの残します
+Comment[ja]=システムのすべてのクッキーを管理します
 Comment[km]=រក្សាការតាមដានខូគីទាំងអស់ក្នុងប្រព័ន្ធ
 Comment[lb]=Iwwerwaacht all d'Cookie vum System
 Comment[lt]=Seka visus slapukus sistemoje
@@ -121,6 +122,7 @@
 Comment[tt]=Sistemdäge bar cookie'larnı küz astında tota
 Comment[uk]=Стежить за всіма куками в системі
 Comment[uz]=Тизимдаги ҳамма кукиларни кузатади
+Comment[vi]=Theo dõi các tập tin cookie trong hệ thống.
 Comment[zh_CN]=将全部 cookies 的记录保存在系统中
 ServiceTypes=KDEDModule
 Exec=kcookiejar
Index: kioslave/http/configure.in.in
===================================================================
--- kioslave/http/configure.in.in	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kioslave/http/configure.in.in	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -11,7 +11,7 @@
 
 if test "x$with_gssapi" = "xCHECK" ; then
 with_gssapi=NOTFOUND
- KDE_FIND_PATH(krb5-config, KRB5_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [
+ KDE_FIND_PATH(krb5-config, KRB5_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin /usr/lib/mit/bin], [
 AC_MSG_WARN([Could not find krb5-config])
 ])
 
Index: kioslave/http/http_cache_cleaner.desktop
===================================================================
--- kioslave/http/http_cache_cleaner.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kioslave/http/http_cache_cleaner.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -32,7 +32,7 @@
 Name[id]=Pembersih Cache HTTP
 Name[is]=Hreinsiforrit HTTP skyndiminnis
 Name[it]=Ripulitore della cache HTTP
-Name[ja]=HTTPキャッシュマネージャ
+Name[ja]=HTTP キャッシュマネージャ
 Name[km]=កម្មវិធីសម្អាតឃ្លាំងសម្ងាត់ HTTP
 Name[ko]=HTTP 캐시 정리
 Name[lb]=Opraumer fir den HTTP-Zwëschespäicher
@@ -70,7 +70,7 @@
 Name[uk]=Очищувач кешу HTTP
 Name[uz]=HTTP кэш бўшатгич
 Name[ven]=Tshikulumagi tsha HTTP Cache
-Name[vi]=Trình xoá HTTP cache 
+Name[vi]=Bộ làm sạch bộ nhớ tạm HTTP
 Name[xh]=Umcoci wendawo efihlakeleyo yokugcina we HTTP
 Name[zh_CN]=HTTP 缓存清除程序
 Name[zh_HK]=HTTP 快取清除程式
@@ -108,7 +108,7 @@
 Comment[id]=Membersihkan entri lama dari cache HTTP
 Comment[is]=Hreinsar gamlar færslur úr HTTP skyndiminninu
 Comment[it]=Ripulisce la cache HTTP dalle voci vecchie
-Comment[ja]=HTTPキャッシュから古いエントリを削除する
+Comment[ja]=HTTPキャッシュから古いエントリを削除します
 Comment[km]=សម្អាតធាតុចាស់ៗពីឃ្លាំងសម្ងាត់ HTTP
 Comment[ko]=HTTP 캐시에서 오래된 것들을 정리합니다
 Comment[lb]=Entfernt al Entréen aus dem HTTP-Zwëschespäicher
@@ -146,7 +146,7 @@
 Comment[uk]=Вичищає старі елементи з кешу HTTP
 Comment[uz]=HTTP кэшидаги эски элементларни ўчиради
 Comment[ven]=I kulumaga zwithu zwakale u bva kha HTTP cache
-Comment[vi]=Xoá các danh mục cũ trong HTTP cache 
+Comment[vi]=Xoá sạch các mục nhập cũ ra bộ nhớ tạm HTTP.
 Comment[xh]=Icoca amangeno amadala asuka kwindawo efihlakeleyo yokugcina ye HTTP
 Comment[zh_CN]=从 HTTP 缓存中清除旧条目
 Comment[zh_HK]=從 HTTP 快取中清除舊的項目
Index: kioslave/http/http.cc
===================================================================
--- kioslave/http/http.cc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kioslave/http/http.cc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -2712,6 +2712,7 @@
 
 QString dispositionType; // In case we get a Content-Disposition type
 QString dispositionFilename; // In case we get a Content-Disposition filename
+
 QString mediaValue;
 QString mediaAttribute;
 
@@ -3279,6 +3280,11 @@
 << dispositionFilename<< endl;
 }
 }
+ else if(strncasecmp(buf, "Content-Language:", 17) == 0) {
+ QString language = QString::fromLatin1(trimLead(buf+17)).stripWhiteSpace();
+ if (!language.isEmpty())
+ setMetaData("content-language", language);
+ }
 else if (strncasecmp(buf, "Proxy-Connection:", 17) == 0)
 {
 if (strncasecmp(trimLead(buf + 17), "Close", 5) == 0)
@@ -3590,6 +3596,16 @@
 error(ERR_ACCESS_DENIED, u.url());
 return false;
 }
+
+ // preserve #ref: (bug 124654)
+ // if we were at http://host/resource1#ref, we sent a GET for "/resource1"
+ // if we got redirected to http://host/resource2, then we have to re-add
+ // the fragment:
+ if (m_request.url.hasRef() && !u.hasRef() &&
+ (m_request.url.host() == u.host()) &&
+ (m_request.url.protocol() == u.protocol()))
+ u.setRef(m_request.url.ref());
+ 
 m_bRedirect = true;
 m_redirectLocation = u;
 
Index: kioslave/bzip2/kbzip2filter.desktop
===================================================================
--- kioslave/bzip2/kbzip2filter.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kioslave/bzip2/kbzip2filter.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -31,7 +31,7 @@
 Name[id]=Filter BZip2
 Name[is]=BZip2 sía
 Name[it]=Filtro Bzip2
-Name[ja]=BZip2フィルタ
+Name[ja]=BZip2 フィルタ
 Name[km]=តម្រង BZip2
 Name[ko]=BZip2 거르개
 Name[lb]=BZip2-Filter
@@ -69,7 +69,7 @@
 Name[uk]=Фільтр BZip2
 Name[uz]=BZip2-филтер
 Name[ven]=Filithara ya BZip2
-Name[vi]=Trình lọc BZip2 
+Name[vi]=Bộ lọc BZip2
 Name[wa]=Passete BZip2
 Name[xh]=Isihluzi se BZip2 
 Name[zh_CN]=BZip2 过滤程序
Index: kioslave/gzip/kgzipfilter.desktop
===================================================================
--- kioslave/gzip/kgzipfilter.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kioslave/gzip/kgzipfilter.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -31,7 +31,7 @@
 Name[id]=Filter Gzip
 Name[is]=GZip sía
 Name[it]=Filtro Gzip
-Name[ja]=GZipフィルタ
+Name[ja]=GZip フィルタ
 Name[km]=តម្រង GZip
 Name[ko]=GZip 거르개
 Name[lb]=GZip-Filter
@@ -69,7 +69,7 @@
 Name[uk]=Фільтр GZip
 Name[uz]=GZip-филтер
 Name[ven]=Filithara ya GZip
-Name[vi]=Trình lọc Gzip 
+Name[vi]=Bộ lọc GZip
 Name[wa]=Passete GZip
 Name[xh]=Isihluzi se GZip
 Name[zh_CN]=GZip 过滤程序
Index: kinit/klauncher.cpp
===================================================================
--- kinit/klauncher.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kinit/klauncher.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -162,10 +162,11 @@
 return (int) difftime(now, mBirthDate);
 }
 
-KLauncher::KLauncher(int _kdeinitSocket)
+KLauncher::KLauncher(int _kdeinitSocket, bool new_startup)
 : KApplication( false, false ), // No Styles, No GUI
 DCOPObject("klauncher"),
- kdeinitSocket(_kdeinitSocket), dontBlockReading(false)
+ kdeinitSocket(_kdeinitSocket), mAutoStart( new_startup ),
+ dontBlockReading(false), newStartup( new_startup )
 {
 #ifdef Q_WS_X11
 mCached_dpy = NULL;
@@ -674,8 +675,16 @@
 if( mAutoStart.phase() >= phase )
 return;
 mAutoStart.setPhase(phase);
- if (phase == 1)
- mAutoStart.loadAutoStartList();
+ if( newStartup )
+ {
+ if (phase == 0)
+ mAutoStart.loadAutoStartList();
+ }
+ else
+ {
+ if (phase == 1)
+ mAutoStart.loadAutoStartList();
+ }
 mAutoTimer.start(0, true);
 }
 
@@ -693,11 +702,20 @@
 	 {
 	 mAutoStart.setPhaseDone();
 	 // Emit signal
-	 QCString autoStartSignal( "autoStartDone()" );
-	 int phase = mAutoStart.phase();
-	 if ( phase > 1 )
-	 autoStartSignal.sprintf( "autoStart%dDone()", phase );
- emitDCOPSignal(autoStartSignal, QByteArray());
+ if( newStartup )
+ {
+	 QCString autoStartSignal;
+ autoStartSignal.sprintf( "autoStart%dDone()", mAutoStart.phase());
+ emitDCOPSignal(autoStartSignal, QByteArray());
+ }
+ else
+ {
+	 QCString autoStartSignal( "autoStartDone()" );
+	 int phase = mAutoStart.phase();
+	 if ( phase > 1 )
+	 autoStartSignal.sprintf( "autoStart%dDone()", phase );
+ emitDCOPSignal(autoStartSignal, QByteArray());
+ }
 	 }
 return;
 }
Index: kinit/kinit.cpp
===================================================================
--- kinit/kinit.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kinit/kinit.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -1099,11 +1099,12 @@
 {
 d.launcher_ok = true;
 }
- else if ((request_header.cmd == LAUNCHER_EXEC) ||
+ else if (request_header.arg_length && 
+ ((request_header.cmd == LAUNCHER_EXEC) ||
 (request_header.cmd == LAUNCHER_EXT_EXEC) ||
 (request_header.cmd == LAUNCHER_SHELL ) ||
 (request_header.cmd == LAUNCHER_KWRAPPER) ||
- (request_header.cmd == LAUNCHER_EXEC_NEW))
+ (request_header.cmd == LAUNCHER_EXEC_NEW)))
 {
 pid_t pid;
 klauncher_header response_header;
@@ -1229,7 +1230,7 @@
 }
 d.debug_wait = false;
 }
- else if (request_header.cmd == LAUNCHER_SETENV)
+ else if (request_header.arg_length && request_header.cmd == LAUNCHER_SETENV)
 {
 const char *env_name;
 const char *env_value;
@@ -1367,7 +1368,7 @@
 if (sock >= 0)
 {
 #if defined(KDEINIT_USE_XFT) && defined(KDEINIT_USE_FONTCONFIG)
- if( !FcConfigUptoDate(NULL))
+ if( FcGetVersion() < 20390 && !FcConfigUptoDate(NULL))
 FcInitReinitialize();
 #endif
 if (fork() == 0)
@@ -1387,7 +1388,7 @@
 if (sock >= 0)
 {
 #if defined(KDEINIT_USE_XFT) && defined(KDEINIT_USE_FONTCONFIG)
- if( !FcConfigUptoDate(NULL))
+ if( FcGetVersion() < 20390 && !FcConfigUptoDate(NULL))
 FcInitReinitialize();
 #endif
 if (fork() == 0)
@@ -1651,6 +1652,7 @@
 int launch_klauncher = 1;
 int launch_kded = 1;
 int keep_running = 1;
+ int new_startup = 0;
 d.suicide = false;
 
 /** Save arguments first... **/
@@ -1668,6 +1670,8 @@
 d.suicide = true;
 if (strcmp(safe_argv[i], "--exit") == 0)
 keep_running = 0;
+ if (strcmp(safe_argv[i], "--new-startup") == 0)
+ new_startup = 1;
 if (strcmp(safe_argv[i], "--help") == 0)
 {
 printf("Usage: kdeinit [options]\n");
@@ -1768,7 +1772,10 @@
 #endif 
 if (launch_klauncher)
 {
- pid = launch( 1, "klauncher", 0 );
+ if( new_startup )
+ pid = launch( 2, "klauncher", "--new-startup" );
+ else
+ pid = launch( 1, "klauncher", 0 );
 #ifndef NDEBUG
 fprintf(stderr, "kdeinit: Launched KLauncher, pid = %ld result = %d\n", (long) pid, d.result);
 #endif
@@ -1782,8 +1789,11 @@
 
 {
 #if defined(KDEINIT_USE_XFT) && defined(KDEINIT_USE_FONTCONFIG)
- XftInit(0);
- XftInitFtLibrary();
+ if( FcGetVersion() < 20390 )
+ {
+ XftInit(0);
+ XftInitFtLibrary();
+ }
 #endif
 QFont::initialize();
 setlocale (LC_ALL, "");
@@ -1800,7 +1810,10 @@
 
 if (launch_kded)
 {
- pid = launch( 1, "kded", 0 );
+ if( new_startup )
+ pid = launch( 2, "kded", "--new-startup" );
+ else
+ pid = launch( 1, "kded", 0 );
 #ifndef NDEBUG
 fprintf(stderr, "kdeinit: Launched KDED, pid = %ld result = %d\n", (long) pid, d.result);
 #endif
Index: kinit/klauncher_main.cpp
===================================================================
--- kinit/klauncher_main.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kinit/klauncher_main.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -44,6 +44,12 @@
 KLauncher::destruct(255);
 }
 
+static KCmdLineOptions options[] =
+{
+ { "new-startup", "Internal", 0 },
+ KCmdLineLastOption
+};
+
 extern "C" KDE_EXPORT int kdemain( int argc, char**argv )
 {
 // Started via kdeinit.
@@ -60,6 +66,7 @@
 "v1.0");
 
 KLauncher::addCmdLineOptions();
+ KCmdLineArgs::addCmdLineOptions( options );
 
 // WABA: Make sure not to enable session management.
 putenv(strdup("SESSION_MANAGER="));
@@ -67,6 +74,8 @@
 // Allow the locale to initialize properly
 KLocale::setMainCatalogue("kdelibs");
 
+ KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+
 int maxTry = 3;
 while(true)
 {
@@ -92,7 +101,7 @@
 // Try again...
 }
 
- KLauncher *launcher = new KLauncher(LAUNCHER_FD);
+ KLauncher *launcher = new KLauncher(LAUNCHER_FD, args->isSet("new-startup"));
 launcher->dcopClient()->setDefaultObject( name );
 launcher->dcopClient()->setDaemonMode( true );
 
Index: kinit/wrapper.c
===================================================================
--- kinit/wrapper.c	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kinit/wrapper.c	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -182,6 +182,7 @@
 if (strlen(sock_file)+strlen(display)+strlen("/kdeinit_")+2 > MAX_SOCK_FILE)
 {
 fprintf(stderr, "Warning: Socket name will be too long.\n");
+ free (display);
 return -1;
 }
 strcat(sock_file, "/kdeinit_");
Index: kinit/klauncher.h
===================================================================
--- kinit/klauncher.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kinit/klauncher.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -110,7 +110,7 @@
 Q_OBJECT
 
 public:
- KLauncher(int _kdeinitSocket);
+ KLauncher(int _kdeinitSocket, bool new_startup);
 
 ~KLauncher();
 
@@ -192,6 +192,7 @@
 QCString mSlaveValgrind;
 QCString mSlaveValgrindSkin;
 bool dontBlockReading;
+ bool newStartup;
 #ifdef Q_WS_X11
 Display *mCached_dpy;
 #endif
Index: kinit/autostart.cpp
===================================================================
--- kinit/autostart.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kinit/autostart.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -42,8 +42,8 @@
 AutoStartList() { }
 };
 
-AutoStart::AutoStart()
- : m_phase(0), m_phasedone(false)
+AutoStart::AutoStart( bool new_startup )
+ : m_newStartup( new_startup ), m_phase( new_startup ? -1 : 0), m_phasedone(false)
 {
 m_startList = new AutoStartList;
 m_startList->setAutoDelete(true);
@@ -133,9 +133,18 @@
 item->name = extractName(*it);
 item->service = *it;
 item->startAfter = config.readEntry("X-KDE-autostart-after");
- item->phase = config.readNumEntry("X-KDE-autostart-phase", 1);
- if (item->phase < 1)
- item->phase = 1;
+ if( m_newStartup )
+ {
+ item->phase = config.readNumEntry("X-KDE-autostart-phase", 2);
+ if (item->phase < 0)
+ item->phase = 0;
+ }
+ else
+ {
+ item->phase = config.readNumEntry("X-KDE-autostart-phase", 1);
+ if (item->phase < 1)
+ item->phase = 1;
+ }
 m_startList->append(item);
 }
 } 
Index: kinit/setproctitle.h
===================================================================
--- kinit/setproctitle.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kinit/setproctitle.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -71,8 +71,8 @@
 # define SPT_PADCHAR '\0' /* pad process title with nulls */
 #endif
 
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-# if defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+# if defined(__NetBSD__) || defined(__DragonFly__)
 # undef SPT_TYPE
 # define SPT_TYPE SPT_BUILTIN /* setproctitle is in libc */
 # endif
Index: kinit/autostart.h
===================================================================
--- kinit/autostart.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kinit/autostart.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -27,7 +27,7 @@
 class AutoStart
 {
 public:
- AutoStart();
+ AutoStart( bool new_startup );
 ~AutoStart();
 
 void loadAutoStartList();
@@ -38,6 +38,7 @@
 bool phaseDone() const { return m_phasedone; }
 
 private:
+ bool m_newStartup;
 AutoStartList *m_startList; 
 QStringList m_started;
 int m_phase;
Index: kimgio/xpm.kimgio
===================================================================
--- kimgio/xpm.kimgio	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kimgio/xpm.kimgio	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -67,6 +67,7 @@
 Name[tt]=X PixMap Süräte
 Name[uk]=Растрове зображення для X
 Name[uz]=X PMP-расм
+Name[vi]=Ảnh sơ đồ điểm ảnh X
 Name[wa]=Imådje XPM
 Name[zh_CN]=X 像素图图像
 Name[zh_HK]=X PixMap 圖檔
Index: kimgio/ico.kimgio
===================================================================
--- kimgio/ico.kimgio	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kimgio/ico.kimgio	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -33,7 +33,7 @@
 Name[id]=Icon Windows
 Name[is]=Windows táknmynd
 Name[it]=Icona Windows
-Name[ja]=Windowsアイコン
+Name[ja]=Windows アイコン
 Name[km]=រូបតំណាងបង្អួច
 Name[ko]=윈도우즈 아이콘
 Name[lb]=Windows-Symbol
@@ -67,6 +67,7 @@
 Name[tt]=Windows İkonı
 Name[uk]=Піктограма Windows
 Name[uz]=Windows нишончаси
+Name[vi]=Biểu tượng Windows
 Name[wa]=Imådjete MS-Windows
 Name[zh_CN]=Windows 图标
 Name[zh_HK]=Windows 圖示
Index: kimgio/rgb.kimgio
===================================================================
--- kimgio/rgb.kimgio	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kimgio/rgb.kimgio	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -29,7 +29,7 @@
 Name[hu]=SGI-kép (RGB)
 Name[is]=SGI mynd (RGB)
 Name[it]=Immagine SGI (RGB)
-Name[ja]=SGI イメージ (RGB)
+Name[ja]=SGI 画像 (RGB)
 Name[km]=រូបភាព SGI (RGB)
 Name[ko]=CGI 그림 (RGB)
 Name[lb]=SGI-Bild (RGB)
@@ -61,6 +61,7 @@
 Name[tt]=SGI Sürät (RGB)
 Name[uk]=Зображення SGI (RGB)
 Name[uz]=SGI-расм (RGB)
+Name[vi]=Ảnh SGI (RGB)
 Name[zh_CN]=SGI 图像(RGB)
 Name[zh_HK]=SGI 圖檔 (RGB)
 Read=true
Index: kimgio/hdr.kimgio
===================================================================
--- kimgio/hdr.kimgio	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kimgio/hdr.kimgio	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -4,6 +4,7 @@
 Name=High Dynamic Range Image
 Name[af]=Hoe Dinamiese Reeks Beeld
 Name[bg]=Изображение с висока динамичност (High Dynamic Range)
+Name[bs]=High Dynamic Range slika
 Name[ca]=Imatge de rang altament dinàmic
 Name[cs]=Obrázek ve formátu HDRI
 Name[da]=Billede med højt dynamisk område
@@ -40,6 +41,7 @@
 Name[tg]=Тасвири динамикии баландқатор
 Name[tt]=Bik Tere Aralı Sürät
 Name[uk]=Зображення HDR (High Dynamic Range)
+Name[vi]=Ảnh phạm vị động cao
 Name[zh_CN]=高动态范围图像
 Read=true
 Write=false
Index: kimgio/bmp.kimgio
===================================================================
--- kimgio/bmp.kimgio	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kimgio/bmp.kimgio	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -33,7 +33,7 @@
 Name[id]=Gambar BMP
 Name[is]=BMP myndir
 Name[it]=Immagine BMP
-Name[ja]=BMP画像
+Name[ja]=BMP 画像
 Name[km]=រូបភាព BMP
 Name[ko]=BMP 그림
 Name[lb]=BMP-Bild
@@ -67,6 +67,7 @@
 Name[tt]=BMP Sürät
 Name[uk]=Зображення BMP
 Name[uz]=BMP-расм
+Name[vi]=Ảnh BMP
 Name[wa]=Imådje BMP
 Name[zh_CN]=BMP 图像
 Name[zh_HK]=點陣圖
Index: kimgio/tga.cpp
===================================================================
--- kimgio/tga.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kimgio/tga.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -168,9 +168,7 @@
 			}
 		}
 	};
-	
 
-
 	static bool LoadTGA( QDataStream & s, const TgaHeader & tga, QImage &img )
 	{
 		// Create image.
@@ -195,6 +193,12 @@
 		uint pixel_size = (tga.pixel_size/8);
 		uint size = tga.width * tga.height * pixel_size;
 
+		if (size < 1)
+		{
+			kdDebug(399) << "This TGA file is broken with size " << size << endl;
+			return false;
+		}
+
 		
 		// Read palette.
 		char palette[768];
Index: kimgio/xcf.kimgio
===================================================================
--- kimgio/xcf.kimgio	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kimgio/xcf.kimgio	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -6,6 +6,7 @@
 Name[bg]=Изображение GIMP
 Name[bn]=জিম্প চিত্র
 Name[br]=Skeudenn GIMP
+Name[bs]=GIMP slika
 Name[ca]=Imatge GIMP
 Name[cs]=Obrázek GIMP
 Name[da]=GIMP-billede
@@ -24,7 +25,7 @@
 Name[hu]=GIMP-kép
 Name[is]=GIMP mynd
 Name[it]=Immagine GIMP
-Name[ja]=GIMP画像
+Name[ja]=GIMP 画像
 Name[km]=រូបភាព GIMP
 Name[lb]=GIMP-Bild
 Name[lt]=GIMP paveiksliukas
@@ -54,6 +55,7 @@
 Name[tt]=GIMP Sürät
 Name[uk]=Зображення GIMP
 Name[uz]=GIMP-расм
+Name[vi]=Ảnh GIMP
 Name[zh_CN]=GIMP 图像
 Name[zh_HK]=GIMP 圖檔
 Read=true
Index: kimgio/mng.kimgio
===================================================================
--- kimgio/mng.kimgio	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kimgio/mng.kimgio	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -6,6 +6,7 @@
 Name[bg]=Изображение MNG
 Name[bn]=এম-এন-জি চিত্র
 Name[br]=Skeudenn MNG
+Name[bs]=MNG slika
 Name[ca]=Imatge MNG
 Name[cs]=Obrázek ve formátu MNG
 Name[cy]=Delwedd MNG
@@ -25,7 +26,7 @@
 Name[hu]=MNG-kép
 Name[is]=MNG mynd
 Name[it]=Immagine MNG
-Name[ja]=MNG画像
+Name[ja]=MNG 画像
 Name[km]=រូបភាព MNG
 Name[lb]=MNG-Bild
 Name[lt]=MNG paveiksliukas
@@ -55,6 +56,7 @@
 Name[tt]=MNG Sürät
 Name[uk]=Зображення MNG
 Name[uz]=MNG-расм
+Name[vi]=Ảnh MNG
 Name[zh_CN]=MNG 图像
 Name[zh_HK]=MNG 圖檔
 Read=true
Index: kimgio/jpeg.kimgio
===================================================================
--- kimgio/jpeg.kimgio	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kimgio/jpeg.kimgio	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -33,7 +33,7 @@
 Name[id]=Gambar JPEG
 Name[is]=JPEG mynd
 Name[it]=Immagine JPEG
-Name[ja]=JPEG画像
+Name[ja]=JPEG 画像
 Name[km]=រូបភាព JPEG
 Name[ko]=JPEG 그림
 Name[lb]=JPEG-Bild
@@ -67,6 +67,7 @@
 Name[tt]=JPEG Süräte
 Name[uk]=Зображення JPEG
 Name[uz]=JPEG-расм
+Name[vi]=Ảnh JPEG
 Name[wa]=Imådje JPEG
 Name[zh_CN]=JPEG 图像
 Name[zh_HK]=JPEG 圖檔
Index: kimgio/psd.kimgio
===================================================================
--- kimgio/psd.kimgio	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kimgio/psd.kimgio	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -24,6 +24,8 @@
 Name[ja]=Adobe Photoshop 画像
 Name[km]= រូបភាពរបស់ Adobe Photoshop
 Name[lb]=Adobe-Photoshop-Bild
+Name[lt]=Adobe Photoshop paveiksliukas
+Name[ms]=Imej Adobe Photoshop
 Name[nb]=Adobe Photoshop-bilde
 Name[nds]=Adobe-Photoshop-Bild
 Name[nl]=Adobe Photoshop-afbeelding
@@ -41,6 +43,7 @@
 Name[tg]=Тасвири Adobe Photoshop
 Name[uk]=Зображення Adobe Photoshop
 Name[uz]=Adobe Photoshop-расм
+Name[vi]=Ảnh Photoshop của Adobe
 Name[zh_CN]=Adobe Photoshop 图像
 Name[zh_HK]=Adobe Photoshop 圖檔
 Read=true
Index: kimgio/eps.kimgio
===================================================================
--- kimgio/eps.kimgio	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kimgio/eps.kimgio	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -33,7 +33,7 @@
 Name[id]=Gambar Encapsulated Postscript
 Name[is]=Postscript-myndir (encapsulated)
 Name[it]=Immagine Encapsulated PostScript
-Name[ja]=Encapsulated PostScriptイメージ
+Name[ja]=Encapsulated PostScript 画像
 Name[km]=រូបភាព Encapsulated PostScript
 Name[ko]=암호화된 포스트스크립트 그림
 Name[lb]=Gekapselt PostScript-Bild
@@ -66,6 +66,7 @@
 Name[tt]=Quşılğan PostScript-Sürät
 Name[uk]=Вбудоване зображення PostScript
 Name[uz]=EPS-расм
+Name[vi]=Ảnh PostScript đã bao bọc (EPS)
 Name[wa]=Imådje PostScript ecapsulêye
 Name[zh_CN]=封装后的 Postscript 图像
 Name[zh_HK]=Encapsulated Postscript 圖檔
Index: kimgio/tiff.kimgio
===================================================================
--- kimgio/tiff.kimgio	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kimgio/tiff.kimgio	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -33,7 +33,7 @@
 Name[id]=Gambar TIFF
 Name[is]=TIFF mynd
 Name[it]=Immagine TIFF
-Name[ja]=TIFF画像
+Name[ja]=TIFF 画像
 Name[km]=រូបភាព TIFF
 Name[ko]=TIFF 그림
 Name[lb]=TIFF-Bild
@@ -67,6 +67,7 @@
 Name[tt]=TIFF Sürät
 Name[uk]=Зображення TIFF
 Name[uz]=TIFF-расм
+Name[vi]=Ảnh TIFF
 Name[wa]=Imådje TIFF
 Name[zh_CN]=TIFF 图像
 Name[zh_HK]=TIFF 圖檔
Index: kimgio/pcx.kimgio
===================================================================
--- kimgio/pcx.kimgio	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kimgio/pcx.kimgio	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -33,7 +33,7 @@
 Name[id]=Gambar PCX
 Name[is]=PCX mynd
 Name[it]=Immagine PCX
-Name[ja]=PCX画像
+Name[ja]=PCX 画像
 Name[km]=រូបភាព PCX
 Name[ko]=PCX 그림
 Name[lb]=PCX-Bild
@@ -67,6 +67,7 @@
 Name[tt]=PCX Sürät
 Name[uk]=Зображення PCX
 Name[uz]=PCX-расм
+Name[vi]=Ảnh PCX
 Name[wa]=Imådje PCX
 Name[zh_CN]=PCX 图像
 Name[zh_HK]=PCX 圖檔
Index: kimgio/jp2.kimgio
===================================================================
--- kimgio/jp2.kimgio	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kimgio/jp2.kimgio	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -33,7 +33,7 @@
 Name[id]=Gambar JPEG 2000
 Name[is]=JPEG 2000 mynd
 Name[it]=Immagine JPEG 2000
-Name[ja]=JPEG 2000画像
+Name[ja]=JPEG 2000 画像
 Name[km]=រូបភាព JPEG 2000
 Name[ko]=JPEG 2000 그림
 Name[lb]=JPEG-2000-Bild
@@ -67,6 +67,7 @@
 Name[tt]=JPEG 2000 Süräte
 Name[uk]=Зображення JPEG 2000
 Name[uz]=JPEG 2000-расм
+Name[vi]=Ảnh JPEG 2000
 Name[wa]=Imådje JPEG 2000
 Name[zh_CN]=JPEG 2000 图像
 Name[zh_HK]=JPEG 2000 圖檔
Index: kimgio/gif.kimgio
===================================================================
--- kimgio/gif.kimgio	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kimgio/gif.kimgio	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -33,7 +33,7 @@
 Name[id]=Gambar GIF
 Name[is]=GIF mynd
 Name[it]=Immagine GIF
-Name[ja]=GIF画像
+Name[ja]=GIF 画像
 Name[km]=រូបភាព GIF
 Name[ko]=GIF 그림
 Name[lb]=GIF-Bild
@@ -67,6 +67,7 @@
 Name[tt]=GIF Süräte
 Name[uk]=Зображення GIF
 Name[uz]=GIF-расм
+Name[vi]=Ảnh GIF
 Name[wa]=Imådje GIF
 Name[zh_CN]=GIF 图像
 Name[zh_HK]=GIF 圖檔
Index: kimgio/dds.kimgio
===================================================================
--- kimgio/dds.kimgio	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kimgio/dds.kimgio	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -45,6 +45,7 @@
 Name[tr]=Doğrudan Çizim Yüzeyi
 Name[tt]=Direct Draw Öslege
 Name[uk]=Поверхня Direct Draw
+Name[vi]=Mặt vẽ trực tiếp
 Name[zh_CN]=DirectDraw 表面
 Read=true
 Write=false
Index: kimgio/tga.kimgio
===================================================================
--- kimgio/tga.kimgio	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kimgio/tga.kimgio	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -33,7 +33,7 @@
 Name[id]=Gambar Truevision Targa
 Name[is]=Truevision Targa mynd
 Name[it]=Immagine Truevision Targa
-Name[ja]=トゥルービジョンTargaイメージ
+Name[ja]=トゥルービジョン Targa 画像
 Name[km]=រូបភាព Truevision Targa
 Name[ko]=트루비전 타가 그림
 Name[lb]=Truevision-Targa-Bild
@@ -66,6 +66,7 @@
 Name[tt]=Truevision Targa Süräte
 Name[uk]=Зображення Truevision Targa
 Name[uz]=TGA-расм
+Name[vi]=Ảnh Truevision Targa
 Name[wa]=Imådje Targa
 Name[zh_CN]=Truevision Targa 图像
 Name[zh_HK]=Truevision Targa 圖形
Index: kimgio/pbm.kimgio
===================================================================
--- kimgio/pbm.kimgio	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kimgio/pbm.kimgio	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -65,6 +65,7 @@
 Name[tt]=Portable Bitmap Süräte
 Name[uk]=Двокольорове зображення у портативному форматі
 Name[uz]=PBMP-расм
+Name[vi]=Ảnh sơ đồ bit di động
 Name[wa]=Imådje PBM
 Name[zh_CN]=便携位图图像
 Name[zh_HK]=PNG 圖檔
Index: kimgio/pgm.kimgio
===================================================================
--- kimgio/pgm.kimgio	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kimgio/pgm.kimgio	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -65,6 +65,7 @@
 Name[tt]=Portable Graymap Süräte
 Name[uk]=Чорно-біле зображення у портативному форматі
 Name[uz]=PGM-расм
+Name[vi]=Ảnh sơ đồ xám di động
 Name[wa]=Imådje PGM
 Name[zh_CN]=便携灰度图像
 Name[zh_HK]=PGM 圖檔
Index: kimgio/png.kimgio
===================================================================
--- kimgio/png.kimgio	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kimgio/png.kimgio	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -33,7 +33,7 @@
 Name[id]=Gambar PNG
 Name[is]=PNG mynd
 Name[it]=Immagine PNG
-Name[ja]=PNG画像
+Name[ja]=PNG 画像
 Name[km]=រូបភាព PNG
 Name[ko]=PNG 그림
 Name[lb]=PNG-Bild
@@ -67,6 +67,7 @@
 Name[tt]=PNG Sürät
 Name[uk]=Зображення PNG
 Name[uz]=PNG-расм
+Name[vi]=Ảnh PNG
 Name[wa]=Imådje PNG
 Name[zh_CN]=PNG 图像
 Name[zh_HK]=PNG 圖檔
Index: kimgio/xbm.kimgio
===================================================================
--- kimgio/xbm.kimgio	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kimgio/xbm.kimgio	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -67,6 +67,7 @@
 Name[tt]=X BitMap Sürät
 Name[uk]=Двокольорове зображення для X
 Name[uz]=X BMP-расм
+Name[vi]=Ảnh sơ đồ bit X
 Name[wa]=Imådje XBM
 Name[zh_CN]=X 位图图像
 Name[zh_HK]=X BitMap 圖檔
Index: kimgio/ppm.kimgio
===================================================================
--- kimgio/ppm.kimgio	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kimgio/ppm.kimgio	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -66,6 +66,7 @@
 Name[tt]=Portable Pixmap Süräte
 Name[uk]=Растрове зображення у портативному форматі
 Name[uz]=PPMP-расм
+Name[vi]=Ảnh sơ đồ điểm ảnh di động
 Name[wa]=Imådje PPM
 Name[zh_CN]=便携像素图图像
 Name[zh_HK]=PPM 圖檔
Index: kimgio/xv.kimgio
===================================================================
--- kimgio/xv.kimgio	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kimgio/xv.kimgio	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -34,7 +34,7 @@
 Name[id]=Gambar XView
 Name[is]=XView mynd
 Name[it]=Immagine XView
-Name[ja]=XView画像
+Name[ja]=XView 画像
 Name[km]=រូបភាព XView
 Name[ko]=XView 그림
 Name[lb]=XView-Bild
@@ -68,6 +68,7 @@
 Name[tt]=XView Sürät
 Name[uk]=Зображення XView
 Name[uz]=XView-расм
+Name[vi]=Ảnh XView
 Name[wa]=Imådje XView
 Name[zh_CN]=XView 图像
 Name[zh_HK]=XView 圖檔
Index: kimgio/exr.kimgio
===================================================================
--- kimgio/exr.kimgio	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kimgio/exr.kimgio	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -49,6 +49,7 @@
 Name[tr]=ILM EXR Resim Kimgio
 Name[tt]=ILM EXR Süräte
 Name[uk]=Ввід/Вивід для зображень ILM EXR
+Name[vi]=Kimgio ảnh EXR ILM
 Name[zh_CN]=ILM EXR 图像 Kimgio
 Read=true
 Write=false
Index: kio/kfileplugin.desktop
===================================================================
--- kio/kfileplugin.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kfileplugin.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -31,7 +31,7 @@
 Name[id]=Plugin Meta Data KFile
 Name[is]=KFile lýsiskráar-íforrit
 Name[it]=Plugin informazioni aggiuntive per KFile
-Name[ja]=KFileメタデータプラグイン
+Name[ja]=KFile メタデータプラグイン
 Name[km]=កម្មវិធីជំនួយខាងក្នុងនៃទិន្នន័យមេតា KFile
 Name[ko]=K파일 메타 자료 플러그인
 Name[lb]=KFile-Metadonnéeë-Plugin
@@ -66,6 +66,7 @@
 Name[uk]=Втулок метаданих KFile
 Name[uz]=KFile мета маълумот учун плагин
 Name[ven]=Meta data pulagini ya faela ya K
+Name[vi]=Bộ cầm phít siêu dữ liệu KFile
 Name[xh]=Iplagi yangaphakathi ye KFile Meta Data
 Name[zh_CN]=KFile 元数据插件
 Name[zh_HK]=KFile 元資料外掛程式
Index: kio/kio/global.cpp
===================================================================
--- kio/kio/global.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kio/global.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -1438,7 +1438,11 @@
 
 #ifdef HAVE_GETMNTINFO
 
+#ifdef GETMNTINFO_USES_STATVFS
+ struct statvfs *mounted;
+#else
 struct statfs *mounted;
+#endif
 
 int num_fs = getmntinfo(&mounted, MNT_NOWAIT);
 
@@ -1704,7 +1708,12 @@
 
 #ifdef HAVE_GETMNTINFO
 
+#ifdef GETMNTINFO_USES_STATVFS
+ struct statvfs *mounted;
+#else
 struct statfs *mounted;
+#endif
+
 char realpath_buffer[MAXPATHLEN];
 
 int num_fs = getmntinfo(&mounted, MNT_NOWAIT);
Index: kio/kio/yacc.y
===================================================================
--- kio/kio/yacc.y	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kio/yacc.y	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -116,7 +116,7 @@
 
 void yyerror ( const char *s ) /* Called by yyparse on error */
 {
- printf ("ERROR: %s\n", s);
+ KTraderParse_error( s );
 }
 
 void KTraderParse_mainParse( const char *_code )
Index: kio/kio/tcpslavebase.cpp
===================================================================
--- kio/kio/tcpslavebase.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kio/tcpslavebase.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -622,6 +622,7 @@
 !pkcs->getCertificate()->x509V3Extensions().certTypeSSLClient())) {
 certs.remove(*it);
 }
+ delete pkcs;
 }
 
 if (certs.isEmpty()) return; // we had nothing else, and prompt failed
Index: kio/kio/kfilemetainfo.cpp
===================================================================
--- kio/kio/kfilemetainfo.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kio/kfilemetainfo.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -527,6 +527,11 @@
 
 bool KFileMetaInfo::applyChanges()
 {
+ return applyChanges( path() );
+}
+
+bool KFileMetaInfo::applyChanges( const QString& path )
+{
 bool doit = false;
 
 // kdDebug(7033) << "KFileMetaInfo::applyChanges()\n";
@@ -563,7 +568,14 @@
 
 // kdDebug(7033) << "Ok, trying to write the info\n";
 
- return p->writeInfo(*this);
+ KURL savedURL = url();
+ d->url = KURL();
+ d->url.setPath( path );
+ 
+ bool ret = p->writeInfo(*this);
+ 
+ d->url = savedURL;
+ return ret;
 }
 
 KFilePlugin * const KFileMetaInfo::plugin() const
Index: kio/kio/krun.h
===================================================================
--- kio/kio/krun.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kio/krun.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -1,5 +1,6 @@
 /* This file is part of the KDE project
 Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
+ Copyright (C) 2006 David Faure <faure@kde.org>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Library General Public
@@ -187,6 +188,16 @@
 void setEnableExternalBrowser(bool b);
 
 /**
+ * Sets the file name to use in the case of downloading the file to a tempfile
+ * in order to give to a non-url-aware application. Some apps rely on the extension
+ * to determine the mimetype of the file. Usually the file name comes from the URL,
+ * but in the case of the HTTP Content-Disposition header, we need to override the
+ * file name.
+ * @since 3.5.3
+ */
+ void setSuggestedFileName( const QString& fileName );
+
+ /**
 * Open a list of URLs with a certain service (application).
 *
 * @param _service the service to run
@@ -212,6 +223,9 @@
 // BIC merge second overload with first one, using tempFiles=false
 static pid_t run( const KService& _service, const KURL::List& _urls, bool tempFiles );
 static pid_t run( const KService& _service, const KURL::List& _urls );
+ /// @since 3.5.3
+ /// @internal
+ static pid_t run( const KService& _service, const KURL::List& _urls, QWidget* window, bool tempFiles, const QString& suggestedFileName );
 
 /**
 * Open a list of URLs with.
@@ -253,6 +267,9 @@
 static pid_t runURL( const KURL& _url, const QString& _mimetype, bool tempFile, bool runExecutables);
 static pid_t runURL( const KURL& _url, const QString& _mimetype, bool tempFile);
 static pid_t runURL( const KURL& _url, const QString& _mimetype );
+ /// @since 3.5.3
+ /// @internal
+ static pid_t runURL( const KURL& _url, const QString& _mimetype, bool tempFile, bool runExecutables, const QString& suggestedFileName );
 
 /**
 * Run the given shell command and notifies kicker of the starting
@@ -293,6 +310,9 @@
 // BIC merge second overload with first one, using tempFiles=false
 static bool displayOpenWithDialog( const KURL::List& lst, bool tempFiles );
 static bool displayOpenWithDialog( const KURL::List& lst );
+ /// @since 3.5.3
+ /// @internal
+ static bool displayOpenWithDialog( const KURL::List& lst, bool tempFiles, const QString& suggestedFileName );
 
 /**
 * Quotes a string for the shell.
@@ -314,9 +334,11 @@
 * when the application exits.
 * @return a list of arguments suitable for either system() or exec().
 */
- // BIC merge second overload with first one, using tempFiles=false
 static QStringList processDesktopExec(const KService &_service, const KURL::List &_urls, bool has_shell, bool tempFiles);
 static QStringList processDesktopExec(const KService &_service, const KURL::List &_urls, bool has_shell);
+ /// @since 3.5.3
+ /// @internal
+ static QStringList processDesktopExec(const KService &_service, const KURL::List &_urls, bool has_shell, bool tempFiles, const QString& suggestedFileName);
 
 /**
 * Given a full command line (e.g. the Exec= line from a .desktop file),
Index: kio/kio/ktar.cpp
===================================================================
--- kio/kio/ktar.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kio/ktar.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -301,10 +301,10 @@
 delete filterDev;
 return false;
 }
- Q_LONG len;
- while ( !filterDev->atEnd() ) {
+ Q_LONG len = -1;
+ while ( !filterDev->atEnd() && len != 0) {
 len = filterDev->readBlock(buffer.data(),buffer.size());
- if ( len <= 0 ) { // corrupted archive
+ if ( len < 0 ) { // corrupted archive
 delete filterDev;
 return false;
 }
Index: kio/kio/krun.cpp
===================================================================
--- kio/kio/krun.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kio/krun.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -1,5 +1,6 @@
 /* This file is part of the KDE libraries
 Copyright (C) 2000 Torben Weis <weis@kde.org>
+ Copyright (C) 2006 David Faure <faure@kde.org>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Library General Public
@@ -74,19 +75,25 @@
 QString m_preferredService;
 QString m_externalBrowser;
 QString m_localPath;
+ QString m_suggestedFileName;
 QGuardedPtr <QWidget> m_window;
 };
 
 pid_t KRun::runURL( const KURL& u, const QString& _mimetype )
 {
- return runURL( u, _mimetype, false, true );
+ return runURL( u, _mimetype, false, true, QString::null );
 }
 
 pid_t KRun::runURL( const KURL& u, const QString& _mimetype, bool tempFile )
 {
- return runURL( u, _mimetype, tempFile, true );
+ return runURL( u, _mimetype, tempFile, true, QString::null );
 }
 
+pid_t KRun::runURL( const KURL& u, const QString& _mimetype, bool tempFile, bool runExecutables )
+{
+ return runURL( u, _mimetype, tempFile, runExecutables, QString::null );
+}
+
 bool KRun::isExecutableFile( const KURL& url, const QString &mimetype )
 {
 if ( !url.isLocalFile() )
@@ -103,7 +110,7 @@
 }
 
 // This is called by foundMimeType, since it knows the mimetype of the URL
-pid_t KRun::runURL( const KURL& u, const QString& _mimetype, bool tempFile, bool runExecutables )
+pid_t KRun::runURL( const KURL& u, const QString& _mimetype, bool tempFile, bool runExecutables, const QString& suggestedFileName )
 {
 bool noRun = false;
 bool noAuth = false;
@@ -172,19 +179,24 @@
 // Open-with dialog
 // TODO : pass the mimetype as a parameter, to show it (comment field) in the dialog !
 // Hmm, in fact KOpenWithDlg::setServiceType already guesses the mimetype from the first URL of the list...
- return displayOpenWithDialog( lst, tempFile );
+ return displayOpenWithDialog( lst, tempFile, suggestedFileName );
 }
 
- return KRun::run( *offer, lst, tempFile );
+ return KRun::run( *offer, lst, 0 /*window*/, tempFile, suggestedFileName );
 }
 
 bool KRun::displayOpenWithDialog( const KURL::List& lst )
 {
- return displayOpenWithDialog( lst, false );
+ return displayOpenWithDialog( lst, false, QString::null );
 }
 
 bool KRun::displayOpenWithDialog( const KURL::List& lst, bool tempFiles )
 {
+ return displayOpenWithDialog( lst, tempFiles, QString::null );
+}
+
+bool KRun::displayOpenWithDialog( const KURL::List& lst, bool tempFiles, const QString& suggestedFileName )
+{
 if (kapp && !kapp->authorizeKAction("openwith"))
 {
 // TODO: Better message, i18n freeze :-(
@@ -197,10 +209,10 @@
 {
 KService::Ptr service = l.service();
 if ( !!service )
- return KRun::run( *service, lst, tempFiles );
+ return KRun::run( *service, lst, 0 /*window*/, tempFiles, suggestedFileName );
 
 kdDebug(7010) << "No service set, running " << l.text() << endl;
- return KRun::run( l.text(), lst ); // TODO handle tempFiles
+ return KRun::run( l.text(), lst, suggestedFileName ); // TODO handle tempFiles
 }
 return false;
 }
@@ -338,13 +350,18 @@
 return 2;
 }
 
-// BIC: merge with method below
+// BIC: merge methods below
 QStringList KRun::processDesktopExec(const KService &_service, const KURL::List& _urls, bool has_shell) {
- return processDesktopExec( _service, _urls, has_shell, false );
+ return processDesktopExec( _service, _urls, has_shell, false, QString::null );
 }
 
 QStringList KRun::processDesktopExec(const KService &_service, const KURL::List& _urls, bool has_shell /* KDE4: remove */, bool tempFiles)
 {
+ return processDesktopExec( _service, _urls, has_shell, tempFiles, QString::null );
+}
+
+QStringList KRun::processDesktopExec(const KService &_service, const KURL::List& _urls, bool has_shell /* KDE4: remove */, bool tempFiles, const QString& suggestedFileName)
+{
 QString exec = _service.exec();
 QStringList result;
 bool appHasTempFileOption;
@@ -392,6 +409,10 @@
 result << "kioexec";
 if ( tempFiles )
 result << "--tempfiles";
+ if ( !suggestedFileName.isEmpty() ) {
+ result << "--suggestedfilename";
+ result << suggestedFileName;
+ }
 result << exec;
 result += _urls.toStringList();
 if (has_shell)
@@ -608,7 +629,7 @@
 return true;
 }
 
-static pid_t runTempService( const KService& _service, const KURL::List& _urls, bool tempFiles )
+static pid_t runTempService( const KService& _service, const KURL::List& _urls, bool tempFiles, const QString& suggestedFileName )
 {
 if (!_urls.isEmpty()) {
 kdDebug(7010) << "runTempService: first url " << _urls.first().url() << endl;
@@ -627,15 +648,15 @@
 {
 KURL::List singleUrl;
 singleUrl.append(*it);
- runTempService( _service, singleUrl, tempFiles );
+ runTempService( _service, singleUrl, tempFiles, suggestedFileName );
 }
 KURL::List singleUrl;
 singleUrl.append(_urls.first());
- args = KRun::processDesktopExec(_service, singleUrl, false, tempFiles);
+ args = KRun::processDesktopExec(_service, singleUrl, false, tempFiles, suggestedFileName);
 }
 else
 {
- args = KRun::processDesktopExec(_service, _urls, false, tempFiles);
+ args = KRun::processDesktopExec(_service, _urls, false, tempFiles, suggestedFileName);
 }
 kdDebug(7010) << "runTempService: KProcess args=" << args << endl;
 
@@ -660,8 +681,17 @@
 if ( mx1.expandMacrosShellQuote( exec ) && !mx1.hasUrls ) {
 Q_ASSERT( supportedProtocols.isEmpty() ); // huh? If you support protocols you need %u or %U...
 } else {
- if ( supportedProtocols.isEmpty() ) // compat: assume KIO if not set
- supportedProtocols.append( "KIO" );
+ if ( supportedProtocols.isEmpty() )
+ {
+ // compat mode: assume KIO if not set and it's a KDE app
+ QStringList categories = _service.property("Categories").toStringList();
+ if ( categories.find("KDE") != categories.end() )
+ supportedProtocols.append( "KIO" );
+ else { // if no KDE app, be a bit over-generic
+ supportedProtocols.append( "http");
+ supportedProtocols.append( "ftp");
+ }
+ }
 }
 kdDebug(7010) << "supportedProtocols:" << supportedProtocols << endl;
 
@@ -685,19 +715,24 @@
 return urls;
 }
 
-// BIC merge with method below
+// BIC merge methods below
 pid_t KRun::run( const KService& _service, const KURL::List& _urls )
 {
- return run( _service, _urls, false );
+ return run( _service, _urls, 0, false, QString::null );
 }
 
 pid_t KRun::run( const KService& _service, const KURL::List& _urls, bool tempFiles )
 {
- return run( _service, _urls, 0, tempFiles );
+ return run( _service, _urls, 0, tempFiles, QString::null );
 }
 
 pid_t KRun::run( const KService& _service, const KURL::List& _urls, QWidget* window, bool tempFiles )
 {
+ return run( _service, _urls, window, tempFiles, QString::null );
+}
+
+pid_t KRun::run( const KService& _service, const KURL::List& _urls, QWidget* window, bool tempFiles, const QString& suggestedFileName )
+{
 if (!_service.desktopEntryPath().isEmpty() &&
 !KDesktopFile::isAuthorizedDesktopFile( _service.desktopEntryPath()))
 {
@@ -716,9 +751,9 @@
 }
 }
 
- if ( tempFiles || _service.desktopEntryPath().isEmpty())
+ if ( tempFiles || _service.desktopEntryPath().isEmpty() || !suggestedFileName.isEmpty() )
 {
- return runTempService(_service, _urls, tempFiles);
+ return runTempService(_service, _urls, tempFiles, suggestedFileName);
 }
 
 kdDebug(7010) << "KRun::run " << _service.desktopEntryPath() << endl;
@@ -1209,7 +1244,7 @@
 m_strURL.setPath( d->m_localPath );
 }
 
- if (!m_bFinished && KRun::runURL( m_strURL, type, false, d->m_runExecutables )){
+ if (!m_bFinished && KRun::runURL( m_strURL, type, false, d->m_runExecutables, d->m_suggestedFileName )){
 m_bFinished = true;
 }
 else{
@@ -1265,6 +1300,11 @@
 d->m_runExecutables = b;
 }
 
+void KRun::setSuggestedFileName( const QString& fileName )
+{
+ d->m_suggestedFileName = fileName;
+}
+
 bool KRun::isExecutable( const QString& serviceType )
 {
 return ( serviceType == "application/x-desktop" ||
Index: kio/kio/kdirwatch.cpp
===================================================================
--- kio/kio/kdirwatch.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kio/kdirwatch.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -273,6 +273,7 @@
 }
 
 if ( supports_inotify ) {
+ available += ", Inotify";
 fcntl(m_inotify_fd, F_SETFD, FD_CLOEXEC);
 
 mSn = new QSocketNotifier( m_inotify_fd, QSocketNotifier::Read, this );
@@ -430,8 +431,8 @@
 //(void) inotify_rm_watch( m_inotify_fd, e->wd );
 addEntry(0, QDir::cleanDirPath(e->path+"/.."), e, true);
 }
- if ( event->mask & IN_CREATE ) {
- kdDebug(7001) << "-->got create subfile signal for " << e->path << endl;
+ if ( event->mask & (IN_CREATE|IN_MOVED_TO) ) {
+ kdDebug(7001) << "-->got new subfile " << path << " in " << e->path << endl;
 
 Entry *sub_entry = e->m_entries.first();
 for(;sub_entry; sub_entry = e->m_entries.next())
@@ -876,6 +877,7 @@
 void KDirWatchPrivate::removeEntry( KDirWatch* instance,
 				 const QString& _path, Entry* sub_entry )
 {
+ kdDebug(7001) << "KDirWatchPrivate::removeEntry for '" << _path << "' sub_entry: " << sub_entry << endl;
 Entry* e = entry(_path);
 if (!e) {
 kdDebug(7001) << "KDirWatchPrivate::removeEntry can't handle '" << _path << "'" << endl;
@@ -1046,7 +1048,7 @@
 if (newWatching == 0)
 return false;
 
- kdDebug(7001) << instance->name() << " restarted scanning " << e->path
+ kdDebug(7001) << (instance ? instance->name() : "all") << " restarted scanning " << e->path
 		<< " (now " << wasWatching+newWatching << " watchers)" << endl;
 
 // restart watching and emit pending events
@@ -1589,7 +1591,7 @@
 
 KDirWatch::~KDirWatch()
 {
- if (d) d->removeEntries(this);
+ d->removeEntries(this);
 if ( d->deref() )
 {
 // delete it if it's the last one
Index: kio/kio/kfilemetainfo.h
===================================================================
--- kio/kio/kfilemetainfo.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kio/kfilemetainfo.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -1149,7 +1149,16 @@
 */
 bool applyChanges();
 
- /**
+ /**
+ * This method writes all pending changes of the meta info to the file @p path.
+ * If any items are marked as removed, they are really removed from the
+ * list. The info object as well as all items are updated.
+ *
+ * @return true if successful, false if not
+ */
+ bool applyChanges(const QString& path);
+
+ /**
 * Checks whether an item with the given @p key exists.
 *
 * @param key the key to check
Index: kio/kio/ktraderparse.h
===================================================================
--- kio/kio/ktraderparse.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kio/ktraderparse.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -1,21 +1,21 @@
 /* This file is part of the KDE project
 Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
- 
+
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Library General Public
 License as published by the Free Software Foundation; either
 version 2 of the License, or (at your option) any later version.
- 
+
 This library is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 Library General Public License for more details.
- 
+
 You should have received a copy of the GNU Library General Public License
 along with this library; see the file COPYING.LIB. If not, write to
 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.
-*/ 
+*/
 
 #ifndef __parse_h__
 #define __parse_h__
@@ -23,7 +23,9 @@
 /*
 * Functions definition for yacc
 */
+void KTraderParse_mainParse( const char *_code );
 void KTraderParse_setParseTree( void *_ptr1 );
+void KTraderParse_error( const char* err );
 void* KTraderParse_newOR( void *_ptr1, void *_ptr2 );
 void* KTraderParse_newAND( void *_ptr1, void *_ptr2 );
 void* KTraderParse_newCMP( void *_ptr1, void *_ptr2, int _i );
Index: kio/kio/kservicetypefactory.cpp
===================================================================
--- kio/kio/kservicetypefactory.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kio/kservicetypefactory.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -283,7 +283,7 @@
 kdError(7011) << QString("KServiceTypeFactory: unexpected object entry in KSycoca database (type = %1)").arg((int)type) << endl;
 break;
 }
- if (!newEntry->isValid())
+ if (newEntry && !newEntry->isValid())
 {
 kdError(7011) << "KServiceTypeFactory: corrupt object in KSycoca database!\n" << endl;
 delete newEntry;
Index: kio/kio/job.cpp
===================================================================
--- kio/kio/job.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kio/job.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -2786,7 +2786,7 @@
 {
 m_conflictError = job->error();
 if ( (m_conflictError == ERR_DIR_ALREADY_EXIST)
- || (m_conflictError == ERR_FILE_ALREADY_EXIST) )
+ || (m_conflictError == ERR_FILE_ALREADY_EXIST) ) // can't happen?
 {
 KURL oldURL = ((SimpleJob*)job)->url();
 // Should we skip automatically ?
@@ -3050,7 +3050,8 @@
 m_conflictError = job->error(); // save for later
 // Existing dest ?
 if ( ( m_conflictError == ERR_FILE_ALREADY_EXIST )
- || ( m_conflictError == ERR_DIR_ALREADY_EXIST ) )
+ || ( m_conflictError == ERR_DIR_ALREADY_EXIST )
+ || ( m_conflictError == ERR_IDENTICAL_FILES ) )
 {
 subjobs.remove( job );
 assert ( subjobs.isEmpty() );
@@ -3132,7 +3133,8 @@
 m_reportTimer->stop();
 
 if ( ( m_conflictError == ERR_FILE_ALREADY_EXIST )
- || ( m_conflictError == ERR_DIR_ALREADY_EXIST ) )
+ || ( m_conflictError == ERR_DIR_ALREADY_EXIST )
+ || ( m_conflictError == ERR_IDENTICAL_FILES ) )
 {
 // Its modification time:
 time_t destmtime = (time_t)-1;
@@ -3161,6 +3163,7 @@
 // Offer overwrite only if the existing thing is a file
 // If src==dest, use "overwrite-itself"
 RenameDlg_Mode mode;
+ bool isDir = true;
 
 if( m_conflictError == ERR_DIR_ALREADY_EXIST )
 mode = (RenameDlg_Mode) 0;
@@ -3172,6 +3175,7 @@
 mode = M_OVERWRITE_ITSELF;
 else
 mode = M_OVERWRITE;
+ isDir = false;
 }
 
 	if ( m_bSingleFileCopy )
@@ -3179,7 +3183,7 @@
 	else
 mode = (RenameDlg_Mode) ( mode | M_MULTI | M_SKIP );
 
- res = Observer::self()->open_RenameDlg( this, m_conflictError == ERR_FILE_ALREADY_EXIST ?
+ res = Observer::self()->open_RenameDlg( this, !isDir ?
 i18n("File Already Exists") : i18n("Already Exists as Folder"),
 (*it).uSource.url(),
 (*it).uDest.url(),
@@ -3602,7 +3606,9 @@
 // In that case it's the _same_ dir, we don't want to copy+del (data loss!)
 if ( m_currentSrcURL.isLocalFile() && m_currentSrcURL.url(-1) != dest.url(-1) &&
 m_currentSrcURL.url(-1).lower() == dest.url(-1).lower() &&
- ( err == ERR_FILE_ALREADY_EXIST || err == ERR_DIR_ALREADY_EXIST ) )
+ ( err == ERR_FILE_ALREADY_EXIST ||
+ err == ERR_DIR_ALREADY_EXIST ||
+ err == ERR_IDENTICAL_FILES ) )
 {
 kdDebug(7007) << "Couldn't rename directly, dest already exists. Detected special case of lower/uppercase renaming in same dir, try with 2 rename calls" << endl;
 QCString _src( QFile::encodeName(m_currentSrcURL.path()) );
@@ -3643,7 +3649,9 @@
 Q_ASSERT( m_currentSrcURL == *m_currentStatSrc );
 
 // Existing dest?
- if ( ( err == ERR_DIR_ALREADY_EXIST || err == ERR_FILE_ALREADY_EXIST )
+ if ( ( err == ERR_DIR_ALREADY_EXIST ||
+ err == ERR_FILE_ALREADY_EXIST ||
+ err == ERR_IDENTICAL_FILES )
 && isInteractive() )
 {
 if (m_reportTimer)
@@ -3693,7 +3701,7 @@
 
 RenameDlg_Result r = Observer::self()->open_RenameDlg(
 this,
- err == ERR_FILE_ALREADY_EXIST ? i18n("File Already Exists") : i18n("Already Exists as Folder"),
+ err != ERR_DIR_ALREADY_EXIST ? i18n("File Already Exists") : i18n("Already Exists as Folder"),
 m_currentSrcURL.url(),
 dest.url(),
 mode, newPath,
Index: kio/kio/authinfo.cpp
===================================================================
--- kio/kio/authinfo.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kio/authinfo.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -326,6 +326,7 @@
 }
 
 delete [] buf;
+ fclose (fstream);
 close (fd);
 return true;
 }
Index: kio/kio/ktraderparse.cpp
===================================================================
--- kio/kio/ktraderparse.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kio/ktraderparse.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -25,26 +25,32 @@
 extern "C"
 {
 #include "ktraderparse.h"
-
-void KTraderParse_mainParse( const char *_code );
 }
 
 #include "ktraderparsetree.h"
+#include <kdebug.h>
 
 using namespace KIO;
 
 static ParseTreeBase::Ptr *pTree = 0;
+static const char* sCode = 0;
 
 ParseTreeBase::Ptr KIO::parseConstraints( const QString& _constr )
 {
- KTraderParse_mainParse( _constr.ascii() );
+ QCString str = _constr.utf8();
+ sCode = str.data();
+ KTraderParse_mainParse( sCode );
+ sCode = 0;
 assert( pTree );
 return *pTree;
 }
 
 ParseTreeBase::Ptr KIO::parsePreferences( const QString& _prefs )
 {
- KTraderParse_mainParse( _prefs.ascii() );
+ QCString str = _prefs.utf8();
+ sCode = str.data();
+ KTraderParse_mainParse( sCode );
+ sCode = 0;
 assert( pTree );
 return *pTree;
 }
@@ -52,10 +58,16 @@
 void KTraderParse_setParseTree( void *_ptr1 )
 {
 if ( !pTree )
- pTree = new ParseTreeBase::Ptr; // ### leak
+ pTree = new ParseTreeBase::Ptr; // ### leak; should use KStaticDeleter
 *pTree = static_cast<ParseTreeBase*>( _ptr1 );
 }
 
+
+void KTraderParse_error( const char* err )
+{
+ kdWarning(7014) << "Parsing '" << sCode << "' gave " << err << endl;
+}
+
 void* KTraderParse_newOR( void *_ptr1, void *_ptr2 )
 {
 return new ParseTreeOR( (ParseTreeBase*)_ptr1, (ParseTreeBase*)_ptr2 );
Index: kio/kio/kdirlister.cpp
===================================================================
--- kio/kio/kdirlister.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kio/kdirlister.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -944,7 +944,7 @@
 // check if anyone wants the mimetypes immediately
 bool delayedMimeTypes = true;
 for ( KDirLister *kdl = listers->first(); kdl; kdl = listers->next() )
- delayedMimeTypes &= kdl->d->delayedMimeTypes;
+ delayedMimeTypes = delayedMimeTypes && kdl->d->delayedMimeTypes;
 
 // avoid creating these QStrings again and again
 static const QString& dot = KGlobal::staticQString(".");
@@ -1521,7 +1521,7 @@
 // check if anyone wants the mimetypes immediately
 bool delayedMimeTypes = true;
 for ( kdl = listers->first(); kdl; kdl = listers->next() )
- delayedMimeTypes &= kdl->d->delayedMimeTypes;
+ delayedMimeTypes = delayedMimeTypes && kdl->d->delayedMimeTypes;
 
 // should be enough to get reasonable speed in most cases
 QDict<KFileItem> fileItems( 9973 );
Index: kio/kio/yacc.c
===================================================================
--- kio/kio/yacc.c	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kio/yacc.c	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 1.875. */
+/* A Bison parser, made by GNU Bison 2.0. */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -15,8 +15,8 @@
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
 
 /* As a special exception, when this file is copied by Bison into a
 Bison output file, you may use that output file without restriction.
@@ -45,8 +45,7 @@
 /* Using locations. */
 #define YYLSP_NEEDED 0
 
-/* If NAME_PREFIX is specified substitute the variables and functions
- names. */
+/* Substitute the variable and function names. */
 #define yyparse kiotraderparse
 #define yylex kiotraderlex
 #define yyerror kiotradererror
@@ -139,7 +138,7 @@
 char *name;
 void *ptr;
 } YYSTYPE;
-/* Line 191 of yacc.c. */
+/* Line 190 of yacc.c. */
 #line 143 "yacc.tab.c"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -151,23 +150,26 @@
 /* Copy the second part of user declarations. */
 
 
-/* Line 214 of yacc.c. */
+/* Line 213 of yacc.c. */
 #line 155 "yacc.tab.c"
 
 #if ! defined (yyoverflow) || YYERROR_VERBOSE
 
+# ifndef YYFREE
+# define YYFREE free
+# endif
+# ifndef YYMALLOC
+# define YYMALLOC malloc
+# endif
+
 /* The parser invokes alloca or malloc; define the necessary symbols. */
 
-# if YYSTACK_USE_ALLOCA
-# define YYSTACK_ALLOC alloca
-# else
-# ifndef YYSTACK_USE_ALLOCA
-# if defined (alloca) || defined (_ALLOCA_H)
+# ifdef YYSTACK_USE_ALLOCA
+# if YYSTACK_USE_ALLOCA
+# ifdef __GNUC__
+# define YYSTACK_ALLOC __builtin_alloca
+# else
 # define YYSTACK_ALLOC alloca
-# else
-# ifdef __GNUC__
-# define YYSTACK_ALLOC __builtin_alloca
-# endif
 # endif
 # endif
 # endif
@@ -180,20 +182,20 @@
 # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
 # define YYSIZE_T size_t
 # endif
-# define YYSTACK_ALLOC malloc
-# define YYSTACK_FREE free
+# define YYSTACK_ALLOC YYMALLOC
+# define YYSTACK_FREE YYFREE
 # endif
 #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
 
 
 #if (! defined (yyoverflow) \
 && (! defined (__cplusplus) \
-	 || (YYSTYPE_IS_TRIVIAL)))
+	 || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member. */
 union yyalloc
 {
- short yyss;
+ short int yyss;
 YYSTYPE yyvs;
 };
 
@@ -203,13 +205,13 @@
 /* The size of an array large to enough to hold all stacks, each with
 N elements. */
 # define YYSTACK_BYTES(N) \
- ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
+ ((N) * (sizeof (short int) + sizeof (YYSTYPE))			\
 + YYSTACK_GAP_MAXIMUM)
 
 /* Copy COUNT objects from FROM to TO. The source and destination do
 not overlap. */
 # ifndef YYCOPY
-# if 1 < __GNUC__
+# if defined (__GNUC__) && 1 < __GNUC__
 # define YYCOPY(To, From, Count) \
 __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 # else
@@ -245,7 +247,7 @@
 #if defined (__STDC__) || defined (__cplusplus)
 typedef signed char yysigned_char;
 #else
- typedef short yysigned_char;
+ typedef short int yysigned_char;
 #endif
 
 /* YYFINAL -- State number of the termination state. */
@@ -344,11 +346,11 @@
 First, the terminals, then, starting at YYNTOKENS, nonterminals. */
 static const char *const yytname[] =
 {
- "$end", "error", "$undefined", "NOT", "EQ", "NEQ", "LEQ", "GEQ", "LE", 
- "GR", "OR", "AND", "TOKEN_IN", "EXIST", "MAX", "MIN", "VAL_BOOL", 
- "VAL_STRING", "VAL_ID", "VAL_NUM", "VAL_FLOAT", "'~'", "'+'", "'-'", 
- "'*'", "'/'", "'('", "')'", "$accept", "constraint", "bool", "bool_or", 
- "bool_and", "bool_compare", "expr_in", "expr_twiddle", "expr", "term", 
+ "$end", "error", "$undefined", "NOT", "EQ", "NEQ", "LEQ", "GEQ", "LE",
+ "GR", "OR", "AND", "TOKEN_IN", "EXIST", "MAX", "MIN", "VAL_BOOL",
+ "VAL_STRING", "VAL_ID", "VAL_NUM", "VAL_FLOAT", "'~'", "'+'", "'-'",
+ "'*'", "'/'", "'('", "')'", "$accept", "constraint", "bool", "bool_or",
+ "bool_and", "bool_compare", "expr_in", "expr_twiddle", "expr", "term",
 "factor_non", "factor", 0
 };
 #endif
@@ -356,7 +358,7 @@
 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
 token YYLEX-NUM. */
-static const unsigned short yytoknum[] =
+static const unsigned short int yytoknum[] =
 {
 0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
@@ -482,7 +484,7 @@
 
 #define YYACCEPT	goto yyacceptlab
 #define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrlab1
+#define YYERROR		goto yyerrorlab
 
 
 /* Like YYERROR except do call yyerror. This remains here temporarily
@@ -510,20 +512,53 @@
 }								\
 while (0)
 
+
 #define YYTERROR	1
 #define YYERRCODE	256
 
-/* YYLLOC_DEFAULT -- Compute the default location (before the actions
- are run). */
 
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+ If N is 0, then set CURRENT to the empty location which ends
+ the previous symbol: RHS[0] (always defined). */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
 #ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N) \
- Current.first_line = Rhs[1].first_line; \
- Current.first_column = Rhs[1].first_column; \
- Current.last_line = Rhs[N].last_line; \
- Current.last_column = Rhs[N].last_column;
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+ do									\
+ if (N)								\
+	{								\
+	 (Current).first_line = YYRHSLOC (Rhs, 1).first_line;	\
+	 (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	 (Current).last_line = YYRHSLOC (Rhs, N).last_line;		\
+	 (Current).last_column = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+ else								\
+	{								\
+	 (Current).first_line = (Current).last_line =		\
+	 YYRHSLOC (Rhs, 0).last_line;				\
+	 (Current).first_column = (Current).last_column =		\
+	 YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+ while (0)
 #endif
 
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+ This macro was not mandated originally: define only if we know
+ we won't break user code: when these are the locations we know. */
+
+#ifndef YY_LOCATION_PRINT
+# if YYLTYPE_IS_TRIVIAL
+# define YY_LOCATION_PRINT(File, Loc)			\
+ fprintf (File, "%d.%d-%d.%d",			\
+ (Loc).first_line, (Loc).first_column,	\
+ (Loc).last_line, (Loc).last_column)
+# else
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
+#endif
+
+
 /* YYLEX -- calling `yylex' with the right arguments. */
 
 #ifdef YYLEX_PARAM
@@ -546,36 +581,30 @@
 YYFPRINTF Args;				\
 } while (0)
 
-# define YYDSYMPRINT(Args)			\
-do {						\
- if (yydebug)					\
- yysymprint Args;				\
-} while (0)
-
-# define YYDSYMPRINTF(Title, Token, Value, Location)		\
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)		\
 do {								\
 if (yydebug)							\
 {								\
 YYFPRINTF (stderr, "%s ", Title);				\
 yysymprint (stderr, 					\
- Token, Value);	\
+ Type, Value);	\
 YYFPRINTF (stderr, "\n");					\
 }								\
 } while (0)
 
 /*------------------------------------------------------------------.
 | yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (cinluded). |
+| TOP (included). |
 `------------------------------------------------------------------*/
 
 #if defined (__STDC__) || defined (__cplusplus)
 static void
-yy_stack_print (short *bottom, short *top)
+yy_stack_print (short int *bottom, short int *top)
 #else
 static void
 yy_stack_print (bottom, top)
- short *bottom;
- short *top;
+ short int *bottom;
+ short int *top;
 #endif
 {
 YYFPRINTF (stderr, "Stack now");
@@ -605,9 +634,9 @@
 #endif
 {
 int yyi;
- unsigned int yylineno = yyrline[yyrule];
+ unsigned int yylno = yyrline[yyrule];
 YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
- yyrule - 1, yylineno);
+ yyrule - 1, yylno);
 /* Print the symbols being reduced, and their result. */
 for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
 YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
@@ -625,8 +654,7 @@
 int yydebug;
 #else /* !YYDEBUG */
 # define YYDPRINTF(Args)
-# define YYDSYMPRINT(Args)
-# define YYDSYMPRINTF(Title, Token, Value, Location)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
 # define YY_STACK_PRINT(Bottom, Top)
 # define YY_REDUCE_PRINT(Rule)
 #endif /* !YYDEBUG */
@@ -644,10 +672,6 @@
 SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
 evaluated with infinite-precision integer arithmetic. */
 
-#if YYMAXDEPTH == 0
-# undef YYMAXDEPTH
-#endif
-
 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH 10000
 #endif
@@ -729,15 +753,15 @@
 (void) yyvaluep;
 
 if (yytype < YYNTOKENS)
- {
- YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-# ifdef YYPRINT
- YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
- }
+ YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
 else
 YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
 
+
+# ifdef YYPRINT
+ if (yytype < YYNTOKENS)
+ YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
 switch (yytype)
 {
 default:
@@ -753,10 +777,11 @@
 
 #if defined (__STDC__) || defined (__cplusplus)
 static void
-yydestruct (int yytype, YYSTYPE *yyvaluep)
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
 #else
 static void
-yydestruct (yytype, yyvaluep)
+yydestruct (yymsg, yytype, yyvaluep)
+ const char *yymsg;
 int yytype;
 YYSTYPE *yyvaluep;
 #endif
@@ -764,6 +789,10 @@
 /* Pacify ``unused variable'' warnings. */
 (void) yyvaluep;
 
+ if (!yymsg)
+ yymsg = "Deleting";
+ YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
 switch (yytype)
 {
 
@@ -791,10 +820,10 @@
 
 
 
-/* The lookahead symbol. */
+/* The look-ahead symbol. */
 int yychar;
 
-/* The semantic value of the lookahead symbol. */
+/* The semantic value of the look-ahead symbol. */
 YYSTYPE yylval;
 
 /* Number of syntax errors so far. */
@@ -830,7 +859,7 @@
 int yyresult;
 /* Number of tokens to shift before error messages enabled. */
 int yyerrstatus;
- /* Lookahead token as an internal (translated) token number. */
+ /* Look-ahead token as an internal (translated) token number. */
 int yytoken = 0;
 
 /* Three stacks and their tools:
@@ -842,9 +871,9 @@
 to reallocate them elsewhere. */
 
 /* The state stack. */
- short	yyssa[YYINITDEPTH];
- short *yyss = yyssa;
- register short *yyssp;
+ short int yyssa[YYINITDEPTH];
+ short int *yyss = yyssa;
+ register short int *yyssp;
 
 /* The semantic value stack. */
 YYSTYPE yyvsa[YYINITDEPTH];
@@ -881,6 +910,9 @@
 yyssp = yyss;
 yyvsp = yyvs;
 
+
+ yyvsp[0] = yylval;
+
 goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -906,7 +938,7 @@
 	 these so that the &'s don't force the real ones into
 	 memory. */
 	YYSTYPE *yyvs1 = yyvs;
-	short *yyss1 = yyss;
+	short int *yyss1 = yyss;
 
 
 	/* Each stack pointer address is followed by the size of the
@@ -934,7 +966,7 @@
 	yystacksize = YYMAXDEPTH;
 
 {
-	short *yyss1 = yyss;
+	short int *yyss1 = yyss;
 	union yyalloc *yyptr =
 	 (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
@@ -970,18 +1002,18 @@
 yybackup:
 
 /* Do appropriate processing given the current state. */
-/* Read a lookahead token if we need one and don't already have one. */
+/* Read a look-ahead token if we need one and don't already have one. */
 /* yyresume: */
 
- /* First try to decide what to do without reference to lookahead token. */
+ /* First try to decide what to do without reference to look-ahead token. */
 
 yyn = yypact[yystate];
 if (yyn == YYPACT_NINF)
 goto yydefault;
 
- /* Not known => get a lookahead token if don't already have one. */
+ /* Not known => get a look-ahead token if don't already have one. */
 
- /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
+ /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */
 if (yychar == YYEMPTY)
 {
 YYDPRINTF ((stderr, "Reading a token: "));
@@ -996,7 +1028,7 @@
 else
 {
 yytoken = YYTRANSLATE (yychar);
- YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
+ YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
 }
 
 /* If the proper action on seeing token YYTOKEN is to reduce or to
@@ -1016,8 +1048,8 @@
 if (yyn == YYFINAL)
 YYACCEPT;
 
- /* Shift the lookahead token. */
- YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
+ /* Shift the look-ahead token. */
+ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
 /* Discard the token being shifted unless it is eof. */
 if (yychar != YYEOF)
@@ -1073,179 +1105,179 @@
 
 case 3:
 #line 57 "yacc.y"
- { KTraderParse_setParseTree( yyvsp[0].ptr ); ;}
+ { KTraderParse_setParseTree( (yyvsp[0].ptr) ); ;}
 break;
 
 case 4:
 #line 60 "yacc.y"
- { yyval.ptr = yyvsp[0].ptr; ;}
+ { (yyval.ptr) = (yyvsp[0].ptr); ;}
 break;
 
 case 5:
 #line 63 "yacc.y"
- { yyval.ptr = KTraderParse_newOR( yyvsp[-2].ptr, yyvsp[0].ptr ); ;}
+ { (yyval.ptr) = KTraderParse_newOR( (yyvsp[-2].ptr), (yyvsp[0].ptr) ); ;}
 break;
 
 case 6:
 #line 64 "yacc.y"
- { yyval.ptr = yyvsp[0].ptr; ;}
+ { (yyval.ptr) = (yyvsp[0].ptr); ;}
 break;
 
 case 7:
 #line 67 "yacc.y"
- { yyval.ptr = KTraderParse_newAND( yyvsp[-2].ptr, yyvsp[0].ptr ); ;}
+ { (yyval.ptr) = KTraderParse_newAND( (yyvsp[-2].ptr), (yyvsp[0].ptr) ); ;}
 break;
 
 case 8:
 #line 68 "yacc.y"
- { yyval.ptr = yyvsp[0].ptr; ;}
+ { (yyval.ptr) = (yyvsp[0].ptr); ;}
 break;
 
 case 9:
 #line 71 "yacc.y"
- { yyval.ptr = KTraderParse_newCMP( yyvsp[-2].ptr, yyvsp[0].ptr, 1 ); ;}
+ { (yyval.ptr) = KTraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 1 ); ;}
 break;
 
 case 10:
 #line 72 "yacc.y"
- { yyval.ptr = KTraderParse_newCMP( yyvsp[-2].ptr, yyvsp[0].ptr, 2 ); ;}
+ { (yyval.ptr) = KTraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 2 ); ;}
 break;
 
 case 11:
 #line 73 "yacc.y"
- { yyval.ptr = KTraderParse_newCMP( yyvsp[-2].ptr, yyvsp[0].ptr, 3 ); ;}
+ { (yyval.ptr) = KTraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 3 ); ;}
 break;
 
 case 12:
 #line 74 "yacc.y"
- { yyval.ptr = KTraderParse_newCMP( yyvsp[-2].ptr, yyvsp[0].ptr, 4 ); ;}
+ { (yyval.ptr) = KTraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 4 ); ;}
 break;
 
 case 13:
 #line 75 "yacc.y"
- { yyval.ptr = KTraderParse_newCMP( yyvsp[-2].ptr, yyvsp[0].ptr, 5 ); ;}
+ { (yyval.ptr) = KTraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 5 ); ;}
 break;
 
 case 14:
 #line 76 "yacc.y"
- { yyval.ptr = KTraderParse_newCMP( yyvsp[-2].ptr, yyvsp[0].ptr, 6 ); ;}
+ { (yyval.ptr) = KTraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 6 ); ;}
 break;
 
 case 15:
 #line 77 "yacc.y"
- { yyval.ptr = yyvsp[0].ptr; ;}
+ { (yyval.ptr) = (yyvsp[0].ptr); ;}
 break;
 
 case 16:
 #line 80 "yacc.y"
- { yyval.ptr = KTraderParse_newIN( yyvsp[-2].ptr, KTraderParse_newID( yyvsp[0].name ) ); ;}
+ { (yyval.ptr) = KTraderParse_newIN( (yyvsp[-2].ptr), KTraderParse_newID( (yyvsp[0].name) ) ); ;}
 break;
 
 case 17:
 #line 81 "yacc.y"
- { yyval.ptr = yyvsp[0].ptr; ;}
+ { (yyval.ptr) = (yyvsp[0].ptr); ;}
 break;
 
 case 18:
 #line 84 "yacc.y"
- { yyval.ptr = KTraderParse_newMATCH( yyvsp[-2].ptr, yyvsp[0].ptr ); ;}
+ { (yyval.ptr) = KTraderParse_newMATCH( (yyvsp[-2].ptr), (yyvsp[0].ptr) ); ;}
 break;
 
 case 19:
 #line 85 "yacc.y"
- { yyval.ptr = yyvsp[0].ptr; ;}
+ { (yyval.ptr) = (yyvsp[0].ptr); ;}
 break;
 
 case 20:
 #line 88 "yacc.y"
- { yyval.ptr = KTraderParse_newCALC( yyvsp[-2].ptr, yyvsp[0].ptr, 1 ); ;}
+ { (yyval.ptr) = KTraderParse_newCALC( (yyvsp[-2].ptr), (yyvsp[0].ptr), 1 ); ;}
 break;
 
 case 21:
 #line 89 "yacc.y"
- { yyval.ptr = KTraderParse_newCALC( yyvsp[-2].ptr, yyvsp[0].ptr, 2 ); ;}
+ { (yyval.ptr) = KTraderParse_newCALC( (yyvsp[-2].ptr), (yyvsp[0].ptr), 2 ); ;}
 break;
 
 case 22:
 #line 90 "yacc.y"
- { yyval.ptr = yyvsp[0].ptr; ;}
+ { (yyval.ptr) = (yyvsp[0].ptr); ;}
 break;
 
 case 23:
 #line 93 "yacc.y"
- { yyval.ptr = KTraderParse_newCALC( yyvsp[-2].ptr, yyvsp[0].ptr, 3 ); ;}
+ { (yyval.ptr) = KTraderParse_newCALC( (yyvsp[-2].ptr), (yyvsp[0].ptr), 3 ); ;}
 break;
 
 case 24:
 #line 94 "yacc.y"
- { yyval.ptr = KTraderParse_newCALC( yyvsp[-2].ptr, yyvsp[0].ptr, 4 ); ;}
+ { (yyval.ptr) = KTraderParse_newCALC( (yyvsp[-2].ptr), (yyvsp[0].ptr), 4 ); ;}
 break;
 
 case 25:
 #line 95 "yacc.y"
- { yyval.ptr = yyvsp[0].ptr; ;}
+ { (yyval.ptr) = (yyvsp[0].ptr); ;}
 break;
 
 case 26:
 #line 98 "yacc.y"
- { yyval.ptr = KTraderParse_newNOT( yyvsp[0].ptr ); ;}
+ { (yyval.ptr) = KTraderParse_newNOT( (yyvsp[0].ptr) ); ;}
 break;
 
 case 27:
 #line 99 "yacc.y"
- { yyval.ptr = yyvsp[0].ptr; ;}
+ { (yyval.ptr) = (yyvsp[0].ptr); ;}
 break;
 
 case 28:
 #line 102 "yacc.y"
- { yyval.ptr = KTraderParse_newBRACKETS( yyvsp[-1].ptr ); ;}
+ { (yyval.ptr) = KTraderParse_newBRACKETS( (yyvsp[-1].ptr) ); ;}
 break;
 
 case 29:
 #line 103 "yacc.y"
- { yyval.ptr = KTraderParse_newEXIST( yyvsp[0].name ); ;}
+ { (yyval.ptr) = KTraderParse_newEXIST( (yyvsp[0].name) ); ;}
 break;
 
 case 30:
 #line 104 "yacc.y"
- { yyval.ptr = KTraderParse_newID( yyvsp[0].name ); ;}
+ { (yyval.ptr) = KTraderParse_newID( (yyvsp[0].name) ); ;}
 break;
 
 case 31:
 #line 105 "yacc.y"
- { yyval.ptr = KTraderParse_newNUM( yyvsp[0].vali ); ;}
+ { (yyval.ptr) = KTraderParse_newNUM( (yyvsp[0].vali) ); ;}
 break;
 
 case 32:
 #line 106 "yacc.y"
- { yyval.ptr = KTraderParse_newFLOAT( yyvsp[0].vald ); ;}
+ { (yyval.ptr) = KTraderParse_newFLOAT( (yyvsp[0].vald) ); ;}
 break;
 
 case 33:
 #line 107 "yacc.y"
- { yyval.ptr = KTraderParse_newSTRING( yyvsp[0].name ); ;}
+ { (yyval.ptr) = KTraderParse_newSTRING( (yyvsp[0].name) ); ;}
 break;
 
 case 34:
 #line 108 "yacc.y"
- { yyval.ptr = KTraderParse_newBOOL( yyvsp[0].valb ); ;}
+ { (yyval.ptr) = KTraderParse_newBOOL( (yyvsp[0].valb) ); ;}
 break;
 
 case 35:
 #line 109 "yacc.y"
- { yyval.ptr = KTraderParse_newMAX2( yyvsp[0].name ); ;}
+ { (yyval.ptr) = KTraderParse_newMAX2( (yyvsp[0].name) ); ;}
 break;
 
 case 36:
 #line 110 "yacc.y"
- { yyval.ptr = KTraderParse_newMIN2( yyvsp[0].name ); ;}
+ { (yyval.ptr) = KTraderParse_newMIN2( (yyvsp[0].name) ); ;}
 break;
 
 
 }
 
-/* Line 999 of yacc.c. */
-#line 1248 "yacc.tab.c"
+/* Line 1037 of yacc.c. */
+#line 1281 "yacc.tab.c"
 
 yyvsp -= yylen;
 yyssp -= yylen;
@@ -1286,18 +1318,33 @@
 	{
 	 YYSIZE_T yysize = 0;
 	 int yytype = YYTRANSLATE (yychar);
+	 const char* yyprefix;
 	 char *yymsg;
-	 int yyx, yycount;
+	 int yyx;
 
-	 yycount = 0;
 	 /* Start YYX at -YYN if negative to avoid negative indexes in
 	 YYCHECK. */
-	 for (yyx = yyn < 0 ? -yyn : 0;
-	 yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
+	 int yyxbegin = yyn < 0 ? -yyn : 0;
+
+	 /* Stay within bounds of both yycheck and yytname. */
+	 int yychecklim = YYLAST - yyn;
+	 int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+	 int yycount = 0;
+
+	 yyprefix = ", expecting ";
+	 for (yyx = yyxbegin; yyx < yyxend; ++yyx)
 	 if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	 yysize += yystrlen (yytname[yyx]) + 15, yycount++;
-	 yysize += yystrlen ("syntax error, unexpected ") + 1;
-	 yysize += yystrlen (yytname[yytype]);
+	 {
+		yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
+		yycount += 1;
+		if (yycount == 5)
+		 {
+		 yysize = 0;
+		 break;
+		 }
+	 }
+	 yysize += (sizeof ("syntax error, unexpected ")
+		 + yystrlen (yytname[yytype]));
 	 yymsg = (char *) YYSTACK_ALLOC (yysize);
 	 if (yymsg != 0)
 	 {
@@ -1306,16 +1353,13 @@
 
 	 if (yycount < 5)
 		{
-		 yycount = 0;
-		 for (yyx = yyn < 0 ? -yyn : 0;
-		 yyx < (int) (sizeof (yytname) / sizeof (char *));
-		 yyx++)
+		 yyprefix = ", expecting ";
+		 for (yyx = yyxbegin; yyx < yyxend; ++yyx)
 		 if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
 		 {
-			const char *yyq = ! yycount ? ", expecting " : " or ";
-			yyp = yystpcpy (yyp, yyq);
+			yyp = yystpcpy (yyp, yyprefix);
 			yyp = yystpcpy (yyp, yytname[yyx]);
-			yycount++;
+			yyprefix = " or ";
 		 }
 		}
 	 yyerror (yymsg);
@@ -1333,38 +1377,57 @@
 
 if (yyerrstatus == 3)
 {
- /* If just tried and failed to reuse lookahead token after an
+ /* If just tried and failed to reuse look-ahead token after an
 	 error, discard it. */
 
- /* Return failure if at end of input. */
- if (yychar == YYEOF)
+ if (yychar <= YYEOF)
 {
-	 /* Pop the error token. */
- YYPOPSTACK;
-	 /* Pop the rest of the stack. */
-	 while (yyss < yyssp)
-	 {
-	 YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-	 yydestruct (yystos[*yyssp], yyvsp);
-	 YYPOPSTACK;
-	 }
-	 YYABORT;
+ /* If at end of input, pop the error token,
+	 then the rest of the stack, then return failure. */
+	 if (yychar == YYEOF)
+	 for (;;)
+	 {
+
+		 YYPOPSTACK;
+		 if (yyssp == yyss)
+		 YYABORT;
+		 yydestruct ("Error: popping",
+ yystos[*yyssp], yyvsp);
+	 }
 }
-
- YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
- yydestruct (yytoken, &yylval);
- yychar = YYEMPTY;
-
+ else
+	{
+	 yydestruct ("Error: discarding", yytoken, &yylval);
+	 yychar = YYEMPTY;
+	}
 }
 
- /* Else will try to reuse lookahead token after shifting the error
+ /* Else will try to reuse look-ahead token after shifting the error
 token. */
 goto yyerrlab1;
 
 
-/*----------------------------------------------------.
-| yyerrlab1 -- error raised explicitly by an action. |
-`----------------------------------------------------*/
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR. |
+`---------------------------------------------------*/
+yyerrorlab:
+
+#ifdef __GNUC__
+ /* Pacify GCC when the user code never invokes YYERROR and the label
+ yyerrorlab therefore never appears in user code. */
+ if (0)
+ goto yyerrorlab;
+#endif
+
+yyvsp -= yylen;
+ yyssp -= yylen;
+ yystate = *yyssp;
+ goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR. |
+`-------------------------------------------------------------*/
 yyerrlab1:
 yyerrstatus = 3;	/* Each real token shifted decrements this. */
 
@@ -1386,22 +1449,22 @@
 if (yyssp == yyss)
 	YYABORT;
 
- YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
- yydestruct (yystos[yystate], yyvsp);
- yyvsp--;
- yystate = *--yyssp;
 
+ yydestruct ("Error: popping", yystos[yystate], yyvsp);
+ YYPOPSTACK;
+ yystate = *yyssp;
 YY_STACK_PRINT (yyss, yyssp);
 }
 
 if (yyn == YYFINAL)
 YYACCEPT;
 
- YYDPRINTF ((stderr, "Shifting error token, "));
-
 *++yyvsp = yylval;
 
 
+ /* Shift the error token. */
+ YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
 yystate = yyn;
 goto yynewstate;
 
@@ -1417,6 +1480,9 @@
 | yyabortlab -- YYABORT comes here. |
 `-----------------------------------*/
 yyabortlab:
+ yydestruct ("Error: discarding lookahead",
+ yytoken, &yylval);
+ yychar = YYEMPTY;
 yyresult = 1;
 goto yyreturn;
 
@@ -1439,12 +1505,12 @@
 }
 
 
-#line 56 "yacc.y"
+#line 115 "yacc.y"
 
 
 void yyerror ( const char *s ) /* Called by yyparse on error */
 {
- printf ("ERROR: %s\n", s);
+ KTraderParse_error( s );
 }
 
 void KTraderParse_mainParse( const char *_code )
Index: kio/kio/forwardingslavebase.cpp
===================================================================
--- kio/kio/forwardingslavebase.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kio/forwardingslavebase.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,10 +69,8 @@
 kdDebug() << "ForwardingSlaveBase::prepareUDSEntry: listing=="
 << listing << endl;
 
- bool mimetype_found = false;
- bool name_found = false;
 bool url_found = false;
- QString name, mimetype;
+ QString name;
 KURL url;
 
 KIO::UDSEntry::iterator it = entry.begin();
@@ -85,7 +83,6 @@
 switch( (*it).m_uds )
 {
 case KIO::UDS_NAME:
- name_found = true;
 name = (*it).m_str;
 kdDebug() << "Name = " << name << endl;
 	 break;
@@ -100,38 +97,9 @@
 kdDebug() << "URL = " << url << endl;
 kdDebug() << "New URL = " << (*it).m_str << endl;
 break;
- case KIO::UDS_MIME_TYPE:
- mimetype_found = true;
- mimetype = (*it).m_str;
- kdDebug() << "Mimetype = " << (*it).m_str << endl;
- break;
 }
 }
 
- if (!mimetype_found)
- {
- KURL new_url = m_processedURL;
- if (url_found && listing)
- {
- new_url.addPath( url.fileName() );
- }
- else if (name_found && listing)
- {
- new_url.addPath( name );
- }
-
- KMimeType::Ptr mime = KMimeType::findByURL(new_url);
- mimetype = mime->name();
-
- KIO::UDSAtom atom;
- atom.m_uds = KIO::UDS_MIME_TYPE;
- atom.m_long = 0;
- atom.m_str = mimetype;
- entry.append(atom);
-
- kdDebug() << "New Mimetype = " << mime->name() << endl;
- }
-
 if ( m_processedURL.isLocalFile() )
 {
 KURL new_url = m_processedURL;
Index: kio/renamedlgplugin.desktop
===================================================================
--- kio/renamedlgplugin.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/renamedlgplugin.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,7 +69,7 @@
 Comment[uk]=Втулок для діалогу перейменування
 Comment[uz]=Номини ўзгартириш диалоги учун плагин
 Comment[ven]=Pulagini uitela u rinulula nyambedzano
-Comment[vi]=Plugin cho Rename Dialog
+Comment[vi]=Bộ cầm phít cho hộp thoại thay đổi tên.
 Comment[wa]=Tchôke-divins pol purnea di rlomaedje
 Comment[xh]=Iplagi yangaphakathi Yencoko yababini Yokunika igama elitsha
 Comment[zh_CN]=重命名对话的插件
Index: kio/kioexec/main.cpp
===================================================================
--- kio/kioexec/main.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kioexec/main.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -52,6 +52,7 @@
 static KCmdLineOptions options[] =
 {
 { "tempfiles", I18N_NOOP("Treat URLs as local files and delete them afterwards"), 0 },
+ { "suggestedfilename <file name>", I18N_NOOP("Suggested file name for the downloaded file"), 0 },
 { "+command", I18N_NOOP("Command to execute"), 0 },
 { "+[URLs]", I18N_NOOP("URL(s) or local file(s) used for 'command'"), 0 },
 KCmdLineLastOption
@@ -72,7 +73,8 @@
 KCmdLineArgs::usage(i18n("'command' expected.\n"));
 
 tempfiles = args->isSet("tempfiles");
-
+ if ( args->isSet( "suggestedfilename" ) )
+ suggestedFileName = QString::fromLocal8Bit( args->getOption( "suggestedfilename" ) );
 expectedCounter = 0;
 command = args->arg(0);
 kdDebug() << "command=" << command << endl;
@@ -101,6 +103,8 @@
 // We must fetch the file
 {
 QString fileName = KIO::encodeFileName( url.fileName() );
+ if ( !suggestedFileName.isEmpty() )
+ fileName = suggestedFileName;
 // Build the destination filename, in ~/.kde/cache-*/krun/
 // Unlike KDE-1.1, we put the filename at the end so that the extension is kept
 // (Some programs rely on it)
Index: kio/kioexec/main.h
===================================================================
--- kio/kioexec/main.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kioexec/main.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -20,6 +20,7 @@
 
 protected:
 bool tempfiles;
+ QString suggestedFileName;
 int counter;
 int expectedCounter;
 QString command;
Index: kio/bookmarks/kbookmarkbar.cc
===================================================================
--- kio/bookmarks/kbookmarkbar.cc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/bookmarks/kbookmarkbar.cc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -310,7 +310,7 @@
 p->m_sepToolBar = tb;
 p->m_sepToolBar->removeItemDelayed(const_sepId);
 
- int index;
+ int index = 0;
 KToolBarButton* b;
 
 b = dynamic_cast<KToolBarButton*>(tb->childAt(pos));
Index: kio/kfile/kmetaprops.cpp
===================================================================
--- kio/kfile/kmetaprops.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kfile/kmetaprops.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -262,7 +262,7 @@
 QPtrListIterator<KFileMetaInfoWidget> it( d->m_editWidgets );
 KFileMetaInfoWidget* w;
 for (; (w = it.current()); ++it) w->apply();
- d->m_info.applyChanges();
+ d->m_info.applyChanges(properties->kurl().path());
 }
 
 #include "kmetaprops.moc"
Index: kio/kfile/kpropsdlgplugin.desktop
===================================================================
--- kio/kfile/kpropsdlgplugin.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kfile/kpropsdlgplugin.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -71,7 +71,7 @@
 Comment[uk]=Втулок для діалогу властивостей
 Comment[uz]=Хоссалар диалоги учун плагин
 Comment[ven]=U pulaga ha zwishumiswa zwa nyambedzano
-Comment[vi]=Plugin cho tính chất của hộp thoại 
+Comment[vi]=Bộ cầm phít cho hộp thoại đặc tả.
 Comment[xh]=Iplagi yangaphakathi Yezinto zobumnini Zencoko yababini
 Comment[zh_CN]=属性对话的插件
 Comment[zh_HK]=屬性對話盒的外掛程式
Index: kio/kfile/kfiledialog.cpp
===================================================================
--- kio/kfile/kfiledialog.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kfile/kfiledialog.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -402,8 +402,9 @@
 }
 }
 
+ KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget());
 if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly &&
- !d->url.isLocalFile() ) {
+ !url.isLocalFile() ) {
 // ### after message freeze, add message for directories!
 KMessageBox::sorry( d->mainWidget,
 i18n("You can only select local files."),
@@ -411,6 +412,7 @@
 return;
 }
 
+ d->url = url;
 accept();
 return;
 }
@@ -444,15 +446,16 @@
 return;
 }
 
+ KURL url = KIO::NetAccess::mostLocalURL(selectedURL,topLevelWidget());
 if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly &&
- !selectedURL.isLocalFile() ) {
+ !url.isLocalFile() ) {
 KMessageBox::sorry( d->mainWidget,
 i18n("You can only select local files."),
 i18n("Remote Files Not Accepted") );
 return;
 }
 
- d->url = selectedURL;
+ d->url = url;
 
 // d->url is a correct URL now
 
@@ -1536,8 +1539,9 @@
 {
 if ( result() == QDialog::Accepted )
 {
- if (d->url.isLocalFile())
- return d->url.path();
+ KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget());
+ if (url.isLocalFile())
+ return url.path();
 else {
 KMessageBox::sorry( d->mainWidget,
 i18n("You can only select local files."),
@@ -1550,14 +1554,16 @@
 QStringList KFileDialog::selectedFiles() const
 {
 QStringList list;
+ KURL url;
 
 if ( result() == QDialog::Accepted ) {
 if ( (ops->mode() & KFile::Files) == KFile::Files ) {
 KURL::List urls = parseSelectedURLs();
 QValueListConstIterator<KURL> it = urls.begin();
 while ( it != urls.end() ) {
- if ( (*it).isLocalFile() )
- list.append( (*it).path() );
+ url = KIO::NetAccess::mostLocalURL(*it,topLevelWidget());
+ if ( url.isLocalFile() )
+ list.append( url.path() );
 ++it;
 }
 }
Index: kio/kdatatool.desktop
===================================================================
--- kio/kdatatool.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kdatatool.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -32,7 +32,7 @@
 Comment[id]=Tool Data KDE
 Comment[is]=KDE gagnatól
 Comment[it]=Strumenti dati di KDE
-Comment[ja]=KDEデータツール
+Comment[ja]=KDE データツール
 Comment[km]=ឧបករណ៍ទិន្នន័យ KDE
 Comment[ko]=KDE 자료 연장
 Comment[lb]=KDE-Donnéen-Hëllefsprogramm
@@ -70,7 +70,7 @@
 Comment[uk]=Засіб роботи з даними KDE
 Comment[uz]=KDE маълумот воситаси
 Comment[ven]=Tshishumiswa tsha data tsha KDE
-Comment[vi]=Công cụ KDE Data
+Comment[vi]=Công cụ dữ liệu KDE.
 Comment[xh]=Isihluzi se Data ye KDE
 Comment[zh_CN]=KDE 数据工具
 Comment[zh_HK]=KDE 資料工具
Index: kio/misc/kssld/kssld.desktop
===================================================================
--- kio/misc/kssld/kssld.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/misc/kssld/kssld.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -72,6 +72,7 @@
 Name[uk]=Модуль демону KSSL
 Name[uz]=KSSL хизматининг модули
 Name[ven]=Modulu wa Daemon wa KSSL
+Name[vi]=Mô-đun trình nền KSSL
 Name[xh]=Isicatshulwa se KSSL Daemon
 Name[zh_CN]=KSSL 守护进程模块
 Name[zh_HK]=KSSL 伺服程式模組
@@ -131,5 +132,6 @@
 Comment[tt]=KDED öçen KSSL xezmät
 Comment[uk]=Модуль демону KSSL для KDED
 Comment[uz]=KDED учун KSSL хизматининг модули
+Comment[vi]=Mô-đun trình nền KSSL cho KDED.
 Comment[zh_CN]=KDED 的 KSSL 守护进程模块
 Comment[zh_HK]=KDED 使用的 SSL 伺服程式模組
Index: kio/misc/mms.protocol
===================================================================
--- kio/misc/mms.protocol	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/misc/mms.protocol	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -11,11 +11,12 @@
 Description=Microsoft Media Server Protocol
 Description[af]=Microsoft Media Bediener Protokol
 Description[bn]=মাইক্রোসফ্‌ট মিডিয়া সার্ভার প্রোটোকল
+Description[bs]=Microsoft Media Server protokol
 Description[ca]=Protocol Microsoft Media Server
 Description[cs]=Microsoft Media Server protokol
 Description[da]=Microsoft Medieserver-protokol
 Description[de]=Microsoft Media Server Protokoll
-Description[el]=Προτόκολο Microsoft Media Server
+Description[el]=Πρωτόκολλο Microsoft Media Server
 Description[es]=Protocolo Microsoft Media Server
 Description[et]=Microsoft Media Server protokoll
 Description[eu]=Microsoft Media Server protokoloa
@@ -53,6 +54,7 @@
 Description[tr]=Microsoft Media Server Protokolü
 Description[tt]=Microsoft Media Server Protokolı
 Description[uk]=Протокол медіа сервера Microsoft
+Description[vi]=Giao thức trình phục vụ phương tiện Microsoft™.
 Description[zh_CN]=Microsoft 媒体服务器协议
 Description[zh_HK]=Microsoft Media Server 協定
 URIMode=url
Index: kio/misc/ksendbugmail/smtp.cpp
===================================================================
--- kio/misc/ksendbugmail/smtp.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/misc/ksendbugmail/smtp.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -212,6 +212,10 @@
 if(socket == 0L || socket->socket() < 0)
 return;
 n = read(socket->socket(), readBuffer, SMTP_READ_BUFFER_SIZE-1 );
+
+ if(n < 0)
+ return;
+
 readBuffer[n] = '\0';
 lineBuffer += readBuffer;
 nl = lineBuffer.find('\n');
Index: kio/misc/kwalletd/kwalletd.desktop
===================================================================
--- kio/misc/kwalletd/kwalletd.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/misc/kwalletd/kwalletd.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -67,6 +67,7 @@
 Name[tt]=KWallet Xezmäteneñ Modulı
 Name[uk]=Модуль демону KWallet
 Name[uz]=KWallet хизматининг модули
+Name[vi]=Mô-đun trình nền KWallet
 Name[zh_CN]=KWallet 守护进程模块
 Name[zh_HK]=KWAllet 伺服程式模組
 Name[zh_TW]=KWAllet 服務程式模組
@@ -122,5 +123,6 @@
 Comment[tt]=KDED öçen KWallet xezmäteneñ modulı
 Comment[uk]=Модуль демону торбинок KWallet для KDED
 Comment[uz]=KDED учун KWallet хизматининг модули
+Comment[vi]=Mô-đun trình nền KWallet cho KDED.
 Comment[zh_CN]=KDED 的 KWallet 守护进程模块
 Comment[zh_HK]=KDED 的 KWallet 伺服程式模組
Index: kio/misc/kwalletd/kwalletd.cpp
===================================================================
--- kio/misc/kwalletd/kwalletd.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/misc/kwalletd/kwalletd.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -418,6 +418,7 @@
 
 		const char *p = 0L;
 		while (!b->isOpen()) {
+			assert(kpd); // kpd can't be null if isOpen() is false
 #ifdef Q_WS_X11
 			XSetTransientForHint(qt_xdisplay(), kpd->winId(), w);
 #endif
Index: kio/misc/ktelnetservice.cpp
===================================================================
--- kio/misc/ktelnetservice.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/misc/ktelnetservice.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -27,6 +27,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kprocess.h>
+#include <ksimpleconfig.h>
 
 static const KCmdLineOptions options[] =
 {
@@ -48,9 +49,14 @@
 	if (args->count() != 1)
 		return 1;
 
+	KConfig *config = new KConfig("kdeglobals", true);
+	config->setGroup("General");
+	QString terminal = config->readPathEntry("TerminalApplication", "konsole");
+
 	KURL url(args->arg(0));
 	QStringList cmd;
-	cmd << "--noclose";
+	if (terminal == "konsole")
+	 cmd << "--noclose";
 
 	cmd << "-e";
 if ( url.protocol() == "telnet" )
@@ -98,7 +104,7 @@
 		cmd << QString::number(url.port());
 	}
 
-	app.kdeinitExec("konsole", cmd);
+	app.kdeinitExec(terminal, cmd);
 
 	return 0;
 }
Index: kio/misc/kpac/eventsrc
===================================================================
--- kio/misc/kpac/eventsrc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/misc/kpac/eventsrc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -63,6 +63,7 @@
 Comment[tt]=Proxy'nı Aqıllı Caylaw
 Comment[uk]=Автоматичне визначення проксі сервера
 Comment[uz]=Проксини автоматик равишда мослаш
+Comment[vi]=Cấu hình ủy nhiệm tự động.
 Comment[wa]=Apontiaedje otomatike do procsi
 Comment[zh_CN]=自动代理配置
 Comment[zh_HK]=自動代理組態
@@ -131,6 +132,7 @@
 Name[tt]=Proxy ämerlege bozıq
 Name[uk]=Неправильний скрипт для проксі
 Name[uz]=Прокси скрипти ҳақиқий эмас
+Name[vi]=Tập lệnh ủy nhiệm không hợp lệ
 Name[zh_CN]=无效的代理脚本
 Name[zh_HK]=不合法的代理伺服器 script
 Name[zh_TW]=不合法 proxy 命令稿檔案
@@ -195,6 +197,7 @@
 Comment[tt]=Proxy caylaw öçen iñderelgän ämerlek bozıq bulğan
 Comment[uk]=Звантажений скрипт для визначення проксі сервера неправильний
 Comment[uz]=Проксини мослаш учун ёзиб олинган скрипт ҳақиқий эмас
+Comment[vi]=Tập lệnh cấu hình ủy nhiệm đã được tải xuống không phải là hợp lệ.
 Comment[zh_CN]=下载的代理配置脚本是无效的
 Comment[zh_HK]=剛下載的代理伺服器組態 script 語法有誤
 Comment[zh_TW]=代理組態的 script 檔案語法有誤
@@ -265,6 +268,7 @@
 Name[tt]=Ämerlek iñderü xatarı
 Name[uk]=Помилка звантаження скрипту
 Name[uz]=Скриптни ёзиб олишда хато рўй берди
+Name[vi]=Lỗi tải xuống tập lệnh
 Name[zh_CN]=脚本下载错误
 Name[zh_HK]=Script 下載錯誤
 Name[zh_TW]=Script 下載錯誤
@@ -298,7 +302,7 @@
 Comment[hu]=A proxybeállító szkript letöltése nem sikerült
 Comment[is]=Gat ekki sótt stillingaskriftu milliþjóns
 Comment[it]=Impossibile scaricare lo script di configurazione proxy
-Comment[ja]=プロキシ設定スクリプトをダウンロードすることができないかもしれません。
+Comment[ja]=プロキシ設定スクリプトをダウンロードできませんでした
 Comment[km]=មិនអាចទាញយកស្គ្រីបកំណត់រចនាសម្ព័ន្ធប្រូកស៊ី
 Comment[ko]=프록시 설정 스크립트를 내려받지 못합니다
 Comment[lb]=D'Proxy-Konfiguratiounsskript konnt net erofgeluede ginn
@@ -330,6 +334,7 @@
 Comment[tt]=Bu proxy caylaw ämerlegen iñderep bulmadı
 Comment[uk]=Не вдається звантажити скрипт для визначення проксі сервера
 Comment[uz]=Проксини мослаш учун скриптни ёзиб олиб бўлмади
+Comment[vi]=Không thể tải xuống tập lệnh cấu hình ủy nhiệm.
 Comment[zh_CN]=代理配置脚本无法下载
 Comment[zh_HK]=無法取得代理伺服器組態 script 檔案
 Comment[zh_TW]=無法取得代理組態 script 檔案
@@ -396,6 +401,7 @@
 Name[tt]=Ämerlek eçtälegen uqığanda xata çıqtı
 Name[uk]=Помилка виконання скрипту
 Name[uz]=Скриптни текширишда хато рўй берди
+Name[vi]=Lỗi định lượng tập lệnh
 Name[zh_CN]=脚本求值错误
 Name[zh_HK]=Script 執行錯誤
 Name[zh_TW]=Script 執行錯誤
@@ -428,7 +434,7 @@
 Comment[hu]=Hiba történt a proxybeállító szkript végrehajtása közben
 Comment[is]=Það kom upp villa við keyrslu stillingaskriftu milliþjóns
 Comment[it]=Si è verificato un errore durante l'esecuzione dello script di configurazione proxy
-Comment[ja]=プロキシ設定スクリプトを実行中エラーがありました
+Comment[ja]=プロキシ設定スクリプトの実行中にエラーが発生しました
 Comment[km]=មានកំហុសមួយក្នុងការប្រតិបត្តិស្គ្រីបកំណត់រចនាសម្ព័ន្ធប្រូកស៊ី
 Comment[ko]=프록시 설정 스크리트를 실행하는데 문제가 있습니다
 Comment[lb]=Et gouf e Feeler beim Ausféiere vum Proxy-Konfiguratiounsskript
@@ -460,6 +466,7 @@
 Comment[tt]=Proxy caylaw ämerelegen eşlätkändä xata çıqtı
 Comment[uk]=Виникла помилка при спробі виконати скрипт для визначення проксі сервера
 Comment[uz]=Проксини мослаш учун скриптни ишга туширишда хато рўй берди
+Comment[vi]=Gặp lỗi khi thực hiện tập lệnh cấu hình ủy nhiệm.
 Comment[zh_CN]=执行代理配置脚本出现错误
 Comment[zh_HK]=代理伺服器組態檔案執行錯誤
 Comment[zh_TW]=proxy 代理組態檔案執行錯誤
Index: kio/misc/kpac/kpac_dhcp_helper.c
===================================================================
--- kio/misc/kpac/kpac_dhcp_helper.c	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/misc/kpac/kpac_dhcp_helper.c	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -94,6 +94,7 @@
 		exit(1);
 
 	if (setsockopt(sock, SOL_SOCKET, SO_BROADCAST, &bcast, sizeof(bcast)) == -1 ||
+		setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &bcast, sizeof(bcast)) == -1 ||
 		bind(sock, (struct sockaddr *)&addr, sizeof(addr)) == -1)
 		exit(1);
 
Index: kio/misc/kpac/proxyscout.desktop
===================================================================
--- kio/misc/kpac/proxyscout.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/misc/kpac/proxyscout.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -100,6 +100,7 @@
 Comment[tt]=Proxy'nıñ üzzihenle caylanu
 Comment[uk]=Автоматичне визначення проксі сервера
 Comment[uz]=Проксини автоматик равишда мослаш
+Comment[vi]=Cấu hình ủy nhiệm tự động.
 Comment[zh_CN]=自动代理配置
 Comment[zh_HK]=自動代理伺服器組態
 ServiceTypes=KDEDModule
Index: kio/misc/kio_uiserver.desktop
===================================================================
--- kio/misc/kio_uiserver.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/misc/kio_uiserver.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -43,7 +43,7 @@
 Comment[id]=Perkembangan KDE mengenai info server UI
 Comment[is]=Þjónn sem sýnir framvindu ferla
 Comment[it]=Server informazioni avanzamento di KDE
-Comment[ja]=KDE進捗情報UIサーバ
+Comment[ja]=KDE 進捗情報 UI サーバ
 Comment[km]=ម៉ាស៊ីនបម្រើ UI នៃព័ត៌មានវឌ្ឍនភាពរបស់ KDE
 Comment[ko]=KDE에서 보다 발전된 정보 UI 서버
 Comment[lb]=UI-Server vu KDE, dee Fortschrëttsinformatiounen uweist
@@ -81,7 +81,7 @@
 Comment[uk]=Сервер графічного інтерфейсу інформації про розвиток KDE
 Comment[uz]=KDE'нинг маълумот узатишни назорат қилиш сервери
 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[vi]=Trình phục vụ giao diện người dùng cho thông tin tiến hành của KDE.
 Comment[xh]=Umcedisi we UI Wenqubela Yenkcukacha we KDE
 Comment[zh_CN]=KDE 的进度信息用户界面服务器
 Comment[zh_HK]=KDE 的進度資訊介面伺服程式
Index: kio/tests/kdirwatchunittest.cpp
===================================================================
--- kio/tests/kdirwatchunittest.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/tests/kdirwatchunittest.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -34,6 +34,8 @@
 if (m_s[i] != m_signals[i])
 nothing_failed = false;
 
+ KDirWatch::statistics();
+
 VERIFY (nothing_failed);
 }
 
@@ -88,6 +90,22 @@
 m_lastSignal == alert);
 }
 
+void KDirWatchTest::remove_file (const QString& file)
+{
+ ::unlink (QFile::encodeName(file));
+}
+
+void KDirWatchTest::touch_file (const QString& file)
+{
+ QFile f(file);
+ f.open(IO_WriteOnly);
+}
+
+void KDirWatchTest::rename_file(const QString& from, const QString& to)
+{
+ ::rename(QFile::encodeName(from), QFile::encodeName(to));
+}
+
 KUNITTEST_MODULE ( kunittest_kdirwatch, "KDirWatchTest" )
 KUNITTEST_MODULE_REGISTER_TESTER (KDirWatchTest)
 
@@ -112,6 +130,10 @@
 VERIFY_NOTHING();
 dir->mkdir ("does");
 VERIFY_DIRTY (m_workingDir);
+ touch_file (m_workingDir + "/file");
+ VERIFY_DIRTY (m_workingDir);
+ VERIFY_NOTHING ();
+ remove_file (m_workingDir + "/file");
 d->addDir (m_workingDir + "/does/not/exist");
 d->removeDir (m_workingDir);
 VERIFY_NOTHING();
@@ -128,6 +150,28 @@
 dir->rmdir ("does");
 VERIFY_NOTHING();
 
+ d->addFile(m_workingDir + "/a");
+ touch_file(m_workingDir + "/a");
+ VERIFY_CREATED (m_workingDir + "/a");
+
+ rename_file (m_workingDir + "/a", m_workingDir + "/b");
+ VERIFY_DELETED (m_workingDir + "/a");
+ VERIFY_NOTHING();
+
+ touch_file (m_workingDir + "/a");
+ VERIFY_CREATED (m_workingDir + "/a");
+ VERIFY_NOTHING();
+
+ touch_file (m_workingDir + "/a");
+ VERIFY_DIRTY (m_workingDir + "/a");
+
+ remove_file (m_workingDir + "/b");
+ VERIFY_NOTHING();
+
+ d->removeFile(m_workingDir + "/a");
+
+ remove_file(m_workingDir + "/a");
+
 VERIFY (dir->rmdir (m_workingDir));
 delete d;
 }
Index: kio/tests/kdirwatchunittest.h
===================================================================
--- kio/tests/kdirwatchunittest.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/tests/kdirwatchunittest.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -54,6 +54,10 @@
 /* verify that deleted got emitted */
 void VERIFY_DELETED (const QString&);
 
+ void touch_file (const QString& file);
+ void remove_file (const QString& file);
+ void rename_file (const QString& from, const QString& to);
+
 QString m_lastSignal;
 QString m_workingDir;
 KDirWatch* d;
Index: kio/tests/dummymeta.desktop
===================================================================
--- kio/tests/dummymeta.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/tests/dummymeta.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -40,6 +40,7 @@
 Name[uk]=Макет метаданих
 Name[uz]=Маъносиз мета
 Name[ven]=Meta isa tshili
+Name[vi]=Siêu giả
 Name[zh_CN]=哑元
 Name[zh_HK]=空的資料定義
 Name[zh_TW]=空的資料定義
Index: kio/kurifilterplugin.desktop
===================================================================
--- kio/kurifilterplugin.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kurifilterplugin.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -70,7 +70,7 @@
 Name[uk]=Втулок розширеної навігації
 Name[uz]=Тезлаштирилган веб-кўриш плагини
 Name[ven]=Pulagini ya burausu yo engedzhwaho
-Name[vi]=Các plugin đềEtănt cường duyệt 
+Name[vi]=Bộ cầm phít duyệt tăng cường
 Name[xh]=Iplagi yangaphakathi Ekhangela iincwadi Enyusiweyo
 Name[zh_CN]=增强的浏览插件
 Name[zh_HK]=增強功能的瀏覽外掛程式
Index: kio/kcomprfilter.desktop
===================================================================
--- kio/kcomprfilter.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kcomprfilter.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -70,7 +70,7 @@
 Name[uk]=Фільтр стискання KDE
 Name[uz]=KDE қисиш филтери
 Name[ven]=Filithara yau tsikeledza ya KDE
-Name[vi]=Trình lọc nén của KDE 
+Name[vi]=Bộ lọc nén KDE
 Name[xh]=Isihluzi Sodibaniso se KDE
 Name[zh_CN]=KDE 压缩过滤程序
 Name[zh_HK]=KDE 壓縮過濾器
Index: kio/data.protocol
===================================================================
--- kio/data.protocol	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/data.protocol	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -8,6 +8,7 @@
 Description=A kioslave for data URIs (rfc2397)
 Description[af]= ´n kioslave vir data URIs (rfc2397)
 Description[br]=Ur kioslave evit an URIoù roadoù (rfc2397)
+Description[bs]=Kioslave za data URIs (rfc2397)
 Description[ca]=Un kioslave per a URIs de dades (rfc2397)
 Description[cs]=Kioslave pro datová URI (rfc2397)
 Description[da]=En kioslave for data-URI'er (rfc2397)
@@ -24,7 +25,7 @@
 Description[hu]=KDE-protokoll adat-URI-k használataához (RFC 2397)
 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[ja]=データ URIs (rfc2397) の kioslave
 Description[km]=kioslave មួយសម្រាប់ទិន្នន័យ URIs (rfc2397)
 Description[lb]=E kioslave fir Donnéen-URIs (rfc2397)
 Description[lt]=Antrinė KDE programa duomenų URI (rfc2397)
@@ -50,6 +51,7 @@
 Description[tg]=kioslave барои URIs (rfc2397)
 Description[tt]=Biremle URI öçen kioslave (rfc2397)
 Description[uk]=Підлеглий В/В для адрес (URI) даних (rfc2397)
+Description[vi]=Một kioslave cho các địa điểm URI kiểu dữ liệu (rfc2397).
 Description[zh_CN]=data URI(rfc2397) 的 kioslave
 DocPath=kioslave/data.html
 URIMode=rawuri
Index: kio/kcmodule.desktop
===================================================================
--- kio/kcmodule.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kcmodule.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -71,6 +71,7 @@
 Name[uk]=Модуль центра керування KDE
 Name[uz]=KDE бошқарув модули
 Name[ven]=Phanele ndangula ya phirinthara
+Name[vi]=Mô-đun điều khiển KDE
 Name[wa]=Module di contrôle KDE
 Name[xh]=Ulawulo Lwesicatshulwa we KDE
 Name[zh_CN]=KDE 控制模块
Index: kio/application.desktop
===================================================================
--- kio/application.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/application.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -73,7 +73,7 @@
 Name[uk]=Програма
 Name[uz]=Дастур
 Name[ven]=Apulifikhesheni
-Name[vi]=Chương trình 
+Name[vi]=Ứng dụng
 Name[wa]=Programe
 Name[xh]=Isicelo
 Name[zh_CN]=应用程序
Index: kio/kpasswdserver.desktop
===================================================================
--- kio/kpasswdserver.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kpasswdserver.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,6 +69,7 @@
 Name[uk]=Модуль паролів KDED
 Name[uz]=KDED махфий сўз модули
 Name[ven]=Modulu wa phasewede ya KDED
+Name[vi]=Mô-đun mật khẩu KDED
 Name[wa]=Module di screts po KDE
 Name[xh]=Igama lokugqitha le Sicatshulwa se KDED
 Name[zh_CN]=KDED 密码模块
@@ -126,6 +127,7 @@
 Comment[tt]=Sersüz alxäterläw totu
 Comment[uk]=Підтримка кешування паролів
 Comment[uz]=Махфий сўзларни кэшда сақлаш
+Comment[vi]=Cách hỗ trợ khả năng lưu tạm mật khẩu.
 Comment[zh_CN]=密码缓存支持
 Comment[zh_HK]=密碼暫存支援
 ServiceTypes=KDEDModule
Index: kio/kssl/ksslpkcs12.cc
===================================================================
--- kio/kssl/ksslpkcs12.cc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kssl/ksslpkcs12.cc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -200,14 +200,16 @@
 int len;
 
 len = kossl->i2d_PKCS12(_pkcs, NULL);
- char *buf = new char[len];
- p = (unsigned char *)buf;
- kossl->i2d_PKCS12(_pkcs, &p);
- QByteArray qba;
- qba.setRawData(buf, len);
- base64 = KCodecs::base64Encode(qba);
- qba.resetRawData(buf, len);
- delete[] buf;
+ if (len >= 0) {
+ char *buf = new char[len];
+ p = (unsigned char *)buf;
+ kossl->i2d_PKCS12(_pkcs, &p);
+ QByteArray qba;
+ qba.setRawData(buf, len);
+ base64 = KCodecs::base64Encode(qba);
+ qba.resetRawData(buf, len);
+ delete[] buf;
+ }
 #endif
 return base64;
 }
Index: kio/kssl/ksslinfodlg.cc
===================================================================
--- kio/kssl/ksslinfodlg.cc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kssl/ksslinfodlg.cc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -433,7 +433,7 @@
 KURLLabel *mail = new KURLLabel(tmp, tmp, _frame);
 connect(mail, SIGNAL(leftClickedURL(const QString &)), mailCatcher, SLOT(mailClicked(const QString &)));
 } else {
- new QLabel(tmp, _frame);
+ label = new QLabel(tmp, _frame);
 }
 }
 if (label && viewport()) {
Index: kio/kssl/ksslpkcs7.cc
===================================================================
--- kio/kssl/ksslpkcs7.cc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kio/kssl/ksslpkcs7.cc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -129,14 +129,16 @@
 int len;
 
 len = kossl->i2d_PKCS7(_pkcs, NULL);
- char *buf = new char[len];
- p = (unsigned char *)buf;
- kossl->i2d_PKCS7(_pkcs, &p);
- QByteArray qba;
- qba.setRawData(buf, len);
- base64 = KCodecs::base64Encode(qba);
- qba.resetRawData(buf, len);
- delete[] buf;
+ if (len >= 0) {
+ char *buf = new char[len];
+ p = (unsigned char *)buf;
+ kossl->i2d_PKCS7(_pkcs, &p);
+ QByteArray qba;
+ qba.setRawData(buf, len);
+ base64 = KCodecs::base64Encode(qba);
+ qba.resetRawData(buf, len);
+ delete[] buf;
+ }
 #endif
 return base64;
 }
Index: kstyles/riscos/riscos.themerc
===================================================================
--- kstyles/riscos/riscos.themerc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kstyles/riscos/riscos.themerc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -277,7 +277,7 @@
 Comment[id]=Gaya RISC OS
 Comment[is]=Stíll í anda RiscOS (Archimedes tölvur)
 Comment[it]=Tema simile a RISC OS
-Comment[ja]=RISC OS ライクテーマ
+Comment[ja]=RISC OS 風のテーマ
 Comment[km]=ស្បែក RISC OS-like
 Comment[ko]=리스크 OS 같은 테마
 Comment[lb]=RISC OS-ähnlecht Thema
@@ -314,7 +314,7 @@
 Comment[uk]=Тема "а ля RISC OS"
 Comment[uz]=RISC ОСга ўхшаш мавзу
 Comment[ven]=RISC OS-sa thero
-Comment[vi]=Theme kiểu RISC OS 
+Comment[vi]=Sắc thái kiểu RISC OS.
 Comment[wa]=Tinme rishonnant al rivnance do sistinme RISC OS
 Comment[xh]=RISC OS-Njengo mxholo 
 Comment[zh_CN]=类似 RISC OS 的主题
Index: kstyles/themes/light-v2.themerc
===================================================================
--- kstyles/themes/light-v2.themerc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kstyles/themes/light-v2.themerc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -29,6 +29,7 @@
 Name[id]=Gaya Ringan, revisi ke-2
 Name[is]=Léttur stíll, - taka 2
 Name[it]=Stile Light, seconda versione
+Name[ja]=Light スタイル、第2版
 Name[km]=រចនាប័ទ្មភ្លឺ ពិនិត្យឡើងវិញលើកទី២
 Name[ko]=가벼운 꼴, 두번째 판
 Name[lb]=Liichte Stil, 2. Versioun
@@ -64,7 +65,7 @@
 Name[uk]=Стиль Light, випуск N2
 Name[uz]=Light услуби, иккинчи таҳрири
 Name[ven]=Tshitaela tshisi tshau konda, ndulamiso ya vhuvhili
-Name[vi]=Light Style, revision thứ 2
+Name[vi]=Kiểu dáng sáng, bản sửa đổi 2
 Name[xh]=Uhlobo Olukhanyayo, 2nd ukhumbuzo kwakhona
 Name[zh_CN]=Light 风格，第二版
 Name[zh_HK]=輕靈風格，第二版
@@ -133,7 +134,7 @@
 Comment[uk]=Друга версія простого та елегантного стилю віджетів "Light".
 Comment[uz]=Оддий ва чиройли Light услубининг иккинчи таҳрири
 Comment[ven]=Ndulamiso ya vhuvhili isa kondi na tshitaela tshileluwaho
-Comment[vi]=Revision thứ 2 của kiểu widget đơn giản
+Comment[vi]=Bản sửa đổi thứ hai của kiểu dáng ô điều khiển Sáng đơn giản và thanh lịch.
 Comment[xh]=Ukhumbuzo kwakhona lwesibini lokulula nokubukekayo kwe hlobo lwe widget 'Ekhaphu-khaphu.
 Comment[zh_CN]=简约雅致的“Light”风格，第二版。
 Comment[zh_HK]=簡單高雅的「輕靈」介面工具風格的第二版。
Index: kstyles/themes/light-v3.themerc
===================================================================
--- kstyles/themes/light-v3.themerc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kstyles/themes/light-v3.themerc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -29,6 +29,7 @@
 Name[id]=Gaya Ringan, revisi ke-3
 Name[is]=Léttur stíll, - taka 3
 Name[it]=Stile Light, terza versione
+Name[ja]=Light スタイル、第3版
 Name[km]=រចនាប័ទ្មភ្លឺ ពិនិត្យឡើងវិញលើកទី៣
 Name[ko]=가벼운 꼴, 세번째 판
 Name[lb]=Liichte Stil, 3. Versioun
@@ -64,7 +65,7 @@
 Name[uk]=Стиль Light, випуск N3
 Name[uz]=Light услуби, учинчи таҳрири
 Name[ven]=Tshitaela tshisa kondi, ndovhololo ya vhuraru
-Name[vi]=Light Style, revision 3
+Name[vi]=Kiểu dáng sáng, bản sửa đổi 3
 Name[xh]=Uhlobo Olukhanyayo, 3rd ukhumbuzo kwakhona
 Name[zh_CN]=Light 风格，第三版
 Name[zh_HK]=輕靈風格，第三版
@@ -134,7 +135,7 @@
 Comment[uk]=Третя версія простого та елегантного стилю віджетів "Light".
 Comment[uz]=Оддий ва чиройли Light услубининг учинчи таҳрири
 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[vi]=Bản sửa đổi thứ ba của kiểu dáng ô điều khiển Sáng đơn giản và thanh lịch.
 Comment[xh]=Ukhumbuzo kwakhona lwesithathu lokulula kunye nokubukekayo kohlobo lwe widget 'Ekhaphu-khaphu'.
 Comment[zh_CN]=简约雅致的“Light”风格，第三版。
 Comment[zh_HK]=簡單高雅的「輕靈」介面工具風格的第三版。
Index: kstyles/themes/qtplatinum.themerc
===================================================================
--- kstyles/themes/qtplatinum.themerc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kstyles/themes/qtplatinum.themerc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -19,6 +19,7 @@
 Name[ta]=பிளாட்டினம்
 Name[th]=แพลตตินัม
 Name[tr]=Platin
+Name[vi]=Bạch kim
 Name[wa]=Platene
 Name[zh_CN]=白金
 Comment=Built-in unthemed Platinum style
@@ -52,7 +53,7 @@
 Comment[id]=Gaya unthemed Platinum built-in
 Comment[is]=Innbyggði Platínum stíllinn (án þema)
 Comment[it]=Stile Platino interno senza tema
-Comment[ja]=Platinumスタイル
+Comment[ja]=ビルトイン Platinum スタイル (テーマなし)
 Comment[km]=រចនាប័ទ្ម Platinum ដែលគ្មានស្បែកជាប់
 Comment[ko]=플래티넘과 같은 꼴을 가진 붙박이 테마
 Comment[lb]=Agebaute Platinum-Stil ouni Thema
@@ -89,7 +90,7 @@
 Comment[uk]=Вбудований стиль Platinum без теми
 Comment[uz]=Ички мавзусиз Platinum услуби
 Comment[ven]=Tshitale tsha pulathinamu tsho fhatelwaho nga ngomu
-Comment[vi]=Kiểu Platinum chưa dùng theme có sẵn 
+Comment[vi]=Kiểu dáng Bạch Kim có sẵn không có sắc thái.
 Comment[xh]=Uhloboa lwe Platinum olungenamxholo olwakhelwe-ngaphakathi
 Comment[zh_CN]=内建的无主题白金风格
 Comment[zh_HK]=內置的無主題 Platinum 風格
Index: kstyles/themes/qtwindows.themerc
===================================================================
--- kstyles/themes/qtwindows.themerc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kstyles/themes/qtwindows.themerc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -9,6 +9,7 @@
 Name[lt]=MSWindows 9x
 Name[se]=Windows
 Name[th]=วินโดว์ส 9x
+Name[vi]=MS™ Windows 9x
 Comment=Built-in unthemed Windows 9x style
 Comment[af]=Ingeboude ongetemade Vensters 9x styl
 Comment[ar]=مظهر مضمن مشابه لويندوز
@@ -40,7 +41,7 @@
 Comment[id]=Gaya unthemed Windows 9x built-in
 Comment[is]=Innbyggður stíll sem minnir á Windows 9x (án þema)
 Comment[it]=Stile Windows 9x interno senza tema
-Comment[ja]=Windows9xスタイル
+Comment[ja]=ビルトイン Windows 9x スタイル (テーマなし)
 Comment[km]=រចនាប័ទ្ម Windows 9x ដែលគ្មានស្បែក
 Comment[ko]=윈도우즈 9X와 비슷한 꼴을 가진 붙박이 테마
 Comment[lb]=Agebaute Windows 9x-Stil ouni Thema
@@ -77,7 +78,7 @@
 Comment[uk]=Вбудований стиль Windows 9x без теми
 Comment[uz]=Ички мавзусиз Windows 9x услуби
 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[vi]=Kiểu dáng Windows 9x có sẵn không có sắc thái.
 Comment[xh]=Uhlobo lwe Windows 9x olungenamxholo olwakhelwe-ngaphakathi
 Comment[zh_CN]=内建的无主题 Windows 9x 风格
 Comment[zh_HK]=內置的無主題 Windows 9x 風格
Index: kstyles/themes/qtcde.themerc
===================================================================
--- kstyles/themes/qtcde.themerc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kstyles/themes/qtcde.themerc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -34,7 +34,7 @@
 Comment[id]=Gaya unthemed CDE built-in
 Comment[is]=Innbyggður stíll sem minnir á CDE notendaskilin (án þema)
 Comment[it]=Stile CDE interno senza tema
-Comment[ja]=CDEスタイル
+Comment[ja]=ビルトイン CDE スタイル (テーマなし)
 Comment[km]=រចនាប័ទ្ម CDE ដែលគ្មានស្បែកជាប់
 Comment[ko]=CDE와 같은 꼴을 가진 붙박이 테마
 Comment[lb]=Agebauten CDE-Stil ouni Thema
@@ -71,7 +71,7 @@
 Comment[uk]=Вбудований стиль CDE без теми
 Comment[uz]=Ички мавзусиз CDE услуби
 Comment[ven]=Tshitaela tsha CDE tsho fhatelwaho ngomu
-Comment[vi]=Kiểu CDE chưa dùng theme có sẵn 
+Comment[vi]=Kiểu dáng CDE có sẵn không có sắc thái.
 Comment[xh]=Uhlobo olungenamxholo olakhelwe-ngaphakathi lwe CDE
 Comment[zh_CN]=内建的无主题 CDE 风格
 Comment[zh_HK]=內置類似沒有修改風格的 CDE 佈景
Index: kstyles/themes/b3.themerc
===================================================================
--- kstyles/themes/b3.themerc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kstyles/themes/b3.themerc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -35,7 +35,7 @@
 Comment[id]=B3/Modifikasi dari B2
 Comment[is]=B3, breytt útgáfa B2
 Comment[it]=B3/Modifica di B2
-Comment[ja]=B3 B2の改良版
+Comment[ja]=B3 / B2の改良版
 Comment[km]=B3/ការកែប្រែរបស់ B2
 Comment[lb]=B3/Verännerung vu B2
 Comment[lt]=B3 – B2 modifikacija
@@ -72,7 +72,7 @@
 Comment[uk]=B3/модифікація B2
 Comment[uz]=B3 - ўзгартирилган B2
 Comment[ven]=B3/U lugisela ha B2
-Comment[vi]=B3/Modification của B2
+Comment[vi]=B2 đã sửa đổi / B3
 Comment[wa]=B3/Modifiadje do B2
 Comment[xh]=B3/Uguqulelo kancinane lwe B2
 Comment[zh_CN]=B3/修正的 B2
Index: kstyles/themes/mega.themerc
===================================================================
--- kstyles/themes/mega.themerc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kstyles/themes/mega.themerc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -58,7 +58,7 @@
 Name[uk]=Багатокольоровий стиль "Мега-градієнт"
 Name[uz]=MegaGradient highcolor услуби
 Name[ven]=Tshitaela tsha muvhala wa ntha wa MegaGradient
-Name[vi]=Kiểu màu sáng Megagradient 
+Name[vi]=Kiểu dáng màu cao Siêu Dốc
 Name[xh]=Uhlobo lombala ophezulu we MegaGradient
 Name[zh_CN]=MegaGradient 高色彩风格
 Name[zh_HK]=MegaGradient 高彩風格
Index: kstyles/themes/highcolor.themerc
===================================================================
--- kstyles/themes/highcolor.themerc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kstyles/themes/highcolor.themerc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -59,6 +59,7 @@
 Name[tr]=Klasik Yüksek Renk
 Name[tt]=KüpTösle Klassik
 Name[uk]=Типовий (64K кольорів)
+Name[vi]=Màu cao kinh điển
 Name[zh_CN]=高色彩经典
 Name[zh_HK]=預設高彩佈景
 Name[zh_TW]=預設的高彩
@@ -128,6 +129,7 @@
 Comment[tt]=Klassik tışlawnıñ küptösle töre
 Comment[uk]=Версія типового стилю для 64К кольорів та більше
 Comment[uz]=Классик услубининг юқори рангли нусхаси
+Comment[vi]=Phiên bản màu cao của kiểu dáng kinh điển.
 Comment[zh_CN]=经典风格的高色彩版本
 Comment[zh_HK]=預設佈景的高彩版本
 Comment[zh_TW]=預設風格的高彩版本
Index: kstyles/themes/qtmotif.themerc
===================================================================
--- kstyles/themes/qtmotif.themerc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kstyles/themes/qtmotif.themerc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -39,7 +39,7 @@
 Comment[id]=Gaya unthemed Motif built-in
 Comment[is]=Innbyggður stíll sem minnir á Motif unhverfið (án þema)
 Comment[it]=Stile Motif interno senza tema
-Comment[ja]=Motifスタイル
+Comment[ja]=ビルトイン Motif スタイル (テーマなし)
 Comment[km]=រចនាប័ទ្ម Motif ដែលគ្មានស្បែកជាប់
 Comment[ko]=모티프와 같은 꼴을 가진 붙박이 테마
 Comment[lb]=Agebaute Motif-Stil ouni Thema
@@ -76,7 +76,7 @@
 Comment[uk]=Вбудований стиль Motif без теми
 Comment[uz]=Ички мавзусиз Motif услуби
 Comment[ven]=Tshitaela tsha mothifi tsho fhatelwaho ngomu
-Comment[vi]=Kiểu Motif chưa dùng theme có sẵn 
+Comment[vi]=Kiểu dáng Motif có sẵn không có sắc thái.
 Comment[xh]=Uhlobo lwe Motir olungenamxholo olakhelwe-ngaphakathi
 Comment[zh_CN]=内建的无主题 Motif 风格
 Comment[zh_HK]=內置類似沒有修改風格的 Motif 佈景
Index: kstyles/themes/keramik.themerc
===================================================================
--- kstyles/themes/keramik.themerc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kstyles/themes/keramik.themerc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -28,6 +28,7 @@
 Comment=A style using alphablending
 Comment[af]='n standaard styl wat alfa vermenging gebruik
 Comment[bg]=Стил, използващ алфа сливане
+Comment[bs]=Stil koji koristi alphablending
 Comment[ca]=Un estil que usa barreja alfa
 Comment[cs]=Styl používající alfa kanál
 Comment[da]=En stil der bruger alfablanding
@@ -66,6 +67,7 @@
 Comment[tg]=Услуб бо истифодаи тобиши алфа
 Comment[uk]=Стиль з використанням альфа-змішування
 Comment[uz]=Алфаблендингли услуб
+Comment[vi]=Kiểu dáng hợp nhau anfa.
 Comment[zh_CN]=使用 alpha 混和的风格
 Comment[zh_HK]=一個使用漸變色的佈景
 
Index: kstyles/themes/default.themerc
===================================================================
--- kstyles/themes/default.themerc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kstyles/themes/default.themerc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -59,6 +59,7 @@
 Name[tr]=Klasik KDE
 Name[tt]=KDE Klassik
 Name[uk]=Типовий для KDE
+Name[vi]=KDE kinh điển
 Name[wa]=KDE Classike
 Name[zh_CN]=KDE 经典
 Name[zh_HK]=KDE 預設
@@ -95,7 +96,7 @@
 Comment[id]=Gaya Klasik KDE
 Comment[is]=Klassíski KDE stíllinn
 Comment[it]=Stile KDE classico
-Comment[ja]=クラシックKDEスタイル
+Comment[ja]=クラシック KDE スタイル
 Comment[km]=រចនាប័ទ្ម KDE បុរាណ
 Comment[ko]=KDE에서 기본으로 쓰는 모양새
 Comment[lb]=Klassësche KDE-Stil
@@ -129,6 +130,7 @@
 Comment[tt]=KDE'neñ klassik bizäleşe
 Comment[uk]=Класичний стиль KDE
 Comment[uz]=Классик KDE услуби
+Comment[vi]=Kiểu dáng KDE kinh điển.
 Comment[wa]=Tinme avou l' rivnance «classike» di KDE
 Comment[zh_CN]=经典的 KDE 风格
 Comment[zh_HK]=預設的 KDE 佈景
Index: kstyles/themes/kstep.themerc
===================================================================
--- kstyles/themes/kstep.themerc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kstyles/themes/kstep.themerc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -53,7 +53,7 @@
 Comment[id]=Gaya Unthemed Next-like
 Comment[is]=Stíll sem minnir á Next stýrikerfið (án þema)
 Comment[it]=Stile senza tema simile a Next
-Comment[ja]=非テーマNextライクスタイル
+Comment[ja]=Next 風のスタイル (テーマなし)
 Comment[km]=រចនាប័ទ្ម Next-like ដែលគ្មានស្បែក
 Comment[ko]=넥스트와 같은 꼴을 가진 테마
 Comment[lb]=Next-ähnleche Stil ouni Thema
@@ -91,7 +91,7 @@
 Comment[uk]=Стиль NeXT (без теми)
 Comment[uz]=Next'га ўхшаш мавзусиз услуб
 Comment[ven]=Hu songo newaho thero-sa tshitaela
-Comment[vi]=Kiểu Next chưa dùng theme 
+Comment[vi]=Kiểu dánf như NeXt không có sắc thái.
 Comment[xh]=Okulandelayo Okungenamxholo-njengo hlobo
 Comment[zh_CN]=无主题的类似 Next 的风格
 Comment[zh_HK]=類似未修改佈景的 NextStep
Index: kstyles/themes/qtsgi.themerc
===================================================================
--- kstyles/themes/qtsgi.themerc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kstyles/themes/qtsgi.themerc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -35,7 +35,7 @@
 Comment[id]=Gaya SGI built-in
 Comment[is]=Innbyggður stíll sem minnir á SGI notendaskilin
 Comment[it]=Stile SGI interno
-Comment[ja]=内蔵SGIスタイル
+Comment[ja]=ビルトイン SGI スタイル
 Comment[km]=រចនាប័ទ្ម Built-in SGI
 Comment[ko]=SGI와 같은 꼴을 가진 붙박이 테마
 Comment[lb]=Agebauten SGI-Stil
@@ -73,7 +73,7 @@
 Comment[uk]=Вбудований стиль SGI
 Comment[uz]=Ички SGI услуби
 Comment[ven]=Tshitaela tsha SGI tsho fhatelwaho nga ngomu
-Comment[vi]=Kiểu SGI có sẵn 
+Comment[vi]=Kiểu dáng SGI có sẵn.
 Comment[xh]=Uhlobo lwe SGI olwakhelwe-ngaphakathi
 Comment[zh_CN]=内建的 SGI 风格
 Comment[zh_HK]=內置的 SGI 風格
Index: kstyles/themes/qtmotifplus.themerc
===================================================================
--- kstyles/themes/qtmotifplus.themerc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kstyles/themes/qtmotifplus.themerc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -15,6 +15,7 @@
 Name[rw]=Impamvu Nyongera
 Name[ta]=மோடிஃப் ப்ளஸ்
 Name[th]=โมทีฟพลัส
+Name[vi]=Motif Cộng
 Comment=Built-in enhanced Motif style
 Comment[af]=Ingeboude verbeterde Motief styl
 Comment[ar]=مظهر مضمن محسّن مشابه لMotif
@@ -45,7 +46,7 @@
 Comment[id]=Gaya enhanced Motif built-in
 Comment[is]=Innbyggður stíll, endurbætt Motif unhverfi
 Comment[it]=Stile Motif interno avanzato
-Comment[ja]=内蔵拡張Motifスタイル
+Comment[ja]=ビルトイン Motif スタイル 改良版
 Comment[km]=រចនាប័ទ្ម Motif ជាប់
 Comment[ko]=더 나은 모티프와 같은 꼴을 가진 붙박이 테마
 Comment[lb]=Agebauten, erweiderte Motif-Stil
@@ -82,7 +83,7 @@
 Comment[uk]=Вбудований покращений стиль Motif
 Comment[uz]=Кенгайтирилган ички Motif услуби
 Comment[ven]=Tshitaela tsho fhatelwaho nga ngomu
-Comment[vi]=Kiểu Motif cao cấp có sẵn 
+Comment[vi]=Name=Kiểu dáng Motif có sẵn tăng cường.
 Comment[xh]=Uhlobo lwe Motif olunyusiweyo olwakhelwe-ngaphakathi
 Comment[zh_CN]=内建的增强的 Motif 风格
 Comment[zh_HK]=內置的增強的 Motif 風格
Index: kstyles/themes/beos.themerc
===================================================================
--- kstyles/themes/beos.themerc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kstyles/themes/beos.themerc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -33,7 +33,7 @@
 Comment[hu]=BeOS-szerű megjelenés, téma nélkül
 Comment[is]=Stíll í anda BeOS stýrikerfisins (án þema)
 Comment[it]=Stile senza tema simile a BeOS
-Comment[ja]=テーマになっていないBeOSのようなスタイル
+Comment[ja]=BeOS 風のスタイル (テーマなし)
 Comment[km]=រចនាប័ទ្ម BeOS-like ដែលគ្មានស្បែក
 Comment[ko]=BeOS와 같은 꼴을 가진 테마
 Comment[lb]=BeOS-ähnlechen Stil ouni Thema
@@ -67,6 +67,7 @@
 Comment[tt]=BeOS-kebek tışlaw
 Comment[uk]=Стиль схожий на BeOS без встановленої теми
 Comment[uz]=BeOS'га ўхшаш мавзусиз услуб
+Comment[vi]=Kiểu dáng như BeOS không có sắc thái.
 Comment[wa]=Tinme rishonnant al rivnance do sistinme BeOS
 Comment[zh_CN]=无主题的类似 Beos 的风格
 Comment[zh_HK]=類似未修改佈景的 BeOS
Index: kstyles/plastik/plastik.themerc
===================================================================
--- kstyles/plastik/plastik.themerc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kstyles/plastik/plastik.themerc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -25,6 +25,7 @@
 Comment[bg]=Семпъл и изчистен стил
 Comment[bn]=একটি সরল এবং পরিচ্ছন্ন স্টাইল
 Comment[br]=Un arloadig panell eeun
+Comment[bs]=Jednostavan i čist stil
 Comment[ca]=Un estil simple i net
 Comment[cs]=Jednoduchý a čistý styl
 Comment[cy]=Arddull syml a glan
@@ -74,6 +75,7 @@
 Comment[tt]=Ciñel yämle tışlaw
 Comment[uk]=Простий та чистий стиль
 Comment[uz]=Оддий ва чиройли услуб
+Comment[vi]=Kiểu dáng sạch và đơn giản.
 Comment[zh_CN]=简洁清爽的样式
 [KDE]
 WidgetStyle=Plastik
Index: kstyles/highcontrast/highcontrast.themerc
===================================================================
--- kstyles/highcontrast/highcontrast.themerc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kstyles/highcontrast/highcontrast.themerc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -22,6 +22,7 @@
 Name[km]=កម្រិតពណ៌ខ្ពស់
 Name[lb]=HéichKontrast
 Name[lt]=Didelis kontrastas
+Name[mk]=Висок контраст
 Name[ms]=Kontras Tinggi
 Name[nb]=HøyKontrast
 Name[nds]=HoochKontrast
@@ -44,12 +45,14 @@
 Name[tr]=Yüksek Kontrast
 Name[tt]=KiskenTösle
 Name[uk]=Висока контрастність
+Name[vi]=Độ tương phản cao
 Name[zh_CN]=高对比度
 Name[zh_HK]=高反差
 ConfigPage=kstyle_highcontrast_config
 Comment=A style that works well with high contrast color schemes
 Comment[af]=´n Styl wat goed werk met hoë kontras kleur skemas
 Comment[bg]=Стил за схеми с висок контраст
+Comment[bs]=Stil koji izgleda dobro sa šemama boja visokog kontrasta
 Comment[ca]=Un estil que funciona bé amb esquemes de color de contrast alt
 Comment[cs]=Styl vhodný pro barevná schémata s vysokým kontrastem
 Comment[da]=En stil der virker godt med farvesammensætninger med høj kontrast
@@ -93,6 +96,7 @@
 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[vi]=Kiểu dáng thích hợp với lược đồ màu có độ tương phản cao.
 Comment[zh_CN]=在高对比度配色方案中适用的样式
 Comment[zh_HK]=適用於高反差色彩的佈景
 [KDE]
Index: kstyles/web/web.themerc
===================================================================
--- kstyles/web/web.themerc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kstyles/web/web.themerc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -66,7 +66,7 @@
 Name[uk]=Стиль "Тенета"
 Name[uz]=Веб услуби
 Name[ven]=Tshitaela tsha webu
-Name[vi]=Kiểu Web 
+Name[vi]=Kiểu dáng Mạng
 Name[xh]=Uhlobo lwe Web
 Name[zh_CN]=网络风格
 Name[zh_HK]=網站風格
@@ -101,7 +101,7 @@
 Comment[hu]=Webes elemstílus
 Comment[is]=Vefeiningastíll
 Comment[it]=Stile Web
-Comment[ja]=Webウィジェットスタイル
+Comment[ja]=ウェブウィジェットスタイル
 Comment[km]=រចនាប័ទ្មរបស់វត្ថុមើលឃើញនៃគេហទំព័រ
 Comment[ko]=웹 위젯 꼴
 Comment[lb]=Web-Widget-Stil
@@ -138,7 +138,7 @@
 Comment[uk]=Стиль "Віджети Тенет"
 Comment[uz]=Веб услуби
 Comment[ven]=Tshitaela tsha webe ya Widget
-Comment[vi]=Kiểu Wed widget 
+Comment[vi]=Kiểu dáng ô điều khiển Mạng
 Comment[xh]=Uhlobo lwe widget ye Web
 Comment[zh_CN]=网络部件风格
 Comment[zh_HK]=Web 元件風格
Index: kabc/plugins/file/file.desktop
===================================================================
--- kabc/plugins/file/file.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kabc/plugins/file/file.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -65,6 +65,7 @@
 Name[tt]=Birem
 Name[uk]=Файл
 Name[uz]=Файл
+Name[vi]=Tập tin
 Name[wa]=Fitchî
 Name[zh_CN]=文件
 Name[zh_HK]=檔案
Index: kabc/plugins/file/resourcefile.cpp
===================================================================
--- kabc/plugins/file/resourcefile.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kabc/plugins/file/resourcefile.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -2,6 +2,7 @@
 This file is part of libkabc.
 
 Copyright (c) 2001,2003 Cornelius Schumacher <schumacher@kde.org>
+ Copyright (c) 2006 Tom Abers <tomalbers@kde.nl>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Library General Public
@@ -26,7 +27,6 @@
 
 #include <qfile.h>
 #include <qfileinfo.h>
-#include <qregexp.h>
 #include <qtimer.h>
 
 #include <kapplication.h>
@@ -36,7 +36,9 @@
 #include <klocale.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <kurl.h>
+#include <jobclasses.h>
+#include <kio/netaccess.h>
 
 #include "formatfactory.h"
 #include "resourcefileconfig.h"
@@ -47,19 +49,9 @@
 
 using namespace KABC;
 
-class ResourceFile::ResourceFilePrivate
-{
- public:
- KIO::Job *mLoadJob;
- bool mIsLoading;
-
- KIO::Job *mSaveJob;
- bool mIsSaving;
-};
-
 ResourceFile::ResourceFile( const KConfig *config )
- : Resource( config ), mFormat( 0 ), mTempFile( 0 ),
- mAsynchronous( false ), d( new ResourceFilePrivate )
+ : Resource( config ), mFormat( 0 ),
+ mAsynchronous( false )
 {
 QString fileName, formatName;
 
@@ -76,19 +68,14 @@
 
 ResourceFile::ResourceFile( const QString &fileName,
 const QString &formatName )
- : Resource( 0 ), mFormat( 0 ), mTempFile( 0 ),
- mAsynchronous( false ), d( new ResourceFilePrivate )
+ : Resource( 0 ), mFormat( 0 ),
+ mAsynchronous( false )
 {
 init( fileName, formatName );
 }
 
 void ResourceFile::init( const QString &fileName, const QString &formatName )
 {
- d->mLoadJob = 0;
- d->mIsLoading = false;
- d->mSaveJob = 0;
- d->mIsSaving = false;
-
 mFormatName = formatName;
 
 FormatFactory *factory = FormatFactory::self();
@@ -110,17 +97,8 @@
 
 ResourceFile::~ResourceFile()
 {
- if ( d->mIsLoading )
- d->mLoadJob->kill();
- if ( d->mIsSaving )
- d->mSaveJob->kill();
-
- delete d;
- d = 0;
 delete mFormat;
 mFormat = 0;
-
- deleteLocalTempFile();
 }
 
 void ResourceFile::writeConfig( KConfig *config )
@@ -189,9 +167,31 @@
 
 if ( file.size() == 0 ) {
 file.close();
+ kdDebug() << "File size is zero. Evaluating backups" << endl;
+ for (int i=0; i!=20; i++)
+ {
+ QFile backup( mFileName + "__" + QString::number(i) );
+ kdDebug() << "Evaluating" << backup.name() << " size: " << backup.size() << endl;
+ if ( backup.size() != 0 )
+ {
+ kdDebug() << "Restoring backup " << i << endl;
+ KURL src, dest;
+ src.setPath( mFileName + "__" + QString::number(i) );
+ dest.setPath( mFileName );
+
+ KIO::DeleteJob* job = KIO::del( dest, false, false ); 
+ KIO::NetAccess::synchronousRun( job, 0);
+
+ KIO::CopyJob* job2 = KIO::copy( src, dest, false ); 
+ KIO::NetAccess::synchronousRun( job2, 0);
+
+ backup.close();
+ return true; 
+ }
+ backup.close();
+ }
 return true;
 }
-
 bool ok = mFormat->checkFormat( &file );
 file.close();
 
@@ -207,10 +207,6 @@
 {
 kdDebug(5700) << "ResourceFile::load(): '" << mFileName << "'" << endl;
 
- if ( d->mIsLoading ) {
- abortAsyncLoading();
- }
-
 mAsynchronous = false;
 
 QFile file( mFileName );
@@ -219,96 +215,53 @@
 return false;
 }
 
- if ( !clearAndLoad( &file ) ) {
- addressBook()->error( i18n( "Problems during parsing file '%1'." ).arg( mFileName ) );
- return false;
- }
+ clear();
 
- return true;
+ return mFormat->loadAll( addressBook(), this, &file );
 }
 
-bool ResourceFile::clearAndLoad( QFile *file )
-{
- clear();
- return mFormat->loadAll( addressBook(), this, file );
-}
-
 bool ResourceFile::asyncLoad()
 {
- if ( d->mIsLoading ) {
- abortAsyncLoading();
- }
+ kdDebug(5700) << "ResourceFile::asyncLoad()" << endl;
 
- if (d->mIsSaving) {
- kdWarning(5700) << "Aborted asyncSave() because we're still asyncSave()ing!" << endl;
- return false;
- }
-
 mAsynchronous = true;
 
- bool ok = createLocalTempFile();
- if ( ok )
- ok = mTempFile->close(); // we only need the filename
+ bool ok = load();
 
- if ( !ok ) {
- emit loadingError( this, i18n( "Unable to open file '%1'." ).arg( mTempFile->name() ) );
- deleteLocalTempFile();
- return false;
- }
+ if ( !ok )
+ emitLoadingError();
+ else
+ emitLoadingFinished();
 
- KURL dest, src;
- dest.setPath( mTempFile->name() );
- src.setPath( mFileName );
-
- KIO::Scheduler::checkSlaveOnHold( true );
- d->mLoadJob = KIO::file_copy( src, dest, -1, true, false, false );
- d->mIsLoading = true;
- connect( d->mLoadJob, SIGNAL( result( KIO::Job* ) ),
- this, SLOT( downloadFinished( KIO::Job* ) ) );
-
 return true;
 }
 
-void ResourceFile::abortAsyncLoading()
-{
- kdDebug(5700) << "ResourceFile::abortAsyncLoading()" << endl;
-
- if ( d->mLoadJob ) {
- d->mLoadJob->kill(); // result not emitted
- d->mLoadJob = 0;
- }
-
- deleteLocalTempFile();
- d->mIsLoading = false;
-}
-
-void ResourceFile::abortAsyncSaving()
-{
- kdDebug(5700) << "ResourceFile::abortAsyncSaving()" << endl;
-
- if ( d->mSaveJob ) {
- d->mSaveJob->kill(); // result not emitted
- d->mSaveJob = 0;
- }
-
- deleteLocalTempFile();
- d->mIsSaving = false;
-}
-
 bool ResourceFile::save( Ticket * )
 {
 kdDebug(5700) << "ResourceFile::save()" << endl;
 
- if (d->mIsSaving) {
- abortAsyncSaving();
- }
- if ( d->mIsLoading ) {
- kdWarning(5700) << "Aborted save() because we're still asyncLoad()ing!" << endl;
- return false;
- }
+ // Only do the logrotate dance when the __0 file is not 0 bytes.
+ QFile file( mFileName + "__0" );
+ if ( file.size() != 0 ) {
+ KURL last;
+ last.setPath( mFileName + "__20" );
+ kdDebug() << "deleting " << last << endl;
+ KIO::DeleteJob* job = KIO::del( last, false, false ); 
+ KIO::NetAccess::synchronousRun( job, 0);
 
- // create backup file
- QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() );
+ for (int i=19; i>=0; i--)
+ {
+ KURL src, dest;
+ src.setPath( mFileName + "__" + QString::number(i) );
+ dest.setPath( mFileName + "__" + QString::number(i+1) );
+ kdDebug() << "moving " << src << " -> " << dest << endl;
+ KIO::SimpleJob* job = KIO::rename( src, dest, false ); 
+ KIO::NetAccess::synchronousRun( job, 0);
+ }
+ } else
+ kdDebug() << "Not starting logrotate __0 is 0 bytes." << endl;
+
+ QString extension = "__0";
 (void) KSaveFile::backupFile( mFileName, QString::null /*directory*/,
 extension );
 
@@ -318,7 +271,7 @@
 bool ok = false;
 
 if ( saveFile.status() == 0 && saveFile.file() ) {
- saveToFile( saveFile.file() );
+ mFormat->saveAll( addressBook(), this, saveFile.file() );
 ok = saveFile.close();
 }
 
@@ -332,72 +285,20 @@
 return ok;
 }
 
-bool ResourceFile::asyncSave( Ticket * )
+bool ResourceFile::asyncSave( Ticket *ticket )
 {
 kdDebug(5700) << "ResourceFile::asyncSave()" << endl;
 
- if (d->mIsSaving) {
- abortAsyncSaving();
- }
+ bool ok = save( ticket );
 
- if (d->mIsLoading) {
- kdWarning(5700) << "Aborted asyncSave() because we're still asyncLoad()ing!" << endl;
- return false;
- }
+ if ( !ok )
+ QTimer::singleShot( 0, this, SLOT( emitSavingError() ) );
+ else
+ QTimer::singleShot( 0, this, SLOT( emitSavingFinished() ) );
 
- bool ok = createLocalTempFile();
- if ( ok ) {
- saveToFile( mTempFile->file() );
- ok = mTempFile->close();
- }
-
- if ( !ok ) {
- emit savingError( this, i18n( "Unable to save file '%1'." ).arg( mTempFile->name() ) );
- deleteLocalTempFile();
- return false;
- }
-
- KURL src, dest;
- src.setPath( mTempFile->name() );
- dest.setPath( mFileName );
-
- KIO::Scheduler::checkSlaveOnHold( true );
- d->mIsSaving = true;
- mDirWatch.stopScan(); // restarted in uploadFinished()
- d->mSaveJob = KIO::file_copy( src, dest, -1, true, false, false );
- connect( d->mSaveJob, SIGNAL( result( KIO::Job* ) ),
- this, SLOT( uploadFinished( KIO::Job* ) ) );
-
- return true;
+ return ok;
 }
 
-bool ResourceFile::createLocalTempFile()
-{
- deleteStaleTempFile();
- mTempFile = new KTempFile();
- mTempFile->setAutoDelete( true );
- return mTempFile->status() == 0;
-}
-
-void ResourceFile::deleteStaleTempFile()
-{
- if ( hasTempFile() ) {
- kdDebug(5700) << "stale temp file detected " << mTempFile->name() << endl;
- deleteLocalTempFile();
- }
-}
-
-void ResourceFile::deleteLocalTempFile()
-{
- delete mTempFile;
- mTempFile = 0;
-}
-
-void ResourceFile::saveToFile( QFile *file )
-{
- mFormat->saveAll( addressBook(), this, file );
-}
-
 void ResourceFile::setFileName( const QString &fileName )
 {
 mDirWatch.stopScan();
@@ -436,7 +337,6 @@
 if ( !addressBook() )
 return;
 
-// clear(); // moved to clearAndLoad()
 if ( mAsynchronous )
 asyncLoad();
 else {
@@ -455,44 +355,24 @@
 mAddrMap.erase( addr.uid() );
 }
 
-void ResourceFile::downloadFinished( KIO::Job* )
+void ResourceFile::emitSavingFinished()
 {
- kdDebug(5700) << "ResourceFile::downloadFinished()" << endl;
+ emit savingFinished( this );
+}
 
- d->mIsLoading = false;
-
- if ( !hasTempFile() || mTempFile->status() != 0 ) {
- emit loadingError( this, i18n( "Download failed in some way!" ) );
- return;
- }
-
- QFile file( mTempFile->name() );
- if ( file.open( IO_ReadOnly ) ) {
- if ( clearAndLoad( &file ) )
- emit loadingFinished( this );
- else
- emit loadingError( this, i18n( "Problems during parsing file '%1'." ).arg( mTempFile->name() ) );
- }
- else {
- emit loadingError( this, i18n( "Unable to open file '%1'." ).arg( mTempFile->name() ) );
- }
-
- deleteLocalTempFile();
+void ResourceFile::emitSavingError()
+{
+ emit savingError( this, i18n( "Unable to save file '%1'." ).arg( mFileName ) );
 }
 
-void ResourceFile::uploadFinished( KIO::Job *job )
+void ResourceFile::emitLoadingFinished()
 {
- kdDebug(5700) << "ResourceFile::uploadFinished()" << endl;
+ emit loadingFinished( this );
+}
 
- d->mIsSaving = false;
-
- if ( job->error() )
- emit savingError( this, job->errorString() );
- else
- emit savingFinished( this );
-
- deleteLocalTempFile();
- mDirWatch.startScan();
+void ResourceFile::emitLoadingError()
+{
+ emit loadingError( this, i18n( "Problems during parsing file '%1'." ).arg( mFileName ) );
 }
 
 #include "resourcefile.moc"
Index: kabc/plugins/file/resourcefile.h
===================================================================
--- kabc/plugins/file/resourcefile.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kabc/plugins/file/resourcefile.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -28,14 +28,6 @@
 
 #include <kabc/resource.h>
 
-class QFile;
-class QTimer;
-class KTempFile;
-
-namespace KIO {
-class Job;
-}
-
 namespace KABC {
 
 class FormatPlugin;
@@ -135,8 +127,10 @@
 virtual void removeAddressee( const Addressee& addr );
 
 private slots:
- void downloadFinished( KIO::Job* );
- void uploadFinished( KIO::Job* );
+ void emitLoadingFinished();
+ void emitLoadingError();
+ void emitSavingFinished();
+ void emitSavingError();
 
 protected slots:
 void fileChanged();
@@ -148,15 +142,6 @@
 void unlock( const QString &fileName );
 
 private:
- bool clearAndLoad( QFile *file );
- void saveToFile( QFile *file );
- void abortAsyncLoading();
- void abortAsyncSaving();
- bool createLocalTempFile();
- void deleteLocalTempFile();
- void deleteStaleTempFile();
- bool hasTempFile() const { return mTempFile != 0; }
-
 QString mFileName;
 QString mFormatName;
 
@@ -166,8 +151,6 @@
 
 KDirWatch mDirWatch;
 
- KTempFile *mTempFile;
-
 bool mAsynchronous;
 
 class ResourceFilePrivate;
Index: kabc/plugins/net/net.desktop
===================================================================
--- kabc/plugins/net/net.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kabc/plugins/net/net.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -70,7 +70,7 @@
 Name[uk]=Мережа
 Name[uz]=Tarмоқ
 Name[ven]=Vhukwamani
-Name[vi]=Mạng 
+Name[vi]=mạng
 Name[wa]=Rantoele
 Name[xh]=Umsebenzi womnatha
 Name[zh_CN]=网络
Index: kabc/plugins/dir/dir.desktop
===================================================================
--- kabc/plugins/dir/dir.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kabc/plugins/dir/dir.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -72,7 +72,7 @@
 Name[uk]=Каталог
 Name[uz]=Жилд
 Name[ven]=Tsumbavhulwo
-Name[vi]=Thư mục 
+Name[vi]=Thư mục
 Name[wa]=Ridant
 Name[xh]=Ulawulo
 Name[zh_CN]=目录
Index: kabc/kabc_manager.desktop
===================================================================
--- kabc/kabc_manager.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kabc/kabc_manager.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -4,6 +4,7 @@
 Name=Contacts
 Name[af]=Kontakte
 Name[br]=Darempredoù
+Name[bs]=Kontakti
 Name[ca]=Contactes
 Name[cs]=Kontakty
 Name[cy]=Cysylltau
@@ -53,6 +54,7 @@
 Name[tt]=Elemtälär
 Name[uk]=Контакти
 Name[uz]=Алоқалар
+Name[vi]=Liên lạc
 Name[zh_CN]=联系人
 Name[zh_HK]=聯絡人
 Type=Service
Index: kabc/kab2kabc.desktop
===================================================================
--- kabc/kab2kabc.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kabc/kab2kabc.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -85,7 +85,7 @@
 Comment[uk]=Засіб перетворення libkab до libkabc.
 Comment[uz]=libkab'ни libkabc'га айлантирадиган восита.
 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[vi]=Công cụ chuyển đổi libkab sang libkabc.
 Comment[xh]=libkab kwi libkabc isixhobo sokuguqulela.
 Comment[zh_CN]=libkab 到 libkabc 的转换工具。
 Comment[zh_HK]=libkab 至 libkabc 的轉換工具
Index: kabc/lock.cpp
===================================================================
--- kabc/lock.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kabc/lock.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -55,9 +55,9 @@
 {
 QFile file( filename );
 if ( !file.open( IO_ReadOnly ) ) return false;
- 
+
 QTextStream t( &file );
- t >> pid >> ws >> app;
+ t >> pid >> endl >> app;
 
 return true;
 }
@@ -102,8 +102,8 @@
 QString identifier( mIdentifier );
 identifier.replace( '_', '/' );
 
- mError = i18n("The resource '%1' is locked by application '%2'.")
- .arg( identifier ).arg( app );
+ mError = i18n("The address book '%1' is locked by application '%2'.\nIf you believe this is incorrect, just remove the lock file from '%3'")
+ .arg( identifier ).arg( app ).arg( locateLocal( "data", "kabc/lock/*.lock" ) );
 return false;
 }
 }
Index: kabc/Makefile.am
===================================================================
--- kabc/Makefile.am	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kabc/Makefile.am	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -2,7 +2,7 @@
 
 # Make sure $(all_includes) remains last!
 INCLUDES = -I$(top_builddir)/kabc -I$(top_srcdir)/kabc -I$(top_srcdir)/kab \
- -I$(srcdir)/vcardparser/ -I$(srcdir)/vcard/include \
+ -I$(srcdir)/vcard/include -I$(srcdir)/vcardparser/ \
 -I$(srcdir)/vcard/include/generated \
 -I$(srcdir)/vcardparser $(all_includes)
 
Index: kabc/formats/binary.desktop
===================================================================
--- kabc/formats/binary.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kabc/formats/binary.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,6 +69,7 @@
 Name[uk]=Двійковий
 Name[uz]=Бинар
 Name[ven]=Zwivhili
+Name[vi]=Nhị phân
 Name[wa]=Binaire
 Name[xh]=Ephindwe kabini
 Name[zh_CN]=二进制
Index: kwallet/backend/sha1.cc
===================================================================
--- kwallet/backend/sha1.cc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kwallet/backend/sha1.cc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -23,6 +23,9 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
+#ifdef HAVE_STDINT_H
+#include <stdint.h> /* For uintXX_t on OSX */
+#endif
 #ifdef HAVE_SYS_BITYPES_H
 #include <sys/bitypes.h> /* For uintXX_t on Tru64 */
 #endif
Index: kwallet/client/kwallet.cc
===================================================================
--- kwallet/client/kwallet.cc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kwallet/client/kwallet.cc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -34,7 +34,7 @@
 
 
 const QString Wallet::LocalWallet() {
-	KConfig cfg("kwalletrc");
+	KConfig cfg("kwalletrc", true);
 	cfg.setGroup("Wallet");
 	if (!cfg.readBoolEntry("Use One Wallet", true)) {
 		QString tmp = cfg.readEntry("Local Wallet", "localwallet");
@@ -52,7 +52,7 @@
 }
 
 const QString Wallet::NetworkWallet() {
-	KConfig cfg("kwalletrc");
+	KConfig cfg("kwalletrc", true);
 	cfg.setGroup("Wallet");
 
 	QString tmp = cfg.readEntry("Default Wallet", "kdewallet");
Index: kcert/kcertpart.desktop
===================================================================
--- kcert/kcertpart.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kcert/kcertpart.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -31,7 +31,7 @@
 Comment[hu]=Beágyazható személyes tanúsítványkezelő
 Comment[is]=Ívefjanlegur einkaskírteina-stjóri
 Comment[it]=Gestione integrabile dei certificati personali
-Comment[ja]=埋め込み可能個人証明書マネージャ
+Comment[ja]=埋め込み可能な個人証明書マネージャ
 Comment[km]=កម្មវិធីគ្រប់គ្រងវិញ្ញាបនបត្រឯកជនដែលអាចបង្កប់
 Comment[ko]=끼워넣는 개인용 인증서 관리
 Comment[lb]=Abettbare perséinlechen Zertifikatsmanager
@@ -69,7 +69,7 @@
 Comment[uk]=Менеджер персональних сертифікатів, який можна вбудовувати
 Comment[uz]=Ичига ўрнатиб бўладиган шахсий сертификат бошқарувчиси
 Comment[ven]=Mulanguli wa sethifikheithi ya vhune
-Comment[vi]=Embeđable Personal Certificate Manager
+Comment[vi]=Bộ Quản lý Chứng nhận Cá nhân có khả năng nhúng
 Comment[xh]=Umphathi Wesiqinisekiso Sobuntu bakho Obulungiselelweyo
 Comment[zh_CN]=可嵌入的个人证书管理器
 Comment[zh_HK]=可嵌入的個人證書管理工具
Index: kutils/kcmodulecontainer.h
===================================================================
--- kutils/kcmodulecontainer.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kutils/kcmodulecontainer.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -34,6 +34,7 @@
 class KCModuleProxy;
 
 /**
+ * @ingroup kcmodule
 * @brief KCModuleContainer is a convenience class encapsulating several KCModules.
 *
 * The KCModuleContainer class is a convenience class for organizing a multiple set
@@ -169,6 +170,7 @@
 };
 
 /**
+ * @ingroup kcmodule
 * This macro creates an factory declaration which when run creates an KCModule with specified
 * modules. For example:
 * \code
Index: kutils/kplugininfo.desktop
===================================================================
--- kutils/kplugininfo.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kutils/kplugininfo.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -67,6 +67,7 @@
 Name[tt]=KDE Östämäse Turında
 Name[uk]=Інформація про втулок KDE
 Name[uz]=KDE плагин ҳақида маълумот
+Name[vi]=Thông tin bộ cầm phít KDE
 Name[wa]=Informåcion sol tchôke-divins di KDE
 Name[zh_CN]=KDE 打印信息
 Name[zh_HK]=KDE 外掛資訊
Index: kutils/kpluginselector.h
===================================================================
--- kutils/kpluginselector.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kutils/kpluginselector.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -32,6 +32,8 @@
 class KConfigGroup;
 
 /**
+ * @ingroup main
+ * @ingroup plugin
 * @short A widget to select what plugins to load and configure the plugins.
 *
 * It shows the list of available plugins on top (if there's more than one
Index: kutils/kfinddialog.h
===================================================================
--- kutils/kfinddialog.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kutils/kfinddialog.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -31,6 +31,8 @@
 class QCheckBox;
 
 /**
+ * @ingroup main
+ * @ingroup findreplace
 * @brief A generic "find" dialog.
 *
 * @author S.R.Haque <srhaque@iee.org>
@@ -79,18 +81,21 @@
 // Options.
 
 // KDE4: move to KFind
+ /**
+ * Options for the search
+ */
 enum Options
 {
- WholeWordsOnly = 1, // Match whole words only.
- FromCursor = 2, // Start from current cursor position.
- SelectedText = 4, // Only search selected area.
- CaseSensitive = 8, // Consider case when matching.
- FindBackwards = 16, // Go backwards.
- RegularExpression = 32, // Interpret the pattern as a regular expression.
- FindIncremental = 64, // Find incremental.
+ WholeWordsOnly = 1, ///< Match whole words only.
+ FromCursor = 2, ///< Start from current cursor position.
+ SelectedText = 4, ///< Only search selected area.
+ CaseSensitive = 8, ///< Consider case when matching.
+ FindBackwards = 16, ///< Go backwards.
+ RegularExpression = 32, ///< Interpret the pattern as a regular expression.
+ FindIncremental = 64, ///< Find incremental.
 // Note that KReplaceDialog uses 256 and 512
 // User extensions can use boolean options above this value.
- MinimumUserOption = 65536
+ MinimumUserOption = 65536 ///< The first flag which can be used by extensions.
 };
 
 /**
@@ -110,7 +115,7 @@
 /**
 * Construct a non-modal find dialog
 *
- * @param modal set to false to get a non-modal dialog
+ * @param modal set to @c false to get a non-modal dialog
 * @param parent The parent object of this widget.
 * @param name The name of this widget.
 * @param options A bitfield of the Options to be checked.
@@ -139,6 +144,7 @@
 /**
 * Returns the list of history items.
 *
+ * @return The find history.
 * @see setFindHistory
 */
 QStringList findHistory() const;
@@ -147,7 +153,7 @@
 * Enable/disable the 'search in selection' option, depending
 * on whether there actually is a selection.
 *
- * @param hasSelection true if a selection exists
+ * @param hasSelection @c true if a selection exists
 */
 void setHasSelection( bool hasSelection );
 
@@ -155,7 +161,7 @@
 * Hide/show the 'from cursor' option, depending
 * on whether the application implements a cursor.
 *
- * @param hasCursor true if the application features a cursor
+ * @param hasCursor @c true if the application features a cursor
 * This is assumed to be the case by default.
 */
 void setHasCursor( bool hasCursor );
@@ -164,7 +170,7 @@
 * Enable/disable the 'Find backwards' option, depending
 * on whether the application supports it.
 *
- * @param supports true if the application supports backwards find
+ * @param supports @c true if the application supports backwards find
 * This is assumed to be the case by default.
 * @since 3.4
 */
@@ -174,7 +180,7 @@
 * Enable/disable the 'Case sensitive' option, depending
 * on whether the application supports it.
 *
- * @param supports true if the application supports case sensitive find
+ * @param supports @c true if the application supports case sensitive find
 * This is assumed to be the case by default.
 * @since 3.4
 */
@@ -184,7 +190,7 @@
 * Enable/disable the 'Whole words only' option, depending
 * on whether the application supports it.
 *
- * @param supports true if the application supports whole words only find
+ * @param supports @c true if the application supports whole words only find
 * This is assumed to be the case by default.
 * @since 3.4
 */
@@ -194,7 +200,7 @@
 * Enable/disable the 'Regular expression' option, depending
 * on whether the application supports it.
 *
- * @param supports true if the application supports regular expression find
+ * @param supports @c true if the application supports regular expression find
 * This is assumed to be the case by default.
 * @since 3.4
 */
@@ -204,6 +210,7 @@
 * Set the options which are checked.
 *
 * @param options The setting of the Options.
+ * @see Options
 */
 void setOptions( long options );
 
@@ -211,17 +218,20 @@
 * Returns the state of the options. Disabled options may be returned in
 * an indeterminate state.
 *
- * @see setOptions
+ * @return The options.
+ * @see Options, setOptions
 */
 long options() const;
 
 /**
 * Returns the pattern to find.
+ * @return The search text.
 */
 QString pattern() const;
 
 /**
- * Sets the pattern to find
+ * Sets the pattern to find.
+ * @param pattern The new search pattern.
 */
 void setPattern ( const QString &pattern );
 
@@ -230,6 +240,7 @@
 * elements as required. The widget occupies the width of the dialog,
 * and is positioned immediately below the regular expression support
 * widgets for the pattern string.
+ * @return An extensible QWidget.
 */
 QWidget *findExtension();
 
Index: kutils/kcmoduleproxyIfaceImpl.h
===================================================================
--- kutils/kcmoduleproxyIfaceImpl.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kutils/kcmoduleproxyIfaceImpl.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -24,6 +24,8 @@
 class KCModuleProxy;
 
 /***************************************************************/
+/** @internal
+ @ingroup internal */
 class KCModuleProxyIfaceImpl: public QObject, virtual public KCModuleProxyIface
 {
 	/* KDE4 Merge KCModuleProxyIfaceImpl with KCModuleProxy(MI)
@@ -72,6 +74,8 @@
 
 
 /***************************************************************/
+/** @internal
+ @ingroup internal */
 class KCModuleProxyRootCommunicatorImpl: public QObject, 
 	virtual public KCModuleProxyRootDispatcher
 {
Index: kutils/kplugininfo.h
===================================================================
--- kutils/kplugininfo.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kutils/kplugininfo.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -29,6 +29,8 @@
 class KConfigGroup;
 
 /**
+ * @ingroup main
+ * @ingroup plugin
 * Information about a plugin.
 *
 * This holds all the information about a plugin there is. It's used for the
Index: kutils/kcmoduleloader.h
===================================================================
--- kutils/kcmoduleloader.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kutils/kcmoduleloader.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -28,7 +28,8 @@
 class KLibLoader;
 
 /**
- * @class Loads a KControl Module.
+ * @ingroup kcmodule
+ * @brief Loads a KControl Module.
 *
 * KCModuleLoader tries in several ways 
 * to locate and load a KCModule. If loading fails a 
@@ -50,6 +51,9 @@
 * @param module what module to load
 * @param withFallback if true and loading failed a separate window
 * with the module may appear and a zero pointer is a returned
+ * @param parent The parent widget
+ * @param name The widget's name
+ * @param args A list of arguments for the module to load
 *
 * @return a pointer to the loaded @ref KCModule
 *
@@ -64,6 +68,9 @@
 * Loads a @ref KCModule. If loading fails a zero pointer is returned.
 * @param module what module to load
 * with the module may appear and a zero pointer is a returned
+ * @param parent The parent widget
+ * @param name The widget's name
+ * @param args A list of arguments for the module to load
 *
 * @deprecated use the function which explicitly states the error reporting
 * method
@@ -100,6 +107,9 @@
 * @param report see ErrorReporting
 * @param withFallback if true and loading failed a separate window
 * with the module may appear and a zero pointer is a returned
+ * @param parent The parent widget
+ * @param name The widget's name
+ * @param args A list of arguments for the module to load
 *
 * @return a pointer to the loaded @ref KCModule
 * @since 3.4
@@ -113,6 +123,9 @@
 * @param module what module to load
 * @param report see ErrorReporting
 * with the module may appear and a zero pointer is a returned
+ * @param parent The parent widget
+ * @param name The widget's name
+ * @param args A list of arguments for the module to load
 *
 * @return a pointer to the loaded @ref KCModule
 * @since 3.4
@@ -182,6 +195,7 @@
 * @param report the type of error reporting, see ErrorReporting
 * @param text the main message
 * @param details any additional details
+ * @param parent The parent widget
 *
 * @since 3.4
 * @internal
Index: kutils/kfind.h
===================================================================
--- kutils/kfind.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kutils/kfind.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -25,6 +25,8 @@
 #include <qrect.h>
 
 /**
+ * @ingroup main
+ * @ingroup findreplace
 * @brief A generic implementation of the "find" function.
 *
 * @author S.R.Haque <srhaque@iee.org>, David Faure <faure@kde.org>,
@@ -108,6 +110,9 @@
 /**
 * Only use this constructor if you don't use KFindDialog, or if
 * you use it as a modal dialog.
+ * @param pattern The pattern to look for.
+ * @param options Options for the find dialog. @see KFindDialog.
+ * @param parent The parent widget.
 */
 KFind(const QString &pattern, long options, QWidget *parent);
 
@@ -116,14 +121,28 @@
 * You should pass the pointer to it here, so that when a message box
 * appears it has the right parent. Don't worry about deletion, KFind
 * will notice if the find dialog is closed.
+ * @param pattern The pattern to look for.
+ * @param options Options for the find dialog. @see KFindDialog.
+ * @param parent The parent widget.
+ * @param findDialog A pointer to the KFindDialog object.
 */
 KFind(const QString &pattern, long options, QWidget *parent, QWidget* findDialog);
+
+ /**
+ * Destructor.
+ */
 virtual ~KFind();
 
- enum Result { NoMatch, Match };
+ /**
+ * Result enum. Holds information if the find was successful.
+ */
+ enum Result {
+ NoMatch, ///< No match was found.
+ Match ///< A match was found.
+ };
 
 /**
- * @return true if the application must supply a new text fragment
+ * @return @c true if the application must supply a new text fragment
 * It also means the last call returned "NoMatch". But by storing this here
 * the application doesn't have to store it in a member variable (between
 * calls to slotFindNext()).
@@ -131,7 +150,7 @@
 bool needData() const;
 
 /**
- * Call this when needData returns true, before calling find().
+ * Call this when needData returns @c true, before calling find().
 * @param data the text fragment (line)
 * @param startPos if set, the index at which the search should start.
 * This is only necessary for the very first call to setData usually,
@@ -142,7 +161,7 @@
 void setData( const QString& data, int startPos = -1 );
 
 /**
- * Call this when needData returns true, before calling find(). The use of
+ * Call this when needData returns @c true, before calling find(). The use of
 * ID's is especially useful if you're using the FindIncremental option.
 * @param id the id of the text fragment
 * @param data the text fragment (line)
@@ -160,6 +179,7 @@
 * Walk the text fragment (e.g. text-processor line, kspread cell) looking for matches.
 * For each match, emits the highlight() signal and displays the find-again dialog
 * proceeding.
+ * @return Whether or not there has been a match.
 */
 Result find();
 
@@ -170,12 +190,15 @@
 * but options might change _during_ the replace operation:
 * e.g. the "All" button resets the PromptOnReplace flag.
 *
+ * @return The current options. @see KFindDialog.
 */
 long options() const { return m_options; }
 
 /**
 * Set new options. Usually this is used for setting or clearing the
 * FindBackwards options.
+ *
+ * @see KFindDialog.
 */
 virtual void setOptions( long options );
 
@@ -186,6 +209,7 @@
 
 /**
 * Change the pattern we're looking for
+ * @param pattern The new pattern.
 */
 void setPattern( const QString& pattern );
 
@@ -194,6 +218,7 @@
 * the highlight signal was emitted).
 * If 0, can be used in a dialog box to tell the user "no match was found".
 * The final dialog does so already, unless you used setDisplayFinalDialog(false).
+ * @return The number of matches.
 */
 int numMatches() const { return m_matches; }
 
@@ -219,17 +244,19 @@
 Q_UNUSED(text); Q_UNUSED(index); Q_UNUSED(matchedlength); return true; }
 
 /**
- * Returns true if we should restart the search from scratch.
- * Can ask the user, or return false (if we already searched the whole document).
+ * Returns @c true if we should restart the search from scratch.
+ * Can ask the user, or return @c false (if we already searched the whole document).
 *
- * @param forceAsking set to true if the user modified the document during the
+ * @param forceAsking set to @c true if the user modified the document during the
 * search. In that case it makes sense to restart the search again.
 *
- * @param showNumMatches set to true if the dialog should show the number of
- * matches. Set to false if the application provides a "find previous" action,
+ * @param showNumMatches set to @c true if the dialog should show the number of
+ * matches. Set to @c false if the application provides a "find previous" action,
 * in which case the match count will be erroneous when hitting the end,
 * and we could even be hitting the beginning of the document (so not all
 * matches have even been seen).
+ *
+ * @return @c true, if the search should be restarted.
 */
 virtual bool shouldRestart( bool forceAsking = false, bool showNumMatches = true ) const;
 
@@ -249,6 +276,19 @@
 */
 static int find( const QString &text, const QString &pattern, int index, long options, int *matchedlength );
 
+ /**
+ * Search the given regular expression, and returns whether a match was found. If one is,
+ * the length of the matched string is also returned.
+ *
+ * Another version of the function is provided for use with strings.
+ *
+ * @param text The string to search.
+ * @param pattern The regular expression pattern to look for.
+ * @param index The starting index into the string.
+ * @param options The options to use.
+ * @param matchedlength The length of the string that was matched
+ * @return The index at which a match was found, or -1 if no match was found.
+ */
 static int find( const QString &text, const QRegExp &pattern, int index, long options, int *matchedlength );
 
 /**
@@ -263,6 +303,7 @@
 * One case where it can be useful, is when the user selects the "Find"
 * menu item while a find operation is under way. In that case, the
 * program may want to call setActiveWindow() on that dialog.
+ * @return The find next dialog.
 */
 KDialogBase* findNextDialog( bool create = false );
 
@@ -294,10 +335,13 @@
 * If you've set data with setData(id, text), use the signal highlight(id,
 * matchingIndex, matchedLength)
 *
- * WARNING: If you're using the FindIncremental option, the text argument
+ * @warning If you're using the FindIncremental option, the text argument
 * passed by this signal is not necessarily the data last set through
 * setData(), but can also be an earlier set data block.
 *
+ * @param text The found text.
+ * @param matchingIndex The index of the found text's occurrence.
+ * @param matchedLength The length of the matched text.
 * @see setData()
 */
 void highlight(const QString &text, int matchingIndex, int matchedLength);
@@ -309,10 +353,13 @@
 * Use this signal if you've set your data with setData(id, text), otherwise
 * use the signal with highlight(text, matchingIndex, matchedLength).
 *
- * WARNING: If you're using the FindIncremental option, the id argument
+ * @warning If you're using the FindIncremental option, the id argument
 * passed by this signal is not necessarily the id of the data last set
 * through setData(), but can also be of an earlier set data block.
 *
+ * @param id The ID of the text fragment, as used in setData().
+ * @param matchingIndex The index of the found text's occurrence.
+ * @param matchedLength The length of the matched text.
 * @see setData()
 *
 * @since 3.3
Index: kutils/kcmoduleproxyIface.h
===================================================================
--- kutils/kcmoduleproxyIface.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kutils/kcmoduleproxyIface.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -23,7 +23,8 @@
 #include <dcopobject.h>
 
 /**
- * @class DCOP Interface for KCModule.
+ * @ingroup kcmodule
+ * @brief DCOP Interface for KCModule.
 * 
 * A module (which is loaded via KCModuleProxy) does always have 
 * this DCOP interface, whether it's in root mode or not.
@@ -89,9 +90,10 @@
 };
 
 /**
- * @class DCOP interface for communicating with the real module running in root mode.
+ * @ingroup kcmodule
+ * @brief DCOP interface for communicating with the real module running in root mode.
 * 
- * @description When a KCModuleProxy tells kcmshell to load "itself" and embed into the 
+ * When a KCModuleProxy tells kcmshell to load "itself" and embed into the 
 * KCModuleProxy, this DCOP interface is used to communicate to the real KCModuleProxy, since 
 * the KCModuleProxy which told kcmshell to load itself, is nothing but a shell.
 *
Index: kutils/kcmoduleproxy.h
===================================================================
--- kutils/kcmoduleproxy.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kutils/kcmoduleproxy.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -34,6 +34,7 @@
 class KProcess;
 
 /**
+ * @ingroup kcmodule
 *
 * @brief Encapsulates a KCModule for embedding.
 *
Index: kutils/kreplacedialog.h
===================================================================
--- kutils/kreplacedialog.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kutils/kreplacedialog.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -32,6 +32,8 @@
 class QRect;
 
 /**
+ * @ingroup main
+ * @ingroup findreplace
 * @short A generic "replace" dialog.
 *
 * @author S.R.Haque <srhaque@iee.org>
@@ -61,12 +63,12 @@
 
 public:
 
- // Options.
-
+ /**
+ * Options.
+ */
 enum Options
 {
- // Should the user be prompted before the replace operation?
- PromptOnReplace = 256,
+ PromptOnReplace = 256, ///< Should the user be prompted before the replace operation?
 BackReference = 512
 };
 
@@ -105,6 +107,7 @@
 /**
 * Returns the list of history items.
 *
+ * @return The replacement history.
 * @see setReplacementHistory
 */
 QStringList replacementHistory() const;
@@ -113,6 +116,7 @@
 * Set the options which are enabled.
 *
 * @param options The setting of the Options.
+ * @see Options, KFindDialog::Options
 */
 void setOptions( long options );
 
@@ -120,12 +124,14 @@
 * Returns the state of the options. Disabled options may be returned in
 * an indeterminate state.
 *
- * @see setOptions
+ * @return The options.
+ * @see setOptions, Options, KFindDialog::Options
 */
 long options() const;
 
 /**
 * Returns the replacement string.
+ * @return The replacement string.
 */
 QString replacement() const;
 
@@ -134,6 +140,7 @@
 * elements as required. The widget occupies the width of the dialog,
 * and is positioned immediately the regular expression support widgets
 * for the replacement string.
+ * @return An extensible QWidget.
 */
 QWidget *replaceExtension();
 
Index: kutils/kcmoduleinfo.h
===================================================================
--- kutils/kcmoduleinfo.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kutils/kcmoduleinfo.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -31,6 +31,7 @@
 class QStringList;
 
 /**
+ * @ingroup kcmodule
 * A class that provides information about a KCModule
 *
 * KCModuleInfo provides various technical information, such as icon, library
Index: kutils/kmultitabbar.h
===================================================================
--- kutils/kmultitabbar.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kutils/kmultitabbar.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -45,6 +45,8 @@
 class KMultiTabBarInternal;
 
 /**
+ * @ingroup main
+ * @ingroup multitabbar
 * A Widget for horizontal and vertical tabs.
 * It is possible to add normal buttons to the top/left
 * The handling if only one tab at a time or multiple tabs
@@ -55,18 +57,46 @@
 {
 	Q_OBJECT
 public:
-	enum KMultiTabBarMode{Horizontal, Vertical};
-	enum KMultiTabBarPosition{Left, Right, Top, Bottom};
+	/**
+	 * The tab bar's orientation. Also constraints the bar's position.
+	 */
+	enum KMultiTabBarMode {
+		Horizontal, ///< Horizontal orientation (i.e. on top or bottom)
+		Vertical ///< Vertical orientation (i.e. on the left or right hand side)
+	};
+	
+	/**
+	 * The tab bar's position
+	 */
+	enum KMultiTabBarPosition {
+		Left, ///< Left hand side
+		Right, ///< Right hand side
+		Top, ///< On top
+		Bottom ///< On bottom
+	};
 
 	/**
 	 * The list of available styles for KMultiTabBar
-	 * - VSNET - Visual Studio .Net like (only show the text of active tabs
-	 * - KDEV3 - Kdevelop 3 like (always show the text)
-	 * - KONQSBC - konqy's classic sidebar style (unthemed) (currently disabled)
 	 */
-	enum KMultiTabBarStyle{VSNET=0, KDEV3=1, KONQSBC=2, KDEV3ICON=3,STYLELAST=0xffff};
+	enum KMultiTabBarStyle {
+		VSNET=0, ///< Visual Studio .Net like (only show the text of active tabs)
+		KDEV3=1, ///< KDevelop 3 like (always show the text)
+		KONQSBC=2, ///< Konqueror's classic sidebar style (unthemed) (currently disabled)
+		KDEV3ICON=3, ///< KDevelop 3 like with icons
+		STYLELAST=0xffff ///< Last style
+	};
 
+	/**
+	 * Constructor.
+	 * @param bm The tab bar's orientation
+	 * @param parent The parent widget
+	 * @param name The widget's name
+	 */
 	KMultiTabBar(KMultiTabBarMode bm,QWidget *parent=0,const char *name=0);
+	
+	/**
+	 * Destructor.
+	 */
 	virtual ~KMultiTabBar();
 
 	/**
@@ -88,10 +118,12 @@
 	 * @param pic a bitmap for the tab
 	 * @param id an arbitrary ID which can be used later on to identify the tab
 	 * @param text if a mode with text is used it will be the tab text, otherwise a mouse over hint
+	 * @return Always zero. Can be safely ignored.
 	 */
 	int appendTab(const QPixmap &pic,int id=-1,const QString& text=QString::null);
 	/**
 	 * remove a tab with a given ID
+	 * @param id The ID of the tab to remove
 	 */
 	void removeTab(int id);
 	/**
@@ -102,15 +134,17 @@
 	void setTab(int id ,bool state);
 	/**
 	 * return the state of a tab, identified by it's ID
+	 * @param id The ID of the tab to raise
 	 */
 	bool isTabRaised(int id) const;
 	/**
 	 * get a pointer to a button within the button area identified by its ID
+	 * @param id The id of the tab
 	 */
 	class KMultiTabBarButton *button(int id) const;
 
 	/**
-	 * get a pointer to a tab within the tab area, identiifed by its ID
+	 * get a pointer to a tab within the tab area, identified by its ID
 	 */
 	class KMultiTabBarTab *tab(int id) const;
 	/**
@@ -120,11 +154,12 @@
 	void setPosition(KMultiTabBarPosition pos);
 	/**
 	 * get the tabbar position.
-	 * @return position
+	 * @return The tab bar's position
 	 */
 	KMultiTabBarPosition position() const;
 	/**
 	 * set the display style of the tabs
+	 * @param style The new display style
 	 */
 	void setStyle(KMultiTabBarStyle style);
 	/**
@@ -133,11 +168,15 @@
 	 */
 	KMultiTabBarStyle tabStyle() const;
 	/**
-	 * be carefull, don't delete tabs yourself and don't delete the list itself
+	 * Returns the list of pointers to the tabs of type KMultiTabBarTab.
+	 * @return The list of tabs.
+	 * @warning be careful, don't delete tabs yourself and don't delete the list itself
 	 */
 QPtrList<KMultiTabBarTab>* tabs();
 	/**
-	 * be carefull, don't delete buttons yourself and don't delete the list itself
+	 * Returns the list of pointers to the tab buttons of type KMultiTabBarButton.
+	 * @return The list of tab buttons.
+	 * @warning be careful, don't delete buttons yourself and don't delete the list itself
 	 */
 	QPtrList<KMultiTabBarButton>* buttons();
 
@@ -159,17 +198,28 @@
 };
 
 /**
+ * @ingroup multitabbar
+ * This class represents a tab bar button in a KMultiTabBarWidget.
 * This class should never be created except with the appendButton call of KMultiTabBar
 */
 class KUTILS_EXPORT KMultiTabBarButton: public QPushButton
 {
 	Q_OBJECT
 public:
+	/** @internal */
 	KMultiTabBarButton(const QPixmap& pic,const QString&, QPopupMenu *popup,
 		int id,QWidget *parent, KMultiTabBar::KMultiTabBarPosition pos, KMultiTabBar::KMultiTabBarStyle style);
+	/** @internal */
 	KMultiTabBarButton(const QString&, QPopupMenu *popup,
 		int id,QWidget *parent, KMultiTabBar::KMultiTabBarPosition pos, KMultiTabBar::KMultiTabBarStyle style);
+	/**
+	 * Destructor
+	 */
 	virtual ~KMultiTabBarButton();
+	/**
+	 * Returns the tab's ID
+	 * @return The tab's ID
+	 */
 	int id() const;
 
 public slots:
@@ -211,25 +261,35 @@
 };
 
 /**
+ * @ingroup multitabbar
+ * This class represents a tab bar's tab in a KMultiTabBarWidget.
 * This class should never be created except with the appendTab call of KMultiTabBar
 */
 class KUTILS_EXPORT KMultiTabBarTab: public KMultiTabBarButton
 {
 	Q_OBJECT
 public:
+ /** @internal */
 	KMultiTabBarTab(const QPixmap& pic,const QString&,int id,QWidget *parent,
 		KMultiTabBar::KMultiTabBarPosition pos,KMultiTabBar::KMultiTabBarStyle style);
+	/**
+	 * Destructor.
+	 */
 	virtual ~KMultiTabBarTab();
 	/**
 	 * set the active state of the tab
-	 * @param state true==active false==not active
+	 * @param state @c true if the tab should become active, @c false otherwise
 	 */
 	void setState(bool state);
 	/**
 	 * choose if the text should always be displayed
 	 * this is only used in classic mode if at all
+	 * @param show Whether or not to show the text
 	 */
 	void showActiveTabText(bool show);
+	/**
+	 * Resized the tab to the needed size.
+	 */
 	void resize(){ setSize( neededSize() ); }
 private:
 	bool m_showActiveTabText;
Index: kutils/groups.dox
===================================================================
--- kutils/groups.dox	(.../tags/KDE/3.5.2/kdelibs)	(revision 0)
+++ kutils/groups.dox	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -0,0 +1,41 @@
+/**
+@defgroup main Main classes
+*/
+
+/**
+@defgroup internal Internal classes
+*/
+
+/**
+@defgroup findreplace Find and Replace classes
+
+These classes implement a generic find/replace function, along with
+extensible dialogs.
+*/
+
+/**
+@defgroup plugin Plugin handling classes
+
+These classes provide an easy and generic way for handling plugins.
+*/
+
+/**
+@defgroup settings Settings UI classes
+
+These classes provide widgets to build settings dialogs. See KSettings
+namespace description for an overview.
+*/
+
+/**
+@defgroup kcmodule KControl module classes
+
+Thwse classes provide the KControl module API.
+*/
+
+/**
+@defgroup multitabbar KMultiTabBar related classes
+
+These classes implement the tab bar often found on the border of KDE
+applications' main windows (such as Kate or KDevelop).
+*/
+
Index: kutils/ksettings/pluginpage.h
===================================================================
--- kutils/ksettings/pluginpage.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kutils/ksettings/pluginpage.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -29,6 +29,8 @@
 {
 
 /**
+ * @ingroup settings
+ * @ingroup plugin
 * @short Convenience KCModule for creating a plugins config page.
 *
 * This class makes it very easy to create a plugins configuration page to your
Index: kutils/ksettings/dialog.h
===================================================================
--- kutils/ksettings/dialog.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kutils/ksettings/dialog.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -32,6 +32,8 @@
 {
 
 /**
+ * @ingroup main
+ * @ingroup settings
 * @short Generic configuration dialog that even works over component boundaries
 *
 * For more information see \ref KSettings.
Index: kutils/ksettings/componentsdialog.h
===================================================================
--- kutils/ksettings/componentsdialog.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kutils/ksettings/componentsdialog.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -29,6 +29,8 @@
 {
 
 /**
+ @ingroup plugin
+ @ingroup settings
 Dialog for selecting which plugins should be active for an application. Set
 the list of available plugins with \ref setPluginInfos. The dialog will save the
 configuration on clicking ok or apply to the applications config file. Connect
Index: kutils/ksettings/dispatcher.h
===================================================================
--- kutils/ksettings/dispatcher.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kutils/ksettings/dispatcher.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -35,6 +35,7 @@
 {
 
 /**
+ * @ingroup settings
 * @short Dispatch change notifications from the KCMs to the program.
 *
 * Since your program does not have direct control over the KCMs that get loaded
Index: kutils/kreplace.h
===================================================================
--- kutils/kreplace.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kutils/kreplace.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -26,6 +26,8 @@
 class KReplaceNextDialog;
 
 /**
+ * @ingroup main
+ * @ingroup findreplace
 * @brief A generic implementation of the "replace" function.
 *
 * @author S.R.Haque <srhaque@iee.org>, David Faure <faure@kde.org>
@@ -102,6 +104,10 @@
 /**
 * Only use this constructor if you don't use KFindDialog, or if
 * you use it as a modal dialog.
+ * @param pattern The pattern to look for.
+ * @param replacement The replacement string.
+ * @param options Options for the find dialog. @see KFindDialog and KReplaceDialog.
+ * @param parent The parent widget.
 */
 KReplace(const QString &pattern, const QString &replacement, long options, QWidget *parent = 0);
 /**
@@ -109,9 +115,17 @@
 * You should pass the pointer to it here, so that when a message box
 * appears it has the right parent. Don't worry about deletion, KReplace
 * will notice if the find dialog is closed.
+ * @param pattern The pattern to look for.
+ * @param replacement The replacement string.
+ * @param options Options for the find dialog. @see KFindDialog and KReplaceDialog.
+ * @param parent The parent widget.
+ * @param replaceDialog A pointer to the KReplaceDialog object.
 */
 KReplace(const QString &pattern, const QString &replacement, long options, QWidget *parent, QWidget* replaceDialog);
 
+ /**
+ * Destructor.
+ */
 virtual ~KReplace();
 
 /**
@@ -119,6 +133,7 @@
 * the replace signal was emitted).
 * Can be used in a dialog box to tell the user how many replacements were made.
 * The final dialog does so already, unless you used setDisplayFinalDialog(false).
+ * @return The number of replacements.
 */
 int numReplacements() const { return m_replacements; }
 
@@ -133,6 +148,7 @@
 * Walk the text fragment (e.g. kwrite line, kspread cell) looking for matches.
 * For each match, if prompt-on-replace is specified, emits the highlight() signal
 * and displays the prompt-for-replace dialog before doing the replace.
+ * @return Whether or not there has been a match.
 */
 Result replace();
 
@@ -142,6 +158,7 @@
 * One case where it can be useful, is when the user selects the "Find"
 * menu item while a find operation is under way. In that case, the
 * program may want to call setActiveWindow() on that dialog.
+ * @return The replace next dialog.
 */
 KDialogBase* replaceNextDialog( bool create = false );
 
@@ -153,7 +170,7 @@
 void closeReplaceNextDialog();
 
 /**
- * Search the given string, replaces with the given replacement string,
+ * Searches the given string, replaces with the given replacement string,
 * and returns whether a match was found. If one is,
 * the replacement string length is also returned.
 *
@@ -170,21 +187,40 @@
 * @return The index at which a match was found, or -1 if no match was found.
 */
 static int replace( QString &text, const QString &pattern, const QString &replacement, int index, long options, int *replacedLength );
+
+ /**
+ * Searches the given regular expression, replaces with the given replacement string,
+ * and returns whether a match was found. If one is,
+ * the replacement string length is also returned.
+ *
+ * Another version of the function is provided for use with strings.
+ *
+ * @param text The string to search.
+ * @param pattern The regular expression pattern to look for.
+ * @param replacement The replacement string to insert into the text.
+ * @param index The starting index into the string.
+ * @param options The options to use.
+ * @param replacedLength Output parameter, contains the length of the replaced string.
+ * Not always the same as replacement.length(), when backreferences are used.
+ * @return The index at which a match was found, or -1 if no match was found.
+ */
 static int replace( QString &text, const QRegExp &pattern, const QString &replacement, int index, long options, int *replacedLength );
 
 /**
- * Returns true if we should restart the search from scratch.
- * Can ask the user, or return false (if we already searched/replaced the
+ * Returns @c true if we should restart the search from scratch.
+ * Can ask the user, or return @c false (if we already searched/replaced the
 * whole document without the PromptOnReplace option).
 *
- * @param forceAsking set to true if the user modified the document during the
+ * @param forceAsking set to @c true if the user modified the document during the
 * search. In that case it makes sense to restart the search again.
 *
- * @param showNumMatches set to true if the dialog should show the number of
- * matches. Set to false if the application provides a "find previous" action,
+ * @param showNumMatches set to @c true if the dialog should show the number of
+ * matches. Set to @c false if the application provides a "find previous" action,
 * in which case the match count will be erroneous when hitting the end,
 * and we could even be hitting the beginning of the document (so not all
 * matches have even been seen).
+ *
+ * @return @c true, if the search should be restarted.
 */
 virtual bool shouldRestart( bool forceAsking = false, bool showNumMatches = true ) const;
 
Index: kutils/kcmultidialog.h
===================================================================
--- kutils/kcmultidialog.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kutils/kcmultidialog.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -33,6 +33,7 @@
 class KCModuleInfo;
 
 /**
+ * @ingroup kcmodule
 * @short A method that offers a KDialogBase containing arbitrary
 * KControl Modules.
 *
Index: kdesu/kdesu_stub.c
===================================================================
--- kdesu/kdesu_stub.c	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdesu/kdesu_stub.c	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -192,6 +192,7 @@
 pid_t pid;
 FILE *fout;
 struct passwd *pw;
+ const char* kdesu_lc_all;
 
 /* Get startup parameters. */
 
@@ -236,6 +237,12 @@
 xsetenv("PATH", params[P_PATH].value);
 xsetenv("DESKTOP_STARTUP_ID", params[P_APP_STARTUP_ID].value);
 
+ kdesu_lc_all = getenv( "KDESU_LC_ALL" );
+ if( kdesu_lc_all != NULL )
+ xsetenv("LC_ALL",kdesu_lc_all);
+ else
+ xsetenv("LC_ALL","");
+
 /* Do we need to change uid? */
 
 pw = getpwnam(params[P_USER].value);
Index: kdesu/process.cpp
===================================================================
--- kdesu/process.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdesu/process.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -296,6 +296,14 @@
 putenv((*it).data());
 }
 unsetenv("KDE_FULL_SESSION");
+ 
+ // set temporarily LC_ALL to C, for su (to be able to parse "Password:")
+ const char* old_lc_all = getenv( "LC_ALL" );
+ if( old_lc_all != NULL )
+ setenv( "KDESU_LC_ALL", old_lc_all, 1 );
+ else
+ unsetenv( "KDESU_LC_ALL" );
+ setenv("LC_ALL", "C", 1);
 
 // From now on, terminal output goes through the tty.
 
Index: kdesu/su.cpp
===================================================================
--- kdesu/su.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdesu/su.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -75,6 +75,11 @@
 
 QCStringList args;
 
+#ifdef Q_OS_DARWIN
+ args += "-c";
+ args += "staff";
+#endif
+
 if ((m_Scheduler != SchedNormal) || (m_Priority > 50))
 args += "root";
 else
@@ -82,7 +87,9 @@
 
 args += "-c";
 args += QCString(__KDE_BINDIR) + "/kdesu_stub";
+#ifndef Q_OS_DARWIN
 args += "-";
+#endif
 
 QCString command = __PATH_SU;
 if (::access(__PATH_SU, X_OK) != 0)
Index: kspell2/kspellclient.desktop
===================================================================
--- kspell2/kspellclient.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kspell2/kspellclient.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -57,4 +57,5 @@
 Comment[tt]=KSpell Kliente
 Comment[uk]=Клієнт KSpell
 Comment[uz]=KSpell клиенти
+Comment[vi]=Ứng dụng khách chính tả KSpell
 Comment[zh_CN]=KSpell 客户
Index: kdecore/netsupp.cpp
===================================================================
--- kdecore/netsupp.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdecore/netsupp.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -352,15 +352,9 @@
 return 0;
 
 out:
- // Normal exit of the function
- if (err == 0)
- *result = res;
- else
- {
- if (res->data != NULL)
-	freeaddrinfo(res->data);
- free(res);
- }
+ if (res->data != NULL)
+ freeaddrinfo(res->data);
+ free(res);
 return err;
 }
 
Index: kdecore/kmountpoint.cpp
===================================================================
--- kdecore/kmountpoint.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdecore/kmountpoint.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -226,7 +226,11 @@
 
 #ifdef HAVE_GETMNTINFO
 
+#ifdef GETMNTINFO_USES_STATVFS
+ struct statvfs *mounted;
+#else
 struct statfs *mounted;
+#endif
 
 int num_fs = getmntinfo(&mounted, MNT_NOWAIT);
 
Index: kdecore/kinstance.cpp
===================================================================
--- kdecore/kinstance.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdecore/kinstance.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -239,7 +239,7 @@
 DEBUG_CHECK_ALIVE
 if( _iconLoader == 0 ) {
 	_iconLoader = new KIconLoader( _name, dirs() );
- _iconLoader->enableDelayedIconSetLoading( true );
+ 	_iconLoader->enableDelayedIconSetLoading( true );
 }
 
 return _iconLoader;
Index: kdecore/kwinmodule.cpp
===================================================================
--- kdecore/kwinmodule.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdecore/kwinmodule.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -224,7 +224,7 @@
 }
 	if ( (dirty[ NETWinInfo::PROTOCOLS ] & NET::WMStrut) != 0 ) {
 removeStrutWindow( ev->xany.window );
- if ( !possibleStrutWindows.findIndex( ev->xany.window ) != -1 )
+ if ( possibleStrutWindows.findIndex( ev->xany.window ) == -1 )
 	possibleStrutWindows.append( ev->xany.window );
 	}
 	if ( dirty[ NETWinInfo::PROTOCOLS ] || dirty[ NETWinInfo::PROTOCOLS2 ] ) {
Index: kdecore/eventsrc
===================================================================
--- kdecore/eventsrc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdecore/eventsrc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -72,7 +72,7 @@
 Comment[uk]=Системні повідомлення KDE
 Comment[uz]=KDE тизимнинг хабарномалари
 Comment[ven]=U divhadza maitele a KDE
-Comment[vi]=Thông báo hềEthống của KDE 
+Comment[vi]=Thông báo hệ thống KDE
 Comment[wa]=Notifiaedjes sistinme di KDE
 Comment[xh]=Izaziso Zendlela ye KDE
 Comment[zh_CN]=KDE 系统通知
@@ -86,6 +86,7 @@
 Name[bg]=Кошчето е изтрито
 Name[bn]=আবর্জনা: ফাঁকা
 Name[br]=Pod-lastez : goullonderet
+Name[bs]=Smeće: ispražnjeno
 Name[ca]=Paperera: buida
 Name[cs]=Koš vyprázdněn
 Name[da]=Affald: tømt
@@ -109,6 +110,7 @@
 Name[km]=ធុងសម្រាម ៖ បានសម្អាត
 Name[lb]=Dreckskëscht: eidel
 Name[lt]=Šiukšliadėžė: ištuštinta
+Name[mk]=Корпа: празна
 Name[ms]=Tong Sampah; dikosongkan
 Name[nb]=Papirkurven: tømt
 Name[nds]=Affalltünn: leddigmaakt
@@ -133,12 +135,14 @@
 Name[tt]=Çüplek: buşatıldı
 Name[uk]=Смітник: спорожнено
 Name[uz]=Чиқиндилар қутиси бўшатилди
+Name[vi]=Rác: đã đổ
 Name[zh_CN]=回收站：已清空
 Comment=The trash has been emptied
 Comment[af]=Die gemors is leeggemaak
 Comment[bg]=Съдържанието а кошчето е изтрито
 Comment[bn]=আবর্জনার বাক্স ফাঁকা করা হয়েছে
 Comment[br]=Goullonderet e oa ar pod-lastez
+Comment[bs]=Smeće je ispražnjeno
 Comment[ca]=S'ha buidat la paperera
 Comment[cs]=Koš byl vyprázdněn
 Comment[da]=Affaldet er blevet tømt ud
@@ -161,6 +165,7 @@
 Comment[km]=ធុងសម្រាមត្រូវបានសម្អាត
 Comment[lb]=D'Dreckskëscht ass eidelgemat ginn
 Comment[lt]=Šiukšliadėžė buvo ištuštinta
+Comment[mk]=Корпата беше испразнета
 Comment[ms]=Tong sampah telah dikosongkan
 Comment[nb]=Papirkurven er tømt
 Comment[nds]=De Affalltünn wöör leddig maakt
@@ -185,6 +190,7 @@
 Comment[tt]=Çüplek buşatılğan buldı
 Comment[uk]=Смітник було спорожнено
 Comment[uz]=Чиқиндилар қутиси бўшатилди
+Comment[vi]=Rác đã được đổ.
 Comment[zh_CN]=回收站已被清空
 default_presentation=1
 
@@ -260,7 +266,7 @@
 Name[uk]=Доповнення тексту: обертання
 Name[uz]=Матнни тугатиш: қайтариш
 Name[ven]=U fhela ha manwalwa: U mona
-Name[vi]=Textcompletion:Quay 
+Name[vi]=Nhập xong từ: xoay
 Name[xh]=Textcompletion: ujikeleziso
 Name[zh_CN]=文字补齐：轮转
 Name[zh_HK]=文字補齊：旋轉
@@ -320,6 +326,7 @@
 Comment[tt]=Kileşülär tezmäseneñ azağına cittek
 Comment[uk]=Досягнуто кінець списку співпадань
 Comment[uz]=Мос келадиган элементлар рўйхатининг охири
+Comment[vi]=Mới tới kết thúc của danh sách từ khớp.
 Comment[zh_CN]=已到达匹配项列表的最后
 default_presentation=1
 
@@ -395,7 +402,7 @@
 Name[uk]=Доповнення тексту: немає відповідних значень
 Name[uz]=Матнни тугатиш: мос келадиган йўқ
 Name[ven]=U fhela ha manwalwa: A huna u fanyisa
-Name[vi]=Textcompletion: Không phù hợp 
+Name[vi]=Nhập xong từ: không khớp
 Name[xh]=Textcompletion: akukho ntelekiso
 Name[zh_CN]=文字补齐：没有匹配
 Name[zh_HK]=文字補齊：沒有匹配
@@ -455,6 +462,7 @@
 Comment[tt]=Kileşkän azaqlar tabılmadı
 Comment[uk]=Відповідного завершення не знайдено
 Comment[uz]=Мос келадиган тугатиш топилмади
+Comment[vi]=Không tìm thấy.
 Comment[zh_CN]=没有找到匹配的补全项
 Comment[zh_HK]=找不到完全匹配的項目
 default_presentation=1
@@ -531,7 +539,7 @@
 Name[uk]=Доповнення тексту: часткове співпадання
 Name[uz]=Матнни тугатиш: қисман мос келиш
 Name[ven]=U fhela ha manwalwa: U elana hu tukunyana
-Name[vi]=Textcompletion: Phù hợp một phần 
+Name[vi]=Nhập xong từ: khớp bộ phạn
 Name[xh]=Ugqibeko lokubhaliweyo: intelekiso engaphelelanga
 Name[zh_CN]=文字补齐：部分匹配
 Name[zh_HK]=文字補齊︰部分匹配
@@ -591,6 +599,7 @@
 Comment[tt]=Kileşkäne berdän dä kübkär
 Comment[uk]=Більше одного відповідного значення
 Comment[uz]=Биттадан кўп мослик топилди
+Comment[vi]=Khớp nhiều từ.
 Comment[zh_CN]=有多于一个的可能匹配项
 Comment[zh_HK]=匹配的可能性多於一個
 default_presentation=1
@@ -619,7 +628,7 @@
 Name[fi]=Ei voitu avata tiedostoa
 Name[fo]=Kann ikki opna fíla
 Name[fr]=Impossible d'ouvrir un fichier
-Name[fy]=Kin it triem net iepenje
+Name[fy]=Kin de triem net iepenje
 Name[ga]=Ní Féidir an Comhad a Oscailt
 Name[gl]=Non se pode abrir a arquivo
 Name[he]=אין אפשרות לפתוח קובץ
@@ -670,7 +679,7 @@
 Name[uk]=Неможливо відкрити файл
 Name[uz]=Файлни очиб бўлмади
 Name[ven]=I ngasi vule faela
-Name[vi]=Không thềEmềEfile 
+Name[vi]=Không thể mở tập tin
 Name[wa]=Dji n' sai drovi l' fitchî
 Name[xh]=Ayinakuyivula Ifayile
 Name[zh_CN]=无法打开文件
@@ -748,7 +757,7 @@
 Comment[uk]=Вибраний файл не може бути відкритий для читання або запису
 Comment[uz]=Танланган файлни на ўқиш на ёзиш учун очиб бўлади.
 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[vi]=Tập tin được chọn không có khả năng mở để đọc hay ghi.
 Comment[xh]=Ifayile ekhethiweyo ayinakuvulelwa ukufunda okanye ukubhala
 Comment[zh_CN]=选中的文件不能打开来读或写
 Comment[zh_HK]=所選取的檔案無法開啟進行讀取或者是寫入
@@ -829,7 +838,7 @@
 Name[uk]=Фатальна помилка
 Name[uz]=Жуда жиддий хато
 Name[ven]=Vhukhakhi vhuhulwane
-Name[vi]=Lỗi nghiêm trọng 
+Name[vi]=Lỗi nghiêm trọng
 Name[wa]=Aroke moirt
 Name[xh]=Imposiso Enengozi
 Name[zh_CN]=致命错误
@@ -891,6 +900,7 @@
 Comment[tt]=Yazılımnan çığuına kitergän citdi xata kilep çıqqan
 Comment[uk]=Серйозна помилка стала причиною виходу програми
 Comment[uz]=Дастурнинг ишини якунланишига сабабчи бўлган жиддий хато рўй берди
+Comment[vi]=Gặp lỗi nghiêm trong mà gây ra chương trình thoát.
 Comment[zh_CN]=有一个严重的错误导致程序退出
 Comment[zh_HK]=發生了嚴重的錯誤，導致程式結束
 default_presentation=2
@@ -968,7 +978,7 @@
 Name[uk]=Повідомлення
 Name[uz]=Хабарнома
 Name[ven]=Ndivhadzo
-Name[vi]=Thông báo 
+Name[vi]=Thông báo
 Name[wa]=Notifiaedje
 Name[xh]=Isaziso
 Name[zh_CN]=通知
@@ -1030,6 +1040,7 @@
 Comment[tt]=Yazılımda kötelmägän närsä kilep çıqqan
 Comment[uk]=Щось особливе сталось у програмі
 Comment[uz]=Дастурда қандайдир одатдан ташқари ҳодиса рўй берди
+Comment[vi]=Có gì đặc biệt đã xảy ra trong chương trình.
 Comment[zh_CN]=程序中发生了特殊情况
 Comment[zh_HK]=程式發生了特殊情況
 default_presentation=1
@@ -1110,7 +1121,7 @@
 Name[uk]=Попередження
 Name[uz]=Диққат
 Name[ven]=Khaidzo
-Name[vi]=Cảnh cáo 
+Name[vi]=Cảnh báo
 Name[wa]=Adviertixhmint
 Name[xh]=Isilumkiso
 Name[zh_CN]=警告
@@ -1172,6 +1183,7 @@
 Comment[tt]=Qıyınlıqlarğa kiterä ala torğan xatalar kilep çıqqannar
 Comment[uk]=Сталася серйозна помилка, яка може викликати проблеми
 Comment[uz]=Дастурда муаммоларга олиб келиши мумкин бўлган хато рўй берди
+Comment[vi]=Gặp lỗi trong chương trình, mà có thể gây ra vấn đề.
 Comment[zh_CN]=程序中发生了可能导致问题的错误
 default_presentation=2
 level=2
@@ -1247,7 +1259,7 @@
 Name[uk]=Катастрофа
 Name[uz]=Фожиа
 Name[ven]=Mutshinyalo
-Name[vi]=Thảm hoạ 
+Name[vi]=Lỗi rất nghiêm trọng
 Name[xh]=Ingozi enkulu
 Name[zh_CN]=严重问题
 Name[zh_HK]=嚴重問題
@@ -1285,7 +1297,7 @@
 Comment[id]=Ada kesalahan serius muncul, menyebabkan program harus diakhiri
 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[ja]=非常に重大なエラーが発生し、そのために少くともプログラムが終了しました
 Comment[km]=កំហុសដ៏ធ្ងន់ធ្ងរបំផុតមួយបានកើតឡើង ដែលយ៉ាងហោចណាស់ វាបណ្តាលឲ្យកម្មវិធីបិទ
 Comment[ko]=프로그램이 끝날 때 아주 심각한 오류가 생겼습니다
 Comment[lb]=E ganz schlëmme Feeler ass opgetrueden, deen op Mannst zum Ophale vum Programm gefouert huet
@@ -1319,6 +1331,7 @@
 Comment[tt]=İñ kimendä,yazılımnan çığuına kitergän bik citdi xata kilep çıqqan
 Comment[uk]=Сталася дуже серйозна помилка, яка, щонайменше, стала причиною виходу програми
 Comment[uz]=Дастурнинг ишини якунланишига сабабчи бўлган жиддий хато рўй берди
+Comment[vi]=Gặp lỗi rất nghiêm trọng mà ít nhất đã gây ra chương trình thoát.
 Comment[zh_CN]=出现了一个非常严重的错误，至少使程序退出
 Comment[zh_HK]=發生了一個很嚴重的錯誤，令程式必須結束
 default_presentation=2
@@ -1392,7 +1405,7 @@
 Name[uk]=Реєстрація
 Name[uz]=Кириш
 Name[ven]=U dzhena kha khomupwutha
-Name[vi]=Đăng nhập 
+Name[vi]=Đăng nhập
 Name[wa]=Elodjaedje
 Name[xh]=Igama elithile
 Name[zh_CN]=登录
@@ -1424,7 +1437,7 @@
 Comment[hu]=A KDE elindul
 Comment[is]=KDE er að ræsa
 Comment[it]=Avvio di KDE
-Comment[ja]=KDE起動中
+Comment[ja]=KDE 起動中
 Comment[km]=KDE កំពុងចាប់ផ្តើម
 Comment[lb]=KDE gëtt gestart
 Comment[lt]=KDE pradeda darbą
@@ -1454,6 +1467,7 @@
 Comment[tt]=KDE yöklänä
 Comment[uk]=Триває запуск KDE
 Comment[uz]=KDE ишга тушмоқда
+Comment[vi]=KDE đang khởi chạy.
 Comment[zh_CN]=KDE 正在启动
 Comment[zh_HK]=KDE 正在啟動
 default_presentation=1
@@ -1530,6 +1544,7 @@
 Name[uk]=Кінець сеансу
 Name[uz]=Чиқиш
 Name[ven]=U litsha u shumisa khomupwutha
+Name[vi]=Đăng xuất
 Name[wa]=Dislodjaedje
 Name[xh]=Phuma ngaphandle
 Name[zh_CN]=注消
@@ -1561,7 +1576,7 @@
 Comment[hu]=A KDE kilép
 Comment[is]=KDE er að hætta
 Comment[it]=Uscita da KDE
-Comment[ja]=KDE終了中
+Comment[ja]=KDE 終了中
 Comment[km]=KDE កំពុងបិទ
 Comment[lb]=KDE gëtt zougemat
 Comment[lt]=KDE baigia darbą
@@ -1591,6 +1606,7 @@
 Comment[tt]=KDE tuqtatıla
 Comment[uk]=Триває завершення роботи KDE
 Comment[uz]=KDE ишини якунламоқда
+Comment[vi]=KDE đang thoát.
 Comment[zh_CN]=KDE 正在退出
 Comment[zh_HK]=KDE 正在結束
 default_presentation=1
@@ -1668,7 +1684,7 @@
 Name[uk]=Помилка друку
 Name[uz]=Босиб чиқариш хатоси
 Name[ven]=Vhukhakhi hau phirintha
-Name[vi]=Lỗi khi in 
+Name[vi]=Lỗi in
 Name[wa]=Aroke d' imprimaedje
 Name[xh]=Imposiso yoshicilelo
 Name[zh_CN]=打印错误
@@ -1741,6 +1757,7 @@
 Comment[tt]=Bastıru xatası bulıp çıqtı
 Comment[uk]=Сталася помилка друку
 Comment[uz]=Босиб чиқариш хатоси рўй берди
+Comment[vi]=Gặp lỗi in
 Comment[wa]=Åk n' a nén stî tot-z imprimant
 Comment[zh_CN]=发生了打印错误
 Comment[zh_HK]=列印時發生錯誤
@@ -1816,6 +1833,7 @@
 Name[tt]=Belderü xäbäre
 Name[uk]=Інформаційне повідомлення
 Name[uz]=Маълумот хабари
+Name[vi]=Thông điệp thông tin
 Name[wa]=Messaedje d' informåcion
 Name[zh_CN]=信息性消息
 Name[zh_HK]=一般訊息
@@ -1884,6 +1902,7 @@
 Comment[tt]=Belderü xäbäre kürsätelä
 Comment[uk]=Показується інформативне повідомлення
 Comment[uz]=Маълумот хабари кўрсатилди
+Comment[vi]=Một thông điệp thông in đang được hiển thị.
 Comment[wa]=On messaedje d' informåcion est håyné
 Comment[zh_CN]=正在显示信息性消息
 Comment[zh_HK]=顯示一般訊息
@@ -1958,6 +1977,7 @@
 Name[tt]=Kisätü xäbäre
 Name[uk]=Попередження
 Name[uz]=Огоҳнома хабари
+Name[vi]=Thông điệp cảnh báo
 Name[wa]=Messaedje d' adviertixhmint
 Name[zh_CN]=警告消息
 Name[zh_HK]=警告訊息
@@ -2026,6 +2046,7 @@
 Comment[tt]=Kisätü xäbäre kürsätelä
 Comment[uk]=Показується повідомлення з попередженням
 Comment[uz]=Огоҳнома хабари кўрсатилди
+Comment[vi]=Một thông điệp cảnh báo đang được hiển thị.
 Comment[wa]=On messaedje d' adviertixhmint est håyné
 Comment[zh_CN]=正在显示警告消息
 Comment[zh_HK]=顯示警告訊息
@@ -2100,6 +2121,7 @@
 Name[tt]=Kisken xäl xäbäre
 Name[uk]=Критична помилка
 Name[uz]=Муаммо хабари
+Name[vi]=Thông điệp tới hạn
 Name[wa]=Messaedje critike
 Name[zh_CN]=关键消息
 Name[zh_HK]=嚴重警告訊息
@@ -2167,6 +2189,7 @@
 Comment[tt]=Kisken xäl xäbäre kürsätelä
 Comment[uk]=Показується повідомлення про критичну помилку
 Comment[uz]=Муаммо хабари кўрсатилди
+Comment[vi]=Một thông điệp về trường hợp tới hạn đang được hiển thị.
 Comment[wa]=On messaedje critike est håyné
 Comment[zh_CN]=正在显示关键消息
 Comment[zh_HK]=顯示嚴重警告訊息
@@ -2243,6 +2266,7 @@
 Name[tt]=Soraw
 Name[uk]=Запитання
 Name[uz]=Савол
+Name[vi]=Câu hỏi
 Name[wa]=Kesse
 Name[zh_CN]=问题
 Name[zh_HK]=提問
@@ -2312,6 +2336,7 @@
 Comment[tt]=Ber soraw birelde
 Comment[uk]=Показується запитання
 Comment[uz]=Савол берилди
+Comment[vi]=Một câu đang được hỏi.
 Comment[wa]=Ene kesse est dmandêye
 Comment[zh_CN]=正在提问
 Comment[zh_HK]=顯示提問訊息
Index: kdecore/kprocess.cpp
===================================================================
--- kdecore/kprocess.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdecore/kprocess.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -355,8 +355,6 @@
 if (pipe(fd))
 fd[0] = fd[1] = -1; // Pipe failed.. continue
 
- QApplication::flushX();
-
 // we don't use vfork() because
 // - it has unclear semantics and is not standardized
 // - we do way too much magic in the child
@@ -768,7 +766,7 @@
 d->shell = shell;
 else
 // #ifdef NON_FREE // ... as they ship non-POSIX /bin/sh
-#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__GNU__)
+#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__GNU__) && !defined(__DragonFly__)
 // Solaris POSIX ...
 if (!access( "/usr/xpg4/bin/sh", X_OK ))
 d->shell = "/usr/xpg4/bin/sh";
Index: kdecore/kiconloader.cpp
===================================================================
--- kdecore/kiconloader.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdecore/kiconloader.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -435,17 +435,26 @@
 
 if ( extensionLength > 0 )
 {
+	return name.left(name.length() - extensionLength);
+ }
+ return name;
+}
+
+QString KIconLoader::removeIconExtensionInternal(const QString &name) const
+{
+ QString name_noext = removeIconExtension(name);
+
 #ifndef NDEBUG
+ if (name != name_noext)
+ {
 	kdDebug(264) << "Application " << KGlobal::instance()->instanceName()
- << " loads icon " << name << " with extension." << endl;
+		 << " loads icon " << name << " with extension." << endl;
+ }
 #endif
 
-	return name.left(name.length() - extensionLength);
- }
- return name;
+ return name_noext;
 }
 
-
 KIcon KIconLoader::findMatchingIcon(const QString& name, int size) const
 {
 KIcon icon;
@@ -529,7 +538,7 @@
 if (!QDir::isRelativePath(_name))
 	return _name;
 
- QString name = removeIconExtension( _name );
+ QString name = removeIconExtensionInternal( _name );
 
 QString path;
 if (group_or_size == KIcon::User)
@@ -673,7 +682,7 @@
 if (!canReturnNull && name.isEmpty())
 name = str_unknown;
 else
-	 name = removeIconExtension(name);
+	 name = removeIconExtensionInternal(name);
 }
 
 // If size == 0, use default size for the specified group.
@@ -810,12 +819,16 @@
 	 ((ovl = loadOverlay(theme->shareOverlay(), size)) != 0L))
 	 KIconEffect::overlay(*img, *ovl);
 if (overlay & KIcon::HiddenOverlay)
+ {
+	 if (img->depth() != 32)
+	 *img = img->convertDepth(32);
 for (int y = 0; y < img->height(); y++)
 {
-		Q_UINT32 *line = reinterpret_cast<Q_UINT32 *>(img->scanLine(y));
+		QRgb *line = reinterpret_cast<QRgb *>(img->scanLine(y));
 for (int x = 0; x < img->width(); x++)
 line[x] = (line[x] & 0x00ffffff) | (QMIN(0x80, qAlpha(line[x])) << 24);
 	 }
+	}
 }
 
 // Scale the icon and apply effects if necessary
Index: kdecore/kglobalaccel_x11.cpp
===================================================================
--- kdecore/kglobalaccel_x11.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdecore/kglobalaccel_x11.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -212,7 +212,7 @@
 		if( failed ) {
 			kdDebug(125) << "grab failed!\n";
 			for( uint m = 0; m <= 0xff; m++ ) {
-				if( m & keyModMaskX == 0 )
+				if(( m & keyModMaskX ) == 0 )
 					XUngrabKey( qt_xdisplay(), keyCodeX, keyModX | m, qt_xrootwin() );
 				}
 }
Index: kdecore/kiconloader.h
===================================================================
--- kdecore/kiconloader.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdecore/kiconloader.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -401,11 +401,32 @@
 /**
 * Checks if name ends in one of the supported icon formats (i.e. .png)
 * and returns the name without the extension if it does.
+ *
+ * Otherwise name is returned unchanged.
+ *
+ * Currently supported:
+ * - png
+ * - xpm
+ * - svg (if libart is being used)
+ * - svgz (if libart is being used)
+ *
+ * TODO: KDE 4 make public & static
 * @since 3.1
 */
 QString removeIconExtension(const QString &name) const;
 
 /**
+ * Same as removeIconExtension except it prints a debug message
+ * if an extension is removed to help catch programming errors.
+ *
+ * @see findMatchingIcon()
+ * @see iconPath()
+ *
+ * TODO: KDE 4 make static
+ */
+ QString removeIconExtensionInternal(const QString &name) const;
+
+ /**
 * Loads all the different sizes for an iconset.
 */
 QIconSet loadIconSetNonDelayed( const QString& name, KIcon::Group group,
Index: kdecore/ktempdir.cpp
===================================================================
--- kdecore/ktempdir.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdecore/ktempdir.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -107,6 +107,9 @@
 {
 if (bAutoDelete)
 unlink();
+
+// KTempDirPrivate doesn't exist, so it can't be deleted
+// delete d;
 }
 
 int
Index: kdecore/all_languages.desktop
===================================================================
--- kdecore/all_languages.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdecore/all_languages.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -35,6 +35,7 @@
 Name[tt]=Afarça
 Name[uk]=Афар
 Name[uz]=Афар
+Name[vi]=Ă-pha
 Name[zh_CN]=阿法尔语
 Name[zh_HK]=阿發爾
 Name[zh_TW]=阿發爾
@@ -98,6 +99,7 @@
 Name[tt]=Abxazça
 Name[uk]=Абхазька
 Name[uz]=Абхазча
+Name[vi]=Ap-kha-xi-an
 Name[wa]=Abxhaze
 Name[zh_CN]=阿布哈西亚语
 Name[zh_HK]=阿布哈西亞語
@@ -152,6 +154,7 @@
 Name[tt]=Avestança
 Name[uk]=Авестан
 Name[uz]=Авеста
+Name[vi]=Ă-ve-x-tanh
 Name[zh_CN]=阿维斯陀语
 Name[zh_HK]=阿維斯陀語
 Name[zh_TW]=阿維斯陀語
@@ -211,6 +214,7 @@
 Name[uk]=Південноафриканська
 Name[uz]=Африканча
 Name[ven]=Tshivhuru
+Name[vi]=Hoà Nam Phi
 Name[xh]=Isibhulu
 Name[zh_CN]=南非荷兰语
 Name[zh_HK]=南非荷蘭語
@@ -276,6 +280,7 @@
 Name[tt]=Amharça
 Name[uk]=Амхарська
 Name[uz]=Амхарик
+Name[vi]=Am-ha-ri
 Name[zh_CN]=阿姆哈拉语
 Name[zh_HK]=衣索比亞官方語
 Name[zh_TW]=衣索比亞官方語
@@ -354,7 +359,7 @@
 Name[uk]=Арабська
 Name[uz]=Арабча
 Name[ven]=Tshiarabiki
-Name[vi]=Arabic (A? Rập) 
+Name[vi]=A-rập
 Name[wa]=Arabe
 Name[zh_CN]=阿拉伯语
 Name[zh_HK]=阿拉伯語
@@ -414,6 +419,7 @@
 Name[tt]=Assamesçä
 Name[uk]=Асамійська
 Name[uz]=Ассамесе
+Name[vi]=A-xam
 Name[zh_CN]=阿萨姆语
 Name[zh_HK]=阿薩姆語
 Name[zh_TW]=阿薩姆語
@@ -459,6 +465,7 @@
 Name[tt]=Aymarça
 Name[uk]=Аймарська
 Name[uz]=Аймара
+Name[vi]=Ay-ma-ra
 Name[zh_CN]=艾马拉语
 Name[zh_HK]=愛瑪拉語
 Name[zh_TW]=愛瑪拉語
@@ -533,7 +540,7 @@
 Name[tt]=Äzerçä
 Name[uk]=Азербайджанська
 Name[uz]=Озарбайжонча
-Name[vi]=Agiecbaigiăng 
+Name[vi]=A-xợ-bai-gianh
 Name[wa]=Azeri
 Name[zh_CN]=阿塞拜疆语
 Name[zh_HK]=亞塞拜彊語
@@ -589,6 +596,7 @@
 Name[tt]=Başqortça
 Name[uk]=Башкирська
 Name[uz]=Бошқирча
+Name[vi]=Ba-x-kia
 Name[zh_CN]=巴什基尔语
 Name[zh_HK]=Bashkir語
 Name[zh_TW]=Bashkir語
@@ -663,7 +671,7 @@
 Name[tt]=Belarusça
 Name[uk]=Білоруська
 Name[uz]=Белорусча
-Name[vi]=SBelarusian 
+Name[vi]=Be-la-ru-xợ
 Name[wa]=Bielorûsse
 Name[zh_CN]=白俄罗斯语
 Name[zh_HK]=白俄羅斯語
@@ -742,7 +750,7 @@
 Name[tt]=Bulgarça
 Name[uk]=Болгарська
 Name[uz]=Болгарча
-Name[vi]=Tiếng Bungari 
+Name[vi]=Bảo-gia-lơi
 Name[wa]=Bulgåre
 Name[zh_CN]=保加利亚语
 Name[zh_HK]=保加利亞語
@@ -784,6 +792,7 @@
 Name[tt]=Biharça
 Name[uk]=Біхарі
 Name[uz]=Бихари
+Name[vi]=Bi-ha-ri
 Name[zh_CN]=比哈里语
 Name[zh_HK]=比哈爾語
 Name[zh_TW]=比哈爾語
@@ -822,6 +831,7 @@
 Name[tt]=Bislamaça
 Name[uk]=Біслама
 Name[uz]=Бислама
+Name[vi]=Bit-la-ma
 Name[zh_CN]=比斯拉马语
 Name[zh_HK]=Bislama語
 Name[zh_TW]=Bislama語
@@ -877,6 +887,7 @@
 Name[tt]=Bengalça
 Name[uk]=Бенгальська
 Name[uz]=Бенгалча
+Name[vi]=Ben-ga-li
 Name[zh_CN]=孟加拉语
 Name[zh_HK]=孟加拉語
 Name[zh_TW]=孟加拉語
@@ -948,6 +959,7 @@
 Name[tt]=Tibetçä
 Name[uk]=Тибетська
 Name[uz]=Тибетча
+Name[vi]=Tây-tạng
 Name[wa]=Tibetyin
 Name[zh_CN]=藏语
 Name[zh_HK]=藏語
@@ -1020,6 +1032,7 @@
 Name[tt]=Bretonça
 Name[uk]=Бретонська
 Name[uz]=Бретонча
+Name[vi]=Bợ-re-ton
 Name[wa]=Burton
 Name[zh_CN]=布里多尼语
 Name[zh_HK]=不列塔尼語
@@ -1097,6 +1110,7 @@
 Name[uk]=Боснійська
 Name[uz]=Боснияча
 Name[ven]=Mubosinia
+Name[vi]=Bo-x-ni-a
 Name[wa]=Bosnyin
 Name[zh_CN]=波斯尼亚语
 Name[zh_HK]=波斯尼亞語
@@ -1171,7 +1185,7 @@
 Name[tt]=Katalança
 Name[uk]=Каталонська
 Name[uz]=Каталанча
-Name[vi]=Tiếng Catalăng 
+Name[vi]=Ca-ta-lan
 Name[zh_CN]=加泰罗尼亚语
 Name[zh_HK]=嘉泰羅尼亞語
 Name[zh_TW]=嘉泰羅尼亞語
@@ -1238,6 +1252,7 @@
 Name[tt]=Çäçänçä
 Name[uk]=Чеченська
 Name[uz]=Чеченча
+Name[vi]=Che-chen
 Name[wa]=Tchetchene
 Name[zh_CN]=车臣语
 Name[zh_HK]=Chechen語
@@ -1279,6 +1294,7 @@
 Name[tt]=Çamorroça
 Name[uk]=Чаморо
 Name[uz]=Чаморро
+Name[vi]=Cha-mo-rô
 Name[zh_CN]=查莫罗语
 Name[zh_HK]=查摩洛語
 Name[zh_TW]=查摩洛語
@@ -1346,6 +1362,7 @@
 Name[tt]=Korsikça
 Name[uk]=Корсиканська
 Name[uz]=Корсиканча
+Name[vi]=Coa-xi-ca
 Name[wa]=Corse
 Name[zh_CN]=科西嘉语
 Name[zh_HK]=科西嘉語
@@ -1422,7 +1439,7 @@
 Name[tt]=Çexçä
 Name[uk]=Чеська
 Name[uz]=Чехча
-Name[vi]=Tiếng Séc 
+Name[vi]=Séc
 Name[wa]=Tcheke
 Name[zh_CN]=捷克语
 Name[zh_HK]=捷克語
@@ -1492,6 +1509,7 @@
 Name[uk]=Церковнослов'янська
 Name[uz]=Черков-словянча
 Name[ven]=Slavic Zwakereke
+Name[vi]=Xla-vơ nhà thơ
 Name[wa]=Eslave d' eglijhe
 Name[zh_CN]=宗教斯拉夫语(古代俄语)
 Name[zh_HK]=教堂斯拉夫語
@@ -1548,6 +1566,7 @@
 Name[tt]=Çuaşça
 Name[uk]=Чуваська
 Name[uz]=Чувашча
+Name[vi]=Chu-va-xợ
 Name[wa]=Tchouvache
 Name[zh_CN]=楚瓦什语
 Name[zh_HK]=楚瓦士語
@@ -1621,6 +1640,7 @@
 Name[tt]=Welşçä
 Name[uk]=Уельська
 Name[uz]=Уэлсча
+Name[vi]=Ouen-x
 Name[wa]=Walès
 Name[zh_CN]=威尔士
 Name[zh_HK]=威爾斯語
@@ -1698,7 +1718,7 @@
 Name[tt]=Dança
 Name[uk]=Датська
 Name[uz]=Данияча
-Name[vi]=Tiếng Đan Mạch 
+Name[vi]=Đan-mạch
 Name[wa]=Daenwès
 Name[zh_CN]=丹麦语
 Name[zh_HK]=丹麥語
@@ -1778,7 +1798,7 @@
 Name[uk]=Німецька
 Name[uz]=Олмонча
 Name[ven]=Mudzhemeni
-Name[vi]=Tiếng Đức 
+Name[vi]=Đức
 Name[wa]=Almand
 Name[xh]=Isijamani
 Name[zh_CN]=德语
@@ -1816,6 +1836,7 @@
 Name[tt]=Dzongxaça
 Name[uk]=Дзонгка
 Name[uz]=Дзонгха
+Name[vi]=Đ-xong-kha
 Name[wa]=Boutanès
 Name[zh_CN]=不丹宗卡语
 Name[zh_HK]=Dzongkha語
@@ -1894,7 +1915,7 @@
 Name[uk]=Грецька
 Name[uz]=Юнонча
 Name[ven]=Mugerika
-Name[vi]=Tiếng Hy Lạp 
+Name[vi]=Hy-lạp
 Name[wa]=Grek
 Name[xh]=isigrike
 Name[zh_CN]=希腊语
@@ -1975,7 +1996,7 @@
 Name[uk]=Англійська
 Name[uz]=Инглизча
 Name[ven]=Luisimane
-Name[vi]=English(Anh) 
+Name[vi]=Anh
 Name[wa]=Inglès
 Name[xh]=Isingesi
 Name[zh_CN]=英语
@@ -1988,11 +2009,12 @@
 Name[bg]=Британски английски
 Name[bn]=বৃটিশ ইংরেজি
 Name[br]=Saozneg eus Bro Saoz
+Name[bs]=Britanski engleski
 Name[ca]=Anglès britànic
 Name[cs]=Britská angličtina
 Name[cy]=Saesneg Prydain
 Name[da]=Britisk engelsk
-Name[de]=Britisches Englisch
+Name[de]=Englisch (UK)
 Name[el]=Αγγλικά (Μ. Βρετανίας)
 Name[es]=Inglés británico
 Name[et]=Briti inglise
@@ -2012,6 +2034,7 @@
 Name[lb]=Britescht Englesch
 Name[lt]=Anglų (D.Britanijos)
 Name[lv]=Britu Angļu
+Name[mk]=Англиски (британски)
 Name[nb]=Britisk engelsk
 Name[nds]=Britsch Engelsch
 Name[nl]=Engels (Brits)
@@ -2035,6 +2058,7 @@
 Name[tt]=İnglizçä (Britania)
 Name[uk]=Англійська (Великобританія)
 Name[uz]=Инглизча (Англия)
+Name[vi]=Anh (quốc Anh)
 Name[zh_CN]=英国英语
 Name[zh_HK]=英式英語
 [en_US]
@@ -2043,10 +2067,11 @@
 Name[bg]=Американски английски
 Name[bn]=মার্কিন ইংরেজি
 Name[br]=Saozneg eus SUA
+Name[bs]=Američki engleski
 Name[ca]=Anglès americà
 Name[cs]=Americká angličtina
 Name[da]=Amerikansk engelsk
-Name[de]=Amerikanisches Englisch
+Name[de]=Englisch (US)
 Name[el]=Αγγλικά (Αμερικής)
 Name[es]=Inglés americano
 Name[et]=Ameerika inglise
@@ -2065,6 +2090,7 @@
 Name[km]=អង់គ្លេស អាមេរិក
 Name[lb]=Amerikanescht Englesch
 Name[lt]=Anglų (JAV)
+Name[mk]=Англиски (американски)
 Name[nb]=Amerikansk engelsk
 Name[nds]=Amerikaansch Engelsch
 Name[nl]=Engels (Amerikaans)
@@ -2088,6 +2114,7 @@
 Name[tt]=İnglizçä (Amerika)
 Name[uk]=Англійська (США)
 Name[uz]=Инглизча (АҚШ)
+Name[vi]=Anh (Mỹ)
 Name[zh_CN]=美国英语
 Name[zh_HK]=美式英語
 [eo]
@@ -2123,7 +2150,7 @@
 Name[tt]=Esperantoça
 Name[uk]=Есперанто
 Name[uz]=Эсперанто
-Name[vi]=Tiếng Etpêrantô 
+Name[vi]=Ét-pe-ran-tô
 Name[zh_CN]=世界语
 Name[zh_HK]=世界語
 Name[zh_TW]=世界語
@@ -2201,7 +2228,7 @@
 Name[tt]=İspança
 Name[uk]=Іспанська
 Name[uz]=Испанча
-Name[vi]=Tiếng Tây Ban Nha 
+Name[vi]=Tây-ban-nha
 Name[wa]=Castiyan
 Name[xh]=Isipanishi
 Name[zh_CN]=西班牙语
@@ -2280,7 +2307,7 @@
 Name[tt]=Estonça
 Name[uk]=Естонська
 Name[uz]=Эстонча
-Name[vi]=Tiếng Estonian 
+Name[vi]=E-x-tô-ni-a
 Name[wa]=Estonyin
 Name[zh_CN]=爱沙尼亚语
 Name[zh_HK]=愛沙尼亞語
@@ -2354,7 +2381,7 @@
 Name[tt]=Basqça
 Name[uk]=Баскська
 Name[uz]=Баскча
-Name[vi]=Tiếng Baxcơ 
+Name[vi]=Ba-x-quợ
 Name[wa]=Basse
 Name[zh_CN]=巴斯克语
 Name[zh_HK]=巴斯克語
@@ -2392,7 +2419,7 @@
 Name[hu]=Fárszi (perzsa)
 Name[is]=Farsi (Persneska)
 Name[it]=Farsi (Persiano)
-Name[ja]=ファルシ語(ペルシア語)
+Name[ja]=ファルシ語 (ペルシア語)
 Name[km]=ហ្វាស៊ី (ពឺស៊ាន)
 Name[ko]=팔시 (페르시아어)
 Name[lb]=Farsi (Persesch)
@@ -2424,6 +2451,7 @@
 Name[tt]=Farsı
 Name[uk]=Фризійська (Перська)
 Name[uz]=Форсча (Персча)
+Name[vi]=Pha-xi
 Name[wa]=Farsi
 Name[zh_CN]=波斯语
 Name[zh_HK]=波斯語
@@ -2499,7 +2527,7 @@
 Name[tt]=Finçä
 Name[uk]=Фінська
 Name[uz]=Финча
-Name[vi]=Tiếng Phần Lan 
+Name[vi]=Phần-lan
 Name[wa]=Finwès
 Name[zh_CN]=芬兰语
 Name[zh_HK]=芬蘭語
@@ -2567,6 +2595,7 @@
 Name[tt]=Fijiçä
 Name[uk]=Фіджійська
 Name[uz]=Фижича
+Name[vi]=Phi-gi
 Name[wa]=Fidjyin
 Name[zh_CN]=斐济语
 Name[zh_HK]=斐濟語
@@ -2632,6 +2661,7 @@
 Name[tt]=Farosça
 Name[uk]=Фарерська
 Name[uz]=Фарерча
+Name[vi]=Pha-rô
 Name[wa]=Faeroyès
 Name[zh_CN]=法罗群岛语
 Name[zh_HK]=法羅語
@@ -2781,6 +2811,7 @@
 Name[tg]=Фризианӣ
 Name[uk]=Фризійська
 Name[uz]=Фризча
+Name[vi]=Ph-ri-xi
 Name[wa]=Frizon
 Name[zh_CN]=弗里斯兰语
 Name[zh_HK]=弗利然語
@@ -2792,6 +2823,7 @@
 Name[bg]=Ирландски
 Name[bn]=আইরিশ গেলিক
 Name[br]=Iwerzhoneg eus Bro Iwerzhon
+Name[bs]=Irski Gaelic
 Name[ca]=Irlandès gaèlic
 Name[cs]=Galský (irština)
 Name[da]=Irsk gælisk
@@ -2834,6 +2866,7 @@
 Name[tr]=İrlanda Galik
 Name[tt]=Galça (İrland)
 Name[uk]=Гальська (Ірландія)
+Name[vi]=Xen-tợ Ái-nhĩ-lan
 Name[zh_CN]=爱尔兰盖尔语
 [gd]
 Name=Gaelic
@@ -2843,7 +2876,6 @@
 Name[bg]=Гаелски
 Name[bn]=গেলিক
 Name[br]=Iwerzhoneg
-Name[bs]=Galski
 Name[ca]=Gaèlic
 Name[cs]=Galský
 Name[cy]=Gaeleg
@@ -2869,7 +2901,6 @@
 Name[km]=ហ្កែលិគ
 Name[lb]=Gällesch
 Name[lt]=Galų
-Name[mk]=Галски
 Name[mn]=Гаели
 Name[nb]=Gælisk
 Name[nds]=Gäälsch
@@ -2895,6 +2926,8 @@
 Name[tr]=Galik
 Name[tt]=Galça
 Name[uk]=Гальська
+Name[uz]=Галикча
+Name[vi]=Xen-tợ
 Name[wa]=Gayel
 Name[zh_CN]=盖尔语
 Name[zh_HK]=蓋爾語
@@ -2905,6 +2938,7 @@
 Name[bg]=Галисийски
 Name[bn]=গেলিসিয়ান
 Name[br]=Galiseg
+Name[bs]=Galicijski
 Name[ca]=Gallec
 Name[cs]=Haličský
 Name[cy]=Galiseg
@@ -2928,6 +2962,7 @@
 Name[lb]=Galizesch
 Name[lt]=Galiciečių
 Name[lv]=Galiciāņu
+Name[mk]=Галски
 Name[mt]=Galiċian
 Name[nb]=Gaelisk
 Name[nds]=Galizsch
@@ -2953,7 +2988,7 @@
 Name[uk]=Галісійська
 Name[uz]=Галикча
 Name[ven]=Mugalata
-Name[vi]=Tiếng Galician 
+Name[vi]=Ga-li-ci
 Name[xh]=isiGalacian
 Name[zh_CN]=加利西亚语
 Name[zu]=Isi-Galashiyani
@@ -2977,7 +3012,7 @@
 Name[ja]=グアラニー語
 Name[km]=ហ្កួរ៉ានី
 Name[ko]=과라니어
-Name[mk]=Гоарани
+Name[mk]=Гуарани
 Name[mn]=Гуарани
 Name[nso]=Se-Guarani
 Name[pa]=ਗੁਜਰਾਨੀ
@@ -2996,6 +3031,7 @@
 Name[tt]=Guarança
 Name[uk]=Гуарані
 Name[uz]=Гуарани
+Name[vi]=Gua-ra-ni
 Name[wa]=Gwarani
 Name[zh_CN]=瓜拉尼语
 Name[zh_HK]=瓜拉尼語
@@ -3041,6 +3077,7 @@
 Name[tg]=Гӯҷаратӣ
 Name[uk]=Гуяраті
 Name[uz]=Гужарати
+Name[vi]=Gu-gia-ra-ti
 Name[wa]=Goudjarati
 Name[zh_CN]=古吉拉特语
 Name[zh_HK]=古吉拉特語
@@ -3087,6 +3124,7 @@
 Name[tt]=Manksça
 Name[uk]=Манкс
 Name[uz]=Манкс
+Name[vi]=Man-xợ
 Name[wa]=Gayel del Iye di Man
 Name[zh_CN]=马恩岛语
 Name[zh_HK]=曼島語
@@ -3127,6 +3165,7 @@
 Name[tt]=Hausça
 Name[uk]=Гауса
 Name[uz]=Хауса
+Name[vi]=Hau-sa
 Name[zh_CN]=豪撒语
 Name[zh_HK]=豪薩語
 Name[zh_TW]=豪薩語
@@ -3203,7 +3242,7 @@
 Name[tt]=Yähüdçä
 Name[uk]=Єврейська
 Name[uz]=Яҳудийча
-Name[vi]=Tiếng Do Thái 
+Name[vi]=Do-thái
 Name[wa]=Ebreu
 Name[xh]=Isihebhere
 Name[zh_CN]=希伯来语
@@ -3250,6 +3289,7 @@
 Name[tt]=Hindçä
 Name[uk]=Хінді
 Name[uz]=Ҳиндча
+Name[vi]=Hin-đi
 Name[zh_CN]=北印度语
 Name[zh_HK]=北印度語
 Name[zh_TW]=北印度語
@@ -3291,6 +3331,7 @@
 Name[tg]=Хири Моту
 Name[uk]=Хірі Моту
 Name[uz]=Хири Моту
+Name[vi]=Hi-ri-mô-tu
 Name[zh_CN]=新里木托语
 Name[zh_HK]=Hiri Motu語
 Name[zh_TW]=Hiri Motu語
@@ -3368,7 +3409,7 @@
 Name[tt]=Kroatça
 Name[uk]=Хорватська
 Name[uz]=Хорватча
-Name[vi]=Tiếng Crô-át 
+Name[vi]=Cợ-rô-a-ti-a
 Name[wa]=Crowåte
 Name[zh_CN]=克罗地亚语
 Name[zh_HK]=克羅地亞語
@@ -3380,6 +3421,7 @@
 Name[bg]=Горносорбийски
 Name[bn]=উচ্চ সার্বীয়
 Name[br]=Sorab uhel
+Name[bs]=Gornji lužičkosrpski
 Name[ca]=Alt sòrab
 Name[cs]=Hornolužicko srbský
 Name[cy]=Sorbieg Uchaf
@@ -3424,6 +3466,7 @@
 Name[tt]=Sorbça, Öske
 Name[uk]=Верхньо-лужицька
 Name[uz]=Юқори Сорбча
+Name[vi]=Xoa-bi muộn
 Name[zh_CN]=索布语
 [hu]
 Name=Hungarian
@@ -3498,7 +3541,7 @@
 Name[tt]=Macarça
 Name[uk]=Угорська
 Name[uz]=Венгрча
-Name[vi]=Tiếng Hung-ga-ri 
+Name[vi]=Hung-gia-lợi
 Name[wa]=Hongrwès
 Name[zh_CN]=匈牙利语
 Name[zh_HK]=匈牙利語
@@ -3574,6 +3617,7 @@
 Name[tt]=Ärmänçä
 Name[uk]=Вірменська
 Name[uz]=Арманча
+Name[vi]=Ác-mê-ni
 Name[wa]=Årmenyin
 Name[zh_CN]=亚美尼亚语
 Name[zh_HK]=亞美尼亞語
@@ -3613,6 +3657,7 @@
 Name[tt]=Hereroça
 Name[uk]=Гереро
 Name[uz]=Хереро
+Name[vi]=He-re-rô
 Name[zh_CN]=赫雷罗语
 Name[zh_HK]=Herero語
 Name[zh_TW]=Herero語
@@ -3650,6 +3695,7 @@
 Name[uk]=Інтерлінгва
 Name[uz]=Интерлингуа
 Name[ven]=Luambo lwa hothe
+Name[vi]=In-tợ-lin-gua
 Name[wa]=Interlingua (noû latén)
 Name[zh_CN]=拉丁国际语(国际辅助语)
 Name[zh_HK]=科技共通語
@@ -3726,6 +3772,7 @@
 Name[tt]=İndonesçä
 Name[uk]=Індонезійська
 Name[uz]=Индонезча
+Name[vi]=Nam-dương
 Name[wa]=Indonezyin
 Name[zh_CN]=印度尼西亚语
 Name[zh_HK]=印尼語
@@ -3768,6 +3815,7 @@
 Name[uk]=Інтерлінгва
 Name[uz]=Интерлингуе
 Name[ven]=Luambo lwa hothe
+Name[vi]=In-tợ-lin-guợ
 Name[zh_CN]=语际语
 Name[zh_HK]=Interlingue語
 Name[zh_TW]=Interlingue語
@@ -3810,6 +3858,7 @@
 Name[tt]=İnupiaqça
 Name[uk]=Інупіак
 Name[uz]=Инупиак
+Name[vi]=I-nu-piac
 Name[wa]=Inyupiak
 Name[zh_CN]=因纽佩特语
 Name[zh_HK]=Inupiaq語
@@ -3844,6 +3893,7 @@
 Name[tt]=İdoça
 Name[uk]=Ідо
 Name[uz]=Идо
+Name[vi]=I-đô
 Name[zh_CN]=伊多语
 Name[zh_HK]=伊多語
 Name[zh_TW]=伊多語
@@ -3920,7 +3970,7 @@
 Name[tt]=İslandça
 Name[uk]=Ісландська
 Name[uz]=Исландча
-Name[vi]=Tiếng Ai-xơ-len
+Name[vi]=Băng-đảo
 Name[wa]=Izlandès
 Name[zh_CN]=冰岛语
 Name[zh_HK]=冰島語
@@ -3998,7 +4048,7 @@
 Name[tt]=İtalça
 Name[uk]=Італійська
 Name[uz]=Италянча
-Name[vi]=Tiếng Italia 
+Name[vi]=Ý
 Name[wa]=Itålyin
 Name[xh]=isitaliyane
 Name[zh_CN]=意大利语
@@ -4036,6 +4086,7 @@
 Name[tt]=İnuktitutça
 Name[uk]=Інуктітут
 Name[uz]=Инуктитут
+Name[vi]=I-nuc-ti-túc
 Name[zh_CN]=因纽特语
 Name[zh_HK]=Inuktitut語
 Name[zh_TW]=Inuktitut語
@@ -4114,7 +4165,7 @@
 Name[uk]=Японська
 Name[uz]=Японча
 Name[ven]=Mudzhapani
-Name[vi]=Tiếng Nhật 
+Name[vi]=Nhật
 Name[wa]=Djaponès
 Name[xh]=Isijapani
 Name[zh_CN]=日语
@@ -4187,6 +4238,7 @@
 Name[tt]=Javaça
 Name[uk]=Яванська
 Name[uz]=Яаванез
+Name[vi]=Gia-va
 Name[wa]=Djavanès
 Name[zh_CN]=爪哇语
 Name[zh_HK]=爪哇語
@@ -4260,6 +4312,7 @@
 Name[tt]=Görceçä
 Name[uk]=Грузинська
 Name[uz]=Грузинча
+Name[vi]=Gi-oa-gi-ạ
 Name[wa]=Djeyordjyin
 Name[zh_CN]=乔治亚语
 Name[zh_HK]=喬治亞語
@@ -4301,6 +4354,7 @@
 Name[tt]=Kikuyuça
 Name[uk]=Кікую
 Name[uz]=Кикуйу
+Name[vi]=Ki-ku-yu
 Name[zh_CN]=基库尤语
 Name[zh_HK]=吉庫猶語
 Name[zh_TW]=吉庫猶語
@@ -4360,6 +4414,7 @@
 Name[tt]=Qazaqça
 Name[uk]=Казахська
 Name[uz]=Қозоқча
+Name[vi]=Kha-xakh
 Name[wa]=Kazaxh
 Name[zh_CN]=哈萨克语
 Name[zh_HK]=哈薩克語
@@ -4402,6 +4457,7 @@
 Name[tt]=Kalaallisutça
 Name[uk]=Калаалісут
 Name[uz]=Калааллисут
+Name[vi]=Ka-lă-li-sút
 Name[zh_CN]=格陵兰语
 Name[zh_HK]=Kalaallisut語
 Name[zh_TW]=Kalaallisut語
@@ -4449,6 +4505,7 @@
 Name[tt]=Xmerçä
 Name[uk]=Кхмерська
 Name[uz]=Кхмерча
+Name[vi]=Khơ-me
 Name[wa]=Xhmer
 Name[zh_CN]=高棉语
 Name[zh_HK]=高棉語
@@ -4489,6 +4546,7 @@
 Name[tt]=Kannadça
 Name[uk]=Каннада
 Name[uz]=Каннада
+Name[vi]=Ka-na-đa
 Name[zh_CN]=坎纳德语
 Name[zh_HK]=坎那達語
 Name[zh_TW]=坎那達語
@@ -4564,7 +4622,7 @@
 Name[tt]=Koreyçä
 Name[uk]=Корейська
 Name[uz]=Корейсча
-Name[vi]=Tiếng Hàn Quốc 
+Name[vi]=Triều-tiên
 Name[wa]=Coreyin
 Name[xh]=Isikorea
 Name[zh_CN]=朝鲜语
@@ -4622,6 +4680,7 @@
 Name[tt]=Kaşmirçä
 Name[uk]=Кашмірська
 Name[uz]=Кашмирча
+Name[vi]=Ka-x-mi-ri
 Name[wa]=Cachmiri
 Name[zh_CN]=克什米尔语
 Name[zh_HK]=喀什米爾語
@@ -4696,6 +4755,7 @@
 Name[tt]=Kördçä
 Name[uk]=Курдська
 Name[uz]=Курдча
+Name[vi]=Kuổ-đị
 Name[wa]=Kurdi
 Name[zh_CN]=库尔德语
 Name[zh_HK]=庫德語
@@ -4738,6 +4798,7 @@
 Name[tt]=Komiçä
 Name[uk]=Комі
 Name[uz]=Коми
+Name[vi]=Khô-mi
 Name[zh_CN]=科米语
 Name[zh_HK]=Komi語
 Name[zh_TW]=Komi語
@@ -4800,6 +4861,7 @@
 Name[tt]=Kornişçä
 Name[uk]=Корнійська
 Name[uz]=Корн
+Name[vi]=Xen-tợ Coanh-ouặn
 Name[wa]=Cornike
 Name[zh_CN]=康瓦尔郡语
 Name[zh_HK]=康瓦耳語
@@ -4866,6 +4928,7 @@
 Name[tt]=Qırğızça
 Name[uk]=Киргизька
 Name[uz]=Қирғизча
+Name[vi]=Kia-gi-x
 Name[wa]=Kirguize
 Name[zh_CN]=吉尔吉斯语
 Name[zh_HK]=吉爾吉斯語
@@ -4929,6 +4992,7 @@
 Name[tt]=Latínça
 Name[uk]=Латинська
 Name[uz]=Лотинча
+Name[vi]=La-tinh
 Name[wa]=Latén
 Name[zh_CN]=拉丁语
 Name[zh_HK]=拉丁語
@@ -4999,6 +5063,7 @@
 Name[tt]=Lüksemburgça
 Name[uk]=Люксембурзька
 Name[uz]=Люксембургча
+Name[vi]=Lúc-xăm-buac
 Name[wa]=Lussimbordjwès
 Name[zh_CN]=卢森堡语
 Name[zh_HK]=盧森堡語
@@ -5060,6 +5125,7 @@
 Name[tt]=Limburgça
 Name[uk]=Лімбурганська
 Name[uz]=Лимбурган
+Name[vi]=Lim-bua-ga
 Name[wa]=Limbordjwès
 Name[zh_CN]=林堡语
 Name[zh_HK]=Limburgan語
@@ -5096,6 +5162,7 @@
 Name[tt]=Lingalaça
 Name[uk]=Лінгала
 Name[uz]=Лингала
+Name[vi]=Lin-ga-la
 Name[zh_CN]=林加拉语
 Name[zh_HK]=Lingala語
 Name[zh_TW]=Lingala語
@@ -5142,6 +5209,7 @@
 Name[tt]=Laoça
 Name[uk]=Лаоська
 Name[uz]=Лаосча
+Name[vi]=Lào
 Name[wa]=Lawocyin
 Name[zh_CN]=老挝语
 Name[zh_HK]=寮國語
@@ -5219,7 +5287,7 @@
 Name[tt]=Litçä
 Name[uk]=Литовська
 Name[uz]=Литвача
-Name[vi]=Lithuanian 
+Name[vi]=Li-tu-a-ni
 Name[wa]=Litwanyin
 Name[zh_CN]=立陶宛语
 Name[zh_HK]=立陶宛語
@@ -5295,7 +5363,7 @@
 Name[tt]=Latça
 Name[uk]=Латвійська
 Name[uz]=Латишча
-Name[vi]=Tiếng Latvia
+Name[vi]=Lát-vi-a
 Name[wa]=Letonyin
 Name[xh]=Isilatvian
 Name[zh_CN]=拉脱维亚语
@@ -5356,6 +5424,7 @@
 Name[tt]=Malagasça
 Name[uk]=Малагська
 Name[uz]=Малагаси
+Name[vi]=Ma-la-ga-xị
 Name[wa]=Malgache
 Name[zh_CN]=马尔加什语
 Name[zh_HK]=馬拉加西語
@@ -5422,6 +5491,7 @@
 Name[tt]=Marşallça
 Name[uk]=Маршальська
 Name[uz]=Маршаллез
+Name[vi]=Mă-xăn
 Name[wa]=Marshalès
 Name[zh_CN]=马绍尔语
 Name[zh_HK]=馬紹爾語
@@ -5479,7 +5549,7 @@
 Name[tt]=Maoriça
 Name[uk]=Маорі
 Name[uz]=Маори
-Name[vi]=Tiếng Maori 
+Name[vi]=Mao-ri
 Name[wa]=Mawori
 Name[zh_CN]=毛利语
 Name[zh_HK]=毛利語
@@ -5556,7 +5626,7 @@
 Name[tt]=Makedonça
 Name[uk]=Македонська
 Name[uz]=Македонияча
-Name[vi]=Tiếng Macedonian 
+Name[vi]=Ma-xê-đô-ni
 Name[wa]=Macedonyin
 Name[zh_CN]=马其顿语
 Name[zh_HK]=馬其頓語
@@ -5604,6 +5674,7 @@
 Name[tg]=Малаямӣ
 Name[uk]=Малайська
 Name[uz]=Малайалам
+Name[vi]=Ma-lay-am
 Name[zh_CN]=德拉维族语
 Name[zh_HK]=馬來亞拉姆語
 Name[zh_TW]=馬來亞拉姆語
@@ -5677,6 +5748,7 @@
 Name[tt]=Moğolça
 Name[uk]=Монгольська
 Name[uz]=Муғулча
+Name[vi]=Mông-cổ
 Name[wa]=Mongol
 Name[zh_CN]=蒙古语
 Name[zh_HK]=蒙古語
@@ -5750,6 +5822,7 @@
 Name[tt]=Moldavça
 Name[uk]=Молдовська
 Name[uz]=Молдавча
+Name[vi]=Mon-đa-vi
 Name[wa]=Moldåve
 Name[zh_CN]=摩尔多瓦
 Name[zh_HK]=摩爾達維亞語
@@ -5796,6 +5869,7 @@
 Name[tt]=Maratça
 Name[uk]=Мараті
 Name[uz]=Марати
+Name[vi]=Ma-ra-ti
 Name[wa]=Marati
 Name[zh_CN]=马拉地语
 Name[zh_HK]=馬拉地語
@@ -5812,7 +5886,7 @@
 Name[ca]=Malai
 Name[cs]=Malajský
 Name[da]=Malajisk
-Name[de]=Malaisch
+Name[de]=Malaiisch
 Name[eo]=Malaja
 Name[es]=Malayo
 Name[et]=Malaisia
@@ -5862,6 +5936,7 @@
 Name[tt]=Malayça
 Name[uk]=Малайська
 Name[uz]=Малайча
+Name[vi]=Mã-lai
 Name[zh_CN]=马来西亚语
 Name[zh_HK]=馬來語
 Name[zh_TW]=馬來語
@@ -5935,7 +6010,7 @@
 Name[tt]=Maltesçä
 Name[uk]=Мальтійська
 Name[uz]=Малтача
-Name[vi]=Tiếng Mantơ 
+Name[vi]=Man-tợ
 Name[wa]=Maltès
 Name[zh_CN]=马耳他语
 Name[zh_HK]=馬爾他語
@@ -6005,6 +6080,7 @@
 Name[tt]=Burmesçä
 Name[uk]=Бірманська
 Name[uz]=Бурмезча
+Name[vi]=Miến-điện
 Name[zh_CN]=缅甸语
 Name[zh_HK]=緬甸語
 Name[zh_TW]=緬甸語
@@ -6049,6 +6125,7 @@
 Name[tg]=Науру
 Name[uk]=Науру
 Name[uz]=Науру
+Name[vi]=Nau-ru
 Name[zh_CN]=瑙鲁语
 Name[zh_HK]=諾魯語
 Name[zh_TW]=諾魯語
@@ -6118,6 +6195,7 @@
 Name[tt]=Norvegçä (ädäbi)
 Name[uk]=Норвезька (Bokmål)
 Name[uz]=Норвегча (Бокмаал)
+Name[vi]=Na-uy (Bóc-mặn)
 Name[wa]=Norvedjyin (Bokmål)
 Name[zh_CN]=挪威语 (博克马尔语)
 Name[zu]=Isi-Norwegian Bokmaal
@@ -6185,6 +6263,7 @@
 Name[uk]=Ндебелє, Північна
 Name[uz]=Ндебеле, Шимол
 Name[ven]=Ndebele, Devhula
+Name[vi]=N-đe-be-lê (Bắc)
 Name[wa]=Ndebele (bijhe)
 Name[xh]=Isindebele, Emntla
 Name[zh_CN]=Ndebele，北部
@@ -6197,6 +6276,7 @@
 Name[bg]=Долносаксонски
 Name[bn]=নিম্ন স্যাক্সন
 Name[br]=Saozeg izel
+Name[bs]=Niži saksonski
 Name[ca]=Baix saxó
 Name[cs]=Dolnosaský
 Name[cy]=Sacsoneg Isel
@@ -6219,6 +6299,7 @@
 Name[lb]=Niddersächsesch
 Name[lt]=Žemutinių saksonų
 Name[lv]=Lejas sakšu
+Name[mk]=Долносаксонски
 Name[nb]=Lavgermansk
 Name[nds]=Neddersass'sch
 Name[nl]=Nedersaksisch
@@ -6242,6 +6323,7 @@
 Name[tt]=Saksonça, Asqı
 Name[uk]=Ніжньо-Саксонська
 Name[uz]=Паст Саксонча
+Name[vi]=Xác-xọnh thấp
 Name[zh_CN]=撒克逊语
 [ne]
 Name=Nepali
@@ -6301,6 +6383,7 @@
 Name[tt]=Nepalça
 Name[uk]=Непальська
 Name[uz]=Непалча
+Name[vi]=Ne-pa-li
 Name[wa]=Nepalès
 Name[zh_CN]=尼泊尔语
 Name[zh_HK]=尼泊爾語
@@ -6333,6 +6416,7 @@
 Name[tt]=Ndongaça
 Name[uk]=Ндонга
 Name[uz]=Ндонга
+Name[vi]=N-đon-ga
 Name[zh_HK]=Ndonga語
 Name[zh_TW]=Ndonga語
 Name[zu]=Isi-Ndonga
@@ -6409,7 +6493,7 @@
 Name[tt]=Dutça
 Name[uk]=Нідерландська
 Name[uz]=Голландча
-Name[vi]=Tiếng Hà Lan 
+Name[vi]=Hoà-lan
 Name[wa]=Neyerlandès
 Name[xh]=Isidatshi
 Name[zh_CN]=荷兰语
@@ -6484,6 +6568,7 @@
 Name[tt]=Norwejçä (Ninorsk)
 Name[uk]=Норвезька (Nynorsk)
 Name[uz]=Норвегияча (Нйнорск)
+Name[vi]=Na-uy (Ny-noạ-x-kh)
 Name[wa]=Noû-Norvedjyin (Nynorsk)
 Name[zh_CN]=挪威语 (尼诺斯克语)
 Name[zh_HK]=挪威 Nynorsk 語
@@ -6553,6 +6638,7 @@
 Name[uk]=Ндебелє, Південна
 Name[uz]=Ндебеле, Жануб
 Name[ven]=Ndebele, Tshipembe
+Name[vi]=N-đe-be-lê (Nam)
 Name[wa]=Ndebele (nonne)
 Name[xh]=Isindebele, Emazantsi
 Name[zh_CN]=Ndebele，南部
@@ -6620,6 +6706,7 @@
 Name[tt]=Tönyaq Sotho
 Name[uk]=Північне Сото
 Name[uz]=Шимолий Соточа
+Name[vi]=Xô-tô (Bắc)
 Name[wa]=Soto (bijhe)
 Name[zh_CN]=北部梭托语
 [nv]
@@ -6660,6 +6747,7 @@
 Name[tt]=Navaxoça
 Name[uk]=Навахо
 Name[uz]=Наважо
+Name[vi]=Na-va-cộ
 Name[wa]=Navaxho
 Name[zh_CN]=纳瓦霍语
 Name[zh_HK]=納瓦伙語
@@ -6703,6 +6791,7 @@
 Name[tt]=Çiçewaça
 Name[uk]=Чічеванська
 Name[uz]=Чичева
+Name[vi]=Chi-che-ouă
 Name[wa]=Tchitchewa
 Name[zh_CN]=齐切瓦语
 Name[zh_HK]=Chichewa語
@@ -6769,6 +6858,7 @@
 Name[tt]=Okkitança
 Name[uk]=Оксітанська
 Name[uz]=Французча (Осситан шеваси)
+Name[vi]=Óc-ci-tan
 Name[zh_CN]=奥西坦语
 Name[zh_HK]=Occitan語
 Name[zh_TW]=Occitan語
@@ -6806,6 +6896,7 @@
 Name[tt]=Oromoça
 Name[uk]=Оромо
 Name[uz]=Оромо
+Name[vi]=O-ro-mô
 Name[zh_CN]=阿曼语
 Name[zh_HK]=Oromo語
 Name[zh_TW]=Oromo語
@@ -6848,6 +6939,7 @@
 Name[tg]=Ориёӣ
 Name[uk]=Орія
 Name[uz]=Ория
+Name[vi]=Ô-ri-yạ
 Name[zh_CN]=欧里亚语
 Name[zh_HK]=Oriya語
 Name[zh_TW]=Oriya語
@@ -6913,6 +7005,7 @@
 Name[tt]=Ossetinçä
 Name[uk]=Осетійська
 Name[uz]=Оссетинча
+Name[vi]=Óc-xe-ti-an
 Name[wa]=Ossete
 Name[zh_CN]=奥塞梯语
 Name[zh_HK]=Ossetian語
@@ -6927,7 +7020,7 @@
 Name[bn]=পাঞ্জাবী
 Name[br]=Pendjabieg
 Name[cs]=Pandžábský
-Name[de]=Pandschabi-Sprache
+Name[de]=Pandschabi
 Name[eo]=Panĝaba
 Name[es]=Punjabí
 Name[et]=Pandžabi
@@ -6969,6 +7062,7 @@
 Name[tt]=Panjabça
 Name[uk]=Панджабська
 Name[uz]=Панжабча
+Name[vi]=Pan-gia-bi
 Name[wa]=Pundjabi
 Name[zh_CN]=旁遮普语
 Name[zh_HK]=Panjabi語
@@ -7008,6 +7102,7 @@
 Name[tt]=Paliçä
 Name[uk]=Палі
 Name[uz]=Пали
+Name[vi]=Pa-li
 Name[wa]=Pâli
 Name[zh_CN]=巴利语
 Name[zh_HK]=巴利語
@@ -7085,7 +7180,7 @@
 Name[tt]=Polça
 Name[uk]=Польська
 Name[uz]=Полякча
-Name[vi]=Tiếng Ba Lan 
+Name[vi]=Ba-lan
 Name[wa]=Polonès
 Name[zh_CN]=波兰语
 Name[zh_HK]=波蘭語
@@ -7137,6 +7232,7 @@
 Name[tt]=Puştu Farsíçası
 Name[uk]=Пуштунська
 Name[uz]=Пуштунча
+Name[vi]=Pu-x-tô
 Name[wa]=Pashto
 Name[zh_CN]=普什图语
 Name[zh_HK]=普什圖語
@@ -7215,7 +7311,7 @@
 Name[tt]=Portugalça
 Name[uk]=Португальська
 Name[uz]=Португалча
-Name[vi]=Tiếng BềEĐào Nha 
+Name[vi]=Bồ-đào-nha
 Name[wa]=Portuguès
 Name[zh_CN]=葡萄牙语
 Name[zh_HK]=葡萄牙語
@@ -7287,6 +7383,7 @@
 Name[tt]=Portugalça, Brasil
 Name[uk]=Бразильська португальська
 Name[uz]=Португалча (Бразилия)
+Name[vi]=Bồ-đào-nha (Bra-xin)
 Name[wa]=Portuguès do Braezi
 Name[zh_CN]=巴西葡萄牙语
 Name[zh_HK]=巴西葡萄牙語
@@ -7297,7 +7394,6 @@
 Name[bg]=Кечуа
 Name[bn]=কেচুয়া
 Name[br]=Kechuaeg
-Name[de]=Quechua-Sprache
 Name[eo]=Keĉua
 Name[et]=Ketšua
 Name[eu]=Kitxua
@@ -7328,6 +7424,7 @@
 Name[tt]=Queçuaça
 Name[uk]=Кечуа
 Name[uz]=Квечуа
+Name[vi]=Quê-chua
 Name[wa]=Kitchwa
 Name[zh_CN]=盖丘亚语
 Name[zh_HK]=蓋楚瓦語
@@ -7340,7 +7437,6 @@
 Name[bg]=Руанда
 Name[bn]=রুণ্ডি
 Name[cy]=Rwndi
-Name[de]=Rundi-Sprache
 Name[eo]=Ruanda
 Name[fa]=روندی
 Name[fy]=Rûandeesk
@@ -7366,6 +7462,7 @@
 Name[tt]=Rundiçä
 Name[uk]=Рунді
 Name[uz]=Рунди
+Name[vi]=Run-đi
 Name[wa]=Kirundi
 Name[zh_CN]=基隆迪语
 Name[zh_HK]=Rundi語
@@ -7443,7 +7540,7 @@
 Name[tt]=Romança
 Name[uk]=Румунська
 Name[uz]=Руминча
-Name[vi]=Tiếng BềEĐào Nha 
+Name[vi]=Rô-ma-ni-a
 Name[wa]=Roumin
 Name[zh_CN]=罗马尼亚语
 Name[zh_HK]=羅馬尼亞語
@@ -7452,6 +7549,7 @@
 [rom]
 Name=Romany
 Name[br]=Jipsianek
+Name[bs]=Romanski
 Name[ca]=Caló
 Name[cs]=Romský
 Name[de]=Romani
@@ -7482,6 +7580,7 @@
 Name[sv]=Romanés
 Name[tg]=Романӣ
 Name[uk]=Циганська
+Name[vi]=Rô-ma-ny
 Name[zh_CN]=吉普赛语
 [ru]
 Name=Russian
@@ -7556,7 +7655,7 @@
 Name[tt]=Urısça
 Name[uk]=Російська
 Name[uz]=Русча
-Name[vi]=Tiếng Nga 
+Name[vi]=Nga
 Name[wa]=Rûsse
 Name[xh]=Isirashiya
 Name[zh_CN]=俄语
@@ -7569,7 +7668,6 @@
 Name[az]=Kinyarvandaca
 Name[bg]=Кинияруанда
 Name[bn]=কিন্যারওয়াণ্ডা
-Name[de]=Rwanda-Sprache
 Name[et]=Ruanda
 Name[eu]=Kinyaruanda
 Name[fa]=کینیارواندا
@@ -7603,6 +7701,7 @@
 Name[tt]=Kinyarwandaça
 Name[uk]=Кіньярванда
 Name[uz]=Кинярванда
+Name[vi]=Ki-nyă-ouanh-đa
 Name[wa]=Kiniarwanda
 Name[zh_CN]=卢旺达语
 Name[zh_HK]=Kinyarwanda語
@@ -7654,6 +7753,7 @@
 Name[tt]=Sanskritçä
 Name[uk]=Санскрит
 Name[uz]=Санскрит
+Name[vi]=Xan-s-cợ-ríth
 Name[zh_CN]=梵语
 Name[zh_HK]=梵語
 Name[zh_TW]=梵語
@@ -7720,6 +7820,7 @@
 Name[tt]=Sardinça
 Name[uk]=Сардинська
 Name[uz]=Сардинча
+Name[vi]=Xa-đi-ni-a
 Name[wa]=Sardinyin
 Name[zh_CN]=撒丁语
 Name[zh_HK]=薩丁尼亞語
@@ -7731,7 +7832,6 @@
 Name[bg]=Синдхи
 Name[bn]=সিন্ধি
 Name[br]=Sindhieg
-Name[de]=Sindhi-Sprache
 Name[eo]=Sinda
 Name[fa]=سیندهی
 Name[ga]=Sindis
@@ -7761,6 +7861,7 @@
 Name[tt]=Sindihçä
 Name[uk]=Сіндхі
 Name[uz]=Синдхи
+Name[vi]=Xin-đi
 Name[wa]=Sindi
 Name[zh_HK]=Sindhi語
 Name[zh_TW]=Sindhi語
@@ -7831,6 +7932,7 @@
 Name[uk]=Північна Саамі
 Name[uz]=Шимолий Сами
 Name[ven]=Sami ya Devhula
+Name[vi]=Xa-mi (Bắc)
 Name[wa]=Bijhe såmi
 Name[xh]=Sami Yasemntla
 Name[zh_CN]=北部沙米语
@@ -7843,7 +7945,6 @@
 Name[az]=Sagno
 Name[bg]=Сангро
 Name[bn]=সাংগো
-Name[de]=Sango-Sprache
 Name[eo]=Sangoa
 Name[fa]=سانگویی
 Name[ga]=Sangóis
@@ -7870,6 +7971,7 @@
 Name[tt]=Sangoça
 Name[uk]=Санго
 Name[uz]=Санго
+Name[vi]=Xan-gô
 Name[zh_CN]=桑戈语
 Name[zh_HK]=Sango語
 Name[zh_TW]=Sango語
@@ -7934,6 +8036,7 @@
 Name[tt]=Sinhalçä
 Name[uk]=Сингалійська
 Name[uz]=Синхалесе
+Name[vi]=Xin-ha-li
 Name[wa]=Sinhalès
 Name[zh_CN]=僧伽罗语
 Name[zh_HK]=錫蘭語
@@ -8009,7 +8112,7 @@
 Name[uk]=Словацька
 Name[uz]=Словакча
 Name[ven]=Musilovaka
-Name[vi]=Tiếng Slô-vác 
+Name[vi]=Xlô-vák
 Name[wa]=Eslovake
 Name[xh]=isiSlovak
 Name[zh_CN]=斯洛伐克语
@@ -8087,6 +8190,7 @@
 Name[tt]=Slovençä
 Name[uk]=Словенська
 Name[uz]=Словенианча
+Name[vi]=Xlô-ven
 Name[wa]=Eslovenyin
 Name[zh_CN]=斯洛文尼亚语
 Name[zh_HK]=斯洛維尼亞語
@@ -8154,6 +8258,7 @@
 Name[tt]=Samoaça
 Name[uk]=Самойська
 Name[uz]=Самоача
+Name[vi]=Xa-mô-a
 Name[wa]=Samowan
 Name[zh_CN]=萨摩亚语
 Name[zh_HK]=薩摩牙語
@@ -8192,6 +8297,7 @@
 Name[tt]=Şonaça
 Name[uk]=Шона
 Name[uz]=Шона
+Name[vi]=Sô-na
 Name[xh]=Isishona
 Name[zh_CN]=修纳语
 Name[zh_HK]=Shona語
@@ -8251,6 +8357,7 @@
 Name[tt]=Somaliçä
 Name[uk]=Сомалійська
 Name[uz]=Сомалича
+Name[vi]=Xô-ma-li
 Name[wa]=Somalyin
 Name[zh_CN]=索马里语
 Name[zh_HK]=索馬利語
@@ -8324,6 +8431,7 @@
 Name[tt]=Albança
 Name[uk]=Албанська
 Name[uz]=Албанча
+Name[vi]=An-ba-ni
 Name[wa]=Albanyin
 Name[zh_CN]=阿尔巴尼亚语
 Name[zh_HK]=阿爾巴尼亞語
@@ -8400,7 +8508,7 @@
 Name[tt]=Serbçä
 Name[uk]=Сербська
 Name[uz]=Сербча
-Name[vi]=Tiếng Séc bi 
+Name[vi]=Xéc-bi
 Name[wa]=Serbe
 Name[zh_CN]=塞尔维亚语
 Name[zh_HK]=塞爾維亞語
@@ -8409,11 +8517,12 @@
 [sr@Latn]
 Name=Serbian Latin
 Name[br]=Serbeg latin
+Name[bs]=Srpski latinica
 Name[ca]=Serbi llatí
 Name[cs]=Srbský (latinka)
 Name[cy]=Serbieg Lladin
 Name[da]=Serbisk latin
-Name[de]=Serbisch Latein
+Name[de]=Serbisch (lat. Alphabet)
 Name[el]=Σερβικά (Λατινικά)
 Name[es]=Latín Serbio
 Name[et]=Serbia (ladina)
@@ -8429,6 +8538,7 @@
 Name[km]=សែប៊ី (ឡាតាំង)
 Name[lb]=Latäinescht Serbesch
 Name[lt]=Serbų lotyniška
+Name[mk]=Српски (латиница)
 Name[ms]=Latin Serbia
 Name[nb]=Serbisk (latinsk)
 Name[nds]=Serbsch (latiensch Schrift)
@@ -8444,6 +8554,8 @@
 Name[sv]=Latinsk serbiska
 Name[tg]=Сербӣ (Лотинӣ)
 Name[uk]=Сербська (латинь)
+Name[uz]=Сербча (Лотин)
+Name[vi]=Xéc-bi (La-tinh)
 Name[zh_CN]=塞尔维亚语(拉丁)
 [ss]
 Name=Swati
@@ -8451,7 +8563,6 @@
 Name[az]=Svati
 Name[bg]=Суази
 Name[bn]=সোয়াতি
-Name[de]=Swazi
 Name[et]=Svaasi
 Name[fa]=سواتی
 Name[fi]=Swazi
@@ -8482,6 +8593,7 @@
 Name[tt]=Swatça
 Name[uk]=Суаті
 Name[uz]=Свати
+Name[vi]=Xouă-ti
 Name[wa]=Suwati
 Name[xh]=Isiswati
 Name[zh_CN]=斯瓦特语
@@ -8552,6 +8664,7 @@
 Name[uk]=Сото, Південна
 Name[uz]=Сотхо, Жанубий
 Name[ven]=Sotho, Tshipembe
+Name[vi]=Xô-tô (nam)
 Name[wa]=Soto (nonne)
 Name[xh]=Isisuthu, Sasemzantsi
 Name[zh_CN]=索托，南部
@@ -8620,6 +8733,7 @@
 Name[tt]=Sundanesçä
 Name[uk]=Сунданійська
 Name[uz]=Сунданча
+Name[vi]=Xun-đa-ni
 Name[wa]=Soudanès
 Name[zh_CN]=巽他语
 Name[zh_HK]=Sundanese語
@@ -8697,7 +8811,7 @@
 Name[tt]=İswäcçä
 Name[uk]=Шведська
 Name[uz]=Шведча
-Name[vi]=Tiếng Thuỵ Điển 
+Name[vi]=Thuỵ-điển
 Name[wa]=Suwedwès
 Name[zh_CN]=瑞典语
 Name[zh_HK]=瑞典語
@@ -8746,6 +8860,7 @@
 Name[tt]=Swahiliçä
 Name[uk]=Суахілі
 Name[uz]=Свахили
+Name[vi]=Xouă-hi-li
 Name[wa]=Suwahili
 Name[zh_CN]=斯瓦希里语
 Name[zh_HK]=斯華西里語
@@ -8805,7 +8920,7 @@
 Name[tt]=Tamilça
 Name[uk]=Тамільська
 Name[uz]=Тамилча
-Name[vi]=Tiếng Tamil 
+Name[vi]=Ta-min
 Name[wa]=Tamoul
 Name[zh_CN]=泰米尔语
 Name[zh_HK]=坦米爾語
@@ -8848,6 +8963,7 @@
 Name[tt]=Teluguça
 Name[uk]=Телугу
 Name[uz]=Телугу
+Name[vi]=Te-lu-gu
 Name[wa]=Telougou
 Name[zh_CN]=泰卢固语
 Name[zh_HK]=特拉古語
@@ -8913,6 +9029,7 @@
 Name[tt]=Tajıqça
 Name[uk]=Таджицька
 Name[uz]=Тожикча
+Name[vi]=Ta-gíc
 Name[wa]=Tadjik
 Name[zh_CN]=塔吉克语
 Name[zh_HK]=塔吉克語
@@ -8979,7 +9096,7 @@
 Name[tt]=Tayça
 Name[uk]=Тайська
 Name[uz]=Тайча
-Name[vi]=Tiếng Thái Lan 
+Name[vi]=Thái
 Name[wa]=Taylandès
 Name[zh_CN]=泰语
 Name[zh_HK]=泰國語
@@ -9029,6 +9146,7 @@
 Name[tt]=Tigrinyaça
 Name[uk]=Тигринійська
 Name[uz]=Тигриня
+Name[vi]=Ti-gợ-ri-nia
 Name[wa]=Tigrinia
 Name[zh_CN]=提格里尼亚语
 Name[zh_HK]=提格利尼亞語
@@ -9097,6 +9215,7 @@
 Name[uk]=Туркменська
 Name[uz]=Туркманча
 Name[ven]=Munna wa Turkey
+Name[vi]=Tuổc-men
 Name[wa]=Turkmene
 Name[zh_CN]=土库曼语
 Name[zh_HK]=土庫曼語
@@ -9141,6 +9260,7 @@
 Name[tt]=Tswanaça
 Name[uk]=Тсвана
 Name[uz]=Тсвана
+Name[vi]=T-xouă-nă
 Name[xh]=Isitswana
 Name[zh_CN]=茨瓦纳语
 Name[zh_HK]=班圖語
@@ -9180,6 +9300,7 @@
 Name[tg]=Тонгаӣ
 Name[uk]=Тонга
 Name[uz]=Тонга
+Name[vi]=Tông-ga
 Name[zh_CN]=汤加语
 Name[zh_HK]=東加語
 Name[zh_TW]=東加語
@@ -9256,7 +9377,7 @@
 Name[tt]=Törekçä
 Name[uk]=Турецька
 Name[uz]=Туркча
-Name[vi]=Tiếng ThềENhĩ Kì 
+Name[vi]=Thổ-nhĩ-kỳ
 Name[wa]=Turk
 Name[zh_CN]=土耳其语
 Name[zh_HK]=土耳其語
@@ -9297,6 +9418,7 @@
 Name[tt]=Tsongaça
 Name[uk]=Цонґа
 Name[uz]=Цонга
+Name[vi]=T-xông-ga
 Name[zh_CN]=特松加语
 Name[zh_HK]=Tsonga語
 Name[zh_TW]=Tsonga語
@@ -9354,6 +9476,7 @@
 Name[tt]=Tatarça
 Name[uk]=Татарська
 Name[uz]=Тотарча
+Name[vi]=Ta-tă
 Name[wa]=Tatår
 Name[zh_CN]=鞑靼语
 Name[zh_HK]=韃靼語
@@ -9391,6 +9514,7 @@
 Name[tt]=Twiçä
 Name[uk]=Тві
 Name[uz]=Тви
+Name[vi]=Tui
 Name[zh_CN]=契维语
 Name[zh_HK]=契維語
 Name[zh_TW]=契維語
@@ -9458,6 +9582,7 @@
 Name[tt]=Tahitçä
 Name[uk]=Таїтянська
 Name[uz]=Тахитиан
+Name[vi]=Ta-hi-ti
 Name[wa]=Tahityin
 Name[zh_CN]=塔希提语
 Name[zh_HK]=大溪地語
@@ -9510,6 +9635,7 @@
 Name[tt]=Uyğurça
 Name[uk]=Уйгур
 Name[uz]=Уйғурча
+Name[vi]=Ui-gua
 Name[wa]=Ouygour
 Name[zh_CN]=维吾尔语
 Name[zh_HK]=維吾爾語
@@ -9587,7 +9713,7 @@
 Name[tt]=Ukrainça
 Name[uk]=Українська
 Name[uz]=Украинча
-Name[vi]=Tiếng Ukraina 
+Name[vi]=U-cợ-rainh
 Name[wa]=Oucrinnyin
 Name[xh]=Ukranian
 Name[zh_CN]=乌克兰语
@@ -9628,6 +9754,7 @@
 Name[tt]=Urduça
 Name[uk]=Урду
 Name[uz]=Урду
+Name[vi]=Uổ-đu
 Name[wa]=Ourdou
 Name[zh_CN]=乌尔都语
 Name[zh_HK]=烏都語
@@ -9694,6 +9821,7 @@
 Name[tt]=Üzbäkçä
 Name[uk]=Узбецька
 Name[uz]=Ўзбекча
+Name[vi]=U-x-béc
 Name[wa]=Ouzbeke
 Name[zh_CN]=乌兹别克语
 Name[zh_HK]=烏茲別克語
@@ -9725,6 +9853,7 @@
 Name[tt]=Vendaça
 Name[uk]=Венда
 Name[uz]=Венда
+Name[vi]=Ven-đa
 Name[zh_CN]=闻达语
 [vi]
 Name=Vietnamese
@@ -9797,7 +9926,7 @@
 Name[tt]=Vietnamça
 Name[uk]=В'єтнамська
 Name[uz]=Ветнамча
-Name[vi]=Tiếng Việt
+Name[vi]=Việt
 Name[wa]=Vietnamyin
 Name[zh_CN]=越南语
 Name[zh_HK]=越南語
@@ -9838,6 +9967,7 @@
 Name[tt]=Volapükçä
 Name[uk]=Волап'юк
 Name[uz]=Волапук
+Name[vi]=Vo-la-puc
 Name[zh_CN]=沃拉普克语
 Name[zu]=Isi-Volapük
 [wa]
@@ -9904,7 +10034,7 @@
 Name[tt]=Walonça
 Name[uk]=Валлонська
 Name[uz]=Валлонча
-Name[vi]=Tiếng Wallon 
+Name[vi]=Oua-lunh
 Name[wa]=Walon
 Name[zh_CN]=瓦龙语
 Name[zh_HK]=華隆語
@@ -9948,6 +10078,7 @@
 Name[tt]=Wolofça
 Name[uk]=Волоф
 Name[uz]=Волоф
+Name[vi]=Ouo-lo-ph
 Name[zh_CN]=沃洛夫语
 Name[zh_HK]=Wolof語
 Name[zh_TW]=Wolof語
@@ -9985,7 +10116,7 @@
 Name[uk]=Ксоза
 Name[uz]=Хҳоса
 Name[ven]=Xhoza
-Name[vi]=Xhosa 
+Name[vi]=Xô-xa
 Name[wa]=Xhossa
 Name[xh]=isixhosa
 Name[zh_CN]=科萨语
@@ -10044,6 +10175,7 @@
 Name[tt]=Yidiş
 Name[uk]=Ідиш
 Name[uz]=Йиддиш
+Name[vi]=Y-đít
 Name[wa]=Yidish
 Name[zh_CN]=依地语
 Name[zh_HK]=意第緒語
@@ -10090,6 +10222,7 @@
 Name[tt]=Yorubaça
 Name[uk]=Йоруба
 Name[uz]=Ёруба
+Name[vi]=Yô-ru-ba
 Name[wa]=Yorouba
 Name[zh_CN]=约鲁巴语
 Name[zh_HK]=優魯巴語
@@ -10107,7 +10240,7 @@
 Name[gl]=Chuan
 Name[he]=ג'ואנג
 Name[hi]=झुआंग
-Name[ja]=荘
+Name[ja]=チワン(壮)語
 Name[km]=ចួង
 Name[mk]=Жуанг
 Name[mn]=Жунгаа
@@ -10126,6 +10259,7 @@
 Name[tt]=Cuañça
 Name[uk]=Жуан
 Name[uz]=Зхуанг
+Name[vi]=Xuang
 Name[zh_CN]=壮语
 Name[zh_HK]=Zhuang語
 Name[zh_TW]=Zhuang語
@@ -10204,7 +10338,7 @@
 Name[uk]=Китайська
 Name[uz]=Хитойча
 Name[ven]=Mutshaina
-Name[vi]=Tiếng Trung Quốc 
+Name[vi]=Trung quốc
 Name[wa]=Chinwès
 Name[xh]=Isitshayina
 Name[zh_CN]=中文
@@ -10217,11 +10351,12 @@
 Name[bg]=Китайски опростен
 Name[bn]=সরলীকৃত চৈনিক
 Name[br]=Sineg eeun
+Name[bs]=Kineski pojednostavljeni
 Name[ca]=Xinès simplificat
 Name[cs]=Čínský (zjednodušená)
 Name[cy]=Tseineeg Syml
 Name[da]=Kinesisk simplificeret
-Name[de]=Vereinfachtes Chinesisch
+Name[de]=Chinesisch (vereinfachtes)
 Name[el]=Κινέζικα απλά
 Name[es]=Chino simplificado
 Name[et]=Hiina (lihtsustatud)
@@ -10241,6 +10376,7 @@
 Name[lb]=Einfacht Chinesesch
 Name[lt]=Kinų supaprastinta
 Name[lv]=Ķīniešu vienkāršotā
+Name[mk]=Кинески поедноставен
 Name[nb]=Forenklet kinesisk
 Name[nds]=Vereenfacht Chineesch
 Name[nl]=Chinees (Vereenvoudigd)
@@ -10264,11 +10400,13 @@
 Name[tt]=Çinçä (Ciñel)
 Name[uk]=Китайська (спрощена)
 Name[uz]=Соддалаштирилган Хитойча
+Name[vi]=Trung quốc (phổ thông)
 Name[zh_CN]=简体中文
 Name[zh_HK]=簡體中文
 [zh_HK]
 Name=Chinese (Hong Kong)
 Name[br]=Sinaeg (Hong Kong)
+Name[bs]=Kineski (Hong Kong)
 Name[ca]=Xinès (Hong Kong)
 Name[cs]=Čínský (Hong Kong)
 Name[da]=Kinesisk (Hong Kong)
@@ -10288,6 +10426,7 @@
 Name[km]=ចិន (ហុងកុង)
 Name[lb]=Chinesesch (Hong Kong)
 Name[lt]=Kiniečių (honkongo)
+Name[mk]=Кинески (Хонг Конг)
 Name[ms]=China (Hong Kong)
 Name[nb]=Kinesisk (Hong kong)
 Name[nds]=Chineesch (Hong Kong)
@@ -10303,6 +10442,8 @@
 Name[sv]=Kinesiska (Hong Kong)
 Name[tg]=Хитоӣ (Гонконг)
 Name[uk]=Китайська (Гонконг)
+Name[uz]=Хитойча (Гонгконг)
+Name[vi]=Trung quốc (Hồng Kông)
 Name[zh_CN]=繁体中文(香港)
 [zh_TW]
 Name=Chinese Traditional
@@ -10310,11 +10451,12 @@
 Name[bg]=Китайски традиционен
 Name[bn]=পারম্পরিক চৈনিক
 Name[br]=Sinaeg da gustum
+Name[bs]=Kineski tradicionalni
 Name[ca]=Xinès tradicional
 Name[cs]=Čínský (tradiční)
 Name[cy]=Tsieineeg Traddodiadol
 Name[da]=Kinesisk traditionel
-Name[de]=Traditionelles Chinesisch
+Name[de]=Chinesisch (traditionelles)
 Name[el]=Κινέζικα παραδοσιακά
 Name[es]=Chino tradicional
 Name[et]=Hiina (traditsiooniline)
@@ -10334,6 +10476,7 @@
 Name[lb]=Traditionellt Chinesesch
 Name[lt]=Kinų tradicinė
 Name[lv]=Ķīniešu tradicionālā
+Name[mk]=Кинески традиционален
 Name[nb]=Tradisjonell kinesisk
 Name[nds]=Traditschonell Chineesch
 Name[nl]=Chinees (Traditioneel)
@@ -10357,6 +10500,7 @@
 Name[tt]=Çinçä (Ğädäti)
 Name[uk]=Китайська (традиційна)
 Name[uz]=Анъанавий Хитойча
+Name[vi]=Trung quốc (truyền thống)
 Name[zh_CN]=繁体中文
 Name[zh_HK]=繁體中文
 [zu]
@@ -10400,6 +10544,7 @@
 Name[uk]=Зулуська
 Name[uz]=Зулуча
 Name[ven]=Muzulu
+Name[vi]=Xu-lu
 Name[wa]=Zoulou
 Name[xh]=Isizulu
 Name[zh_CN]=祖鲁语
Index: kdecore/network/kresolver.cpp
===================================================================
--- kdecore/network/kresolver.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdecore/network/kresolver.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -609,7 +609,7 @@
 
 QStrList KResolver::protocolName(int protonum)
 {
- struct protoent *pe;
+ struct protoent *pe = 0L;
 #ifndef HAVE_GETPROTOBYNAME_R
 QMutexLocker locker(&getXXbyYYmutex);
 
@@ -628,6 +628,7 @@
 if (getprotobynumber_r(protonum, &protobuf, buf, buflen, &pe) == ERANGE)
 # endif
 	{
+ pe = 0L;
 	 buflen += 1024;
 	 delete [] buf;
 	}
@@ -655,7 +656,7 @@
 
 QStrList KResolver::protocolName(const char *protoname)
 {
- struct protoent *pe;
+ struct protoent *pe = 0L;
 #ifndef HAVE_GETPROTOBYNAME_R
 QMutexLocker locker(&getXXbyYYmutex);
 
@@ -674,6 +675,7 @@
 if (getprotobyname_r(protoname, &protobuf, buf, buflen, &pe) == ERANGE)
 # endif
 	{
+ pe = 0L;
 	 buflen += 1024;
 	 delete [] buf;
 	}
@@ -701,7 +703,7 @@
 
 int KResolver::protocolNumber(const char *protoname)
 {
- struct protoent *pe;
+ struct protoent *pe = 0L;
 #ifndef HAVE_GETPROTOBYNAME_R
 QMutexLocker locker(&getXXbyYYmutex);
 
@@ -720,6 +722,7 @@
 if (getprotobyname_r(protoname, &protobuf, buf, buflen, &pe) == ERANGE)
 # endif
 	{
+ pe = 0L;
 	 buflen += 1024;
 	 delete [] buf;
 	}
@@ -743,7 +746,7 @@
 
 int KResolver::servicePort(const char *servname, const char *protoname)
 {
- struct servent *se;
+ struct servent *se = 0L;
 #ifndef HAVE_GETSERVBYNAME_R
 QMutexLocker locker(&getXXbyYYmutex);
 
@@ -762,6 +765,7 @@
 if (getservbyname_r(servname, protoname, &servbuf, buf, buflen, &se) == ERANGE)
 # endif
 	{
+ se = 0L;
 	 buflen += 1024;
 	 delete [] buf;
 	}
@@ -785,7 +789,7 @@
 
 QStrList KResolver::serviceName(const char* servname, const char *protoname)
 {
- struct servent *se;
+ struct servent *se = 0L;
 #ifndef HAVE_GETSERVBYNAME_R
 QMutexLocker locker(&getXXbyYYmutex);
 
@@ -804,6 +808,7 @@
 if (getservbyname_r(servname, protoname, &servbuf, buf, buflen, &se) == ERANGE)
 # endif
 	{
+ se = 0L;
 	 buflen += 1024;
 	 delete [] buf;
 	}
@@ -831,7 +836,7 @@
 
 QStrList KResolver::serviceName(int port, const char *protoname)
 {
- struct servent *se;
+ struct servent *se = 0L;
 #ifndef HAVE_GETSERVBYPORT_R
 QMutexLocker locker(&getXXbyYYmutex);
 
@@ -850,6 +855,7 @@
 if (getservbyport_r(port, protoname, &servbuf, buf, buflen, &se) == ERANGE)
 # endif
 	{
+ se = 0L;
 	 buflen += 1024;
 	 delete [] buf;
 	}
Index: kdecore/kapplication.cpp
===================================================================
--- kdecore/kapplication.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdecore/kapplication.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -960,14 +960,13 @@
 static int my_system (const char *command) {
 int pid, status;
 
- QApplication::flushX();
 pid = fork();
 if (pid == -1)
 return -1;
 if (pid == 0) {
 const char* shell = "/bin/sh";
 execl(shell, shell, "-c", command, (void *)0);
- ::exit(127);
+ ::_exit(127);
 }
 do {
 if (waitpid(pid, &status, 0) == -1) {
@@ -1684,7 +1683,7 @@
 && _event->xclient.data.l[ 3 ] != 0 )
 {
 if( qt_x_user_time == 0
- || ( _event->xclient.data.l[ 3 ] - qt_x_user_time ) < 100000U )
+ || NET::timestampCompare( _event->xclient.data.l[ 3 ], qt_x_user_time ) > 0 )
 { // and the timestamp looks reasonable
 qt_x_user_time = _event->xclient.data.l[ 3 ]; // update our qt_x_user_time from it
 }
@@ -1692,7 +1691,7 @@
 else // normal DND, only needed until Qt updates qt_x_user_time from XdndDrop
 {
 if( qt_x_user_time == 0
- || ( _event->xclient.data.l[ 2 ] - qt_x_user_time ) < 100000U )
+ || NET::timestampCompare( _event->xclient.data.l[ 2 ], qt_x_user_time ) > 0 )
 { // the timestamp looks reasonable
 qt_x_user_time = _event->xclient.data.l[ 2 ]; // update our qt_x_user_time from it
 }
@@ -1812,7 +1811,7 @@
 XDestroyWindow( qt_xdisplay(), w );
 }
 if( qt_x_user_time == 0
- || time - qt_x_user_time < 1000000000U ) // check time > qt_x_user_time, handle wrapping
+ || NET::timestampCompare( time, qt_x_user_time ) > 0 ) // check time > qt_x_user_time
 qt_x_user_time = time;
 #endif
 }
Index: kdecore/kcrash.cpp
===================================================================
--- kdecore/kcrash.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdecore/kcrash.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -479,6 +479,7 @@
 if (strlen(sock_file)+strlen(display)+strlen("/kdeinit_")+2 > MAX_SOCK_FILE)
 {
 fprintf(stderr, "Warning: Socket name will be too long.\n");
+ free(display);
 return -1;
 }
 strcat(sock_file, "/kdeinit_");
Index: kdecore/netwm_def.h
===================================================================
--- kdecore/netwm_def.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdecore/netwm_def.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -606,6 +606,20 @@
 FromApplication,
 FromTool
 };
+ 
+ /**
+ Compares two X timestamps, taking into account wrapping and 64bit architectures.
+ Return value is like with strcmp(), 0 for equal, -1 for time1 < time2, 1 for time1 > time2.
+ @since 3.5.3
+ */
+ static int timestampCompare( unsigned long time1, unsigned long time2 );
+ /**
+ Returns a difference of two X timestamps, time2 - time1, where time2 must be later than time1,
+ as returned by timestampCompare().
+ @since 3.5.3
+ */
+ static int timestampDiff( unsigned long time1_, unsigned long time2_ );
+
 };
 
 
Index: kdecore/kpty.cpp
===================================================================
--- kdecore/kpty.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdecore/kpty.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -95,7 +95,7 @@
 # endif
 #endif
 
-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__)
+#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__)
 # define _tcgetattr(fd, ttmode) ioctl(fd, TIOCGETA, (char *)ttmode)
 #else
 # if defined(_HPUX_SOURCE) || defined(__Lynx__) || defined (__CYGWIN__)
@@ -105,7 +105,7 @@
 # endif
 #endif
 
-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__)
+#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__)
 # define _tcsetattr(fd, ttmode) ioctl(fd, TIOCSETA, (char *)ttmode)
 #else
 # if defined(_HPUX_SOURCE) || defined(__CYGWIN__)
Index: kdecore/kxerrorhandler.cpp
===================================================================
--- kdecore/kxerrorhandler.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdecore/kxerrorhandler.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -28,6 +28,7 @@
 #include "kxerrorhandler.h"
 #include <assert.h>
 #include <stdlib.h>
+#include <netwm_def.h>
 
 KXErrorHandler** KXErrorHandler::handlers = NULL;
 int KXErrorHandler::pos = 0;
@@ -101,13 +102,14 @@
 int KXErrorHandler::handle( Display* dpy, XErrorEvent* e )
 {
 if( dpy == display
- && e->serial - first_request < 1000000000 ) // e->serial > first_request, with wrapping
+ // e->serial >= first_request , compare like X timestamps to handle wrapping
+ && NET::timestampCompare( e->serial, first_request ) >= 0 )
 { // it's for us
 //qDebug( "Handling: %p", static_cast< void* >( this ));
- if( user_handler1 != NULL )
- was_error |= user_handler1( e->request_code, e->error_code, e->resourceid );
- else if( user_handler2 != NULL )
- was_error |= ( user_handler2( dpy, e ) != 0 );
+ if( user_handler1 != NULL && user_handler1( e->request_code, e->error_code, e->resourceid ))
+ was_error = true;
+ if( user_handler2 != NULL && user_handler2( dpy, e ) != 0 )
+ was_error = true;
 else // no handler set, simply set that there was an error
 was_error = true;
 return 0;
Index: kdecore/netwm.cpp
===================================================================
--- kdecore/netwm.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdecore/netwm.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -4401,4 +4401,38 @@
 void NETWinInfo::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
+// Functions for X timestamp comparing. For Time being 32bit they're fairly simple
+// (the #if 0 part), but on 64bit architectures Time is 64bit unsigned long,
+// so there special care needs to be taken to always use only the lower 32bits.
+#if 0
+int NET::timestampCompare( Time time1, Time time2 ) // like strcmp()
+ {
+ if( time1 == time2 )
+ return 0;
+ return ( time1 - time2 ) < 0x7fffffffU ? 1 : -1; // time1 > time2 -> 1, handle wrapping
+ }
+
+Time NET::timestampDiff( Time time1, Time time2 ) // returns time2 - time1
+ { // no need to handle wrapping?
+ return time2 - time1;
+ }
+#else
+int NET::timestampCompare( unsigned long time1_, unsigned long time2_ ) // like strcmp()
+ {
+ Q_UINT32 time1 = time1_;
+ Q_UINT32 time2 = time2_;
+ if( time1 == time2 )
+ return 0;
+ return Q_UINT32( time1 - time2 ) < 0x7fffffffU ? 1 : -1; // time1 > time2 -> 1, handle wrapping
+ }
+
+int NET::timestampDiff( unsigned long time1_, unsigned long time2_ ) // returns time2 - time1
+ { // no need to handle wrapping?
+ Q_UINT32 time1 = time1_;
+ Q_UINT32 time2 = time2_;
+ return Q_UINT32( time2 - time1 );
+ }
 #endif
+
+
+#endif
Index: khtml/khtml_part.cpp
===================================================================
--- khtml/khtml_part.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/khtml_part.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -1595,7 +1595,6 @@
 
 d->m_pageServices = d->m_job->queryMetaData("PageServices");
 d->m_pageReferrer = d->m_job->queryMetaData("referrer");
-
 d->m_bSecurityInQuestion = false;
 d->m_ssl_in_use = (d->m_job->queryMetaData("ssl_in_use") == "TRUE");
 
@@ -1638,6 +1637,7 @@
 if ( !qData.isEmpty() && !d->m_haveEncoding ) // only use information if the user didn't override the settings
 d->m_encoding = qData;
 
+
 // Support for http-refresh
 qData = d->m_job->queryMetaData("http-refresh");
 if( !qData.isEmpty())
@@ -1651,6 +1651,11 @@
 d->m_doc->setBaseURL(KURL( d->m_doc->completeURL(baseURL) ));
 */
 
+ // Support for Content-Language
+ QString language = d->m_job->queryMetaData("content-language");
+ if (!language.isEmpty())
+ d->m_doc->setContentLanguage(language);
+
 if ( !m_url.isLocalFile() ) {
 // Support for http last-modified
 d->m_lastModified = d->m_job->queryMetaData("modified");
@@ -3155,7 +3160,8 @@
 else if ( renderLineText )
 {
 khtml::RenderLineEdit *parentLine= static_cast<khtml::RenderLineEdit *>(obj);
- s = parentLine->widget()->text();
+ if (parentLine->widget()->echoMode() == QLineEdit::Normal)
+ s = parentLine->widget()->text();
 s = s.replace(0xa0, ' ');
 }
 else if ( obj->isText() )
@@ -3465,7 +3471,8 @@
 	 text += static_cast<HTMLTextAreaElementImpl*>(n.handle())->value().string();
 	 break;
 	 case ID_INPUT:
-	 text += static_cast<HTMLInputElementImpl*>(n.handle())->value().string();
+ if (static_cast<HTMLInputElementImpl*>(n.handle())->inputType() != HTMLInputElementImpl::PASSWORD)
+ 	 text += static_cast<HTMLInputElementImpl*>(n.handle())->value().string();
 	 break;
 	 case ID_SELECT:
 	 text += static_cast<HTMLSelectElementImpl*>(n.handle())->value().string();
@@ -3966,10 +3973,10 @@
 return true;
 }
 
- //If we're asked to open up an anchor in the current URL, in current window, 
- //merely gotoanchor, and do not reload the new page. Note that this does 
+ //If we're asked to open up an anchor in the current URL, in current window,
+ //merely gotoanchor, and do not reload the new page. Note that this does
 //not apply if the URL is the same page, but without a ref
- if (cURL.hasRef() && (!hasTarget || target == "_self")) 
+ if (cURL.hasRef() && (!hasTarget || target == "_self"))
 {
 KURL curUrl = this->url();
 if (urlcmp(cURL.url(), curUrl.url(),
@@ -3977,7 +3984,7 @@
 true)) // don't care if the ref changes!
 {
 m_url = cURL;
- emit d->m_extension->openURLNotify(); 
+ emit d->m_extension->openURLNotify();
 if ( !gotoAnchor( m_url.encodedHtmlRef()) )
 gotoAnchor( m_url.htmlRef() );
 emit d->m_extension->setLocationBarURL( m_url.prettyURL() );
@@ -4472,7 +4479,7 @@
 }
 
 child->m_serviceType = mimetype;
- if ( child->m_frame )
+ if ( child->m_frame && part->widget() )
 child->m_frame->setWidget( part->widget() );
 
 if ( child->m_type != khtml::ChildFrame::Object )
@@ -5956,9 +5963,9 @@
 if (n->isText()) {
 khtml::RenderText* const textRenderer = static_cast<khtml::RenderText *>(n);
 const khtml::InlineTextBoxArray &runs = textRenderer->inlineTextBoxes();
-	 const unsigned lim = runs.count();
+ const unsigned lim = runs.count();
 for (unsigned i = 0; i != lim; ++i) {
- if (runs[i]->m_y == y) {
+ if (runs[i]->m_y == y && textRenderer->element()) {
 startNode = textRenderer->element();
 startOffset = runs[i]->m_start;
 return true;
@@ -5999,7 +6006,7 @@
 khtml::RenderText* const textRenderer = static_cast<khtml::RenderText *>(n);
 const khtml::InlineTextBoxArray &runs = textRenderer->inlineTextBoxes();
 for (int i = (int)runs.count()-1; i >= 0; --i) {
- if (runs[i]->m_y == y) {
+ if (runs[i]->m_y == y && textRenderer->element()) {
 endNode = textRenderer->element();
 endOffset = runs[i]->m_start + runs[i]->m_len;
 return true;
Index: khtml/khtml.desktop
===================================================================
--- khtml/khtml.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/khtml.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -71,7 +71,7 @@
 Comment[uk]=Вбудований компонент "переглядач HTML"
 Comment[uz]=Ичига ўрнатиб бўладиган HTML кўрувчи компонент
 Comment[ven]=Khomphonente ya HTML yau vhona
-Comment[vi]=Component đềExem HTML có thềEembeđ được 
+Comment[vi]=Thành phần xem HTML có khả năng nhúng.
 Comment[xh]=Inxenye yemboniselo elungisiweyo ye HTML
 Comment[zh_CN]=可嵌入的 HTML 查看部件
 Comment[zh_HK]=可嵌入的 HTML 檢視元件
Index: khtml/khtmlimage.desktop
===================================================================
--- khtml/khtmlimage.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/khtmlimage.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -70,7 +70,7 @@
 Comment[uk]=Вбудований компонент переглядача зображень
 Comment[uz]=Ичига ўрнатиб бўладиган расм кўрувчи компонент
 Comment[ven]=Khomphonente yau vhona tshifanyiso
-Comment[vi]=Component đềExem ảnh có thềEembeđ được 
+Comment[vi]=Thành phần xem ảnh có khả năng nhúng.
 Comment[xh]=Ingxenye Yemboniselo Yomfanekiso Olungisiweyo
 Comment[zh_CN]=可嵌入的图像查看部件
 Comment[zh_HK]=可嵌入的圖檔檢視元件
@@ -145,7 +145,7 @@
 Name[uk]=Вмонтований переглядач зображень
 Name[uz]=Расм кўрувчи
 Name[ven]=Muvhoni wa tshifanyiso o dzheniswaho
-Name[vi]=Trình xem ảnh có thềEembeđ được 
+Name[vi]=Bộ xem ảnh có khả năng nhúng
 Name[wa]=Ravalé håyneu d' imådjes
 Name[xh]=Umboniseli Womfanekiso Olungisiweyo
 Name[zh_CN]=可嵌入的图像查看器
Index: khtml/kmultipart/kmultipart.desktop
===================================================================
--- khtml/kmultipart/kmultipart.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/kmultipart/kmultipart.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -54,6 +54,7 @@
 Name[tr]=Çok parçalı/karışık için Gömülebilir Bileşen
 Name[uk]=Вбудовна компонента для повідомлень multipart/mixed
 Name[uz]=Multipart/mixed учун ичига ўрнатиб бўладиган компонент
+Name[vi]=Thành phần có khả năng nhúng cho dạng thức thư đa phần/đã trộn (multipart/mixed).
 Name[zh_CN]=可嵌入的 multipart/mixed 组件
 Name[zh_HK]=multipart/mixed 的可嵌入元件
 ServiceTypes=KParts/ReadOnlyPart
Index: khtml/testkhtml.cpp
===================================================================
--- khtml/testkhtml.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/testkhtml.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -9,6 +9,7 @@
 // just for memory debugging
 #define protected public
 #include "khtml_part.h"
+#include "khtmlview.h"
 #undef protected
 #include "testkhtml.h"
 #include "testkhtml.moc"
@@ -29,6 +30,7 @@
 #include <kcmdlineargs.h>
 #include <kaction.h>
 #include "domtreeview.h"
+#include <kfiledialog.h>
 
 static KCmdLineOptions options[] = { { "+file", "url to open", 0 } , KCmdLineLastOption };
 
@@ -57,6 +59,8 @@
 QObject::connect( doc->browserExtension(), SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ),
 		 dummy, SLOT( slotOpenURL( const KURL&, const KParts::URLArgs & ) ) );
 
+ QObject::connect( doc, SIGNAL(completed()), dummy, SLOT(handleDone()) );
+
 if (args->url(0).url().right(4).find(".xml", 0, false) == 0) {
 KParts::URLArgs ags(doc->browserExtension()->urlArgs());
 ags.serviceType = "text/xml";
@@ -81,6 +85,12 @@
 e = d.createElement( "action" );
 e.setAttribute( "name", "debugDOMTree" );
 viewMenu.appendChild( e );
+
+
+ e = d.createElement( "action" );
+ e.setAttribute( "name", "debugDoBenchmark" );
+ viewMenu.appendChild( e );
+
 QDomElement toolBar = d.documentElement().firstChild().nextSibling().toElement();
 e = d.createElement( "action" );
 e.setAttribute( "name", "editable" );
@@ -96,6 +106,7 @@
 toolBar.insertBefore( e, toolBar.firstChild() );
 
 (void)new KAction( "Reload", "reload", Qt::Key_F5, dummy, SLOT( reload() ), doc->actionCollection(), "reload" );
+ (void)new KAction( "Benchmark...", 0, 0, dummy, SLOT( doBenchmark() ), doc->actionCollection(), "debugDoBenchmark" );
 KAction* kprint = new KAction( "Print", "print", 0, doc->browserExtension(), SLOT( print() ), doc->actionCollection(), "print" );
 kprint->setEnabled(true);
 KToggleAction *ta = new KToggleAction( "Navigable", "editclear", 0, doc->actionCollection(), "navigable" );
@@ -125,3 +136,75 @@
 return ret;
 }
 
+void Dummy::doBenchmark()
+{
+ KConfigGroup settings(KGlobal::config(), "bench");
+ results.clear();
+
+ QString directory = KFileDialog::getExistingDirectory(settings.readPathEntry("path"), m_part->view(), 
+ QString::fromLatin1("Please select directory with tests"));
+
+ if (!directory.isEmpty()) {
+ settings.writePathEntry("path", directory);
+
+ QDir dirListing(directory, "*.html");
+ for (int i = 0; i < dirListing.count(); ++i) {
+ filesToBenchmark.append(dirListing.absFilePath(dirListing[i]));
+ }
+ }
+
+ benchmarkRun = 0;
+
+ if (!filesToBenchmark.isEmpty())
+ nextRun();
+}
+
+const int COLD_RUNS = 2;
+const int HOT_RUNS = 5;
+
+void Dummy::nextRun()
+{
+ if (benchmarkRun == (COLD_RUNS + HOT_RUNS)) {
+ filesToBenchmark.remove(filesToBenchmark.begin());
+ benchmarkRun = 0;
+ }
+
+ if (!filesToBenchmark.isEmpty()) {
+ loadTimer.start();
+ m_part->openURL(filesToBenchmark[0]);
+ } else {
+ //Generate HTML for report.
+ m_part->begin();
+ m_part->write("<table border=1>");
+
+ for (QMap<QString, QValueList<int> >::iterator i = results.begin(); i != results.end(); ++i) {
+ m_part->write("<tr><td>" + i.key() + "</td>");
+ QValueList<int> timings = i.data();
+ int total = 0;
+ for (int pos = 0; pos < timings.size(); ++pos) {
+ int t = timings[pos];
+ if (pos < COLD_RUNS)
+		 m_part->write(QString::fromLatin1("<td>(Cold):") + QString::number(t) + "</td>");
+ else {
+ total += t;
+ m_part->write(QString::fromLatin1("<td>") + QString::number(t) + "</td>");
+ }
+ }
+
+ m_part->write(QString::fromLatin1("<td>Average:") + QString::number(double(total) / HOT_RUNS) + "</td>");
+
+ m_part->write("</tr>");
+ }
+
+ m_part->end();
+ }
+}
+
+void Dummy::handleDone() 
+{
+ if (filesToBenchmark.isEmpty()) return;
+
+ results[filesToBenchmark[0]].append(loadTimer.elapsed());
+ ++benchmarkRun;
+ nextRun();
+}
Index: khtml/html/htmltokenizer.cpp
===================================================================
--- khtml/html/htmltokenizer.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/html/htmltokenizer.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -7,7 +7,8 @@
 (C) 1999 Lars Knoll (knoll@kde.org)
 (C) 1999 Antti Koivisto (koivisto@kde.org)
 (C) 2001-2003 Dirk Mueller (mueller@kde.org)
- (C) 2002 Apple Computer, Inc.
+ (C) 2004 Apple Computer, Inc.
+ (C) 2006 Germain Garand (germain@ebooksfrance.org)
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Library General Public
@@ -90,38 +91,36 @@
 #define fixUpChar(x) \
 switch ((x).unicode()) \
 { \
- /* ALL of these should be changed to Unicode SOON */ \
 case 0x80: (x) = 0x20ac; break; \
- case 0x82: (x) = ','; break; \
+ case 0x82: (x) = 0x201a; break; \
 case 0x83: (x) = 0x0192; break; \
- case 0x84: (x) = '"'; break; \
+ case 0x84: (x) = 0x201e; break; \
 case 0x85: (x) = 0x2026; break; \
 case 0x86: (x) = 0x2020; break; \
 case 0x87: (x) = 0x2021; break; \
 case 0x88: (x) = 0x02C6; break; \
 case 0x89: (x) = 0x2030; break; \
 case 0x8A: (x) = 0x0160; break; \
- case 0x8b: (x) = '<'; break; \
+ case 0x8b: (x) = 0x2039; break; \
 case 0x8C: (x) = 0x0152; break; \
 case 0x8E: (x) = 0x017D; break; \
- case 0x91: (x) = '\''; break; \
- case 0x92: (x) = '\''; break; \
- case 0x93: (x) = '"'; break; \
- case 0x94: (x) = '"'; break; \
- case 0x95: (x) = '*'; break; \
- case 0x96: (x) = '-'; break; \
- case 0x97: (x) = '-'; break; \
- case 0x98: (x) = '~'; break; \
+ case 0x91: (x) = 0x2018; break; \
+ case 0x92: (x) = 0x2019; break; \
+ case 0x93: (x) = 0x201C; break; \
+ case 0x94: (x) = 0X201D; break; \
+ case 0x95: (x) = 0x2022; break; \
+ case 0x96: (x) = 0x2013; break; \
+ case 0x97: (x) = 0x2014; break; \
+ case 0x98: (x) = 0x02DC; break; \
 case 0x99: (x) = 0x2122; break; \
 case 0x9A: (x) = 0x0161; break; \
- case 0x9b: (x) = '>'; break; \
+ case 0x9b: (x) = 0x203A; break; \
 case 0x9C: (x) = 0x0153; break; \
 case 0x9E: (x) = 0x017E; break; \
 case 0x9F: (x) = 0x0178; break; \
 default: break; \
 }
 #endif
-
 // ----------------------------------------------------------------------------
 
 HTMLTokenizer::HTMLTokenizer(DOM::DocumentPtr *_doc, KHTMLView *_view)
@@ -387,27 +386,30 @@
 currToken.tid = ID_SCRIPT + ID_CLOSE_TAG;
 processToken();
 
- TokenizerString prependingSrc;
+ // Scripts following a frameset element should not be executed or even loaded in the case of extern scripts.
+ bool followingFrameset = (parser->doc()->body() && parser->doc()->body()->id() == ID_FRAMESET);
+ bool deferredScript = false;
 
- if ( !parser->skipMode() ) {
+ if ( !parser->skipMode() && !followingFrameset) {
 CachedScript* cs = 0;
 
 // forget what we just got, load from src url instead
 if ( !currentScriptSrc.isEmpty() &&
- (cs = parser->doc()->docLoader()->requestScript(currentScriptSrc, scriptSrcCharset) ))
+ (cs = parser->doc()->docLoader()->requestScript(currentScriptSrc, scriptSrcCharset) )) {
 cachedScript.enqueue(cs);
+ }
 
 if (cs) {
- pendingSrc.prepend(src);
+ pendingQueue.push(src);
+ uint scriptCount = cachedScript.count();
 setSrc(TokenizerString());
 scriptCodeSize = scriptCodeResync = 0;
 cs->ref(this);
+ if (cachedScript.count() == scriptCount)
+ deferredScript = true;
 }
 else if (currentScriptSrc.isEmpty() && view && javascript ) {
- if ( !m_executingScript )
- pendingSrc.prepend(src);
- else
- prependingSrc = src;
+ pendingQueue.push(src);
 setSrc(TokenizerString());
 scriptCodeSize = scriptCodeResync = 0;
 scriptExecution( exScript, QString::null, tagStartLineno /*scriptStartLineno*/ );
@@ -417,12 +419,17 @@
 script = false;
 scriptCodeSize = scriptCodeResync = 0;
 
+ if (parser->skipMode() || followingFrameset)
+ return;
+
 if ( !m_executingScript && cachedScript.isEmpty() ) {
- // kdDebug( 6036 ) << "adding pending Output to parsed string" << endl;
- src.append(pendingSrc);
- pendingSrc.clear();
- } else if ( !prependingSrc.isEmpty() )
- write( prependingSrc, false );
+ src.append(pendingQueue.pop());
+ } else if ( cachedScript.isEmpty() ) {
+ write( pendingQueue.pop(), false );
+ } else if ( !deferredScript && pendingQueue.count() > 1) {
+ TokenizerString t = pendingQueue.pop();
+ pendingQueue.top().prepend( t );
+ }
 }
 
 void HTMLTokenizer::scriptExecution( const QString& str, const QString& scriptURL,
@@ -1294,10 +1301,14 @@
 if ( !buffer )
 return;
 
- if ( ( m_executingScript && appendData ) ||
- ( !m_executingScript && cachedScript.count() ) ) {
+ if ( ( m_executingScript && appendData ) || cachedScript.count() ) {
 // don't parse; we will do this later
- pendingSrc.append(str);
+ if (pendingQueue.isEmpty())
+ pendingQueue.push(str);
+ else if (appendData)
+ pendingQueue.bottom().append(str);
+ else
+ pendingQueue.top().append(str);
 return;
 }
 
@@ -1705,9 +1716,9 @@
 assert(!cachedScript.isEmpty());
 bool done = false;
 while (!done && cachedScript.head()->isLoaded()) {
-#ifdef TOKEN_DEBUG
+
 kdDebug( 6036 ) << "Finished loading an external script" << endl;
-#endif
+
 CachedScript* cs = cachedScript.dequeue();
 DOMString scriptSource = cs->script();
 #ifdef TOKEN_DEBUG
@@ -1725,12 +1736,16 @@
 done = cachedScript.isEmpty();
 
 // 'script' is true when we are called synchronously from
- // parseScript(). In that case parseScript() will take care
+ // scriptHandler(). In that case scriptHandler() will take care
 // of 'scriptOutput'.
 if ( !script ) {
- TokenizerString rest = pendingSrc;
- pendingSrc.clear();
- write(rest, false);
+ while (pendingQueue.count() > 1) {
+ TokenizerString t = pendingQueue.pop();
+ pendingQueue.top().prepend( t );
+ }
+ if (done) {
+ write(pendingQueue.pop(), false);
+ }
 // we might be deleted at this point, do not
 // access any members.
 }
Index: khtml/html/html_formimpl.cpp
===================================================================
--- khtml/html/html_formimpl.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/html/html_formimpl.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -4,6 +4,7 @@
 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
 * (C) 1999 Antti Koivisto (koivisto@kde.org)
 * (C) 2001 Dirk Mueller (mueller@kde.org)
+ * (C) 2004, 2005, 2006 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
@@ -40,6 +41,7 @@
 #include "xml/dom_textimpl.h"
 #include "xml/dom_docimpl.h"
 #include "xml/dom2_eventsimpl.h"
+#include "xml/dom_restyler.h"
 #include "khtml_ext.h"
 
 #include "rendering/render_form.h"
@@ -630,7 +632,9 @@
 // otherwise we might have a potential security problem
 // by saving passwords under wrong lookup key.
 
- getDocument()->view()->part()->saveToWallet(key, m_walletMap);
+ if (view->part()) {
+ view->part()->saveToWallet(key, m_walletMap);
+ }
 } else if ( savePassword == KDialogBase::No ) {
 view->addNonPasswordStorableSite(formUrl.host());
 }
@@ -933,7 +937,12 @@
 {
 if ( m_disabled != _disabled ) {
 m_disabled = _disabled;
- setChanged();
+ // Trigger dynamic restyles
+ getDocument()->dynamicDomRestyler().restyleDepedent(this, OtherStateDependency);
+ // We need to update rendering under all circumstances
+ if (!changed() && m_render) {
+ m_render->updateFromElement();
+ }
 }
 }
 
@@ -1208,6 +1217,7 @@
 m_size = 20;
 m_clicked = false;
 m_checked = false;
+ m_indeterminate = false;
 
 m_haveType = false;
 m_activeSubmit = false;
@@ -1476,17 +1486,20 @@
 case TEXT:
 case PASSWORD:
 case ISINDEX: m_render = new (getDocument()->renderArena()) RenderLineEdit(this); break;
- case CHECKBOX: m_render = new (getDocument()->renderArena()) RenderCheckBox(this); break;
+ case CHECKBOX: m_render = new (getDocument()->renderArena()) RenderCheckBox(this); break;
 case RADIO: m_render = new (getDocument()->renderArena()) RenderRadioButton(this); break;
- case SUBMIT: m_render = new (getDocument()->renderArena()) RenderSubmitButton(this); break;
- case IMAGE: m_render = new (getDocument()->renderArena()) RenderImageButton(this); break;
- case RESET: m_render = new (getDocument()->renderArena()) RenderResetButton(this); break;
+ case SUBMIT: m_render = new (getDocument()->renderArena()) RenderSubmitButton(this); break;
+ case IMAGE: m_render = new (getDocument()->renderArena()) RenderImageButton(this); break;
+ case RESET: m_render = new (getDocument()->renderArena()) RenderResetButton(this); break;
 case FILE: m_render = new (getDocument()->renderArena()) RenderFileButton(this); break;
- case BUTTON: m_render = new (getDocument()->renderArena()) RenderPushButton(this);
+ case BUTTON: m_render = new (getDocument()->renderArena()) RenderPushButton(this);
 case HIDDEN: break;
 }
 }
 
+ // Let check and radio boxes start indeterminate
+ setIndeterminate(true);
+
 if (m_render)
 m_render->setStyle(_style);
 
@@ -1640,6 +1653,7 @@
 {
 setValue(getAttribute(ATTR_VALUE));
 setChecked(getAttribute(ATTR_CHECKED) != 0);
+ setIndeterminate(true);
 }
 
 void HTMLInputElementImpl::setChecked(bool _checked)
@@ -1649,10 +1663,33 @@
 
 if (m_checked == _checked) return;
 m_checked = _checked;
- setChanged();
+
+// setIndeterminate(false);
+
+ // Trigger dynamic restyles
+ getDocument()->dynamicDomRestyler().restyleDepedent(this, OtherStateDependency);
+ // We need to update rendering under all circumstances
+ if (!changed() && m_render) {
+ m_render->updateFromElement();
+ }
 }
 
+void HTMLInputElementImpl::setIndeterminate(bool _indeterminate)
+{
+ // Only checkboxes and radio-boxes honor indeterminate.
+ if (inputType() != CHECKBOX || inputType() != RADIO || indeterminate() == _indeterminate)
+ return;
 
+ m_indeterminate = _indeterminate;
+
+ // Trigger dynamic restyles
+// getDocument()->dynamicDomRestyler().restyleDepedent(this, OtherStateDependency);
+ // We need to update rendering under all circumstances
+ if (!changed() && m_render) {
+ m_render->updateFromElement();
+ }
+}
+
 DOMString HTMLInputElementImpl::value() const
 {
 if (m_type == CHECKBOX || m_type == RADIO) {
@@ -2003,7 +2040,7 @@
 return;
 
 HTMLOptionElementImpl* option = static_cast<HTMLOptionElementImpl*>(element.handle());;
- //Fast path for appending an item. Can't be done if it is selected and 
+ //Fast path for appending an item. Can't be done if it is selected and
 //we're single-select, since we may need to drop an implicitly-selected item
 bool fastAppendLast = false;
 if (before.handle() == 0 && (m_multiple || !option->selected()) && !m_recalcListItems)
@@ -2031,10 +2068,10 @@
 
 //Fast path for last element, for e.g. clearing the box
 //Note that if this is a single-select, we may have to recompute
- //anyway if the item was selected, since we may want to set 
+ //anyway if the item was selected, since we may want to set
 //a different one
 bool fastRemoveLast = false;
- if ((listIndex == (signed)items.size() - 1) && !m_recalcListItems && 
+ if ((listIndex == (signed)items.size() - 1) && !m_recalcListItems &&
 (m_multiple || !static_cast<HTMLOptionElementImpl*>(items[listIndex])->selected()))
 fastRemoveLast = true;
 
@@ -2290,7 +2327,7 @@
 
 //See if we're asked for the very last item, and check whether it's an <option>
 //to fastpath clear
- if (optionIndex == (m_length - 1) && items[itemsSize - 1]->id() == ID_OPTION)
+ if ((unsigned int)optionIndex == (m_length - 1) && items[itemsSize - 1]->id() == ID_OPTION)
 return itemsSize - 1;
 
 int listIndex = 0;
Index: khtml/html/doctypes.gperf
===================================================================
--- khtml/html/doctypes.gperf	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/html/doctypes.gperf	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -48,6 +48,7 @@
 "-//w3c//dtd w3 html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
 "-//w3c//dtd xhtml 1.0 frameset//en", PubIDInfo::eAlmostStandards, PubIDInfo::eAlmostStandards
 "-//w3c//dtd xhtml 1.0 transitional//en", PubIDInfo::eAlmostStandards, PubIDInfo::eAlmostStandards
+"-//w3c//dtd xhtml 1.1//en", PubIDInfo::eAlmostStandards, PubIDInfo::eAlmostStandards
 "-//w3o//dtd w3 html 3.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
 "-//w3o//dtd w3 html 3.0//en//", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
 "-//webtechs//dtd mozilla html 2.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
Index: khtml/html/html_imageimpl.cpp
===================================================================
--- khtml/html/html_imageimpl.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/html/html_imageimpl.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -407,6 +407,12 @@
 if (getDocument()->htmlMode() != DocumentImpl::XHtml) {
 HTMLElementImpl::parseAttribute(attr);
 break;
+ } 
+ else {
+ // add name with full url:
+ QString url = getDocument()->completeURL( khtml::parseURL( attr->value() ).string() );
+ if(getDocument()->isHTMLDocument())
+ static_cast<HTMLDocumentImpl*>(getDocument())->mapMap[url] = this;
 }
 // fall through
 case ATTR_NAME:
Index: khtml/html/html_elementimpl.cpp
===================================================================
--- khtml/html/html_elementimpl.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/html/html_elementimpl.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -171,7 +171,6 @@
 case ATTR_ID:
 // unique id
 setHasID();
- setChanged(); // in case of a CSS selector on id
 getDocument()->incDOMTreeVersion();
 break;
 case ATTR_CLASS:
@@ -182,11 +181,13 @@
 while( l && !s->isSpace() )
 l--,s++;
 setHasClassList(l);
- } else
- setHasClassList(false); 
- // no break 
+ setHasClass(true);
+ } else {
+ setHasClassList(false);
+ setHasClass(false);
+ }
+ break;
 case ATTR_NAME:
- setChanged(); // in case of a CSS selector on class/name
 getDocument()->incDOMTreeVersion();
 break;
 case ATTR_STYLE:
Index: khtml/html/htmltokenizer.h
===================================================================
--- khtml/html/htmltokenizer.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/html/htmltokenizer.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -317,7 +317,7 @@
 QString scriptSrcCharset;
 bool javascript;
 // the HTML code we will parse after the external script we are waiting for has loaded
- TokenizerString pendingSrc;
+ TokenizerQueue pendingQueue;
 // true if we are executing a script while parsing a document. This causes the parsing of
 // the output of the script to be postponed until after the script has finished executing
 int m_executingScript;
Index: khtml/html/html_formimpl.h
===================================================================
--- khtml/html/html_formimpl.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/html/html_formimpl.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -4,6 +4,7 @@
 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
 * (C) 1999 Antti Koivisto (koivisto@kde.org)
 * (C) 2000 Dirk Mueller (mueller@kde.org)
+ * (C) 2004, 2005, 2006 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
@@ -271,6 +272,8 @@
 
 bool checked() const { return m_checked; }
 void setChecked(bool);
+ bool indeterminate() const { return m_indeterminate; }
+ void setIndeterminate(bool);
 long maxLength() const { return m_maxLen; }
 int size() const { return m_size; }
 DOMString type() const;
@@ -329,6 +332,7 @@
 typeEnum m_type : 4;
 bool m_clicked : 1 ;
 bool m_checked : 1;
+ bool m_indeterminate : 1;
 bool m_haveType : 1;
 bool m_activeSubmit : 1;
 bool m_autocomplete : 1;
Index: khtml/html/htmlparser.cpp
===================================================================
--- khtml/html/htmlparser.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/html/htmlparser.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -268,7 +268,7 @@
 
 // if this tag is forbidden inside the current context, pop
 // blocks until we are allowed to add it...
- while(forbiddenTag[t->tid]) {
+ while(blockStack && forbiddenTag[t->tid]) {
 #ifdef PARSER_DEBUG
 kdDebug( 6035 ) << "t->id: " << t->tid << " is forbidden :-( " << endl;
 #endif
Index: khtml/html/doctypes.cpp
===================================================================
--- khtml/html/doctypes.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/html/doctypes.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -1,5 +1,5 @@
 /* ANSI-C code produced by gperf version 3.0.1 */
-/* Command-line: gperf -CEot -L ANSI-C -k '*' -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards ./doctypes.gperf */
+/* Command-line: gperf -CEot -L ANSI-C -k '*' -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards /opt/src/kde/kdelibs/khtml/html/doctypes.gperf */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
 && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
@@ -28,7 +28,7 @@
 #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
 #endif
 
-#line 1 "./doctypes.gperf"
+#line 1 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 struct PubIDInfo {
 enum eMode { 
 eQuirks, 
@@ -40,7 +40,7 @@
 eMode mode_if_no_sysid;
 eMode mode_if_sysid;
 };
-/* maximum key range = 178, duplicates = 0 */
+/* maximum key range = 173, duplicates = 0 */
 
 #ifdef __GNUC__
 __inline
@@ -54,32 +54,32 @@
 {
 static const unsigned char asso_values[] =
 {
- 241, 241, 241, 241, 241, 241, 241, 241, 241, 241,
- 241, 241, 241, 241, 241, 241, 241, 241, 241, 241,
- 241, 241, 241, 241, 241, 241, 241, 241, 241, 241,
- 241, 241, 0, 241, 241, 241, 241, 241, 241, 0,
- 241, 241, 241, 0, 241, 0, 0, 0, 10, 0,
- 5, 0, 0, 0, 0, 0, 241, 0, 0, 241,
- 241, 241, 241, 241, 241, 241, 241, 241, 241, 241,
- 241, 241, 241, 241, 241, 241, 241, 241, 241, 241,
- 241, 241, 241, 241, 241, 241, 241, 241, 241, 241,
- 241, 241, 241, 241, 241, 241, 241, 5, 0, 0,
- 10, 0, 10, 0, 0, 0, 241, 241, 0, 15,
+ 236, 236, 236, 236, 236, 236, 236, 236, 236, 236,
+ 236, 236, 236, 236, 236, 236, 236, 236, 236, 236,
+ 236, 236, 236, 236, 236, 236, 236, 236, 236, 236,
+ 236, 236, 0, 236, 236, 236, 236, 236, 236, 0,
+ 236, 236, 236, 0, 236, 0, 0, 0, 10, 0,
+ 5, 0, 5, 0, 0, 0, 236, 0, 0, 236,
+ 236, 236, 236, 236, 236, 236, 236, 236, 236, 236,
+ 236, 236, 236, 236, 236, 236, 236, 236, 236, 236,
+ 236, 236, 236, 236, 236, 236, 236, 236, 236, 236,
+ 236, 236, 236, 236, 236, 236, 236, 5, 10, 0,
+ 10, 0, 10, 0, 0, 0, 236, 236, 0, 15,
 5, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 10, 0, 0, 241, 241, 241, 241, 241, 241, 241,
- 241, 241, 241, 241, 241, 241, 241, 241, 241, 241,
- 241, 241, 241, 241, 241, 241, 241, 241, 241, 241,
- 241, 241, 241, 241, 241, 241, 241, 241, 241, 241,
- 241, 241, 241, 241, 241, 241, 241, 241, 241, 241,
- 241, 241, 241, 241, 241, 241, 241, 241, 241, 241,
- 241, 241, 241, 241, 241, 241, 241, 241, 241, 241,
- 241, 241, 241, 241, 241, 241, 241, 241, 241, 241,
- 241, 241, 241, 241, 241, 241, 241, 241, 241, 241,
- 241, 241, 241, 241, 241, 241, 241, 241, 241, 241,
- 241, 241, 241, 241, 241, 241, 241, 241, 241, 241,
- 241, 241, 241, 241, 241, 241, 241, 241, 241, 241,
- 241, 241, 241, 241, 241, 241, 241, 241, 241, 241,
- 241, 241, 241, 241, 241, 241
+ 0, 0, 5, 236, 236, 236, 236, 236, 236, 236,
+ 236, 236, 236, 236, 236, 236, 236, 236, 236, 236,
+ 236, 236, 236, 236, 236, 236, 236, 236, 236, 236,
+ 236, 236, 236, 236, 236, 236, 236, 236, 236, 236,
+ 236, 236, 236, 236, 236, 236, 236, 236, 236, 236,
+ 236, 236, 236, 236, 236, 236, 236, 236, 236, 236,
+ 236, 236, 236, 236, 236, 236, 236, 236, 236, 236,
+ 236, 236, 236, 236, 236, 236, 236, 236, 236, 236,
+ 236, 236, 236, 236, 236, 236, 236, 236, 236, 236,
+ 236, 236, 236, 236, 236, 236, 236, 236, 236, 236,
+ 236, 236, 236, 236, 236, 236, 236, 236, 236, 236,
+ 236, 236, 236, 236, 236, 236, 236, 236, 236, 236,
+ 236, 236, 236, 236, 236, 236, 236, 236, 236, 236,
+ 236, 236, 236, 236, 236, 236
 };
 register int hval = len;
 
@@ -337,11 +337,11 @@
 {
 enum
 {
- TOTAL_KEYWORDS = 41,
+ TOTAL_KEYWORDS = 42,
 MIN_WORD_LENGTH = 21,
 MAX_WORD_LENGTH = 80,
 MIN_HASH_VALUE = 63,
- MAX_HASH_VALUE = 240
+ MAX_HASH_VALUE = 235
 };
 
 static const struct PubIDInfo wordlist[] =
@@ -409,122 +409,116 @@
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 48 "./doctypes.gperf"
+#line 48 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//w3c//dtd w3 html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
+#line 51 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+ {"-//w3c//dtd xhtml 1.1//en", PubIDInfo::eAlmostStandards, PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
- {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 40 "./doctypes.gperf"
+#line 40 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//w3c//dtd html 3.2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 27 "./doctypes.gperf"
+#line 27 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//ietf//dtd html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 26 "./doctypes.gperf"
+#line 26 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//ietf//dtd html 3//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 51 "./doctypes.gperf"
+#line 52 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//w3o//dtd w3 html 3.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 52 "./doctypes.gperf"
+#line 53 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//w3o//dtd w3 html 3.0//en//", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 25 "./doctypes.gperf"
+#line 25 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//ietf//dtd html 3.2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 21 "./doctypes.gperf"
+#line 21 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//ietf//dtd html 2.1e//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 22 "./doctypes.gperf"
+#line 22 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//ietf//dtd html 3.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 29 "./doctypes.gperf"
+#line 29 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//ietf//dtd html//en//3.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 23 "./doctypes.gperf"
+#line 23 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//ietf//dtd html 3.0//en//", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 37 "./doctypes.gperf"
- {"-//w3c//dtd html 3 1995-03-24//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 20 "./doctypes.gperf"
+ {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
+#line 20 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//ietf//dtd html 2.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 28 "./doctypes.gperf"
+#line 28 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//ietf//dtd html//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 36 "./doctypes.gperf"
+#line 36 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//w30//dtd w3 html 2.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
+#line 37 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+ {"-//w3c//dtd html 3 1995-03-24//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
- {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 39 "./doctypes.gperf"
+#line 39 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//w3c//dtd html 3.2 final//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 19 "./doctypes.gperf"
+#line 19 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//ietf//dtd html 2.0 strict//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 15 "./doctypes.gperf"
+#line 15 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//ietf//dtd html 2.0 level 1//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 38 "./doctypes.gperf"
+#line 38 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//w3c//dtd html 3.2 draft//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 41 "./doctypes.gperf"
+#line 41 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//w3c//dtd html 3.2s draft//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 16 "./doctypes.gperf"
+#line 16 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//ietf//dtd html 2.0 level 2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 17 "./doctypes.gperf"
+#line 17 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//ietf//dtd html 2.0 strict level 1//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 24 "./doctypes.gperf"
+#line 24 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//ietf//dtd html 3.2 final//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 43 "./doctypes.gperf"
- {"-//w3c//dtd html 4.0 transitional//en", PubIDInfo::eQuirks, PubIDInfo::eQuirks},
-#line 45 "./doctypes.gperf"
- {"-//w3c//dtd html 4.01 transitional//en", PubIDInfo::eQuirks, PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 18 "./doctypes.gperf"
- {"-//ietf//dtd html 2.0 strict level 2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
- {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 53 "./doctypes.gperf"
- {"-//webtechs//dtd mozilla html 2.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 42 "./doctypes.gperf"
- {"-//w3c//dtd html 4.0 frameset//en", PubIDInfo::eQuirks, PubIDInfo::eQuirks},
-#line 44 "./doctypes.gperf"
- {"-//w3c//dtd html 4.01 frameset//en", PubIDInfo::eQuirks, PubIDInfo::eAlmostStandards},
- {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
- {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 30 "./doctypes.gperf"
- {"-//netscape comm. corp.//dtd html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 50 "./doctypes.gperf"
+#line 50 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//w3c//dtd xhtml 1.0 transitional//en", PubIDInfo::eAlmostStandards, PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
+#line 18 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+ {"-//ietf//dtd html 2.0 strict level 2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
- {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
- {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
- {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 49 "./doctypes.gperf"
+#line 43 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+ {"-//w3c//dtd html 4.0 transitional//en", PubIDInfo::eQuirks, PubIDInfo::eQuirks},
+#line 45 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+ {"-//w3c//dtd html 4.01 transitional//en", PubIDInfo::eQuirks, PubIDInfo::eAlmostStandards},
+#line 49 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//w3c//dtd xhtml 1.0 frameset//en", PubIDInfo::eAlmostStandards, PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
+#line 30 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+ {"-//netscape comm. corp.//dtd html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
+#line 42 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+ {"-//w3c//dtd html 4.0 frameset//en", PubIDInfo::eQuirks, PubIDInfo::eQuirks},
+#line 44 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+ {"-//w3c//dtd html 4.01 frameset//en", PubIDInfo::eQuirks, PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 31 "./doctypes.gperf"
- {"-//o'reilly and associates//dtd html 2.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 47 "./doctypes.gperf"
- {"-//w3c//dtd html experimental 970421//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
- {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 46 "./doctypes.gperf"
+#line 46 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//w3c//dtd html experimental 19960712//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 34 "./doctypes.gperf"
+#line 34 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//spyglass//dtd html 2.0 extended//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 14 "./doctypes.gperf"
+#line 14 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//as//dtd html 3.0 aswedit + extensions//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
+#line 47 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+ {"-//w3c//dtd html experimental 970421//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
+#line 54 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+ {"-//webtechs//dtd mozilla html 2.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
+#line 31 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+ {"-//o'reilly and associates//dtd html 2.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
+#line 35 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+ {"-//sq//dtd html 2.0 hotmetal + extensions//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 35 "./doctypes.gperf"
- {"-//sq//dtd html 2.0 hotmetal + extensions//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -560,11 +554,11 @@
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
+#line 13 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+ {"-//advasoft ltd//dtd html 3.0 aswedit + extensions//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 13 "./doctypes.gperf"
- {"-//advasoft ltd//dtd html 3.0 aswedit + extensions//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -601,8 +595,6 @@
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 33 "./doctypes.gperf"
- {"-//softquad//dtd hotmetal pro 4.0::19971010::extensions to html 4.0//en", PubIDInfo::eQuirks, PubIDInfo::eQuirks},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -610,6 +602,8 @@
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
+#line 33 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+ {"-//softquad//dtd hotmetal pro 4.0::19971010::extensions to html 4.0//en", PubIDInfo::eQuirks, PubIDInfo::eQuirks},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -626,7 +620,9 @@
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
 {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 32 "./doctypes.gperf"
+ {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
+ {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
+#line 32 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
 {"-//softquad software//dtd hotmetal pro 6.0::19990601::extensions to html 4.0//en", PubIDInfo::eQuirks, PubIDInfo::eQuirks}
 };
 
Index: khtml/kjserrordlg.ui
===================================================================
--- khtml/kjserrordlg.ui	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/kjserrordlg.ui	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -86,7 +86,7 @@
 <enum>RichText</enum>
 </property>
 </widget>
- <widget class="KActiveLabel" row="0" column="0" rowspan="1" colspan="3">
+ <widget class="KSqueezedTextLabel" row="0" column="0" rowspan="1" colspan="3">
 <property name="name">
 <cstring>_url</cstring>
 </property>
@@ -117,7 +117,7 @@
 </tabstops>
 <includes>
 <include location="global" impldecl="in declaration">kdialog.h</include>
- <include location="global" impldecl="in declaration">kactivelabel.h</include>
+ <include location="global" impldecl="in declaration">ksqueezedtextlabel.h</include>
 </includes>
 <slots>
 <slot>init()</slot>
Index: khtml/ecma/kjs_html.h
===================================================================
--- khtml/ecma/kjs_html.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/ecma/kjs_html.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -94,13 +94,13 @@
 OptionLabel, OptionValue, InputBlur, InputReadOnly, InputAccept,
 InputSize, InputDefaultValue, InputTabIndex, InputValue, InputType,
 InputFocus, InputMaxLength, InputDefaultChecked, InputDisabled,
- InputChecked, InputForm, InputAccessKey, InputAlign, InputAlt,
+ InputChecked, InputIndeterminate, InputForm, InputAccessKey, InputAlign, InputAlt,
 InputName, InputSrc, InputUseMap, InputSelect, InputClick,
 InputSelectionStart, InputSelectionEnd, InputSetSelectionRange,
 TextAreaAccessKey, TextAreaName, TextAreaDefaultValue, TextAreaSelect,
 TextAreaCols, TextAreaDisabled, TextAreaForm, TextAreaType,
 TextAreaTabIndex, TextAreaReadOnly, TextAreaRows, TextAreaValue,
- TextAreaBlur, TextAreaFocus, TextAreaSelectionStart, TextAreaSelectionEnd, TextAreaSetSelectionRange, 
+ TextAreaBlur, TextAreaFocus, TextAreaSelectionStart, TextAreaSelectionEnd, TextAreaSetSelectionRange,
 TextAreaTextLength, ButtonBlur, ButtonFocus, ButtonForm, ButtonTabIndex, ButtonName,
 ButtonDisabled, ButtonAccessKey, ButtonType, ButtonValue, LabelHtmlFor,
 LabelForm, LabelAccessKey, FieldSetForm, LegendForm, LegendAccessKey,
@@ -113,7 +113,7 @@
 AnchorAccessKey, AnchorCoords, AnchorHref, AnchorProtocol, AnchorHost,
 AnchorCharset, AnchorHrefLang, AnchorHostname, AnchorType, AnchorFocus,
 AnchorPort, AnchorPathName, AnchorHash, AnchorSearch, AnchorName,
- AnchorRev, AnchorTabIndex, AnchorTarget, AnchorText, AnchorBlur, AnchorClick, 
+ AnchorRev, AnchorTabIndex, AnchorTarget, AnchorText, AnchorBlur, AnchorClick,
 ImageName, ImageAlign, ImageHspace, ImageVspace, ImageUseMap, ImageAlt,
 ImageLowSrc, ImageWidth, ImageIsMap, ImageBorder, ImageHeight,
 ImageLongDesc, ImageSrc, ImageX, ImageY, ImageComplete, ObjectHspace, ObjectHeight, ObjectAlign,
Index: khtml/ecma/kjs_html.cpp
===================================================================
--- khtml/ecma/kjs_html.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/ecma/kjs_html.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -236,7 +236,7 @@
 } else {
 //Can't tell it just like that, so better go through collection and count stuff. This is the slow path...
 DOM::HTMLMappedNameCollection coll(docImpl, HTMLCollectionImpl::DOCUMENT_NAMED_ITEMS, propertyDOMString);
- 
+
 if (coll.length() == 1) {
 DOM::Node node = coll.firstItem();
 return getDOMNode(exec, node);
@@ -743,7 +743,7 @@
 selected	KJS::HTMLElement::OptionSelected	DontDelete
 value		KJS::HTMLElement::OptionValue		DontDelete
 @end
-@begin HTMLInputElementTable 24
+@begin HTMLInputElementTable 25
 defaultValue	KJS::HTMLElement::InputDefaultValue	DontDelete
 defaultChecked KJS::HTMLElement::InputDefaultChecked	DontDelete
 form		KJS::HTMLElement::InputForm		DontDelete|ReadOnly
@@ -752,6 +752,7 @@
 align		KJS::HTMLElement::InputAlign		DontDelete
 alt		KJS::HTMLElement::InputAlt		DontDelete
 checked	KJS::HTMLElement::InputChecked		DontDelete
+ indeterminate	KJS::HTMLElement::InputIndeterminate	DontDelete
 status	KJS::HTMLElement::InputChecked		DontDelete
 disabled	KJS::HTMLElement::InputDisabled		DontDelete
 maxLength	KJS::HTMLElement::InputMaxLength	DontDelete
@@ -1350,6 +1351,7 @@
 case InputAlign: return String(input.align());
 case InputAlt: return String(input.alt());
 case InputChecked: return Boolean(input.checked());
+ case InputIndeterminate: return Boolean(input.indeterminate());
 case InputDisabled: return Boolean(input.disabled());
 case InputMaxLength: return Number(input.maxLength());
 case InputName: return String(input.name()); // NOT getString (IE gives empty string)
@@ -2603,6 +2605,7 @@
 case InputAlign: { input.setAlign(str); return; }
 case InputAlt: { input.setAlt(str); return; }
 case InputChecked: { input.setChecked(value.toBoolean(exec)); return; }
+ case InputIndeterminate: { input.setIndeterminate(value.toBoolean(exec)); return; }
 case InputDisabled: { input.setDisabled(value.toBoolean(exec)); return; }
 case InputMaxLength: { input.setMaxLength(value.toInteger(exec)); return; }
 case InputName: { input.setName(str); return; }
Index: khtml/ecma/kjs_window.cpp
===================================================================
--- khtml/ecma/kjs_window.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/ecma/kjs_window.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -106,6 +106,8 @@
 FrameArray(ExecState *exec, KHTMLPart *p)
 : ObjectImp(exec->interpreter()->builtinObjectPrototype()), part(p) { }
 virtual Value get(ExecState *exec, const Identifier &propertyName) const;
+ virtual Value call(ExecState *exec, Object &thisObj, const List &args);
+ virtual bool implementsCall() const { return true; }
 private:
 QGuardedPtr<KHTMLPart> part;
 };
@@ -1334,7 +1336,9 @@
 return Undefined();
 KHTMLView *widget = part->view();
 Value v = args[0];
- QString str = v.toString(exec).qstring();
+ QString str;
+ if (v.isValid() && !v.isA(UndefinedType))
+ str = v.toString(exec).qstring();
 
 // prepare arguments
 KURL url;
@@ -1555,8 +1559,11 @@
 
 KHTMLView *widget = part->view();
 Value v = args[0];
- UString s = v.toString(exec);
- str = s.qstring();
+ UString s;
+ if (v.isValid() && !v.isA(UndefinedType)) {
+ s = v.toString(exec);
+ str = s.qstring();
+ }
 
 QString caption;
 if (part && !part->url().host().isEmpty())
@@ -2231,6 +2238,19 @@
 return ObjectImp::get(exec, p);
 }
 
+Value FrameArray::call(ExecState *exec, Object &/*thisObj*/, const List &args)
+{
+ //IE supports a subset of the get functionality as call...
+ //... basically, when the return is a window, it supports that, otherwise it 
+ //errors out. We do a cheap-and-easy emulation of that, and just do the same
+ //thing as get does.
+ if (args.size() == 1)
+ return get(exec, Identifier(args[0].toString(exec)));
+
+ return Undefined();
+}
+
+
 ////////////////////// Location Object ////////////////////////
 
 const ClassInfo Location::info = { "Location", 0, &LocationTable, 0 };
Index: khtml/ecma/kjs_proxy.cpp
===================================================================
--- khtml/ecma/kjs_proxy.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/ecma/kjs_proxy.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -20,6 +20,16 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include <config.h>
+
+#if defined(HAVE_VALGRIND_MEMCHECK_H) && !defined(NDEBUG)
+
+#include <valgrind/memcheck.h>
+#define VALGRIND_SUPPORT
+
+#endif
+
+
 #include "kjs_proxy.h"
 
 #include "kjs_window.h"
@@ -369,6 +379,13 @@
 
 void KJSCPUGuard::start(unsigned int ms, unsigned int i_ms)
 {
+#ifdef VALGRIND_SUPPORT
+ if (RUNNING_ON_VALGRIND) {
+ ms *= 50;
+ i_ms *= 50;
+ }
+#endif
+
 oldAlarmHandler = signal(SIGVTALRM, alarmHandler);
 itimerval tv = {
 { i_ms / 1000, (i_ms % 1000) * 1000 },
Index: khtml/rendering/render_style.cpp
===================================================================
--- khtml/rendering/render_style.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/rendering/render_style.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -4,7 +4,7 @@
 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
 * Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
 * Copyright (C) 2002-2003 Dirk Mueller (mueller@kde.org)
- * Copyright (C) 2002-2004 Apple Computer, Inc.
+ * Copyright (C) 2002-2005 Apple Computer, Inc.
 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
 *
 * This library is free software; you can redistribute it and/or
@@ -247,6 +247,90 @@
 return m_background == o.m_background && m_color == o.m_color && m_outline == o.m_outline;
 }
 
+StyleGeneratedData::StyleGeneratedData() : Shared<StyleGeneratedData>(), content(0), counter_reset(0), counter_increment(0) {}
+
+StyleGeneratedData::~StyleGeneratedData() 
+{
+ if (counter_reset) counter_reset->deref();
+ if (counter_increment) counter_increment->deref();
+ delete content;
+}
+
+StyleGeneratedData::StyleGeneratedData(const StyleGeneratedData& o)
+ : Shared<StyleGeneratedData>(), content(0),
+ counter_reset(o.counter_reset), counter_increment(o.counter_increment)
+{
+ if (o.content) content = new ContentData(*o.content);
+ if (counter_reset) counter_reset->ref();
+ if (counter_increment) counter_increment->ref();
+}
+
+bool StyleGeneratedData::contentDataEquivalent(const StyleGeneratedData* otherStyle) const
+{
+ ContentData* c1 = content;
+ ContentData* c2 = otherStyle->content;
+
+ while (c1 && c2) {
+ if (c1->_contentType != c2->_contentType)
+ return false;
+ if (c1->_contentType == CONTENT_TEXT) {
+ DOM::DOMString c1Str(c1->_content.text);
+ DOM::DOMString c2Str(c2->_content.text);
+ if (c1Str != c2Str)
+ return false;
+ }
+ else if (c1->_contentType == CONTENT_OBJECT) {
+ if (c1->_content.object != c2->_content.object)
+ return false;
+ }
+ else if (c1->_contentType == CONTENT_COUNTER) {
+ if (c1->_content.counter != c2->_content.counter)
+ return false;
+ }
+ else if (c1->_contentType == CONTENT_QUOTE) {
+ if (c1->_content.quote != c2->_content.quote)
+ return false;
+ }
+
+ c1 = c1->_nextContent;
+ c2 = c2->_nextContent;
+ }
+
+ return !c1 && !c2;
+}
+
+static bool compareCounterActList(const CSSValueListImpl* ca, const CSSValueListImpl* cb) {
+ // weeee....
+ CSSValueListImpl* a = const_cast<CSSValueListImpl*>(ca);
+ CSSValueListImpl* b = const_cast<CSSValueListImpl*>(cb);
+
+ if (!a && !b) return true;
+ if (!a || !b) return false;
+ if (a->length() != b->length()) return false;
+ for(uint i=0; i< a->length(); i++) {
+ CSSValueImpl *ai = a->item(i);
+ CSSValueImpl *bi = b->item(i);
+ assert(ai && ai->cssValueType() == CSSValue::CSS_CUSTOM);
+ assert(bi && bi->cssValueType() == CSSValue::CSS_CUSTOM);
+ CounterActImpl* caa = static_cast<CounterActImpl*>(ai);
+ CounterActImpl* cab = static_cast<CounterActImpl*>(bi);
+ if (caa->value() != cab->value()) return false;
+ if (caa->counter() != cab->counter()) return false;
+ }
+ return true;
+}
+
+bool StyleGeneratedData::counterDataEquivalent(const StyleGeneratedData* otherStyle) const
+{
+ return compareCounterActList(counter_reset, otherStyle->counter_reset) && 
+ compareCounterActList(counter_increment, otherStyle->counter_increment);
+}
+
+bool StyleGeneratedData::operator==(const StyleGeneratedData& o) const
+{
+ return contentDataEquivalent(&o) && counterDataEquivalent(&o);
+}
+
 StyleMarqueeData::StyleMarqueeData()
 {
 increment = RenderStyle::initialMarqueeIncrement();
@@ -393,6 +477,7 @@
 visual = _default->visual;
 background = _default->background;
 surround = _default->surround;
+ generated = _default->generated;
 css3NonInheritedData = _default->css3NonInheritedData;
 css3InheritedData = _default->css3InheritedData;
 
@@ -401,9 +486,6 @@
 setBitDefaults();
 
 pseudoStyle = 0;
- content = 0;
- counter_reset = 0;
- counter_increment = 0;
 }
 
 RenderStyle::RenderStyle(bool)
@@ -414,6 +496,7 @@
 visual.init();
 background.init();
 surround.init();
+ generated.init();
 css3NonInheritedData.init();
 #ifdef APPLE_CHANGES	// ### yet to be merged
 css3NonInheritedData.access()->flexibleBox.init();
@@ -423,22 +506,15 @@
 inherited.init();
 
 pseudoStyle = 0;
- content = 0;
- counter_reset = 0;
- counter_increment = 0;
 }
 
 RenderStyle::RenderStyle(const RenderStyle& o)
 : Shared<RenderStyle>(),
 inherited_flags( o.inherited_flags ), noninherited_flags( o.noninherited_flags ),
- box( o.box ), visual( o.visual ), background( o.background ), surround( o.surround ),
+ box( o.box ), visual( o.visual ), background( o.background ), surround( o.surround ), generated(o.generated),
 css3NonInheritedData( o.css3NonInheritedData ), css3InheritedData( o.css3InheritedData ),
- inherited( o.inherited ), pseudoStyle( 0 ), content( o.content ),
- counter_reset(o.counter_reset), counter_increment(o.counter_increment)
-{
- if (counter_reset) counter_reset->ref();
- if (counter_increment) counter_increment->ref();
-}
+ inherited( o.inherited ), pseudoStyle( 0 )
+{}
 
 void RenderStyle::inheritFrom(const RenderStyle* inheritParent)
 {
@@ -465,9 +541,6 @@
 prev->pseudoStyle = 0;
 prev->deref();
 }
- delete content;
- if (counter_reset) counter_reset->deref();
- if (counter_increment) counter_increment->deref();
 }
 
 bool RenderStyle::operator==(const RenderStyle& o) const
@@ -479,13 +552,50 @@
 visual == o.visual &&
 background == o.background &&
 surround == o.surround &&
+ generated == o.generated &&
 css3NonInheritedData == o.css3NonInheritedData &&
 css3InheritedData == o.css3InheritedData &&
 inherited == o.inherited);
 }
 
-RenderStyle* RenderStyle::getPseudoStyle(PseudoId pid)
+enum EPseudoBit { NO_BIT = 0x0, BEFORE_BIT = 0x1, AFTER_BIT = 0x2, FIRST_LINE_BIT = 0x4,
+ FIRST_LETTER_BIT = 0x8, SELECTION_BIT = 0x10 };
+
+static int pseudoBit(RenderStyle::PseudoId pseudo)
 {
+ switch (pseudo) {
+ case RenderStyle::BEFORE:
+ return BEFORE_BIT;
+ case RenderStyle::AFTER:
+ return AFTER_BIT;
+ case RenderStyle::FIRST_LINE:
+ return FIRST_LINE_BIT;
+ case RenderStyle::FIRST_LETTER:
+ return FIRST_LETTER_BIT;
+ case RenderStyle::SELECTION:
+ return SELECTION_BIT;
+ default:
+ return NO_BIT;
+ }
+}
+
+bool RenderStyle::hasPseudoStyle(PseudoId pseudo) const
+{
+ return (pseudoBit(pseudo) & noninherited_flags.f._pseudoBits) != 0;
+}
+
+void RenderStyle::setHasPseudoStyle(PseudoId pseudo, bool b)
+{
+ if (b)
+ noninherited_flags.f._pseudoBits |= pseudoBit(pseudo);
+ else
+ noninherited_flags.f._pseudoBits &= ~(pseudoBit(pseudo));
+}
+
+RenderStyle* RenderStyle::getPseudoStyle(PseudoId pid) const
+{
+ if (!hasPseudoStyle(pid)) return 0;
+
 RenderStyle *ps = 0;
 if (noninherited_flags.f._styleType==NOPSEUDO)
 for (ps = pseudoStyle; ps; ps = ps->pseudoStyle)
@@ -496,26 +606,28 @@
 
 RenderStyle* RenderStyle::addPseudoStyle(PseudoId pid)
 {
- RenderStyle *ps = getPseudoStyle(pid);
+ if (hasPseudoStyle(pid)) return getPseudoStyle(pid);
 
- if (!ps)
- {
- switch (pid) {
- case FIRST_LETTER: // pseudo-elements (FIRST_LINE has a special handling)
- case BEFORE:
- case AFTER:
+ RenderStyle *ps = 0;
+
+ switch (pid) {
+ case FIRST_LETTER: // pseudo-elements (FIRST_LINE has a special handling)
+ case SELECTION:
+ case BEFORE:
+ case AFTER:
 ps = new RenderStyle();
 break;
- default:
+ default:
 ps = new RenderStyle(*this); // use the real copy constructor to get an identical copy
- }
- ps->ref();
- ps->noninherited_flags.f._styleType = pid;
- ps->pseudoStyle = pseudoStyle;
-
- pseudoStyle = ps;
 }
+ ps->ref();
+ ps->noninherited_flags.f._styleType = pid;
+ ps->pseudoStyle = pseudoStyle;
 
+ pseudoStyle = ps;
+
+ setHasPseudoStyle(pid, true);
+
 return ps;
 }
 
@@ -533,6 +645,8 @@
 prev = ps;
 ps = ps->pseudoStyle;
 }
+
+ setHasPseudoStyle(pid, false);
 }
 
 
@@ -662,7 +776,24 @@
 )
 return Visible;
 
- return Equal;
+ RenderStyle::Diff ch = Equal;
+ // Check for visible pseudo-changes:
+ if (hasPseudoStyle(FIRST_LINE) != other->hasPseudoStyle(FIRST_LINE))
+ ch = Visible;
+ else
+ if (hasPseudoStyle(FIRST_LINE) && other->hasPseudoStyle(FIRST_LINE))
+ ch = getPseudoStyle(FIRST_LINE)->diff(other->getPseudoStyle(FIRST_LINE));
+
+ if (ch != Equal) return ch;
+
+ // Check for visible pseudo-changes:
+ if (hasPseudoStyle(SELECTION) != other->hasPseudoStyle(SELECTION))
+ ch = Visible;
+ else
+ if (hasPseudoStyle(SELECTION) && other->hasPseudoStyle(SELECTION))
+ ch = getPseudoStyle(SELECTION)->diff(other->getPseudoStyle(SELECTION));
+
+ return ch;
 }
 
 
@@ -723,79 +854,41 @@
 return "\""; // 0 is default quotes
 }
 
-bool RenderStyle::contentDataEquivalent(RenderStyle* otherStyle)
+void RenderStyle::addContent(CachedObject* o)
 {
- ContentData* c1 = content;
- ContentData* c2 = otherStyle->content;
-
- while (c1 && c2) {
- if (c1->_contentType != c2->_contentType)
- return false;
- if (c1->_contentType == CONTENT_TEXT) {
- DOM::DOMString c1Str(c1->_content.text);
- DOM::DOMString c2Str(c2->_content.text);
- if (c1Str != c2Str)
- return false;
- }
- else if (c1->_contentType == CONTENT_OBJECT) {
- if (c1->_content.object != c2->_content.object)
- return false;
- }
- else if (c1->_contentType == CONTENT_COUNTER) {
- if (c1->_content.counter != c2->_content.counter)
- return false;
- }
- else if (c1->_contentType == CONTENT_QUOTE) {
- if (c1->_content.quote != c2->_content.quote)
- return false;
- }
-
- c1 = c1->_nextContent;
- c2 = c2->_nextContent;
- }
-
- return !c1 && !c2;
-}
-
-void RenderStyle::setContent(CachedObject* o, bool add)
-{
 if (!o)
 return; // The object is null. Nothing to do. Just bail.
 
- ContentData* lastContent = content;
+ StyleGeneratedData *t_generated = generated.access();
+
+ ContentData* lastContent = t_generated->content;
 while (lastContent && lastContent->_nextContent)
 lastContent = lastContent->_nextContent;
 
- bool reuseContent = !add;
- ContentData* newContentData = 0;
- if (reuseContent && content) {
- content->clearContent();
- newContentData = content;
- }
- else
- newContentData = new ContentData;
+ ContentData* newContentData = new ContentData;
 
- if (lastContent && !reuseContent)
+ if (lastContent)
 lastContent->_nextContent = newContentData;
 else
- content = newContentData;
+ t_generated->content = newContentData;
 
 // o->ref();
 newContentData->_content.object = o;
 newContentData->_contentType = CONTENT_OBJECT;
 }
 
-void RenderStyle::setContent(DOM::DOMStringImpl* s, bool add)
+void RenderStyle::addContent(DOM::DOMStringImpl* s)
 {
 if (!s)
 return; // The string is null. Nothing to do. Just bail.
 
- ContentData* lastContent = content;
+ StyleGeneratedData *t_generated = generated.access();
+
+ ContentData* lastContent = t_generated->content;
 while (lastContent && lastContent->_nextContent)
 lastContent = lastContent->_nextContent;
 
- bool reuseContent = !add;
- if (add && lastContent) {
+ if (lastContent) {
 if (lastContent->_contentType == CONTENT_TEXT) {
 // We can augment the existing string and share this ContentData node.
 DOMStringImpl* oldStr = lastContent->_content.text;
@@ -808,18 +901,12 @@
 }
 }
 
- ContentData* newContentData = 0;
- if (reuseContent && content) {
- content->clearContent();
- newContentData = content;
- }
- else
- newContentData = new ContentData;
+ ContentData* newContentData = new ContentData;
 
- if (lastContent && !reuseContent)
+ if (lastContent)
 lastContent->_nextContent = newContentData;
 else
- content = newContentData;
+ t_generated->content = newContentData;
 
 newContentData->_content.text = s;
 newContentData->_content.text->ref();
@@ -827,71 +914,88 @@
 
 }
 
-void RenderStyle::setContent(DOM::CounterImpl* c, bool add)
+void RenderStyle::addContent(DOM::CounterImpl* c)
 {
 if (!c)
 return;
 
- ContentData* lastContent = content;
+ StyleGeneratedData *t_generated = generated.access();
+
+ ContentData* lastContent = t_generated->content;
 while (lastContent && lastContent->_nextContent)
 lastContent = lastContent->_nextContent;
 
- bool reuseContent = !add;
- ContentData* newContentData = 0;
- if (reuseContent && content) {
- content->clearContent();
- newContentData = content;
- }
- else
- newContentData = new ContentData;
+ ContentData* newContentData = new ContentData;
 
- if (lastContent && !reuseContent)
+ if (lastContent)
 lastContent->_nextContent = newContentData;
 else
- content = newContentData;
+ t_generated->content = newContentData;
 
 c->ref();
 newContentData->_content.counter = c;
 newContentData->_contentType = CONTENT_COUNTER;
 }
 
-void RenderStyle::setContent(EQuoteContent q, bool add)
+void RenderStyle::addContent(EQuoteContent q)
 {
 if (q == NO_QUOTE)
 return;
 
- ContentData* lastContent = content;
+ StyleGeneratedData *t_generated = generated.access();
+
+ ContentData* lastContent = t_generated->content;
 while (lastContent && lastContent->_nextContent)
 lastContent = lastContent->_nextContent;
 
- bool reuseContent = !add;
- ContentData* newContentData = 0;
- if (reuseContent && content) {
- content->clearContent();
- newContentData = content;
- }
- else
- newContentData = new ContentData;
+ ContentData* newContentData = new ContentData;
 
- if (lastContent && !reuseContent)
+ if (lastContent)
 lastContent->_nextContent = newContentData;
 else
- content = newContentData;
+ t_generated->content = newContentData;
 
 newContentData->_content.quote = q;
 newContentData->_contentType = CONTENT_QUOTE;
 }
 
+// content: normal is the same as having no content at all
 void RenderStyle::setContentNormal() {
- delete content;
- content = 0;
+ delete generated->content;
+ generated.access()->content = 0;
 }
 
+// content: none, add an empty content node
 void RenderStyle::setContentNone() {
 setContentNormal();
- content = new ContentData;
+ generated.access()->content = new ContentData;
 }
 
+ContentData::ContentData(const ContentData& o) : _contentType(o._contentType)
+{
+ switch (_contentType) {
+ case CONTENT_OBJECT:
+ _content.object = o._content.object;
+ break;
+ case CONTENT_TEXT:
+ _content.text = o._content.text;
+ _content.text->ref();
+ break;
+ case CONTENT_COUNTER:
+ _content.counter = o._content.counter;
+ _content.counter->ref();
+ break;
+ case CONTENT_QUOTE:
+ _content.quote = o._content.quote;
+ break;
+ case CONTENT_NONE:
+ default:
+ break;
+ }
+
+ _nextContent = o._nextContent ? new ContentData(*o._nextContent) : 0;
+}
+
 ContentData::~ContentData()
 {
 clearContent();
@@ -952,13 +1056,6 @@
 return x == o.x && y == o.y && blur == o.blur && color == o.color;
 }
 
-bool RenderStyle::counterDataEquivalent(RenderStyle* otherStyle)
-{
- // ### Should we compare content?
- return counter_reset == otherStyle->counter_reset &&
- counter_increment == otherStyle->counter_increment;
-}
-
 static bool hasCounter(const DOM::DOMString& c, CSSValueListImpl *l)
 {
 int len = l->length();
@@ -972,16 +1069,16 @@
 
 bool RenderStyle::hasCounterReset(const DOM::DOMString& c) const
 {
- if (counter_reset)
- return hasCounter(c, counter_reset);
+ if (generated->counter_reset)
+ return hasCounter(c, generated->counter_reset);
 else
 return false;
 }
 
 bool RenderStyle::hasCounterIncrement(const DOM::DOMString& c) const
 {
- if (counter_increment)
- return hasCounter(c, counter_increment);
+ if (generated->counter_increment)
+ return hasCounter(c, generated->counter_increment);
 else
 return false;
 }
@@ -999,32 +1096,32 @@
 
 short RenderStyle::counterReset(const DOM::DOMString& c) const
 {
- if (counter_reset)
- return readCounter(c, counter_reset);
+ if (generated->counter_reset)
+ return readCounter(c, generated->counter_reset);
 else
 return 0;
 }
 
 short RenderStyle::counterIncrement(const DOM::DOMString& c) const
 {
- if (counter_increment)
- return readCounter(c, counter_increment);
+ if (generated->counter_increment)
+ return readCounter(c, generated->counter_increment);
 else
 return 0;
 }
 
 void RenderStyle::setCounterReset(CSSValueListImpl *l)
 {
- CSSValueListImpl *t = counter_reset;
- counter_reset = l;
+ CSSValueListImpl *t = generated->counter_reset;
+ generated.access()->counter_reset = l;
 if (l) l->ref();
 if (t) t->deref();
 }
 
 void RenderStyle::setCounterIncrement(CSSValueListImpl *l)
 {
- CSSValueListImpl *t = counter_increment;
- counter_increment = l;
+ CSSValueListImpl *t = generated->counter_increment;
+ generated.access()->counter_increment = l;
 if (l) l->ref();
 if (t) t->deref();
 }
Index: khtml/rendering/bidi.cpp
===================================================================
--- khtml/rendering/bidi.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/rendering/bidi.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -792,12 +792,18 @@
 if (bottomOfLine > m_height && bottomOfLine > m_overflowHeight)
 m_overflowHeight = bottomOfLine;
 
+ bool beforeContent = true;
+
 // Now make sure we place replaced render objects correctly.
 for (BidiRun* r = sFirstBidiRun; r; r = r->nextRun) {
- // Align positioned boxes with the top of the line box. This is
- // a reasonable approximation of an appropriate y position.
+
+ // For positioned placeholders, cache the static Y position an object with non-inline display would have.
+ // Either it is unchanged if it comes before any real linebox, or it must clear the current line (already accounted in m_height).
+ // This value will be picked up by position() if relevant.
 if (r->obj->isPositioned())
- r->box->setYPos(m_height);
+ r->box->setYPos( beforeContent && r->obj->isBox() ? static_cast<RenderBox*>(r->obj)->staticY() : m_height );
+ else if (beforeContent)
+ beforeContent = false;
 
 // Position is used to properly position both replaced elements and
 // to update the static normal flow x/y of positioned elements.
@@ -1813,7 +1819,7 @@
 // Optimize for a common case. If we can't find whitespace after the list
 // item, then this is all moot. -dwh
 RenderObject* next = Bidinext( start.par, o, bidi );
- if (!m_pre && next && next->isText() && static_cast<RenderText*>(next)->stringLength() > 0 &&
+ if (!style()->preserveWS() && next && next->isText() && static_cast<RenderText*>(next)->stringLength() > 0 &&
 (static_cast<RenderText*>(next)->text()[0].category() == QChar::Separator_Space ||
 static_cast<RenderText*>(next)->text()[0] == '\n')) {
 currentCharacterIsSpace = true;
@@ -2010,27 +2016,28 @@
 KHTMLAssert( false );
 
 RenderObject* next = Bidinext(start.par, o, bidi);
- bool isNormal = o->style()->autoWrap();
- bool checkForBreak = isNormal;
+ bool autoWrap = o->style()->autoWrap();
+ bool checkForBreak = autoWrap;
 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()) {
+ if (autoWrap || next->style()->autoWrap()) {
 if (currentCharacterIsSpace)
 checkForBreak = true;
 else {
+ checkForBreak = false;
 RenderText* nextText = static_cast<RenderText*>(next);
- int strlen = nextText->stringLength();
- QChar *str = nextText->text();
- if (strlen && str[0] == ' ')
- // If the next item on the line is text, and if we did not end with
- // a space, then the next text run continues our word (and so it needs to
- // keep adding to |tmpW|. Just update and continue.
- checkForBreak = true;
- else
- checkForBreak = false;
+ if (nextText->stringLength() != 0) {
+ QChar c = nextText->text()[0];
+ if (c == ' ' || c == '\t' || (c == '\n' && !next->style()->preserveLF())) {
+ // If the next item on the line is text, and if we did not end with
+ // a space, then the next text run continues our word (and so it needs to
+ // keep adding to |tmpW|. Just update and continue.
+ checkForBreak = true;
+ }
+ }
 
- bool canPlaceOnLine = (w + tmpW <= width+1) || !isNormal;
+ bool canPlaceOnLine = (w + tmpW <= width+1) || !autoWrap;
 if (canPlaceOnLine && checkForBreak) {
 w += tmpW;
 tmpW = 0;
@@ -2104,7 +2111,8 @@
 
 if( lBreak == start && !lBreak.obj->isBR() ) {
 // we just add as much as possible
- if ( m_pre ) {
+ if ( style()->whiteSpace() == PRE ) {
+ // FIXME: Don't really understand this case.
 if(pos != 0) {
 lBreak.obj = o;
 lBreak.pos = pos - 1;
Index: khtml/rendering/font.h
===================================================================
--- khtml/rendering/font.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/rendering/font.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -27,11 +27,12 @@
 
 #include <qfont.h>
 #include <qfontmetrics.h>
+#include <qmap.h>
 #include <qpainter.h>
 
+class QFontDatabase;
 class QPaintDeviceMetrics;
 
-
 namespace khtml
 {
 class RenderStyle;
@@ -41,7 +42,7 @@
 {
 public:
 FontDef()
- : size( 0 ), italic( false ), smallCaps( false ), weight( 50 ), hasNbsp( true ) {}
+ : size( 0 ), italic( false ), smallCaps( false ), weight( 50 ) {}
 bool operator == ( const FontDef &other ) const {
 return ( family == other.family &&
 size == other.size &&
@@ -55,7 +56,6 @@
 bool italic 		: 1;
 bool smallCaps 		: 1;
 unsigned int weight 		: 8;
- mutable bool hasNbsp : 1;
 };
 
 
@@ -163,6 +163,17 @@
 mutable QFont *scFont;
 short letterSpacing;
 short wordSpacing;
+
+ struct ScalKey;
+ enum ScalInfo {
+ Unknown,
+ No,
+ Yes
+ };
+
+ static QMap<ScalKey, ScalInfo>* scalCache;
+ static QMap<ScalKey, QValueList<int> >* scalSizesCache;
+ static bool isFontScalable(QFontDatabase& db, const QFont& font);
 };
 
 } // namespace
Index: khtml/rendering/render_table.h
===================================================================
--- khtml/rendering/render_table.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/rendering/render_table.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -215,7 +215,7 @@
 virtual void dump(QTextStream &stream, const QString &ind) const;
 #endif
 
- void addCell( RenderTableCell *cell );
+ void addCell( RenderTableCell *cell, RenderTableRow *row );
 
 void setCellWidths();
 void calcRowHeight();
@@ -225,10 +225,11 @@
 
 typedef QMemArray<RenderTableCell *> Row;
 struct RowStruct {
-	Row *row;
-	int baseLine;
-	Length height;
-	bool needFlex;
+ Row *row;
+ RenderTableRow* rowRenderer;
+ int baseLine;
+ Length height;
+ bool needFlex;
 };
 
 RenderTableCell *&cellAt( int row, int col ) {
Index: khtml/rendering/render_box.h
===================================================================
--- khtml/rendering/render_box.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/rendering/render_box.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -130,6 +130,10 @@
 int calcReplacedHeightUsing(HeightType heightType) const;
 int calcPercentageHeight(const Length& height, bool treatAsReplaced = false) const;
 int availableHeightUsing(const Length& h) const;
+ int calcImplicitHeight() const;
+ bool hasImplicitHeight() const {
+ return isPositioned() && !style()->top().isVariable() && !style()->bottom().isVariable();
+ }
 
 protected:
 virtual void paintBoxDecorations(PaintInfo& paintInfo, int _tx, int _ty);
Index: khtml/rendering/render_block.h
===================================================================
--- khtml/rendering/render_block.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/rendering/render_block.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -347,7 +347,6 @@
 QPtrList<RenderObject>* m_positionedObjects;
 
 bool m_childrenInline : 1;
- bool m_pre : 1;
 bool m_firstLine : 1; // used in inline layouting
 EClear m_clearStatus : 2; // used during layuting of paragraphs
 bool m_avoidPageBreak : 1; // anonymous avoid page-break block
Index: khtml/rendering/render_form.cpp
===================================================================
--- khtml/rendering/render_form.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/rendering/render_form.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -172,7 +172,8 @@
 
 void RenderCheckBox::slotStateChanged(int state)
 {
- element()->setChecked(state == 2);
+ element()->setChecked(state == QButton::On);
+ element()->setIndeterminate(state == QButton::NoChange);
 
 ref();
 element()->onChange();
@@ -1793,7 +1794,7 @@
 *index = -1;
 return;
 }
- 
+
 //Find the paragraph that contains us..
 int containingPar = 0;
 long endPos = 0;
Index: khtml/rendering/render_style.h
===================================================================
--- khtml/rendering/render_style.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/rendering/render_style.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -5,7 +5,7 @@
 * (C) 2000 Antti Koivisto (koivisto@kde.org)
 * (C) 2000-2003 Dirk Mueller (mueller@kde.org)
 * (C) 2002-2004 Apple Computer, Inc.
- * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
+ * (C) 2004-2006 Allan Sandfeld Jensen (kde@carewolf.com)
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Library General Public
@@ -503,6 +503,62 @@
 OutlineValue m_outline;
 };
 
+enum EQuoteContent {
+ NO_QUOTE = 0, OPEN_QUOTE, CLOSE_QUOTE, NO_OPEN_QUOTE, NO_CLOSE_QUOTE
+};
+
+enum ContentType {
+ CONTENT_NONE = 0, CONTENT_NORMAL, CONTENT_OBJECT, 
+ CONTENT_TEXT, CONTENT_COUNTER, CONTENT_QUOTE
+};
+
+struct ContentData {
+ ContentData() : _contentType( CONTENT_NONE ), _nextContent(0) {}
+ ContentData(const ContentData& o);
+ ~ContentData();
+ void clearContent();
+
+ DOM::DOMStringImpl* contentText()
+ { if (_contentType == CONTENT_TEXT) return _content.text; return 0; }
+ CachedObject* contentObject()
+ { if (_contentType == CONTENT_OBJECT) return _content.object; return 0; }
+ DOM::CounterImpl* contentCounter()
+ { if (_contentType == CONTENT_COUNTER) return _content.counter; return 0; }
+ EQuoteContent contentQuote()
+ { if (_contentType == CONTENT_QUOTE) return _content.quote; return NO_QUOTE; }
+
+ ContentType _contentType;
+
+ union {
+ CachedObject* object;
+ DOM::DOMStringImpl* text;
+ DOM::CounterImpl* counter;
+ EQuoteContent quote;
+ } _content ;
+
+ ContentData* _nextContent;
+};
+
+class StyleGeneratedData : public Shared<StyleGeneratedData>
+{
+public:
+ StyleGeneratedData();
+ ~StyleGeneratedData();
+ StyleGeneratedData(const StyleGeneratedData& o );
+
+ bool operator==(const StyleGeneratedData& o) const;
+ bool operator!=(const StyleGeneratedData &o) const {
+	return !(*this == o);
+ }
+
+ bool contentDataEquivalent(const StyleGeneratedData* otherStyle) const;
+ bool counterDataEquivalent(const StyleGeneratedData* otherStyle) const;
+
+ ContentData *content;
+ DOM::CSSValueListImpl *counter_reset;
+ DOM::CSSValueListImpl *counter_increment;
+};
+
 //------------------------------------------------
 // CSS3 Marquee Properties
 
@@ -704,41 +760,6 @@
 UI_ENABLED, UI_DISABLED, UI_NONE
 };
 
-enum EQuoteContent {
- NO_QUOTE, OPEN_QUOTE, CLOSE_QUOTE, NO_OPEN_QUOTE, NO_CLOSE_QUOTE
-};
-
-enum ContentType {
- CONTENT_NONE, CONTENT_OBJECT, CONTENT_TEXT,
- CONTENT_ATTR, CONTENT_COUNTER, CONTENT_QUOTE
-};
-
-struct ContentData {
- ContentData() : _contentType( CONTENT_NONE ), _nextContent(0) {}
- ~ContentData();
- void clearContent();
-
- ContentType _contentType;
-
- DOM::DOMStringImpl* contentText()
- { if (_contentType == CONTENT_TEXT) return _content.text; return 0; }
- CachedObject* contentObject()
- { if (_contentType == CONTENT_OBJECT) return _content.object; return 0; }
- DOM::CounterImpl* contentCounter()
- { if (_contentType == CONTENT_COUNTER) return _content.counter; return 0; }
- EQuoteContent contentQuote()
- { if (_contentType == CONTENT_QUOTE) return _content.quote; return NO_QUOTE; }
-
- union {
- CachedObject* object;
- DOM::DOMStringImpl* text;
- DOM::CounterImpl* counter;
- EQuoteContent quote;
- } _content ;
-
- ContentData* _nextContent;
-};
-
 //------------------------------------------------
 
 enum EDisplay {
@@ -823,12 +844,11 @@
 EPageBreak _page_break_after : 3;
 
 PseudoId _styleType : 4;
-		bool _affectedByHover : 1;
-		bool _affectedByActive : 1;
 bool _hasClip : 1;
+ unsigned _pseudoBits : 6;
 EUnicodeBidi _unicodeBidi : 2;
 
- unsigned int unused : 22;
+ unsigned int unused : 18;
 } f;
 Q_UINT64 _niflags;
 };
@@ -839,6 +859,7 @@
 DataRef<StyleVisualData> visual;
 DataRef<StyleBackgroundData> background;
 DataRef<StyleSurroundData> surround;
+ DataRef<StyleGeneratedData> generated;
 DataRef<StyleCSS3NonInheritedData> css3NonInheritedData;
 
 // inherited attributes
@@ -848,11 +869,6 @@
 // list of associated pseudo styles
 RenderStyle* pseudoStyle;
 
- // added this here, so we can get rid of the vptr in this class.
- // makes up for the same size.
- ContentData *content;
- DOM::CSSValueListImpl *counter_reset;
- DOM::CSSValueListImpl *counter_increment;
 // !END SYNC!
 
 // static default style
@@ -896,9 +912,8 @@
 noninherited_flags.f._page_break_before = initialPageBreak();
 noninherited_flags.f._page_break_after = initialPageBreak();
 	noninherited_flags.f._styleType = NOPSEUDO;
-	noninherited_flags.f._affectedByHover = false;
-	noninherited_flags.f._affectedByActive = false;
 	noninherited_flags.f._hasClip = false;
+ noninherited_flags.f._pseudoBits = 0;
 	noninherited_flags.f._unicodeBidi = initialUnicodeBidi();
 noninherited_flags.f.unused = 0;
 }
@@ -916,16 +931,12 @@
 
 PseudoId styleType() { return noninherited_flags.f._styleType; }
 
- RenderStyle* getPseudoStyle(PseudoId pi);
+ bool hasPseudoStyle(PseudoId pi) const;
+ void setHasPseudoStyle(PseudoId pi, bool b=true);
+ RenderStyle* getPseudoStyle(PseudoId pi) const;
 RenderStyle* addPseudoStyle(PseudoId pi);
 void removePseudoStyle(PseudoId pi);
 
- bool affectedByHoverRules() const { return noninherited_flags.f._affectedByHover; }
- bool affectedByActiveRules() const { return noninherited_flags.f._affectedByActive; }
-
- void setAffectedByHoverRules(bool b) { noninherited_flags.f._affectedByHover = b; }
- void setAffectedByActiveRules(bool b) { noninherited_flags.f._affectedByActive = b; }
-
 bool operator==(const RenderStyle& other) const;
 bool isFloating() const { return !(noninherited_flags.f._floating == FNONE); }
 bool hasMargin() const { return surround->margin.nonZero(); }
@@ -1269,18 +1280,20 @@
 const_cast<StyleVisualData *>(visual.get())->palette = QApplication::palette();
 }
 
- ContentData* contentData() const { return content; }
- bool contentDataEquivalent(RenderStyle* otherStyle);
- void setContent(DOM::DOMStringImpl* s, bool add);
- void setContent(CachedObject* o, bool add);
- void setContent(DOM::CounterImpl* c, bool add);
- void setContent(EQuoteContent q, bool add);
+ ContentData* contentData() const { return generated->content; }
+ bool contentDataEquivalent(const RenderStyle* otherStyle) const 
+ { 
+ return generated->contentDataEquivalent(otherStyle->generated.get());
+ }
+ void addContent(DOM::DOMStringImpl* s);
+ void addContent(CachedObject* o);
+ void addContent(DOM::CounterImpl* c);
+ void addContent(EQuoteContent q);
 void setContentNone();
 void setContentNormal();
 
- DOM::CSSValueListImpl* counterReset() const { return counter_reset; }
- DOM::CSSValueListImpl* counterIncrement() const { return counter_increment; }
- bool counterDataEquivalent(RenderStyle* otherStyle);
+ DOM::CSSValueListImpl* counterReset() const { return generated->counter_reset; }
+ DOM::CSSValueListImpl* counterIncrement() const { return generated->counter_increment; }
 void setCounterReset(DOM::CSSValueListImpl* v);
 void setCounterIncrement(DOM::CSSValueListImpl* v);
 bool hasCounterReset(const DOM::DOMString& c) const;
Index: khtml/rendering/render_object.cpp
===================================================================
--- khtml/rendering/render_object.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/rendering/render_object.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -194,8 +194,12 @@
 
 RenderObject::~RenderObject()
 {
- if(m_style->backgroundImage())
- m_style->backgroundImage()->deref(this);
+ const BackgroundLayer* bgLayer = m_style->backgroundLayers();
+ while (bgLayer) {
+ if(bgLayer->backgroundImage())
+ bgLayer->backgroundImage()->deref(this);
+ bgLayer = bgLayer->next();
+ }
 
 if (m_style)
 m_style->deref();
@@ -453,8 +457,8 @@
 bool skipTables = isPositioned() || isRelPositioned();
 bool strict = !style()->htmlHacks();
 RenderObject* curr = parent();
- while (curr && (!curr->element() || 
- (!curr->isPositioned() && !curr->isRelPositioned() && 
+ while (curr && (!curr->element() ||
+ (!curr->isPositioned() && !curr->isRelPositioned() &&
 !(strict && skipTables ? curr->isRoot() : curr->isBody())))) {
 if (!skipTables && curr->element() && (curr->isTableCell() || curr->isTable()))
 break;
@@ -512,7 +516,7 @@
 bool alreadyNeededLayout = m_needsLayout;
 m_needsLayout = b;
 if (b) {
- if (!alreadyNeededLayout && markParents) {
+ if (!alreadyNeededLayout && markParents && m_parent) {
 dirtyFormattingContext( false );
 markContainingBlocksForLayout();
 }
@@ -1277,8 +1281,7 @@
 
 updateBackgroundImages(oldStyle);
 
- if (m_style)
- m_style->ref();
+ m_style->ref();
 
 if (oldStyle)
 oldStyle->deref();
@@ -1295,7 +1298,7 @@
 } else if (!isText() && d == RenderStyle::Visible) {
 if (layer() && !isInlineFlow()) {
 layer()->repaint();
- if (canvas() && canvas()->needsWidgetMasks()) { 
+ if (canvas() && canvas()->needsWidgetMasks()) {
 RenderLayer *p, *d = 0;
 for (p=layer()->parent();p;p=p->parent())
 if (p->hasOverlaidWidgets()) d=p;
@@ -1315,17 +1318,9 @@
 m_markedForRepaint = true;
 if (layer() && (style()->position() == FIXED || style()->position() == ABSOLUTE))
 return;
- if (m_parent) {
- if (isInlineFlow()) {
- if (!checkContainer && !m_parent->isInline())
- return;
- else
- m_parent->dirtyFormattingContext(false);
- } 
- else if (checkContainer || style()->width().isVariable() || style()->height().isVariable() ||
- !(isFloating() || flowAroundFloats() || isTableCell()))
- m_parent->dirtyFormattingContext(false);
- }
+ if (m_parent && (checkContainer || style()->width().isVariable() || style()->height().isVariable() ||
+ !(isFloating() || flowAroundFloats() || isTableCell())))
+ m_parent->dirtyFormattingContext(false);
 }
 
 void RenderObject::repaintDuringLayout()
@@ -1510,8 +1505,6 @@
 
 void RenderObject::remove()
 {
- removeFromObjectLists();
-
 if ( parent() )
 //have parent, take care of the tree integrity
 parent()->removeChild(this);
@@ -1556,6 +1549,10 @@
 deleteInlineBoxes();
 remove();
 
+ // make sure our DOM-node don't think we exist
+ if ( node() && node()->renderer() == this)
+ node()->setRenderer(0);
+
 // by default no refcounting
 arenaDelete(renderArena(), this);
 }
@@ -2109,19 +2106,21 @@
 n = n->previousSibling();
 }
 if (sibling->isReset())
+ {
 if (last != sibling)
 sibling->insertAfter(i, last);
 else
 sibling->insertAfter(i, 0);
- else
+ }
+ else if (last->parent())
 last->parent()->insertAfter(i, last);
 }
- else {
+ else if (parent()) {
 // Nothing found among siblings, let our parent search
 last = parent()->getCounter(counter, false);
 if (last->isReset())
 last->insertAfter(i, 0);
- else
+ else if (last->parent())
 last->parent()->insertAfter(i, last);
 }
 }
@@ -2193,7 +2192,7 @@
 }
 else if (!curr->layer() || !curr->layer()->isStackingContext())
 curr->updateWidgetMasks();
- 
+
 }
 }
 
Index: khtml/rendering/font.cpp
===================================================================
--- khtml/rendering/font.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/rendering/font.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -338,7 +338,66 @@
 return w;
 }
 
+/** Querying QFontDB whether something is scalable is expensive, so we cache. */
+struct Font::ScalKey 
+{
+ QString family;
+ int weight;
+ int italic;
 
+ ScalKey(const QFont& font) : 
+ family(font.family()), weight(font.weight()), italic(font.italic())
+ {}
+
+ ScalKey() {}
+
+ bool operator<(const ScalKey& other) const {
+ if (weight < other.weight)
+ return true;
+ if (weight > other.weight)
+ return false;
+
+ if (italic < other.italic)
+ return true;
+ if (italic > other.italic)
+ return false;
+
+ return family < other.family;
+ }
+
+ bool operator==(const ScalKey& other) const {
+ return (weight == other.weight &&
+ italic == other.italic && 
+ family == other.family);
+ }
+};
+
+QMap<Font::ScalKey, Font::ScalInfo>* Font::scalCache;
+QMap<Font::ScalKey, QValueList<int> >* Font::scalSizesCache;
+
+bool Font::isFontScalable(QFontDatabase& db, const QFont& font) 
+{
+ if (!scalCache)
+ scalCache = new QMap<ScalKey, ScalInfo>;
+
+ ScalKey key(font);
+
+ ScalInfo &s = (*scalCache)[key];
+ if (s == Unknown) {
+ s = db.isSmoothlyScalable(font.family(), db.styleString(font)) ? Yes : No;
+
+ if (s == No) {
+ /* Cache size info */
+ if (!scalSizesCache)
+ scalSizesCache = new QMap<ScalKey, QValueList<int> >;
+ (*scalSizesCache)[key] = db.smoothSizes(font.family(), db.styleString(font));
+ }
+ }
+
+ return (s == Yes);
+}
+
+
 void Font::update( QPaintDeviceMetrics* devMetrics ) const
 {
 f.setFamily( fontDef.family.isEmpty() ? KHTMLFactory::defaultHTMLSettings()->stdFontName() : fontDef.family );
@@ -352,9 +411,9 @@
 
 // ok, now some magic to get a nice unscaled font
 // all other font properties should be set before this one!!!!
- if( !db.isSmoothlyScalable(f.family(), db.styleString(f)) )
+ if( !isFontScalable(db, f) )
 {
- const QValueList<int> pointSizes = db.smoothSizes(f.family(), db.styleString(f));
+ const QValueList<int>& pointSizes = (*scalSizesCache)[ScalKey(f)];
 // lets see if we find a nice looking font, which is not too far away
 // from the requested one.
 // kdDebug(6080) << "khtml::setFontSize family = " << f.family() << " size requested=" << size << endl;
@@ -392,7 +451,6 @@
 f.setPixelSize( size );
 
 fm = QFontMetrics( f );
- fontDef.hasNbsp = fm.inFont( 0xa0 );
 
 // small caps
 delete scFont;
Index: khtml/rendering/render_canvas.cpp
===================================================================
--- khtml/rendering/render_canvas.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/rendering/render_canvas.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -715,7 +715,9 @@
 
 RenderObject *fc = firstChild();
 if(fc) {
- int dw = fc->effectiveWidth() + fc->marginLeft() + fc->marginRight();
+ // ow: like effectiveWidth() but without the negative
+ const int ow = hasOverflowClip() ? width() : overflowWidth();
+ int dw = ow + fc->marginLeft() + fc->marginRight();
 int rightmostPos = fc->rightmostPosition(false);
 // kdDebug(6040) << "w " << w << " rightmostPos " << rightmostPos << " dw " << dw << " fc->rw " << fc->effectiveWidth() << " fc->width() " << fc->width() << endl;
 if( rightmostPos > dw )
Index: khtml/rendering/render_layer.cpp
===================================================================
--- khtml/rendering/render_layer.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/rendering/render_layer.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2003 Apple Computer, Inc.
- * Copyright (C) 2006 Germain Garand <germain@ebooksfrance.org>
+ * (C) 2006 Germain Garand <germain@ebooksfrance.org>
+ * (C) 2006 Allan Sandfeld Jense <kde@carewolf.com>
 *
 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
 *
@@ -55,6 +56,7 @@
 #include "xml/dom2_eventsimpl.h"
 #include "misc/htmltags.h"
 #include "html/html_blockimpl.h"
+#include "xml/dom_restyler.h"
 
 #include <qscrollbar.h>
 #include <qptrvector.h>
@@ -144,8 +146,8 @@
 RenderLayer* positionedParent = enclosingPositionedAncestor();
 
 // For positioned layers, we subtract out the enclosing positioned layer's scroll offset.
- positionedParent->subtractScrollOffset(x, y); 
- positionedParent->checkInlineRelOffset(m_object, x, y); 
+ positionedParent->subtractScrollOffset(x, y);
+ positionedParent->checkInlineRelOffset(m_object, x, y);
 }
 else if (parent())
 parent()->subtractScrollOffset(x, y);
@@ -153,7 +155,7 @@
 setPos(x,y);
 }
 
-QRegion RenderLayer::paintedRegion(RenderLayer* rootLayer) 
+QRegion RenderLayer::paintedRegion(RenderLayer* rootLayer)
 {
 updateZOrderLists();
 QRegion r;
@@ -169,14 +171,14 @@
 int x = 0; int y = 0;
 convertToLayerCoords(rootLayer,x,y);
 QRect cr(x,y,width(),height());
- if ( s->backgroundImage() || s->backgroundColor().isValid() || s->hasBorder() || 
+ if ( s->backgroundImage() || s->backgroundColor().isValid() || s->hasBorder() ||
 s->scrollsOverflow() || renderer()->isReplaced() ) {
 r += cr;
 } else {
 r += renderer()->visibleFlowRegion(x, y);
 }
 }
- 
+
 if (m_posZOrderList) {
 uint count = m_posZOrderList->count();
 for (uint i = 0; i < count; i++) {
@@ -208,7 +210,7 @@
 m_object->repaint();
 checkForRepaint = doFullRepaint = false;
 }
- 
+
 updateLayerPosition(); // For relpositioned layers or non-positioned layers,
 // we need to keep in sync, since we may have shifted relative
 // to our parent layer.
@@ -226,7 +228,7 @@
 // FIXME: Child object could override visibility.
 if (checkForRepaint && (m_object->style()->visibility() == VISIBLE))
 m_object->repaintAfterLayoutIfNeeded(m_repaintRect, m_fullRepaintRect);
-#else 
+#else
 if (checkForRepaint && m_markedForRepaint) {
 QRect layerBounds, damageRect, fgrect;
 calculateRects(rootLayer, renderer()->viewRect(), layerBounds, damageRect, fgrect);
@@ -236,9 +238,9 @@
 m_visibleRect = vr;
 }
 }
- m_markedForRepaint = false; 
+ m_markedForRepaint = false;
 #endif
- 
+
 for	(RenderLayer* child = firstChild(); child; child = child->nextSibling())
 child->updateLayerPositions(rootLayer, doFullRepaint, checkForRepaint);
 
@@ -247,7 +249,7 @@
 m_marquee->updateMarqueePosition();
 }
 
-void RenderLayer::updateWidgetMasks(RenderLayer* rootLayer) 
+void RenderLayer::updateWidgetMasks(RenderLayer* rootLayer)
 {
 if (hasOverlaidWidgets() && !renderer()->canvas()->pagedMode()) {
 updateZOrderLists();
@@ -268,7 +270,7 @@
 }
 if (needUpdate)
 renderer()->updateWidgetMasks();
- } 
+ }
 for	(RenderLayer* child = firstChild(); child; child = child->nextSibling())
 child->updateWidgetMasks(rootLayer);
 }
@@ -506,17 +508,17 @@
 sy = flow->staticY();
 }
 bool isInlineType = o->style()->isOriginalDisplayInlineType();
- 
+
 if (!o->hasStaticX())
 x += sx;
- 
+
 // Despite the positioned child being a block display type inside an inline, we still keep
- // its x locked to our left. Arguably the correct behavior would be to go flush left to 
+ // its x locked to our left. Arguably the correct behavior would be to go flush left to
 // the block that contains us, but that isn't what other browsers do.
 if (o->hasStaticX() && !isInlineType)
 // Avoid adding in the left border/padding of the containing block twice. Subtract it out.
 x += sx - (o->containingBlock()->borderLeft() + o->containingBlock()->paddingLeft());
- 
+
 if (!o->hasStaticY())
 y += sy;
 }
@@ -549,7 +551,7 @@
 RenderLayer* rootLayer = root();
 for (RenderLayer* child = firstChild(); child; child = child->nextSibling())
 child->updateLayerPositions(rootLayer);
- 
+
 // Fire the scroll DOM event.
 m_object->element()->dispatchHTMLEvent(EventImpl::SCROLL_EVENT, true, false);
 
@@ -1158,23 +1160,24 @@
 if (info.readonly())
 return;
 
- // Check to see if the hovered node has changed. If not, then we don't need to
- // do anything. An exception is if we just went from :hover into :hover:active,
- // in which case we need to update to get the new :active state.
 DOM::NodeImpl *e = m_object->element();
 DOM::DocumentImpl *doc = e ? e->getDocument() : 0;
- if (!doc)
-	return;
+ if (!doc) return;
 
+ // Check to see if the hovered node has changed. If not, then we don't need to
+ // do anything.
 DOM::NodeImpl* oldHoverNode = doc->hoverNode();
 DOM::NodeImpl* newHoverNode = info.innerNode();
 
- 
 if (oldHoverNode == newHoverNode && (!oldHoverNode || oldHoverNode->active() == info.active()))
 return;
 
 // Update our current hover node.
 doc->setHoverNode(newHoverNode);
+ if (info.active())
+ doc->setActiveNode(newHoverNode);
+ else
+ doc->setActiveNode(0);
 
 // We have two different objects. Fetch their renderers.
 RenderObject* oldHoverObj = oldHoverNode ? oldHoverNode->renderer() : 0;
@@ -1187,25 +1190,17 @@
 for (RenderObject* curr = oldHoverObj; curr && curr != ancestor; curr = hoverAncestor(curr)) {
 curr->setMouseInside(false);
 if (curr->element()) {
- bool oldActive = curr->element()->active();
- curr->element()->NodeImpl::setActive(false);
- if (!curr->isText() && (curr->style()->affectedByHoverRules() ||
- (curr->style()->affectedByActiveRules() && oldActive)))
- curr->element()->setChanged();
+ curr->element()->setActive(false);
+ curr->element()->setHovered(false);
 }
 }
 
 // Now set the hover state for our new object up to the root.
 for (RenderObject* curr = newHoverObj; curr; curr = hoverAncestor(curr)) {
- bool oldInside = curr->mouseInside();
 curr->setMouseInside(true);
 if (curr->element()) {
- bool oldActive = curr->element()->active();
- curr->element()->NodeImpl::setActive(info.active());
- if (!curr->isText() && (curr->style()->affectedByHoverRules() && !oldInside) ||
- (curr->style()->affectedByActiveRules() && oldActive != info.active())) {
- curr->element()->setChanged();
- }
+ curr->element()->setActive(info.active());
+ curr->element()->setHovered(true);
 }
 }
 }
@@ -1593,7 +1588,7 @@
 killTimer(m_timerId);
 m_timerId = 0;
 }
- 
+
 m_stopped = true;
 }
 
Index: khtml/rendering/render_container.cpp
===================================================================
--- khtml/rendering/render_container.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/rendering/render_container.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -52,9 +52,17 @@
 if (continuation())
 continuation()->detach();
 
+ // We simulate removeNode calls for all our children
+ // and set parent to 0 to avoid removeNode from being called.
+ // First call removeLayers and removeFromObjectLists since they assume
+ // a valid render-tree
+ for(RenderObject* n = m_first; n; n = n->nextSibling() ) {
+ n->removeLayers(enclosingLayer());
+ n->removeFromObjectLists();
+ }
+
 RenderObject* next;
 for(RenderObject* n = m_first; n; n = next ) {
-	n->removeFromObjectLists();
 n->setParent(0);
 next = n->nextSibling();
 n->detach();
@@ -159,6 +167,8 @@
 
 // Keep our layer hierarchy updated.
 oldChild->removeLayers(enclosingLayer());
+ // remove the child from any special layout lists
+ oldChild->removeFromObjectLists();
 
 // if oldChild is the start or end of the selection, then clear
 // the selection to avoid problems of invalid pointers
@@ -172,7 +182,7 @@
 
 if (oldChild->isSelectionBorder()) {
 RenderObject *root = oldChild;
- while (root && root->parent())
+ while (root->parent())
 root = root->parent();
 if (root->isCanvas()) {
 static_cast<RenderCanvas*>(root)->clearSelection();
@@ -180,7 +190,7 @@
 }
 }
 
- // remove the child
+ // remove the child from the render-tree
 if (oldChild->previousSibling())
 oldChild->previousSibling()->setNextSibling(oldChild->nextSibling());
 if (oldChild->nextSibling())
@@ -275,7 +285,7 @@
 {
 // The child needs to be removed.
 oldContentPresent = false;
- removeChild(child);
+ child->detach();
 child = (type == RenderStyle::BEFORE) ? firstChild() : lastChild();
 }
 
Index: khtml/rendering/render_text.cpp
===================================================================
--- khtml/rendering/render_text.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/rendering/render_text.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -140,10 +140,33 @@
 p->setPen(hc);
 
 //kdDebug( 6040 ) << "textRun::painting(" << QConstString(text->str->s + m_start, m_len).string().left(30) << ") at(" << m_x+tx << "/" << m_y+ty << ")" << endl;
+
+ const bool needClipping = startPos != 0 || endPos != m_len;
+
+ if (needClipping) {
+ p->save();
+
+ int visualSelectionStart = f->width(text->str->s, text->str->l, m_start, startPos);
+ int visualSelectionEnd = f->width(text->str->s, text->str->l, m_start, endPos);
+ int visualSelectionWidth = visualSelectionEnd - visualSelectionStart;
+ if (m_reversed) {
+ visualSelectionStart = f->width(text->str->s, text->str->l, m_start, m_len) - visualSelectionEnd;
+ }
+
+ QRect selectionRect(m_x + tx + visualSelectionStart, m_y + ty, visualSelectionWidth, height());
+ QRegion r(selectionRect);
+ if (p->hasClipping())
+ r &= p->clipRegion(QPainter::CoordPainter);
+ p->setClipRegion(r, QPainter::CoordPainter);
+ }
+
 f->drawText(p, m_x + tx, m_y + ty + m_baseline, text->str->s, text->str->l,
- 		m_start, m_len, m_toAdd,
-		m_reversed ? QPainter::RTL : QPainter::LTR,
-		startPos, endPos, hbg, m_y + ty, height(), deco);
+ m_start, m_len, m_toAdd,
+ m_reversed ? QPainter::RTL : QPainter::LTR,
+ needClipping ? 0 : startPos, needClipping ? m_len : endPos,
+		hbg, m_y + ty, height(), deco);
+
+ if (needClipping) p->restore();
 }
 
 void InlineTextBox::paintDecoration( QPainter *pt, const Font *f, int _tx, int _ty, int deco)
@@ -222,7 +245,7 @@
 bmap[n] = f;
 }
 
- float factor = 0.0; // maximal opacity-sum
+ float factor = 0.0; // maximal potential opacity-sum
 for(int n=-thickness; n<=thickness; n++)
 for(int m=-thickness; m<=thickness; m++) {
 int d = n*n+m*m;
@@ -230,7 +253,8 @@
 factor += bmap[d];
 }
 
- factor = 1.0/factor;
+ // arbitratry factor adjustment to make shadows solid.
+ factor = factor/1.333;
 
 // alpha map
 float* amap = (float*)alloca(sizeof(float)*(h*w));
@@ -261,9 +285,14 @@
 int g = qGreen(color);
 int b = qBlue(color);
 
+ // divide by factor
+ factor = 1.0/factor;
+
 for(int j=0; j<h; j++) {
 for(int i=0; i<w; i++) {
- res.setPixel(i,j, qRgba(r,g,b,(int)(amap[i+j*w]*factor*255.0)));
+ int a = (int)(amap[i+j*w] * factor * 255.0);
+ if (a > 255) a = 255;
+ res.setPixel(i,j, qRgba(r,g,b,a));
 }
 }
 
@@ -307,12 +336,12 @@
 }
 if ( _x > _tx + m_x + m_width ) {
 	// to the right
-	return m_reversed ? SelectionPointBeforeInLine : SelectionPointAfterInLine;
+	return SelectionPointAfterInLine;
 }
 
 // The Y matches, check if we're on the left
 if ( _x < _tx + m_x ) {
- return m_reversed ? SelectionPointAfterInLine : SelectionPointBeforeInLine;
+ return SelectionPointBeforeInLine;
 }
 
 // consider spacing for justified text
@@ -871,7 +900,7 @@
 
 // Now calculate startPos and endPos, for painting selection.
 // We paint selection while endPos > 0
- int endPos, startPos;
+ int endPos = 0, startPos = 0;
 if (!isStatic && (selectionState() != SelectionNone)) {
 if (selectionState() == SelectionInside) {
 //kdDebug(6040) << this << " SelectionInside -> 0 to end" << endl;
@@ -922,55 +951,17 @@
 }
 #endif
 
+ const int offset = s->m_start;
+ const int sPos = kMax( startPos - offset, 0 );
+ const int ePos = kMin( endPos - offset, int( s->m_len ) );
 if (s->m_len > 0 && pI.phase != PaintActionSelection) {
-	 if (!haveSelection) {
-	 //kdDebug( 6040 ) << "RenderObject::paintObject(" << QConstString(str->s + s->m_start, s->m_len).string() << ") at(" << s->m_x+tx << "/" << s->m_y+ty << ")" << endl;
-#ifndef APPLE_CHANGES
- if (_style->textShadow())
- s->paintShadow(pI.p, font, tx, ty, _style->textShadow());
-#endif
+ //kdDebug( 6040 ) << "RenderObject::paintObject(" << QConstString(str->s + s->m_start, s->m_len).string() << ") at(" << s->m_x+tx << "/" << s->m_y+ty << ")" << endl;
+ if (_style->textShadow())
+ s->paintShadow(pI.p, font, tx, ty, _style->textShadow());
 // kdDebug(6040) << QConstString(str->s + s->m_start, s->m_len).string().left(40) << endl;
-		 font->drawText(pI.p, s->m_x + tx, s->m_y + ty + s->m_baseline, str->s, str->l, s->m_start, s->m_len,
-				 s->m_toAdd, s->m_reversed ? QPainter::RTL : QPainter::LTR);
-	 }
-		else {
- int offset = s->m_start;
- int sPos = kMax( startPos - offset, 0 );
- int ePos = kMin( endPos - offset, int( s->m_len ) );
-// selected text is always separate in konqueror
-#ifdef APPLE_CHANGES
- if (paintSelectedTextSeparately) {
-#endif
-#ifndef APPLE_CHANGES
- if (_style->textShadow())
- s->paintShadow(pI.p, font, tx, ty, _style->textShadow());
-#endif
- if (sPos >= ePos)
- font->drawText(pI.p, s->m_x + tx, s->m_y + ty + s->m_baseline,
- str->s, str->l, s->m_start, s->m_len,
- s->m_toAdd, s->m_reversed ? QPainter::RTL : QPainter::LTR);
- else {
- if (sPos-1 >= 0)
- font->drawText(pI.p, s->m_x + tx, s->m_y + ty + s->m_baseline,
- str->s, str->l, s->m_start, s->m_len,
- s->m_toAdd, s->m_reversed ? QPainter::RTL : QPainter::LTR, 0, sPos);
- if (ePos < s->m_len)
- font->drawText(pI.p, s->m_x + tx, s->m_y + ty + s->m_baseline,
- str->s, str->l, s->m_start, s->m_len,
- s->m_toAdd, s->m_reversed ? QPainter::RTL : QPainter::LTR, ePos, s->m_len);
- }
-#ifdef APPLE_CHANGES
- }
-
- if ( sPos < ePos ) {
- if (selectionColor != p->pen().color())
- p->setPen(selectionColor);
-
- font->drawText(pI.p, s->m_x + tx, s->m_y + ty + s->m_baseline, str->s,
- str->l, s->m_start, s->m_len,
- s->m_toAdd, s->m_reversed ? QPainter::RTL : QPainter::LTR, sPos, ePos);
- }
-#endif
+ if (!haveSelection || sPos != 0 || ePos != s->m_len) {
+ font->drawText(pI.p, s->m_x + tx, s->m_y + ty + s->m_baseline, str->s, str->l, s->m_start, s->m_len,
+ s->m_toAdd, s->m_reversed ? QPainter::RTL : QPainter::LTR);
 }
 	 }
 
@@ -981,9 +972,6 @@
 }
 
 if (haveSelection && pI.phase == PaintActionSelection) {
-		int offset = s->m_start;
-		int sPos = kMax( startPos - offset, 0 );
-		int ePos = kMin( endPos - offset, int( s->m_len ) );
 //kdDebug(6040) << this << " paintSelection with startPos=" << sPos << " endPos=" << ePos << endl;
 		if ( sPos < ePos )
 		 s->paintSelection(font, this, pI.p, _style, tx, ty, sPos, ePos, d);
@@ -1044,7 +1032,7 @@
 m_hasBeginWS = true;
 if ((isSpace || isNewline) && i == len-1)
 m_hasEndWS = true;
- 
+
 if (i && c == SOFT_HYPHEN)
 continue;
 
Index: khtml/rendering/render_table.cpp
===================================================================
--- khtml/rendering/render_table.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/rendering/render_table.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -1014,18 +1014,19 @@
 int nRows = grid.size();
 int nCols = table()->numEffCols();
 if ( numRows > nRows ) {
-	grid.resize( numRows );
-	for ( int r = nRows; r < numRows; r++ ) {
-	 grid[r].row = new Row( nCols );
-	 grid[r].row->fill( 0 );
-	 grid[r].baseLine = 0;
-	 grid[r].height = Length();
-	}
+ grid.resize( numRows );
+ for ( int r = nRows; r < numRows; r++ ) {
+ grid[r].row = new Row( nCols );
+ grid[r].row->fill( 0 );
+ grid[r].rowRenderer = 0;
+ grid[r].baseLine = 0;
+ grid[r].height = Length();
+ }
 }
 
 }
 
-void RenderTableSection::addCell( RenderTableCell *cell )
+void RenderTableSection::addCell( RenderTableCell *cell, RenderTableRow *row )
 {
 int rSpan = cell->rowSpan();
 int cSpan = cell->colSpan();
@@ -1038,29 +1039,8 @@
 // <TR><TD>1 <TD rowspan="2">2 <TD>3 <TD>4
 // <TR><TD colspan="2">5
 // </TABLE>
-#if 0
- // find empty space for the cell
- bool found = false;
- while ( !found ) {
-	found = true;
-	while ( cCol < nCols && cellAt( cRow, cCol ) )
-	 cCol++;
-	int pos = cCol;
-	int span = 0;
-	while ( pos < nCols && span < cSpan ) {
-	 if ( cellAt( cRow, pos ) ) {
-		found = false;
-		cCol = pos;
-		break;
-	 }
-	 span += columns[pos].span;
-	 pos++;
-	}
- }
-#else
 while ( cCol < nCols && cellAt( cRow, cCol ) )
 	cCol++;
-#endif
 
 // qDebug("adding cell at %d/%d span=(%d/%d)", cRow, cCol, rSpan, cSpan );
 
@@ -1097,6 +1077,8 @@
 // make sure we have enough rows
 ensureRows( cRow + rSpan );
 
+ grid[cRow].rowRenderer = row;
+
 int col = cCol;
 // tell the cell where it is
 RenderTableCell *set = cell;
@@ -1546,6 +1528,61 @@
 return left;
 }
 
+// Search from first_row to last_row for the row containing y
+static unsigned int findRow(unsigned int first_row, unsigned int last_row,
+ const QMemArray<int> &rowPos, int y)
+{
+ unsigned int under = first_row;
+ unsigned int over = last_row;
+ int offset = (over - under)/2;
+ while (over-under > 1) {
+ if (rowPos[under+offset] <= y)
+ under = under+offset;
+ else
+ over = under+offset;
+ offset = (over - under)/2;
+ }
+
+ assert(under == first_row || rowPos[under] <= y);
+ assert(over == last_row || rowPos[over] > y);
+
+ return under;
+}
+
+static void findRowCover(unsigned int &startrow, unsigned int &endrow,
+ const QMemArray<int> &rowPos,
+ int min_y, int max_y)
+{
+ assert(max_y >= min_y);
+ unsigned int totalRows = endrow;
+
+ unsigned int index = 0;
+ // Initial binary search boost:
+ if (totalRows >= 8) {
+ int offset = (endrow - startrow)/2;
+ while (endrow - startrow > 1) {
+ index = startrow+offset;
+ if (rowPos[index] <= min_y ) 
+ // index is below both min_y and max_y
+ startrow = index;
+ else
+ if (rowPos[index] > max_y) 
+ // index is above both min_y and max_y
+ endrow = index;
+ else
+ // index is within the selection
+ break;
+ offset = (endrow - startrow)/2;
+ }
+ }
+
+ // Binary search for startrow
+ startrow = findRow(startrow, endrow, rowPos, min_y);
+ // Binary search for endrow
+ endrow = findRow(startrow, endrow, rowPos, max_y) + 1;
+ if (endrow > totalRows) endrow = totalRows;
+}
+
 void RenderTableSection::paint( PaintInfo& pI, int tx, int ty )
 {
 unsigned int totalRows = grid.size();
@@ -1561,22 +1598,14 @@
 int cbsw2 = cbs ? cbs->width()/2 : 0;
 int cbsw21 = cbs ? (cbs->width()+1)/2 : 0;
 
- RenderTableRow *trow = firstTableRow(firstChild());
-
 int x = pI.r.x(), y = pI.r.y(), w = pI.r.width(), h = pI.r.height();
 // check which rows and cols are visible and only paint these
- // ### fixme: could use a binary search here
 int os = 2*maximalOutlineSize(pI.phase);
 unsigned int startrow = 0;
 unsigned int endrow = totalRows;
- for ( ; startrow < totalRows; startrow++, trow = nextTableRow(trow) ) {
-	if ( ty + rowPos[startrow+1] + kMax(cbsw21, os) > y - os )
-	 break;
- }
- for ( ; endrow > 0; endrow-- ) {
-	if ( ty + rowPos[endrow-1] - kMax(cbsw2, os) < y + h + os )
-	 break;
- }
+ findRowCover(startrow, endrow, rowPos, y - os - ty - kMax(cbsw21, os), y + h + os - ty + kMax(cbsw2, os));
+
+ // A binary search is probably not worthwhile for coloumns
 unsigned int startcol = 0;
 unsigned int endcol = totalCols;
 if ( style()->direction() == LTR ) {
@@ -1591,22 +1620,24 @@
 }
 if ( startcol < endcol ) {
 	// draw the cells
-	for ( unsigned int r = startrow; r < endrow; r++, trow = nextTableRow(trow) ) {
+	for ( unsigned int r = startrow; r < endrow; r++ ) {
 	 // paint the row
-	 if (trow) {
+	 if (grid[r].rowRenderer) {
 	 int height = rowPos[r+1] - rowPos[r] - table()->borderVSpacing();
-	 trow->paintRow(pI, tx, ty + rowPos[r], width(), height);
+	 grid[r].rowRenderer->paintRow(pI, tx, ty + rowPos[r], width(), height);
 	 }
 
 	 unsigned int c = startcol;
+	 Row *row = grid[r].row;
+	 Row *nextrow = (r < endrow - 1) ? grid[r+1].row : 0;
 	 // since a cell can be -1 (indicating a colspan) we might have to search backwards to include it
-	 while ( c && cellAt( r, c ) == (RenderTableCell *)-1 )
+	 while ( c && (*row)[c] == (RenderTableCell *)-1 )
 		c--;
 	 for ( ; c < endcol; c++ ) {
-		RenderTableCell *cell = cellAt(r, c);
+		RenderTableCell *cell = (*row)[c];
 		if (!cell || cell == (RenderTableCell *)-1 )
 		 continue;
-		if ( (r < endrow - 1) && (cellAt(r+1, c) == cell) )
+		if ( nextrow && (*nextrow)[c] == cell )
 		 continue;
 
 #ifdef TABLE_PRINT
@@ -1625,18 +1656,15 @@
 clearGrid();
 grid.resize( 0 );
 
- RenderObject *row = firstChild();
- while ( row ) {
-	cRow++;
-	cCol = 0;
-	ensureRows( cRow+1 );
-	RenderObject *cell = row->firstChild();
-	while ( cell ) {
-	 if ( cell->isTableCell() )
-		addCell( static_cast<RenderTableCell *>(cell) );
-	 cell = cell->nextSibling();
-	}
-	row = row->nextSibling();
+ for (RenderObject *row = firstChild(); row; row = row->nextSibling()) {
+ if (row->isTableRow()) {
+ cRow++;
+ cCol = 0;
+ ensureRows( cRow+1 );
+ for (RenderObject *cell = row->firstChild(); cell; cell = cell->nextSibling())
+ if (cell->isTableCell())
+ addCell( static_cast<RenderTableCell *>(cell), static_cast<RenderTableRow *>(row) );
+ }
 }
 needCellRecalc = false;
 setNeedsLayout(true);
@@ -1782,17 +1810,9 @@
 if (needsLayout() || _y < _ty) return SelectionPointBefore;
 // else if (_y >= _ty + height()) save_last = true;
 
- // bluntly taken from paint (LS)
- // check which rows and cols are visible and only paint these
- // ### fixme: could use a binary search here
- int row_idx = (int)totalRows - 1;
- if ( row_idx > 0 ) {
- for ( ; row_idx >= 0; row_idx-- ) {
- if ( _ty + rowPos[row_idx] < _y )
- break;
- }
- if (row_idx < 0) row_idx = 0;
- }
+ // Find the row containing the pointer
+ int row_idx = findRow(0, totalRows, rowPos, _y - _ty);
+
 int col_idx;
 if ( style()->direction() == LTR ) {
 	for ( col_idx = (int)totalCols - 1; col_idx >= 0; col_idx-- ) {
@@ -1908,7 +1928,7 @@
 } else
 cell = static_cast<RenderTableCell *>(child);
 
- static_cast<RenderTableSection *>(parent())->addCell( cell );
+ section()->addCell( cell, this );
 
 RenderContainer::addChild(cell,beforeChild);
 
Index: khtml/rendering/render_box.cpp
===================================================================
--- khtml/rendering/render_box.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/rendering/render_box.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -433,8 +433,10 @@
 if( (bgr == NO_REPEAT || bgr == REPEAT_Y) && pw > pixw ) {
 cw = pixw;
 int xp = bgLayer->backgroundXPosition().minWidth(pw-pixw);
- if ( xp >= 0 )
+ if ( xp >= 0 ) {
 cx = _tx + xp;
+ cw = kMin(cw, pw - xp);
+ }
 else {
 cx = _tx;
 if (pixw > 0) {
@@ -461,8 +463,10 @@
 if( (bgr == NO_REPEAT || bgr == REPEAT_X) && ph > pixh ) {
 ch = pixh;
 int yp = bgLayer->backgroundYPosition().minWidth(ph-pixh);
- if ( yp >= 0 )
+ if ( yp >= 0 ) {
 cy = _ty + yp;
+ ch = kMin(ch, ph - yp);
+ }
 else {
 cy = _ty;
 if (pixh > 0) {
@@ -687,16 +691,12 @@
 Q_ASSERT(p);
 while( p->isInline() && !p->isReplaced() )
 p = p->parent();
- int off = 0;
- if (!p->hasOverflowClip());
- off = p->negativeOverflowWidth();
+ int off = p->hasOverflowClip() ? 0 : p->negativeOverflowWidth();
 p->repaintRectangle( -ow - off, -ow, p->effectiveWidth()+ow*2, p->effectiveHeight()+ow*2, immediate);
 }
 else
 {
- int off = 0;
- if (!hasOverflowClip());
- off = negativeOverflowWidth();
+ int off = hasOverflowClip() ? 0 : negativeOverflowWidth();
 repaintRectangle( -ow - off, -ow, effectiveWidth()+ow*2, effectiveHeight()+ow*2, immediate);
 }
 }
@@ -989,6 +989,18 @@
 return height;
 }
 
+int RenderBox::calcImplicitHeight() const {
+ assert(hasImplicitHeight());
+
+ RenderBlock* cb = containingBlock();
+ // padding-box height
+ int ch = cb->height() - cb->borderTop() + cb->borderBottom();
+ int top = style()->top().width(ch);
+ int bottom = style()->bottom().width(ch);
+
+ return ch - top - bottom;
+}
+
 int RenderBox::calcPercentageHeight(const Length& height, bool treatAsReplaced) const
 {
 int result = -1;
@@ -1028,6 +1040,10 @@
 // IE quirk.
 result = cb->calcPercentageHeight(cb->style()->height(), treatAsReplaced);
 }
+ else if (cb->hasImplicitHeight()) {
+ result = cb->calcImplicitHeight();
+ }
+
 if (result != -1) {
 result = height.width(result);
 if (cb->isTableCell() && style()->boxSizing() != BORDER_BOX) {
@@ -1147,6 +1163,10 @@
 if (h.isPercent())
 return calcContentHeight(h.width(containingBlock()->availableHeight()));
 
+ // Check for implicit height 
+ if (hasImplicitHeight())
+ return calcImplicitHeight();
+
 return containingBlock()->availableHeight();
 }
 
Index: khtml/rendering/render_block.cpp
===================================================================
--- khtml/rendering/render_block.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/rendering/render_block.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -92,7 +92,6 @@
 m_childrenInline = true;
 m_floatingObjects = 0;
 m_positionedObjects = 0;
- m_pre = false;
 m_firstLine = false;
 m_avoidPageBreak = false;
 m_clearStatus = CNONE;
@@ -115,8 +114,6 @@
 
 RenderFlow::setStyle(_style);
 
- m_pre = ( _style->whiteSpace() == PRE );
-
 // ### we could save this call when the change only affected
 // non inherited properties
 RenderObject *child = firstChild();
@@ -136,8 +133,9 @@
 updatePseudoChildren();
 
 // handled by close() during parsing
- if (!document()->parsing())
+ if (!document()->parsing()) {
 updateFirstLetter();
+ }
 }
 
 void RenderBlock::updateFirstLetter()
@@ -176,6 +174,11 @@
 firstLetter->setIsAnonymous( true );
 firstLetterContainer->addChild(firstLetter, firstLetterContainer->firstChild());
 
+ // if this object is the result of a :begin, then the text may have not been
+ // generated yet if it is a counter
+ if (textObj->recalcMinMax())
+ textObj->recalcMinMaxWidths();
+
 // The original string is going to be either a generated content string or a DOM node's
 // string. We want the original string before it got transformed in case first-letter has
 // no text-transform or a different text-transform applied to it.
@@ -187,11 +190,13 @@
 oldText->ref();
 unsigned int length = 0;
 while ( length < oldText->l &&
- ( (oldText->s+length)->isSpace() || (oldText->s+length)->isPunct() ) )
+ ( (oldText->s+length)->isSpace() || (oldText->s+length)->isPunct()) )
 length++;
- if ( length < oldText->l && 
+ if ( length < oldText->l &&
 !( (oldText->s+length)->isSpace() || (oldText->s+length)->isPunct() ))
 length++;
+ while ( length < oldText->l && (oldText->s+length)->isMark() )
+ length++;
 RenderTextFragment* remainingText =
 new (renderArena()) RenderTextFragment(textObj->node(), oldText, length, oldText->l-length);
 remainingText->setIsAnonymous( textObj->isAnonymous() );
@@ -226,17 +231,17 @@
 
 // If the requested beforeChild is not one of our children, then this is most likely because
 // there is an anonymous block box within this object that contains the beforeChild. So
- // just insert the child into the anonymous block box instead of here. This may also be 
+ // just insert the child into the anonymous block box instead of here. This may also be
 // needed in cases of things like anonymous tables.
 if (beforeChild && beforeChild->parent() != this) {
 
 KHTMLAssert(beforeChild->parent());
- 
+
 // In the special case where we are prepending a block-level element before
 // something contained inside an anonymous block, we can just prepend it before
 // the anonymous block.
 if (!newChild->isInline() && beforeChild->parent()->isAnonymousBlock() &&
- beforeChild->parent()->parent() == this && 
+ beforeChild->parent()->parent() == this &&
 beforeChild->parent()->firstChild() == beforeChild)
 return addChildToFlow(newChild, beforeChild->parent());
 
@@ -767,7 +772,7 @@
 int y = m_height;
 if (!marginInfo.canCollapseWithTop()) {
 child->calcVerticalMargins();
- int marginTop = child->marginTop(); 
+ int marginTop = child->marginTop();
 int collapsedTopPos = marginInfo.posMargin();
 int collapsedTopNeg = marginInfo.negMargin();
 if (marginTop > 0) {
@@ -1431,7 +1436,7 @@
 
 m_overflowHeight = kMax(m_height + overflowDelta, m_overflowHeight);
 m_overflowWidth = kMax(rightChildPos, m_overflowWidth);
- 
+
 m_negativeOverflowWidth = kMax(m_negativeOverflowWidth, child->negativeOverflowWidth());
 
 // Insert our compact into the block margin if we have one.
@@ -1561,7 +1566,10 @@
 r->layoutIfNeeded();
 if (adjOverflow && r->style()->position() == ABSOLUTE) {
 if (r->effectiveXPos() + r->effectiveWidth() > m_overflowWidth)
- m_overflowWidth = r->xPos() + r->effectiveWidth();
+ {
+ m_overflowWidth = r->xPos() + r->overflowWidth();
+ m_negativeOverflowWidth = r->negativeOverflowWidth();
+ }
 if (r->yPos() + r->effectiveHeight() > m_overflowHeight)
 m_overflowHeight = r->yPos() + r->effectiveHeight();
 }
@@ -1726,6 +1734,10 @@
 m_positionedObjects->removeRef(it.current());
 ++it;
 }
+ if (m_positionedObjects->isEmpty()) {
+ delete m_positionedObjects;
+ m_positionedObjects = 0;
+ }
 }
 }
 
@@ -1935,7 +1947,7 @@
 {
 int left = fixedOffset;
 if (canClearLine) *canClearLine = true;
- 
+
 if (m_floatingObjects) {
 if ( heightRemaining ) *heightRemaining = 1;
 FloatingObject* r;
@@ -2244,8 +2256,10 @@
 
 int offset = m_y;
 if (parentHasFloats)
+ {
 addOverHangingFloats( static_cast<RenderBlock *>( parent() ),
 parent()->borderLeft() + parent()->paddingLeft(), offset, false );
+ }
 
 int xoffset = 0;
 if (prev) {
@@ -2276,9 +2290,23 @@
 if ( !flow->m_floatingObjects || (child && flow->isRoot()) )
 return;
 
+ // if I am clear of my floats, don't add them
+ // the CSS spec also mentions that child floats
+ // are not cleared.
+ if (!child && style()->clear() == CBOTH)
+ {
+ return;
+ }
+
 QPtrListIterator<FloatingObject> it(*flow->m_floatingObjects);
 FloatingObject *r;
 for ( ; (r = it.current()); ++it ) {
+
+ if (!child && r->type == FloatingObject::FloatLeft && style()->clear() == CLEFT )
+ continue;
+ if (!child && r->type == FloatingObject::FloatRight && style()->clear() == CRIGHT )
+ continue;
+
 if ( ( !child && r->endY > offset ) ||
 ( child && flow->yPos() + r->endY > height() ) ) {
 if (child && !r->crossedLayer) {
@@ -2470,7 +2498,7 @@
 m_minWidth = 0;
 m_maxWidth = 0;
 
- bool preOrNowrap = style()->whiteSpace() != NORMAL;
+ bool noWrap = !style()->autoWrap();
 if (childrenInline())
 calcInlineMinMaxWidth();
 else
@@ -2478,7 +2506,7 @@
 
 if(m_maxWidth < m_minWidth) m_maxWidth = m_minWidth;
 
- if (preOrNowrap && childrenInline()) {
+ if (noWrap && childrenInline()) {
 m_minWidth = m_maxWidth;
 
 // A horizontal marquee with inline children has no minimum width.
@@ -2612,11 +2640,11 @@
 }
 #endif
 
-static void stripTrailingSpace(bool pre,
+static void stripTrailingSpace(bool preserveWS,
 int& inlineMax, int& inlineMin,
 RenderObject* trailingSpaceChild)
 {
- if (!pre && trailingSpaceChild && trailingSpaceChild->isText()) {
+ if (!preserveWS && trailingSpaceChild && trailingSpaceChild->isText()) {
 // Collapse away the trailing space at the end of a block.
 RenderText* t = static_cast<RenderText *>(trailingSpaceChild);
 const Font *f = t->htmlFont( false );
@@ -2643,15 +2671,15 @@
 
 RenderObject* trailingSpaceChild = 0;
 
- bool normal, oldnormal;
- normal = oldnormal = style()->whiteSpace() == NORMAL;
+ bool autoWrap, oldAutoWrap;
+ autoWrap = oldAutoWrap = style()->autoWrap();
 
 InlineMinMaxIterator childIterator(this, this);
 bool addedTextIndent = false; // Only gets added in once.
 RenderObject* prevFloat = 0;
 while (RenderObject* child = childIterator.next())
 {
- normal = child->style()->whiteSpace() == NORMAL;
+ autoWrap = child->style()->autoWrap();
 
 if( !child->isBR() )
 {
@@ -2729,7 +2757,7 @@
 childMin += child->minWidth();
 childMax += child->maxWidth();
 
- if (!qBreak && (normal || oldnormal)) {
+ if (!qBreak && (autoWrap || oldAutoWrap)) {
 if(m_minWidth < inlineMin) m_minWidth = inlineMin;
 inlineMin = 0;
 }
@@ -2758,7 +2786,7 @@
 // Add our width to the max.
 inlineMax += childMax;
 
- if (!normal||qBreak)
+ if (!autoWrap||qBreak)
 inlineMin += childMin;
 else {
 // Now check our line.
@@ -2864,10 +2892,10 @@
 trailingSpaceChild = 0;
 }
 
- oldnormal = normal;
+ oldAutoWrap = autoWrap;
 }
 
- stripTrailingSpace(m_pre, inlineMax, inlineMin, trailingSpaceChild);
+ stripTrailingSpace(style()->preserveWS(), inlineMax, inlineMin, trailingSpaceChild);
 
 if(m_minWidth < inlineMin) m_minWidth = inlineMin;
 if(m_maxWidth < inlineMax) m_maxWidth = inlineMax;
@@ -2880,7 +2908,7 @@
 
 void RenderBlock::calcBlockMinMaxWidth()
 {
- bool nowrap = style()->whiteSpace() == NOWRAP;
+ bool nowrap = !style()->autoWrap();
 
 RenderObject *child = firstChild();
 RenderObject* prevFloat = 0;
@@ -3071,7 +3099,8 @@
 RenderFlow::dump(stream,ind);
 
 if (m_childrenInline) { stream << " childrenInline"; }
- if (m_pre) { stream << " pre"; }
+ // FIXME: currently only print pre to not mess up regression
+ if (style()->preserveWS()) { stream << " pre"; }
 if (m_firstLine) { stream << " firstLine"; }
 
 if (m_floatingObjects && !m_floatingObjects->isEmpty())
Index: khtml/dom/dom_string.h
===================================================================
--- khtml/dom/dom_string.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/dom/dom_string.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -119,7 +119,7 @@
 };
 
 #ifndef NDEBUG
-inline kdbgstream &operator<<(kdbgstream &stream, const DOMString &string) { 
+inline kdbgstream &operator<<(kdbgstream &stream, const DOMString &string) {
 	return (stream << string.string());
 }
 #else
Index: khtml/dom/html_form.h
===================================================================
--- khtml/dom/html_form.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/dom/html_form.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -466,6 +466,16 @@
 void setChecked( bool );
 
 /**
+ * Describes whether a radio box is indeterminate
+ */
+ bool indeterminate() const;
+
+ /**
+ * see indeterminate
+ */
+ void setIndeterminate( bool );
+
+ /**
 * The control is unavailable in this context. See the <a
 * href="http://www.w3.org/TR/REC-html40/interact/forms.html#adef-disabled">
 * disabled attribute definition </a> in HTML 4.0.
Index: khtml/dom/dom_string.cpp
===================================================================
--- khtml/dom/dom_string.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/dom/dom_string.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -196,14 +196,14 @@
 QChar *DOMString::unicode() const
 {
 if(!impl) return 0;
- return impl->s;
+ return impl->unicode();
 }
 
 QString DOMString::string() const
 {
 if(!impl) return QString::null;
 
- return QString(impl->s, impl->l);
+ return impl->string();
 }
 
 int DOMString::toInt() const
@@ -296,6 +296,5 @@
 }
 }
 
- return !*b; 
+ return !*b;
 }
-
Index: khtml/dom/html_form.cpp
===================================================================
--- khtml/dom/html_form.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/dom/html_form.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -412,6 +412,18 @@
 	((HTMLInputElementImpl*)impl)->setChecked(_checked);
 }
 
+bool HTMLInputElement::indeterminate() const
+{
+ if(!impl) return 0;
+ return ((HTMLInputElementImpl*)impl)->indeterminate();
+}
+
+void HTMLInputElement::setIndeterminate( bool _indeterminate )
+{
+ if(impl)
+	((HTMLInputElementImpl*)impl)->setIndeterminate(_indeterminate);
+}
+
 bool HTMLInputElement::disabled() const
 {
 if(!impl) return 0;
Index: khtml/java/kjavaappletviewer.desktop
===================================================================
--- khtml/java/kjavaappletviewer.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/java/kjavaappletviewer.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -63,6 +63,7 @@
 Name[tt]=Java Applet öçen Quşılma-Kürsätkeç
 Name[uk]=Вмонтований переглядач аплетів Java
 Name[uz]=Ички Java апплетини кўрувчи
+Name[vi]=Bộ xem tiểu dụng Java nhúng
 Name[wa]=Ravalé håyneu d' apliketes Java
 Name[zh_CN]=嵌入的 Java 小程序查看器
 Name[zh_TW]=Embedded Java Applet 檢視器
Index: khtml/ChangeLog
===================================================================
--- khtml/ChangeLog	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/ChangeLog	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -1,3 +1,53 @@
+2006-04-20 Allan Sandfeld Jensen <kde@carewolf.com>
+
+ Implement full support for CSS updates on dynamic DOM and user-interaction
+
+ * misc/multimap.h: NEW: A "fast on insert" map with multiple values per key
+ * xml/dom_restyler.{h,cpp}: NEW: The dynamic DOM restyler keeps track of changes and issues restyles
+ * xml/dom_docimpl.h:
+ Remove obsolete usesDescendencyRules.
+ Add a dynamicDomRestyler to the document.
+ * xml/dom_nodeimpl.{h,cpp}: Add dynamic DOM restyler hooks.
+ * xml/dom_elementimpl.{h,cpp}:
+ Remove obsolete usesDescendencyRules logic.
+ Remove obsolete laterestyle logic.
+ Implement DOM restyler hooks.
+ * css/cssstyleselector.{h,cpp}:
+ Clean-up checkSelector, removing obsolete and redundant arguments
+ Fix :link and :visited selector.
+ Setup all dynamic dependencies in checkOneSelector.
+ * css/cssparser.{h,cpp}: Remove defaultNamespace
+ * css/css_stylesheetimpl.{h,cpp}: Add defaultNamespace
+ * css/parser.{y,cpp}:
+ Remove calls to usesDescendencyRules.
+ Use defaultNamespace from stylesheet rather than parser.
+ * rendering/render_style.h: Remove obsolete affectedByHoverRules and affectedByActiveRules
+ * rendering/render_layer.cpp: Use dynamic DOM restyler to restyle :hover and :active nodes.
+ * html/html_formimpl.cpp: Call dynamic restyler for changes to disabled state
+
+2006-04-09 Allan Sandfeld Jensen <kde@carewolf.com>
+
+ Distinguish between having no determined namespace, and determined to have no namespace
+
+ * xml/dom_nodeimpl.h: Split noNamespace into defaultNamespace and emptyNamespace
+ * css/cssstyleselector.cpp: Change HTML-hack to only trigger on undetermined namespace.
+
+2006-04-04 Allan Sandfeld Jensen <kde@carewolf.com>
+
+ Make so-called nondeterministic CSS matching work
+
+ * css/cssstyleselector.{h,cpp} (checkSubSelector/checkOneSelector):
+ Extract combinator matching from checkSelector and make it a recursive function. Clean-up checkOneSelector.
+
+2006-03-25 Germain Garand <germain@ebooksfrance.org>
+
+ Scope: fix handling of nested/external scripts in the tokenizer (#91701)
+
+ * misc/stringit.h (TokenizerQueue): a LIFO stack of TokenizerStrings
+ * html/htmltokenizer.{h,cpp} (scriptHandler/write/notifyFinished): use a TokenizerQueue to store
+ postponed fragments while executing/loading scripts.
+ (fixUpChar): unrelated - fill in missing unicode replacements.
+
 2006-03-20 Dirk Mueller <mueller@kde.org>
 
 	* misc/loader.cpp: fix pixmap leak in tiled_pixmap()
@@ -2,20 +52,27 @@
 
+2006-03-20 Allan Sandfeld Jensen <kde@carewolf.com>
+
+ Improve the CSS :lang() selector to match clarified specification
+
+ * khtml_part.cpp: parse HTTP content-language
+ * xml/dom_docimpl.cpp: parse HTTP-EQUIV content-language
+ * css/cssstyleselector.cpp: match :lang() against parents and ultimately the document
+
 2006-03-07 Germain Garand <germain@ebooksfrance.org>
 
 Scope: relayout/repaint/widget masks fixes. Refine stacking context exploration. Optimise.
 
- * khtmlview.cpp (reset/timerEvent): remove obsolete code checking validity of visible widgets list.
- (drawContents): use widget geometry rather than the RenderWidget's rect (fixes widget borders not being updated)
+ * khtmlview.cpp (drawContents): use widget geometry rather than the RenderWidget's rect (fixes widget borders not being updated)
 Check if widget is in the dirty rect before doing any work.
 
 * rendering/render_block.cpp (layoutBlockChildren): I meant !child->isPositioned() here, not isPositioned(). No need to
- dirty positioned children as this is handled by the containing block chain through layoutPositionedObjects 
+ dirty positioned children as this is handled by the containing block chain through layoutPositionedObjects
 (layoutPositionedObjects): always relayout fixed objects.
 
 * rendering/render_canvas.cpp (layout): check canvas dimensions and call layoutBlock directly with relayoutChildren boolean.
- 
- * rendering/render_layer.{h,cpp} (paintedRegion): constrain our shape to the visibleRect. Use convertToLayerCoords to get a correct 
- visibleFlowRegion (updateWidgetMasks): don't forget to update the mask if it reverts to none at all. 
 
- * rendering/render_object.{h,cpp} (containingBlock): for relpos inlines, return the nearest block (skipping to next containingBlock gives 
+ * rendering/render_layer.{h,cpp} (paintedRegion): constrain our shape to the visibleRect. Use convertToLayerCoords to get a correct
+ visibleFlowRegion (updateWidgetMasks): don't forget to update the mask if it reverts to none at all.
+
+ * rendering/render_object.{h,cpp} (containingBlock): for relpos inlines, return the nearest block (skipping to next containingBlock gives
 stalled layout flags problems - #121653). (updateWidgetMasks): mask the content box, not the border box.
@@ -31,7 +88,7 @@
 	* link not accessable with negative text-indent (#96275)
 	* Wrong :hover effect with negative text-indent (#90510)
 	* text not selectable if it has a negative text-indent
-	
+
 2006-03-05 Charles Samuels <charles@kde.org>
 * javascript timeouts that cross a midnight boundary shall not occur early
 
@@ -39,7 +96,7 @@
 
 get iframes, objects and some other overlaid widgets to obey their stacking context (#31121)
 
- * khtmlview.cpp: mask widgets more precisely (i.e. allow layers to paint over overlaid widgets, 
+ * khtmlview.cpp: mask widgets more precisely (i.e. allow layers to paint over overlaid widgets,
 when they ought to).
 
 * rendering/render_canvas.{cpp,h}: update widget masks after pos child layout/positioning;
@@ -49,7 +106,7 @@
 childs. We'll apply that mask later to widgets that are under our aegis.
 
 * rendering/render_object.{cpp,h} (visibleFlowRegion): helper for calculation of broad region we want to mask in flows.
- (updateWidgetMasks): walk our children looking for widgets suitable to masking. Apply our enclosingLayer's mask, 
+ (updateWidgetMasks): walk our children looking for widgets suitable to masking. Apply our enclosingLayer's mask,
 transformis transformandi.
 
 * rendering/render_replaced.cpp: overlaid widgets must advertise their existence to the enclosing layer.
@@ -64,22 +121,21 @@
 * css/css_ruleimpl.cpp (selectorText): handle of multiple, comma-separated selectors
 
 2006-02-28 Germain Garand <germain@ebooksfrance.org>
- 
+
 Common-case style selection optimisation inspired from WebCore.
 
 * css/css_base.cpp/.h: add 'Class' to possible matching modes
 * css/cssstyleselector.cpp: treat 'Class' extra, not anymore as an ordinary List.
- * css/parser.cpp/y: use 'Class' matching mode 
+ * css/parser.cpp/y: use 'Class' matching mode
 * html/html_elementimpl.cpp: when parsing ATTR_CLASS, set a boolean to remember if it is or not a class list.
 * xml/dom_elementimpl.{cpp,h}: add m_hasClassList boolean + setter/getter
 
 2006-02-28 Germain Garand <germain@ebooksfrance.org>
 
- * rendering/render_object.cpp (dirtyFormattingContext): be more efficient with inlineflow objects.
- * rendering/render_block.cpp (layoutBlockChildren): be more efficient with regard to positioned objects relayout. 
- Merge WC margin-collapse regression fix (WC/#3508). 
+ * rendering/render_block.cpp (layoutBlockChildren): be more efficient with regard to positioned objects relayout.
+ Merge WC margin-collapse regression fix (WC/#3508).
 (layoutPositionedObjects) Objects with staticX() need a relayout too.
- * rendering/render_canvas.cpp (layout): no need to relayout positioned objects here. This would mark entire branches of the tree 
+ * rendering/render_canvas.cpp (layout): no need to relayout positioned objects here. This would mark entire branches of the tree
 as needing a layout, thus stalling update requests in those branches (#116626)
 
 2006-01-14 Allan Sandfeld Jensen <kde@carewolf.com>
Index: khtml/css/html4.css
===================================================================
--- khtml/css/html4.css	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/css/html4.css	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -84,25 +84,25 @@
 margin: 1__qem 40px 1em 40px;
 }
 
-Q {
+q {
 display: inline;
 }
 
-Q:before {
+q:before {
 content: open-quote;
 }
 
-Q:after {
+q:after {
 content: close-quote;
 }
 
-CENTER {
+center {
 	display: block;
 	/* special centering to be able to emulate the html4/netscape behavior */
 	text-align: -khtml-center;
 }
 
-HR {
+hr {
 display: block;
 margin: 12px auto;
 border-style: inset;
@@ -110,53 +110,53 @@
 -khtml-flow-mode: -khtml-around-floats
 }
 
-MAP {
+map {
 	display: inline;
 }
 
 /*
 * heading elements
- * margin values rely on font-sizes ratio defined in CSS-2.1 15.7
- * (cf. CSSStyleSelector for absolute font-sizes computation)
- * We have an 1.1/font-ratio margin
+ * margin values rely on font-sizes ratio defined in css-2.1 15.7
+ * (cf. cssstyleselector for absolute font-sizes computation)
+ * we have an 1.1/font-ratio margin
 */
 
-H1 {
+h1 {
 	display: block;
 	font-size: xx-large;
 	margin: .55__qem 0 .55em 0;
 	font-weight: bolder;
 }
 
-H2 {
+h2 {
 	display: block;
 	font-size: x-large;
 	margin: .73__qem 0 .73em 0;
 	font-weight: bolder;
 }
 
-H3 {
+h3 {
 	display: block;
 	font-size: large;
 	margin: 0.92__qem 0 0.92em 0;
 	font-weight: bolder;
 }
 
-H4 {
+h4 {
 	display: block;
 font-size: medium;
 	margin: 1.1__qem 0 1.1em 0;
 	font-weight: bolder;
 }
 
-H5 {
+h5 {
 	display: block;
 	font-size: small;
 	margin: 1.24__qem 0 1.24em 0;
 	font-weight: bolder;
 }
 
-H6 {
+h6 {
 	display: block;
 	font-size: xx-small;
 	margin: 1.83__qem 0 1.83em 0;
@@ -167,7 +167,7 @@
 * tables
 */
 
-TABLE {
+table {
 	display: table;
 	border-collapse: separate;
 	text-align: -khtml-auto;
@@ -176,142 +176,131 @@
 box-sizing: border-box;
 }
 
-TABLE[align="center"] {
+table[align="center"] {
 	margin-left: auto;
 	margin-right: auto;
 }
 
-TABLE[align="left"] {
+table[align="left"] {
 	float: -khtml-left;
 }
 
-TABLE[align="right"] {
+table[align="right"] {
 	float: -khtml-right;
 }
 
-THEAD {
+thead {
 	display: table-header-group;
 border-color: inherit;
 	vertical-align: middle;
 }
 
-TBODY {
+tbody {
 	display: table-row-group;
 border-color: inherit;
 	vertical-align: middle;
 }
 
-TFOOT {
+tfoot {
 	display: table-footer-group;
 border-color: inherit;
 	vertical-align: middle;
 }
 
-COL {
+col {
 	display: table-column;
 }
 
-COLGROUP {
+colgroup {
 	display: table-column-group;
 }
 
-TR {
+tr {
 	display: table-row;
 	vertical-align: inherit;
 border-color: inherit;
 }
 
 
-TD, TH {
+td, th {
 	display: table-cell;
 	vertical-align: inherit;
 }
 
-TH {
+th {
 	font-weight: bolder;
 }
 
-CAPTION {
+caption {
 	display: table-caption;
 	text-align: -khtml-center;
 }
 
 /*
- * Lists
+ * lists
 */
 
-UL, MENU, DIR {
+ul, menu, dir {
 display: block;
 list-style-type: disc;
 margin: 1__qem 0 1em 0;
 -khtml-padding-start: 40px
 }
 
-OL {
+ol {
 display: block;
 list-style-type: decimal;
 margin: 1__qem 0 1em 0;
 -khtml-padding-start: 40px
 }
 
-LI {
+li {
 display: list-item;
 -khtml-flow-mode: -khtml-around-floats;
 }
 
 
-UL UL, OL UL {
+ul ul, ol ul {
 	list-style-type: circle;
 }
 
-OL OL UL, OL UL UL, UL OL UL, UL UL UL {
+ol ol ul, ol ul ul, ul ol ul, ul ul ul {
 	list-style-type: square;
 }
 
 
-DD {
+dd {
 	display: block;
 	-khtml-margin-start: 40px;
 }
 
-DL {
+dl {
 	display: block;
 margin: 1__qem 0 1em 0;
 }
 
-DT {
+dt {
 	display: block;
 }
 
-DL[compact] > DT {
+dl[compact] > dt {
 	display: compact;
 }
 
-/* for right to left */
-
-*[dir="rtl"] UL,
-*[dir="rtl"] OL,
-*[dir="rtl"] DIR,
-*[dir="rtl"] MENU,
-*[dir="rtl"] DD {
-	margin-right:40px;
-	margin-left: auto;
-}
-
-OL UL,
-UL OL,
-UL UL,
-OL OL {
+ol ul,
+ul ol,
+ul ul,
+ol ol {
 	margin-top: auto;
 	margin-bottom: auto;
 }
 
-LI > P {
+li > p {
 	margin-top: auto;
 /*	margin-bottom: auto;*/
 }
 
-LI > DIV {
+li > div {
 	margin-top: auto;
 /*	margin-bottom: auto;*/
 }
@@ -320,12 +309,12 @@
 * form elements
 */
 
-FORM {
+form {
 	display: block;
 margin: 0__qem 0 1em 0;
 }
 
-LEGEND {
+legend {
 display: block;
 padding-left: 2px;
 padding-right: 2px;
@@ -333,76 +322,76 @@
 margin: 0;
 }
 
-FIELDSET {
+fieldset {
 	display: block;
 padding: 0.75em 0.625em;
 	margin: 1.0em 0;
- border: 2px groove ThreeDFace;
+ border: 2px groove threedface;
 -khtml-flow-mode: -khtml-around-floats
 }
 
-BUTTON {
+button {
 display: inline-block;
- border: 2px outset ButtonFace;
- background-color: ButtonFace;
- color: ButtonText;
+ border: 2px outset buttonface;
+ background-color: buttonface;
+ color: buttontext;
 padding: 2px 2px 2px 2px;
 cursor: default;
 }
 
-BUTTON:active {
+button:active {
 border-style: inset;
 }
 
-INPUT, TEXTAREA {
+input, textarea {
 text-align: -khtml-auto;
 }
 
-INPUT, TEXTAREA, SELECT, BUTTON {
+input, textarea, select, button {
 font-weight: normal;
 margin: 0__qem;
 }
 
-INPUT { color: windowtext;
+input { color: windowtext;
 font-family: sans-serif;
 font-size: small;
 border: 2px -khtml-native;
 }
 
-INPUT[type="hidden"] {
+input[type="hidden"] {
 	display: none;
 }
 
-INPUT[type="radio"], INPUT[type="checkbox"] {
+input[type="radio"], input[type="checkbox"] {
 margin: 0 0.5ex;
 color: buttontext;
 }
 
-INPUT[type="text"], INPUT[type="password"] {
+input[type="text"], input[type="password"] {
 	cursor: text;
 }
 
-INPUT[type="submit"], INPUT[type="reset"], INPUT[type="button"] {
+input[type="submit"], input[type="reset"], input[type="button"] {
 color: buttontext;
 }
 
-ISINDEX { color: windowtext; font-size: small; }
+isindex { color: windowtext; font-size: small; }
 
 
-OPTION,
-OPTGROUP,
-AREA,
-PARAM {
+option,
+optgroup,
+area,
+param {
 	display: none;
 }
 
-SELECT {
+select {
 font-family: sans-serif;
 font-size: small;
 color: windowtext;
 }
 
-TEXTAREA {
+textarea {
 color: windowtext;
 font-family: monospace;
 border: 2px -khtml-native;
@@ -412,64 +401,64 @@
 * inline elements
 */
 
-U,
-INS {
+u,
+ins {
 	text-decoration: underline;
 }
 
-STRONG,
-B {
+strong,
+b {
 	font-weight: bolder;
 }
 
-I,
-CITE,
-EM,
-VAR,
-ADDRESS {
+i,
+cite,
+em,
+var,
+address {
 	font-style: italic;
 }
 
-TT,
-CODE,
-KBD,
-SAMP {
+tt,
+code,
+kbd,
+samp {
 	font-family: monospace;
 }
 
-PRE,
-XMP,
-PLAINTEXT {
+pre,
+xmp,
+plaintext {
 	display: block;
 	font-family: monospace;
 	white-space: pre;
 	margin: 1__qem 0;
 }
 
-BIG {
+big {
 	font-size: larger;
 }
 
-SMALL {
+small {
 	font-size: smaller;
 }
 
-S,
-STRIKE,
-DEL {
+s,
+strike,
+del {
 	text-decoration: line-through;
 }
 
-SUB {
+sub {
 	vertical-align: sub;
 	font-size: smaller;
 }
-SUP {
+sup {
 	vertical-align: super;
 	font-size: smaller;
 }
 
-ABBR, ACRONYM {
+abbr, acronym {
 	font-variant: small-caps;
 	letter-spacing: 0.1em
 }
@@ -482,43 +471,43 @@
 a:link:active { color: red; outline: 1px dotted invert; }
 a:visited:active { color: red; outline: 1px dotted invert; }
 
-/* With the current design it is too expensive to set this default via CSS
+/* with the current design it is too expensive to set this default via css
 :before,:after { white-space: pre-line }
 */
 
-/* ### use this to replace renderBR
- BR:before { content: "\n" }
+/* ### use this to replace renderbr
+ br:before { content: "\n" }
 */
 
 
-/* Bidirectionality settings (do not change) */
+/* bidirectionality settings (do not change) */
 
-BDO[DIR="ltr"] {
+bdo[dir="ltr"] {
 	direction: ltr;
 	unicode-bidi: bidi-override;
 }
 
-BDO[DIR="rtl"] {
+bdo[dir="rtl"] {
 	direction: rtl;
 	unicode-bidi: bidi-override;
 }
 
 /* ### this selector seems to be still broken ...
- *[DIR="ltr"] { direction: ltr; unicode-bidi: embed }
- *[DIR="rtl"] { direction: rtl; unicode-bidi: embed }
+ *[dir="ltr"] { direction: ltr; unicode-bidi: embed }
+ *[dir="rtl"] { direction: rtl; unicode-bidi: embed }
 */
 
-/* Elements that are block-level in HTML4 */
+/* elements that are block-level in html4 */
 /* ### don't support unicode-bidi at the moment
- ADDRESS, BLOCKQUOTE, BODY, DD, DIV, DL, DT, FIELDSET,
- FORM, FRAME, FRAMESET, H1, H2, H3, H4, H5, H6, IFRAME,
- NOSCRIPT, NOFRAMES, OBJECT, OL, P, UL, APPLET, CENTER,
- DIR, HR, MENU, PRE, LI, TABLE, TR, THEAD, TBODY, TFOOT,
- COL, COLGROUP, TD, TH, CAPTION
+ address, blockquote, body, dd, div, dl, dt, fieldset,
+ form, frame, frameset, h1, h2, h3, h4, h5, h6, iframe,
+ noscript, noframes, object, ol, p, ul, applet, center,
+ dir, hr, menu, pre, li, table, tr, thead, tbody, tfoot,
+ col, colgroup, td, th, caption
 { unicode-bidi: embed }
 */
 
-/* End bidi settings */
+/* end bidi settings */
 
 /*
 * other elements
Index: khtml/css/parser.h
===================================================================
--- khtml/css/parser.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/css/parser.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 1.875a. */
+/* A Bison parser, made by GNU Bison 1.875d. */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -15,8 +15,8 @@
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
 
 /* As a special exception, when this file is copied by Bison into a
 Bison output file, you may use that output file without restriction.
@@ -148,7 +148,7 @@
 Value value;
 ValueList *valueList;
 } YYSTYPE;
-/* Line 1240 of yacc.c. */
+/* Line 1285 of yacc.c. */
 
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
Index: khtml/css/cssparser.cpp
===================================================================
--- khtml/css/cssparser.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/css/cssparser.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -110,8 +110,6 @@
 nonCSSHint = false;
 inParseShortHand = false;
 
- defaultNamespace = anyNamespace;
-
 yy_start = 1;
 
 #if YYDEBUG > 0
@@ -136,6 +134,14 @@
 
 }
 
+unsigned int CSSParser::defaultNamespace()
+{
+ if (styleElement && styleElement->isCSSStyleSheet())
+ return static_cast<CSSStyleSheetImpl*>(styleElement)->defaultNamespace();
+ else
+ return anyNamespace;
+}
+
 void CSSParser::runParser(int length)
 {
 data[length-1] = 0;
@@ -158,7 +164,6 @@
 void CSSParser::parseSheet( CSSStyleSheetImpl *sheet, const DOMString &string )
 {
 styleElement = sheet;
- defaultNamespace = anyNamespace; // Reset the default namespace.
 
 int length = string.length() + 3;
 data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
@@ -490,7 +495,8 @@
 }
 if (is_valid)
 parsedValue = quotes;
- //valueList->next();
+ else
+ delete quotes;
 }
 break;
 
@@ -2094,6 +2100,8 @@
 blur = val;
 allowBlur = false;
 }
+	else
+	 delete val;
 }
 
 void commitColor(CSSPrimitiveValueImpl* val) {
@@ -2147,19 +2155,18 @@
 CSSPrimitiveValueImpl* parsedColor = 0;
 bool isColor = (val->id >= CSS_VAL_AQUA && val->id <= CSS_VAL_WINDOWTEXT || val->id == CSS_VAL_MENU ||
 (val->id >= CSS_VAL_GREY && val->id <= CSS_VAL__KHTML_TEXT && !strict));
- if (isColor) {
- if (!context.allowColor)
- return context.failed();
- parsedColor = new CSSPrimitiveValueImpl(val->id);
- }
+	 if (!context.allowColor)
+ return context.failed();
+ 
+ if (isColor)
+ parsedColor = new CSSPrimitiveValueImpl(val->id);
 
 if (!parsedColor)
 // It's not built-in. Try to parse it as a color.
 parsedColor = parseColorFromValue(val);
 
- if (!parsedColor || !context.allowColor)
- return context.failed(); // This value is not a color or length and is invalid or
- // it is a color, but a color isn't allowed at this point.
+ if (!parsedColor)
+ return context.failed();
 
 context.commitColor(parsedColor);
 }
Index: khtml/css/cssstyleselector.h
===================================================================
--- khtml/css/cssstyleselector.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/css/cssstyleselector.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -126,7 +126,7 @@
 KDE_EXPORT static void clear();
 static void reparseConfiguration();
 
-	static void loadDefaultStyle(const KHTMLSettings *s = 0);
+	static void loadDefaultStyle(const KHTMLSettings *s, DOM::DocumentImpl *doc);
 
 	RenderStyle *styleForElement(DOM::ElementImpl *e);
 
@@ -143,13 +143,16 @@
 void computeFontSizes(QPaintDeviceMetrics* paintDeviceMetrics, int zoomFactor);
 	void computeFontSizesFor(QPaintDeviceMetrics* paintDeviceMetrics, int zoomFactor, QValueVector<int>& fontSizes, bool isFixed);
 
+	static void precomputeAttributeDependencies(DOM::DocumentImpl* doc, DOM::CSSSelector* sel);
 protected:
 
+	DOM::NodeImpl* checkSubSelectors(DOM::CSSSelector *sel, DOM::NodeImpl *n, bool isAncestor);
+
 	/* checks if the complete selector (which can be build up from a few CSSSelector's
 	 with given relationships matches the given Element */
 	void checkSelector(int selector, DOM::ElementImpl *e);
 	/* checks if the selector matches the given Element */
-	bool checkOneSelector(DOM::CSSSelector *selector, DOM::ElementImpl *e, bool isSubSelector = false);
+	bool checkOneSelector(DOM::CSSSelector *selector, DOM::ElementImpl *e, bool isAncestor);
 
 #ifdef APPLE_CHANGES
 	/* This function fixes up the default font size if it detects that the
@@ -184,7 +187,7 @@
 public:
 
 private:
- void init(const KHTMLSettings* settings);
+ void init(const KHTMLSettings* settings, DOM::DocumentImpl* doc);
 
 void mapBackgroundAttachment(BackgroundLayer* layer, DOM::CSSValueImpl* value);
 void mapBackgroundImage(BackgroundLayer* layer, DOM::CSSValueImpl* value);
Index: khtml/css/parser.y
===================================================================
--- khtml/css/parser.y	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/css/parser.y	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -30,6 +30,7 @@
 
 #include <dom/dom_string.h>
 #include <xml/dom_docimpl.h>
+#include <css/cssstyleselector.h>
 #include <css/css_ruleimpl.h>
 #include <css/css_stylesheetimpl.h>
 #include <css/css_valueimpl.h>
@@ -76,7 +77,7 @@
 
 
 #define YYDEBUG 0
-#define YYMAXDEPTH 0
+#undef YYMAXDEPTH
 #define YYPARSE_PARAM parser
 %}
 
@@ -252,7 +253,7 @@
 %%
 
 stylesheet:
- maybe_charset maybe_sgml import_list maybe_namespace rule_list
+ maybe_charset maybe_sgml import_list namespace_list rule_list
 | khtml_rule maybe_space
 | khtml_decls maybe_space
 | khtml_value maybe_space
@@ -349,9 +350,9 @@
 }
 ;
 
-maybe_namespace
- : /* empty */ %prec UNIMPORTANT_TOK
- | namespace maybe_sgml
+namespace_list:
+ /* empty */ %prec UNIMPORTANT_TOK
+ | namespace_list namespace maybe_sgml
 ;
 
 namespace:
@@ -530,6 +531,7 @@
 	 $1->print();
 #endif
 	 $$->append( $1 );
+	 khtml::CSSStyleSelector::precomputeAttributeDependencies(static_cast<CSSParser *>(parser)->document(), $1);
 	} else {
 	 $$ = 0;
 	}
@@ -538,6 +540,7 @@
 	if ( $1 && $4 ) {
 	 $$ = $1;
 	 $$->append( $4 );
+	 khtml::CSSStyleSelector::precomputeAttributeDependencies(static_cast<CSSParser *>(parser)->document(), $4);
 #ifdef CSS_DEBUG
 	 kdDebug( 6080 ) << " got simple selector:" << endl;
 	 $4->print();
@@ -570,13 +573,6 @@
 		end = end->tagHistory;
 	 end->relation = $2;
 	 end->tagHistory = $1;
-	 if ( $2 == CSSSelector::Descendant ||
-		 $2 == CSSSelector::Child ) {
-		CSSParser *p = static_cast<CSSParser *>(parser);
-		DOM::DocumentImpl *doc = p->document();
-		if ( doc )
-		 doc->setUsesDescendantRules(true);
-	 }
 	}
 }
 | selector error {
@@ -604,7 +600,7 @@
 | specifier_list maybe_space {
 	$$ = $1;
 if ( $$ )
- $$->tag = makeId(static_cast<CSSParser*>(parser)->defaultNamespace, anyLocalName);;
+ $$->tag = makeId(static_cast<CSSParser*>(parser)->defaultNamespace(), anyLocalName);
 }
 | namespace_selector element_name maybe_space {
 $$ = new CSSSelector();
@@ -642,16 +638,16 @@
 	 if (doc->isHTMLDocument())
 		tag = tag.lower();
 	 const DOMString dtag(tag);
- $$ = makeId(p->defaultNamespace, doc->getId(NodeImpl::ElementId, dtag.implementation(), false, true));
+ $$ = makeId(p->defaultNamespace(), doc->getId(NodeImpl::ElementId, dtag.implementation(), false, true));
 	} else {
-	 $$ = makeId(p->defaultNamespace, khtml::getTagID(tag.lower().ascii(), tag.length()));
+	 $$ = makeId(p->defaultNamespace(), khtml::getTagID(tag.lower().ascii(), tag.length()));
 	 // this case should never happen - only when loading
 	 // the default stylesheet - which must not contain unknown tags
 // 	 assert($$ != 0);
 	}
 }
 | '*' {
-	$$ = makeId(static_cast<CSSParser*>(parser)->defaultNamespace, anyLocalName);
+	$$ = makeId(static_cast<CSSParser*>(parser)->defaultNamespace(), anyLocalName);
 }
 ;
 
@@ -733,19 +729,19 @@
 	$$->match = $4;
 	$$->value = domString($6);
 }
- | '[' maybe_space namespace_selector '|' attrib_id ']' {
+ | '[' maybe_space namespace_selector attrib_id ']' {
 $$ = new CSSSelector();
- $$->attr = $5;
+ $$->attr = $4;
 $$->match = CSSSelector::Set;
 CSSParser *p = static_cast<CSSParser *>(parser);
 if (p->styleElement && p->styleElement->isCSSStyleSheet())
 static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace($$->attr, domString($3));
 }
- | '[' maybe_space namespace_selector '|' attrib_id match maybe_space ident_or_string maybe_space ']' {
+ | '[' maybe_space namespace_selector attrib_id match maybe_space ident_or_string maybe_space ']' {
 $$ = new CSSSelector();
- $$->attr = $5;
- $$->match = (CSSSelector::Match)$6;
- $$->value = domString($8);
+ $$->attr = $4;
+ $$->match = (CSSSelector::Match)$5;
+ $$->value = domString($7);
 CSSParser *p = static_cast<CSSParser *>(parser);
 if (p->styleElement && p->styleElement->isCSSStyleSheet())
 static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace($$->attr, domString($3));
Index: khtml/css/css_stylesheetimpl.h
===================================================================
--- khtml/css/css_stylesheetimpl.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/css/css_stylesheetimpl.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -102,6 +102,7 @@
 
 void addNamespace(CSSParser* p, const DOM::DOMString& prefix, const DOM::DOMString& uri);
 void determineNamespace(Q_UINT32& id, const DOM::DOMString& prefix);
+ Q_UINT32 defaultNamespace() { return m_defaultNamespace; };
 
 virtual bool parseString( const DOMString &string, bool strict = true );
 
@@ -119,6 +120,7 @@
 protected:
 DocumentImpl *m_doc;
 bool m_implicit;
+ Q_UINT32 m_defaultNamespace;
 CSSNamespace* m_namespaces;
 };
 
Index: khtml/css/parser.cpp
===================================================================
--- khtml/css/parser.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/css/parser.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 1.875a. */
+/* A Bison parser, made by GNU Bison 1.875d. */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -15,8 +15,8 @@
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
 
 /* As a special exception, when this file is copied by Bison into a
 Bison output file, you may use that output file without restriction.
@@ -192,6 +192,7 @@
 
 #include <dom/dom_string.h>
 #include <xml/dom_docimpl.h>
+#include <css/cssstyleselector.h>
 #include <css/css_ruleimpl.h>
 #include <css/css_stylesheetimpl.h>
 #include <css/css_valueimpl.h>
@@ -238,7 +239,7 @@
 
 
 #define YYDEBUG 0
-#define YYMAXDEPTH 0
+#undef YYMAXDEPTH
 #define YYPARSE_PARAM parser
 
 
@@ -314,18 +315,25 @@
 
 #if ! defined (yyoverflow) || YYERROR_VERBOSE
 
+# ifndef YYFREE
+# define YYFREE free
+# endif
+# ifndef YYMALLOC
+# define YYMALLOC malloc
+# endif
+
 /* The parser invokes alloca or malloc; define the necessary symbols. */
 
-# if YYSTACK_USE_ALLOCA
-# define YYSTACK_ALLOC alloca
+# ifdef YYSTACK_USE_ALLOCA
+# if YYSTACK_USE_ALLOCA
+# define YYSTACK_ALLOC alloca
+# endif
 # else
-# ifndef YYSTACK_USE_ALLOCA
-# if defined (alloca) || defined (_ALLOCA_H)
-# define YYSTACK_ALLOC alloca
-# else
-# ifdef __GNUC__
-# define YYSTACK_ALLOC __builtin_alloca
-# endif
+# if defined (alloca) || defined (_ALLOCA_H)
+# define YYSTACK_ALLOC alloca
+# else
+# ifdef __GNUC__
+# define YYSTACK_ALLOC __builtin_alloca
 # endif
 # endif
 # endif
@@ -338,20 +346,20 @@
 # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
 # define YYSIZE_T size_t
 # endif
-# define YYSTACK_ALLOC malloc
-# define YYSTACK_FREE free
+# define YYSTACK_ALLOC YYMALLOC
+# define YYSTACK_FREE YYFREE
 # endif
 #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
 
 
 #if (! defined (yyoverflow) \
 && (! defined (__cplusplus) \
-	 || (YYSTYPE_IS_TRIVIAL)))
+	 || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member. */
 union yyalloc
 {
- short yyss;
+ short int yyss;
 YYSTYPE yyvs;
 };
 
@@ -361,13 +369,13 @@
 /* The size of an array large to enough to hold all stacks, each with
 N elements. */
 # define YYSTACK_BYTES(N) \
- ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
+ ((N) * (sizeof (short int) + sizeof (YYSTYPE))			\
 + YYSTACK_GAP_MAXIMUM)
 
 /* Copy COUNT objects from FROM to TO. The source and destination do
 not overlap. */
 # ifndef YYCOPY
-# if 1 < __GNUC__
+# if defined (__GNUC__) && 1 < __GNUC__
 # define YYCOPY(To, From, Count) \
 __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 # else
@@ -403,13 +411,13 @@
 #if defined (__STDC__) || defined (__cplusplus)
 typedef signed char yysigned_char;
 #else
- typedef short yysigned_char;
+ typedef short int yysigned_char;
 #endif
 
 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL 16
 /* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 447
+#define YYLAST 446
 
 /* YYNTOKENS -- Number of terminals. */
 #define YYNTOKENS 66
@@ -418,7 +426,7 @@
 /* YYNRULES -- Number of rules. */
 #define YYNRULES 161
 /* YYNRULES -- Number of states. */
-#define YYNSTATES 304
+#define YYNSTATES 303
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
 #define YYUNDEFTOK 2
@@ -466,25 +474,25 @@
 #if YYDEBUG
 /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
 YYRHS. */
-static const unsigned short yyprhs[] =
+static const unsigned short int yyprhs[] =
 {
 0, 0, 3, 9, 12, 15, 18, 25, 28, 34,
 35, 38, 39, 42, 45, 46, 52, 56, 60, 61,
- 65, 72, 76, 80, 81, 84, 91, 95, 99, 100,
- 103, 104, 108, 110, 112, 114, 116, 118, 120, 123,
- 125, 127, 128, 130, 132, 137, 140, 148, 149, 153,
- 156, 160, 164, 168, 172, 175, 178, 181, 182, 184,
- 186, 189, 191, 196, 199, 201, 205, 208, 210, 213,
- 216, 219, 223, 226, 230, 235, 239, 241, 243, 245,
- 248, 251, 253, 255, 257, 259, 262, 265, 270, 279,
- 286, 297, 299, 301, 303, 305, 307, 309, 311, 313,
- 316, 320, 325, 330, 335, 340, 346, 351, 356, 361,
- 367, 373, 377, 381, 386, 391, 397, 400, 403, 406,
- 407, 409, 413, 416, 419, 420, 422, 425, 428, 431,
- 434, 437, 440, 442, 444, 447, 450, 453, 456, 459,
- 462, 465, 468, 471, 474, 477, 480, 483, 486, 489,
- 492, 495, 498, 504, 508, 511, 515, 519, 522, 528,
- 532, 534
+ 65, 72, 76, 80, 81, 85, 92, 96, 100, 101,
+ 104, 105, 109, 111, 113, 115, 117, 119, 121, 124,
+ 126, 128, 129, 131, 133, 138, 141, 149, 150, 154,
+ 157, 161, 165, 169, 173, 176, 179, 182, 183, 185,
+ 187, 190, 192, 197, 200, 202, 206, 209, 211, 214,
+ 217, 220, 224, 227, 231, 236, 240, 242, 244, 246,
+ 249, 252, 254, 256, 258, 260, 263, 266, 271, 280,
+ 286, 296, 298, 300, 302, 304, 306, 308, 310, 312,
+ 315, 319, 324, 329, 334, 339, 345, 350, 355, 360,
+ 366, 372, 376, 380, 385, 390, 396, 399, 402, 405,
+ 406, 408, 412, 415, 418, 419, 421, 424, 427, 430,
+ 433, 436, 439, 441, 443, 446, 449, 452, 455, 458,
+ 461, 464, 467, 470, 473, 476, 479, 482, 485, 488,
+ 491, 494, 497, 503, 507, 510, 514, 518, 521, 527,
+ 531, 533
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -498,74 +506,74 @@
 55, -1, 24, 1, 118, -1, 24, 1, 55, -1,
 -1, 74, 75, 72, -1, 20, 71, 81, 71, 82,
 55, -1, 20, 1, 118, -1, 20, 1, 55, -1,
- -1, 77, 72, -1, 25, 71, 78, 81, 71, 55,
- -1, 25, 1, 118, -1, 25, 1, 55, -1, -1,
- 12, 4, -1, -1, 79, 80, 72, -1, 91, -1,
- 84, -1, 87, -1, 88, -1, 117, -1, 116, -1,
- 75, 1, -1, 11, -1, 49, -1, -1, 83, -1,
- 86, -1, 83, 56, 71, 86, -1, 83, 1, -1,
- 22, 71, 83, 53, 71, 85, 54, -1, -1, 85,
- 91, 71, -1, 12, 71, -1, 21, 1, 118, -1,
- 21, 1, 55, -1, 23, 1, 118, -1, 23, 1,
- 55, -1, 57, 71, -1, 58, 71, -1, 59, 71,
- -1, -1, 60, -1, 57, -1, 92, 105, -1, 93,
- -1, 92, 56, 71, 93, -1, 92, 1, -1, 95,
- -1, 93, 89, 95, -1, 93, 1, -1, 19, -1,
- 18, 19, -1, 12, 19, -1, 96, 71, -1, 96,
- 97, 71, -1, 97, 71, -1, 94, 96, 71, -1,
- 94, 96, 97, 71, -1, 94, 97, 71, -1, 12,
- -1, 18, -1, 98, -1, 97, 98, -1, 97, 1,
- -1, 14, -1, 99, -1, 101, -1, 104, -1, 16,
- 12, -1, 12, 71, -1, 17, 71, 100, 61, -1,
- 17, 71, 100, 102, 71, 103, 71, 61, -1, 17,
- 71, 94, 19, 100, 61, -1, 17, 71, 94, 19,
- 100, 102, 71, 103, 71, 61, -1, 62, -1, 6,
- -1, 7, -1, 8, -1, 9, -1, 10, -1, 12,
- -1, 11, -1, 15, 12, -1, 15, 15, 12, -1,
- 15, 50, 13, 63, -1, 15, 50, 48, 63, -1,
- 15, 50, 12, 63, -1, 15, 50, 11, 63, -1,
- 15, 51, 71, 95, 63, -1, 53, 71, 107, 54,
- -1, 53, 71, 1, 54, -1, 53, 71, 106, 54,
- -1, 53, 71, 106, 107, 54, -1, 53, 71, 106,
- 1, 54, -1, 107, 55, 71, -1, 1, 55, 71,
- -1, 106, 107, 55, 71, -1, 106, 1, 55, 71,
- -1, 108, 15, 71, 110, 109, -1, 1, 118, -1,
- 12, 71, -1, 29, 71, -1, -1, 112, -1, 110,
- 111, 112, -1, 64, 71, -1, 56, 71, -1, -1,
- 113, -1, 90, 113, -1, 46, 71, -1, 11, 71,
- -1, 12, 71, -1, 49, 71, -1, 52, 71, -1,
- 115, -1, 114, -1, 48, 71, -1, 47, 71, -1,
- 33, 71, -1, 34, 71, -1, 35, 71, -1, 36,
- 71, -1, 37, 71, -1, 38, 71, -1, 39, 71,
- -1, 40, 71, -1, 41, 71, -1, 42, 71, -1,
- 43, 71, -1, 44, 71, -1, 45, 71, -1, 31,
- 71, -1, 30, 71, -1, 32, 71, -1, 50, 71,
- 110, 63, 71, -1, 50, 71, 1, -1, 14, 71,
- -1, 65, 1, 118, -1, 65, 1, 55, -1, 1,
- 118, -1, 53, 1, 119, 1, 54, -1, 53, 1,
- 54, -1, 118, -1, 119, 1, 118, -1
+ -1, 76, 77, 72, -1, 25, 71, 78, 81, 71,
+ 55, -1, 25, 1, 118, -1, 25, 1, 55, -1,
+ -1, 12, 4, -1, -1, 79, 80, 72, -1, 91,
+ -1, 84, -1, 87, -1, 88, -1, 117, -1, 116,
+ -1, 75, 1, -1, 11, -1, 49, -1, -1, 83,
+ -1, 86, -1, 83, 56, 71, 86, -1, 83, 1,
+ -1, 22, 71, 83, 53, 71, 85, 54, -1, -1,
+ 85, 91, 71, -1, 12, 71, -1, 21, 1, 118,
+ -1, 21, 1, 55, -1, 23, 1, 118, -1, 23,
+ 1, 55, -1, 57, 71, -1, 58, 71, -1, 59,
+ 71, -1, -1, 60, -1, 57, -1, 92, 105, -1,
+ 93, -1, 92, 56, 71, 93, -1, 92, 1, -1,
+ 95, -1, 93, 89, 95, -1, 93, 1, -1, 19,
+ -1, 18, 19, -1, 12, 19, -1, 96, 71, -1,
+ 96, 97, 71, -1, 97, 71, -1, 94, 96, 71,
+ -1, 94, 96, 97, 71, -1, 94, 97, 71, -1,
+ 12, -1, 18, -1, 98, -1, 97, 98, -1, 97,
+ 1, -1, 14, -1, 99, -1, 101, -1, 104, -1,
+ 16, 12, -1, 12, 71, -1, 17, 71, 100, 61,
+ -1, 17, 71, 100, 102, 71, 103, 71, 61, -1,
+ 17, 71, 94, 100, 61, -1, 17, 71, 94, 100,
+ 102, 71, 103, 71, 61, -1, 62, -1, 6, -1,
+ 7, -1, 8, -1, 9, -1, 10, -1, 12, -1,
+ 11, -1, 15, 12, -1, 15, 15, 12, -1, 15,
+ 50, 13, 63, -1, 15, 50, 48, 63, -1, 15,
+ 50, 12, 63, -1, 15, 50, 11, 63, -1, 15,
+ 51, 71, 95, 63, -1, 53, 71, 107, 54, -1,
+ 53, 71, 1, 54, -1, 53, 71, 106, 54, -1,
+ 53, 71, 106, 107, 54, -1, 53, 71, 106, 1,
+ 54, -1, 107, 55, 71, -1, 1, 55, 71, -1,
+ 106, 107, 55, 71, -1, 106, 1, 55, 71, -1,
+ 108, 15, 71, 110, 109, -1, 1, 118, -1, 12,
+ 71, -1, 29, 71, -1, -1, 112, -1, 110, 111,
+ 112, -1, 64, 71, -1, 56, 71, -1, -1, 113,
+ -1, 90, 113, -1, 46, 71, -1, 11, 71, -1,
+ 12, 71, -1, 49, 71, -1, 52, 71, -1, 115,
+ -1, 114, -1, 48, 71, -1, 47, 71, -1, 33,
+ 71, -1, 34, 71, -1, 35, 71, -1, 36, 71,
+ -1, 37, 71, -1, 38, 71, -1, 39, 71, -1,
+ 40, 71, -1, 41, 71, -1, 42, 71, -1, 43,
+ 71, -1, 44, 71, -1, 45, 71, -1, 31, 71,
+ -1, 30, 71, -1, 32, 71, -1, 50, 71, 110,
+ 63, 71, -1, 50, 71, 1, -1, 14, 71, -1,
+ 65, 1, 118, -1, 65, 1, 55, -1, 1, 118,
+ -1, 53, 1, 119, 1, 54, -1, 53, 1, 54,
+ -1, 118, -1, 119, 1, 118, -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined. */
-static const unsigned short yyrline[] =
+static const unsigned short int yyrline[] =
 {
- 0, 255, 255, 256, 257, 258, 262, 269, 275, 300,
- 301, 304, 306, 307, 310, 312, 317, 318, 321, 323,
- 334, 344, 347, 353, 354, 358, 366, 367, 371, 372,
- 375, 377, 388, 389, 390, 391, 392, 393, 394, 398,
- 399, 403, 406, 411, 415, 420, 427, 441, 442, 452,
- 474, 477, 483, 486, 492, 493, 494, 495, 499, 500,
- 504, 524, 537, 551, 558, 561, 582, 589, 590, 591,
- 595, 599, 604, 609, 616, 625, 637, 653, 659, 663,
- 673, 680, 686, 687, 688, 692, 701, 725, 730, 736,
- 744, 756, 759, 762, 765, 768, 771, 777, 778, 782,
- 788, 794, 801, 808, 815, 822, 831, 834, 837, 840,
- 845, 851, 855, 858, 863, 869, 891, 897, 904, 905,
- 909, 913, 929, 932, 935, 941, 942, 944, 945, 946,
- 952, 953, 954, 956, 962, 963, 964, 965, 966, 967,
- 968, 969, 970, 971, 972, 973, 974, 975, 976, 977,
- 978, 979, 984, 992, 1008, 1015, 1021, 1030, 1056, 1057,
- 1061, 1062
+ 0, 256, 256, 257, 258, 259, 263, 270, 276, 301,
+ 302, 305, 307, 308, 311, 313, 318, 319, 322, 324,
+ 335, 345, 348, 354, 355, 359, 367, 368, 372, 373,
+ 376, 378, 389, 390, 391, 392, 393, 394, 395, 399,
+ 400, 404, 407, 412, 416, 421, 428, 442, 443, 453,
+ 475, 478, 484, 487, 493, 494, 495, 496, 500, 501,
+ 505, 525, 539, 554, 561, 564, 578, 585, 586, 587,
+ 591, 595, 600, 605, 612, 621, 633, 649, 655, 659,
+ 669, 676, 682, 683, 684, 688, 697, 721, 726, 732,
+ 740, 752, 755, 758, 761, 764, 767, 773, 774, 778,
+ 784, 790, 797, 804, 811, 818, 827, 830, 833, 836,
+ 841, 847, 851, 854, 859, 865, 887, 893, 900, 901,
+ 905, 909, 925, 928, 931, 937, 938, 940, 941, 942,
+ 948, 949, 950, 952, 958, 959, 960, 961, 962, 963,
+ 964, 965, 966, 967, 968, 969, 970, 971, 972, 973,
+ 974, 975, 980, 988, 1004, 1011, 1017, 1026, 1052, 1053,
+ 1057, 1058
 };
 #endif
 
@@ -574,26 +582,26 @@
 First, the terminals, then, starting at YYNTOKENS, nonterminals. */
 static const char *const yytname[] =
 {
- "$end", "error", "$undefined", "UNIMPORTANT_TOK", "S", "SGML_CD", 
- "INCLUDES", "DASHMATCH", "BEGINSWITH", "ENDSWITH", "CONTAINS", "STRING", 
- "IDENT", "NTH", "HASH", "':'", "'.'", "'['", "'*'", "'|'", "IMPORT_SYM", 
- "PAGE_SYM", "MEDIA_SYM", "FONT_FACE_SYM", "CHARSET_SYM", 
- "NAMESPACE_SYM", "KHTML_RULE_SYM", "KHTML_DECLS_SYM", "KHTML_VALUE_SYM", 
- "IMPORTANT_SYM", "QEMS", "EMS", "EXS", "PXS", "CMS", "MMS", "INS", 
- "PTS", "PCS", "DEGS", "RADS", "GRADS", "MSECS", "SECS", "HERZ", "KHERZ", 
- "DIMEN", "PERCENTAGE", "NUMBER", "URI", "FUNCTION", "NOTFUNCTION", 
- "UNICODERANGE", "'{'", "'}'", "';'", "','", "'+'", "'~'", "'>'", "'-'", 
- "']'", "'='", "')'", "'/'", "'@'", "$accept", "stylesheet", 
- "khtml_rule", "khtml_decls", "khtml_value", "maybe_space", "maybe_sgml", 
- "maybe_charset", "import_list", "import", "maybe_namespace", 
- "namespace", "maybe_ns_prefix", "rule_list", "rule", "string_or_uri", 
- "maybe_media_list", "media_list", "media", "ruleset_list", "medium", 
- "page", "font_face", "combinator", "unary_operator", "ruleset", 
- "selector_list", "selector", "namespace_selector", "simple_selector", 
- "element_name", "specifier_list", "specifier", "class", "attrib_id", 
- "attrib", "match", "ident_or_string", "pseudo", "declaration_block", 
- "declaration_list", "declaration", "property", "prio", "expr", 
- "operator", "term", "unary_term", "function", "hexcolor", "invalid_at", 
+ "$end", "error", "$undefined", "UNIMPORTANT_TOK", "S", "SGML_CD",
+ "INCLUDES", "DASHMATCH", "BEGINSWITH", "ENDSWITH", "CONTAINS", "STRING",
+ "IDENT", "NTH", "HASH", "':'", "'.'", "'['", "'*'", "'|'", "IMPORT_SYM",
+ "PAGE_SYM", "MEDIA_SYM", "FONT_FACE_SYM", "CHARSET_SYM", "NAMESPACE_SYM",
+ "KHTML_RULE_SYM", "KHTML_DECLS_SYM", "KHTML_VALUE_SYM", "IMPORTANT_SYM",
+ "QEMS", "EMS", "EXS", "PXS", "CMS", "MMS", "INS", "PTS", "PCS", "DEGS",
+ "RADS", "GRADS", "MSECS", "SECS", "HERZ", "KHERZ", "DIMEN", "PERCENTAGE",
+ "NUMBER", "URI", "FUNCTION", "NOTFUNCTION", "UNICODERANGE", "'{'", "'}'",
+ "';'", "','", "'+'", "'~'", "'>'", "'-'", "']'", "'='", "')'", "'/'",
+ "'@'", "$accept", "stylesheet", "khtml_rule", "khtml_decls",
+ "khtml_value", "maybe_space", "maybe_sgml", "maybe_charset",
+ "import_list", "import", "namespace_list", "namespace",
+ "maybe_ns_prefix", "rule_list", "rule", "string_or_uri",
+ "maybe_media_list", "media_list", "media", "ruleset_list", "medium",
+ "page", "font_face", "combinator", "unary_operator", "ruleset",
+ "selector_list", "selector", "namespace_selector", "simple_selector",
+ "element_name", "specifier_list", "specifier", "class", "attrib_id",
+ "attrib", "match", "ident_or_string", "pseudo", "declaration_block",
+ "declaration_list", "declaration", "property", "prio", "expr",
+ "operator", "term", "unary_term", "function", "hexcolor", "invalid_at",
 "invalid_rule", "invalid_block", "invalid_block_list", 0
 };
 #endif
@@ -601,7 +609,7 @@
 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
 token YYLEX-NUM. */
-static const unsigned short yytoknum[] =
+static const unsigned short int yytoknum[] =
 {
 0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
 265, 266, 267, 268, 269, 58, 46, 91, 42, 124,
@@ -640,14 +648,14 @@
 {
 0, 2, 5, 2, 2, 2, 6, 2, 5, 0,
 2, 0, 2, 2, 0, 5, 3, 3, 0, 3,
- 6, 3, 3, 0, 2, 6, 3, 3, 0, 2,
+ 6, 3, 3, 0, 3, 6, 3, 3, 0, 2,
 0, 3, 1, 1, 1, 1, 1, 1, 2, 1,
 1, 0, 1, 1, 4, 2, 7, 0, 3, 2,
 3, 3, 3, 3, 2, 2, 2, 0, 1, 1,
 2, 1, 4, 2, 1, 3, 2, 1, 2, 2,
 2, 3, 2, 3, 4, 3, 1, 1, 1, 2,
- 2, 1, 1, 1, 1, 2, 2, 4, 8, 6,
- 10, 1, 1, 1, 1, 1, 1, 1, 1, 2,
+ 2, 1, 1, 1, 1, 2, 2, 4, 8, 5,
+ 9, 1, 1, 1, 1, 1, 1, 1, 1, 2,
 3, 4, 4, 4, 4, 5, 4, 4, 4, 5,
 5, 3, 3, 4, 4, 5, 2, 2, 2, 0,
 1, 3, 2, 2, 0, 1, 2, 2, 2, 2,
@@ -671,88 +679,88 @@
 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
 9, 9, 59, 58, 0, 124, 120, 125, 133, 132,
- 0, 0, 11, 30, 11, 159, 160, 0, 15, 69,
- 99, 0, 0, 9, 85, 0, 68, 0, 63, 9,
- 60, 66, 9, 9, 9, 0, 76, 77, 9, 0,
- 70, 0, 80, 72, 79, 107, 9, 116, 117, 0,
- 108, 0, 106, 9, 9, 128, 129, 154, 150, 149,
- 151, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- 145, 146, 147, 148, 127, 135, 134, 130, 0, 131,
- 126, 8, 9, 9, 0, 0, 0, 0, 28, 19,
- 0, 24, 0, 100, 0, 0, 0, 0, 0, 9,
- 0, 0, 0, 6, 0, 54, 55, 56, 65, 73,
- 0, 75, 71, 112, 110, 9, 109, 9, 111, 0,
- 153, 124, 123, 122, 121, 22, 21, 39, 40, 9,
- 27, 26, 0, 0, 0, 0, 9, 0, 0, 0,
- 11, 33, 34, 35, 32, 37, 36, 158, 161, 104,
- 103, 101, 102, 0, 86, 0, 92, 93, 94, 95,
- 96, 87, 91, 9, 0, 74, 114, 113, 124, 9,
- 41, 29, 9, 157, 0, 0, 0, 0, 38, 31,
- 105, 9, 0, 0, 9, 115, 152, 9, 0, 0,
- 43, 0, 51, 50, 0, 53, 52, 156, 155, 89,
- 9, 98, 97, 9, 118, 49, 20, 45, 9, 25,
- 9, 0, 0, 0, 47, 9, 88, 44, 0, 0,
- 46, 9, 90, 48
+ 0, 11, 30, 159, 160, 0, 15, 69, 99, 0,
+ 0, 9, 85, 0, 68, 0, 63, 9, 60, 66,
+ 9, 9, 9, 0, 76, 77, 9, 0, 70, 0,
+ 80, 72, 79, 107, 9, 116, 117, 0, 108, 0,
+ 106, 9, 9, 128, 129, 154, 150, 149, 151, 136,
+ 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
+ 147, 148, 127, 135, 134, 130, 0, 131, 126, 8,
+ 9, 9, 0, 0, 0, 19, 0, 11, 0, 0,
+ 100, 0, 0, 0, 0, 0, 9, 0, 0, 0,
+ 6, 0, 54, 55, 56, 65, 73, 0, 75, 71,
+ 112, 110, 9, 109, 9, 111, 0, 153, 124, 123,
+ 122, 121, 22, 21, 39, 40, 9, 0, 28, 24,
+ 0, 0, 9, 0, 0, 0, 11, 33, 34, 35,
+ 32, 37, 36, 158, 161, 104, 103, 101, 102, 0,
+ 86, 9, 0, 92, 93, 94, 95, 96, 87, 91,
+ 9, 0, 74, 114, 113, 124, 9, 41, 27, 26,
+ 0, 0, 157, 0, 0, 0, 0, 38, 31, 105,
+ 89, 9, 0, 9, 115, 152, 9, 0, 0, 43,
+ 29, 9, 51, 50, 0, 53, 52, 156, 155, 0,
+ 98, 97, 9, 118, 49, 20, 45, 9, 0, 9,
+ 9, 0, 0, 25, 47, 0, 88, 44, 0, 90,
+ 46, 9, 48
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
-static const short yydefgoto[] =
+static const short int yydefgoto[] =
 {
- -1, 5, 6, 7, 8, 234, 20, 9, 31, 92,
- 93, 94, 213, 170, 220, 209, 268, 269, 221, 298,
- 270, 222, 223, 115, 84, 41, 42, 43, 44, 45,
- 46, 47, 48, 49, 182, 50, 243, 283, 51, 14,
- 54, 55, 56, 265, 85, 164, 86, 87, 88, 89,
- 225, 226, 127, 97
+ -1, 5, 6, 7, 8, 230, 20, 9, 31, 91,
+ 92, 167, 251, 168, 216, 206, 267, 268, 217, 298,
+ 269, 218, 219, 113, 84, 41, 42, 43, 44, 45,
+ 46, 47, 48, 49, 179, 50, 240, 282, 51, 14,
+ 54, 55, 56, 264, 85, 162, 86, 87, 88, 89,
+ 221, 222, 125, 95
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
 STATE-NUM. */
-#define YYPACT_NINF -170
-static const short yypact[] =
+#define YYPACT_NINF -167
+static const short int yypact[] =
 {
- 186, 226, -27, -11, 57, 114, -170, -170, -170, -170,
- -2, 124, -170, -170, -170, -170, -170, 151, 151, 151,
- 213, 158, -170, -170, -170, -170, 322, 37, 319, -170,
- -170, 2, 211, 46, 173, -170, 178, 185, -170, 176,
- -170, -170, 43, 187, 330, -170, 372, 163, -170, -170,
- -170, -170, 117, -170, 103, 236, 194, -170, -170, -170,
- -170, -170, -170, -170, -170, -170, -170, -170, -170, -170,
- -170, -170, -170, -170, -170, -170, -170, -170, -170, -170,
- -170, -170, -170, -170, 392, 206, -170, -170, -170, -170,
- 120, 162, -170, -170, -170, -170, -170, 199, -170, -170,
- -170, 223, 138, -170, -170, 249, -170, 102, -170, -170,
- -170, -170, -170, -170, -170, 366, -170, -170, 372, 163,
- 151, 163, -170, 151, -170, -170, -170, -170, 151, 130,
- -170, 273, -170, -170, -170, 151, 151, 151, 151, 151,
+ 317, 193, -43, -19, -9, 135, -167, -167, -167, -167,
+ 137, 5, -167, -167, -167, -167, -167, 151, 151, 151,
+ 94, 163, -167, -167, -167, -167, 321, 26, 318, -167,
+ -167, 167, 97, 0, 183, -167, 186, 197, -167, 200,
+ -167, -167, 52, 165, 262, -167, 371, 157, -167, -167,
+ -167, -167, -32, -167, 100, 180, 223, -167, -167, -167,
+ -167, -167, -167, -167, -167, -167, -167, -167, -167, -167,
+ -167, -167, -167, -167, -167, -167, -167, -167, -167, -167,
+ -167, -167, -167, -167, 391, 114, -167, -167, -167, -167,
+ 118, -167, 187, -167, -167, 225, -167, -167, -167, 229,
+ 115, -167, -167, 14, -167, 50, -167, -167, -167, -167,
+ -167, -167, -167, 365, -167, -167, 371, 157, 151, 157,
+ -167, 151, -167, -167, -167, -167, 151, 361, -167, 272,
+ -167, -167, -167, 151, 151, 151, 151, 151, 151, 151,
 151, 151, 151, 151, 151, 151, 151, 151, 151, 151,
- 151, 151, 151, 151, 151, 151, 151, 151, 272, 151,
- -170, -170, -170, -170, 361, 179, 105, 183, 35, 213,
- 122, 213, 227, -170, 168, 215, 225, 229, 322, 173,
- 176, 220, 26, -170, 322, 151, 151, 151, -170, 151,
- 163, 151, 151, 151, -170, -170, -170, -170, 151, 319,
- -170, -33, 151, 151, -170, -170, -170, -170, -170, -170,
- -170, -170, 281, 142, 242, 300, -170, 324, 334, 342,
- -170, -170, -170, -170, -170, -170, -170, -170, -170, -170,
- -170, -170, -170, 307, 151, 362, -170, -170, -170, -170,
- -170, -170, -170, -170, 240, 151, 151, 151, 169, -170,
- 164, -170, -170, -170, 216, 164, 219, 222, -170, 213,
- -170, -170, 85, 115, -170, -170, 151, -170, 335, 42,
- -170, 50, -170, -170, 47, -170, -170, -170, -170, -170,
- -170, -170, -170, -170, 151, 151, -170, -170, -170, -170,
- -170, 115, 24, 164, 151, -170, -170, -170, 1, 25,
- -170, -170, -170, 151
+ 151, 151, 151, 151, 151, 151, 271, 151, -167, -167,
+ -167, -167, 360, 153, 103, 94, 184, -167, 124, 293,
+ -167, 205, 210, 221, 224, 321, 183, 200, 235, 41,
+ -167, 321, 151, 151, 151, -167, 151, 157, 151, 151,
+ 151, -167, -167, -167, -167, 151, 318, -167, -21, 151,
+ 151, -167, -167, -167, -167, -167, -167, 206, 16, 94,
+ 237, 249, -167, 298, 323, 333, -167, -167, -167, -167,
+ -167, -167, -167, -167, -167, -167, -167, -167, -167, 231,
+ 151, -167, 87, -167, -167, -167, -167, -167, -167, -167,
+ -167, 239, 151, 151, 151, 188, -167, 195, -167, -167,
+ 259, -10, -167, 211, 195, 216, 238, -167, 94, -167,
+ -167, -167, 109, -167, -167, 151, -167, 287, 35, -167,
+ -167, -167, -167, -167, 81, -167, -167, -167, -167, 109,
+ -167, -167, -167, 151, 151, -167, -167, -167, 37, -167,
+ -167, 25, 195, -167, 151, 27, -167, -167, 213, -167,
+ -167, -167, 151
 };
 
 /* YYPGOTO[NTERM-NUM]. */
-static const short yypgoto[] =
+static const short int yypgoto[] =
 {
- -170, -170, -170, -170, -170, -1, -90, -170, -170, 207,
- -170, -170, -170, -170, -170, 201, -170, 157, -170, -170,
- 123, -170, -170, -170, -170, -169, -170, 231, 312, -94,
- 375, -36, -38, -170, 203, -170, 180, 129, -170, 399,
- -170, 389, -170, -170, -51, -170, 280, 363, -170, -170,
- -170, -170, -7, -170
+ -167, -167, -167, -167, -167, -1, -83, -167, -167, 201,
+ -167, -167, -167, -167, -167, 122, -167, 159, -167, -167,
+ 84, -167, -167, -167, -167, -166, -167, 208, 308, -94,
+ 374, -29, -34, -167, 241, -167, 209, 158, -167, 398,
+ -167, 388, -167, -167, -39, -167, 281, 362, -167, -167,
+ -167, -167, -7, -167
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -760,102 +768,102 @@
 number is the opposite. If zero, do what YYDEFACT says.
 If YYTABLE_NINF, syntax error. */
 #define YYTABLE_NINF -120
-static const short yytable[] =
+static const short int yytable[] =
 {
- 11, 224, 169, 23, 171, 17, 18, 19, 119, 124,
- 121, 26, 27, 34, 28, 35, 36, 37, 38, 39,
- 40, 188, 90, 162, 33, 96, 12, 91, 24, 24,
- 249, 163, 236, 237, 238, 239, 240, 105, 52, 24,
- 107, 24, 13, 287, 108, 120, 123, 212, 287, 53,
- 24, 21, 128, 22, 24, 300, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
- 149, 150, 151, 152, 153, 154, 155, 156, 157, 158,
- 159, 124, 190, 124, 233, 296, 302, 241, 242, 166,
- 168, 236, 237, 238, 239, 240, 13, -42, 288, 109,
- 290, 98, 178, 288, 129, 289, 24, 201, 184, 24,
- 15, 185, 186, 187, 16, 53, 207, 189, 191, 24,
- 192, 165, -2, 214, -9, 193, 281, 282, 24, 301,
- 259, -9, 198, 199, 34, 25, 35, 36, 37, 38,
- 39, 40, 90, 215, 216, 217, 279, 242, 248, 174,
- 175, 176, 124, 207, 208, 24, 183, 130, 206, 32,
- 211, 202, 203, 167, 122, 228, -9, -9, 24, -9,
- 21, 125, 126, -9, -9, -9, 267, 35, 36, 37,
- 38, -9, -9, 21, 194, 195, 177, 218, 111, 245,
- 100, 208, 99, 101, 246, 106, 247, 104, 264, -57,
- 172, -57, -57, -57, -57, -57, -57, 253, 250, 134,
- 1, -9, 2, 3, 4, 255, -9, 29, 30, -9,
- -9, -9, -9, -119, -119, 162, -9, 10, 102, 103,
- -9, 229, 21, 163, 205, 173, 21, -9, 210, 235,
- -61, 111, 263, -61, 112, 113, 114, 273, 266, 276,
- 278, 271, -57, 24, -57, -57, -57, -57, -57, -57,
- 161, 179, 162, 284, 21, 95, 285, 180, 40, 21,
- 163, 272, 21, 200, 275, 21, 24, 277, 230, 291,
- 21, 227, 292, 57, 58, 251, 59, 293, 231, 294,
- 132, 133, 232, -62, 299, 21, -62, 112, 113, 114,
- 303, 254, 60, 61, 62, 63, 64, 65, 66, 67,
- 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
- 78, 79, 80, 24, 81, 256, 24, 196, 197, 82,
- 57, 58, 83, 59, 34, 257, 35, 36, 37, 38,
- 39, 40, 116, 258, 35, 36, 37, 38, 117, 60,
- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
- 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
- 260, 81, 57, 58, 261, 59, 82, 219, 34, 83,
- 35, 36, 37, 38, 39, 40, 35, 36, 37, 38,
- 286, 60, 61, 62, 63, 64, 65, 66, 67, 68,
+ 11, 204, 220, 23, 24, 17, 18, 19, 165, 24,
+ 12, 26, 27, 122, 28, 117, 25, 119, 24, 185,
+ 24, 21, 123, 124, 33, 94, 176, 52, 250, 24,
+ 24, 24, 177, 40, 13, 160, 286, 103, 53, 205,
+ 105, 24, 246, 161, 15, 118, 121, 233, 234, 235,
+ 236, 237, 126, 106, 24, 96, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
+ 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
+ 157, 229, 286, 122, 209, 122, 296, 187, 299, 164,
+ -42, 287, 293, 233, 234, 235, 236, 237, 29, 30,
+ 175, 127, 238, 239, 180, 13, 181, 24, 107, 182,
+ 183, 184, 53, 24, 204, 186, 188, 198, 189, 163,
+ 280, 281, -9, 190, -2, 210, 171, 172, 173, -9,
+ 195, 196, 301, 258, 289, 16, 34, 287, 35, 36,
+ 37, 38, 39, 40, 90, 211, 212, 213, 260, 239,
+ 21, 93, 205, 122, 128, 24, 203, 245, 120, 199,
+ 200, -9, 224, 174, 32, 208, 109, -9, 159, -9,
+ 160, 35, 36, 37, 38, -9, -9, -57, 161, -57,
+ -57, -57, -57, -57, -57, 207, 242, 90, -9, 214,
+ 21, 243, 22, 244, 10, -9, -9, -9, 98, 24,
+ 249, 99, 97, 252, -9, 247, 21, 266, 202, 102,
+ -9, 254, 166, -9, -9, -9, -9, 263, -61, 104,
+ -9, -61, 110, 111, 112, 34, 169, 35, 36, 37,
+ 38, 39, 40, -9, 130, 131, 100, 101, 132, 262,
+ 109, 170, -119, -119, 160, 265, 273, 231, 276, 278,
+ 253, -57, 161, -57, -57, -57, -57, -57, -57, 21,
+ 279, 248, 283, 270, 21, 284, 272, 300, 225, 21,
+ 288, 275, 197, 226, 114, 24, 35, 36, 37, 38,
+ 115, 291, 57, 58, 227, 59, 292, 228, 294, 295,
+ 21, 21, -62, 277, 259, -62, 110, 111, 112, 255,
+ 302, 60, 61, 62, 63, 64, 65, 66, 67, 68,
 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
- 79, 80, 274, 81, 252, 244, 297, 181, 82, 118,
- 295, 83, 60, 61, 62, 63, 64, 65, 66, 67,
- 68, 69, 70, 71, 72, 73, 74, 75, 262, 77,
- 78, 110, 280, 131, 204, 0, 0, 160
+ 79, 80, 24, 81, 256, 24, 193, 194, 82, 57,
+ 58, 83, 59, 34, 257, 35, 36, 37, 38, 39,
+ 40, 1, 285, 2, 3, 4, 21, 223, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
+ 72, 73, 74, 75, 76, 77, 78, 79, 80, 215,
+ 81, 57, 58, 271, 59, 82, 297, 34, 83, 35,
+ 36, 37, 38, 39, 40, 35, 36, 37, 38, 241,
+ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 178, 81, 274, 21, 191, 192, 82, 116, 232,
+ 83, 60, 61, 62, 63, 64, 65, 66, 67, 68,
+ 69, 70, 71, 72, 73, 74, 75, 290, 77, 78,
+ 108, 261, 129, 201, 0, 0, 158
 };
 
-static const short yycheck[] =
+static const short int yycheck[] =
 {
- 1, 170, 92, 10, 94, 6, 7, 8, 44, 47,
- 46, 12, 13, 12, 15, 14, 15, 16, 17, 18,
- 19, 115, 20, 56, 25, 32, 53, 25, 4, 4,
- 63, 64, 6, 7, 8, 9, 10, 38, 1, 4,
- 41, 4, 53, 1, 1, 46, 47, 12, 1, 12,
- 4, 53, 53, 55, 4, 54, 57, 58, 59, 60,
+ 1, 11, 168, 10, 4, 6, 7, 8, 91, 4,
+ 53, 12, 13, 47, 15, 44, 11, 46, 4, 113,
+ 4, 53, 54, 55, 25, 32, 12, 1, 12, 4,
+ 4, 4, 18, 19, 53, 56, 1, 38, 12, 49,
+ 41, 4, 63, 64, 53, 46, 47, 6, 7, 8,
+ 9, 10, 53, 1, 4, 55, 57, 58, 59, 60,
 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
- 81, 119, 118, 121, 178, 61, 61, 61, 62, 90,
- 91, 6, 7, 8, 9, 10, 53, 55, 56, 56,
- 53, 55, 103, 56, 1, 55, 4, 158, 109, 4,
- 53, 112, 113, 114, 0, 12, 11, 118, 119, 4,
- 121, 1, 0, 1, 4, 126, 11, 12, 4, 298,
- 220, 11, 133, 134, 12, 11, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 61, 62, 199, 11,
- 12, 13, 190, 11, 49, 4, 54, 54, 165, 1,
- 167, 162, 163, 1, 1, 172, 4, 4, 4, 49,
- 53, 54, 55, 11, 12, 12, 12, 14, 15, 16,
- 17, 18, 19, 53, 54, 55, 48, 65, 1, 190,
- 12, 49, 19, 15, 195, 19, 197, 12, 29, 12,
- 1, 14, 15, 16, 17, 18, 19, 214, 209, 15,
- 24, 49, 26, 27, 28, 216, 53, 4, 5, 56,
- 57, 58, 59, 54, 55, 56, 63, 1, 50, 51,
- 4, 63, 53, 64, 55, 12, 53, 11, 55, 19,
- 53, 1, 243, 56, 57, 58, 59, 254, 249, 256,
- 257, 252, 12, 4, 14, 15, 16, 17, 18, 19,
- 54, 12, 56, 264, 53, 54, 267, 18, 19, 53,
- 64, 55, 53, 1, 55, 53, 4, 55, 63, 280,
- 53, 54, 283, 11, 12, 4, 14, 288, 63, 290,
- 54, 55, 63, 53, 295, 53, 56, 57, 58, 59,
- 301, 1, 30, 31, 32, 33, 34, 35, 36, 37,
- 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 4, 52, 1, 4, 54, 55, 57,
- 11, 12, 60, 14, 12, 1, 14, 15, 16, 17,
- 18, 19, 12, 1, 14, 15, 16, 17, 18, 30,
- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
- 63, 52, 11, 12, 12, 14, 57, 170, 12, 60,
- 14, 15, 16, 17, 18, 19, 14, 15, 16, 17,
- 55, 30, 31, 32, 33, 34, 35, 36, 37, 38,
+ 81, 175, 1, 117, 167, 119, 61, 116, 61, 90,
+ 55, 56, 55, 6, 7, 8, 9, 10, 4, 5,
+ 101, 1, 61, 62, 54, 53, 107, 4, 56, 110,
+ 111, 112, 12, 4, 11, 116, 117, 156, 119, 1,
+ 11, 12, 4, 124, 0, 1, 11, 12, 13, 11,
+ 131, 132, 298, 216, 53, 0, 12, 56, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 61, 62,
+ 53, 54, 49, 187, 54, 4, 163, 196, 1, 160,
+ 161, 4, 169, 48, 1, 166, 1, 49, 54, 12,
+ 56, 14, 15, 16, 17, 18, 19, 12, 64, 14,
+ 15, 16, 17, 18, 19, 1, 187, 20, 4, 65,
+ 53, 192, 55, 194, 1, 11, 12, 4, 12, 4,
+ 207, 15, 19, 210, 11, 206, 53, 12, 55, 12,
+ 53, 212, 25, 56, 57, 58, 59, 29, 53, 19,
+ 63, 56, 57, 58, 59, 12, 1, 14, 15, 16,
+ 17, 18, 19, 49, 54, 55, 50, 51, 15, 240,
+ 1, 12, 54, 55, 56, 246, 253, 12, 255, 256,
+ 1, 12, 64, 14, 15, 16, 17, 18, 19, 53,
+ 261, 55, 263, 4, 53, 266, 55, 54, 63, 53,
+ 271, 55, 1, 63, 12, 4, 14, 15, 16, 17,
+ 18, 282, 11, 12, 63, 14, 287, 63, 289, 290,
+ 53, 53, 53, 55, 63, 56, 57, 58, 59, 1,
+ 301, 30, 31, 32, 33, 34, 35, 36, 37, 38,
 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
- 49, 50, 255, 52, 213, 184, 293, 105, 57, 44,
- 291, 60, 30, 31, 32, 33, 34, 35, 36, 37,
- 38, 39, 40, 41, 42, 43, 44, 45, 235, 47,
- 48, 42, 262, 54, 164, -1, -1, 84
+ 49, 50, 4, 52, 1, 4, 54, 55, 57, 11,
+ 12, 60, 14, 12, 1, 14, 15, 16, 17, 18,
+ 19, 24, 55, 26, 27, 28, 53, 54, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 49, 50, 168,
+ 52, 11, 12, 251, 14, 57, 292, 12, 60, 14,
+ 15, 16, 17, 18, 19, 14, 15, 16, 17, 181,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+ 50, 103, 52, 254, 53, 54, 55, 57, 44, 178,
+ 60, 30, 31, 32, 33, 34, 35, 36, 37, 38,
+ 39, 40, 41, 42, 43, 44, 45, 279, 47, 48,
+ 42, 232, 54, 162, -1, -1, 84
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -871,28 +879,28 @@
 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
 50, 52, 57, 60, 90, 110, 112, 113, 114, 115,
- 20, 25, 75, 76, 77, 54, 118, 119, 55, 19,
- 12, 15, 50, 51, 12, 71, 19, 71, 1, 56,
- 105, 1, 57, 58, 59, 89, 12, 18, 96, 97,
- 71, 97, 1, 71, 98, 54, 55, 118, 71, 1,
- 54, 107, 54, 55, 15, 71, 71, 71, 71, 71,
+ 20, 75, 76, 54, 118, 119, 55, 19, 12, 15,
+ 50, 51, 12, 71, 19, 71, 1, 56, 105, 1,
+ 57, 58, 59, 89, 12, 18, 96, 97, 71, 97,
+ 1, 71, 98, 54, 55, 118, 71, 1, 54, 107,
+ 54, 55, 15, 71, 71, 71, 71, 71, 71, 71,
 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
- 113, 54, 56, 64, 111, 1, 71, 1, 71, 72,
- 79, 72, 1, 12, 11, 12, 13, 48, 71, 12,
- 18, 94, 100, 54, 71, 71, 71, 71, 95, 71,
- 97, 71, 71, 71, 54, 55, 54, 55, 71, 71,
- 1, 110, 71, 71, 112, 55, 118, 11, 49, 81,
- 55, 118, 12, 78, 1, 21, 22, 23, 65, 75,
- 80, 84, 87, 88, 91, 116, 117, 54, 118, 63,
- 63, 63, 63, 95, 71, 19, 6, 7, 8, 9,
- 10, 61, 62, 102, 93, 71, 71, 71, 110, 63,
- 71, 4, 81, 118, 1, 71, 1, 1, 1, 72,
- 63, 12, 100, 71, 29, 109, 71, 12, 82, 83,
- 86, 71, 55, 118, 83, 55, 118, 55, 118, 61,
- 102, 11, 12, 103, 71, 71, 55, 1, 56, 55,
- 53, 71, 71, 71, 71, 103, 61, 86, 85, 71,
- 54, 91, 61, 71
+ 71, 71, 71, 71, 71, 71, 71, 71, 113, 54,
+ 56, 64, 111, 1, 71, 72, 25, 77, 79, 1,
+ 12, 11, 12, 13, 48, 71, 12, 18, 94, 100,
+ 54, 71, 71, 71, 71, 95, 71, 97, 71, 71,
+ 71, 54, 55, 54, 55, 71, 71, 1, 110, 71,
+ 71, 112, 55, 118, 11, 49, 81, 1, 71, 72,
+ 1, 21, 22, 23, 65, 75, 80, 84, 87, 88,
+ 91, 116, 117, 54, 118, 63, 63, 63, 63, 95,
+ 71, 12, 100, 6, 7, 8, 9, 10, 61, 62,
+ 102, 93, 71, 71, 71, 110, 63, 71, 55, 118,
+ 12, 78, 118, 1, 71, 1, 1, 1, 72, 63,
+ 61, 102, 71, 29, 109, 71, 12, 82, 83, 86,
+ 4, 81, 55, 118, 83, 55, 118, 55, 118, 71,
+ 11, 12, 103, 71, 71, 55, 1, 56, 71, 53,
+ 103, 71, 71, 55, 71, 71, 61, 86, 85, 61,
+ 54, 91, 71
 };
 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
@@ -918,7 +926,7 @@
 
 #define YYACCEPT	goto yyacceptlab
 #define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrlab1
+#define YYERROR		goto yyerrorlab
 
 
 /* Like YYERROR except do call yyerror. This remains here temporarily
@@ -953,11 +961,11 @@
 are run). */
 
 #ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N) \
- Current.first_line = Rhs[1].first_line; \
- Current.first_column = Rhs[1].first_column; \
- Current.last_line = Rhs[N].last_line; \
- Current.last_column = Rhs[N].last_column;
+# define YYLLOC_DEFAULT(Current, Rhs, N)		\
+ ((Current).first_line = (Rhs)[1].first_line,	\
+ (Current).first_column = (Rhs)[1].first_column,	\
+ (Current).last_line = (Rhs)[N].last_line,	\
+ (Current).last_column = (Rhs)[N].last_column)
 #endif
 
 /* YYLEX -- calling `yylex' with the right arguments. */
@@ -1001,17 +1009,17 @@
 
 /*------------------------------------------------------------------.
 | yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (cinluded). |
+| TOP (included). |
 `------------------------------------------------------------------*/
 
 #if defined (__STDC__) || defined (__cplusplus)
 static void
-yy_stack_print (short *bottom, short *top)
+yy_stack_print (short int *bottom, short int *top)
 #else
 static void
 yy_stack_print (bottom, top)
- short *bottom;
- short *top;
+ short int *bottom;
+ short int *top;
 #endif
 {
 YYFPRINTF (stderr, "Stack now");
@@ -1041,9 +1049,9 @@
 #endif
 {
 int yyi;
- unsigned int yylineno = yyrline[yyrule];
+ unsigned int yylno = yyrline[yyrule];
 YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
- yyrule - 1, yylineno);
+ yyrule - 1, yylno);
 /* Print the symbols being reduced, and their result. */
 for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
 YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
@@ -1080,7 +1088,7 @@
 SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
 evaluated with infinite-precision integer arithmetic. */
 
-#if YYMAXDEPTH == 0
+#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0
 # undef YYMAXDEPTH
 #endif
 
@@ -1338,9 +1346,9 @@
 to reallocate them elsewhere. */
 
 /* The state stack. */
- short	yyssa[YYINITDEPTH];
- short *yyss = yyssa;
- register short *yyssp;
+ short int yyssa[YYINITDEPTH];
+ short int *yyss = yyssa;
+ register short int *yyssp;
 
 /* The semantic value stack. */
 YYSTYPE yyvsa[YYINITDEPTH];
@@ -1377,6 +1385,7 @@
 yyssp = yyss;
 yyvsp = yyvs;
 
+
 goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1402,7 +1411,7 @@
 	 these so that the &'s don't force the real ones into
 	 memory. */
 	YYSTYPE *yyvs1 = yyvs;
-	short *yyss1 = yyss;
+	short int *yyss1 = yyss;
 
 
 	/* Each stack pointer address is followed by the size of the
@@ -1430,7 +1439,7 @@
 	yystacksize = YYMAXDEPTH;
 
 {
-	short *yyss1 = yyss;
+	short int *yyss1 = yyss;
 	union yyalloc *yyptr =
 	 (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
@@ -1851,6 +1860,7 @@
 	 yyvsp[0].selector->print();
 #endif
 	 yyval.selectorList->append( yyvsp[0].selector );
+	 khtml::CSSStyleSelector::precomputeAttributeDependencies(static_cast<CSSParser *>(parser)->document(), yyvsp[0].selector);
 	} else {
 	 yyval.selectorList = 0;
 	}
@@ -1863,6 +1873,7 @@
 	if ( yyvsp[-3].selectorList && yyvsp[0].selector ) {
 	 yyval.selectorList = yyvsp[-3].selectorList;
 	 yyval.selectorList->append( yyvsp[0].selector );
+	 khtml::CSSStyleSelector::precomputeAttributeDependencies(static_cast<CSSParser *>(parser)->document(), yyvsp[0].selector);
 #ifdef CSS_DEBUG
 	 kdDebug( 6080 ) << " got simple selector:" << endl;
 	 yyvsp[0].selector->print();
@@ -1904,13 +1915,6 @@
 		end = end->tagHistory;
 	 end->relation = yyvsp[-1].relation;
 	 end->tagHistory = yyvsp[-2].selector;
-	 if ( yyvsp[-1].relation == CSSSelector::Descendant ||
-		 yyvsp[-1].relation == CSSSelector::Child ) {
-		CSSParser *p = static_cast<CSSParser *>(parser);
-		DOM::DocumentImpl *doc = p->document();
-		if ( doc )
-		 doc->setUsesDescendantRules(true);
-	 }
 	}
 ;}
 break;
@@ -1960,7 +1964,7 @@
 {
 	yyval.selector = yyvsp[-1].selector;
 if ( yyval.selector )
- yyval.selector->tag = makeId(static_cast<CSSParser*>(parser)->defaultNamespace, anyLocalName);;
+ yyval.selector->tag = makeId(static_cast<CSSParser*>(parser)->defaultNamespace(), anyLocalName);
 ;}
 break;
 
@@ -2011,9 +2015,9 @@
 	 if (doc->isHTMLDocument())
 		tag = tag.lower();
 	 const DOMString dtag(tag);
- yyval.element = makeId(p->defaultNamespace, doc->getId(NodeImpl::ElementId, dtag.implementation(), false, true));
+ yyval.element = makeId(p->defaultNamespace(), doc->getId(NodeImpl::ElementId, dtag.implementation(), false, true));
 	} else {
-	 yyval.element = makeId(p->defaultNamespace, khtml::getTagID(tag.lower().ascii(), tag.length()));
+	 yyval.element = makeId(p->defaultNamespace(), khtml::getTagID(tag.lower().ascii(), tag.length()));
 	 // this case should never happen - only when loading
 	 // the default stylesheet - which must not contain unknown tags
 // 	 assert($$ != 0);
@@ -2024,7 +2028,7 @@
 case 77:
 
 {
-	yyval.element = makeId(static_cast<CSSParser*>(parser)->defaultNamespace, anyLocalName);
+	yyval.element = makeId(static_cast<CSSParser*>(parser)->defaultNamespace(), anyLocalName);
 ;}
 break;
 
@@ -2130,7 +2134,7 @@
 yyval.selector->match = CSSSelector::Set;
 CSSParser *p = static_cast<CSSParser *>(parser);
 if (p->styleElement && p->styleElement->isCSSStyleSheet())
- static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace(yyval.selector->attr, domString(yyvsp[-3].string));
+ static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace(yyval.selector->attr, domString(yyvsp[-2].string));
 ;}
 break;
 
@@ -2143,7 +2147,7 @@
 yyval.selector->value = domString(yyvsp[-2].string);
 CSSParser *p = static_cast<CSSParser *>(parser);
 if (p->styleElement && p->styleElement->isCSSStyleSheet())
- static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace(yyval.selector->attr, domString(yyvsp[-7].string));
+ static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace(yyval.selector->attr, domString(yyvsp[-6].string));
 ;}
 break;
 
@@ -2625,7 +2629,7 @@
 
 }
 
-/* Line 999 of yacc.c. */
+/* Line 1010 of yacc.c. */
 
 
 yyvsp -= yylen;
@@ -2667,18 +2671,33 @@
 	{
 	 YYSIZE_T yysize = 0;
 	 int yytype = YYTRANSLATE (yychar);
+	 const char* yyprefix;
 	 char *yymsg;
-	 int yyx, yycount;
+	 int yyx;
 
-	 yycount = 0;
 	 /* Start YYX at -YYN if negative to avoid negative indexes in
 	 YYCHECK. */
-	 for (yyx = yyn < 0 ? -yyn : 0;
-	 yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
+	 int yyxbegin = yyn < 0 ? -yyn : 0;
+
+	 /* Stay within bounds of both yycheck and yytname. */
+	 int yychecklim = YYLAST - yyn;
+	 int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+	 int yycount = 0;
+
+	 yyprefix = ", expecting ";
+	 for (yyx = yyxbegin; yyx < yyxend; ++yyx)
 	 if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	 yysize += yystrlen (yytname[yyx]) + 15, yycount++;
-	 yysize += yystrlen ("syntax error, unexpected ") + 1;
-	 yysize += yystrlen (yytname[yytype]);
+	 {
+		yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
+		yycount += 1;
+		if (yycount == 5)
+		 {
+		 yysize = 0;
+		 break;
+		 }
+	 }
+	 yysize += (sizeof ("syntax error, unexpected ")
+		 + yystrlen (yytname[yytype]));
 	 yymsg = (char *) YYSTACK_ALLOC (yysize);
 	 if (yymsg != 0)
 	 {
@@ -2687,16 +2706,13 @@
 
 	 if (yycount < 5)
 		{
-		 yycount = 0;
-		 for (yyx = yyn < 0 ? -yyn : 0;
-		 yyx < (int) (sizeof (yytname) / sizeof (char *));
-		 yyx++)
+		 yyprefix = ", expecting ";
+		 for (yyx = yyxbegin; yyx < yyxend; ++yyx)
 		 if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
 		 {
-			const char *yyq = ! yycount ? ", expecting " : " or ";
-			yyp = yystpcpy (yyp, yyq);
+			yyp = yystpcpy (yyp, yyprefix);
 			yyp = yystpcpy (yyp, yytname[yyx]);
-			yycount++;
+			yyprefix = " or ";
 		 }
 		}
 	 yyerror (yymsg);
@@ -2717,25 +2733,27 @@
 /* If just tried and failed to reuse lookahead token after an
 	 error, discard it. */
 
- /* Return failure if at end of input. */
- if (yychar == YYEOF)
+ if (yychar <= YYEOF)
 {
-	 /* Pop the error token. */
- YYPOPSTACK;
-	 /* Pop the rest of the stack. */
-	 while (yyss < yyssp)
-	 {
-	 YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-	 yydestruct (yystos[*yyssp], yyvsp);
-	 YYPOPSTACK;
-	 }
-	 YYABORT;
+ /* If at end of input, pop the error token,
+	 then the rest of the stack, then return failure. */
+	 if (yychar == YYEOF)
+	 for (;;)
+	 {
+		 YYPOPSTACK;
+		 if (yyssp == yyss)
+		 YYABORT;
+		 YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+		 yydestruct (yystos[*yyssp], yyvsp);
+	 }
 }
+ else
+	{
+	 YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
+	 yydestruct (yytoken, &yylval);
+	 yychar = YYEMPTY;
 
- YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
- yydestruct (yytoken, &yylval);
- yychar = YYEMPTY;
-
+	}
 }
 
 /* Else will try to reuse lookahead token after shifting the error
@@ -2743,9 +2761,27 @@
 goto yyerrlab1;
 
 
-/*----------------------------------------------------.
-| yyerrlab1 -- error raised explicitly by an action. |
-`----------------------------------------------------*/
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR. |
+`---------------------------------------------------*/
+yyerrorlab:
+
+#ifdef __GNUC__
+ /* Pacify GCC when the user code never invokes YYERROR and the label
+ yyerrorlab therefore never appears in user code. */
+ if (0)
+ goto yyerrorlab;
+#endif
+
+ yyvsp -= yylen;
+ yyssp -= yylen;
+ yystate = *yyssp;
+ goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR. |
+`-------------------------------------------------------------*/
 yyerrlab1:
 yyerrstatus = 3;	/* Each real token shifted decrements this. */
 
@@ -2769,9 +2805,8 @@
 
 YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
 yydestruct (yystos[yystate], yyvsp);
- yyvsp--;
- yystate = *--yyssp;
-
+ YYPOPSTACK;
+ yystate = *yyssp;
 YY_STACK_PRINT (yyss, yyssp);
 }
 
Index: khtml/css/cssstyleselector.cpp
===================================================================
--- khtml/css/cssstyleselector.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/css/cssstyleselector.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
 * (C) 2003-2004 Apple Computer, Inc.
- * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
+ * (C) 2004-2006 Allan Sandfeld Jensen (kde@carewolf.com)
 * (C) 2004 Germain Garand (germain@ebooksfrance.org)
 *
 * This library is free software; you can redistribute it and/or
@@ -32,6 +32,7 @@
 #include "html/html_documentimpl.h"
 #include "html/html_elementimpl.h"
 #include "xml/dom_elementimpl.h"
+#include "xml/dom_restyler.h"
 #include "dom/css_rule.h"
 #include "dom/css_value.h"
 #include "khtml_factory.h"
@@ -191,7 +192,7 @@
 {
 KHTMLView* view = doc->view();
 
- init(view ? view->part()->settings() : 0);
+ init(view ? view->part()->settings() : 0, doc);
 
 strictParsing = _strictParsing;
 m_medium = view ? view->mediaType() : QString("all");
@@ -249,7 +250,7 @@
 
 CSSStyleSelector::CSSStyleSelector( CSSStyleSheetImpl *sheet )
 {
- init(0L);
+ init(0L, 0L);
 
 KHTMLView *view = sheet->doc()->view();
 m_medium = view ? view->mediaType() : "screen";
@@ -258,7 +259,7 @@
 authorStyle->append( sheet, m_medium );
 }
 
-void CSSStyleSelector::init(const KHTMLSettings* _settings)
+void CSSStyleSelector::init(const KHTMLSettings* _settings, DocumentImpl* doc)
 {
 element = 0;
 settings = _settings;
@@ -267,7 +268,7 @@
 pseudoProps = (CSSOrderedProperty **)malloc(128*sizeof(CSSOrderedProperty *));
 propsToApplySize = 128;
 pseudoPropsSize = 128;
- if(!s_defaultStyle) loadDefaultStyle(settings);
+ if(!s_defaultStyle) loadDefaultStyle(settings, doc);
 
 defaultStyle = s_defaultStyle;
 defaultPrintStyle = s_defaultPrintStyle;
@@ -291,7 +292,7 @@
 authorStyle->append( sheet, m_medium );
 }
 
-void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s)
+void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s, DocumentImpl *doc)
 {
 if(s_defaultStyle) return;
 
@@ -310,7 +311,7 @@
 	 style += s->settingsToCSS();
 	DOMString str(style);
 
-	s_defaultSheet = new DOM::CSSStyleSheetImpl((DOM::CSSStyleSheetImpl * ) 0);
+	s_defaultSheet = new DOM::CSSStyleSheetImpl(doc);
 	s_defaultSheet->parseString( str );
 
 	// Collect only strict-mode rules.
@@ -333,7 +334,7 @@
 	QString style = QString::fromLatin1( file.data() );
 	DOMString str(style);
 
-	s_quirksSheet = new DOM::CSSStyleSheetImpl((DOM::CSSStyleSheetImpl * ) 0);
+	s_quirksSheet = new DOM::CSSStyleSheetImpl(doc);
 	s_quirksSheet->parseString( str );
 
 	// Collect only quirks-mode rules.
@@ -461,6 +462,9 @@
 settings = part->settings();
 paintDeviceMetrics = element->getDocument()->paintDeviceMetrics();
 
+ // reset dynamic DOM dependencies
+ e->getDocument()->dynamicDomRestyler().resetDependencies(e);
+
 style = new RenderStyle();
 if( parentStyle )
 style->inheritFrom( parentStyle );
@@ -773,8 +777,6 @@
 return numProps;
 }
 
-static bool subject;
-
 // modified version of the one in kurl.cpp
 static void cleanpath(QString &path)
 {
@@ -813,16 +815,14 @@
 //kdDebug() << "checkPseudoState " << path << endl;
 }
 
-static void checkPseudoState( const CSSStyleSelector::Encodedurl& encodedurl, DOM::ElementImpl *e )
+static PseudoState checkPseudoState( const CSSStyleSelector::Encodedurl& encodedurl, DOM::ElementImpl *e )
 {
 if( e->id() != ID_A ) {
- pseudoState = PseudoNone;
- return;
+ return PseudoNone;
 }
 DOMString attr = e->getAttribute(ATTR_HREF);
 if( attr.isNull() ) {
- pseudoState = PseudoNone;
- return;
+ return PseudoNone;
 }
 QConstString cu(attr.unicode(), attr.length());
 QString u = cu.string();
@@ -839,11 +839,11 @@
 bool contains = KHTMLFactory::vLinks()->contains( u );
 if ( !contains && u.contains('/')==2 )
 contains = KHTMLFactory::vLinks()->contains( u+'/' );
- pseudoState = contains ? PseudoVisited : PseudoLink;
+ return contains ? PseudoVisited : PseudoLink;
 }
 
 // a helper function for parsing nth-arguments
-static inline bool matchNth(int count, const QString& nth)
+static bool matchNth(int count, const QString& nth)
 {
 if (nth.isEmpty()) return false;
 int a = 0;
@@ -898,121 +898,153 @@
 return false;
 }
 
-void CSSStyleSelector::checkSelector(int selIndex, DOM::ElementImpl *e)
+
+// Recursively work the combinator to compute static attribute dependency, similar to
+//structure of checkSubSelectors
+static void precomputeAttributeDependenciesAux(DOM::DocumentImpl* doc, DOM::CSSSelector* sel, bool isAncestor, bool isSubject)
 {
- dynamicPseudo = RenderStyle::NOPSEUDO;
+ if(sel->attr)
+ {
+ // Sets up global dependencies of attributes
+ if (isSubject)
+ doc->dynamicDomRestyler().addDependency(sel->attr, PersonalDependency);
+ else if (isAncestor)
+ doc->dynamicDomRestyler().addDependency(sel->attr, AncestorDependency);
+ else
+ doc->dynamicDomRestyler().addDependency(sel->attr, PredecessorDependency);
+ }
 
- NodeImpl *n = e;
+ CSSSelector::Relation relation = sel->relation;
+ sel = sel->tagHistory;
+ if (!sel) return;
 
- selectorCache[ selIndex ].state = Invalid;
- CSSSelector *sel = selectors[ selIndex ];
+ switch(relation)
+ {
+ case CSSSelector::Descendant:
+ case CSSSelector::Child:
+ precomputeAttributeDependenciesAux(doc, sel, true, false);
+ break;
+ case CSSSelector::IndirectAdjacent:
+ case CSSSelector::DirectAdjacent:
+ precomputeAttributeDependenciesAux(doc, sel, false, false);
+ break;
+ case CSSSelector::SubSelector:
+ precomputeAttributeDependenciesAux(doc, sel, isAncestor, isSubject);
+ break;
+ }
+}
 
- // we have the subject part of the selector
- subject = true;
+void CSSStyleSelector::precomputeAttributeDependencies(DOM::DocumentImpl* doc, DOM::CSSSelector* sel)
+{
+ precomputeAttributeDependenciesAux(doc, sel, false, true);
+}
 
- // We track whether or not the rule contains only :hover and :active in a simple selector. If
- // so, we can't allow that to apply to every element on the page. We assume the author intended
- // to apply the rules only to links.
- bool onlyHoverActive = (sel->tag == anyQName &&
- (sel->match == CSSSelector::PseudoClass &&
- (sel->pseudoType() == CSSSelector::PseudoHover ||
- sel->pseudoType() == CSSSelector::PseudoActive)));
- bool affectedByHover = style->affectedByHoverRules();
- bool affectedByActive = style->affectedByActiveRules();
+// Recursive check of combinators to support nondeterministic matching
+DOM::NodeImpl* CSSStyleSelector::checkSubSelectors(DOM::CSSSelector *sel, DOM::NodeImpl * n, bool isAncestor)
+{
+ if(!n->isElementNode()) return 0;
 
- // first selector has to match
- if(!checkOneSelector(sel, e)) return;
+ CSSSelector::Relation relation = sel->relation;
+ sel = sel->tagHistory;
+ if (!sel) return n;
 
- // check the subselectors
- CSSSelector::Relation relation = sel->relation;
- while((sel = sel->tagHistory))
+ switch(relation)
 {
- if(!n->isElementNode()) return;
- switch(relation)
+ case CSSSelector::Descendant:
+ {
+ ElementImpl *elem = 0;
+ while(true)
 {
- case CSSSelector::Descendant:
- {
- bool found = false;
- while(!found)
- {
-		subject = false;
- n = n->parentNode();
- if(!n || !n->isElementNode()) return;
- ElementImpl *elem = static_cast<ElementImpl *>(n);
- if(checkOneSelector(sel, elem)) found = true;
+ n = n->parentNode();
+ if(!n || !n->isElementNode()) return 0;
+ elem = static_cast<ElementImpl *>(n);
+ // Found one matching element
+ if(checkOneSelector(sel, elem, true)) {
+ // Check the rest of the combinators
+ if (checkSubSelectors(sel, n, true)) {
+ return n;
+ }
 }
- break;
 }
- case CSSSelector::Child:
+ return 0;
+ }
+ case CSSSelector::Child:
+ {
+ n = n->parentNode();
+ if (!strictParsing)
+ while (n && n->implicitNode()) n = n->parentNode();
+ if(!n || !n->isElementNode()) return 0;
+ ElementImpl *elem = static_cast<ElementImpl *>(n);
+ if(!checkOneSelector(sel, elem, true)) return 0;
+ break;
+ }
+ case CSSSelector::IndirectAdjacent:
+ {
+ // Sibling selectors always generate structural dependencies
+ // because new inserted element might fullfill them.
+ if (n->parentNode()->isElementNode())
+ element->getDocument()->dynamicDomRestyler().addDependency(element,
+ static_cast<ElementImpl*>(n->parentNode()),
+ StructuralDependency);
+ ElementImpl *elem = 0;
+ while(true)
 {
-	 subject = false;
- n = n->parentNode();
- if (!strictParsing)
- while (n && n->implicitNode()) n = n->parentNode();
- if(!n || !n->isElementNode()) return;
- ElementImpl *elem = static_cast<ElementImpl *>(n);
- if(!checkOneSelector(sel, elem)) return;
- break;
- }
- case CSSSelector::DirectAdjacent:
- {
- subject = false;
 n = n->previousSibling();
 while( n && !n->isElementNode() )
 n = n->previousSibling();
- if( !n ) return;
- ElementImpl *elem = static_cast<ElementImpl *>(n);
- if(!checkOneSelector(sel, elem)) return;
- break;
- }
- case CSSSelector::IndirectAdjacent:
- {
- subject = false;
- ElementImpl *elem = 0;
- do {
- n = n->previousSibling();
- while( n && !n->isElementNode() )
- n = n->previousSibling();
- if( !n ) return;
- elem = static_cast<ElementImpl *>(n);
- } while (!checkOneSelector(sel, elem));
- break;
- }
- case CSSSelector::SubSelector:
-	{
- if (onlyHoverActive)
- onlyHoverActive = (sel->match == CSSSelector::PseudoClass &&
- (sel->pseudoType() == CSSSelector::PseudoHover ||
- sel->pseudoType() == CSSSelector::PseudoActive));
-
-	 //kdDebug() << "CSSOrderedRule::checkSelector" << endl;
-	 ElementImpl *elem = static_cast<ElementImpl *>(n);
-	 // a selector is invalid if something follows :first-xxx
-	 if ( dynamicPseudo != RenderStyle::NOPSEUDO ) {
-		return;
-	 }
-	 if(!checkOneSelector(sel, elem, true)) return;
-	 //kdDebug() << "CSSOrderedRule::checkSelector: passed" << endl;
-	 break;
-	}
- }
- relation = sel->relation;
+ if( !n ) return 0;
+ elem = static_cast<ElementImpl *>(n);
+ if (checkOneSelector(sel, elem, false)) {
+ // Check the rest of the combinators
+ if (checkSubSelectors(sel, n, false)) {
+ return n;
+ }
+ }
+ };
+ return 0;
 }
+ case CSSSelector::DirectAdjacent:
+ {
+ if (n->parentNode()->isElementNode())
+ element->getDocument()->dynamicDomRestyler().addDependency(element,
+ static_cast<ElementImpl*>(n->parentNode()),
+ StructuralDependency);
+ n = n->previousSibling();
+ while( n && !n->isElementNode() )
+ n = n->previousSibling();
+ if( !n ) return 0;
+ ElementImpl *elem = static_cast<ElementImpl *>(n);
+ if(!checkOneSelector(sel, elem, false)) return 0;
+ break;
+ }
+ case CSSSelector::SubSelector:
+ {
+ //kdDebug() << "CSSOrderedRule::checkSelector" << endl;
+ ElementImpl *elem = static_cast<ElementImpl *>(n);
 
- // disallow *:hover, *:active, and *:hover:active except for links
- if (onlyHoverActive && subject) {
- if (pseudoState == PseudoUnknown)
- checkPseudoState( encodedurl, e );
-
- if (pseudoState == PseudoNone) {
- if (!affectedByHover && style->affectedByHoverRules())
- style->setAffectedByHoverRules(false);
- if (!affectedByActive && style->affectedByActiveRules())
- style->setAffectedByActiveRules(false);
- return;
+ if(!checkOneSelector(sel, elem, isAncestor)) return 0;
+ //kdDebug() << "CSSOrderedRule::checkSelector: passed" << endl;
+ break;
 }
 }
+ return checkSubSelectors(sel, n, isAncestor);
+}
 
+void CSSStyleSelector::checkSelector(int selIndex, DOM::ElementImpl * e)
+{
+ assert(e == element); // yes, actually
+
+ dynamicPseudo = RenderStyle::NOPSEUDO;
+
+ selectorCache[ selIndex ].state = Invalid;
+ CSSSelector *sel = selectors[ selIndex ];
+
+ // first selector has to match
+ if(!checkOneSelector(sel, e, true)) return;
+
+ // check the subselectors
+ if(!checkSubSelectors(sel, e, true)) return;
+
 if ( dynamicPseudo != RenderStyle::NOPSEUDO ) {
 	selectorCache[selIndex].state = AppliesPseudo;
 	selectors[ selIndex ]->pseudoId = dynamicPseudo;
@@ -1023,7 +1055,7 @@
 return;
 }
 
-bool CSSStyleSelector::checkOneSelector(DOM::CSSSelector *sel, DOM::ElementImpl *e, bool isSubSelector)
+bool CSSStyleSelector::checkOneSelector(DOM::CSSSelector *sel, DOM::ElementImpl *e, bool isAncestor)
 {
 if(!e)
 return false;
@@ -1035,26 +1067,30 @@
 Q_UINT16 selLocalName = localNamePart(sel->tag);
 Q_UINT16 selNS = namespacePart(sel->tag);
 
- if (localName <= ID_LAST_TAG && e->isHTMLElement())
- ns = xhtmlNamespace; // FIXME: Really want to move away from this complicated hackery and just
- // switch tags and attr names over to AtomicStrings.
+ if (localName <= ID_LAST_TAG && ns == defaultNamespace) {
+ assert(e->isHTMLElement());
+ ns = xhtmlNamespace;
+ }
 
- if ((selLocalName != anyLocalName && localName != selLocalName) ||
- (selNS != anyNamespace && ns != selNS))
- return false;
+ // match on local
+ if (selLocalName != anyLocalName && localName != selLocalName) return false;
+ // match on namespace
+ if (selNS != anyNamespace && ns != selNS) return false;
 }
 
+ DOM::DocumentImpl* doc = e->getDocument();
+
 if(sel->attr)
 {
- DOMString value = e->getAttribute(sel->attr);
- if(value.isNull()) return false; // attribute is not set
+ DOMStringImpl* value = e->getAttributeImpl(sel->attr);
+ if(!value) return false; // attribute is not set
 
 switch(sel->match)
 {
 case CSSSelector::Exact:
- /* attribut values are case insensitive in all HTML modes,
+ /* attribute values are case insensitive in all HTML modes,
 even in the strict ones */
- if ( e->getDocument()->htmlMode() != DocumentImpl::XHtml ) {
+ if ( doc->htmlMode() != DocumentImpl::XHtml ) {
 if ( strcasecmp(sel->value, value) )
 return false;
 } else {
@@ -1070,46 +1106,34 @@
 case CSSSelector::Set:
 break;
 case CSSSelector::Class:
- if (!e->hasClassList()) {
- if( (strictParsing && strcmp(sel->value, value) ) ||
- (!strictParsing && strcasecmp(sel->value, value)))
- return false;
- return true;
- }
- // no break 
+ // no break
 case CSSSelector::List:
 {
- if (sel->match != CSSSelector::Class) {
- const QChar* s = value.unicode();
- int l = value.length();
- while( l && !s->isSpace() )
- l--,s++;
- if (!l) {
-		 // There is no list, just a single item. We can avoid
-		 // allocing QStrings and just treat this as an exact
-		 // match check.
-		 if( (strictParsing && strcmp(sel->value, value) ) ||
-		 (!strictParsing && strcasecmp(sel->value, value)))
-		 return false;
-		 break;
-	 }
- }
+ int sel_len = sel->value.length();
+ int val_len = value->length();
+ // Be smart compare on length first
+ if (sel_len > val_len) return false;
+ // Selector string may not contain spaces
+ if (sel->value.find(' ') != -1) return false;
+ if (sel_len == val_len)
+ return (strictParsing && !strcmp(sel->value, value)) ||
+		 (!strictParsing && !strcasecmp(sel->value, value));
+ // else the value is longer and can be a list
+ if ( sel->match == CSSSelector::Class && !e->hasClassList() ) return false;
 
- // The selector's value can't contain a space, or it's totally bogus.
- // ### check if this can still happen
- if (sel->value.find(' ') != -1)
- return false;
+ QChar* sel_uc = sel->value.unicode();
+ QChar* val_uc = value->unicode();
 
- QString str = value.string();
- QString selStr = sel->value.string();
- const int selStrlen = selStr.length();
+ QConstString sel_str(sel_uc, sel_len);
+ QConstString val_str(val_uc, val_len);
+
 int pos = 0;
 for ( ;; ) {
- pos = str.find(selStr, pos, strictParsing);
+ pos = val_str.string().find(sel_str.string(), pos, strictParsing);
 if ( pos == -1 ) return false;
- if ( pos == 0 || str[pos-1].isSpace() ) {
- uint endpos = pos + selStrlen;
- if ( endpos >= str.length() || str[endpos].isSpace() )
+ if ( pos == 0 || val_uc[pos-1].isSpace() ) {
+ int endpos = pos + sel_len;
+ if ( endpos >= val_len || val_uc[endpos].isSpace() )
 break; // We have a match.
 }
 ++pos;
@@ -1119,39 +1143,31 @@
 case CSSSelector::Contain:
 {
 //kdDebug( 6080 ) << "checking for contains match" << endl;
- QString str = value.string();
- QString selStr = sel->value.string();
- int pos = str.find(selStr, 0, strictParsing);
- if(pos == -1) return false;
- break;
+ QConstString val_str(value->unicode(), value->length());
+ QConstString sel_str(sel->value.unicode(), sel->value.length());
+ return val_str.string().contains(sel_str.string());
 }
 case CSSSelector::Begin:
 {
 //kdDebug( 6080 ) << "checking for beginswith match" << endl;
- QString str = value.string();
- QString selStr = sel->value.string();
- int pos = str.find(selStr, 0, strictParsing);
- if(pos != 0) return false;
- break;
+ QConstString val_str(value->unicode(), value->length());
+ QConstString sel_str(sel->value.unicode(), sel->value.length());
+ return val_str.string().startsWith(sel_str.string());
 }
 case CSSSelector::End:
 {
 //kdDebug( 6080 ) << "checking for endswith match" << endl;
- QString str = value.string();
- QString selStr = sel->value.string();
-	 if (strictParsing && !str.endsWith(selStr)) return false;
-	 if (!strictParsing) {
-	 int pos = str.length() - selStr.length();
-		if (pos < 0 || pos != str.find(selStr, pos, false) )
-		 return false;
-	 }
- break;
+ QConstString val_str(value->unicode(), value->length());
+ QConstString sel_str(sel->value.unicode(), sel->value.length());
+ return val_str.string().endsWith(sel_str.string());
 }
 case CSSSelector::Hyphen:
 {
 //kdDebug( 6080 ) << "checking for hyphen match" << endl;
- QString str = value.string();
- QString selStr = sel->value.string();
+ QConstString val_str(value->unicode(), value->length());
+ QConstString sel_str(sel->value.unicode(), sel->value.length());
+ const QString& str = val_str.string();
+ const QString& selStr = sel_str.string();
 if(str.length() < selStr.length()) return false;
 // Check if str begins with selStr:
 if(str.find(selStr, 0, strictParsing) != 0) return false;
@@ -1166,22 +1182,38 @@
 break;
 }
 }
+
 if(sel->match == CSSSelector::PseudoClass || sel->match == CSSSelector::PseudoElement)
 {
 	switch (sel->pseudoType()) {
 // Pseudo classes:
 	case CSSSelector::PseudoEmpty:
+ doc->dynamicDomRestyler().addDependency(element, e, BackwardsStructuralDependency);
 // If e is not closed yet we don't know the number of children
 if (!e->closed()) {
- e->setRestyleSelfLate();
 return false;
 }
 if (!e->firstChild())
 return true;
+ else {
+ // check for empty text nodes
+ NodeImpl *t = e->firstChild();
+
+ while (t && t->isTextNode() && static_cast<TextImpl*>(t)->length() == 0) t = t->nextSibling();
+
+ if (t == 0)
+ return true;
+ else
+ return false;
+ }
 break;
 	case CSSSelector::PseudoFirstChild: {
 	 // first-child matches the first child that is an element!
 if (e->parentNode() && e->parentNode()->isElementNode()) {
+ // Handle dynamic DOM changes
+ doc->dynamicDomRestyler().addDependency(element,
+ static_cast<ElementImpl*>(e->parentNode()),
+ StructuralDependency);
 DOM::NodeImpl* n = e->previousSibling();
 while ( n && !n->isElementNode() )
 n = n->previousSibling();
@@ -1193,9 +1225,12 @@
 case CSSSelector::PseudoLastChild: {
 // last-child matches the last child that is an element!
 if (e->parentNode() && e->parentNode()->isElementNode()) {
+ // Handle unfinished parsing and dynamic DOM changes
+ doc->dynamicDomRestyler().addDependency(element,
+ static_cast<ElementImpl*>(e->parentNode()),
+ BackwardsStructuralDependency);
 if (!e->parentNode()->closed()) {
- e->setRestyleLate();
- static_cast<ElementImpl*>(e->parentNode())->setRestyleChildrenLate();
+// kdDebug(6080) << e->nodeName().string() << "::last-child: Parent unclosed" << endl;
 return false;
 }
 DOM::NodeImpl* n = e->nextSibling();
@@ -1209,9 +1244,10 @@
 case CSSSelector::PseudoOnlyChild: {
 // If both first-child and last-child apply, then only-child applies.
 if (e->parentNode() && e->parentNode()->isElementNode()) {
+ doc->dynamicDomRestyler().addDependency(element,
+ static_cast<ElementImpl*>(e->parentNode()),
+ BackwardsStructuralDependency);
 if (!e->parentNode()->closed()) {
- e->setRestyleLate();
- static_cast<ElementImpl*>(e->parentNode())->setRestyleChildrenLate();
 return false;
 }
 DOM::NodeImpl* n = e->previousSibling();
@@ -1230,13 +1266,16 @@
 case CSSSelector::PseudoNthChild: {
 	 // nth-child matches every (a*n+b)th element!
 if (e->parentNode() && e->parentNode()->isElementNode()) {
+ doc->dynamicDomRestyler().addDependency(element,
+ static_cast<ElementImpl*>(e->parentNode()),
+ StructuralDependency);
 int count = 1;
 DOM::NodeImpl* n = e->previousSibling();
 while ( n ) {
 if (n->isElementNode()) count++;
 n = n->previousSibling();
 }
- kdDebug(6080) << "NthChild " << count << "=" << sel->string_arg << endl;
+// kdDebug(6080) << "NthChild " << count << "=" << sel->string_arg << endl;
 if (matchNth(count,sel->string_arg.string()))
 return true;
 }
@@ -1244,9 +1283,10 @@
 }
 case CSSSelector::PseudoNthLastChild: {
 if (e->parentNode() && e->parentNode()->isElementNode()) {
+ doc->dynamicDomRestyler().addDependency(element,
+ static_cast<ElementImpl*>(e->parentNode()),
+ BackwardsStructuralDependency);
 if (!e->parentNode()->closed()) {
- e->setRestyleLate();
- static_cast<ElementImpl*>(e->parentNode())->setRestyleChildrenLate();
 return false;
 }
 int count = 1;
@@ -1264,6 +1304,9 @@
 	case CSSSelector::PseudoFirstOfType: {
 	 // first-of-type matches the first element of its type!
 if (e->parentNode() && e->parentNode()->isElementNode()) {
+ doc->dynamicDomRestyler().addDependency(element,
+ static_cast<ElementImpl*>(e->parentNode()),
+ StructuralDependency);
 const DOMString& type = e->tagName();
 DOM::NodeImpl* n = e->previousSibling();
 while ( n ) {
@@ -1279,9 +1322,10 @@
 case CSSSelector::PseudoLastOfType: {
 // last-child matches the last child that is an element!
 if (e->parentNode() && e->parentNode()->isElementNode()) {
+ doc->dynamicDomRestyler().addDependency(element,
+ static_cast<ElementImpl*>(e->parentNode()),
+ BackwardsStructuralDependency);
 if (!e->parentNode()->closed()) {
- e->setRestyleLate();
- static_cast<ElementImpl*>(e->parentNode())->setRestyleChildrenLate();
 return false;
 }
 const DOMString& type = e->tagName();
@@ -1299,9 +1343,10 @@
 case CSSSelector::PseudoOnlyOfType: {
 // If both first-of-type and last-of-type apply, then only-of-type applies.
 if (e->parentNode() && e->parentNode()->isElementNode()) {
+ doc->dynamicDomRestyler().addDependency(element,
+ static_cast<ElementImpl*>(e->parentNode()),
+ BackwardsStructuralDependency);
 if (!e->parentNode()->closed()) {
- e->setRestyleLate();
- static_cast<ElementImpl*>(e->parentNode())->setRestyleChildrenLate();
 return false;
 }
 const DOMString& type = e->tagName();
@@ -1321,6 +1366,9 @@
 case CSSSelector::PseudoNthOfType: {
 	 // nth-of-type matches every (a*n+b)th element of this type!
 if (e->parentNode() && e->parentNode()->isElementNode()) {
+ doc->dynamicDomRestyler().addDependency(element,
+ static_cast<ElementImpl*>(e->parentNode()),
+ StructuralDependency);
 int count = 1;
 const DOMString& type = e->tagName();
 DOM::NodeImpl* n = e->previousSibling();
@@ -1336,9 +1384,10 @@
 }
 case CSSSelector::PseudoNthLastOfType: {
 if (e->parentNode() && e->parentNode()->isElementNode()) {
+ doc->dynamicDomRestyler().addDependency(element,
+ static_cast<ElementImpl*>(e->parentNode()),
+ BackwardsStructuralDependency);
 if (!e->parentNode()->closed()) {
- e->setRestyleLate();
- static_cast<ElementImpl*>(e->parentNode())->setRestyleChildrenLate();
 return false;
 }
 int count = 1;
@@ -1355,60 +1404,85 @@
 break;
 }
 case CSSSelector::PseudoTarget:
- if (e == e->getDocument()->getCSSTarget())
+ if (e == doc->getCSSTarget())
 return true;
 break;
+ case CSSSelector::PseudoRoot:
+ if (e == doc->documentElement())
+ return true;
+ break;
 	case CSSSelector::PseudoLink:
-	 if ( pseudoState == PseudoUnknown )
- checkPseudoState( encodedurl, e );
-	 if ( pseudoState == PseudoLink )
-		return true;
+	 if (e == element) {
+	 // cache pseudoState
+	 if ( pseudoState == PseudoUnknown )
+ pseudoState = checkPseudoState( encodedurl, e );
+ if ( pseudoState == PseudoLink )
+ return true;
+ } else
+ return checkPseudoState( encodedurl, e ) == PseudoLink;
 	 break;
 	case CSSSelector::PseudoVisited:
-	 if ( pseudoState == PseudoUnknown )
- checkPseudoState( encodedurl, e );
-	 if ( pseudoState == PseudoVisited )
-		return true;
+	 if (e == element) {
+ // cache pseudoState
+ if ( pseudoState == PseudoUnknown )
+ pseudoState = checkPseudoState( encodedurl, e );
+ if ( pseudoState == PseudoVisited )
+ return true;
+ } else
+ return checkPseudoState( encodedurl, e ) == PseudoVisited;
 	 break;
 case CSSSelector::PseudoHover: {
-	 // If we're in quirks mode, then hover should never match anchors with no
-	 // href and *:hover should not match anything. This is important for sites like wsj.com.
-	 if (strictParsing || isSubSelector || sel->relation == CSSSelector::SubSelector || (sel->tag != anyQName && e->id() != ID_A) || e->hasAnchor()) {
-		if (element == e)
-		 style->setAffectedByHoverRules(true);
-		if (e->renderer()) {
-		 if (element != e)
-			e->renderer()->style()->setAffectedByHoverRules(true);
-		 if (e->renderer()->mouseInside())
-			return true;
-		}
-	 }
-	 break;
+	 // If we're in quirks mode, then *:active should only match focusable elements, and never
+	 // unfocusable anchors.
+	 if (strictParsing || (sel->tag != anyQName && e->id() != ID_A) || e->isFocusable()) {
+ doc->dynamicDomRestyler().addDependency(element, e, HoverDependency);
+
+ if (e->hovered())
+ return true;
 }
-	case CSSSelector::PseudoFocus:
-	 if (e && e->focused()) {
-		return true;
-	 }
-	 break;
+ break;
+ }
 	case CSSSelector::PseudoActive:
-	 // If we're in quirks mode, then :active should never match anchors with no
-	 // href.
-	 if (strictParsing || isSubSelector || sel->relation == CSSSelector::SubSelector || (sel->tag != anyQName && e->id() != ID_A) || e->hasAnchor()) {
-		if (element == e)
-		 style->setAffectedByActiveRules(true);
-		else if (e->renderer())
-		 e->renderer()->style()->setAffectedByActiveRules(true);
+	 // If we're in quirks mode, then *:active should only match focusable elements
+	 if (strictParsing || (sel->tag != anyQName && e->id() != ID_A) || e->isFocusable()) {
+ doc->dynamicDomRestyler().addDependency(element, e, ActiveDependency);
+
 		if (e->active())
 		 return true;
 	 }
 	 break;
- case CSSSelector::PseudoRoot:
- if (e == e->getDocument()->documentElement())
- return true;
+	case CSSSelector::PseudoFocus:
+	 if (e != element && e->isFocusable()) {
+ // *:focus is a default style, no need to track it.
+ doc->dynamicDomRestyler().addDependency(element, e, OtherStateDependency);
+ }
+ if (e->focused()) return true;
 break;
 case CSSSelector::PseudoLang: {
+ // Set dynamic attribute dependency
+ if (e == element) {
+ doc->dynamicDomRestyler().addDependency(ATTR_LANG, PersonalDependency);
+ doc->dynamicDomRestyler().addDependency(ATTR_LANG, AncestorDependency);
+ }
+ else if (isAncestor)
+ doc->dynamicDomRestyler().addDependency(ATTR_LANG, AncestorDependency);
+ else
+ doc->dynamicDomRestyler().addDependency(ATTR_LANG, PredecessorDependency);
+ // ### check xml:lang attribute in XML and XHTML documents
 DOMString value = e->getAttribute(ATTR_LANG);
- if (value.isNull()) return false;
+ // The LANG attribute is inherited like a property
+ NodeImpl *n = e->parent();;
+ while (n && value.isEmpty()) {
+ if (n->isElementNode()) {
+ value = static_cast<ElementImpl*>(n)->getAttribute(ATTR_LANG);
+ } else
+ if (n->isDocumentNode()) {
+ value = static_cast<DocumentImpl*>(n)->contentLanguage();
+ }
+ n = n->parent();
+ }
+ if (value.isEmpty()) return false;
+
 QString langAttr = value.string();
 QString langSel = sel->string_arg.string();
 
@@ -1429,13 +1503,14 @@
 // but it is, so let's honor it.
 if (subSel->simpleSelector)
 break;
- if (!checkOneSelector(subSel, e))
+ if (!checkOneSelector(subSel, e, isAncestor))
 return true;
 }
 break;
 }
 case CSSSelector::PseudoEnabled: {
 if (e->isGenericFormElement()) {
+ doc->dynamicDomRestyler().addDependency(element, e, OtherStateDependency);
 HTMLGenericFormElementImpl *form;
 form = static_cast<HTMLGenericFormElementImpl*>(e);
 return !form->disabled();
@@ -1444,6 +1519,7 @@
 }
 case CSSSelector::PseudoDisabled: {
 if (e->isGenericFormElement()) {
+ doc->dynamicDomRestyler().addDependency(element, e, OtherStateDependency);
 HTMLGenericFormElementImpl *form;
 form = static_cast<HTMLGenericFormElementImpl*>(e);
 return form->disabled();
@@ -1452,9 +1528,9 @@
 }
 case CSSSelector::PseudoContains: {
 if (e->isHTMLElement()) {
+ doc->dynamicDomRestyler().addDependency(element, e, BackwardsStructuralDependency);
 if (!e->closed()) {
- e->setRestyleSelfLate();
- return false;
+ return false;
 }
 HTMLElementImpl *elem;
 elem = static_cast<HTMLElementImpl*>(e);
@@ -1465,35 +1541,60 @@
 }
 break;
 }
-	case CSSSelector::PseudoChecked:
-	case CSSSelector::PseudoIndeterminate:
-	 /* not supported for now */
+	case CSSSelector::PseudoChecked: {
+ if (e->isHTMLElement() && e->id() == ID_INPUT) {
+ doc->dynamicDomRestyler().addDependency(element, e, OtherStateDependency);
+ return (static_cast<HTMLInputElementImpl*>(e)->checked());
+ }
+ return false;
+ }
+ 	case CSSSelector::PseudoIndeterminate: {
+#if 0
+ if (e->isHTMLElement() && e->id() == ID_INPUT) {
+ return (static_cast<HTMLInputElementImpl*>(e)->indeterminate() &&
+ !static_cast<HTMLInputElementImpl*>(e)->checked());
+ }
+ return false;
+#endif
+ }
 	case CSSSelector::PseudoOther:
 	 break;
 
 	// Pseudo-elements:
 	case CSSSelector::PseudoFirstLine:
-	 if ( subject ) {
-		dynamicPseudo=RenderStyle::FIRST_LINE;
-		return true;
-	 }
-	 break;
 	case CSSSelector::PseudoFirstLetter:
-	 if ( subject ) {
-		dynamicPseudo=RenderStyle::FIRST_LETTER;
-		return true;
-	 }
-	 break;
 	case CSSSelector::PseudoSelection:
-	 dynamicPseudo = RenderStyle::SELECTION;
-	 return true;
 	case CSSSelector::PseudoBefore:
-	 dynamicPseudo = RenderStyle::BEFORE;
-	 return true;
 	case CSSSelector::PseudoAfter:
-	 dynamicPseudo = RenderStyle::AFTER;
-	 return true;
+	 // Pseudo-elements can only apply to subject
+	 if ( e == element ) {
+ // Pseudo-elements has to be the last sub-selector on subject
+ if (sel->tagHistory && sel->relation == CSSSelector::SubSelector) return false;
 
+ assert(dynamicPseudo == RenderStyle::NOPSEUDO);
+
+ switch (sel->pseudoType()) {
+ case CSSSelector::PseudoFirstLine:
+ dynamicPseudo = RenderStyle::FIRST_LINE;
+ break;
+ case CSSSelector::PseudoFirstLetter:
+ dynamicPseudo = RenderStyle::FIRST_LETTER;
+ break;
+ case CSSSelector::PseudoSelection:
+ dynamicPseudo = RenderStyle::SELECTION;
+ break;
+ case CSSSelector::PseudoBefore:
+ dynamicPseudo = RenderStyle::BEFORE;
+ break;
+ case CSSSelector::PseudoAfter:
+ dynamicPseudo = RenderStyle::AFTER;
+ break;
+ default:
+ assert(false);
+ }
+		return true;
+	 }
+	 break;
 	case CSSSelector::PseudoNotParsed:
 	 assert(false);
 	 break;
@@ -3198,32 +3299,33 @@
 CSSValueListImpl *list = static_cast<CSSValueListImpl *>(value);
 int len = list->length();
 
+ style->setContentNormal(); // clear the content
+
 for(int i = 0; i < len; i++) {
 CSSValueImpl *item = list->item(i);
 if(!item->isPrimitiveValue()) continue;
 CSSPrimitiveValueImpl *val = static_cast<CSSPrimitiveValueImpl *>(item);
 if(val->primitiveType()==CSSPrimitiveValue::CSS_STRING)
 {
- style->setContent(val->getStringValue(), i != 0);
+ style->addContent(val->getStringValue());
 }
 else if (val->primitiveType()==CSSPrimitiveValue::CSS_ATTR)
 {
-#ifdef APPLE_CHANGES
- int attrID = element->getDocument()->attrId(0, val->getStringValue(), false);
-#else
+ // TODO: setup dynamic attribute dependencies
 int attrID = element->getDocument()->getId(NodeImpl::AttributeId, val->getStringValue(), false, true);
-#endif
 if (attrID)
- style->setContent(element->getAttribute(attrID).implementation(), i != 0);
+ style->addContent(element->getAttribute(attrID).implementation());
+ else
+ kdDebug(6080) << "Attribute \"" << val->getStringValue() << "\" not found" << endl;
 }
 else if (val->primitiveType()==CSSPrimitiveValue::CSS_URI)
 {
 CSSImageValueImpl *image = static_cast<CSSImageValueImpl *>(val);
- style->setContent(image->image(), i != 0);
+ style->addContent(image->image());
 }
 else if (val->primitiveType()==CSSPrimitiveValue::CSS_COUNTER)
 {
- style->setContent(val->getCounterValue(), i != 0);
+ style->addContent(val->getCounterValue());
 }
 else if (val->primitiveType()==CSSPrimitiveValue::CSS_IDENT)
 {
@@ -3244,8 +3346,9 @@
 default:
 assert(false);
 }
- style->setContent(quote, i != 0);
- }
+ style->addContent(quote);
+ } else
+ kdDebug(6080) << "Unrecognized CSS content" << endl;
 
 }
 break;
Index: khtml/css/cssparser.h
===================================================================
--- khtml/css/cssparser.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/css/cssparser.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -108,6 +108,8 @@
 
 	DOM::DocumentImpl *document() const;
 
+	unsigned int defaultNamespace();
+
 	void addProperty( int propId, CSSValueImpl *value, bool important );
 	bool hasProperties() const { return numParsedProperties > 0; }
 	CSSStyleDeclarationImpl *createStyleDeclaration( CSSStyleRuleImpl *rule );
@@ -145,6 +147,7 @@
 // CSS3 Parsing Routines (for properties specific to CSS3)
 bool parseShadow(int propId, bool important);
 
+
 public:
 	bool strict;
 	bool important;
@@ -157,7 +160,6 @@
 	int numParsedProperties;
 	int maxParsedProperties;
 	bool inParseShortHand;
-	unsigned int defaultNamespace;
 	static CSSParser *currentParser;
 
 	// tokenizer methods and data
Index: khtml/css/css_valueimpl.h
===================================================================
--- khtml/css/css_valueimpl.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/css/css_valueimpl.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -360,13 +360,13 @@
 // Used for counter-reset and counter-increment
 class CounterActImpl : public CSSValueImpl {
 public:
- CounterActImpl(DOM::DOMString &c, short v) : m_counter(c), m_value(v) { }
+ CounterActImpl(const DOMString &c, short v) : m_counter(c), m_value(v) { }
 virtual ~CounterActImpl() {};
 
 virtual unsigned short cssValueType() const { return CSSValue::CSS_CUSTOM; }
 virtual DOM::DOMString cssText() const;
 
- DOMString counter() const { return m_counter; }
+ const DOMString& counter() const { return m_counter; }
 short value() const { return m_value; }
 void setValue( const short v ) { m_value = v; }
 
Index: khtml/css/css_stylesheetimpl.cpp
===================================================================
--- khtml/css/css_stylesheetimpl.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/css/css_stylesheetimpl.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -113,6 +113,7 @@
 m_doc = 0;
 m_implicit = false;
 m_namespaces = 0;
+ m_defaultNamespace = anyNamespace;
 }
 
 CSSStyleSheetImpl::CSSStyleSheetImpl(DOM::NodeImpl *parentNode, DOMString href, bool _implicit)
@@ -122,6 +123,7 @@
 m_doc = parentNode->getDocument();
 m_implicit = _implicit;
 m_namespaces = 0;
+ m_defaultNamespace = anyNamespace;
 }
 
 CSSStyleSheetImpl::CSSStyleSheetImpl(CSSRuleImpl *ownerRule, DOMString href)
@@ -131,6 +133,7 @@
 m_doc = 0;
 m_implicit = false;
 m_namespaces = 0;
+ m_defaultNamespace = anyNamespace;
 }
 
 CSSStyleSheetImpl::CSSStyleSheetImpl(DOM::NodeImpl *parentNode, CSSStyleSheetImpl *orig)
@@ -146,6 +149,7 @@
 m_doc = parentNode->getDocument();
 m_implicit = false;
 m_namespaces = 0;
+ m_defaultNamespace = anyNamespace;
 }
 
 CSSStyleSheetImpl::CSSStyleSheetImpl(CSSRuleImpl *ownerRule, CSSStyleSheetImpl *orig)
@@ -162,6 +166,7 @@
 m_doc = 0;
 m_implicit = false;
 m_namespaces = 0;
+ m_defaultNamespace = anyNamespace;
 }
 
 CSSRuleImpl *CSSStyleSheetImpl::ownerRule() const
@@ -216,10 +221,11 @@
 
 m_namespaces = new CSSNamespace(prefix, uri, m_namespaces);
 
- if (prefix.isEmpty())
- // Set the default namespace on the parser so that selectors that omit namespace info will
- // be able to pick it up easily.
- p->defaultNamespace = m_doc->getId(NodeImpl::NamespaceId, uri.implementation(), false, false, &exceptioncode);
+ if (prefix.isEmpty()) {
+ Q_ASSERT(m_doc != 0);
+
+ m_defaultNamespace = m_doc->getId(NodeImpl::NamespaceId, uri.implementation(), false, false, &exceptioncode);
+ }
 }
 
 void CSSStyleSheetImpl::determineNamespace(Q_UINT32& id, const DOM::DOMString& prefix)
@@ -230,15 +236,19 @@
 return;
 
 if (prefix.isEmpty())
- id = makeId(noNamespace, localNamePart(id)); // No namespace. If an element/attribute has a namespace, e won't match it.
+ id = makeId(emptyNamespace, localNamePart(id)); // No namespace. If an element/attribute has a namespace, we won't match it.
 else if (prefix == "*")
 id = makeId(anyNamespace, localNamePart(id)); // We'll match any namespace.
 else {
 int exceptioncode = 0;
 CSSNamespace* ns = m_namespaces->namespaceForPrefix(prefix);
- if (ns)
+ if (ns) {
+ Q_ASSERT(m_doc != 0);
+
 // Look up the id for this namespace URI.
- id = makeId(m_doc->getId(NodeImpl::NamespaceId, ns->uri().implementation(), false, false, &exceptioncode), localNamePart(id));
+ Q_UINT16 nsid = m_doc->getId(NodeImpl::NamespaceId, 0, 0, ns->uri().implementation(), false, false, &exceptioncode);
+ id = makeId(nsid, localNamePart(id));
+ }
 }
 }
 
Index: khtml/misc/stringit.h
===================================================================
--- khtml/misc/stringit.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/misc/stringit.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -113,6 +113,11 @@
 TokenizerString() : m_currentChar(0), m_lines(0), m_composite(false) {}
 TokenizerString(const QChar *str, int length) : m_currentString(str, length), m_currentChar(m_currentString.m_current), m_lines(0), m_composite(false) {}
 TokenizerString(const QString &str) : m_currentString(str), m_currentChar(m_currentString.m_current), m_lines(0), m_composite(false) {}
+ TokenizerString(const TokenizerString &o) : m_pushedChar1(o.m_pushedChar1), m_pushedChar2(o.m_pushedChar2),
+ m_currentString(o.m_currentString), m_substrings(o.m_substrings),
+ m_lines(o.m_lines), m_composite(o.m_composite) { 
+ m_currentChar = m_pushedChar1.isNull() ? m_currentString.m_current : &m_pushedChar1; 
+ } 
 
 void clear();
 
@@ -173,6 +178,25 @@
 
 };
 
+
+class TokenizerQueue : public QValueList<TokenizerString>
+{
+
+public:
+ TokenizerQueue() {}
+ ~TokenizerQueue() {}
+ void push( const TokenizerString &t ) { prepend(t); }
+ TokenizerString pop() {
+ if (isEmpty()) 
+ return TokenizerString();
+ TokenizerString t(first());
+ remove( begin() );
+ return t;
+ }
+ TokenizerString& top() { return first(); }
+ TokenizerString& bottom() { return last(); }
+};
+
 }
 
 #endif
Index: khtml/misc/multimap.h
===================================================================
--- khtml/misc/multimap.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 0)
+++ khtml/misc/multimap.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -0,0 +1,345 @@
+/*
+ * This file is part of the DOM implementation for KDE.
+ *
+ * Copyright (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef _MultiMap_h_
+#define _MultiMap_h_
+
+#include <qptrdict.h>
+#include <qptrlist.h>
+#include <assert.h>
+#include <stdlib.h>
+
+template<class T> class MultiMapPtrList;
+
+// KMultiMap is an implementaition of a Map with multiple entries per key.
+// It is originally designed to work like a shell for QPtrDict<QPtrList>, but
+// QPtrList have been replaced with a much faster hash set.
+template<class T>
+class KMultiMap {
+public:
+ KMultiMap() : dict(257) { dict.setAutoDelete(true); }
+ ~KMultiMap() {};
+
+ typedef MultiMapPtrList<T> List;
+
+ void append(void* key, T* element) {
+ List *list = dict.find(key);
+ if (!list){
+ list = new List(8);
+ dict.insert(key, list);
+ }
+ list->append(element);
+ }
+ void remove(void* key, T* element) {
+ List *list = dict.find(key);
+ if (list) {
+ list->remove(element);
+ if (list->isEmpty()) dict.remove(key);
+ }
+ }
+ void remove(void* key) {
+ dict.remove(key);
+ }
+ List* find(void* key) {
+ return dict.find(key);
+ }
+private:
+ QPtrDict<List> dict;
+
+};
+
+static inline unsigned int stupidHash(void* ptr)
+{
+ unsigned long val = (unsigned long)ptr;
+ // remove alignment and multiply by a prime unlikely to be a factor of size
+ val = (val >> 4) * 1237;
+ return val;
+}
+
+#define START_PTRLIST_SIZE 4
+#define MAX_PTRLIST_SIZE 27
+
+class PtrListEntry {
+public:
+ PtrListEntry(unsigned int log_size) : count(0), log_size(log_size), search(log_size), next(0) {
+// entry = new T* [size];
+ assert(log_size < MAX_PTRLIST_SIZE);
+ entry = (void**)calloc ((1<<log_size), sizeof(void*));
+ }
+ ~PtrListEntry() {
+// delete[] entry;
+ free(entry);
+ }
+ bool insert(void* e) {
+ unsigned int t_size = size();
+ if (count == t_size) return false;
+ unsigned int hash = stupidHash(e);
+ void** firstFree = 0;
+ // Only let elements be placed 'search' spots from their hash
+ for(unsigned int j=0; j<search; j++) {
+ unsigned int i = (hash + j) & (t_size-1); // modulo size
+ // We need check to all hashes in 'search' to garuantee uniqueness
+ if (entry[i] == 0) {
+ if (!firstFree)
+ firstFree = entry + i;
+ } else
+ if (entry[i] == e)
+ return true;
+ }
+ if (firstFree) {
+ *firstFree = e;
+ count++;
+ return true;
+ }
+ // We had more than 'search' collisions
+ if (count < (t_size/3)*2) {
+ // only 2/3 full => increase search
+ unsigned int s = search *2;
+ if (s >= t_size) s = t_size;
+ search = s;
+ return insert(e);
+ }
+ return false;
+ }
+ // Insert another smaller set into this one
+ // Is only garuantied to succede when this PtrList is new
+ void insert(PtrListEntry* listEntry) {
+ assert(size() >= listEntry->count * 2);
+ unsigned int old_size = 1U << listEntry->log_size;
+ for(unsigned int i = 0; i < old_size; i++) {
+ bool s = true;
+ void *e = listEntry->entry[i];
+ if (e) s = insert(e);
+ assert(s);
+ }
+ }
+ bool remove(void* e) {
+ if (count == 0) return false;
+ unsigned int size = (1U<<log_size);
+ unsigned int hash = stupidHash(e);
+ // Elements are at most placed 'search' spots from their hash
+ for(unsigned int j=0; j<search; j++) {
+ unsigned int i = (hash + j) & (size-1); // modulo size
+ if (entry[i] == e) {
+ entry[i] = 0;
+ count--;
+ return true;
+ }
+ }
+ return false;
+ }
+ bool contains(void* e) {
+ if (count == 0) return false;
+ unsigned int t_size = size();
+ unsigned int hash = stupidHash(e);
+ // Elements are at most placed 'search' spots from their hash
+ for(unsigned int j=0; j<search; j++) {
+ unsigned int i = (hash + j) & (t_size-1); // modulo size
+ if (entry[i] == e) return true;
+ }
+ return false;
+ }
+ void* at(unsigned int i) const {
+ assert (i < (1U<<log_size));
+ return entry[i];
+ }
+ bool isEmpty() const {
+ return count == 0;
+ }
+ bool isFull() const {
+ return count == size();
+ }
+ unsigned int size() const {
+ return (1U << log_size);
+ }
+
+ unsigned int count;
+ const unsigned short log_size;
+ unsigned short search;
+ PtrListEntry *next;
+ void** entry;
+};
+
+// An unsorted and unique PtrList that is implement as a linked list of hash-sets
+// Optimized for fast insert and fast lookup
+template<class T>
+class MultiMapPtrList {
+public:
+ MultiMapPtrList(unsigned int init_size= 16) : m_first(0), m_current(0), m_pos(0) {
+ assert(init_size > 0);
+ unsigned int s = init_size - 1;
+ unsigned int log_size = 0;
+ while (s > 0) {
+ log_size++;
+ s = s >> 1;
+ }
+ m_first = new PtrListEntry(log_size);
+ }
+ MultiMapPtrList(const MultiMapPtrList& ptrList) : m_first(0), m_current(0), m_pos(0) {
+ unsigned int t_count = ptrList.count();
+ unsigned int log_size = 0;
+ while (t_count > 0) {
+ log_size++;
+ t_count = t_count >> 1;
+ }
+ // At least as large as the largest ptrListEntry in the original
+ if (t_count < ptrList.m_first->log_size) log_size = ptrList.m_first->log_size;
+ m_first = new PtrListEntry(log_size);
+
+ PtrListEntry *t_current = ptrList.m_first;
+ while (t_current) {
+ unsigned int t_size = t_current->size();
+ for(unsigned int i=0; i < t_size; i++) {
+ void* e = t_current->at(i);
+ if (e != 0) {
+ bool t = m_first->insert(e);
+ if (!t) {
+ // Make a new, but keep the size
+ PtrListEntry *t_new = new PtrListEntry(log_size);
+ t_new->insert(e);
+ t_new->next = m_first;
+ m_first = t_new;
+ }
+ }
+ }
+ t_current = t_current->next;
+ }
+ }
+ ~MultiMapPtrList() {
+ PtrListEntry *t_next, *t_current = m_first;
+ while (t_current) {
+ t_next = t_current->next;
+ delete t_current;
+ t_current = t_next;
+ }
+ }
+ void append(T* e) {
+ PtrListEntry *t_last = 0, *t_current = m_first;
+ int count = 0;
+ while (t_current) {
+ if (t_current->insert(e)) return;
+ t_last = t_current;
+ t_current = t_current->next;
+ count++;
+ }
+ // Create new hash-set
+ unsigned int newsize = m_first->log_size+1;
+ if (newsize > MAX_PTRLIST_SIZE) newsize = MAX_PTRLIST_SIZE;
+ t_current = new PtrListEntry(newsize);
+ bool t = t_current->insert(e);
+ assert(t);
+ // Prepend it to the list, for insert effeciency
+ t_current->next = m_first;
+ m_first = t_current;
+ // ### rehash some of the smaller sets
+ /*
+ if (count > 4) {
+ // rehash the last in the new
+ t_current->insert(t_last);
+ }*/
+ }
+ void remove(T* e) {
+ PtrListEntry *t_next, *t_last = 0, *t_current = m_first;
+ // Remove has to check every PtrEntry.
+ while (t_current) {
+ t_next = t_current->next;
+ if (t_current->remove(e) && t_current->isEmpty()) {
+ if (t_last) {
+ t_last->next = t_current->next;
+ }
+ else {
+ assert (m_first == t_current);
+ m_first = t_current->next;
+ }
+ delete t_current;
+ } else {
+ t_last = t_current;
+ }
+ t_current = t_next;
+ }
+ }
+ bool contains(T* e) {
+ PtrListEntry *t_current = m_first;
+ while (t_current) {
+ if (t_current->contains(e)) return true;
+ t_current = t_current->next;
+ }
+ return false;
+ }
+ bool isEmpty() {
+ if (!m_first) return true;
+ PtrListEntry *t_current = m_first;
+ while (t_current) {
+ if (!t_current->isEmpty()) return false;
+ t_current = t_current->next;
+ }
+ return true;
+ }
+ unsigned int count() const {
+ unsigned int t_count = 0;
+ PtrListEntry *t_current = m_first;
+ while (t_current) {
+ t_count += t_current->count;
+ t_current = t_current->next;
+ }
+ return t_count;
+ }
+// Iterator functions:
+ T* first() {
+ m_current = m_first;
+ m_pos = 0;
+ // skip holes
+ if (m_current && !m_current->at(m_pos))
+ return next();
+ else
+ return current();
+ }
+ T* current() {
+ if (!m_current)
+ return (T*)0;
+ else
+ return (T*)m_current->at(m_pos);
+ }
+ T* next() {
+ if (!m_current) return (T*)0;
+ m_pos++;
+ if (m_pos >= m_current->size()) {
+ m_current = m_current->next;
+ m_pos = 0;
+ }
+ // skip holes
+ if (m_current && !m_current->at(m_pos))
+ return next();
+ else
+ return current();
+ }
+private:
+ PtrListEntry *m_first;
+// iteration:
+ PtrListEntry *m_current;
+ unsigned int m_pos;
+};
+
+#undef START_PTRLIST_SIZE
+#undef MAX_PTRLIST_SIZE
+
+#endif
Index: khtml/misc/loader.cpp
===================================================================
--- khtml/misc/loader.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/misc/loader.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -1223,17 +1223,17 @@
 // ----------------------------------------------------------------------------
 
 
-QDict<CachedObject> *Cache::cache;
-QPtrList<DocLoader>* Cache::docloader;
-QPtrList<CachedObject> *Cache::freeList;
-Loader *Cache::m_loader;
+QDict<CachedObject> *Cache::cache = 0;
+QPtrList<DocLoader>* Cache::docloader = 0;
+QPtrList<CachedObject> *Cache::freeList = 0;
+Loader *Cache::m_loader = 0;
 
 int Cache::maxSize = DEFCACHESIZE;
 int Cache::totalSizeOfLRU;
 
-QPixmap *Cache::nullPixmap;
-QPixmap *Cache::brokenPixmap;
-QPixmap *Cache::blockedPixmap;
+QPixmap *Cache::nullPixmap = 0;
+QPixmap *Cache::brokenPixmap = 0;
+QPixmap *Cache::blockedPixmap = 0;
 
 void Cache::init()
 {
@@ -1248,7 +1248,7 @@
 
 if ( !brokenPixmap )
 brokenPixmap = new QPixmap(KHTMLFactory::instance()->iconLoader()->loadIcon("file_broken", KIcon::Desktop, 16, KIcon::DisabledState));
- 
+
 if ( !blockedPixmap ) {
 blockedPixmap = new QPixmap();
 blockedPixmap->loadFromData(blocked_icon_data, blocked_icon_len);
@@ -1275,8 +1275,8 @@
 #ifndef NDEBUG
 for (QDictIterator<CachedObject> it(*cache); it.current(); ++it)
 assert(it.current()->canDelete());
- for (QPtrListIterator<CachedObject> it(*freeList); it.current(); ++it)
- assert(it.current()->canDelete());
+ for (freeList->first(); freeList->current(); freeList->next())
+ assert(freeList->current()->canDelete());
 #endif
 
 delete cache; cache = 0;
@@ -1363,9 +1363,12 @@
 #endif
 }
 
- for ( CachedObject* p = freeList->first(); p; p = freeList->next() ) {
+ for ( freeList->first(); freeList->current(); ) {
+ CachedObject* p = freeList->current();
 if ( p->canDelete() )
 freeList->remove();
+ else
+ freeList->next();
 }
 
 }
Index: khtml/khtmlview.h
===================================================================
--- khtml/khtmlview.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/khtmlview.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -171,6 +171,10 @@
 
 
 signals:
+ /**
+ * This signal is used for internal layouting. Don't use it to check if rendering finished.
+ * Use @ref KHTMLPart completed() signal instead.
+ */
 void finishedLayout();
 void cleared();
 void zoomView( int );
Index: khtml/test_regression.cpp
===================================================================
--- khtml/test_regression.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/test_regression.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -132,7 +132,7 @@
 void PartMonitor::waitForCompletion()
 {
 if (!m_completed) {
- 
+
 if (sm_highestMonitor)
 		return;
 
@@ -466,18 +466,17 @@
 }
 }
 
- if ( ::access( "/usr/X11R6/bin/Xvfb", X_OK ) ) {
- fprintf( stderr, "ERROR: We need /usr/X11R6/bin/Xvfb to be installed for reliable results\n" );
- exit( 1 );
- }
-
-
 if (args->isSet("xvfb"))
 {
+ if ( ::access( "/usr/X11R6/bin/Xvfb", X_OK ) ) {
+ fprintf( stderr, "ERROR: We need /usr/X11R6/bin/Xvfb to be installed for reliable results\n" );
+ exit( 1 );
+ }
+
 xvfb = fork();
 if ( !xvfb ) {
 char buffer[1000];
- sprintf( buffer, "%s/resources,/usr/X11R6/lib/X11/fonts/75dpi:unscaled,/usr/X11R6/lib/X11/fonts/misc:unscaled,/usr/X11R6/lib/X11/fonts/Type1", (const char *)baseDir );
+ sprintf( buffer, "%s/resources,/usr/X11R6/lib/X11/fonts/75dpi:unscaled,/usr/X11R6/lib/X11/fonts/misc:unscaled,/usr/X11R6/lib/X11/fonts/Type1,/usr/share/fonts/X11/misc,/usr/share/fonts/X11/75dpi:unscaled,/usr/share/fonts/X11/Type1", (const char *)baseDir );
 execl( "/usr/X11R6/bin/Xvfb", "/usr/X11R6/bin/Xvfb", "-once", "-dpi", "100", "-screen", "0", "1024x768x16", "-ac", "-fp", buffer, ":47", (char*)NULL );
 }
 
@@ -1318,9 +1317,7 @@
 
 if ( m_known_failures & PaintFailure )
 m_known_failures = AllFailure;
- CheckResult dumped = checkPaintdump(filename);
- reportResult( dumped, "PAINT");
- if (dumped == Failure)
+ if (!reportResult( checkPaintdump(filename), "PAINT") )
 failures |= PaintFailure;
 
 doFailureReport(filename, failures );
@@ -1420,6 +1417,15 @@
 if ( !imageEqual( baseline, output ) ) {
 QString outputFilename = m_outputDir + "/" + againstFilename;
 createMissingDirs(outputFilename );
+
+ bool kf = false;
+ if ( m_known_failures & AllFailure )
+ kf = true;
+ else if ( m_known_failures & PaintFailure )
+ kf = true;
+ if ( kf )
+ outputFilename += "-KF";
+
 output.save(outputFilename, "PNG", 60);
 }
 else {
Index: khtml/xml/dom_textimpl.cpp
===================================================================
--- khtml/xml/dom_textimpl.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/xml/dom_textimpl.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -384,17 +384,17 @@
 if (!onlyWS) {
 return true;
 }
- 
+
 RenderObject *par = parentNode()->renderer();
- 
+
 if (par->isTable() || par->isTableRow() || par->isTableSection()) {
 return false;
 }
- 
+
 if (style->preserveWS() || style->preserveLF()) {
 return true;
 }
- 
+
 if (par->isInline()) {
 // <div/> <div/>
 RenderObject *prev = previousRenderer();
@@ -406,7 +406,7 @@
 if (par->isRenderBlock() && !par->childrenInline() && (!prev || !prev->isInline())) {
 return false;
 }
- 
+
 RenderObject *first = par->firstChild();
 RenderObject *next = nextRenderer();
 if (!first || next == first) {
@@ -415,7 +415,7 @@
 return false;
 }
 }
- 
+
 return true;
 }
 
@@ -438,6 +438,10 @@
 void TextImpl::recalcStyle( StyleChange change )
 {
 // qDebug("textImpl::recalcStyle");
+ // Create renderer if now needed
+ if ( changed() && !m_render) {
+ createRendererIfNeeded();
+ }
 if (change != NoChange && parentNode()) {
 // 	qDebug("DomText::recalcStyle");
 	if(m_render)
@@ -461,9 +465,9 @@
 
 DOMStringImpl* TextImpl::renderString() const
 {
- if (renderer()) 
+ if (renderer())
 return static_cast<RenderText*>(renderer())->string();
- else 
+ else
 return string();
 }
 
@@ -481,7 +485,7 @@
 if(endOffset >=0 || startOffset >0)
 	str = str.copy(); //we are going to modify this, so make a copy. I hope I'm doing this right.
 if(endOffset >= 0)
- str.truncate(endOffset); 
+ str.truncate(endOffset);
 if(startOffset > 0) //note the order of these 2 'if' statements so that it works right when n==m_startContainer==m_endContainer
 str.remove(0, startOffset);
 return escapeHTML( str );
Index: khtml/xml/dom_nodeimpl.cpp
===================================================================
--- khtml/xml/dom_nodeimpl.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/xml/dom_nodeimpl.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -4,7 +4,8 @@
 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
 * (C) 1999 Antti Koivisto (koivisto@kde.org)
 * (C) 2001 Dirk Mueller (mueller@kde.org)
- * (C) 2003 Apple Computer, Inc.
+ * (C) 2003-2006 Apple Computer, Inc.
+ * (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com)
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Library General Public
@@ -30,6 +31,7 @@
 #include "xml/dom2_eventsimpl.h"
 #include "xml/dom_docimpl.h"
 #include "xml/dom_nodeimpl.h"
+#include "xml/dom_restyler.h"
 
 #include <kglobal.h>
 #include <kdebug.h>
@@ -63,14 +65,17 @@
 m_closed(false),
 m_changed( false ),
 m_hasChangedChild( false ),
+ m_changedAscendentAttribute( false ),
 m_inDocument( false ),
 m_hasAnchor( false ),
 m_specified( false ),
+ m_hovered( false ),
 m_focused( false ),
 m_active( false ),
 m_implicit( false ),
- m_rendererNeedsClose( false ),
- m_htmlCompat( false )
+ m_htmlCompat( false ),
+ m_hasClassList( false ),
+ m_hasClass( false )
 {
 if (document)
 document->ref();
@@ -689,7 +694,7 @@
 // - if this node is an attribute and the specified prefix is "xmlns" and
 // the namespaceURI of this node is different from "http://www.w3.org/2000/xmlns/",
 // - or if this node is an attribute and the qualifiedName of this node is "xmlns" [Namespaces].
- if (Element::khtmlMalformedPrefix(_prefix) || (!(id() & NodeImpl_IdNSMask) && id() > ID_LAST_TAG) ||
+ if (Element::khtmlMalformedPrefix(_prefix) || (namespacePart(id()) == defaultNamespace && id() > ID_LAST_TAG) ||
 (_prefix == "xml" && namespaceURI() != "http://www.w3.org/XML/1998/namespace")) {
 exceptioncode = DOMException::NAMESPACE_ERR;
 return;
@@ -767,45 +772,74 @@
 return childTypeAllowed(newChild->nodeType());
 }
 
-NodeImpl::StyleChange NodeImpl::diff( khtml::RenderStyle *s1, khtml::RenderStyle *s2 ) const
+NodeImpl::StyleChange NodeImpl::diff( khtml::RenderStyle *s1, khtml::RenderStyle *s2 )
 {
+ // This method won't work when a style contains noninherited properties with "inherit" value.
 StyleChange ch = NoInherit;
- if ( !s1 || !s2 )
+
+ EDisplay display1 = s1 ? s1->display() : NONE;
+ EDisplay display2 = s2 ? s2->display() : NONE;
+ EPosition position1 = s1 ? s1->position() : STATIC;
+ EPosition position2 = s2 ? s2->position() : STATIC;
+
+ if (display1 != display2 || position1 != position2)
+ ch = Detach;
+ else if ( !s1 || !s2 )
 	ch = Inherit;
 else if ( *s1 == *s2 )
- 	ch = NoChange;
+	ch = NoChange;
 else if ( s1->inheritedNotEqual( s2 ) )
 	ch = Inherit;
+
+ // Because the first-letter implementation is so f..ked up, the easiest way
+ // to update first-letter is to remove the entire node and readd it.
+ if (ch < Detach && pseudoDiff(s1, s2, khtml::RenderStyle::FIRST_LETTER))
+ ch = Detach;
+ // If the other pseudoStyles have changed, we want to return NoInherit
+ if (ch == NoChange && pseudoDiff(s1, s2, khtml::RenderStyle::BEFORE))
+ ch = NoInherit;
+ if (ch == NoChange && pseudoDiff(s1, s2, khtml::RenderStyle::AFTER))
+ ch = NoInherit;
+ if (ch == NoChange && pseudoDiff(s1, s2, khtml::RenderStyle::SELECTION))
+ ch = NoInherit;
+ if (ch == NoChange && pseudoDiff(s1, s2, khtml::RenderStyle::FIRST_LINE))
+ ch = NoInherit;
+
 return ch;
 }
 
-void NodeImpl::close()
+bool NodeImpl::pseudoDiff( khtml::RenderStyle *s1, khtml::RenderStyle *s2, unsigned int pid)
 {
- closeRenderer();
- m_closed = true;
+ khtml::RenderStyle *ps1 = s1 ? s1->getPseudoStyle((khtml::RenderStyle::PseudoId)pid) : 0;
+ khtml::RenderStyle *ps2 = s2 ? s2->getPseudoStyle((khtml::RenderStyle::PseudoId)pid) : 0;
+
+ if (ps1 == ps2)
+ return false;
+ else
+ if (ps1 && ps2) {
+ if (*ps1 == *ps2)
+ return false;
+ else
+ return true;
+ }
+ else
+ return true;
 }
 
-void NodeImpl::closeRenderer()
+void NodeImpl::close()
 {
- // It's important that we close the renderer, even if it hasn't been
- // created yet. This happens even more because of the FOUC fixes we did
- // at Apple, which prevent renderers from being created until the stylesheets
- // are all loaded. If the renderer is not here to be closed, we set a flag,
- // then close it later when it's attached.
- assert(!m_rendererNeedsClose);
- if (m_render)
- m_render->close();
- else
- m_rendererNeedsClose = true;
+ if (m_render) m_render->close();
+ m_closed = true;
 }
 
 void NodeImpl::attach()
 {
 assert(!attached());
 assert(!m_render || (m_render->style() && m_render->parent()));
- if (m_render && m_rendererNeedsClose) {
- m_render->close();
- m_rendererNeedsClose = false;
+ if (m_render) // set states to match node
+ {
+ if (closed()) m_render->close();
+ if (hovered()) m_render->setMouseInside();
 }
 getDocument()->incDOMTreeVersion();
 m_attached = true;
@@ -891,7 +925,6 @@
 return;
 #endif
 
- assert(!attached());
 assert(!m_render);
 
 NodeImpl *parent = parentNode();
@@ -929,7 +962,7 @@
 bool NodeImpl::contentEditable() const
 {
 RenderObject *r = renderer();
- if (!r) return false;
+ if (!r || !r->style()) return false;
 return r->style()->userInput() == UI_ENABLED;
 }
 
@@ -1042,8 +1075,9 @@
 child = nextChild;
 }
 
+ structureChanged();
+
 // ### set style in case it's attached
- setChanged(true);
 dispatchSubtreeModifiedEvent();
 return newChild;
 }
@@ -1115,8 +1149,9 @@
 child = nextChild;
 }
 
+ structureChanged();
+
 // ### set style in case it's attached
- setChanged(true);
 dispatchSubtreeModifiedEvent();
 return oldChild;
 }
@@ -1159,7 +1194,7 @@
 oldChild->setNextSibling(0);
 oldChild->setParent(0);
 
- setChanged(true);
+ structureChanged();
 
 // Dispatch post-removal mutation events
 dispatchSubtreeModifiedEvent();
@@ -1258,7 +1293,8 @@
 child = nextChild;
 }
 
- setChanged(true);
+ backwardsStructureChanged();
+
 // ### set style in case it's attached
 dispatchSubtreeModifiedEvent();
 return newChild;
@@ -1465,7 +1501,10 @@
 NodeImpl::setFocus(received);
 
 // note that we need to recalc the style
- setChanged();
+ setChanged(); // *:focus is a default style, so we just assume personal dependency
+ if (isElementNode()) {
+ getDocument()->dynamicDomRestyler().restyleDepedent(static_cast<ElementImpl*>(this), OtherStateDependency);
+ }
 }
 
 void NodeBaseImpl::setActive(bool down)
@@ -1475,10 +1514,21 @@
 NodeImpl::setActive(down);
 
 // note that we need to recalc the style
- if (m_render && m_render->style()->affectedByActiveRules())
- setChanged();
+ if (isElementNode())
+ getDocument()->dynamicDomRestyler().restyleDepedent(static_cast<ElementImpl*>(this), ActiveDependency);
 }
 
+void NodeBaseImpl::setHovered(bool hover)
+{
+ if (hover == hovered()) return;
+
+ NodeImpl::setHovered(hover);
+
+ // note that we need to recalc the style
+ if (isElementNode())
+ getDocument()->dynamicDomRestyler().restyleDepedent(static_cast<ElementImpl*>(this), HoverDependency);
+}
+
 unsigned long NodeBaseImpl::childNodeCount()
 {
 unsigned long count = 0;
@@ -1575,7 +1625,7 @@
 //Compute distance from the requested index to the cache node
 long cacheDist = QABS(long(index) - long(m_cache->position));
 
- if (cacheDist < index) { //Closer to the cached position
+ if (cacheDist < (long)index) { //Closer to the cached position
 usedCache = true;
 if (index >= m_cache->position) { //Go ahead
 unsigned long relIndex = index - m_cache->position;
@@ -1639,7 +1689,7 @@
 
 
 /**
- Next item in the pre-order walk of tree from node, but not going outside 
+ Next item in the pre-order walk of tree from node, but not going outside
 absStart
 */
 static NodeImpl* helperNext(NodeImpl* node, NodeImpl* absStart)
@@ -1765,8 +1815,7 @@
 else {
 NodeImpl::Id testId = testNode->id();
 //we have to strip the namespaces if we compare in a namespace unaware fashion
- if ( !m_namespaceAware )
- testId &= ~NodeImpl_IdNSMask;
+ if ( !m_namespaceAware ) testId = localNamePart(testId);
 	return (m_id == 0 || m_id == testId);
 }
 }
Index: khtml/xml/dom2_traversalimpl.cpp
===================================================================
--- khtml/xml/dom2_traversalimpl.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/xml/dom2_traversalimpl.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -611,7 +611,7 @@
 // now the case if we don't have previous sibling
 else
 {
- _tempCurrent = _tempCurrent->parentNode();
+ _tempCurrent = n->parentNode();
 if( !_tempCurrent || _tempCurrent == m_rootNode)
 return 0;
 _result = isAccepted( _tempCurrent );
Index: khtml/xml/dom2_eventsimpl.cpp
===================================================================
--- khtml/xml/dom2_eventsimpl.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/xml/dom2_eventsimpl.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -499,14 +499,14 @@
 }
 
 L toLeft(R r) {
- typename QMap<R,L>::iterator i = m_rToL.find(r);
+ QMapIterator<R,L> i( m_rToL.find(r) );
 if (i != m_rToL.end())
 return *i;
 return L();
 }
 
 R toRight(L l) {
- typename QMap<L,R>::iterator i = m_lToR.find(l);
+ QMapIterator<L,R> i = m_lToR.find(l);
 if (i != m_lToR.end())
 return *i;
 return R();
@@ -775,7 +775,7 @@
 if (keyIdentifierArg.length() == 1) {
 //Likely to be normal unicode id, unless it's one of the few
 //special values.
- unsigned short code = keyIdentifierArg.unicode()[0].unicode();
+ unsigned short code = keyIdentifierArg.unicode()[0];
 if (code > 0x20 && code != 0x7F)
 keyVal = code;
 }
@@ -789,7 +789,7 @@
 modifiersList.string().stripWhiteSpace().simplifyWhiteSpace());
 
 unsigned modifiers = 0;
- for (QStringList::iterator i = mods.begin(); i != mods.end(); ++i)
+ for (QStringList::Iterator i = mods.begin(); i != mods.end(); ++i)
 if (unsigned mask = keyModifiersToCode()->toRight((*i).latin1()))
 modifiers |= mask;
 
Index: khtml/xml/dom_restyler.cpp
===================================================================
--- khtml/xml/dom_restyler.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 0)
+++ khtml/xml/dom_restyler.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -0,0 +1,122 @@
+/*
+ * This file is part of the DOM implementation for KDE.
+ *
+ * Copyright (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "dom_restyler.h"
+#include "dom_elementimpl.h"
+
+namespace khtml {
+
+DynamicDomRestyler::DynamicDomRestyler()
+{
+}
+
+void DynamicDomRestyler::addDependency(ElementImpl* subject, ElementImpl* dependency, StructuralDependencyType type)
+{
+ assert(type < LastStructuralDependency);
+
+ dependency_map[type].append(dependency, subject);
+ reverse_map.append(subject,dependency);
+}
+
+void DynamicDomRestyler::removeDependency(ElementImpl* subject, ElementImpl* dependency, StructuralDependencyType type)
+{
+ dependency_map[type].remove(dependency, subject);
+ // don't remove from reverse_map as there might be other depencies to the same element
+}
+
+void DynamicDomRestyler::removeDependencies(ElementImpl* subject, StructuralDependencyType type)
+{
+ KMultiMap<ElementImpl>::List* my_dependencies = reverse_map.find(subject);
+
+ if (!my_dependencies) return;
+
+ for (my_dependencies->first(); my_dependencies->current() ; my_dependencies->next())
+ {
+ ElementImpl* e = my_dependencies->current();
+ dependency_map[type].remove(e,subject);
+ }
+
+ // don't remove from reverse_map as there might be other depencies to the same elements
+}
+
+void DynamicDomRestyler::resetDependencies(ElementImpl* subject)
+{
+ KMultiMap<ElementImpl>::List* my_dependencies = reverse_map.find(subject);
+
+ if (!my_dependencies) return;
+
+ for (my_dependencies->first(); my_dependencies->current() ; my_dependencies->next())
+ {
+ ElementImpl* e = my_dependencies->current();
+ for (int type = 0; type < LastStructuralDependency; type++) {
+ dependency_map[type].remove(e,subject);
+ }
+ }
+
+ reverse_map.remove(subject);
+}
+
+void DynamicDomRestyler::restyleDepedent(ElementImpl* dependency, StructuralDependencyType type)
+{
+ assert(type < LastStructuralDependency);
+ KMultiMap<ElementImpl>::List* dep = dependency_map[type].find(dependency);
+
+ if (!dep) return;
+
+ // take copy as the restyle will change the list
+ KMultiMap<ElementImpl>::List dependent(*dep);
+
+ for (dependent.first(); dependent.current() ; dependent.next())
+ {
+// kdDebug() << "Restyling dependent" << endl;
+ dependent.current()->setChanged(true);
+ }
+}
+
+void DynamicDomRestyler::dumpStats() const
+{
+/*
+ kdDebug() << "Keys in structural dependencies: " << dependency_map[StructuralDependency].size() << endl;
+ kdDebug() << "Keys in attribute dependencies: " << dependency_map[AttributeDependency].size() << endl;
+
+ kdDebug() << "Keys in reverse map: " << reverse_map.size() << endl;
+ */
+}
+
+void DynamicDomRestyler::addDependency(uint attrID, AttributeDependencyType type)
+{
+ assert(type < LastAttributeDependency);
+
+ unsigned int hash = (attrID * 257) % 512;
+ attribute_map[type][hash] = true;
+}
+
+bool DynamicDomRestyler::checkDependency(uint attrID, AttributeDependencyType type)
+{
+ assert(type < LastAttributeDependency);
+
+ unsigned int hash = (attrID * 257) % 512;
+ // ### gives false positives, but that's okay.
+ return attribute_map[type][hash];
+}
+
+} // namespace
Index: khtml/xml/dom_elementimpl.cpp
===================================================================
--- khtml/xml/dom_elementimpl.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/xml/dom_elementimpl.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -5,6 +5,7 @@
 * (C) 1999 Antti Koivisto (koivisto@kde.org)
 * (C) 2001 Peter Kelly (pmk@post.com)
 * (C) 2001 Dirk Mueller (mueller@kde.org)
+ * (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com)
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Library General Public
@@ -30,6 +31,7 @@
 #include "xml/dom_docimpl.h"
 #include "xml/dom2_eventsimpl.h"
 #include "xml/dom_elementimpl.h"
+#include "xml/dom_restyler.h"
 
 #include "html/dtd.h"
 #include "html/htmlparser.h"
@@ -305,10 +307,6 @@
 namedAttrMap = 0;
 m_styleDecls = 0;
 m_prefix = 0;
- m_restyleLate = false;
- m_restyleSelfLate = false;
- m_restyleChildrenLate = false;
- m_hasClassList = false;
 }
 
 ElementImpl::~ElementImpl()
@@ -333,24 +331,29 @@
 return Node::ELEMENT_NODE;
 }
 
-DOMString ElementImpl::getAttribute( NodeImpl::Id id, bool nsAware, const DOMString& qName) const
+DOMStringImpl* ElementImpl::getAttributeImpl( NodeImpl::Id id, bool nsAware, DOMStringImpl* qName) const
 {
 if (!namedAttrMap)
-	return DOMString();
+	return 0;
 
- DOMStringImpl *value = namedAttrMap->getValue(id, nsAware, (qName.isEmpty() ? 0: qName.implementation()));
+ DOMStringImpl *value = namedAttrMap->getValue(id, nsAware, qName);
 if (value)
 	return value;
 
 // then search in default attr in case it is not yet set
 NamedAttrMapImpl* dm = defaultMap();
- value = dm ? dm->getValue(id, nsAware, (qName.isEmpty() ? 0: qName.implementation())) : 0;
+ value = dm ? dm->getValue(id, nsAware, qName) : 0;
 if (value)
 	return value;
 
- return DOMString();
+ return 0;
 }
 
+DOMString ElementImpl::getAttribute( NodeImpl::Id id, bool nsAware, const DOMString& qName) const
+{
+ return DOMString(getAttributeImpl(id, nsAware, qName.implementation()));
+}
+
 void ElementImpl::setAttribute(NodeImpl::Id id, const DOMString &value, const DOMString& qName, int &exceptioncode)
 {
 // NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly
@@ -359,6 +362,7 @@
 return;
 }
 attributes()->setValue(id, value.implementation(), (qName.isEmpty() ? 0: qName.implementation()));
+ attributeChanged(id);
 }
 
 void ElementImpl::setAttributeNS( const DOMString &namespaceURI, const DOMString &qualifiedName,
@@ -380,12 +384,14 @@
 prefix.implementation(), localName.implementation(), false, true /*lookupHTML*/);
 attributes()->setValue(id, value.implementation(), 0, prefix.implementation(),
 true /*nsAware*/, !namespaceURI.isNull() /*hasNS*/);
+ attributeChanged(id);
 }
 
 void ElementImpl::setAttribute(NodeImpl::Id id, const DOMString &value)
 {
 int exceptioncode = 0;
 setAttribute(id,value,DOMString(),exceptioncode);
+ attributeChanged(id);
 }
 
 void ElementImpl::setAttributeMap( NamedAttrMapImpl* list )
@@ -519,28 +525,59 @@
 {
 NodeImpl::close();
 
+ // Trigger all the addChild changes as one large dynamic appendChildren change
+ if (attached())
+ backwardsStructureChanged();
+}
+
+void ElementImpl::detach()
+{
+ getDocument()->dynamicDomRestyler().resetDependencies(this);
+
+ NodeBaseImpl::detach();
+}
+
+void ElementImpl::structureChanged()
+{
+ NodeBaseImpl::structureChanged();
+
 if (!getDocument()->renderer())
 return; // the document is about to be destroyed
- 
- if (m_restyleChildrenLate) {
- NodeImpl *e = firstChild();
- while(e) {
- if (e->isElementNode()) {
- if (static_cast<ElementImpl*>(e)->restyleLate()) {
- static_cast<ElementImpl*>(e)->recalcStyle(Force);
- static_cast<ElementImpl*>(e)->setRestyleLate(false);
- }
- }
- e = e->nextSibling();
- }
- m_restyleChildrenLate = false;
- }
- if (m_restyleSelfLate) {
- recalcStyle(Force);
- m_restyleSelfLate = false;
- }
+
+ getDocument()->dynamicDomRestyler().restyleDepedent(this, StructuralDependency);
+ // In theory BackwardsStructurualDependencies are indifferent to prepend,
+ // but it's too rare to optimize.
+ getDocument()->dynamicDomRestyler().restyleDepedent(this, BackwardsStructuralDependency);
 }
 
+void ElementImpl::backwardsStructureChanged()
+{
+ NodeBaseImpl::backwardsStructureChanged();
+
+ if (!getDocument()->renderer())
+ return; // the document is about to be destroyed
+
+ // Most selectors are not affected by append. Fire the few that are.
+ getDocument()->dynamicDomRestyler().restyleDepedent(this, BackwardsStructuralDependency);
+}
+
+void ElementImpl::attributeChanged(NodeImpl::Id id)
+{
+ if (!getDocument()->renderer())
+ return; // the document is about to be destroyed
+
+#if 0 // one-one dependencies for attributes disabled
+ getDocument()->dynamicDomRestyler().restyleDepedent(this, AttributeDependency);
+#endif
+ if (getDocument()->dynamicDomRestyler().checkDependency(id, PersonalDependency))
+ setChanged(true);
+ if (getDocument()->dynamicDomRestyler().checkDependency(id, AncestorDependency))
+ setChangedAscendentAttribute(true);
+ if (getDocument()->dynamicDomRestyler().checkDependency(id, PredecessorDependency) && parent())
+ // Any element that dependt on a predecessors attribute, also depend structurally on parent
+ parent()->structureChanged();
+}
+
 void ElementImpl::recalcStyle( StyleChange change )
 {
 // ### should go away and be done in renderobject
@@ -562,38 +599,34 @@
 qDebug("recalcStyle(%d: %s, changed: %d)[%p: %s]", change, debug, changed(), this, tagName().string().latin1());
 #endif
 if ( hasParentRenderer && (change >= Inherit || changed()) ) {
- EDisplay oldDisplay = _style ? _style->display() : NONE;
- EPosition oldPosition = _style ? _style->position() : STATIC;
-
 RenderStyle *newStyle = getDocument()->styleSelector()->styleForElement(this);
 newStyle->ref();
 StyleChange ch = diff( _style, newStyle );
- if ( ch != NoChange ) {
- if (oldDisplay != newStyle->display()
- || oldPosition != newStyle->position()) {
- if (attached()) detach();
- // ### uuhm, suboptimal. style gets calculated again
- attach();
-		// attach recalulates the style for all children. No need to do it twice.
-		setChanged( false );
-		setHasChangedChild( false );
-		newStyle->deref();
-		return;
- }
+ if (ch == Detach) {
+ if (attached()) detach();
+ // ### Suboptimal. Style gets calculated again.
+ attach();
+ // attach recalulates the style for all children. No need to do it twice.
+ setChanged( false );
+ setHasChangedChild( false );
+ newStyle->deref();
+ return;
+ }
+ else if (ch != NoChange) {
 if( m_render && newStyle ) {
- //qDebug("--> setting style on render element bgcolor=%s", newStyle->backgroundColor().name().latin1());
 m_render->setStyle(newStyle);
 }
 }
 newStyle->deref();
 
- if ( change != Force) {
- if (getDocument()->usesDescendantRules())
- change = Force;
- else
- change = ch;
- }
+ if ( change != Force)
+ change = ch;
 }
+ // If a changed attribute has ancestor dependencies, restyle all children
+ if (changedAscendentAttribute()) {
+ change = Force;
+ setChangedAscendentAttribute(false);
+ }
 
 NodeImpl *n;
 for (n = _first; n; n = n->nextSibling()) {
@@ -613,7 +646,7 @@
 // Only make editable elements selectable if its parent element
 // is not editable. FIXME: this is not 100% right as non-editable elements
 // within editable elements are focusable too.
- return contentEditable() && (!parentNode() || !parentNode()->contentEditable());
+ return contentEditable() && !(parentNode() && parentNode()->contentEditable());
 }
 
 // DOM Section 1.1.1
@@ -682,7 +715,6 @@
 if (!inDocument())
 return;
 
- DocumentImpl* doc = getDocument();
 if (oldId && oldId->l)
 removeId(DOMString(oldId).string());
 
@@ -918,7 +950,7 @@
 for (unsigned long i = 0; i < m_attrCount; i++) {
 	if ((m_attrs[i].id() & mask) == id) {
 // if we are called with a qualified name, filter out NS-aware elements with non-matching name.
- if (qName && (m_attrs[i].id() & NodeImpl_IdNSMask) &&
+ if (qName && (namespacePart(m_attrs[i].id()) != defaultNamespace) &&
 strcasecmp(m_attrs[i].name(), DOMString(qName)))
 continue;
 	 return m_attrs[i].createAttr(m_element,m_element->docPtr());
@@ -946,7 +978,7 @@
 for (unsigned long i = 0; i < m_attrCount; i++) {
 	if ((m_attrs[i].id() & mask) == id) {
 // if we are called with a qualified name, filter out NS-aware elements with non-matching name.
- if (qName && (m_attrs[i].id() & NodeImpl_IdNSMask) &&
+ if (qName && (namespacePart(m_attrs[i].id()) != defaultNamespace) &&
 strcasecmp(m_attrs[i].name(), DOMString(qName)))
 continue;
 	 id = m_attrs[i].id();
@@ -1012,13 +1044,13 @@
 for (unsigned long i = 0; i < m_attrCount; i++) {
 	if ((m_attrs[i].id() & mask) == id) {
 // if we are called with a qualified name, filter out NS-aware elements with non-matching name.
- if (qName && (m_attrs[i].id() & NodeImpl_IdNSMask) &&
+ if (qName && (namespacePart(m_attrs[i].id()) != defaultNamespace) &&
 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 */
@@ -1084,8 +1116,8 @@
 for (unsigned long i = 0; i < m_attrCount; i++)
 if ((m_attrs[i].id() & mask) == id) {
 // if we are called with a qualified name, filter out NS-aware elements with non-matching name.
- if (qName && (m_attrs[i].id() & NodeImpl_IdNSMask) &&
- strcasecmp(m_attrs[i].name(), DOMString(qName)))
+ if (qName && (namespacePart(m_attrs[i].id()) != defaultNamespace) &&
+ strcasecmp(m_attrs[i].name(), qName))
 continue;
 return m_attrs[i].val();
 }
@@ -1111,7 +1143,7 @@
 for (unsigned long i = 0; i < m_attrCount; i++) {
 	if ((m_attrs[i].id() & mask) == mid) {
 // if we are called with a qualified name, filter out NS-aware elements with non-matching name.
- if (qName && (m_attrs[i].id() & NodeImpl_IdNSMask) &&
+ if (qName && (namespacePart(m_attrs[i].id()) != defaultNamespace) &&
 strcasecmp(m_attrs[i].name(), DOMString(qName)))
 continue;
 	 if (prefix)
Index: khtml/xml/dom_nodeimpl.h
===================================================================
--- khtml/xml/dom_nodeimpl.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/xml/dom_nodeimpl.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -98,9 +98,10 @@
 #define NodeImpl_IdNSMask 0xffff0000
 #define NodeImpl_IdLocalMask 0x0000ffff
 
-const Q_UINT16 noNamespace = 0;
+const Q_UINT16 defaultNamespace = 0;
+const Q_UINT16 xhtmlNamespace = 1;
+const Q_UINT16 emptyNamespace = 2;
 const Q_UINT16 anyNamespace = 0xffff;
-const Q_UINT16 xhtmlNamespace = 1;
 const Q_UINT16 anyLocalName = 0xffff;
 
 inline Q_UINT16 localNamePart(Q_UINT32 id) { return id & NodeImpl_IdLocalMask; }
@@ -219,8 +220,10 @@
 virtual void sheetLoaded() {}
 
 bool hasID() const { return m_hasId; }
+ bool hasClass() const { return m_hasClass; }
 bool active() const { return m_active; }
- bool focused() const { return m_focused; }
+ bool focused() const { return m_focused; }
+ bool hovered() const { return m_hovered; }
 bool attached() const { return m_attached; }
 bool closed() const { return m_closed; }
 bool changed() const { return m_changed; }
@@ -230,13 +233,23 @@
 bool implicitNode() const { return m_implicit; }
 bool htmlCompat() const { return m_htmlCompat; }
 void setHasID(bool b=true) { m_hasId = b; }
+ void setHasClass(bool b=true) { m_hasClass = b; }
 void setHasChangedChild( bool b = true ) { m_hasChangedChild = b; }
 void setInDocument(bool b=true) { m_inDocument = b; }
 void setHTMLCompat(bool b) { m_htmlCompat = b; }
 virtual void setFocus(bool b=true) { m_focused = b; }
 virtual void setActive(bool b=true) { m_active = b; }
+ virtual void setHovered(bool b=true) { m_hovered = b; }
 virtual void setChanged(bool b=true);
 
+ // for descending restyle when ID or CLASS changes
+ bool changedAscendentAttribute() const { return m_changedAscendentAttribute; }
+ void setChangedAscendentAttribute(bool b) { m_changedAscendentAttribute = b; }
+
+ // for style selection performance: whether the element matches several CSS Classes
+ bool hasClassList() const { return m_hasClassList; }
+ void setHasClassList(bool b) { m_hasClassList = b; }
+
 unsigned short tabIndex() const { return m_tabIndex; }
 void setTabIndex(unsigned short _tabIndex) { m_tabIndex = _tabIndex; }
 
@@ -249,9 +262,10 @@
 virtual void getCaret(int offset, bool override, int &_x, int &_y, int &width, int &height);
 virtual QRect getRect() const;
 
- enum StyleChange { NoChange, NoInherit, Inherit, Force };
+ enum StyleChange { NoChange, NoInherit, Inherit, Detach, Force };
 virtual void recalcStyle( StyleChange = NoChange ) {}
- StyleChange diff( khtml::RenderStyle *s1, khtml::RenderStyle *s2 ) const;
+ static StyleChange diff( khtml::RenderStyle *s1, khtml::RenderStyle *s2 );
+ static bool pseudoDiff( khtml::RenderStyle *s1, khtml::RenderStyle *s2, unsigned int pid);
 
 unsigned long nodeIndex() const;
 // Returns the document that this node is associated with. This is guaranteed to always be non-null, as opposed to
@@ -351,11 +365,13 @@
 virtual void detach();
 
 /**
- * Notifies the node that no more children will be added.
+ * Notifies the node that no more children will be added during parsing.
+ * After a node has been closed all changes must go through the DOM interface.
 */
 virtual void close();
 
- void closeRenderer();
+ virtual void structureChanged() {};
+ virtual void backwardsStructureChanged() {};
 
 void createRendererIfNeeded();
 virtual khtml::RenderStyle *styleForRenderer(khtml::RenderObject *parent);
@@ -447,18 +463,18 @@
 bool m_closed : 1;
 bool m_changed : 1;
 bool m_hasChangedChild : 1;
+ bool m_changedAscendentAttribute : 1;
 bool m_inDocument : 1;
 bool m_hasAnchor : 1;
 bool m_specified : 1; // used in AttrImpl. Accessor functions there
- 
+
+ bool m_hovered : 1;
 bool m_focused : 1;
 bool m_active : 1;
 bool m_implicit : 1; // implicitely generated by the parser
- bool m_rendererNeedsClose : 1;
 bool m_htmlCompat : 1; // true if element was created in HTML compat mode
- bool m_unused : 1;
- bool m_unused2 : 1;
- bool m_unused3 : 1; 
+ bool m_hasClassList : 1;
+ bool m_hasClass : 1; // true if element has a class property, as relevant to CSS
 };
 
 // this is the full Node Implementation with parents and children.
@@ -494,6 +510,7 @@
 
 virtual void setFocus(bool=true);
 virtual void setActive(bool=true);
+ virtual void setHovered(bool=true);
 virtual unsigned long childNodeCount();
 virtual NodeImpl *childNode(unsigned long index);
 
@@ -556,7 +573,7 @@
 struct Cache: public khtml::Shared<Cache>
 {
 static Cache* make() { return new Cache; }
- 
+
 CacheKey key;//### We must store this in here due to QCache in Qt3 sucking
 
 unsigned int version;
@@ -568,7 +585,7 @@
 unsigned int position;
 unsigned int length;
 bool hasLength;
- 
+
 void updateNodeListInfo(DocumentImpl* doc);
 
 virtual void clear(DocumentImpl* doc);
@@ -593,7 +610,7 @@
 NodeImpl *recursiveItem ( NodeImpl* absStart, NodeImpl *start, unsigned long &offset ) const;
 NodeImpl *recursiveItemBack( NodeImpl* absStart, NodeImpl *start, unsigned long &offset ) const;
 
- // Override this to determine what nodes to return. Set doRecurse to 
+ // Override this to determine what nodes to return. Set doRecurse to
 // false if the children of this node do not need to be entered.
 virtual bool nodeMatches( NodeImpl *testNode, bool& doRecurse ) const = 0;
 
@@ -604,9 +621,9 @@
 class ChildNodeListImpl : public NodeListImpl
 {
 public:
- 
+
 ChildNodeListImpl( NodeImpl *n);
- 
+
 protected:
 virtual bool nodeMatches( NodeImpl *testNode, bool& doRecurse ) const;
 };
Index: khtml/xml/dom2_eventsimpl.h
===================================================================
--- khtml/xml/dom2_eventsimpl.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/xml/dom2_eventsimpl.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -479,7 +479,7 @@
 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(); }
+ : id(_id), useCapture(_useCapture), listener(_listener) { if (listener) listener->ref(); }
 
 ~RegisteredEventListener() { if (listener) listener->deref(); listener = 0; }
 
Index: khtml/xml/dom_restyler.h
===================================================================
--- khtml/xml/dom_restyler.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 0)
+++ khtml/xml/dom_restyler.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -0,0 +1,102 @@
+/*
+ * This file is part of the DOM implementation for KDE.
+ *
+ * Copyright (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef _DOM_restyler_h_
+#define _DOM_restyler_h_
+
+#include "misc/multimap.h"
+#include <bitset>
+
+namespace DOM {
+ class ElementImpl;
+}
+
+// Restyle dependency tracker for dynamic DOM
+
+namespace khtml {
+
+using DOM::ElementImpl;
+
+// These types are different types of dependencies, and serves to identify which element should be
+// restyled when a change of that kind triggers on the element
+enum StructuralDependencyType {
+ // Style relies on the children of the element (unaffected by append & close)
+ StructuralDependency = 0,
+ // Style relies on the last children of the element (affected by append & close)
+ BackwardsStructuralDependency = 1,
+ // Style relies on the element having hover
+ HoverDependency = 2,
+ // Style relies on the element being active
+ ActiveDependency = 3,
+ // Style relies on another state of element (focus, disabled, checked, etc.)
+ // (focus is special cased though since elements always depend on their own focus)
+ OtherStateDependency = 4,
+ LastStructuralDependency
+};
+
+// Attribute dependencies are much coarser than structural, for memory reasons rather than performance
+// This tracks global depencies of various kinds.
+// The groups are separated into where possible depending elements might be:
+enum AttributeDependencyType {
+ // Style of the changed element depend on this attribute
+ PersonalDependency = 0,
+ // Style of the elements children depend on this attribute
+ AncestorDependency = 1,
+ // Style of the elements later siblings or their children depend on this attribute
+ PredecessorDependency = 2,
+ LastAttributeDependency
+};
+
+
+/**
+ * @internal
+ */
+class DynamicDomRestyler {
+public:
+ DynamicDomRestyler();
+
+ // Structural dependencies are tracked from element to subject
+ void addDependency(ElementImpl* subject, ElementImpl* dependency, StructuralDependencyType type);
+ void resetDependencies(ElementImpl* subject);
+ void removeDependency(ElementImpl* subject, ElementImpl* dependency, StructuralDependencyType type);
+ void removeDependencies(ElementImpl* subject, StructuralDependencyType type);
+ void restyleDepedent(ElementImpl* dependency, StructuralDependencyType type);
+
+ // Attribute dependencies are traced on attribute alone
+ void addDependency(uint attrID, AttributeDependencyType type);
+ bool checkDependency(uint attrID, AttributeDependencyType type);
+
+ void dumpStats() const;
+private:
+ // Map of dependencies.
+ KMultiMap<ElementImpl> dependency_map[LastStructuralDependency];
+ // Map of reverse dependencies. For fast reset
+ KMultiMap<ElementImpl> reverse_map;
+
+ // Map of the various attribute dependencies
+ std::bitset<512> attribute_map[LastAttributeDependency];
+};
+
+}
+
+#endif
+
Index: khtml/xml/dom_elementimpl.h
===================================================================
--- khtml/xml/dom_elementimpl.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/xml/dom_elementimpl.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -141,8 +141,9 @@
 public:
 ElementImpl(DocumentPtr *doc);
 ~ElementImpl();
- 
+
 DOMString getAttribute( NodeImpl::Id id, bool nsAware = 0, const DOMString& qName = DOMString() ) const;
+ DOMStringImpl* getAttributeImpl( NodeImpl::Id id, bool nsAware = 0, DOMStringImpl* qName = 0 ) const;
 void setAttribute( NodeImpl::Id id, const DOMString &value, const DOMString &qName,
 int &exceptioncode );
 void setAttributeNS( const DOMString &namespaceURI, const DOMString &qualifiedName,
@@ -187,6 +188,11 @@
 
 virtual void attach();
 virtual void close();
+ virtual void detach();
+ virtual void structureChanged();
+ virtual void backwardsStructureChanged();
+ virtual void attributeChanged(NodeImpl::Id attrId);
+
 virtual khtml::RenderStyle *styleForRenderer(khtml::RenderObject *parent);
 virtual khtml::RenderObject *createRenderer(khtml::RenderArena *, khtml::RenderStyle *);
 virtual void recalcStyle( StyleChange = NoChange );
@@ -206,7 +212,7 @@
 
 virtual DOMString toString() const;
 virtual DOMString selectionToString(NodeImpl *selectionStart, NodeImpl *selectionEnd, int startOffset, int endOffset, bool &found) const;
-	 
+
 virtual bool contentEditable() const;
 void setContentEditable(bool enabled);
 
@@ -223,16 +229,7 @@
 * DOM::RangeImpl uses this which is why it is public.
 */
 DOMString openTagStartToString(bool expandurls = false) const;
- 
- bool restyleLate() const { return m_restyleLate; };
- void setRestyleLate(bool b=true) { m_restyleLate = b; };
- void setRestyleSelfLate() { m_restyleSelfLate = true; };
- void setRestyleChildrenLate() { m_restyleChildrenLate = true; };
 
- // for style selection performance: whether the element matches several CSS Classes
- bool hasClassList() const { return m_hasClassList; }
- void setHasClassList(bool b) { m_hasClassList = b; }
-
 void updateId(DOMStringImpl* oldId, DOMStringImpl* newId);
 //Called when mapping from id to this node in document should be removed
 virtual void removeId(const QString& id);
@@ -255,10 +252,6 @@
 
 DOM::CSSStyleDeclarationImpl *m_styleDecls;
 DOMStringImpl *m_prefix;
- bool m_restyleLate;
- bool m_restyleSelfLate;
- bool m_restyleChildrenLate;
- bool m_hasClassList;
 };
 
 
Index: khtml/xml/dom_docimpl.cpp
===================================================================
--- khtml/xml/dom_docimpl.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/xml/dom_docimpl.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -4,7 +4,8 @@
 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
 * (C) 1999 Antti Koivisto (koivisto@kde.org)
 * (C) 2001 Dirk Mueller (mueller@kde.org)
- * (C) 2002-2003 Apple Computer, Inc.
+ * (C) 2002-2006 Apple Computer, Inc.
+ * (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com)
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Library General Public
@@ -30,6 +31,7 @@
 #include "xml/dom2_eventsimpl.h"
 #include "xml/xml_tokenizer.h"
 #include "html/htmltokenizer.h"
+#include "xml/dom_restyler.h"
 
 #include "css/csshelper.h"
 #include "css/cssstyleselector.h"
@@ -173,7 +175,7 @@
 if (doc->doctype() && dtype)
 doc->doctype()->copyFrom(*dtype);
 
- // the document must be created empty if all parameters are null 
+ // 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);
@@ -328,15 +330,16 @@
 m_textColor = "#000000";
 m_attrMap = new IdNameMapping(ATTR_LAST_ATTR+1);
 m_elementMap = new IdNameMapping(ID_LAST_TAG+1);
- m_namespaceMap = new IdNameMapping(2);
+ m_namespaceMap = new IdNameMapping(1);
 QString xhtml(XHTML_NAMESPACE);
- m_namespaceMap->names.insert(noNamespace, new DOMStringImpl(""));
+ m_namespaceMap->names.insert(emptyNamespace, new DOMStringImpl(""));
 m_namespaceMap->names.insert(xhtmlNamespace, new DOMStringImpl(xhtml.unicode(), xhtml.length()));
- m_namespaceMap->names[noNamespace]->ref();
+ m_namespaceMap->names[emptyNamespace]->ref();
 m_namespaceMap->names[xhtmlNamespace]->ref();
 m_namespaceMap->count+=2;
 m_focusNode = 0;
 m_hoverNode = 0;
+ m_activeNode = 0;
 m_defaultView = new AbstractViewImpl(this);
 m_defaultView->ref();
 m_listenerTypes = 0;
@@ -351,13 +354,13 @@
 m_inStyleRecalc = false;
 m_pendingStylesheets = 0;
 m_ignorePendingStylesheets = false;
- m_usesDescendantRules = false;
 m_async = true;
 m_hadLoadError = false;
 m_docLoading = false;
 m_inSyncLoad = false;
 m_loadingXMLDoc = 0;
 m_cssTarget = 0;
+ m_dynamicDomRestyler = new khtml::DynamicDomRestyler();
 }
 
 DocumentImpl::~DocumentImpl()
@@ -384,10 +387,13 @@
 delete m_elementMap;
 delete m_attrMap;
 delete m_namespaceMap;
+ delete m_dynamicDomRestyler;
 m_defaultView->deref();
 m_styleSheets->deref();
 if (m_addedStyleSheets)
 m_addedStyleSheets->deref();
+ if (m_cssTarget)
+ m_cssTarget->deref();
 if (m_focusNode)
 m_focusNode->deref();
 if ( m_hoverNode )
@@ -562,7 +568,7 @@
 splitPrefixLocalName(_qualifiedName.implementation(), prefix, localName, colonPos);
 
 if ((isHTMLDocument() && _namespaceURI.isNull()) ||
- (_namespaceURI == XHTML_NAMESPACE && localName == localName.lower())) {
+ (strcasecmp(_namespaceURI, XHTML_NAMESPACE) == 0 && localName == localName.lower())) {
 e = createHTMLElement(localName);
 if (e) {
 int _exceptioncode = 0;
@@ -610,7 +616,7 @@
 
 ElementMappingCache::ItemInfo* info = m_getElementByIdCache.get(stringKey);
 
- if (!info) 
+ if (!info)
 return 0;
 
 //See if cache has an unambiguous answer.
@@ -698,6 +704,7 @@
 ElementImpl *DocumentImpl::createHTMLElement( const DOMString &name )
 {
 uint id = khtml::getTagID( name.string().lower().latin1(), name.string().length() );
+// id = makeId(xhtmlNamespace, id);
 
 ElementImpl *n = 0;
 switch(id)
@@ -1656,6 +1663,9 @@
 m_preferredStylesheetSet = content;
 updateStyleSelector();
 }
+ else if (strcasecmp(equiv, "content-language") == 0) {
+ m_contentLanguage = content.string();
+ }
 }
 
 bool DocumentImpl::prepareMouseEvent( bool readonly, int _x, int _y, MouseEvent *ev )
@@ -1752,7 +1762,7 @@
 << ", exceptions: " << (pExceptioncode ? "yes" : "no")
 << " )" << endl;*/
 
- if(!_name || !_name->l) return 0;
+ if(!_name) return 0;
 IdNameMapping *map;
 IdLookupFunction lookup;
 
@@ -1766,16 +1776,19 @@
 lookup = getAttrID;
 break;
 case NodeImpl::NamespaceId:
- if( !strcasecmp(_name, XHTML_NAMESPACE) )
- return xhtmlNamespace; //### Id == 0 can't be used with (void*)int based QDicts...
+ if( strcasecmp(_name, XHTML_NAMESPACE) == 0)
+ return xhtmlNamespace;
 if( _name->l == 0)
- return noNamespace;
+ return emptyNamespace;
+ // defaultNamespace handled by "if (!_name) return 0"
 map = m_namespaceMap;
- lookup= 0;
+ lookup = 0;
 break;
 default:
 return 0;
 }
+ // Names and attributes with ""
+ if (_name->l == 0) return 0;
 
 NodeImpl::Id id, nsid = 0;
 QConstString n(_name->s, _name->l);
@@ -1854,7 +1867,7 @@
 {
 IdNameMapping *map;
 NameLookupFunction lookup;
- bool hasNS = (_id & NodeImpl_IdNSMask);
+ bool hasNS = (namespacePart(_id) != defaultNamespace);
 switch (_type) {
 case NodeImpl::ElementId:
 map = m_elementMap;
@@ -1867,15 +1880,19 @@
 case NodeImpl::NamespaceId:
 if( _id == xhtmlNamespace )
 return XHTML_NAMESPACE;
- if( _id == noNamespace )
- return "";
+ else
+ if( _id == emptyNamespace )
+ return DOMString("");
+ else
+ if ( _id == defaultNamespace )
+ return DOMString();
 map = m_namespaceMap;
 lookup = 0;
 break;
 default:
 return DOMString();;
 }
- _id = _id & NodeImpl_IdLocalMask;
+ _id = localNamePart(_id) ;
 if (_id >= map->idStart) {
 return map->names[_id];
 }
@@ -2136,6 +2153,14 @@
 if ( oldHoverNode ) oldHoverNode->deref();
 }
 
+void DocumentImpl::setActiveNode(NodeImpl* newActiveNode)
+{
+ NodeImpl* oldActiveNode = m_activeNode;
+ if (newActiveNode ) newActiveNode->ref();
+ m_activeNode = newActiveNode;
+ if ( oldActiveNode ) oldActiveNode->deref();
+}
+
 void DocumentImpl::setFocusNode(NodeImpl *newFocusNode)
 {
 // don't process focus changes while detaching
@@ -2193,11 +2218,18 @@
 
 void DocumentImpl::setCSSTarget(NodeImpl* n)
 {
- if (m_cssTarget)
+ if (n == m_cssTarget)
+ return;
+
+ if (m_cssTarget) {
 m_cssTarget->setChanged();
+ m_cssTarget->deref();
+ }
 m_cssTarget = n;
- if (n)
+ if (n) {
 n->setChanged();
+ n->ref();
+ }
 }
 
 void DocumentImpl::attachNodeIterator(NodeIteratorImpl *ni)
Index: khtml/xml/dom_stringimpl.cpp
===================================================================
--- khtml/xml/dom_stringimpl.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/xml/dom_stringimpl.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -139,9 +139,6 @@
 if( pos >=l ) return new DOMStringImpl();
 
 uint newLen = l-pos;
- QChar *c = QT_ALLOC_QCHAR_VEC(newLen);
- memcpy(c, s+pos, newLen*sizeof(QChar));
-
 DOMStringImpl *str = new DOMStringImpl(s + pos, newLen);
 truncate(pos);
 return str;
@@ -170,7 +167,14 @@
 bool changedLF = false;
 for(unsigned int i=0; i<l; i++) {
 QChar ch = s[i];
- if (!preserveLF && (ch == '\n' || ch == '\r')) {
+
+ // We act on \r as we would on \n because CSS uses it to indicate new-line
+ if (ch == '\r') ch = '\n';
+ else
+ // ### The XML parser lets \t through, for now treat them as spaces
+ if (ch == '\t') ch = ' ';
+
+ if (!preserveLF && ch == '\n') {
 // ### Not strictly correct according to CSS3 text-module.
 // - In ideographic languages linefeed should be ignored
 // - and in Thai and Khmer it should be treated as a zero-width space
@@ -181,8 +185,7 @@
 if (collapsing) {
 if (ch == ' ')
 continue;
- // We act on \r as we would on \n because CSS uses it to indicate new-line
- if (ch == '\n' || ch == '\r') {
+ if (ch == '\n') {
 collapsingLF = true;
 continue;
 }
@@ -197,7 +200,7 @@
 continue;
 }
 else
- if (!preserveWS && (ch == '\n' || ch == '\r')) {
+ if (!preserveWS && ch == '\n') {
 collapsing = true;
 collapsingLF = true;
 continue;
@@ -255,15 +258,15 @@
 if (*next == '%')
 return Length(r, Percent);
 
- if (*next == '*') 
+ if (*next == '*')
 return Length(r, Relative);
 }
 return Length(r, Fixed);
 } else {
 if (i < l) {
 const QChar* next = s+i;
- 
- if (*next == '*') 
+
+ if (*next == '*')
 return Length(1, Relative);
 
 if (*next == '%')
@@ -367,7 +370,7 @@
 bool canCapitalize=true;
 DOMStringImpl *c = new DOMStringImpl;
 if(!l) return c;
- 
+
 c->s = QT_ALLOC_QCHAR_VEC(l);
 c->l = l;
 
@@ -385,10 +388,15 @@
 canCapitalize=true;
 }
 }
- 
+
 return c;
 }
 
+QString DOMStringImpl::string() const
+{
+ return QString(s, l);
+}
+
 int DOMStringImpl::toInt(bool* ok) const
 {
 // match \s*[+-]?\d*
Index: khtml/xml/Makefile.am
===================================================================
--- khtml/xml/Makefile.am	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/xml/Makefile.am	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -24,16 +24,16 @@
 	dom_docimpl.cpp dom_nodeimpl.cpp dom_textimpl.cpp \
 	dom_elementimpl.cpp dom_stringimpl.cpp dom2_rangeimpl.cpp \
 	dom2_traversalimpl.cpp xml_tokenizer.cpp dom_xmlimpl.cpp \
-	dom2_eventsimpl.cpp dom2_viewsimpl.cpp
+	dom2_eventsimpl.cpp dom2_viewsimpl.cpp	 dom_restyler.cpp
 
-#libkhtmlxml_la_LDFLAGS = -no-undefined 
+#libkhtmlxml_la_LDFLAGS = -no-undefined
 libkhtmlxml_la_METASOURCES = AUTO
 
 noinst_HEADERS = \
 	dom_docimpl.h dom_nodeimpl.h dom_textimpl.h \
 	dom_elementimpl.h dom_stringimpl.h dom2_rangeimpl.h \
 	dom2_traversalimpl.h xml_tokenizer.h dom_xmlimpl.h \
-	dom2_eventsimpl.h dom2_viewsimpl.h
+	dom2_eventsimpl.h dom2_viewsimpl.h dom_restyler.h
 
 INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
 -I$(top_srcdir)/khtml -I$(top_srcdir) -I$(top_srcdir)/kwallet/client \
Index: khtml/xml/xml_tokenizer.cpp
===================================================================
--- khtml/xml/xml_tokenizer.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/xml/xml_tokenizer.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -142,10 +142,15 @@
 if (currentNode()->nodeType() == Node::TEXT_NODE)
 exitText();
 
- ElementImpl *newElement = m_doc->document()->createElementNS(namespaceURI,qName);
+ DOMString nsURI;
+ if (!namespaceURI.isNull())
+ nsURI = DOMString(namespaceURI);
+ else
+ // No namespace declared, default to the no namespace
+ nsURI = DOMString("");
+ ElementImpl *newElement = m_doc->document()->createElementNS(nsURI,qName);
 if (!newElement)
 return false;
-
 int i;
 for (i = 0; i < atts.length(); i++) {
 int exceptioncode = 0;
@@ -157,7 +162,7 @@
 return false;
 }
 
- if (newElement->id() == ID_SCRIPT)
+ if (newElement->id() == ID_SCRIPT || newElement->id() == makeId(xhtmlNamespace, ID_SCRIPT))
 static_cast<HTMLScriptElementImpl *>(newElement)->setCreatedByParser(true);
 
 //this is tricky. in general the node doesn't have to attach to the one it's in. as far
@@ -241,8 +246,12 @@
 return false;
 return true;
 }
- else
+ else {
+ // Don't worry about white-space violating DTD
+ if (ch.stripWhiteSpace().isEmpty()) return true;
+
 return false;
+ }
 
 }
 
@@ -270,6 +279,7 @@
 
 QString XMLHandler::errorString()
 {
+ // ### Make better error-messages
 return i18n("the document is not in the correct file format");
 }
 
@@ -491,7 +501,7 @@
 // Recursively go through the entire document tree, looking for html <script> tags. For each of these
 // that is found, add it to the m_scripts list from which they will be executed
 
- if (n->id() == ID_SCRIPT) {
+ if (n->id() == ID_SCRIPT || n->id() == makeId(xhtmlNamespace, ID_SCRIPT)) {
 m_scripts.append(static_cast<HTMLScriptElementImpl*>(n));
 }
 
Index: khtml/xml/dom_docimpl.h
===================================================================
--- khtml/xml/dom_docimpl.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/xml/dom_docimpl.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -5,6 +5,7 @@
 * (C) 1999 Antti Koivisto (koivisto@kde.org)
 * (C) 2001 Dirk Mueller (mueller@kde.org)
 * (C) 2002-2003 Apple Computer, Inc.
+ * (C) 2006 Allan Sandfeld Jensen(kde@carewolf.com)
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Library General Public
@@ -58,6 +59,7 @@
 class CounterNode;
 class CachedObject;
 class CachedCSSStyleSheet;
+ class DynamicDomRestyler;
 }
 
 namespace DOM {
@@ -174,6 +176,7 @@
 QDict<ItemInfo> m_dict;
 };
 
+
 /**
 * @internal
 */
@@ -260,9 +263,6 @@
 
 void recalcStyleSelector();
 
- bool usesDescendantRules() { return m_usesDescendantRules; }
- void setUsesDescendantRules(bool b) { m_usesDescendantRules = b; }
-
 QString nextState();
 
 // Query all registered elements for their state
@@ -398,6 +398,9 @@
 void setHoverNode(NodeImpl *newHoverNode);
 NodeImpl *focusNode() const { return m_focusNode; }
 void setFocusNode(NodeImpl *newFocusNode);
+ NodeImpl* activeNode() const { return m_activeNode; }
+ void setActiveNode(NodeImpl *newActiveNode);
+
 // Updates for :target (CSS3 selector).
 void setCSSTarget(NodeImpl* n);
 NodeImpl* getCSSTarget() { return m_cssTarget; }
@@ -530,6 +533,12 @@
 return m_getElementByIdCache;
 }
 
+ QString contentLanguage() const { return m_contentLanguage; }
+ void setContentLanguage(const QString& cl) { m_contentLanguage = cl; }
+
+ khtml::DynamicDomRestyler& dynamicDomRestyler() { return *m_dynamicDomRestyler; }
+ const khtml::DynamicDomRestyler& dynamicDomRestyler() const { return *m_dynamicDomRestyler; }
+
 signals:
 void finishedParsing();
 
@@ -551,6 +560,8 @@
 QString m_printSheet;
 QStringList m_availableSheets;
 
+ QString m_contentLanguage;
+
 // Track the number of currently loading top-level stylesheets. Sheets
 // loaded using the @import directive are not included in this count.
 // We use this count of pending sheets to detect when we can begin attaching
@@ -568,6 +579,7 @@
 QColor m_textColor;
 NodeImpl *m_hoverNode;
 NodeImpl *m_focusNode;
+ NodeImpl *m_activeNode;
 NodeImpl *m_cssTarget;
 
 unsigned int m_domtree_version;
@@ -624,12 +636,13 @@
 // ### evaluate for placement in RenderStyle
 QPtrDict<QDict<khtml::CounterNode> > m_counterDict;
 
+ khtml::DynamicDomRestyler *m_dynamicDomRestyler;
+
 bool visuallyOrdered;
 bool m_bParsing;
 bool m_docChanged;
 bool m_styleSelectorDirty;
 bool m_inStyleRecalc;
- bool m_usesDescendantRules;
 bool m_async;
 bool m_hadLoadError;
 bool m_docLoading;
Index: khtml/xml/dom_stringimpl.h
===================================================================
--- khtml/xml/dom_stringimpl.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/xml/dom_stringimpl.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -55,8 +55,8 @@
 	}
 }
 
- DOMStringImpl(const char *str);
- DOMStringImpl(const QChar &ch) {
+ explicit DOMStringImpl(const char *str);
+ explicit DOMStringImpl(const QChar &ch) {
 	s = QT_ALLOC_QCHAR_VEC( 1 );
 	s[0] = ch;
 	l = 1;
@@ -90,6 +90,10 @@
 DOMStringImpl *upper() const;
 DOMStringImpl *capitalize() const;
 
+ QChar *unicode() const { return s; }
+ uint length() const { return l; }
+ QString string() const;
+
 unsigned int l;
 QChar *s;
 };
Index: khtml/khtmlimage.cpp
===================================================================
--- khtml/khtmlimage.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/khtmlimage.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -156,10 +156,11 @@
 m_khtml->setAutoloadImages( true );
 
 DOM::DocumentImpl *impl = dynamic_cast<DOM::DocumentImpl *>( m_khtml->document().handle() ); // ### hack ;-)
- if ( impl && m_ext->urlArgs().reload )
+ if (!impl) return false;
+ if ( m_ext->urlArgs().reload )
 impl->docLoader()->setCachePolicy( KIO::CC_Reload );
 
- khtml::DocLoader *dl = impl ? impl->docLoader() : 0;
+ khtml::DocLoader *dl = impl->docLoader();
 m_image = dl->requestImage( m_url.url() );
 if ( m_image )
 m_image->ref( this );
Index: khtml/testkhtml.h
===================================================================
--- khtml/testkhtml.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/testkhtml.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -2,6 +2,8 @@
 #define TESTKHTML_H
 
 #include <kdebug.h>
+#include <qvaluelist.h>
+#include <qdatetime.h>
 
 /**
 * @internal
@@ -36,8 +38,18 @@
 m_part->setEditable(s);
 }
 
+ void doBenchmark();
+
+ void handleDone();
+
 private:
 KHTMLPart *m_part;
+ QValueList<QString> filesToBenchmark;
+ QMap<QString, QValueList<int> > results;
+ int benchmarkRun;
+ QTime loadTimer;
+
+ void nextRun();
 };
 
 #endif
Index: khtml/khtmlpart_p.h
===================================================================
--- khtml/khtmlpart_p.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ khtml/khtmlpart_p.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -463,15 +463,15 @@
 QString m_overURL;
 QString m_overURLTarget;
 
- bool m_startBeforeEnd:1;
- bool m_extendAtEnd:1;		// true if selection is to be extended at its end
- enum { ExtendByChar, ExtendByWord, ExtendByLine } m_extendMode:2;
- bool m_bDnd:1;
- bool m_bFirstData:1;
- bool m_bClearing:1;
- bool m_bCleared:1;
- bool m_bSecurityInQuestion:1;
- bool m_focusNodeRestored:1;
+ bool m_startBeforeEnd;
+ bool m_extendAtEnd;		// true if selection is to be extended at its end
+ enum { ExtendByChar, ExtendByWord, ExtendByLine } m_extendMode;
+ bool m_bDnd;
+ bool m_bFirstData;
+ bool m_bClearing;
+ bool m_bCleared;
+ bool m_bSecurityInQuestion;
+ bool m_focusNodeRestored;
 
 int m_focusNodeNumber;
 
Index: kresources/kresources_manager.desktop
===================================================================
--- kresources/kresources_manager.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kresources/kresources_manager.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -7,6 +7,7 @@
 Comment[bg]=Мениджър на KResource
 Comment[bn]=কে-রিসোর্স ম্যানেজার
 Comment[br]=Merour KResource
+Comment[bs]=K Upravitelj resursima
 Comment[ca]=Gestor KResource
 Comment[cs]=Správce zdrojů
 Comment[da]=KResource-håndtering
@@ -29,6 +30,7 @@
 Comment[lb]=KResource-Manager
 Comment[lt]=KResouse tvarkyklė
 Comment[lv]=KResursu menedžeris
+Comment[mk]=Менаџер на KResource
 Comment[ms]=Pengurus KResource
 Comment[nb]=KRessurshåndterer
 Comment[nds]=KResource-Pleger
@@ -52,6 +54,7 @@
 Comment[tt]=KResource İdäräçese
 Comment[uk]=Менеджер KResource
 Comment[uz]=KResource бошқарувчиси
+Comment[vi]=Bộ quản lý tài nguyên KResource
 Comment[zh_CN]=KResource 管理器
 Comment[zh_HK]=KResource 管理員
 
Index: kresources/kresources.desktop
===================================================================
--- kresources/kresources.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kresources/kresources.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -15,6 +15,7 @@
 Name[bg]=Системни ресурси
 Name[bn]=কে.ডি.ই রিসোর্সসমূহ
 Name[br]=Danvezioù KDE
+Name[bs]=KDE resursi
 Name[ca]=Recursos KDE
 Name[cs]=Zdroje KDE
 Name[da]=KDE Ressourcer
@@ -60,6 +61,7 @@
 Name[tt]=KDE Resursları
 Name[uk]=Ресурси KDE
 Name[uz]=KDE имкониятлари
+Name[vi]=Tài nguyên KDE
 Name[zh_CN]=KDE 资源
 Name[zh_HK]=KDE 資源
 
@@ -119,6 +121,7 @@
 Comment[tt]=KDE Resursların Caylaw
 Comment[uk]=Налаштування ресурсів KDE
 Comment[uz]=KDE манбаларини мослаш
+Comment[vi]=Cấu hình các tài nguyên KDE.
 Comment[zh_CN]=配置 KDE 资源
 Comment[zh_HK]=設定 KDE 使用的資源
 
@@ -166,7 +169,9 @@
 Keywords[ta]=மூலங்கள்,இணைப்பு மூலம்,தொடர்பு மூலம்,நாள்காட்டி மூலம்,குறிப்புகள் மூலம்e,imap
 Keywords[tr]=kaynaklar,bağlantı kaynağı,iletiişm kaynağı,takvim kaynak,not kaynağı,imap
 Keywords[uk]=ресурси,ресурс для konnector,ресурс контактів,ресурс календаря,ресурс приміток,imap
+Keywords[vi]=tài nguyên,tài nguyên konnector,tài nguyên liên lạc,tài nguyên lịch,tài nguyên ghi chú,imap
 Keywords[zh_CN]=resources,konnector resource,contact resource,calendar resource,notes resource,imap资源,konnector 资源,联系人资源,日历资源,备忘资源
 
 Categories=Qt;KDE;X-KDE-settings-components;
+OnlyShowIn=KDE;
 
Index: kresources/kresources_plugin.desktop
===================================================================
--- kresources/kresources_plugin.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kresources/kresources_plugin.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -60,6 +60,7 @@
 Comment[tt]=KResource Eşçara Östämäse
 Comment[uk]=Втулок структури KResource
 Comment[uz]=KResource тўплам плагини
+Comment[vi]=Bộ cầm phít khuôn khổ tài nguyên KResource
 Comment[zh_CN]=KResource 框架插件
 Comment[zh_HK]=KResource Framework 外掛程式
 Comment[zh_TW]=KRsource Framework 外掛程式
Index: dcop/dcopc.c
===================================================================
--- dcop/dcopc.c	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ dcop/dcopc.c	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -470,6 +470,7 @@
 IceFlush(dcop_ice_conn);
 
 free(outputData);
+ outputData = NULL;
 
 if (IceConnectionStatus(dcop_ice_conn) != IceConnectAccepted) {
 fprintf(stderr, "dcop_call(): Connection not accepted\n");
@@ -495,10 +496,9 @@
 status = IceProcessMessages(dcop_ice_conn, &waitInfo, &readyRet);
 
 if (status == IceProcessMessagesIOError) {
-	 fprintf(stderr, "dcop_call(): IceProcessMessagesIOError\n");
-	 IceCloseConnection(dcop_ice_conn);
-	 free(outputData);
-	 return False;
+ fprintf(stderr, "dcop_call(): IceProcessMessagesIOError\n");
+ IceCloseConnection(dcop_ice_conn);
+ return False;
 }
 
 fprintf(stderr, "dcop_call(): readyRet == %s\n", readyRet ? "True" : "False");
Index: kjs/date_object.cpp
===================================================================
--- kjs/date_object.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kjs/date_object.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -927,11 +927,11 @@
 if (!*dateString)
 	return invalidDate;
 
- if (day < 1)
+ if (day < 0)
 return invalidDate;
 if (day > 31) {
 // ### where is the boundary and what happens below?
- if (*dateString == '/' && day >= 1000) {
+ if (*dateString == '/') {
 // looks like a YYYY/MM/DD date
 if (!*++dateString)
 return invalidDate;
@@ -949,7 +949,7 @@
 } else {
 return invalidDate;
 }
- } else if (*dateString == '/' && day <= 12 && month == -1)
+ } else if (*dateString == '/' && month == -1)
 {
 	dateString++;
 // This looks like a MM/DD/YYYY date, not an RFC date.....
Index: pics/hicolor/index.theme
===================================================================
--- pics/hicolor/index.theme	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ pics/hicolor/index.theme	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -45,6 +45,7 @@
 Name[tt]=KDE-KüpTösle
 Name[uk]=Багатокольорова KDE
 Name[ven]=Muvhala wa ntha wa-KDE
+Name[vi]=Màu cao KDE
 Name[wa]=KDE-HôtèsColeurs
 Name[zh_CN]=KDE 高色彩
 Name[zh_HK]=KDE 高彩圖示
@@ -53,6 +54,7 @@
 Comment=Fallback icon theme
 Comment[af]=Valterug Ikoon Tema
 Comment[bg]=Тема с икони с висококачествени цветове (24, 32 бита)
+Comment[bs]=Standardna tema ikona
 Comment[ca]=Tema d'icona de reserva
 Comment[cs]=Záložní motiv ikon
 Comment[da]=Ikontema at falde tilbage til
@@ -98,6 +100,7 @@
 Comment[tr]=Yedek simge teması
 Comment[tt]=Fallback ikon tışlawı
 Comment[uk]=Основна тема піктограм
+Comment[vi]=Sắc thái biểu tượng dự trữ
 Comment[zh_CN]=默认图标主题
 Comment[zh_HK]=後備高彩圖示主題
 DisplayDepth=32
Index: pics/crystalsvg/cr16-action-tab_new_bg.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: pics/crystalsvg/cr16-action-tab_new_bg.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: pics/crystalsvg/index.theme
===================================================================
--- pics/crystalsvg/index.theme	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ pics/crystalsvg/index.theme	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -16,6 +16,7 @@
 Name[sv]=Kristall SVG
 Name[ta]=க்ரிஸ்டல் எஸ்விஜி
 Name[uz]=Кристал SVG
+Name[vi]=SVG Crystal
 Name[zh_CN]=水晶 SVG
 Comment=Icon Theme by Everaldo.com Design Studio
 Comment[af]=Ikoon Tema deur Everaldo.com Design Studio
@@ -74,6 +75,7 @@
 Comment[tt]=Everaldo.com Design Studio tarafınnan İkon Tışlawı
 Comment[uk]=Тема піктограм від студії дизайну Everaldo.com
 Comment[uz]=Everaldo.com дизайн студиоси томонидан нишончалар мавзуси
+Comment[vi]=Sắc thái biểu tượng của Xưởng vẽ Thiết kế Everaldo.com
 Comment[zh_CN]=Everaldo 设计工作室制作的图标主题
 Comment[zh_HK]=由 Everaldo.com 提供的圖示主題
 DisplayDepth=32
Index: pics/crystalsvg/cr16-action-tab_remove.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: pics/crystalsvg/cr16-action-tab_remove_other.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: pics/crystalsvg/cr16-action-tab_remove_other.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: pics/crystalsvg/cr16-action-tab_new.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: kdoctools/meinproc.cpp
===================================================================
--- kdoctools/meinproc.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdoctools/meinproc.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -143,8 +143,6 @@
 return 2;
 	}
 
- chdir( QFile::encodeName( file.dirPath( true ) ) );
-
 QString catalogs;
 catalogs += locate( "dtd", "customization/catalog" );
 catalogs += " ";
@@ -161,6 +159,7 @@
 exe = locate( "exe", "xmllint" );
 }
 if ( !::access( QFile::encodeName( exe ), X_OK ) ) {
+ chdir( QFile::encodeName( file.dirPath( true ) ) );
 QString cmd = exe;
 cmd += " --catalogs --valid --noout ";
 cmd += KProcess::quote(file.fileName());
@@ -242,7 +241,7 @@
 for ( PairList::ConstIterator it = list.begin(); it != list.end();
 ++it, ++wi )
 fprintf( stdout, "w\t%s\t%d\t%d\n", ( *it ).word.utf8().data(),
- 1000*wi/list.count(), ( *it ).base );
+ 1000*wi/(int)list.count(), ( *it ).base );
 
 xmlFreeDoc(res);
 } else {
Index: kdoctools/customization/da/lang.entities
===================================================================
--- kdoctools/customization/da/lang.entities	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdoctools/customization/da/lang.entities	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -12,6 +12,8 @@
 
 <!ENTITY underGPL PUBLIC "-//KDE//DOCUMENT GPL Licence Declaration//DA"
 "entities/underGPL.docbook" >
+<!ENTITY underLGPL PUBLIC "-//KDE//DOCUMENT LGPL Licence Declaration//DA"
+ "entities/underLGPL.docbook" >
 <!ENTITY underFDL PUBLIC "-//KDE//DOCUMENT FDL Licence Declaration//DA"
 "entities/underFDL.docbook" >
 <!ENTITY underBSDLicense PUBLIC "-//KDE//DOCUMENT BSD Licence Declaration//DA"
Index: kdoctools/customization/da/catalog
===================================================================
--- kdoctools/customization/da/catalog	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdoctools/customization/da/catalog	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -16,6 +16,8 @@
 "common/fdl-translated"
 PUBLIC "-//KDE//DOCUMENT GPL Licence Declaration//DA"
 "entities/underGPL.docbook" 
+PUBLIC "-//KDE//DOCUMENT LGPL Licence Declaration//DA"
+ "entities/underLGPL.docbook"
 PUBLIC "-//KDE//DOCUMENT FDL Licence Declaration//DA"
 "entities/underFDL.docbook"
 PUBLIC "-//KDE//DOCUMENT BSD Licence Declaration//DA"
Index: kdoctools/customization/fr/user.entities
===================================================================
--- kdoctools/customization/fr/user.entities	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdoctools/customization/fr/user.entities	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -133,6 +133,10 @@
 <!ENTITY traducteurPierre-EmmanuelMuller '<othercredit role="translator"><firstname>Pierre-Emmanuel</firstname><surname>Müller</surname><affiliation><address><email>pem@levillage.org</email></address></affiliation><contrib>Traduction française</contrib></othercredit>'>
 <!ENTITY relecteurPierre-EmmanuelMuller '<othercredit role="reviewer"><firstname>Pierre-Emmanel</firstname><surname>Müller</surname><affiliation><address><email>pem@levillage.org</email></address></affiliation><contrib>Relecture de la documentation française</contrib></othercredit>'>
 
+<!ENTITY traducteurPaulMarcelinNana '<othercredit role="translator"><firstname>Paul-Marcelin</firstname><surname>Nana</surname><affiliation><address><email>paul.nana@tic.unilim.fr</email></address></affiliation><contrib>Traduction française</contrib></othercredit>'>
+<!ENTITY relecteurPaulMarcelinNana '<othercredit role="reviewer"><firstname>Paul-Marcelin</firstname><surname>Nana</surname><affiliation><address><email>paul.nana@tic.unilim.fr</email></address></affiliation><contrib>Relecture de la documentation française</contrib></othercredit>'>
+
+
 <!ENTITY traducteurCedricPasteur '<othercredit role="translator"><firstname>Cédric</firstname><surname>Pasteur</surname><affiliation><address><email>cedric.pasteur@free.fr</email></address></affiliation><contrib>Traduction française</contrib></othercredit>'>
 <!ENTITY relecteurCedricPasteur '<othercredit role="reviewer"><firstname>Cédric</firstname><surname>Pasteur</surname><affiliation><address><email>cedric.pasteur@free.fr</email></address></affiliation><contrib>Relecture de la documentation française</contrib></othercredit>'>
 
@@ -225,6 +229,7 @@
 <!ENTITY JulienMorot 'Julien Morot <email>julien@momonux.org</email>'>
 <!ENTITY BaptisteMathus 'Baptiste Mathus <email>bmathus@free.fr</email>'>
 <!ENTITY Pierre-EmmanuelMuller 'Pierre-Emmanuel Müller <email>pem@levillage.org</email>'>
+<!ENTITY PaulMarcelinNana 'Paul-Marcelin Nana <email>paul.nana@tic.unilim.fr</email>'>
 <!ENTITY CedricPasteur 'Cédric Pasteur <email>cedric.pasteur@free.fr</email>'>
 <!ENTITY PatricePawlak 'Patrice Pawlak <email>patrice.pawlak@free.fr</email>'>
 <!ENTITY RomainPelisse 'Romain Pelisse <email>belaran@gmail.com</email>'>
Index: kdoctools/customization/ca/user.entities
===================================================================
--- kdoctools/customization/ca/user.entities	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdoctools/customization/ca/user.entities	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -29,8 +29,17 @@
 <!ENTITY kmenu	"Menú <guimenu>K</guimenu>">
 <!ENTITY BER	"botó <mousebutton>esquerra</mousebutton> del ratolí">
 <!ENTITY BMR	"botó <mousebutton>mig</mousebutton> del ratolí">
-<!ENTITY SO	"sistema operatiu">
+<!ENTITY SO		"sistema operatiu">
 <!ENTITY BDR	"botó <mousebutton>dret</mousebutton> del ratolí">
 <!ENTITY Maj	"<keycap>Majús.</keycap>">
 <!ENTITY safatasistema	"<application>safata del sistema</application>">
 <!ENTITY Tab	"<keycap>Tabulador</keycap>">
+
+
+<!ENTITY traductor.Antoni.Bella		'<othercredit role="translator"><firstname>Antoni</firstname><surname>Bella</surname><affiliation><address><email>bella5@teleline.es</email></address></affiliation><contrib>Traductor</contrib></othercredit>'>
+<!ENTITY revisor.Antoni.Bella		'<othercredit role="reviewer"><firstname>Antoni</firstname><surname>Bella</surname><affiliation><address><email>bella5@teleline.es</email></address></affiliation><contrib>Revisor</contrib></othercredit>'>
+
+
+
+<!ENTITY credits.Antoni.Bella		'Antoni Bella <email>bella5@teleline.es</email>'>
+
Index: kdoctools/customization/pt/user.entities
===================================================================
--- kdoctools/customization/pt/user.entities	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdoctools/customization/pt/user.entities	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -38,3 +38,4 @@
 </guiicon> icon'>
 <!ENTITY kmenu "menu <guimenu>K</guimenu>">
 <!ENTITY kinfocenter "<application>Centro de Informação do KDE</application>" >
+<!ENTITY ksystemlog "<application>KSystemLog</application>" >
Index: kdoctools/customization/it/entities/underLGPL.docbook
===================================================================
--- kdoctools/customization/it/entities/underLGPL.docbook	(.../tags/KDE/3.5.2/kdelibs)	(revision 0)
+++ kdoctools/customization/it/entities/underLGPL.docbook	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -0,0 +1,2 @@
+<para>Questo programma è concesso in licenza sotto i termini della <ulink
+url="common/gpl-license.html">GNU Lesser General Public License</ulink>.</para>
\ No newline at end of file
Index: kdoctools/customization/it/lang.entities
===================================================================
--- kdoctools/customization/it/lang.entities	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdoctools/customization/it/lang.entities	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -12,6 +12,8 @@
 
 <!ENTITY underGPL PUBLIC "-//KDE//DOCUMENT GPL Licence Declaration//IT"
 "entities/underGPL.docbook" >
+<!ENTITY underLGPL PUBLIC "-//KDE//DOCUMENT LGPL Licence Declaration//IT"
+ "entities/underLGPL.docbook" >
 <!ENTITY underFDL PUBLIC "-//KDE//DOCUMENT FDL Licence Declaration//IT"
 "entities/underFDL.docbook" >
 <!ENTITY underBSDLicense PUBLIC "-//KDE//DOCUMENT BSD Licence Declaration//IT"
Index: kdoctools/customization/it/catalog
===================================================================
--- kdoctools/customization/it/catalog	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdoctools/customization/it/catalog	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -16,6 +16,8 @@
 "common/fdl-translated"
 PUBLIC "-//KDE//DOCUMENT GPL Licence Declaration//IT"
 "entities/underGPL.docbook" 
+PUBLIC "-//KDE//DOCUMENT LGPL Licence Declaration//IT"
+ "entities/underLGPL.docbook" 
 PUBLIC "-//KDE//DOCUMENT FDL Licence Declaration//IT"
 "entities/underFDL.docbook"
 PUBLIC "-//KDE//DOCUMENT BSD Licence Declaration//IT"
Index: kdoctools/customization/kde-chunk.xsl
===================================================================
--- kdoctools/customization/kde-chunk.xsl	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdoctools/customization/kde-chunk.xsl	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -87,18 +87,6 @@
 <meta name="GENERATOR" content="KDE XSL Stylesheet V{$KDE_VERSION} using libxslt"/>
 </xsl:template>
 
-<xsl:template match="/book/bookinfo/legalnotice" mode="titlepage.mode">
- <xsl:variable name="filename" select="concat($kde.common,'fdl-notice.html')"/>
- <xsl:variable name="title">
- <xsl:apply-templates select="." mode="title.markup"/>
- </xsl:variable>
- 
- <a href="{$filename}">
- <xsl:copy-of select="$title"/>
- </a>
- 
-</xsl:template>
-
 <!--
 <xsl:template match="olink">
 <a>
Index: kdoctools/xslt.cpp
===================================================================
--- kdoctools/xslt.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdoctools/xslt.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -214,6 +214,8 @@
 bool saveToCache( const QString &contents, const QString &filename )
 {
 QIODevice *fd = ::getBZip2device(filename);
+ if ( !fd )
+ return false;
 
 if (!fd->open(IO_WriteOnly))
 {
@@ -238,6 +240,8 @@
 
 kdDebug( 7119 ) << "create filter" << endl;
 QIODevice *fd = ::getBZip2device(cache);
+ if ( !fd )
+ return false;
 
 if (!fd->open(IO_ReadOnly))
 {
Index: kparts/krop.desktop
===================================================================
--- kparts/krop.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kparts/krop.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -34,7 +34,7 @@
 Comment[id]=Komponen KDE
 Comment[is]=KDE eining
 Comment[it]=Componente KDE
-Comment[ja]=KDEコンポーネント
+Comment[ja]=KDE コンポーネント
 Comment[km]=សមាសភាគ KDE
 Comment[ko]=KDE 구성 요소
 Comment[lb]=KDE-Komponent
@@ -73,7 +73,7 @@
 Comment[uk]=Компонент KDE
 Comment[uz]=KDE компоненти
 Comment[ven]=Khomphonente ya KDE
-Comment[vi]=KDE Component 
+Comment[vi]=Thành phần KDE.
 Comment[xh]=Ingxenye ye KDE
 Comment[zh_CN]=KDE 部件
 Comment[zh_HK]=KDE 元件
Index: kparts/factory.cpp
===================================================================
--- kparts/factory.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kparts/factory.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -64,7 +64,7 @@
 if ( !factory )
 return 0;
 KParts::Factory *pfactory = dynamic_cast<KParts::Factory *>( factory );
- if ( !factory )
+ if ( !pfactory )
 return 0;
 return pfactory->partInstance();
 }
Index: kparts/krwp.desktop
===================================================================
--- kparts/krwp.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kparts/krwp.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -34,7 +34,7 @@
 Comment[id]=Komponen KDE
 Comment[is]=KDE eining
 Comment[it]=Componente KDE
-Comment[ja]=KDEコンポーネント
+Comment[ja]=KDE コンポーネント
 Comment[km]=សមាសភាគ KDE
 Comment[ko]=KDE 구성 요소
 Comment[lb]=KDE-Komponent
@@ -73,7 +73,7 @@
 Comment[uk]=Компонент KDE
 Comment[uz]=KDE компоненти
 Comment[ven]=Khomphonente ya KDE
-Comment[vi]=KDE Component 
+Comment[vi]=Thành phần KDE.
 Comment[xh]=Ingxenye ye KDE
 Comment[zh_CN]=KDE 部件
 Comment[zh_HK]=KDE 元件
Index: kparts/tests/notepad.desktop
===================================================================
--- kparts/tests/notepad.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kparts/tests/notepad.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -68,7 +68,7 @@
 Name[uk]=Записна книжка (приклад)
 Name[uz]=Ён дафтарча (мисол)
 Name[ven]=Hau nwalela notsi (Tsumbo)
-Name[vi]=notepad(ví dụ) 
+Name[vi]=Tập giấy (thí dụ)
 Name[xh]=Iphetshan lokubhala (umzekelo)
 Name[zh_CN]=记事本(例子)
 Name[zh_HK]=記事本(範例)
Index: kparts/browserview.desktop
===================================================================
--- kparts/browserview.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kparts/browserview.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -68,7 +68,7 @@
 Name[uk]=Вигляд "Навігація"
 Name[uz]=Браузернинг кўриниши
 Name[ven]=U vhona ha Burausu
-Name[vi]=Xem trình duyệt 
+Name[vi]=Xem duyệt
 Name[xh]=Imboniselo Yomkhangeli zincwadi
 Name[zh_CN]=浏览器视图
 Name[zh_HK]=瀏覽器視圖
Index: kparts/kpart.desktop
===================================================================
--- kparts/kpart.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kparts/kpart.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -33,7 +33,7 @@
 Comment[id]=Komponen KDE
 Comment[is]=KDE eining
 Comment[it]=Componente KDE
-Comment[ja]=KDEコンポーネント
+Comment[ja]=KDE コンポーネント
 Comment[km]=សមាសភាគ KDE
 Comment[ko]=KDE 구성 요소
 Comment[lb]=KDE-Komponent
@@ -72,7 +72,7 @@
 Comment[uk]=Компонент KDE
 Comment[uz]=KDE компоненти
 Comment[ven]=Khomphonente ya KDE
-Comment[vi]=KDE Component 
+Comment[vi]=Thành phần KDE.
 Comment[xh]=Ingxenye ye KDE
 Comment[zh_CN]=KDE 部件
 Comment[zh_HK]=KDE 元件
Index: kparts/browserrun.cpp
===================================================================
--- kparts/browserrun.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kparts/browserrun.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -195,6 +195,8 @@
 job->putOnHold();
 m_job = 0;
 
+ KRun::setSuggestedFileName(m_suggestedFilename);
+
 foundMimeType( _type );
 }
 
Index: kded/test/test.desktop
===================================================================
--- kded/test/test.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kded/test/test.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -77,7 +77,7 @@
 Name[uk]=Модуль тестування KDED
 Name[uz]=KDED синов модули
 Name[ven]=Modulu ya mulingo wa KDED
-Name[vi]=Mô đun thử nghiệm KDED 
+Name[vi]=Mô-đun thử ra KDED
 Name[xh]=Isichatshulwa Sovavanyo lwe KDED
 Name[zh_CN]=KDED 测试模块
 Name[zh_HK]=KDED 測試模組
@@ -152,7 +152,7 @@
 Comment[uk]=Модуль тестування для KDED
 Comment[uz]=KDED учун синов модули
 Comment[ven]=Modulu ya mulingo ya KDED
-Comment[vi]=Mô đun thử nghiệm cho KDED 
+Comment[vi]=Một mô-đun thử ra cho KDED.
 Comment[xh]=Isichatshulwa Sovavavanyo lwe KDED
 Comment[zh_CN]=KDED 的测试模块
 Comment[zh_HK]=KDED 的測試模組
Index: kded/kdedmodule.desktop
===================================================================
--- kded/kdedmodule.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kded/kdedmodule.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -34,7 +34,7 @@
 Comment[id]=Modul KDED
 Comment[is]=KDED eining
 Comment[it]=Modulo di KDED
-Comment[ja]=KDEDモジュール
+Comment[ja]=KDED モジュール
 Comment[km]=ម៉ូឌុល KDED
 Comment[ko]=KDED 모듈
 Comment[lb]=KDED-Modul
@@ -71,7 +71,7 @@
 Comment[uk]=Модуль KDED
 Comment[uz]=KDED модули
 Comment[ven]=Modulu wa KDED
-Comment[vi]=Mô đun KDED 
+Comment[vi]=Mô-đun KDED
 Comment[xh]=KDED Isichatshulwa
 Comment[zh_CN]=KDED 模块
 Comment[zh_HK]=KDED 模組
Index: kded/kded.cpp
===================================================================
--- kded/kded.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kded/kded.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -96,10 +96,11 @@
 KApplication::kdeinitExecWait( "kdontchangethehostname", args );
 }
 
-Kded::Kded(bool checkUpdates)
+Kded::Kded(bool checkUpdates, bool new_startup)
 : DCOPObject("kbuildsycoca"), DCOPObjectProxy(),
 b_checkUpdates(checkUpdates),
- m_needDelayedCheck(false)
+ m_needDelayedCheck(false),
+ m_newStartup( new_startup )
 {
 _self = this;
 QCString cPath;
@@ -162,9 +163,33 @@
 bool autoload = service->property("X-KDE-Kded-autoload", QVariant::Bool).toBool();
 config->setGroup(QString("Module-%1").arg(service->desktopEntryName()));
 autoload = config->readBoolEntry("autoload", autoload);
- if (autoload && kde_running)
- loadModule(service, false);
-
+ if( m_newStartup )
+ {
+ // see ksmserver's README for description of the phases
+ QVariant phasev = service->property("X-KDE-Kded-phase", QVariant::Int );
+ int phase = phasev.isValid() ? phasev.toInt() : 2;
+ bool prevent_autoload = false;
+ switch( phase )
+ {
+ case 0: // always autoload
+ break;
+ case 1: // autoload only in KDE
+ if( !kde_running )
+ prevent_autoload = true;
+ break;
+ case 2: // autoload delayed, only in KDE
+ default:
+ prevent_autoload = true;
+ break; 
+ }
+ if (autoload && !prevent_autoload)
+ loadModule(service, false);
+ }
+ else
+ {
+ if (autoload && kde_running)
+ loadModule(service, false);
+ }
 bool dontLoad = false;
 QVariant p = service->property("X-KDE-Kded-load-on-demand", QVariant::Bool);
 if (p.isValid() && (p.toBool() == false))
@@ -177,6 +202,23 @@
 }
 }
 
+void Kded::loadSecondPhase()
+{
+ kdDebug(7020) << "Loading second phase autoload" << endl;
+ KConfig *config = kapp->config();
+ KService::List kdedModules = KServiceType::offers("KDEDModule");
+ for(KService::List::ConstIterator it = kdedModules.begin(); it != kdedModules.end(); ++it)
+ {
+ KService::Ptr service = *it;
+ bool autoload = service->property("X-KDE-Kded-autoload", QVariant::Bool).toBool();
+ config->setGroup(QString("Module-%1").arg(service->desktopEntryName()));
+ autoload = config->readBoolEntry("autoload", autoload);
+ QVariant phasev = service->property("X-KDE-Kded-phase", QVariant::Int );
+ int phase = phasev.isValid() ? phasev.toInt() : 2;
+ if( phase == 2 && autoload )
+ loadModule(service, false);
+ }
+}
 
 void Kded::noDemandLoad(const QString &obj)
 {
@@ -671,6 +713,7 @@
 static KCmdLineOptions options[] =
 {
 { "check", I18N_NOOP("Check Sycoca database only once"), 0 },
+ { "new-startup", "Internal", 0 },
 KCmdLineLastOption
 };
 
@@ -713,7 +756,10 @@
 {
 if (startup) {
 startup = false;
-	 QTimer::singleShot(500, Kded::self(), SLOT(initModules()));
+ if( Kded::self()->newStartup())
+ Kded::self()->initModules();
+ else
+	 QTimer::singleShot(500, Kded::self(), SLOT(initModules()));
 } else 
 runBuildSycoca();
 
@@ -729,6 +775,7 @@
 res += "void unregisterWindowId(long int)";
 res += "QCStringList loadedModules()";
 res += "void reconfigure()";
+ res += "void loadSecondPhase()";
 res += "void quit()";
 return res;
 }
@@ -786,6 +833,11 @@
 replyType = "void";
 return true;
 }
+ else if (fun == "loadSecondPhase()") {
+ Kded::self()->loadSecondPhase();
+ replyType = "void";
+ return true;
+ }
 else if (fun == "quit()") {
 quit();
 replyType = "void";
@@ -860,7 +912,7 @@
 checkStamps = config->readBoolEntry("CheckFileStamps", true);
 delayedCheck = config->readBoolEntry("DelayedCheck", false);
 
- Kded *kded = new Kded(bCheckSycoca); // Build data base
+ Kded *kded = new Kded(bCheckSycoca, args->isSet("new-startup")); // Build data base
 
 signal(SIGTERM, sighandler);
 signal(SIGHUP, sighandler);
Index: kded/kded.h
===================================================================
--- kded/kded.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kded/kded.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -42,7 +42,7 @@
 {
 Q_OBJECT
 public:
- Kded(bool checkUpdates);
+ Kded(bool checkUpdates, bool new_startup);
 virtual ~Kded();
 
 static Kded *self() { return _self;}
@@ -72,6 +72,7 @@
 void registerWindowId(long windowId);
 void unregisterWindowId(long windowId);
 void recreate(bool initial);
+ void loadSecondPhase();
 
 public slots:
 /**
@@ -164,6 +165,10 @@
 QIntDict<long> m_globalWindowIdList;
 QStringList m_allResourceDirs;
 bool m_needDelayedCheck;
+ bool m_newStartup;
+public:
+ bool newStartup() const { return m_newStartup; }
+private:
 
 static Kded *_self;
 };
Index: kded/khostname.cpp
===================================================================
--- kded/khostname.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kded/khostname.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -155,7 +155,11 @@
 continue;
 
 QCString newNetId = newName+netId.mid(i);
+ QCString oldNetId = netId.left(i);
 
+ if(oldNetId != oldName)
+ continue;
+
 cmd = "xauth remove "+KProcess::quote(netId);
 system(QFile::encodeName(cmd));
 cmd = "xauth add ";
Index: kdeprint/filters/poster.desktop
===================================================================
--- kdeprint/filters/poster.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeprint/filters/poster.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -66,6 +66,7 @@
 Comment[uk]=Друк плакатів
 Comment[uz]=Плакат босиб чиқариш
 Comment[ven]=Phirinthani ya phosithara
+Comment[vi]=In bích chương
 Comment[wa]=Imprimaedje poster
 Comment[xh]=Ushicilelo Lwephepha elinomyalezo
 Comment[zh_CN]=海报打印
@@ -109,7 +110,7 @@
 Description[mn]=Том зарлалыг олон жижиг хуудсууд дээр хэвлэх хэрэгсэл.Энэ тушаалыг хэрэглэхдээ poster-ггүйцэтгэхээр болгохдоо өөрийн<tt>PATH</tt> даа ханддаг болгох ёстой. Энэ хэрэгслийн эх код <a href="http://printing.kde.org/downloads">KDEPrint вэб хуудсанд байгаа байх</a>. САНАМЖ: KDEPrint вэб хуудсанд эх хувилбарын өөрчилөгдсөн хувилбарууд олдох ба CTAN ариваар шахагдаж тус тусын сайтан дээр тавигдсан байгаа.Харин эх пакет КДЭ-тэй ажиллахгүй. Та <a href="http://printing.kde.org/downloads">KDEPrint веб хуудсаас</a> авсан пакетаа хэрэглэх ёстой.
 Description[ms]=Utiliti untuk mencetak poster besar pada banyak helaian kertas. Untuk menggunakan fungsi ini ini, poster boleh laksana mesti ada pada <tt>PATH</tt> anda.Kod sumber untuk utiliti ini ada di <a href="http://printing.kde.org/downloads">Laman KDEPrint</a>. AMARAN: Pakej di laman KDEPrint ialah versi telah diubah dari versi asal yang boleh diperoleh dari mana-mana cermin arkib CTAN. Namun, pakej asal tidak boleh berfungsi dengan KDE. Anda mesti menggunakan pakej yang terdapat di <a href="http://printing.kde.org/downloads">Laman KDEPrint</a>.
 Description[nb]=Hjelpeprogram for å skrive ut store plakater fordelt på mange små papirark. Du må ha poster-programmet i søkestien din, <tt>PATH</tt>. Kildekoden for dette programmet kan hentes fra <a href="http://printing.kde.org/downloads">KDEPrint-siden</a>. ADVARSEL Pakken som finnes på KDEPrint-siden er en modifisert utgave av originalen som kan finnes på alle CTAN-arkivspeil, men originalen virker ikke med KDE. Du må bruke utgaven fra <a href="http://printing.kde.org/downloads">KDEPrint-siden</a>.
-Description[nds]=Warktüüch, mit dat grote Biller op mennige lütte Sieden druckt warrn kann. Wenn Du dat bruken wullt, mutt dat Programm poster binnen Dien <tt>PATH</tt> wesen. De Borncode dorför kann vun de <a href="http://printing.kde.org/downloads">KDEPrint-Nettsiet</a> daallaadt warrn.Wohrscho: Dat Paket vun KDEPrint is en ännert Verschoon vun dat Orginaalpaket, dat op jichtenseen CTAN Archiv-Mirror liggt, aver dat Orginaalpaket warrt nich mit KDE arbeiden. Du muttst dat Paket vun de <a href="http://printing.kde.org/downloads">KDEPrint-Nettsiet</a> bruken.
+Description[nds]=Warktüüch, mit dat grote Biller op mennige lütte Sieden druckt warrn kann. Wenn Du dat bruken wullt, mutt dat Programm poster binnen Dien <tt>PATH</tt> wesen. De Bornkode dorför kann vun de <a href="http://printing.kde.org/downloads">KDEPrint-Nettsiet</a> daallaadt warrn.Wohrscho: Dat Paket vun KDEPrint is en ännert Verschoon vun dat Orginaalpaket, dat op jichtenseen CTAN Archiv-Mirror liggt, aver dat Orginaalpaket warrt nich mit KDE arbeiden. Du muttst dat Paket vun de <a href="http://printing.kde.org/downloads">KDEPrint-Nettsiet</a> bruken.
 Description[nl]=Hulpprogramma voor het afdrukken van grote posterformaten op kleine vellen papier. Om dit commando te gebruiken dient het programmma poster zich in uw zoekpad (<tt>$PATH</tt>) te bevinden. De broncode voor dit hulpprogramma kunt u vinden op de <a href="http://printing.kde.org/downloads">website</a> van KDEPrint. Waarschuwing: het pakket dat aangeboden wordt op de website van KDEPrint is een afgeleide versie. Het originele pakket kunt u vinden op elke CTAN-archiefmirror, maar dit pakket zal niet met KDE werken. U kunt alleen het pakket dat aangeboden wordt op de <a href="http://printing.kde.org/downloads">website</a> van KDEPrint gebruiken.
 Description[nn]=Verktøy som let deg skriva ut store plakatar på fleire små ark. For å bruka denne kommandoen, må programmet poster vera tilgjengeleg i søkjestigen (<tt>PATH</tt>). Kjeldekoden til dette verktøyet finn du på <a href="http://printing.kde.org/downloads">nettstaden til KDEPrint</a>. ÅTVARING: Pakken som ligg på KDEPrint-nettstaden er ei tilpassa utgåve av den opphavlege som du kan finna i CTAN-arkivet. Den opphavlege pakken fungerer ikkje med KDE. Du må bruka pakken som ligg på <a href="http://printing.kde.org/downloads">KDEPrint-nettstaden</a>.
 Description[nso]=Sebereka sago gatisa diswantsho tse kgolo go matlakala a mantshi a mannyane. Go somisa taelo ye, phethagatsego ya seswantsho e swanetse go tsenelega kago <tt>TSEJANA</tt> ya gago. Khoutu ya mothopo wa sebereka se ekaba ele go <a href="http://printing.kde.org/downloads">Lefelo la web la Kgatiso ya KDE</a>. TEMOSO: Pakana yeo e hweditswego kago lefelo la web la Kgatiso ya KDE ke tsweletso yeo e kaonafaditswego ya ya mathomothomo yeo eka hwetswago kago seipone sa polokelo ya CTAN, efela pakana ya mathomothomo e kase beereke le KDE. O swanetse go somisa pakana yeo e hweditswego kago <a href="http://printing.kde.org/downloads">lefelo la web la Kgatiso ya KDE</a>.
Index: kdeprint/filters/psbook1.desktop
===================================================================
--- kdeprint/filters/psbook1.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeprint/filters/psbook1.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -76,6 +76,7 @@
 Comment[uk]=Друк брошури - парні сторінки (крок 1)
 Comment[uz]=Памфлет босиб чиқариш - Жуфт бетлар (қадам 1)
 Comment[ven]=U phirintha ha tshibugwana - masiatari (tshitepe tshau thoma)
+Comment[vi]=Khả năng in pam-phơ-lê — các trang chẵn (bước 1)
 Comment[xh]=Ushicilelo Lwephetshana - Amaphepha Alinganayo (inyathelo 1) 
 Comment[zh_CN]=打印小册 - 偶数页(第一步)
 Comment[zh_HK]=列印小冊子 - 偶數頁(第一步)
Index: kdeprint/filters/psbook2.desktop
===================================================================
--- kdeprint/filters/psbook2.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeprint/filters/psbook2.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -77,6 +77,7 @@
 Comment[uk]=Друк брошури - непарні сторінки (крок 2)
 Comment[uz]=Памфлет босиб чиқариш - Тоқ бетлар (қадам 2)
 Comment[ven]=U phirintha tshibugwana - masaitari (tshitepe tsha vhuvhili)
+Comment[vi]=Khả năng in pam-phơ-lê — các trang lẻ (bước 2)
 Comment[xh]=Ushicilelo Lwephetshana - Amaphepha Amnqakathi (inyathelo 2)
 Comment[zh_CN]=打印小册 - 奇数页(第二步)
 Comment[zh_HK]=列印小冊子 - 奇數頁(第二步)
Index: kdeprint/filters/psselect.desktop
===================================================================
--- kdeprint/filters/psselect.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeprint/filters/psselect.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -77,6 +77,7 @@
 Comment[uk]=Фільтр вибору/порядку сторінок
 Comment[uz]=Бетларни танлаш/тартиблаш филтери
 Comment[ven]=U nanga ha siatari/u vhekanya filithara
+Comment[vi]=Chọn trang / bộ lọc sắp xếp 
 Comment[xh]=Ukhetho Lwephepha/Isihluzi Sokulungisa kakuhle
 Comment[zh_CN]=页面选择/排序过滤程序
 Comment[zh_HK]=紙張選擇/排序過濾器
Index: kdeprint/filters/pdfwrite.desktop
===================================================================
--- kdeprint/filters/pdfwrite.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeprint/filters/pdfwrite.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -45,7 +45,7 @@
 Comment[id]=Pembuat PDF (memerlukan Ghostscript)
 Comment[is]=PDF skrifari (krefst GhostScript)
 Comment[it]=Scrittura di PDF (richiede GhostScript)
-Comment[ja]=PDFライター (GhostScriptが必要)
+Comment[ja]=PDF ライター (GhostScriptが必要)
 Comment[km]=PDF Writer (ត្រូវការ Ghostscript)
 Comment[ko]=PDF 쓰기 (고스트스크립트가 필요함)
 Comment[lb]=PDF-Schreiwer (brauch Ghostscript)
@@ -83,6 +83,7 @@
 Comment[uk]=Генератор PDF (потребує GhostScript)
 Comment[uz]=PDF ёзгич (Ghostscript ўрнатилган бўлиши шарт)
 Comment[ven]=Munwali wa PDF (I toda bammbiri la tshipuku)
+Comment[vi]=Bộ ghi PDF (cần Ghostscript)
 Comment[wa]=Fijheu di fitchîs PDF (a mezåjhe di Ghostscript)
 Comment[xh]=Umbhali we PDF (ufuna i Ghostscript)
 Comment[zh_CN]=PDF 书写器 (需要 GhostScript)
Index: kdeprint/filters/enscript.desktop
===================================================================
--- kdeprint/filters/enscript.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeprint/filters/enscript.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -23,7 +23,7 @@
 Comment[bn]=enscript টেক্সট ফিল্টার
 Comment[br]=Sil skrid Enscript
 Comment[bs]=Enscript tekst filter
-Comment[ca]=Filtre de texts enscript
+Comment[ca]=Filtre de text enscript
 Comment[cs]=Textový filtr Enscript
 Comment[cy]=Hidl Testun Enscript
 Comment[da]=Enscript-tekstfilter
@@ -84,6 +84,7 @@
 Comment[uk]=Текстовий фільтр enscript
 Comment[uz]=Enscript матн филтери
 Comment[ven]=Nwalani ya filithara ya manwalwa
+Comment[vi]=Bộ lọc văn bản enscript.
 Comment[wa]=Passete po-z imprimer do peur tecse avou enscript
 Comment[xh]=Enscript Uhluzo Lombhalo
 Comment[zh_CN]=Enscript 文本过滤程序
Index: kdeprint/filters/imagetops.desktop
===================================================================
--- kdeprint/filters/imagetops.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeprint/filters/imagetops.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -87,6 +87,7 @@
 Comment[uk]=Загальний фільтр зображень в файли PS
 Comment[uz]=Расмни PS'га айлантирадиган оддий филтр
 Comment[ven]=Tshifanyiso kha tshigwada kha filithara ya PS
+Comment[vi]=Bộ lọc ảnh sang PS giống loài.
 Comment[wa]=Passete djenerike imådjes viè PostScript
 Comment[xh]=Umfanekiso ngokubanzi kwicebo lokucoca ulwelo le PS
 Comment[zh_CN]=通用图像到 PS 过滤程序
Index: kdeprint/filters/psbook.desktop
===================================================================
--- kdeprint/filters/psbook.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeprint/filters/psbook.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -73,6 +73,7 @@
 Comment[uk]=Друк брошури (використовуйте з двостороннім друком за меншою стороною)
 Comment[uz]=Памфлет босиб чиқариш (кичик тарафлама варақнинг иккита томонига босиб чиқариш)
 Comment[ven]=U phirintha ha tshibugwana (shumisa na lurumbu lutuku lwa u phirintha a duplex)
+Comment[vi]=Khả năng in pam-phơ-lê (sử dụng với việc in hai chiều mặt nhỏ)
 Comment[xh]=Ushicilelo Lwephetshana (sebenzisa ngoshicilelo oluncinane olusecaleni oluphindwe kabini)
 Comment[zh_CN]=打印小册 (使用小张双面打印)
 Comment[zh_HK]=列印小冊子 (使用小張雙面列印)
Index: kdeprint/filters/ps2pdf.desktop
===================================================================
--- kdeprint/filters/ps2pdf.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeprint/filters/ps2pdf.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -73,6 +73,7 @@
 Comment[uk]=Конвертер документів з формату PostScript в PDF
 Comment[uz]=PostScrip'ни PDF'га айлантирадиган дастур
 Comment[ven]=Bammbiri la poso uya kha mushandukisi wa PDF
+Comment[vi]=Bộ chuyển đổi PostScript sang PDF
 Comment[wa]=Covierseu di PostScript viè PDF
 Comment[xh]=PostScript Kumguqili we PDF
 Comment[zh_CN]=PostScript 到 PDF 的转换器
Index: kdeprint/filters/psresize.desktop
===================================================================
--- kdeprint/filters/psresize.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeprint/filters/psresize.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -77,6 +77,7 @@
 Comment[uk]=Масштабувати зміст друку до іншого розміру паперу
 Comment[uz]=Варақнинг бошқа ўлчамига мос келтириш
 Comment[ven]=Zwirengomu ha tshikeili tshau phirintha uitela u dzhena kha saizi inwe ya siatari
+Comment[vi]=Co dãn nội dung in để vừa khít một kích cỡ giấy khác.
 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[zh_CN]=缩放打印内容以适合其它纸张大小
Index: kdeprint/filters/psnup.desktop
===================================================================
--- kdeprint/filters/psnup.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeprint/filters/psnup.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -68,6 +68,7 @@
 Comment[uk]=Фільтр укладання декількох сторінок на аркуш
 Comment[uz]=Битта варақга бир нечта бет чиқариш филтери
 Comment[ven]=Masiatari manzhi kha filithara ya bammbiri
+Comment[vi]=Nhiều trang cho mỗi bộ lọc tờ giấy.
 Comment[wa]=Passete pus d' ene pådje par foye
 Comment[xh]=Amaphepha Amaninzi Ngekhasi Lesihluzi ngasinye 
 Comment[zh_CN]=每张多页过滤程序
Index: kdeprint/cups/ipprequest.cpp
===================================================================
--- kdeprint/cups/ipprequest.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeprint/cups/ipprequest.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -511,6 +511,11 @@
 	cupsFreeOptions(n, options);
 
 	// find an remove that annoying "document-format" attribute
+#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
+ ipp_attribute_t *attr = ippFindAttribute(request_, "document-format", IPP_TAG_NAME);
+ ippDeleteAttribute(request_, attr);
+#else
+	// (can't use IppDeleteAttribute as older cups doesn't have that)
 	ipp_attribute_t	*attr = request_->attrs;
 	while (attr)
 	{
@@ -523,4 +528,5 @@
 		}
 		attr = attr->next;
 	}
+#endif
 }
Index: kdeprint/cups/cups.print
===================================================================
--- kdeprint/cups/cups.print	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeprint/cups/cups.print	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -49,6 +49,7 @@
 Comment[tt]=CUPS atlı bastıru sisteme (Common UNIX Print System)
 Comment[uz]=CUPS (UNIX учун умумий босиб чиқариш тизими)
 Comment[ven]=CUPS (Maitele au phirintha a UNIX zwao)
+Comment[vi]=CUPS (hệ thống in UNIX dùng chung)
 Comment[wa]=CUPS (Comon Sistinme d' Imprimaedje po UNIX)
 Comment[xh]=CUPS (Indlela Elula Yoshicilelo lwe UNIX)
 Comment[zh_CN]=CUPS (通用 Unix 打印系统)
Index: kdeprint/lpd/lpd.print
===================================================================
--- kdeprint/lpd/lpd.print	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeprint/lpd/lpd.print	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -69,7 +69,7 @@
 Comment[uk]=LPR (типова система друку BSD)
 Comment[uz]=LPR (BSD'нинг андоза босиб чиқариш тизими)
 Comment[ven]=LPR (maitele a u phirintha a zwino fana zwa BCD)
-Comment[vi]=LPR (Hệ thống chuẩn BSD)
+Comment[vi]=LPR (hệ thống in BSD chuẩn)
 Comment[wa]=LPR (Sistinme d' imprimaedje BSD standård)
 Comment[xh]=LPR (Indlela esezantsi yoshicilelo lwe BSD)
 Comment[zh_CN]=LPR (标准 BSD 打印系统)
Index: kdeprint/kpgeneralpage.cpp
===================================================================
--- kdeprint/kpgeneralpage.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeprint/kpgeneralpage.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -523,7 +523,7 @@
 			if (ch) setComboItem(m_papertype, ch->get("text"));
 		}
 		value = opts["InputSlot"];
-		if (m_inputslot->isEnabled() && !value.isEmpty())
+		if (m_inputslot && m_inputslot->isEnabled() && !value.isEmpty())
 		{
 			DrBase	*ch = ((DrListOption*)driver()->findOption("InputSlot"))->findChoice(value);
 			if (ch) setComboItem(m_inputslot, ch->get("text"));
Index: kdeprint/lpr/lpr.print
===================================================================
--- kdeprint/lpr/lpr.print	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeprint/lpr/lpr.print	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -68,6 +68,7 @@
 Comment[uk]=Система друку LPR/LPRng
 Comment[uz]=LPR/LPRng босиб чиқариш тизими
 Comment[ven]=LPR/Maitele au phirintha a LPRng
+Comment[vi]=Hệ thống in LPR/LPRng
 Comment[wa]=Sistinme d' imprimaedje LPR/LPRng
 Comment[xh]=LPR/LPRng Indlela Yokushicilela
 Comment[zh_CN]=LPR/LPRng 打印系统
Index: kdeprint/kdeprintd.desktop
===================================================================
--- kdeprint/kdeprintd.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeprint/kdeprintd.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -77,6 +77,7 @@
 Name[uk]=Демон друку KDE
 Name[uz]=KDE босиб чиқариш хизмати
 Name[ven]=Daemon yau phirintha ya KDE
+Name[vi]=Trình nền in KDE
 Name[wa]=Démon d' imprimaedje di KDE
 Name[xh]=Daemon Yoshicilelo lwe KDE
 Name[zh_CN]=KDE 打印守护进程
@@ -138,5 +139,6 @@
 Comment[tt]=KDE öçen bastıru xezmäte
 Comment[uk]=Демон друку KDE
 Comment[uz]=KDE учун босиб чиқариш хизмати
+Comment[vi]=Trình nền in cho môi trường KDE.
 Comment[zh_CN]=KDE 的打印守护进程
 Comment[zh_HK]=KDE 的列印伺服程式
Index: kdeprint/rlpr/rlpr.print
===================================================================
--- kdeprint/rlpr/rlpr.print	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeprint/rlpr/rlpr.print	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -65,6 +65,7 @@
 Comment[uk]=Оточення RLPR (віддалені сервери LPD)
 Comment[uz]=RLPR муҳити (масофадаги LPD серверлар)
 Comment[ven]=Vhupo ha RLPR (dzisiva dza LPD)
+Comment[vi]=Môi trường RLPR (máy phục vụ LPD từ xa)
 Comment[wa]=Evironmint d' imprimaedje RLPR (sierveus LPD å lon)
 Comment[xh]=RLPR Imeko-bume ye RLPR (Abancedisi be LPD ababeka kude)
 Comment[zh_CN]=RLPR 环境(远程 LPD 服务器)
Index: kdeprint/lpdunix/lpdunix.print
===================================================================
--- kdeprint/lpdunix/lpdunix.print	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeprint/lpdunix/lpdunix.print	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -67,6 +67,7 @@
 Comment[uk]=Загальна система друку UNIX - LPD (типова)
 Comment[uz]=Оддий UNIX LPD босиб чиқариш тизими (андоза)
 Comment[ven]=Maitele au phirintha a UNIX (default)
+Comment[vi]=Hệ thống in LPD UNIX giống loài (mặc định)
 Comment[wa]=Sistinme d' imprimaedje djenerike LPD po UNIX (prémetou)
 Comment[xh]=Indlela Yoshicilelo Ngokubanzi ye UNIX LPD (edaliweyo)
 Comment[zh_CN]=通用 UNIX LPD 打印系统(默认)
Index: kdeprint/ext/ext.print
===================================================================
--- kdeprint/ext/ext.print	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeprint/ext/ext.print	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -6,7 +6,7 @@
 Comment[az]=Xarici Proqram Vasitəsilə Çap Et (ümumi)
 Comment[bn]=বহিঃস্থ প্রোগ্রামের (generic) সাহায্যে ছাপানো হোক
 Comment[bs]=Štampajte pomoću eksternog programa (generic)
-Comment[ca]=Imprimeix mitjançant un programa extern (genèric)
+Comment[ca]=Impressió mitjançant un programa extern (genèric)
 Comment[cs]=Tisk pomocí externího programu (obecné)
 Comment[cy]=Argraffu drwy Raglen Allanol (cyffredinol)
 Comment[da]=Udskriv gennem et eksternt program (generisk)
@@ -68,6 +68,7 @@
 Comment[uk]=Друк через зовнішню програму (загальна)
 Comment[uz]=Ташқи дастур ёрдамида босиб чиқариш (умумий)
 Comment[ven]=Phirinthani nga Mbekanyamushumo yanga nnda (tshigwada)
+Comment[vi]=In bằng một chương trình bên ngoài (giống loài).
 Comment[wa]=Imprimer åd truviè d' on dfoûtrin programe (djenerike)
 Comment[xh]=Shicilela Ngapha Kodweliso lwenkqubo olungaphandle (ngokubanzi)
 Comment[zh_CN]=通过外部程序打印(通用)
Index: kdeprint/specials.desktop
===================================================================
--- kdeprint/specials.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeprint/specials.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -72,6 +72,7 @@
 Name[uk]=Друк у файл (PostScript)
 Name[uz]=PostScript-файли сифатида сақлаш
 Name[ven]=Phirinthani kha faela (Bammbiri la poso)
+Name[vi]=In vào tập tin (PostScript)
 Name[wa]=Imprimer en on fitchî (PostScript)
 Name[xh]=Shicilela Kwifayile (PostScript)
 Name[zh_CN]=打印到文件(PostScript)
@@ -148,7 +149,7 @@
 Description[uk]=Записати файл PostScript
 Description[uz]=PostScript-файли сифатида сақлаш
 Description[ven]=Nwalani faela ya bammbiri la poso
-Description[vi]=Viết ra file PostScript 
+Description[vi]=Ghi tập tin PostScript
 Description[wa]=Fé on fitchî PostScript
 Description[xh]=Bhala ifayile ye PostScript
 Description[zh_CN]=写入 PostScript 文件
@@ -225,7 +226,7 @@
 Comment[uk]=Локальний файл
 Comment[uz]=Локал файл
 Comment[ven]=Faela ya henefhano
-Comment[vi]=File địa phương 
+Comment[vi]=Tập tin cục bộ
 Comment[wa]=Fitchî locål
 Comment[xh]=Ifayile yobulali
 Comment[zh_CN]=本地文件
@@ -309,6 +310,7 @@
 Name[uk]=Друк у файл (PDF)
 Name[uz]=PDF-файли сифатида сақлаш
 Name[ven]=Phirinthani ni kone u faela (PDF)
+Name[vi]=In vào tập tin (PDF)
 Name[wa]=Imprimer en on fitchî (PDF)
 Name[xh]=Shicilela Kwifayile (PDF)
 Name[zh_CN]=打印到文件(PDF)
@@ -385,7 +387,7 @@
 Description[uk]=Записати файл PDF/Acrobat
 Description[uz]=PDF/Acrobat-файли сифатида сақлаш
 Description[ven]=Nwalani PDF/faela ya Acrobat
-Description[vi]=Viết ra file PDF/Acrobat 
+Description[vi]=Ghi tập tin PDF/Acrobat
 Description[wa]=Fé on fitchî PDF/Acrobat
 Description[xh]=Bhala PDF/Ifayile ye Acrobat
 Description[zh_CN]=写入 PDF/Acrobat 文件
@@ -462,7 +464,7 @@
 Comment[uk]=Локальний файл
 Comment[uz]=Локал файл
 Comment[ven]=Faela ya henefhano
-Comment[vi]=File địa phương 
+Comment[vi]=Tập tin cục bộ
 Comment[wa]=Fitchî locål
 Comment[xh]=Ifayile yobulali
 Comment[zh_CN]=本地文件
@@ -547,6 +549,7 @@
 Name[uk]=Відіслати на факс
 Name[uz]=Факсга жўнатиш
 Name[ven]=Rumela kha fekisi
+Name[vi]=Gởi tới fax
 Name[wa]=Evoyî so on facs
 Name[xh]=Thumela kwi Fax
 Name[zh_CN]=发送至传真
@@ -620,7 +623,7 @@
 Description[uk]=Відіслати на зовнішню систему факсу
 Description[uz]=Ташқи факсга жўнатиш
 Description[ven]=Rumelani kha sisitemu ya maitele a nnda a fekisi
-Description[vi]=Gửi tới hềEthống fax ềEbên ngoài (external) 
+Description[vi]=Gởi tới hệ thống điện thư bên ngoài.
 Description[wa]=Evoyî so on dfoûtrin sistinme di facs
 Description[xh]=Thumela kwindlela engaphandle ye fax
 Description[zh_CN]=发至外部传真系统
@@ -696,7 +699,7 @@
 Comment[uk]=Зовнішній
 Comment[uz]=Ташқи
 Comment[ven]=Zwangannda
-Comment[vi]=Bên ngoài(external) 
+Comment[vi]=Bên ngoài
 Comment[wa]=Difoûtrin
 Comment[xh]=Ngaphandle
 Comment[zh_CN]=外部
@@ -717,6 +720,7 @@
 Comment[az]=Kmail Yazıçısına İlişdirilmiş
 Comment[bg]=Прикачен файл в пощенския клиент KMail
 Comment[bn]=কে-মেইল কম্পোসার-এর জন্য অ্যাটাচমেন্ট
+Comment[br]=Stagadenn evit aozer KMail
 Comment[bs]=Attachment za KMail Composer
 Comment[ca]=Adjunt per a l'editor del KMail
 Comment[cs]=Příloha pro editor KMailu
@@ -739,7 +743,7 @@
 Comment[hu]=Csatolás a KMail szerkesztőprogramhoz
 Comment[is]=Viðhengi við KMail póst
 Comment[it]=Allegato per il compositore di KMail
-Comment[ja]=KMailコンポーザの添付
+Comment[ja]=KMail メールの添付物
 Comment[km]=ឯកសារភ្ជាប់របស់កម្មវិធីតែង KMail
 Comment[ko]=KDE 편지용 편집기로 덧붙여 보냅니다
 Comment[lb]=Unhang fir KMail-Verfaasser
@@ -777,7 +781,7 @@
 Comment[uk]=Долучення для редактора KMail
 Comment[uz]=KMail учун илова
 Comment[ven]=U tangana na mubveledzi wa meili wa K
-Comment[vi]=Đính vào trình soạn Kmail
+Comment[vi]=Đính kèm cho Bộ soạn thảo KMail
 Comment[xh]=Ufakelo Lomqhambi we KMail
 Comment[zh_CN]=KMail 编写器的附件
 Comment[zh_HK]=當作 KMail 郵件編輯器的附件
@@ -813,7 +817,7 @@
 Description[hu]=PDF/Acrobat fájl létrehozása KMail csatolásként
 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[ja]=PDF/Acrobat ファイルを KMail の添付物として作成
 Description[km]=បង្កើតឯកសារ PDF/Acrobat ជាឯកសារភ្ជាប់សម្រាប់ KMail
 Description[ko]=KDE 편지에 덧붙일 PDF/어크로뱃 파일로 만듭니다
 Description[lb]=Erstellt eng PDF/Acrobat-Datei als Unhang fir de KMail
@@ -851,7 +855,7 @@
 Description[uk]=Створює файл PDF/Acrobat як долучення для KMail
 Description[uz]=KMail учун илова сифатида PDF/Acrobat-файлини яратади
 Description[ven]=Itani PDF/Faela ya Acrobat sa vhutumani ha meili ya K
-Description[vi]=Tạo file PDF/Acrobat dưới dạng file đính 
+Description[vi]=Tạo tập tin PDF/Acrobat dạng đính kèm thư KMail
 Description[wa]=Fé des fitchîs PDF/Acrobat come atatchmints po KMail
 Description[xh]=Yenza PDF/Ifayile yomenzi womthambo njengofakelelo lwe KMail
 Description[zh_CN]=创建 PDF/Acrobat 文件作为 KMail 附件
@@ -887,7 +891,7 @@
 Name[hu]=PDF-fájl elküldése levélben
 Name[is]=Senda PDF skrá í pósti
 Name[it]=Spedisci file PDF
-Name[ja]=PDFファイルをメール
+Name[ja]=PDF ファイルをメール
 Name[km]=ផ្ញើ Mail PDF
 Name[lb]=PDF-Datei mailen
 Name[lt]=Pašto PDF byla
@@ -917,6 +921,7 @@
 Name[tt]=PDF Birem Cibärü
 Name[uk]=Відсилання файла PDF поштою
 Name[uz]=PDF-файли сифатида хат орқали жўнатиш
+Name[vi]=Gởi tập tin PDF trong thư
 Name[zh_CN]=邮寄 PDF 文件
 Name[zh_HK]=郵寄 PDF 文件
 Require=exec:/ps2pdf,exec:/kmail
@@ -1004,6 +1009,7 @@
 Description[uk]=Використовує ksendfax для відсилання поточного документу на факс
 Description[uz]=Жорий ҳужжатни факс билан жўнатиш учун ksendfax'дан фойдаланинг
 Description[ven]=Shumisani fekisi yau rumele kha k u fekisa manwalwa a zwino
+Description[vi]=Sử dụng ksendfax để gởi tài liệu hiện có qua máy điện thư.
 Description[wa]=Eploye ksendfax po-z evoyî pa facs li documint do moumint
 Description[xh]=Sebenzisa i ksendfax ukuthumela i fax yoxwebhu lwangoku
 Description[zh_CN]=使用 ksendfax 发送当前文档
@@ -1080,6 +1086,7 @@
 Name[uk]=Потужний засіб відсилання факсів (ksendfax)
 Name[uz]=Факс жўнатиш учун кенгайтирилган восита (ksendfax)
 Name[ven]=Tshishumiswa tsha fekisi ya khwinesa (ksendfax)
+Name[vi]=Công cụ Fax Cấp cao (ksendfax)
 Name[xh]=Isixhobo se Fax Esibhekisa phambili (ksendfax)
 Name[zh_CN]=高级传真工具(ksendfax)
 Name[zh_HK]=進階傳真工具 (ksendfax)
Index: kdeprint/kfilelist.cpp
===================================================================
--- kdeprint/kfilelist.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeprint/kfilelist.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -243,9 +243,9 @@
 
 void KFileList::slotAddFile()
 {
-	KURL	fname = KFileDialog::getOpenURL(QString::null, QString::null, this);
-	if (!fname.isEmpty())
-		addFiles(KURL::List(fname));
+	KURL::List fnames = KFileDialog::getOpenURLs(QString::null, QString::null, this);
+	if (!fnames.empty())
+		addFiles(fnames);
 }
 
 void KFileList::slotRemoveFile()
Index: configure.in.in
===================================================================
--- configure.in.in	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ configure.in.in	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -226,6 +226,17 @@
 fi
 AC_SUBST(QNAMESPACE_H)
 
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+AC_MSG_CHECKING([if getmntinfo() uses struct statvfs])
+AC_TRY_LINK([#include <sys/types.h>
+#include <sys/statvfs.h>
+],[int flags = 0; struct statvfs *mntbufp; return getmntinfo(&mntbufp, flags);],
+[AC_MSG_RESULT(yes)
+AC_DEFINE(GETMNTINFO_USES_STATVFS,,[getmntinfo() uses struct statvfs])],
+AC_MSG_RESULT(no))
+AC_LANG_RESTORE
+
 dnl output files
 AC_SUBST(x_includes)
 AC_SUBST(x_libraries)
@@ -306,7 +317,10 @@
 CXXFLAGS="$CXXFLAGS $USE_RTTI"
 fi
 
-rgb_file="$x_libraries/X11/rgb.txt"
+AC_ARG_WITH([rgbfile],
+ AC_HELP_STRING([--with-rgbfile=path], [Define custom path for rgb.txt. (default: \$(x11libdir)/X11/rgb.txt)]),
+ [rgb_file=$withval], [rgb_file="$x_libraries/X11/rgb.txt"])
+
 AC_DEFINE_UNQUOTED(X11_RGBFILE, "$rgb_file", [where rgb.txt is in])
 
 AC_MSG_CHECKING([for Compiler version])
Index: kdeui/kcolordialog.cpp
===================================================================
--- kdeui/kcolordialog.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeui/kcolordialog.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -242,7 +242,7 @@
 		p = (uint *) image.scanLine( ySize - s - 1 );
 		for( h = 0; h < xSize; h++ )
 		{
-			col.setHsv( 359*h/(xSize-1), 255*s/(ySize-1), 192 );
+			col.setHsv( 359*h/(xSize-1), 255*s/((ySize == 1) ? 1 : ySize-1), 192 );
 			*p = col.rgb();
 			p++;
 		}
@@ -305,7 +305,7 @@
 
 			for( int x = 0; x < xSize; x++ )
 			{
-				col.setHsv( _hue, _sat, 255*x/(xSize-1) );
+				col.setHsv( _hue, _sat, 255*x/((xSize == 1) ? 1 : xSize-1) );
 				rgb = col.rgb();
 				*p++ = rgb;
 			}
@@ -317,7 +317,7 @@
 		for ( int v = 0; v < ySize; v++ )
 		{
 			p = (uint *) image.scanLine( ySize - v - 1 );
-			col.setHsv( _hue, _sat, 255*v/(ySize-1) );
+			col.setHsv( _hue, _sat, 255*v/((ySize == 1) ? 1 : ySize-1) );
 			rgb = col.rgb();
 			for ( int i = 0; i < xSize; i++ )
 				*p++ = rgb;
@@ -426,7 +426,7 @@
 
 void KColorCells::mouseMoveEvent( QMouseEvent *e )
 {
- if( !(e->state() && LeftButton)) return;
+ if( !(e->state() & LeftButton)) return;
 
 if(inMouse) {
 int delay = KGlobalSettings::dndEventDelay();
@@ -530,7 +530,7 @@
 void KColorPatch::mouseMoveEvent( QMouseEvent *e )
 {
 // Drag color object
- if( !(e->state() && LeftButton)) return;
+ if( !(e->state() & LeftButton)) return;
 	KColorDrag *d = new KColorDrag( color, this);
 	d->dragCopy();
 }
@@ -1253,30 +1253,26 @@
 void
 KColorDialog::readSettings()
 {
- KConfig* config = KGlobal::config();
+ KConfigGroup group( KGlobal::config(), "Colors" );
 
- QString oldgroup = config->group();
-
- config->setGroup("Colors");
- QString palette = config->readEntry("CurrentPalette");
+ QString palette = group.readEntry("CurrentPalette");
 d->table->setPalette(palette);
- config->setGroup( oldgroup );
 }
 
 void
 KColorDialog::slotWriteSettings()
 {
- KConfig* config = KGlobal::config();
- config->setGroup("Colors");
+ KConfigGroup group( KGlobal::config(), "Colors" );
+
 QString palette = d->table->palette();
- if (!config->hasDefault("CurrentPalette") &&
+ if (!group.hasDefault("CurrentPalette") &&
 (d->table->palette() == d->originalPalette))
 {
- config->revertToDefault("CurrentPalette");
+ group.revertToDefault("CurrentPalette");
 }
 else
 {
- config->writeEntry("CurrentPalette", d->table->palette());
+ group.writeEntry("CurrentPalette", d->table->palette());
 }
 }
 
Index: kdeui/kdialogbase.cpp
===================================================================
--- kdeui/kdialogbase.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeui/kdialogbase.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -668,7 +668,7 @@
 return;
 }
 
- if( style < 0 || style > ActionStyleMAX ) { style = ActionStyle0; }
+ if( style < 0 || style >= ActionStyleMAX ) { style = ActionStyle0; }
 d->mButton.style = style;
 
 const int *layout;
Index: kdeui/kcmodule.cpp
===================================================================
--- kdeui/kcmodule.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeui/kcmodule.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -79,7 +79,12 @@
 {
 init();
 d->_instance = instance;
- KGlobal::locale()->insertCatalogue(instance->instanceName());
+
+ if (instance)
+ {
+ KGlobal::locale()->insertCatalogue(instance->instanceName());
+ }
+
 d->_hasOwnInstance = false;
 KGlobal::setActiveInstance(this->instance());
 }
Index: kdeui/kdetrayproxy/kdetrayproxy.desktop
===================================================================
--- kdeui/kdetrayproxy/kdetrayproxy.desktop	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeui/kdetrayproxy/kdetrayproxy.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -50,6 +50,7 @@
 Name[tr]=KDE Görev Çubuğu Vekil Birimi
 Name[tt]=KDE Tiräsenä Proxy Modulı
 Name[uk]=Модуль посередника для програм в системному лотку
+Name[vi]=Mô-đun ủy nhiệm khay KDE
 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
@@ -73,7 +74,7 @@
 Comment[hu]=KDE-s paneltálca-alkalmazások futtatása a KWin-től eltérő ablakkezelőknél
 Comment[is]=Milliþjónseining 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[ja]=KWin なしで KDE systray アプリケーションを動作可能にするプロキシ
 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
@@ -100,7 +101,8 @@
 Comment[tg]=Proxy барномаҳои KDE systray-ро барои корнамоӣ, бидуни KWin фаъол месозад
 Comment[tr]=Vekil sunucu etkinleştirme KDE sistem çubuğu uygulamalarının KWin olmadan çalıştırır.
 Comment[tt]=KWin'sız eşläwçe yazılımnar öçen KDE sistiräseneñ Proxy
-Comment[uk]=Програма посередник яка дозволяє працювати програмам для KDE, що використовують системний лоток без працюючого KWin
+Comment[uk]=Програма посередник, яка дозволяє працювати програмам для KDE, що використовують системний лоток, без KWin
+Comment[vi]=Bộ ủy nhiệm hiệu lực các ứng dụng khay hệ thống KDE hoạt động, không cần KWin.
 Comment[zh_CN]=允许 KDE 系统托盘应用程序在没有 KWin 的情况下工作
 ServiceTypes=KDEDModule
 X-KDE-ModuleType=Library
Index: kdeui/kdockwidget.cpp
===================================================================
--- kdeui/kdockwidget.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeui/kdockwidget.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -762,9 +762,11 @@
 void KDockWidget::setEnableDocking( int pos )
 {
 eDocking = pos;
- if( header && header->inherits( "KDockWidgetHeader" ) )
- ( ( KDockWidgetHeader* ) header )->showUndockButton( pos & DockDesktop );
- updateHeader();
+ if( header ) {
+ if (header->inherits( "KDockWidgetHeader" ) )
+ ( ( KDockWidgetHeader* ) header )->showUndockButton( pos & DockDesktop );
+ updateHeader();
+ }
 }
 
 void KDockWidget::updateHeader()
Index: kdeui/ktextedit.h
===================================================================
--- kdeui/ktextedit.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeui/ktextedit.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -74,15 +74,20 @@
 virtual void setPalette( const QPalette& palette );
 
 /**
- * Turns spell checking for this text edit on or off.
+ * Turns spell checking for this text edit on or off. Note that spell
+ * checking is only available in read-writable KTextEdits.
 *
 * @see checkSpellingEnabled()
+ * @see isReadOnly()
+ * @see setReadOnly()
 * @since 3.2
 */
 void setCheckSpellingEnabled( bool check );
 
 /**
 * Returns true if spell checking is enabled for this text edit.
+ * Note that it even returns true if this is a read-only KTextEdit,
+ * where spell checking is actually disabled.
 *
 @ see setCheckSpellingEnabled()
 * @since 3.2
Index: kdeui/kprogress.cpp
===================================================================
--- kdeui/kprogress.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeui/kprogress.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -216,7 +216,6 @@
 
 show();
 kapp->processEvents();
- mShown = true;
 }
 
 void KProgressDialog::slotCancel()
@@ -394,6 +393,13 @@
 }
 }
 
+void KProgressDialog::show()
+{
+ KDialogBase::show();
+ mShown = true;
+}
+
+
 void KProgress::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
Index: kdeui/kmessagebox.cpp
===================================================================
--- kdeui/kmessagebox.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeui/kmessagebox.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -82,7 +82,7 @@
 break;
 }
 
- QPixmap ret = KApplication::kApplication()->iconLoader()->loadIcon(icon_name, KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true);
+ QPixmap ret = KGlobal::iconLoader()->loadIcon(icon_name, KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true);
 
 if (ret.isNull())
 return QMessageBox::standardIcon(icon);
Index: kdeui/klistviewsearchline.h
===================================================================
--- kdeui/klistviewsearchline.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeui/klistviewsearchline.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -33,6 +33,11 @@
 * No changes to the application other than instantiating this class with an
 * appropriate KListView should be needed.
 *
+ * @note { When iterating over items in the KListView, make sure that
+ * the iterator only includes visible items (for example, by adding
+ * QListViewItemIterator::Visible to the iterator flags). Otherwise,
+ * actions (such as deletion) may be taken on items that have been
+ * hidden by the search function. } 
 * @since 3.3
 */
 
Index: kdeui/tests/ktextedittest.cpp
===================================================================
--- kdeui/tests/ktextedittest.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeui/tests/ktextedittest.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -26,6 +26,8 @@
 {
 KApplication app( argc, argv, "ktextedittest" );
 KTextEdit *edit = new KTextEdit();
+ edit->setReadOnly( true );
+ edit->setCheckSpellingEnabled( true );
 
 QFile file( "ktextedittest.cpp" );
 if ( file.open( IO_ReadOnly ) )
@@ -36,5 +38,6 @@
 
 edit->resize( 600, 600 );
 edit->show();
+ edit->setReadOnly( false ); // also enables spell checking
 return app.exec();
 }
Index: kdeui/ktextedit.cpp
===================================================================
--- kdeui/ktextedit.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeui/ktextedit.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -295,7 +295,7 @@
 
 void KTextEdit::focusInEvent( QFocusEvent *e )
 {
- if ( d->checkSpellingEnabled && !d->highlighter )
+ if ( d->checkSpellingEnabled && !isReadOnly() && !d->highlighter )
 d->highlighter = new KDictSpellingHighlighter( this );
 
 QTextEdit::focusInEvent( e );
@@ -308,11 +308,17 @@
 
 void KTextEdit::setReadOnly(bool readOnly)
 {
+ if ( !readOnly && hasFocus() && d->checkSpellingEnabled && !d->highlighter )
+ d->highlighter = new KDictSpellingHighlighter( this );
+	
 if ( readOnly == isReadOnly() )
 return;
 
 if (readOnly)
 {
+	delete d->highlighter;
+	d->highlighter = 0;
+	 
 bool custom = ownPalette();
 QPalette p = palette();
 QColor color = p.color(QPalette::Disabled, QColorGroup::Background);
Index: kdeui/kedittoolbar.cpp
===================================================================
--- kdeui/kedittoolbar.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeui/kedittoolbar.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -1375,6 +1375,12 @@
 {
 // We can't use KIconChooser here, since it's in libkio
 // ##### KDE4: reconsider this, e.g. move KEditToolbar to libkio
+ 
+ //if the process is already running (e.g. when somebody clicked the change button twice (see #127149)) - do nothing... 
+ //otherwise m_kdialogProcess will be overwritten and set to zero in slotProcessExited()...crash!
+ if ( d->m_kdialogProcess && d->m_kdialogProcess->isRunning() )
+ return;
+ 
 d->m_kdialogProcess = new KProcIO;
 QString kdialogExe = KStandardDirs::findExe(QString::fromLatin1("kdialog"));
 (*d->m_kdialogProcess) << kdialogExe;
@@ -1403,6 +1409,12 @@
 m_toolbarCombo->setEnabled( true );
 
 QString icon;
+
+ if (!d->m_kdialogProcess) {
+ kdError(240) << "Something is wrong here! m_kdialogProcess is zero!" << endl;
+ return;
+ }
+
 if ( !d->m_kdialogProcess->normalExit() ||
 d->m_kdialogProcess->exitStatus() ||
 d->m_kdialogProcess->readln(icon, true) <= 0 ) {
Index: kdeui/ksconfig.cpp
===================================================================
--- kdeui/ksconfig.cpp	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeui/ksconfig.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -23,6 +23,7 @@
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qlayout.h>
+#include <qtimer.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
@@ -238,7 +239,7 @@
 dictcombo->clear();
 dictcombo->insertItem( i18n("Turkish") );
 sChangeEncoding( KS_E_UTF8 );
- } 
+ }
 else
 getAvailDictsAspell();
 }
@@ -505,7 +506,7 @@
 dictcombo->insertItem (i18n("ASpell Default"));
 
 // Aspell now have /usr/lib/aspell as
- // ASPELL_DATADIR default. 
+ // ASPELL_DATADIR default.
 QFileInfo dir ( ASPELL_DATADIR );
 if (!dir.exists() || !dir.isDir())
 dir.setFile ("/usr/lib/aspell-0.60");
@@ -908,7 +909,7 @@
 {
 setDictionary (langfnames[i]);
 setDictFromList (true);
- emit configChanged();
+ QTimer::singleShot( 0, this, SIGNAL( configChanged() ) );
 }
 
 void
Index: kdeui/kprogress.h
===================================================================
--- kdeui/kprogress.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ kdeui/kprogress.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -124,7 +124,7 @@
 void setFormat(const QString & format);
 
 /**
- * Set the current total number of steps in the action tat the progress bar
+ * Set the current total number of steps in the action that the progress bar
 * is representing.
 */
 void setTotalSteps(int totalSteps);
@@ -361,6 +361,11 @@
 */
 int minimumDuration() const;
 
+ 	/**
+	 * Reimplemented for internal reasons, the API is not affected.
+	 */
+ virtual void show();
+
 protected slots:
 void slotAutoShow();
 void slotAutoActions(int percentage);
Index: libkmid/player.cc
===================================================================
--- libkmid/player.cc	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ libkmid/player.cc	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -362,8 +362,8 @@
 
 #endif
 strncpy(pspev->text,(char *)ev->data,
- (ev->length>1024)? (1023) : (ev->length) );
- pspev->text[(ev->length>1024)? (1023):(ev->length)]=0;
+ (ev->length>= sizeof(lasttext))? sizeof(lasttext)-1 : (ev->length) );
+ pspev->text[(ev->length>= sizeof(lasttext))? sizeof(lasttext)-1:(ev->length)]=0;
 #ifdef PLAYERDEBUG
 printf("(%s)(%s)\n",pspev->text,lasttext);
 #endif
@@ -373,7 +373,7 @@
 lasttexttime=pspev->absmilliseconds;
 lasttexttype=pspev->type;
 strncpy(lasttext, pspev->text, 1024);
- lasttext[1023] = 0;
+ lasttext[sizeof(lasttext)-1] = 0;
 #endif
 pspev->next=new SpecialEvent;
 #ifdef PLAYERDEBUG
Index: libkmid/sndcard.h
===================================================================
--- libkmid/sndcard.h	(.../tags/KDE/3.5.2/kdelibs)	(revision 541084)
+++ libkmid/sndcard.h	(.../branches/KDE/3.5/kdelibs)	(revision 541084)
@@ -31,9 +31,12 @@
 
 #ifdef HAVE_SYS_SOUNDCARD_H
 #include <sys/soundcard.h>
- #define HAVE_OSS_SUPPORT
 #elif defined(HAVE_MACHINE_SOUNDCARD_H)
 #include <machine/soundcard.h>
+#endif
+
+/* Check for OSS MIDI API */
+#if defined(SNDCTL_SEQ_NRSYNTHS) && defined(CTL_MAIN_VOLUME)
 #define HAVE_OSS_SUPPORT
 #else
 #undef HAVE_OSS_SUPPORT

Property changes on: .
___________________________________________________________________
Name: svn:externals
   + admin https://svn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin

Places

File 3_5_BRANCH.diff of Package kdelibs3 (Revision 2e05447571d440b2401d8a0e7716b69d)

Places