diff -Nru kdesdk-4.4.2/debian/changelog kdesdk-4.4.5/debian/changelog --- kdesdk-4.4.2/debian/changelog 2010-12-16 14:36:36.000000000 +0000 +++ kdesdk-4.4.5/debian/changelog 2010-12-16 14:36:37.000000000 +0000 @@ -1,3 +1,33 @@ +kdesdk (4:4.4.5-0ubuntu1) lucid-proposed; urgency=low + + * Upload to lucid-propsed for 10.04.2 (LP: #691068) + - No SRU/security upload to verify + + -- Scott Kitterman Thu, 16 Dec 2010 09:24:21 -0500 + +kdesdk (4:4.4.5-0ubuntu1~lucid1~ppa1) lucid; urgency=low + + * New upstream bugfix release + - Bump KDE build-depends to 4.4.5 + - Refresh patches not applying cleanly + + -- Andreas Wenning Sat, 26 Jun 2010 13:57:58 +0200 + +kdesdk (4:4.4.4-0ubuntu1~lucid1~ppa1) lucid; urgency=low + + * New upstream release + - Bump KDE build-depends to 4.4.4 + - Bump standards package version + + -- Ralph Janke Mon, 31 May 2010 21:39:16 -0400 + +kdesdk (4:4.4.3-0ubuntu1~ppa1) lucid; urgency=low + + * New upstream bugfix release + - Bump KDE build-depends to 4.4.3 + + -- Christian Mangold Mon, 03 May 2010 20:11:55 +0200 + kdesdk (4:4.4.2-0ubuntu3) lucid; urgency=low * Update kubuntu_03_optimizegraphics.diff to also check for optipng diff -Nru kdesdk-4.4.2/debian/control kdesdk-4.4.5/debian/control --- kdesdk-4.4.2/debian/control 2010-12-16 14:36:36.000000000 +0000 +++ kdesdk-4.4.5/debian/control 2010-12-16 14:36:37.000000000 +0000 @@ -5,9 +5,9 @@ XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Fathi Boudra , Sune Vuorela , Armin Berres , Matthew Rosewarne Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4), - kdepimlibs5-dev (>= 4:4.4.2), libphonon-dev (>= 4:4.6.2), libhunspell-dev, + kdepimlibs5-dev (>= 4:4.4.5), libphonon-dev (>= 4:4.6.2), libhunspell-dev, libsvn-dev, libstreamanalyzer-dev (>= 0.6.3), libxslt1-dev, libboost1.40-dev, binutils-dev -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Homepage: http://www.kde.org Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-members/kdesdk/ubuntu Vcs-Bzr: https://code.launchpad.net/~kubuntu-members/kdesdk/ubuntu diff -Nru kdesdk-4.4.2/debian/patches/03_kmtrace_compile.diff kdesdk-4.4.5/debian/patches/03_kmtrace_compile.diff --- kdesdk-4.4.2/debian/patches/03_kmtrace_compile.diff 2010-12-16 14:36:36.000000000 +0000 +++ kdesdk-4.4.5/debian/patches/03_kmtrace_compile.diff 2010-12-16 14:36:37.000000000 +0000 @@ -1,8 +1,8 @@ -Index: kdesdk-4.3.90/CMakeLists.txt +Index: kdesdk-4.4.5/CMakeLists.txt =================================================================== ---- kdesdk-4.3.90.orig/CMakeLists.txt 2009-12-04 18:09:40.000000000 -0500 -+++ kdesdk-4.3.90/CMakeLists.txt 2010-01-06 19:40:53.662007245 -0500 -@@ -57,11 +57,11 @@ +--- kdesdk-4.4.5.orig/CMakeLists.txt 2010-06-26 13:57:18.251896619 +0200 ++++ kdesdk-4.4.5/CMakeLists.txt 2010-06-26 13:57:22.290645470 +0200 +@@ -55,11 +55,11 @@ macro_optional_add_subdirectory(strigi-analyzer) macro_optional_add_subdirectory(kioslave) diff -Nru kdesdk-4.4.2/debian/patches/kubuntu_01_kate_desktop.patch kdesdk-4.4.5/debian/patches/kubuntu_01_kate_desktop.patch --- kdesdk-4.4.2/debian/patches/kubuntu_01_kate_desktop.patch 2010-12-16 14:36:36.000000000 +0000 +++ kdesdk-4.4.5/debian/patches/kubuntu_01_kate_desktop.patch 2010-12-16 14:36:37.000000000 +0000 @@ -1,8 +1,8 @@ -Index: kdesdk-4.3.80/kate/data/kate.desktop +Index: kdesdk-4.4.5/kate/data/kate.desktop =================================================================== ---- kdesdk-4.3.80.orig/kate/data/kate.desktop 2009-12-02 16:36:21.770455016 -0330 -+++ kdesdk-4.3.80/kate/data/kate.desktop 2009-12-02 16:55:19.032953117 -0330 -@@ -83,6 +83,7 @@ +--- kdesdk-4.4.5.orig/kate/data/kate.desktop 2010-06-26 13:57:18.221896228 +0200 ++++ kdesdk-4.4.5/kate/data/kate.desktop 2010-06-26 13:57:34.340646938 +0200 +@@ -91,6 +91,7 @@ Name[zh_TW]=Kate MimeType=text/plain; Exec=kate -b %U Binary files /tmp/Qwd0yUitQP/kdesdk-4.4.2/doc/cervisia/index.cache.bz2 and /tmp/bATOapcttD/kdesdk-4.4.5/doc/cervisia/index.cache.bz2 differ Binary files /tmp/Qwd0yUitQP/kdesdk-4.4.2/doc/kapptemplate/index.cache.bz2 and /tmp/bATOapcttD/kdesdk-4.4.5/doc/kapptemplate/index.cache.bz2 differ Binary files /tmp/Qwd0yUitQP/kdesdk-4.4.2/doc/kate/index.cache.bz2 and /tmp/bATOapcttD/kdesdk-4.4.5/doc/kate/index.cache.bz2 differ Binary files /tmp/Qwd0yUitQP/kdesdk-4.4.2/doc/kbugbuster/index.cache.bz2 and /tmp/bATOapcttD/kdesdk-4.4.5/doc/kbugbuster/index.cache.bz2 differ Binary files /tmp/Qwd0yUitQP/kdesdk-4.4.2/doc/kcachegrind/index.cache.bz2 and /tmp/bATOapcttD/kdesdk-4.4.5/doc/kcachegrind/index.cache.bz2 differ Binary files /tmp/Qwd0yUitQP/kdesdk-4.4.2/doc/kompare/index.cache.bz2 and /tmp/bATOapcttD/kdesdk-4.4.5/doc/kompare/index.cache.bz2 differ Binary files /tmp/Qwd0yUitQP/kdesdk-4.4.2/doc/scripts/kdesvn-build/index.cache.bz2 and /tmp/bATOapcttD/kdesdk-4.4.5/doc/scripts/kdesvn-build/index.cache.bz2 differ Binary files /tmp/Qwd0yUitQP/kdesdk-4.4.2/doc/umbrello/index.cache.bz2 and /tmp/bATOapcttD/kdesdk-4.4.5/doc/umbrello/index.cache.bz2 differ diff -Nru kdesdk-4.4.2/kapptemplate/templates/C++/flake/%{APPNAMELC}shape.desktop kdesdk-4.4.5/kapptemplate/templates/C++/flake/%{APPNAMELC}shape.desktop --- kdesdk-4.4.2/kapptemplate/templates/C++/flake/%{APPNAMELC}shape.desktop 2010-03-26 17:30:27.000000000 +0000 +++ kdesdk-4.4.5/kapptemplate/templates/C++/flake/%{APPNAMELC}shape.desktop 2010-04-29 19:59:02.000000000 +0000 @@ -18,6 +18,7 @@ Name[nb]=%{APPNAME}-form Name[nds]=%{APPNAME}-Form Name[nl]=%{APPNAME}-vorm +Name[nn]=%{APPNAME}-form Name[pa]=%{APPNAME} ਸ਼ਕਲ Name[pt]=Forma %{APPNAME} Name[pt_BR]=Forma %{APPNAME} @@ -47,6 +48,7 @@ Comment[nb]=%{APPNAME}-flakform Comment[nds]=%{APPNAME}-Flakeform Comment[nl]=%{APPNAME}-vlokkenvorm +Comment[nn]=%{APPNAME}-Flake-form Comment[pt]=Forma do Flake %{APPNAME} Comment[pt_BR]=Forma do Flake %{APPNAME} Comment[sr]=Облик за %{APPNAME} (Флејк) diff -Nru kdesdk-4.4.2/kapptemplate/templates/C++/flake/%{APPNAME}shape.desktop kdesdk-4.4.5/kapptemplate/templates/C++/flake/%{APPNAME}shape.desktop --- kdesdk-4.4.2/kapptemplate/templates/C++/flake/%{APPNAME}shape.desktop 2010-03-26 17:30:27.000000000 +0000 +++ kdesdk-4.4.5/kapptemplate/templates/C++/flake/%{APPNAME}shape.desktop 2010-04-29 19:59:02.000000000 +0000 @@ -18,6 +18,7 @@ Name[nb]=%{APPNAME}-form Name[nds]=%{APPNAME}-Form Name[nl]=%{APPNAME}-vorm +Name[nn]=%{APPNAME}-form Name[pa]=%{APPNAME} ਸ਼ਕਲ Name[pt]=Forma %{APPNAME} Name[pt_BR]=Forma %{APPNAME} @@ -47,6 +48,7 @@ Comment[nb]=%{APPNAME}-flakform Comment[nds]=%{APPNAME}-Flakeform Comment[nl]=%{APPNAME}-vlokkenvorm +Comment[nn]=%{APPNAME}-Flake-form Comment[pt]=Forma do Flake %{APPNAME} Comment[pt_BR]=Forma do Flake %{APPNAME} Comment[sr]=Облик за %{APPNAME} (Флејк) diff -Nru kdesdk-4.4.2/kapptemplate/templates/C++/flake/flake.kdevtemplate kdesdk-4.4.5/kapptemplate/templates/C++/flake/flake.kdevtemplate --- kdesdk-4.4.2/kapptemplate/templates/C++/flake/flake.kdevtemplate 2010-03-26 17:30:27.000000000 +0000 +++ kdesdk-4.4.5/kapptemplate/templates/C++/flake/flake.kdevtemplate 2010-04-29 19:59:02.000000000 +0000 @@ -17,6 +17,7 @@ Name[nb]=KOffice formmal (flak) Name[nds]=Formvörlaag (Flake) för KOffice Name[nl]=KOffice vormsjabloon (vlok) +Name[nn]=KOffice-formmal (Flake) Name[pt]=Modelo de Formas do KOffice (Flake) Name[pt_BR]=Modelo de Formas do KOffice (Flake) Name[sr]=Шаблон облика за К‑офис (Флејк) @@ -44,6 +45,7 @@ Comment[nb]=En KOffice mal for programtillegg med en form, et verktøy og en dokker (bruk ThisFormat som prosjektnavn). Comment[nds]=En Moduulvörlaag för KOffice mit en Form, en Warktüüch un en Andocker (Bruuk DitFormaat as Projektnaam.) Comment[nl]=Een sjabloonplugin voor KOffice met een vorm, een hulpmiddel en een verankering (gaarne DezeOpmaak gebruiken voor de projectnaam) +Comment[nn]=Programtillegg-mal for KOffice, med ei form, eit verktøy og ein dokk (bruk DetteFormatet for namnet på prosjektet) Comment[pt]=Um modelo de 'plugin' do KOffice com uma forma, uma ferramenta e uma área acoplável (use por favor EsteFormato como nome do projecto) Comment[pt_BR]=Um modelo de plugin do KOffice com uma forma, uma ferramenta e uma área acoplável (use por favor EsteFormato como nome do projeto) Comment[sr]=Шаблон прикључка за К‑офис са обликом, алатком и сидриштем (име пројекта треба да буде OvogOblika) diff -Nru kdesdk-4.4.2/kapptemplate/templates/C++/kofficetext/kofficetext.kdevtemplate kdesdk-4.4.5/kapptemplate/templates/C++/kofficetext/kofficetext.kdevtemplate --- kdesdk-4.4.2/kapptemplate/templates/C++/kofficetext/kofficetext.kdevtemplate 2010-03-26 17:30:28.000000000 +0000 +++ kdesdk-4.4.5/kapptemplate/templates/C++/kofficetext/kofficetext.kdevtemplate 2010-04-29 19:59:02.000000000 +0000 @@ -17,6 +17,7 @@ Name[nb]=KOffice mal for tekst-programtillegg Name[nds]=Textmoduul-Vörlaag för KOffice Name[nl]=KOffice tekst-plugin-sjabloon +Name[nn]=KOffice-mal for teksttillegg Name[pt]=Modelo de 'Plugin' de Texto do KOffice Name[pt_BR]=Modelo de 'Plugin' de Texto do KOffice Name[sr]=Шаблон текстуалног прикључка за К‑офис @@ -44,6 +45,7 @@ Comment[nb]=En KOffice mal for programtillegg som legger til nye muligheter til å endre tekst (bruk ThisFormat som prosjektnavn). Comment[nds]=En Moduulvörlaag för KOffice, mit de sik niege Mööglichkeiten för Textännern tofögen laat. (Bruuk DitFormaat as Projektnaam.) Comment[nl]=Een plugin voor KOffice met nieuwe functies voor het wijzigen van tekst(gaarne DezeOpmaak gebruiken voor de projectnaam) +Comment[nn]=Programtillegg-mal for KOffice, for nye funksjonar for endring av tekst (bruk DetteFormatet for namnet på prosjektet) Comment[pt]=Um modelo de 'plugin' do KOffice para adicionar novas funcionalidades de modificação de texto (use por favor EsteFormato como nome do projecto) Comment[pt_BR]=Um modelo de plugin do KOffice para adicionar novas funcionalidades de modificação de texto (use por favor EsteFormato como nome do projeto) Comment[sr]=Шаблон прикључка за К‑офис за додавање нових могућности мењања текста (име пројекта треба да буде OvogOblika) diff -Nru kdesdk-4.4.2/kapptemplate/templates/C++/kofficetext/kotext%{APPNAMELC}.desktop kdesdk-4.4.5/kapptemplate/templates/C++/kofficetext/kotext%{APPNAMELC}.desktop --- kdesdk-4.4.2/kapptemplate/templates/C++/kofficetext/kotext%{APPNAMELC}.desktop 2010-03-26 17:30:28.000000000 +0000 +++ kdesdk-4.4.5/kapptemplate/templates/C++/kofficetext/kotext%{APPNAMELC}.desktop 2010-04-29 19:59:02.000000000 +0000 @@ -10,6 +10,7 @@ Name[et]=%{APPNAME} plugin Name[fi]=%{APPNAME}-liitännäinen Name[fr]=Module externe %{APPNAME} +Name[ga]=Breiseán %{APPNAME} Name[gl]=Extensión para %{APPNAME} Name[hu]=%{APPNAME} plugin Name[it]=Estensione di %{APPNAME} @@ -17,6 +18,7 @@ Name[nb]=%{APPNAME}-programtillegg Name[nds]=%{APPNAME}-Moduul Name[nl]=%{APPNAME}-plugin +Name[nn]=%{APPNAME}-tillegg Name[pa]=%{APPNAME} ਪਲੱਗਇਨ Name[pt]='Plugin' do %{APPNAME} Name[pt_BR]=Plug-in do %{APPNAME} diff -Nru kdesdk-4.4.2/kapptemplate/templates/C++/ktexteditor/ktexteditor_%{APPNAMELC}.desktop kdesdk-4.4.5/kapptemplate/templates/C++/ktexteditor/ktexteditor_%{APPNAMELC}.desktop --- kdesdk-4.4.2/kapptemplate/templates/C++/ktexteditor/ktexteditor_%{APPNAMELC}.desktop 2010-03-26 17:30:27.000000000 +0000 +++ kdesdk-4.4.5/kapptemplate/templates/C++/ktexteditor/ktexteditor_%{APPNAMELC}.desktop 2010-06-25 18:39:50.000000000 +0000 @@ -3,6 +3,7 @@ Comment=%{APPNAME} Comment[ca]=%{APPNAME} Comment[ca@valencia]=%{APPNAME} +Comment[cs]=%{APPNAME} Comment[da]=%{APPNAME} Comment[de]=%{APPNAME} Comment[en_GB]=%{APPNAME} @@ -10,6 +11,7 @@ Comment[et]=%{APPNAME} Comment[fi]=%{APPNAME} Comment[fr]=%{APPNAME} +Comment[ga]=%{APPNAME} Comment[gl]=%{APPNAME} Comment[hu]=%{APPNAME} Comment[it]=%{APPNAME} @@ -17,6 +19,7 @@ Comment[nb]=%{APPNAME} Comment[nds]=%{APPNAME} Comment[nl]=%{APPNAME} +Comment[nn]=%{APPNAME} Comment[pa]=%{APPNAME} Comment[pt]=%{APPNAME} Comment[pt_BR]=%{APPNAME} @@ -73,6 +76,7 @@ GenericName=%{APPNAME} GenericName[ca]=%{APPNAME} GenericName[ca@valencia]=%{APPNAME} +GenericName[cs]=%{APPNAME} GenericName[da]=%{APPNAME} GenericName[de]=%{APPNAME} GenericName[en_GB]=%{APPNAME} @@ -80,6 +84,7 @@ GenericName[et]=%{APPNAME} GenericName[fi]=%{APPNAME} GenericName[fr]=%{APPNAME} +GenericName[ga]=%{APPNAME} GenericName[gl]=%{APPNAME} GenericName[hu]=%{APPNAME} GenericName[it]=%{APPNAME} @@ -87,6 +92,7 @@ GenericName[nb]=%{APPNAME} GenericName[nds]=%{APPNAME} GenericName[nl]=%{APPNAME} +GenericName[nn]=%{APPNAME} GenericName[pa]=%{APPNAME} GenericName[pt]=%{APPNAME} GenericName[pt_BR]=%{APPNAME} diff -Nru kdesdk-4.4.2/kapptemplate/templates/C++/ktexteditor/ktexteditor.kdevtemplate kdesdk-4.4.5/kapptemplate/templates/C++/ktexteditor/ktexteditor.kdevtemplate --- kdesdk-4.4.2/kapptemplate/templates/C++/ktexteditor/ktexteditor.kdevtemplate 2010-03-26 17:30:27.000000000 +0000 +++ kdesdk-4.4.5/kapptemplate/templates/C++/ktexteditor/ktexteditor.kdevtemplate 2010-05-28 09:43:13.000000000 +0000 @@ -17,6 +17,7 @@ Name[nb]=KTextEditor mal for programtillegg Name[nds]=KTextEditor-Moduulvörlaag Name[nl]=KTextEditor plugin-sjabloon +Name[nn]=KTextEditor-mal for programtillegg Name[pa]=ਕੇਟੈਕਸਟਐਡੀਟਰ ਪਲੱਗਇਨ ਟੈਪਲੇਟ Name[pt]=Modelo de 'Plugin' do KTextEditor Name[pt_BR]=Modelo de 'Plugin' do KTextEditor @@ -25,6 +26,7 @@ Name[sr@ijekavianlatin]=Šablon priključka za KTextEditor Name[sr@latin]=Šablon priključka za KTextEditor Name[sv]=Ktexteditor-insticksmodulmall +Name[tr]=KTextEditor Eklenti Şablonu Name[uk]=Шаблон додатка KTextEditor Name[x-test]=xxKTextEditor Plugin Templatexx Name[zh_CN]=KTextEditor 插件模板 @@ -45,6 +47,7 @@ Comment[nb]=En KTextEditor-mal for programtillegg som utfører spesielle handlinger på tekst i KWrite, Kate, KDevelop osv. (bruk ThisFormat som prosjektnavn). Comment[nds]=En KTextEditor-Moduulvörlaag mit de sik in KWrite, Kate, KDevelop usw. besünner Textakschonen utföhren laat. (Bruuk DitFormaat as Projektnaam.) Comment[nl]=Een plugin-sjabloon voor KTextEditor voor het doen van speciale tekstbewerkingen in KWrite, Kate, KDevelop etc. (gaarne DezeOpmaak gebruiken voor de projectnaam) +Comment[nn]=Programtillegg-mal for KTextEditor, for tekstoperasjonar i KWrite, Kate, KDevelop osv. (bruk DetteFormatet for namnet på prosjektet) Comment[pt]=Um modelo de 'plugin' do KTextEditor para efectuar operações especiais sobre o texto no KWrite, Kate, KDevelop, etc. (use por favor EsteFormato como nome do projecto) Comment[pt_BR]=Um modelo de 'plugin' do KTextEditor para efetuar operações especiais sobre o texto no KWrite, Kate, KDevelop, etc. (use por favor EsteFormato como nome do projeto) Comment[sr]=Шаблон прикључка за KTextEditor за извођење специјалних поступака у К‑писању, Кејт, К‑девелопу, итд. (име пројекта треба да буде OvogOblika) diff -Nru kdesdk-4.4.2/kapptemplate/templates/C++/qmake_qt4guiapp/%{PROJECTDIRNAME}.kdev4 kdesdk-4.4.5/kapptemplate/templates/C++/qmake_qt4guiapp/%{PROJECTDIRNAME}.kdev4 --- kdesdk-4.4.2/kapptemplate/templates/C++/qmake_qt4guiapp/%{PROJECTDIRNAME}.kdev4 2008-05-21 08:33:33.000000000 +0000 +++ kdesdk-4.4.5/kapptemplate/templates/C++/qmake_qt4guiapp/%{PROJECTDIRNAME}.kdev4 2010-04-29 19:59:03.000000000 +0000 @@ -1,4 +1,4 @@ [Project] -Manager=KDevQMakeManager +Manager=KDevCustomMakeManager Name=%{APPNAME} VersionControl=%{VERSIONCONTROLPLUGIN} diff -Nru kdesdk-4.4.2/kapptemplate/templates/Python/pykde4app/pykde4app.kdevtemplate kdesdk-4.4.5/kapptemplate/templates/Python/pykde4app/pykde4app.kdevtemplate --- kdesdk-4.4.2/kapptemplate/templates/Python/pykde4app/pykde4app.kdevtemplate 2010-02-04 09:50:10.000000000 +0000 +++ kdesdk-4.4.5/kapptemplate/templates/Python/pykde4app/pykde4app.kdevtemplate 2010-05-28 09:43:06.000000000 +0000 @@ -44,7 +44,7 @@ Comment[ca]=Plantilla PyKDE4 - necessita el PyKDE4 Comment[ca@valencia]=Plantilla PyKDE4 - necessita el PyKDE4 Comment[da]=PyKDE4-skabelon - kræver PyKDE4 -Comment[de]=Vorlage für PyKDE4 - benötigt PyKDE4 +Comment[de]=Vorlage für PyKDE4 – benötigt PyKDE4 Comment[el]=Πρότυπο του PyKDE4 - απαιτείται το PyKDE4 Comment[en_GB]=PyKDE4 template - needs PyKDE4 Comment[es]=Plantilla PyKDE4 (necesita PyKDE4) diff -Nru kdesdk-4.4.2/kapptemplate/templates/Python/pyqt4app/pyqt4app.kdevtemplate kdesdk-4.4.5/kapptemplate/templates/Python/pyqt4app/pyqt4app.kdevtemplate --- kdesdk-4.4.2/kapptemplate/templates/Python/pyqt4app/pyqt4app.kdevtemplate 2010-02-04 09:50:11.000000000 +0000 +++ kdesdk-4.4.5/kapptemplate/templates/Python/pyqt4app/pyqt4app.kdevtemplate 2010-05-28 09:43:07.000000000 +0000 @@ -44,7 +44,7 @@ Comment[ca]=Plantilla PyQt que usa un fitxer de Designer - necessita el PyQt4 Comment[ca@valencia]=Plantilla PyQt que usa un fitxer de Designer - necessita el PyQt4 Comment[da]=PyQt-skabelon som bruger en Designer-fil - kræver PyQt4 -Comment[de]=Vorlage für PyQt mit Qt-Designer-Datei - benötigt PyQt4 +Comment[de]=Vorlage für PyQt mit Qt-Designer-Datei – benötigt PyQt4 Comment[el]=Πρότυπο της PyQt4 που χρησιμοποιεί αρχείο του Designer - απαιτείται η PyQt4 Comment[en_GB]=PyQt template using a Designer file - needs PyQt4 Comment[es]=Plantilla PyQt que usa un archivo de Designer (necesita PyQt4) diff -Nru kdesdk-4.4.2/kapptemplate/templates/ruby/kderubyapp/kderubyapp.kdevtemplate kdesdk-4.4.5/kapptemplate/templates/ruby/kderubyapp/kderubyapp.kdevtemplate --- kdesdk-4.4.2/kapptemplate/templates/ruby/kderubyapp/kderubyapp.kdevtemplate 2010-02-04 09:50:12.000000000 +0000 +++ kdesdk-4.4.5/kapptemplate/templates/ruby/kderubyapp/kderubyapp.kdevtemplate 2010-05-28 09:43:10.000000000 +0000 @@ -42,7 +42,7 @@ Comment[ca]=Plantilla ruby senzilla del KDE4, hereva del XMLGuiWindow - necessita el «korundum4» Comment[ca@valencia]=Plantilla ruby senzilla del KDE4, hereva del XMLGuiWindow - necessita el «korundum4» Comment[da]=Simpel Ruby-skabelon til KDE 4. Den efterfølger XMLGuiWindows - kræver korundum4 -Comment[de]=Vorlage für einfache KDE-4-Ruby-Anwendung. Abgeleitet von XMLGuiWindow - benötigt Korundum 4 +Comment[de]=Vorlage für einfache KDE-4-Ruby-Anwendung. Abgeleitet von XMLGuiWindow – benötigt Korundum 4 Comment[el]=Απλό πρότυπο του KDE4 Ruby που προέρχεται από το XMLGuiWindow - απαιτείται το korundum4 Comment[en_GB]=KDE4 simple ruby template, inherits from XMLGuiWindow - needs korundum4 Comment[es]=Sencilla plantilla Ruby para KDE4, que hereda de XMLGuiWindow (necesita korundum4) diff -Nru kdesdk-4.4.2/kate/app/kateviewdocumentproxymodel.cpp kdesdk-4.4.5/kate/app/kateviewdocumentproxymodel.cpp --- kdesdk-4.4.2/kate/app/kateviewdocumentproxymodel.cpp 2010-01-06 17:00:28.000000000 +0000 +++ kdesdk-4.4.5/kate/app/kateviewdocumentproxymodel.cpp 2010-05-28 09:43:01.000000000 +0000 @@ -636,7 +636,7 @@ foreach( int row, m_mapToSource ) { QString key=data(sourceModel()->index(row, 0), m_sortRole).toString(); if (key.isEmpty()) key=QString("kate-internal-untitled:/%1").arg(row); - sorted.insert(key, m_mapToSource[row]); + sorted.insertMulti(key, m_mapToSource[row]); } m_mapToSource = sorted.values(); } diff -Nru kdesdk-4.4.2/kate/app/kateviewmanager.cpp kdesdk-4.4.5/kate/app/kateviewmanager.cpp --- kdesdk-4.4.2/kate/app/kateviewmanager.cpp 2010-03-26 17:30:25.000000000 +0000 +++ kdesdk-4.4.5/kate/app/kateviewmanager.cpp 2010-05-28 09:43:01.000000000 +0000 @@ -647,6 +647,7 @@ // save current splitter size, as the removal of currentSplitter looses the info QList parentSizes = parentSplitter->sizes(); parentSplitter->insertWidget (index, currentSplitter->widget (0)); + currentSplitter->hide(); // see bug #232140 delete currentSplitter; // now restore the sizes again parentSplitter->setSizes(parentSizes); diff -Nru kdesdk-4.4.2/kate/plugins/filebrowser/katefilebrowserconfig.cpp kdesdk-4.4.5/kate/plugins/filebrowser/katefilebrowserconfig.cpp --- kdesdk-4.4.2/kate/plugins/filebrowser/katefilebrowserconfig.cpp 2009-08-20 02:42:58.000000000 +0000 +++ kdesdk-4.4.5/kate/plugins/filebrowser/katefilebrowserconfig.cpp 2010-05-28 09:43:02.000000000 +0000 @@ -63,7 +63,7 @@ //BEGIN KateFileBrowserConfigPage KateFileBrowserConfigPage::KateFileBrowserConfigPage( QWidget *parent, const char *, KateFileBrowser *kfb ) : Kate::PluginConfigPage( parent ), - fileBrowser( kfb ), + fileBrowser( kfb ), // NOTE: fileBrowser might be 0, if createView was not called for the plugin yet... m_changed( false ) { QVBoxLayout *lo = new QVBoxLayout( this ); @@ -110,7 +110,8 @@ l << aItem->idstring(); } config.writeEntry( "toolbar actions", l ); - fileBrowser->setupToolbar(); + if (fileBrowser) + fileBrowser->setupToolbar(); } void KateFileBrowserConfigPage::reset() @@ -137,15 +138,17 @@ << "show hidden" /*<< "view menu" << "properties"*/ << "bookmarks" << "sync_dir" << "configure"; QRegExp re("&(?=[^&])"); - QAction *ac; + QAction *ac = 0; QListWidget *lb; for ( QStringList::Iterator it = allActions.begin(); it != allActions.end(); ++it ) { lb = l.contains( *it ) ? acSel->selectedListWidget() : acSel->availableListWidget(); - if ( *it == "bookmarks" || *it == "sync_dir" || *it == "configure" ) - ac = fileBrowser->actionCollection()->action( (*it).toLatin1().constData() ); - else - ac = fileBrowser->dirOperator()->actionCollection()->action( (*it).toLatin1().constData() ); + if (fileBrowser) { + if ( *it == "bookmarks" || *it == "sync_dir" || *it == "configure" ) + ac = fileBrowser->actionCollection()->action( (*it).toLatin1().constData() ); + else + ac = fileBrowser->dirOperator()->actionCollection()->action( (*it).toLatin1().constData() ); + } if ( ac ) { QString text = ac->text().remove( re ); diff -Nru kdesdk-4.4.2/kate/plugins/filebrowser/katefilebrowser.cpp kdesdk-4.4.5/kate/plugins/filebrowser/katefilebrowser.cpp --- kdesdk-4.4.2/kate/plugins/filebrowser/katefilebrowser.cpp 2010-02-26 18:35:25.000000000 +0000 +++ kdesdk-4.4.5/kate/plugins/filebrowser/katefilebrowser.cpp 2010-05-28 09:43:03.000000000 +0000 @@ -74,7 +74,7 @@ setFocusProxy(m_dirOperator); connect(m_dirOperator, SIGNAL(viewChanged(QAbstractItemView *)), this, SLOT(selectorViewChanged(QAbstractItemView *))); - connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)), + connect(m_urlNavigator, SIGNAL(returnPressed()), m_dirOperator, SLOT(setFocus())); // now all actions exist in dir operator and we can use them in the toolbar setupActions(); diff -Nru kdesdk-4.4.2/kate/plugins/filebrowser/katefilebrowserplugin.cpp kdesdk-4.4.5/kate/plugins/filebrowser/katefilebrowserplugin.cpp --- kdesdk-4.4.2/kate/plugins/filebrowser/katefilebrowserplugin.cpp 2009-08-20 02:42:58.000000000 +0000 +++ kdesdk-4.4.5/kate/plugins/filebrowser/katefilebrowserplugin.cpp 2010-05-28 09:43:03.000000000 +0000 @@ -39,6 +39,7 @@ //BEGIN KateFileBrowserPlugin KateFileBrowserPlugin::KateFileBrowserPlugin(QObject* parent, const QList&) : Kate::Plugin ((Kate::Application*)parent) + , m_fileBrowser(0) { } diff -Nru kdesdk-4.4.2/kate/plugins/kttsd/kate_kttsd.desktop kdesdk-4.4.5/kate/plugins/kttsd/kate_kttsd.desktop --- kdesdk-4.4.2/kate/plugins/kttsd/kate_kttsd.desktop 2010-03-26 17:30:25.000000000 +0000 +++ kdesdk-4.4.5/kate/plugins/kttsd/kate_kttsd.desktop 2010-04-29 19:59:02.000000000 +0000 @@ -16,6 +16,7 @@ Name[et]=KTextEditori KTTSD plugin Name[fi]=KTextEditor-KTTSD-liitännäinen Name[fr]=Module KTTSD pour KTextEditor +Name[ga]=Breiseán KTTSD KTextEditor Name[gl]=Extensión de KTTSD para KTextEditor Name[hu]=KTextEditor KTTSD Plugin Name[it]=Estensione KTTSD di KTextEditor @@ -49,6 +50,7 @@ Comment[es]=Añade una entrada de menú para leer el texto Comment[et]=Lisab menüükirje teksti kõnelemiseks Comment[fr]=Ajoute une ligne de menu pour énoncer le texte +Comment[ga]=Cuir iontráil sa roghchlár chun an téacs a léamh Comment[gl]=Engade unha entrada no menú para falar o texto Comment[hu]=Egy bejegyzés hozzáadása a szöveg elbeszéléséhez Comment[it]=Aggiunge una voce del menu per pronunciare il testo diff -Nru kdesdk-4.4.2/kate/plugins/mailfiles/katemailfilesplugin.desktop kdesdk-4.4.5/kate/plugins/mailfiles/katemailfilesplugin.desktop --- kdesdk-4.4.2/kate/plugins/mailfiles/katemailfilesplugin.desktop 2010-03-26 17:30:26.000000000 +0000 +++ kdesdk-4.4.5/kate/plugins/mailfiles/katemailfilesplugin.desktop 2010-04-29 19:59:02.000000000 +0000 @@ -56,6 +56,7 @@ Comment[et]=Failide saatmine e-postiga Comment[fi]=Lähetä tiedostoja sähköpostitse Comment[fr]=Envoie des fichiers par courrier électronique +Comment[ga]=Seol comhaid trí ríomhphost Comment[gl]=Envía os ficheiros por correo electrónico Comment[hu]=Fájlok küldése email-en keresztül Comment[it]=Invia file per posta elettronica diff -Nru kdesdk-4.4.2/kate/plugins/snippets_tng/editor/data/katesnippetstng_editor.desktop kdesdk-4.4.5/kate/plugins/snippets_tng/editor/data/katesnippetstng_editor.desktop --- kdesdk-4.4.2/kate/plugins/snippets_tng/editor/data/katesnippetstng_editor.desktop 2010-03-26 17:30:27.000000000 +0000 +++ kdesdk-4.4.5/kate/plugins/snippets_tng/editor/data/katesnippetstng_editor.desktop 2010-04-29 19:59:02.000000000 +0000 @@ -15,6 +15,7 @@ GenericName[nb]=TNG datafilredigering for Kate tekstbiter GenericName[nds]=Verbetert Editor för Kate-Snippels GenericName[nl]=Bewerker van Kate-tekstfragmenten TNG-gegevensbestand +GenericName[nn]=Rediger Kate-bitar i TNG-format GenericName[pt]=Editor de ficheiros de dados TNG dos excertos do Kate GenericName[pt_BR]=Editor de arquivos de dados TNG dos trechos de texto do Kate GenericName[ru]=Редактор файлов данных TNG фрагментов текста Kate @@ -44,6 +45,7 @@ Name[nb]=TNG datafilredigering for Kate tekstbiter Name[nds]=Verbetert Editor för Kate-Snippels Name[nl]=Bewerker van Kate-tekstfragmenten TNG-gegevensbestand +Name[nn]=Rediger Kate-bitar i TNG-format Name[pt]=Editor de ficheiros de dados TNG dos excertos do Kate Name[pt_BR]=Editor de arquivos de dados TNG dos trechos de texto do Kate Name[ru]=Редактор файлов данных TNG фрагментов текста Kate diff -Nru kdesdk-4.4.2/kate/plugins/snippets_tng/katesnippets_tngplugin.desktop kdesdk-4.4.5/kate/plugins/snippets_tng/katesnippets_tngplugin.desktop --- kdesdk-4.4.2/kate/plugins/snippets_tng/katesnippets_tngplugin.desktop 2010-03-26 17:30:27.000000000 +0000 +++ kdesdk-4.4.5/kate/plugins/snippets_tng/katesnippets_tngplugin.desktop 2010-04-29 19:59:02.000000000 +0000 @@ -13,6 +13,7 @@ Name[et]=Kate jupid Name[fi]=Kate-palaset Name[fr]=Fragments de code pour Kate +Name[ga]=Blúirí Kate Name[gl]=Fragmentos para Kate Name[hu]=Kate szövegelemek Name[it]=Frammenti di Kate @@ -20,6 +21,7 @@ Name[nb]=Kate tekstbiter Name[nds]=Kate-Snippels Name[nl]=Kate-fragmenten +Name[nn]=Kate-tekstbitar Name[pa]=ਕੇਟ ਸਨਿੱਪਟ Name[pt]=Excertos do Kate Name[pt_BR]=Trechos do Kate @@ -49,6 +51,7 @@ Comment[nb]=Programtillegg for tekstbiter med støtte for kodefullføring Comment[nds]=Snippelsmoduul mit Ünnerstütten för Kodekompletteren Comment[nl]=Plugin voor fragmenten met ondersteuning voor code aanvullen +Comment[nn]=Tekstbit-tillegg med autofullføring av programkode Comment[pt]='Plugin' de excertos com suporte para a completação de código Comment[pt_BR]=Plugin de trechos de texto com suporte para o completamento de código Comment[ru]=Модуль фрагментов текста с поддержкой дополнения кода diff -Nru kdesdk-4.4.2/kioslave/svn/svnhelper/subversion.desktop kdesdk-4.4.5/kioslave/svn/svnhelper/subversion.desktop --- kdesdk-4.4.2/kioslave/svn/svnhelper/subversion.desktop 2010-01-31 19:34:13.000000000 +0000 +++ kdesdk-4.4.5/kioslave/svn/svnhelper/subversion.desktop 2010-04-29 19:59:03.000000000 +0000 @@ -446,7 +446,7 @@ Comment[fa]=گذاشتن پوشه در مخزن موجود جهت قراردادن آن تحت کنترل بازبینی. Comment[fi]=Laita kansio versionhallintaan viemällä se olemassa olevaan versionhallintavarastoon. Comment[fr]=Introduit le dossier dans un référentiel existant pour le placer sous contrôle de versions. -Comment[ga]=Cuir fillteán isteach i stór at ann más mian leat a chuid athruithe a rialú. +Comment[ga]=Cuir fillteán isteach i stór atá ann más mian leat a chuid athruithe a rialú. Comment[gl]=Pon o cartafol nun repositorio existente para pólo baixo control de versións. Comment[hu]=Könyvtár felvétele a verziókövető rendszer felügyelete alá. Comment[is]=Setja möppu í geymslu sem finnst fyrir til að setja hana undir breytingarstjórn. diff -Nru kdesdk-4.4.2/lokalize/src/cataloglistview/cataloglistview.cpp kdesdk-4.4.5/lokalize/src/cataloglistview/cataloglistview.cpp --- kdesdk-4.4.2/lokalize/src/cataloglistview/cataloglistview.cpp 2009-11-21 09:44:52.000000000 +0000 +++ kdesdk-4.4.5/lokalize/src/cataloglistview/cataloglistview.cpp 2010-05-28 09:43:14.000000000 +0000 @@ -101,6 +101,7 @@ m_browser->setSortingEnabled(true); m_browser->sortByColumn(0, Qt::AscendingOrder); m_browser->setWordWrap(true); + m_browser->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel); KConfig config; @@ -123,7 +124,9 @@ void CatalogView::slotNewEntryDisplayed(const DocPosition& pos) { - m_browser->setCurrentIndex(m_proxyModel->mapFromSource(m_model->index(pos.entry,0))); + QModelIndex item=m_proxyModel->mapFromSource(m_model->index(pos.entry,0)); + m_browser->setCurrentIndex(item); + m_browser->scrollTo(item/*,QAbstractItemView::PositionAtCenter*/); } void CatalogView::setFilterRegExp() diff -Nru kdesdk-4.4.2/lokalize/src/editortab.cpp kdesdk-4.4.5/lokalize/src/editortab.cpp --- kdesdk-4.4.2/lokalize/src/editortab.cpp 2009-12-17 16:37:55.000000000 +0000 +++ kdesdk-4.4.5/lokalize/src/editortab.cpp 2010-05-28 09:43:14.000000000 +0000 @@ -310,13 +310,13 @@ TM::TMView* _tmView = new TM::TMView(this,m_catalog,tmactions); addDockWidget(Qt::BottomDockWidgetArea, _tmView); tm->addAction( QLatin1String("showtmqueryview_action"), _tmView->toggleViewAction() ); - connect (this,SIGNAL(signalNewEntryDisplayed(DocPosition)),_tmView,SLOT(slotNewEntryDisplayed(DocPosition))); connect (_tmView,SIGNAL(refreshRequested()),m_view,SLOT(gotoEntry()),Qt::QueuedConnection); connect (_tmView,SIGNAL(refreshRequested()),this,SLOT(msgStrChanged()),Qt::QueuedConnection); connect (_tmView,SIGNAL(textInsertRequested(QString)),m_view,SLOT(insertTerm(QString))); connect (_tmView,SIGNAL(fileOpenRequested(KUrl,QString,QString)),this,SIGNAL(fileOpenRequested(KUrl,QString,QString))); connect (this,SIGNAL(fileAboutToBeClosed()),m_catalog,SLOT(flushUpdateDBBuffer())); connect (this,SIGNAL(signalNewEntryDisplayed(DocPosition)),m_catalog,SLOT(flushUpdateDBBuffer())); + connect (this,SIGNAL(signalNewEntryDisplayed(DocPosition)),_tmView,SLOT(slotNewEntryDisplayed(DocPosition))); //do this after flushUpdateDBBuffer QVector gactions(GLOSSARY_SHORTCUTS); Qt::Key glist[GLOSSARY_SHORTCUTS]= diff -Nru kdesdk-4.4.2/lokalize/src/lokalize.desktop kdesdk-4.4.5/lokalize/src/lokalize.desktop --- kdesdk-4.4.2/lokalize/src/lokalize.desktop 2010-03-26 17:30:28.000000000 +0000 +++ kdesdk-4.4.5/lokalize/src/lokalize.desktop 2010-04-29 19:59:03.000000000 +0000 @@ -60,6 +60,7 @@ GenericName[et]=Tõlkemäluga tõlkimisrakendus GenericName[fi]=Tietokoneavusteinen käännösjärjestelmä GenericName[fr]=Système de traduction assistée par ordinateur +GenericName[ga]=Córas Aistriúcháin Ríomhchuidithe GenericName[gl]=Sistema de tradución asistida por ordenador GenericName[hu]=Számítógép támogatott fordítórendszer GenericName[it]=Sistema di traduzione assistito dal computer @@ -68,7 +69,7 @@ GenericName[nb]=Dataassistert oversettelsessystem GenericName[nds]=Reeknerünnerstütt Översettensysteem GenericName[nl]=Computerondersteund vertaalsysteem -GenericName[nn]=Dataassistert omsetjingssystem +GenericName[nn]=Dataassistert omsetjing GenericName[pa]=ਕੰਪਿਊਟਰ ਅਨੁਵਾਦ ਸਿਸਟਮ GenericName[pl]=System tłumaczeń wspomaganych komputerowo GenericName[pt]=Sistema de Traduções Auxiliado pelo Computador diff -Nru kdesdk-4.4.2/lokalize/src/lokalizemainwindow.cpp kdesdk-4.4.5/lokalize/src/lokalizemainwindow.cpp --- kdesdk-4.4.2/lokalize/src/lokalizemainwindow.cpp 2010-03-26 17:30:28.000000000 +0000 +++ kdesdk-4.4.5/lokalize/src/lokalizemainwindow.cpp 2010-05-28 09:43:14.000000000 +0000 @@ -458,7 +458,9 @@ m_openRecentProjectAction=new KRecentFilesAction(i18nc("@action:inmenu","Open recent project"),this); action = proj->addAction("project_open_recent",m_openRecentProjectAction); connect(m_openRecentProjectAction,SIGNAL(urlSelected(KUrl)),this,SLOT(openProject(KUrl))); - connect(Project::instance(),SIGNAL(loaded()), this,SLOT(projectLoaded())); + + //Qt::QueuedConnection: defer until event loop is running to eliminate QWidgetPrivate::showChildren(bool) startup crash + connect(Project::instance(),SIGNAL(loaded()), this,SLOT(projectLoaded()), Qt::QueuedConnection); setupGUI(Default,"lokalizemainwindowui.rc"); @@ -528,7 +530,7 @@ while (--i>=0) { //if (editors.at(i)==m_projectSubWindow) - if (!qobject_cast(editors.at(i)->widget())) + if (!editors.at(i) || !qobject_cast(editors.at(i)->widget())) continue; if (editors.at(i)==activeSW) activeSWIndex=files.size(); @@ -580,7 +582,11 @@ QString path=stateGroup.readEntry("Project",QString()); if (Project::instance()->isLoaded() || path.isEmpty()) - projectLoaded(); //we weren't existing yet when the signal was emitted + { + //1. we weren't existing yet when the signal was emitted + //2. defer until event loop is running to eliminate QWidgetPrivate::showChildren(bool) startup crash + QTimer::singleShot(0, this, SLOT(projectLoaded())); + } else Project::instance()->load(path); } diff -Nru kdesdk-4.4.2/lokalize/src/tm/jobs.cpp kdesdk-4.4.5/lokalize/src/tm/jobs.cpp --- kdesdk-4.4.2/lokalize/src/tm/jobs.cpp 2009-11-21 09:44:52.000000000 +0000 +++ kdesdk-4.4.5/lokalize/src/tm/jobs.cpp 2010-04-29 19:59:03.000000000 +0000 @@ -21,8 +21,6 @@ **************************************************************************** */ -#undef KDE_NO_DEBUG_OUTPUT - #include "jobs.h" #include "catalog.h" #include "project.h" @@ -50,6 +48,10 @@ #define TM_SEPARATOR '\b' #define TM_NOTAPPROVED 0x04 +#ifndef KDE_NO_DEBUG_OUTPUT +#define KDE_NO_DEBUG_OUTPUT +#endif + /** * splits string into words, removing any markup * @@ -132,7 +134,7 @@ static void addToIndex(qlonglong sourceId, QString sourceString, QRegExp& rxClean1, const QString& accel, QSqlDatabase& db) { - kDebug(TM_AREA)<isApproved(pos.entry)) { ///m_catalog->push(new DelTextCmd(m_catalog,pos,m_catalog->msgstr(pos))); - removeTargetSubstring(m_catalog, pos, 0, m_catalog->sourceWithTags(pos).string.size()); + removeTargetSubstring(m_catalog, pos, 0, m_catalog->targetWithTags(pos).string.size()); if ( ctxtMatches || !(m_markAsFuzzy||forceFuzzy) ) SetStateCmd::push(m_catalog,pos,true); } diff -Nru kdesdk-4.4.2/lokalize/src/xlifftextedit.cpp kdesdk-4.4.5/lokalize/src/xlifftextedit.cpp --- kdesdk-4.4.2/lokalize/src/xlifftextedit.cpp 2010-02-26 18:35:34.000000000 +0000 +++ kdesdk-4.4.5/lokalize/src/xlifftextedit.cpp 2010-06-25 18:39:55.000000000 +0000 @@ -8,7 +8,7 @@ published by the Free Software Foundation; either version 2 of the License or (at your option) version 3 or any later version accepted by the membership of KDE e.V. (or its successor approved - by the membership of KDE e.V.), which shall act as a proxy + by the membership of KDE e.V.), which shall act as a proxy defined in Section 14 of version 3 of the license. This program is distributed in the hope that it will be useful, @@ -80,7 +80,7 @@ public: MyCompletionBox(QWidget* p):KCompletionBox(p){} QSize sizeHint() const; - + bool eventFilter(QObject* , QEvent* ); //reimplemented to deliver more keypresses to XliffTextEdit }; @@ -154,15 +154,33 @@ { connect (document(), SIGNAL(contentsChange(int,int,int)), this, SLOT(contentsChanged(int,int,int))); connect (this,SIGNAL(cursorPositionChanged()), this, SLOT(emitCursorPositionChanged())); - m_highlighter->setCurrentLanguage(Project::instance()->targetLangCode()); } - else - m_highlighter->setCurrentLanguage(Project::instance()->sourceLangCode()); + projectConfigChanged(); + connect (Project::instance(),SIGNAL(configChanged()), this, SLOT(projectConfigChanged())); setSpellInterface(new XliffTextEditSpellInterface(m_highlighter)); setHighlighter(m_highlighter); } +void XliffTextEdit::projectConfigChanged() +{ + if (m_part==DocPosition::Target) + { + m_highlighter->setCurrentLanguage(Project::instance()->targetLangCode()); + + //"i use an english locale while translating kde pot files from english to hebrew" + QLocale targetLocale(Project::instance()->targetLangCode()); + Qt::LayoutDirection targetLanguageDirection=Qt::LeftToRight; + if (targetLocale.language()==QLocale::Arabic || targetLocale.language()==QLocale::Hebrew + || targetLocale.language()==QLocale::Urdu || targetLocale.language()==QLocale::Persian + || targetLocale.language()==QLocale::Pashto) + targetLanguageDirection=Qt::RightToLeft; + + setLayoutDirection(targetLanguageDirection); + } + else + m_highlighter->setCurrentLanguage(Project::instance()->sourceLangCode()); +} void XliffTextEdit::reflectApprovementState() { @@ -228,7 +246,7 @@ else setContent(catalogString,refStr.string.isEmpty()?m_catalog->sourceWithTags(docPosition):refStr); connect (document(), SIGNAL(contentsChange(int,int,int)), this, SLOT(contentsChanged(int,int,int))); - + _oldMsgstrAscii=document()->toPlainText(); //BEGIN pos @@ -470,7 +488,7 @@ //kWarning()<<"char"<push(new InsTextCmd(m_catalog,pos,addedText)); - + } /* TODO @@ -486,7 +504,7 @@ // for mergecatalog (remove entry from index) // and for statusbar emit contentsModified(m_currentPos); - + if (charsAdded==1) doCompletion(offset+1); @@ -743,8 +761,11 @@ { if (m_completionBox&&m_completionBox->isVisible()) { + if (m_completionBox->currentItem()) + completionActivated(m_completionBox->currentItem()->text()); + else + kWarning()<<"avoided a crash. a case for bug 238835!"; m_completionBox->hide(); - completionActivated(m_completionBox->currentItem()->text()); return; } QString str=toPlainText(); @@ -910,7 +931,7 @@ // //try harder // if (--pos>=0 && str.string.at(pos)==TAGRANGE_IMAGE_SYMBOL) // { -// +// // } return -1; @@ -1054,7 +1075,7 @@ const QStringList& suggestions=m_highlighter->suggestionsForWord(wordSelectCursor.selectedText()); if (suggestions.isEmpty()) return; - + m_catalog->beginMacro(i18nc("@item Undo action item","Replace text")); wordSelectCursor.insertText(suggestions.first()); m_catalog->endMacro(); @@ -1260,7 +1281,7 @@ } QStringList s=CompletionStorage::instance()->makeCompletion(target.mid(sp+1,len)); - + if (!m_completionBox) { m_completionBox=new MyCompletionBox(this); diff -Nru kdesdk-4.4.2/lokalize/src/xlifftextedit.h kdesdk-4.4.5/lokalize/src/xlifftextedit.h --- kdesdk-4.4.2/lokalize/src/xlifftextedit.h 2009-12-31 13:28:44.000000000 +0000 +++ kdesdk-4.4.5/lokalize/src/xlifftextedit.h 2010-05-28 09:43:14.000000000 +0000 @@ -90,6 +90,7 @@ //for Undo/Redo tracking void contentsChanged(int position,int charsRemoved,int charsAdded); void completionActivated(const QString&); + void projectConfigChanged(); signals: void toggleApprovementRequested();