[pkg-kde-commits] rev 2751 - in trunk/packages/kdelibs/debian: .
patches
Adeodato Simó
adeodato at costa.debian.org
Fri Jan 6 13:55:18 UTC 2006
Author: adeodato
Date: 2006-01-06 13:55:12 +0000 (Fri, 06 Jan 2006)
New Revision: 2751
Added:
trunk/packages/kdelibs/debian/patches/01_kdelibs_branch_r494869.diff
Modified:
trunk/packages/kdelibs/debian/changelog
Log:
Add kdelibs branch pull.
Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog 2006-01-06 13:15:07 UTC (rev 2750)
+++ trunk/packages/kdelibs/debian/changelog 2006-01-06 13:55:12 UTC (rev 2751)
@@ -15,8 +15,10 @@
* Upload to unstable.
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 6 Jan 2006 14:13:06 +0100
+ * KDE_3_5_BRANCH update (up to r494869).
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 6 Jan 2006 14:54:24 +0100
+
kdelibs (4:3.5.0-2) experimental; urgency=low
* Upload to experimental.
Added: trunk/packages/kdelibs/debian/patches/01_kdelibs_branch_r494869.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/01_kdelibs_branch_r494869.diff 2006-01-06 13:15:07 UTC (rev 2750)
+++ trunk/packages/kdelibs/debian/patches/01_kdelibs_branch_r494869.diff 2006-01-06 13:55:12 UTC (rev 2751)
@@ -0,0 +1,9606 @@
+#DPATCHLEVEL=0
+--- interfaces/kscript/sample/shellscript.desktop (revision 488534)
++++ interfaces/kscript/sample/shellscript.desktop (revision 494869)
+@@ -14,7 +14,7 @@
+ Name[eo]=BaÅoskriptlanĉilo
+ Name[es]=Ejecutor de script para intérprete de comandos de bash
+ Name[et]=Bash shelli skripti käivitaja
+-Name[eu]=Bash shell script eragikaritzailea
++Name[eu]=Bash shell script-aren abiarazlea
+ Name[fa]=مجری نویسه‌ی پوسته‌ی بش
+ Name[fi]=Komentotulkkiohjelmien käynnistäjä
+ Name[fr]=Lanceur de scripts shell Bash
+@@ -37,7 +37,7 @@
+ Name[mn]=Bash-Shell-Скрипт ажиллуулагч
+ Name[ms]=Pelaksana Skrip Cengkerang Bash
+ Name[nb]=Bash skallskriptkjører
+-Name[nds]=Utföhren vun'n Bash-Shellskript
++Name[nds]=Bashskript-Starter
+ Name[nn]=Bash-skalskriptkøyrar
+ Name[pa]=ਬੈਸ਼ ਸ਼ੈਲ ਸਕà©à¨°à¨¿à¨ªà¨Ÿ ਰਨਰ(Bash Shell)
+ Name[pl]=Program uruchamiajÄ…cy skrypty Bash
+@@ -81,7 +81,7 @@
+ Comment[eo]=Enaplikaĵe lanĉas Åelskriptojn.
+ Comment[es]=Ejecuta procedimientos del intérprete de comandos bash desde dentro de la aplicación.
+ Comment[et]=Käivitab bash shelli skripte rakendustes.
+-Comment[eu]=Aplikazioaren baitatik bash shell scriptak abiarazten ditu.
++Comment[eu]=Aplikazioaren baitatik bash-eko shell script-ak abiarazteko.
+ Comment[fa]=نویسه‌‌های پوسته‌ی بش را از داخل یک برنامه اجرا می‌کند.
+ Comment[fi]=Suorittaa Bash-komentotulkkiohjelmia ohjelman sisästä
+ Comment[fr]=Exécute des scripts shell Bash depuis l'intérieur de l'application.
+@@ -106,7 +106,7 @@
+ Comment[mn]=Програм Ð´Ð¾Ñ‚Ñ€Ð¾Ð¾Ñ Bash-Shell-Скрипт ажиллуулах.
+ Comment[ms]=Laksanakan skrip cengkerang bash di dalam aplikasi.
+ Comment[nb]=Kjører bash skallskript fra innsiden av programmet.
+-Comment[nds]=Dormit köönt Programmen ok Bash-Shellskripten utföhren.
++Comment[nds]=Dor köönt Programmen mit Bash-Shellskripten utföhren.
+ Comment[nl]=Voert Bash-shellscripts uit binnen de toepassing.
+ Comment[nn]=Køyrer Bash-skalskript innanfrå programmet.
+ Comment[pa]=ਇੱਕ ਕਾਰਜ ਵਿੱਚ ਬੈਸ਼ ਸ਼ੈਲ ਸਕà©à¨°à¨¿à¨ªà¨Ÿà¨¾à¨‚ ਚਲਾਉਣ ਲਈ ਸਹਾਇਕ ਹੈ
+--- interfaces/kscript/scriptinterface.desktop (revision 488534)
++++ interfaces/kscript/scriptinterface.desktop (revision 494869)
+@@ -17,7 +17,7 @@
+ Comment[eo]=Tio estas testprogram-maÅino por testi la programinterfaco.
+ Comment[es]=Este es un motor de script genérico para probar el interfaz de script.
+ Comment[et]=Ãœldise skriptimootori testskript liidese testimiseks.
+-Comment[eu]=Hau testu script motore generikoa da script interfazea aprobatzeko.
++Comment[eu]=Hau script motoreen proba generikoa da script-aren interfazea probatzeko.
+ Comment[fa]=این موتور نویسه‌ی آزمایش عمومی برای آزمایش واسط نویسه است.
+ Comment[fi]=Tämä on yleinen skriptitestimoottori skriptin käyttöliittymän testaamiseen
+ Comment[fo]=Hetta er ein almen royndarforritsskipan til at nároyna fjølvisforritsmarkamótið.
+@@ -42,7 +42,7 @@
+ Comment[ms]=Ini ialah enjin skrip uji generik untuk mencuba antaramuka skrip.
+ Comment[mt]=Magna ġenerika biex tittestja l-interfaċċja tal-iskritti
+ Comment[nb]=Dette er et generisk testskript for å teste skriptgrensesnitt.
+-Comment[nds]=Dit is en allgemeen Koppel vun Testroutinen för dat Pröven vun de Skript-Verbinnen.
++Comment[nds]=Dit is en allgemeen Koppel vun Testskripten för dat Pröven vun de Skript-Koppelsteed.
+ Comment[nl]= Dit is een algemene verzameling van testroutines voor het testen dan de script-interface.
+ Comment[nn]=Dette er ein generell testskriptmotor for å prøva ut skriptgrensesnittet.
+ Comment[nso]=Ye ke engine ya thswaelo ya teko ya kakaretso yeo e somiswago go leka sefahlego sa tshwaelo.
+--- interfaces/kimproxy/interface/dcopinstantmessenger.desktop (revision 488534)
++++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop (revision 494869)
+@@ -16,7 +16,7 @@
+ Comment[eo]=TujmesaÄilo kun DCOP-interfaco
+ Comment[es]=Instant Messenger con un interfaz DCOP
+ Comment[et]=Kiirsuhtlemisrakendus DCOP-liidesega
+-Comment[eu]=DCOP interfazea duen berehalako mezularitza
++Comment[eu]=Berehalako mezularitza DCOP interfazearekin
+ Comment[fi]=Pikaviestiohjelma, jossa on DCOP-rajapinta
+ Comment[fr]=Messagerie instantanée munie d'une interface DCOP
+ Comment[fy]=Instant Messenger mei in DCOP-interface
+@@ -35,7 +35,7 @@
+ Comment[mk]=ИнÑтант ГлаÑник (Messenger) Ñо DCOP интерфејÑ
+ Comment[ms]=Utusan Segera dengan antaramuka DCOP
+ Comment[nb]=Lynmeldingsprogram med DCOP-grensesnitt
+-Comment[nds]=Kortnarichten-Maker mit en Verbinnen to dat DCOP
++Comment[nds]=Kortnarichten-Maker mit DCOP-Koppelsteed
+ Comment[nl]=Instant messenger met een DCOP interface
+ Comment[nn]=Lynmeldingsprogram med DCOP-grensesnitt
+ Comment[pa]=ਇੱਕ DCOP ਇੰਟਰਫੇਸ ਲਈ ਇੱਕ ਮੌਕਾ ਸà©à¨¨à©‡à¨¹à¨¾à¨•à¨¾à¨°
+--- interfaces/kimproxy/interface/kcm_instantmessenger.desktop (revision 488534)
++++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop (revision 494869)
+@@ -60,7 +60,7 @@
+ Comment[eo]=La tujmesaÄilo ebligas ambaÅdirekta parolado inter homoj kaj grupoj
+ Comment[es]=El Instant Messenger permite conversación en dos sentidos entre indivÃduos y grupos.
+ Comment[et]=Kiirsuhtlus võimaldab üksikisikute ja gruppide kahepoolset vestlust.
+-Comment[eu]=Berehalako mezularitzak banan-banako edo taldeen arteko elkarrizketa ahalbideratzen du.
++Comment[eu]=Berehalako mezularitzak banan-banako edo taldeen arteko berriketan aritzeko.
+ Comment[fi]=Pikaviestiohjelman avulla voidaan keskustella kahden kesken tai ryhmässä.
+ Comment[fr]=La messagerie instantanée permet un dialogue bidirectionnel entre individus et groupes.
+ Comment[fy]=Mei de instant messenger kinne jo twaspraak hâlde mei in yndividu en groepen.
+--- interfaces/kspeech/dcoptexttospeech.desktop (revision 488534)
++++ interfaces/kspeech/dcoptexttospeech.desktop (revision 494869)
+@@ -14,7 +14,7 @@
+ Comment[el]=ΥπηÏεσία κειμÎνου-σε-ομιλία με διασÏνδεση DCOP
+ Comment[es]=Texto a servicio de voz con un interfaz DCOP
+ Comment[et]=Teksti kõneks muutmise teenus DCOP-liidesega
+-Comment[eu]=DCOP interfazea duen testua-hitz-egitera
++Comment[eu]='Testua-ahoskatzea' zerbitzua DCOP interfazearekin
+ Comment[fi]=Teksti-Puheeksi palvelu DCOP-rajapinnalla
+ Comment[fr]=Service de synthèse vocale munie d'une interface DCOP
+ Comment[fy]=tekst-ta-prate mei in DCOP-ynterface
+@@ -30,7 +30,7 @@
+ Comment[lb]=Sproochausgab-Service mat engem DCOP-Interface
+ Comment[lt]=Teksto vertimo kalba tarnyba su DCOP sÄ…saja
+ Comment[nb]=Tekst til tale-program med DCOP-grensesnitt
+-Comment[nds]=Vörleesdeenst mit DCOP-Verbinnen
++Comment[nds]=Vörleesdeenst mit DCOP-Koppelsteed
+ Comment[nl]=Tekst-tot-spraak-dienst met een DCOP interface
+ Comment[nn]=Tekst-til-tale-teneste med DCOP-grensesnitt
+ Comment[pa]=ਇੱਕ DCOP ਇੰਟਰਫੇਸ ਨਾਲ ਪਾਠ-ਤੋਂ-ਬੋਲੀ ਸੇਵਾ
+--- interfaces/ktexteditor/ktexteditoreditor.desktop (revision 488534)
++++ interfaces/ktexteditor/ktexteditoreditor.desktop (revision 494869)
+@@ -19,7 +19,7 @@
+ Comment[eo]=Interna redaktilo (sen apartigo de dokumento kaj rigardo)
+ Comment[es]=Componente incrustable de editor de textos (sin separación Doc/Vista)
+ Comment[et]=Põimitav tekstiredaktori komponent
+-Comment[eu]=Testu editore osagai txertagarria (Doc/Ikusi banatu gabe)
++Comment[eu]=Testu-editorearen kapsulatutako osagaia (Dok/Ikusi bereizketarik gabe)
+ Comment[fa]=بخش ویرایشگر متن نهÙته (بدون نمایش/راهنمای مجزا)
+ Comment[fi]=Upotettava tekstimuokkauskomponentti (ilman Asiakirja/Näkymä-jakoa)
+ Comment[fr]=Composant d'édition de texte intégrable (sans séparation doc / vue)
+--- interfaces/ktexteditor/kcm_ktexteditor.desktop (revision 488534)
++++ interfaces/ktexteditor/kcm_ktexteditor.desktop (revision 494869)
+@@ -15,7 +15,7 @@
+ Name[eo]=Interna tekstredaktilo
+ Name[es]=Editor de texto empotrable
+ Name[et]=Põimitud tekstiredaktor
+-Name[eu]=Testu editore txertagarria
++Name[eu]=Kapsulatutako testu-editorea
+ Name[fa]=ویرایشگر متن نهÙته
+ Name[fi]=Upotettava tekstieditori
+ Name[fr]=Éditeur de texte intégré
+@@ -40,7 +40,7 @@
+ Name[mn]=ХолбооÑÑ‚ текÑÑ‚ боловÑруулагч
+ Name[ms]=Editor Teks Terimplan
+ Name[nb]=Innebygget skriveprogram
+-Name[nds]=Inbett Text-Editor
++Name[nds]=Inbett Texteditor
+ Name[nl]=Ingebedde tekst-editor
+ Name[nn]=Inkluderbart skriveprogram
+ Name[nso]=Mofetosi wa Sengwalwana yo a Robaditswego
+@@ -87,7 +87,7 @@
+ Comment[eo]=La tekstredaktila servo donas vin aplikaĵojn kun tekstrigardilo kaj redaktilo. KDE aplikaĵoj kiuj volas uzi tekstredakton uzu tiun ĉi servon.
+ Comment[es]=El servicio del editor de texto proporciona aplicaciones con un visor de textos y un editor de textos. Las aplicaciones KDE que suministran propiedades de edición deberÃan utilizar este servicio.
+ Comment[et]=Tekstiredaktori teenus annab rakendustele komponendi teksti vaatamiseks ja redigeerimiseks. Seda kasutavad kõik KDE rakendused, mis tegelevad teksti redigeerimisega.
+-Comment[eu]=Testu editore zerbitzuak testu ikustaile eta editore bat eskeintzen dizkie aplikazioei. Testuak editatzeko aukera ematen duten KDE aplikazioek erabili beharko lukete zerbitzu hau.
++Comment[eu]=Testu-editorearen zerbitzuak testu-ikustailea eta editorea duten aplikazioak eskaintzen ditu. Testuak editatzeko aukera ematen duten KDE aplikazioek erabili beharko lukete zerbitzu hau.
+ Comment[fa]=سرویس ویرایشگر متن یک نمایشگر Ùˆ ویرایشگر برای برنامه‌ها مهیا می‌سازد. برنامه‌های KDE Ú©Ù‡ امکانات ویرایش متن مهیا می‌سازند باید از این سرویس استÙاده کنند.
+ Comment[fi]=Tekstieditoripalvelu tarjoaa sovelluksille tekstinäyttäjän- ja muokkaimen. KDE-sovelluksien, jotka tarjoavat tekstinmuokkauspalveluita, tulisi käyttää tätä palvelua.
+ Comment[fo]=Tekstritiltænastuni gera forrit út við ein tekstvÃsari og -ritil. KDE-forrit ið geva nýtarin møguleiki fyri at rætta tekst eiga at nýta hesa tænasta.
+@@ -112,7 +112,7 @@
+ Comment[ms]= Servis penyunting teks yang menyediakan aplikasi dengan pelihat teks dan editor. Aplikasi KDE yang menyediakan kemudahan penyuntingan teks patut menggunakan servis ini.
+ Comment[mt]=Is-servizz ta' editur ta' test jipprovdi l-programmi b'werrej u editur ta' test. Programmi tal-KDE li jipprovdu servizzi ta' editjar ta' test għandhom jużaw dan is-servizz.
+ Comment[nb]=Skriveprogrammet gir kan vise og redigere teks. KDE-programmer som kan redigere tekst bør bruke denne tjenesten.
+-Comment[nds]=För Programmen gifft dat den Texteditor-Deenst, de en Text-Wieser un en Editor toföögt. KDE-Programmen, mit de Texten bewerkt warrn, schullen dat bruken.
++Comment[nds]=De Texteditor-Deenst föögt Programmen en Textwieser un -editor to. KDE-Programmen, mit de Texten bewerkt warrt, schöölt em bruken.
+ Comment[nl]=Dit component stelt programma's een tekstviewer en -editor tot hun beschikking. KDE-toepassingen die te maken hebben met het bewerken van tekst kunnen gebruik maken van deze aangeboden dienst.
+ Comment[nn]=Skriveprogramtenesta tilbyr vising og redigering av tekst. KDE-program som skal visa eller redigera tekst bør bruka denne tenesta.
+ Comment[nso]=Tirelo ya phetoso ya sengwalwana e aba ditshumiso le molebeledi lemofetosi wa sengwalwana. Ditshumiso tsa KDE tseo di abago ditirelo tsaphetoso ya sengwalwana di swanetse go somisa tirelo ye.
+--- interfaces/ktexteditor/ktexteditor.desktop (revision 488534)
++++ interfaces/ktexteditor/ktexteditor.desktop (revision 494869)
+@@ -19,7 +19,7 @@
+ Comment[eo]=Interna redaktilo (kun apartigo de dokumento kaj rigardo)
+ Comment[es]=Componente incrustable de editor de textos (con separación Doc/Vista)
+ Comment[et]=Põimitav tekstiredaktori komponent (dokument/vaade eraldamisega)
+-Comment[eu]=Testu editore osagai txertagarria (Doc/Ikusi banaturik)
++Comment[eu]=Testu-editorearen kapsulatutako osagaia (Dok/Ikusi bereizketarekin)
+ Comment[fa]=بخش ویرایشگر متن نهÙته (با نمایش/راهنمای مجزا)
+ Comment[fi]=Upotettava tekstimuokkauskomponentti (Asiakirja/Näkymä-jaolla)
+ Comment[fr]=Composant d'édition de texte intégrable (avec séparation doc / vue)
+--- interfaces/ktexteditor/ktexteditorplugin.desktop (revision 488534)
++++ interfaces/ktexteditor/ktexteditorplugin.desktop (revision 494869)
+@@ -21,7 +21,7 @@
+ Comment[eo]=Tekstredaktilo kromaĵo
+ Comment[es]=Plugin de KTextEditor
+ Comment[et]=KTextEditori plugin
+-Comment[eu]=KTextEditor plugina
++Comment[eu]=KTextEditor plugin-a
+ Comment[fa]=متصل‌کننده‌ی KTextEditor
+ Comment[fi]=KTextEditor-lisäosa
+ Comment[fr]=Module externe KTextEditor
+--- kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (revision 488534)
++++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (revision 494869)
+@@ -16,7 +16,7 @@
+ Name[eo]=KTextEditor KDataTool Kromaĵo
+ Name[es]=Plugin KDataTool de KTextEditor
+ Name[et]=KTextEditori KDataTool plugin
+-Name[eu]=KTextEditor-en KDataTool plugina
++Name[eu]=KTextEditor-en KDataTool plugin-a
+ Name[fa]=متصل‌کننده‌ی ابزار KData KTextEditor
+ Name[fi]=KTextEditor KDataTool -lisäosa
+ Name[fr]=Module externe KDataTool pour KTextEditor
+@@ -86,7 +86,7 @@
+ 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
+-Comment[eu]=Thesaurus-a eta ortografia zuzentzailea bezalako tresnak gaitzen ditu (instalatua badaude)
++Comment[eu]=Gaitu thesaurus-a eta ortografia zuzentzailea bezalako tresnak (instalatua badaude)
+ Comment[fa]=Ùعال‌سازی ابزار اطلاعات مانند غلط‌یاب Ùˆ همانندیاب (در صورت نصب)
+ Comment[fi]=Käytä datatyökaluja, kuten oikolukua ja sanakirjaa (jos asennettuna)
+ Comment[fr]=Activer les outils de données comme le thésaurus et la correction orthographique (s'ils sont installés)
+@@ -111,7 +111,7 @@
+ Comment[ms]=Membolehkan alatan data seperti tesaurus dan periksa ejaan(jika dipasang)
+ Comment[mt]=Ippermetti l-użu ta' għodda bħat-teżawru u spell check (jekk installati)
+ Comment[nb]=Skru på dataverktøy som ordbok og stavekontroll (hvis det er installert)
+-Comment[nds]=Warktüüch as Thesaurus oder Klookschriever anmaken (wenn op dien Reekner)
++Comment[nds]=Warktüüch as Thesaurus oder Klookschriever anmaken (wenn installeert)
+ Comment[nl]=Activering van hulpprogramma's, zoals de thesaurus en spellingcontrole (indien geïnstalleerd)
+ Comment[nn]=Tilgang til dataverktøy som ordliste og stavekontroll
+ Comment[nso]=Kgontsha dibereka tsa data goswana le thesaurus le tebelelo yamongwalo (ge di tsentswe)
+--- kate/plugins/insertfile/ktexteditor_insertfile.desktop (revision 488534)
++++ kate/plugins/insertfile/ktexteditor_insertfile.desktop (revision 494869)
+@@ -16,7 +16,7 @@
+ Name[eo]=KTextEditor Enmetu-Dosieron-kromaĵo
+ Name[es]=Plugin de inserción de archivos de KTextEditor
+ Name[et]=KTextEditori faili lisamise plugin
+-Name[eu]=Fitxategiak txertatzeko KTextEditor-en plugina
++Name[eu]=Fitxategiak txertatzeko KTextEditor-en plugin-a
+ Name[fa]=متصل‌کننده‌ی پرونده‌ی ورود KTextEditor
+ Name[fi]=KTextEditorin 'Lisää tiedosto'-laajennus
+ Name[fr]=Module externe du fichier d'insertion de KTextEditor
+@@ -41,7 +41,7 @@
+ Name[ms]=Plug masuk Fail KTextEditor
+ Name[mt]=Plagin ta' KTextEditor biex iddaħħal fajl
+ Name[nb]=Programtillegg for 'sett inn fil' i KTextEditor
+-Name[nds]=KTextEditor-Plugin för dat Infögen vun Dateien
++Name[nds]=KTextEditor-Plugin för't Datei-Infögen
+ Name[nl]=KTextEditor-plugin voor het invoegen van bestanden
+ Name[nn]=Programtillegg for innsetjing av fil i skriveprogram
+ Name[nso]=Tsenyo ya Faele ya Mofetosi wa Sengwalwana sa K
+@@ -81,11 +81,11 @@
+ Comment[cs]=Vložà jakýkoliv Äitelný soubor na mÃsto kurzoru
+ Comment[da]=Indsæt en vilkårlig læsbar fil ved markørens position
+ Comment[de]=Beliebige lesbare Datei an Cursor-Position einfügen
+-Comment[el]=Εισαγωγή οποιουδήποτε αναγνώσιμου αÏχείου στη θÎση του κÎÏσοÏα
++Comment[el]=Εισαγωγή οποιουδήποτε αναγνώσιμου αÏχείου στη θÎση του δÏομÎα
+ Comment[eo]=Enmetu iun legeblan dosieron je ĉi tiu posicio
+ Comment[es]=Insertar cualquier archivo legible en la posición del cursor
+ Comment[et]=Suvalise loetava faili lisamine kursori asukohta
+-Comment[eu]=Kurtsorearen kokapenean fitxategi irakurgarri bat txertatzen du
++Comment[eu]=Kurtsorearen posizioan fitxategi irakurgarri bat txertatzen du
+ Comment[fi]=Lisää mikä tahansa luettava tiedosto kursorin kohdalle
+ Comment[fr]=Insérer tout fichier lisible à la position du curseur
+ Comment[fy]=Els lêsber Triem by it rinnerke ynfoegje
+@@ -102,7 +102,7 @@
+ Comment[lv]=Ievieto jebkuru lasÄmu failu kursora atraÅ¡anÄs vietÄ
+ Comment[mk]=ВнеÑува било која читлива датотека на позицијата на курÑорот
+ Comment[nb]=Sett inn en lesbar fil ved skrivemerket
+-Comment[nds]=Jichtenseen leesbore Datei bi'n Cursor infögen
++Comment[nds]=Jichtenseen leesbore Datei bi'n Blinker infögen
+ Comment[nl]=Voeg een willekeurig leesbaar bestand in op de cursorpositie
+ Comment[nn]=Set inn ei lesbar fil ved skrivemerket
+ Comment[pa]=ਕੋਈ ਪੜਨਯੋਗ ਫਾਇਲ ਕਰਸਰ ਸਥਿਤੀ ਤੇ ਸ਼ਾਮਿਲ ਕਰੋ
+--- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (revision 488534)
++++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (revision 494869)
+@@ -13,7 +13,7 @@
+ Name[eo]=KTextEditor AÅtomata legosignigilo
+ Name[es]=Automarcadores de KTextEditor
+ Name[et]=KTextEditori järjehoidjate märkija
+-Name[eu]=KTextEditor-en AutoLasterMarkatzailea
++Name[eu]=KTextEditor-en laster-markatzaile automatikoa
+ Name[fi]=KTextEditorin automaattinen kirjanmerkkien tekijä
+ Name[fr]=Signets automatiques KTextEditor
+ Name[fy]=Automatyske Blêdwizer foar de KTekstbewurker
+@@ -32,7 +32,7 @@
+ Name[mk]=KTextEditor Ðвтообележувач
+ Name[ms]=Penanda buku auto KTextEditor
+ Name[nb]=Automatisk bokmerke for KTextEditor
+-Name[nds]=Automaatsch Leesteken setten
++Name[nds]=KTextEditor -Leestekensetter
+ Name[nl]=KTextEditor Autobladwijzers
+ Name[nn]=Automatisk bokmerke for KTextEditor
+ Name[pa]=ਕੇਪਾਠਸੰਪਾਦਕ ਸਵੈਬà©à©±à¨•à¨®à¨¾à¨°à¨•à¨°
+@@ -67,7 +67,7 @@
+ Comment[eo]=Igas legosignojn en linioj, kiuj konvenas Åablonon, kiam dokumentoj estas ÅarÄataj
+ Comment[es]=Pone marcadores en las lÃneas que coinciden con un patrón definido al cargar documentos.
+ Comment[et]=Määrab dokumendi avamisel vastavalt mustrile ridadele järjehoidjad
+-Comment[eu]=Dokumentuak kargatzen direnean, eredu jakin batekin bat datozen lerroak laster-marka bidez markatzen ditu.
++Comment[eu]=Eredu batekin bat datozen lerroen laster-markak ezartzen ditu dokumentuak kargatzean
+ Comment[fi]=Määrittele kirjanmerkkejä riveille, jotka vastaavat kuviota, kun asiakirjoja avataan
+ Comment[fr]=Positionne des signets sur les lignes qui correspondent à un motif quand les documents sont chargés
+ Comment[fy]=Blêdwizer ynstelle om by it laden fan dokuminten oerienkomstige patroanen
+@@ -87,7 +87,7 @@
+ Comment[mk]=ПоÑтава обележувачи на линиите кои Ñе поклопуваат Ñо шема кога документите Ñе вчитуваат
+ Comment[ms]=Tetapkan penanda buku pada baris yang padan dengan paten apabila dokumen dimuatkan
+ Comment[nb]=Bestem bokmerke på linjer som passer til et mønster når dokument blir åpnet
+-Comment[nds]=Sett al bi't Laden Leestekens för Regen, de to'n Muster passt
++Comment[nds]=Sett al bi't Laden Leestekens för Regen, op de en Muster passt
+ Comment[nl]=Plaatsen van bladwijzers op regels die voldoen aan een bepaald patroon zodra het document geopend wordt
+ Comment[nn]=Set bokmerke på linjer som passar til eit mønster når dokument vert opna
+ Comment[pa]=ਜਦੋਂ ਵੀ ਦਸਤਾਵੇਜ਼ ਨੂੰ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੋਵੇ ਤਾਂ ਬà©à©±à¨•à¨®à¨¾à¨°à¨• ਨੂੰ ਸਤਰ-ਮੇਲ ਤਰਤੀਬ ਨਿਰਧਾਰਿਤ ਕਰੋ
+--- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (revision 488534)
++++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (revision 494869)
+@@ -12,7 +12,7 @@
+ Name[eo]=KTextEditor Vortotutiga kromaĵo
+ Name[es]=Plugin de completado de palabras de KTextEditor
+ Name[et]=KTextEditori sõna lõpetamise plugin
+-Name[eu]=KTextEditor-en hitzen osaketarako plugina
++Name[eu]=KTextEditor-en hitzen osaketarako plugin-a
+ Name[fi]=KTextEditorin sanojen täydennyslaajennus
+ Name[fr]=Module externe de complètement des mots de KTextEditor
+ Name[fy]=KTextEditor plugin foar it kompleet meitje fan wurden
+@@ -33,7 +33,7 @@
+ Name[mk]=KTextEditor приклучок за довршување на зборови
+ Name[ms]=Plug masuk Penyudah Kata Fail KTextEditor
+ Name[nb]=Programtillegg for ordfullføring i KTextEditor
+-Name[nds]=KTextEditor-Plugin för dat Kumpletteren vun Wöör
++Name[nds]=KTextEditor-Plugin för Woort-Kompletteren
+ Name[nl]=KTextEditor-plugin voor het aanvullen van woorden
+ Name[nn]=Programtillegg for ordfullføring i KTextEditor
+ Name[pa]=KTextEditor ਪਾਠਪੂਰਨ ਪਲੱਗਿੰਨ
+@@ -68,7 +68,7 @@
+ Comment[eo]=Regula aÅ ekfenestra tutigo de vortoj en la dokumento
+ Comment[es]=Completado de palabras direccional o de menú emergente en el documento.
+ Comment[et]=Lõpetamine vastavalt suunale või hüpikvariantide alusel dokumendi sõnade põhjal
+-Comment[eu]=Dokumentuko hitzen osaketarako plugina
++Comment[eu]=Dokumentuko hitzen osaketarako plugin-a
+ Comment[fi]=Asiakirjasta löytyvillä sanoilla täydentäminen
+ Comment[fr]=Complètement basé sur la direction ou un menu à partir des mots du document
+ Comment[fy]=kompleet meitsje fan wurden yn it dokumint op Direktsjeneel of popup-basearje
+@@ -86,7 +86,7 @@
+ Comment[lv]=VÄrdu automÄtiska pabeigÅ¡ana izmantojot dokumentÄ jau esoÅ¡os vÄrdus
+ Comment[mk]=ÐаÑочено или Ñкок-базирано довршување од зборови во документот
+ Comment[nb]=Retningsbestemt eller sprettopp-basert fullføring av ord i dokumentet
+-Comment[nds]=Richten- oder Popup-baseert Kumpletteren vun Wöör binnen dat Dokment
++Comment[nds]=Richten- oder Opdukbaseert Kompletteren vun Wöör binnen dat Dokment
+ Comment[nl]=Voor het aanvullen van woorden in het document door middel van onder meer pop-ups
+ Comment[nn]=Retningsbestemt eller sprettopp-basert fullføring av ord i dokumentet
+ Comment[pa]=ਦਸਤਾਵੇਜ਼ ਵਿੱਚ ਦਿਸ਼ਾਵੀ ਜਾਂ ਪੋਪਅੱਪ ਆਧਾਰਿਤ ਸ਼ਬਦ ਪੂਰਨ
+--- kate/plugins/isearch/ktexteditor_isearch.desktop (revision 488534)
++++ kate/plugins/isearch/ktexteditor_isearch.desktop (revision 494869)
+@@ -15,7 +15,7 @@
+ Name[eo]=KTextEditor Iom-post-Ioma-Serĉo-kromaĵo
+ Name[es]=Plugin de búsqueda incremental de KTextEditor
+ Name[et]=KTextEditori täpsustava otsingu plugin
+-Name[eu]=KTextEditor-en bilaketa inkrementalerako plugina
++Name[eu]=KTextEditor-en bilaketa inkrementalerako plugin-a
+ Name[fa]=متصل‌کننده‌ی موتور اÙزودنی KTextEditor
+ Name[fi]=KTextEditorin tarkentuvan haun laajennus
+ Name[fr]=Module externe de recherche incrémentale pour KTextEditor
+@@ -39,7 +39,7 @@
+ Name[ms]=Plug masuk Carian Meningkat KTextEditor
+ Name[mt]=Plagin ta' KTextEditor għal tfittix inkrementali
+ Name[nb]=Programtillegg for 'fortløpende søk' i KTextEditor
+-Name[nds]=KTextEditor-Plugin för dat Söken "Tast för Tast"
++Name[nds]=KTextEditor-Plugin för "Tast för Tast"-Söök
+ Name[nl]=KTextEditor-plugin voor incrementele zoekacties
+ Name[nn]=Programtillegg for inkrementelt søk i skriveprogram
+ Name[nso]=Tsenyo ya Nyako ya Koketso ya Mofetosi wa Sengwalwana sa K
+@@ -82,7 +82,7 @@
+ Comment[eo]=AnkaÅ konata kiel "Kiel vi entipas"
+ Comment[es]=También conocido como "Búsqueda mientras teclea"
+ Comment[et]=Tuntud ka kui "otsimine vastavalt kirjutamisele"
+-Comment[eu]="Teklei eragiten diezun bitarteko bilaketa" bezala ere ezaguna
++Comment[eu]="Idaztean bilatu" bezala ere ezaguna
+ Comment[fi]=Tunnetaan myös nimellä "Hae kun kirjoitat"
+ Comment[fr]=Aussi connu comme « Recherche pendant la saisie »
+ Comment[fy]=Ek bekend as"ûnder it typen sykje"
+--- kate/part/kateview.cpp (revision 488534)
++++ kate/part/kateview.cpp (revision 494869)
+@@ -861,7 +861,7 @@
+ if( res.URLs.isEmpty() || !checkOverwrite( res.URLs.first() ) )
+ return SAVE_CANCEL;
+
+- m_doc->setEncoding( res.encoding );
++ m_doc->config()->setEncoding( res.encoding );
+
+ if( m_doc->saveAs( res.URLs.first() ) )
+ return SAVE_OK;
+--- kate/part/katedocument.cpp (revision 488534)
++++ kate/part/katedocument.cpp (revision 494869)
+@@ -4856,6 +4856,7 @@
+ ret = md5.update( f );
+ md5.hexDigest( result );
+ f.close();
++ ret = true;
+ }
+ }
+ return ret;
+--- kate/part/kateautoindent.cpp (revision 488534)
++++ kate/part/kateautoindent.cpp (revision 494869)
+@@ -344,8 +344,8 @@
+
+ uint KateNormalIndent::measureIndent (KateDocCursor &cur) const
+ {
+- if (useSpaces && !mixedIndent)
+- return cur.col();
++ // We cannot short-cut by checking for useSpaces because there may be
++ // tabs in the line despite this setting.
+
+ return doc->plainKateTextLine(cur.line())->cursorX(cur.col(), tabWidth);
+ }
+--- kate/part/katedialogs.cpp (revision 488534)
++++ kate/part/katedialogs.cpp (revision 494869)
+@@ -728,8 +728,8 @@
+ "Each new bookmark will be added to the bottom, independently from "
+ "where it is placed in the document."));
+ QWhatsThis::add(m_showIndentLines, i18n(
+- "If this is enabled, the editor will display vertical line to help "
+- "identifying indent lines.") );
++ "If this is enabled, the editor will display vertical lines to help "
++ "identify indent lines.") );
+
+ reload();
+
+--- kate/scripts/jstest.desktop (revision 488534)
++++ kate/scripts/jstest.desktop (revision 494869)
+@@ -8,6 +8,7 @@
+ Name[el]=Έλεγχος JavaScript του Kate Part
+ Name[es]=Prueba JavaScript de Kate Part
+ Name[et]=Kate komponendi JavaScripti test
++Name[eu]=Kate zatiaren JavaScript proba
+ Name[fi]=Kate Part JavaScript -testi
+ Name[fr]=Test du module JavaScript pour Kate
+ Name[fy]=Kate-part JavaSkript-test
+@@ -21,7 +22,7 @@
+ Name[lb]=Kate Part JavaScript-Test
+ Name[lt]=Kate Part JavaScript testas
+ Name[nb]=Kate Part JavaScript-test
+-Name[nds]=Kate-Deel JavaScript-Test
++Name[nds]=Kate-Part JavaScript-Test
+ Name[nl]=Kate-part JavaScript-test
+ Name[nn]=Kate Part JavaScript-test
+ Name[pa]=Kate Part JavaScript ਜਾਂਚ
+@@ -50,6 +51,7 @@
+ Comment[el]=ΣενάÏιο για Îλεγχο του scripting του Kate Part
+ Comment[es]=Guión para probar el part de scripting de kate
+ Comment[et]=Skript Kate komponendi skriptimisomaduste testimiseks
++Comment[eu]=Script-a Kate zatiaren script-ak probatzeko.
+ Comment[fi]=Skripti kate partin skriptien testaukseen
+ Comment[fr]=Script testant le module de scripting de Kate
+ Comment[fy]=Skript foar it testen fan Kate-part's skriptmooglikheid
+@@ -62,7 +64,7 @@
+ Comment[km]=ស្គ្រីប​សម្រាប់​សាកល្បង​ការ​សរសáŸážšâ€‹ážšáž”ស់ kate part
+ Comment[lb]=Skript fir d'Skriptfunktioune vum Kate part ze testen
+ Comment[nb]=Skript til å teste kate parts skripting
+-Comment[nds]=En Skript, dat Kate-Deels Skriptkönen pröven schall
++Comment[nds]=En Skript, dat Kate-Part sien Skriptkönen pröven schall
+ Comment[nl]=Script voor het testen van Kate-part's scriptmogelijkheid
+ Comment[nn]=Skript for testing av Kate part-skriptinga
+ Comment[pa]=kate part ਦੀ ਸਕà©à¨°à¨¿à¨ªà¨Ÿà¨¿à©°à¨— ਦੀ ਜਾਂਚ ਲਈ ਸਕà©à¨°à¨¿à¨ªà¨Ÿ
+--- kate/data/abc.xml (revision 488534)
++++ kate/data/abc.xml (revision 494869)
+@@ -1,8 +1,8 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE language SYSTEM "language.dtd">
+ <!-- Andrea Primiani - primiani at dag dot it
+- version1.0 - 5 august 2004 -->
+-<language name="ABC" version="1.01" kateversion="2.4" section="Other" extensions="*.abc;*.ABC" mimetype="text/vnd.abc" casesensitive="1" author="Andrea Primiani (primiani at dag.it)" license="LGPL">
++ version1.10 - 12 december 2005 -->
++<language name="ABC" version="1.10" kateversion="2.4" section="Other" extensions="*.abc;*.ABC" mimetype="text/vnd.abc" casesensitive="1" author="Andrea Primiani (primiani at dag.it)" license="LGPL">
+ <highlighting>
+ <contexts>
+ <context name="Normal" attribute="Normal Text" lineEndContext="#stay">
+@@ -16,7 +16,6 @@
+ <RegExpr attribute="Header" context="Header" String="\[[ABCGHILMNOQRSTUVZ]:" />
+ <!-- detects single header line inside a song without [] - ends at EOL-->
+ <RegExpr attribute="Header" context="Header2" String="[ABCGHILMNOPQRSTUVZ]:" />
+-<!-- <Detect2Chars attribute="Header2" context="Part" char="P" char1=":" /> -->
+ <!-- detect beginning of header zone with X: and sends to Header context -->
+ <Detect2Chars attribute="Header" context="Header" char="X" char1=":" beginRegion="header" column="0"/>
+ <!-- detects bar beginning (or chord) symbols and sends to Bar context -->
+@@ -41,13 +40,17 @@
+ <context name="Lyrics" attribute="Lyrics" lineEndContext="#pop" />
+ <context name="Part" attribute="Header" lineEndContext="#pop" />
+ <context name="Comment" attribute="Comment" lineEndContext="#pop" />
+-<!-- returns to Normal context after the end of bar symbols (not perfect) or at EOL -->
++<!-- returns to Normal context after the end of bar symbols or at EOL -->
+ <context name="Bar" attribute="Bar" lineEndContext="#pop" >
+ <DetectChar attribute="Normal" context="#pop" char=""" />
+-<!-- the bar symbol ends when a note letter follows <RegExpr attribute="Bar" context="#pop" String="" />-->
++<!-- the bar symbol ends when a note letter follows -->
+ <RegExpr attribute="Normal" context="#pop" String="[A-Ga-gZz]" />
+ <!-- the bar symbol ends after a white space -->
+ <DetectChar attribute="Normal" context="#pop" char=" " />
++<!-- detects decorations delimited by ! ! symbols -->
++ <RangeDetect attribute="Decoration" context="#stay" char="!" char1="!" />
++<!-- detects () for slurs -->
++ <AnyChar attribute="Slur" context="#stay" String="()" />
+ <!-- chomps all other bar symbols -->
+ <RegExpr attribute="Bar" context="#pop" String=":*\|*[1-9]|/*\|" />
+ </context>
+@@ -73,7 +76,7 @@
+ <itemData name="Tuplet" defStyleNum="dsDataType" color="#bb00bb"/>
+ <itemData name="Lyrics" defStyleNum="dsDataType" color="#00bb00"/>
+ <itemData name="Bar" defStyleNum="dsChar" color="#0000ff"/>
+- <itemData name="Sharp" defStyleNum="dsNormal" bold="true"/>
++ <itemData name="Sharp" defStyleNum="dsNormal" color="#22bb66" bold="true"/>
+ </itemDatas>
+ </highlighting>
+ <general>
+--- kate/data/katepart.desktop (revision 488534)
++++ kate/data/katepart.desktop (revision 494869)
+@@ -17,7 +17,7 @@
+ Name[eo]=Interna tekstredaktilo
+ Name[es]=Editor de texto avanzado empotrable
+ Name[et]=Põimitud võimas tekstiredaktor
+-Name[eu]=Testu editore txertagarri aurreratua
++Name[eu]=Kapsulatutako testu-editore aurreratua
+ Name[fa]=ویرایشگر متن پیشرÙته‌ی نهÙته
+ Name[fi]=Upotettava kehittynyt tekstieditori
+ Name[fr]=Éditeur de texte avancé intégré
+--- kate/data/apache.xml (revision 488534)
++++ kate/data/apache.xml (revision 494869)
+@@ -1,9 +1,22 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE language SYSTEM "language.dtd">
+-<language name="Apache Configuration" section="Configuration" extensions="httpd.conf;httpd2.conf;apache.conf;apache2.conf" mimetype="" version="1.0" author="Jan Janssen (medhefgo at web.de)" license="LGPL">
+
++<!-- Changelog:
++
++v1.1:
++- improved Syntax
++- added support for Apache 2.2 Directives
++- .ht* files may now automaticaly be highlighted
++
++v1.0:
++- first Release
++-->
++
++<language name="Apache Configuration" section="Configuration" extensions="httpd.conf;httpd2.conf;apache.conf;apache2.conf;.ht*" mimetype="" version="1.10" author="Jan Janssen (medhefgo at googlemail.com)" license="LGPL">
++
+ <highlighting>
+-<list name="StringDirectives">
++<list name="String Directives">
++<item>AcceptFilter</item>
+ <item>AccessFileName</item>
+ <item>Action</item>
+ <item>AddAlt</item>
+@@ -27,13 +40,16 @@
+ <item>AliasMatch</item>
+ <item>Allow</item>
+ <item>Anonymous</item>
++<item>AuthBasicProvider</item>
+ <item>AuthDBMGroupFile</item>
+ <item>AuthDBMUserFile</item>
+ <item>AuthDigestDomain</item>
+ <item>AuthDigestFile</item>
+ <item>AuthDigestGroupFile</item>
+ <item>AuthDigestNonceFormat</item>
++<item>AuthDigestProvider</item>
+ <item>AuthGroupFile</item>
++<item>AuthLDAPBindDN</item>
+ <item>AuthLDAPBindPassword</item>
+ <item>AuthLDAPCharsetConfig</item>
+ <item>AuthLDAPGroupAttribute</item>
+@@ -48,7 +64,6 @@
+ <item>CacheFile</item>
+ <item>CacheGcClean</item>
+ <item>CacheGcUnused</item>
+-<item>CacheIgnoreHeaders</item>
+ <item>CacheRoot</item>
+ <item>CGIMapExtension</item>
+ <item>CharsetDefault</item>
+@@ -59,7 +74,12 @@
+ <item>CookieName</item>
+ <item>CoreDumpDirectory</item>
+ <item>CustomLog</item>
++<item>Dav</item>
++<item>DavGenericLockDB</item>
+ <item>DavLockDB</item>
++<item>DBDParams</item>
++<item>DBDPrepareSQL</item>
++<item>DBDriver</item>
+ <item>DefaultIcon</item>
+ <item>DefaultLanguage</item>
+ <item>DefaultType</item>
+@@ -74,23 +94,33 @@
+ <item>ExpiresDefault</item>
+ <item>ExtFilterDefine</item>
+ <item>ExtFilterOptions</item>
+-<item>FileETag</item>
++<item>FilterChain</item>
++<item>FilterDeclare</item>
++<item>FilterProtocol</item>
++<item>FilterProvider</item>
++<item>FilterTrace</item>
+ <item>ForceType</item>
+ <item>ForensicLog</item>
+ <item>Group</item>
++<item>Header</item>
+ <item>HeaderName</item>
++<item>ImapBase</item>
+ <item>Include</item>
+ <item>IndexIgnore</item>
+ <item>IndexOptions</item>
++<item>IndexStyleSheet</item>
+ <item>ISAPICacheFile</item>
+ <item>LanguagePriority</item>
+ <item>LDAPSharedCacheFile</item>
+ <item>LDAPTrustedCA</item>
+ <item>LDAPTrustedCAType</item>
++<item>LDAPTrustedClientCert</item>
++<item>LDAPTrustedGlobalCert</item>
+ <item>Listen</item>
+ <item>LoadFile</item>
+ <item>LoadModule</item>
+ <item>LockFile</item>
++<item>LogFormat</item>
+ <item>MetaDir</item>
+ <item>MetaSuffix</item>
+ <item>MimeMagicFile</item>
+@@ -99,14 +129,14 @@
+ <item>NoProxy</item>
+ <item>NWSSLTrustedCerts</item>
+ <item>NWSSLUpgradeable</item>
+-<item>Options</item>
+-<item>Order</item>
+ <item>PassEnv</item>
+ <item>PidFile</item>
+ <item>ProxyBlock</item>
+ <item>ProxyDomain</item>
+ <item>ProxyPass</item>
+ <item>ProxyPassReverse</item>
++<item>ProxyPassReverseCookieDomain</item>
++<item>ProxyPassReverseCookiePath</item>
+ <item>ProxyRemote</item>
+ <item>ProxyRemoteMatch</item>
+ <item>ReadmeName</item>
+@@ -121,14 +151,13 @@
+ <item>RemoveLanguage</item>
+ <item>RemoveOutputFilter</item>
+ <item>RemoveType</item>
++<item>RequestHeader</item>
+ <item>Require</item>
+ <item>RewriteBase</item>
+ <item>RewriteCond</item>
+ <item>RewriteLock</item>
+ <item>RewriteLog</item>
+-<item>RewriteLogLevel</item>
+ <item>RewriteMap</item>
+-<item>RewriteOptions</item>
+ <item>RewriteRule</item>
+ <item>ScoreBoardFile</item>
+ <item>Script</item>
+@@ -155,16 +184,17 @@
+ <item>SSIUndefinedEcho</item>
+ <item>SSLCACertificateFile</item>
+ <item>SSLCACertificatePath</item>
++<item>SSLCADNRequestFile</item>
++<item>SSLCADNRequestPath</item>
+ <item>SSLCARevocationFile</item>
+ <item>SSLCARevocationPath</item>
+ <item>SSLCertificateChainFile</item>
+ <item>SSLCertificateFile</item>
+ <item>SSLCertificateKeyFile</item>
+ <item>SSLCipherSuite</item>
+-<item>SSLMutex</item>
+-<item>SSLOptions</item>
++<item>SSLCryptoDevice</item>
++<item>SSLHonorCiperOrder</item>
+ <item>SSLPassPhraseDialog</item>
+-<item>SSLProtocol</item>
+ <item>SSLProxyCACertificateFile</item>
+ <item>SSLProxyCACertificatePath</item>
+ <item>SSLProxyCARevocationFile</item>
+@@ -176,7 +206,6 @@
+ <item>SSLRandomSeed</item>
+ <item>SSLRequire</item>
+ <item>SSLRequireSSL</item>
+-<item>SSLSessionCache</item>
+ <item>SSLUserName</item>
+ <item>SuexecUserGroup</item>
+ <item>TransferLog</item>
+@@ -189,10 +218,9 @@
+ <item>VirtualScriptAlias</item>
+ <item>VirtualScriptAliasIP</item>
+ <item>Win32DisableAcceptEx</item>
+-<item>XBitHack</item>
+ </list>
+
+-<list name="IntDirectives">
++<list name="Integer Directives">
+ <item>AllowCONNECT</item>
+ <item>AssignUserID</item>
+ <item>AuthDigestNonceLifetime</item>
+@@ -210,13 +238,19 @@
+ <item>CacheMinFileSize</item>
+ <item>CacheSize</item>
+ <item>CacheTimeMargin</item>
+-<item>ChildPerUserI</item>
++<item>ChildPerUserID</item>
+ <item>CookieExpires</item>
+ <item>DavMinTimeout</item>
++<item>DBDExptime</item>
++<item>DBDKeep</item>
++<item>DBDMax</item>
++<item>DBDMin</item>
++<item>DBDPersist</item>
+ <item>DeflateBufferSize</item>
+ <item>DeflateCompressionLevel</item>
+ <item>DeflateMemLevel</item>
+ <item>DeflateWindowSize</item>
++<item>IdentityCheckTimeout</item>
+ <item>ISAPIReadAheadBuffer</item>
+ <item>KeepAliveTimeout</item>
+ <item>LDAPCacheEntries</item>
+@@ -253,6 +287,7 @@
+ <item>ProxyMaxForwards</item>
+ <item>ProxyReceiveBufferSize</item>
+ <item>ProxyTimeout</item>
++<item>RewriteLogLevel</item>
+ <item>RLimitCPU</item>
+ <item>RLimitMEM</item>
+ <item>RLimitNPROC</item>
+@@ -271,7 +306,7 @@
+ <item>TimeOut</item>
+ </list>
+
+-<list name="AlterDirectives">
++<list name="Alternative Directives">
+ <item>AcceptMutex</item>
+ <item>AcceptPathInfo</item>
+ <item>AllowEncodedSlashes</item>
+@@ -282,13 +317,15 @@
+ <item>Anonymous_NoUserID</item>
+ <item>Anonymous_VerifyEmail</item>
+ <item>AuthAuthoritative</item>
++<item>AuthBasicAuthoritative</item>
++<item>AuthBasicProvider</item>
+ <item>AuthDBMAuthoritative</item>
+ <item>AuthDBMType</item>
++<item>AuthDefaultAuthoritative</item>
+ <item>AuthDigestAlgorithm</item>
+ <item>AuthDigestNcCheck</item>
+ <item>AuthDigestQop</item>
+ <item>AuthLDAPAuthoritative</item>
+-<item>AuthLDAPBindDN</item>
+ <item>AuthLDAPCompareDNOnServer</item>
+ <item>AuthLDAPDereferenceAliases</item>
+ <item>AuthLDAPEnabled</item>
+@@ -296,16 +333,27 @@
+ <item>AuthLDAPGroupAttributeIsDN</item>
+ <item>AuthLDAPRemoteUserIsDN</item>
+ <item>AuthType</item>
++<item>AuthzDBMAuthoritative</item>
++<item>AuthzDBMType</item>
++<item>AuthzDefaultAuthoritative</item>
++<item>AuthzGroupFileAuthoritative</item>
++<item>AuthzLDAPAuthoritative</item>
++<item>AuthzOwnerAuthoritative</item>
++<item>AuthzUserAuthoritative</item>
+ <item>BufferedLogs</item>
+ <item>CacheExpiryCheck</item>
+ <item>CacheIgnoreCacheControl</item>
++<item>CacheIgnoreHeaders</item>
+ <item>CacheIgnoreNoLastMod</item>
+ <item>CacheNegotiatedDocs</item>
++<item>CacheStoreNoStore</item>
++<item>CacheStorePrivate</item>
+ <item>CheckSpelling</item>
+ <item>ContentDigest</item>
+ <item>CookieStyle</item>
+ <item>CookieTracking</item>
+-<item>Dav</item>
++<item>CoreDumpDirectory</item>
++<item>CustomLog</item>
+ <item>DavDepthInfinity</item>
+ <item>DirectorySlash</item>
+ <item>DumpIOInput</item>
+@@ -315,11 +363,10 @@
+ <item>EnableSendfile</item>
+ <item>ExpiresActive</item>
+ <item>ExtendedStatus</item>
++<item>FileETag</item>
+ <item>ForceLanguagePriority</item>
+-<item>Header</item>
+ <item>HostnameLookups</item>
+ <item>IdentityCheck</item>
+-<item>ImapBase</item>
+ <item>ImapDefault</item>
+ <item>ImapMenu</item>
+ <item>IndexOrderDefault</item>
+@@ -328,40 +375,70 @@
+ <item>ISAPIFakeAsync</item>
+ <item>ISAPILogNotSupported</item>
+ <item>KeepAlive</item>
+-<item>LogFormat</item>
++<item>LDAPTrustedMode</item>
++<item>LDAPVerifyServerCert</item>
+ <item>LogLevel</item>
+ <item>MCacheRemovalAlgorithm</item>
+ <item>MetaFiles</item>
+ <item>ModMimeUsePathInfo</item>
+ <item>MultiviewsMatch</item>
++<item>Options</item>
++<item>Order</item>
+ <item>ProtocolEcho</item>
+ <item>ProxyBadHeader</item>
+ <item>ProxyErrorOverride</item>
+ <item>ProxyPreserveHost</item>
+ <item>ProxyRequests</item>
+ <item>ProxyVia</item>
+-<item>RequestHeader</item>
+ <item>RewriteEngine</item>
++<item>RewriteOptions</item>
+ <item>Satisfy</item>
+ <item>ScriptInterpreterSource</item>
+ <item>ServerSignature</item>
+ <item>ServerTokens</item>
+ <item>SSLEngine</item>
++<item>SSLMutex</item>
++<item>SSLOptions</item>
++<item>SSLProtocol</item>
+ <item>SSLProxyEngine</item>
+ <item>SSLProxyVerify</item>
++<item>SSLSessionCache</item>
+ <item>SSLVerifyClient</item>
+ <item>UseCanonicalName</item>
++<item>XBitHack</item>
+ </list>
+
+ <list name="Alternates">
+-<item>Default</item>
+ <item>On</item>
+ <item>Off</item>
+-<item>Methode</item>
++<item>Default</item>
++<item>flock</item>
++<item>fcntl</item>
++<item>posixsem</item>
++<item>pthread</item>
++<item>sysvsem</item>
+ <item>All</item>
+-<item>host</item>
+-<item>env</item>
+ <item>None</item>
++<item>AuthConfig</item>
++<item>FileInfo</item>
++<item>Indexes</item>
++<item>Limit</item>
++<item>Options</item>
++
++<item>ExecCGI</item>
++<item>FollowSymLinks</item>
++<item>Includes</item>
++<item>IncludesNOEXEC</item>
++<item>Indexes</item>
++<item>MultiViews</item>
++<item>SymLinksIfOwnerMatch</item>
++<item>StdEnvVars</item>
++<item>CompatEnvVars</item>
++<item>ExportCertData</item>
++<item>FakeBasicAuth</item>
++<item>StrictRequire</item>
++<item>OptRenegotiate</item>
++
+ <item>SDBM</item>
+ <item>GDBM</item>
+ <item>NDBM</item>
+@@ -370,30 +447,35 @@
+ <item>MD5-sess</item>
+ <item>auth</item>
+ <item>auth-int</item>
++<item>never</item>
++<item>searching</item>
++<item>finding</item>
+ <item>always</item>
+-<item>finding</item>
+-<item>searching</item>
+-<item>never</item>
+ <item>Basic</item>
+ <item>Digest</item>
++<item>Connection</item>
++<item>Keep-Alive</item>
++<item>Proxy-Authenticate</item>
++<item>Proxy-Authorization</item>
++<item>TE</item>
++<item>Trailers</item>
++<item>Transfer-Encoding</item>
++<item>Upgrade</item>
+ <item>Netscape</item>
+ <item>Cookie</item>
+ <item>Cookie2</item>
+ <item>RFC2109</item>
+ <item>RFC2965</item>
+-<item>provider-name</item>
++<item>INode</item>
++<item>MTime</item>
++<item>Size</item>
+ <item>Prefer</item>
+ <item>Fallback</item>
+-<item>set</item>
+-<item>append</item>
+-<item>add</item>
+-<item>unset</item>
+-<item>echo</item>
+ <item>Double</item>
++<item>error</item>
++<item>nocontent</item>
+ <item>map</item>
+ <item>referer</item>
+-<item>error</item>
+-<item>nocontent</item>
+ <item>formatted</item>
+ <item>semiformatted</item>
+ <item>unformatted</item>
+@@ -403,9 +485,13 @@
+ <item>Date</item>
+ <item>Size</item>
+ <item>Description</item>
++<item>SSL</item>
++<item>TLS</item>
++<item>STARTTLS</item>
+ <item>emerg</item>
+ <item>alert</item>
+ <item>crit</item>
++<item>error</item>
+ <item>warn</item>
+ <item>notice</item>
+ <item>info</item>
+@@ -416,11 +502,15 @@
+ <item>NegotiatedOnly</item>
+ <item>Filters</item>
+ <item>Handlers</item>
++<item>Deny,Allow</item>
++<item>Allow,Deny</item>
++<item>Mutual-failure</item>
+ <item>IsError</item>
+ <item>Ignore</item>
+ <item>StartBody</item>
+ <item>Full</item>
+ <item>Block</item>
++<item>inherit</item>
+ <item>Registry</item>
+ <item>Registry-Strict</item>
+ <item>Script</item>
+@@ -432,62 +522,90 @@
+ <item>Prod</item>
+ <item>ProductOnly</item>
+ <item>OS</item>
++<item>Full</item>
+ <item>optional</item>
++<item>posixsem</item>
++<item>sysvsem</item>
++<item>sem</item>
++<item>pthread</item>
++<item>fcntl:</item>
++<item>flock:</item>
++<item>file:</item>
++<item>yes</item>
++<item>no</item>
++<item>SSLv2</item>
++<item>SSLv3</item>
++<item>TLSv1</item>
+ <item>require</item>
+ <item>optional_no_ca</item>
++<item>nonenotnull</item>
++<item>dbm:</item>
++<item>shm:</item>
++<item>dc:</item>
+ <item>DNS</item>
+ </list>
+
+
+ <contexts>
+- <context name="httpd" attribute="Normal Text" lineEndContext="#stay">
+- <keyword context="StringDirectives" String="StringDirectives" />
+- <keyword context="IntDirectives" String="IntDirectives" />
+- <keyword context="AlterDirectives" String="AlterDirectives" />
++ <context name="apache" attribute="Normal Text" lineEndContext="#stay">
++ <keyword context="String Directives" String="String Directives" />
++ <keyword attribute="Directives" context="Integer Directives" String="Integer Directives" />
++ <keyword attribute="Directives" context="Alternative Directives" String="Alternative Directives" />
+
+- <RegExpr attribute="Container" context="Container Open" String="<[\w_:][\w.:_-]*" beginRegion="Container" />
+- <RegExpr attribute="Container" context="Container Close" String="</[\w_:][\w.:_-]*" endRegion="Container" />
+- <RegExpr attribute="Comment" context="#pop" String="#.*$" />
++ <RegExpr attribute="Container" context="Container Open" String="<\w+" beginRegion="Container" />
++ <RegExpr attribute="Container" context="Container Close" String="</\w+" endRegion="Container" />
++ <DetectChar attribute="Comment" context="Comment" char="#" firstNonSpace="true" />
+ </context>
+
+-<!-- Directiven - getrennt nach String, Integer, Alternatives -->
+- <context name="StringDirectives" attribute="Directives" lineEndContext="#pop">
+- <RegExpr attribute="String" context="#stay" String="((?!#).)*$" />
+- <IncludeRules context="CommentAlert" />
++ <!-- Directives - separated after String, Integer and Alternatives -->
++ <context name="String Directives" attribute="Directives" lineEndContext="#pop">
++ <RegExpr attribute="String" context="#stay" String="[^#]*" />
++ <IncludeRules context="Comment Alert" />
+ </context>
+
+- <context name="IntDirectives" attribute="Directives" lineEndContext="#pop">
+- <Float attribute="Float" context="CommentAlert" />
+- <Int attribute="Int" context="CommentAlert" />
++ <context name="Integer Directives" attribute="Other" lineEndContext="#pop">
++ <Float attribute="Float" context="Integer Directives" />
++ <Int attribute="Int" context="Integer Directives" />
++ <IncludeRules context="Comment Alert" />
+ </context>
+
+- <context name="AlterDirectives" attribute="Directives" lineEndContext="#pop">
+- <keyword attribute="Alternates" context="CommentAlert" String="Alternates" />
+- <IncludeRules context="CommentAlert" />
++ <context name="Alternative Directives" attribute="Other" lineEndContext="#pop">
++ <keyword attribute="Alternates" context="#stay" String="Alternates" />
++ <DetectChar attribute="Alternates" context="#stay" char="-" />
++ <DetectChar attribute="Alternates" context="#stay" char="+" />
++ <IncludeRules context="Comment Alert" />
+ </context>
+
+-<!-- Sonstiges -->
++<!-- Other -->
++ <context name="Comment" attribute="Comment" lineEndContext="#pop">
++ <DetectSpaces />
++ <IncludeRules context="##Alerts" />
++ <DetectIdentifier />
++ </context>
+
+-<!-- Container -->
++<!-- Container -->
+ <context name="Container Open" attribute="Container" lineEndContext="#pop">
+- <DetectChar attribute="Container" context="CommentAlert" char=">" />
+- <RegExpr attribute="Attribute" context="#stay" String="((?!#|>).)*" />
++ <DetectChar attribute="Container" context="Alert" char=">" />
++ <RegExpr attribute="Attribute" context="#stay" String="[^#>]*" />
++ <IncludeRules context="Comment Alert" />
+ </context>
+
+ <context name="Container Close" attribute="Container" lineEndContext="#pop">
+- <DetectChar attribute="Container" context="CommentAlert" char=">" />
++ <DetectChar attribute="Container" context="Alert" char=">" />
+ </context>
+
+ <!-- Alerts -->
+- <context name="CommentAlert" attribute="Alert" lineEndContext="#pop">
+- <RegExpr attribute="Alert" context="#stay" String="#.*$" />
++ <context name="Comment Alert" attribute="Normal Text" lineEndContext="#pop">
++ <DetectChar attribute="Alert" context="Alert" char="#" />
+ </context>
++
++ <context name="Alert" attribute="Alert" lineEndContext="#pop" />
+ </contexts>
+
+ <itemDatas>
+ <itemData name="Normal Text" defStyleNum="dsNormal" />
+ <itemData name="Comment" defStyleNum="dsComment" />
+- <itemData name="Directives" defStyleNum="dsOthers" color="#0000FF" selColor="#FF0000" bold="1" italic="0" />
++ <itemData name="Directives" defStyleNum="dsOthers" color="#0000FF" selColor="#0000FF" bold="true" italic="false" />
+ <itemData name="String" defStyleNum="dsString" />
+ <itemData name="Float" defStyleNum="dsFloat" />
+ <itemData name="Int" defStyleNum="dsFloat" />
+@@ -495,6 +613,7 @@
+ <itemData name="Alert" defStyleNum="dsError" />
+ <itemData name="Container" defStyleNum="dsFunction" />
+ <itemData name="Attribute" defStyleNum="dsOthers" />
++ <itemData name="Other" defStyleNum="dsChar" />
+ </itemDatas>
+ </highlighting>
+
+@@ -503,7 +622,9 @@
+ <comments>
+ <comment name="singleLine" start="#" />
+ </comments>
+- <keywords casesensitive="0" />
++ <keywords casesensitive="0" weakDeliminator="," />
+ </general>
+
+ </language>
++
++
+--- kate/data/cpp.xml (revision 488534)
++++ kate/data/cpp.xml (revision 494869)
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE language SYSTEM "language.dtd">
+-<language name="C++" version="1.33" kateversion="2.4" section="Sources" extensions="*.cxx;*.cpp;*.cc;*.C;*.h;*.H;*.hxx;*.hpp;*.hcc;*.moc" mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr" priority="9">
++<language name="C++" version="1.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">
+ <highlighting>
+ <list name="keywords">
+ <item> asm </item>
+--- kdefx/kimageeffect.cpp (revision 488534)
++++ kdefx/kimageeffect.cpp (revision 494869)
+@@ -2749,88 +2749,58 @@
+ if(w == src.width() && h == src.height())
+ return(src);
+
+- double *x_offset, *y_offset;
+- int j, k, y;
+- register int x;
+- QImage dest(w, h, src.depth());
+-
+- x_offset = (double *)malloc(w*sizeof(double));
+- y_offset = (double *)malloc(h*sizeof(double));
++ int depth = src.depth();
++ QImage dest(w, h, depth, depth <= 8 ? src.numColors() : 0,
++ depth == 1 ? QImage::LittleEndian : QImage::IgnoreEndian);
++ int *x_offset = (int *)malloc(w*sizeof(int));
++ int *y_offset = (int *)malloc(h*sizeof(int));
+ if(!x_offset || !y_offset){
+- qWarning("KImageEffect::sample(): Unable to allocate pixels buffer");
++#ifndef NDEBUG
++ qWarning("KImageEffect::sample(): Unable to allocate pixel buffer");
++#endif
+ free(x_offset);
+ free(y_offset);
+ return(src);
+ }
+
+ // init pixel offsets
+- for(x=0; x < w; ++x)
+- x_offset[x] = x*src.width()/((double)w);
+- for(y=0; y < h; ++y)
+- y_offset[y] = y*src.height()/((double)h);
++ for(int x=0; x < w; ++x)
++ x_offset[x] = (int)(x*src.width()/((double)w));
++ for(int y=0; y < h; ++y)
++ y_offset[y] = (int)(y*src.height()/((double)h));
+
+- // sample each row
+- if(src.depth() > 8){ // DirectClass source image
+- unsigned int *srcData, *destData;
+- unsigned int *pixels;
+- pixels = (unsigned int *)malloc(src.width()*sizeof(unsigned int));
+- if(!pixels){
+- qWarning("KImageEffect::sample(): Unable to allocate pixels buffer");
+- free(pixels);
+- free(x_offset);
+- free(y_offset);
+- return(src);
++ if(depth > 8){ // DirectClass source image
++ for(int y=0; y < h; ++y){
++ unsigned int *destData = (unsigned int *)dest.scanLine(y);
++ unsigned int *srcData = (unsigned int *)src.scanLine(y_offset[y]);
++ for(int x=0; x < w; ++x)
++ destData[x] = srcData[x_offset[x]];
+ }
+- j = (-1);
+- for(y=0; y < h; ++y){
+- destData = (unsigned int *)dest.scanLine(y);
+- if(j != y_offset[y]){
+- // read a scan line
+- j = (int)(y_offset[y]);
+- srcData = (unsigned int *)src.scanLine(j);
+- (void)memcpy(pixels, srcData, src.width()*sizeof(unsigned int));
++ }
++ else if(depth == 1) {
++ int r = src.bitOrder() == QImage::LittleEndian;
++ memcpy(dest.colorTable(), src.colorTable(), src.numColors()*sizeof(QRgb));
++ for(int y=0; y < h; ++y){
++ unsigned char *destData = dest.scanLine(y);
++ unsigned char *srcData = src.scanLine(y_offset[y]);
++ for(int x=0; x < w; ++x){
++ int k = x_offset[x];
++ int l = r ? (k & 7) : (7 - (k&7));
++ if(srcData[k >> 3] & (1 << l))
++ destData[x >> 3] |= 1 << (x & 7);
++ else
++ destData[x >> 3] &= ~(1 << (x & 7));
+ }
+- // sample each column
+- for(x=0; x < w; ++x){
+- k = (int)(x_offset[x]);
+- destData[x] = pixels[k];
+- }
+ }
+- free(pixels);
+ }
+- else{ // PsudeoClass source image
+- unsigned char *srcData, *destData;
+- unsigned char *pixels;
+- pixels = (unsigned char *)malloc(src.width()*sizeof(unsigned char));
+- if(!pixels){
+- qWarning("KImageEffect::sample(): Unable to allocate pixels buffer");
+- free(pixels);
+- free(x_offset);
+- free(y_offset);
+- return(src);
++ else{ // PseudoClass source image
++ memcpy(dest.colorTable(), src.colorTable(), src.numColors()*sizeof(QRgb));
++ for(int y=0; y < h; ++y){
++ unsigned char *destData = dest.scanLine(y);
++ unsigned char *srcData = src.scanLine(y_offset[y]);
++ for(int x=0; x < w; ++x)
++ destData[x] = srcData[x_offset[x]];
+ }
+- // copy colortable
+- dest.setNumColors(src.numColors());
+- (void)memcpy(dest.colorTable(), src.colorTable(),
+- src.numColors()*sizeof(unsigned int));
+-
+- // sample image
+- j = (-1);
+- for(y=0; y < h; ++y){
+- destData = (unsigned char *)dest.scanLine(y);
+- if(j != y_offset[y]){
+- // read a scan line
+- j = (int)(y_offset[y]);
+- srcData = (unsigned char *)src.scanLine(j);
+- (void)memcpy(pixels, srcData, src.width()*sizeof(unsigned char));
+- }
+- // sample each column
+- for(x=0; x < w; ++x){
+- k = (int)(x_offset[x]);
+- destData[x] = pixels[k];
+- }
+- }
+- free(pixels);
+ }
+ free(x_offset);
+ free(y_offset);
+--- doc/common/fdl-notice.html (revision 488534)
++++ doc/common/fdl-notice.html (revision 494869)
+@@ -12,4 +12,4 @@
+ of the license is included <a href="fdl-license.html">here</a>.</p>
+
+ </body>
+-</html>
+\ No newline at end of file
++</html>
+--- doc/common/kde-web.css (revision 488534)
++++ doc/common/kde-web.css (revision 494869)
+@@ -175,4 +175,4 @@
+ }
+
+ .topbanner { background-repeat: no-repeat;
+- }
+\ No newline at end of file
++ }
+--- doc/kdelibs/man-kbuildsycoca.8.docbook (revision 0)
++++ doc/kdelibs/man-kbuildsycoca.8.docbook (revision 494869)
+@@ -0,0 +1,221 @@
++<?xml version="1.0" ?>
++<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN" "dtd/kdex.dtd" [
++ <!ENTITY % English "INCLUDE"><!-- change language only here -->
++]>
++
++<refentry>
++
++<refentryinfo>
++
++<author>
++<firstname>Darian</firstname>
++<surname>Lanx</surname>
++<affiliation>
++<address><email>content at openprojects.net</email></address>
++</affiliation>
++</author>
++
++<date>2001-04-25</date>
++<releaseinfo>0.01.01</releaseinfo>
++
++</refentryinfo>
++
++<refmeta>
++<refentrytitle>KBuildSycoca</refentrytitle>
++<manvolnum>8</manvolnum>
++</refmeta>
++
++<refnamediv>
++<refname>Description</refname>
++<refpurpose>Rebuilds the system configuration cache.</refpurpose>
++</refnamediv>
++
++<refsynopsisdiv>
++<title>Synopsis</title>
++
++<cmdsynopsis>
++<command>kbuildsycoca</command>
++
++<group>
++<arg choice="opt">--nosignal</arg>
++<arg choice="opt">--incremental</arg>
++<arg choice="opt">--help</arg>
++<arg choice="opt">--help-qt</arg>
++<arg choice="opt">--help-kde</arg>
++<arg choice="opt">--help-all</arg>
++<arg choice="opt">--author</arg>
++<arg choice="opt">-v, --version</arg>
++<arg choice="opt">--license</arg>
++</group>
++</cmdsynopsis>
++
++</refsynopsisdiv>
++
++<refsect1>
++<title>Description</title>
++
++<para>
++<command>kbuildsyscoca</command>, as part of the &kde; command line
++tools ensures the proper operation of &kde; by reading in all the
++<literal role="extension">.desktop</literal>, <literal
++role="extension">.directory</literal>, <literal
++role="extension">.kimgio</literal> and <literal
++role="extension">.protocol</literal> files to constructs a binary
++database.
++</para>
++
++<para>
++&kde; itself accesses this databse during operation to provide
++configurational information a program needs to run.
++</para>
++
++<para>
++This tool is part of ksyscoca, which stands for &kde; System
++Configuration Cache
++</para>
++
++</refsect1>
++
++<refsect1>
++<title>Options</title>
++
++<variablelist>
++<varlistentry>
++<term><option>--nosignal</option></term>
++<listitem>
++<para>Don't signal applications </para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><option>--incremental</option></term>
++<listitem>
++<para>Incremental Update</para>
++</listitem>
++</varlistentry>
++
++<!-- this entire section from here to the end of the section could be an -->
++<!-- entity.. or maybe just so irrelevant as to leave it out -->
++
++<varlistentry>
++<term><option>--help</option></term>
++<listitem>
++<para>
++Show help about options
++</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><option>--help-qt</option></term>
++<listitem>
++<para>
++Show Qt specific options
++</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><option>--help-kde</option></term>
++<listitem>
++<para>
++Show KDE specific options
++</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><option>--help-all</option></term>
++<listitem>
++<para>
++Show all options
++</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><option>--author</option></term>
++<listitem>
++<para>
++Show author information
++</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><option>--version</option></term>
++<listitem>
++<para>
++Show version information
++</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><option>--license</option></term>
++<listitem>
++<para>
++Show license information
++</para>
++</listitem>
++</varlistentry>
++</variablelist>
++
++</refsect1>
++
++<refsect1>
++<title>Usage</title>
++<para>
++A standard way to run this program is by simply specifying the following
++command at the prompt
++<userinput><command>kbuildsyscoca</command></userinput>
++</para>
++
++</refsect1>
++
++<refsect1>
++<title>Files</title>
++
++<variablelist>
++<varlistentry>
++<term><filename>/tmp/kde-$USER/ksyscoca</filename></term>
++<listitem>
++<para>...</para>
++</listitem>
++</varlistentry>
++</variablelist>
++
++</refsect1>
++
++<refsect1>
++<title>Environment Variables</title>
++<variablelist>
++<varlistentry>
++<term>$<envar>KDEDIRS</envar></term>
++<listitem>
++<para>Specifies which directories are part of the KDE
++installations</para>
++</listitem>
++</varlistentry>
++</variablelist>
++
++</refsect1>
++
++<refsect1>
++<title>See Also</title>
++
++<para>ksycoca(3), kblah(4), knogga(6)</para>
++
++</refsect1>
++
++<refsect1>
++<title>Bugs</title>
++
++<para>There are no known bugs at the time of writing.</para>
++
++</refsect1>
++
++</refentry>
++
++
++
+--- arts/kde/mcop-dcop/kmcop.desktop (revision 488534)
++++ arts/kde/mcop-dcop/kmcop.desktop (revision 494869)
+@@ -46,7 +46,7 @@
+ Comment[ms]=Jambatan KDE MCOP-DCOP
+ Comment[mt]=Pont bejn MCOP u DCOP
+ Comment[nb]=KDE MCOP-DCOP Bro
+-Comment[nds]=KDE Brüch twischen MCOP un DCOP
++Comment[nds]=KDE-Brüch twischen MCOP un DCOP
+ Comment[nn]=MCOP-DCOP-bru for KDE
+ Comment[nso]=Leporogo la KDE MCOP-DCOP
+ Comment[pa]=KDE MCOP-DCOP ਪà©à©±à¨²
+--- arts/knotify/knotify.desktop (revision 488534)
++++ arts/knotify/knotify.desktop (revision 494869)
+@@ -41,7 +41,7 @@
+ Comment[eo]=KDE-Sistematentigo-demono
+ Comment[es]=Demonio de notificación de KDE
+ Comment[et]=KDE süsteemsete märguannete deemon
+-Comment[eu]=KDEren ohar daemona
++Comment[eu]=KDEko jakinarazpenaren daemona
+ Comment[fa]=برنامه اعلام KDE
+ Comment[fi]=KDE:n huomautuspalvelin
+ Comment[fo]=Ãminningarandi KDE's
+--- mimetypes/uri/pnm.desktop (revision 488534)
++++ mimetypes/uri/pnm.desktop (revision 494869)
+@@ -17,6 +17,7 @@
+ Comment[it]=URI pnm:
+ Comment[lt]=pnm: URI
+ Comment[nb]=pnm: nettadresse
++Comment[nds]=pnm-URIs
+ Comment[nl]=pnm: URI-adressen
+ Comment[nn]=pnm:-URI-ar
+ Comment[pl]=pnm: URI
+--- mimetypes/uri/mms.desktop (revision 488534)
++++ mimetypes/uri/mms.desktop (revision 494869)
+@@ -17,6 +17,7 @@
+ Comment[it]=URI mms:
+ Comment[lt]=mms: URI
+ Comment[nb]=mms: nettadresse
++Comment[nds]=mms-URIs
+ Comment[nl]=mms: URI-adressen
+ Comment[nn]=mms:-URI-ar
+ Comment[pa]=mms: URI
+--- mimetypes/uri/rtspt.desktop (revision 488534)
++++ mimetypes/uri/rtspt.desktop (revision 494869)
+@@ -17,6 +17,7 @@
+ Comment[it]=URI rtspt:
+ Comment[lt]=rtspt: URI
+ Comment[nb]=rtspt: nettadresse
++Comment[nds]=rtspt-URIs
+ Comment[nl]=rtspt: URI-adressen
+ Comment[nn]=rtspt:-URI-ar
+ Comment[pa]=rtspt: URI
+--- mimetypes/uri/rtspu.desktop (revision 488534)
++++ mimetypes/uri/rtspu.desktop (revision 494869)
+@@ -17,6 +17,7 @@
+ Comment[it]=URI rtspu:
+ Comment[lt]=rtspu: URI
+ Comment[nb]=rtspu: nettadresse
++Comment[nds]=rtspu-URIs
+ Comment[nl]=rtspu: URI-adressen
+ Comment[nn]=rtspu:-URI-ar
+ Comment[pa]=rtspu: URI
+--- mimetypes/uri/mmst.desktop (revision 488534)
++++ mimetypes/uri/mmst.desktop (revision 494869)
+@@ -17,6 +17,7 @@
+ Comment[it]=URI mmst:
+ Comment[lt]=mmst: URI
+ Comment[nb]=mmst: nettadresse
++Comment[nds]=mmst-URIs
+ Comment[nl]=mmst: URI-adressen
+ Comment[nn]=mmst:-URI-ar
+ Comment[pa]=mmst: URI
+--- mimetypes/uri/mmsu.desktop (revision 488534)
++++ mimetypes/uri/mmsu.desktop (revision 494869)
+@@ -17,6 +17,7 @@
+ Comment[it]=URI mmsu:
+ Comment[lt]=mmsu: URI
+ Comment[nb]=mmsu: nettadresse
++Comment[nds]=mmsu-URIs
+ Comment[nl]=mmsu: URI-adressen
+ Comment[nn]=mmsu:-URI-ar
+ Comment[pa]=mmsu: URI
+--- mimetypes/all.desktop (revision 488534)
++++ mimetypes/all.desktop (revision 494869)
+@@ -43,7 +43,7 @@
+ Comment[mn]=Бүх файл болон лавлахууд
+ Comment[ms]=Semua Fail dan Folder
+ Comment[nb]=Alle filer og kataloger
+-Comment[nds]=All Dateien un Orner
++Comment[nds]=All Dateien un Ornern
+ Comment[nl]=Alle bestanden en mappen
+ Comment[nn]=Alle filer og katalogar
+ Comment[pa]=ਸਠਫਾਇਲਾਂ ਤੇ ਫੋਲਡਰ
+--- mimetypes/audio/mpegurl.desktop (revision 488534)
++++ mimetypes/audio/mpegurl.desktop (revision 494869)
+@@ -44,7 +44,7 @@
+ Comment[ms]=Audio Aliran MPEG Peringkat 3
+ Comment[mt]=Awdjo Streaming MPEG 3
+ Comment[nb]=MPEG lag 3-lydstrøm
+-Comment[nds]=Streaming-MPEG-Audiodatei (Layer 3)
++Comment[nds]=MPEG-Audiostroomdatei (Laag 3)
+ Comment[nl]=Streaming MPEG Layer3-audio
+ Comment[nn]=MPEG lag 3-lydstraum
+ Comment[nso]=Latelanya Kwagalo ya Peo 3 ya MPEG
+--- mimetypes/audio/x-mpegurl.desktop (revision 488534)
++++ mimetypes/audio/x-mpegurl.desktop (revision 494869)
+@@ -42,7 +42,7 @@
+ Comment[ms]=Audio Aliran MPEG Peringkat 3
+ Comment[mt]=Awdjo Streaming MPEG 3
+ Comment[nb]=MPEG lag 3-lydstrøm
+-Comment[nds]=Streaming-MPEG-Audiodatei (Layer 3)
++Comment[nds]=MPEG-Audiostroomdatei (Laag 3)
+ Comment[nl]=Streaming MPEG Layer3-audio
+ Comment[nn]=MPEG lag 3-lydstraum
+ Comment[nso]=Latelanya Kwagalo ya Peo 3 ya MPEG
+--- mimetypes/audio/basic.desktop (revision 488534)
++++ mimetypes/audio/basic.desktop (revision 494869)
+@@ -41,7 +41,7 @@
+ Comment[ms]=Audio ULAW (Sun)
+ Comment[mt]=Awdjo ULAW (Sun)
+ Comment[nb]=ULAW (Sun-lyd)
+-Comment[nds]=ULAW (Sun)-Audiodatei
++Comment[nds]=ULAW-Audiodatei (Sun)
+ Comment[nl]=ULAW (Sun) audiobestand
+ Comment[nn]=ULAW-lyd (Sun)
+ Comment[nso]=Kwagalo ya ya ULAW (Letsatsi)
+--- mimetypes/audio/x-mod.desktop (revision 488534)
++++ mimetypes/audio/x-mod.desktop (revision 494869)
+@@ -43,7 +43,7 @@
+ Comment[ms]=Audio Penjejak Bunyi Amiga
+ Comment[mt]=Awdjo Amiga Soundtracker
+ Comment[nb]=Amiga lydtracker-lyd
+-Comment[nds]=Amiga-Soundtracker-Audiodatei
++Comment[nds]="Amiga Soundtracker"-Audiodatei
+ Comment[nl]=Amiga Soundtracker-audio
+ Comment[nn]=Amiga Soundtracker-lyd
+ Comment[nso]=Kwagalo ya Sentshamodumo sa Amiga
+--- mimetypes/audio/x-midi.desktop (revision 488534)
++++ mimetypes/audio/x-midi.desktop (revision 494869)
+@@ -21,7 +21,7 @@
+ Comment[eo]=MIDI-sondosiero
+ Comment[es]=Sonido MIDI
+ Comment[et]=MIDI audiofail
+-Comment[eu]=MIDI audioa
++Comment[eu]=MIDI audioa
+ Comment[fa]=صدای MIDI
+ Comment[fi]=MIDI-musiikki
+ Comment[fr]=Son MIDI
+--- mimetypes/audio/mp4.desktop (revision 488534)
++++ mimetypes/audio/mp4.desktop (revision 494869)
+@@ -41,7 +41,7 @@
+ Comment[mn]=MPEG-4 Ðудио
+ Comment[ms]=Audio MPEG-4
+ Comment[nb]=MPEG-4 lyd
+-Comment[nds]=MPEG-4 Audiodatei
++Comment[nds]=MPEG4-Audiodatei
+ Comment[nl]=MPEG-4 audio
+ Comment[nn]=MPEG-4-lyd
+ Comment[pa]=MPEG-4 ਆਡੀਓ
+--- mimetypes/audio/x-mp2.desktop (revision 488534)
++++ mimetypes/audio/x-mp2.desktop (revision 494869)
+@@ -20,7 +20,7 @@
+ Comment[eo]=MPEG-2-sondosiero
+ Comment[es]=Audio MPEG capa 2
+ Comment[et]=MPEG layer 2 audiofail
+-Comment[eu]=MPEG Layer 3 audioa
++Comment[eu]=MPEG Layer 2 audioa
+ Comment[fi]=MPEG 2-tason musiikki
+ Comment[fr]=Son MPEG niveau 2
+ Comment[gl]=Son MPEG Capa 2
+@@ -36,7 +36,7 @@
+ Comment[mk]=MPEG Layer 2 аудио
+ Comment[ms]=Audio MPEG Lapisan 2
+ Comment[nb]=MPEG lag 2-lyd
+-Comment[nds]=MPEG-Audiodatei (Layer 2)
++Comment[nds]=MPEG-Audiodatei (Laag 2)
+ Comment[nl]=MPEG Layer2-audio
+ Comment[nn]=MPEG lag 2-lyd
+ Comment[pa]=MPEG ਲੇਅਰ 2 ਧà©à¨¨à©€
+--- mimetypes/audio/x-mp3.desktop (revision 488534)
++++ mimetypes/audio/x-mp3.desktop (revision 494869)
+@@ -45,7 +45,7 @@
+ Comment[ms]=Audio MPEG Lapisan 3
+ Comment[mt]=Awdio MPEG 3
+ Comment[nb]=MPEG layer 3-lyd
+-Comment[nds]=MPEG-Audiodatei (Layer 3)
++Comment[nds]=MPEG-Audiodatei (Laag 3)
+ Comment[nl]=MPEG Layer3-audio
+ Comment[nn]=MPEG lag 3-lyd
+ Comment[nso]=Kwagalo ya Peo 3 ya MPEG
+--- mimetypes/audio/x-ms-wma.desktop (revision 488534)
++++ mimetypes/audio/x-ms-wma.desktop (revision 494869)
+@@ -33,7 +33,7 @@
+ Comment[mk]=Windows Media аудио
+ Comment[ms]=Audio Windows Media
+ Comment[nb]=Windows Media-lyd
+-Comment[nds]=Windows-Media-Audiodatei
++Comment[nds]="Windows Media"-Audiodatei
+ Comment[nl]=Windows Media-audio
+ Comment[nn]=Windows Media-lyd
+ Comment[pl]=Dźwięk w formacie Windows Media Audio
+--- mimetypes/image/x-portable-pixmap.desktop (revision 488534)
++++ mimetypes/image/x-portable-pixmap.desktop (revision 494869)
+@@ -44,7 +44,7 @@
+ Comment[ms]=Imej Mudah Alih Pixmap
+ Comment[mt]=Stampa "portable pixmap"
+ Comment[nb]=Portable Pixmap File-format
+-Comment[nds]=Portable Pixmap-Bild
++Comment[nds]=Porteerbor Pixmap-Bild
+ Comment[nl]=Portable Pixmap-afbeelding
+ Comment[nn]=Portable Pixmap-bilete
+ Comment[nso]=Ponagalo yeo e Kukegago ya Pixmap
+--- mimetypes/image/x-dds.desktop (revision 488534)
++++ mimetypes/image/x-dds.desktop (revision 494869)
+@@ -14,6 +14,7 @@
+ Comment[da]=Overflade til direkte tegning
+ Comment[de]=DirectDraw-Oberfläche
+ Comment[eo]=Rekta desegnosurfaco
++Comment[eu]=DirectDraw gainazala
+ Comment[fi]=DirectDraw-taso
+ Comment[fr]=Surface DirectDraw
+ Comment[gl]=SuperfÃcie DirectDraw
+@@ -26,7 +27,7 @@
+ Comment[lv]=DirectDraw virsma
+ Comment[ms]=Permukaan DirectDraw
+ Comment[nb]=DirectDraw-overflate
+-Comment[nds]=Böversiet för DirectDraw
++Comment[nds]=DirectDraw-Böversiet
+ Comment[nl]=Direct beeldgeheugen
+ Comment[nn]=DirectDraw-overflate
+ Comment[pl]=Powierzchnia DirectDraw
+--- mimetypes/image/x-xcf-gimp.desktop (revision 488534)
++++ mimetypes/image/x-xcf-gimp.desktop (revision 494869)
+@@ -16,7 +16,7 @@
+ Comment[eo]=GIMP-grafiko
+ Comment[es]=Formato de imagen nativo de GIMP
+ Comment[et]=GIMP-i pildifail
+-Comment[eu]=GIMP jatorridun irudi formatoa
++Comment[eu]=GIMP jatorridun irudi-formatua
+ Comment[fa]=قالب تصویر طبیعی گیمپ
+ Comment[fi]=GIMP:n tiedostomuoto
+ Comment[fr]=Format graphique natif de GIMP
+--- mimetypes/image/x-hdr.desktop (revision 488534)
++++ mimetypes/image/x-hdr.desktop (revision 494869)
+@@ -13,6 +13,7 @@
+ Comment[el]=Εικόνα υψηλής δυναμικής πεÏιοχής
+ Comment[es]=Imagen de gran rango dinámico
+ Comment[et]=High Dynamic Range pildifail
++Comment[eu]=Dinamika Altuko Barrutiko irudia
+ Comment[fi]=Korkeatasoinen muuttuvien arvoalueiden kuva
+ Comment[fr]=Image à définition dynamique haute
+ Comment[fy]=High Dynamic Range-ôfbylding
+@@ -25,7 +26,7 @@
+ Comment[lb]=High-Dynamic-Range-Bild
+ Comment[lt]=High Dynamic Range paveiksliukas
+ Comment[nb]=Bilde med høyt dynamisk område
+-Comment[nds]=High Dynamic Range-Bild
++Comment[nds]="High Dynamic Range"-Bild
+ Comment[nl]=High Dynamic Range-afbeelding
+ Comment[nn]=Bilete med stort dynamikkområde
+ Comment[pl]=Obrazek HDR(High Dynamic Range)
+--- mimetypes/image/x-vnd.adobe.photoshop.desktop (revision 488534)
++++ mimetypes/image/x-vnd.adobe.photoshop.desktop (revision 494869)
+@@ -45,7 +45,7 @@
+ Comment[mn]=Adobe Photoshop зураг
+ Comment[ms]=Imej Adobe Photoshop
+ Comment[nb]=Adobe Photoshop bilde
+-Comment[nds]=Adobe-Photoshop-Bild
++Comment[nds]="Adobe Photoshop"-Bild
+ Comment[nl]=Adobe Photoshop-afbeelding
+ Comment[nn]=Adobe Photoshop-bilete
+ Comment[pa]=Adobe Photoshop ਚਿੱਤਰ
+--- mimetypes/image/jp2.desktop (revision 488534)
++++ mimetypes/image/jp2.desktop (revision 494869)
+@@ -45,7 +45,7 @@
+ Comment[mn]=JPEG 2000 зураг
+ Comment[ms]=Imej JPEG 2000
+ Comment[nb]=JPEG-2000 bilde
+-Comment[nds]=JPEG-2000-Bild
++Comment[nds]=JPEG2000-Bild
+ Comment[nl]=JPEG 2000-afbeelding
+ Comment[nn]=JPEG 2000-bilete
+ Comment[pa]=JPEG 2000 ਚਿੱਤਰ
+--- mimetypes/image/x-xbm.desktop (revision 488534)
++++ mimetypes/image/x-xbm.desktop (revision 494869)
+@@ -46,12 +46,12 @@
+ Comment[ms]=Imej X BitMap
+ Comment[mt]=Stampa X BitMap
+ Comment[nb]=X BitMap-bilde
+-Comment[nds]=X BitMap-Bild
++Comment[nds]=X-Bitmap-Bild
+ Comment[nl]=X Bitmap-afbeelding
+ Comment[nn]=X BitMap-bilete
+ Comment[nso]=Ponagalo ya BitMap ya X
+ Comment[pa]=X BitMap ਚਿੱਤਰ
+-Comment[pl]=Obraz X Bitmap
++Comment[pl]=Obrazek X Bitmap
+ Comment[pt]=Imagem X BitMap
+ Comment[pt_BR]=Imagem Bitmap X
+ Comment[ro]=Imagine XBM
+--- mimetypes/image/x-eps.desktop (revision 488534)
++++ mimetypes/image/x-eps.desktop (revision 494869)
+@@ -22,7 +22,7 @@
+ Comment[eo]=EPS-bildo
+ Comment[es]=Imagen PostScript encapsulado
+ Comment[et]=Kapseldatud PostScript pildifail
+-Comment[eu]=Encaptsulatutako PostScript irudia
++Comment[eu]=Kapsulatutako PostScript irudia
+ Comment[fa]=تصویر PostScript کپسوله شده
+ Comment[fi]=Encapsulated PostScript -kuva
+ Comment[fr]=Image PostScript encapsulé
+--- mimetypes/image/x-targa.desktop (revision 488534)
++++ mimetypes/image/x-targa.desktop (revision 494869)
+@@ -46,7 +46,7 @@
+ Comment[ms]=Imej Truevision Targa
+ Comment[mt]=Stampa Truevision Targa
+ Comment[nb]=Truevision Targa-bilde
+-Comment[nds]=Truevision-Targa-Bild
++Comment[nds]="Truevision Targa"-Bild
+ Comment[nl]=Truevision Targa-afbeelding
+ Comment[nn]=Truevision Targa-bilete
+ Comment[nso]=Ponagalo ya Pono ya Nnete ya Targa
+--- mimetypes/image/x-exr.desktop (revision 488534)
++++ mimetypes/image/x-exr.desktop (revision 494869)
+@@ -40,7 +40,7 @@
+ Comment[mk]=ILM EXR Ñлика
+ Comment[ms]=Imej ILM EXR
+ Comment[nb]=ILM EXR-bilete
+-Comment[nds]=ILM EXR-Bild
++Comment[nds]=ILM-EXR-Bild
+ Comment[nl]=ILM EXR-afbeelding
+ Comment[nn]=ILM EXR-bilete
+ Comment[pa]=ILM EXR ਚਿੱਤਰ
+--- mimetypes/image/gif.desktop (revision 488534)
++++ mimetypes/image/gif.desktop (revision 494869)
+@@ -51,7 +51,7 @@
+ Comment[nn]=GIF-bilete
+ Comment[nso]=Ponagalo ya GIF
+ Comment[pa]=GIF ਚਿੱਤਰ
+-Comment[pl]=Obraz GIF
++Comment[pl]=Obrazek GIF
+ Comment[pt]=Imagem GIF
+ Comment[pt_BR]=Imagem GIF
+ Comment[ro]=Imagine GIF
+--- mimetypes/image/x-msod.desktop (revision 488534)
++++ mimetypes/image/x-msod.desktop (revision 494869)
+@@ -43,7 +43,7 @@
+ Comment[ms]=Lukisan Microsoft Office
+ Comment[mt]=Tpinġija Microsoft Office
+ Comment[nb]=MS Office Tegning
+-Comment[nds]=Teken vun Microsoft Office
++Comment[nds]="Microsoft Office"-Teken
+ Comment[nl]=MS Office-tekening
+ Comment[nn]=Microsoft Office-teikning
+ Comment[nso]=Tako ya Ofisi ya Microsoft
+--- mimetypes/image/x-xpm.desktop (revision 488534)
++++ mimetypes/image/x-xpm.desktop (revision 494869)
+@@ -46,7 +46,7 @@
+ Comment[ms]=Imej X PixMap
+ Comment[mt]=Stampa X PixMap
+ Comment[nb]=X PixMap-bilde
+-Comment[nds]=X PixMap-Datei
++Comment[nds]=X-Pixmap-Datei
+ Comment[nl]=X Pixmap-afbeelding
+ Comment[nn]=X PixMap-bilete
+ Comment[nso]=Ponagalo ya PixMap ya X
+--- mimetypes/image/x-xcursor.desktop (revision 488534)
++++ mimetypes/image/x-xcursor.desktop (revision 494869)
+@@ -16,7 +16,7 @@
+ Comment[cy]=Cyrchydd Llygoden X11
+ Comment[da]=X11 Musemarkør
+ Comment[de]=X11-Mauszeiger
+-Comment[el]=ΚÎÏσοÏας Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï X11
++Comment[el]=ΔÏομÎας Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï X11
+ Comment[eo]=X11-muskursoro
+ Comment[es]=Cursor de ratón X11
+ Comment[et]=X11 hiirekursor
+@@ -42,7 +42,7 @@
+ Comment[mn]=X11 Хулганы түүчÑÑ
+ Comment[ms]=Kursor Tetikus X11
+ Comment[nb]=X11 musepeker
+-Comment[nds]=X11 Muuswieser
++Comment[nds]=X11-Muuswieser
+ Comment[nl]=X11-muisaanwijzer
+ Comment[nn]=X11-musepeikar
+ Comment[pa]=X11 ਮਾਊਸ ਕਰਸਰ
+--- mimetypes/image/x-djvu-2.desktop (revision 0)
++++ mimetypes/image/x-djvu-2.desktop (revision 494869)
+@@ -0,0 +1,51 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=MimeType
++MimeType=image/x.djvu
++Icon=djvu
++Patterns=*.djvu;*.DJVU;*.djv;*.DJV;
++Comment=DjVu Document
++Comment[af]=DjVu Dokument
++Comment[bg]=Документ DjVu
++Comment[ca]=Document DjVu
++Comment[cs]=DjVu dokument
++Comment[da]=DjVU-dokument
++Comment[de]=DjVu-Dokument
++Comment[el]=ΈγγÏαφο DjVu
++Comment[es]=Documento DjVu
++Comment[et]=DjVu dokument
++Comment[eu]=DjVu dokumentua
++Comment[fi]=DjVu-asiakirja
++Comment[fr]=Document DjVu
++Comment[fy]=DjVu-dokumint
++Comment[ga]=Cáipéis DjVu
++Comment[gl]=Documento DjVu
++Comment[he]=מסמך DjVu
++Comment[hu]=DjVu-dokumentum
++Comment[is]=DjVu skjal
++Comment[it]=Documento DjVu
++Comment[ja]=DjVu ドã‚ュメント
++Comment[km]=ឯកសារ DjVu
++Comment[ko]=DjVu 문서
++Comment[lb]=DjVu-Dokument
++Comment[lt]=DjVu dokumentas
++Comment[nb]=DjVu-dokument
++Comment[nds]=DjVu-Dokment
++Comment[nl]=DjVu-document
++Comment[nn]=DjVu-dokument
++Comment[pa]=DjVu ਦਸਤਾਵੇਜ਼
++Comment[pl]=Dokument DjVu
++Comment[pt]=Documento do DjVu
++Comment[pt_BR]=Documento DjVu
++Comment[ru]=Документ DjVu
++Comment[se]=DjVu-dokumeanta
++Comment[sl]=Dokument DjVu
++Comment[sr]=DjVu документ
++Comment[sr at Latn]=DjVu dokument
++Comment[sv]=Djvu-dokument
++Comment[tg]=Ҳуҷҷати DjVu
++Comment[tr]=DjVu Belgesi
++Comment[tt]=DjVu İstälege
++Comment[uk]=Документ DjVu
++Comment[uz]=DjVu ҳужжати
++Comment[zh_CN]=DjVu 文档
+--- mimetypes/image/x-djvu.desktop (revision 488534)
++++ mimetypes/image/x-djvu.desktop (revision 494869)
+@@ -14,6 +14,7 @@
+ Comment[el]=ΈγγÏαφο DjVu
+ Comment[es]=Documento DjVu
+ Comment[et]=DjVu dokument
++Comment[eu]=DjVu dokumentua
+ Comment[fi]=DjVu-asiakirja
+ Comment[fr]=Document DjVu
+ Comment[fy]=DjVu-dokumint
+--- mimetypes/image/x-portable-greymap.desktop (revision 488534)
++++ mimetypes/image/x-portable-greymap.desktop (revision 494869)
+@@ -43,7 +43,7 @@
+ Comment[ms]=Imej Mudah Alih Graymap
+ Comment[mt]=Stampa "portable greymap"
+ Comment[nb]=Portable Graymap File-format
+-Comment[nds]=Portable Graymap-Bild
++Comment[nds]=Porteerbor Graymap-Bild
+ Comment[nl]=Portable Graymap-afbeelding
+ Comment[nn]=Portable Graymap-bilete
+ Comment[nso]=Ponagalo yeo e Kukegago ya Graymap
+--- mimetypes/image/x-portable-bitmap.desktop (revision 488534)
++++ mimetypes/image/x-portable-bitmap.desktop (revision 494869)
+@@ -45,7 +45,7 @@
+ Comment[ms]=Imej Mudah Alih Bitmap
+ Comment[mt]=Stampa "portable bitmap"
+ Comment[nb]=Portable Bitmap File-format
+-Comment[nds]=Portable Bitmap-Bild
++Comment[nds]=Porteerbor Bitmap-Bild
+ Comment[nl]=Portable Bitmap-afbeelding
+ Comment[nn]=Portable Bitmap-bilete
+ Comment[nso]=Ponagalo yeo e Kukegago ya Bitmap
+--- mimetypes/image/Makefile.am (revision 488534)
++++ mimetypes/image/Makefile.am (revision 494869)
+@@ -7,7 +7,8 @@
+ x-portable-pixmap.desktop x-pcx.desktop x-targa.desktop jp2.desktop \
+ x-vnd.trolltech.qpicture.desktop x-vnd.adobe.photoshop.desktop \
+ x-xcursor.desktop pjpeg.desktop x-exr.desktop \
+- x-rgb.desktop x-dds.desktop x-djvu.desktop x-hdr.desktop fits.desktop
++ x-rgb.desktop x-dds.desktop x-djvu.desktop x-djvu-2.desktop x-hdr.desktop \
++ fits.desktop
+
+ mimetypeimagedatadir = $(kde_mimedir)/image
+
+--- mimetypes/image/fits.desktop (revision 488534)
++++ mimetypes/image/fits.desktop (revision 494869)
+@@ -14,6 +14,7 @@
+ Comment[el]=Εικόνα FITS
+ Comment[es]=Imagen FITS
+ Comment[et]=FITS pildifail
++Comment[eu]=FITS irudia
+ Comment[fi]=FITS-kuva
+ Comment[fr]=Image FITS
+ Comment[fy]=FITS-ôfbylding
+--- mimetypes/application/chm.desktop (revision 488534)
++++ mimetypes/application/chm.desktop (revision 494869)
+@@ -10,6 +10,7 @@
+ Comment[el]=ΈγγÏαφο Βοήθειας HTML
+ Comment[es]=Documento de ayuda HTML
+ Comment[et]=HTML abi dokument
++Comment[eu]=HTML laguntzako dokumentua
+ Comment[fi]=HTML help-asiakirja
+ Comment[fr]=Document d'aide HTML
+ Comment[fy]=HTML Helpdokumint
+--- mimetypes/application/x-pkcs12.desktop (revision 488534)
++++ mimetypes/application/x-pkcs12.desktop (revision 494869)
+@@ -41,7 +41,7 @@
+ Comment[ms]=Set Sijil PKCS#12
+ Comment[mt]=Mazz Ä‹ertifikati PKCS#12
+ Comment[nb]=PKCS#12-sertifikatpakke
+-Comment[nds]=PKCS#12 Zertifikaatpaket
++Comment[nds]=PKCS#12-Zertifikaatpaket
+ Comment[nl]=PKCS#12 Certificatenbundel
+ Comment[nn]=PKCS#12-sertifikatpakke
+ Comment[nso]=Ntshubana ya Kgonthisiso ya PKCS#12
+--- mimetypes/application/x-tex-pk.desktop (revision 488534)
++++ mimetypes/application/x-tex-pk.desktop (revision 494869)
+@@ -75,4 +75,4 @@
+ Icon=pk
+ Type=MimeType
+ MimeType=application/x-tex-pk
+-Patterns=*pk;*PK;
++Patterns=*.pk;*.PK;
+--- mimetypes/application/x-lyx.desktop (revision 488534)
++++ mimetypes/application/x-lyx.desktop (revision 494869)
+@@ -18,7 +18,7 @@
+ Comment[eo]=LyX-dokumento
+ Comment[es]=Documento de LyX
+ Comment[et]=LyXi dokument
+-Comment[eu]=LyX dokumentua
++Comment[eu]=LyX dokumentua
+ Comment[fa]=سند LyX
+ Comment[fi]=LyX-asiakirja
+ Comment[fr]=Document LyX
+--- mimetypes/application/x-font-speedo.desktop (revision 488534)
++++ mimetypes/application/x-font-speedo.desktop (revision 494869)
+@@ -22,7 +22,7 @@
+ Comment[eo]=Speedo-Tiparo
+ Comment[es]=Fuente Speedo
+ Comment[et]=Speedo font
+-Comment[eu]=Speedo letra-tipoa
++Comment[eu]=Speedo-ren letra-tipoa
+ Comment[fa]=قلم Speedo
+ Comment[fi]=Speedo-kirjasin
+ Comment[fr]=Police de caractères Speedo
+--- mimetypes/application/x-vnd.kde.kexi.desktop (revision 488534)
++++ mimetypes/application/x-vnd.kde.kexi.desktop (revision 494869)
+@@ -23,7 +23,7 @@
+ Comment[eo]=Projektdosiero de Kexi
+ Comment[es]=Archivo de proyecto Kexi
+ Comment[et]=Kexi projektifail
+-Comment[eu]=Kexi proiektu fitxategia
++Comment[eu]=Kexi proiektuko fitxategia
+ Comment[fa]=پرونده‌ی پروژه‌ای Kexi
+ Comment[fi]=Kexi Project -tiedosto
+ Comment[fr]=Fichier de projet Kexi
+--- mimetypes/application/x-magicpoint.desktop (revision 488534)
++++ mimetypes/application/x-magicpoint.desktop (revision 494869)
+@@ -44,7 +44,7 @@
+ Comment[mn]=MagicPoint ҮзүүлÑнгүүд
+ Comment[ms]=Persembahan Magicpoint
+ Comment[nb]=MagicPoint presentasjon
+-Comment[nds]=MagicPoint Presentatschoon
++Comment[nds]=MagicPoint-Presentatschoon
+ Comment[nl]=MagicPoint-presentatie
+ Comment[nn]=MagicPoint-presentasjon
+ Comment[pa]=MagicPoint ਪੇਸ਼ਕਾਰੀ
+--- mimetypes/application/vnd.mozilla.xul+xml.desktop (revision 488534)
++++ mimetypes/application/vnd.mozilla.xul+xml.desktop (revision 494869)
+@@ -38,7 +38,7 @@
+ Comment[mk]=Mozilla XUL датотека
+ Comment[ms]=Fail Mozilla XUL
+ Comment[nb]=Mozilla XUL-fil
+-Comment[nds]=Mozilla XUL-Datei
++Comment[nds]=XUL-Datei vun Mozilla
+ Comment[nl]=Mozilla XUL-bestand
+ Comment[nn]=Mozilla XUL-fil
+ Comment[pa]=ਮੌਜੀਲਾ XUL ਫਾਇਲ
+--- mimetypes/application/x-bittorrent.desktop (revision 488534)
++++ mimetypes/application/x-bittorrent.desktop (revision 494869)
+@@ -15,7 +15,7 @@
+ Comment[eo]=BitTorrent-ÅarÄo
+ Comment[es]=Descarga BitTorrent
+ Comment[et]=BitTorrent allalaadimine
+-Comment[eu]=BitTorrent behera kargatzea
++Comment[eu]=BitTorrent deskarga
+ Comment[fa]=بارگیری BitTorrent
+ Comment[fi]=BitTorrent-lataus
+ Comment[fr]=Téléchargement BitTorrent
+@@ -37,7 +37,7 @@
+ Comment[mn]=BitTorrent татац
+ Comment[ms]=Muat Turun BitTorrent
+ Comment[nb]=BitTorrent nedlasting
+-Comment[nds]=Daalladen mit BitTorrent
++Comment[nds]=BitTorrent-Daalladen
+ Comment[nl]=BitTorrent-download
+ Comment[nn]=BitTorrent-nedlasting
+ Comment[pa]=BitTorrent ਡਾਊਨਲੋਡ
+--- mimetypes/application/x-sharedlib.desktop (revision 488534)
++++ mimetypes/application/x-sharedlib.desktop (revision 494869)
+@@ -41,7 +41,7 @@
+ Comment[ms]=Perkongsian Pustaka
+ Comment[mt]=Librerija "shared"
+ Comment[nb]=Delt bibliotek
+-Comment[nds]=Deelte Bibliotheek
++Comment[nds]=Deelt Bibliotheek
+ Comment[nl]=Gedeelde bibliotheek
+ Comment[nn]=Delt bibliotek
+ Comment[nso]=Bokgobapuku bjo bo Abaganwego
+--- mimetypes/application/vnd.sun.xml.base.desktop (revision 488534)
++++ mimetypes/application/vnd.sun.xml.base.desktop (revision 494869)
+@@ -11,6 +11,7 @@
+ Comment[el]=Βάση δεδομÎνων του OpenOffice.org
+ Comment[es]=Base de datos de OpenOffice.org
+ Comment[et]=OpenOffice.org-i andmebaas
++Comment[eu]=OpenOffice.org datu-basea
+ Comment[fi]=OpenOffice.org-tietokanta
+ Comment[fr]=Base de données OpenOffice.org
+ Comment[fy]=OpenOffice.org-databank
+--- mimetypes/application/x-linguist.desktop (revision 488534)
++++ mimetypes/application/x-linguist.desktop (revision 494869)
+@@ -20,7 +20,7 @@
+ Comment[eo]=Qta tradukfontdosiero
+ Comment[es]=Archivo fuente de traducción de Qt
+ Comment[et]=Qt Translationi lähtetekst
+-Comment[eu]=Qt itzulpenerako iturburu fitxategia
++Comment[eu]=Qt itzulpenerako iturburuko fitxategia
+ Comment[fa]=پرونده‌ی کد ترجمه‌ها‌ی Qt
+ Comment[fi]=Qr-käännöstiedosto
+ Comment[fr]=Fichier source de traduction QT
+--- mimetypes/application/x-tbz.desktop (revision 488534)
++++ mimetypes/application/x-tbz.desktop (revision 494869)
+@@ -11,6 +11,7 @@
+ Comment[el]=ΣυμπιεσμÎνη αÏχειοθήκη tar με bzip-2
+ Comment[es]=Archivo Tar comprimido con Bzip2
+ Comment[et]=Bzip2-tihendusega tar-arhiiv
++Comment[eu]=Tar+BZIP artxiboa
+ Comment[fi]=Bzip2-pakattu Tar-paketti
+ Comment[fr]=Archive Tar compactée par Bzip2
+ Comment[fy]=Mei Bzip2 ynpakt Tar-argyf
+@@ -24,7 +25,7 @@
+ Comment[lb]=Mat Bzip2 kompriméierten Tar-Archiv
+ Comment[lt]=Tar archyvas, suglaudintas su bzip2
+ Comment[nb]=Bzip2-et tar-arkiv
+-Comment[nds]=Tar-Archiv (mit Bzip2 komprimeert)
++Comment[nds]=Bzip2-komprimeert Tar-Archiv
+ Comment[nl]=Met Bzip2 ingepakt Tar-archief
+ Comment[nn]=Bzip2a tar-arkiv
+ Comment[pa]=Bzip2-ed ਟਾਰ ਆਰਚੀਵ
+--- mimetypes/application/x-cue.desktop (revision 488534)
++++ mimetypes/application/x-cue.desktop (revision 494869)
+@@ -15,7 +15,7 @@
+ Comment[el]=ΦÏλλο Cue του CDRWIN
+ Comment[es]=Hoja cue de CDRWIN
+ Comment[et]=CDRWIN cue-sheet
+-Comment[eu]=CDRWIN cue orria
++Comment[eu]=CDRWIN cue-orria
+ Comment[fi]=CDRWIN kansilehti
+ Comment[fr]=feuille CDRWIN
+ Comment[gl]=Folla Cue de CDRWIN
+@@ -27,7 +27,7 @@
+ Comment[mk]=CDRWIN табела Ñо ознаки
+ Comment[ms]=Lembaran CDRWIN Cue
+ Comment[nb]=CDRWIN cue-ark
+-Comment[nds]=CDRWIN Cue-Datei
++Comment[nds]=Cue-Blatt vun CDRWIN
+ Comment[nl]=CDRWIN-cue-sheet
+ Comment[nn]=CDRWIN-cue-ark
+ Comment[pa]=CDRWIN Cue-ਸ਼ੀਟ
+--- mimetypes/application/x-tzo.desktop (revision 488534)
++++ mimetypes/application/x-tzo.desktop (revision 494869)
+@@ -18,7 +18,7 @@
+ Comment[eo]=Lzop-Tar-arĥivo
+ Comment[es]=Archivo Tar comprimido en Lzop
+ Comment[et]=Lzopitud TAR-arhiiv
+-Comment[eu]=Lzop-Tar fitxategia
++Comment[eu]=Lzop-Tar artxiboa
+ Comment[fa]=آرشیو Lzop شده‌ی Tar
+ Comment[fi]=Lzop-pakattu Tar-paketti
+ Comment[fr]=Archive Tar compactée par Lzop
+--- mimetypes/application/x-font-ghostscript.desktop (revision 488534)
++++ mimetypes/application/x-font-ghostscript.desktop (revision 494869)
+@@ -22,7 +22,7 @@
+ Comment[eo]=Postskripta tiparo
+ Comment[es]=Fuente Ghostscript
+ Comment[et]=Ghostscripti font
+-Comment[eu]=Ghostscript letra-tipoa
++Comment[eu]=Ghostscript-en letra-tipoa
+ Comment[fa]=قلم Ghostscript
+ Comment[fi]=GhostScript-kirjasin
+ Comment[fr]=Police de caractères Ghostscript
+--- mimetypes/application/vnd.oasis.opendocument.spreadsheet-template.desktop (revision 488534)
++++ mimetypes/application/vnd.oasis.opendocument.spreadsheet-template.desktop (revision 494869)
+@@ -17,7 +17,7 @@
+ Comment[el]=Î Ïότυπο Î»Î¿Î³Î¹ÏƒÏ„Î¹ÎºÎ¿Ï Ï†Ïλλου του OASIS OpenDocument
+ Comment[es]=Plantilla de hoja de cálculo de OpenDocument OASIS
+ Comment[et]=OASIS-e OpenDocument arvutustabeli mall
+-Comment[eu]=OASIS OpenDocument kalkulu-orri txantiloia
++Comment[eu]=OASIS OpenDocument kalkulu-orriaren txantiloia
+ Comment[fi]=OASIS OpenDocument -taulukkopohja
+ Comment[fr]=Modèle de feuille de calcul OASIS OpenDocument
+ Comment[fy]=OASIS OpenDocument rekkenboerdsjabloan
+@@ -31,7 +31,7 @@
+ Comment[lb]=OASIS-OpenDocument-Tabellëkalkulatiounsvirlag
+ Comment[lt]=OASIS OpenDocument elektroninÄ—s lentelÄ—s Å¡ablonas
+ Comment[nb]=OASIS Ã…pent dokument regnearkmal
+-Comment[nds]=Vörlaag för 'n Tabelldokment vun OASIS OpenDocument
++Comment[nds]="OASIS OpenDocument"-Tabelldokmentvörlaag
+ Comment[nl]=OASIS OpenDocument werkbladsjabloon
+ Comment[nn]=OASIS OpenDocument-reknearkmal
+ Comment[pa]=OASIS OpenDocument ਸਾਰਣੀਕਾਰ ਨਮੂਨਾ
+--- mimetypes/application/x-webarchive.desktop (revision 488534)
++++ mimetypes/application/x-webarchive.desktop (revision 494869)
+@@ -31,7 +31,7 @@
+ Comment[lv]=Tīmekļa arhīvs
+ Comment[mt]=Arkivji webb
+ Comment[nb]=Nett-arkiv
+-Comment[nds]=Web-Archiv
++Comment[nds]=Neetarchiv
+ Comment[nl]=Webarchief
+ Comment[nn]=Nett-arkiv
+ Comment[pa]=ਵੈੱਬ ਪà©à¨°à¨¾à¨²à©‡à¨–
+--- mimetypes/application/pkcs7-signature.desktop (revision 488534)
++++ mimetypes/application/pkcs7-signature.desktop (revision 494869)
+@@ -20,7 +20,7 @@
+ Comment[eo]=Deligita S/MIME-subskribo
+ Comment[es]=Firma suelta S/MIME
+ Comment[et]=Eraldiseisev S/MIME signatuur
+-Comment[eu]=Uztartu gabeko MIME sinadura
++Comment[eu]=Uztartu gabeko S/MIME sinadura
+ Comment[fa]=امضای غیر متصل S/MIME
+ Comment[fi]=Irroitettu S/MIME-allekirjoitus
+ Comment[fr]=Signature S/MIME détachée
+--- mimetypes/application/pgp.desktop (revision 488534)
++++ mimetypes/application/pgp.desktop (revision 494869)
+@@ -19,7 +19,7 @@
+ Comment[eo]=PGP-ĉifrita aÅ subskribita mesaÄo
+ Comment[es]=Mensaje cifrado o firmado PGP/MIME
+ Comment[et]=PGP-ga krüptitud või signeeritud kiri
+-Comment[eu]=PGP bidez zifratu edo sinatutako mezua
++Comment[eu]=PGPrekin zifratutako edo sinatutako mezua
+ Comment[fa]=پیام رمزینه یا امضا شده توسط PGP
+ Comment[fi]=PGP-salattu tai -allekirjoitettu viesti
+ Comment[fr]=Message signé ou crypté par PGP
+--- mimetypes/application/vnd.oasis.opendocument.text.desktop (revision 488534)
++++ mimetypes/application/vnd.oasis.opendocument.text.desktop (revision 494869)
+@@ -31,7 +31,7 @@
+ Comment[lb]=OASIS-OpenDocument-Text
+ Comment[lt]=OASIS OpenDocument tekstas
+ Comment[nb]=OASIS Ã…pent dokument tekst
+-Comment[nds]=Textdokment vun OASIS OpenDocument
++Comment[nds]="OASIS OpenDocument"-Textdokment
+ Comment[nl]=OASIS OpenDocument tekst
+ Comment[nn]=OASIS OpenDocument-tekst
+ Comment[pa]=OASIS OpenDocument ਪਾà¨
+--- mimetypes/application/x-gettext.desktop (revision 488534)
++++ mimetypes/application/x-gettext.desktop (revision 494869)
+@@ -18,7 +18,7 @@
+ Comment[eo]=MesaÄkatalogo (Gettext)
+ Comment[es]=Catálogo de mensajes de GNU Gettext
+ Comment[et]=GNU Gettexti teadete kataloog
+-Comment[eu]=GNU Gettext mezu katalogoa
++Comment[eu]=GNU Gettext mezuen katalogoa
+ Comment[fa]=کاتالوگ پیام‌های GNU Gettext
+ Comment[fi]=GNU Gettext -viestilista
+ Comment[fr]=Catalogue de messages GNU Gettext
+@@ -40,7 +40,7 @@
+ Comment[mn]=GNU Gettext ÐœÑдÑÑний катлог
+ Comment[ms]=Katalog Mesej GNU Gettext
+ Comment[nb]=GNU gettext meldingskatalog
+-Comment[nds]=GNU Gettext-Narichtenkataloog
++Comment[nds]="GNU Gettext"-Narichtenkataloog
+ Comment[nl]=GNU Gettext meldingencatalogus
+ Comment[nn]=GNU Gettext-meldingskatalog
+ Comment[pa]=GNU Gettext ਸà©à¨¨à©‡à¨¹à¨¾ ਸੂਚੀ
+--- mimetypes/application/vnd.oasis.opendocument.text-template.desktop (revision 488534)
++++ mimetypes/application/vnd.oasis.opendocument.text-template.desktop (revision 494869)
+@@ -17,7 +17,7 @@
+ Comment[el]=Î Ïότυπο κειμÎνου του OASIS OpenDocument
+ Comment[es]=Plantilla de documento de texto de OpenDocument OASIS
+ Comment[et]=OASIS-e OpenDocument tekstidokumendi mall
+-Comment[eu]=OASIS OpenDocument testu txantiloia
++Comment[eu]=OASIS OpenDocument testu-txantiloia
+ Comment[fi]=OASIS OpenDocument -tekstiasiakirjapohja
+ Comment[fr]=Modèle de document texte OASIS OpenDocument
+ Comment[fy]=OpenOffice.org tekstsjabloan
+@@ -31,7 +31,7 @@
+ Comment[lb]=OASIS-OpenDocument-Textvirlag
+ Comment[lt]=OASIS OpenDocument teksto dokumento Å¡ablonas
+ Comment[nb]=OASIS Ã…pent dokument tekstmal
+-Comment[nds]=Textdokment-Vörlaag vun OASIS OpenDocument
++Comment[nds]="OASIS OpenDocument"-Textdokmentvörlaag
+ Comment[nl]=OpenOffice.org tekstsjabloon
+ Comment[nn]=OASIS OpenDocument-tekstmal
+ Comment[pa]=OASIS OpenDocument ਪਾਠਨਮੂਨਾ
+--- mimetypes/application/vnd.sun.xml.writer.master.desktop (revision 488534)
++++ mimetypes/application/vnd.sun.xml.writer.master.desktop (revision 494869)
+@@ -15,7 +15,7 @@
+ Comment[eo]=Malfermoficeja ĉeftekstodokumento
+ Comment[es]=Documento de texto maestro de OpenOffice.org
+ Comment[et]=OpenOffice.org-i peatekstidokument
+-Comment[eu]=OpenOffice.org testu dokumentu maisua
++Comment[eu]=OpenOffice.org testu-dokumentu maisua
+ Comment[fi]=OpenOffice.org-päätekstiasiakirja
+ Comment[fr]=Document texte maître OpenOffice.org
+ Comment[fy]=OpenOffice.org Haad tekst Dokumint
+@@ -32,7 +32,7 @@
+ Comment[mk]=OpenOffice.org главен текÑÑ‚ документ
+ Comment[ms]=OpenOffice.org Dokumen Teks Utama
+ Comment[nb]=OpenOffice.org-hovedtekstdokument
+-Comment[nds]=Textvörlaag vun OpenOffice
++Comment[nds]=OpenOffice-Textvörlaag
+ Comment[nl]=OpenOffice.org Text-hoofddocument
+ Comment[nn]=OpenOffice.org-hovudtekstdokument
+ Comment[pa]=OpenOffice.org ਮਾਸਟਰ ਪਾਠਦਸਤਾਵੇਜ਼
+--- mimetypes/application/x-font-otf.desktop (revision 488534)
++++ mimetypes/application/x-font-otf.desktop (revision 494869)
+@@ -18,7 +18,7 @@
+ Comment[eo]=OpenType-Tiparo
+ Comment[es]=Fuente OpenType
+ Comment[et]=OpenType'i font
+-Comment[eu]=OpenType letra-tipoa
++Comment[eu]=OpenType-en letra-tipoa
+ Comment[fa]=قلم OpenType
+ Comment[fi]=OpenType-kirjasin
+ Comment[fr]=Police de caractères OpenType
+--- mimetypes/application/smil.desktop (revision 488534)
++++ mimetypes/application/smil.desktop (revision 494869)
+@@ -19,7 +19,7 @@
+ Comment[eo]=SMIL
+ Comment[es]=Lenguaje de integración multimedia sincronizada
+ Comment[et]=Sünkroniseeritud Multimeedia Integreerimise Keel
+-Comment[eu]=Multimedia integrazio lengoaia sinkronizatua
++Comment[eu]=Sinkronizatutako Multimedia integrazioaren lengoaia
+ Comment[fa]=زبان تکمیلی چندرسانه‌ای هماهنگ
+ Comment[fi]=Synkronoitu multimedianintergoimiskieli
+ Comment[fr]=Langage d'intégration multimédia synchronisée
+--- mimetypes/application/vnd.sun.xml.calc.template.desktop (revision 488534)
++++ mimetypes/application/vnd.sun.xml.calc.template.desktop (revision 494869)
+@@ -16,7 +16,7 @@
+ Comment[eo]=Malfermoficeja tabelkalkulilÅablono
+ Comment[es]=Plantilla de hoja de cálculo de OpenOffice.org
+ Comment[et]=OpenOffice.org-i arvutustabeli mall
+-Comment[eu]=OpenOffice.org kalkulu-orri txantiloia
++Comment[eu]=OpenOffice.org kalkulu-orrien txantiloia
+ Comment[fi]=OpenOffice.org-taulukkopohja
+ Comment[fr]=Modèle de feuille de calcul OpenOffice.org
+ Comment[fy]=OpenOffice.org Rekkenboerd Sjabloan
+@@ -34,7 +34,7 @@
+ Comment[mk]=OpenOffice.org шаблон за табела
+ Comment[ms]=OpenOffice.org Templat Lembaran Kerja
+ Comment[nb]=OpenOffice.org-regnearkmal
+-Comment[nds]=Tabell-Vörlaag vun OpenOffice
++Comment[nds]=OpenOffice-Arbeitblattvörlaag
+ Comment[nl]=OpenOffice.org Spreadsheet-sjabloon
+ Comment[nn]=OpenOffice.org-reknearkmal
+ Comment[pa]=OpenOffice.org ਸਾਰਣੀਕਾਰ ਨਮੂਨਾ
+--- mimetypes/application/xml-dtd.desktop (revision 488534)
++++ mimetypes/application/xml-dtd.desktop (revision 494869)
+@@ -11,6 +11,7 @@
+ Comment[el]=ΈγγÏαφο XML DTD
+ Comment[es]=Documento DTD XML
+ Comment[et]=XML DTD-dokument
++Comment[eu]=XML DTD dokumentua
+ Comment[fi]=XML DTD -asiakirja
+ Comment[fr]=Document DTD en XML
+ Comment[fy]=XML DTD-dokumint
+@@ -24,7 +25,7 @@
+ Comment[lb]=XML-DTD-Dokument
+ Comment[lt]=XML DTD dokumentas
+ Comment[nb]=XML DTD-dokument
+-Comment[nds]=XML DTD-Dokment
++Comment[nds]=XML-Dokmenttypdefinitschoon (DTD)
+ Comment[nl]=XML DTD-document
+ Comment[nn]=XML-DTD-dokument
+ Comment[pa]=XML DTD ਦਸਤਾਵੇਜ਼
+--- mimetypes/application/pkcs7-mime.desktop (revision 488534)
++++ mimetypes/application/pkcs7-mime.desktop (revision 494869)
+@@ -44,7 +44,7 @@
+ Comment[ms]=Data Diformat PKCS#7 (S/MIME)
+ Comment[mt]=Data fformattjata PKCS#7 (S/MIME)
+ Comment[nb]=PKCS#7 (S/MIME) Formatert data
+-Comment[nds]=mit PKCS#7 (S/MIME) formateerte Daten
++Comment[nds]=mit PKCS#7 (S/MIME) formateert Daten
+ Comment[nl]=PKCS#7-opgemaakte data (S/MIME)
+ Comment[nn]=PKCS#7-formaterte data (S/MIME)
+ Comment[nso]=Data yeo e Hlotswego ka (S/MIME) PKCS#7
+--- mimetypes/application/vnd.sun.xml.writer.template.desktop (revision 488534)
++++ mimetypes/application/vnd.sun.xml.writer.template.desktop (revision 494869)
+@@ -16,7 +16,7 @@
+ Comment[eo]=Malfermoficeja tekstodokumentÅablono
+ Comment[es]=Plantilla de documento de texto de OpenOffice.org
+ Comment[et]=OpenOffice.org-i tekstidokumendi mall
+-Comment[eu]=OpenOffice.org testu dokumentu txantiloia
++Comment[eu]=OpenOffice.org testu-dokumentu txantiloia
+ Comment[fi]=OpenOffice.org-tekstiasiakirjapohja
+ Comment[fr]=Modèle de document texte OpenOffice.org
+ Comment[fy]=OpenOffice.org Tekst Dokumint Sjabloan
+@@ -35,7 +35,7 @@
+ Comment[mk]=OpenOffice.org шаблон за текÑÑ‚ документ
+ Comment[ms]=OpenOffice.org Templat Dokumen Teks
+ Comment[nb]=OpenOffice.org-tekstdokumentmal
+-Comment[nds]=Textdokment-Vörlaag vun OpenOffice
++Comment[nds]=OpenOffice-Textdokmentvörlaag
+ Comment[nl]=OpenOffice.org Text-sjabloon
+ Comment[nn]=OpenOffice.org-tekstdokumentmal
+ Comment[pa]=OpenOffice.org ਪਾਠਦਸਤਾਵੇਜ਼ ਨਮੂਨਾ
+--- mimetypes/application/x-font-pcf.desktop (revision 488534)
++++ mimetypes/application/x-font-pcf.desktop (revision 494869)
+@@ -21,7 +21,7 @@
+ Comment[eo]=PCF-bitmapa tiparo
+ Comment[es]=Fuente bitmap PCF
+ Comment[et]=PCF bittrasterfont
+-Comment[eu]=PCF bitmap letra-tipoa
++Comment[eu]=PCF bitmap-en letra-tipoa
+ Comment[fa]=قلم نقش‌بیت PCF
+ Comment[fi]=PCF-bittikarttakirjasin
+ Comment[fr]=Police de caractères bitmap PCF
+@@ -45,7 +45,7 @@
+ Comment[ms]=Font PCF Bitmap
+ Comment[mt]=Font PCF (bitmap)
+ Comment[nb]=PCF Bitmapfont
+-Comment[nds]=PCF Bitmap-Schriftoort
++Comment[nds]=PCF-Bitmapschriftoort
+ Comment[nl]=PCF Bitmap-lettertype
+ Comment[nn]=PCF Bitmap-skrift
+ Comment[nso]=Fonto ya Bitmap ya PCF
+--- mimetypes/application/vnd.oasis.opendocument.presentation-template.desktop (revision 488534)
++++ mimetypes/application/vnd.oasis.opendocument.presentation-template.desktop (revision 494869)
+@@ -17,7 +17,7 @@
+ Comment[el]=Î Ïότυπο παÏουσίασης του OASIS OpenDocument
+ Comment[es]=Plantilla de presentación de OpenDocument OASIS
+ Comment[et]=OASIS-e OpenDocument esitlusemall
+-Comment[eu]=OASIS OpenDocument aurkezpen txantiloia
++Comment[eu]=OASIS OpenDocument aurkezpen-txantiloia
+ Comment[fi]=OASIS OpenDocument -esityspohja
+ Comment[fr]=Modèle de présentation OASIS OpenDocument
+ Comment[fy]=OASIS OpenDocument presintaasjesjabloan
+@@ -31,7 +31,7 @@
+ Comment[lb]=OASIS-OpenDocument-Präsentatiounsvirlag
+ Comment[lt]=OASIS OpenDocument pateikÄių Å¡ablonas
+ Comment[nb]=OASIS Ã…pent dokument presentasjonsmal
+-Comment[nds]=Präsentatschoonsvörlaag vun OASIS OpenDocument
++Comment[nds]="OASIS OpenDocument"-Presentatschoonsvörlaag
+ Comment[nl]=OASIS OpenDocument presentatiesjabloon
+ Comment[nn]=OASIS OpenDocument-presentasjonsmal
+ Comment[pa]=OASIS OpenDocument ਪੇਸ਼ਕਾਰੀ ਨਮੂਨਾ
+--- mimetypes/application/x-trash.desktop (revision 488534)
++++ mimetypes/application/x-trash.desktop (revision 494869)
+@@ -21,7 +21,7 @@
+ Comment[eo]=Sekurkopia-dosiero
+ Comment[es]=Archivo de copia de seguridad
+ Comment[et]=Varukoopia
+-Comment[eu]=Segurtasun kopia fitxategia
++Comment[eu]=Babeskopiaren fitxategia
+ Comment[fa]=پرونده‌ی پشتیبان
+ Comment[fi]=Varmuuskopiotiedosto
+ Comment[fr]=Fichier de sauvegarde
+--- mimetypes/application/x-siag.desktop (revision 488534)
++++ mimetypes/application/x-siag.desktop (revision 494869)
+@@ -43,7 +43,7 @@
+ Comment[ms]=Hamparan helaian Siag
+ Comment[mt]=Spreadsheet Siag
+ Comment[nb]=Siag Regneark
+-Comment[nds]=Siag-Tabell
++Comment[nds]=Siag-Arbeitblatt
+ Comment[nl]=Siag-spreadsheet
+ Comment[nn]=Siag-rekneark
+ Comment[nso]=Letlakala la Phatlalatso la Siag
+--- mimetypes/application/x-kde-wallet.desktop (revision 488534)
++++ mimetypes/application/x-kde-wallet.desktop (revision 494869)
+@@ -41,7 +41,7 @@
+ Comment[mn]=КДРWallet файл
+ Comment[ms]=Fail KDE Wallet
+ Comment[nb]=KDE lommebokfil
+-Comment[nds]=KDE Wallet-Datei
++Comment[nds]="KDE Wallet"-Datei
+ Comment[nl]=KWallet-portefeuillebestand
+ Comment[nn]=KDE Wallet-fil
+ Comment[pa]=KDE ਵਾਲਿਟ ਫਾਇਲ
+--- mimetypes/application/x-mimearchive.desktop (revision 488534)
++++ mimetypes/application/x-mimearchive.desktop (revision 494869)
+@@ -14,7 +14,7 @@
+ Comment[el]=ΠεÏιεχόμενη Mime αÏχειοθήκη ιστοÏ
+ Comment[es]=Archivo web MIME encapsulado
+ Comment[et]=MIME kapselduses veebiarhiiv
+-Comment[eu]=Encaptsulatutako Mime-a duen web fitxategia
++Comment[eu]=Kapsulatutako Mime-a duen web artxiboa
+ Comment[fi]=Mime pakattu www-paketti
+ Comment[fr]=Archive Web encapsulé MIME
+ Comment[fy]=Mime Ynsletten webargyf
+--- mimetypes/application/x-java-jnlp-file.desktop (revision 488534)
++++ mimetypes/application/x-java-jnlp-file.desktop (revision 494869)
+@@ -10,6 +10,7 @@
+ Comment[el]=ΕφαÏμογή αναζήτησης στο διαδίκτυο πεÏί Java
+ Comment[es]=Aplicación de Java Web Start
+ Comment[et]=Java Web Start rakendus
++Comment[eu]=Web hasierako Java aplikazioa
+ Comment[fi]=Java Web Start -sovelma
+ Comment[fr]=Application Java Web Start
+ Comment[fy]=Java Web Start-applikaasje
+--- mimetypes/application/x-designer.desktop (revision 488534)
++++ mimetypes/application/x-designer.desktop (revision 494869)
+@@ -18,7 +18,7 @@
+ Comment[eo]=Qt-desegnilo-dosiero
+ Comment[es]=Archivo de Qt Designer
+ Comment[et]=Qt Disaineri fail
+-Comment[eu]=Qt diseinu fitxategia
++Comment[eu]=Qt diseinuko fitxategia
+ Comment[fa]=پرونده‌ی Qt Designer
+ Comment[fi]=Qt Designer -tiedosto
+ Comment[fr]=Fichier Qt-Designer
+@@ -42,7 +42,7 @@
+ Comment[ms]=Fail Qt Designer
+ Comment[mt]=Fajl Qt Designer
+ Comment[nb]=QT-designer fil
+-Comment[nds]=Qt Designer-Datei
++Comment[nds]="Qt Designer"-Datei
+ Comment[nl]=Qt Designer-bestand
+ Comment[nn]=Qt Designer-fil
+ Comment[nso]=Faele ya Mokgabisi wa Qt
+--- mimetypes/application/vnd.sun.xml.writer.desktop (revision 488534)
++++ mimetypes/application/vnd.sun.xml.writer.desktop (revision 494869)
+@@ -18,7 +18,7 @@
+ Comment[eo]=Malfermoficeja tekstodokumento
+ Comment[es]=Documento de texto de OpenOffice.org
+ Comment[et]=OpenOffice.org-i tekstidokument
+-Comment[eu]=OpenOffice.org testu dokumentua
++Comment[eu]=OpenOffice.org testu-dokumentua
+ Comment[fa]= سند متنی OpenOffice.org
+ Comment[fi]=OpenOffice.org-tekstiasiakirja
+ Comment[fr]=Document texte OpenOffice.org
+@@ -41,7 +41,7 @@
+ Comment[mn]=OpenOffice.org ТекÑÑ‚ баримт
+ Comment[ms]=Dokumen Teks OpenOffice.org
+ Comment[nb]=OpenOffice.org tekstdokument
+-Comment[nds]=Textdokment vun OpenOffice
++Comment[nds]=OpenOffice-Textdokment
+ Comment[nl]=OpenOffice.org Text-document
+ Comment[nn]=OpenOffice.org-tekstdokument
+ Comment[pa]=OpenOffice.org ਪਾਠਦਸਤਾਵੇਜ਼
+--- mimetypes/application/x-perl.desktop (revision 488534)
++++ mimetypes/application/x-perl.desktop (revision 494869)
+@@ -12,7 +12,7 @@
+ Comment[el]=Î ÏόγÏαμμα Perl
+ Comment[es]=Programa en Perl
+ Comment[et]=Perli rakendus
+-Comment[eu]=PERL programa
++Comment[eu]=Perl programa
+ Comment[fi]=PERL-ohjelma
+ Comment[fr]=Programme Perl
+ Comment[fy]=Perl-programma
+--- mimetypes/application/x-java-applet.desktop (revision 488534)
++++ mimetypes/application/x-java-applet.desktop (revision 494869)
+@@ -18,7 +18,7 @@
+ Comment[eo]=Javaplikaĵo
+ Comment[es]=Applet de Java
+ Comment[et]=Java aplett
+-Comment[eu]=Javaren appleta
++Comment[eu]=Javaren applet-a
+ Comment[fa]=برنامک Java
+ Comment[fi]=Java-sovelma
+ Comment[fr]=Applet Java
+--- mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop (revision 488534)
++++ mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop (revision 494869)
+@@ -17,7 +17,7 @@
+ Comment[el]=Î Ïότυπο γÏαφικών του OASIS OpenDocument
+ Comment[es]=Plantilla de documento gráfico de OpenDocument OASIS
+ Comment[et]=OASIS-e OpenDocument joonistusemall
+-Comment[eu]=OASIS OpenDocument grafiko txantiloia
++Comment[eu]=OASIS OpenDocument grafiko-txantiloia
+ Comment[fi]=OASIS OpenDocument -piirrospohja
+ Comment[fr]=Modèle de graphiques OASIS OpenDocument
+ Comment[fy]=OASIS OpenDocument grafyske foarstellings sjabloan
+@@ -31,7 +31,7 @@
+ Comment[lb]=OASIS-OpenDocument-Grafikvirlag
+ Comment[lt]=OASIS OpenDocument grafikos Å¡ablonas
+ Comment[nb]=OASIS Ã…pent dokument grafikkmal
+-Comment[nds]= Grafikvörlaag vun OASIS OpenDocument
++Comment[nds]="OASIS OpenDocument"-Grafikvörlaag
+ Comment[nl]=OASIS OpenDocument illustratiesjabloon
+ Comment[nn]=OASIS OpenDocument-teikningsmal
+ Comment[pa]=OASIS OpenDocument ਗਰਾਫ਼ਿਕਸ ਨਮੂਨਾ
+--- mimetypes/application/vnd.oasis.opendocument.presentation.desktop (revision 488534)
++++ mimetypes/application/vnd.oasis.opendocument.presentation.desktop (revision 494869)
+@@ -31,7 +31,7 @@
+ Comment[lb]=OASIS-OpenDocument-Präsentatioun
+ Comment[lt]=OASIS OpenDocument pateiktis
+ Comment[nb]=OASIS Ã…pent dokumentpresentasjon
+-Comment[nds]=Präsentatschoon vun OASIS OpenDocument
++Comment[nds]="OASIS OpenDocument"-Presentatschoon
+ Comment[nl]=OASIS OpenDocument presentatie
+ Comment[nn]=OASIS OpenDocument-presentasjon
+ Comment[pa]=OASIS OpenDocument ਪੇਸ਼ਕਾਰੀ
+--- mimetypes/application/x-jar.desktop (revision 488534)
++++ mimetypes/application/x-jar.desktop (revision 494869)
+@@ -22,7 +22,7 @@
+ Comment[eo]=Javo-arĥivo
+ Comment[es]=Archivo Java
+ Comment[et]=Java arhiiv
+-Comment[eu]=Java fitxategia
++Comment[eu]=Java artxiboa
+ Comment[fa]=آرشیو Java
+ Comment[fi]=Java-paketti
+ Comment[fr]=Archive Java
+@@ -48,7 +48,7 @@
+ Comment[ms]=Arkib Java
+ Comment[mt]=Arkivju Java
+ Comment[nb]=Java-arkiv
+-Comment[nds]=Java Archiv
++Comment[nds]=Java-Archiv
+ Comment[nl]=Java-archief
+ Comment[nn]=Java-arkiv
+ Comment[nso]=Polokelo ya Java
+--- mimetypes/application/java.desktop (revision 488534)
++++ mimetypes/application/java.desktop (revision 494869)
+@@ -31,7 +31,7 @@
+ Comment[he]=מחלקת Java
+ Comment[hi]=जावा कà¥à¤²à¤¾à¤¸
+ Comment[hr]=Java razred
+-Comment[hu]=Java-osztály
++Comment[hu]=Java osztály
+ Comment[id]=Class Java
+ Comment[is]=Java klasi
+ Comment[it]=Classe Java
+--- mimetypes/application/x-ogg.desktop (revision 488534)
++++ mimetypes/application/x-ogg.desktop (revision 494869)
+@@ -44,6 +44,7 @@
+ Comment[mn]=Ogg Мултимедиа
+ Comment[ms]=Multimedia Ogg
+ Comment[mt]=Awdjo OGG
++Comment[nds]=Ogg-Multimediadatei
+ Comment[nl]=Ogg-multimedia
+ Comment[nn]=Ogg-multimedia
+ Comment[nso]=Media wa Bontshintshi wa Ogg
+--- mimetypes/application/vnd.oasis.opendocument.image.desktop (revision 488534)
++++ mimetypes/application/vnd.oasis.opendocument.image.desktop (revision 494869)
+@@ -31,7 +31,7 @@
+ Comment[lb]=OASIS-OpenDocument-Bild
+ Comment[lt]=OASIS OpenDocument paveikslÄ—lis
+ Comment[nb]=OASIS Ã…pent dokumentbilde
+-Comment[nds]=Bild vun OASIS OpenDocument
++Comment[nds]="OASIS OpenDocument"-Bild
+ Comment[nl]=OASIS OpenDocument afbeelding
+ Comment[nn]=OASIS OpenDocument-bilete
+ Comment[pa]=OASIS OpenDocument ਚਿੱਤਰ
+--- mimetypes/application/vnd.sun.xml.impress.template.desktop (revision 488534)
++++ mimetypes/application/vnd.sun.xml.impress.template.desktop (revision 494869)
+@@ -16,7 +16,7 @@
+ Comment[eo]=Malfermoficeja prezentilÅablono
+ Comment[es]=Plantilla de presentación de OpenOffice.org
+ Comment[et]=OpenOffice.org-i esitlusemall
+-Comment[eu]=OpenOffice.org aurkezpen txantiloia
++Comment[eu]=OpenOffice.org aurkezpen-txantiloia
+ Comment[fi]=OpenOffice.org-esityspohja
+ Comment[fr]=Modèle de présentation OpenOffice.org
+ Comment[fy]=OpenOffice.org Presentaasje Sjabloan
+@@ -35,7 +35,7 @@
+ Comment[mk]=OpenOffice.org шаблон за презентација
+ Comment[ms]=OpenOffice.org Templat Persembahan
+ Comment[nb]=OpenOffice.org-presentasjonsmal
+-Comment[nds]=Presentatschoon-Vörlaag vun OpenOffice
++Comment[nds]=OpenOffice-Presentatschoonvörlaag
+ Comment[nl]=OpenOffice.org Presentation-sjabloon
+ Comment[nn]=OpenOffice.org-presentasjonsmal
+ Comment[pa]=OpenOffice.org ਪੇਸ਼ਕਾਰੀ ਨਮੂਨਾ
+--- mimetypes/application/x-rar.desktop (revision 488534)
++++ mimetypes/application/x-rar.desktop (revision 494869)
+@@ -22,7 +22,7 @@
+ Comment[eo]=Rar-arĥivo
+ Comment[es]=Archivo RAR
+ Comment[et]=Rar arhiiv
+-Comment[eu]=Rar fitxategia
++Comment[eu]=Rar artxiboa
+ Comment[fa]=آرشیو Rar
+ Comment[fi]=Rar-paketti
+ Comment[fr]=Archive Rar
+--- mimetypes/application/vnd.stardivision.math.desktop (revision 488534)
++++ mimetypes/application/vnd.stardivision.math.desktop (revision 494869)
+@@ -20,7 +20,7 @@
+ Comment[eo]=Steloficeja matematika dokumento
+ Comment[es]=Documentos matemáticos de StarOffice
+ Comment[et]=StarOffice Math'i dokument
+-Comment[eu]=StarOffice Math dokumentua
++Comment[eu]=StarOffice matematika
+ Comment[fi]=StarOffice Math -asiakirja
+ Comment[fr]=Document StarOffice Math
+ Comment[fy]=StarOffice Rekken Dokumint
+@@ -38,7 +38,7 @@
+ Comment[mk]=StarOffice Math документ
+ Comment[ms]=StarOffice Dokumen Matematik
+ Comment[nb]=StarOffice-formel
+-Comment[nds]=Mathemaatsch Dokment vun StarOffice
++Comment[nds]="StarOffice Math"-Dokment
+ Comment[nl]=StarOffice Math-document
+ Comment[nn]=StarOffice-formel
+ Comment[pa]=ਸਟਾਰਆਫਿਸ Math ਦਸਤਾਵੇਜ਼
+--- mimetypes/application/x-iso.desktop (revision 488534)
++++ mimetypes/application/x-iso.desktop (revision 494869)
+@@ -17,7 +17,7 @@
+ Comment[el]=ΑÏχείο εικόνας ISO9660
+ Comment[es]=Archivo de imagen ISO9660
+ Comment[et]=ISO9660 tõmmisefail
+-Comment[eu]=ISO9660 irudi fitxategia
++Comment[eu]=ISO9660 irudi-fitxategia
+ Comment[fi]=ISO9660 binäärikuva
+ Comment[fr]=Fichier image ISO9660
+ Comment[fy]=ISO9660 Ofbylding Triem
+--- mimetypes/application/x-font-snf.desktop (revision 488534)
++++ mimetypes/application/x-font-snf.desktop (revision 494869)
+@@ -21,7 +21,7 @@
+ Comment[eo]=SNF-bitmapa tiparo
+ Comment[es]=Fuente bitmap SNF
+ Comment[et]=SNF bittrasterfont
+-Comment[eu]=SNF bitmap letra-tipoa
++Comment[eu]=SNF bitmap-en letra-tipoa
+ Comment[fa]=قلم نقش‌بیت SNF
+ Comment[fi]=SNF-bittikarttakirjasin
+ Comment[fr]=Police de caractères bitmap SNF
+@@ -45,7 +45,7 @@
+ Comment[ms]=Font SNF Bitmap
+ Comment[mt]=Font SNF (bitmap)
+ Comment[nb]=SNF Bitmapfont
+-Comment[nds]=SNF Bitmap-Schriftoort
++Comment[nds]=SNF-Bitmapschriftoort
+ Comment[nl]=SNF Bitmap-lettertype
+ Comment[nn]=SNF Bitmap-skrift
+ Comment[nso]=Fonto ya Bitmap ya SNF
+--- mimetypes/application/pgp-keys.desktop (revision 488534)
++++ mimetypes/application/pgp-keys.desktop (revision 494869)
+@@ -40,7 +40,7 @@
+ Comment[mn]=OpenPGP түлхүүр боодол
+ Comment[ms]=Gugusan Kunci OpenPGP
+ Comment[nb]=OpenPGP-nøkkelsamling
+-Comment[nds]=OpenPGP Slötelpaket
++Comment[nds]=OpenPGP-Slötelbund
+ Comment[nl]=OpenPGP-sleutelbos
+ Comment[nn]=OpenPGP-nøkkelsamling
+ Comment[pa]=OpenPGP ਕà©à©°à¨œà©€ ਬੰਡਲ
+--- mimetypes/application/msexcel.desktop (revision 488534)
++++ mimetypes/application/msexcel.desktop (revision 494869)
+@@ -23,7 +23,7 @@
+ Comment[eo]=Mikrosoft-Excel-dokumento
+ Comment[es]=Hoja de cálculo de Microsoft Excel
+ Comment[et]=Microsoft Exceli tabel
+-Comment[eu]=Microsoft Excel kalkulu orria
++Comment[eu]=Microsoft Excel kalkulu-orria
+ Comment[fa]=صÙØه‌ی گسترده‌ی مایکروساÙت اکسل
+ Comment[fi]=Microsoft Excel -taulukko
+ Comment[fr]=Feuille de calcul Microsoft Excel
+@@ -47,7 +47,7 @@
+ Comment[ms]=Hamparan helaian Microsoft Excel
+ Comment[mt]=Spreadsheet Microsoft Excel
+ Comment[nb]=Microsoft Excel-regneark
+-Comment[nds]=Tabell vun Microsoft Excel
++Comment[nds]="Microsoft Excel"-Arbeitblatt
+ Comment[nl]=Microsoft Excel-spreadsheet
+ Comment[nn]=Microsoft Excel-rekneark
+ Comment[nso]=Letlakala la Phatlalatso la Bokgoni bja Microsoft
+--- mimetypes/application/x-applixspread.desktop (revision 488534)
++++ mimetypes/application/x-applixspread.desktop (revision 494869)
+@@ -22,7 +22,7 @@
+ Comment[eo]=Apliks-kalkultabelo
+ Comment[es]=Documento hoja de cálculo de Applix
+ Comment[et]=Applixi arvutustabel
+-Comment[eu]=Applix kalkulu-orri dokumentua
++Comment[eu]=Applix kalkulu-orria
+ Comment[fa]=سند صÙØه‌گسترده‌ی Applix
+ Comment[fi]=Applix taulukkolaskenta-asiakirja
+ Comment[fr]=Document Applix Spreadsheets
+@@ -46,7 +46,7 @@
+ Comment[ms]=Dokumen Hamparan Helaian Applix
+ Comment[mt]=Spreadsheet Applix
+ Comment[nb]=Applix regneark
+-Comment[nds]=Applix-Tabell
++Comment[nds]="Applix Spreadsheets"-Dokment
+ Comment[nl]=Applix Spreadsheets-document
+ Comment[nn]=Applix Spreadsheets-dokument
+ Comment[nso]=Tokomane ya Matlakala a Phatlalatso a Applix
+--- mimetypes/application/Makefile.am (revision 488534)
++++ mimetypes/application/Makefile.am (revision 494869)
+@@ -30,7 +30,7 @@
+ x-kspread.desktop x-kugar.desktop x-kword.desktop \
+ x-quattropro.desktop x-amipro.desktop x-tgif.desktop \
+ x-lyx.desktop x-zerosize.desktop x-kpovmodeler.desktop x-cda.desktop \
+- pkcs7-mime.desktop pkcs10.desktop sieve.desktop \
++ pkcs7-mime.desktop pkcs10.desktop sieve.desktop mbox.desktop \
+ x-hancomword.desktop \
+ x-font-bdf.desktop x-font-pcf.desktop x-font-speedo.desktop x-font-type1.desktop \
+ x-font-ghostscript.desktop x-font-snf.desktop x-font-ttf.desktop \
+--- mimetypes/application/x-font-ttc.desktop (revision 488534)
++++ mimetypes/application/x-font-ttc.desktop (revision 494869)
+@@ -18,7 +18,7 @@
+ Comment[eo]=TrueType-Tiparkolekto
+ Comment[es]=Colección de fuentes TrueType
+ Comment[et]=TrueType fondikogu
+-Comment[eu]=Truetype letra-tipoen bilduma
++Comment[eu]=TrueType letra-tipoen bilduma
+ Comment[fa]=مجموعه‌ی قلم‌های TrueType
+ Comment[fi]=TrueType-kirjasinkokoelma
+ Comment[fr]=Jeu de polices de caractères Truetype
+--- mimetypes/application/vnd.ms-excel.desktop (revision 488534)
++++ mimetypes/application/vnd.ms-excel.desktop (revision 494869)
+@@ -21,7 +21,7 @@
+ Comment[eo]=Mikrosoft-Excel-dokumento
+ Comment[es]=Hoja de cálculo de Microsoft Excel
+ Comment[et]=Microsoft Exceli tabel
+-Comment[eu]=Microsoft Excel kalkulu orria
++Comment[eu]=Microsoft Excel kalkulu-orria
+ Comment[fa]=صÙØه‌ی گسترده‌ی مایکروساÙت اکسل
+ Comment[fi]=Microsoft Excel -taulukko
+ Comment[fr]=Feuille de calcul Microsoft Excel
+@@ -45,7 +45,7 @@
+ Comment[ms]=Hamparan helaian Microsoft Excel
+ Comment[mt]=Spreadsheet Microsoft Excel
+ Comment[nb]=Microsoft Excel-regneark
+-Comment[nds]=Tabell vun Microsoft Excel
++Comment[nds]="Microsoft Excel"-Arbeitblatt
+ Comment[nl]=Microsoft Excel-spreadsheet
+ Comment[nn]=Microsoft Excel-rekneark
+ Comment[nso]=Letlakala la Phatlalatso la Bokgoni bja Microsoft
+--- mimetypes/application/x-font-ttf.desktop (revision 488534)
++++ mimetypes/application/x-font-ttf.desktop (revision 494869)
+@@ -18,7 +18,7 @@
+ Comment[eo]=TrueType-Tiparo
+ Comment[es]=Fuente TrueType
+ Comment[et]=TrueType font
+-Comment[eu]=Truetype letra-tipoa
++Comment[eu]=TrueType letra-tipoa
+ Comment[fa]=قلم TrueType
+ Comment[fi]=TrueType-kirjasin
+ Comment[fr]=Police de caractères Truetype
+--- mimetypes/application/x-msaccess.desktop (revision 488534)
++++ mimetypes/application/x-msaccess.desktop (revision 494869)
+@@ -44,7 +44,7 @@
+ Comment[mn]=Microsoft Access Өгөгдлийн бааз
+ Comment[ms]=Pangkalan Data Microsoft Access
+ Comment[nb]=Microsoft Access database
+-Comment[nds]=Microsoft-Access-Datenbank
++Comment[nds]="Microsoft Access"-Datenbank
+ Comment[nl]=Microsoft Access-database
+ Comment[nn]=Microsoft Access-database
+ Comment[pa]=Microsoft Access ਡਾਟਾਬੇਸ
+--- mimetypes/application/vnd.ms-powerpoint.desktop (revision 488534)
++++ mimetypes/application/vnd.ms-powerpoint.desktop (revision 494869)
+@@ -44,7 +44,7 @@
+ Comment[mn]=MS-PowerPoint-ҮзүүлÑн
+ Comment[ms]=Persembahan Microsoft PowerPoint
+ Comment[nb]=Microsoft PowerPoint-dokument
+-Comment[nds]=Microsoft PowerPoint Presentatschoon
++Comment[nds]="Microsoft PowerPoint"-Presentatschoon
+ Comment[nl]=Microsoft PowerPoint-presentatie
+ Comment[nn]=Microsoft PowerPoint-presentasjon
+ Comment[pa]=Microsoft PowerPoint ਪੇਸ਼ਕਾਰੀ
+--- mimetypes/application/x-kcsrc.desktop (revision 488534)
++++ mimetypes/application/x-kcsrc.desktop (revision 494869)
+@@ -23,7 +23,7 @@
+ Comment[eo]=KDE-Etoso
+ Comment[es]=Tema de color de KDE
+ Comment[et]=KDE värviteema
+-Comment[eu]=KDE kolore gaia
++Comment[eu]=KDE kolore-gaia
+ Comment[fa]=Ø·Ø±Ø Ø±Ù†Ú¯ÛŒ KDE
+ Comment[fi]=KDE:n väriteema
+ Comment[fr]=Thème de couleurs pour KDE
+--- mimetypes/application/vnd.ms-word.desktop (revision 488534)
++++ mimetypes/application/vnd.ms-word.desktop (revision 494869)
+@@ -45,7 +45,7 @@
+ Comment[ms]=Dokumen Microsoft Word
+ Comment[mt]=Dokument Microsoft Word
+ Comment[nb]=Microsoft Word-dokument
+-Comment[nds]=Dokment vun Microsoft Word
++Comment[nds]="Microsoft Word"-Dokment
+ Comment[nl]=Microsoft Word-document
+ Comment[nn]=Microsoft Word-dokument
+ Comment[nso]=Tokomane ya Lentsu la Microsoft
+--- mimetypes/application/x-gzpostscript.desktop (revision 488534)
++++ mimetypes/application/x-gzpostscript.desktop (revision 494869)
+@@ -41,7 +41,7 @@
+ Comment[ms]=Fail PostScript diGzipkan
+ Comment[mt]=Fajl Postscript gzippjat
+ Comment[nb]=Gzippet Postscript-fil
+-Comment[nds]=PostScript-Datei, de mit GZip komprimeert is
++Comment[nds]=GZip-komprimeert PostScript-Datei
+ Comment[nl]=Met gzip gecomprimeerd PostScript-bestand
+ Comment[nn]=Gzippa PostScript-fil
+ Comment[nso]=Faele ya Setlankana sa Poso sa Gzipped
+--- mimetypes/application/vnd.stardivision.impress.desktop (revision 488534)
++++ mimetypes/application/vnd.stardivision.impress.desktop (revision 494869)
+@@ -22,7 +22,7 @@
+ Comment[eo]=Steloficeja prezentilo
+ Comment[es]=Presentación Impress de StarOffice
+ Comment[et]=StarOffice Impress'i esitlus
+-Comment[eu]=StarOffice Impress aurkezpena
++Comment[eu]=StarOffice aurkezpena
+ Comment[fa]=نمایش StarOffice Impress
+ Comment[fi]=StarOffice Impress -esitys
+ Comment[fr]=Présentation StarOffice Impress
+@@ -44,7 +44,7 @@
+ Comment[mn]=StarOffice СÑтгÑлд ХоногшÑон ҮзүүлÑнгүүд
+ Comment[ms]=Persembahan StarOffice Impress
+ Comment[nb]=StarOffice Impress presentasjon
+-Comment[nds]=Presentatschoon vun Impress (StarOffice)
++Comment[nds]="StarOffice Impress"-Presentatschoon
+ Comment[nn]=StarOffice Impress-presentasjon
+ Comment[nso]=Pontsho ya Kgahlego ya StarOffice
+ Comment[pa]=ਸਟਾਰਆਫਿਸ Impress ਪੇਸ਼ਕਾਰ
+--- mimetypes/application/x-java.desktop (revision 488534)
++++ mimetypes/application/x-java.desktop (revision 494869)
+@@ -32,7 +32,7 @@
+ Comment[he]=מחלקת Java
+ Comment[hi]=जावा कà¥à¤²à¤¾à¤¸
+ Comment[hr]=Java razred
+-Comment[hu]=Java-osztály
++Comment[hu]=Java osztály
+ Comment[id]=Class Java
+ Comment[is]=Java klasi
+ Comment[it]=Classe Java
+--- mimetypes/application/xhtml+xml.desktop (revision 488534)
++++ mimetypes/application/xhtml+xml.desktop (revision 494869)
+@@ -41,7 +41,7 @@
+ Comment[mn]=XHTML-Бүлийн Баримт
+ Comment[ms]=Dokumen Keluarga XHTML
+ Comment[nb]=Dokument av XHTML-familien
+-Comment[nds]=Dokment ut dat XHTML-Rebeet
++Comment[nds]=Dokment ut de XHTML-Familie
+ Comment[nl]=XHTML-familie-document
+ Comment[nn]=XHTML-dokument
+ Comment[pa]=XHTML ਸਮੂਹ ਦਸਤਾਵੇਜ਼
+--- mimetypes/application/vnd.sun.xml.calc.desktop (revision 488534)
++++ mimetypes/application/vnd.sun.xml.calc.desktop (revision 494869)
+@@ -40,7 +40,7 @@
+ Comment[mn]=OpenOffice.org Ð¥Ò¯ÑнÑгтÑн боловÑруулагч
+ Comment[ms]=Hamparan helaian OpenOffice.org
+ Comment[nb]=OpenOffice.org regneark
+-Comment[nds]=Tabell vun OpenOffice
++Comment[nds]=OpenOffice-Arbeitblatt
+ Comment[nn]=OpenOffice.org-rekneark
+ Comment[pa]=OpenOffice.org ਸਾਰਣੀਕਾਰ
+ Comment[pl]=Arkusz OpenOffice.org
+--- mimetypes/application/x-applixword.desktop (revision 488534)
++++ mimetypes/application/x-applixword.desktop (revision 494869)
+@@ -22,7 +22,7 @@
+ Comment[eo]=Apliks-teksto
+ Comment[es]=Documento de texto de Applix
+ Comment[et]=Applixi tekstidokument
+-Comment[eu]=Applix Words dokumentua
++Comment[eu]=Applix testu-dokumentua
+ Comment[fa]=سند Applix Words
+ Comment[fi]=Applix Words -asiakirja
+ Comment[fr]=Document Applix Words
+@@ -46,7 +46,7 @@
+ Comment[ms]=Dokumen Applix Words
+ Comment[mt]=Dokument Applix Words
+ Comment[nb]=Applix tekst-dokument
+-Comment[nds]=Applix Words-Dokment
++Comment[nds]="Applix Words"-Dokment
+ Comment[nl]=Applix Words-document
+ Comment[nn]=Applix Words-dokument
+ Comment[nso]=Tokomane ya Mantsu a Applix
+--- mimetypes/application/pkcs10.desktop (revision 488534)
++++ mimetypes/application/pkcs10.desktop (revision 494869)
+@@ -20,7 +20,7 @@
+ Comment[eo]=S/MIME-atestilo-peto
+ Comment[es]=Solicitud de certificación S/MIME
+ Comment[et]=S/MIME sertifitseerimise päring
+-Comment[eu]=S/MIME ziurtagiri eskabidea
++Comment[eu]=S/MIME ziurtagiri eskaera
+ Comment[fa]=درخواست گواهینامه‌ی S/MIME
+ Comment[fi]=S/MIME-sertifikaattipyyntö
+ Comment[fr]=Requête de certification S/MIME
+@@ -43,7 +43,7 @@
+ Comment[ms]=Permintaan Sijil S/MIME
+ Comment[mt]=Rikjesta għal ċertifikat S/MIME
+ Comment[nb]=S/MIME sertifiseringsforespørsel
+-Comment[nds]=Anfraag för'n S/MIME-Zertifikaat
++Comment[nds]=Anfraag för en S/MIME-Zertifikaat
+ Comment[nl]=S/MIME-certificaatverzoek
+ Comment[nn]=S/MIME-sertifiseringsførespurnad
+ Comment[nso]=Kgopelo ya Kgonthisiso ya S/MIME
+--- mimetypes/application/vnd.stardivision.calc.desktop (revision 488534)
++++ mimetypes/application/vnd.stardivision.calc.desktop (revision 494869)
+@@ -22,7 +22,7 @@
+ Comment[eo]=Steloficeja tabelkalkulilo
+ Comment[es]=Hoja de cálculo de StarOffice
+ Comment[et]=StarOffice Calc'i arvutustabel
+-Comment[eu]=StarOffice Calc kalkulu-orria
++Comment[eu]=StarOffice kalkulu-orria
+ Comment[fa]=صÙØÙ‡ گسترده‌ی StarOffice Calc
+ Comment[fi]=StarOffice Calc -taulukko
+ Comment[fr]=Feuille de calcul StarOffice Calc
+@@ -44,7 +44,7 @@
+ Comment[mn]=StarOffice-Ð¥Ò¯ÑнÑгтÑн БоловÑруулагч
+ Comment[ms]=Hamparan helaian StarOffice Calc
+ Comment[nb]=StarCalc regneark
+-Comment[nds]=Tabell vun Calc (StarOffice)
++Comment[nds]="StarOffice Calc"-Arbeitblatt
+ Comment[nl]=StarOffice Calc-spreadsheet
+ Comment[nn]=StarOffice Calc-rekneark
+ Comment[nso]=Letlakala la Phatlalatso la Calc StarOffice
+--- mimetypes/application/mspowerpoint.desktop (revision 488534)
++++ mimetypes/application/mspowerpoint.desktop (revision 494869)
+@@ -46,7 +46,7 @@
+ Comment[mn]=MS-PowerPoint-ҮзүүлÑн
+ Comment[ms]=Persembahan Microsoft PowerPoint
+ Comment[nb]=Microsoft PowerPoint-dokument
+-Comment[nds]=Microsoft PowerPoint Presentatschoon
++Comment[nds]="Microsoft PowerPoint"-Presentatschoon
+ Comment[nl]=Microsoft PowerPoint-presentatie
+ Comment[nn]=Microsoft PowerPoint-presentasjon
+ Comment[pa]=Microsoft PowerPoint ਪੇਸ਼ਕਾਰੀ
+--- mimetypes/application/x-object.desktop (revision 488534)
++++ mimetypes/application/x-object.desktop (revision 494869)
+@@ -21,7 +21,7 @@
+ Comment[eo]=Objektkodo
+ Comment[es]=Código objeto
+ Comment[et]=Objektkood
+-Comment[eu]=Objektu kodea
++Comment[eu]=Objektu-kodea
+ Comment[fa]=کد موضوعی
+ Comment[fi]=Objektikoodi
+ Comment[fr]=Code objet
+--- mimetypes/application/x-desktop.desktop (revision 488534)
++++ mimetypes/application/x-desktop.desktop (revision 494869)
+@@ -17,7 +17,7 @@
+ Comment[eo]=Tabula agordo-dosiero
+ Comment[es]=Archivo de configuración del escritorio
+ Comment[et]=Töölaua seadistuste fail
+-Comment[eu]=Mahaigain konfigurazio fitxategia
++Comment[eu]=Mahaigainaren konfigurazio-fitxategia
+ Comment[fa]=پرونده‌ی تنظیم میزکار
+ Comment[fi]=Työpöydän asetustiedosto
+ Comment[fr]=Fichier de configuration du bureau
+--- mimetypes/application/x-quattropro.desktop (revision 488534)
++++ mimetypes/application/x-quattropro.desktop (revision 494869)
+@@ -46,7 +46,7 @@
+ Comment[ms]=Dokumen Quattro Pro
+ Comment[mt]=Spreadsheet Quattro Pro
+ Comment[nb]=Quattro Pro-dokument
+-Comment[nds]=Quattro-Pro-Dokment
++Comment[nds]="Quattro Pro"-Dokment
+ Comment[nl]=Quattro Pro-document
+ Comment[nn]=Quattro Pro-dokument
+ Comment[nso]=Tokomane ya Pro ya Quattro
+--- mimetypes/application/x-x509-ca-cert.desktop (revision 488534)
++++ mimetypes/application/x-x509-ca-cert.desktop (revision 494869)
+@@ -42,7 +42,7 @@
+ Comment[ms]=Sijil DER, PEM, atau Netscape Encoded X.509
+ Comment[mt]=ÄŠertifikat X.509 kodifikat b'DER, PEM, jew Netscape
+ Comment[nb]=DER, PEM, eller Netscape Encoded X.509 sertifikat
+-Comment[nds]=DER, PEM, oder Netscape kodeert X.509-Zertifikaat
++Comment[nds]=DER-, PEM-, oder Netscape-kodeert X.509-Zertifikaat
+ Comment[nl]=DER-, PEM-, of Netscape-versleuteld X.509-certificaat
+ Comment[nn]=DER, PEM eller Netscape-koda X.509-sertifikat
+ Comment[nso]=Kgonthisiso ya DER, PEM, goba X.509 yeo e Khoutilwego ka Netscape
+--- mimetypes/application/x-sqlite2.desktop (revision 488534)
++++ mimetypes/application/x-sqlite2.desktop (revision 494869)
+@@ -16,6 +16,7 @@
+ Comment[el]=ΑÏχείο βάσης δεδομÎνων SQLite2
+ Comment[es]=Archivo de la base de datos SQLite2
+ Comment[et]=SQLite2 andmebaasi fail
++Comment[eu]=SQLite2 datu-basearen fitxategia
+ Comment[fi]=SQLite2-tietokantatiedosto
+ Comment[fr]=Fichier de base de données SQLite2
+ Comment[fy]=SQLite2 databanktriem
+--- mimetypes/application/x-sqlite3.desktop (revision 488534)
++++ mimetypes/application/x-sqlite3.desktop (revision 494869)
+@@ -16,6 +16,7 @@
+ Comment[el]=ΑÏχείο βάσης δεδομÎνων SQLite3
+ Comment[es]=Archivo de la base de datos SQLite3
+ Comment[et]=SQLite3 andmebaasi fail
++Comment[eu]=SQLite3 datu-basearen fitxategia
+ Comment[fi]=SQLite3-tietokantatiedosto
+ Comment[fr]=Fichier de base de données SQLite3
+ Comment[fy]=SQLite3 databanktriem
+--- mimetypes/application/x-perl-module.desktop (revision 488534)
++++ mimetypes/application/x-perl-module.desktop (revision 494869)
+@@ -12,7 +12,7 @@
+ Comment[el]=ΆÏθÏωμα Perl
+ Comment[es]=Módulo Perl
+ Comment[et]=Perli moodul
+-Comment[eu]=PERL modulua
++Comment[eu]=Perl modulua
+ Comment[fi]=PERL-moduuli
+ Comment[fr]=Module Perl
+ Comment[fy]=Perl-module
+--- mimetypes/application/x-amipro.desktop (revision 488534)
++++ mimetypes/application/x-amipro.desktop (revision 494869)
+@@ -46,7 +46,7 @@
+ Comment[ms]=Dokumen Lotus AmiPro
+ Comment[mt]=Dokument Lotus AmiPro
+ Comment[nb]=Lotus AmiPro-dokument
+-Comment[nds]=Lotus AmiPro-Dokment
++Comment[nds]="Lotus AmiPro"-Dokment
+ Comment[nl]=Lotus AmiPro-document
+ Comment[nn]=Lotus AmiPro-dokument
+ Comment[nso]=Tokomane ya AmiPro ya Lotus
+--- mimetypes/application/xsd.desktop (revision 488534)
++++ mimetypes/application/xsd.desktop (revision 494869)
+@@ -26,7 +26,7 @@
+ Comment[lt]=W3C XML schema
+ Comment[lv]=W3C XML shēma
+ Comment[nb]=W3C XML skjema
+-Comment[nds]=W3C XML-Schema
++Comment[nds]=XML-Schemadefinitschoon na W3C
+ Comment[nl]=W3C XML-schema
+ Comment[nn]=W3C XML-skjema
+ Comment[pa]=W3C XML ਸਕੀਮ
+--- mimetypes/application/x-mswrite.desktop (revision 488534)
++++ mimetypes/application/x-mswrite.desktop (revision 494869)
+@@ -22,7 +22,7 @@
+ Comment[eo]=Mikrosoft-Write-dokumento
+ Comment[es]=Documento de Microsoft Write
+ Comment[et]=Microsoft Write'i dokument
+-Comment[eu]=Microsoft Write dokumentua
++Comment[eu]=Microsoft testu-dokumentua
+ Comment[fa]=سند مایکروساÙت رایت
+ Comment[fi]=Microsoft Write -asiakirja
+ Comment[fr]=Document Microsoft Write
+@@ -46,7 +46,7 @@
+ Comment[ms]=Dokumen Microsoft Write
+ Comment[mt]=Dokument Microsoft Write
+ Comment[nb]=Microsoft Write-dokument
+-Comment[nds]=Microsoft Write-Dokment
++Comment[nds]="Microsoft Write"-Dokment
+ Comment[nl]=Microsoft Write-document
+ Comment[nn]=Microsoft Write-dokument
+ Comment[nso]=Tokomane ya Ngwalo ya Microsoft
+--- mimetypes/application/fits.desktop (revision 488534)
++++ mimetypes/application/fits.desktop (revision 494869)
+@@ -10,6 +10,7 @@
+ Comment[el]=ΔεδομÎνα FITS
+ Comment[es]=Datos FITS
+ Comment[et]=FITS-andmed
++Comment[eu]=FITS datuak
+ Comment[fi]=FITS-tiedot
+ Comment[fr]=Données FITS
+ Comment[fy]=FITS-data
+--- mimetypes/application/pdf.desktop (revision 488534)
++++ mimetypes/application/pdf.desktop (revision 494869)
+@@ -23,7 +23,7 @@
+ Comment[eo]=PDF-dokumento
+ Comment[es]=Documento PDF
+ Comment[et]=PDF-dokument
+-Comment[eu]=Pdf dokumentua
++Comment[eu]=PDF dokumentua
+ Comment[fa]=سند PDF
+ Comment[fi]=PDF-asiakirja
+ Comment[fr]=Document PDF
+--- mimetypes/application/vnd.oasis.opendocument.spreadsheet.desktop (revision 488534)
++++ mimetypes/application/vnd.oasis.opendocument.spreadsheet.desktop (revision 494869)
+@@ -31,7 +31,7 @@
+ Comment[lb]=OASIS-OpenDocument-Tabellëblat
+ Comment[lt]=OASIS OpenDocument elektroninÄ— lentelÄ—
+ Comment[nb]=OASIS Ã…pent dokument regneark
+-Comment[nds]=Tabelldokment vun OASIS OpenDocument
++Comment[nds]="OASIS OpenDocument"-Tabelldokment
+ Comment[nl]=OASIS OpenDocument werkblad
+ Comment[nn]=OASIS OpenDocument-rekneark
+ Comment[pa]=OASIS OpenDocument ਸਾਰਣੀਕਾਰ
+--- mimetypes/application/x-lha.desktop (revision 488534)
++++ mimetypes/application/x-lha.desktop (revision 494869)
+@@ -19,7 +19,7 @@
+ Comment[eo]=Lha-arĥivo
+ Comment[es]=Archivo LHA
+ Comment[et]=Lha arhiiv
+-Comment[eu]=Lha fitxategia
++Comment[eu]=Lha artxiboa
+ Comment[fa]=آرشیو Lha
+ Comment[fi]=Lha-paketti
+ Comment[fr]=Archive LHA
+--- mimetypes/application/x-tgz.desktop (revision 488534)
++++ mimetypes/application/x-tgz.desktop (revision 494869)
+@@ -21,7 +21,7 @@
+ Comment[eo]=Gzip-Tar-arĥivo
+ Comment[es]=Archivo Tar comprimido en Gzip
+ Comment[et]=Gzipitud TAR-arhiiv
+-Comment[eu]=Tar-GZIP fitxategia
++Comment[eu]=Tar+GZIP artxiboa
+ Comment[fa]=آرشیو Gzip شده‌ی Tar
+ Comment[fi]=Gzip-pakattu Tar-paketti
+ Comment[fr]=Archive Tar compactée par Gzip
+@@ -47,7 +47,7 @@
+ Comment[ms]=Arkib Tar diGzipkan
+ Comment[mt]=Arkivju Tar Gzippjat
+ Comment[nb]=Gzippet tar-arkiv
+-Comment[nds]=Tar-Archiv (mit GZip komprimeert)
++Comment[nds]=GZip-komprimeert Tar-Archiv
+ Comment[nl]=Met Gzip gecomprimeerd Tar-archief
+ Comment[nn]=Gzippa tar-arkiv
+ Comment[nso]=Polokelo ya Tar ya Gzipped
+--- mimetypes/application/x-javascript.desktop (revision 488534)
++++ mimetypes/application/x-javascript.desktop (revision 494869)
+@@ -61,3 +61,8 @@
+ Comment[uz]=JavaScript-файли
+ Comment[zh_CN]=JavaScript 文件
+ X-KDE-IsAlso=application/x-executable-script
++
++[Property::X-KDE-text]
++Type=bool
++Value=true
++
+--- mimetypes/application/vnd.sun.xml.impress.desktop (revision 488534)
++++ mimetypes/application/vnd.sun.xml.impress.desktop (revision 494869)
+@@ -41,7 +41,7 @@
+ Comment[mn]=OpenOffice.org ҮзүүлÑн
+ Comment[ms]=Persembahan OpenOffice.org
+ Comment[nb]=OpenOffice.org presentasjon
+-Comment[nds]=Presentatschoon vun OpenOffice
++Comment[nds]=OpenOffice-Presentatschoon
+ Comment[nn]=OpenOffice.org-presentasjon
+ Comment[pa]=OpenOffice.org ਪੇਸ਼ਕਾਰੀ
+ Comment[pl]=Prezentacja OpenOffice.org
+--- mimetypes/application/x-vnd.kde.kugar.mixed.desktop (revision 488534)
++++ mimetypes/application/x-vnd.kde.kugar.mixed.desktop (revision 494869)
+@@ -22,7 +22,7 @@
+ Comment[eo]=Kugar-arĥivo
+ Comment[es]=Archivo de archivos Kugar
+ Comment[et]=Kugari arhiivifail
+-Comment[eu]=Kugar fitxategi artxibategia
++Comment[eu]=Kugar fitxategi artxiboa
+ Comment[fa]=پرونده‌ی آرشیو Kugar
+ Comment[fi]=Kugar-paketti
+ Comment[fr]=Archive Kugar
+--- mimetypes/application/x-gnumeric.desktop (revision 488534)
++++ mimetypes/application/x-gnumeric.desktop (revision 494869)
+@@ -22,7 +22,7 @@
+ Comment[eo]=GNUmeric-kalkultabelo
+ Comment[es]=Hoja de cálculo de GNUmeric
+ Comment[et]=GNUmerici arvutustabel
+-Comment[eu]=GNUmeric kalkulu-orria
++Comment[eu]=Gnumeric kalkulu-orria
+ Comment[fa]=صÙØه‌گسترده‌ی GNUmeric
+ Comment[fi]=GNUmeric-taulukko
+ Comment[fr]=Feuille de calcul GNUmeric
+@@ -46,7 +46,7 @@
+ Comment[ms]=Halaman Helaian GNUmeric
+ Comment[mt]=Spreadsheet GNUmeric
+ Comment[nb]=GNUmeric regneark
+-Comment[nds]=Tabell vun GNUmeric
++Comment[nds]=GNUmeric-Arbeitblatt
+ Comment[nl]=GNUmeric-spreadsheet
+ Comment[nn]=GNUmeric-rekneark
+ Comment[nso]=Matlakala a Phatlalatso a GDInomoro
+--- mimetypes/application/x-executable.desktop (revision 488534)
++++ mimetypes/application/x-executable.desktop (revision 494869)
+@@ -41,7 +41,7 @@
+ Comment[ms]=Fail Boleh Laksana
+ Comment[mt]=Programm
+ Comment[nb]=Program
+-Comment[nds]=Datei, lett sik utföhren
++Comment[nds]=Utföhrbor Datei
+ Comment[nl]=Uitvoerbaar bestand
+ Comment[nn]=Køyrbar fil
+ Comment[nso]=Faele yeo e Phethagatsegago
+--- mimetypes/application/x-executable-script.desktop (revision 488534)
++++ mimetypes/application/x-executable-script.desktop (revision 494869)
+@@ -13,7 +13,7 @@
+ Comment[el]=ΑÏχείο εντολών κελÏφους (πιθανόν εκτελÎσιμο)
+ Comment[es]=Procedimiento (probablemente ejecutable)
+ Comment[et]=Käivitatav skript
+-Comment[eu]=Script (exekutagarria seguru aski)
++Comment[eu]=Script (exekutagarria litekeena)
+ Comment[fi]=Skripti (mahdollisesti suoritettava)
+ Comment[fr]=Script (peut-être exécutable)
+ Comment[fy]=Skript (Wierskynlik útfierber)
+--- mimetypes/application/x-shockwave-flash.desktop (revision 488534)
++++ mimetypes/application/x-shockwave-flash.desktop (revision 494869)
+@@ -31,7 +31,7 @@
+ Comment[ms]=Media Shockwave Flash
+ Comment[mt]=Media Shockwave Flash
+ Comment[nb]=Shockware flashmedia
+-Comment[nds]=Shockwave-Flash-Datei
++Comment[nds]="Shockwave Flash"-Datei
+ Comment[nn]=Shockwave Flash-media
+ Comment[nso]=Media wa Kgadimo ya Shockwave
+ Comment[pa]=Shockwave ਫਲੈਸ਼ ਮੀਡਿਆ
+--- mimetypes/application/x-pw.desktop (revision 488534)
++++ mimetypes/application/x-pw.desktop (revision 494869)
+@@ -19,7 +19,7 @@
+ Comment[eo]=Patosa Skribildokumento
+ Comment[es]=Documento de Pathetic Writer
+ Comment[et]=Pathetic Writeri dokument
+-Comment[eu]=Pathetic Writer dokumentua
++Comment[eu]=Pathetic testu-dokumentua
+ Comment[fa]=سند Pathetic ٌWriter
+ Comment[fi]=Pathetic Writer -asiakirja
+ Comment[fr]=Document Pathetic Writer
+@@ -42,7 +42,7 @@
+ Comment[mn]=Pathetic Баримт Бичигч
+ Comment[ms]=Dokumen Pathetic Writer
+ Comment[nb]=Pathetic Writer dokument
+-Comment[nds]=Pathetic-Writer-Dokment
++Comment[nds]="Pathetic Writer"-Dokment
+ Comment[nl]=Pathetic Writer-document
+ Comment[nn]=Pathetic Writer-dokument
+ Comment[pa]=Pathetic Writer ਦਸਤਾਵੇਜ਼
+--- mimetypes/application/x-rar-compressed.desktop (revision 488534)
++++ mimetypes/application/x-rar-compressed.desktop (revision 494869)
+@@ -22,7 +22,7 @@
+ Comment[eo]=Rar-arĥivo
+ Comment[es]=Archivo RAR
+ Comment[et]=Rar arhiiv
+-Comment[eu]=Rar fitxategia
++Comment[eu]=Rar artxiboa
+ Comment[fa]=آرشیو Rar
+ Comment[fi]=Rar-paketti
+ Comment[fr]=Archive Rar
+--- mimetypes/application/x-troff-man.desktop (revision 488534)
++++ mimetypes/application/x-troff-man.desktop (revision 494869)
+@@ -17,7 +17,7 @@
+ Comment[eo]=Troff-dokumento kun "man"-makrooj
+ Comment[es]=Documento Troff con macros de páginas de Man
+ Comment[et]=Manpage makrodega troff-dokument
+-Comment[eu]=Man orri makrodun troff Dokumentua
++Comment[eu]=Troff dokumentua man eskuliburuko makroekin
+ Comment[fa]=سند Troff با ماکروهای صÙØات دستور
+ Comment[fi]=Troff-asiakirja manpage-makroilla
+ Comment[fr]=Document Troff avec macros de page de manuel
+--- mimetypes/application/x-tex-gf.desktop (revision 488534)
++++ mimetypes/application/x-tex-gf.desktop (revision 494869)
+@@ -75,4 +75,4 @@
+ Icon=gf
+ Type=MimeType
+ MimeType=application/x-tex-gf
+-Patterns=*.*gf;*.*GF;
++Patterns=*.gf;*.GF;
+--- mimetypes/application/vnd.oasis.opendocument.graphics.desktop (revision 488534)
++++ mimetypes/application/vnd.oasis.opendocument.graphics.desktop (revision 494869)
+@@ -31,7 +31,7 @@
+ Comment[lb]=OASIS-OpenDocument-Grafik
+ Comment[lt]=OASIS OpenDocument grafika
+ Comment[nb]=OASIS Ã…pen dokument grafikk
+-Comment[nds]=Grafik vun OASIS OpenDocument
++Comment[nds]="OASIS OpenDocument"-Grafik
+ Comment[nl]=OASIS OpenDocument illustraties
+ Comment[nn]=OASIS OpenDocument-teikning
+ Comment[pa]=OASIS OpenDocument ਗਰਾਫਿਕਸ
+--- mimetypes/application/x-font-bdf.desktop (revision 488534)
++++ mimetypes/application/x-font-bdf.desktop (revision 494869)
+@@ -45,7 +45,7 @@
+ Comment[ms]=Font BDF Bitmap
+ Comment[mt]=Font BDF (bitmap)
+ Comment[nb]=BDF Bitmapfont
+-Comment[nds]=BDF Bitmap-Schriftoort
++Comment[nds]=BDF-Bitmapschriftoort
+ Comment[nl]=BDF Bitmap-lettertype
+ Comment[nn]=BDF Bitmap-skrift
+ Comment[nso]=Fonto ya Bitmap ya BDF
+--- mimetypes/application/vnd.oasis.opendocument.formula.desktop (revision 488534)
++++ mimetypes/application/vnd.oasis.opendocument.formula.desktop (revision 494869)
+@@ -31,7 +31,7 @@
+ Comment[lb]=OASIS-OpenDocument-Formel
+ Comment[lt]=OASIS OpenDocument rormulÄ—
+ Comment[nb]=OASIS Ã…pent dokumentformel
+-Comment[nds]=Formel vun OASIS OpenDocument
++Comment[nds]="OASIS OpenDocument"-Formel
+ Comment[nl]=OASIS OpenDocument formule
+ Comment[nn]=OASIS OpenDocument-diagram
+ Comment[pa]=OASIS OpenDocument ਫਾਰਮੂਲਾ
+--- mimetypes/application/x-font-type1.desktop (revision 488534)
++++ mimetypes/application/x-font-type1.desktop (revision 494869)
+@@ -46,7 +46,7 @@
+ Comment[ms]=Font PostScript Type1
+ Comment[mt]=Font PostScript Type1
+ Comment[nb]=PostScript Type1-skrifttype
+-Comment[nds]=PostScript Type1-Schriftoort
++Comment[nds]=Type1-Schriftoort
+ Comment[nl]=PostScript Type1-lettertype
+ Comment[nn]=PostScript Type1-skrift
+ Comment[nso]=Fonto ya Mohuta wa pele wa PostScript
+--- mimetypes/application/msword.desktop (revision 488534)
++++ mimetypes/application/msword.desktop (revision 494869)
+@@ -48,7 +48,7 @@
+ Comment[ms]=Dokumen Microsoft Word
+ Comment[mt]=Dokument Microsoft Word
+ Comment[nb]=Microsoft Word-dokument
+-Comment[nds]=Dokment vun Microsoft Word
++Comment[nds]="Microsoft Word"-Dokment
+ Comment[nl]=Microsoft Word-document
+ Comment[nn]=Microsoft Word-dokument
+ Comment[nso]=Tokomane ya Lentsu la Microsoft
+--- mimetypes/application/ogg.desktop (revision 488534)
++++ mimetypes/application/ogg.desktop (revision 494869)
+@@ -45,6 +45,7 @@
+ Comment[mn]=Ogg Мултимедиа
+ Comment[ms]=Multimedia Ogg
+ Comment[mt]=Awdjo OGG
++Comment[nds]=Ogg-Multimediadatei
+ Comment[nl]=Ogg-multimedia
+ Comment[nn]=Ogg-multimedia
+ Comment[nso]=Media wa Bontshintshi wa Ogg
+--- mimetypes/application/vnd.stardivision.writer-global.desktop (revision 488534)
++++ mimetypes/application/vnd.stardivision.writer-global.desktop (revision 494869)
+@@ -19,7 +19,7 @@
+ Comment[eo]=Steloficeja skribila ĉefdokumento
+ Comment[es]=Documentos maestros de escritura de StarOffice
+ Comment[et]=StarOffice Writer'i peadokument
+-Comment[eu]=StarOffice Writer dokumentu maisuak
++Comment[eu]=StarOffice dokumentu maisua
+ Comment[fi]=StarOffice Writer -pääasiakirja
+ Comment[fr]=Document-maître StarOffice Writer
+ Comment[fy]=StarOffice Writer Haad Dokumint
+@@ -37,7 +37,7 @@
+ Comment[mk]=Главен документ на StarOffice Writer
+ Comment[ms]=StarOffice Dokumen Writer Utama
+ Comment[nb]=StarOffice Writer-hovuddokument
+-Comment[nds]=Vörlaag-Dokment vun Writer (StarOffice)
++Comment[nds]="StarOffice Writer"-Dokment-Vörlaag
+ Comment[nl]=StarOffice Writer-hoofddocument
+ Comment[nn]=StarOffice Writer-hovuddokument
+ Comment[pa]=ਸਟਾਰਆਫਿਸ Writer ਮਾਸਟਰ ਦਸਤਾਵੇਜ਼
+--- mimetypes/application/vnd.stardivision.writer.desktop (revision 488534)
++++ mimetypes/application/vnd.stardivision.writer.desktop (revision 494869)
+@@ -22,7 +22,7 @@
+ Comment[eo]=Steloficeja skribila dokumento
+ Comment[es]=Documento de Microsoft Writer
+ Comment[et]=StarOffice Writer'i dokument
+-Comment[eu]=StarOffice Writer dokumentua
++Comment[eu]=StarOffice testu-dokumentua
+ Comment[fa]=سند StarOffice Writer
+ Comment[fi]=StarOffice Writer -asiakirja
+ Comment[fr]=Document StarOffice Writer
+@@ -45,7 +45,7 @@
+ Comment[mn]=StarOffice-Баримт-БичÑÑч
+ Comment[ms]=Dokumen StarOffice Writer
+ Comment[nb]=StarOffice Writer-dokument
+-Comment[nds]=Dokment vun Writer (StarOffice)
++Comment[nds]="StarOffice Writer"-Dokment
+ Comment[nl]=StarOffice Writer-document
+ Comment[nn]=StarOffice Writer-dokument
+ Comment[nso]=Tokomane ya Sengwadi sa StarOffice
+--- mimetypes/application/x-pak.desktop (revision 488534)
++++ mimetypes/application/x-pak.desktop (revision 494869)
+@@ -18,7 +18,7 @@
+ Comment[el]=ΑÏχειοθήκη PAK
+ Comment[es]=Archivo de ficheros PAK
+ Comment[et]=PAK arhiiv
+-Comment[eu]=PAK fitxategi artxibategia
++Comment[eu]=PAK fitxategien artxiboa
+ Comment[fi]=PAK-paketti
+ Comment[fr]=Fichier archive PAK
+ Comment[fy]=PAK Triem Argyf
+--- mimetypes/application/x-tarz.desktop (revision 488534)
++++ mimetypes/application/x-tarz.desktop (revision 494869)
+@@ -18,7 +18,7 @@
+ Comment[eo]=Kunpremita Tar-arĥivo
+ Comment[es]=Archivo Tar comprimido
+ Comment[et]=Pakitud tar-arhiiv
+-Comment[eu]=Tar fitxategi konprimitua
++Comment[eu]=Tar artxibo konprimitua
+ Comment[fa]=آرشیو Ùشرده شده‌ی Tar
+ Comment[fi]=Pakattu Tar-paketti
+ Comment[fr]=Archive Tar compactée
+--- mimetypes/application/x-awk.desktop (revision 488534)
++++ mimetypes/application/x-awk.desktop (revision 494869)
+@@ -42,7 +42,7 @@
+ Comment[ms]=Skrip AWK
+ Comment[mt]=Skritt AWK
+ Comment[nb]=AWK-skript
+-Comment[nds]=AWK Skript
++Comment[nds]=Awk-Skript
+ Comment[nl]=AWK-script
+ Comment[nn]=AWK-skript
+ Comment[nso]=Tshwaelo ya AWK
+--- mimetypes/application/x-vnd.kde.kplato.desktop (revision 488534)
++++ mimetypes/application/x-vnd.kde.kplato.desktop (revision 494869)
+@@ -16,7 +16,7 @@
+ Comment[eo]=Projektadministrada dokumento de KPlato
+ Comment[es]=Documento de gestión de proyectos KPlato
+ Comment[et]=KPlato projektihalduse dokument
+-Comment[eu]=KPlato proiektu kudeaketa dokumentua
++Comment[eu]=KPlato proiektu kudeaketako dokumentua
+ Comment[fi]=KPlaton projektinhallinta-asiakirja
+ Comment[fr]=Document de gestion de projet KPlato
+ Comment[fy]=KPlato Projekt Management Dokumint
+@@ -34,7 +34,7 @@
+ Comment[mk]=KPlato документ за менаџмент на проект
+ Comment[ms]=Dokumen Pengurusan Projek KPlato
+ Comment[nb]=KPlato-prosjektstyringsdokument
+-Comment[nds]=KPlato-Projektpleeg-Dokment
++Comment[nds]=KPlato-Projektpleegdokment
+ Comment[nl]=KPlato Projectbeheer-document
+ Comment[nn]=KPlato-prosjektstyringsdokument
+ Comment[pa]=KPlato ਪਰੋਜੈੱਕਟ ਪਰਬੰਧਨ ਦਸਤਾਵੇਜ਼
+--- mimetypes/application/x-tar.desktop (revision 488534)
++++ mimetypes/application/x-tar.desktop (revision 494869)
+@@ -22,7 +22,7 @@
+ Comment[eo]=Tar-arĥivo
+ Comment[es]=Archivo Tar
+ Comment[et]=Tar-arhiiv
+-Comment[eu]=Tar fitxategia
++Comment[eu]=Tar artxiboa
+ Comment[fa]=آرشیو Tar
+ Comment[fi]=Tar-paketti
+ Comment[fr]=Archive Tar
+--- mimetypes/application/x-cda.desktop (revision 488534)
++++ mimetypes/application/x-cda.desktop (revision 494869)
+@@ -39,6 +39,7 @@
+ Comment[mk]=CD аудио
+ Comment[mn]=CD-Audio
+ Comment[mt]=Awdjo CD
++Comment[nds]=Audio-CD
+ Comment[nl]=CD-audio
+ Comment[nn]=CD-lyd
+ Comment[nso]=Kwagalo ya CD
+--- mimetypes/application/x-core.desktop (revision 488534)
++++ mimetypes/application/x-core.desktop (revision 494869)
+@@ -44,7 +44,7 @@
+ Comment[ms]=Data Program Rosak
+ Comment[mt]=Data ta' kraxx ta' programm
+ Comment[nb]=Krasj-data til et program
+-Comment[nds]=Afstörtbericht vun'n Programm
++Comment[nds]=Programmafstört-Daten
+ Comment[nl]=Gegevens over vastgelopen programma's
+ Comment[nn]=Programkrasj-data
+ Comment[nso]=Data ya Thulano ya Lenaneo
+--- mimetypes/application/vnd.sun.xml.draw.template.desktop (revision 488534)
++++ mimetypes/application/vnd.sun.xml.draw.template.desktop (revision 494869)
+@@ -16,7 +16,7 @@
+ Comment[eo]=Malfermoficeja desegnilÅablono
+ Comment[es]=Plantilla de dibujo de OpenOffice.org
+ Comment[et]=OpenOffice.org-i joonistusemall
+-Comment[eu]=OpenOffice.org marrazki txantiloia
++Comment[eu]=OpenOffice.org marrazkien txantiloia
+ Comment[fi]=OpenOffice.org-piirrospohja
+ Comment[fr]=Modèle de dessin OpenOffice.org
+ Comment[fy]=OpenOffice.org Drawing sjabloan
+@@ -35,7 +35,7 @@
+ Comment[mk]=OpenOffice.org шаблон за цртеж
+ Comment[ms]=OpenOffice.org Templat Lukis
+ Comment[nb]=OpenOffice.org-tegnemal
+-Comment[nds]=Teken-Vörlaag vun OpenOffice
++Comment[nds]=OpenOffice-Tekenvörlaag
+ Comment[nl]=OpenOffice.org Drawing-sjabloon
+ Comment[nn]=OpenOffice.org-teikningsmal
+ Comment[pa]=OpenOffice.org ਡਰਾਇੰਗ ਨਮੂਨਾ
+--- mimetypes/application/vnd.oasis.opendocument.chart.desktop (revision 488534)
++++ mimetypes/application/vnd.oasis.opendocument.chart.desktop (revision 494869)
+@@ -31,7 +31,7 @@
+ Comment[lb]=OASIS-OpenDocument-Diagramm
+ Comment[lt]=OASIS OpenDocument grafikas
+ Comment[nb]=OASIS Ã…pent dokumentdiagram
+-Comment[nds]= Diagramm vun OASIS OpenDocument
++Comment[nds]="OASIS OpenDocument"-Diagramm
+ Comment[nl]=OASIS OpenDocument grafiek
+ Comment[nn]=OASIS OpenDocument-diagram
+ Comment[pa]=OASIS OpenDocument ਚਾਰਟ
+--- mimetypes/application/mbox.desktop (revision 0)
++++ mimetypes/application/mbox.desktop (revision 494869)
+@@ -0,0 +1,27 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=MimeType
++MimeType=application/mbox
++Patterns=
++Comment=MBOX Mail Folder
++Comment[da]=MBOX mappe til e-mail
++Comment[de]=MBOX Mail-Ordner
++Comment[el]=Φάκελος αλληλογÏαφίας MBOX
++Comment[es]=Carpeta de correo MBOX
++Comment[et]=MBOX e-posti kaust
++Comment[fr]=Dossier de boîte aux lettres MBox
++Comment[hu]=MBOX levélmappa
++Comment[is]=MBOX póstmappa
++Comment[it]=Cartella di posta MBOX
++Comment[lb]=MBOX Mail-Dossier
++Comment[nds]=Mbox-Nettpostorner
++Comment[nl]=MBOX-postvakmap
++Comment[pt]=Pasta de Correio MBOX
++Comment[pt_BR]=Pasta de Correio MBOX
++Comment[sv]=Mbox-brevkorg
++Comment[uk]=Поштова тека MBOX
++Comment[zh_CN]=MBOX 邮件文件夹
++
++[Property::X-KDE-text]
++Type=bool
++Value=true
+--- mimetypes/message/rfc822.desktop (revision 488534)
++++ mimetypes/message/rfc822.desktop (revision 494869)
+@@ -46,7 +46,7 @@
+ Comment[ms]=Mesej Emel
+ Comment[mt]=Messaġġ imejl
+ Comment[nb]=E-postmelding
+-Comment[nds]=Email-Naricht
++Comment[nds]=Nettbreef
+ Comment[nl]=E-mailbericht
+ Comment[nn]=E-postmelding
+ Comment[nso]=Molaetsa wa E-poso
+--- mimetypes/text/rss.desktop (revision 488534)
++++ mimetypes/text/rss.desktop (revision 494869)
+@@ -38,7 +38,7 @@
+ Comment[ms]=Ringkasan Tapak RDF
+ Comment[mt]=Sommarju tas-sit RDF
+ Comment[nb]=RDF-oppsummering
+-Comment[nds]=RDF-Siet-Tosamenfaten
++Comment[nds]=RDF-Siedentosamenfaten
+ Comment[nl]=RDF-site samenvatting
+ Comment[nn]=RDF-oppsummering
+ Comment[nso]=Kakaretso ya Lefelo la RDF
+--- mimetypes/text/x-diff.desktop (revision 488534)
++++ mimetypes/text/x-diff.desktop (revision 494869)
+@@ -18,7 +18,7 @@
+ Comment[eo]=Diferencoj inter dosieroj
+ Comment[es]=Diferencias entre archivos
+ Comment[et]=Failidevaheline erinevus
+-Comment[eu]=Fitxategien arteko ezberdintasunak
++Comment[eu]=Fitxategien arteko desberdintasunak
+ Comment[fa]=اختلاÙ‌های میان پرونده‌ها
+ Comment[fi]=Tiedostojen väliset erot
+ Comment[fr]=Différences entre fichiers
+--- mimetypes/text/x-objchdr.desktop (revision 488534)
++++ mimetypes/text/x-objchdr.desktop (revision 494869)
+@@ -13,7 +13,7 @@
+ Comment[el]=ΑÏχείο κεφαλίδας Objective-C
+ Comment[es]=Archivo de cabecera de Objective-C
+ Comment[et]=Objective-C päisefail
+-Comment[eu]=Objective-C goi-buruko fitxategia
++Comment[eu]=Objective-C goiburuko fitxategia
+ Comment[fi]=Objective-C -otsikko
+ Comment[fr]=Fichier en-tête Objective-C
+ Comment[fy]=Objektive-C koptekst-bestand
+@@ -28,7 +28,7 @@
+ Comment[lb]=Objective-C-Header-Datei
+ Comment[lt]=Objective-C header byla
+ Comment[nb]=Objective-C-header-fil
+-Comment[nds]=Objective-C-Koppdatei
++Comment[nds]="Objective C"-Koppdatei
+ Comment[nl]=Objective-C-headerbestand
+ Comment[nn]=Objective C-headerfil
+ Comment[pa]=Objective-C ਸਿਰਲੇਖ ਫਾਇਲ
+--- mimetypes/text/x-bibtex.desktop (revision 488534)
++++ mimetypes/text/x-bibtex.desktop (revision 494869)
+@@ -17,7 +17,7 @@
+ Comment[eo]=Bibliografia datumo (bibtex)
+ Comment[es]=Datos bibliográficos (Bibtex)
+ Comment[et]=Bibliograafilised andmed (bibtex)
+-Comment[eu]=Datu biografikoak (Bibtex)
++Comment[eu]=Datu bibliografikoak (Bibtex)
+ Comment[fa]=داده‌ی Bibliographic (Bibtex)
+ Comment[fi]=Kirjadata (Bibtex)
+ Comment[fr]=Données bibliographiques (BibTeX)
+--- mimetypes/text/x-objcsrc.desktop (revision 488534)
++++ mimetypes/text/x-objcsrc.desktop (revision 494869)
+@@ -42,7 +42,7 @@
+ Comment[ms]=Fail Sumber C Objektif
+ Comment[mt]=Sors Objective-C
+ Comment[nb]=Objective-C-kildekode
+-Comment[nds]=Objective-C-Borndatei
++Comment[nds]="Objective C"-Borndatei
+ Comment[nl]=Objective-C-bronbestand
+ Comment[nn]=Objective C-kjelde
+ Comment[nso]=Faele ya Mothopo wa Senyakwa sa C
+--- mimetypes/text/x-xslfo.desktop (revision 488534)
++++ mimetypes/text/x-xslfo.desktop (revision 494869)
+@@ -15,7 +15,7 @@
+ Comment[eo]=XSL-dosiero kun formatobjektoj
+ Comment[es]=Archivo de objeto de formato XSL
+ Comment[et]=XSL vormindamise objektfail
+-Comment[eu]=XSL formatodun objektu fitxategia
++Comment[eu]=XSL formatuko objektu-fitxategia
+ Comment[fa]=پرونده‌ی موضوع قالبی XSL
+ Comment[fi]=XSL-muotoinen objektitiedosto
+ Comment[fr]=Fichier de formatage d'objet XSL
+@@ -38,7 +38,7 @@
+ Comment[ms]=Fail Pengformat Objek XSL
+ Comment[mt]=Fajl tal-ifformattjar XSL
+ Comment[nb]=XSL-formatert objektfil
+-Comment[nds]=XSL-Formaatobjekt-Datei
++Comment[nds]=XSL-Formaatobjekt
+ Comment[nl]=XSL Formatting Object-bestand
+ Comment[nn]=XSL-formatobjektfil
+ Comment[nso]=Faele ya Sediriswa sa Thlolo ya XSL
+--- mimetypes/text/x-c++hdr.desktop (revision 488534)
++++ mimetypes/text/x-c++hdr.desktop (revision 494869)
+@@ -17,7 +17,7 @@
+ Comment[eo]=C++-difindosiero
+ Comment[es]=Archivo de cabecera C++
+ Comment[et]=C++ päis
+-Comment[eu]=C++ goi-buruko fitxategia
++Comment[eu]=C++ goiburuko fitxategia
+ Comment[fa]=سربرگ پرونده‌ی C++
+ Comment[fi]=C++-otsikkotiedosto
+ Comment[fr]=Fichier d'en-tête C++
+--- mimetypes/text/x-moc.desktop (revision 488534)
++++ mimetypes/text/x-moc.desktop (revision 494869)
+@@ -18,7 +18,7 @@
+ Comment[eo]=Qt Meta-objekt-dosiero
+ Comment[es]=Archivo metaobjeto de Qt
+ Comment[et]=Qt metaobjektfail
+-Comment[eu]=Qt meta objektu fitxategia
++Comment[eu]=Qt meta-objektu fitxategia
+ Comment[fa]=پرونده‌ی Ùوق موضوعی Qt
+ Comment[fi]=Qt Meta -objektitiedosto
+ Comment[fr]=Fichier Méta-objet pour Qt
+@@ -40,7 +40,7 @@
+ Comment[ms]=Fail Objek Meta Qt
+ Comment[mt]=Fajl Qt Meta Object
+ Comment[nb]=Qt-metaobjektfil
+-Comment[nds]=Qt Meta-Objekt-Datei
++Comment[nds]=Qt-Metaobjekt
+ Comment[nl]=Qt-Meta-Object-bestand
+ Comment[nn]=Qt-metaobjektfil
+ Comment[nso]=Faele ya Sediriswa sa Meta wa Qt
+--- mimetypes/text/x-chdr.desktop (revision 488534)
++++ mimetypes/text/x-chdr.desktop (revision 494869)
+@@ -17,7 +17,7 @@
+ Comment[eo]=C-difinoj
+ Comment[es]=Archivo de cabecera C
+ Comment[et]=C päis
+-Comment[eu]=C goi-buruko fitxategia
++Comment[eu]=C goiburuko fitxategia
+ Comment[fa]=سربرگ پرونده‌ی C
+ Comment[fi]=C-otsikkotiedosto
+ Comment[fr]=Fichier d'en-tête C
+--- mimetypes/text/x-log.desktop (revision 488534)
++++ mimetypes/text/x-log.desktop (revision 494869)
+@@ -17,7 +17,7 @@
+ Comment[eo]=Aplikaĵa protokoldosiero
+ Comment[es]=Archivo de registro de aplicación
+ Comment[et]=Rakenduse logifail
+-Comment[eu]=Aplikazio log fitxategia
++Comment[eu]=Aplikazioen egunkari-fitxategia
+ Comment[fa]=پرونده‌ی گذارشات برنامه
+ Comment[fi]=Sovelluksen lokitiedosto
+ Comment[fr]=Fichier journal d'application
+@@ -40,7 +40,7 @@
+ Comment[ms]=Fail Log Aplikasi
+ Comment[mt]=Log ta' programm
+ Comment[nb]=Loggfil for programmer
+-Comment[nds]=Logbook vun'n Programm
++Comment[nds]=Logbook-Datei
+ Comment[nl]=Programmalogbestand
+ Comment[nn]=Loggfil for program
+ Comment[nso]=Faele ya Tsenyo ya Tshomiso
+--- mimetypes/text/x-hex.desktop (revision 488534)
++++ mimetypes/text/x-hex.desktop (revision 494869)
+@@ -17,7 +17,7 @@
+ Comment[eo]=Deksessuma objektdosierformo de Intel®
+ Comment[es]=Formato de archivo Intel® Hexadecimal Object
+ Comment[et]=Intel® 16nd-objektfaili vorming
+-Comment[eu]=Intel® Hexadecimal Object fitxategi formatua
++Comment[eu]=Intel® objektu hamaiseitarreko fitxategi formatua
+ Comment[fi]=Intel® Heksadesimaaliolion tiedostomuoto
+ Comment[fr]=Format de fichier objet hexadécimal Intel®
+ Comment[fy]=Intel® Hexadecimal Objekt Triem yndieling
+@@ -34,7 +34,7 @@
+ Comment[mk]=Intel® ХекÑадецимален формат на објектна датотека
+ Comment[ms]=Format Objek Intel® Heksadesimal
+ Comment[nb]=Intel®-heksadesimal objektfil
+-Comment[nds]=Intel® Hexadezimaalobjekt-Datei
++Comment[nds]=Datei in't "Intel® Hexadezimaal Objektdatei"-Formaat
+ Comment[nl]=Intel® Hexadecimaal Object-bestandsformaat
+ Comment[nn]=Intel®-heksadesimal objektfil
+ Comment[pa]=Intel® ਹੈਕਸਾਡੈਸੀਮਲ ਆਬਜੈਕਟ ਫਾਇਲ ਫਾਰਮਿਟ
+--- mimetypes/text/x-xslt.desktop (revision 488534)
++++ mimetypes/text/x-xslt.desktop (revision 494869)
+@@ -17,7 +17,7 @@
+ Comment[eo]=XSLT-dosiero
+ Comment[es]=Archivo de hoja de estilo XSLT
+ Comment[et]=XSLT laaditabeli fail
+-Comment[eu]=XSLT estilo orria fitxategia
++Comment[eu]=XSLT estilo-orriko fitxategia
+ Comment[fa]=پرونده‌ی صÙØه‌گسترده‌ی XSLT
+ Comment[fi]=XSLT-tyylitiedosto
+ Comment[fr]=Feuille de style XSLT
+@@ -41,7 +41,7 @@
+ Comment[ms]=Fail Gaya Lata XSLT
+ Comment[mt]=Stylesheet XSLT
+ Comment[nb]=XSLT-stilarkfil
+-Comment[nds]=XSLT-Stilvörlaag-Datei
++Comment[nds]=XSLT-Stilvörlaag
+ Comment[nl]=XSLT-stijlbladbestand
+ Comment[nn]=XSLT-stilsettfil
+ Comment[nso]=Faele ya Letlakala la Mokgwa wa XSLT
+--- mimetypes/text/x-csv.desktop (revision 488534)
++++ mimetypes/text/x-csv.desktop (revision 494869)
+@@ -21,7 +21,7 @@
+ Comment[eo]=Tekstdosiero (Komo-apartigitaj valoroj)
+ Comment[es]=Archivo de texto con valores separados por comas
+ Comment[et]=Komaga eraldatud väärtuste tekstifail
+-Comment[eu]=Komen bitartez banatutako baloredun testu fitxategia
++Comment[eu]=Komaz bereiztutako balioen testu-fitxategia
+ Comment[fa]=پرونده‌ی متن با مقادیر جدا شده توسط ویرگول
+ Comment[fi]=Pilkuilla erotettu tekstitiedosto
+ Comment[fr]=Fichier texte avec des valeurs séparées par une virgule
+@@ -45,7 +45,7 @@
+ Comment[ms]=Fail Teks dengan Nila Dipisah Koma (CSV)
+ Comment[mt]=Fajl ta' test bil-valuri separati b'virgola
+ Comment[nb]=Tekstfil med kommaseparerte verdier
+-Comment[nds]=Textdatei mit Weerten, mit Kommas optrennt
++Comment[nds]=Textdatei mit Weerten, dör Kommas optrennt
+ Comment[nl]=Tekstbestand met door komma's gescheiden waarden
+ Comment[nn]=Tekstfil med kommadelte verdiar
+ Comment[nso]=Sengwalwana seo senago le Maboleng ao a Kgaogantswego ke Difegelwana
+--- mimetypes/text/x-vcalendar.desktop (revision 488534)
++++ mimetypes/text/x-vcalendar.desktop (revision 494869)
+@@ -17,7 +17,7 @@
+ Comment[eo]=InterÅanÄdosiero por vKalendaro
+ Comment[es]=Archivo de intercambio de vCalendar
+ Comment[et]=vCalendari transpordifail
+-Comment[eu]=vCalendar elkartrukaketa fitxategia
++Comment[eu]=vCalendar elkartrukaketako fitxategia
+ Comment[fa]=پرونده‌ی تبدیل vCalendar
+ Comment[fi]=vCalendar-siirtotiedosto
+ Comment[fr]=Fichier d'échange vCalendar
+@@ -39,7 +39,7 @@
+ Comment[ms]=Fail Tukar Ganti vCalendar
+ Comment[mt]=Fajl ta' skambju vCalendar
+ Comment[nb]=vCalendar-utvekslingsfil
+-Comment[nds]=vCalendar-Kommunikatschoon-Datei
++Comment[nds]=vCalendar-Kommunikatschoondatei
+ Comment[nl]=vCalendar Interchange-bestand
+ Comment[nn]=vCalendar-delingsfil
+ Comment[nso]=Faele yago Fetosafetosa vAlemanaka
+--- mimetypes/video/mpeg.desktop (revision 488534)
++++ mimetypes/video/mpeg.desktop (revision 494869)
+@@ -44,6 +44,7 @@
+ Comment[ms]= Video MPEG
+ Comment[mt]=Video MPEG
+ Comment[nb]=MPEG-video
++Comment[nds]=MPEG-Video
+ Comment[nl]=MPEG-video
+ Comment[nn]=MPEG-video
+ Comment[nso]=Video ya MPEG
+--- mimetypes/video/quicktime.desktop (revision 488534)
++++ mimetypes/video/quicktime.desktop (revision 494869)
+@@ -42,6 +42,7 @@
+ Comment[ms]= Video Quicktime
+ Comment[mt]=Video Quicktime
+ Comment[nb]=Quicktime-video
++Comment[nds]=Quicktime-Video
+ Comment[nl]=Quicktime-video
+ Comment[nn]=Quicktime-video
+ Comment[nso]=Video ya Bonakwana
+--- mimetypes/video/x-ms-wmv.desktop (revision 488534)
++++ mimetypes/video/x-ms-wmv.desktop (revision 494869)
+@@ -39,7 +39,7 @@
+ Comment[mn]=Ð’Ð¸Ð½Ð´Ð¾Ð²Ñ ÐœÐµÐ´Ð¸Ð° Видео
+ Comment[ms]=Video Windows Media
+ Comment[nb]=Windows Media-video
+-Comment[nds]=Windows Media-Video
++Comment[nds]="Windows Media"-Video
+ Comment[nl]=Windows Media-video
+ Comment[nn]=Windows Media-video
+ Comment[pa]=ਵਿੰਡੋ ਮੀਡਿਆ ਵੀਡਿਓ
+--- mimetypes/video/x-msvideo.desktop (revision 488534)
++++ mimetypes/video/x-msvideo.desktop (revision 494869)
+@@ -44,7 +44,7 @@
+ Comment[ms]=Video Microsoft AVI
+ Comment[mt]=Video Microsoft AVI
+ Comment[nb]=Microsoft AVI-film
+-Comment[nds]=Microsoft AVI-Video
++Comment[nds]=AVI-Video (Microsoft)
+ Comment[nl]=Microsoft AVI-video
+ Comment[nn]=Microsoft AVI-video
+ Comment[nso]=Video ya AVI ya Microsoft
+--- mimetypes/video/avi.desktop (revision 488534)
++++ mimetypes/video/avi.desktop (revision 494869)
+@@ -45,7 +45,7 @@
+ Comment[ms]=Video Microsoft AVI
+ Comment[mt]=Video Microsoft AVI
+ Comment[nb]=Microsoft AVI-film
+-Comment[nds]=Microsoft AVI-Video
++Comment[nds]=AVI-Video (Microsoft)
+ Comment[nl]=Microsoft AVI-video
+ Comment[nn]=Microsoft AVI-video
+ Comment[nso]=Video ya AVI ya Microsoft
+--- mimetypes/video/mp4.desktop (revision 488534)
++++ mimetypes/video/mp4.desktop (revision 494869)
+@@ -41,6 +41,7 @@
+ Comment[mn]=MPEG-4 Видео
+ Comment[ms]=Video MPEG-4
+ Comment[nb]=MPEG-4-video
++Comment[nds]=MPEG4-Video
+ Comment[nl]=MPEG-4 video
+ Comment[nn]=MPEG-4-video
+ Comment[pa]=MPEG-4 ਵੀਡਿਓ
+--- mimetypes/video/x-flic.desktop (revision 488534)
++++ mimetypes/video/x-flic.desktop (revision 494869)
+@@ -46,7 +46,7 @@
+ Comment[ms]=Fail FLIC Autodesk
+ Comment[mt]=Fajl FLIC ta' Autodesk
+ Comment[nb]=Autodesks FLIC-filer
+-Comment[nds]=Autodesks FLIC-Datei
++Comment[nds]=FLIC-Datei vun Autodesk
+ Comment[nl]=Autodesk's FLIC-bestand
+ Comment[nn]=FLIC-filer frå Autodesk
+ Comment[nso]=Faele ya FLIC ya Autodesk
+--- mimetypes/inode/socket.desktop (revision 488534)
++++ mimetypes/inode/socket.desktop (revision 494869)
+@@ -31,7 +31,6 @@
+ Comment[mi]=Köhao
+ Comment[ms]=Soket
+ Comment[nb]=Sokkel
+-Comment[nds]=Sockel
+ Comment[nn]=Sokkel
+ Comment[nso]=Lesoba
+ Comment[pa]=ਸਾਕਟ
+--- mimetypes/inode/fifo.desktop (revision 488534)
++++ mimetypes/inode/fifo.desktop (revision 494869)
+@@ -16,7 +16,7 @@
+ Comment[eo]=Dukto
+ Comment[es]=TuberÃa
+ Comment[et]=Putk
+-Comment[eu]=Hodia
++Comment[eu]=Kanalizazioa
+ Comment[fa]=لوله
+ Comment[fi]=Putki
+ Comment[fr]=Tube de communication
+--- kioslave/file/file.cc (revision 488534)
++++ kioslave/file/file.cc (revision 494869)
+@@ -1196,7 +1196,7 @@
+ as the slave runs in the background, it's hard
+ to see for the user what the problem would be */
+ char path_buffer[PATH_MAX];
+- getcwd(path_buffer, PATH_MAX - 1);
++ (void) getcwd(path_buffer, PATH_MAX - 1);
+ if ( chdir( _path.data() ) ) {
+ if (errno == EACCES)
+ error(ERR_ACCESS_DENIED, _path);
+--- kioslave/http/kcookiejar/kcookiejar.desktop (revision 488534)
++++ kioslave/http/kcookiejar/kcookiejar.desktop (revision 494869)
+@@ -39,7 +39,7 @@
+ Name[ms]=Modul Balang Cecikut KDED
+ Name[mt]=Modulu tal-"cookies" KDED
+ Name[nb]=KDEDs modul for informasjonskapsler (Cookie Jar)
+-Name[nds]=KDED-Moduul för dat Plegen vun Kookjes
++Name[nds]=KDED-Kookjepleeg
+ Name[nl]=KDED-module voor het opslaan van cookies
+ Name[nn]=KDED-informasjonskapselmodul
+ Name[nso]=Seripa sa Jar ya Cookie ya KDED
+@@ -98,7 +98,7 @@
+ Comment[mk]=Води Ñметка за Ñите колачиња во ÑиÑтемот
+ Comment[ms]=Memerhati semua cecikut dalam sistem
+ Comment[nb]=Holder rede på alle informasjonskapsler i systemet
+-Comment[nds]=Passt op all Kookjes in't Systeem
++Comment[nds]=Passt all Kookjes in't Systeem
+ Comment[nl]=Houdt alle cookies in het systeem bij
+ Comment[nn]=Held greie på informasjonskapslane
+ Comment[pa]=ਸਿਸਟਮ ਦੇ ਸਾਰੇ ਕੂਕੀਜ਼ ਦਾ ਰਿਕਾਰਡ ਰੱਖੋ
+--- kioslave/http/webdavs.protocol (revision 488534)
++++ kioslave/http/webdavs.protocol (revision 494869)
+@@ -15,3 +15,4 @@
+ Icon=www
+ config=webdav
+ DocPath=kioslave/webdavs.html
++Class=:internet
+--- kioslave/http/http_cache_cleaner.desktop (revision 488534)
++++ kioslave/http/http_cache_cleaner.desktop (revision 494869)
+@@ -18,7 +18,7 @@
+ Name[eo]=HTTP-Tenejpurigilo
+ Name[es]=Limpiador del caché de HTTP
+ Name[et]=HTTP vahemälu puhastaja
+-Name[eu]=HTTP katxearen garbitzailea
++Name[eu]=HTTP cache-garbitzailea
+ Name[fa]=پاک‌کننده‌ی کاشه HTTP
+ Name[fi]=HTTP-välimuistin tyhjentäjä
+ Name[fr]=Nettoyage du cache HTTP
+@@ -43,7 +43,7 @@
+ Name[ms]=Pembersih Penyimpan HTTP
+ Name[mt]=Tindif tal-cache HTTP
+ Name[nb]=HTTP Mellomlagerrenser
+-Name[nds]=Reenmaker för den HTTP-Twischenspieker
++Name[nds]=Reenmaker för HTTP-Twischenspieker
+ Name[nl]=HTTP Cache opschonen
+ Name[nn]=HTTP-mellomlageropprensking
+ Name[nso]=Sehlwekisi sa Polokelo ya HTTP
+@@ -93,7 +93,7 @@
+ Comment[eo]=Forigas malnovajn erojn el HTTP-tenejo
+ Comment[es]=Elimina entradas antiguas del caché de HTTP
+ Comment[et]=Puhastab HTTP vahemälu vanadest kirjetest
+-Comment[eu]=HTTP katxearen sarrera zaharrak garbitzen ditu
++Comment[eu]=HTTP cachearen sarrera zaharrak garbitzen ditu
+ Comment[fa]=مدخل‌های قدیمی را از کاشه HTTP پاک می‌کند
+ Comment[fi]=Puhdistaa vanhat tiedot HTTP-välimuistista
+ Comment[fr]=Efface les anciennes entrées du cache HTTP
+--- kioslave/http/http.cc (revision 488534)
++++ kioslave/http/http.cc (revision 494869)
+@@ -171,8 +171,8 @@
+ QString header = (*it).lower();
+ // Do not allow Request line to be specified and ignore
+ // the other HTTP headers.
+- if (header.find(':') == -1 || header.startsWith("host") ||
+- header.startsWith("proxy-authorization") ||
++ if (header.find(':') == -1 ||
++ header.startsWith("host") ||
+ header.startsWith("via"))
+ continue;
+
+@@ -259,6 +259,7 @@
+ void HTTPProtocol::resetResponseSettings()
+ {
+ m_bRedirect = false;
++ m_redirectLocation = KURL();
+ m_bChunked = false;
+ m_iSize = NO_SIZE;
+
+@@ -1245,7 +1246,7 @@
+ retrieveContent();
+ }
+
+-void HTTPProtocol::put( const KURL &url, int, bool, bool)
++void HTTPProtocol::put( const KURL &url, int, bool overwrite, bool)
+ {
+ kdDebug(7113) << "(" << m_pid << ") HTTPProtocol::put " << url.prettyURL()
+ << endl;
+@@ -1253,6 +1254,40 @@
+ if ( !checkRequestURL( url ) )
+ return;
+
++ // Webdav hosts are capable of observing overwrite == false
++ if (!overwrite && m_protocol.left(6) == "webdav") {
++ // check to make sure this host supports WebDAV
++ if ( !davHostOk() )
++ return;
++
++ QCString request;
++ request = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>"
++ "<D:propfind xmlns:D=\"DAV:\"><D:prop>"
++ "<D:creationdate/>"
++ "<D:getcontentlength/>"
++ "<D:displayname/>"
++ "<D:resourcetype/>"
++ "</D:prop></D:propfind>";
++
++ davSetRequest( request );
++
++ // WebDAV Stat or List...
++ m_request.method = DAV_PROPFIND;
++ m_request.query = QString::null;
++ m_request.cache = CC_Reload;
++ m_request.doProxy = m_bUseProxy;
++ m_request.davData.depth = 0;
++
++ retrieveContent(true);
++
++ if (m_responseCode == 207) {
++ error(ERR_FILE_ALREADY_EXIST, QString::null);
++ return;
++ }
++
++ m_bError = false;
++ }
++
+ m_request.method = HTTP_PUT;
+ m_request.path = url.path();
+ m_request.query = QString::null;
+@@ -1332,6 +1367,31 @@
+
+ retrieveHeader( false );
+
++ if ( m_responseCode == 301 )
++ {
++ // Work around strict Apache-2 WebDAV implementation which refuses to cooperate
++ // with webdav://host/directory, instead requiring webdav://host/directory/
++ // (strangely enough it accepts Destination: without a trailing slash)
++
++ if (m_redirectLocation.protocol() == "https")
++ m_redirectLocation.setProtocol("webdavs");
++ else
++ m_redirectLocation.setProtocol("webdav");
++
++ if ( !checkRequestURL( m_redirectLocation ) )
++ return;
++
++ m_request.method = DAV_MOVE;
++ m_request.path = m_redirectLocation.path();
++ m_request.davData.desturl = newDest.url();
++ m_request.davData.overwrite = overwrite;
++ m_request.query = QString::null;
++ m_request.cache = CC_Reload;
++ m_request.doProxy = m_bUseProxy;
++
++ retrieveHeader( false );
++ }
++
+ if ( m_responseCode == 201 )
+ davFinished();
+ else
+@@ -2335,18 +2395,6 @@
+
+ header += " HTTP/1.1\r\n"; /* start header */
+
+- // Support old HTTP/1.0 style keep-alive header for compatability
+- // purposes as well as performance improvements while giving end
+- // users the ability to disable this feature proxy servers that
+- // don't not support such feature, e.g. junkbuster proxy server.
+- if (!m_bUseProxy || m_bPersistentProxyConnection || m_bIsTunneled)
+- header += "Connection: Keep-Alive\r\n";
+- else
+- header += "Connection: close\r\n";
+-
+- if ( m_bPersistentProxyConnection )
+- header += "Proxy-Connection: Keep-Alive\r\n";
+-
+ if (!m_request.userAgent.isEmpty())
+ {
+ header += "User-Agent: ";
+@@ -2507,6 +2555,15 @@
+ if ( m_state.doProxy && !m_bIsTunneled )
+ header += proxyAuthenticationHeader();
+
++ // Support old HTTP/1.0 style keep-alive header for compatability
++ // purposes as well as performance improvements while giving end
++ // users the ability to disable this feature proxy servers that
++ // don't not support such feature, e.g. junkbuster proxy server.
++ if (!m_bUseProxy || m_bPersistentProxyConnection || m_bIsTunneled)
++ header += "Connection: Keep-Alive\r\n";
++ else
++ header += "Connection: close\r\n";
++
+ if ( m_protocol == "webdav" || m_protocol == "webdavs" )
+ {
+ header += davProcessLocks();
+@@ -3530,6 +3587,7 @@
+ return false;
+ }
+ m_bRedirect = true;
++ m_redirectLocation = u;
+
+ if (!m_request.id.isEmpty())
+ {
+@@ -4884,7 +4942,7 @@
+ //************************** AUTHENTICATION CODE ********************/
+
+
+-void HTTPProtocol::configAuth( char *p, bool b )
++void HTTPProtocol::configAuth( char *p, bool isForProxy )
+ {
+ HTTP_AUTH f = AUTH_None;
+ const char *strAuth = p;
+@@ -4913,7 +4971,7 @@
+ {
+ // if we get two 401 in a row let's assume for now that
+ // Negotiate isn't working and ignore it
+- if ( !b && !(m_responseCode == 401 && m_prevResponseCode == 401) )
++ if ( !isForProxy && !(m_responseCode == 401 && m_prevResponseCode == 401) )
+ {
+ f = AUTH_Negotiate;
+ memcpy((void *)p, "Negotiate", 9); // Correct for upper-case variations.
+@@ -4921,8 +4979,7 @@
+ };
+ }
+ #endif
+- else if ( strncasecmp( p, "NTLM", 4 ) == 0 &&
+- (( b && m_bPersistentProxyConnection ) || !b ) )
++ else if ( strncasecmp( p, "NTLM", 4 ) == 0 )
+ {
+ f = AUTH_NTLM;
+ memcpy((void *)p, "NTLM", 4); // Correct for upper-case variations.
+@@ -4933,7 +4990,7 @@
+ {
+ kdWarning(7113) << "(" << m_pid << ") Unsupported or invalid authorization "
+ << "type requested" << endl;
+- if (b)
++ if (isForProxy)
+ kdWarning(7113) << "(" << m_pid << ") Proxy URL: " << m_proxyURL << endl;
+ else
+ kdWarning(7113) << "(" << m_pid << ") URL: " << m_request.url << endl;
+@@ -4947,7 +5004,7 @@
+ and when multiple Proxy-Authenticate or WWW-Authenticate
+ header field is sent.
+ */
+- if (b)
++ if (isForProxy)
+ {
+ if ((f == AUTH_None) ||
+ ((m_iProxyAuthCount > 0) && (f < ProxyAuthentication)))
+@@ -4986,7 +5043,7 @@
+ p += 6;
+ if (*p == '"') p++;
+ while( p[i] && p[i] != '"' ) i++;
+- if( b )
++ if( isForProxy )
+ m_strProxyRealm = QString::fromLatin1( p, i );
+ else
+ m_strRealm = QString::fromLatin1( p, i );
+@@ -4995,7 +5052,7 @@
+ p+=(i+1);
+ }
+
+- if( b )
++ if( isForProxy )
+ {
+ ProxyAuthentication = f;
+ m_strProxyAuthorization = QString::fromLatin1( strAuth );
+@@ -5460,7 +5517,8 @@
+
+ if ( isForProxy )
+ {
+- auth = "Proxy-Authorization: NTLM ";
++ auth = "Proxy-Connection: Keep-Alive\r\n";
++ auth += "Proxy-Authorization: NTLM ";
+ user = m_proxyURL.user();
+ passwd = m_proxyURL.pass();
+ strauth = m_strProxyAuthorization.latin1();
+--- kioslave/http/http.h (revision 488534)
++++ kioslave/http/http.h (revision 494869)
+@@ -74,7 +74,7 @@
+ port = 0;
+ doProxy = false;
+ }
+-
++
+ QString hostname;
+ QString encoded_hostname;
+ short unsigned int port;
+@@ -91,7 +91,7 @@
+ overwrite = false;
+ depth = 0;
+ }
+-
++
+ QString desturl;
+ bool overwrite;
+ int depth;
+@@ -100,7 +100,7 @@
+ /** The request for the current connection **/
+ struct HTTPRequest
+ {
+- HTTPRequest ()
++ HTTPRequest ()
+ {
+ port = 0;
+ method = KIO::HTTP_UNKNOWN;
+@@ -118,9 +118,9 @@
+ bErrorPage = false;
+ bUseCookiejar = false;
+ expireDate = 0;
+- creationDate = 0;
++ creationDate = 0;
+ }
+-
++
+ QString hostname;
+ QString encoded_hostname;
+ short unsigned int port;
+@@ -143,8 +143,8 @@
+ QString id;
+ DAVRequest davData;
+
+- bool bNoAuth; // Do not authenticate
+-
++ bool bNoAuth; // Do not authenticate
++
+ // Cache related
+ QString cef; // Cache Entry File belonging to this URL.
+ bool bUseCache; // Whether the cache is active
+@@ -190,7 +190,7 @@
+ virtual void slave_status();
+
+ virtual void get( const KURL& url );
+- virtual void put( const KURL& url, int _mode, bool _overwrite,
++ virtual void put( const KURL& url, int _mode, bool overwrite,
+ bool _resume );
+
+ //----------------- Re-implemented methods for WebDAV -----------
+@@ -293,7 +293,7 @@
+ void httpCheckConnection(); // Check whether to keep connection.
+
+ void forwardHttpResponseHeader();
+-
++
+ bool readHeader();
+
+ bool sendBody();
+@@ -400,7 +400,7 @@
+ * Resets settings related to parsing a response.
+ */
+ void resetResponseSettings();
+-
++
+ /**
+ * Resets any per connection settings. These are different from
+ * per-session settings in that they must be invalidates every time
+@@ -476,6 +476,7 @@
+
+ //--- Settings related to a single response only
+ QStringList m_responseHeader; // All headers
++ KURL m_redirectLocation;
+ bool m_bRedirect; // Indicates current request is a redirection
+
+ // Processing related
+@@ -503,8 +504,8 @@
+ QStringList m_qContentEncodings;
+ QString m_sContentMD5;
+ QString m_strMimeType;
+-
+
++
+ //--- WebDAV
+ // Data structure to hold data which will be passed to an internal func.
+ QByteArray m_bufWebDavData;
+@@ -529,7 +530,7 @@
+ //--- Proxy related members
+ bool m_bUseProxy;
+ bool m_bNeedTunnel; // Whether we need to make a SSL tunnel
+- bool m_bIsTunneled; // Whether we have an active SSL tunnel
++ bool m_bIsTunneled; // Whether we have an active SSL tunnel
+ bool m_bProxyAuthValid;
+ int m_iProxyPort;
+ KURL m_proxyURL;
+--- kioslave/http/webdav.protocol (revision 488534)
++++ kioslave/http/webdav.protocol (revision 494869)
+@@ -15,3 +15,4 @@
+ Icon=www
+ maxInstances=3
+ DocPath=kioslave/webdav.html
++Class=:internet
+--- kimgio/g3.kimgio (revision 488534)
++++ kimgio/g3.kimgio (revision 494869)
+@@ -16,7 +16,7 @@
+ Name[eo]=CCITT-G3-fakso
+ Name[es]=Fax CCITT G3
+ Name[et]=CCITT g3 fax
+-Name[eu]=CCITT G3 Faxa
++Name[eu]=CCITT G3 faxa
+ Name[fa]=دورنگار CCITT G3
+ Name[fi]=CCITT G3 -faksi
+ Name[fr]=Fax CCITT G3
+@@ -39,6 +39,7 @@
+ Name[mn]=CCITT G3 ФакÑ
+ Name[ms]=Faks CCITT G3
+ Name[nb]=CCITT G3-Faks
++Name[nds]=CCITT-G3-Fax
+ Name[nl]=CCITT G3-fax
+ Name[nn]=CCITT G3-Faks
+ Name[pa]=CCITT G3 ਫੈਕਸ
+--- kimgio/hdr.kimgio (revision 488534)
++++ kimgio/hdr.kimgio (revision 494869)
+@@ -10,6 +10,7 @@
+ Name[el]=Εικόνα υψηλής δυναμικής πεÏιοχής
+ Name[es]=Imagen de gran rango dinámico
+ Name[et]=High Dynamic Range pildifail
++Name[eu]=Dinamika Altuko Barruti irudia
+ Name[fi]=Korkeatasoinen muuttuvien arvoalueiden kuva
+ Name[fr]=Image à définition dynamique haute
+ Name[fy]=High Dynamic Range-ôfbylding
+@@ -21,7 +22,7 @@
+ Name[km]=រូបភាព​ជួរ​ážáž¶áž˜ážœážŽáŸ’ដ​ážáŸ’ពស់
+ Name[lb]=High-Dynamic-Range-Bild
+ Name[nb]=Bilde med høyt dynamisk område
+-Name[nds]=High Dynamic Range Bild
++Name[nds]="High Dynamic Range"-Bild
+ Name[nl]=High Dynamic Range-afbeelding
+ Name[nn]=Bilete med stort dynamikkområde
+ Name[pl]=Obrazek HDR (High Dynamic Range)
+--- kimgio/psd.kimgio (revision 488534)
++++ kimgio/psd.kimgio (revision 494869)
+@@ -13,6 +13,7 @@
+ Name[el]=Εικόνα Adobe Photoshop
+ Name[es]=Imagen Photoshop de Adobe
+ Name[et]=Adobe Photoshop pildifail
++Name[eu]=Adobe Photoshop irudia
+ Name[fi]=Adobe Photoshop -kuva
+ Name[fr]=Image Adobe Photoshop
+ Name[fy]=Adobe Photoshop-ôfbylding
+--- kimgio/eps.kimgio (revision 488534)
++++ kimgio/eps.kimgio (revision 494869)
+@@ -19,7 +19,7 @@
+ Name[eo]=EPS-bildo
+ Name[es]=Imagen PostScript encapsulada
+ Name[et]=Kapseldatud PostScript pildifail
+-Name[eu]=PostScript irudi enkapsulatua
++Name[eu]=Kapsulatutako PostScript irudia
+ Name[fa]=تصویر PostScript کپسوله شده
+ Name[fi]=Encapsulated PostScript (EPS) -kuva
+ Name[fr]=Image PostScript encapsulée
+@@ -43,7 +43,7 @@
+ Name[mn]=ХайрцаглаÑан PostScript зураг
+ Name[ms]=Imej PostScript Terenkapsul
+ Name[nb]=Innkapslede PostScript-bilder
+-Name[nds]=EPS-Bild (Encapsulated PostScript)
++Name[nds]=EPS-Bild
+ Name[nl]=Encapsulated PostScript-afbeelding
+ Name[nn]=Encapsulated PostScript-bilete
+ Name[pa]=ਸਮੇਟਿਆ ਪੋਸਟ-ਸਕà©à¨°à¨¿à¨ªà¨Ÿ ਚਿੱਤਰ
+--- kimgio/dds.kimgio (revision 488534)
++++ kimgio/dds.kimgio (revision 494869)
+@@ -11,6 +11,7 @@
+ Name[da]=Overflade til direkte tegning
+ Name[de]=Oberfläche für Direct Draw
+ Name[eo]=Rekta desegnosurfaco
++Name[eu]=Zuzeneko marrazketarako gainazala
+ Name[fi]=Suora piirtotaso
+ Name[fr]=Surface Direct Draw
+ Name[gl]=Debuxar SuperfÃcie Directamente
+@@ -23,7 +24,7 @@
+ Name[lv]=Direct Draw virsma
+ Name[ms]=Permukaan Direct Draw
+ Name[nb]=Overflate for direktetegning
+-Name[nds]=Böversiet för Direct Draw
++Name[nds]=Böversiet för "Direct Draw"
+ Name[nl]=Direct beeldgeheugen
+ Name[nn]=Overflate for direkteteikning
+ Name[pa]=ਸਿੱਧਾ ਖਿੱਚਿਆ ਤਲ
+--- kimgio/tga.kimgio (revision 488534)
++++ kimgio/tga.kimgio (revision 494869)
+@@ -43,7 +43,7 @@
+ Name[mn]=Truevision Targa Зураг
+ Name[ms]=Imej Truevision Targa
+ Name[nb]=Truevision Targa-bilde
+-Name[nds]=Truevision Targa-Bild
++Name[nds]="Truevision Targa"-Bild
+ Name[nl]=Truevision Targa-afbeelding
+ Name[nn]=Truevision Targa-bilete
+ Name[pa]=Truevision Targa ਚਿੱਤਰ
+--- kimgio/exr.kimgio (revision 488534)
++++ kimgio/exr.kimgio (revision 494869)
+@@ -28,7 +28,7 @@
+ Name[mk]=ILM EXR Ñлика Kimgio
+ Name[ms]=Imej Kimgio ILM EXR
+ Name[nb]=ILM EXR-bilde Kimgio
+-Name[nds]=ILM-EXR-Bild
++Name[nds]="ILM EXR Image"-Kimgio
+ Name[nl]=ILM EXR Kimgio-afbeelding
+ Name[nn]=ILM EXR-bilete Kimgio
+ Name[pa]=ILM EXR ਚਿੱਤਰ ਕੀਮਗੀਓ
+--- kio/magic (revision 488534)
++++ kio/magic (revision 494869)
+@@ -638,17 +638,24 @@
+ # mail.news: file(1) magic for mail and news
+ #
+ # There are tests to ascmagic.c to cope with mail and news.
++
+ 0 string Relay-Version: message/rfc822
+ 0 string #!\ rnews message/rfc822
+ 0 string N#!\ rnews message/rfc822
+ 0 string Forward\ to message/rfc822
+ 0 string Pipe\ to message/rfc822
+ 0 string Return-Path: message/rfc822
+-0 string Path: message/news
+-0 string Xref: message/news
+-0 string From: message/rfc822
+-0 string Article message/news
++0 string Return-Path: message/rfc822
++0 string Path: message/news
++0 string Xref: message/news
++0 string From: message/rfc822
++0 string From\x20 application/mbox
++0 string Article message/news
++#0 string BABYL message/x-gnu-rmail
++0 string Received: message/rfc822
+
++
++
+ # TNEF files...
+ 0 lelong 0x223E9F78 application/ms-tnef
+
+@@ -865,15 +872,6 @@
+ 0 short 0xcafe
+ >2 short 0xbabe application/x-java
+
+-# news and mail
+-0 string Return-Path: message/rfc822
+-0 string Path: message/news
+-0 string Xref: message/news
+-0 string From: message/rfc822
+-0 string Article message/news
+-#0 string BABYL message/x-gnu-rmail
+-0 string Received: message/rfc822
+-
+ # vcard / vcalendar
+ 0 string BEGIN:VCALENDAR text/x-vcalendar
+ 0 string begin:vcalendar text/x-vcalendar
+--- kio/kfileplugin.desktop (revision 488534)
++++ kio/kfileplugin.desktop (revision 494869)
+@@ -18,7 +18,7 @@
+ Name[eo]=Dosierinterdatuma kromaĵo
+ Name[es]=Plugin de meta datos KFile
+ Name[et]=KFile'i metaandmete plugin
+-Name[eu]=KFile meta datuen plugina
++Name[eu]=KFile metadatuen plugin-a
+ Name[fa]=متصل‌کننده‌ی Ùوق داده‌ی KFile
+ Name[fi]=KFile-metatietolisäosa
+ Name[fr]=Module externe de métadonnées KFile
+--- kio/kio/kacl.cpp (revision 488534)
++++ kio/kio/kacl.cpp (revision 494869)
+@@ -13,8 +13,8 @@
+
+ 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., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+ // $Id: kacl.cpp 424977 2005-06-13 15:13:22Z tilladam $
+
+--- kio/kio/posixacladdons.h (revision 488534)
++++ kio/kio/posixacladdons.h (revision 494869)
+@@ -14,7 +14,7 @@
+ * 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., *
+- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
+ ***************************************************************************/
+
+ #ifndef __posixacladdons_h__
+--- kio/kio/posixacladdons.cpp (revision 488534)
++++ kio/kio/posixacladdons.cpp (revision 494869)
+@@ -14,7 +14,7 @@
+ * 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., *
+- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
+ ***************************************************************************/
+
+ #include "posixacladdons.h"
+--- kio/kio/sessiondata.cpp (revision 488534)
++++ kio/kio/sessiondata.cpp (revision 494869)
+@@ -14,8 +14,8 @@
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; see the file COPYING.LIB. If not,
+- write to the Free Software Foundation, Inc., 59 Temple Place -
+- Suite 330, Boston, MA 02110-1301, USA.
++ write to the Free Software Foundation, Inc., 51 Franklin Street,
++ Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include <qptrlist.h>
+--- kio/kio/kacl.h (revision 488534)
++++ kio/kio/kacl.h (revision 494869)
+@@ -13,8 +13,8 @@
+
+ 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., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef __kacl_h__
+--- kio/kio/kdirwatch.cpp (revision 488534)
++++ kio/kio/kdirwatch.cpp (revision 494869)
+@@ -98,6 +98,8 @@
+
+ #endif
+
++#include <sys/utsname.h>
++
+ #include "kdirwatch.h"
+ #include "kdirwatch_p.h"
+ #include "global.h" // KIO::probably_slow_mounted
+@@ -108,8 +110,6 @@
+
+ #ifdef HAVE_DNOTIFY
+
+-#include <sys/utsname.h>
+-
+ static int dnotify_signal = 0;
+
+ /* DNOTIFY signal handler
+@@ -210,8 +210,9 @@
+ */
+
+ KDirWatchPrivate::KDirWatchPrivate()
++ : rescan_timer(0, "KDirWatchPrivate::rescan_timer")
+ {
+- timer = new QTimer(this);
++ timer = new QTimer(this, "KDirWatchPrivate::timer");
+ connect (timer, SIGNAL(timeout()), this, SLOT(slotRescan()));
+ freq = 3600000; // 1 hour as upper bound
+ statEntries = 0;
+@@ -254,6 +255,19 @@
+ supports_inotify = false;
+ }
+
++ {
++ struct utsname uts;
++ int major, minor, patch;
++ if (uname(&uts) < 0)
++ supports_inotify = false; // *shrug*
++ else if (sscanf(uts.release, "%d.%d.%d", &major, &minor, &patch) != 3)
++ supports_inotify = false; // *shrug*
++ else if( major * 1000000 + minor * 1000 + patch < 2006014 ) { // <2.6.14
++ kdDebug(7001) << "Can't use INotify, Linux kernel too old" << endl;
++ supports_inotify = false;
++ }
++ }
++
+ if ( supports_inotify ) {
+ int wd = inotify_add_watch ( m_inotify_fd, "/", 0x800 );
+ if (wd > 0) {
+@@ -406,7 +420,7 @@
+ if ( path.length() && isNoisyFile( path.latin1() ) )
+ continue;
+
+- kdDebug() << "ev wd: " << event->wd << " mask " << event->mask << " path: " << path << endl;
++ kdDebug(7001) << "ev wd: " << event->wd << " mask " << event->mask << " path: " << path << endl;
+
+ // now we're in deep trouble of finding the
+ // associated entries
+@@ -419,13 +433,13 @@
+
+ if ( 1 || e->isDir) {
+ if( event->mask & IN_DELETE_SELF) {
+- kdDebug() << "-->got deleteself signal for " << e->path << endl;
++ kdDebug(7001) << "-->got deleteself signal for " << e->path << endl;
+ e->m_status = NonExistent;
+ //(void) inotify_rm_watch( m_inotify_fd, e->wd );
+ addEntry(0, QDir::cleanDirPath(e->path+"/.."), e, true);
+ }
+ if ( event->mask & IN_CREATE ) {
+- kdDebug() << "-->got create subfile signal for " << e->path << endl;
++ kdDebug(7001) << "-->got create subfile signal for " << e->path << endl;
+
+ Entry *sub_entry = e->m_entries.first();
+ for(;sub_entry; sub_entry = e->m_entries.next())
+@@ -913,7 +927,7 @@
+ #endif
+
+ #ifdef HAVE_INOTIFY
+- kdDebug() << "inotify remove " << ( e->m_mode == INotifyMode ) << " " << ( e->m_status == Normal ) << endl;
++ kdDebug(7001) << "inotify remove " << ( e->m_mode == INotifyMode ) << " " << ( e->m_status == Normal ) << endl;
+ if (e->m_mode == INotifyMode) {
+ if ( e->m_status == Normal ) {
+ (void) inotify_rm_watch( m_inotify_fd, e->wd );
+--- kio/kio/passdlg.h (revision 488534)
++++ kio/kio/passdlg.h (revision 494869)
+@@ -13,8 +13,8 @@
+
+ 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., 59 Temple
+- Place - Suite 330, Boston, MA 02110-1301, USA.
++ not, write to the Free Software Foundation, Inc., 51 Franklin Street,
++ Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef __kio_pass_dlg_h__
+--- kio/kio/sessiondata.h (revision 488534)
++++ kio/kio/sessiondata.h (revision 494869)
+@@ -14,8 +14,8 @@
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; see the file COPYING.LIB. If not,
+- write to the Free Software Foundation, Inc., 59 Temple Place -
+- Suite 330, Boston, MA 02110-1301, USA.
++ write to the Free Software Foundation, Inc., 51 Franklin Street,
++ Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef __KIO_SESSIONDATA_H
+--- kio/kio/kmimetypechooser.cpp (revision 488534)
++++ kio/kio/kmimetypechooser.cpp (revision 494869)
+@@ -262,7 +262,8 @@
+ setMainWidget(m_chooser);
+
+ KConfigGroup group( KGlobal::config(), "KMimeTypeChooserDialog");
+- resize( group.readSizeEntry("size", new QSize(400,300)) );
++ QSize defaultSize( 400, 300 );
++ resize( group.readSizeEntry("size", &defaultSize) );
+ }
+
+ KMimeTypeChooserDialog::KMimeTypeChooserDialog(
+@@ -280,7 +281,8 @@
+ setMainWidget(m_chooser);
+
+ KConfigGroup group( KGlobal::config(), "KMimeTypeChooserDialog");
+- resize( group.readSizeEntry("size", new QSize(400,300)) );
++ QSize defaultSize( 400, 300 );
++ resize( group.readSizeEntry("size", &defaultSize) );
+ }
+
+
+--- kio/renamedlgplugin.desktop (revision 488534)
++++ kio/renamedlgplugin.desktop (revision 494869)
+@@ -19,7 +19,7 @@
+ Comment[eo]=Kromaĵo por la alinoma dialogo
+ Comment[es]=Plugin para el diálogo de renombrado
+ Comment[et]=Ãœmbernimetamise dialoogi plugin
+-Comment[eu]=Berrizendatze elkarrizketarako plugina
++Comment[eu]=Berrizendatze elkarrizketa-koadroen plugin-a
+ Comment[fa]=متصل‌کننده برای Ù…Øاوره‌ی تغییر نام
+ Comment[fi]=Lisäosa uudelleennimeämisikkunalle
+ Comment[fr]=Module externe pour la boîte de dialogue de renommage
+--- kio/kfile/kdirselectdialog.cpp (revision 488534)
++++ kio/kfile/kdirselectdialog.cpp (revision 494869)
+@@ -34,6 +34,7 @@
+ #include <klocale.h>
+ #include <kprotocolinfo.h>
+ #include <krecentdirs.h>
++#include <kshell.h>
+ #include <kurl.h>
+ #include <kurlcompletion.h>
+ #include <kurlpixmapprovider.h>
+@@ -374,7 +375,7 @@
+ {
+ if ( d->branch )
+ {
+- KURL url = KURL::fromPathOrURL( text );
++ KURL url = KURL::fromPathOrURL( KShell::tildeExpand( text ) );
+ KFileTreeViewItem *item = d->branch->findTVIByURL( url );
+ if ( item )
+ {
+--- kio/kfile/kacleditwidget.h (revision 488534)
++++ kio/kfile/kacleditwidget.h (revision 494869)
+@@ -15,7 +15,7 @@
+ * 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., *
+- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
+ ***************************************************************************/
+ #ifndef KACLEDITWIDGET_H
+ #define KACLEDITWIDGET_H
+--- kio/kfile/knotifydialog.cpp (revision 488534)
++++ kio/kfile/knotifydialog.cpp (revision 494869)
+@@ -1085,11 +1085,11 @@
+ e->description = kc->readEntry( comment );
+ e->dontShow = kc->readNumEntry("nopresentation", 0 );
+ e->configGroup = *it;
+-
+- if ( e->name.isEmpty() || e->description.isEmpty() )
++ if ( e->name.isEmpty() && e->description.isEmpty() )
+ delete e;
+-
+ else { // load the event
++ if( !e->name.isEmpty() && e->description.isEmpty() )
++ e->description = e->name;
+ // default to passive popups over plain messageboxes
+ int default_rep = kc->readNumEntry("default_presentation",
+ 0 | KNotifyClient::PassivePopup);
+--- kio/kfile/kpropsdlgplugin.desktop (revision 488534)
++++ kio/kfile/kpropsdlgplugin.desktop (revision 494869)
+@@ -20,7 +20,7 @@
+ Comment[eo]=Internaĵo por la Eco-dialogo
+ Comment[es]=Plugin para el diálogo de propiedades
+ Comment[et]=Omaduste dialoogi plugin
+-Comment[eu]=Ezaugarrien elkarrizketarako plugina
++Comment[eu]=Propietateen elkarrizketa-koadroaren plugin-a
+ Comment[fa]=متصل‌کننده برای Ù…Øاوره‌ی امکانات
+ Comment[fi]=Lisäosa asetusikkunalle
+ Comment[fr]=Module externe pour la boîte de dialogue des propriétés
+--- kio/kfile/kdiroperator.cpp (revision 488534)
++++ kio/kfile/kdiroperator.cpp (revision 494869)
+@@ -1244,6 +1244,10 @@
+ void KDirOperator::setupActions()
+ {
+ myActionCollection = new KActionCollection( this, "KDirOperator::myActionCollection" );
++ // ensure our actions get caught even when we aren't the only widget around
++ // e.g. the file dialog
++ myActionCollection->setWidget(topLevelWidget());
++
+ actionMenu = new KActionMenu( i18n("Menu"), myActionCollection, "popupMenu" );
+ upAction = KStdAction::up( this, SLOT( cdUp() ), myActionCollection, "up" );
+ upAction->setText( i18n("Parent Folder") );
+--- kio/kfile/kacleditwidget_p.h (revision 488534)
++++ kio/kfile/kacleditwidget_p.h (revision 494869)
+@@ -15,7 +15,7 @@
+ * 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., *
+- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
+ ***************************************************************************/
+ #ifndef KACLEDITWIDGET_P_H
+ #define KACLEDITWIDGET_P_H
+@@ -93,6 +93,9 @@
+ const KACL getDefaultACL() const { return getDefaultACL(); }
+ KACL getDefaultACL();
+
++ QPixmap getYesPixmap() const { return *m_yesPixmap; }
++ QPixmap getYesPartialPixmap() const { return *m_yesPartialPixmap; }
++
+ public slots:
+ void slotAddEntry();
+ void slotEditEntry();
+@@ -116,6 +119,8 @@
+ bool m_allowDefaults;
+ QStringList m_allUsers;
+ QStringList m_allGroups;
++ QPixmap* m_yesPixmap;
++ QPixmap* m_yesPartialPixmap;
+ };
+
+ class EditACLEntryDialog : public KDialogBase
+--- kio/kfile/kacleditwidget.cpp (revision 488534)
++++ kio/kfile/kacleditwidget.cpp (revision 494869)
+@@ -15,7 +15,7 @@
+ * 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., *
+- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
+ ***************************************************************************/
+
+
+@@ -37,7 +37,6 @@
+ #include <qlayout.h>
+ #include <qwidgetstack.h>
+ #include <qheader.h>
+-#include <qpixmapcache.h>
+
+ #include <klocale.h>
+ #include <kfileitem.h>
+@@ -56,16 +55,17 @@
+
+ #include "images.h"
+
+-static const struct {
++static struct {
+ const char* label;
+- const char* pixmap;
++ const char* pixmapName;
++ QPixmap* pixmap;
+ } s_itemAttributes[] = {
+- { I18N_NOOP( "Owner" ), "user-grey" },
+- { I18N_NOOP( "Owning Group" ), "group-grey" },
+- { I18N_NOOP( "Others" ), "others-grey" },
+- { I18N_NOOP( "Mask" ), "mask" },
+- { I18N_NOOP( "Named User" ), "user" },
+- { I18N_NOOP( "Named Group" ), "group" },
++ { I18N_NOOP( "Owner" ), "user-grey", 0 },
++ { I18N_NOOP( "Owning Group" ), "group-grey", 0 },
++ { I18N_NOOP( "Others" ), "others-grey", 0 },
++ { I18N_NOOP( "Mask" ), "mask", 0 },
++ { I18N_NOOP( "Named User" ), "user", 0 },
++ { I18N_NOOP( "Named Group" ), "group", 0 },
+ };
+
+ KACLEditWidget::KACLEditWidget( QWidget *parent, const char *name )
+@@ -214,23 +214,23 @@
+ unsigned int partialPerms = value;
+
+ if ( value & ACL_READ )
+- setPixmap( 2, *QPixmapCache::find("yes") );
++ setPixmap( 2, m_pACLListView->getYesPixmap() );
+ else if ( partialPerms & ACL_READ )
+- setPixmap( 2, *QPixmapCache::find("yespartial") );
++ setPixmap( 2, m_pACLListView->getYesPartialPixmap() );
+ else
+ setPixmap( 2, QPixmap() );
+
+ if ( value & ACL_WRITE )
+- setPixmap( 3, *QPixmapCache::find("yes") );
++ setPixmap( 3, m_pACLListView->getYesPixmap() );
+ else if ( partialPerms & ACL_WRITE )
+- setPixmap( 3, *QPixmapCache::find("yespartial") );
++ setPixmap( 3, m_pACLListView->getYesPartialPixmap() );
+ else
+ setPixmap( 3, QPixmap() );
+
+ if ( value & ACL_EXECUTE )
+- setPixmap( 4, *QPixmapCache::find("yes") );
++ setPixmap( 4, m_pACLListView->getYesPixmap() );
+ else if ( partialPerms & ACL_EXECUTE )
+- setPixmap( 4, *QPixmapCache::find("yespartial") );
++ setPixmap( 4, m_pACLListView->getYesPartialPixmap() );
+ else
+ setPixmap( 4, QPixmap() );
+ }
+@@ -262,10 +262,8 @@
+ idx = KACLListView::OWNER_IDX;
+ break;
+ }
+- QPixmap *pic = QPixmapCache::find( s_itemAttributes[idx].pixmap );
+- assert( pic );
+- setPixmap( 0, *pic );
+ setText( 0, s_itemAttributes[idx].label );
++ setPixmap( 0, *s_itemAttributes[idx].pixmap );
+ if ( isDefault )
+ setText( 0, text( 0 ) + i18n( " (Default)" ) );
+ setText( 1, qualifier );
+@@ -538,14 +536,11 @@
+ header()->setClickEnabled( false );
+
+ // Load the avatars
+- if ( !QPixmapCache::find( s_itemAttributes[OWNER_IDX].pixmap ) ) {
+- for ( int i=0; i < LAST_IDX; i++ ) {
+- QPixmapCache::insert( s_itemAttributes[i].pixmap,
+- qembed_findImage( s_itemAttributes[i].pixmap ) );
+- }
+- QPixmapCache::insert( "yes", qembed_findImage( "yes" ) );
+- QPixmapCache::insert( "yespartial", qembed_findImage( "yespartial" ) );
++ for ( int i=0; i < LAST_IDX; ++i ) {
++ s_itemAttributes[i].pixmap = new QPixmap( qembed_findImage( s_itemAttributes[i].pixmapName ) );
+ }
++ m_yesPixmap = new QPixmap( qembed_findImage( "yes" ) );
++ m_yesPartialPixmap = new QPixmap( qembed_findImage( "yespartial" ) );
+
+ setSelectionMode( QListView::Extended );
+
+@@ -570,7 +565,11 @@
+
+ KACLListView::~KACLListView()
+ {
+-
++ for ( int i=0; i < LAST_IDX; ++i ) {
++ delete s_itemAttributes[i].pixmap;
++ }
++ delete m_yesPixmap;
++ delete m_yesPartialPixmap;
+ }
+
+ QStringList KACLListView::allowedUsers( bool defaults, KACLListViewItem *allowedItem )
+@@ -979,17 +978,18 @@
+ * either no name user or group entry, which means the mask can be
+ * removed, or don't remove it, but reset it. That is allowed. */
+ if ( item->type == Mask ) {
+- if ( !item->isDefault && !needsMask ) {
++ bool itemWasDefault = item->isDefault;
++ if ( !itemWasDefault && !needsMask ) {
+ m_hasMask= false;
+ m_mask = 0;
+ delete item;
+- } else if ( item->isDefault && !needsDefaultMask ) {
++ } else if ( itemWasDefault && !needsDefaultMask ) {
+ delete item;
+ } else {
+ item->value = 0;
+ item->repaint();
+ }
+- if ( !item->isDefault )
++ if ( !itemWasDefault )
+ calculateEffectiveRights();
+ } else {
+ // for the base permissions, disable them, which is what libacl does
+--- kio/kdatatool.desktop (revision 488534)
++++ kio/kdatatool.desktop (revision 494869)
+@@ -18,7 +18,7 @@
+ Comment[eo]=Datumilo
+ Comment[es]=Herramienta KDE de datos
+ Comment[et]=KDE andmete rakendus
+-Comment[eu]=KDEren datu tresna
++Comment[eu]=KDEren datuen tresna
+ Comment[fa]=ابزار داده‌ی KDE
+ Comment[fi]=KDE:n datatyökalu
+ Comment[fr]=Outil de données KDE
+--- kio/misc/kssld/kssld.desktop (revision 488534)
++++ kio/misc/kssld/kssld.desktop (revision 494869)
+@@ -46,7 +46,7 @@
+ Name[ms]=Modul Daemon KSSL
+ Name[mt]=Modulu daemon KSSL
+ Name[nb]=KSSL nisse-modul
+-Name[nds]=KSSL-Dämoon-Moduul
++Name[nds]=KSSL-Dämoon
+ Name[nl]=KSSL daemon-module
+ Name[nn]=KSSL-nissemodul
+ Name[nso]=Seripa sa Daemon ya KSSL
+@@ -108,7 +108,7 @@
+ Comment[mk]=KSSL даемон модул за KDED
+ Comment[ms]=Modul Daemon KSSL untuk KDED
+ Comment[nb]=KSSL nissemodul for KDED
+-Comment[nds]=KSSL-Dämoon för KDED
++Comment[nds]=KSSL-Dämoonmoduul för KDED
+ Comment[nl]=KSSL daemon-module voor KDED
+ Comment[nn]=KSSL-nissemodul for KDED
+ Comment[pa]=KDED ਲਈ KSSL ਪੇਸ਼ਕਾਰੀ
+--- kio/misc/mms.protocol (revision 488534)
++++ kio/misc/mms.protocol (revision 494869)
+@@ -31,7 +31,7 @@
+ Description[lb]=Microsoft-Media Server-Protokoll
+ Description[lt]=Microsoft media serverio protokolas
+ Description[lv]=Microsoft Media Server protokols
+-Description[nds]=Protokoll vun den Microsoft-Medienserver
++Description[nds]=Microsoft-Medienserverprotokoll
+ Description[nl]=Microsoft Media Server-protocol
+ Description[nn]=Microsoft Media Server-protokoll
+ Description[pa]=Microsoft Media ਸਰਵਰ ਪà©à¨°à©‹à¨Ÿà©‹à¨•à¨¾à¨²
+--- kio/misc/kwalletd/kwalletd.desktop (revision 488534)
++++ kio/misc/kwalletd/kwalletd.desktop (revision 494869)
+@@ -44,7 +44,7 @@
+ Name[mn]=KWallet Daemon Модул
+ Name[ms]=Modul Daemon KWallet
+ Name[nb]=KWallet nisseprogramtillegg
+-Name[nds]=KWallet-Dämoon-Moduul
++Name[nds]=KWallet-Dämoon
+ Name[nl]=KWallet daemon-module
+ Name[nn]=KWallet-nissemodul
+ Name[pa]=KWallet ਪੇਸ਼ਕਾਰੀ ਮੈਡੀਊਲ
+@@ -99,7 +99,7 @@
+ Comment[mk]=KWallet даемон модул за KDED
+ Comment[ms]=Modul Daemon KWallet untuk KDED
+ Comment[nb]=KWallet nissemodul for KDED
+-Comment[nds]=KWallet-Dämoon för KDED
++Comment[nds]=KWallet-Dämoonmoduul för KDED
+ Comment[nl]=KWallet daemon-module voor KDED
+ Comment[nn]=KWallet-nissemodul for KDED
+ Comment[pa]=KDED ਲਈ KWallet ਪੇਸ਼ਕਾਰੀ ਮੈਡੀਊਲ
+--- kio/misc/kpac/eventsrc (revision 488534)
++++ kio/misc/kpac/eventsrc (revision 494869)
+@@ -85,7 +85,7 @@
+ Name[eo]=Nevalida prokurila skripto
+ Name[es]=Procedimiento inválido del proxy
+ Name[et]=Vigane proxy skript
+-Name[eu]=Proxy script baliogabekoa
++Name[eu]=Proxy-aren script baliogabea
+ Name[fa]=نوشتک پراکسی بی‌اعتبار
+ Name[fi]=Virheellinen proxy-skripti
+ Name[fr]=Script de proxy non valable
+@@ -107,7 +107,7 @@
+ Name[mn]=Хүчингүй итгÑмжилÑгч Ñкрипт
+ Name[ms]=Skrip proksi tidak sah
+ Name[nb]=Ugyldig mellomtjenerskript
+-Name[nds]=Proxy-Skript löppt nich
++Name[nds]=Proxyskript gellt nich
+ Name[nl]=Ongeldig proxyscript
+ Name[nn]=Ugyldig mellomtenarskript
+ Name[pa]=ਗਲਤ ਪਰਾਕਸੀ ਸਕà©à¨°à¨¿à¨ªà¨Ÿ
+@@ -149,7 +149,7 @@
+ Comment[eo]=La ÅarÄita prokuragordoskript estas nevalida
+ Comment[es]=El procedimiento descargado para la configuración del proxy es inválido
+ Comment[et]=Allalaaditud proxy seadistuse skript on vigane
+-Comment[eu]=Jaitsitako proxyaren konfigurazio scripta baliogabekoa da
++Comment[eu]=Deskargatutako proxy-aren konfigurazioko script-a baliogabea da
+ Comment[fa]=نوشتک تنظیم پراکسی بارگیری شده بی‌اعتبار می‌باشد
+ Comment[fi]=Ladattu proxy-asetusskripti on virheellinen
+ Comment[fr]=Le script téléchargé de configuration du proxy n'est pas valable
+@@ -170,7 +170,7 @@
+ Comment[mn]=ТатагдÑан итгÑмжилÑгч тохируулгын Ñкрипт хүчингүй
+ Comment[ms]=Skrip penyelarasan proksi yang dimuat turun tidak sah
+ Comment[nb]=Det nedlastede skriptet for mellomtjener-innstillinger er ugyldig
+-Comment[nds]=Dat weer keen Skript för't Instellen vun den Proxy
++Comment[nds]=Dat Skript för't Instellen vun den Proxy gellt nich
+ Comment[nl]=Het opgehaalde proxyconfiguratiescript is ongeldig
+ Comment[nn]=Det nedlasta skriptet for mellomtenaroppsett er ugyldig
+ Comment[pa]=ਡਾਊਨਲੋਡ ਪਰਾਕਸੀ ਸੰਰਚਨਾ ਸਕà©à¨°à¨¿à¨ªà¨Ÿ ਜਾਇਜ਼ ਨਹੀਂ ਹੈ
+@@ -215,7 +215,7 @@
+ Name[eo]=Skripta ÅarÄeraro
+ Name[es]=Error de descarga del procedimiento
+ Name[et]=Viga skripti allalaadimisel
+-Name[eu]=Errorea script-a jeistean
++Name[eu]=Errorea script-a deskargatzean
+ Name[fa]=خطای بارگیری نوشتک
+ Name[fi]=Skriptin latausvirhe
+ Name[fr]=Erreur de téléchargement du script
+@@ -239,7 +239,7 @@
+ Name[mn]=Скрипт татахад алдаа
+ Name[ms]=Ralat muat turun skrip
+ Name[nb]=Skript nedlastingsfeil
+-Name[nds]=Fehler bi't daalladen vun'n Skript
++Name[nds]=Skript-Daallaadfehler
+ Name[nl]=Fout bij downloaden van script
+ Name[nn]=Feil ved skriptnedlasting
+ Name[pa]=ਸਕà©à¨°à¨¿à¨ªà¨Ÿ ਡਾਊਨਲੋਡ ਗਲਤੀ
+@@ -281,7 +281,7 @@
+ Comment[eo]=Ne eblas ÅarÄi la prokuragordoskripton
+ Comment[es]=El procedimiento de configuración del proxy no se pudo descargar
+ Comment[et]=Proxy seadistuse skripti ei õnnestu alla laadida
+-Comment[eu]=Proxyaren konfigurazio script-a ezin izan da jeitsi
++Comment[eu]=Proxy-aren konfigurazioko script-a ezin izan da deskargatu
+ Comment[fa]=بارگیری نوشتک تنظیم پراکسی امکان‌پذیر نبود
+ Comment[fi]=Proxyn asetusskriptiä ei voitu ladata
+ Comment[fr]=Le script de configuration du proxy n'a pas pu être téléchargé
+@@ -347,7 +347,7 @@
+ Name[eo]=Skripta ruleraro
+ Name[es]=Error de evaluación del procedimiento
+ Name[et]=Viga skripti käivitamisel
+-Name[eu]=Script-aren ebaluazio errorea
++Name[eu]=Script-aren ebaluazioko errorea
+ Name[fa]=خطای ارزیابی نوشتک
+ Name[fi]=Skriptin määritysvirhe
+ Name[fr]=Erreur d'évaluation du script
+@@ -369,7 +369,7 @@
+ Name[mn]=Скрипт үнÑлÑÑ…Ñд алдаа
+ Name[ms]=Ralat penilaian skrip
+ Name[nb]=Skript evalueringsfeil
+-Name[nds]=Fehler bi't Pröven vun'n Skript
++Name[nds]=Skript-Pröövfehler
+ Name[nl]=Fout bij evalueren van script
+ Name[nn]=Feil ved skriptevaluering
+ Name[pa]=ਸਕà©à¨°à¨¿à¨ªà¨Ÿ à¨à¨µà©‚ਲੇਸ਼ਨ ਗਲਤੀ
+@@ -431,7 +431,7 @@
+ Comment[mn]=итгÑмжилÑгч тохируулгын Ñкрипт ажиллуулж байхад алдаа
+ Comment[ms]=Terdapat ralat melaksanakan skrip penyelarasan proksi
+ Comment[nb]=Det oppsto en alvorlig feil under kjøringen av skriptet for mellomtjener-innstillinger
+-Comment[nds]=Bi't Utföhren vun dat Proxy-Instellenskript hett dat'n Fehler geven
++Comment[nds]=Bi't Utföhren vun dat Proxy-Instellenskript hett dat en Fehler geven
+ Comment[nl]=Er deed zich een fout voor tijdens het uitvoeren van het proxyconfiguratiescript
+ Comment[nn]=Feil ved køyring av skript for mellomtenaroppsett
+ Comment[pa]=ਪਰਾਕਸੀ ਸੰਰਚਨਾ ਸਕà©à¨°à¨¿à¨ªà¨Ÿ ਚਲਾਉਣ ਵਿੱਚ ਗਲਤੀ ਆਈ ਹੈ
+--- kio/misc/kio_uiserver.desktop (revision 488534)
++++ kio/misc/kio_uiserver.desktop (revision 494869)
+@@ -6,7 +6,7 @@
+ Name[fy]=Kio_uiserver
+ Name[ja]=kio_uiサーãƒ
+ Name[mn]=График гадаргуугийн Ñервер
+-Name[nds]=Server för de graafsche Böversiet
++Name[nds]=kio_uiserver, Server för de graafsche Böversiet
+ Name[nl]=Kio_uiserver
+ Name[nso]=kio_uiseabi
+ Name[ro]=Kio_uiserver
+@@ -30,7 +30,7 @@
+ Comment[eo]=Progresinforma servo
+ Comment[es]=Servidor UI de información de progreso de KDE
+ Comment[et]=KDE edenemise info UI server
+-Comment[eu]=KDEren progresio-informazio UI zerbitzaria
++Comment[eu]=KDEren progresio-informazioen UI zerbitzaria
+ Comment[fa]=کارگزار واسطه‌ی کاریر اطلاعات پیشرÙت KDE
+ Comment[fi]=KDE:n edistymispalkin käyttöliittymäpalvelin
+ Comment[fr]=Serveur graphique d'infos de progression de KDE
+--- kio/tests/kacltest.h (revision 488534)
++++ kio/tests/kacltest.h (revision 494869)
+@@ -13,8 +13,8 @@
+
+ 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., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef KACLTEST_H
+--- kio/tests/kacltest.cpp (revision 488534)
++++ kio/tests/kacltest.cpp (revision 494869)
+@@ -13,8 +13,8 @@
+
+ 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., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include "kacltest.h"
+--- kio/kurifilterplugin.desktop (revision 488534)
++++ kio/kurifilterplugin.desktop (revision 494869)
+@@ -43,7 +43,7 @@
+ Name[ms]=Plug masuk Pelayar Ekstra
+ Name[mt]=Plagin għal browsing estiż
+ Name[nb]=Programtillegg for utvidet nettlesing
+-Name[nds]=Verwiedert Stövern
++Name[nds]=Nettkiekverwiedern-Plugin
+ Name[nl]=Verbeterd Browsen Plugin
+ Name[nn]=Programtillegg for forbetring av nettlesaren
+ Name[nso]=Tsenyo yeo e Hlohleleditswego ya Boinyakisi
+--- kio/kcomprfilter.desktop (revision 488534)
++++ kio/kcomprfilter.desktop (revision 494869)
+@@ -18,7 +18,7 @@
+ Name[eo]=KDE-kunpremo-filtrilo
+ Name[es]=Filtro de compresión de KDE
+ Name[et]=KDE pakkimise filter
+-Name[eu]=KDEren konpresio iragazkia
++Name[eu]=KDEren konpresio-iragazkia
+ Name[fa]=صاÙÛŒ Ùشرده سازی KDE
+ Name[fi]=KDE:n pakkaussuodin
+ Name[fr]=Filtre de compression de KDE
+@@ -43,7 +43,7 @@
+ Name[ms]=Penapis Pemadatan KDE
+ Name[mt]=Filtru tal-kompressjoni KDE
+ Name[nb]=Komprimeringsfilter for KDE
+-Name[nds]=KDE-Filter för't Kumprimeren
++Name[nds]=KDE-Komprimerenfilter
+ Name[nl]=KDE Compressiefilter
+ Name[nn]=KDE Kompresjonsfilter
+ Name[nso]=Sesekodi sa Pitleletso ya KDE
+--- kio/data.protocol (revision 488534)
++++ kio/data.protocol (revision 494869)
+@@ -15,7 +15,7 @@
+ Description[el]=Ένα kioslave για URI δεδομÎνων (rfc2397)
+ Description[es]=Un kioslave para datos URIs (rfc2397)
+ Description[et]=Andme-URI-de I/O-moodul (rfc2397)
+-Description[eu]=Datu URLen (rfc2397) kioslave-a
++Description[eu]=Datuen URLen (rfc2397) kioslave-a
+ Description[fi]=kioslave data URI:lle (rfc2397)
+ Description[fr]=Un module d'entrée / sortie pour les URI de données (rfc2397)
+ Description[fy]=In kioslave foar data-URI-adresse (rfc2397)
+@@ -29,7 +29,7 @@
+ Description[lb]=E kioslave fir Donnéen-URIs (rfc2397)
+ Description[lt]=Antrinė KDE programa duomenų URI (rfc2397)
+ Description[nb]=kioslave for data URI-er (rfc2397)
+-Description[nds]=Een kioslave för Daten-URIs (rfc2397)
++Description[nds]=In-/Utgaavmoduul för Daten-URIs (rfc2397)
+ Description[nl]=Een kioslave voor data-URI-adressen (rfc2397)
+ Description[nn]=A kioslave for data URI-ar (rfc2397)
+ Description[pa]= ਡਾਟਾ URI ਲਈ kioslave(rfc2397)
+--- kio/kcmodule.desktop (revision 488534)
++++ kio/kcmodule.desktop (revision 494869)
+@@ -20,7 +20,7 @@
+ Name[eo]=KDE Agordmodulo
+ Name[es]=Módulo de control de KDE
+ Name[et]=KDE juhtimismoodul
+-Name[eu]=KDEren kontrol modulua
++Name[eu]=KDEren kontrol-modulua
+ Name[fa]=بخش کنترل KDE
+ Name[fi]=KDE:n ohjausmoduuli
+ Name[fr]=Module de configuration de KDE
+--- kio/kpasswdserver.desktop (revision 488534)
++++ kio/kpasswdserver.desktop (revision 494869)
+@@ -19,7 +19,7 @@
+ Name[eo]=KDED-pasvortmodulo
+ Name[es]=Módulo de contraseña de KDED
+ Name[et]=KDED parooli moodul
+-Name[eu]=KDEDren pasahitz modulua
++Name[eu]=KDEDren pasahitz-modulua
+ Name[fa]=بخش واژه‌ی رمز KDED
+ Name[fi]=KDED-salasanamoduuli
+ Name[fr]=Module de mot de passe KDED
+@@ -86,7 +86,7 @@
+ Comment[el]=ΥποστήÏιξη Ï€ÏοσωÏινής αποθήκευσης ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασης
+ Comment[es]=Soporte de caché de contraseñas
+ Comment[et]=Parooli meelespidamise toetus
+-Comment[eu]=Pasahitzen cache euskarria
++Comment[eu]=Pasahitzen cachearen euskarria
+ Comment[fi]=Salasanojen välimuistituki
+ Comment[fr]=Gestion du cache des mots de passe
+ Comment[fy]=Wachtwurd caching stype
+--- kio/kssl/ksslcertificate.cc (revision 488534)
++++ kio/kssl/ksslcertificate.cc (revision 494869)
+@@ -958,15 +958,13 @@
+ QByteArray qba;
+ #ifdef KSSL_HAVE_SSL
+ unsigned int certlen = d->kossl->i2d_X509(getCert(), NULL);
+-// These should technically be unsigned char * but it doesn't matter
+-// for our purposes
+-char *cert = new char[certlen];
+-char *p = cert;
++unsigned char *cert = new unsigned char[certlen];
++unsigned char *p = cert;
+ // FIXME: return code!
+- d->kossl->i2d_X509(getCert(), (unsigned char **)&p);
++ d->kossl->i2d_X509(getCert(), &p);
+
+ // encode it into a QString
+- qba.duplicate(cert, certlen);
++ qba.duplicate((const char*)cert, certlen);
+ delete[] cert;
+ #endif
+ return qba;
+--- kio/kssl/ksslsession.cc (revision 488534)
++++ kio/kssl/ksslsession.cc (revision 494869)
+@@ -47,18 +47,16 @@
+ QByteArray qba;
+ SSL_SESSION *session = static_cast<SSL_SESSION*>(_session);
+ unsigned int slen = KOpenSSLProxy::self()->i2d_SSL_SESSION(session, 0L);
+-// These should technically be unsigned char * but it doesn't matter
+-// for our purposes
+-char *csess = new char[slen];
+-char *p = csess;
++unsigned char *csess = new unsigned char[slen];
++unsigned char *p = csess;
+
+- if (!KOpenSSLProxy::self()->i2d_SSL_SESSION(session, (unsigned char **)&p)) {
++ if (!KOpenSSLProxy::self()->i2d_SSL_SESSION(session, &p)) {
+ delete[] csess;
+ return QString::null;
+ }
+
+ // encode it into a QString
+- qba.duplicate(csess, slen);
++ qba.duplicate((const char*)csess, slen);
+ delete[] csess;
+ rc = KCodecs::base64Encode(qba);
+ #endif
+--- kstyles/riscos/riscos.themerc (revision 488534)
++++ kstyles/riscos/riscos.themerc (revision 494869)
+@@ -233,6 +233,7 @@
+ Name[cs]=Risc OS
+ Name[de]=RISC-OS
+ Name[eo]=Risc-OS
++Name[eu]=RISC SE
+ Name[fa]=RISC سیستم‌عامل
+ Name[hi]=रिसà¥à¤• ओà¤à¤¸(RISC OS)
+ Name[ko]=ë¦¬ìŠ¤í¬ OS
+@@ -262,7 +263,7 @@
+ Comment[eo]=Risc OS - simila stilo
+ Comment[es]=Tema tipo RISC OS
+ Comment[et]=RISC OS-laadne teema
+-Comment[eu]=RISC OSen antzeko gaia
++Comment[eu]=RISC SEen antzeko gaia
+ Comment[fa]=Ø·Ø±Ø Ø´Ø¨ÛŒÙ‡ سیستم عامل RISC
+ Comment[fi]=RISC OS:n kaltainen tyyli
+ Comment[fr]=Thème similaire à RISC OS
+--- kstyles/themes/light-v2.themerc (revision 488534)
++++ kstyles/themes/light-v2.themerc (revision 494869)
+@@ -15,7 +15,7 @@
+ Name[eo]=Lumstilo, 2a eldono
+ Name[es]=Estilo ligero, 2nda revisión
+ Name[et]=Light Style, 2. versioon
+-Name[eu]=Light Style, 2. berrikuspena
++Name[eu]=Argi-estiloa, 2. berrikuspena
+ Name[fa]=سبک نور، نسخه‌ی دوم
+ Name[fi]=Light Style, toinen versio
+ Name[fr]=Style lumière, 2ème version
+@@ -84,7 +84,7 @@
+ Comment[eo]=Dua eldono de la simpla kaj eleganta fenestrostilo 'Lumo'.
+ Comment[es]=Segunda revisión del elegante estilo de widgets 'Ligero'.
+ Comment[et]=Lihtsa ja elegantse 'Light' stiili teine versioon
+-Comment[eu]='Light' widget estilo sinple eta dotorearen 2. berrikuspena.
++Comment[eu]='Argi' trepetaren estilo sinple eta dotorearen 2. berrikuspena.
+ Comment[fa]=انتشار دوم سبک تکه‌ی ساده و زیبای 'نور'.
+ Comment[fi]=Toinen versio yksinkertaisesta ja elegantista Light-tyylistä
+ Comment[fr]=Deuxième version du style graphique « Lumière », simple et élégant.
+@@ -107,7 +107,7 @@
+ Comment[ms]=Revisi kedua untuk gaya wijet 'Light' yang ringkas dan elegan.
+ Comment[mt]=It-tieni reviżjoni tal-istil sempliċi u eleganti "Light"
+ Comment[nb]=Andre utgave av den enkle og elegante elementstilen «Lett».
+-Comment[nds]=Tweet Överarbeiden vun den eenfachen un smucken 'Light'-Stil.
++Comment[nds]=Tweet Överarbeiden vun den eenfachen un smucken "Light"-Stil.
+ Comment[nl]=Tweede herziening van de eenvoudige en elegante widgetstijl 'Light'
+ Comment[nn]=Andre utgåva av den enkle og elegante stilen «Lett».
+ Comment[nso]=Ponoleswa ya bobedi ya mokgwa wa widget wo bonolo wo botsana ebile wo 'Bofefo'.
+--- kstyles/themes/light-v3.themerc (revision 488534)
++++ kstyles/themes/light-v3.themerc (revision 494869)
+@@ -15,7 +15,7 @@
+ Name[eo]=Lumo-stilo, 3a eldono
+ Name[es]=Estilo Ligero, 3era revisión
+ Name[et]=Light Style, 3. versioon
+-Name[eu]=Light Style, 3. berrikuspena
++Name[eu]=Argi-estiloa, 3. berrikuspena
+ Name[fa]=سبک نور، نسخه‌ی سوم
+ Name[fi]=Light-tyyli, kolmas versio
+ Name[fr]=Style lumière, 3ème version
+@@ -84,7 +84,7 @@
+ Comment[eo]=Tria eldono de la simpla kaj eleganta fenstrostilo 'Lumo'.
+ Comment[es]=Tercera revisión del elegante estilo de widgets 'Ligero'.
+ Comment[et]=Lihtsa ja elegantse 'Light' stiili kolmas versioon
+-Comment[eu]='Light' widget estilo sinple eta dotorearen 3. berrikuspena.
++Comment[eu]='Argi' trepetaren estilo sinple eta dotorearen 3. berrikuspena.
+ Comment[fa]=انتشار سوم سبک تکه‌ی ساده و زیبای 'نور'.
+ Comment[fi]=Kolmas versio yksinkertaisesta ja elegantista Light-tyylistä
+ Comment[fr]=Troisième version du style graphique « Lumière », simple et élégant.
+@@ -107,7 +107,7 @@
+ Comment[ms]=Revisi ketiga untuk gaya wijet 'Light' yang ringkas dan elegan.
+ Comment[mt]=It-tielet reviżjoni tal-istil sempliċi u eleganti "Light"
+ Comment[nb]=Tredje utgave av den enkle og elegante elementstilen «Lett».
+-Comment[nds]=Drütt Överarbeiden vun den eenfachen un smucken 'Light'-Stil.
++Comment[nds]=Drütt Överarbeiden vun den eenfachen un smucken "Light"-Stil.
+ Comment[nl]=Derde herziening van de eenvoudige en elegante widgetstijl 'Light'
+ Comment[nn]=Tredje utgåva av den enkle og elegante stilen «Lett».
+ Comment[nso]=Ponoleswa ya boraro ya mokgwa wa widget wo bonolo wo mmotsana ebile wo 'Bofefo'.
+--- kstyles/themes/qtplatinum.themerc (revision 488534)
++++ kstyles/themes/qtplatinum.themerc (revision 494869)
+@@ -38,7 +38,7 @@
+ Comment[eo]=Originala Platena stilo neetosa
+ Comment[es]=Estilo incorporado Platinum sin tema
+ Comment[et]=Qt Platinum teemata stiil
+-Comment[eu]=Temarik gabeko Platinum estiloa
++Comment[eu]=Gairik gabeko Platinum estiloa
+ Comment[fa]=سبک پلاتینم بدون Ø·Ø±Ø ØªÙˆÚ©Ø§Ø±
+ Comment[fi]=Sisäänrakennettu teemoittamaton Platinium-tyyli
+ Comment[fr]=Style Platinum d'origine sans thème
+--- kstyles/themes/qtwindows.themerc (revision 488534)
++++ kstyles/themes/qtwindows.themerc (revision 494869)
+@@ -26,7 +26,7 @@
+ Comment[eo]=Senetosa Vindozo-9x-stilo
+ Comment[es]=Estilo incorporado Windows 9x sin tema
+ Comment[et]=Qt Windows9x-laadne teemata stiil
+-Comment[eu]=Temarik gabeko Windows 9x estiloa
++Comment[eu]=Gairik gabeko Windows 9x estiloa
+ Comment[fa]=سبک ویندوز Û¹x بدون Ø·Ø±Ø ØªÙˆÚ©Ø§Ø±
+ Comment[fi]=Sisäänrakennettu teemoittamaton Windows 9x-tyyli
+ Comment[fr]=Style Windows 9x d'origine sans thème
+--- kstyles/themes/qtcde.themerc (revision 488534)
++++ kstyles/themes/qtcde.themerc (revision 494869)
+@@ -20,7 +20,7 @@
+ Comment[eo]=Originala CDE-stilo neetosa
+ Comment[es]=Estilo incorporado CDE sin tema
+ Comment[et]=Qt CDE-laadne teemata stiil
+-Comment[eu]=Temarik gabeko CDE estiloa
++Comment[eu]=Gairik gabeko CDE estiloa
+ Comment[fa]=سبک CDE بدون Ø·Ø±Ø ØªÙˆÚ©Ø§Ø±
+ Comment[fi]=Sisäänrakennettu teemoittamaton CDE-tyyli
+ Comment[fr]=Style CDE d'origine sans thème
+--- kstyles/themes/qtmotif.themerc (revision 488534)
++++ kstyles/themes/qtmotif.themerc (revision 494869)
+@@ -25,7 +25,7 @@
+ Comment[eo]=Originala Motif-stilo neetosa
+ Comment[es]=Estilo incorporado Motif sin tema
+ Comment[et]=Qt Motif'i-laadne teemata stiil
+-Comment[eu]=Temarik gabeko Motif estiloa
++Comment[eu]=Gairik gabeko Motif estiloa
+ Comment[fa]=سبک موتی٠بدون Ø·Ø±Ø ØªÙˆÚ©Ø§Ø±
+ Comment[fi]=Sisäänrakennettu teemoittamaton Motif-tyyli
+ Comment[fr]=Style Motif d'origine sans thème
+--- kstyles/themes/keramik.themerc (revision 488534)
++++ kstyles/themes/keramik.themerc (revision 494869)
+@@ -35,6 +35,7 @@
+ Comment[el]=Ένα στυλ που χÏησιμοποιεί alphablending
+ Comment[es]=Un estilo que utiliza mezcla alfa
+ Comment[et]=Alfablendingut kasutav stiil
++Comment[eu]=Alfa kanala darabilen estilo lehenetsia
+ Comment[fi]=Alphasekoitusta käyttävä tyyli
+ Comment[fr]=Un style utilisant l'alpha-blending
+ Comment[fy]=In styl dy brûk makket fan alfaminging
+--- kstyles/themes/default.themerc (revision 488534)
++++ kstyles/themes/default.themerc (revision 494869)
+@@ -16,6 +16,7 @@
+ Name[eo]=Klasika KDE
+ Name[es]=KDE clásico
+ Name[et]=KDE vaikestiil
++Name[eu]=KDE Klasikoa
+ Name[fa]=KDE کلاسیک
+ Name[fi]=KDE:n klassikkotyyli
+ Name[fr]=KDE Classique
+@@ -79,7 +80,7 @@
+ Comment[eo]=Origina KDE-stilo
+ Comment[es]=Estilo KDE clásico
+ Comment[et]=KDE vaikestiil
+-Comment[eu]=Classic KDE estiloa
++Comment[eu]=KDEren estilo klasikoa
+ Comment[fa]=سبک کلاسیک KDE
+ Comment[fi]=KDE:n klassikkotyyli
+ Comment[fr]=Style classique de KDE
+--- kstyles/themes/kstep.themerc (revision 488534)
++++ kstyles/themes/kstep.themerc (revision 494869)
+@@ -40,7 +40,7 @@
+ Comment[eo]=Next-simila stilo neetosa
+ Comment[es]=Estilo tipo NeXT sin tema
+ Comment[et]=NeXT'i-laadne teemata stiil
+-Comment[eu]=Temarik gabeko Next estiloa
++Comment[eu]=Gairik gabeko Next estiloa
+ Comment[fa]=سبک شبیه Next بدون طرØ
+ Comment[fi]=Teemoittamaton Next:n kaltainen tyyli
+ Comment[fr]=Style sans thème similaire à NeXT
+--- kstyles/themes/qtmotifplus.themerc (revision 488534)
++++ kstyles/themes/qtmotifplus.themerc (revision 494869)
+@@ -31,7 +31,7 @@
+ Comment[eo]=Enkonstruita etendita Motif-stilo
+ Comment[es]=Estilo incorporado Motif mejorado
+ Comment[et]=Qt täiustatud Motif'i-laadne stiil
+-Comment[eu]=Temarik gabeko Motif estilo hobetua
++Comment[eu]=Gairik gabeko Motif estilo hobetua
+ Comment[fa]=سبک موتی٠مترقی توکار
+ Comment[fi]=Sisäänrakennettu paranneltu Motif-tyyli
+ Comment[fr]=Style Motif amélioré d'origine
+--- kstyles/themes/beos.themerc (revision 488534)
++++ kstyles/themes/beos.themerc (revision 494869)
+@@ -20,7 +20,7 @@
+ Comment[eo]=BeOS-simila stilo neetosa
+ Comment[es]=Estilo tipo BeOS sin tema
+ Comment[et]=BeOS'i-laadne teemata stiil
+-Comment[eu]=Temarik gabeko BeOS estiloa
++Comment[eu]=Gairik gabeko BeOS estiloa
+ Comment[fa]=سبک شبیه Beos بدون طرØ
+ Comment[fi]=Teemoittamaton BeOS:n kaltainen tyyli
+ Comment[fr]=Style sans thème similaire à BeOS
+--- kstyles/plastik/config/plastikconf.cpp (revision 488534)
++++ kstyles/plastik/config/plastikconf.cpp (revision 494869)
+@@ -126,11 +126,11 @@
+ connect(drawTriangularExpander, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
+ connect(inputFocusHighlight, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
+ connect(customOverHighlightColor, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
+- connect(overHighlightColor, SIGNAL( changed(QColor) ), SLOT( updateChanged() ) );
++ connect(overHighlightColor, SIGNAL( changed(const QColor&) ), SLOT( updateChanged() ) );
+ connect(customFocusHighlightColor, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
+- connect(focusHighlightColor, SIGNAL( changed(QColor) ), SLOT( updateChanged() ) );
++ connect(focusHighlightColor, SIGNAL( changed(const QColor&) ), SLOT( updateChanged() ) );
+ connect(customCheckMarkColor, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
+- connect(checkMarkColor, SIGNAL( changed(QColor) ), SLOT( updateChanged() ) );
++ connect(checkMarkColor, SIGNAL( changed(const QColor&) ), SLOT( updateChanged() ) );
+ if ( customOverHighlightColor->isChecked() )
+ overHighlightColor->setEnabled(true);
+ else
+--- kstyles/plastik/plastik.themerc (revision 488534)
++++ kstyles/plastik/plastik.themerc (revision 494869)
+@@ -51,7 +51,7 @@
+ Comment[lv]=VienkÄrÅ¡s un tÄ«rs stils
+ Comment[mk]=ЕдноÑтавен и чиÑÑ‚ Ñтил
+ Comment[nb]=En enkel og ren stil
+-Comment[nds]=Een eenfachen un smucken Stil
++Comment[nds]=En eenfache un smucke Stil
+ Comment[nl]=Een eenvoudige en schone stijl
+ Comment[nn]=Ein enkel og rein stil
+ Comment[pa]=ਇੱਕ ਸਧਾਰਨ ਤੇ ਸਾਫ਼ ਸ਼ੈਲੀ
+--- kstyles/highcontrast/highcontrast.themerc (revision 488534)
++++ kstyles/highcontrast/highcontrast.themerc (revision 494869)
+@@ -23,7 +23,7 @@
+ Name[lb]=HéichKontrast
+ Name[lt]=Didelis kontrastas
+ Name[nb]=HøyKontrast
+-Name[nds]=HogenKontrast
++Name[nds]=HoochKontrast
+ Name[nl]=Hoogcontrast
+ Name[nn]=Høg kontrast
+ Name[pa]=ਗੂੜਾ
+@@ -56,7 +56,7 @@
+ Comment[en_GB]=A style that works well with high contrast colour schemes
+ Comment[es]=Un estilo que funciona con esquemas de color de contraste alto
+ Comment[et]=Stiil, mis sobib hästi tugeva kontrastiga värviskeemidele
+-Comment[eu]=Kontraste handiko temekin ongi moldatzen den estiloa
++Comment[eu]=Kontraste handiko gaiekin ongi moldatzen den estiloa
+ Comment[fi]=Tyyli joka toimii hyvin korkeakontrastisien väriteemojen kanssa
+ Comment[fr]=Un style se combinant bien avec les modèles de couleurs à fort contraste
+ Comment[fy]=In styl dy goed wurket mei hege kontrast kleureskema’s
+@@ -69,7 +69,7 @@
+ Comment[lb]=E Stil, dee gutt bei Faarfschemaë mat engem héiche Kontrast passt
+ Comment[lt]=Stilius, kuris labai tinka didelio kontrasto spalvų schemoms
+ Comment[nb]=En stil som passer bra sammen med temaer med høy kontrast
+-Comment[nds]=En Stil, de goot to Klöörschemas mit hogen Kontrast passt.
++Comment[nds]=En Stil, de goot för Klöörschemas mit hogen Kontrast passt.
+ Comment[nl]=Een stijl die goed werkt met hoog contrast kleurenschema's
+ Comment[nn]=Ein stil som fungerer bra når fargeoppsettet har høg kontrast
+ Comment[pa]= ਇੱਕ ਸ਼ੈਲੀ, ਜੋ ਕਿ ਗੂੜੀ ਰੰਗ ਸਕੀਮ ਨਾਲ ਵਧੀਆ ਕੰਮ ਕਰਦੀ ਹੈ
+--- kstyles/web/web.themerc (revision 488534)
++++ kstyles/web/web.themerc (revision 494869)
+@@ -88,7 +88,7 @@
+ Comment[eo]=TTT-speca stilo
+ Comment[es]=Estilo objeto visual Web
+ Comment[et]=Veebi elementide sarnane stiil
+-Comment[eu]=Web widget estiloa
++Comment[eu]=Web trepetaren estiloa
+ Comment[fa]=سبک تکه وب
+ Comment[fi]=Web-tyyli
+ Comment[fr]=Style web
+--- kabc/kabc_manager.desktop (revision 488534)
++++ kabc/kabc_manager.desktop (revision 494869)
+@@ -29,6 +29,7 @@
+ Name[lv]=Kontakti
+ Name[mk]=Контакти
+ Name[nb]=Kontakter
++Name[nds]=Kontakten
+ Name[nl]=Contactpersonen
+ Name[nn]=Kontaktar
+ Name[pa]=ਸੰਪਰਕ
+--- kabc/kab2kabc.desktop (revision 488534)
++++ kabc/kab2kabc.desktop (revision 494869)
+@@ -33,7 +33,7 @@
+ Comment[eo]=Konvertilo de "libkab" al "libkabc"
+ Comment[es]=Conversor libkab a libkabc.
+ Comment[et]=libkab -> libkabc teisendamine
+-Comment[eu]=libkab-etik libkabc-era bihurtze-tresna
++Comment[eu]=libkab-etik libkabc-era bihurtzeko tresna.
+ Comment[fa]=وسیله‌ی تبدیل libkab به libkabc
+ Comment[fi]=libkab-libkabc -muunnin
+ Comment[fr]=Outil de conversion de libkab vers libkabc.
+@@ -59,7 +59,7 @@
+ Comment[ms]=perkakasan penukaran libkab to libkabc.
+ Comment[mt]=Għodda għall-konverżjoni libkab għal libkabc
+ Comment[nb]=libkab til libkabc konverteringsverktøy.
+-Comment[nds]=Warktüüch för't Konverteren vun libkab na libkabc.
++Comment[nds]=Warktüüch för't Ümwanneln vun libkab na libkabc.
+ Comment[nl]=Conversieprogramma van libkab naar libkabc.
+ Comment[nn]=Konverterer libkab til libkabc
+ Comment[nso]=Sebereka sa phetosetso ya libkab go libkabc
+--- kabc/formats/binary.desktop (revision 488534)
++++ kabc/formats/binary.desktop (revision 494869)
+@@ -17,7 +17,7 @@
+ Name[eo]=Bitkodo
+ Name[es]=Binario
+ Name[et]=Binaar
+-Name[eu]=Binarioa
++Name[eu]=Bitarra
+ Name[fa]=اجرایی
+ Name[fi]=Binääri
+ Name[fr]=Binaire
+@@ -43,7 +43,7 @@
+ Name[ms]=Binari
+ Name[mt]=Binarju
+ Name[nb]=Binær
+-Name[nds]=Binäär
++Name[nds]=Bineer
+ Name[nl]=Binair
+ Name[nn]=Binær
+ Name[nso]=Tselapedi
+--- kcert/kcertpart.desktop (revision 488534)
++++ kcert/kcertpart.desktop (revision 494869)
+@@ -17,7 +17,7 @@
+ Comment[eo]=Enplantebla administrilo por personaj atestoj
+ Comment[es]=Administrador empotrable de certificados personales
+ Comment[et]=Põimitav personaalsete sertifikaatide haldur
+-Comment[eu]=Ziurtagiri pertsonalen kudeatzaile txertagarria
++Comment[eu]=Ziurtagiri pertsonalen kudeatzaile kapsulagarria
+ Comment[fa]=مپیر گواهی‌نامه‌ی شخصی نهÙته
+ Comment[fi]=Upotettava henkilökohtaisten sertifikaattien hallintatyökalu
+ Comment[fr]=Gestionnaire de certificats personnels intégrable
+--- kutils/kplugininfo.desktop (revision 488534)
++++ kutils/kplugininfo.desktop (revision 494869)
+@@ -20,7 +20,7 @@
+ Name[eo]=KDEa kromaĵinformo
+ Name[es]=Información de los plugin de KDE
+ Name[et]=KDE plugina info
+-Name[eu]=KDEren pluginen informazioa
++Name[eu]=KDEren plugin-en informazioa
+ Name[fa]=اطلاعات متصل‌کننده‌ی KDE
+ Name[fi]=KDE:n lisäosatiedot
+ Name[fr]=Information sur le module KDE
+--- kspell2/ui/configui.ui (revision 488534)
++++ kspell2/ui/configui.ui (revision 494869)
+@@ -22,6 +22,9 @@
+ <property name="name">
+ <cstring>m_langCombo</cstring>
+ </property>
++ <property name="whatsThis" stdset="0">
++ <string>This is the default language that the spell checker will use. The drop down box will list all of the dictionaries of your existing languages.</string>
++ </property>
+ </widget>
+ <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2">
+ <property name="name">
+@@ -41,6 +44,9 @@
+ <property name="text">
+ <string>Enable &background spellchecking</string>
+ </property>
++ <property name="whatsThis" stdset="0">
++ <string>If checked, the "spell as you type" mode is active and all misspelled words are immediately highlighted.</string>
++ </property>
+ </widget>
+ <widget class="QCheckBox" row="1" column="0">
+ <property name="name">
+@@ -49,6 +55,9 @@
+ <property name="text">
+ <string>Skip all &uppercase words</string>
+ </property>
++ <property name="whatsThis" stdset="0">
++ <string>If checked, words that consist of only uppercase letters are not spell checked. This is useful if you have a lot of acronyms, such as KDE for example.</string>
++ </property>
+ </widget>
+ <widget class="QCheckBox" row="2" column="0">
+ <property name="name">
+@@ -57,6 +66,9 @@
+ <property name="text">
+ <string>S&kip run-together words</string>
+ </property>
++ <property name="whatsThis" stdset="0">
++ <string>If checked, concatenated words made of existing words are not spell checked. This is useful in some languages.</string>
++ </property>
+ </widget>
+ </grid>
+ </widget>
+@@ -81,9 +93,14 @@
+ <property name="buttons">
+ <set>Remove|Add</set>
+ </property>
++ <property name="whatsThis" stdset="0">
++ <string>To add a word you want to ignore, type it in the top edit field and click Add. To remove a word, highlight it in the list and click Remove.</string>
++ </property>
+ </widget>
+ </grid>
+ </widget>
++<customwidgets>
++</customwidgets>
+ <includes>
+ <include location="global" impldecl="in implementation">keditlistbox.h</include>
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
+--- knewstuff/downloaddialog.cpp (revision 488534)
++++ knewstuff/downloaddialog.cpp (revision 494869)
+@@ -569,6 +569,9 @@
+ }
+
+ d->m_installlist.append(e);
++ d->m_lvtmp_r->setEnabled( true );
++ d->m_lvtmp_l->setEnabled( true );
++ d->m_lvtmp_d->setEnabled( true );
+ }
+
+ void DownloadDialog::slotInstalled(KIO::Job *job)
+--- kdecore/kcmdlineargs.cpp (revision 488534)
++++ kdecore/kcmdlineargs.cpp (revision 494869)
+@@ -183,7 +183,7 @@
+ about = _about;
+ parsed = false;
+ mCwd = mCwdd.setObject(mCwd, new char [PATH_MAX+1], true);
+- getcwd(mCwd, PATH_MAX);
++ (void) getcwd(mCwd, PATH_MAX);
+ #ifdef Q_WS_WIN
+ win32_slashify(mCwd, PATH_MAX);
+ #endif
+--- kdecore/kaccelmanager.cpp (revision 488534)
++++ kdecore/kaccelmanager.cpp (revision 494869)
+@@ -235,6 +235,9 @@
+ // we possibly reserved an accel, but we won't set it as it looks silly
+ if ( dynamic_cast<QGroupBox*>( it->m_widget ) )
+ continue;
++ // links look weird with ampersands
++ if ( dynamic_cast<QLabel*>( it->m_widget ) && it->m_widget->inherits("KURLLabel") )
++ continue;
+
+ kdDebug(125) << "write " << cnt << " " << it->m_widget->className() << " " <<contents[cnt].accelerated() << endl;
+
+--- kdecore/libintl.cpp (revision 488534)
++++ kdecore/libintl.cpp (revision 494869)
+@@ -45,7 +45,7 @@
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If
+ not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+-Cambridge, MA 02110-1301, USA. */
++Boston, MA 02110-1301, USA. */
+
+ #include "kdelibs_export.h"
+ #include "kde_file.h"
+--- kdecore/eventsrc (revision 488534)
++++ kdecore/eventsrc (revision 494869)
+@@ -18,7 +18,7 @@
+ Comment[eo]=KDE-Sistematentigoj
+ Comment[es]=Notificaciones del sistema de KDE
+ Comment[et]=KDE süsteemi märguanded
+-Comment[eu]=KDEren sistemaren oharrak
++Comment[eu]=KDEren sistemako jakinarazpenak
+ Comment[fa]=اعلامیه‌های سیستم KDE
+ Comment[fi]=KDE:n järjestelmähuomautukset
+ Comment[fr]=Notifications du système KDE
+@@ -93,7 +93,7 @@
+ Name[en_GB]=Wastebin: emptied
+ Name[es]=Papelera: vaciada
+ Name[et]=Prügikast: tühjendatud
+-Name[eu]=Zakarontzia: hustuta
++Name[eu]=Zakarrontzia: hustuta
+ Name[fi]=Roskakori: tyhjennetty
+ Name[fr]=Corbeille : vidée
+ Name[fy]=Jiskefet: leech makke
+@@ -145,7 +145,7 @@
+ Comment[en_GB]=The wastebin has been emptied
+ Comment[es]=La papelera se ha vaciado
+ Comment[et]=Prügikast on tühjendatud
+-Comment[eu]=Zakarontzia hustu da
++Comment[eu]=Zakarrontzia hustu da
+ Comment[fi]=Roskakori on tyhjennetty
+ Comment[fr]=La corbeille a été vidée
+ Comment[fy]=It jiskefet is leech makke
+@@ -203,7 +203,7 @@
+ Name[eo]=KKompletigo: rotacio
+ Name[es]=Completado de texto: rotación
+ Name[et]=Teksti lõpetamine: pööramine
+-Name[eu]=Textcompletion: errotazioa
++Name[eu]=Testu-osaketa: biraketa
+ Name[fa]=تکمیل متن: گردش
+ Name[fi]=Tekstintäydennys: pyöritys
+ Name[fr]=Autocomplètement de texte : rotation
+@@ -229,7 +229,7 @@
+ Name[ms]= Penyudah teks: putaran
+ Name[mt]=Kompletazzjoni tal-kliem: tidwir
+ Name[nb]=Tekstfullføring: rotering
+-Name[nds]=Textkumpletteren: dreihen
++Name[nds]=Textkompletteren: dreihen
+ Name[nl]=Tekstaanvulling: rotatie
+ Name[nn]=Tekstfullføring: rotering
+ Name[nso]=Phetso ya sengwalwana: tharelo
+@@ -275,7 +275,7 @@
+ Comment[el]=Φτάσαμε στο Ï„Îλος της λίστας με τα ταιÏιάσματα
+ Comment[es]=Se ha alcanzado el final de la lista de concordancias
+ Comment[et]=Jõuti kokkulangevuste nimekirja lõppu
+-Comment[eu]=Parekatze zerrendaren bukaeraraino ailegatu da
++Comment[eu]=Bat datozenen zerrendaren amaierara iritsi da
+ Comment[fi]=Osumalistan loppu saavutettu
+ Comment[fr]=La fin de la liste des correspondances a été atteinte
+ Comment[fy]=It ein fan de oerienkomstenlist is berikt
+@@ -337,7 +337,7 @@
+ Name[eo]=KKompletigo: neniu trovaĵo
+ Name[es]=Completado de texto: no hay concordancias
+ Name[et]=Teksti lõpetamine: kokkulangevus puudub
+-Name[eu]=Textcompletion: parekaketarik ez
++Name[eu]=Testu-osaketa: ez dago bat datorrenik
+ Name[fa]=تکمیل متن: بدون لنگه
+ Name[fi]=Tekstintäydennys: ei osumia
+ Name[fr]=Autocomplètement de texte : aucune correspondance
+@@ -363,7 +363,7 @@
+ Name[ms]= Penyudah teks: tiada padanan
+ Name[mt]=Kompletazzjoni tal-kliem: ebda qbil
+ Name[nb]=Tekstfullføring: ingen treff
+-Name[nds]=Textkumpletteren: nix passt
++Name[nds]=Textkompletteren: nix passt
+ Name[nl]=Tekstaanvulling - geen overeenkomsten
+ Name[nn]=Tekstfullføring: ingen treff
+ Name[nso]=Phetso ya sengwalwana: gagona tshwanelano
+@@ -471,7 +471,7 @@
+ Name[eo]=KKompletigo: parta trovaĵo
+ Name[es]=Completado de texto: concordancia parcial
+ Name[et]=Teksti lõpetamine: osaline kokkulangevus
+-Name[eu]=Textcompletion: parekatze partziala
++Name[eu]=Testu-osaketa: bat datorren partziala
+ Name[fa]=تکمیل متن: قسمتی نظیر
+ Name[fi]=Tekstintäydennys: osittainen osuma
+ Name[fr]=Autocomplètement de texte : correspondance partielle
+@@ -497,7 +497,7 @@
+ Name[ms]= Penyudah teks: separa padanan
+ Name[mt]=Kompletazzjoni tal-kliem: qbil parzjali
+ Name[nb]=Tekstfullføring: delvis treff
+-Name[nds]=Textkumpletteren: passt deelwies
++Name[nds]=Textkompletteren: passt deelwies
+ Name[nl]=Tekstaanvulling - gedeeltelijke overeenkomsten
+ Name[nn]=Tekstfullføring: delvis treff
+ Name[nso]=Phetso ya sengwalwana: tshwanelanyo dikarolong tse rilego
+@@ -543,7 +543,7 @@
+ Comment[el]=ΥπάÏχουν πεÏισσότεÏες από μία δυνατÎÏ‚ συμπληÏώσεις
+ Comment[es]=Hay más de una posible concordancia
+ Comment[et]=Võimalike variante on rohkem kui üks
+-Comment[eu]=Parekatze posible bat baino gehiago dago
++Comment[eu]=Bat datorrenak bat baino gehiago dira
+ Comment[fi]=Useampia mahdollisia osumia
+ Comment[fr]=Au moins deux correspondances ont été trouvées
+ Comment[fy]=Der is wierskynlik mear as ien oerienkomst
+@@ -606,7 +606,7 @@
+ Name[eo]=Ne eblas malfermi dosieron
+ Name[es]=No se puede abrir archivo
+ Name[et]=Faili avamine ebaõnnestus
+-Name[eu]=Ezin fitxtegia ireki
++Name[eu]=Ezin da fitxategia ireki
+ Name[fa]=نتوانستم پرونده را بگشایم
+ Name[fi]=Ei voitu avata tiedostoa
+ Name[fo]=Kann ikki opna fÃla
+@@ -902,7 +902,7 @@
+ Name[eo]=Atentigo
+ Name[es]=Notificación
+ Name[et]=Märguanne
+-Name[eu]=Oharra
++Name[eu]=Jakinarazpena
+ Name[fa]=اعلام
+ Name[fi]=Huomautus
+ Name[fo]=Ãminning
+@@ -975,7 +975,7 @@
+ Comment[el]=Κάτι εξαιÏετικό συνÎβη στο Ï€ÏόγÏαμμα
+ Comment[es]=Ocurrió algo especial en el programa
+ Comment[et]=Programmis juhtus midagi erilist
+-Comment[eu]=Gertakari bereziren bat gertadu da programan
++Comment[eu]=Gertaera berezia gertatu da programan
+ Comment[fi]=Ohjelmassa tapahtui jotain erikoista
+ Comment[fr]=Quelque chose de spécial s'est passé dans le programme
+ Comment[fy]=Der barde wat spesjaals yn't programma
+@@ -995,7 +995,7 @@
+ Comment[mk]=Ðешто Ñпецијално Ñе Ñлучило во програмот
+ Comment[ms]=Sesuatu yang pelik berlaku di dalam program
+ Comment[nb]=Noe spesielt skjedde med programmet
+-Comment[nds]=In dat Programm is wat afsünnerlich passeert
++Comment[nds]=In dat Programm is wat besünners passeert
+ Comment[nl]=Er gebeurde iets bijzonders in het programma
+ Comment[nn]=Noko spesielt skjedde i programmet
+ Comment[pa]=ਇਸ ਕਾਰਜ ਵਿੱਚ ਕà©à¨ ਖਾਸ ਹੋ ਗਿਆ ਹੈ
+@@ -1041,7 +1041,7 @@
+ Name[eo]=Averto
+ Name[es]=Aviso
+ Name[et]=Hoiatus
+-Name[eu]=Kontuz
++Name[eu]=Abisua
+ Name[fa]=اخطار
+ Name[fi]=Varoitus
+ Name[fo]=Ãvaring
+@@ -1068,7 +1068,7 @@
+ Name[ms]=Amaran
+ Name[mt]=Twissija
+ Name[nb]=Advarsel
+-Name[nds]=Wohrschoon
++Name[nds]=Wohrschoen
+ Name[nl]=Waarschuwing
+ Name[nn]=Ã…tvaring
+ Name[nso]=Temoso
+@@ -1135,7 +1135,7 @@
+ Comment[mk]=Се Ñлучи грешка во програмот што може да предизвика проблеми
+ Comment[ms]=Ada ralat di dalam program yang menyebabkan masalah.
+ Comment[nb]=Det var en feil i programmet som kan føre til problemer
+-Comment[nds]=Dor is en Fehler in dat Programm, villicht treckt dat Problemen na sik
++Comment[nds]=Dat geev en Fehler in dat Programm, villicht treckt he Problemen na sik
+ Comment[nl]=Er zat een fout in het programma die voor problemen kon zorgen
+ Comment[nn]=Ein feil oppstod i programmet og kan føra til problem
+ Comment[pa]=ਕਾਰਜ ਵਿੱਚ ਗਲਤੀ ਆਈ ਹੈ, ਜੋ ਕਿ ਸਮੱਸਿਆ ਪੈਦਾ ਕਰ ਰਹੀ ਹੈ
+@@ -1180,7 +1180,7 @@
+ Name[eo]=Katastrofo
+ Name[es]=Catástrofe
+ Name[et]=Katastroof
+-Name[eu]=Katastrofea
++Name[eu]=Ondamendia
+ Name[fa]=مصیبت
+ Name[fi]=Katastrofi
+ Name[fy]=Katastrofe
+@@ -1254,7 +1254,7 @@
+ Comment[eo]=Okazis tre grava eraro, kiu ĉesigis la programon
+ Comment[es]=Ocurrió un error muy serio, causando al menos el cierre del programa.
+ Comment[et]=Ilmnes väga tõsine viga, mis sundis programmi tööd lõpetama.
+-Comment[eu]=Oso errore larria gertatu da, programa itxiaraziz
++Comment[eu]=Errore oso larria gertatu da, programa itxiaraziz
+ Comment[fa]=خطایی جدی رخ داد، Ú©Ù‡ Øداقل باعث خروج برنامه شد
+ Comment[fi]=Tapahtui vakava virhe, jonka takia ohjelma ainakin lopetetaan.
+ Comment[fr]=Une erreur très grave s'est produite, provoquant au moins l'arrêt du programme
+@@ -1324,6 +1324,7 @@
+ Name[eo]=Saluto
+ Name[es]=Entrada
+ Name[et]=Sisselogimine
++Name[eu]=Hasi saioa
+ Name[fa]=ورود
+ Name[fi]=Kirjaudu sisään
+ Name[fo]=Innrita
+@@ -1457,6 +1458,7 @@
+ Name[eo]=AdiaÅo
+ Name[es]=Salida
+ Name[et]=Väljalogimine
++Name[eu]=Amaitu saioa
+ Name[fa]=خروج
+ Name[fi]=Kirjaudu ulos
+ Name[fo]=Útrita
+@@ -1592,7 +1594,7 @@
+ Name[eo]=Preseraro
+ Name[es]=Error de impresión
+ Name[et]=Viga trükkimisel
+-Name[eu]=Inprimaketa errorea
++Name[eu]=Inprimatze-errorea
+ Name[fa]=خطای چاپ
+ Name[fi]=Tulostusvirhe
+ Name[fr]=Problème d'impression
+@@ -1668,7 +1670,7 @@
+ Comment[eo]=Okazis preseraro
+ Comment[es]=Se ha producido un error de impresión.
+ Comment[et]=Trükkimisel ilmnes viga
+-Comment[eu]=Inprimaketa errore bat gertatu da
++Comment[eu]=Inprimatze-errorea gertatu da
+ Comment[fa]=خطای چاپی رخ داد
+ Comment[fi]=Tapahtui tulostusvirhe
+ Comment[fr]=Un problème d'impression est survenu
+@@ -1693,7 +1695,7 @@
+ Comment[mn]=Ð¥ÑвлÑÑ…Ñд алдаа гарлаа
+ Comment[ms]=Ralat cetak berlaku
+ Comment[nb]=En skriverfeil har oppstått
+-Comment[nds]=Bi't Drucken hett dat 'n Fehler geven
++Comment[nds]=Bi't Drucken hett dat en Fehler geven
+ Comment[nl]=Er deed zich een afdrukfout voor
+ Comment[nn]=Feil ved utskrift
+ Comment[pa]=ਇੱਕ ਪà©à¨°à¨¿à©°à¨Ÿà¨° ਗਲਤੀ ਹੈ
+@@ -1742,7 +1744,7 @@
+ Name[eo]=Informa mesaÄo
+ Name[es]=Mensaje de información
+ Name[et]=Informatiivne teade
+-Name[eu]=Informazio mezua
++Name[eu]=Informazioaren mezua
+ Name[fa]=پیام اطلاعاتی
+ Name[fi]=Tiedoitusviesti
+ Name[fr]=Message d'information
+@@ -1809,7 +1811,7 @@
+ Comment[eo]=Informa mesaÄo estas montrata
+ Comment[es]=Se está mostrando un mensaje de información
+ Comment[et]=Näidatakse informatiivset teadet
+-Comment[eu]=Informazio mezu bat erakusten
++Comment[eu]=Informazioren mezua erakusten ari da
+ Comment[fa]=یک پیام اطلاعاتی نمایش داده می‌شود
+ Comment[fi]=Näytetään tiedotusviesti
+ Comment[fr]=Un message d'information est affiché actuellement
+@@ -1882,7 +1884,7 @@
+ Name[eo]=Averta mesaÄo
+ Name[es]=Mensaje de aviso
+ Name[et]=Hoiatav teade
+-Name[eu]=Abisu mezua
++Name[eu]=Abisuaren mezua
+ Name[fa]=پیام اخطاری
+ Name[fi]=Varoitusviesti
+ Name[fr]=Message d'avertissement
+@@ -1907,7 +1909,7 @@
+ Name[mn]=Сануулга мÑдÑÑ
+ Name[ms]=Mesej amaran
+ Name[nb]=Varselmelding
+-Name[nds]=Wohrschoon
++Name[nds]=Wohrschoen
+ Name[nl]=Waarschuwingsbericht
+ Name[nn]=Varselmelding
+ Name[pa]=ਚੇਤਾਵਨੀ ਸà©à¨¨à©‡à¨¹à¨¾
+@@ -1949,7 +1951,7 @@
+ Comment[eo]=Averta mesaÄo estas montrata
+ Comment[es]=Se está mostrando un mensaje de aviso
+ Comment[et]=Näidatakse hoiatavat teadet
+-Comment[eu]=Abisu mezu bat erakusten
++Comment[eu]=Abisuaren mezua erakusten ari da
+ Comment[fa]=یک پیام اخطاری نمایش داده می‌شود
+ Comment[fi]=Näytetään varoitusviesti
+ Comment[fr]=Un message d'avertissement est affiché actuellement
+@@ -1974,7 +1976,7 @@
+ Comment[mn]=Харуулж байхад Ñануулга
+ Comment[ms]=Mesej amaran yang dipaparkan
+ Comment[nb]=En varselmelding blir vist
+-Comment[nds]=En Wohrschoon warrt wiest
++Comment[nds]=En Wohrschoen warrt wiest
+ Comment[nl]=Er wordt een waarschuwingsbericht getoond
+ Comment[nn]=Ei varselmelding vert vist
+ Comment[pa]=ਇੱਕ ਚੇਤਾਵਨੀ ਸà©à¨¨à©‡à¨¹à¨¾ ਹੇਠਾਂ ਵੇਖਿਆ ਗਿਆ ਹੈ
+@@ -2089,7 +2091,7 @@
+ Comment[eo]=Gravega mesaÄo estas montrata
+ Comment[es]=Se está mostrando un mensaje crÃtico
+ Comment[et]=Näidatakse kriitilist teadet
+-Comment[eu]=Mezu kritiko bat erakusten
++Comment[eu]=Mezu kritikoa erakusten ari da
+ Comment[fa]=یک پیام بØرانی نمایش داده می‌شود
+ Comment[fi]=Näytetään kriittinen viesti
+ Comment[fr]=Un message critique est affiché actuellement
+@@ -2231,7 +2233,7 @@
+ Comment[eo]=Demando estas demandata
+ Comment[es]=Se está haciendo una pregunta
+ Comment[et]=Esitatakse küsimus
+-Comment[eu]=Galdera bat egiten ari da
++Comment[eu]=Galdera egiten ari da
+ Comment[fa]=سوالی Ù…Ø·Ø±Ø Ù…ÛŒâ€ŒØ´ÙˆØ¯
+ Comment[fi]=Kysytään kysymys
+ Comment[fr]=Une question est posée actuellement
+--- kdecore/all_languages.desktop (revision 488534)
++++ kdecore/all_languages.desktop (revision 494869)
+@@ -165,6 +165,7 @@
+ Name[el]=ΑφÏικανικά
+ Name[eo]=Afrikansa
+ Name[et]=Afrikaani
++Name[eu]=Afrikaansa
+ Name[fa]=Ø¢Ùریکانس
+ Name[fy]=Afrikaansk
+ Name[ga]=Afracáinis
+@@ -385,7 +386,7 @@
+ Name[mk]=ÐÑамеÑки
+ Name[mn]=ÐÑÑаме
+ Name[nb]=Assamesisk
+-Name[nds]=Assameessch
++Name[nds]=Assameesch
+ Name[nl]=Assamees
+ Name[nn]=Assami
+ Name[nso]=Se-Assamese
+@@ -600,7 +601,7 @@
+ Name[eo]=Bjelorusa
+ Name[es]=Bieloruso
+ Name[et]=Valgevene
+-Name[eu]=Belarusiera
++Name[eu]=Bielorrusiera
+ Name[fa]=بلاروسی
+ Name[fi]=Valkovenäjä
+ Name[fr]=Bélarus
+@@ -824,6 +825,7 @@
+ Name[cy]=Bengaleg
+ Name[eo]=Bengala
+ Name[es]=BengalÃ
++Name[eu]=Bengalera
+ Name[fa]=بنگلادشی
+ Name[fy]=Bengaalsk
+ Name[ga]=Beangáilis
+@@ -842,7 +844,7 @@
+ Name[lv]=BengÄļu
+ Name[mk]=БенгалÑки
+ Name[mn]=Бенгали
+-Name[nds]=Bengalsch
++Name[nds]=Bengaalsch
+ Name[nso]=Se-Bengali
+ Name[pa]=ਬੰਗਾਲੀ
+ Name[pl]=Bengalski
+@@ -1025,7 +1027,7 @@
+ Name[eo]=Bosnia
+ Name[es]=Bosnio
+ Name[et]=Bosnia
+-Name[eu]=Estoniera
++Name[eu]=Bosniera
+ Name[fa]=بوسنیایی
+ Name[fi]=Bosnia
+ Name[fr]=Bosniaque
+@@ -1171,7 +1173,6 @@
+ Name[eo]=Ĉeĉena
+ Name[es]=Checheno
+ Name[et]=Tšetšeeni
+-Name[eu]=Checheniera
+ Name[fa]=Ú†Ú†Ù†
+ Name[fi]=Tšetšeeni
+ Name[fr]=Tchétchène
+@@ -1421,7 +1422,7 @@
+ Name[eo]=Eklezia Slava
+ Name[es]=Eslávo eclesiástico
+ Name[et]=Kirikuslaavi
+-Name[eu]=Church Slaviera
++Name[eu]=Church Eslaviera
+ Name[fa]=اسلواک کلیسایی
+ Name[fi]=Kirkkoslaavi
+ Name[fr]=Slavon d'égise
+@@ -1444,7 +1445,7 @@
+ Name[mk]=ЦрковноÑловенÑки
+ Name[mn]=Чүрч Ñлавик
+ Name[nb]=Kirkeslavisk
+-Name[nds]=Slaavsch (as vun de Kark)
++Name[nds]=Slaawsch (as vun de Kark)
+ Name[nl]=Kerk Slavisch
+ Name[nn]=Kyrkjeslavisk
+ Name[nso]=Se-Church Slavic
+@@ -1503,7 +1504,7 @@
+ Name[lv]=Čuvašu
+ Name[mk]=Чуваш
+ Name[mn]=Чуваш
+-Name[nds]=Tschuvassch
++Name[nds]=Tschuvasch
+ Name[nso]=Se-Chuvash
+ Name[pa]=ਚੂਵਸ਼
+ Name[pl]=Czuwaski
+@@ -1722,7 +1723,7 @@
+ Name[ms]=Jerman
+ Name[mt]=Ä ermaniż
+ Name[nb]=Tysk
+-Name[nds]=Hochdüütsch
++Name[nds]=Hoochdüütsch
+ Name[nl]=Duits
+ Name[nn]=Tysk
+ Name[nso]=Se-German
+@@ -1964,7 +1965,7 @@
+ Name[el]=Αγγλικά (Îœ. Î’Ïετανίας)
+ Name[es]=Inglés británico
+ Name[et]=Briti inglise
+-Name[eu]=Ingeles britainiarra
++Name[eu]=Ingelesa (britainiarra)
+ Name[fi]=Brittienglanti
+ Name[fr]=Anglais britannique
+ Name[fy]=Britsk Ingelsk
+@@ -1981,7 +1982,7 @@
+ Name[lt]=Anglų (D.Britanijos)
+ Name[lv]=Britu Angļu
+ Name[nb]=Britisk engelsk
+-Name[nds]=Britschet Engelsch
++Name[nds]=Britsch Engelsch
+ Name[nl]=Engels (Brits)
+ Name[nn]=Engelsk (Storbritannia)
+ Name[pa]=ਅੰਗਰੇਜ਼ੀ ਬਰਤਾਨੀਆ
+@@ -2017,7 +2018,7 @@
+ Name[el]=Αγγλικά (ΑμεÏικής)
+ Name[es]=Inglés americano
+ Name[et]=Ameerika inglise
+-Name[eu]=Ingeles amerikarra
++Name[eu]=Ingelesa (amerikarra)
+ Name[fi]=Amerikanenglanti
+ Name[fr]=Anglais américain
+ Name[fy]=Amerikaansk Ingelsk
+@@ -2033,7 +2034,7 @@
+ Name[lb]=Amerikanescht Englesch
+ Name[lt]=Anglų (JAV)
+ Name[nb]=Amerikansk engelsk
+-Name[nds]=Amerikaanschet Engelsch
++Name[nds]=Amerikaansch Engelsch
+ Name[nl]=Engels (Amerikaans)
+ Name[nn]=Engelsk (USA)
+ Name[pa]=ਅੰਗਰੇਜ਼ੀ ਅਮਰੀਕੀ
+@@ -2364,7 +2365,7 @@
+ Name[mn]=ФарÑи (ПерÑ)
+ Name[ms]=Parsi
+ Name[nb]=Farsi (Persisk)
+-Name[nds]=Farsi (Perssch)
++Name[nds]=Farsi (Persisch)
+ Name[nl]=Farsi (Perzisch)
+ Name[nn]=Persisk
+ Name[pa]=ਫਾਰਸੀ(ਪਰਸ਼ੀਅਨ)
+@@ -2548,6 +2549,7 @@
+ Name[eo]=Feroa
+ Name[es]=Feroés
+ Name[et]=Fääri
++Name[eu]=Faroera
+ Name[fa]=Ùارویی
+ Name[fi]=Fääri
+ Name[fr]=Féroïen
+@@ -2568,7 +2570,7 @@
+ Name[mk]=ФарÑки
+ Name[mn]=Фаро
+ Name[nb]=Færøyisk
+-Name[nds]=Faröösch
++Name[nds]=Färöösch
+ Name[nn]=Færøysk
+ Name[nso]=Se-Faroese
+ Name[pa]=ਫਾਰੋਇਸੀ
+@@ -2715,7 +2717,7 @@
+ Name[mn]=ФриÑ
+ Name[ms]=Frisia
+ Name[nb]=Frisisk
+-Name[nds]=Freessch
++Name[nds]=Freesch
+ Name[nl]=Frysk
+ Name[nn]=Frisisk
+ Name[nso]=Se-Frisian
+@@ -2768,7 +2770,7 @@
+ Name[km]=អៀរឡង់ ហ្កែលិគ
+ Name[lb]=Irescht Gällesch
+ Name[nb]=Irsk gaelisk
+-Name[nds]=Irschet Gäälsch
++Name[nds]=Irsch Gäälsch
+ Name[nl]=Gaelic (Iers)
+ Name[nn]=Gælisk (Irland)
+ Name[pa]=ਆਈਰਿਸ਼ ਗਾਈਲਿਕ
+@@ -2963,7 +2965,7 @@
+ Name[br]=Gujaratieg
+ Name[eo]= GuÄarata
+ Name[et]=Gudžarati
+-Name[eu]=Gujeratiera
++Name[eu]=Gujaratera
+ Name[fa]=گوراجاتی
+ Name[ga]=Gúisearáitis
+ Name[gl]=Guxarati
+@@ -3008,6 +3010,7 @@
+ Name[da]=Mansk
+ Name[eo]=Manksa
+ Name[et]=Mänksi
++Name[eu]=Manera
+ Name[fa]=منکس
+ Name[fr]=Mannois
+ Name[ga]=Manainnis
+@@ -3098,7 +3101,7 @@
+ Name[eo]=Hebrea
+ Name[es]=Hebreo
+ Name[et]=Heebrea
+-Name[eu]=Hebraiera
++Name[eu]=Hebreera
+ Name[fa]=عبری
+ Name[fi]=Heprea
+ Name[fr]=Hébreu
+@@ -3167,7 +3170,6 @@
+ Name[cy]=Hindw^
+ Name[da]=Hindu
+ Name[eo]=Hinda
+-Name[eu]=Hindia
+ Name[fa]=هندی
+ Name[fy]=Hindy
+ Name[ga]=Hiondúis
+@@ -3332,7 +3334,7 @@
+ Name[de]=Obersorbisch
+ Name[es]=Serbio superior
+ Name[et]=Ãœlemsorbi
+-Name[eu]=Serbiera
++Name[eu]=Goi Serbiera
+ Name[fi]=Yläserbia
+ Name[fr]=Haut Sorabe
+ Name[fy]=Heech Sorbysk
+@@ -3641,7 +3643,7 @@
+ Name[ms]=Indonesia
+ Name[mt]=Indoneżjan
+ Name[nb]=Indonesisk
+-Name[nds]=Indoneessch
++Name[nds]=Indoneesch
+ Name[nl]=Indonesisch
+ Name[nn]=Indonesisk
+ Name[nso]=Se-Indonesian
+@@ -3830,7 +3832,7 @@
+ Name[mn]=ИÑланд
+ Name[mt]=Islandiż
+ Name[nb]=Islandsk
+-Name[nds]=Islandsch
++Name[nds]=Islannsch
+ Name[nl]=IJslands
+ Name[nn]=Islandsk
+ Name[nso]=Se-Icelandic
+@@ -4073,6 +4075,7 @@
+ Name[eo]=Java
+ Name[es]=Javanés
+ Name[et]=Jaava
++Name[eu]=Javera
+ Name[fa]=جاوانی
+ Name[fi]=Jaava
+ Name[fr]=Javanais
+@@ -4250,6 +4253,7 @@
+ Name[eo]=Kazaĥa
+ Name[es]=Kazajo
+ Name[et]=Kasahhi
++Name[eu]=Kazakhera
+ Name[fa]=قزاق
+ Name[fi]=Kazakki
+ Name[ga]=Casaicis
+@@ -4506,6 +4510,7 @@
+ Name[da]=Kashmirsk
+ Name[eo]=KaÅmira
+ Name[et]=Kašmiiri
++Name[eu]=Kaxmirera
+ Name[fa]=کشمیری
+ Name[fi]=Kašmiri
+ Name[ga]=CaismÃris
+@@ -4631,6 +4636,7 @@
+ Name[bn]=কোমি
+ Name[de]=Komi-Sprache
+ Name[eo]=Komia
++Name[eu]=Komoreera
+ Name[fa]=کمی
+ Name[ga]=CoimÃ
+ Name[he]=קומי
+@@ -4737,6 +4743,7 @@
+ Name[eo]=Kirgiza
+ Name[es]=Kirguiz
+ Name[et]=Kirgiisi
++Name[eu]=Kirgiera
+ Name[fa]=قرقیز
+ Name[fi]=Kirgiisi
+ Name[fr]=Kirghize
+@@ -4759,7 +4766,7 @@
+ Name[mk]=КиргизтанÑки
+ Name[mn]=Киргиз
+ Name[nb]=Kirgisisk
+-Name[nds]=Kirgiissch
++Name[nds]=Kirgiisch
+ Name[nl]=Kirghizisch
+ Name[nn]=Kirgisisk
+ Name[nso]=Se-Kirghiz
+@@ -4818,7 +4825,7 @@
+ Name[ja]=ラテン語
+ Name[km]=ឡាážáž¶áŸ†áž„
+ Name[ko]=ë¼í‹´ì–´
+-Name[lb]=Latéin
++Name[lb]=Latäin
+ Name[lt]=Lotynų
+ Name[mk]=ЛатинÑки
+ Name[mn]=Латин
+@@ -4867,6 +4874,7 @@
+ Name[eo]=Luksemburga
+ Name[es]=Luxemburgués
+ Name[et]=Luksemburgi
++Name[eu]=Luxenburgera
+ Name[fa]=لوگزامبورگی
+ Name[fi]=Luxemburg
+ Name[fr]=Luxembourgeois
+@@ -5021,6 +5029,7 @@
+ Name[cs]=Laoský
+ Name[eo]=LaÅa
+ Name[es]=Laosiano
++Name[eu]=Laosera
+ Name[fa]=لایوسی
+ Name[ga]=Láóis
+ Name[he]=ל×ו
+@@ -5221,6 +5230,7 @@
+ Name[eo]=Malagasa
+ Name[es]=Malagasio
+ Name[et]=Malagassi
++Name[eu]=Madagaskarera
+ Name[fa]=مالاگاسیایی
+ Name[fi]=Malagasi
+ Name[fr]=Malgache
+@@ -5304,7 +5314,7 @@
+ Name[mk]=МаршалÑки
+ Name[mn]=Маршалл
+ Name[nb]=Marshallesisk
+-Name[nds]=Marschalleessch
++Name[nds]=Marschalleesch
+ Name[nl]=Marshallees
+ Name[nn]=Marshallesisk
+ Name[nso]=Se-Marshallese
+@@ -5625,7 +5635,7 @@
+ Name[mn]=Молдав
+ Name[ms]=Moldavia
+ Name[nb]=Moldavisk
+-Name[nds]=Moldaavsch
++Name[nds]=Moldaawsch
+ Name[nl]=Moldavisch
+ Name[nn]=Moldovsk
+ Name[nso]=Se-Moldavian
+@@ -5663,6 +5673,7 @@
+ Name[br]=Marateg
+ Name[eo]=Marata
+ Name[es]=MaratÃ
++Name[eu]=Marathera
+ Name[fa]=مراتی
+ Name[fr]=Marathe
+ Name[ga]=Maraitis
+@@ -5713,7 +5724,7 @@
+ Name[eo]=Malaja
+ Name[es]=Malayo
+ Name[et]=Malaisia
+-Name[eu]=Malayera
++Name[eu]=Malaysiera
+ Name[fa]=مالایی
+ Name[fi]=Malaiji
+ Name[fr]=Malais
+@@ -5736,7 +5747,7 @@
+ Name[mk]=МалајÑки
+ Name[mn]=МалÑ
+ Name[nb]=Malaiisk
+-Name[nds]=Malaisch
++Name[nds]=Malaiisch
+ Name[nn]=Malayisk
+ Name[nso]=Se-Malay
+ Name[pa]=ਮਾਲਿਆ
+@@ -5805,7 +5816,7 @@
+ Name[mn]=Малт
+ Name[mt]=Malti
+ Name[nb]=Maltesisk
+-Name[nds]=Malteessch
++Name[nds]=Malteesch
+ Name[nl]=Maltees
+ Name[nn]=Maltesisk
+ Name[nso]=Se-Maltese
+@@ -5853,6 +5864,7 @@
+ Name[eo]=Birma
+ Name[es]=Burmés
+ Name[et]=Birma
++Name[eu]=Birmaniera
+ Name[fa]=برمه‌ای
+ Name[fi]=Burma
+ Name[fr]=Birman
+@@ -5876,7 +5888,7 @@
+ Name[mn]=Бүрм
+ Name[ms]=Burma
+ Name[nb]=Burmesisk
+-Name[nds]=Burmeessch
++Name[nds]=Burmeesch
+ Name[nl]=Burmees
+ Name[nn]=Burmesisk
+ Name[nso]=Se-Burmese
+@@ -5913,6 +5925,7 @@
+ Name[de]=Nauruisch
+ Name[el]=ÎαουÏοÏ
+ Name[eo]=Naura
++Name[eu]=Nauruera
+ Name[fa]=نایرویی
+ Name[fr]=Nauruan
+ Name[fy]=Naurûaansk
+@@ -5962,7 +5975,7 @@
+ Name[eo]=Norvega (Bokmal)
+ Name[es]=Noruego Bokmål
+ Name[et]=Norra bokmål
+-Name[eu]=Bokmal Norvegiera
++Name[eu]=Norvegiera (Bokmål)
+ Name[fa]=نروژی بکمال
+ Name[fi]=Kirjanorja
+ Name[fr]=Norvégien Bokmaal
+@@ -6029,7 +6042,7 @@
+ Name[eo]=Norda Ndebele
+ Name[es]=Ndebele del norte
+ Name[et]=Põhja-ndebele
+-Name[eu]=Iparreko ndebele-a
++Name[eu]=Ndebelera (iparraldekoa)
+ Name[fa]=ان‌دبله، شمال
+ Name[fi]=Ndebele, Pohjoinen
+ Name[fr]=Ndébélé du Nord
+@@ -6094,7 +6107,7 @@
+ Name[de]=Plattdeutsch
+ Name[es]=Sajón bajo
+ Name[et]=Alamsaksi
+-Name[eu]=Behe saxoniera
++Name[eu]=Beheko Sajoniera
+ Name[fi]=Alasaxon
+ Name[fr]=Bas saxon (ou francique, ou plattdeutsch)
+ Name[fy]=Neder Saksysk
+@@ -6148,7 +6161,7 @@
+ Name[eo]=Nepala
+ Name[es]=NepalÃ
+ Name[et]=Nepaali
+-Name[eu]=Nepaliera
++Name[eu]=Nepalera
+ Name[fa]=نپالی
+ Name[fr]=Népalais
+ Name[fy]=Nepaleesk
+@@ -6168,7 +6181,7 @@
+ Name[lv]=NepÄlieÅ¡u
+ Name[mk]=ÐепалÑки
+ Name[mn]=Ðепал
+-Name[nds]=Nepaleessch
++Name[nds]=Nepaleesch
+ Name[nl]=Nepalees
+ Name[nn]=Nepalsk
+ Name[nso]=Se-Nepali
+@@ -6322,7 +6335,7 @@
+ Name[eo]=Norvega (Nynorsk)
+ Name[es]=Noruego Nynorsk
+ Name[et]=Norra nynorsk
+-Name[eu]=Nynorsk norvegiera
++Name[eu]=Norvegiera (Nynorsk)
+ Name[fa]=نروژی نینورسک
+ Name[fi]=Uusnorja
+ Name[fr]=Norvégien Nynorsk
+@@ -6392,7 +6405,7 @@
+ Name[eo]=Suda Ndebele
+ Name[es]=Ndebele del sur
+ Name[et]=Lõuna-ndebele
+-Name[eu]=Hegoaldeko ndebele-a
++Name[eu]=Ndebelera (hegoaldekoa)
+ Name[fa]=ان‌دبله، جنوب
+ Name[fi]=Ndebele, Etelä
+ Name[fr]=Ndébélé du Sud
+@@ -6461,7 +6474,7 @@
+ Name[eo]=Norda Sotoa
+ Name[es]=Sotho del norte
+ Name[et]=Põhja-Sotho
+-Name[eu]=Iparreko sotho-a
++Name[eu]=Sothoera (iparraldekoa)
+ Name[fa]=سوتوی شمالی
+ Name[fi]=Pohjoissotho
+ Name[fr]=Sotho du Nord
+@@ -6810,6 +6823,7 @@
+ Name[eo]=PanÄaba
+ Name[es]=PunjabÃ
+ Name[et]=Pandžabi
++Name[eu]=Punjabera
+ Name[fa]=پنجابی
+ Name[fi]=Pandžabi
+ Name[fr]=Pendjabi
+@@ -6908,7 +6922,7 @@
+ Name[eo]=Pola
+ Name[es]=Polaco
+ Name[et]=Poola
+-Name[eu]=Polskera
++Name[eu]=Poloniera
+ Name[fa]=لهستانی
+ Name[fi]=Puola
+ Name[fr]=Polonais
+@@ -6977,6 +6991,7 @@
+ Name[eo]=PaÅtua
+ Name[es]=Pastún
+ Name[et]=Puštu
++Name[eu]=Paxtuera
+ Name[fa]=پشتون
+ Name[fi]=Afgaani
+ Name[ga]=Paistis
+@@ -6993,6 +7008,7 @@
+ Name[lv]=Puštu
+ Name[mk]=Пушто
+ Name[mn]=Пушто
++Name[nds]=Puschto
+ Name[nso]=Se-Pushto
+ Name[pa]=ਪà©à¨¶à¨¤à©‹
+ Name[ro]=Puştă
+@@ -7060,7 +7076,7 @@
+ Name[ms]=Portugis
+ Name[mt]=Portugiż
+ Name[nb]=Portugisisk
+-Name[nds]=Portugeessch
++Name[nds]=Portugeesch
+ Name[nl]=Portugees
+ Name[nn]=Portugisisk
+ Name[nso]=Sepotokisi
+@@ -7110,7 +7126,7 @@
+ Name[eo]=Portugala (Brazilo)
+ Name[es]=Portugués brasileño
+ Name[et]=Brasiilia portugali
+-Name[eu]=Brasileko Portugesa
++Name[eu]=Portugesa (Brasilgoa)
+ Name[fa]=پرتغالی برزیلی
+ Name[fi]=Brasilian Portugali
+ Name[fr]=Portugais Brésilien
+@@ -7135,7 +7151,7 @@
+ Name[mn]=Бразилын португал
+ Name[ms]=Portugis Brazil
+ Name[nb]=Brasil-portugisisk
+-Name[nds]=Brasiliaansch Portugeessch
++Name[nds]=Brasiliaansch Portugeesch
+ Name[nl]=Braziliaans Portugees
+ Name[nn]=Brasil-portugisisk
+ Name[pa]=ਬਰਾਜ਼ੀਲ ਪà©à¨°à¨¤à¨—ਾਲੀ
+@@ -7285,7 +7301,7 @@
+ Name[ms]=Romania
+ Name[mt]=Rumen
+ Name[nb]=Rumensk
+-Name[nds]=Rumäänsch
++Name[nds]=Romeensch
+ Name[nl]=Roemeens
+ Name[nn]=Rumensk
+ Name[nso]=Se-Romanian
+@@ -7316,6 +7332,21 @@
+ Name[zh_CN]=罗马尼亚è¯
+ Name[zh_TW]=羅馬尼亞語
+ Name[zu]=Isi-Romania
++[rom]
++Name=Romany
++Name[de]=Romani
++Name[el]=Ρουμανία
++Name[es]=RumanÃ
++Name[et]=Mustlaskeel
++Name[hu]=Lovári cigány
++Name[is]=RúmenÃa
++Name[nds]=Roomsch
++Name[nl]=Roma
++Name[pt]=Romeno
++Name[pt_BR]=Romeno
++Name[sv]=Romanés
++Name[uk]=ЦиганÑька
++Name[zh_CN]=å‰æ™®èµ›è¯
+ [ru]
+ Name=Russian
+ Name[af]=Russies
+@@ -7403,6 +7434,7 @@
+ Name[bn]=কিনà§à¦¯à¦¾à¦°à¦“য়াণà§à¦¡à¦¾
+ Name[de]=Rwanda-Sprache
+ Name[et]=Ruanda
++Name[eu]=Kinyaruanda
+ Name[fa]=کینیارواندا
+ Name[fi]=Ruanda
+ Name[ga]=Cinearuáindis
+@@ -7503,7 +7535,7 @@
+ Name[eo]=Sarda
+ Name[es]=Sardo
+ Name[et]=Sardiinia
+-Name[eu]=Sardiniera
++Name[eu]=Sardiera
+ Name[fa]=ساردینیایی
+ Name[fi]=Sardi
+ Name[fr]=Sarde
+@@ -7526,7 +7558,7 @@
+ Name[mk]=СардиниÑки
+ Name[mn]=Сардин
+ Name[nb]=Sardisk
+-Name[nds]=Sardiinsch
++Name[nds]=Sardiensch
+ Name[nl]=Sardinisch
+ Name[nn]=Sardiniansk
+ Name[nso]=Se-Sardinian
+@@ -7610,7 +7642,7 @@
+ Name[eo]=Norda Samea
+ Name[es]=Samà del norte
+ Name[et]=Põhja-saami
+-Name[eu]=Iparreko samia
++Name[eu]=Samia (iparrekoa)
+ Name[fa]=سامی شمالی
+ Name[fi]=Pohjoissaame
+ Name[fr]=Sami du Nord
+@@ -7715,6 +7747,7 @@
+ Name[eo]=Sinhala
+ Name[es]=Sinhalés
+ Name[et]=Singaleesi
++Name[eu]=Sinhala
+ Name[fa]=سینهالسیی
+ Name[fi]=Singali
+ Name[fr]=Singhalais
+@@ -8221,6 +8254,27 @@
+ Name[zh_CN]=塞尔维亚è¯
+ Name[zh_TW]=塞爾ç¶äºžèªž
+ Name[zu]=Isi-Serbian
++[sr at Latn]
++Name=Serbian Latin
++Name[br]=Serbeg latin
++Name[da]=Serbisk latin
++Name[de]=Serbisch Latein
++Name[el]=ΣεÏβικά (Λατινικά)
++Name[es]=LatÃn Serbio
++Name[et]=Serbia (ladina)
++Name[fr]=Serbe Latin
++Name[ga]=Seirbis (aibÃtir Laidineach)
++Name[hu]=Szerb (latin betűs)
++Name[is]=Serbnesk latÃna
++Name[it]=Serbo latino
++Name[lb]=Latäinescht Serbesch
++Name[nds]=Serbsch latiensch
++Name[nl]=Servisch Latijn
++Name[pt]=Sérvio Latino
++Name[pt_BR]=Sérvio Latino
++Name[sv]=Latinsk serbiska
++Name[uk]=СербÑька (латинь)
++Name[zh_CN]=塞尔维亚è¯(拉ä¸)
+ [ss]
+ Name=Swati
+ Name[ar]=السواتي
+@@ -8280,7 +8334,7 @@
+ Name[eo]=Suda Sota
+ Name[es]=Sotho del sur
+ Name[et]=Lõuna-sotho
+-Name[eu]=Egoaldeko sotho-a
++Name[eu]=Sothoera (egoaldekoa)
+ Name[fa]=سوتو، جنوبی
+ Name[fi]=Sotho
+ Name[fr]=Sotho du Sud
+@@ -8703,7 +8757,7 @@
+ Name[eo]=Taja
+ Name[es]=Tailandés
+ Name[et]=Tai
+-Name[eu]=Thaiera
++Name[eu]=Thailandiera
+ Name[fa]=تایلندی
+ Name[fr]=Thaïlandais
+ Name[fy]=Taaisk
+@@ -8877,6 +8931,7 @@
+ Name[de]=Tswana-Sprache
+ Name[eo]=Cvana
+ Name[et]=Tsvana
++Name[eu]=Tswanera
+ Name[fa]=سوانسایی
+ Name[fi]=TÅ¡wana
+ Name[fy]=Tswanaansk
+@@ -9032,6 +9087,7 @@
+ Name[bn]=তসংগা
+ Name[de]=Tsonga-Sprache
+ Name[eo]=Conga
++Name[eu]=Tsongera
+ Name[fa]=سونگایی
+ Name[fy]=Tsongaansk
+ Name[ga]=Songais
+@@ -9074,7 +9130,7 @@
+ Name[de]=Tatarisch
+ Name[eo]=Tatara
+ Name[et]=Tatari
+-Name[eu]=Tatarera
++Name[eu]=Tatariera
+ Name[fa]=تاتاری
+ Name[fi]=Tataari
+ Name[fy]=Tataarsk
+@@ -9524,7 +9580,7 @@
+ Name[ms]=Vietnam
+ Name[mt]=Vjetnamiż
+ Name[nb]=Vietnamesisk
+-Name[nds]=Vietnameessch
++Name[nds]=Vietnameesch
+ Name[nl]=Vietnamees
+ Name[nn]=Vietnamesisk
+ Name[nso]=Se-Vietnamese
+@@ -9629,7 +9685,7 @@
+ Name[mk]=ВалонÑки
+ Name[mn]=Валлоон
+ Name[nb]=Vallonsk
+-Name[nds]=Waloonsch
++Name[nds]=Walloonsch
+ Name[nl]=Waals
+ Name[nn]=Vallonsk
+ Name[nso]=Se-Walloon
+@@ -9707,6 +9763,7 @@
+ Name[bg]=КÑоÑа
+ Name[bn]=জোসা
+ Name[eo]=Ĥosa
++Name[eu]=Xhosera
+ Name[fa]=زسایی
+ Name[ga]=Cóisis
+ Name[he]=קוזה
+@@ -9752,6 +9809,7 @@
+ Name[de]=Jiddish
+ Name[eo]=Jida
+ Name[et]=Jidiš
++Name[eu]=Jiddish
+ Name[fa]=ییدی
+ Name[fi]=Jiddi
+ Name[fy]=Jiddysk
+@@ -9803,6 +9861,7 @@
+ Name[de]=Yoruba-Sprache
+ Name[eo]=Joruba
+ Name[et]=Joruba
++Name[eu]=Jorubera
+ Name[fa]=یروبایی
+ Name[fi]=Joruba
+ Name[ga]=Iarúibis
+@@ -9918,7 +9977,7 @@
+ Name[ms]=China
+ Name[mt]=Ċiniż
+ Name[nb]=Kinesisk
+-Name[nds]=Chineessch
++Name[nds]=Chineesch
+ Name[nl]=Chinees
+ Name[nn]=Kinesisk
+ Name[nso]=Se-China
+@@ -9966,7 +10025,7 @@
+ Name[el]=ΚινÎζικα απλά
+ Name[es]=Chino simplificado
+ Name[et]=Hiina (lihtsustatud)
+-Name[eu]=Txinera xehea
++Name[eu]=Txinatar soildua
+ Name[fi]=Yksinkertaistettu kiina
+ Name[fr]=Chinois simplifié
+ Name[fy]=Sjineesk (ynfaldich)
+@@ -9983,7 +10042,7 @@
+ Name[lt]=Kinų supaprastinta
+ Name[lv]=ĶīnieÅ¡u vienkÄrÅ¡otÄ
+ Name[nb]=Forenklet kinesisk
+-Name[nds]=Vereenfacht Chineessch
++Name[nds]=Vereenfacht Chineesch
+ Name[nl]=Chinees (Vereenvoudigd)
+ Name[nn]=Kinesisk (forenkla)
+ Name[pa]=ਚੀਨੀ ਸਧਾਰਨ
+@@ -10006,6 +10065,23 @@
+ Name[uk]=КитайÑька (Ñпрощена)
+ Name[uz]=Соддалаштирилган Хитойча
+ Name[zh_CN]=简体ä¸æ–‡
++[zh_HK]
++Name=Chinese (Hong Kong)
++Name[da]=Kinesisk (Hong Kong)
++Name[de]=Chinesisch (Hongkong)
++Name[el]=ΚινÎζικα (Χονγκ Κονγκ)
++Name[es]=Chino (Hong Kong)
++Name[et]=Hiina (Hong Kong)
++Name[fr]=Chinois (Hong Kong)
++Name[hu]=KÃnai (hongkongi)
++Name[is]=KÃnverska (Hong Kong)
++Name[nds]=Chineesch (Hong Kong)
++Name[nl]=Chinees (Hong Kong)
++Name[pt]=Chinês (Hong Kong)
++Name[pt_BR]=Chinês (Hong Kong)
++Name[sv]=Kinesiska (Hong Kong)
++Name[uk]=КитайÑька (Гонконг)
++Name[zh_CN]=ç¹ä½“ä¸æ–‡(香港)
+ [zh_TW]
+ Name=Chinese Traditional
+ Name[af]=Sjinese tradisioneel
+@@ -10020,7 +10096,7 @@
+ Name[el]=ΚινÎζικα παÏαδοσιακά
+ Name[es]=Chino tradicional
+ Name[et]=Hiina (traditsiooniline)
+-Name[eu]=Txinera tradizionala
++Name[eu]=Txinatar tradizionala
+ Name[fi]=Perinteinen kiina
+ Name[fr]=Chinois traditionnel
+ Name[fy]=Sjineesk (tradisjoniel)
+@@ -10037,7 +10113,7 @@
+ Name[lt]=Kinų tradicinė
+ Name[lv]=ĶīnieÅ¡u tradicionÄlÄ
+ Name[nb]=Tradisjonell kinesisk
+-Name[nds]=Traditschonell Chineessch
++Name[nds]=Traditschonell Chineesch
+ Name[nl]=Chinees (Traditioneel)
+ Name[nn]=Kinesisk (tradisjonell)
+ Name[pa]=ਚੀਨੀ ਮੂਲ
+--- kdecore/network/kdatagramsocket.cpp (revision 488534)
++++ kdecore/network/kdatagramsocket.cpp (revision 494869)
+@@ -170,6 +170,18 @@
+ return writeBlock(packet.data(), packet.size(), packet.address());
+ }
+
++Q_LONG KDatagramSocket::writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to)
++{
++ if (to.family() != AF_UNSPEC)
++ {
++ // make sure the socket is open at this point
++ if (!socketDevice()->isOpen())
++ // error handling will happen below
++ socketDevice()->create(to.family(), SOCK_DGRAM, 0);
++ }
++ return KClientSocketBase::writeBlock(data, len, to);
++}
++
+ void KDatagramSocket::lookupFinishedLocal()
+ {
+ // bind lookup has finished and succeeded
+--- kdecore/network/kbufferedsocket.cpp (revision 488534)
++++ kdecore/network/kbufferedsocket.cpp (revision 494869)
+@@ -290,6 +290,8 @@
+ void KBufferedSocket::closeNow()
+ {
+ KStreamSocket::close();
++ if (d->output)
++ d->output->clear();
+ }
+
+ bool KBufferedSocket::canReadLine() const
+--- kdecore/network/ksocketdevice.cpp (revision 488534)
++++ kdecore/network/ksocketdevice.cpp (revision 494869)
+@@ -64,6 +64,7 @@
+ {
+ public:
+ mutable QSocketNotifier *input, *output, *exception;
++ KSocketAddress local, peer;
+ int af;
+
+ inline KSocketDevicePrivate()
+@@ -187,6 +188,9 @@
+
+ d->input = d->output = d->exception = 0L;
+
++ d->local.setFamily(AF_UNSPEC);
++ d->peer.setFamily(AF_UNSPEC);
++
+ ::close(m_sockfd);
+ }
+ setState(0);
+@@ -216,6 +220,7 @@
+
+ d->af = family;
+ setSocketOptions(socketOptions());
++ setState(IO_Open);
+ return true; // successfully created
+ }
+
+@@ -259,7 +264,6 @@
+
+ resetError();
+ setFlags(IO_Sequential | IO_Raw | IO_ReadWrite);
+- setState(IO_Open);
+ return true;
+ }
+
+@@ -299,7 +303,6 @@
+ }
+
+ setFlags(IO_Sequential | IO_Raw | IO_ReadWrite);
+- setState(IO_Open);
+ return true; // all is well
+ }
+
+@@ -529,18 +532,21 @@
+ if (m_sockfd == -1)
+ return KSocketAddress(); // not open, empty value
+
++ if (d->local.family() != AF_UNSPEC)
++ return d->local;
++
+ socklen_t len;
+ KSocketAddress localAddress;
+ localAddress.setLength(len = 32); // arbitrary value
+ if (kde_getsockname(m_sockfd, localAddress.address(), &len) == -1)
+ // error!
+- return KSocketAddress();
++ return d->local = KSocketAddress();
+
+ if (len <= localAddress.length())
+ {
+ // it has fit already
+ localAddress.setLength(len);
+- return localAddress;
++ return d->local = localAddress;
+ }
+
+ // no, the socket address is actually larger than we had anticipated
+@@ -548,9 +554,9 @@
+ localAddress.setLength(len);
+ if (kde_getsockname(m_sockfd, localAddress.address(), &len) == -1)
+ // error!
+- return KSocketAddress();
++ return d->local = KSocketAddress();
+
+- return localAddress;
++ return d->local = localAddress;
+ }
+
+ KSocketAddress KSocketDevice::peerAddress() const
+@@ -558,18 +564,21 @@
+ if (m_sockfd == -1)
+ return KSocketAddress(); // not open, empty value
+
++ if (d->peer.family() != AF_UNSPEC)
++ return d->peer;
++
+ socklen_t len;
+ KSocketAddress peerAddress;
+ peerAddress.setLength(len = 32); // arbitrary value
+ if (kde_getpeername(m_sockfd, peerAddress.address(), &len) == -1)
+ // error!
+- return KSocketAddress();
++ return d->peer = KSocketAddress();
+
+ if (len <= peerAddress.length())
+ {
+ // it has fit already
+ peerAddress.setLength(len);
+- return peerAddress;
++ return d->peer = peerAddress;
+ }
+
+ // no, the socket address is actually larger than we had anticipated
+@@ -577,9 +586,9 @@
+ peerAddress.setLength(len);
+ if (kde_getpeername(m_sockfd, peerAddress.address(), &len) == -1)
+ // error!
+- return KSocketAddress();
++ return d->peer = KSocketAddress();
+
+- return peerAddress;
++ return d->peer = peerAddress;
+ }
+
+ KSocketAddress KSocketDevice::externalAddress() const
+--- kdecore/network/ksrvresolverworker.cpp (revision 488534)
++++ kdecore/network/ksrvresolverworker.cpp (revision 494869)
+@@ -13,8 +13,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ */
+
+ #include <config.h>
+--- kdecore/network/kdatagramsocket.h (revision 488534)
++++ kdecore/network/kdatagramsocket.h (revision 494869)
+@@ -238,6 +238,11 @@
+ { return KClientSocketBase::connect(entry); }
+
+ /**
++ * Writes data to the socket. Reimplemented from KClientSocketBase.
++ */
++ virtual Q_LONG writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to);
++
++ /**
+ * Receives one datagram from the stream. The reading process is guaranteed
+ * to be atomical and not lose data from the packet.
+ *
+--- kdecore/network/ksrvresolverworker_p.h (revision 488534)
++++ kdecore/network/ksrvresolverworker_p.h (revision 494869)
+@@ -13,8 +13,8 @@
+ *
+ * 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., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef KSRVRESOLVERWORKER_P_H
+--- kdecore/kcharsets.cpp (revision 488534)
++++ kdecore/kcharsets.cpp (revision 494869)
+@@ -101,6 +101,7 @@
+ "sjis",
+ "jis7",
+ "big5",
++ "big5-hkscs",
+ "gbk",
+ "gb18030",
+ "gb2312",
+@@ -157,6 +158,7 @@
+ // { "pt 154", 6 },
+ { "ibm866", 6 },
+ { "big5", 5 },
++ { "big5-hkscs", 5 },
+ { "gb18030", 4 },
+ { "gbk", 4 },
+ { "gb2312", 4 },
+@@ -284,6 +286,8 @@
+ { "macintosh", "apple roman" },
+ { "mac", "apple roman" },
+ { "csiso2022jp", "jis7" }, // See bug #77243
++ { "big5-eten", "big5-hkscs" },
++ { "cp950", "big5-hkscs" },
+ { 0, 0 }};
+
+ // some different names for the encodings defined in the charmaps files.
+--- kdecore/kpty.cpp (revision 488534)
++++ kdecore/kpty.cpp (revision 494869)
+@@ -164,6 +164,8 @@
+ struct KPtyPrivate {
+ KPtyPrivate() :
+ xonXoff(false),
++ utf8(false),
++ logged(false),
+ masterFd(-1), slaveFd(-1)
+ {
+ memset(&winSize, 0, sizeof(winSize));
+@@ -173,6 +175,7 @@
+
+ bool xonXoff : 1;
+ bool utf8 : 1;
++ bool logged : 1;
+ int masterFd;
+ int slaveFd;
+ struct winsize winSize;
+@@ -352,6 +355,7 @@
+ {
+ if (d->masterFd < 0)
+ return;
++ logout();
+ // don't bother resetting unix98 pty, it will go away after closing master anyway.
+ if (memcmp(d->ttyName.data(), "/dev/pts/", 9)) {
+ if (!geteuid()) {
+@@ -397,6 +401,9 @@
+
+ void KPty::login(const char *user, const char *remotehost)
+ {
++ if (d->logged)
++ return; // print a warning?
++ d->logged = true;
+ #ifdef HAVE_UTEMPTER
+ KProcess_Utmp utmp;
+ utmp.cmdFd = d->masterFd;
+@@ -440,6 +447,9 @@
+
+ void KPty::logout()
+ {
++ if (!d->logged)
++ return;
++ d->logged = false;
+ #ifdef HAVE_UTEMPTER
+ KProcess_Utmp utmp;
+ utmp.cmdFd = d->masterFd;
+--- khtml/khtml_part.cpp (revision 488534)
++++ khtml/khtml_part.cpp (revision 494869)
+@@ -1643,10 +1643,13 @@
+ if( !qData.isEmpty())
+ d->m_doc->processHttpEquiv("refresh", qData);
+
+- // Support Content-Location per section 14.14 of RFC 2616.
++ // DISABLED: Support Content-Location per section 14.14 of RFC 2616.
++ // See BR# 51185,BR# 82747
++ /*
+ QString baseURL = d->m_job->queryMetaData ("content-location");
+ if (!baseURL.isEmpty())
+ d->m_doc->setBaseURL(KURL( d->m_doc->completeURL(baseURL) ));
++ */
+
+ if ( !m_url.isLocalFile() ) {
+ // Support for http last-modified
+--- khtml/khtml.desktop (revision 488534)
++++ khtml/khtml.desktop (revision 494869)
+@@ -18,7 +18,7 @@
+ Comment[eo]=HTML-rigardo-komponento
+ Comment[es]=Componente incrustable para visualizar HTML
+ Comment[et]=Põimitav HTML-i näitamise komponent
+-Comment[eu]=HTML ikustaile txertagarria
++Comment[eu]=Kapsulatutako HTML ikustailea
+ Comment[fa]=بخش نمایش HTML نهÙته
+ Comment[fi]=Upotettava HTML-katselukomponentti
+ Comment[fr]=Composant d'affichage HTML intégrable
+@@ -43,7 +43,7 @@
+ Comment[ms]=Komponen pelihat HTML boleh-serta
+ Comment[mt]=Komponent integrat għall-wiri tal-HTML
+ Comment[nb]=Inkluderbar komponent for HTML-visning
+-Comment[nds]=Inbettbor HTML-Kieker-Komponent
++Comment[nds]=Inbettbor Kieker-Komponent för HTML
+ Comment[nl]=Ingebed HTML-weergavecomponent
+ Comment[nn]=Inkluderbart komponent for HTML-vising
+ Comment[nso]=Seripa seo se robatsegago sa pono ya HTML
+--- khtml/khtmlimage.desktop (revision 488534)
++++ khtml/khtmlimage.desktop (revision 494869)
+@@ -18,7 +18,7 @@
+ Comment[eo]=Enkonstruebla bildrigardilo
+ Comment[es]=Componente incrustable para visualizar imágenes
+ Comment[et]=Põimitav pildifailide näitamise komponent
+-Comment[eu]=Irudi ikustaile txertagarria
++Comment[eu]=Kapsulatutako irudi-ikustailea
+ Comment[fa]=بخش نمایشگر تصویر نهÙته
+ Comment[fi]=Upotettava kuviennäyttökomponentti
+ Comment[fr]=Composant d'affichage d'images intégrable
+@@ -43,7 +43,7 @@
+ Comment[ms]=Komponen Pelihat Imej Boleh-serta
+ Comment[mt]=Komponent integrat għall wiri tal-istampi
+ Comment[nb]=Innebyggbar bildevisningskomponent
+-Comment[nds]=Inbettbor Bild-Kieker-Komponent
++Comment[nds]=Inbettbor Kieker-Komponent för Biller
+ Comment[nl]=Ingebed afbeeldingenweergavecomponent
+ Comment[nn]=Inkluderbart komponent for biletvising
+ Comment[nso]=Seripa seo se Robatsegsgo sa Pono ya Ponagalo
+@@ -92,7 +92,7 @@
+ Name[eo]=Enkonstruita bildrigardilo
+ Name[es]=Visor de imágenes incrustable
+ Name[et]=Põimitav pildifailide näitaja
+-Name[eu]=Irudi ikustaile txertagarria
++Name[eu]=Kapsulatutako irudi-ikustailea
+ Name[fa]=نمایشگر تصویر نهÙته
+ Name[fi]=Upotettava kuvannäyttäjä
+ Name[fr]=Afficheur d'images intégrable
+@@ -117,7 +117,7 @@
+ Name[ms]=Pelihat Imej Boleh-serta
+ Name[mt]=Werrej integrat tal-istampi
+ Name[nb]=Bildeviser for innebyggbare bilder
+-Name[nds]=Inbettbor Bild-Kieker
++Name[nds]=Inbettbor Bildkieker
+ Name[nl]=Ingebedde afbeeldingenweergave
+ Name[nn]=Innebygd biletvisar
+ Name[nso]=Molebeledi yo a Robatsegago wa Ponagalo
+--- khtml/kmultipart/kmultipart.desktop (revision 488534)
++++ khtml/kmultipart/kmultipart.desktop (revision 494869)
+@@ -15,7 +15,7 @@
+ Name[eo]=Enplantebla komponanto por plurparto/mikso
+ Name[es]=Componente empotrado para multiparte/mezcla
+ Name[et]=Multipart/mixed põimitav komponent
+-Name[eu]=Multipart/mixed osagai txertagarria
++Name[eu]=Kapsulatutako zati-anitzen/nahastuen osagaia
+ Name[fi]=Upotettava komponentti multipart/mixed-hallintaan
+ Name[fr]=Composant intégrable pour le type multipart / mixed
+ Name[fy]=Yn te sluten komponint foar mulipart/mixed
+@@ -33,7 +33,7 @@
+ Name[mk]=Вгнездлива компонента за multipart/mixed
+ Name[ms]=Komponen boleh serta untuk pelbagai bahagian/bercampur
+ Name[nb]=Innebyggbar komponent for multipart/mixed
+-Name[nds]=Inbettbor Komponent för den MIME-Typ "multipart/mixed"
++Name[nds]=Inbettbor Komponent för multipart/mixed
+ Name[nl]=Inbedbaar component voor multipart/mixed
+ Name[nn]=Inkluderbar komponent for multipart/mixed
+ Name[pa]=ਬਹà©à¨à¨¾à¨—à©€/ਰਲਵੇਂ ਲਈ ਸ਼ਾਮਿਲ à¨à¨¾à¨—
+--- khtml/html/html_blockimpl.cpp (revision 488534)
++++ khtml/html/html_blockimpl.cpp (revision 494869)
+@@ -344,6 +344,20 @@
+ HTMLDivElementImpl::insertedIntoDocument();
+ }
+
++void HTMLLayerElementImpl::removeId(const QString& id)
++{
++ getDocument()->underDocNamedCache().remove(id, this);
++ HTMLDivElementImpl::removeId(id);
++}
++
++void HTMLLayerElementImpl::addId (const QString& id)
++{
++ getDocument()->underDocNamedCache().add(id, this);
++ HTMLDivElementImpl::addId(id);
++}
++
++
++
+ NodeImpl *HTMLLayerElementImpl::addChild(NodeImpl *child)
+ {
+ NodeImpl *retval = HTMLDivElementImpl::addChild(child);
+--- khtml/html/html_miscimpl.cpp (revision 488534)
++++ khtml/html/html_miscimpl.cpp (revision 494869)
+@@ -409,3 +409,46 @@
+
+ return 0;
+ }
++
++// -------------------------------------------------------------------------
++HTMLMappedNameCollectionImpl::HTMLMappedNameCollectionImpl(NodeImpl* _base, int _type, const DOMString& _name):
++ HTMLCollectionImpl(_base, NodeListImpl::UNCACHEABLE), name(_name)
++{
++ type = _type; //We pass uncacheable to collection, but need our own type internally.
++}
++
++bool HTMLMappedNameCollectionImpl::nodeMatches(NodeImpl *current, bool& deep) const
++{
++ if ( current->nodeType() != Node::ELEMENT_NODE )
++ {
++ deep = false;
++ return false;
++ }
++
++ HTMLElementImpl *e = static_cast<HTMLElementImpl *>(current);
++
++ return matchesName(e, type, name);
++}
++
++bool HTMLMappedNameCollectionImpl::matchesName( ElementImpl* el, int type, const DOMString& name )
++{
++ switch (el->id())
++ {
++ case ID_IMG:
++ case ID_FORM:
++ //Under document. these require non-empty name to see the element
++ if (type == DOCUMENT_NAMED_ITEMS && el->getAttribute(ATTR_NAME).isNull())
++ return false;
++ //Otherwise, fallthrough
++ case ID_OBJECT:
++ case ID_EMBED:
++ case ID_APPLET:
++ case ID_LAYER:
++ if (el->getAttribute(ATTR_NAME) == name || el->getAttribute(ATTR_ID) == name)
++ return true;
++ else
++ return false;
++ default:
++ return false;
++ }
++}
+--- khtml/html/html_formimpl.cpp (revision 488534)
++++ khtml/html/html_formimpl.cpp (revision 494869)
+@@ -737,6 +737,19 @@
+ HTMLElementImpl::insertedIntoDocument();
+ }
+
++void HTMLFormElementImpl::removeId(const QString& id)
++{
++ getDocument()->underDocNamedCache().remove(id, this);
++ HTMLElementImpl::removeId(id);
++}
++
++void HTMLFormElementImpl::addId (const QString& id)
++{
++ getDocument()->underDocNamedCache().add(id, this);
++ HTMLElementImpl::addId(id);
++}
++
++
+ void HTMLFormElementImpl::radioClicked( HTMLGenericFormElementImpl *caller )
+ {
+ for (QPtrListIterator<HTMLGenericFormElementImpl> it(formElements); it.current(); ++it) {
+--- khtml/html/html_objectimpl.cpp (revision 488534)
++++ khtml/html/html_objectimpl.cpp (revision 494869)
+@@ -87,11 +87,42 @@
+ else
+ removeCSSProperty(CSS_PROP_HEIGHT);
+ break;
++ case ATTR_NAME:
++ if (inDocument() && m_name != attr->value()) {
++ getDocument()->underDocNamedCache().remove(m_name.string(), this);
++ getDocument()->underDocNamedCache().add (attr->value().string(), this);
++ }
++ m_name = attr->value();
++ //fallthrough
+ default:
+ HTMLElementImpl::parseAttribute( attr );
+ }
+ }
+
++void HTMLObjectBaseElementImpl::removedFromDocument()
++{
++ getDocument()->underDocNamedCache().remove(m_name.string(), this);
++ HTMLElementImpl::removedFromDocument();
++}
++
++void HTMLObjectBaseElementImpl::insertedIntoDocument()
++{
++ getDocument()->underDocNamedCache().add(m_name.string(), this);
++ HTMLElementImpl::insertedIntoDocument();
++}
++
++void HTMLObjectBaseElementImpl::removeId(const QString& id)
++{
++ getDocument()->underDocNamedCache().remove(id, this);
++ HTMLElementImpl::removeId(id);
++}
++
++void HTMLObjectBaseElementImpl::addId (const QString& id)
++{
++ getDocument()->underDocNamedCache().add(id, this);
++ HTMLElementImpl::addId(id);
++}
++
+ void HTMLObjectBaseElementImpl::recalcStyle( StyleChange ch )
+ {
+ if (needWidgetUpdate) {
+@@ -226,13 +257,6 @@
+ case ATTR_VALIGN:
+ addCSSProperty(CSS_PROP_VERTICAL_ALIGN, attr->value().lower() );
+ break;
+- case ATTR_NAME:
+- if (inDocument() && m_name != attr->value()) {
+- getDocument()->underDocNamedCache().remove(m_name.string(), this);
+- getDocument()->underDocNamedCache().add (attr->value().string(), this);
+- }
+- m_name = attr->value();
+- //fallthrough
+ default:
+ HTMLObjectBaseElementImpl::parseAttribute(attr);
+ }
+@@ -257,19 +281,6 @@
+ HTMLObjectBaseElementImpl::attach();
+ }
+
+-void HTMLAppletElementImpl::removedFromDocument()
+-{
+- getDocument()->underDocNamedCache().remove(m_name.string(), this);
+- HTMLObjectBaseElementImpl::removedFromDocument();
+-}
+-
+-void HTMLAppletElementImpl::insertedIntoDocument()
+-{
+- getDocument()->underDocNamedCache().add(m_name.string(), this);
+- HTMLObjectBaseElementImpl::insertedIntoDocument();
+-}
+-
+-
+ // -------------------------------------------------------------------------
+
+ HTMLEmbedElementImpl::HTMLEmbedElementImpl(DocumentPtr *doc)
+--- khtml/html/html_imageimpl.cpp (revision 488534)
++++ khtml/html/html_imageimpl.cpp (revision 494869)
+@@ -256,6 +256,19 @@
+ HTMLElementImpl::insertedIntoDocument();
+ }
+
++void HTMLImageElementImpl::removeId(const QString& id)
++{
++ getDocument()->underDocNamedCache().remove(id, this);
++ HTMLElementImpl::removeId(id);
++}
++
++void HTMLImageElementImpl::addId (const QString& id)
++{
++ getDocument()->underDocNamedCache().add(id, this);
++ HTMLElementImpl::addId(id);
++}
++
++
+ long HTMLImageElementImpl::width() const
+ {
+ if (!m_render) {
+--- khtml/html/html_blockimpl.h (revision 488534)
++++ khtml/html/html_blockimpl.h (revision 494869)
+@@ -95,6 +95,8 @@
+
+ virtual void removedFromDocument();
+ virtual void insertedIntoDocument();
++ virtual void addId(const QString& id);
++ virtual void removeId(const QString& id);
+ private:
+ DOMString m_name;
+ bool fixed;
+--- khtml/html/html_miscimpl.h (revision 488534)
++++ khtml/html/html_miscimpl.h (revision 494869)
+@@ -70,6 +70,8 @@
+ DOC_ALL, // "all" elements (IE)
+ NODE_CHILDREN, // first-level children (IE)
+ FORM_ELEMENTS, // input elements in a form
++ WINDOW_NAMED_ITEMS,
++ DOCUMENT_NAMED_ITEMS,
+ LAST_TYPE
+ };
+
+@@ -125,7 +127,21 @@
+ mutable bool foundInput;
+ };
+
++/*
++ Special collection for items of given name/id under document. or window.; but using
++ iteration interface
++*/
++class HTMLMappedNameCollectionImpl : public HTMLCollectionImpl
++{
++public:
++ HTMLMappedNameCollectionImpl(NodeImpl* _base, int type, const DOMString& name);
++ virtual bool nodeMatches( NodeImpl *testNode, bool& doRecurse ) const;
+
++ static bool matchesName( ElementImpl* el, int type, const DOMString& name);
++private:
++ DOMString name;
++};
++
+ } //namespace
+
+ #endif
+--- khtml/html/html_formimpl.h (revision 488534)
++++ khtml/html/html_formimpl.h (revision 494869)
+@@ -71,7 +71,10 @@
+
+ virtual void insertedIntoDocument();
+ virtual void removedFromDocument();
++ virtual void addId(const QString& id);
++ virtual void removeId(const QString& id);
+
++
+ long length() const;
+
+ QByteArray formData(bool& ok);
+--- khtml/html/html_objectimpl.h (revision 488534)
++++ khtml/html/html_objectimpl.h (revision 494869)
+@@ -57,9 +57,14 @@
+ bool needWidgetUpdate;
+ bool m_renderAlternative;
+
++ virtual void insertedIntoDocument();
++ virtual void removedFromDocument();
++ virtual void addId(const QString& id);
++ virtual void removeId(const QString& id);
+ protected slots:
+ void slotRenderAlternative();
+-
++protected:
++ DOMString m_name;
+ };
+
+ // -------------------------------------------------------------------------
+@@ -75,11 +80,7 @@
+
+ virtual void parseAttribute(AttributeImpl *token);
+ virtual void attach();
+- virtual void insertedIntoDocument();
+- virtual void removedFromDocument();
+-
+ protected:
+- DOMString m_name;
+ khtml::VAlign valign;
+ };
+
+--- khtml/html/html_imageimpl.h (revision 488534)
++++ khtml/html/html_imageimpl.h (revision 494869)
+@@ -50,7 +50,10 @@
+ virtual void attach();
+ virtual void removedFromDocument();
+ virtual void insertedIntoDocument();
++ virtual void addId(const QString& id);
++ virtual void removeId(const QString& id);
+
++
+ long width() const;
+ long height() const;
+
+--- khtml/ecma/kjs_html.h (revision 488534)
++++ khtml/ecma/kjs_html.h (revision 494869)
+@@ -220,26 +220,6 @@
+
+ Value getHTMLCollection(ExecState *exec, const DOM::HTMLCollection& c, bool hide=false);
+ Value getSelectHTMLCollection(ExecState *exec, const DOM::HTMLCollection& c, const DOM::HTMLSelectElement& e);
+-
+- /* Helper function object for determining the number
+- * of occurrences of xxxx as in document.xxxx or window.xxxx.
+- * The order of the TagLength array is the order of preference.
+- */
+- class NamedTagLengthDeterminer {
+- public:
+- struct TagLength {
+- DOM::NodeImpl::Id id; unsigned long length; DOM::ElementImpl *last;
+- };
+- NamedTagLengthDeterminer(const DOM::DOMString& n, TagLength *t, int l)
+- : name(n), tags(t), nrTags(l) {}
+- void operator () (DOM::NodeImpl *start);
+- private:
+- const DOM::DOMString& name;
+- TagLength *tags;
+- int nrTags;
+- };
+-
+-
+ } // namespace
+
+ #endif
+--- khtml/ecma/kjs_html.cpp (revision 488534)
++++ khtml/ecma/kjs_html.cpp (revision 494869)
+@@ -178,21 +178,6 @@
+ @end
+ */
+
+-void NamedTagLengthDeterminer::operator () (NodeImpl *start) {
+- for(NodeImpl *n = start->firstChild(); n != 0; n = n->nextSibling())
+- if ( n->nodeType() == Node::ELEMENT_NODE ) {
+- for (int i = 0; i < nrTags; i++)
+- if (n->id() == tags[i].id &&
+- static_cast<ElementImpl *>(n)->getAttribute(ATTR_NAME) == name) {
+- tags[i].length++;
+- tags[i].last = static_cast<ElementImpl*>(n); // cache this ElementImpl*
+- nrTags = i+1; // forget about Tags with lower preference
+- break;
+- }
+- (*this)(n);
+- }
+-}
+-
+ KJS::HTMLDocument::HTMLDocument(ExecState *exec, const DOM::HTMLDocument& d)
+ /*TODO pass HTMLDocumentProto::self(exec), but it needs to access DOMDocumentProto...*/
+ : DOMDocument(exec, d) { }
+@@ -237,34 +222,26 @@
+ if ( !win || !win->isSafeScript(exec) )
+ return Undefined();
+
+- // Check for images with name==propertyName, return item or list if found
+- // We don't use the images collection because it looks for id=p and name=p, we only want name=p
+- // Check for forms with name==propertyName, return item or list if found
+- // Note that document.myform should only look at forms
+- // Check for applets with name==propertyName, return item or list if found
+-
+- //But first, go through the cache
++ //Check for images, forms, objects, etc.
+ ElementMappingCache::ItemInfo* info = docImpl->underDocNamedCache().get(propertyName.qstring());
+ if (info) {
+- if (info->nd)
+- return getDOMNode(exec, info->nd);
+- else {
+- //No cached mapping, do it by hand
+- NamedTagLengthDeterminer::TagLength tags[4] = {
+- {ID_IMG, 0, 0L}, {ID_FORM, 0, 0L}, {ID_APPLET, 0, 0L}, {ID_LAYER, 0, 0L}
+- };
+- NamedTagLengthDeterminer(propertyName.string(), tags, 4)(doc.handle());
+- for (int i = 0; i < 4; i++) {
+- if (tags[i].length > 0) {
+- if (tags[i].length == 1) {
+- //Have a single answer -> cache
+- info->nd = tags[i].last;
+- return getDOMNode(exec, tags[i].last);
+- }
++ //May be a false positive, but we can try to avoid doing it the hard way in
++ //simpler cases. The trickiness here is that the cache is kept under both
++ //name and id, but we sometimes ignore id for IE compat
++ DOM::DOMString propertyDOMString = propertyName.string();
+
+- // Get all the items with the same name
+- return getDOMNodeList(exec, DOM::NodeList(new DOM::NamedTagNodeListImpl(doc.handle(), tags[i].id, propertyName.string())));
+- }
++ if (info->nd && DOM::HTMLMappedNameCollectionImpl::matchesName(info->nd,
++ HTMLCollectionImpl::DOCUMENT_NAMED_ITEMS, propertyDOMString)) {
++ return getDOMNode(exec, info->nd);
++ } 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);
++ } else if (coll.length() > 1) {
++ return getHTMLCollection(exec, coll);
+ }
+ }
+ }
+@@ -385,27 +362,7 @@
+ return Undefined();
+ }
+ }
+- if (DOMDocument::hasProperty(exec, propertyName))
+- return DOMDocument::tryGet(exec, propertyName);
+-
+- // allow shortcuts like 'document.Applet1' instead of document.applets.Applet1
+- if (doc.isHTMLDocument()) { // might be XML
+- DOM::HTMLCollection coll = doc.applets();
+- DOM::HTMLElement element = coll.namedItem(propertyName.string());
+- if (!element.isNull()) {
+- return getDOMNode(exec,element);
+- }
+-
+- DOM::HTMLCollection coll2 = doc.layers();
+- DOM::HTMLElement element2 = coll2.namedItem(propertyName.string());
+- if (!element2.isNull()) {
+- return getDOMNode(exec,element2);
+- }
+- }
+-#ifdef KJS_VERBOSE
+- kdDebug(6070) << "KJS::HTMLDocument::tryGet " << propertyName.qstring() << " not found" << endl;
+-#endif
+- return Undefined();
++ return DOMDocument::tryGet(exec, propertyName);
+ }
+
+ void KJS::HTMLDocument::tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr)
+@@ -2953,7 +2910,7 @@
+ case ID_CAPTION: {
+ DOM::HTMLTableCaptionElement tableCaption = element;
+ switch (token) {
+- case TableAlign: { tableCaption.setAlign(str); return; }
++ case TableCaptionAlign: { tableCaption.setAlign(str); return; }
+ }
+ }
+ break;
+--- khtml/ecma/kjs_window.cpp (revision 488534)
++++ khtml/ecma/kjs_window.cpp (revision 494869)
+@@ -806,37 +806,29 @@
+ }
+ }
+
+- // allow shortcuts like 'Image1' instead of document.images.Image1
+- if (isSafeScript(exec) &&
+- part->document().isHTMLDocument()) { // might be XML
+- // This is only for images, forms, layers and applets, see KJS::HTMLDocument::tryGet
+- DOM::HTMLDocument doc = part->htmlDocument();
+-
+- DOM::ElementMappingCache::ItemInfo* info =
+- static_cast<DOM::DocumentImpl*>(doc.handle())->underDocNamedCache().get(p.qstring());
++ //Check for images, forms, objects, etc.
++ if (isSafeScript(exec) && part->document().isHTMLDocument()) { // might be XML
++ DOM::DocumentImpl* docImpl = part->xmlDocImpl();
++ DOM::ElementMappingCache::ItemInfo* info = docImpl->underDocNamedCache().get(p.qstring());
+ if (info) {
+- if (info->nd)
++ //May be a false positive, but we can try to avoid doing it the hard way in
++ //simpler cases. The trickiness here is that the cache is kept under both
++ //name and id, but we sometimes ignore id for IE compat
++ DOM::DOMString propertyDOMString = p.string();
++ if (info->nd && DOM::HTMLMappedNameCollectionImpl::matchesName(info->nd,
++ DOM::HTMLCollectionImpl::WINDOW_NAMED_ITEMS, propertyDOMString)) {
+ return getDOMNode(exec, info->nd);
+- else {
+- //No cached mapping, do it by hand
+- NamedTagLengthDeterminer::TagLength tags[4] = {
+- {ID_IMG, 0, 0L}, {ID_FORM, 0, 0L}, {ID_APPLET, 0, 0L}, {ID_LAYER, 0, 0L}
+- };
+- NamedTagLengthDeterminer(p.string(), tags, 4)(doc.handle());
+- for (int i = 0; i < 4; i++)
+- if (tags[i].length > 0) {
+- if (tags[i].length == 1) {
+- //Have a single answer -> cache
+- info->nd = tags[i].last;
+- return getDOMNode(exec, tags[i].last);
+- }
+- // Get all the items with the same name
+- return getDOMNodeList(exec, DOM::NodeList(new DOM::NamedTagNodeListImpl(doc.handle(), tags[i].id, p.string())));
+- }
++ } 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, DOM::HTMLCollectionImpl::WINDOW_NAMED_ITEMS, propertyDOMString);
++
++ if (coll.length() == 1)
++ return getDOMNode(exec, coll.firstItem());
++ else if (coll.length() > 1)
++ return getHTMLCollection(exec, coll);
+ }
+ }
+-
+- DOM::Element element = doc.getElementById(p.string() );
++ DOM::Element element = part->document().getElementById(p.string());
+ if ( !element.isNull() )
+ return getDOMNode(exec, element );
+ }
+--- khtml/ecma/domparser.cpp (revision 488534)
++++ khtml/ecma/domparser.cpp (revision 494869)
+@@ -1,7 +1,7 @@
+ // -*- c-basic-offset: 2 -*-
+ /*
+ * This file is part of the KDE libraries
+- * Copyright (C) 2003 Apple Computer, Inc.
++ * Copyright (C) 2005 Anders Carlsson (andersca at mac.com)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+--- khtml/rendering/render_style.cpp (revision 488534)
++++ khtml/rendering/render_style.cpp (revision 494869)
+@@ -878,6 +878,11 @@
+ newContentData->_contentType = CONTENT_QUOTE;
+ }
+
++void RenderStyle::clearContent() {
++ delete content;
++ content = 0;
++}
++
+ ContentData::~ContentData()
+ {
+ clearContent();
+@@ -901,6 +906,9 @@
+ _content.counter->deref();
+ _content.counter = 0;
+ break;
++ case CONTENT_QUOTE:
++ _content.quote = NO_QUOTE;
++ break;
+ default:
+ ;
+ }
+--- khtml/rendering/render_style.h (revision 488534)
++++ khtml/rendering/render_style.h (revision 494869)
+@@ -1275,6 +1275,7 @@
+ void setContent(CachedObject* o, bool add);
+ void setContent(DOM::CounterImpl* c, bool add);
+ void setContent(EQuoteContent q, bool add);
++ void clearContent();
+
+ DOM::CSSValueListImpl* counterReset() const { return counter_reset; }
+ DOM::CSSValueListImpl* counterIncrement() const { return counter_increment; }
+--- khtml/dom/html_misc.h (revision 488534)
++++ khtml/dom/html_misc.h (revision 494869)
+@@ -21,7 +21,7 @@
+ * This file includes excerpts from the Document Object Model (DOM)
+ * Level 1 Specification (Recommendation)
+ * http://www.w3.org/TR/REC-DOM-Level-1/
+- * Copyright © World Wide Web Consortium , (Massachusetts Institute of
++ * Copyright World Wide Web Consortium , (Massachusetts Institute of
+ * Technology , Institut National de Recherche en Informatique et en
+ * Automatique , Keio University ). All Rights Reserved.
+ *
+@@ -208,6 +208,15 @@
+ HTMLFormCollection(NodeImpl *base);
+ };
+
++/**
++ @internal. Not part of the public API
++*/
++class HTMLMappedNameCollection : public HTMLCollection
++{
++public:
++ HTMLMappedNameCollection(NodeImpl *base, int type, const DOMString &name );
++};
++
+ } //namespace
+
+ #endif
+--- khtml/dom/html_misc.cpp (revision 488534)
++++ khtml/dom/html_misc.cpp (revision 494869)
+@@ -205,3 +205,10 @@
+ impl->ref();
+ }
+
++
++// -----------------------------------------------------------------------------
++HTMLMappedNameCollection::HTMLMappedNameCollection(NodeImpl *base, int type, const DOMString &name )
++{
++ impl = new HTMLMappedNameCollectionImpl(base, type, name);
++ impl->ref();
++}
+--- khtml/java/kjavaappletviewer.desktop (revision 488534)
++++ khtml/java/kjavaappletviewer.desktop (revision 494869)
+@@ -16,7 +16,7 @@
+ Name[eo]=Enkonstruita javaplikaĵrigardilo
+ Name[es]=Visor de applets de Java empotrables
+ Name[et]=Põimitav Java apleti näitaja
+-Name[eu]=Javaren aplet-ikustaile txertagarria
++Name[eu]=Kapsulatutako Javaren applet-ikustailea
+ Name[fa]=نمایشگر نهÙته‌ی برنامک‌های Java
+ Name[fi]=Upotettava Java-sovelmien näyttäjä
+ Name[fr]=Afficheur d'applets Java intégré
+@@ -39,7 +39,7 @@
+ Name[mn]=Суулгаж болох Жава Ðпплет Харагч
+ Name[ms]=Pelihat Aplet Java Terserta
+ Name[nb]=Innebygd Java Applet-viser
+-Name[nds]=Inbett Kieker vör Java-Programmen
++Name[nds]=Inbett Kieker för Java-Lüttprogrammen
+ Name[nl]=Ingebed Java Applet-weergaveprogramma
+ Name[nn]=Innebygd Java-appletvisar
+ Name[pa]=ਸ਼ਾਮਿਲ Java Applet ਦਰਸ਼ਕ
+--- khtml/ChangeLog (revision 488534)
++++ khtml/ChangeLog (revision 494869)
+@@ -1,3 +1,8 @@
++2006-01-03 Allan Sandfeld Jensen <kde at carewolf.com>
++
++ * css/cssparser.cpp: Allow content: normal | none
++ * css/cssstyleselector.cpp: Handle content: normal | none
++
+ 2005-12-09 Germain Garand <germain at ebooksfrance.org>
+
+ implement quirky HTML alignment ; introduce special float values
+@@ -14,7 +19,7 @@
+
+ 2005-12-06 Dirk Mueller <mueller at kde.org>
+
+- * html/htmltokenizer.cpp: don't treat <!---> specially.
++ * html/htmltokenizer.cpp: don't treat <!---> specially.
+ fixes bug 93799.
+
+ 2005-12-02 Charles Samuels <charles at kde.org>
+@@ -25,15 +30,15 @@
+
+ sizing of percent objects within table cells
+
+- * rendering/render_box.cpp (calcPercentageHeight): transfer most of the logic for table cells in render_table as
++ * rendering/render_box.cpp (calcPercentageHeight): transfer most of the logic for table cells in render_table as
+ it was partly redundant here. Don't apply the table cell sizing hacks in strict mode - no other engine does that.
+ Don't forget anonymous blocks - those must not stop recursion obviously.
+ Move substraction of the border/padding after calculation (spotted in WC)
+
+- * rendering/render_table.{cpp,h}:
++ * rendering/render_table.{cpp,h}:
+ had member booleans to hold whether flexing of cells in a row is
+- needed, and in the affirmative, whether we need to mark our anonymous childs for relayout (hence go one level deeper).
+- Part of line 1394 comes from WebCore.
++ needed, and in the affirmative, whether we need to mark our anonymous childs for relayout (hence go one level deeper).
++ Part of line 1394 comes from WebCore.
+ Also: don't allow negative offset in vertical alignment when content overflows ; matches MSIE better.
+
+ 2005-10-28 Germain Garand <germain at ebooksfrance.org>
+@@ -43,7 +48,7 @@
+
+ 2005-10-21 Germain Garand <germain at ebooksfrance.org>
+
+- * rendering/bidi.cpp (findNextLineBreak): implement needed quirk for line breaking of
++ * rendering/bidi.cpp (findNextLineBreak): implement needed quirk for line breaking of
+ replaced elements within table cells.
+ * rendering/render_block.cpp (calcInlineMinMaxWidth): ditto.
+ Bugs #93745, #72457
+@@ -52,12 +57,12 @@
+ * ecma/xmlhttprequest.cpp:
+ -Add support for default HTTP referer header. Fixes bug# 113962.
+ - Sanitize all setRequestHeader calls:
+- - We now use a BANNED_HTTP_HEADERS list to filter out
++ - We now use a BANNED_HTTP_HEADERS list to filter out
+ potentially problematic headers.
+- - We always call open on "get" and "post" requests set
++ - We always call open on "get" and "post" requests set
+ through this function.
+ - We sanitize any attempts to set the "referer" field.
+-
++
+ 2005-10-15 Dawit Alemayehu <adawit at kde.org>
+ * ecma/xmlhttprequest.cpp: Handle HTTP response headers case insensitively.
+ Fix for bug 110768.
+--- khtml/css/cssparser.cpp (revision 488534)
++++ khtml/css/cssparser.cpp (revision 494869)
+@@ -494,9 +494,13 @@
+ }
+ break;
+
+- case CSS_PROP_CONTENT: // [ <string> | <uri> | <counter> | attr(X) | open-quote |
+- // close-quote | no-open-quote | no-close-quote ]+ | inherit
+- return parseContent( propId, important );
++ case CSS_PROP_CONTENT: // normal | none | inherit |
++ // [ <string> | <uri> | <counter> | attr(X) | open-quote | close-quote | no-open-quote | no-close-quote ]+
++ if ( id == CSS_VAL_NORMAL || id == CSS_VAL_NONE)
++ valid_primitive = true;
++ else
++ return parseContent( propId, important );
++ break;
+
+ case CSS_PROP_WHITE_SPACE: // normal | pre | nowrap | pre-wrap | pre-line | inherit
+ if ( id == CSS_VAL_NORMAL ||
+--- khtml/css/cssstyleselector.cpp (revision 488534)
++++ khtml/css/cssstyleselector.cpp (revision 494869)
+@@ -3169,11 +3169,19 @@
+ break;
+
+ if (isInitial) {
+- if (style->contentData())
+- style->contentData()->clearContent();
++ style->clearContent();
+ return;
+ }
+
++ if (primitiveValue && primitiveValue->primitiveType() == CSSPrimitiveValue::CSS_IDENT) {
++ // normal | none
++ if (primitiveValue->getIdent() == CSS_VAL_NORMAL || primitiveValue->getIdent() == CSS_VAL_NONE) {
++ style->clearContent();
++ return;
++ }
++ assert(false);
++ }
++
+ if(!value->isValueList()) return;
+ CSSValueListImpl *list = static_cast<CSSValueListImpl *>(value);
+ int len = list->length();
+--- khtml/test_regression.cpp (revision 488534)
++++ khtml/test_regression.cpp (revision 494869)
+@@ -1106,7 +1106,7 @@
+
+ // are blocking reads possible with KProcess?
+ char pwd[PATH_MAX];
+- getcwd( pwd, PATH_MAX );
++ (void) getcwd( pwd, PATH_MAX );
+ chdir( QFile::encodeName( m_baseDir ) );
+
+ if ( failures & RenderFailure ) {
+--- khtml/xml/dom_nodeimpl.cpp (revision 488534)
++++ khtml/xml/dom_nodeimpl.cpp (revision 494869)
+@@ -1175,6 +1175,7 @@
+
+ void NodeBaseImpl::removeChildren()
+ {
++ bool inDoc = inDocument();
+ NodeImpl *n, *next;
+ for( n = _first, _first = 0; n; n = next )
+ {
+@@ -1184,11 +1185,13 @@
+ n->setPreviousSibling(0);
+ n->setNextSibling(0);
+ n->setParent(0);
+- if( !n->refCount() )
+- delete n;
+- else
++
++ if ( inDoc )
+ for ( NodeImpl* c = n; c; c = c->traverseNextNode( n ) )
+ c->removedFromDocument();
++
++ if( !n->refCount() )
++ delete n;
+ }
+ _last = 0;
+ }
+@@ -1324,7 +1327,8 @@
+ _first = _last = newChild;
+ }
+
+- newChild->insertedIntoDocument();
++ if (inDocument())
++ newChild->insertedIntoDocument();
+ childrenChanged();
+
+ if(newChild->nodeType() == Node::ELEMENT_NODE)
+@@ -1776,19 +1780,6 @@
+ return static_cast<ElementImpl *>(testNode)->getAttribute(ATTR_NAME) == nodeName;
+ }
+
+-NamedTagNodeListImpl::NamedTagNodeListImpl( NodeImpl *n, NodeImpl::Id tagId, const DOMString& name )
+- : TagNodeListImpl( n, tagId ), nodeName( name )
+-{
+-}
+-
+-bool NamedTagNodeListImpl::nodeMatches( NodeImpl *testNode, bool& doRecurse ) const
+-{
+- if ( testNode->nodeType() != Node::ELEMENT_NODE ) return false;
+- return TagNodeListImpl::nodeMatches( testNode, doRecurse )
+- && static_cast<ElementImpl *>(testNode)->getAttribute(ATTR_NAME) == nodeName;
+-}
+-
+-
+ // ---------------------------------------------------------------------------
+
+ NamedNodeMapImpl::NamedNodeMapImpl()
+--- khtml/xml/dom_elementimpl.cpp (revision 488534)
++++ khtml/xml/dom_elementimpl.cpp (revision 494869)
+@@ -683,12 +683,22 @@
+
+ DocumentImpl* doc = getDocument();
+ if (oldId && oldId->l)
+- doc->getElementByIdCache().remove(DOMString(oldId).string(), this);
++ removeId(DOMString(oldId).string());
+
+ if (newId && newId->l)
+- doc->getElementByIdCache().add(DOMString(newId).string(), this);
++ addId(DOMString(newId).string());
+ }
+
++void ElementImpl::removeId(const QString& id)
++{
++ getDocument()->getElementByIdCache().remove(id, this);
++}
++
++void ElementImpl::addId(const QString& id)
++{
++ getDocument()->getElementByIdCache().add(id, this);
++}
++
+ void ElementImpl::insertedIntoDocument()
+ {
+ // need to do superclass processing first so inDocument() is true
+--- khtml/xml/dom_nodeimpl.h (revision 488534)
++++ khtml/xml/dom_nodeimpl.h (revision 494869)
+@@ -653,19 +653,6 @@
+ DOMString nodeName;
+ };
+
+-/**
+- * NodeList which lists all Nodes in a document with a given tag name
+- * _and_ a given value for the name attribute (combination of TagNodeListImpl and NameNodeListImpl)
+- */
+-class NamedTagNodeListImpl : public TagNodeListImpl
+-{
+-public:
+- NamedTagNodeListImpl( NodeImpl *n, NodeImpl::Id tagId, const DOMString& name );
+-protected:
+- virtual bool nodeMatches( NodeImpl *testNode, bool& doRecurse ) const;
+- DOMString nodeName;
+-};
+-
+ // Generic NamedNodeMap interface
+ // Other classes implement this for more specific situations e.g. attributes
+ // of an element
+--- khtml/xml/dom_elementimpl.h (revision 488534)
++++ khtml/xml/dom_elementimpl.h (revision 494869)
+@@ -230,6 +230,10 @@
+ void setRestyleChildrenLate() { m_restyleChildrenLate = true; };
+
+ 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);
++ //Called when mapping from id to this node in document should be added
++ virtual void addId (const QString& id);
+ protected:
+ void createAttributeMap() const;
+ void createDecl();
+--- kresources/kresources_manager.desktop (revision 488534)
++++ kresources/kresources_manager.desktop (revision 494869)
+@@ -30,6 +30,7 @@
+ Comment[lt]=KResouse tvarkyklÄ—
+ Comment[lv]=KResursu menedžeris
+ Comment[nb]=KRessurshåndterer
++Comment[nds]=KResource-Pleger
+ Comment[nl]=KResource-beheerder
+ Comment[nn]=KResource-handtering
+ Comment[pa]=KResource ਪà©à¨°à¨¬à©°à¨§à¨•
+--- kresources/kresources.desktop (revision 488534)
++++ kresources/kresources.desktop (revision 494869)
+@@ -76,7 +76,7 @@
+ Comment[eo]=Agordu KDEajn risurcojn
+ Comment[es]=Configurar recursos de KDE
+ Comment[et]=KDE ressurside seadistamine
+-Comment[eu]=KDEren baliabideak konfiguratu
++Comment[eu]=Konfiguratu KDEren baliabideak
+ Comment[fi]=Muokkaa KDE:n resursseja
+ Comment[fr]=Configure les ressources de KDE
+ Comment[fy]=KDE helpboarne Ynstelle
+--- kresources/kresources_plugin.desktop (revision 488534)
++++ kresources/kresources_plugin.desktop (revision 494869)
+@@ -17,7 +17,7 @@
+ Comment[eo]=Risurckadraĵa kromaĵo
+ Comment[es]=Plugin del entorno de KResource
+ Comment[et]=KResource'i raamistiku plugin
+-Comment[eu]=KResource Framework plugina
++Comment[eu]=KResource sistemako plugin-a
+ Comment[fa]=متصل کننده‌ی قالب‌گار برای KResource
+ Comment[fi]=KResource Framework -lisäosa
+ Comment[fr]=Module externe du cadre de KResource
+@@ -38,6 +38,7 @@
+ Comment[mn]=Ðөөц Тодорхойлох-Файлын плугин (RDF)
+ Comment[ms]=Plug masuk Kerangka KResource
+ Comment[nb]=KRessursrammeverk tilleggsprogram
++Comment[nds]=Plugin för dat KResource-Rahmenwark
+ Comment[nl]=KResource Framework-plugin
+ Comment[nn]=Programtillegg for KResource-rammeverket
+ Comment[pa]=KResource ਫਰੇਮਵਰਕ ਪਲੱਗਿੰਨ
+--- kjs/regexp.cpp (revision 488534)
++++ kjs/regexp.cpp (revision 494869)
+@@ -202,26 +202,30 @@
+
+ // map rmatch array to ovector used in PCRE case
+ nrSubPatterns = 0;
+- for(uint j = 1; j < maxMatch && rmatch[j].rm_so >= 0 ; j++)
+- nrSubPatterns++;
+- int ovecsize = (nrSubPatterns+1)*3; // see above
++ for (uint j = 0; j < maxMatch && rmatch[j].rm_so >= 0 ; j++) {
++ nrSubPatterns++;
++ // if the nonEmpty flag is set, return a failed match if any of the
++ // subMatches happens to be an empty string.
++ if (m_notEmpty && rmatch[j].rm_so == rmatch[j].rm_eo)
++ return UString::null;
++ }
++ // Allow an ovector slot to return the (failed) match result.
++ if (nrSubPatterns == 0) nrSubPatterns = 1;
++
++ int ovecsize = (nrSubPatterns)*3; // see above
+ *ovector = new int[ovecsize];
+- for (uint j = 0; j < nrSubPatterns + 1; j++) {
+- if (j>maxMatch)
+- break;
+- (*ovector)[2*j] = rmatch[j].rm_so + i;
+- (*ovector)[2*j+1] = rmatch[j].rm_eo + i;
++ for (uint j = 0; j < nrSubPatterns; j++) {
++ (*ovector)[2*j] = rmatch[j].rm_so + i;
++ (*ovector)[2*j+1] = rmatch[j].rm_eo + i;
+ }
+ #endif
+
+ *pos = (*ovector)[0];
+-#ifdef HAVE_PCREPOSIX // TODO check this stuff in non-pcre mode
+ if ( *pos == (*ovector)[1] && (flgs & Global) )
+ {
+ // empty match, next try will be with m_notEmpty=true
+ m_notEmpty=true;
+ }
+-#endif
+ return s.substr((*ovector)[0], (*ovector)[1] - (*ovector)[0]);
+ }
+
+--- kjs/string_object.cpp (revision 488534)
++++ kjs/string_object.cpp (revision 494869)
+@@ -132,7 +132,7 @@
+ valueOf StringProtoFuncImp::ValueOf DontEnum|Function 0
+ charAt StringProtoFuncImp::CharAt DontEnum|Function 1
+ charCodeAt StringProtoFuncImp::CharCodeAt DontEnum|Function 1
+- concat StringProtoFuncImp::Concat DontEnum|Function 0
++ concat StringProtoFuncImp::Concat DontEnum|Function 1
+ indexOf StringProtoFuncImp::IndexOf DontEnum|Function 1
+ lastIndexOf StringProtoFuncImp::LastIndexOf DontEnum|Function 1
+ match StringProtoFuncImp::Match DontEnum|Function 1
+--- kjs/array_object.cpp (revision 488534)
++++ kjs/array_object.cpp (revision 494869)
+@@ -414,7 +414,7 @@
+ @begin arrayTable 17
+ toString ArrayProtoFuncImp::ToString DontEnum|Function 0
+ toLocaleString ArrayProtoFuncImp::ToLocaleString DontEnum|Function 0
+- concat ArrayProtoFuncImp::Concat DontEnum|Function 0
++ concat ArrayProtoFuncImp::Concat DontEnum|Function 1
+ join ArrayProtoFuncImp::Join DontEnum|Function 1
+ pop ArrayProtoFuncImp::Pop DontEnum|Function 0
+ push ArrayProtoFuncImp::Push DontEnum|Function 1
+--- pics/hicolor/index.theme (revision 488534)
++++ pics/hicolor/index.theme (revision 494869)
+@@ -59,7 +59,7 @@
+ Comment[el]=ΕπαναφοÏά θÎμα εικονιδίων
+ Comment[es]=Tema de iconos de respaldo
+ Comment[et]=Vaikimisi ikooniteema
+-Comment[eu]=Fallback icono gaia
++Comment[eu]=Fallback ikono-gaia
+ Comment[fi]=Varmistuskuvaketeema
+ Comment[fr]=Revenir au thème d'icônes
+ Comment[fy]=Standert Ikoan tema
+--- pics/hicolor/Makefile.am (revision 488534)
++++ pics/hicolor/Makefile.am (revision 494869)
+@@ -1,3 +1,2 @@
+ hicolordir=$(kde_icondir)/hicolor
+ hicolor_DATA=index.theme
+-KDE_ICON=AUTO
+--- pics/crystalsvg/index.theme (revision 488534)
++++ pics/crystalsvg/index.theme (revision 494869)
+@@ -32,7 +32,7 @@
+ Comment[eo]=Piktogrametoso de Everaldo.com Design Studio
+ Comment[es]=Tema de iconoss de Everaldo.com Design Studio
+ Comment[et]=Disainistuudio Everaldo.com ikooniteema
+-Comment[eu]=Everaldo ikono tema (www.everaldo.com)
++Comment[eu]=Everaldoren ikono-gaia (www.everaldo.com)
+ Comment[fi]=Everaldo.com-suunnittelutoimiston tekemä kuvaketeema
+ Comment[fr]=Thème d'icônes par Everaldo.com Design Studio
+ Comment[fy]=ikoan tema makke troch Everaldo.com Design Studio
+@@ -52,7 +52,7 @@
+ Comment[mk]=Тема на икони од Ñтудиото за дизајн на Everaldo.com
+ Comment[ms]=Tema Ikon oleh Everaldo.com Design Studio
+ Comment[nb]=Ikontema av Everaldo.com Design Studio
+-Comment[nds]=Lüttbildmuster vun de Everaldo.com-Design-Makers
++Comment[nds]=Lüttbildmuster vun Everaldo.com Design Studio
+ Comment[nl]=Pictogramthema van ontwerpbureau Everaldo.com
+ Comment[nn]=Ikontema av Everaldo.com Design Studio
+ Comment[pa]=Everaldo.com ਡਿਜ਼ਾਇਨ ਸਟੂਡੀਓ ਦਾ ਆਈਕਾਨ ਸਰੂਪ
+--- kdoctools/kbuildsycoca.refentry.docbook (revision 488534)
++++ kdoctools/kbuildsycoca.refentry.docbook (revision 494869)
+@@ -1,205 +0,0 @@
+-<?xml version="1.0" ?>
+-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN" "dtd/kdex.dtd" [
+- <!ENTITY % English "INCLUDE"><!-- change language only here -->
+-]>
+-
+-<refentry>
+-<refmeta>
+-<refentrytitle>KBuildSycoca</refentrytitle>
+-<manvolnum>8</manvolnum>
+-</refmeta>
+-
+-<refnamediv>
+-<refname>Description</refname>
+-<refpurpose>Rebuilds the system configuration cache.</refpurpose>
+-</refnamediv>
+-
+-<refsynopsisdiv>
+-<title>Synopsis</title>
+-
+-<cmdsynopsis>
+-<command>kbuildsycoca</command>
+-
+-<group>
+-<arg choice="opt">--nosignal</arg>
+-<arg choice="opt">--incremental</arg>
+-<arg choice="opt">--help</arg>
+-<arg choice="opt">--help-qt</arg>
+-<arg choice="opt">--help-kde</arg>
+-<arg choice="opt">--help-all</arg>
+-<arg choice="opt">--author</arg>
+-<arg choice="opt">-v, --version</arg>
+-<arg choice="opt">--license</arg>
+-</group>
+-</cmdsynopsis>
+-
+-</refsynopsisdiv>
+-
+-<refsect1>
+-<title>Description</title>
+-
+-<para>
+-<command>kbuildsyscoca</command>, as part of the &kde; command line
+-tools ensures the proper operation of &kde; by reading in all the
+-<literal role="extension">.desktop</literal>, <literal
+-role="extension">.directory</literal>, <literal
+-role="extension">.kimgio</literal> and <literal
+-role="extension">.protocol</literal> files to constructs a binary
+-database.
+-</para>
+-
+-<para>
+-&kde; itself accesses this databse during operation to provide
+-configurational information a program needs to run.
+-</para>
+-
+-<para>
+-This tool is part of ksyscoca, which stands for &kde; System
+-Configuration Cache
+-</para>
+-
+-</refsect1>
+-
+-<refsect1>
+-<title>Options</title>
+-
+-<variablelist>
+-<varlistentry>
+-<term><option>--nosignal</option></term>
+-<listitem>
+-<para>Don't signal applications </para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><option>--incremental</option></term>
+-<listitem>
+-<para>Incremental Update</para>
+-</listitem>
+-</varlistentry>
+-
+-<!-- this entire section from here to the end of the section could be an -->
+-<!-- entity.. or maybe just so irrelevant as to leave it out -->
+-
+-<varlistentry>
+-<term><option>--help</option></term>
+-<listitem>
+-<para>
+-Show help about options
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><option>--help-qt</option></term>
+-<listitem>
+-<para>
+-Show Qt specific options
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><option>--help-kde</option></term>
+-<listitem>
+-<para>
+-Show KDE specific options
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><option>--help-all</option></term>
+-<listitem>
+-<para>
+-Show all options
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><option>--author</option></term>
+-<listitem>
+-<para>
+-Show author information
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><option>--version</option></term>
+-<listitem>
+-<para>
+-Show version information
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><option>--license</option></term>
+-<listitem>
+-<para>
+-Show license information
+-</para>
+-</listitem>
+-</varlistentry>
+-</variablelist>
+-
+-</refsect1>
+-
+-<refsect1>
+-<title>Usage</title>
+-<para>
+-A standard way to run this program is by simply specifying the following
+-command at the prompt
+-<userinput><command>kbuildsyscoca</command></userinput>
+-</para>
+-
+-</refsect1>
+-
+-<refsect1>
+-<title>Files</title>
+-
+-<variablelist>
+-<varlistentry>
+-<term><filename>/tmp/kde-$USER/ksyscoca</filename></term>
+-<listitem>
+-<para>...</para>
+-</listitem>
+-</varlistentry>
+-</variablelist>
+-
+-</refsect1>
+-
+-<refsect1>
+-<title>Environment Variables</title>
+-<variablelist>
+-<varlistentry>
+-<term>$<envar>KDEDIRS</envar></term>
+-<listitem>
+-<para>Specifies which directories are part of the KDE
+-installations</para>
+-</listitem>
+-</varlistentry>
+-</variablelist>
+-
+-</refsect1>
+-
+-<refsect1>
+-<title>See Also</title>
+-
+-<para>ksycoca(3), kblah(4), knogga(6)</para>
+-
+-</refsect1>
+-
+-<refsect1>
+-<title>Bugs</title>
+-
+-<para>There are no known bugs at the time of writing.</para>
+-
+-</refsect1>
+-
+-</refentry>
+-
+-
+-
+--- kdoctools/kbuildsycoca.man.docbook (revision 488534)
++++ kdoctools/kbuildsycoca.man.docbook (revision 494869)
+@@ -1,202 +0,0 @@
+-<?xml version="1.0" ?>
+-<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN" "customization/dtd/kdex.dtd" [
+- <!ENTITY % English "INCLUDE"><!-- change language only here -->
+-]>
+-
+-<article>
+-<title>kbuildsycoca (8)</title>
+-<articleinfo>
+-<author>
+-<firstname>Darian</firstname>
+-<surname>Lanx</surname>
+-<affiliation>
+-<address><email>content at openprojects.net</email></address>
+-</affiliation>
+-</author>
+-
+-<date>2001-04-25</date>
+-<releaseinfo>0.01.00</releaseinfo>
+-
+-</articleinfo>
+-
+-<section>
+-<title>Name</title>
+-<para>kbuildsycoca - Rebuilds the system configuration cache.</para>
+-</section>
+-
+-<section>
+-<title>Synopsis</title>
+-
+-<cmdsynopsis>
+-<command>kbuildsycoca</command>
+-
+-<group>
+-<arg choice="opt">--nosignal</arg>
+-<arg choice="opt">--incremental</arg>
+-<arg choice="opt">--help</arg>
+-<arg choice="opt">--help-qt</arg>
+-<arg choice="opt">--help-kde</arg>
+-<arg choice="opt">--help-all</arg>
+-<arg choice="opt">--author</arg>
+-<arg choice="opt">-v, --version</arg>
+-<arg choice="opt">--license</arg>
+-</group>
+-</cmdsynopsis>
+-</section>
+-
+-<section>
+-<title>Description</title>
+-
+-<para>
+-kbuildsyscoca, as part of the &kde; command line tools ensures the proper
+-operation of &kde; by reading in all the .desktop, .directory, .kimgio and
+-.protocol files to constructs a binary database.
+-</para>
+-<para>
+-KDE itself accesses this databse during operation to provide
+-configurational information a program needs to run.
+-</para>
+-<para>
+-This tool is part of ksyscoca, which stands for KDE System
+-Configuration Cache
+-</para>
+-
+-</section>
+-
+-<section>
+-<title>Options</title>
+-
+-<variablelist>
+-<varlistentry>
+-<term><option>--nosignal</option></term>
+-<listitem>
+-<para>Don't signal applications </para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><option>--incremental</option></term>
+-<listitem>
+-<para>Incremental Update</para>
+-</listitem>
+-</varlistentry>
+-
+-<!-- this entire section from here to the end of the section could be an -->
+-<!-- entity.. or maybe just so irrelevant as to leave it out -->
+-
+-
+-<varlistentry>
+-<term><option>--help</option></term>
+-<listitem>
+-<para>
+-Show help about options
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><option>--help-qt</option></term>
+-<listitem>
+-<para>
+-Show Qt specific options
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><option>--help-kde</option></term>
+-<listitem>
+-<para>
+-Show KDE specific options
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><option>--help-all</option></term>
+-<listitem>
+-<para>
+-Show all options
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><option>--author</option></term>
+-<listitem>
+-<para>
+-Show author information
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><option>--version</option></term>
+-<listitem>
+-<para>
+-Show version information
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><option>--license</option></term>
+-<listitem>
+-<para>
+-Show license information
+-</para>
+-</listitem>
+-</varlistentry>
+-</variablelist>
+-
+-</section>
+-
+-<section>
+-<title>Usage</title>
+-<para>
+-A standard way to run this program is by simply specifying the following
+-command at the prompt
+-<userinput><command>kbuildsyscoca</command></userinput>
+-</para>
+-
+-</section>
+-
+-<section>
+-<title>Files</title>
+-
+-<variablelist>
+-<varlistentry>
+-<term><filename>/tmp/kde-$USER/ksyscoca</filename></term>
+-<listitem>
+-<para>...</para>
+-</listitem>
+-</varlistentry>
+-</variablelist>
+-
+-</section>
+-
+-<section>
+-<title>Environment Variables</title>
+-
+-<variablelist>
+-<varlistentry>
+-<term>$<envar>KDEDIRS</envar></term>
+-<listitem>
+-<para>Specifies which directories are part of the KDE
+-installations</para>
+-</listitem>
+-</varlistentry>
+-</variablelist>
+-</section>
+-
+-<section>
+-<title>See Also</title>
+-<para>ksycoca(3), kblah(4), knogga(6)</para>
+-</section>
+-
+-<section>
+-<title>Bugs</title>
+-<para>There are no known bugs at the time of writing.</para>
+-</section>
+-
+-</article>
+--- kdoctools/meinproc.cpp (revision 488534)
++++ kdoctools/meinproc.cpp (revision 494869)
+@@ -138,7 +138,7 @@
+ if ( args->isSet( "check" ) ) {
+ char pwd_buffer[250];
+ QFileInfo file( QFile::decodeName(args->arg( 0 )) );
+- getcwd( pwd_buffer, 250 );
++ (void) getcwd( pwd_buffer, 250 );
+ chdir( QFile::encodeName( file.dirPath( true ) ) );
+
+ QString catalogs;
+--- kdoctools/man-template.docbook (revision 488534)
++++ kdoctools/man-template.docbook (revision 494869)
+@@ -11,8 +11,8 @@
+ <surname><!-- --Your last name-- --></surname>
+ </personname>
+ <affiliation><address><email><!-- --Your email address-- --></email></address></affiliation></author>
+-<date><!-- --Date when this manpage was written, in the format
+-'Month Daynumber, 4-Digit-Year'-- --></date>
++<date><!-- --Date when this manpage was written, in the ISO 8601 format
++'yyyy-mm-dd'-- --></date>
+ <productname>K Desktop Environment</productname>
+ </refentryinfo>
+
+--- kdoctools/customization/de/user.entities (revision 488534)
++++ kdoctools/customization/de/user.entities (revision 494869)
+@@ -7,14 +7,18 @@
+ -->
+
+ <!ENTITY Alt "<keycap>Alt</keycap>">
+-<!ENTITY cdrom "<abbrev>CD-ROM</abbrev>">
+-<!ENTITY Ctrl "<keycap>Ctrl</keycap>">
+-<!ENTITY dh "<abbrev>d.h.</abbrev>">
++<!ENTITY Backspace "<keycap>Rücktaste</keycap>">
++<!ENTITY cdrom '<hardware>CD-ROM-Laufwerk</hardware>'>
++<!ENTITY Ctrl "<keycap>Strg</keycap>">
++<!ENTITY dh "<abbrev>d. h.</abbrev>">
+ <!ENTITY dpi '<acronym>dpi</acronym>'>
+-<!ENTITY Enter "<keycap>Enter</keycap>">
++<!ENTITY eg '<abbrev>z. B</abbrev>'>
++<!ENTITY Enter "<keycap>Eingabe</keycap>">
+ <!ENTITY Esc "<keycap>Esc</keycap>">
+ <!ENTITY etc "<abbrev>etc.</abbrev>">
+ <!ENTITY FAQ '<acronym>FAQ</acronym>'>
++<!ENTITY ie "<abbrev>d. h.</abbrev>">
++<!ENTITY infocenter "<application>Infozentrum</application>">
+ <!ENTITY kcc "<application>KDE-Kontrollzentrum</application>" ><!-- kcc -->
+ <!ENTITY kcontrolcenter "<application>&kde;-Kontrollzentrum</application>">
+ <!ENTITY kde "K-Arbeitsumgebung" ><!-- kde -->
+@@ -32,12 +36,24 @@
+ <!ENTITY kontrollleiste "<application>Kontrollleiste</application>"><!--
+ kicker -->
+ <!ENTITY kwm "<application>kwm</application>">
++<!ENTITY LMB "<mousebutton>linke</mousebutton> Maustaste">
++<!ENTITY LMBn "<mousebutton>linken</mousebutton> Maustaste">
++<!ENTITY LMBr "<mousebutton>linker</mousebutton> Maustaste">
++<!ENTITY MMB "<mousebutton>mittlere</mousebutton> Maustaste">
++<!ENTITY MMBn "<mousebutton>mittleren</mousebutton> Maustaste">
++<!ENTITY MMBr "<mousebutton>mittlerer</mousebutton> Maustaste">
+ <!ENTITY mondphase "<application>Mondphase</application>"> <!-- kmoon -->
++<!ENTITY OS "Betriebssystem">
++<!ENTITY RMB "<mousebutton>rechte</mousebutton> Maustaste">
++<!ENTITY RMBn "<mousebutton>rechten</mousebutton> Maustaste">
++<!ENTITY RMBr "<mousebutton>rechter</mousebutton> Maustaste">
+ <!ENTITY Shift "<keycap>Umschalt</keycap>">
+-<!ENTITY Strg "<keycap>Strg</keycap>"><!-- ctrl -->
++<!ENTITY Strg "<keycap>Strg</keycap>"><!-- ctrl -->
++<!ENTITY systemtray "<application>Systemabschnitt</application>">
+ <!ENTITY Umschalt "<keycap>Umschalt</keycap>"> <!-- Shift -->
+-<!ENTITY Tab "<keycap>Tab</keycap>"> <!-- Tab -->
++<!ENTITY Tab "<keycap>Tab</keycap>"> <!-- Tab -->
+ <!ENTITY usw "<abbrev>usw.</abbrev>">
+-<!ENTITY weltzeit "<application>Weltzeituhr</application>" ><!-- kworldwatch
+- -->
+-<!ENTITY zb "<abbrev>z.B.</abbrev>" ><!-- eg -->
++<!ENTITY weltzeit "<application>Weltzeituhr</application>" ><!-- kworldwatch -->
++<!ENTITY zb "<abbrev>z. B.</abbrev>" ><!-- eg -->
++<!ENTITY ua "<abbrev>u. a.</abbrev>" >
++
+--- kdoctools/customization/fr/user.entities (revision 488534)
++++ kdoctools/customization/fr/user.entities (revision 494869)
+@@ -125,8 +125,11 @@
+ <!ENTITY relecteurPatrickMichelon '<othercredit role="reviewer"><firstname>Patrick</firstname><surname>Michelon</surname><affiliation><address><email>patrick.michelon at free.fr</email></address></affiliation><contrib>Relecture de la documentation française</contrib></othercredit>'>
+
+ <!ENTITY traducteurJulienMorot '<othercredit role="translator"><firstname>Julien</firstname><surname>Morot</surname><affiliation><address><email>julien at momonux.org</email></address></affiliation><contrib>Traduction française</contrib></othercredit>'>
+-<!ENTITY relecteurJulienMorot '<othercredit role="reviewer"><firstname>Julien</firstname><surname>Morot</surname><affiliation><address><email>ulien at momonux.org</email></address></affiliation><contrib>Relecture de la documentation française</contrib></othercredit>'>
++<!ENTITY relecteurJulienMorot '<othercredit role="reviewer"><firstname>Julien</firstname><surname>Morot</surname><affiliation><address><email>julien at momonux.org</email></address></affiliation><contrib>Relecture de la documentation française</contrib></othercredit>'>
+
++<!ENTITY traducteurBaptisteMathus '<othercredit role="translator"><firstname>Baptiste</firstname><surname>Mathus</surname><affiliation><address><email>bmathus at free.fr</email></address></affiliation><contrib>Traduction française</contrib></othercredit>'>
++<!ENTITY relecteurBaptisteMathus '<othercredit role="reviewer"><firstname>Baptiste</firstname><surname>Mathus</surname><affiliation><address><email>bmathus at free.fr</email></address></affiliation><contrib>Relecture de la documentation française</contrib></othercredit>'>
++
+ <!ENTITY traducteurPierre-EmmanuelMuller '<othercredit role="translator"><firstname>Pierre-Emmanuel</firstname><surname>Müller</surname><affiliation><address><email>pem at 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 at levillage.org</email></address></affiliation><contrib>Relecture de la documentation française</contrib></othercredit>'>
+
+@@ -214,6 +217,7 @@
+ <!ENTITY AnneMarieMahfouf 'Anne-Marie Mahfouf <email>annemarie.mahfouf at free.fr</email>'>
+ <!ENTITY PatrickMichelon 'Patrick Michelon <email>patrick.michelon at free.fr</email>'>
+ <!ENTITY JulienMorot 'Julien Morot <email>julien at momonux.org</email>'>
++<!ENTITY BaptisteMathus 'Baptiste Mathus <email>bmathus at free.fr</email>'>
+ <!ENTITY Pierre-EmmanuelMuller 'Pierre-Emmanuel Müller <email>pem at levillage.org</email>'>
+ <!ENTITY CedricPasteur 'Cédric Pasteur <email>cedric.pasteur at free.fr</email>'>
+ <!ENTITY PatricePawlak 'Patrice Pawlak <email>patrice.pawlak at free.fr</email>'>
+--- kdoctools/customization/pl/entities/underFDL.docbook (revision 488534)
++++ kdoctools/customization/pl/entities/underFDL.docbook (revision 494869)
+@@ -1,3 +1,3 @@
+-<para id="gnu-fdl" xreflabel="sekcji zatytułowanej "GNU Free Documentation License"">Ten program jest rozprowadzany na zasadach <ulink
++<para id="gnu-fdl" xreflabel="sekcji zatytułowanej "GNU Free Documentation License"">Ta dokumentacja jest rozprowadzana na zasadach <ulink
+ url="common/fdl-license.html">Licencji GNU Free Documentation
+ License</ulink>.</para>
+--- kdoctools/customization/entities/general.entities (revision 488534)
++++ kdoctools/customization/entities/general.entities (revision 494869)
+@@ -119,6 +119,7 @@
+ <!ENTITY artswrapper "<application>artswrapper</application>">
+ <!ENTITY ATAPI "<acronym>ATAPI</acronym>">
+ <!ENTITY atlantik "<application>Atlantik</application>">
++<!ENTITY blinken "<application>blinKen</application>">
+ <!ENTITY catalogmanager "<application>Catalog Manager</application>">
+ <!ENTITY CD "<acronym>CD</acronym>">
+ <!ENTITY CDE "<acronym>CDE</acronym>">
+@@ -158,6 +159,7 @@
+ <!ENTITY kalarmd "<application>KAlarmd</application>">
+ <!ENTITY kalzium "<application>Kalzium</application>">
+ <!ENTITY kamera "<application>Kamera</application>">
++<!ENTITY kanagram "<application>Kanagram</application>">
+ <!ENTITY kandy "<application>Kandy</application>">
+ <!ENTITY kappfinder "<application>Kappfinder</application>">
+ <!ENTITY kaphorism "<application>KAphorism</application>">
+@@ -211,6 +213,7 @@
+ <!ENTITY kfract "<application>KFract</application>">
+ <!ENTITY khangman "<application>KHangMan</application>">
+ <!ENTITY kgeo "<application>KGeo</application>">
++<!ENTITY kgeography "<application>KGeography</application>">
+ <!ENTITY kget "<application>KGet</application>">
+ <!ENTITY kghostview "<application>KGhostView</application>">
+ <!ENTITY kgoldrunner "<application>KGoldrunner</application>">
+--- kdoctools/customization/entities/contributor.entities (revision 488534)
++++ kdoctools/customization/entities/contributor.entities (revision 494869)
+@@ -145,6 +145,8 @@
+ <!ENTITY Michael.Goffioul.mail '<email>kdeprint at swing.be</email>'>
+ <!ENTITY Robert.Gogolok '<personname><firstname>Robert</firstname><surname>Gogolok</surname></personname>'>
+ <!ENTITY Robert.Gogolok.mail '<email>mail at robert-gogolok.de</email>'>
++<!ENTITY Nicolas.Goutte '<personname><firstname>Nicolas</firstname><surname>Goutte</surname></personname>'>
++<!ENTITY Nicolas.Goutte.mail '<email>goutte at kde.org</email>'>
+ <!ENTITY Kurt.Granroth '<personname><firstname>Kurt</firstname><surname>Granroth</surname></personname>'>
+ <!ENTITY Kurt.Granroth.mail '<email>granroth at kde.org</email>'>
+ <!ENTITY Wilco.Greven '<personname><firstname>Wilco</firstname><surname>Greven</surname></personname>'>
+@@ -193,10 +195,10 @@
+ <!ENTITY Geert.Jansen.mail '<email>g.t.jansen at stud.tue.nl</email>'>
+ <!ENTITY David.Jarvie '<personname><firstname>David</firstname><surname>Jarvie</surname></personname>'>
+ <!ENTITY David.Jarvie.mail '<email>software at astrojar.org.uk</email>'>
+-<!ENTITY Stephan.Jochach '<personname><firstname>Stephan</firstname><surname>Jochach</surname></personname>'>
++<!ENTITY Stephan.Johach '<personname><firstname>Stephan</firstname><surname>Johach</surname></personname>'>
++<!ENTITY Stephan.Johach.mail '<email>hunsum at gmx.de</email>'>
+ <!ENTITY Antonio.Larrosa.Jimenez '<personname><firstname>Antonio</firstname><othername>Larrosa</othername><surname>Jiménez</surname></personname>'>
+ <!ENTITY Antonio.Larrosa.Jimenez.mail '<email>larossa at kde.org</email>'>
+-<!ENTITY Stephen.Jochach.mail '<email>lucardus at onlinehome.de</email>'>
+ <!ENTITY Matt.Johnston '<personname><firstname>Matt</firstname><surname>Johnston</surname></personname>'>
+ <!ENTITY Matt.Johnston.mail '<email>mattj at flashmail.com</email>'>
+ <!ENTITY Martin.R.Jones '<personname><firstname>Martin</firstname><othername>R.</othername><surname>Jones</surname></personname>'>
+@@ -238,6 +240,8 @@
+ <!ENTITY Stephan.Kulow '<personname><firstname>Stephan</firstname><surname>Kulow</surname></personname>'>
+ <!ENTITY Stephan.Kulow.mail '<email>coolo at kde.org</email>'>
+
++<!ENTITY Raphael.Langerhorst '<personname><firstname>Raphael</firstname><surname>Langerhorst</surname></personname>'>
++<!ENTITY Raphael.Langerhorst.mail '<email>raphael.langerhorst at kdemail.net</email>'>
+ <!ENTITY Brian.C.Ledbetter '<personname><firstname>Brian</firstname><othername>C.</othername><surname>Ledbetter</surname></personname>'>
+ <!ENTITY Brian.C.Ledbetter.mail '<email>brian at shadowcom.net</email>'>
+ <!ENTITY James.Lindenschmidt '<personname><firstname>James</firstname><surname>Lindenschmidt</surname></personname>'>
+--- kdoctools/customization/af/entities/gpl-notice.docbook (revision 488534)
++++ kdoctools/customization/af/entities/gpl-notice.docbook (revision 494869)
+@@ -11,7 +11,7 @@
+ <para>Jy moes 'n kopie van die 'GNU General Public License' saam
+ met die program gekry het; Indien dit nie die geval is nie, kan
+ dit aangevra word vanaf die Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+- Cambridge, MA 02110-1301, USA.</para>
++ Boston, MA 02110-1301, USA.</para>
+
+ <!--
+ Local variables:
+--- kdoctools/customization/en/entities/update-doc.docbook (revision 488534)
++++ kdoctools/customization/en/entities/update-doc.docbook (revision 494869)
+@@ -1,3 +1,3 @@
+ <para>This document may have been updated since your installation.
+ You can find the latest version at <ulink
+-url="http://docs.kde.org/current/&package;/">http://docs.kde.org/current/&package;/</ulink>.</para>
++url="http://docs.kde.org/development/en/&package;/">http://docs.kde.org/development/en/&package;/</ulink>.</para>
+--- kdoctools/customization/et/entities/gpl-notice.docbook (revision 488534)
++++ kdoctools/customization/et/entities/gpl-notice.docbook (revision 494869)
+@@ -16,4 +16,4 @@
+ mode: sgml
+ sgml-general-insert-case: lower
+ End:
+--->
+\ No newline at end of file
++-->
+--- kdoctools/customization/et/entities/lgpl-notice.docbook (revision 488534)
++++ kdoctools/customization/et/entities/lgpl-notice.docbook (revision 494869)
+@@ -16,4 +16,4 @@
+ mode: sgml
+ sgml-general-insert-case: lower
+ End:
+--->
+\ No newline at end of file
++-->
+--- kdoctools/customization/it/entities/gpl-notice.docbook (revision 488534)
++++ kdoctools/customization/it/entities/gpl-notice.docbook (revision 494869)
+@@ -23,7 +23,7 @@
+
+ <para>Dovresti avere ricevuto una copia della GNU General Public
+ License insieme a questo programma; in caso contrario, scrivi alla Free Software
+-Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.</para>
++Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</para>
+ <!--
+ Local variables:
+ mode: sgml
+--- kdoctools/customization/it/entities/lgpl-notice.docbook (revision 488534)
++++ kdoctools/customization/it/entities/lgpl-notice.docbook (revision 494869)
+@@ -23,7 +23,7 @@
+
+ <para>Dovresti avere ricevuto una copia della GNU General Public
+ License insieme a questo programma; in caso contrario, scrivi alla Free Software
+-Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.</para>
++Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</para>
+ <!--
+ Local variables:
+ mode: sgml
+--- kdoctools/kio_help.cpp (revision 488534)
++++ kdoctools/kio_help.cpp (revision 494869)
+@@ -1,42 +1,34 @@
+-#ifdef HAVE_CONFIG_H
+ #include <config.h>
+-#endif
+
+-#include <sys/types.h>
+-#include <sys/wait.h>
+-#include <sys/stat.h>
+-#ifdef HAVE_SYS_TIME_H
+-#include <sys/time.h>
++#ifdef HAVE_SYS_TYPES_H
++# include <sys/types.h>
+ #endif
++#ifdef HAVE_SYS_STAT_H
++# include <sys/stat.h>
++#endif
+
+-#include <assert.h>
+-#include <dirent.h>
+ #include <errno.h>
+ #include <fcntl.h>
+-#include <grp.h>
+-#include <pwd.h>
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <signal.h>
+-#include <time.h>
+-#include <unistd.h>
++#ifdef HAVE_STDIO_H
++# include <stdio.h>
++#endif
++#ifdef HAVE_STDLIB_H
++# include <stdlib.h>
++#endif
+
+ #include <qvaluelist.h>
+ #include <qfileinfo.h>
+ #include <qfile.h>
+ #include <qtextstream.h>
+ #include <qregexp.h>
++#include <qtextcodec.h>
+
+-#include <kshred.h>
+ #include <kdebug.h>
+ #include <kurl.h>
+ #include <kglobal.h>
+ #include <klocale.h>
+ #include <kstandarddirs.h>
+-#include <kprotocolmanager.h>
+ #include <kinstance.h>
+-#include <limits.h>
+-#include <qtextcodec.h>
+
+ #include "kio_help.h"
+ #include <libxslt/xsltutils.h>
+--- kdoctools/xslt.cpp (revision 488534)
++++ kdoctools/xslt.cpp (revision 494869)
+@@ -242,7 +242,7 @@
+ if (!fd->open(IO_ReadOnly))
+ {
+ delete fd;
+- ::unlink( cache.local8Bit() );
++ QFile::remove(cache);
+ return false;
+ }
+
+--- kparts/browserview.desktop (revision 488534)
++++ kparts/browserview.desktop (revision 494869)
+@@ -19,7 +19,7 @@
+ Name[eo]=Rigardo de TTTilo
+ Name[es]=Vista de navegador
+ Name[et]=Brauseri vaade
+-Name[eu]=Arakatzaile ikuspegia
++Name[eu]=Arakatzailearen ikuspegia
+ Name[fa]=نمایش مرورگر
+ Name[fi]=Selainnäkymä
+ Name[fr]=Affichage du navigateur
+--- kparts/browserrun.cpp (revision 488534)
++++ kparts/browserrun.cpp (revision 494869)
+@@ -394,7 +394,10 @@
+ // the duplicated code) with shiny new KDownload class for 3.2 (pfeiffer)
+ // Until the shiny new class comes about, send the suggestedFilename
+ // along with the actual URL to download. (DA)
+- cmd += " " + KProcess::quote(url.url()) + " " + KProcess::quote(suggestedFilename);
++ cmd += " " + KProcess::quote(url.url());
++ if ( !suggestedFilename.isEmpty() )
++ cmd +=" " + KProcess::quote(suggestedFilename);
++
+ kdDebug(1000) << "Calling command " << cmd << endl;
+ // slave is already on hold (slotBrowserMimetype())
+ KIO::Scheduler::publishSlaveOnHold();
+--- kded/test/test.desktop (revision 488534)
++++ kded/test/test.desktop (revision 494869)
+@@ -25,7 +25,7 @@
+ Name[eo]=KDED-testmodulo
+ Name[es]=Módulo de prueba de KDED
+ Name[et]=KDED testmoodul
+-Name[eu]=KDED aproba modulua
++Name[eu]=KDED probako modulua
+ Name[fa]=بخش آزمایش KDED
+ Name[fi]=KDED-testimoduuli
+ Name[fr]=Module de test KDED
+@@ -98,7 +98,7 @@
+ Comment[eo]=Testmodulo por KDED
+ Comment[es]=Un módulo de prueba para KDED
+ Comment[et]=KDED testmoodul
+-Comment[eu]=KDEDren aproba modulua
++Comment[eu]=KDEDren probako modulua
+ Comment[fa]=بخش آزمایشی برای KDED
+ Comment[fi]=Testimoduuli KDED:lle
+ Comment[fr]=Un module de test pour KDED
+--- kdeprint/tools/escputil/escputil.desktop (revision 488534)
++++ kdeprint/tools/escputil/escputil.desktop (revision 494869)
+@@ -18,7 +18,7 @@
+ Name[mn]=Epson InkJet
+ Name[ms]=InkJet EPSON
+ Name[nb]=EPSON-blekkskriver
+-Name[nds]=EPSON Dintenstrahldrucker
++Name[nds]=EPSON Inkjet
+ Name[nn]=EPSON-blekkskrivar
+ Name[nso]=InkJetEPSON
+ Name[pt]=Jacto de Tinta da EPSON
+--- kdeprint/filters/poster.desktop (revision 488534)
++++ kdeprint/filters/poster.desktop (revision 494869)
+@@ -14,6 +14,7 @@
+ Comment[eo]=Plakato presado
+ Comment[es]=Impresión de poster
+ Comment[et]=Postri trükkimine
++Comment[eu]=Posterra inprimatzea
+ Comment[fa]=چاپ پوستر
+ Comment[fi]=Julistetulostus
+ Comment[fr]=Impression d'affiches
+@@ -38,7 +39,7 @@
+ Comment[mn]=Зарлал Ñ…ÑвлÑÑ…
+ Comment[ms]=Cetakan Poster
+ Comment[nb]=Platakutskrift
+-Comment[nds]=Plakaat drucken
++Comment[nds]=Posterdruck
+ Comment[nl]=Posterafdruk
+ Comment[nn]=Plakatutskrift
+ Comment[nso]=Kgatiso ya Seswantsho
+@@ -86,7 +87,7 @@
+ Description[eo]=Ilo por presi grandajn plakatojn al multaj malgrandaj paperfolioj. Vi bezonas la programon <b>poster</b>. La kodon por tiu programo troveblas ĉe: <a href="http://printing.kde.org/downloads">KDEPresado ttt-paÄo</a>. <p><b><u>AVERTO:</u></b> la programo trovebla sur la KDEPresado ttt-paÄo estas ÅanÄita versio de tiu sur la CTAN-ttt-paÄo. La origina pakaĵo de CTAN ne laborus sub la KDE sistemo. Vi <b>devas</b> uzi la pakaĵon trovebla ĉe <a href="http://printing.kde.org/downloads">KDEPresado ttt-paÄo</a>.
+ Description[es]=Aplicación para imprimir posters grandes en varias hojas de papel. Para usar el comando, el ejecutable <b>poster</b> debe estar accesible en su <tt>PATH</tt>. El código fuente de esta utilidad puede encontrarse en la <a href="http://printing.kde.org/downloads">página web de KDEPrint</a>. <p><b><u>AVISO:</u></b> el paquete en la página web KDEPrint es una versión modificada de la original que se puede encontrar en cualquier réplica de archivos de CTAN. Pero el paquete original <b>no</b> funciona con KDE,. Usted <b>debe</b> usar el paquete que se encuentra en <a href="http://printing.kde.org/downloads">el servidor web de KDEPrint</a>.
+ Description[et]=Vahend suurte postrite trükkimiseks mitmele väikesele paberilehele. Käsu kasutamiseks peab <b>postri</b> käivitusfail asuma sinu otsingurajal. Rakenduse lähtekoodi leiab <a href="http://printing.kde.org/downloads">KDEPrinti veebileheküljel</a>. <p><b><u>HOIATUS</u></b> KDEPrinti veebileheküljel olev pakett on muudetud võrreldes algsega, mille leiab suvaliselt CTAN-i arhiivi peeglilt, kuid originaalpakett <b>ei</b> toimi KDE-s. Sa lihtsalt <b>pead</b> kasutama paketti, mis asub <a href="http://printing.kde.org/downloads">KDEPrinti veebileheküljel</a>.
+-Description[eu]=Poster handiak orri txiki askotan inprimatzeko tresna. Komando hau erabiltzeko <b>poster</b> exekutagarriak zure <tt>BIDE</tt>an egon behar du. Tresna honen iturburua <a href="http://printing.kde.org/downloads">KDEPrint web site</a> orrian egon daiteke. <p><b><u>KONTUZ:</u></b> KDEPrint web orrian dagoen paketea jatorrizkoaren bertsio eraldatua da, edozein CTAN fitxategi ispilutan aurki dezakezuna, baina jatorrizko paketeak <b>ez</b> du KDErekin funtzionatzen.<a href="http://printing.kde.org/downloads"> orrian dagoen paketea erabili <b>behar</b> duzu.</a>
++Description[eu]=Poster handiak orri txiki askotan inprimatzeko tresna. Komando hau erabiltzeko <b>poster</b> exekutagarriak zure <tt>BIDE-IZENEA</tt>an egon behar du. Tresna honen iturburua <a href="http://printing.kde.org/downloads">KDEPrint web gunen</a> egon daiteke. <p><b><u>ABISUA:</u></b> KDEPrint web gunean dagoen paketea jatorrizkoaren bertsio eraldatua da, edozein CTAN fitxategi-ispilutan aurki dezakezuna, baina jatorrizko paketeak <b>ez</b> du KDErekin funtzionatzen.<a href="http://printing.kde.org/downloads"> gunean dagoen paketea erabili <b>behar</b> duzu.</a>
+ Description[fa]=برنامه‌ای برای چاپ پوسترهای بزرگ بر روی صÙØات کاغذ Ú©ÙˆÚ†Ú©. برای استÙاده از این دستور <b>پوستر</b> باید در <tt>مسیر</tt> شما قابل دسترسی باشد. کد مرجع این ابزار می‌تواند در <a href="http://printing.kde.org/downloads">وب‌گاه KDEPrint</a> یاÙت شود. <p><b><u>اخطار:</u></b> بسته‌ی موجود در وب‌گاه KDEPrint نسخه‌ی تغییر یاÙته‌ای از بسته‌ی اصلی است، Ú©Ù‡ آن را می‌توان در هر آیینه آرشیو CTAN پیدا کرد، ولی نسخه‌ی اصلی با KDE کار <b>نمی‌کند</b>. شما باید از بسته‌ی <a href="http://printing.kde.org/downloads">وب‌گاه KDEPrint</a> استÙاده کنید.
+ Description[fi]=Työkalu isojen julisteiden tulostamiseen pienille paperiarkeille. Käyttääksesi komentoa <b>poster</b> ohjelman tulee olla polussasi. Tämän työkalun lähdekoodi löytyy KDEPrintin <a href="http://printing.kde.org/downloads">WWW-sivustolta</a>. <p><b><u>VAROITUS:</u></b>KDEPrintin sivuilla oleva paketti on muokattu versio alkuperäisestä CTAN-arkistossa olevasta paketista. Alkuperäinen paketti <b>ei</b> toimi KDE:n kanssa. Sinun <b>täytyy</b> käyttää KDEPrint WWW-sivuilta löytyvää versiota.
+ Description[fr]=Utilitaire pour imprimer de grandes affiches sur de multiples petites feuilles de papier. Pour utiliser cette commande, l'exécutable <b>poster</b> doit être accessible dans votre <tt>PATH</tt>. Vous pouvez trouver le code source de cet utilitaire à l'adresse <a href="http://printing.kde.org/downloads">KDEPrint web site</a>. <p><b><u>Attention :</u></b> le paquetage présent sur le site web de KDEPrint est une version modifiée de l'original se trouvant sur n'importe quel miroir des archives du CTAN, mais le paquetage d'origine <b>ne fonctionnera pas</b> avec KDE. Vous <b>devez</b> utiliser le paquetage qui se trouve sur le <a href="http://printing.kde.org/downloads">site web de KDEPrint</a>.
+@@ -107,7 +108,7 @@
+ Description[mn]=Том зарлалыг олон жижиг хуудÑууд дÑÑÑ€ Ñ…ÑвлÑÑ… Ñ…ÑÑ€ÑгÑÑл.ÐÐ½Ñ Ñ‚ÑƒÑˆÐ°Ð°Ð»Ñ‹Ð³ Ñ…ÑÑ€ÑглÑхдÑÑ <b>poster</b>-ггүйцÑтгÑÑ…ÑÑÑ€ болгохдоо өөрийн<tt>PATH</tt> даа ханддаг болгох Ñ‘Ñтой. ÐÐ½Ñ Ñ…ÑÑ€ÑгÑлийн ÑÑ… код <a href="http://printing.kde.org/downloads">KDEPrint вÑб хуудÑанд байгаа байх</a>. <p><b><u>СÐÐÐМЖ:</u></b> KDEPrint вÑб хуудÑанд ÑÑ… хувилбарын өөрчилөгдÑөн хувилбарууд олдох ба CTAN ариваар шахагдаж Ñ‚ÑƒÑ Ñ‚ÑƒÑын Ñайтан дÑÑÑ€ тавигдÑан байгаа.Харин ÑÑ… пакет КДÐ-Ñ‚Ñй <b>ажиллахгүй</b>. Та <a href="http://printing.kde.org/downloads">KDEPrint веб хуудÑааÑ</a> авÑан пакетаа Ñ…ÑÑ€ÑглÑÑ… <b>Ñ‘Ñтой</b>.
+ Description[ms]=Utiliti untuk mencetak poster besar pada banyak helaian kertas. Untuk menggunakan fungsi ini ini, <b>poster</b> 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>. <p><b><u>AMARAN:</u></b> Pakej di laman KDEPrint ialah versi telah diubah dari versi asal yang boleh diperoleh dari mana-mana cermin arkib CTAN. Namun, pakej asal <b>tidak</b> boleh berfungsi dengan KDE. Anda <b>mesti</b> 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 <b>poster</b>-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>. <p><b>ADVARSEL</u></b> Pakken som finnes på KDEPrint-siden er en modifisert utgave av originalen som kan finnes på alle CTAN-arkivspeil, men originalen virker <b>ikke</b> med KDE. Du <b>må</b> 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 <b>poster</b> 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. <p><b><u>WOHRSCHOON:</u></b> Dat Paket vun KDEPrint is en modifizeert Verschoon vun dat Orginaalpaket, dat op jichtenseen CTAN Archiv-Mirror liggt, aver dat Orginaalpaket warrt <b>nich</b> mit KDE arbeiden. Du <b>muttst</b> 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 <b>poster</b> 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.<p><b><u>Wohrscho:</u></b> Dat Paket vun KDEPrint is en ännert Verschoon vun dat Orginaalpaket, dat op jichtenseen CTAN Archiv-Mirror liggt, aver dat Orginaalpaket warrt <b>nich</b> mit KDE arbeiden. Du <b>muttst</b> 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 <b>poster</b> 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. <p><b><u>Waarschuwing:</u></b> 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 <b>niet</b> met KDE werken. U kunt <b>alleen</b> 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 <b>poster</b> 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>. <p><b><u>ÅTVARING:</u></b> 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 <b>ikkje</b> med KDE. Du <b>må</b> 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 <b>seswantsho</b> 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>. <p> <b><u>TEMOSO:</u></b> 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 <b>kase</b> beereke le KDE. O <b>swanetse</b> go somisa pakana yeo e hweditswego kago <a href="http://printing.kde.org/downloads">lefelo la web la Kgatiso ya KDE</a>.
+--- kdeprint/filters/psbook1.desktop (revision 488534)
++++ kdeprint/filters/psbook1.desktop (revision 494869)
+@@ -29,7 +29,7 @@
+ Comment[eo]=Pamflet-presado - paraj paÄoj (paÅo 1)
+ Comment[es]=Impresión de folleto - páginas pares (paso 1)
+ Comment[et]=Brošüüri trükkimine - paarislehed (1. samm)
+-Comment[eu]=Liburuxka inprimatzea - Orri bikoitiak (1. urratsa)
++Comment[eu]=Liburuxka inprimatzea - Orrialde bikoitiak (1. urratsa)
+ Comment[fa]=چاپ Pamphlet - صÙØات زوج (مرØله‌ی Û±)
+ Comment[fi]=Lentolehtistulostus - parilliset sivut (vaihe 1)
+ Comment[fr]=Impression au format livret - Pages paires (étape 1)
+--- kdeprint/filters/psbook2.desktop (revision 488534)
++++ kdeprint/filters/psbook2.desktop (revision 494869)
+@@ -29,7 +29,7 @@
+ Comment[eo]=Pamflet-presado - malparaj paÄoj (paÅo 2)
+ Comment[es]=Impresión de folleto - páginas impares (paso 2)
+ Comment[et]=Brošüüri trükkimine - paaritud lehed (2. samm)
+-Comment[eu]=Liburuxka inprimatzea - Orri bakoitiak (2 urratsa)
++Comment[eu]=Liburuxka inprimatzea - Orrialde bakoitiak (2 urratsa)
+ Comment[fa]=چاپ Pamphlet - صÙØات Ùرد (مرØله‌ی Û²)
+ Comment[fi]=Lentolehtistulostus - parittomat sivut (vaihe 2)
+ Comment[fr]=Impression au format livret - Pages impaires (étape 2)
+--- kdeprint/filters/psselect.desktop (revision 488534)
++++ kdeprint/filters/psselect.desktop (revision 494869)
+@@ -25,7 +25,7 @@
+ Comment[eo]=PaÄelektilo/paÄordigilo
+ Comment[es]=Filtro de ordenamiento/selección de página
+ Comment[et]=Lehekülgede valimise/järjestamise filter
+-Comment[eu]=Orrialdeak hautatu/ordenatzeko iragazkia
++Comment[eu]=Orrialdeak hautatzeko/ordenatzeko iragazkia
+ Comment[fa]=صاÙÛŒ مرتبه/انتخاب صÙØÙ‡
+ Comment[fi]=Sivun valinta/järjestys-suodin
+ Comment[fr]=Sélection de pages / Filtre de tri
+@@ -50,7 +50,7 @@
+ Comment[ms]=Penapis Pilihan Laman/Susunan
+ Comment[mt]=Filtru biex tagħżel/tissortja l-karti
+ Comment[nb]=Filter for valg og sortering av sider
+-Comment[nds]=Sieden utsöken/ornen
++Comment[nds]=Sieden utsöken / ornen
+ Comment[nl]=Pagina selecteren/ordenen
+ Comment[nn]=Filter for sideval/siderekkjefølgje
+ Comment[nso]=Sesekodi sa Kgetho/Otara ya Letlakala
+--- kdeprint/filters/enscript.desktop (revision 488534)
++++ kdeprint/filters/enscript.desktop (revision 494869)
+@@ -32,7 +32,7 @@
+ Comment[eo]=Tekstfiltrilo por Enskripto
+ Comment[es]=Filtro de textos Enscript
+ Comment[et]=Enscript tekstifilter
+-Comment[eu]=Enscript testu iragazkia
++Comment[eu]=Enscript testu-iragazkia
+ Comment[fa]=ویرایشگر متن Enscript
+ Comment[fi]=Enscript-tekstisuodin
+ Comment[fr]=Filtre de texte Enscript
+--- kdeprint/filters/imagetops.desktop (revision 488534)
++++ kdeprint/filters/imagetops.desktop (revision 494869)
+@@ -8,7 +8,6 @@
+ Name[fy]=Imagetops
+ Name[hi]=इमेजटॉपà¥à¤¸
+ Name[hr]=vrhslike
+-Name[nds]=Imagetops
+ Name[nl]=Imagetops
+ Name[nso]=mabogodimo a diponagalo
+ Name[pt_BR]=Imagenstops
+@@ -61,7 +60,7 @@
+ Comment[ms]=Imej Generik kepada Penyaring PS
+ Comment[mt]=Filtru ġeneriku minn stampa għal PS
+ Comment[nb]=Bilder til PS-filter
+-Comment[nds]=Standardfilter för't ümwanneln vun'n Bild na PostScript
++Comment[nds]=Allgemeen Filter för't Ümwanneln vun'n Bild na PostScript
+ Comment[nl]=Generieke afbeelding naar PS-filter
+ Comment[nn]=Generelt bilete-til-PS-filter
+ Comment[nso]=Ponagalo ya Kakaretso go Sesekodi sa PS
+--- kdeprint/filters/psbook.desktop (revision 488534)
++++ kdeprint/filters/psbook.desktop (revision 494869)
+@@ -26,7 +26,7 @@
+ Comment[eo]=Pamflet-presado (uzu kun duflanka laÅlarÄa presado)
+ Comment[es]=Impresión de folleto (usar con impresión de doble cara pequeña)
+ Comment[et]=Brošüüri trükkimine - (kasutatakse duplekstrükkimisel)
+-Comment[eu]=Liburuxka inprimatzea (orrialde txikiko inprimatze bikoitzarekin erabili)
++Comment[eu]=Liburuxka inprimatzea (erabili orrialde txikiko inprimatze-bikoitzean)
+ Comment[fa]=چاپ Pamphlet (در چاپ‌های Ú©ÙˆÚ†Ú© یک طرÙÙ‡ استÙاده کنید)
+ Comment[fi]=Lentolehtistulostus (käytä lyhyen sivun kaksipuoleistulostusta)
+ Comment[fr]=Impression au format livret (Ã utiliser avec l'impression duplex de petits feuillets)
+@@ -48,7 +48,7 @@
+ Comment[ms]=Cetakan Pamplet (guna cetakan dupleks sisi kecil)
+ Comment[mt]=Printjar ta' fuljett (uża printjar dupleks min-naħa l-qasira)
+ Comment[nb]=Brosjyreutskrift (brukes for dobbeltsidig utskrift med liten papirstørrelse)
+-Comment[nds]=Lütte Böker drucken (mit Duplexdruck för smalle Sieden bruken)
++Comment[nds]=Lütte Böker drucken (mit Duplexdruck för lütte Sieden bruken)
+ Comment[nl]=Pamflet afdrukken (gebruik i.c.m. smalle kant duplexafdruk)
+ Comment[nn]=Brosjyreutskrift (bruk ved dupleksutskrift på små sider)
+ Comment[nso]=Kgatiso ya Pamphlet (sumisa le kgatiso ya duplex ya lehlakori le lennyane)
+--- kdeprint/filters/ps2pdf.desktop (revision 488534)
++++ kdeprint/filters/ps2pdf.desktop (revision 494869)
+@@ -46,7 +46,7 @@
+ Comment[ms]=Pengubah PostScript ke PDF
+ Comment[mt]=Konvertitur PostScript għal PDF
+ Comment[nb]=Postscript/PDF-dokumentkonvertering
+-Comment[nds]=konverteert PostScript na PDF
++Comment[nds]=Wannelt PostScript na PDF üm
+ Comment[nl]=Conversie van PostScript naar PDF
+ Comment[nn]=Konvertering mellom PostScript og PDF
+ Comment[nso]=Mofetosetsi wa PostScript go PDF
+--- kdeprint/filters/psresize.desktop (revision 488534)
++++ kdeprint/filters/psresize.desktop (revision 494869)
+@@ -27,7 +27,7 @@
+ Comment[eo]=Etendas presaĵon konvene al alia paperformato
+ Comment[es]=Escalar el contenido de la impresión para ajustar en otro tamaño del papel
+ Comment[et]=Sisu suuruse muutmine mahutamaks teise suurusega paberile
+-Comment[eu]=Inprimatzeko edukiak eskalatzen ditu, beste orri neurri bat betetzeko besteraino
++Comment[eu]=Eskalatu inprimatzeko edukiak beste paper-tamainari doitzeko
+ Comment[fa]=کشیدن Ù…Øتوای چاپ برای اندازه گردن آن در کاعذی دیگر
+ Comment[fi]=Skaalaa tulostettava sisältö mahtumaan erikokoiselle paperille
+ Comment[fr]=Ajuste le contenu imprimé pour l'adapter à un autre format de papier
+@@ -51,7 +51,7 @@
+ Comment[ms]=Skala Cetak Kandungan untuk menepati Saiz Kertas Lain
+ Comment[mt]=Kabbar/ċekken id-daqs ta'l-print biex joqgħod fuq karta ta' daqs differenti
+ Comment[nb]=Tilpass utskriften til en annen papirstørrelse
+-Comment[nds]=Dat, wat Du drucken wullt, för'n annere Papeergrött gaatlich maken
++Comment[nds]=Utdruck en anner Papeergrött topassen
+ Comment[nl]=Schaal de afdrukinhoud zodat deze past op een andere papierformaat
+ Comment[nn]=Skaler utskrifta til ein annan papirstorleik
+ Comment[nso]=Kala Bokagare bja Kgatiso gore bo Lekanele go Bogolo bjo Bongwe bja Letlakala
+--- kdeprint/filters/psnup.desktop (revision 488534)
++++ kdeprint/filters/psnup.desktop (revision 494869)
+@@ -17,7 +17,7 @@
+ Comment[eo]=Filtrilo por aranÄi plurajn paÄojn sur folio
+ Comment[es]=Filtro para múltiples páginas por hoja
+ Comment[et]=Mitme lehekülje ühele lehele trükkimise filter
+-Comment[eu]=Orri bakoitzeko orrialde anitzerako iragazkia
++Comment[eu]='Orrialde anitzak orriko' iragazkia
+ Comment[fa]=صاÙÛŒ صÙØات متعدد در برگ
+ Comment[fi]=Useita sivuja samalle arkille
+ Comment[fr]=Plusieurs pages par feuille
+@@ -42,7 +42,7 @@
+ Comment[ms]=Penapis Pelbagai Laman setiap Helaian
+ Comment[mt]=Filtru għal iżjed minn paġna waħda fuq kull karta
+ Comment[nb]=Filter for flere sider på hvert ark
+-Comment[nds]=Mehr as een Siet pro Blatt drucken
++Comment[nds]=Mehr as een Siet per Blatt drucken
+ Comment[nl]=Meerdere pagina's per vel afdrukken
+ Comment[nn]=Filter for fleire sider på kvart ark
+ Comment[nso]=Matlakala A Mantshintshi ka Sesekodi sa Letlakala
+--- kdeprint/lpd/lpd.print (revision 488534)
++++ kdeprint/lpd/lpd.print (revision 494869)
+@@ -17,7 +17,7 @@
+ Comment[eo]=LPR (Normala BSD-pressistemo)
+ Comment[es]=LPR (sistema de impresión estándar de BSD)
+ Comment[et]=LPR (standardne BSD trükkimise süsteem)
+-Comment[eu]=LPR (BSDren inprimaketa sistema estandarra)
++Comment[eu]=LPR (BSDren inprimatze-sistema estandarra)
+ Comment[fa]=LPR (سیستم چاپ استاندارد BSD)
+ Comment[fi]=LPR (standardi BSD-tulostusjärjestelmä)
+ Comment[fr]=LPR (système d'impression BSD standard)
+--- kdeprint/lpr/lpr.print (revision 488534)
++++ kdeprint/lpr/lpr.print (revision 494869)
+@@ -17,7 +17,7 @@
+ Comment[eo]=LPR/LPRng-presosistemo
+ Comment[es]=Sistema de impresión LPR/LPRNg
+ Comment[et]=LPR/LPRng trükkimise süsteem
+-Comment[eu]=LPR/LPRng inprimaketa sistema
++Comment[eu]=LPR/LPRng inprimatze-sistema
+ Comment[fa]=سیستم چاپ LPR/LPRng
+ Comment[fi]=LPR/LPRng-tulostusjärjestelmä
+ Comment[fr]=Système d'impression LPR / LPRng
+--- kdeprint/kdeprintd.desktop (revision 488534)
++++ kdeprint/kdeprintd.desktop (revision 494869)
+@@ -26,7 +26,7 @@
+ Name[eo]=Preso-demono
+ Name[es]=Demonio de impresión de KDE
+ Name[et]=KDE trükkimise deemon
+-Name[eu]=KDEren inprimatze daemon-a
++Name[eu]=KDEren inprimatze-daemona
+ Name[fa]=برنامه‌ی چاپ KDE
+ Name[fi]=KDE:n tulostuspalvelin
+ Name[fr]=Démon d'impression de KDE
+@@ -51,7 +51,7 @@
+ Name[ms]=Daemon Cetak KDE
+ Name[mt]=Proċess tal-ipprintjar KDE
+ Name[nb]=KDE-utskriftsnisse
+-Name[nds]=KDE Druck-Dämoon
++Name[nds]=KDE-Druckdämoon
+ Name[nn]=KDE-utskriftsnisse
+ Name[nso]=Daemon ya Kgatiso ya KDE
+ Name[pa]=KDE ਪà©à¨°à¨¿à©°à¨Ÿà¨° ਡਾਈਮੋਨ
+@@ -95,7 +95,7 @@
+ Comment[el]=Ένας δαίμονας εκτυπώσεων για το KDE
+ Comment[es]=Demonio de impresión para KDE
+ Comment[et]=KDE trükkimise deemon
+-Comment[eu]=KDEren inprimaketa daemon-a
++Comment[eu]=KDEren inprimatze-daemona
+ Comment[fi]=KDE:n tulostuspalvelin
+ Comment[fr]=Un démon d'impression pour KDE
+ Comment[fy]=ôfdruk deamon foar KDE
+@@ -115,7 +115,7 @@
+ Comment[mk]=KDE даемон за печатење
+ Comment[ms]=Daemon Cetak untuk KDE
+ Comment[nb]=Utskriftsnisse for KDE
+-Comment[nds]=Een Druck-Dämoon för KDE
++Comment[nds]=En Druck-Dämoon för KDE
+ Comment[nl]=Printer-daemon voor KDE
+ Comment[nn]=Utskriftsnisse for KDE
+ Comment[pa]=KDE ਲਈ ਪà©à¨°à¨¿à©°à¨Ÿà¨° ਡਾਈਮੋਨ
+--- kdeprint/rlpr/rlpr.print (revision 488534)
++++ kdeprint/rlpr/rlpr.print (revision 494869)
+@@ -38,7 +38,7 @@
+ Comment[ms]=Persekitaran RLPR (Pelayan LPD jauh)
+ Comment[mt]=Ambjent RLPR (servers LPD remoti)
+ Comment[nb]=RLPR-miljø (LPD-tjenere over nettverk)
+-Comment[nds]=RLPR-Ãœmkrink (LPD-Server op'n annern Reekner)
++Comment[nds]=RLPR-Ãœmgeven (LPD-Servers op anner Reekners)
+ Comment[nl]=RLPR-omgeving (LPD-servers op afstand)
+ Comment[nn]=RLPR-miljø (LPD-tenarar over nettverk)
+ Comment[nso]=Tikologo ya RLPR (Baabi remote ba LPD)
+--- kdeprint/lpdunix/lpdunix.print (revision 488534)
++++ kdeprint/lpdunix/lpdunix.print (revision 494869)
+@@ -16,7 +16,7 @@
+ Comment[eo]=Äœenerala Uniksa LPD-pressistemo (apriora)
+ Comment[es]=Sistema de impresión genérico LPD de Unix (predeterminado)
+ Comment[et]=Tavaline UNIX-i LPD trükkimise süsteem (vaikimisi)
+-Comment[eu]=UNIX LPD inprimaketa sistema generikoa (lehenetsia)
++Comment[eu]=UNIX LPD inprimatze-sistema generikoa (lehenetsia)
+ Comment[fa]=سیستم چاپ عمومی یونیکس LPD (پیش‌Ùرض)
+ Comment[fi]=Yleinen UNIX LPD-tulostusjärjestelmä (oletus)
+ Comment[fr]=Système d'impression LPD Unix générique (par défaut)
+--- kdeprint/ext/ext.print (revision 488534)
++++ kdeprint/ext/ext.print (revision 494869)
+@@ -15,7 +15,7 @@
+ Comment[eo]=Presi per ekstera programo (Äenerala)
+ Comment[es]=Imprime a través de un programa externo (genérico)
+ Comment[et]=Trükkimine läbi välise rakenduse (üldine)
+-Comment[eu]=Kanpoko programa baten bidez inprimatu (orokorra)
++Comment[eu]=Inprimatu kanpoko programa bat erabiliz (orokorra)
+ Comment[fa]=چاپ از طریق برنامه‌ای خارجی (عمومی)
+ Comment[fi]=Tulosta ulkoisen sovelluksen kautta (yleinen)
+ Comment[fr]=Imprimer via un programme externe (générique)
+@@ -41,7 +41,7 @@
+ Comment[ms]=Cetak Melalui Program Luaran (biasa)
+ Comment[mt]=Printja permezz ta' programm estern (Ä¡eneriku)
+ Comment[nb]=Skriv ut gjennom et eksternt program (generisk)
+-Comment[nds]=Mit en extern Programm drucken
++Comment[nds]=Över extern Programm drucken
+ Comment[nl]=Afdrukken met behulp van een extern programma (algemeen)
+ Comment[nn]=Skriv ut gjennom eit eksternt program (generelt)
+ Comment[nso]=Gatisetsa go Lenaneo la Kantle (kakaretso)
+--- kdeprint/specials.desktop (revision 488534)
++++ kdeprint/specials.desktop (revision 494869)
+@@ -20,7 +20,7 @@
+ Name[eo]=Presu al dosiero (Postskripto)
+ Name[es]=Imprimir en archivo (PostScript)
+ Name[et]=Faili trükkimine (Postscript)
+-Name[eu]=Fitxategira inprimatu (PostScript)
++Name[eu]=Inprimatu fitxategian (PostScript)
+ Name[fa]=چاپ در پرونده (PostScript)
+ Name[fi]=Tulosta PostScript-tiedostoon
+ Name[fr]=Imprimer dans un fichier (PostScript)
+@@ -45,7 +45,7 @@
+ Name[ms]= Cetak ke Fail (PostScript)
+ Name[mt]=Printja Ä¡o fajl (PostScript)
+ Name[nb]=Skriv til fil (PostScript)
+-Name[nds]=In'n Datei drucken (PostScript)
++Name[nds]=Datei utgeven (PostScript)
+ Name[nl]=Naar bestand afdrukken (PostScript)
+ Name[nn]=Skriv til fil (PostScript)
+ Name[nso]=Gatisetsa go Faele (PostScript)
+@@ -95,7 +95,7 @@
+ Description[eo]=Skribas Postskripto-dosieron
+ Description[es]=Escribir archivo PostScript
+ Description[et]=PS-faili kirjutamine
+-Description[eu]=PostScript fitxategia idatzi
++Description[eu]=Idatzi PostScript fitxategia
+ Description[fa]=نوشتن پرونده‌ی PostScript
+ Description[fi]=Kirjoita PostScript-tiedosto
+ Description[fr]=Imprimer dans un fichier PostScript
+@@ -120,7 +120,7 @@
+ Description[ms]=Tulis fail PostScript
+ Description[mt]=Ikteb fajl PostScript
+ Description[nb]=Skriv PostScript-fil
+-Description[nds]=PostScript-Datei schrieven
++Description[nds]=Druckopgaav as PostScript-Datei utgeven
+ Description[nl]=Schrijf PostScript-bestand
+ Description[nn]=Skriv PostScript-fil
+ Description[nso]=Ngwala faele ya PostScript
+@@ -254,7 +254,7 @@
+ Name[eo]=Presu al dosiero (PDF)
+ Name[es]=Imprimir en archivo (PDF)
+ Name[et]=Faili trükkimine (PDF)
+-Name[eu]=Fitxategira inprimatu (PDF)
++Name[eu]=Inprimatu fitxategian (PDF)
+ Name[fa]=چاپ در پرونده (PDF)
+ Name[fi]=Tulosta PDF-tiedostoon
+ Name[fr]=Imprimer dans un fichier (PDF)
+@@ -279,7 +279,7 @@
+ Name[ms]= Cetak ke Fail(PDF)
+ Name[mt]=Printja Ä¡o fajl (PDF)
+ Name[nb]=Skriv til fil (PDF/Acrobat)
+-Name[nds]=In'n Datei drucken (PDF)
++Name[nds]=Datei utgeven (PDF)
+ Name[nl]=Naar bestand afdrukken (PDF)
+ Name[nn]=Skriv til fil (PDF/Acrobat)
+ Name[nso]=Gatisetsa go Faele (PDF)
+@@ -329,7 +329,7 @@
+ Description[eo]=Skribas PDF/Akrobato-dosieron
+ Description[es]=Escribir archivo PDF/Acrobat
+ Description[et]=PDF/Acrobat-faili kirjutamine
+-Description[eu]=PDF/Acrobat fitxategia idatzi
++Description[eu]=Idatzi PDF/Acrobat fitxategia
+ Description[fa]=نوشتن پرونده‌ی PDF/Acrobat
+ Description[fi]=Kirjoita PDF/Acrobat-tiedosto
+ Description[fr]=Imprime dans un fichier PDFÂ /Â Acrobat
+@@ -354,7 +354,7 @@
+ Description[ms]=Tulis fail PDF/Acrobat
+ Description[mt]=Ikteb fajl PDF/Acrobat
+ Description[nb]=Skriv PDF/Acrobat-fil
+-Description[nds]=PDF/Acrobat-Datei schrieven
++Description[nds]=Druckopgaav as PDF- / Acrobat-Datei utgeven
+ Description[nl]=Schrijf PDF/Acrobat-bestand
+ Description[nn]=Skriv PDF/Acrobat-fil
+ Description[nso]=Ngwala faele ya PDF/Acrobat
+@@ -489,7 +489,7 @@
+ Name[eo]=Sendu al fakso
+ Name[es]=Enviar a fax
+ Name[et]=Faksile saatmine
+-Name[eu]=Faxera bidali
++Name[eu]=Bidali faxez
+ Name[fa]=ارسال به دورنگار
+ Name[fi]=Lähetä faksille
+ Name[fr]=Envoyer au fax
+@@ -514,7 +514,7 @@
+ Name[ms]=Kirim ke Faks
+ Name[mt]=Ibgħat bħala fax
+ Name[nb]=Send til faks
+-Name[nds]=As Fax afschicken
++Name[nds]=Fax sennen
+ Name[nl]=Naar fax verzenden
+ Name[nn]=Send til faks
+ Name[nso]=Romela go Fax
+@@ -562,7 +562,7 @@
+ Description[eo]=Sendas al ekstera faksosistemo
+ Description[es]=Enviar a sistema de fax externo
+ Description[et]=Välisele faksisüsteemile saatmine
+-Description[eu]=Kanpoko fax sistema batera bidali
++Description[eu]=Bidali kanpoko fax-sistemara
+ Description[fa]=ارسال به سیستم دورنگار خارجی
+ Description[fi]=Lähetä faksille
+ Description[fr]=Envoyer à un système de fax externe
+@@ -586,7 +586,7 @@
+ Description[ms]=Kirim ke sistem faks luaran
+ Description[mt]=Ibgħat lis-sistema esterna tal-fax
+ Description[nb]=Send til eksternt telefaks-system
+-Description[nds]=Na'n extern Faxsysteem afschicken
++Description[nds]=Na'n extern Faxsysteem schicken
+ Description[nl]=Naar een extern faxsysteem sturen
+ Description[nn]=Send til eksternt faks-system
+ Description[nso]=Romela go system ya kantle ya fax
+@@ -790,7 +790,7 @@
+ Description[eo]=Kreas PDF/Akrobato-dosieron kiel kunsendaĵo de PoÅtilo
+ Description[es]=Crear archivo PDF/Acrobat como adjunto para KMail
+ Description[et]=Tekitab PDF/Acrobat-faili ja kaasab selle KMaili kirjale
+-Description[eu]=PDF/Acrobat fitxategiak sortzen ditu KMail-en eransteko
++Description[eu]=PDF/Acrobat fitxategiak sortzen ditu KMail-en eranskin gisa
+ Description[fa]=ایجاد پرونده‌ی PDF/Acrobat به عنوان ضمیمه برای KMail
+ Description[fi]=Luo PDF/Acrobat-tiedoston sähköpostiliitteenä KMailille
+ Description[fr]=Crée un fichier PDF en tant que pièce jointe pour KMail
+@@ -814,7 +814,7 @@
+ Description[ms]=Cipta fail PDF/Acrobat sebagai kepilan untuk KMail
+ Description[mt]=Joħloq fajl PDF/Acrobat bħala abbinament għall-KMail
+ Description[nb]=Lager PDF/Acrobat-fil som vedlegg til KMail
+-Description[nds]=Maakt 'n niege PDF/Acrobat-Datei as Bilaag för KMail
++Description[nds]=Stellt niege PDF/Acrobat-Datei as Bilaag för KMail op
+ Description[nl]=Creëert PDF/Acrobat-bestand als bijlage voor KMail
+ Description[nn]=Lagar PDF/Acrobat-fil som vedlegg i KMail
+ Description[nso]=E hlagisa faele ya PDF/Acrobat bjale ka kgwathiso go KPoso
+@@ -884,7 +884,7 @@
+ Name[mk]=PDF по е-пошта
+ Name[ms]=Mel fail PDF
+ Name[nb]=Send PDF-fil
+-Name[nds]=PDF-Datei as Nettbreef afschicken
++Name[nds]=PDF-Datei mit Nettpost schicken
+ Name[nl]=PDF-bestand e-mailen
+ Name[nn]=Send PDF-fil
+ Name[pa]=PDF ਫਾਇਲ ਮੇਲ ਕਰੋ
+@@ -1017,7 +1017,7 @@
+ Name[eo]=Pliluksa Faksilo (ksendfax)
+ Name[es]=Herramienta avanzada de envio de faxes (ksendfax)
+ Name[et]=Võimas faksimise rakendus (ksendfax)
+-Name[eu]=Fax tresna aurreratua (ksendfax)
++Name[eu]=Faxaren tresna aurreratua (ksendfax)
+ Name[fa]=ابزار دورنگار پیشرÙته (ksendfax)
+ Name[fi]=Edistynyt faksaustyökalu (ksendfax)
+ Name[fr]=Outil de fax avancé (KSendfax)
+--- kdeui/kurllabel.cpp (revision 488534)
++++ kdeui/kurllabel.cpp (revision 494869)
+@@ -1,26 +1,29 @@
+-// kurllabel.cpp
++/* This file is part of the KDE libraries
++ Copyright (C) 1998 Kurt Granroth <granroth at kde.org>
++ Copyright (C) 2000 Peter Putzer <putzer at kde.org>
++ Copyright (C) 2005 Jaroslaw Staniek <js at iidea.pl>
+
+-// Copyright (C) 2000 Peter Putzer
++ This library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Library General Public
++ License version 2 as published by the Free Software Foundation.
+
+-// This library is free software; you can redistribute it and/or
+-// modify it under the terms of the GNU Lesser General Public
+-// License as published by the Free Software Foundation; either
+-// version 2.1 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.
+
+-// 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
+-// Lesser 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.
++*/
+
+-// You should have received a copy of the GNU Lesser General Public
+-// License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+-// 02110-1301 USA
+-
+ #include <qcolor.h>
+ #include <qtimer.h>
+ #include <qtooltip.h>
+ #include <qpixmap.h>
++#include <qpainter.h>
++#include <qstyle.h>
+ #include <qapplication.h>
+
+ #include <kcursor.h>
+@@ -79,6 +82,8 @@
+ setFont (font());
+ setCursor (KCursor::handCursor());
+ setLinkColor (d->LinkColor);
++ setMargin(3); //better default : better look when focused
++ setFocusPolicy( QWidget::StrongFocus ); //better accessibility
+ }
+
+ KURLLabel::KURLLabel (QWidget* parent, const char* name)
+@@ -88,6 +93,8 @@
+ setFont (font());
+ setCursor (KCursor::handCursor());
+ setLinkColor (d->LinkColor);
++ setMargin(3); //better default : better look when focused
++ setFocusPolicy( QWidget::StrongFocus ); //better accessibility
+ }
+
+ KURLLabel::~KURLLabel ()
+@@ -330,8 +337,40 @@
+ setLinkColor(d->LinkColor);
+ return true;
+ }
+- else
+- return QLabel::event(e);
++ else if (e->type() == QEvent::Paint) {
++ QPaintEvent* pe = static_cast<QPaintEvent*>(e);
++ bool result = QLabel::event(e);
++ if (result && hasFocus()) {
++ QPainter p(this);
++ QRect r(contentsRect());
++ int hAlign = QApplication::horizontalAlignment( alignment() );
++ int indentX = (hAlign && indent()>0) ? indent() : 0;
++ QFontMetrics fm(font());
++ r.setWidth( QMIN(fm.width(text()), r.width()));
++ if ( hAlign & AlignLeft )
++ r.moveLeft(r.left() + indentX);
++ if ( hAlign & AlignCenter )
++ r.moveLeft((contentsRect().width()-r.width())/2+margin());
++ if ( hAlign & AlignRight )
++ r.moveLeft(contentsRect().width()-r.width()-indentX+margin());
++ int add = QMIN(3, margin());
++ r = QRect(r.left()-add, r.top()-add, r.width()+2*add, r.height()+2*add);
++ style().drawPrimitive( QStyle::PE_FocusRect, &p, r, colorGroup() );
++ }
++ return result;
++ }
++ else if (e->type() == QEvent::KeyPress) {
++ QKeyEvent* ke = static_cast<QKeyEvent*>(e);
++ if (ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Return) {
++ setLinkColor (d->HighlightedLinkColor);
++ d->Timer->start (300);
++ emit leftClickedURL ();
++ emit leftClickedURL (d->URL);
++ ke->accept();
++ return true;
++ }
++ }
++ return QLabel::event(e);
+ }
+
+
+--- kdeui/kdetrayproxy/kdetrayproxy.desktop (revision 488534)
++++ kdeui/kdetrayproxy/kdetrayproxy.desktop (revision 494869)
+@@ -13,7 +13,7 @@
+ Name[eo]=KDE-sistelistela prokurmodulo
+ Name[es]=Módulo Proxy de bandeja de KDE
+ Name[et]=KDE süsteemse salve proxy moodul
+-Name[eu]=KDEren erretiluko proxy modulua
++Name[eu]=KDEren erretiluko proxy-modulua
+ Name[fi]=KDE:n järjestelmätarjottimen välityspalvelinmoduuli
+ Name[fr]=Module proxy des miniatures de KDE
+ Name[fy]=KDE Systeemfak Proxy Module
+@@ -29,7 +29,7 @@
+ Name[lt]=KDE dÄ—klo proxy modulis
+ Name[ms]=Modul Dulang Proksi KDE
+ Name[nb]=KDE mellommodul
+-Name[nds]=Proxy-Moduul för den Paneel-Systeemafsnitt
++Name[nds]=Systeemafsnitt-Proxymoduul
+ Name[nl]=Proxy-module voor het KDE-systeemvak
+ Name[nn]=KDE-mellommodul for systemtrauet
+ Name[pa]=KDE ਟਰੇ ਪਰਾਕਸੀ ਮੈਡੀਊਲ
+@@ -64,7 +64,7 @@
+ Comment[eo]=Prokuro ebligas KDEajn aplikaĵojn labori sen KWin
+ Comment[es]=Activación de Proxy de aplicaciones systray de KDE sin KWin
+ Comment[et]=Proxy, mis võimaldab KDE süsteemse salve rakendustel töötada ilma KWin'ita
+-Comment[eu]=KDEren erretiluko proxy-gaitze aplikazioak KWin gabe lan egiteko
++Comment[eu]=KDEren erretiluko proxy-gaitze aplikazioak KWin gabe lan egiteko
+ Comment[fi]=Välimuistipalvelin, jonka avulla järjestelmätarjottimen sovellukset voivat toimia ilman KWiniä
+ Comment[fr]=Proxy autorisant le fonctionnement des miniatures sans KWin
+ Comment[fy]=Troch Proxy kinne KDE systeemfak applikaasjes wurkje sûnder KWin
+@@ -80,7 +80,7 @@
+ Comment[mk]=ПрокÑи кое им овозможува на KDE апликациите од ÑиÑ. лента да работат без KWin
+ Comment[ms]=Aplikasi dulang sys dengan fungsi proksi untuk berfungsi tanpa KWin
+ Comment[nb]=Modul som gjør at systemkurvprogrammet for KDE kan fungere uten KWin
+-Comment[nds]=Disse Proxy lett Programmen ok ahn KWin as Finsterpleger binnen den Paneel-Systeemafsnitt lopen
++Comment[nds]=Disse Proxy lett Systeemafsnitt-Programmen ok ahn KWin lopen
+ Comment[nl]=Proxy-module om toepassingen in het KDE-systeemvak te plaatsen die geen KWin ondersteuning hebben.
+ Comment[nn]=Modul som gjer at systemtrauprogram for KDE kan fungera uavhengig av KWin
+ Comment[pa]=KWin ਬਿਨਾਂ ਕੰਮ ਕਰਨ ਲਈ KDE systray ਕਾਰਜਾਂ ਲਈ ਪਰਾਕਸੀ ਯੋਗ
+--- kdeui/kaboutdialog.cpp (revision 488534)
++++ kdeui/kaboutdialog.cpp (revision 494869)
+@@ -95,12 +95,14 @@
+ KURLLabel *kurl = static_cast<KURLLabel *>(mText[1]);
+ kurl->setFloat(true);
+ kurl->setUnderline(true);
++ kurl->setMargin(0);
+ connect(kurl, SIGNAL(leftClickedURL(const QString &)),
+ SLOT(emailClickedSlot(const QString &)));
+
+ kurl = static_cast<KURLLabel *>(mText[2]);
+ kurl->setFloat(true);
+ kurl->setUnderline(true);
++ kurl->setMargin(0);
+ connect(kurl, SIGNAL(leftClickedURL(const QString &)),
+ SLOT(urlClickedSlot(const QString &)));
+
+--- kdeui/kguiitem.h (revision 488534)
++++ kdeui/kguiitem.h (revision 494869)
+@@ -33,6 +33,7 @@
+ * @short An abstract class for GUI data such as ToolTip and Icon.
+ *
+ * @author Holger Freyther <freyher at yahoo.com>
++ * @see KStdGuiItem
+ */
+ class KDEUI_EXPORT KGuiItem
+ {
+--- kdeui/kcombobox.cpp (revision 488534)
++++ kdeui/kcombobox.cpp (revision 494869)
+@@ -361,6 +361,9 @@
+
+ void KHistoryCombo::init( bool useCompletion )
+ {
++ // Set a default history size to something reasonable, Qt sets it to INT_MAX by default
++ setMaxCount( 50 );
++
+ if ( useCompletion )
+ completionObject()->setOrder( KCompletion::Weighted );
+
+--- kdeui/kdualcolorbutton.h (revision 488534)
++++ kdeui/kdualcolorbutton.h (revision 494869)
+@@ -61,6 +61,8 @@
+ * Constructs a new KDualColorButton using the default black and white
+ * colors.
+ *
++ * As of KDE 3.5.1, sets the dialog parent to the same as "parent" if that
++ * argument is non-null and the dialogParent argument is null.
+ */
+ KDualColorButton(QWidget *parent=0, const char *name=0, QWidget* dialogParent=0);
+
+--- kdeui/kdualcolorbutton.cpp (revision 488534)
++++ kdeui/kdualcolorbutton.cpp (revision 494869)
+@@ -36,7 +36,11 @@
+ : QWidget(parent, name),
+ d (new KDualColorPrivate)
+ {
+- d->dialogParent = dialogParent;
++ if (!dialogParent && parent) {
++ d->dialogParent = parent;
++ } else {
++ d->dialogParent = dialogParent;
++ }
+
+ arrowBitmap = new QBitmap(dcolorarrow_width, dcolorarrow_height,
+ (const unsigned char *)dcolorarrow_bits, true);
+--- kdeui/ksharedpixmap.cpp (revision 488534)
++++ kdeui/ksharedpixmap.cpp (revision 494869)
+@@ -141,14 +141,14 @@
+
+ int dummy, format;
+ unsigned long nitems, ldummy;
+- Drawable *pixmap_id;
++ unsigned char *pixmap_id = 0;
+ Atom type;
+
+ XGetWindowProperty(qt_xdisplay(), winId(), ev->property, 0, 1, false,
+ d->pixmap, &type, &format, &nitems, &ldummy,
+- (unsigned char **) &pixmap_id);
++ &pixmap_id);
+
+- if (nitems != 1)
++ if (nitems != 1 || !pixmap_id)
+ {
+ kdWarning(270) << k_funcinfo << "could not read property, nitems = " << nitems << "\n";
+ emit done(false);
+@@ -157,13 +157,16 @@
+
+ Window root;
+ unsigned int width, height, udummy;
+- XGetGeometry(qt_xdisplay(), *pixmap_id, &root, &dummy, &dummy, &width,
++ void *drawable_id = (void *) pixmap_id;
++ Drawable pixmap = *(Drawable*) drawable_id;
++
++ XGetGeometry(qt_xdisplay(), pixmap, &root, &dummy, &dummy, &width,
+ &height, &udummy, &udummy);
+
+ if (d->rect.isEmpty())
+ {
+ QPixmap::resize(width, height);
+- XCopyArea(qt_xdisplay(), *pixmap_id, ((KPixmap*)this)->handle(), qt_xget_temp_gc(qt_xscreen(), false),
++ XCopyArea(qt_xdisplay(), pixmap, ((KPixmap*)this)->handle(), qt_xget_temp_gc(qt_xscreen(), false),
+ 0, 0, width, height, 0, 0);
+
+ XFree(pixmap_id);
+@@ -201,13 +204,13 @@
+
+ QPixmap::resize( tw+origin.x(), th+origin.y() );
+
+- XCopyArea(qt_xdisplay(), *pixmap_id, ((KPixmap*)this)->handle(), qt_xget_temp_gc(qt_xscreen(), false),
++ XCopyArea(qt_xdisplay(), pixmap, ((KPixmap*)this)->handle(), qt_xget_temp_gc(qt_xscreen(), false),
+ xa, ya, t1w+origin.x(), t1h+origin.y(), origin.x(), origin.y() );
+- XCopyArea(qt_xdisplay(), *pixmap_id, ((KPixmap*)this)->handle(), qt_xget_temp_gc(qt_xscreen(), false),
++ XCopyArea(qt_xdisplay(), pixmap, ((KPixmap*)this)->handle(), qt_xget_temp_gc(qt_xscreen(), false),
+ 0, ya, tw-t1w, t1h, t1w, 0);
+- XCopyArea(qt_xdisplay(), *pixmap_id, ((KPixmap*)this)->handle(), qt_xget_temp_gc(qt_xscreen(), false),
++ XCopyArea(qt_xdisplay(), pixmap, ((KPixmap*)this)->handle(), qt_xget_temp_gc(qt_xscreen(), false),
+ xa, 0, t1w, th-t1h, 0, t1h);
+- XCopyArea(qt_xdisplay(), *pixmap_id, ((KPixmap*)this)->handle(), qt_xget_temp_gc(qt_xscreen(), false),
++ XCopyArea(qt_xdisplay(), pixmap, ((KPixmap*)this)->handle(), qt_xget_temp_gc(qt_xscreen(), false),
+ 0, 0, tw-t1w, th-t1h, t1w, t1h);
+
+ XFree(pixmap_id);
+--- kdeui/kactionclasses.cpp (revision 488534)
++++ kdeui/kactionclasses.cpp (revision 494869)
+@@ -1103,7 +1103,6 @@
+ {
+ if ( url.isLocalFile() && !KGlobal::dirs()->relativeLocation("tmp", url.path()).startsWith("/"))
+ return;
+- const KURL u = url; // make a copy since d->m_urls.erase( title ) could destroy the KURL that "url" references
+ const QString file = url.pathOrURL();
+ QStringList lst = KSelectAction::items();
+
+@@ -1133,7 +1132,7 @@
+ // add file to list
+ const QString title = name + " [" + file + "]";
+ d->m_shortNames.insert( title, name );
+- d->m_urls.insert( title, u );
++ d->m_urls.insert( title, url );
+ lst.prepend( title );
+ setItems( lst );
+ }
+@@ -1236,13 +1235,19 @@
+
+ void KRecentFilesAction::itemSelected( const QString& text )
+ {
+- emit urlSelected( d->m_urls[ text ] );
++ //return a copy of the URL since the slot where it is connected might call
++ //addURL or removeURL where the d->m_urls.erase( title ) could destroy the
++ //d->m_urls[ text ] and the emitted URL will be invalid in the rest of the slot
++ emit urlSelected( KURL(d->m_urls[ text ]) );
+ }
+
+ void KRecentFilesAction::menuItemActivated( int id )
+ {
+ QString text = d->m_popup->text(id);
+- emit urlSelected( d->m_urls[ text ] );
++ //return a copy of the URL since the slot where it is connected might call
++ //addURL or removeURL where the d->m_urls.erase( title ) could destroy the
++ //d->m_urls[ text ] and the emitted URL will be invalid in the rest of the slot
++ emit urlSelected( KURL(d->m_urls[ text ]) );
+ }
+
+ void KRecentFilesAction::menuAboutToShow()
+--- kdeui/kurllabel.h (revision 488534)
++++ kdeui/kurllabel.h (revision 494869)
+@@ -1,6 +1,7 @@
+ /* This file is part of the KDE libraries
+ Copyright (C) 1998 Kurt Granroth <granroth at kde.org>
+ Copyright (C) 2000 Peter Putzer <putzer at kde.org>
++ Copyright (C) 2005 Jaroslaw Staniek <js at iidea.pl>
+
+ 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,10 @@
+ * the mouse leaving and entering the text area and all forms of
+ * mouse clicking.
+ *
++ * By default KURLLabel accepts focus. When focused, standard
++ * focus rectangle is displayed as in HTML widget.
++ * Pressing Enter key accepts the focused label.
++ *
+ * A typical usage would be something like so:
+ *
+ * \code
+--- kdeui/kwhatsthismanager.cpp (revision 488534)
++++ kdeui/kwhatsthismanager.cpp (revision 494869)
+@@ -47,10 +47,10 @@
+ {
+ if (!m_widget)
+ return "";
+- QString txt = i18n ("<b>Not Defined</b><br>There is no \"What's This\""
+- " help assigned to this widget. If you want to help us and "
++ QString txt = i18n ("<b>Not Defined</b><br>There is no \"What's This?\""
++ " help assigned to this widget. If you want to help us to "
+ " describe the widget, you are welcome to <a href=\"submit"
+- "-whatsthis\">send us \"What's This\" help</a> for it.");
++ "-whatsthis\">send us your own \"What's This?\" help</a> for it.");
+ QString parent;
+ if (m_widget -> parentWidget ())
+ parent = QWhatsThis::textFor (m_widget -> parentWidget ());
+--- dnssd/remoteservice.cpp (revision 488534)
++++ dnssd/remoteservice.cpp (revision 494869)
+@@ -175,15 +175,17 @@
+ return;
+ }
+ char key[256];
+- const char *value;
+ int index=0;
+ unsigned char valueLen;
+ kdDebug() << "Resolve callback\n";
+ QMap<QString,QString> map;
++ const void *voidValue = 0;
+ while (TXTRecordGetItemAtIndex(txtLen,txtRecord,index++,256,key,&valueLen,
+- reinterpret_cast<const void **>(&value)) == kDNSServiceErr_NoError)
+- if (value) map[QString::fromUtf8(key)]=QString::fromUtf8(value,valueLen);
++ &voidValue) == kDNSServiceErr_NoError)
++ {
++ if (voidValue) map[QString::fromUtf8(key)]=QString::fromUtf8((const char*)voidValue,valueLen);
+ else map[QString::fromUtf8(key)]=QString::null;
++ }
+ ResolveEvent rev(DNSToDomain(hosttarget),ntohs(port),map);
+ QApplication::sendEvent(obj, &rev);
+ }
More information about the pkg-kde-commits
mailing list