rev 6112 - in trunk/packages/koffice/debian: . patches
Isaac Clerencia
isaac at alioth.debian.org
Thu May 10 06:55:24 UTC 2007
Author: isaac
Date: 2007-05-10 06:55:21 +0000 (Thu, 10 May 2007)
New Revision: 6112
Added:
trunk/packages/koffice/debian/kexi.docs
trunk/packages/koffice/debian/patches/01_koffice_branch_r662493.diff
Removed:
trunk/packages/koffice/debian/patches/28_libwv2.diff
Modified:
trunk/packages/koffice/debian/changelog
trunk/packages/koffice/debian/control
trunk/packages/koffice/debian/karbon.install
trunk/packages/koffice/debian/kchart.install
trunk/packages/koffice/debian/kexi.install
trunk/packages/koffice/debian/kformula.install
trunk/packages/koffice/debian/koffice-data.install
trunk/packages/koffice/debian/koshell.install
trunk/packages/koffice/debian/kplato.install
trunk/packages/koffice/debian/kpresenter-data.install
trunk/packages/koffice/debian/krita-data.install
trunk/packages/koffice/debian/krita.install
trunk/packages/koffice/debian/kspread.install
trunk/packages/koffice/debian/kugar.install
trunk/packages/koffice/debian/kword-data.install
trunk/packages/koffice/debian/patches/98_buildprep.diff
Log:
koffice 1.6.2-1
Modified: trunk/packages/koffice/debian/changelog
===================================================================
--- trunk/packages/koffice/debian/changelog 2007-05-09 21:46:29 UTC (rev 6111)
+++ trunk/packages/koffice/debian/changelog 2007-05-10 06:55:21 UTC (rev 6112)
@@ -1,3 +1,22 @@
+koffice (1:1.6.2-1) unstable; urgency=low
+
+ * New upstream release
+ * Added dcraw in krita's Recommends, closes: #393634
+ * No longer recommend unexistant package openoffice.org-mimelnk,
+ closes: #376919
+ * Upstream branch pull, including fixes to have kexi building against
+ the new libpqxx, closes: #420477
+ * Updated *.install and *.docs to reflect new Krita plugins, .desktop files
+ moved to /usr/share/applications/kde/ and other small changes
+
+ -- Isaac Clerencia <isaac at debian.org> Wed, 28 Feb 2007 08:30:28 +0100
+
+koffice (1:1.6.1-2) unstable; urgency=low
+
+ * Fix crash when writing an URL in kword, closes: #406590
+
+ -- Isaac Clerencia <isaac at debian.org> Fri, 12 Jan 2007 09:27:16 +0100
+
koffice (1:1.6.1-1) unstable; urgency=low
* New upstream release
Modified: trunk/packages/koffice/debian/control
===================================================================
--- trunk/packages/koffice/debian/control 2007-05-09 21:46:29 UTC (rev 6111)
+++ trunk/packages/koffice/debian/control 2007-05-10 06:55:21 UTC (rev 6112)
@@ -2,8 +2,8 @@
Section: kde
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Ben Burton <bab at debian.org>, Luk Claes <luk at debian.org>, Isaac Clerencia <isaac at debian.org>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0), autotools-dev, binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, flex, kdelibs4-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libgraphicsmagick1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0-1), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient15-dev, sharutils
+Uploaders: Ben Burton <bab at debian.org>, Luk Claes <luk at debian.org>, Isaac Clerencia <isaac at debian.org>, Christopher Martin <chrsmrtn at debian.org>
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0), autotools-dev, binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, flex, kdelibs4-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libgraphicsmagick1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0-1), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient15-dev, sharutils, bzip2
Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, kdelibs4-doc
Standards-Version: 3.6.2
@@ -186,6 +186,7 @@
Architecture: any
Section: kde
Depends: ${shlibs:Depends}, krita-data (>> ${KDE-Version3}), krita-data (<< ${KDE-Next-Version3}), koffice-libs (<< ${KDE-Next-Version3})
+Recommends: dcraw
Suggests: khelpcenter, koffice-doc-html
Description: a pixel-based image manipulation program for the KDE Office Suite
Krita is a painting and image editing application for KOffice. Krita contains
@@ -289,7 +290,6 @@
Package: koffice-data
Architecture: all
Section: libs
-Recommends: openoffice.org-mimelnk
Suggests: khelpcenter, koffice-doc-html
Replaces: koffice-libs (<< 1:1.2.90-0), kugar (<< 1:1.2.90-0), kexi (<< 1:1.4.88-1)
Description: common shared data for the KDE Office Suite
Modified: trunk/packages/koffice/debian/karbon.install
===================================================================
--- trunk/packages/koffice/debian/karbon.install 2007-05-09 21:46:29 UTC (rev 6111)
+++ trunk/packages/koffice/debian/karbon.install 2007-05-10 06:55:21 UTC (rev 6112)
@@ -45,7 +45,7 @@
debian/tmp/usr/lib/kde3/libwmfexport.so
debian/tmp/usr/lib/kde3/libwmfimport.la
debian/tmp/usr/lib/kde3/libwmfimport.so
-debian/tmp/usr/share/applnk/Office/karbon.desktop
+debian/tmp/usr/share/applications/kde/karbon.desktop
debian/tmp/usr/share/apps/karbon
debian/tmp/usr/share/apps/konqueror/servicemenus/karbon_konqi.desktop
debian/tmp/usr/share/icons/hicolor/16x16/apps/karbon.png
Modified: trunk/packages/koffice/debian/kchart.install
===================================================================
--- trunk/packages/koffice/debian/kchart.install 2007-05-09 21:46:29 UTC (rev 6111)
+++ trunk/packages/koffice/debian/kchart.install 2007-05-10 06:55:21 UTC (rev 6112)
@@ -21,7 +21,7 @@
debian/tmp/usr/lib/kde3/libkchartxbmexport.so
debian/tmp/usr/lib/kde3/libkchartxpmexport.la
debian/tmp/usr/lib/kde3/libkchartxpmexport.so
-debian/tmp/usr/share/applnk/Office/kchart.desktop
+debian/tmp/usr/share/applications/kde/kchart.desktop
debian/tmp/usr/share/apps/kchart
debian/tmp/usr/share/services/kchart_png_export.desktop
debian/tmp/usr/share/services/kchart_svg_export.desktop
Added: trunk/packages/koffice/debian/kexi.docs
===================================================================
--- trunk/packages/koffice/debian/kexi.docs 2007-05-09 21:46:29 UTC (rev 6111)
+++ trunk/packages/koffice/debian/kexi.docs 2007-05-10 06:55:21 UTC (rev 6112)
@@ -0,0 +1,2 @@
+kexi/README
+debian/tmp/usr/share/apps/kexi/examples/Simple_Database.kexi
Modified: trunk/packages/koffice/debian/kexi.install
===================================================================
--- trunk/packages/koffice/debian/kexi.install 2007-05-09 21:46:29 UTC (rev 6111)
+++ trunk/packages/koffice/debian/kexi.install 2007-05-10 06:55:21 UTC (rev 6112)
@@ -2,6 +2,10 @@
debian/tmp/usr/bin/ksqlite
debian/tmp/usr/bin/ksqlite2to3
debian/tmp/usr/bin/ksqlite2
+debian/tmp/usr/bin/kexi_add_column
+debian/tmp/usr/bin/kexi_add_column_gui
+debian/tmp/usr/bin/kexi_delete_column
+debian/tmp/usr/bin/kexi_delete_column_gui
debian/tmp/usr/lib/libkexisql3.so.*
debian/tmp/usr/lib/libkexisql2.so.*
debian/tmp/usr/lib/libkexiutils.so.*
@@ -67,6 +71,7 @@
debian/tmp/usr/share/apps/kexi/kexiformpartinstui.rc
debian/tmp/usr/share/apps/kexi/kexiscriptpartui.rc
debian/tmp/usr/share/apps/kexi/kexiscriptpartinstui.rc
+debian/tmp/usr/share/apps/kexi/icons/crystalsvg/16x16/actions/autofield.png
debian/tmp/usr/share/apps/kexi/icons/crystalsvg/16x16/actions/macro_newobj.png
debian/tmp/usr/share/apps/kexi/icons/crystalsvg/16x16/actions/combo.png
debian/tmp/usr/share/apps/kexi/icons/crystalsvg/16x16/actions/macro.png
@@ -124,6 +129,7 @@
debian/tmp/usr/share/apps/kexi/icons/crystalsvg/16x16/actions/lineedit.png
debian/tmp/usr/share/apps/kexi/icons/crystalsvg/16x16/actions/aofit.png
debian/tmp/usr/share/apps/kexi/icons/crystalsvg/16x16/actions/aogrid.png
+debian/tmp/usr/share/apps/kexi/icons/crystalsvg/22x22/actions/autofield.png
debian/tmp/usr/share/apps/kexi/icons/crystalsvg/22x22/actions/state_edit.png
debian/tmp/usr/share/apps/kexi/icons/crystalsvg/22x22/actions/aotop.png
debian/tmp/usr/share/apps/kexi/icons/crystalsvg/22x22/actions/mouse_pointer.png
@@ -276,7 +282,7 @@
debian/tmp/usr/share/doc/kde/HTML/en/kexi/comparing.docbook
debian/tmp/usr/share/doc/kde/HTML/en/kexi/index.cache.bz2
debian/tmp/usr/share/doc/kde/HTML/en/kexi/common
-debian/tmp/usr/share/applnk/Office/kexi.desktop
+debian/tmp/usr/share/applications/kde/kexi.desktop
debian/tmp/usr/share/mimelnk/application/x-kexiproject-sqlite.desktop
debian/tmp/usr/share/mimelnk/application/x-kexi-connectiondata.desktop
debian/tmp/usr/share/mimelnk/application/x-kexiproject-sqlite2.desktop
Modified: trunk/packages/koffice/debian/kformula.install
===================================================================
--- trunk/packages/koffice/debian/kformula.install 2007-05-09 21:46:29 UTC (rev 6111)
+++ trunk/packages/koffice/debian/kformula.install 2007-05-10 06:55:21 UTC (rev 6112)
@@ -6,7 +6,7 @@
debian/tmp/usr/lib/kde3/libkfosvgexport.so
debian/tmp/usr/lib/kde3/libkfosvgexport.la
debian/tmp/usr/lib/libkdeinit_kformula.so
-debian/tmp/usr/share/applnk/Office/kformula.desktop
+debian/tmp/usr/share/applications/kde/kformula.desktop
debian/tmp/usr/share/apps/kformula
debian/tmp/usr/share/apps/konqueror/servicemenus/kformula_konqi.desktop
debian/tmp/usr/share/doc/kde/HTML/en/kformula/*.bz2
Modified: trunk/packages/koffice/debian/koffice-data.install
===================================================================
--- trunk/packages/koffice/debian/koffice-data.install 2007-05-09 21:46:29 UTC (rev 6111)
+++ trunk/packages/koffice/debian/koffice-data.install 2007-05-10 06:55:21 UTC (rev 6112)
@@ -12,6 +12,8 @@
debian/tmp/usr/share/apps/kross/python/RestrictedPython/RestrictionMutator.py
debian/tmp/usr/share/apps/kross/python/RestrictedPython/SelectCompiler.py
debian/tmp/usr/share/apps/kross/python/RestrictedPython/Utilities.py
+debian/tmp/usr/share/applications/kde/koffice.desktop
+debian/tmp/usr/share/doc/kde/HTML/en/koffice/koffice.desktop
debian/tmp/usr/share/doc/kde/HTML/en/koffice/*.bz2
debian/tmp/usr/share/doc/kde/HTML/en/koffice/*.docbook
debian/tmp/usr/share/doc/kde/HTML/en/koffice/common
Modified: trunk/packages/koffice/debian/koshell.install
===================================================================
--- trunk/packages/koffice/debian/koshell.install 2007-05-09 21:46:29 UTC (rev 6111)
+++ trunk/packages/koffice/debian/koshell.install 2007-05-10 06:55:21 UTC (rev 6112)
@@ -9,7 +9,7 @@
debian/tmp/usr/share/icons/hicolor/32x32/apps/koshell.png
debian/tmp/usr/share/icons/hicolor/22x22/apps/koshell.png
debian/tmp/usr/share/icons/hicolor/16x16/apps/koshell.png
-debian/tmp/usr/share/applnk/Office/koshell.desktop
+debian/tmp/usr/share/applications/kde/koshell.desktop
debian/tmp/usr/share/apps/koshell/koshellui.rc
debian/tmp/usr/share/config.kcfg/koshell.kcfg
debian/tmp/usr/share/doc/kde/HTML/en/koshell/*.bz2
Modified: trunk/packages/koffice/debian/kplato.install
===================================================================
--- trunk/packages/koffice/debian/kplato.install 2007-05-09 21:46:29 UTC (rev 6111)
+++ trunk/packages/koffice/debian/kplato.install 2007-05-10 06:55:21 UTC (rev 6112)
@@ -63,4 +63,4 @@
debian/tmp/usr/share/doc/kde/HTML/en/kplato/edit-calendar.png
debian/tmp/usr/share/doc/kde/HTML/en/kplato/configure-wbs.png
debian/tmp/usr/share/doc/kde/HTML/en/kplato/mainwindow1.png
-debian/tmp/usr/share/applnk/Office/kplato.desktop
+debian/tmp/usr/share/applications/kde/kplato.desktop
Modified: trunk/packages/koffice/debian/kpresenter-data.install
===================================================================
--- trunk/packages/koffice/debian/kpresenter-data.install 2007-05-09 21:46:29 UTC (rev 6111)
+++ trunk/packages/koffice/debian/kpresenter-data.install 2007-05-10 06:55:21 UTC (rev 6112)
@@ -1,4 +1,4 @@
-debian/tmp/usr/share/applnk/Office/kpresenter.desktop
+debian/tmp/usr/share/applications/kde/kpresenter.desktop
debian/tmp/usr/share/apps/konqueror/servicemenus/kpresenter_konqi.desktop
debian/tmp/usr/share/apps/kpresenter
debian/tmp/usr/share/icons/hicolor/16x16/apps/kpresenter.png
Modified: trunk/packages/koffice/debian/krita-data.install
===================================================================
--- trunk/packages/koffice/debian/krita-data.install 2007-05-09 21:46:29 UTC (rev 6111)
+++ trunk/packages/koffice/debian/krita-data.install 2007-05-10 06:55:21 UTC (rev 6112)
@@ -32,6 +32,7 @@
debian/tmp/usr/share/apps/kritaplugins/rotateimage.rc
debian/tmp/usr/share/apps/kritaplugins/screenshot-krita.rc
debian/tmp/usr/share/apps/kritaplugins/scripting.rc
+debian/tmp/usr/share/apps/kritaplugins/selectopaque.rc
debian/tmp/usr/share/apps/kritaplugins/shearimage.rc
debian/tmp/usr/share/apps/kritaplugins/substrate.rc
debian/tmp/usr/share/apps/kritaplugins/wetplugin.rc
@@ -305,6 +306,7 @@
debian/tmp/usr/share/services/kritablurfilter.desktop
debian/tmp/usr/share/services/kritabumpmapfilter.desktop
debian/tmp/usr/share/services/kritacimg.desktop
+debian/tmp/usr/share/services/kritacolorifyfilter.desktop
debian/tmp/usr/share/services/kritacmykplugin.desktop
debian/tmp/usr/share/services/krita_cmyk_u16_plugin.desktop
debian/tmp/usr/share/services/kritacolorrange.desktop
@@ -351,6 +353,7 @@
debian/tmp/usr/share/services/kritascreenshot.desktop
debian/tmp/usr/share/services/kritascripting.desktop
debian/tmp/usr/share/services/kritaselectiontools.desktop
+debian/tmp/usr/share/services/kritaselectopaque.desktop
debian/tmp/usr/share/services/kritaseparatechannels.desktop
debian/tmp/usr/share/services/kritashearimage.desktop
debian/tmp/usr/share/services/kritasmalltilesfilter.desktop
Modified: trunk/packages/koffice/debian/krita.install
===================================================================
--- trunk/packages/koffice/debian/krita.install 2007-05-09 21:46:29 UTC (rev 6111)
+++ trunk/packages/koffice/debian/krita.install 2007-05-10 06:55:21 UTC (rev 6112)
@@ -25,6 +25,8 @@
debian/tmp/usr/lib/kde3/kritacimg.so
debian/tmp/usr/lib/kde3/kritacmykplugin.la
debian/tmp/usr/lib/kde3/kritacmykplugin.so
+debian/tmp/usr/lib/kde3/kritacolorify.la
+debian/tmp/usr/lib/kde3/kritacolorify.so
debian/tmp/usr/lib/kde3/kritacolorrange.la
debian/tmp/usr/lib/kde3/kritacolorrange.so
debian/tmp/usr/lib/kde3/kritacolorsfilters.la
@@ -80,6 +82,8 @@
debian/tmp/usr/lib/kde3/kritascripting.so
debian/tmp/usr/lib/kde3/kritaselectiontools.la
debian/tmp/usr/lib/kde3/kritaselectiontools.so
+debian/tmp/usr/lib/kde3/kritaselectopaque.la
+debian/tmp/usr/lib/kde3/kritaselectopaque.so
debian/tmp/usr/lib/kde3/kritaseparatechannels.la
debian/tmp/usr/lib/kde3/kritaseparatechannels.so
debian/tmp/usr/lib/kde3/kritashearimage.la
Modified: trunk/packages/koffice/debian/kspread.install
===================================================================
--- trunk/packages/koffice/debian/kspread.install 2007-05-09 21:46:29 UTC (rev 6111)
+++ trunk/packages/koffice/debian/kspread.install 2007-05-10 06:55:21 UTC (rev 6112)
@@ -37,7 +37,7 @@
debian/tmp/usr/lib/kde3/kspreadscripting.la
debian/tmp/usr/lib/kde3/libkspreadkexiimport.so
debian/tmp/usr/lib/kde3/libkspreadkexiimport.la
-debian/tmp/usr/share/applnk/Office/kspread.desktop
+debian/tmp/usr/share/applications/kde/kspread.desktop
debian/tmp/usr/share/apps/konqueror/servicemenus/kspread_konqi.desktop
debian/tmp/usr/share/apps/kspread
debian/tmp/usr/share/icons/hicolor/16x16/apps/kspread.png
Modified: trunk/packages/koffice/debian/kugar.install
===================================================================
--- trunk/packages/koffice/debian/kugar.install 2007-05-09 21:46:29 UTC (rev 6111)
+++ trunk/packages/koffice/debian/kugar.install 2007-05-10 06:55:21 UTC (rev 6112)
@@ -15,8 +15,8 @@
debian/tmp/usr/lib/kde3/libkugarpart.so
debian/tmp/usr/lib/kde3/libkugarnopimport.la
debian/tmp/usr/lib/kde3/libkugarnopimport.so
-debian/tmp/usr/share/applnk/Office/kugar.desktop
-debian/tmp/usr/share/applnk/Office/kudesigner.desktop
+debian/tmp/usr/share/applications/kde/kugar.desktop
+debian/tmp/usr/share/applications/kde/kudesigner.desktop
debian/tmp/usr/share/apps/kudesigner
debian/tmp/usr/share/apps/kugar
debian/tmp/usr/share/doc/kde/HTML/en/kugar/*.bz2
Modified: trunk/packages/koffice/debian/kword-data.install
===================================================================
--- trunk/packages/koffice/debian/kword-data.install 2007-05-09 21:46:29 UTC (rev 6111)
+++ trunk/packages/koffice/debian/kword-data.install 2007-05-10 06:55:21 UTC (rev 6112)
@@ -1,4 +1,4 @@
-debian/tmp/usr/share/applnk/Office/kword.desktop
+debian/tmp/usr/share/applications/kde/kword.desktop
debian/tmp/usr/share/apps/konqueror/servicemenus/kword_konqi.desktop
debian/tmp/usr/share/apps/kword
debian/tmp/usr/share/doc/kde/HTML/en/kword/*.bz2
Added: trunk/packages/koffice/debian/patches/01_koffice_branch_r662493.diff
===================================================================
--- trunk/packages/koffice/debian/patches/01_koffice_branch_r662493.diff 2007-05-09 21:46:29 UTC (rev 6111)
+++ trunk/packages/koffice/debian/patches/01_koffice_branch_r662493.diff 2007-05-10 06:55:21 UTC (rev 6112)
@@ -0,0 +1,20226 @@
+#DPATCHLEVEL=0
+--- kformula/kformulapart.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kformula/kformulapart.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=KOffice Formula Component
++Name[bg]=Компонент за формули в KOffice
+ Name[ca]=Component de fòrmules de KOffice
+ Name[cy]=Cydran Fformiwla KOffice
+ Name[da]=KOffice formelkomponent
+@@ -14,6 +15,7 @@
+ Name[fr]=Composant formules de KOffice
+ Name[gl]=Componente de Fórmulas de KOffice
+ Name[he]=רכיב נוסחאות KOffice
++Name[hr]=KOffice komponenta formula
+ Name[hu]=KOffice képletszerkesztő komponens
+ Name[is]=KOffice formúlu eining
+ Name[it]=Componente per formule di KOffice
+@@ -23,6 +25,7 @@
+ Name[ms]=Komponen Formula KOffice
+ Name[nb]=Formelkomponent for KOffice
+ Name[nds]=Formelkomponent för KOffice
++Name[ne]=केडीई कार्यालय सूत्र अवयव
+ Name[nl]=KOffice Formula-component
+ Name[nn]=Formelkomponent for KOffice
+ Name[pl]=Komponent wyrażeń matematycznych dla KOffice
+@@ -84,6 +87,7 @@
+ GenericName[mt]=Editur tal-Formuli
+ GenericName[nb]=Formelredigering
+ GenericName[nds]=Tabelleneditor
++GenericName[ne]=सूत्र सम्पादक
+ GenericName[nl]=Formulebewerker
+ GenericName[nn]=Formelredigering
+ GenericName[pl]=Edytor wyrażeń matematycznych
+--- kformula/kformula.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kformula/kformula.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -8,6 +8,7 @@
+ Name[hi]=के-फ़ॉर्मूला
+ Name[lo]=ສູດຄະນິດສາດ K
+ Name[mk]=К-формула
++Name[ne]=केडीई सूत्र
+ Name[sv]=Kformula
+ Name[th]=สูตรคณิตศาสตร์ K
+ Name[ven]=Fomula ya K
+@@ -48,6 +49,7 @@
+ GenericName[mt]=Editur tal-Formuli
+ GenericName[nb]=Formelredigering
+ GenericName[nds]=Tabelleneditor
++GenericName[ne]=सूत्र सम्पादक
+ GenericName[nl]=Formulebewerker
+ GenericName[nn]=Formelredigering
+ GenericName[pl]=Edytor wyrażeń matematycznych
+--- servicetypes/koplugin.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ servicetypes/koplugin.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -16,7 +16,7 @@
+ Comment[de]=KOffice-Plugin
+ Comment[el]=Πρόσθετο του KOffice
+ Comment[eo]=instalebla komponento por KOficejo
+-Comment[es]=Plugin de KOffice
++Comment[es]=Complemento de KOffice
+ Comment[et]=KOffice'i plugin
+ Comment[eu]=KOffice-en plugina
+ Comment[fa]=وصلۀ KOffice
+@@ -42,6 +42,7 @@
+ Comment[mt]=Plagin KOffice
+ Comment[nb]=KOffice-modul
+ Comment[nds]=KOffice-Moduul
++Comment[ne]=केडीई कार्यालय प्लगइन
+ Comment[nn]=KOffice-modul
+ Comment[pl]=Wtyczka KOffice
+ Comment[pt]=Módulo para o KOffice
+--- servicetypes/kofficepart.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ servicetypes/kofficepart.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -42,6 +42,7 @@
+ Comment[mt]=Komponent tal-KOffice
+ Comment[nb]=KOffice-komponent
+ Comment[nds]=KOffice-Komponent
++Comment[ne]=केडीई कार्यालय अवयव
+ Comment[nn]=KOffice-komponent
+ Comment[pl]=Komponent KOffice
+ Comment[pt]=Componente do KOffice
+--- servicetypes/kofilter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ servicetypes/kofilter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -42,6 +42,7 @@
+ Comment[mt]=Filtru KOffice
+ Comment[nb]=KOffice-filter
+ Comment[nds]=KOffice-Filter
++Comment[ne]=केडीई कार्यालय फिल्टर
+ Comment[nn]=KOffice-filter
+ Comment[pl]=Filtr KOffice
+ Comment[pt]=Filtro do KOffice
+--- servicetypes/kofilterwrapper.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ servicetypes/kofilterwrapper.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -31,6 +31,7 @@
+ Comment[ms]=Pembalut Penapis KOffice
+ Comment[nb]=KOffice-filterinnpakning
+ Comment[nds]=Filter-Koppelsteed för KOffice
++Comment[ne]=केडीई कार्यालय फिल्टर र्यापर
+ Comment[nl]=KOffice Filterwrapper
+ Comment[nn]=KOffice-filteromslag
+ Comment[pl]=Pojemnik grupujący filtry dla KOffice
+--- kword/kwordpart.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kword/kwordpart.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=KOffice Word Processing Component
++Name[bg]=Компонент за текстообработка в KOffice
+ Name[ca]=Component de processament de text de KOffice
+ Name[cy]=Cydran Brosesu Geiriau KOffice
+ Name[da]=KOffice tekstbehandlingskomponent
+@@ -25,6 +26,7 @@
+ Name[ms]=Komponen Pemproses Kata KOffice
+ Name[nb]=KOffice-komponent for tekstbehandling
+ Name[nds]=Textverarbeiden-Komponent för KOffice
++Name[ne]=केडीई कार्यालय शब्द प्रोसेसिङ्ग अवयव
+ Name[nl]=KOffice Tekstverwerkingscomponent
+ Name[nn]=KOffice-komponent for teksthandsaming
+ Name[pl]=Komponent przetwarzania tekstu dla KOffice
+@@ -50,6 +52,7 @@
+ ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
+ GenericName=Text Documents
+ GenericName[ar]=مُستندات نصيّة
++GenericName[bg]=Текстови документи
+ GenericName[br]=Teulioù skrid
+ GenericName[ca]=Documents de text
+ GenericName[cy]=Dogfennau Testun
+@@ -72,6 +75,7 @@
+ GenericName[lv]=Teksta dokumenti
+ GenericName[nb]=Tekstdokumenter
+ GenericName[nds]=Textdokmenten
++GenericName[ne]=पाठ कागजातहरू
+ GenericName[nl]=Tekstdocumenten
+ GenericName[pl]=Dokumenty tekstowe
+ GenericName[pt]=Documentos de Texto
+--- kword/kwmailmerge.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kword/kwmailmerge.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -13,7 +13,7 @@
+ Comment[de]=KWord Serienbrief-Plugin
+ Comment[el]=Πρόσθετο συγχώνευσης αλληλογραφίας του KWord
+ Comment[eo]=Retpoŝtintegrilo por Verkilo
+-Comment[es]=Plugin de combinación de correo de KWord
++Comment[es]=Complemento de combinación de correo de KWord
+ Comment[et]=KWordi kirjakoosteplugin
+ Comment[eu]=KWord-en posta bateratzeko plugina
+ Comment[fa]=وصلۀ ادغام پستی KWord
+@@ -36,6 +36,7 @@
+ Comment[mt]=Plagin tal-mailmerge ta' KWord
+ Comment[nb]=Postflettingsmodul for KWord
+ Comment[nds]=Massendruck-Moduul för KWorld
++Comment[ne]=केडीई शब्द पत्र गाँभ्ने प्लगइन
+ Comment[nl]=KWord-plugin voor standaardbrieven (mailmerge)
+ Comment[nn]=Postflettingsmodul for KWord
+ Comment[pl]=Wtyczka korespondencji seryjnej dla KWord
+--- kword/kword.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kword/kword.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -7,6 +7,7 @@
+ Name[fo]=KOrð
+ Name[hi]=के-वर्ड
+ Name[lo]=ເອກະສານຂໍ້ຄວາມ K
++Name[ne]=केडीई शब्द
+ Name[sv]=Kword
+ Name[th]=เอกสารข้อความ K
+ Exec=kword %u
+@@ -14,7 +15,7 @@
+ GenericName[af]=Woord Verwerking
+ GenericName[ar]=مُعالجة الكلمات
+ GenericName[az]=Kəlmə İşləmə
+-GenericName[bg]=Текстообработване
++GenericName[bg]=Текстообработка
+ GenericName[bs]=Obrada teksta
+ GenericName[ca]=Processador de text
+ GenericName[cs]=Zpracování textu
+@@ -46,6 +47,7 @@
+ GenericName[ms]=Pemproses Kata
+ GenericName[nb]=Tekstbehandling
+ GenericName[nds]=Textverarbeiden
++GenericName[ne]=शब्द प्रोसेसिङ्ग
+ GenericName[nl]=Tekstverwerker
+ GenericName[nn]=Teksthandsaming
+ GenericName[pl]=Przetwarzanie tekstu
+--- kword/mailmerge/sql/kwserialletter_qtsqldb_power.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kword/mailmerge/sql/kwserialletter_qtsqldb_power.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -29,6 +29,7 @@
+ Name[ms]=Sumber Qt-SQL (pengguna kuasa)
+ Name[nb]=Qt-SQL kilde (sjefsbruker)
+ Name[nds]=Qt-SQL-Born (för künnige Brukers)
++Name[ne]=Qt-SQL स्रोत (पावर प्रयोगकर्ता)
+ Name[nl]=QT-SQL-bron (geavanceerde gebruiker)
+ Name[nn]=Qt-SQL-kjelde (kraftbrukar)
+ Name[pl]=Źródło Qt-SQL (dla zaawansowanych użytkowników)
+@@ -49,16 +50,16 @@
+ Comment=This datasource type lets you use SQL database tables stored on a SQL Server. Depending on your system configuration, MySQL, PostgreSQL and UnixODBC are among the supported database backends. There might even be more (Oracle in commercial Qt versions or 3rd party backends).
+ Comment[ar]=هذا النّوع من المصادر البيانيّة يتيح لك إمكانية استخدام جداول قاعدة بيانيّة SQL مُخَزَّنة على خادم SQL. بحسب تهيئة نظامك، فإنّ MySQL، PostgreSQL و UnixODBC تُعتبر من بين ما هو مدعوم من وُجهات خلفيّة للقواعد البيانيّة. يمكن حتى أن يتواجد المزيد (Oracle في إصدارات Qt التِّجاريّة أو الوُجهات الخلفيّة المملوكة لطرف ثالث).
+ Comment[az]=Bu mənbə sizə SQL verilənlər bazasını istifadə etməyə imkan verir. Sistem qurğularınızdan asılı olaraq : MySQL,Postgres,(Oracle, lisenziyalı QT buraxılışını işlədirsinizsə),....
+-Comment[bg]=Този източник на данни използва таблица за съхранение на данните в СУБД (сървър SQL). Най често използваните са MySQL, PostgreSQL и UnixODBC.
++Comment[bg]=Този източник на данни използва таблица за съхранение на данните в СУБД (сървър SQL). В зависимост от настройките, поддръжка имат MySQL, PostgreSQL и UnixODBC. Може да има и още (Oracle в комерсиалните версии на Qt или други).
+ Comment[bs]=Ovaj tip izvora podataka vam omogućuje da koristiti SQL tabele smještene na SQL serveru. Ovisno o konfiguraciji vašeg sistema, MySQL, PostgreSQL i UnixODBC su među podržanim bazama podataka. Možda čak i više od toga (Oracle u komercijalnim verzijama Qt-a ili backendima iz trećeg izvora).
+-Comment[ca]=Aquest tipus de font de dades permet usar una base de dades SQL guardada a un servidor SQL. Depenent de la configuració del sistem, MySQL, PostgreSQL i UnixODBC estan entre les bases de dades suportades. Inclús n'hi poden haver més(Oracle comercial a la versió Qt i d'altres servidors).
++Comment[ca]=Aquest tipus de font de dades permet usar una base de dades SQL guardada a un servidor SQL. Depenent de la configuració del sistema, MySQL, PostgreSQL i UnixODBC estan entre les bases de dades permeses. Inclús n'hi poden haver més(Oracle comercial a la versió Qt i d'altres servidors).
+ Comment[cs]=Tento zdroj dat vám umožní požívat tabulky SQL databází uložených na SQL serveru. V závislosti na vašem nastavení systému jsou podporovány databázové systémy MySQL, PostgreSQL a UnixODBC (Oracle je podporována v komerční verzi Qt nebo v databázových systémech jiných výrobců).
+ Comment[cy]=Mae'r math yma o ffynhonnell ddata yn eich galluogi i ddefnyddio tablau cronfa ddata SQL sydd wedi eu storio ar weinydd SQL. Yn dibynnu ar ffurfweddiad eich system, mae MySQL, PostgreSQL a UnixODBC ymysg y cronfeydd data cefndirol a gynhelir. Efallai bod mwy ohonynt (Oracle mewn fersiynau masnachol Qt neu ôl-wynebau 3ydd blaid).
+ Comment[da]=Denne datakildetype lader dig bruge SQL-databasetabeller gemt på en SQL-server. Afhængig af dine systemindstillinger er MySQL, PostgreSQL og UnixODBC blandt de understøttede underliggende databaser. Der er måske endda flere (Oracle i kommercielle Qt-versioner eller underliggende programmer fra tredjepartsudviklere).
+ Comment[de]= Mit diesem Datenquellentyp können Sie Tabellen von SQL-Datenbanken verwenden, die sich auf einem SQL-Server befinden. Abhängig von der Systemeinrichtung: MySQL, PostgresSQL oder UnixODBC. Möglicherweise sogar weitere (etwa Oracle bei einer kommerziellen QT-Version oder Paketen von Drittanbietern).
+ Comment[el]=Αυτός ο τύπος πηγής δεδομένων σας επιτρέπει να χρησιμοποιείτε πίνακες βάσεων δεδομένων SQL αποθηκευμένες σε έναν εξυπηρετητή SQL. Ανάλογα με τη ρύθμιση του συστήματος σας, οι MySQL, PostgreSQL και UnixODBC είναι μέσα στις υποστηριζόμενες βάσεις δεδομένων. Μπορεί να υπάρχουν και περισσότερες (Η Oracle σε εμπορικές εκδόσεις της Qt ή άλλες τρίτων κατασκευαστών).
+ Comment[eo]=Tiu datumfonta tipo permesas uzi SQL-datumbazan tabelon en SQL-servilo. Depende de la konfiguraĵo de via sistemo estas subtenataj MySQL, PostgreSQL kaj UnixODBC. Povas esti pliaj (Orakolo en komercaj Qt-versioj aŭ triapartiaj datumbazajinterfacoj).
+-Comment[es]=Este tipo de fuente de datos le permite utilizar tablas de bases de datos almacenadas en un servidor SQL. Dependiendo de la configuración de su sistema, MySQL, PostgresSQL, y UnixODBC están entre los interfaces de bases de datos soportados. Puede que haya incluso más (Oracle, si utiliza una versión de QT con licencia o interfaces de terceras partes).
++Comment[es]=Este tipo de fuente de datos le permite utilizar tablas de bases de datos almacenadas en un servidor SQL. Dependiendo de la configuración de su sistema, MySQL, PostgreSQL, y UnixODBC están entre los interfaces de bases de datos soportados. Puede que haya incluso más (Oracle, si utiliza una versión de QT con licencia o interfaces de terceras partes).
+ Comment[et]=See andmeallika tüüp lubab kasutada SQL-andmebaasi tabeleid, mida hoitakse SQL-serveris. Sõltuvalt süsteemi seadistustest on MySQL, PostgreSQL ja UnixODBC toetatud andmebaasisüsteemide hulgas. Neid võib olla isegi rohkem (Oracle kommertslikes Qt versioonides või kolmandate osapoolte mootorites).
+ Comment[eu]=Datu-iturburu honek SQL zerbitzari batean gordetako SQL datu-baseko taulak erabiltzeko aukera ematen dizu. Zure sistemaren konfigurazioaren arabera, MySQL, PostgreSQL eta UnixODBC euskarriak onartzen dira. Gehiago ere egon daitezke (Oracle (Qt-ren bertsio komertzialetan) edo hirugarrenen beste euskarri batzuk).
+ Comment[fa]=این نوع متن داده به شما اجازۀ استفاده از جدولهای دادگان SQL ذخیرهشده در یک کارساز SQL را میدهد. بسته به پیکربندی سیستمتان، MySQL، PostgreSQL و UnixODBC، در میان پایانههای دادگان پشتیبانیشده میباشند. حتی ممکن است بیشتر باشند )Oracle در نسخههای تجاری Qt یا پایانههای گروه 3rd(.
+@@ -69,7 +70,7 @@
+ Comment[hu]=Ez az adatforrástípus SQL-kiszolgálón tárolt SQL táblák elérését teszi lehetővé. A rendszer konfigurációjától függően MySQL, PostgreSQL és UnixODBC adatbázistípust lehet választani. Ezeken felül még más is előfordulhat (pl. Oracle a Qt fizetős változatában).
+ Comment[is]=Þessi tegund gerir þér kleyft að nota SQL gagnagrunnstöflur sem liggja á SQL þjóni. MySQL, PostgreSQL og UnixODBC eru meðal studdra gagnagrunnsbakenda, háð kerfisuppsetningu þinni. Það gætu jafnvel verið fleiri (Oracle í verslunarútgáfu Qt eða þriðja aðila bakendar).
+ Comment[it]=Questa fonte di dati permette di usare le tabelle di banche dati SQL memorizzate in un server SQL. A seconda della configurazione del tuo sistema, MySQL, PostgreSQL e UnixODBC potrebbero essere alcune delle banche dati supportate. Potrebbero essere supportate anche altre banche dati (Oracle nelle versioni commerciali di Qt o moduli di terze parti).
+-Comment[ja]=このデータソースタイプは SQL サーバに保存されている SQL データベーステーブルを使用します。システム設定によりますが、 MySQL, PostgreSQL, UnixODBC がサポートされているデータベース バックエンドです。他のものも使用可能かも知れません (Qt の商用バージョンでの Oracle や、サードパーティのバックエンドなど)。
++Comment[ja]=このデータソースタイプは SQL サーバに保存されている SQL データベーステーブルを使用します。システム設定によりますが、MySQL, PostgreSQL, UnixODBC がサポートされているデータベース バックエンドです。他のものも使用可能かもしれません (Qt の商用バージョンでの Oracle や、サードパーティのバックエンドなど)。
+ Comment[km]=ប្រភេទប្រភពទិន្នន័យនេះអនុញ្ញាតឲ្យអ្នកប្រើតារាងមូលដ្ឋានទិន្នន័យ SQL ដែលបានរក្សាលើម៉ាស៊ីនបម្រើ SQL ។ ការពឹងផ្អែកលើការកំណត់រចនាសម្ព័ន្ធប្រព័ន្ធរបស់អ្នក MySQL, PostgreSQL និង UnixODBC គឺក្នុងចំណោមមូលដ្ឋានទិន្នន័យខាងក្រោយដែលបានគាំទ្រ ។ ប្រហែលជាមានច្រើន (Oracle ក្នុងកំណែពាណិជ្ជកម្ម Qt ឬ ភាគីខាងក្រោយទីបី) ។
+ Comment[lt]=Šis duomenų šaltinio tipas leidžia jums naudoti SQL duombazės lenteles išsaugotas SQL serveryje. Priklausomai nuo jūsų sistemos konfigūracijos MySQL, PostgreSQL ir UnixODBC yra tarp palaikomų duombazių tipų. Jų gali būti ir daugiau (Oracle komercinėse Qt versijose ar trečių šalių duombazių tipai).
+ Comment[lv]=Šis datu avota tips ļauj jums izmantot SQL datubāzes tabulas, kas glabājas uz SQL servera. Atkarībā no jūsu sistēmas konfigurācijas: MySQL,PostgreSQL un UnixODBC ir starp atbalstītajām datubāzēm. Šeit var būt arī vairāk (Oracle, ja jūs izmantojiet komerciālu QT versiju vai trešo pušu risinājumus).
+@@ -77,6 +78,7 @@
+ Comment[mt]=Dan it-tip ta' sors iħallik tuża tabelli minn databases SQL fuq server SQL. Skond il-konfigurazzjoni tas-sistema tiegħek, jista' jkollok MySQL, PostgreSQL jew UnixODBC bħala sistemi sapportiti, u jista' jkun hemm oħrajn (Oracle fuq verżjonijiet kummerċjali ta' Qt jew oħrajn ta' terzi partiti).
+ Comment[nb]=Datakilden lar deg bruke en databasetabell lagret på en SQL-tjener. Avhengig av oppsettet støttes databasetjenere som MySQL, PostgreSQL og UnixODBC. I tillegg finnes støtte for flere system (som Oracle i den kommersielle QT-utgaven eller tredjepartsystem).
+ Comment[nds]= Mit dissen Datenborntyp laat sik SQL-Datenbanken vun en SQL-Server bruken. Afhängig vun Dien Systeeminstellen warrt Datenbankplegers för MySQL, PostgresSQL un UnixODBC ünnerstütt. Villicht ok mehr (t.B. Oracle in en warflich Qt-Verschoon oder Plegers vun anner Anbeders).
++Comment[ne]=यो डेटासंसाधन प्रकारले तपाईंलाई एसक्यूएल सर्भरमा संग्रह भएको एसक्यूएल डाटाबेस प्रयोग गर्न दिन्छ ।तपाईंको प्रणाली कन्फिगरेसनमा, माइएसक्यूएल, पोस्टग्रेएसक्यूएल र युनीक्सओडीबीसी भर परेर जुन समर्थित डाटाबेस ब्याकेन्डहरू हुन् । त्यहाँ पक्कै पनि अझ बढी (व्यापारिक क्यूटी संस्करणहरू वा तेस्रो पार्टीको ब्याकेन्डमा आकाशवाणी हुन्छन्)
+ Comment[nl]=Met dit type gegevensbron kunt u SQL-databasetabellen die zijn opgeslagen op een SQL-server gebruiken. Afhankelijk van uw systeemconfiguratie behoren MySQL, PostgreSQL en UnixOBC tot de ondersteunde backends. Er zijn er mogelijk meer (bijv. Oracle in de commerciële Qt-versies of backends van derden).
+ Comment[nn]=Med denne datakjeldetypen kan du bruka SQL-databasetabellar lagra på ein SQL-tenar. Avhengig av systemoppsettet kan du bruka MySQL, PostgreSQL og UnixODBC. Det finst kanskje til og med fleire. (Oracle i kommersielle Qt-versjonar eller tredjepartstillegg.)
+ Comment[pl]=To źródło danych pozwala na przechowywanie tabel w bazach danych na serwerze SQL. W zależności od konfiguracji systemu: MySQL, PostgreSQL oraz UnixODBC są obsługiwane. Oczywiście może ich być więcej, np. Oracle w komercyjnej wersji Qt lub poprzez rozszerzenia innych firm.
+--- kword/mailmerge/sql/kwserialletter_qtsqldb.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kword/mailmerge/sql/kwserialletter_qtsqldb.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,6 +4,7 @@
+ ServiceTypes=KWord/MailMergePlugin
+
+ Name=Qt-SQL Source (single table)
++Name[bg]=Източник Qt-SQL (една таблица)
+ Name[ca]=Font Qt-SQL (taula única)
+ Name[cy]=Ffynhonell Qt-SQL (tabl sengl)
+ Name[da]=Qt-SQL-kilde (enkelt tabel)
+@@ -27,6 +28,7 @@
+ Name[ms]=Sumber Qt-SQL (jadual tunggal)
+ Name[nb]=Qt-SQL-kilde (en tabell)
+ Name[nds]=Qt-SQL-Born (Enkeltabell)
++Name[ne]=Qt-SQL स्रोत (एकल तालिका)
+ Name[nl]=Qt-SQL-bron (enkelvoudige tabel)
+ Name[nn]=Qt-SQL-kjelde (enkel tabell)
+ Name[pl]=Źródło Qt-SQL (pojedyńcza tabela)
+@@ -46,16 +48,16 @@
+ Comment=This datasource type lets you use SQL database tables stored on a SQL Server. Depending on your system configuration, MySQL, PostgreSQL and UnixODBC are among the supported database backends. There might even be more (Oracle in commercial Qt versions or 3rd party backends).
+ Comment[ar]=هذا النّوع من المصادر البيانيّة يتيح لك إمكانية استخدام جداول قاعدة بيانيّة SQL مُخَزَّنة على خادم SQL. بحسب تهيئة نظامك، فإنّ MySQL، PostgreSQL و UnixODBC تُعتبر من بين ما هو مدعوم من وُجهات خلفيّة للقواعد البيانيّة. يمكن حتى أن يتواجد المزيد (Oracle في إصدارات Qt التِّجاريّة أو الوُجهات الخلفيّة المملوكة لطرف ثالث).
+ Comment[az]=Bu mənbə sizə SQL verilənlər bazasını istifadə etməyə imkan verir. Sistem qurğularınızdan asılı olaraq : MySQL,Postgres,(Oracle, lisenziyalı QT buraxılışını işlədirsinizsə),....
+-Comment[bg]=Този източник на данни използва таблица за съхранение на данните в СУБД (сървър SQL). Най често използваните са MySQL, PostgreSQL и UnixODBC.
++Comment[bg]=Този източник на данни използва таблица за съхранение на данните в СУБД (сървър SQL). В зависимост от настройките, поддръжка имат MySQL, PostgreSQL и UnixODBC. Може да има и още (Oracle в комерсиалните версии на Qt или други).
+ Comment[bs]=Ovaj tip izvora podataka vam omogućuje da koristiti SQL tabele smještene na SQL serveru. Ovisno o konfiguraciji vašeg sistema, MySQL, PostgreSQL i UnixODBC su među podržanim bazama podataka. Možda čak i više od toga (Oracle u komercijalnim verzijama Qt-a ili backendima iz trećeg izvora).
+-Comment[ca]=Aquest tipus de font de dades permet usar una base de dades SQL guardada a un servidor SQL. Depenent de la configuració del sistem, MySQL, PostgreSQL i UnixODBC estan entre les bases de dades suportades. Inclús n'hi poden haver més(Oracle comercial a la versió Qt i d'altres servidors).
++Comment[ca]=Aquest tipus de font de dades permet usar una base de dades SQL guardada a un servidor SQL. Depenent de la configuració del sistema, MySQL, PostgreSQL i UnixODBC estan entre les bases de dades permeses. Inclús n'hi poden haver més(Oracle comercial a la versió Qt i d'altres servidors).
+ Comment[cs]=Tento zdroj dat vám umožní požívat tabulky SQL databází uložených na SQL serveru. V závislosti na vašem nastavení systému jsou podporovány databázové systémy MySQL, PostgreSQL a UnixODBC (Oracle je podporována v komerční verzi Qt nebo v databázových systémech jiných výrobců).
+ Comment[cy]=Mae'r math yma o ffynhonnell ddata yn eich galluogi i ddefnyddio tablau cronfa ddata SQL sydd wedi eu storio ar weinydd SQL. Yn dibynnu ar ffurfweddiad eich system, mae MySQL, PostgreSQL a UnixODBC ymysg y cronfeydd data cefndirol a gynhelir. Efallai bod mwy ohonynt (Oracle mewn fersiynau masnachol Qt neu ôl-wynebau 3ydd blaid).
+ Comment[da]=Denne datakildetype lader dig bruge SQL-databasetabeller gemt på en SQL-server. Afhængig af dine systemindstillinger er MySQL, PostgreSQL og UnixODBC blandt de understøttede underliggende databaser. Der er måske endda flere (Oracle i kommercielle Qt-versioner eller underliggende programmer fra tredjepartsudviklere).
+ Comment[de]= Mit diesem Datenquellentyp können Sie Tabellen von SQL-Datenbanken verwenden, die sich auf einem SQL-Server befinden. Abhängig von der Systemeinrichtung: MySQL, PostgresSQL oder UnixODBC. Möglicherweise sogar weitere (etwa Oracle bei einer kommerziellen QT-Version oder Paketen von Drittanbietern).
+ Comment[el]=Αυτός ο τύπος πηγής δεδομένων σας επιτρέπει να χρησιμοποιείτε πίνακες βάσεων δεδομένων SQL αποθηκευμένες σε έναν εξυπηρετητή SQL. Ανάλογα με τη ρύθμιση του συστήματος σας, οι MySQL, PostgreSQL και UnixODBC είναι μέσα στις υποστηριζόμενες βάσεις δεδομένων. Μπορεί να υπάρχουν και περισσότερες (Η Oracle σε εμπορικές εκδόσεις της Qt ή άλλες τρίτων κατασκευαστών).
+ Comment[eo]=Tiu datumfonta tipo permesas uzi SQL-datumbazan tabelon en SQL-servilo. Depende de la konfiguraĵo de via sistemo estas subtenataj MySQL, PostgreSQL kaj UnixODBC. Povas esti pliaj (Orakolo en komercaj Qt-versioj aŭ triapartiaj datumbazajinterfacoj).
+-Comment[es]=Este tipo de fuente de datos le permite utilizar tablas de bases de datos almacenadas en un servidor SQL. Dependiendo de la configuración de su sistema, MySQL, PostgresSQL, y UnixODBC están entre los interfaces de bases de datos soportados. Puede que haya incluso más (Oracle, si utiliza una versión de QT con licencia o interfaces de terceras partes).
++Comment[es]=Este tipo de fuente de datos le permite utilizar tablas de bases de datos almacenadas en un servidor SQL. Dependiendo de la configuración de su sistema, MySQL, PostgreSQL, y UnixODBC están entre los interfaces de bases de datos soportados. Puede que haya incluso más (Oracle, si utiliza una versión de QT con licencia o interfaces de terceras partes).
+ Comment[et]=See andmeallika tüüp lubab kasutada SQL-andmebaasi tabeleid, mida hoitakse SQL-serveris. Sõltuvalt süsteemi seadistustest on MySQL, PostgreSQL ja UnixODBC toetatud andmebaasisüsteemide hulgas. Neid võib olla isegi rohkem (Oracle kommertslikes Qt versioonides või kolmandate osapoolte mootorites).
+ Comment[eu]=Datu-iturburu honek SQL zerbitzari batean gordetako SQL datu-baseko taulak erabiltzeko aukera ematen dizu. Zure sistemaren konfigurazioaren arabera, MySQL, PostgreSQL eta UnixODBC euskarriak onartzen dira. Gehiago ere egon daitezke (Oracle (Qt-ren bertsio komertzialetan) edo hirugarrenen beste euskarri batzuk).
+ Comment[fa]=این نوع متن داده به شما اجازۀ استفاده از جدولهای دادگان SQL ذخیرهشده در یک کارساز SQL را میدهد. بسته به پیکربندی سیستمتان، MySQL، PostgreSQL و UnixODBC، در میان پایانههای دادگان پشتیبانیشده میباشند. حتی ممکن است بیشتر باشند )Oracle در نسخههای تجاری Qt یا پایانههای گروه 3rd(.
+@@ -66,7 +68,7 @@
+ Comment[hu]=Ez az adatforrástípus SQL-kiszolgálón tárolt SQL táblák elérését teszi lehetővé. A rendszer konfigurációjától függően MySQL, PostgreSQL és UnixODBC adatbázistípust lehet választani. Ezeken felül még más is előfordulhat (pl. Oracle a Qt fizetős változatában).
+ Comment[is]=Þessi tegund gerir þér kleyft að nota SQL gagnagrunnstöflur sem liggja á SQL þjóni. MySQL, PostgreSQL og UnixODBC eru meðal studdra gagnagrunnsbakenda, háð kerfisuppsetningu þinni. Það gætu jafnvel verið fleiri (Oracle í verslunarútgáfu Qt eða þriðja aðila bakendar).
+ Comment[it]=Questa fonte di dati permette di usare le tabelle di banche dati SQL memorizzate in un server SQL. A seconda della configurazione del tuo sistema, MySQL, PostgreSQL e UnixODBC potrebbero essere alcune delle banche dati supportate. Potrebbero essere supportate anche altre banche dati (Oracle nelle versioni commerciali di Qt o moduli di terze parti).
+-Comment[ja]=このデータソースタイプは SQL サーバに保存されている SQL データベーステーブルを使用します。システム設定によりますが、 MySQL, PostgreSQL, UnixODBC がサポートされているデータベース バックエンドです。他のものも使用可能かも知れません (Qt の商用バージョンでの Oracle や、サードパーティのバックエンドなど)。
++Comment[ja]=このデータソースタイプは SQL サーバに保存されている SQL データベーステーブルを使用します。システム設定によりますが、MySQL, PostgreSQL, UnixODBC がサポートされているデータベース バックエンドです。他のものも使用可能かもしれません (Qt の商用バージョンでの Oracle や、サードパーティのバックエンドなど)。
+ Comment[km]=ប្រភេទប្រភពទិន្នន័យនេះអនុញ្ញាតឲ្យអ្នកប្រើតារាងមូលដ្ឋានទិន្នន័យ SQL ដែលបានរក្សាលើម៉ាស៊ីនបម្រើ SQL ។ ការពឹងផ្អែកលើការកំណត់រចនាសម្ព័ន្ធប្រព័ន្ធរបស់អ្នក MySQL, PostgreSQL និង UnixODBC គឺក្នុងចំណោមមូលដ្ឋានទិន្នន័យខាងក្រោយដែលបានគាំទ្រ ។ ប្រហែលជាមានច្រើន (Oracle ក្នុងកំណែពាណិជ្ជកម្ម Qt ឬ ភាគីខាងក្រោយទីបី) ។
+ Comment[lt]=Šis duomenų šaltinio tipas leidžia jums naudoti SQL duombazės lenteles išsaugotas SQL serveryje. Priklausomai nuo jūsų sistemos konfigūracijos MySQL, PostgreSQL ir UnixODBC yra tarp palaikomų duombazių tipų. Jų gali būti ir daugiau (Oracle komercinėse Qt versijose ar trečių šalių duombazių tipai).
+ Comment[lv]=Šis datu avota tips ļauj jums izmantot SQL datubāzes tabulas, kas glabājas uz SQL servera. Atkarībā no jūsu sistēmas konfigurācijas: MySQL,PostgreSQL un UnixODBC ir starp atbalstītajām datubāzēm. Šeit var būt arī vairāk (Oracle, ja jūs izmantojiet komerciālu QT versiju vai trešo pušu risinājumus).
+@@ -74,6 +76,7 @@
+ Comment[mt]=Dan it-tip ta' sors iħallik tuża tabelli minn databases SQL fuq server SQL. Skond il-konfigurazzjoni tas-sistema tiegħek, jista' jkollok MySQL, PostgreSQL jew UnixODBC bħala sistemi sapportiti, u jista' jkun hemm oħrajn (Oracle fuq verżjonijiet kummerċjali ta' Qt jew oħrajn ta' terzi partiti).
+ Comment[nb]=Datakilden lar deg bruke en databasetabell lagret på en SQL-tjener. Avhengig av oppsettet støttes databasetjenere som MySQL, PostgreSQL og UnixODBC. I tillegg finnes støtte for flere system (som Oracle i den kommersielle QT-utgaven eller tredjepartsystem).
+ Comment[nds]= Mit dissen Datenborntyp laat sik SQL-Datenbanken vun en SQL-Server bruken. Afhängig vun Dien Systeeminstellen warrt Datenbankplegers för MySQL, PostgresSQL un UnixODBC ünnerstütt. Villicht ok mehr (t.B. Oracle in en warflich Qt-Verschoon oder Plegers vun anner Anbeders).
++Comment[ne]=यो डेटासंसाधन प्रकारले तपाईंलाई एसक्यूएल सर्भरमा संग्रह भएको एसक्यूएल डाटाबेस प्रयोग गर्न दिन्छ ।तपाईंको प्रणाली कन्फिगरेसनमा, माइएसक्यूएल, पोस्टग्रेएसक्यूएल र युनीक्सओडीबीसी भर परेर जुन समर्थित डाटाबेस ब्याकेन्डहरू हुन् । त्यहाँ पक्कै पनि अझ बढी (व्यापारिक क्यूटी संस्करणहरू वा तेस्रो पार्टीको ब्याकेन्डमा आकाशवाणी हुन्छन्)
+ Comment[nl]=Met dit type gegevensbron kunt u SQL-databasetabellen die zijn opgeslagen op een SQL-server gebruiken. Afhankelijk van uw systeemconfiguratie behoren MySQL, PostgreSQL en UnixOBC tot de ondersteunde backends. Er zijn er mogelijk meer (bijv. Oracle in de commerciële Qt-versies of backends van derden).
+ Comment[nn]=Med denne datakjeldetypen kan du bruka SQL-databasetabellar lagra på ein SQL-tenar. Avhengig av systemoppsettet kan du bruka MySQL, PostgreSQL og UnixODBC. Det finst kanskje til og med fleire. (Oracle i kommersielle Qt-versjonar eller tredjepartstillegg.)
+ Comment[pl]=To źródło danych pozwala na przechowywanie tabel w bazach danych na serwerze SQL. W zależności od konfiguracji systemu: MySQL, PostgreSQL oraz UnixODBC są obsługiwane. Oczywiście może ich być więcej, np. Oracle w komercyjnej wersji Qt lub poprzez rozszerzenia innych firm.
+--- kword/mailmerge/kabc/kwmailmerge_kabc.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kword/mailmerge/kabc/kwmailmerge_kabc.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ ServiceTypes=KWord/MailMergePlugin
+
+ Name=KDE Addressbook Plugin
+-Name[bg]=Приставка за адресна книга
++Name[bg]=Приставка за адресника на KDE
+ Name[br]=Lugent Karned chomlec'hioù KDE
+ Name[ca]=Connector de llibreta d'adreces KDE
+ Name[cs]=Modul Knihy adres KDE
+@@ -31,6 +31,7 @@
+ Name[ms]=Plugin Buku Alamat KDE
+ Name[nb]=Programtillegg for KDE-adresseboka
+ Name[nds]=Adressbook-Moduul för KDE
++Name[ne]=KDE ठेगानापुस्तक प्लगइन
+ Name[nl]=Adresboekplugin voor KDE
+ Name[nn]=Programtillegg for KDE-adresseboka
+ Name[pl]=Wtyczka Książki adresowej KDE
+@@ -52,7 +53,7 @@
+ Name[zh_CN]=KDE 地址簿插件
+ Name[zh_TW]=KDE 通訊錄外掛程式
+ Comment=This datasource type lets you use your KDE Address Book entries.
+-Comment[bg]=Източник на данни за адресната книга на КДЕ.
++Comment[bg]=Този източник на данни се свързва директно с адресника на KDE и чете данните от там.
+ Comment[ca]=Aquest tipus de font de dades permet usar les entrades de la teva llibreta d'adreces KDE
+ Comment[cs]=Tento zdroj dat umožňuje využít položky z Knihy adres.
+ Comment[cy]=Mae'r math yma o ffynhonell ddata yn eich galluogi i ddefnyddio eich cofnodion Llyfr Cyfeiriadau KDE.
+@@ -76,6 +77,7 @@
+ Comment[ms]=Jenis sumber data ini membenarkan anda menggunakan entri Buku Alamat KDE anda.
+ Comment[nb]=Med denne datakildetypen kan du få tilgang til oppføringene i KDE-adresseboka.
+ Comment[nds]=Mit dissen Datenborntyp laat sik KDE-Adressbookindrääg bruken.
++Comment[ne]=यो डेटासंसाधनले तपाईंलाई तपाईंको KDE ठेगाना पुस्तक प्रविष्टिहरू प्रयोग गर्न दिन्छ ।
+ Comment[nl]=Via deze plugin hebt u toegang tot uw KDE-adresboek.
+ Comment[nn]=Med denne datakjeldetypen kan du få tilgang til oppføringane i KDE-adresseboka.
+ Comment[pl]=To źródło danych pozwala Ci używać Twoich wpisów z Książki adresowej KDE.
+--- kword/mailmerge/kspread/kwmailmerge_kspread.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kword/mailmerge/kspread/kwmailmerge_kspread.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ ServiceTypes=KWord/MailMergePlugin
+
+ Name=KSpread Table Source
+-Name[bg]=Източник на данни за KSpread
++Name[bg]=Източник на данни от KSpread
+ Name[ca]=Font de taula de KSpread
+ Name[cy]=Ffynhonell Dabl KSpread
+ Name[da]=KSpread-tabelkilde
+@@ -29,6 +29,7 @@
+ Name[ms]=Sumber Jadual KSpread
+ Name[nb]=KSpread Tabellkilde
+ Name[nds]=KSpread-Tabellenborn
++Name[ne]=केडीई स्प्रिड तालिका स्रोत
+ Name[nl]=KSpread Tabelbron
+ Name[nn]=KSpread-tabellkjelde
+ Name[pl]=Źródło tabeli KSpread
+@@ -49,7 +50,7 @@
+ Name[zh_CN]=KSpread 表源
+ Name[zh_TW]=KSpread 表格來源
+ Comment=This datasource type lets you use your entries from a kspread file.
+-Comment[bg]=Източник на данни за от файл на KSpread.
++Comment[bg]=Този източник на данни чете данните директно от файл на KSpread.
+ Comment[ca]=Aquest tipus de font de dades permet usar les entrades d'un fitxer kspread
+ Comment[cy]=Mae'r math yma o ffynhonell ddata yn eich galluogi i ddefnyddio eich cofnodion o ffeil kspread.
+ Comment[da]=Denne datakildetype lader dig bruge dine indgange fra en kspread-fil.
+@@ -72,6 +73,8 @@
+ Comment[km]=ប្រភេទប្រភពទិន្នន័យនេះអនុញ្ញាតឲ្យអ្នកប្រើធាតុរបស់អ្នកពីឯកសារ kspread ។
+ Comment[ms]=Jenis sumber data ini membenarkan anda menggunakan entri anda dari fail kspread.
+ Comment[nb]=Denne datakilden lar deg bruke data fra en kspread fil.
++Comment[nds]=Mit dissen Datenborntyp laat sik Indrääg ut en KSpread-Datei bruken.
++Comment[ne]=यो डेटासंसाधन प्रकारले तपाईंलाई केडीई स्प्रिड फाइलबाट तपाईंको प्रविष्टिहरू प्रयोग गर्न दिन्छ ।
+ Comment[nl]=Met dit type databron kunt u uw ingangen uit een Kspread-bestand gebruiken.
+ Comment[nn]=Med denne datakjeldetypen kan du få tilgang til oppføringane i ei KSpread-fil.
+ Comment[pl]=To źródło danych pozwala Ci używać Twoich wpisów z plików KSpread.
+--- kword/mailmerge/kwserialletter_classic.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kword/mailmerge/kwserialletter_classic.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -38,6 +38,7 @@
+ Name[mt]=Ħażna interna
+ Name[nb]=Internt lagring
+ Name[nds]=Intern Spieker
++Name[ne]=आन्तरिक भण्डारण
+ Name[nl]=Interne opslag
+ Name[nn]=Intern lagring
+ Name[pl]=Przechowywanie wewnętrzne
+@@ -63,7 +64,7 @@
+ Comment=This datasource type stores the data directly in the KWord file
+ Comment[ar]=هذا النّوع من المصادر البيانيّة يُخزِّن البيانات مباشرة في ملف KWord
+ Comment[az]=Bu mənbə verilənləri düz KWord fayl içinə qeyd edir.
+-Comment[bg]=Този тип източник на данни запазва данните директно във файла KWord
++Comment[bg]=Този източник на данни запазва данните директно във файл на KWord
+ Comment[bs]=Ovaj tip izvora podataka spašava podatke direktno u KWord datoteku
+ Comment[ca]=Aquest tipus de font de dades guarda les dades directament en el fitxer KWord
+ Comment[cs]=Tento typ zdroje dat ukládá údaje přímo do souboru ve formátu KWordu
+@@ -72,7 +73,7 @@
+ Comment[de]=Dieser Datenquellentyp speichert seine Daten direkt in die KWord-Datei
+ Comment[el]=Αυτός ο τύπος πηγής δεδομένων αποθηκεύει τα δεδομένα απευθείας σε ένα αρχείο KWord
+ Comment[eo]=Tiu datumfonta tipo konservas la datumojn rekte ne la Verkilo-dosiero
+-Comment[es]=Este tipo de fuente de datos alamcena los datos directamente en el archivo de KWord
++Comment[es]=Este tipo de fuente de datos almacena los datos directamente en el archivo de KWord
+ Comment[et]=See andmeallika tüüp hoiab andmeid otse KWordi failis
+ Comment[eu]=Datu-iturburu honek datuak zuzenean kspread fitxategi batean gordetzen ditu
+ Comment[fa]=این نوع متن داده، مستقیماً داده را در پروندۀ KWord ذخیره میکند
+@@ -93,6 +94,7 @@
+ Comment[mt]=Dan it-tip ta' sors jikteb l-informazzjoni direttament fid-dokument tal-KWord
+ Comment[nb]=Denne datakilden lagrer data rett i KWord-fila
+ Comment[nds]=Disse Datenborntyp sekert Daten direktemang na en KWord-Datei
++Comment[ne]=यो डेटासंसाधन प्रकारले डेटालाई सीधै केडीई शब्द फाइलमा संग्रह गर्दछ
+ Comment[nl]=Dit type gegevensbron slaat de gegevens rechtstreeks op in een KWord-bestand.
+ Comment[nn]=Denne datakjeldetypen lagrar informasjonen rett i KWord-fila
+ Comment[pl]=To źródło sprawia, że dane są przechowywane bezpośrednio w pliku KWord
+--- kword/templates/Envelopes/.directory (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kword/templates/Envelopes/.directory (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Name=Envelopes
+ Name[ar]=أظرفة
+-Name[bg]=Плик
++Name[bg]=Пликове
+ Name[br]=Goloioù
+ Name[ca]=Sobres
+ Name[cy]=Amlenni
+@@ -24,6 +24,7 @@
+ Name[lv]=Aploksnes
+ Name[nb]=Konvolutter
+ Name[nds]=Ümslääg
++Name[ne]=खामहरू
+ Name[nl]=Enveloppen
+ Name[pl]=Koperty
+ Name[ru]=Конверты
+--- kword/templates/Envelopes/EnvelopeDL.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kword/templates/Envelopes/EnvelopeDL.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -30,6 +30,7 @@
+ Name[ms]=Sampul DL
+ Name[nb]=Konvolutt DL
+ Name[nds]=Ümslag DL
++Name[ne]=खाम DL
+ Name[nl]=Envelop DL
+ Name[nn]=Konvolutt DL
+ Name[pl]=Koperta DL
+--- kword/templates/Envelopes/EnvelopeC6.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kword/templates/Envelopes/EnvelopeC6.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -30,6 +30,7 @@
+ Name[ms]=Sampul C6
+ Name[nb]=Konvolutt C6
+ Name[nds]=Ümslag C6
++Name[ne]=खाम C6
+ Name[nl]=Envelop C6
+ Name[nn]=Konvolutt C6
+ Name[pl]=Koperta C6
+--- kword/templates/CardsAndLabels/BusinessCards10.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kword/templates/CardsAndLabels/BusinessCards10.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -29,6 +29,7 @@
+ Name[ms]=Kad Nama 10
+ Name[nb]=Visittkort 10
+ Name[nds]=Visietkoorten (10)
++Name[ne]=व्यवसाय कार्डहरू १०
+ Name[nl]=Visitekaarten (10)
+ Name[nn]=Visittkort 10
+ Name[pl]=10 wizytówek biznesowych
+--- kword/templates/CardsAndLabels/.directory (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kword/templates/CardsAndLabels/.directory (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Name=Cards and Labels
+-Name[bg]=Визитки и етикети
++Name[bg]=Карти и етикети
+ Name[br]=Kartennoù ha skridennadoù
+ Name[ca]=Targetes i etiquetes
+ Name[cy]=Cardiau a Labeli
+@@ -19,9 +19,10 @@
+ Name[is]=Spjöld og merkimiðar
+ Name[it]=Biglietti e etichette
+ Name[ja]=カードとラベル
+-Name[km]=កាត និង ស្លាក
++Name[km]=កាត និងស្លាក
+ Name[nb]=Kort og merkelapper
+ Name[nds]=Koorten un Opbackers
++Name[ne]=कार्ड र लेबुल
+ Name[nl]=Kaarten en labels
+ Name[pl]=Wizytówki i etykiety
+ Name[pt]=Cartões e Etiquetas
+--- kword/templates/CardsAndLabels/LabelsL16.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kword/templates/CardsAndLabels/LabelsL16.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -29,6 +29,7 @@
+ Name[ms]=Label L16
+ Name[nb]=Merkelapper L16
+ Name[nds]=Opbackers (L16)
++Name[ne]=लेबुलहरू L16
+ Name[nl]=Etiketten (L16)
+ Name[nn]=Etikettar L16
+ Name[pl]=16 etykiet
+--- kword/templates/Wordprocessing/TwoColumns.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kword/templates/Wordprocessing/TwoColumns.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -42,6 +42,7 @@
+ Name[mt]=Żewġ Kolonni
+ Name[nb]=To spalter
+ Name[nds]=Twee Striepen
++Name[ne]=दुई स्तम्भहरू
+ Name[nl]=Twee kolommen
+ Name[nn]=To kolonnar
+ Name[pl]=Dwie kolumny
+@@ -68,6 +69,7 @@
+ Name[zh_TW]=兩列
+ Name[zu]=Amakholamu Amabili
+ Comment=Creates an A4 document with two columns per page.
++Comment[bg]=Създаване на документ във формат A4 с две колони на страница.
+ Comment[ca]=Crea un document A4 amb dues columnes per pàgina
+ Comment[cy]=Creu dogfen A4 efo dwy golofn ar y dudalen.
+ Comment[da]=Opretter et A4-dokument med to søjler pr side
+@@ -88,6 +90,7 @@
+ Comment[lv]=Izveido A4 formāta dokumentu ar divām kolonnām uz lapas
+ Comment[nb]=Lager et A4 dokument med to spalter på hver side.
+ Comment[nds]=Stellt en A4-Dokment mit twee Striepen per Siet op.
++Comment[ne]=प्रति पृष्ठ दुई स्तम्भ सहित एउटा A4 कागजात सिर्जना गर्दछ ।
+ Comment[nl]=Maakt een A4-document aan met twee kolommen per pagina.
+ Comment[pl]=Tworzy dokument formatu A4 w dwiema kolumnami na stronę.
+ Comment[pt]=Cria um documento A4 com duas colunas por página.
+--- kword/templates/Wordprocessing/.directory (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kword/templates/Wordprocessing/.directory (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Name=Blank Document
++Name[bg]=Празен документ
+ Name[br]=Teul goullo
+ Name[ca]=Document buit
+ Name[da]=Blankt dokument
+@@ -21,6 +22,7 @@
+ Name[lv]=Tukšs dokuments
+ Name[nb]=Tomt dokument
+ Name[nds]=Leddid Dokment
++Name[ne]=खाली कागजात
+ Name[nl]=Leeg document
+ Name[pl]=Pusty dokument
+ Name[pt]=Documento Vazio
+--- kword/templates/Wordprocessing/TwoColumnsLetter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kword/templates/Wordprocessing/TwoColumnsLetter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -42,6 +42,7 @@
+ Name[mt]=Żewġ Kolonni
+ Name[nb]=To spalter
+ Name[nds]=Twee Striepen
++Name[ne]=दुई स्तम्भहरू
+ Name[nl]=Twee kolommen
+ Name[nn]=To kolonnar
+ Name[pl]=Dwie kolumny
+@@ -68,6 +69,7 @@
+ Name[zh_TW]=兩列
+ Name[zu]=Amakholamu Amabili
+ Comment=Creates a letter document with two columns per page.
++Comment[bg]=Създаване на документ във формат A4 с две колони на страница.
+ Comment[ca]=Crea una carta amb dues columnes per pàgina
+ Comment[da]=Opretter et brev-dokument med to søjler pr side
+ Comment[de]=Erstellt ein zweispaltiges Letter-Dokument.
+@@ -84,6 +86,7 @@
+ Comment[km]=បង្ហាញឯកសារសំបុត្រមួយ ដោយចែកទំព័រជាពីរជួរឈរ ។
+ Comment[nb]=Lager et letter-dokument med to spalter på hver side.
+ Comment[nds]=Stellt en "US Letter"-Dokment mit twee Striepen per Siet op.
++Comment[ne]=प्रति पृष्ठ दुई स्तम्भ सहित चिठ्ठी कागजात सिर्जना गर्दछ ।
+ Comment[nl]=Maakt een Letter-document aan met twee kolommen per pagina.
+ Comment[pl]=Tworzy list z dwiema kolumnami na stronę.
+ Comment[pt]=Cria uma carta com duas colunas por página.
+--- kword/templates/Wordprocessing/Memo.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kword/templates/Wordprocessing/Memo.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Link
+ URL=.source/Memo.kwt
+ Name=Memorandum
++Name[bg]=Меморандум
+ Name[ca]=Memoràndum
+ Name[el]=Υπόμνημα
+ Name[es]=Memorando
+@@ -18,6 +19,7 @@
+ Name[lv]=Memorands
+ Name[nb]=Notat
+ Name[nds]=Notiz
++Name[ne]=ज्ञापनपत्र
+ Name[pl]=Przypomnienie
+ Name[pt]=Memorando
+ Name[pt_BR]=Memorando
+@@ -29,6 +31,7 @@
+ Name[zh_CN]=备忘录
+ Name[zh_TW]=記事便條
+ Comment=Basic template for quickly writing a good-looking memo
++Comment[bg]=Основен шаблон за бързо писане на добре изглеждаща бележка
+ Comment[ca]=Plantilla bàsica per a escriure ràpidament una nota amb bon aspecte
+ Comment[da]=Basal skabelon for hurtigt at skrive et godt udseende memo
+ Comment[de]=Eine einfache Vorlage, um schnell ein gut aussehendes Memo zu schreiben
+@@ -46,6 +49,7 @@
+ Comment[lv]=Vienkārša sagatave ātrai laba izskata piezīmju rakstīšanai
+ Comment[nb]=Grunnleggende mal for fort å kunne skrive et notat som ser bra ut
+ Comment[nds]=En eenfach Vörlaag för smucke Notizen
++Comment[ne]=राम्रो-हेराई मेमो द्रुत रूपमा लेख्नका लागि आधारभूत टेम्प्लेट
+ Comment[nl]=Een sjabloon om snel een mooie memo te schrijven
+ Comment[pl]=Prosty szablon pozwalający na szybkie sporządzenie dobrze wyglądającego przypomnienia
+ Comment[pt]=Modelo básico para criar rapidamente um memorando com bom aspecto
+--- kword/templates/Wordprocessing/FaxLetter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kword/templates/Wordprocessing/FaxLetter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -29,7 +29,7 @@
+ Name[hu]=Faxsablon
+ Name[is]=Fax snið
+ Name[it]=Modello fax
+-Name[ja]=FAX テンプレート
++Name[ja]=ファクステンプレート
+ Name[km]=ពុម្ពទូរសារ
+ Name[lo]=ຕົ້ນແບບໂທລະສານ
+ Name[lv]=Faksa šablons
+@@ -37,6 +37,7 @@
+ Name[mt]=Mudell ta' faks
+ Name[nb]=Faksmal
+ Name[nds]=Faxvörlag
++Name[ne]=फ्याक्स टेम्प्लेट
+ Name[nl]=Faxsjabloon
+ Name[nn]=Faksmal
+ Name[pl]=Szablon faksu
+@@ -59,6 +60,7 @@
+ Name[zh_CN]=传真模板
+ Name[zh_TW]=傳真樣板
+ Comment=A template to quickly create a facsimile communication
++Comment[bg]=Шаблон за бързо създаване на факсимиле
+ Comment[ca]=Una plantilla per a crear ràpidament una comunicació per fax
+ Comment[da]=En skabelon til hurtigt at oprette en faxmeddelelse
+ Comment[de]=Eine Vorlage, um schnell ein Fax zu erstellen
+@@ -71,10 +73,11 @@
+ Comment[hu]=Sablon faxdokumentum gyors létrehozásához
+ Comment[is]=Sniðmát til að búa til fax á einfaldan hátt
+ Comment[it]=Un modello per creare rapidamente una comunicazione fax
+-Comment[ja]=FAX 送信用の文書を素早く作成するためのテンプレート
++Comment[ja]=ファクス送信用の文書を素早く作成するためのテンプレート
+ Comment[km]=ពុម្ពត្រូវបង្កើតទំនាក់ទំនងនៃសំណៅយ៉ាងលឿន
+ Comment[nb]=En mal som fort lager en telefaks
+ Comment[nds]=En Vörlaag för gaue Fax-Överdregen
++Comment[ne]=प्रतिरूप सञ्चार द्रुत सिर्जना गर्न टेम्प्लेट
+ Comment[nl]=Een sjabloon om snel een fax op te stellen
+ Comment[pl]=Szablon pozwalający szybko sporządzić odpowiedź
+ Comment[pt]=Modelo básico para criar rapidamente uma comunicação facsimile
+--- kword/templates/Wordprocessing/Letter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kword/templates/Wordprocessing/Letter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Link
+ URL=.source/Letter.kwt
+ Name=Blank Page
++Name[bg]=Празна страница
+ Name[br]=Goullonderiñ ar bajenn
+ Name[ca]=Pàgina buida
+ Name[da]=Blank side
+@@ -24,6 +25,7 @@
+ Name[lv]=Tukša lapa
+ Name[nb]=Tom side
+ Name[nds]=Leddig Siet
++Name[ne]=खाली पृष्ठ
+ Name[nl]=Leeg pagina
+ Name[pl]=Pusta strona
+ Name[pt]=Página em Branco
+@@ -39,6 +41,7 @@
+ Name[zh_CN]=空页面
+ Name[zh_TW]=空白頁面
+ Comment=Creates a blank US Letter document.
++Comment[bg]=Създаване на празен документ във формат US Letter.
+ Comment[ca]=Crea un document de carta US buit.
+ Comment[da]=Opretter et blankt US Letter-dokument.
+ Comment[de]=Erstellt ein leeres US-Letter-Dokument.
+@@ -56,6 +59,7 @@
+ Comment[km]=បង្កើតឯកសារសំបុត្រអាមេរិកទទេមួយ ។
+ Comment[nb]=Lager et tomt dokument i US Letter-format.
+ Comment[nds]=Stellt en leddig Dokment in'n Formaat "US-Letter" op.
++Comment[ne]=खाली यूएस अक्षर कागजात सिर्जना गर्दछ ।
+ Comment[nl]=Maakt een leeg US Letter-document aan.
+ Comment[pl]=Tworzy pusty dokument z rozmiarem papieru US Letter.
+ Comment[pt]=Cria um documento Carta dos EUA vazio.
+--- kword/templates/Wordprocessing/FaxA4.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kword/templates/Wordprocessing/FaxA4.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -29,7 +29,7 @@
+ Name[hu]=Faxsablon
+ Name[is]=Fax snið
+ Name[it]=Modello fax
+-Name[ja]=FAX テンプレート
++Name[ja]=ファクステンプレート
+ Name[km]=ពុម្ពទូរសារ
+ Name[lo]=ຕົ້ນແບບໂທລະສານ
+ Name[lv]=Faksa šablons
+@@ -37,6 +37,7 @@
+ Name[mt]=Mudell ta' faks
+ Name[nb]=Faksmal
+ Name[nds]=Faxvörlag
++Name[ne]=फ्याक्स टेम्प्लेट
+ Name[nl]=Faxsjabloon
+ Name[nn]=Faksmal
+ Name[pl]=Szablon faksu
+@@ -59,6 +60,7 @@
+ Name[zh_CN]=传真模板
+ Name[zh_TW]=傳真樣板
+ Comment=A template to quickly create a facsimile communication
++Comment[bg]=Шаблон за бързо създаване на факсимиле
+ Comment[ca]=Una plantilla per a crear ràpidament una comunicació per fax
+ Comment[da]=En skabelon til hurtigt at oprette en faxmeddelelse
+ Comment[de]=Eine Vorlage, um schnell ein Fax zu erstellen
+@@ -71,10 +73,11 @@
+ Comment[hu]=Sablon faxdokumentum gyors létrehozásához
+ Comment[is]=Sniðmát til að búa til fax á einfaldan hátt
+ Comment[it]=Un modello per creare rapidamente una comunicazione fax
+-Comment[ja]=FAX 送信用の文書を素早く作成するためのテンプレート
++Comment[ja]=ファクス送信用の文書を素早く作成するためのテンプレート
+ Comment[km]=ពុម្ពត្រូវបង្កើតទំនាក់ទំនងនៃសំណៅយ៉ាងលឿន
+ Comment[nb]=En mal som fort lager en telefaks
+ Comment[nds]=En Vörlaag för gaue Fax-Överdregen
++Comment[ne]=प्रतिरूप सञ्चार द्रुत सिर्जना गर्न टेम्प्लेट
+ Comment[nl]=Een sjabloon om snel een fax op te stellen
+ Comment[pl]=Szablon pozwalający szybko sporządzić odpowiedź
+ Comment[pt]=Modelo básico para criar rapidamente uma comunicação facsimile
+--- kword/templates/Wordprocessing/A4.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kword/templates/Wordprocessing/A4.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Link
+ URL=.source/A4.kwt
+ Name=Blank Document
++Name[bg]=Празен документ
+ Name[br]=Teul goullo
+ Name[ca]=Document buit
+ Name[da]=Blankt dokument
+@@ -24,6 +25,7 @@
+ Name[lv]=Tukšs dokuments
+ Name[nb]=Tomt dokument
+ Name[nds]=Leddid Dokment
++Name[ne]=खाली कागजात
+ Name[nl]=Leeg document
+ Name[pl]=Pusty dokument
+ Name[pt]=Documento Vazio
+@@ -39,6 +41,7 @@
+ Name[zh_CN]=空文档
+ Name[zh_TW]=空白文件
+ Comment=Creates a blank A4 document, with a small page margin.
++Comment[bg]=Създаване на документ във формат A4 с две колони на страница.
+ Comment[ca]=Crea un document A4 amb un petit marge de pàgina
+ Comment[da]=Opretter et blankt A4-dokument med en lille sidemargen.
+ Comment[de]=Erstellt ein leeres A4-Dokument mit einem schmalen Seitenrand
+@@ -56,6 +59,7 @@
+ Comment[lv]=Izveido tukšu A4 dokumentu ar mazām lapas maliņām.
+ Comment[nb]=Lager et tomt A4 dokument med en liten sidemarg.
+ Comment[nds]=Stellt en leddig A4-Dokment mit en smallen Rand op.
++Comment[ne]=सानो पृष्ठ सीमान्त सहित, खाली A4 कागजात सिर्जना गर्दछ ।
+ Comment[nl]=Maakt een leeg A4-document aan met een kleine paginamarge.
+ Comment[pl]=Tworzy pusty dokument formatu A4 z małym marginesem strony.
+ Comment[pt]=Cria um documento A4 em branco, com uma pequena margem na página.
+--- kword/templates/Wordprocessing/ColorfulLetter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kword/templates/Wordprocessing/ColorfulLetter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Link
+ URL=.source/ColorfulLetter.odt
+ Name=Colorful Document
++Name[bg]=Цветен документ
+ Name[br]=Teul livet
+ Name[ca]=Document a tot color
+ Name[da]=Farverigt dokument
+@@ -25,6 +26,7 @@
+ Name[lv]=Krāsains dokuments
+ Name[nb]=Fargerikt dokument
+ Name[nds]=Bunt Dokment
++Name[ne]=रङिन कागजात
+ Name[nl]=Kleurrijk document
+ Name[pl]=Kolorowy dokument
+ Name[pt]=Documento Colorido
+@@ -40,6 +42,7 @@
+ Name[zh_CN]=多彩文档
+ Name[zh_TW]=彩色文件
+ Comment=A two-column template with stylishly colored headers and footers
++Comment[bg]=Шаблон с две колони със стилни цветни колонтитули
+ Comment[ca]=Una plantilla de dues columnes amb capçaleres i peus de colors i amb estil
+ Comment[da]=En tosøjlers skabelon med elegant farvet sidehoved og sidefod
+ Comment[de]=Eine zweispaltige Vorlage mit stilvoll kolorierten Kopf- und Fußzeilen
+@@ -57,6 +60,7 @@
+ Comment[km]=ពុម្ពជួរឈរពីដែលមានបថមកថានិងបាតកថាដែលលម្អរដោយពណ៌មានរចនាប័ទ្ម
+ Comment[nb]=En tospalters mal med stilig farget topptekst og bunntekst
+ Comment[nds]=En Vörlaag mit twee Striepen un smucke Klören för Kopp- un Footregen
++Comment[ne]=रङिन शैलीका हेडर र फुटरहरू सहितको दुई-स्तम्भ टेम्प्लेट
+ Comment[nl]=Een tweekoloms sjabloon met stijlvolle gekleurde kop- en voetteksten
+ Comment[pl]=Dwukolumnowy szablon ze stylowo pokolorowanymi nagłówkami i stopkami
+ Comment[pt]=Um modelo de duas colunas, com cabeçalhos e rodapés com estilos coloridos
+--- kword/templates/Wordprocessing/ColorfulA4.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kword/templates/Wordprocessing/ColorfulA4.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Link
+ URL=.source/ColorfulA4.odt
+ Name=Colorful Document
++Name[bg]=Цветен документ
+ Name[br]=Teul livet
+ Name[ca]=Document a tot color
+ Name[da]=Farverigt dokument
+@@ -25,6 +26,7 @@
+ Name[lv]=Krāsains dokuments
+ Name[nb]=Fargerikt dokument
+ Name[nds]=Bunt Dokment
++Name[ne]=रङिन कागजात
+ Name[nl]=Kleurrijk document
+ Name[pl]=Kolorowy dokument
+ Name[pt]=Documento Colorido
+@@ -40,6 +42,7 @@
+ Name[zh_CN]=多彩文档
+ Name[zh_TW]=彩色文件
+ Comment=A two-column template with stylishly colored headers and footers
++Comment[bg]=Шаблон с две колони със стилни цветни колонтитули
+ Comment[ca]=Una plantilla de dues columnes amb capçaleres i peus de colors i amb estil
+ Comment[da]=En tosøjlers skabelon med elegant farvet sidehoved og sidefod
+ Comment[de]=Eine zweispaltige Vorlage mit stilvoll kolorierten Kopf- und Fußzeilen
+@@ -57,6 +60,7 @@
+ Comment[km]=ពុម្ពជួរឈរពីដែលមានបថមកថានិងបាតកថាដែលលម្អរដោយពណ៌មានរចនាប័ទ្ម
+ Comment[nb]=En tospalters mal med stilig farget topptekst og bunntekst
+ Comment[nds]=En Vörlaag mit twee Striepen un smucke Klören för Kopp- un Footregen
++Comment[ne]=रङिन शैलीका हेडर र फुटरहरू सहितको दुई-स्तम्भ टेम्प्लेट
+ Comment[nl]=Een tweekoloms sjabloon met stijlvolle gekleurde kop- en voetteksten
+ Comment[pl]=Dwukolumnowy szablon ze stylowo pokolorowanymi nagłówkami i stopkami
+ Comment[pt]=Um modelo de duas colunas, com cabeçalhos e rodapés com estilos coloridos
+--- kword/templates/Wordprocessing/ProfessionalLetter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kword/templates/Wordprocessing/ProfessionalLetter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Link
+ URL=.source/ProfessionalLetter.odt
+ Name=Professional Letter
++Name[bg]=Професионално писмо
+ Name[br]=Lizher vicherel
+ Name[ca]=Carta professional
+ Name[da]=Professionelt brev
+@@ -24,6 +25,7 @@
+ Name[lv]=Profesionāla vēstule
+ Name[nb]=Profesjonelt brev
+ Name[nds]=Profeschonell Breef
++Name[ne]=व्यवसायिक पत्र
+ Name[nl]=Professionele brief
+ Name[pl]=Profesjonalny list
+ Name[pt]=Carta Profissional
+@@ -39,6 +41,7 @@
+ Name[zh_CN]=专业信函
+ Name[zh_TW]=職業信
+ Comment=Creates a blank document with wide margins for professional looking documents
++Comment[bg]=Създаване на празен документ с широки полета за професионално изглеждащи документи
+ Comment[ca]=Crea un document buit amb marges amples per a documents d'aspecte professional
+ Comment[da]=Laver et blankt dokument med brede margener for et professionelt udseende dokument.
+ Comment[de]=Erstellt ein leeres Dokument mit breiten Rändern für professionell aussehende Dokumente
+@@ -56,6 +59,7 @@
+ Comment[lv]=Izveido tukšu dokumentu ar platām maliņām kam vajadzētu izskatīties profesionāli
+ Comment[nb]=Lager et tomt dokument med brede marger som gir profesjonelt utseende dokumenter
+ Comment[nds]=Stellt en leddig Dokment mit breede Ränners för Dokmenten mit profeschonell Utsehn op
++Comment[ne]=व्यवसायिक हेराइ कागजातहरूका लागि चौडाइ सीमान्तहरू सहित खाली कागजात सिर्जना गर्दछ
+ Comment[nl]=Maakt een leeg document aan met brede margins voor een professioneel uiterlijk
+ Comment[pl]=Tworzy pusty dokument z szerokimi marginesami dla profesjonalnie wyglądających dokumentów
+ Comment[pt]=Cria um documento em branco com margens largas para documentos com aspecto profissional
+--- kword/templates/Wordprocessing/ProfessionalA4.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kword/templates/Wordprocessing/ProfessionalA4.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Link
+ URL=.source/ProfessionalA4.odt
+ Name=Professional Letter
++Name[bg]=Професионално писмо
+ Name[br]=Lizher vicherel
+ Name[ca]=Carta professional
+ Name[da]=Professionelt brev
+@@ -24,6 +25,7 @@
+ Name[lv]=Profesionāla vēstule
+ Name[nb]=Profesjonelt brev
+ Name[nds]=Profeschonell Breef
++Name[ne]=व्यवसायिक पत्र
+ Name[nl]=Professionele brief
+ Name[pl]=Profesjonalny list
+ Name[pt]=Carta Profissional
+@@ -39,6 +41,7 @@
+ Name[zh_CN]=专业信函
+ Name[zh_TW]=職業信
+ Comment=Creates a blank document with wide margins for professional looking documents
++Comment[bg]=Създаване на празен документ с широки полета за професионално изглеждащи документи
+ Comment[ca]=Crea un document buit amb marges amples per a documents d'aspecte professional
+ Comment[da]=Laver et blankt dokument med brede margener for et professionelt udseende dokument.
+ Comment[de]=Erstellt ein leeres Dokument mit breiten Rändern für professionell aussehende Dokumente
+@@ -56,6 +59,7 @@
+ Comment[lv]=Izveido tukšu dokumentu ar platām maliņām kam vajadzētu izskatīties profesionāli
+ Comment[nb]=Lager et tomt dokument med brede marger som gir profesjonelt utseende dokumenter
+ Comment[nds]=Stellt en leddig Dokment mit breede Ränners för Dokmenten mit profeschonell Utsehn op
++Comment[ne]=व्यवसायिक हेराइ कागजातहरूका लागि चौडाइ सीमान्तहरू सहित खाली कागजात सिर्जना गर्दछ
+ Comment[nl]=Maakt een leeg document aan met brede margins voor een professioneel uiterlijk
+ Comment[pl]=Tworzy pusty dokument z szerokimi marginesami dla profesjonalnie wyglądających dokumentów
+ Comment[pt]=Cria um documento em branco com margens largas para documentos com aspecto profissional
+--- kounavail/kounavail.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kounavail/kounavail.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -34,6 +34,7 @@
+ Name[mt]=Dokument KOffice mhux disponibbli
+ Name[nb]=Utilgjengelig KOffice-dokument
+ Name[nds]=Nich verföögbor KOffice-Dokment
++Name[ne]=उपलब्ध नभएको केडीई कार्यालय कागजात
+ Name[nl]=Niet beschikbaar KOffice-document
+ Name[nn]=Utilgjengeleg KOffice-dokument
+ Name[pl]=Niedostępny dokument KOffice
+--- example/examplepart.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ example/examplepart.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,7 +2,7 @@
+ Encoding=UTF-8
+ Name=KOffice Example Component
+ Name[ar]=مكوّن KOffice مثالي
+-Name[bg]=Примерни модули за KOffice
++Name[bg]=Примерен модул за KOffice
+ Name[ca]=Component KOffice d'exemple
+ Name[cs]=Ukázková KOffice komponenta
+ Name[cy]=Cydran Enghreifftiol KOffice
+@@ -29,6 +29,7 @@
+ Name[ms]=Komponen Contoh KOffice
+ Name[nb]=Eksempelkomponent for KOffice
+ Name[nds]=Bispeelmodulen för KOffice
++Name[ne]=केडीई कार्यालय उदाहरण अवयव
+ Name[nl]=Voorbeeldcomponent voor KOffice
+ Name[nn]=Dømekomponent for KOffice
+ Name[pa]=KOffice ਉਦਾਹਰਨ ਭਾਗ
+--- example/example.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ example/example.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,7 +2,7 @@
+ Encoding=UTF-8
+ Name=KOffice Example Application
+ Name[ar]=تطبيق مثالي لِــ KOffice
+-Name[bg]=Примерни програми за KOffice
++Name[bg]=Примерна програма за KOffice
+ Name[br]=Meziant skouer KOffice
+ Name[ca]=Aplicació KOffice d'exemple
+ Name[cs]=Příklad KOffice aplikace
+@@ -30,6 +30,7 @@
+ Name[ms]=Aplikasi Contoh KOffice
+ Name[nb]=Eksempelprogram for KOffice
+ Name[nds]=Bispeelprogramm för KOffice
++Name[ne]=केडीई कार्यालय उदाहरण अनुप्रयोग
+ Name[nl]=Voorbeeldtoepassing voor KOffice
+ Name[nn]=Dømeprogram for KOffice
+ Name[pa]=KOffice ਉਦਾਹਰਨ ਕਾਰਜ
+--- kexi/kexiutils/utils.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/kexiutils/utils.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,5 @@
+ /* This file is part of the KDE project
+- Copyright (C) 2003-2006 Jaroslaw Staniek <js at iidea.pl>
++ Copyright (C) 2003-2007 Jaroslaw Staniek <js at iidea.pl>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+@@ -26,6 +26,7 @@
+ #include <qwmatrix.h>
+ #include <qiconset.h>
+ #include <qbitmap.h>
++#include <qfile.h>
+
+ #include <kdebug.h>
+ #include <kcursor.h>
+@@ -35,6 +36,10 @@
+ #include <kpixmapeffect.h>
+ #include <kiconloader.h>
+
++#if defined(Q_WS_WIN)
++# include <win32_utils.h>
++#endif
++
+ using namespace KexiUtils;
+
+ DelayedCursorHandler::DelayedCursorHandler()
+@@ -366,4 +371,64 @@
+ return *(void**)(array.data());
+ }
+
++void KexiUtils::setFocusWithReason(QWidget* widget, QFocusEvent::Reason reason)
++{
++ QEvent fe( QEvent::FocusIn );
++ QFocusEvent::setReason(reason);
++ QApplication::sendEvent( widget, &fe );
++ QFocusEvent::resetReason();
++}
++
++void KexiUtils::unsetFocusWithReason(QWidget* widget, QFocusEvent::Reason reason)
++{
++ QEvent fe( QEvent::FocusOut );
++ QFocusEvent::setReason(reason);
++ QApplication::sendEvent( widget, &fe );
++ QFocusEvent::resetReason();
++}
++
++CopyFileResult KexiUtils::copyFile(const QString& src, const QString& dest)
++{
++#ifdef Q_WS_WIN
++ int res = fcopy( QFile::encodeName( src ), QFile::encodeName( dest ) );
++ if (res == fcopy_src_err)
++ return CopyReadError;
++ else if (res == fcopy_dest_err)
++ return CopyWriteError;
++
++ return CopySuccess;
++#else
++# define _fcopy_BUFLEN 1024*32
++ char _fcopy_buf[_fcopy_BUFLEN];
++ FILE *in, *out;
++ int c_in=0, c_out=0;
++ CopyFileResult res=CopySuccess;
++
++ in=fopen(QFile::encodeName( src ), "rb");
++ if (!in)
++ return CopyReadError;
++ out=fopen(QFile::encodeName( dest ), "wb");
++ if (!out)
++ return CopyWriteError;
++ while (!feof(in) && !ferror(in) && !ferror(out)) {
++ c_in=fread(_fcopy_buf, 1, _fcopy_BUFLEN, in);
++ if (ferror(in) || c_in==0)
++ break;
++ c_out=fwrite(_fcopy_buf, 1, c_in, out);
++ if (ferror(out) || c_in!=c_out)
++ break;
++ }
++
++ if (ferror(in))
++ res=CopyReadError;
++ else if (ferror(out))
++ res=CopyWriteError;
++ else if (c_in!=c_out)
++ res=CopyWriteError;
++ fclose(in);
++ fclose(out);
++ return res;
++#endif
++}
++
+ #include "utils_p.moc"
+--- kexi/kexiutils/tristate.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/kexiutils/tristate.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -20,6 +20,8 @@
+ #ifndef _TRISTATE_TYPE_H_
+ #define _TRISTATE_TYPE_H_
+
++#include <qstring.h>
++
+ /**
+ * \e cancelled value, in most cases usable if there is a need for returning
+ * \e cancelled value explicitly. Example use:
+--- kexi/kexiutils/utils.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/kexiutils/utils.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,5 @@
+ /* This file is part of the KDE project
+- Copyright (C) 2003-2006 Jaroslaw Staniek <js at iidea.pl>
++ Copyright (C) 2003-2007 Jaroslaw Staniek <js at iidea.pl>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+@@ -27,8 +27,7 @@
+ #include <kmimetype.h>
+ class QColor;
+
+-// General Utils
+-
++//! @short General Utils
+ namespace KexiUtils
+ {
+ //! \return true if \a o has parent \a par.
+@@ -54,31 +53,28 @@
+
+ //! Const version of findParent()
+ template<class type>
+- inline type* findParentConst(const QObject* const o, const char* className)
++ inline const type* findParentConst(const QObject* const o, const char* className)
+ {
+ const QObject * obj = o;
+ if (!obj || !className || className[0]=='\0')
+ return 0;
+ while ( ((obj=obj->parent())) && !obj->inherits(className) )
+ ;
+- return static_cast<type*>(obj);
++ return static_cast<const type*>(obj);
+ }
+
+- /*! \return first found child of \a o, that inherit \a className.
++ /*! \return first found child of \a o, inheriting \a className.
+ If objName is 0 (the default), all object names match.
+ Returned pointer type is casted. */
+-
+- //! \return first found child of \a o, that inherit \a className.
+- //! If objName is 0 (the default), all object names match.
+- //! Returned pointer type is casted.
+ template<class type>
+ type* findFirstChild(QObject *o, const char* className, const char* objName = 0)
+ {
+ if (!o || !className || className[0]=='\0')
+ return 0;
+ QObjectList *l = o->queryList( className, objName );
+- QObjectListIt it( *l );
+- return static_cast<type*>(it.current());
++ QObject *result = l->first();
++ delete l;
++ return static_cast<type*>(result);
+ }
+
+ //! QDateTime - a hack needed because QVariant(QTime) has broken isNull()
+@@ -236,8 +232,30 @@
+ {
+ return static_cast<type*>( stringToPtrInternal(str, sizeof(type*)) );
+ }
++
++ //! Sets focus for widget \a widget with reason \a reason.
++ KEXIUTILS_EXPORT void setFocusWithReason(QWidget* widget, QFocusEvent::Reason reason);
++
++ //! Unsets focus for widget \a widget with reason \a reason.
++ KEXIUTILS_EXPORT void unsetFocusWithReason(QWidget* widget, QFocusEvent::Reason reason);
++
++ //! Used by copyFile()
++ enum CopyFileResult {
++ CopySuccess = 0,
++ CopyReadError = 1,
++ CopyWriteError = 2
++ };
++
++ /*!
++ Copies @p src file to @p dest file.
++ @return CopySuccess on success, CopyReadError on source file error,
++ CopyWriteError on destination file error.
++ @todo remove: QFile in Qt4 provides this.
++ */
++ KEXIUTILS_EXPORT CopyFileResult copyFile(const QString& src, const QString& dest);
+ }
+
++
+ //! sometimes we leave a space in the form of empty QFrame and want to insert here
+ //! a widget that must be instantiated by hand.
+ //! This macro inserts a widget \a what into a frame \a where.
+--- kexi/plugins/relations/kexirelationhandler.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/relations/kexirelationhandler.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -30,6 +30,7 @@
+ GenericName[ms]=Hubungan
+ GenericName[nb]=Relasjoner
+ GenericName[nds]=Betöög
++GenericName[ne]=सम्बन्धहरू
+ GenericName[nl]=Relaties
+ GenericName[nn]=Relasjonar
+ GenericName[pl]=Relacje
+@@ -75,6 +76,7 @@
+ Name[ms]=Hubungan
+ Name[nb]=Relasjoner
+ Name[nds]=Betöög
++Name[ne]=सम्बन्धहरू
+ Name[nl]=Relaties
+ Name[nn]=Relasjonar
+ Name[pl]=Relacje
+--- kexi/plugins/scripting/kexiscripting/kexiscripthandler.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/scripting/kexiscripting/kexiscripthandler.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,6 +4,7 @@
+ ServiceTypes=Kexi/Handler
+
+ GenericName=Scripts
++GenericName[bg]=Скриптове
+ GenericName[br]=Urzhiaouegoù
+ GenericName[ca]=Seqüències
+ GenericName[cs]=Skripty
+@@ -19,6 +20,7 @@
+ GenericName[ga]=Scripteanna
+ GenericName[gl]=Programas
+ GenericName[he]=תסריטים
++GenericName[hr]=Skripte
+ GenericName[hu]=Szkriptek
+ GenericName[is]=Skriftur
+ GenericName[it]=Script
+@@ -28,6 +30,7 @@
+ GenericName[ms]=Skrip
+ GenericName[nb]=Skript
+ GenericName[nds]=Skripten
++GenericName[ne]=स्क्रिप्टहरू
+ GenericName[nn]=Skript
+ GenericName[pl]=Skrypty
+ GenericName[pt]=Programas
+@@ -43,6 +46,7 @@
+ GenericName[zh_CN]=脚本
+ GenericName[zh_TW]=命令稿
+ Name=Scripts
++Name[bg]=Скриптове
+ Name[br]=Urzhiaouegoù
+ Name[ca]=Seqüències
+ Name[cs]=Skripty
+@@ -58,6 +62,7 @@
+ Name[ga]=Scripteanna
+ Name[gl]=Programas
+ Name[he]=תסריטים
++Name[hr]=Skripte
+ Name[hu]=Szkriptek
+ Name[is]=Skriftur
+ Name[it]=Script
+@@ -67,6 +72,7 @@
+ Name[ms]=Skrip
+ Name[nb]=Skript
+ Name[nds]=Skripten
++Name[ne]=स्क्रिप्टहरू
+ Name[nn]=Skript
+ Name[pl]=Skrypty
+ Name[pt]=Programas
+--- kexi/plugins/macros/kexipart/keximacrohandler.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/macros/kexipart/keximacrohandler.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,6 +4,7 @@
+ ServiceTypes=Kexi/Handler
+
+ GenericName=Macros
++GenericName[bg]=Макроси
+ GenericName[br]=Makroù
+ GenericName[da]=Makroer
+ GenericName[de]=Makros
+@@ -19,6 +20,7 @@
+ GenericName[lv]=Makross
+ GenericName[nb]=Makroer
+ GenericName[nds]=Makros
++GenericName[ne]=म्याक्रोस
+ GenericName[nl]=Macro's
+ GenericName[pl]=Makra
+ GenericName[ru]=Макросы
+@@ -32,6 +34,7 @@
+ GenericName[zh_TW]=巨集
+
+ Name=Macros
++Name[bg]=Макроси
+ Name[br]=Makroù
+ Name[da]=Makroer
+ Name[de]=Makros
+@@ -47,6 +50,7 @@
+ Name[lv]=Makross
+ Name[nb]=Makroer
+ Name[nds]=Makros
++Name[ne]=म्याक्रोस
+ Name[nl]=Macro's
+ Name[pl]=Makra
+ Name[ru]=Макросы
+--- kexi/plugins/forms/kexidbfactory.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/forms/kexidbfactory.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -45,6 +45,7 @@
+ #include <keximainwindow.h>
+ #include <kexiutils/utils.h>
+ #include <widget/kexicustompropertyfactory.h>
++#include <widget/utils/kexicontextmenuutils.h>
+
+ #include "kexiformview.h"
+ #include "widgets/kexidbautofield.h"
+--- kexi/plugins/forms/kexiformhandler.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/forms/kexiformhandler.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -28,10 +28,12 @@
+ GenericName[it]=Moduli
+ GenericName[ja]=フォーム
+ GenericName[km]=សំណុំបែបបទ
++GenericName[lt]=Formos
+ GenericName[lv]=Formas
+ GenericName[ms]=Borang
+ GenericName[nb]=Skjema
+ GenericName[nds]=Kiekwarken
++GenericName[ne]=फारमहरू
+ GenericName[nn]=Skjema
+ GenericName[pl]=Formularze
+ GenericName[pt]=Formulários
+@@ -78,6 +80,7 @@
+ Name[ms]=Borang
+ Name[nb]=Skjema
+ Name[nds]=Kiekwarken
++Name[ne]=फारमहरू
+ Name[nn]=Skjema
+ Name[pl]=Formularze
+ Name[pt]=Formulários
+--- kexi/plugins/forms/kexiformview.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/forms/kexiformview.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -31,6 +31,7 @@
+ #include <formeditor/widgetpropertyset.h>
+ #include <formeditor/commands.h>
+ #include <formeditor/widgetwithsubpropertiesinterface.h>
++#include <formeditor/objecttree.h>
+
+ #include <kexi.h>
+ #include <kexidialogbase.h>
+@@ -44,7 +45,8 @@
+ #include <tableview/kexitableitem.h>
+ #include <tableview/kexitableviewdata.h>
+ #include <widget/kexipropertyeditorview.h>
+-#include <formeditor/objecttree.h>
++#include <widget/kexiqueryparameters.h>
++#include <kexiutils/utils.h>
+
+ #include <koproperty/set.h>
+ #include <koproperty/property.h>
+@@ -365,6 +367,24 @@
+ }
+ }
+
++//! Used in KexiFormView::loadForm()
++static void setUnsavedBLOBIdsForDataViewMode(
++ QWidget* widget, const QMap<QCString, KexiBLOBBuffer::Id_t>& unsavedLocalBLOBsByName)
++{
++ if (-1 != widget->metaObject()->findProperty("pixmapId")) {
++ const KexiBLOBBuffer::Id_t blobID = unsavedLocalBLOBsByName[ widget->name() ];
++ if (blobID > 0)
++ widget->setProperty("pixmapId", (uint /* KexiBLOBBuffer::Id_t is unsafe and unsupported by QVariant - will be fixed in Qt4*/)blobID);
++ }
++ const QObjectList *list = widget->children();
++ if (!list)
++ return;
++ for (QObjectListIterator it(*list); it.current(); ++it) {
++ if (dynamic_cast<QWidget*>(it.current()))
++ setUnsavedBLOBIdsForDataViewMode(dynamic_cast<QWidget*>(it.current()), unsavedLocalBLOBsByName);
++ }
++}
++
+ void
+ KexiFormView::loadForm()
+ {
+@@ -375,6 +395,7 @@
+ if(viewMode()==Kexi::DataViewMode && !tempData()->tempForm.isNull() )
+ {
+ KFormDesigner::FormIO::loadFormFromString(form(), m_dbform, tempData()->tempForm);
++ setUnsavedBLOBIdsForDataViewMode( m_dbform, tempData()->unsavedLocalBLOBsByName );
+ updateAutoFieldsDataSource();
+ updateValuesForSubproperties();
+ return;
+@@ -430,6 +451,16 @@
+ KexiFormPart::TempData* temp = tempData();
+ if (!KFormDesigner::FormIO::saveFormToString(form(), temp->tempForm))
+ return false;
++
++ //collect blobs from design mode by name for use in data view mode
++ temp->unsavedLocalBLOBsByName.clear();
++ for (QMapConstIterator<QWidget*, KexiBLOBBuffer::Id_t> it = temp->unsavedLocalBLOBs.constBegin();
++ it!=temp->unsavedLocalBLOBs.constEnd(); ++it)
++ {
++ if (!it.key())
++ continue;
++ temp->unsavedLocalBLOBsByName.insert( it.key()->name(), it.data() );
++ }
+ }
+
+ return true;
+@@ -496,10 +527,7 @@
+ if (!m_dbform->orderedFocusWidgets()->isEmpty()) {
+ // QWidget *www = focusWidget();
+ //if (Kexi::hasParent(this, qApp->focusWidget())) {
+- QEvent fe( QEvent::FocusOut );
+- QFocusEvent::setReason(QFocusEvent::Tab);
+- QApplication::sendEvent( qApp->focusWidget(), &fe );
+- QFocusEvent::resetReason();
++ KexiUtils::unsetFocusWithReason(qApp->focusWidget(), QFocusEvent::Tab);
+ //}
+
+ QPtrListIterator<QWidget> it(*m_dbform->orderedFocusWidgets());
+@@ -517,7 +545,7 @@
+ it.toFirst();
+
+ it.current()->setFocus();
+- SET_FOCUS_USING_REASON(it.current(), QFocusEvent::Tab);
++ KexiUtils::setFocusWithReason(it.current(), QFocusEvent::Tab);
+ m_setFocusInternalOnce = it.current();
+ }
+
+@@ -643,7 +671,15 @@
+ deleteQuery();
+ }
+ else {
+- m_cursor = conn->executeQuery( *m_query );
++ KexiDB::debug( m_query->parameters() );
++ // like in KexiQueryView::executeQuery()
++ QValueList<QVariant> params;
++ {
++ KexiUtils::WaitCursorRemover remover;
++ params = KexiQueryParameters::getParameters(this, *conn->driver(), *m_query, ok);
++ }
++ if (ok) //input cancelled
++ m_cursor = conn->executeQuery( *m_query, params );
+ }
+ m_scrollView->invalidateDataSources( invalidSources, m_query );
+ ok = m_cursor!=0;
+@@ -724,71 +760,61 @@
+
+ KexiDB::PreparedStatement::Ptr st = conn->prepareStatement(
+ KexiDB::PreparedStatement::InsertStatement, *blobsFieldsWithoutID);
+-//#if 0
+-////! @todo reenable when all drivers get PreparedStatement support
+ if (!st) {
+ delete blobsFieldsWithoutID;
+ //! @todo show message
+ return false;
+ }
+-//#endif
+ KexiBLOBBuffer *blobBuf = KexiBLOBBuffer::self();
+- for (QMapConstIterator<QWidget*, KexiBLOBBuffer::Id_t> it = m_unsavedLocalBLOBs.constBegin();
+- it!=m_unsavedLocalBLOBs.constEnd(); ++it)
+- {
+- if (!it.key()) {
+- kexipluginswarn << "KexiFormView::storeData(): it.key()==0 !" << endl;
+- continue;
+- }
+- kexipluginsdbg << "name=" << it.key()->name() << " dataID=" << it.data() << endl;
+- KexiBLOBBuffer::Handle h( blobBuf->objectForId(it.data(), /*!stored*/false) );
+- if (!h)
+- continue; //no BLOB assigned
++ KexiFormView *designFormView
++ = dynamic_cast<KexiFormView*>( parentDialog()->viewForMode(Kexi::DesignViewMode) );
++ if (designFormView) {
++ for (QMapConstIterator<QWidget*, KexiBLOBBuffer::Id_t> it = tempData()->unsavedLocalBLOBs.constBegin();
++ it!=tempData()->unsavedLocalBLOBs.constEnd(); ++it)
++ {
++ if (!it.key()) {
++ kexipluginswarn << "KexiFormView::storeData(): it.key()==0 !" << endl;
++ continue;
++ }
++ kexipluginsdbg << "name=" << it.key()->name() << " dataID=" << it.data() << endl;
++ KexiBLOBBuffer::Handle h( blobBuf->objectForId(it.data(), /*!stored*/false) );
++ if (!h)
++ continue; //no BLOB assigned
+
+- QString originalFileName(h.originalFileName());
+- QFileInfo fi(originalFileName);
+- QString caption(fi.baseName().replace('_', " ").simplifyWhiteSpace());
+-////////
++ QString originalFileName(h.originalFileName());
++ QFileInfo fi(originalFileName);
++ QString caption(fi.baseName().replace('_', " ").simplifyWhiteSpace());
+
+-// KexiDB::PreparedStatement st(KexiDB::PreparedStatement::InsertStatement, *conn, *blobsTable);
+- if (st) {
+- *st /* << NO, (pgsql doesn't support this):QVariant()*/ /*id*/
+- << h.data() << originalFileName << caption
+- << h.mimeType() << (uint)/*! @todo unsafe */h.folderId();
+- if (!st->execute()) {
+- delete blobsFieldsWithoutID;
+- kexipluginsdbg << " execute error" << endl;
++ if (st) {
++ *st /* << NO, (pgsql doesn't support this):QVariant()*/ /*id*/
++ << h.data() << originalFileName << caption
++ << h.mimeType() << (uint)/*! @todo unsafe */h.folderId();
++ if (!st->execute()) {
++ delete blobsFieldsWithoutID;
++ kexipluginsdbg << " execute error" << endl;
++ return false;
++ }
++ }
++ delete blobsFieldsWithoutID;
++ blobsFieldsWithoutID=0;
++ const Q_ULLONG storedBLOBID = conn->lastInsertedAutoIncValue("o_id", "kexi__blobs");
++ if ((Q_ULLONG)-1 == storedBLOBID) {
++ //! @todo show message?
+ return false;
+ }
++ kexipluginsdbg << " storedDataID=" << storedBLOBID << endl;
++ h.setStoredWidthID((KexiBLOBBuffer::Id_t /*unsafe - will be fixed in Qt4*/)storedBLOBID);
++ //set widget's internal property so it can be saved...
++ const QVariant oldStoredPixmapId( it.key()->property("storedPixmapId") );
++ it.key()->setProperty("storedPixmapId",
++ QVariant((uint /* KexiBLOBBuffer::Id_t is unsafe and unsupported by QVariant - will be fixed in Qt4*/)storedBLOBID));
++ KFormDesigner::ObjectTreeItem *widgetItem = designFormView->form()->objectTree()->lookup(it.key()->name()); //form()->objectTree()->lookup(it.key()->name());
++ if (widgetItem)
++ widgetItem->addModifiedProperty( "storedPixmapId", oldStoredPixmapId );
++ else
++ kexipluginswarn << "KexiFormView::storeData(): no '" << widgetItem->name() << "' widget found within a form" << endl;
+ }
+-///////
+-#if 0
+- if (!conn->insertRecord(*blobsFieldsWithoutID, h.data(), originalFileName, caption, h.mimeType())) {
+- delete blobsFieldsWithoutID;
+-//! @todo show message?
+- return false;
+- }
+-#endif
+- delete blobsFieldsWithoutID;
+- blobsFieldsWithoutID=0;
+- const Q_ULLONG storedBLOBID = conn->lastInsertedAutoIncValue("o_id", "kexi__blobs");
+- if ((Q_ULLONG)-1 == storedBLOBID) {
+-//! @todo show message?
+- return false;
+- }
+- kexipluginsdbg << " storedDataID=" << storedBLOBID << endl;
+- h.setStoredWidthID((KexiBLOBBuffer::Id_t /*unsafe - will be fixed in Qt4*/)storedBLOBID);
+- //set widget's internal property so it can be saved...
+- const QVariant oldStoredPixmapId( it.key()->property("storedPixmapId") );
+- it.key()->setProperty("storedPixmapId",
+- QVariant((uint /* KexiBLOBBuffer::Id_t is unsafe and unsupported by QVariant - will be fixed in Qt4*/)storedBLOBID));
+- KFormDesigner::ObjectTreeItem *widgetItem = form()->objectTree()->lookup(it.key()->name());
+- if (widgetItem)
+- widgetItem->addModifiedProperty( "storedPixmapId", oldStoredPixmapId );
+- else
+- kexipluginswarn << "KexiFormView::storeData(): no '" << widgetItem->name() << "' widget found within a form" << endl;
+ }
+-//TODO: forall it.key()->setProperty(
+
+ //-- now, save form's XML
+ QString data;
+@@ -798,7 +824,7 @@
+ return false;
+
+ //all blobs are now saved
+- m_unsavedLocalBLOBs.clear();
++ tempData()->unsavedLocalBLOBs.clear();
+
+ tempData()->tempForm = QString::null;
+ return true;
+@@ -976,7 +1002,7 @@
+ if (m_dbform->focusWidget()) {
+ //better-looking focus
+ if (m_setFocusInternalOnce) {
+- SET_FOCUS_USING_REASON(m_setFocusInternalOnce, QFocusEvent::Other);//Tab);
++ KexiUtils::setFocusWithReason(m_setFocusInternalOnce, QFocusEvent::Other);//Tab);
+ m_setFocusInternalOnce = 0;
+ }
+ else {
+@@ -1039,18 +1065,24 @@
+ void
+ KexiFormView::slotHandleDropEvent(QDropEvent* e)
+ {
+- if (KexiFieldDrag::canDecodeMultiple( e )) {
++ const QWidget *targetContainerWidget = dynamic_cast<const QWidget*>(sender());
++ KFormDesigner::ObjectTreeItem *targetContainerWidgetItem = targetContainerWidget
++ ? form()->objectTree()->lookup( targetContainerWidget->name() ) : 0;
++ if (targetContainerWidgetItem && targetContainerWidgetItem->container()
++ && KexiFieldDrag::canDecodeMultiple( e ))
++ {
+ QString sourceMimeType, sourceName;
+ QStringList fields;
+ if (!KexiFieldDrag::decodeMultiple( e, sourceMimeType, sourceName, fields ))
+ return;
+- insertAutoFields(sourceMimeType, sourceName, fields, e->pos());
++ insertAutoFields(sourceMimeType, sourceName, fields,
++ targetContainerWidgetItem->container(), e->pos());
+ }
+ }
+
+ void
+ KexiFormView::insertAutoFields(const QString& sourceMimeType, const QString& sourceName,
+- const QStringList& fields, const QPoint& _pos)
++ const QStringList& fields, KFormDesigner::Container* targetContainer, const QPoint& _pos)
+ {
+ if (fields.isEmpty())
+ return;
+@@ -1095,8 +1127,8 @@
+ continue;
+ }
+ //! todo add autolabel using field's caption or name
+- KFormDesigner::Container *targetContainer;
+- QWidget* targetContainerWidget = QApplication::widgetAt(pos, true);
++ //KFormDesigner::Container *targetContainer;
++/* QWidget* targetContainerWidget = QApplication::widgetAt(pos, true);
+ while (targetContainerWidget
+ && !dynamic_cast<KFormDesigner::Container*>(targetContainerWidget))
+ {
+@@ -1105,7 +1137,7 @@
+ if (dynamic_cast<KFormDesigner::Container*>(targetContainerWidget))
+ targetContainer = dynamic_cast<KFormDesigner::Container*>(targetContainerWidget);
+ else
+- targetContainer = form()->toplevelContainer();
++ targetContainer = form()->toplevelContainer();*/
+ KFormDesigner::InsertWidgetCommand *insertCmd
+ = new KFormDesigner::InsertWidgetCommand(targetContainer,
+ //! todo this is hardcoded!
+@@ -1208,9 +1240,9 @@
+ {
+ //! @todo if there already was data assigned, remember it should be dereferenced
+ if (id==0)
+- m_unsavedLocalBLOBs.remove(widget);
++ tempData()->unsavedLocalBLOBs.remove(widget);
+ else
+- m_unsavedLocalBLOBs.insert(widget, id);
++ tempData()->unsavedLocalBLOBs.insert(widget, id);
+ }
+
+ /*
+--- kexi/plugins/forms/kexiformmanager.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/forms/kexiformmanager.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -188,9 +188,10 @@
+ const QStringList& fields)
+ {
+ KexiFormView* formViewWidget = activeFormViewWidget();
+- if (!formViewWidget)
++ if (!formViewWidget || !formViewWidget->form() || !formViewWidget->form()->activeContainer())
+ return;
+- formViewWidget->insertAutoFields(sourceMimeType, sourceName, fields);
++ formViewWidget->insertAutoFields(sourceMimeType, sourceName, fields,
++ formViewWidget->form()->activeContainer());
+ }
+
+ void KexiFormManager::slotHistoryCommandExecuted()
+--- kexi/plugins/forms/kexiformpart.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/forms/kexiformpart.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -28,6 +28,7 @@
+ #include <kexi.h>
+ #include <kexipart.h>
+ #include <kexidialogbase.h>
++#include <kexiblobbuffer.h>
+
+ namespace KFormDesigner
+ {
+@@ -70,6 +71,11 @@
+ QString tempForm;
+ QPoint scrollViewContentsPos; //!< to preserve contents pos after switching to other view
+ int resizeMode; //!< form's window's resize mode -one of KexiFormView::ResizeMode items
++ //! Used in KexiFormView::setUnsavedLocalBLOBs()
++ QMap<QWidget*, KexiBLOBBuffer::Id_t> unsavedLocalBLOBs;
++ //! Used when loading a form from (temporary) XML in Data View
++ //! to get unsaved blobs collected at design mode.
++ QMap<QCString, KexiBLOBBuffer::Id_t> unsavedLocalBLOBsByName;
+ };
+
+ virtual QString i18nMessage(const QCString& englishMessage,
+@@ -91,6 +97,7 @@
+ void slotAutoTabStopsSet(KFormDesigner::Form *form, bool set);
+ void slotAssignAction();
+ void slotPropertyChanged(QWidget *widget, const QCString &name, const QVariant &value);
++ void slotWidgetCreatedByFormsLibrary(QWidget* widget);
+
+ private:
+ class Private;
+--- kexi/plugins/forms/kexiformscrollview.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/forms/kexiformscrollview.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -61,9 +61,8 @@
+ virtual bool columnEditable(int col);
+
+ /*! \return number of visible columns in this view.
+- There can be a number of duplicated columns defined
+- (data-aware widgets, see KexiFormScrollView::columns()),
+- so columns() can return greater number than dataColumns(). */
++ There can be a number of duplicated columns defined,
++ so columns() can return greater or smaller number than dataColumns(). */
+ virtual int columns() const;
+
+ /*! \return column information for column number \a col.
+--- kexi/plugins/forms/kformdesigner_kexidbfactory.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/forms/kformdesigner_kexidbfactory.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -28,6 +28,7 @@
+ Name[ms]=Widget DB Kexi
+ Name[nb]=DB-element for Kexi
+ Name[nds]=Datenbank-Stüerelementen för Kexi
++Name[ne]=केक्सी DB विजेटहरू
+ Name[nl]=Kexi DB-widgets
+ Name[nn]=DB-element for Kexi
+ Name[pl]=Kontrolki baz danych dla Kexi
+--- kexi/plugins/forms/kexiformpart.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/forms/kexiformpart.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -38,6 +38,7 @@
+ #include <kexidb/connection.h>
+ #include <kexidb/fieldlist.h>
+ #include <kexidb/field.h>
++#include <kexiutils/utils.h>
+
+ #include <form.h>
+ #include <formIO.h>
+@@ -94,7 +95,7 @@
+ m_newObjectsAreDirty = true;
+
+ // Only create form manager if it's not yet created.
+- // KexiReportPart could have created is already.
++ // KexiReportPart could have created it already.
+ KFormDesigner::FormManager *formManager = KFormDesigner::FormManager::self();
+ if (!formManager)
+ formManager = new KexiFormManager(this, "kexi_form_and_report_manager");
+@@ -106,6 +107,8 @@
+ static_formsLibrary = KFormDesigner::FormManager::createWidgetLibrary(
+ formManager, supportedFactoryGroups);
+ static_formsLibrary->setAdvancedPropertiesVisible(false);
++ connect(static_formsLibrary, SIGNAL(widgetCreated(QWidget*)),
++ this, SLOT(slotWidgetCreatedByFormsLibrary(QWidget*)));
+
+ connect(KFormDesigner::FormManager::self()->propertySet(), SIGNAL(widgetPropertyChanged(QWidget *, const QCString &, const QVariant&)),
+ this, SLOT(slotPropertyChanged(QWidget *, const QCString &, const QVariant&)));
+@@ -505,6 +508,34 @@
+ tab->setTabToolTip( d->objectTreeView, i18n("Widgets"));
+ }
+
++void KexiFormPart::slotWidgetCreatedByFormsLibrary(QWidget* widget)
++{
++ QStrList signalNames(widget->metaObject()->signalNames());
++ if (!signalNames.isEmpty()) {
++ const char *handleDragMoveEventSignal = "handleDragMoveEvent(QDragMoveEvent*)";
++ const char *handleDropEventSignal = "handleDropEvent(QDropEvent*)";
++
++ for (QStrListIterator it(signalNames); it.current(); ++it) {
++ if (0==qstrcmp(it.current(), handleDragMoveEventSignal)) {
++ kdDebug() << it.current() << endl;
++ KexiFormView *formView = KexiUtils::findParent<KexiFormView>(widget, "KexiFormView");
++ if (formView) {
++ connect(widget, SIGNAL(handleDragMoveEvent(QDragMoveEvent*)),
++ formView, SLOT(slotHandleDragMoveEvent(QDragMoveEvent*)));
++ }
++ }
++ else if (0==qstrcmp(it.current(), handleDropEventSignal)) {
++ kdDebug() << it.current() << endl;
++ KexiFormView *formView = KexiUtils::findParent<KexiFormView>(widget, "KexiFormView");
++ if (formView) {
++ connect(widget, SIGNAL(handleDropEvent(QDropEvent*)),
++ formView, SLOT(slotHandleDropEvent(QDropEvent*)));
++ }
++ }
++ }
++ }
++}
++
+ //----------------
+
+ KexiFormPart::TempData::TempData(QObject* parent)
+--- kexi/plugins/forms/kexiformview.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/forms/kexiformview.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -36,6 +36,10 @@
+ class KexiTableViewData;
+ class KexiFormScrollView;
+ namespace KexiDB { class Cursor; }
++namespace KFormDesigner
++{
++ class Container;
++}
+
+ //! The KexiFormView lass provides a data-driven (record-based) form view .
+ /*! The KexiFormView can display data provided "by hand"
+@@ -106,7 +110,8 @@
+ - slotHandleDropEvent() when field(s) are dropped from the data source pane onto the form
+ - KexiFormManager is a used clicked "Insert fields" button on the data source pane. */
+ void insertAutoFields(const QString& sourceMimeType, const QString& sourceName,
+- const QStringList& fields, const QPoint& pos = QPoint(-1,-1));
++ const QStringList& fields, KFormDesigner::Container* targetContainerWidget,
++ const QPoint& pos = QPoint(-1,-1));
+
+ protected slots:
+ void slotPropertySetSwitched(KoProperty::Set *b, bool forceReload = false,
+@@ -220,7 +225,7 @@
+ QRect m_widgetGeometryForRecentInsertAutoFields;
+
+ //! Used in setUnsavedLocalBLOBs()
+- QMap<QWidget*, KexiBLOBBuffer::Id_t> m_unsavedLocalBLOBs;
++// QMap<QWidget*, KexiBLOBBuffer::Id_t> m_unsavedLocalBLOBs;
+ };
+
+ #endif
+--- kexi/plugins/forms/widgets/kexidbautofield.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/forms/widgets/kexidbautofield.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,7 +1,7 @@
+ /* This file is part of the KDE project
+ Copyright (C) 2005 Cedric Pasteur <cedric.pasteur at free.fr>
+ Copyright (C) 2005 Christian Nitschkowski <segfault_ii at web.de>
+- Copyright (C) 2005-2006 Jaroslaw Staniek <js at iidea.pl>
++ Copyright (C) 2005-2007 Jaroslaw Staniek <js at iidea.pl>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+--- kexi/plugins/forms/widgets/kexidbcombobox.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/forms/widgets/kexidbcombobox.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -170,7 +170,8 @@
+
+ /*! Called by top-level form on key press event.
+ Used for Key_Escape to if the popup is visible,
+- so the key press won't be consumed to perform "cancel editing". */
++ so the key press won't be consumed to perform "cancel editing".
++ Also used for grabbing page down/up keys. */
+ virtual bool keyPressed(QKeyEvent *ke);
+
+ class Private;
+--- kexi/plugins/forms/widgets/kexiframe.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/forms/widgets/kexiframe.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,5 @@
+ /* This file is part of the KDE project
+- Copyright (C) 2005-2006 Jaroslaw Staniek <js at iidea.pl>
++ Copyright (C) 2005-2007 Jaroslaw Staniek <js at iidea.pl>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+@@ -59,6 +59,18 @@
+ delete d;
+ }
+
++void KexiFrame::dragMoveEvent( QDragMoveEvent *e )
++{
++ QFrame::dragMoveEvent(e);
++ emit handleDragMoveEvent(e);
++}
++
++void KexiFrame::dropEvent( QDropEvent *e )
++{
++ QFrame::dropEvent(e);
++ emit handleDropEvent(e);
++}
++
+ #define ClassName KexiFrame
+ #define SuperClassName QFrame
+ #include "kexiframeutils_p.cpp"
+--- kexi/plugins/forms/widgets/kexidbimagebox.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/forms/widgets/kexidbimagebox.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -44,8 +44,10 @@
+ #include <kguiitem.h>
+
+ #include <widget/utils/kexidropdownbutton.h>
++#include <widget/utils/kexicontextmenuutils.h>
+ #include <kexiutils/utils.h>
+ #include <kexidb/field.h>
++#include <kexidb/utils.h>
+ #include <kexidb/queryschema.h>
+ #include <formeditor/widgetlibrary.h>
+
+@@ -59,6 +61,8 @@
+
+ static KStaticDeleter<QPixmap> KexiDBImageBox_pmDeleter;
+ static QPixmap* KexiDBImageBox_pm = 0;
++static KStaticDeleter<QPixmap> KexiDBImageBox_pmSmallDeleter;
++static QPixmap* KexiDBImageBox_pmSmall = 0;
+
+ KexiDBImageBox::KexiDBImageBox( bool designMode, QWidget *parent, const char *name )
+ : KexiFrame( parent, name, Qt::WNoAutoErase )
+@@ -80,6 +84,7 @@
+
+ //setup popup menu
+ m_popupMenu = new KexiImageContextMenu(this);
++ m_popupMenu->installEventFilter(this);
+
+ if (m_designMode) {
+ m_chooser = 0;
+@@ -153,7 +158,7 @@
+ {
+ if (isReadOnly())
+ return;
+-// const bool valueWasEmpty = m_value.isEmpty();
++ m_popupMenu->hide();
+ if (removeOld)
+ m_value = add.toByteArray();
+ else //do not add "m_origValue" to "add" as this is QByteArray
+@@ -172,8 +177,6 @@
+ m_pixmap = QPixmap();
+ }
+ repaint();
+-// if (m_value.isEmpty() != valueWasEmpty)
+-// emit pixmapChanged();//valueChanged(m_value);
+ }
+
+ void KexiDBImageBox::setInvalidState( const QString& displayText )
+@@ -632,7 +635,7 @@
+ return;
+ QPainter p(this);
+ p.setClipRect(pe->rect());
+- const int m = realLineWidth();
++ const int m = realLineWidth() + margin();
+ QColor bg(eraseColor());
+ if (m_designMode && pixmap().isNull()) {
+ QPixmap pm(size()-QSize(m, m));
+@@ -641,19 +644,26 @@
+ p2.fillRect(0,0,width(),height(), bg);
+
+ updatePixmap();
+- QImage img(KexiDBImageBox_pm->convertToImage());
++ QPixmap *imagBoxPm;
++ const bool tooLarge = (height()-m-m) <= KexiDBImageBox_pm->height();
++ if (tooLarge || (width()-m-m) <= KexiDBImageBox_pm->width())
++ imagBoxPm = KexiDBImageBox_pmSmall;
++ else
++ imagBoxPm = KexiDBImageBox_pm;
++ QImage img(imagBoxPm->convertToImage());
+ img = KImageEffect::flatten(img, bg.dark(150),
+ qGray( bg.rgb() ) <= 20 ? QColor(Qt::gray).dark(150) : bg.light(105));
+
+ QPixmap converted;
+ converted.convertFromImage(img);
+- p2.drawPixmap(2, height()-m-m-KexiDBImageBox_pm->height()-2, converted);
++// if (tooLarge)
++// p2.drawPixmap(2, 2, converted);
++// else
++ p2.drawPixmap(2, height()-m-m-imagBoxPm->height()-2, converted);
+ QFont f(qApp->font());
+ p2.setFont(f);
+ p2.setPen( KexiUtils::contrastColor( bg ) );
+- ;
+-
+- p2.drawText(pm.rect(), Qt::AlignCenter|Qt::WordBreak,
++ p2.drawText(pm.rect(), Qt::AlignCenter,
+ dataSource().isEmpty()
+ ? QString::fromLatin1(name())+"\n"+i18n("Unbound Image Box", "(unbound)") //i18n("No Image")
+ : dataSource());
+@@ -691,22 +701,17 @@
+ }
+ }*/
+
+-void KexiDBImageBox::updatePixmap() {
++void KexiDBImageBox::updatePixmap()
++{
+ if (! (m_designMode && pixmap().isNull()) )
+ return;
+
+-// if (KexiDBImageBox_pm) {
+-// QSize size = KexiDBImageBox_pm->size();
+-// if ((KexiDBImageBox_pm->width() > (width()/2) || KexiDBImageBox_pm->height() > (height()/2))) {
+-// int maxSize = QMAX(width()/2, height()/2);
+-// size = QSize(maxSize,maxSize);
+-// delete KexiDBImageBox_pm;
+-// KexiDBImageBox_pm = 0;
+-// }
+-// }
+ if (!KexiDBImageBox_pm) {
+ QString fname( locate("data", QString("kexi/pics/imagebox.png")) );
+ KexiDBImageBox_pmDeleter.setObject( KexiDBImageBox_pm, new QPixmap(fname, "PNG") );
++ QImage img(KexiDBImageBox_pm->convertToImage());
++ KexiDBImageBox_pmSmallDeleter.setObject( KexiDBImageBox_pmSmall,
++ new QPixmap( img.smoothScale(img.width()/2, img.height()/2, QImage::ScaleMin) ) );
+ }
+ }
+
+@@ -837,6 +842,10 @@
+ update(); //to repaint focus rect
+ }
+ }
++ // hide popup menu as soon as it loses focus
++ if (watched==m_popupMenu && e->type()==QEvent::FocusOut) {
++ m_popupMenu->hide();
++ }
+ return KexiFrame::eventFilter(watched, e);
+ }
+
+--- kexi/plugins/forms/widgets/kexidbtextedit.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/forms/widgets/kexidbtextedit.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,6 @@
+ /* This file is part of the KDE project
+ Copyright (C) 2005 Cedric Pasteur <cedric.pasteur at free.fr>
+- Copyright (C) 2004-2006 Jaroslaw Staniek <js at iidea.pl>
++ Copyright (C) 2004-2007 Jaroslaw Staniek <js at iidea.pl>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+@@ -73,6 +73,9 @@
+ Reimplemented after KexiFormDataItemInterface. */
+ virtual void setDisplayDefaultValue(QWidget* widget, bool displayDefaultValue);
+
++ //! Windows uses Ctrl+Tab for moving between tabs, so do not steal this shortcut
++ virtual void keyPressEvent( QKeyEvent *ke );
++
+ public slots:
+ inline void setDataSource(const QString &ds) { KexiFormDataItemInterface::setDataSource(ds); }
+ inline void setDataSourceMimeType(const QCString &ds) { KexiFormDataItemInterface::setDataSourceMimeType(ds); }
+--- kexi/plugins/forms/widgets/kexidbutils.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/forms/widgets/kexidbutils.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,5 @@
+ /* This file is part of the KDE project
+- Copyright (C) 2006 Jaroslaw Staniek <js at iidea.pl>
++ Copyright (C) 2006-2007 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
+@@ -23,11 +23,13 @@
+ #include <kiconloader.h>
+
+ #include <kexidb/queryschema.h>
++#include <kexidb/utils.h>
+ #include <formeditor/widgetlibrary.h>
+ #include <kexiutils/utils.h>
+ #include "../kexiformpart.h"
+-#include <widget/utils/kexiimagecontextmenu.h>
++#include <widget/utils/kexicontextmenuutils.h>
+
++
+ QColor lighterGrayBackgroundColor(const QPalette& palette)
+ {
+ return KexiUtils::blendedColors(palette.active().background(), palette.active().base(), 1, 2);
+@@ -59,7 +61,9 @@
+ icon = KexiFormPart::library()->iconName(dynamic_cast<QWidget*>(m_iface)->className());
+
+ m_contextMenuHasTitle = m_iface->columnInfo() ?
+- KexiImageContextMenu::updateTitle(m_contextMenu, m_iface->columnInfo()->captionOrAliasOrName(), icon)
++ KexiContextMenuUtils::updateTitle(m_contextMenu,
++ m_iface->columnInfo()->captionOrAliasOrName(),
++ KexiDB::simplifiedTypeName(*m_iface->columnInfo()->field), icon)
+ : false;
+
+ if (!m_contextMenuHasTitle)
+--- kexi/plugins/forms/widgets/kexidbcombobox.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/forms/widgets/kexidbcombobox.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -308,6 +308,8 @@
+ popup()->hide();
+ return true;
+ }
++ if (ke->state() == Qt::NoButton && (k==Qt::Key_PageDown || k==Qt::Key_PageUp) && popupVisible)
++ return true;
+ return false;
+ }
+
+@@ -361,6 +363,12 @@
+ if (handleKeyPressEvent(static_cast<QKeyEvent*>(e)))
+ return true;
+ }
++ else if (e->type()==QEvent::FocusOut) {
++ if (popup() && popup()->isVisible()) {
++ popup()->hide();
++ undoChanges();
++ }
++ }
+ }
+ else if (!d->isEditable && d->subWidgetsWithDisabledEvents && d->subWidgetsWithDisabledEvents->find(o)) {
+ if (e->type()==QEvent::MouseButtonPress) {
+@@ -435,6 +443,8 @@
+ {
+ //// use KexiDBAutoField instead of KexiComboBoxBase::setValueInternal
+ //// expects existing popup(), but we want to have delayed creation
++ if (popup())
++ popup()->hide();
+ KexiComboBoxBase::setValueInternal(add, removeOld);
+ }
+
+--- kexi/plugins/forms/widgets/kexidbform.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/forms/widgets/kexidbform.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,7 +1,7 @@
+ /* This file is part of the KDE project
+ Copyright (C) 2004 Lucijan Busch <lucijan at kde.org>
+ Copyright (C) 2004 Cedric Pasteur <cedric.pasteur at free.fr>
+- Copyright (C) 2005-2006 Jaroslaw Staniek <js at iidea.pl>
++ Copyright (C) 2005-2007 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
+@@ -36,18 +36,6 @@
+ class KexiDataAwareObjectInterface;
+ class KexiFormScrollView;
+
+-#define SET_FOCUS_USING_REASON(widget, reason) \
+- { QEvent fe( QEvent::FocusIn ); \
+- QFocusEvent::setReason(reason); \
+- QApplication::sendEvent( widget, &fe ); \
+- QFocusEvent::resetReason(); }
+-
+-#define UNSET_FOCUS_USING_REASON(widget, reason) \
+- { QEvent fe( QEvent::FocusOut ); \
+- QFocusEvent::setReason(reason); \
+- QApplication::sendEvent( widget, &fe ); \
+- QFocusEvent::resetReason(); }
+-
+ //! @short A DB-aware form widget, acting as form's toplevel widget
+ class KEXIFORMUTILS_EXPORT KexiDBForm :
+ public KexiDBFormBase,
+@@ -128,7 +116,10 @@
+ //! no effect
+ virtual void setValueInternal(const QVariant&, bool) {}
+
++ //! Used to emit handleDragMoveEvent() signal needed to control dragging over the container's surface
+ virtual void dragMoveEvent( QDragMoveEvent *e );
++
++ //! Used to emit handleDropEvent() signal needed to control dropping on the container's surface
+ virtual void dropEvent( QDropEvent *e );
+
+ //! called from KexiFormScrollView::initDataContents()
+--- kexi/plugins/forms/widgets/kexiframe.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/forms/widgets/kexiframe.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,5 @@
+ /* This file is part of the KDE project
+- Copyright (C) 2005-2006 Jaroslaw Staniek <js at iidea.pl>
++ Copyright (C) 2005-2007 Jaroslaw Staniek <js at iidea.pl>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+@@ -57,10 +57,23 @@
+ void setFrameShadow( KexiFrame::Shadow shadow );
+ #endif
+
++ //! Used to emit handleDragMoveEvent() signal needed to control dragging over the container's surface
++ virtual void dragMoveEvent( QDragMoveEvent *e );
++
++ //! Used to emit handleDropEvent() signal needed to control dropping on the container's surface
++ virtual void dropEvent( QDropEvent *e );
++
+ public slots:
+ virtual void setPalette( const QPalette &pal );
+ virtual void setFrameColor(const QColor& color);
+
++ signals:
++ //! Needed to control dragging over the container's surface
++ void handleDragMoveEvent(QDragMoveEvent *e);
++
++ //! Needed to control dropping on the container's surface
++ void handleDropEvent(QDropEvent *e);
++
+ protected:
+ virtual void drawFrame( QPainter * );
+
+--- kexi/plugins/forms/widgets/kexidbtextedit.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/forms/widgets/kexidbtextedit.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -23,6 +23,8 @@
+ #include <kexidb/queryschema.h>
+
+ #include <kapplication.h>
++#include <kstdaccel.h>
++#include <kdebug.h>
+
+ #include <qpainter.h>
+
+@@ -34,6 +36,7 @@
+ , m_slotTextChanged_enabled(true)
+ {
+ connect(this, SIGNAL(textChanged()), this, SLOT(slotTextChanged()));
++ installEventFilter(this);
+ }
+
+ KexiDBTextEdit::~KexiDBTextEdit()
+@@ -193,4 +196,14 @@
+ KTextEdit::selectAll();
+ }
+
++void KexiDBTextEdit::keyPressEvent( QKeyEvent *ke )
++{
++ // for instance, Windows uses Ctrl+Tab for moving between tabs, so do not steal this shortcut
++ if (KStdAccel::tabNext().contains( KKey(ke) ) || KStdAccel::tabPrev().contains( KKey(ke) )) {
++ ke->ignore();
++ return;
++ }
++ KTextEdit::keyPressEvent(ke);
++}
++
+ #include "kexidbtextedit.moc"
+--- kexi/plugins/forms/widgets/kexidbimagebox.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/forms/widgets/kexidbimagebox.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -25,9 +25,9 @@
+ #include "kexiframe.h"
+ #include "kexidbutils.h"
+ #include <kexiblobbuffer.h>
+-#include <widget/utils/kexiimagecontextmenu.h>
+
+ class KexiDropDownButton;
++class KexiImageContextMenu;
+
+ //! @short A data-aware, editable image box.
+ /*! Can also act as a normal static image box.
+--- kexi/plugins/forms/widgets/kexidbform.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/forms/widgets/kexidbform.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,7 +1,7 @@
+ /* This file is part of the KDE project
+ Copyright (C) 2004 Lucijan Busch <lucijan at kde.org>
+ Copyright (C) 2004 Cedric Pasteur <cedric.pasteur at free.fr>
+- Copyright (C) 2005-2006 Jaroslaw Staniek <js at iidea.pl>
++ Copyright (C) 2005-2007 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
+@@ -28,12 +28,15 @@
+ #include <kdebug.h>
+
+ #include "kexidbform.h"
++#include "kexiformpart.h"
+ #include "kexiformscrollview.h"
+
+ #include <formeditor/objecttree.h>
+ #include <formeditor/formmanager.h>
++#include <formeditor/widgetlibrary.h>
+ #include <widget/tableview/kexidataawareobjectiface.h>
+ #include <widget/kexiscrollview.h>
++#include <kexiutils/utils.h>
+
+ //! @internal
+ class KexiDBForm::Private
+@@ -393,12 +396,41 @@
+ if (preview()) {
+ QKeyEvent *ke = static_cast<QKeyEvent*>(e);
+ const int key = ke->key();
+- const bool tab = ke->state() == Qt::NoButton && key == Qt::Key_Tab;
+- const bool backtab = ((ke->state() == Qt::NoButton || ke->state() == Qt::ShiftButton) && key == Qt::Key_Backtab)
++ bool tab = ke->state() == Qt::NoButton && key == Qt::Key_Tab;
++ bool backtab = ((ke->state() == Qt::NoButton || ke->state() == Qt::ShiftButton) && key == Qt::Key_Backtab)
+ || (ke->state() == Qt::ShiftButton && key == Qt::Key_Tab);
+ QObject *o = watched; //focusWidget();
+ QWidget* realWidget = dynamic_cast<QWidget*>(o); //will beused below (for tab/backtab handling)
++
+ if (!tab && !backtab) {
++ //for buttons, left/up and right/down keys act like tab/backtab (see qbutton.cpp)
++ if (realWidget->inherits("QButton")) {
++ if (ke->state() == Qt::NoButton && (key == Qt::Key_Right || key == Qt::Key_Down))
++ tab = true;
++ else if (ke->state() == Qt::NoButton && (key == Qt::Key_Left || key == Qt::Key_Up))
++ backtab = true;
++ }
++ }
++
++ if (!tab && !backtab) {
++ // allow the editor widget to grab the key press event
++ while (true) {
++ if (!o || o == dynamic_cast<QObject*>(d->dataAwareObject))
++ break;
++ if (dynamic_cast<KexiFormDataItemInterface*>(o)) {
++ realWidget = dynamic_cast<QWidget*>(o); //will be used below
++ if (realWidget == this) //we have encountered 'this' form surface, give up
++ return false;
++ KexiFormDataItemInterface* dataItemIface = dynamic_cast<KexiFormDataItemInterface*>(o);
++ while (dataItemIface) {
++ if (dataItemIface->keyPressed(ke))
++ return false;
++ dataItemIface = dynamic_cast<KexiFormDataItemInterface*>(dataItemIface->parentInterface()); //try in parent, e.g. in combobox
++ }
++ break;
++ }
++ o = o->parent();
++ }
+ // try to handle global shortcuts at the KexiDataAwareObjectInterface
+ // level (e.g. for "next record" action)
+ int curRow = d->dataAwareObject->currentRow();
+@@ -440,20 +472,6 @@
+ d->dataAwareObject->deleteCurrentRow();
+ return true;
+ }
+- // allow the editor widget to grab the key press event
+- while (true) {
+- if (!o || o == dynamic_cast<QObject*>(d->dataAwareObject))
+- break;
+- if (dynamic_cast<KexiFormDataItemInterface*>(o)) {
+- realWidget = dynamic_cast<QWidget*>(o); //will be used below (for tab/backtab handling)
+- if (realWidget == this) //we have encountered 'this' form surface, give up
+- return false;
+- if (dynamic_cast<KexiFormDataItemInterface*>(o)->keyPressed(ke))
+- return false;
+- break;
+- }
+- o = o->parent();
+- }
+ }
+ // handle Esc key
+ if (ke->state() == Qt::NoButton && key == Qt::Key_Escape) {
+@@ -471,6 +489,11 @@
+ return true;
+
+ if (tab || backtab) {
++ //the watched widget can be a subwidget of a real widget, e.g. a drop down button of image box: find it
++ while (!KexiFormPart::library()->widgetInfoForClassName(realWidget->className()))
++ realWidget = realWidget->parentWidget();
++ if (!realWidget)
++ return true; //ignore
+ //the watched widget can be a subwidget of a real widget, e.g. autofield: find it
+ //QWidget* realWidget = static_cast<QWidget*>(watched);
+ while (dynamic_cast<KexiDataItemInterface*>(realWidget) && dynamic_cast<KexiDataItemInterface*>(realWidget)->parentInterface())
+@@ -478,50 +501,69 @@
+
+ d->setOrderedFocusWidgetsIteratorTo( realWidget );
+ kexipluginsdbg << realWidget->name() << endl;
+- if (tab) {
+- if (d->orderedFocusWidgets.first() && realWidget == d->orderedFocusWidgets.last()) {
+- d->orderedFocusWidgetsIterator.toFirst();
++
++ // find next/prev widget to focus
++ QWidget *widgetToUnfocus = realWidget;
++ QWidget *widgetToFocus = 0;
++ bool wasAtFirstWidget = false; //used to protect against infinite loop
++ while (true) {
++ if (tab) {
++ if (d->orderedFocusWidgets.first() && realWidget == d->orderedFocusWidgets.last()) {
++ if (wasAtFirstWidget)
++ break;
++ d->orderedFocusWidgetsIterator.toFirst();
++ wasAtFirstWidget = true;
++ }
++ else if (realWidget == d->orderedFocusWidgetsIterator.current()) {
++ ++d->orderedFocusWidgetsIterator; //next
++ }
++ else
++ return true; //ignore
+ }
+- else if (realWidget == d->orderedFocusWidgetsIterator.current()) {
+-/* QEvent fe( QEvent::FocusOut );
+- QFocusEvent::setReason(QFocusEvent::Tab);
+- QApplication::sendEvent( d->orderedFocusWidgetsIterator.current(), &fe );
+- QFocusEvent::resetReason();*/
+- ++d->orderedFocusWidgetsIterator; //next
++ else {//backtab
++ if (d->orderedFocusWidgets.last() && realWidget == d->orderedFocusWidgets.first()) {
++ d->orderedFocusWidgetsIterator.toLast();
++ }
++ else if (realWidget == d->orderedFocusWidgetsIterator.current()) {
++ --d->orderedFocusWidgetsIterator; //prev
++ }
++ else
++ return true; //ignore
+ }
+- else
+- return true; //ignore
+- //set focus, but don't use just setFocus() because certain widgets
+- //behaves differently (e.g. QLineEdit calls selectAll()) when
+- //focus event's reason is QFocusEvent::Tab
+- QWidget *widgetToFocus = d->orderedFocusWidgetsIterator.current();
+- if (widgetToFocus->focusProxy())
+- widgetToFocus = widgetToFocus->focusProxy();
+- if (widgetToFocus && d->dataAwareObject->acceptEditor()) {//try to accept this will validate the current
+- //input (if any)
+- UNSET_FOCUS_USING_REASON(realWidget, QFocusEvent::Tab);
+- SET_FOCUS_USING_REASON(widgetToFocus, QFocusEvent::Tab);
++
++ widgetToFocus = d->orderedFocusWidgetsIterator.current();
++
++ QObject *pageFor_widgetToFocus = 0;
++ KFormDesigner::TabWidget *tabWidgetFor_widgetToFocus
++ = KFormDesigner::findParent<KFormDesigner::TabWidget>(
++ widgetToFocus, "KFormDesigner::TabWidget", pageFor_widgetToFocus);
++ if (tabWidgetFor_widgetToFocus && tabWidgetFor_widgetToFocus->currentPage()!=pageFor_widgetToFocus) {
++ realWidget = widgetToFocus;
++ continue; //the new widget to focus is placed on invisible tab page: move to next widget
++ }
++ break;
++ }//while
++
++ //set focus, but don't use just setFocus() because certain widgets
++ //behaves differently (e.g. QLineEdit calls selectAll()) when
++ //focus event's reason is QFocusEvent::Tab
++ if (widgetToFocus->focusProxy())
++ widgetToFocus = widgetToFocus->focusProxy();
++ if (widgetToFocus && d->dataAwareObject->acceptEditor()) {
++ if (tab) {
++ //try to accept this will validate the current input (if any)
++ KexiUtils::unsetFocusWithReason(widgetToUnfocus, QFocusEvent::Tab);
++ KexiUtils::setFocusWithReason(widgetToFocus, QFocusEvent::Tab);
+ kexipluginsdbg << "focusing " << widgetToFocus->name() << endl;
+ }
+- return true;
+- } else if (backtab) {
+- if (d->orderedFocusWidgets.last() && realWidget == d->orderedFocusWidgets.first()) {
+- d->orderedFocusWidgetsIterator.toLast();
+- }
+- else if (realWidget == d->orderedFocusWidgetsIterator.current()) {
+- --d->orderedFocusWidgetsIterator; //prev
+- }
+- else
+- return true; //ignore
+- if (d->dataAwareObject->acceptEditor()) {//try to accept this will validate the current
+- //input (if any)
+- UNSET_FOCUS_USING_REASON(realWidget, QFocusEvent::Backtab);
++ else {//backtab
++ KexiUtils::unsetFocusWithReason(widgetToUnfocus, QFocusEvent::Backtab);
+ //set focus, see above note
+- SET_FOCUS_USING_REASON(d->orderedFocusWidgetsIterator.current(), QFocusEvent::Backtab);
++ KexiUtils::setFocusWithReason(d->orderedFocusWidgetsIterator.current(), QFocusEvent::Backtab);
+ kexipluginsdbg << "focusing " << d->orderedFocusWidgetsIterator.current()->name() << endl;
+ }
+- return true;
+ }
++ return true;
+ }
+ }
+ }
+@@ -630,11 +672,13 @@
+
+ void KexiDBForm::dragMoveEvent( QDragMoveEvent *e )
+ {
++ KexiDBFormBase::dragMoveEvent( e );
+ emit handleDragMoveEvent(e);
+ }
+
+ void KexiDBForm::dropEvent( QDropEvent *e )
+ {
++ KexiDBFormBase::dropEvent( e );
+ emit handleDropEvent(e);
+ }
+
+--- kexi/plugins/forms/widgets/kexidbutils.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/forms/widgets/kexidbutils.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,5 @@
+ /* This file is part of the KDE project
+- Copyright (C) 2006 Jaroslaw Staniek <js at iidea.pl>
++ Copyright (C) 2006-2007 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
+--- kexi/plugins/forms/Makefile.am (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/forms/Makefile.am (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -16,6 +16,7 @@
+ kformdesigner_kexidbwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined
+ kformdesigner_kexidbwidgets_la_SOURCES = kexidbfactory.cpp
+ kformdesigner_kexidbwidgets_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la \
++ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
+ ./libkexiformutils.la
+
+ lib_LTLIBRARIES = libkexiformutils.la
+--- kexi/plugins/migration/keximigrationhandler.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/migration/keximigrationhandler.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -19,6 +19,7 @@
+ GenericName[ga]=Breiseán Migration
+ GenericName[gl]=Plugin de Migración
+ GenericName[he]=תוסף Migration
++GenericName[hr]=Migracijski dodatak
+ GenericName[hu]=Migrálási modul
+ GenericName[is]=Gagnaflutnings íforrit
+ GenericName[it]=Plugin di migrazione
+@@ -28,6 +29,7 @@
+ GenericName[ms]=Plugin Migrasi
+ GenericName[nb]=Programtillegg for migrering
+ GenericName[nds]=Datenutlagern-Moduul
++GenericName[ne]=माइग्रेसन प्लगइन
+ GenericName[nl]=Migratieplugin
+ GenericName[nn]=Programtillegg for migrering
+ GenericName[pl]=Wtyczka migracji
+@@ -60,6 +62,7 @@
+ Name[gl]=Plugin de Migración
+ Name[he]=תוסף Migration
+ Name[hi]=माइग्रेशन प्लगइन
++Name[hr]=Migracijski dodatak
+ Name[hu]=Migrálási modul
+ Name[is]=Gagnaflutnings íforrit
+ Name[it]=Plugin di migrazione
+@@ -69,6 +72,7 @@
+ Name[ms]=Plugin Migrasi
+ Name[nb]=Programtillegg for migrering
+ Name[nds]=Datenutlagern-Moduul
++Name[ne]=माइग्रेसन प्लगइन
+ Name[nl]=Migratieplugin
+ Name[nn]=Programtillegg for migrering
+ Name[pl]=Wtyczka migracji
+--- kexi/plugins/tables/kexitabledesignerview_p.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/tables/kexitabledesignerview_p.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -87,6 +87,10 @@
+ KCommandHistory::redo();
+ }
+
++void CommandHistory::clear() {
++ KCommandHistory::clear(); m_commandsToUndo.clear();
++}
++
+ //----------------------------------------------
+
+ KexiTableDesignerViewPrivate::KexiTableDesignerViewPrivate(KexiTableDesignerView* aDesignerView)
+@@ -265,13 +269,13 @@
+ return changed;
+ }
+
+-QString KexiTableDesignerViewPrivate::messageForSavingChanges(bool &emptyTable)
++QString KexiTableDesignerViewPrivate::messageForSavingChanges(bool &emptyTable, bool skipWarning)
+ {
+ KexiDB::Connection *conn = designerView->mainWin()->project()->dbConnection();
+ bool ok;
+ emptyTable = conn->isEmpty( *designerView->tempData()->table, ok ) && ok;
+ return i18n("Do you want to save the design now?")
+- + ( emptyTable ? QString::null :
++ + ( (emptyTable || skipWarning) ? QString::null :
+ (QString("\n\n") + designerView->part()->i18nMessage(":additional message before saving design",
+ designerView->parentDialog())) );
+ }
+--- kexi/plugins/tables/kexitabledesignerview_p.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/tables/kexitabledesignerview_p.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -57,6 +57,8 @@
+
+ void addCommand(KCommand *command, bool execute = true);
+
++ void clear();
++
+ public slots:
+ virtual void undo();
+ virtual void redo();
+@@ -117,7 +119,11 @@
+ bool updatePropertiesVisibility(KexiDB::Field::Type fieldType, KoProperty::Set &set,
+ CommandGroup *commandGroup = 0);
+
+- QString messageForSavingChanges(bool &emptyTable);
++ /*! \return message used to ask user for accepting saving the design.
++ \a emptyTable is set to true if the table designed contains no rows.
++ If \a skipWarning is true, no warning about data loss is appended (useful when
++ only non-physical altering actions will be performed). */
++ QString messageForSavingChanges(bool &emptyTable, bool skipWarning = false);
+
+ /*! Updates icon in the first column, depending on property set \a set.
+ For example, when "rowSource" and "rowSourceType" propertiesa are not empty,
+--- kexi/plugins/tables/kexitablepartinstui.rc (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/tables/kexitablepartinstui.rc (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,5 @@
+ <!DOCTYPE kpartgui>
+-<kpartgui name="kexitablepartinst" version="5">
++<kpartgui name="kexitablepartinst" version="6">
+
+ <MenuBar>
+ <Menu name="edit" noMerge="0">
+@@ -9,7 +9,7 @@
+ </Menu>
+ </MenuBar>
+
+-<ToolBar name="design" fullWidth="false" noMerge="0">
++<ToolBar name="designToolBar" fullWidth="false" noMerge="0">
+ <text>Design</text>
+ <!-- Design View -->
+ <!-- TODO: reenable after shared toggle actions fix: Action name="tablepart_toggle_pkey"/ -->
+--- kexi/plugins/tables/kexitabledesignerview.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/tables/kexitabledesignerview.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -182,6 +182,7 @@
+ plugSharedAction("tablepart_toggle_pkey", this, SLOT(slotTogglePrimaryKey()));
+ d->action_toggle_pkey = static_cast<KToggleAction*>( sharedAction("tablepart_toggle_pkey") );
+ d->action_toggle_pkey->plug(d->view->contextMenu(), 1); //add at the beginning
++ d->view->contextMenu()->insertSeparator(2);
+ setAvailable("tablepart_toggle_pkey", !conn->isReadOnly());
+
+ #ifndef KEXI_NO_UNDOREDO_ALTERTABLE
+@@ -600,7 +601,8 @@
+ bool emptyTable;
+ int r = KMessageBox::warningYesNoCancel(this,
+ i18n("Saving changes for existing table design is now required.")
+- + "\n" + d->messageForSavingChanges(emptyTable), QString::null,
++ + "\n" + d->messageForSavingChanges(emptyTable, /* skip warning? */!isPhysicalAlteringNeeded()),
++ QString::null,
+ KStdGuiItem::save(), KStdGuiItem::discard(), QString::null,
+ KMessageBox::Notify|KMessageBox::Dangerous);
+ if (r == KMessageBox::Cancel)
+@@ -1463,7 +1465,7 @@
+ //! @todo temp; remove this case:
+ delete alterTableHandler;
+ alterTableHandler = 0;
+- // - inform about removing the current table and ask for confimation
++ // - inform about removing the current table and ask for confirmation
+ if (!d->dontAskOnStoreData && !dontAsk) {
+ bool emptyTable;
+ const QString msg = d->messageForSavingChanges(emptyTable);
+@@ -1505,6 +1507,7 @@
+ //change current schema
+ tempData()->table = newTable;
+ tempData()->tableSchemaChangedInPreviousView = true;
++ d->history->clear();
+ }
+ else {
+ delete newTable;
+@@ -1914,4 +1917,27 @@
+ ->assignPropertySet(propertySet());
+ }
+
++bool KexiTableDesignerView::isPhysicalAlteringNeeded()
++{
++ //- create action list for the alter table handler
++ KexiDB::AlterTableHandler::ActionList actions;
++ tristate res = buildAlterTableActions( actions );
++ if (res != true)
++ return true;
++
++ KexiDB::Connection *conn = mainWin()->project()->dbConnection();
++ KexiDB::AlterTableHandler *alterTableHandler = new KexiDB::AlterTableHandler( *conn );
++ alterTableHandler->setActions(actions);
++
++ //only compute requirements
++ KexiDB::AlterTableHandler::ExecutionArguments args;
++ args.onlyComputeRequirements = true;
++ (void)alterTableHandler->execute(tempData()->table->name(), args);
++ res = args.result;
++ delete alterTableHandler;
++ if (res == true && 0 == (args.requirements & (0xffff ^ KexiDB::AlterTableHandler::SchemaAlteringRequired)))
++ return false;
++ return true;
++}
++
+ #include "kexitabledesignerview.moc"
+--- kexi/plugins/tables/kexitabledesignerview.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/tables/kexitabledesignerview.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -245,6 +245,12 @@
+ //! Reimplemented to pass the information also to the "Lookup" tab
+ virtual void propertySetSwitched();
+
++ /*! \return true if physical altering is needed for the current list of actions.
++ Used in KexiTableDesignerView::beforeSwitchTo() to avoid warning about removinf
++ table data if table recreating is not needed.
++ True is also returned if there is any trouble with getting the answer. */
++ bool isPhysicalAlteringNeeded();
++
+ private:
+ KexiTableDesignerViewPrivate *d;
+ };
+--- kexi/plugins/tables/kexitablehandler.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/tables/kexitablehandler.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -22,6 +22,7 @@
+ GenericName[gl]=Táboas
+ GenericName[he]=טבלאות
+ GenericName[hi]=तालिका
++GenericName[hr]=Tablice
+ GenericName[hu]=Táblák
+ GenericName[is]=Töflur
+ GenericName[it]=Tabelle
+@@ -31,6 +32,7 @@
+ GenericName[ms]=Jadual
+ GenericName[nb]=Tabeller
+ GenericName[nds]=Tabellen
++GenericName[ne]=तालिका
+ GenericName[nl]=Tabellen
+ GenericName[nn]=Tabellar
+ GenericName[pl]=Tabele
+@@ -68,6 +70,7 @@
+ Name[gl]=Táboas
+ Name[he]=טבלאות
+ Name[hi]=टेबल्स
++Name[hr]=Tablice
+ Name[hu]=Táblák
+ Name[is]=Töflur
+ Name[it]=Tabelle
+@@ -77,6 +80,7 @@
+ Name[ms]=Jadual
+ Name[nb]=Tabeller
+ Name[nds]=Tabellen
++Name[ne]=तालिकाहरू
+ Name[nl]=Tabellen
+ Name[nn]=Tabellar
+ Name[pl]=Tabele
+--- kexi/plugins/importexport/csv/kexicsvimportdialog.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/importexport/csv/kexicsvimportdialog.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -300,6 +300,7 @@
+ m_timeRegExp1 = QRegExp("(\\d{1,2}):(\\d{1,2}):(\\d{1,2})");
+ m_timeRegExp2 = QRegExp("(\\d{1,2}):(\\d{1,2})");
+ m_fpNumberRegExp = QRegExp("[\\-]{0,1}\\d*[,\\.]\\d+");
++ QString caption( i18n("Open CSV Data File") );
+
+ if (m_mode == File) {
+ QStringList mimetypes( csvMimeTypes() );
+@@ -309,7 +310,7 @@
+ m_fname = QFileDialog::getOpenFileName(
+ KFileDialog::getStartURL(":CSVImportExport", recentDir).path(),
+ KexiUtils::fileDialogFilterStrings(mimetypes, false),
+- page, "KexiCSVImportDialog", i18n("Open CSV Data File"));
++ page, "KexiCSVImportDialog", caption);
+ if ( !m_fname.isEmpty() ) {
+ //save last visited path
+ KURL url;
+@@ -318,7 +319,8 @@
+ KRecentDirs::add(":CSVImportExport", url.directory());
+ }
+ #else
+- m_fname = KFileDialog::getOpenFileName(":CSVImportExport", mimetypes.join(" "), this);
++ m_fname = KFileDialog::getOpenFileName(":CSVImportExport", mimetypes.join(" "),
++ this, caption);
+ #endif
+ //cancel action !
+ if ( m_fname.isEmpty() )
+--- kexi/plugins/importexport/csv/kexicsv_importexporthandler.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/importexport/csv/kexicsv_importexporthandler.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,6 +4,7 @@
+ ServiceTypes=Kexi/Handler
+
+ Name=Kexi CSV Data Import/Export Plugin
++Name[bg]=Приставка за импортиране/експортиране от CSV в Kexi
+ Name[ca]=Connector d'importació/Exportació de dades CVS per a Kexi
+ Name[da]=Kexi CSV data-import/eksport plugin
+ Name[de]=Kexi CSV-Daten Import/Export-Plugin
+@@ -18,10 +19,11 @@
+ Name[is]=Kexi CSV gagna inn/útflutnings íforrit
+ Name[it]=Importazione ed esportazione di dati CSV di Kexi
+ Name[ja]=Kexi CSV データ インポート/エクスポートプラグイン
+-Name[km]=កម្មវិធីជំនួយក្នុងការនាំចេញ និង នាំចូលទិន្នន័យ CSV សម្រាប់ Kexi
++Name[km]=កម្មវិធីជំនួយក្នុងការនាំចេញ និងនាំចូលទិន្នន័យ CSV សម្រាប់ Kexi
+ Name[lv]=Kexi CSV datu importa/eksporta spraudnis
+ Name[nb]=CSV-data import/eksportfilter for Kexi
+ Name[nds]=CSV-Datenimport-/exportmoduul för Kexi
++Name[ne]=केक्सी CSV डेटा आयात/निर्यात प्लगइन
+ Name[nl]=Kexi import/exportplugin voor CSV-gegevens
+ Name[pl]=Wtyczka importu/eksportu danych CSV dla Kexi
+ Name[pt]=Importação de Dados CSV do Kexi
+--- kexi/plugins/queries/kexiqueryhandler.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/queries/kexiqueryhandler.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -31,6 +31,7 @@
+ GenericName[ms]=Pertanyaan
+ GenericName[nb]=Spørringer
+ GenericName[nds]=Affragen
++GenericName[ne]=क्वेरीहरू
+ GenericName[nn]=Spørjingar
+ GenericName[pl]=Zapytania
+ GenericName[pt]=Pesquisas
+@@ -76,6 +77,7 @@
+ Name[ms]=Pertanyaan
+ Name[nb]=Spørringer
+ Name[nds]=Affragen
++Name[ne]=क्वेरीहरू
+ Name[nn]=Spørjingar
+ Name[pl]=Zapytania
+ Name[pt]=Procuras
+--- kexi/plugins/queries/kexiqueryview.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/queries/kexiqueryview.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -96,8 +96,11 @@
+ if (oldCursor)
+ oldCursor->connection()->deleteCursor(oldCursor);
+
+- //TODO: maybe allow writing and inserting for single-table relations?
++//! @todo maybe allow writing and inserting for single-table relations?
+ tableView()->setReadOnly( true );
++//! @todo maybe allow writing and inserting for single-table relations?
++ //set data model itself read-only too
++ tableView()->data()->setReadOnly( true );
+ tableView()->setInsertingEnabled( false );
+ return true;
+ }
+--- kexi/plugins/queries/kexiquerydesignerguieditor.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/queries/kexiquerydesignerguieditor.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1139,6 +1139,7 @@
+
+ KexiDB::Connection::SelectStatementOptions options;
+ options.identifierEscaping = KexiDB::Driver::EscapeKexi|KexiDB::Driver::EscapeAsNecessary;
++ options.addVisibleLookupColumns = false;
+ QString sqlText = dbConn->selectStatement( *temp->query(), options );
+ if (!storeDataBlock( sqlText, "sql" )) {
+ return false;
+--- kexi/plugins/queries/kexiquerydesignersql.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/queries/kexiquerydesignersql.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -248,7 +248,7 @@
+ //this view is no longer _just_ switched from "NoViewMode"
+ d->justSwitchedFromNoViewMode = false;
+ //replace old query schema with new one
+- temp->setQuery( d->parsedQuery ); //this wil also delete temp->query()
++ temp->setQuery( d->parsedQuery ); //this will also delete temp->query()
+ // delete temp->query; //safe?
+ // temp->query = d->parsedQuery;
+ d->parsedQuery = 0;
+@@ -313,6 +313,7 @@
+ KexiDB::Connection* conn = mainWin()->project()->dbConnection();
+ KexiDB::Connection::SelectStatementOptions options;
+ options.identifierEscaping = KexiDB::Driver::EscapeKexi;
++ options.addVisibleLookupColumns = false;
+ d->origStatement = conn->selectStatement(*query, options).stripWhiteSpace();
+ }
+
+--- kexi/plugins/queries/kexiquerypartinstui.rc (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/queries/kexiquerypartinstui.rc (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,5 @@
+ <!DOCTYPE kpartgui>
+-<kpartgui name="kexiquerypartinst" version="3">
++<kpartgui name="kexiquerypartinst" version="4">
+
+ <MenuBar>
+ <Menu name="view" noMerge="1">
+@@ -14,7 +14,7 @@
+ </Menu>
+ </MenuBar>
+
+-<ToolBar name="design" fullWidth="false" noMerge="0">
++<ToolBar name="designToolBar" fullWidth="false" noMerge="0">
+ <text>Design</text>
+ <Action name="querypart_check_query"/>
+ <Action name="querypart_execute_query"/>
+--- kexi/plugins/reports/kexireporthandler.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/reports/kexireporthandler.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,6 +4,7 @@
+ ServiceTypes=Kexi/Handler
+
+ GenericName=Reports
++GenericName[bg]=Отчети
+ GenericName[ca]=Informes
+ GenericName[cs]=Sestavy
+ GenericName[cy]=Adroddiadau
+@@ -29,6 +30,7 @@
+ GenericName[ms]=Laporan
+ GenericName[nb]=Rapporter
+ GenericName[nds]=Berichten
++GenericName[ne]=प्रतिवेदनहरू
+ GenericName[nl]=Rapporten
+ GenericName[nn]=Rapportar
+ GenericName[pl]=Raporty
+@@ -46,6 +48,7 @@
+ GenericName[zh_CN]=报表
+ GenericName[zh_TW]=報告
+ Name=Reports
++Name[bg]=Отчети
+ Name[ca]=Informes
+ Name[cs]=Sestavy
+ Name[cy]=Adroddiadau
+@@ -71,6 +74,7 @@
+ Name[ms]=Laporan
+ Name[nb]=Rapporter
+ Name[nds]=Berichten
++Name[ne]=प्रतिवेदनहरू
+ Name[nl]=Rapporten
+ Name[nn]=Rapportar
+ Name[pl]=Raporty
+--- kexi/plugins/reports/kformdesigner_kexireportfactory.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/plugins/reports/kformdesigner_kexireportfactory.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,6 +4,7 @@
+ ServiceTypes=KFormDesigner/WidgetFactory
+
+ Name=Kexi Report Widgets
++Name[bg]=Графични елементи за отчети на Kexi
+ Name[ca]=Estris d'informe de Kexi
+ Name[cy]=Celfigion Adroddiad i Kexi
+ Name[da]=Kexi Rapportkontroller
+@@ -17,6 +18,7 @@
+ Name[fr]=Éléments de rapport Kexi
+ Name[gl]=Elementos de Informe de Kexi
+ Name[he]=פריטי דו"חות של Kexi
++Name[hr]=Kexi widgeti izvještaja
+ Name[hu]=Kexi jelentéskezelő grafikus elemek
+ Name[is]=Kexi skýrslu hlutar
+ Name[it]=Oggetti dei rapporti per Kexi
+@@ -26,6 +28,7 @@
+ Name[ms]=Widget Laporan Kexi
+ Name[nb]=Skjermelement for Kexi-rapport
+ Name[nds]=Bericht-Elementen för Kexi
++Name[ne]=केक्सी प्रतिवेदन विजेटहरू
+ Name[nl]=Kexi Rapportwidgets
+ Name[nn]=Skjermelement for Kexi-rapport
+ Name[pl]=Kontrolki raportów dla Kexi
+--- kexi/widget/tableview/kexiblobtableedit.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/widget/tableview/kexiblobtableedit.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -57,7 +57,7 @@
+
+ #include <kexiutils/utils.h>
+ #include <widget/utils/kexidropdownbutton.h>
+-#include <widget/utils/kexiimagecontextmenu.h>
++#include <widget/utils/kexicontextmenuutils.h>
+
+ //! @internal
+ class KexiBlobTableEdit::Private
+@@ -93,6 +93,7 @@
+ QToolTip::add(d->button, i18n("Click to show available actions for this cell"));
+
+ d->popup = new KexiImageContextMenu(this);
++ d->popup->installEventFilter(this);
+ if (column.columnInfo)
+ KexiImageContextMenu::updateTitle( d->popup, column.columnInfo->captionOrAliasOrName(),
+ //! @todo pixmaplabel icon is hardcoded...
+@@ -162,47 +163,6 @@
+
+ setViewWidget( new QWidget(this) );
+ #endif
+-
+-/*js: TODO
+- QGridLayout *g = new QGridLayout(m_view);
+-
+- if(mmr->mimeType().contains("text/") || val.size() == 0)
+- {
+- m_content = new QTextEdit(m_view);
+- m_content->setTextFormat(PlainText);
+- m_content->setText(QString(val));
+- g->addWidget(m_content, 0, 0);
+- }
+- else
+- {
+- QLabel *l = new QLabel("", this);
+-// g->addMultiCellWidget(l, 0, 1, 0, 1);
+- g->addMultiCellWidget(l, 0, 2, 0, 1);
+- if(mmr->mimeType().contains("image/"))
+- {
+- //sale the image to the maximal allowed size by optaining the aspect ratio
+- QImage pix(m_tempFile->name());
+- pix = pix.smoothScale(m_view->width(), l->height(), QImage::ScaleMin);
+-
+- l->setScaledContents(true);
+- l->setPixmap(QPixmap(pix));
+- }
+- else
+- {
+- l->setPixmap(KMimeType::pixmapForURL(KURL(m_tempFile->name())));
+- }
+-
+-// QLabel *l = new QLabel(this);
+- QLabel *lsize = new QLabel(i18n("Size:"), this);
+- QLabel *size = new QLabel(QString::number(val.size()) + " bytes", this);
+- g->addMultiCellWidget(lsize, 2, 2, 0, 0);
+- g->addMultiCellWidget(size, 2, 2, 1, 1);
+- }
+-
+- KArrowButton *menu = new KArrowButton(m_view, Qt::DownArrow, "Menu button");
+- g->addWidget(menu, 3, 0);
+- connect(menu, SIGNAL(clicked()), SLOT(menu()));
+-*/
+ }
+
+ bool KexiBlobTableEdit::valueIsNull()
+@@ -271,131 +231,6 @@
+ }
+ }
+
+-/*todo
+-void
+-KexiBlobTableEdit::slotFinished(KProcess* p)
+-{
+- kdDebug() << "Program is finished!" << endl;
+-
+- // No need for m_proc now that the app has exited
+- delete m_proc;
+- m_proc = 0;
+-}
+-
+-QString
+-KexiBlobTableEdit::openWithDlg(const QString& file)
+-{
+- KURL::List ul;
+- KURL url;
+- url.setPath(file);
+- ul.append(url);
+- QString exec = QString::null;
+-
+- KOpenWithDlg* dlg = new KOpenWithDlg(ul, this);
+-
+- if(dlg->exec() == QDialog::Accepted)
+- {
+- exec = dlg->text().section(' ', 0, 0);
+- }
+-
+- delete dlg;
+- dlg = 0;
+-
+- return exec;
+-}
+-
+-void
+-KexiBlobTableEdit::execute(const QString& app, const QString& file)
+-{
+- kdDebug() << "KexiBlobTableEdit: App = " << app << "File = " << file << endl;
+-
+- // only execute if there isn't any other app already running
+- if(!m_proc)
+- {
+- m_proc = new KProcess();
+- *m_proc << app;
+- *m_proc << file;
+- connect(m_proc, SIGNAL(processExited(KProcess *)), SLOT(slotFinished(KProcess *)));
+- m_proc->start();
+- }
+-}
+-
+-void
+-KexiBlobTableEdit::open()
+-{
+- KMimeMagicResult* mmr = KMimeMagic::self()->findFileType(m_tempFile->name());
+- kdDebug() << "KexiBlobTableEdit: Mimetype = " << mmr->mimeType() << endl;
+- KService::Ptr ptr = KServiceTypeProfile::preferredService(mmr->mimeType(), "Application");
+- QString exec;
+-
+- if(!ptr.data())
+- {
+- exec = openWithDlg(m_tempFile->name());
+- }
+- else
+- {
+- exec = ptr->exec().section(' ', 0, 0);
+- }
+-
+- if(!exec.isEmpty())
+- {
+- execute(exec, m_tempFile->name());
+- }
+-}
+-
+-void
+-KexiBlobTableEdit::openWith()
+-{
+- QString exec = openWithDlg(m_tempFile->name());
+-
+- if(!exec.isEmpty())
+- {
+- execute(exec, m_tempFile->name());
+- }
+-}
+-
+-void
+-KexiBlobTableEdit::menu()
+-{
+- QPopupMenu* menu = new QPopupMenu(this, "BLOB Menu");
+-
+- menu->insertItem(i18n("Open"), this, SLOT(open()));
+- menu->insertItem(i18n("Open With..."), this, SLOT(openWith()));
+- menu->insertSeparator();
+- menu->insertItem(i18n("Load From File..."), this, SLOT(loadFile()));
+- menu->insertItem(i18n("Save to File..."), this, SLOT(saveFile()));
+-
+- QPoint pos = mapToGlobal(widget()->pos());
+- pos.setY(pos.y() + widget()->height());
+- menu->move(pos);
+- menu->exec();
+-
+- delete menu;
+- menu = 0;
+-}
+-
+-void
+-KexiBlobTableEdit::loadFile()
+-{
+- QString file = KFileDialog::getOpenFileName();
+-
+- if(!file.isEmpty())
+- {
+- (void) KIO::file_copy(KURL(file), KURL(m_tempFile->name()), -1, true);
+- }
+-}
+-
+-void
+-KexiBlobTableEdit::saveFile()
+-{
+- QString file = KFileDialog::getSaveFileName();
+-
+- if(!file.isEmpty())
+- {
+- (void)KIO::file_copy(KURL(m_tempFile->name()), KURL(file), -1, true);
+- }
+-}*/
+-
+ bool KexiBlobTableEdit::cursorAtStart()
+ {
+ return true;
+@@ -587,6 +422,8 @@
+ else if ((ke->state()==NoButton && (k==Qt::Key_F2 || k==Qt::Key_Space || k==Qt::Key_Enter || k==Qt::Key_Return))) {
+ d->popup->insertFromFile();
+ }
++ else
++ return false;
+ }
+ else
+ return false;
+@@ -616,6 +453,24 @@
+ }
+ }
+
++bool KexiBlobTableEdit::eventFilter( QObject *o, QEvent *e )
++{
++ if (o == d->popup && e->type()==QEvent::KeyPress) {
++ QKeyEvent* ke = static_cast<QKeyEvent*>(e);
++ const int state = ke->state();
++ const int k = ke->key();
++ if ( (state==Qt::NoButton && (k==Qt::Key_Tab || k==Qt::Key_Left || k==Qt::Key_Right))
++ || (state==Qt::ShiftButton && k==Qt::Key_Backtab)
++ )
++ {
++ d->popup->hide();
++ QApplication::sendEvent( this, ke ); //re-send to move cursor
++ return true;
++ }
++ }
++ return false;
++}
++
+ KEXI_CELLEDITOR_FACTORY_ITEM_IMPL(KexiBlobEditorFactoryItem, KexiBlobTableEdit)
+
+ //=======================
+--- kexi/widget/tableview/kexidataawareobjectiface.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/widget/tableview/kexidataawareobjectiface.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,5 @@
+ /* This file is part of the KDE project
+- Copyright (C) 2005-2006 Jaroslaw Staniek <js at iidea.pl>
++ Copyright (C) 2005-2007 Jaroslaw Staniek <js at iidea.pl>
+
+ Based on KexiTableView code.
+ Copyright (C) 2002 Till Busch <till at bux.at>
+@@ -31,6 +31,7 @@
+ #include <qtimer.h>
+ #include <kdebug.h>
+ #include <widget/utils/kexiarrowtip.h>
++#include <kexisearchandreplaceiface.h>
+ #include "kexitableviewdata.h"
+
+ class QObject;
+@@ -474,6 +475,34 @@
+ //! Paste current clipboard contents (e.g. to a cell)
+ virtual void paste() = 0;
+
++ /*! Finds \a valueToFind within the data items
++ \a options are used to control the process. Selection is moved to found value.
++ If \a next is true, "find next" is performed, else "find previous" is performed.
++
++ Searching behaviour also depends on status of the previous search: for every search,
++ position of the cells containing the found value is stored internally
++ by the data-aware interface (not in options).
++ Moreover, position (start, end) of the found value is also stored.
++ Thus, the subsequent search will reuse this information to be able to start
++ searching exactly after the previously found value (or before for "find previous" option).
++ The flags can be zeroed, what will lead to seaching from the first character
++ of the current item (cell).
++
++ \return true if value has been found, false if value has not been found,
++ and cancelled if there is nothing to find or there is no data to search in. */
++ virtual tristate find(const QVariant& valueToFind,
++ const KexiSearchAndReplaceViewInterface::Options& options, bool next);
++
++ /*! Finds \a valueToFind within the data items and replaces with \a replacement
++ \a options are used to control the process.
++ \return true if value has been found and replaced, false if value
++ has not been found and replaced, and cancelled if there is nothing
++ to find or there is no data to search in or the data is read only.
++ If \a replaceAll is true, all found values are replaced. */
++ virtual tristate findNextAndReplace(const QVariant& valueToFind,
++ const QVariant& replacement,
++ const KexiSearchAndReplaceViewInterface::Options& options, bool replaceAll);
++
+ /*! \return vertical scrollbar */
+ virtual QScrollBar* verticalScrollBar() const = 0;
+
+@@ -672,6 +701,13 @@
+ and KMessageBox::Yes or KMessageBox::No in case of "queryYesNo" message. */
+ int showErrorMessageForResult(KexiDB::ResultInfo* resultInfo);
+
++ /*! Prepares array of indices of visible values to search within.
++ This is per-interface global cache.
++ Needed for faster lookup because there could be lookup values.
++ Called whenever columns definition changes, i.e. in setData() and clearColumns().
++ @see find() */
++ void updateIndicesForVisibleValues();
++
+ //! data structure displayed for this object
+ KexiTableViewData *m_data;
+
+@@ -809,6 +845,30 @@
+ QLabel* m_scrollBarTip; //!< scrollbar tooltip
+ QTimer m_scrollBarTipTimer; //!< scrollbar tooltip's timer
+ uint m_scrollBarTipTimerCnt; //!< helper for timeout counting (scrollbar tooltip)
++
++ //! Used to mark recently found value
++ class PositionOfValue {
++ public:
++ PositionOfValue() : firstCharacter(0), lastCharacter(0), exists(false)
++ {}
++ uint firstCharacter;
++ uint lastCharacter;
++ bool exists : 1;
++ };
++
++ /*! Used to mark recently found value. Updated on succesful execution of find().
++ If the current cursor's position changes, or data in the current cell changes,
++ positionOfRecentlyFoundValue.exists is set to false. */
++ PositionOfValue m_positionOfRecentlyFoundValue;
++
++ /*! Used to compare whether we're looking for new value. */
++ QVariant m_recentlySearchedValue;
++
++ /*! Used to compare whether the search direction has changed. */
++ KexiSearchAndReplaceViewInterface::Options::SearchDirection m_recentSearchDirection;
++
++ //! Setup by updateIndicesForVisibleValues() and used by find()
++ QValueVector<uint> m_indicesForVisibleValues;
+ };
+
+ inline bool KexiDataAwareObjectInterface::hasData() const
+--- kexi/widget/tableview/kexitableviewdata.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/widget/tableview/kexitableviewdata.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -86,7 +86,7 @@
+ /*! \return true if the column is read-only
+ For db-aware column this can depend on whether the column
+ is in parent table of this query. \sa setReadOnly() */
+- inline bool isReadOnly() const { return m_readOnly; }
++ bool isReadOnly() const;
+
+ //TODO: synchronize this with table view:
+ //! forces readOnly flag to be set to \a ro
+--- kexi/widget/tableview/kexiblobtableedit.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/widget/tableview/kexiblobtableedit.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -107,6 +107,8 @@
+ //! @internal
+ void executeCopyAction(const QByteArray& data);
+
++ virtual bool eventFilter( QObject *o, QEvent *e );
++
+ class Private;
+ Private *d;
+ //todo KTempFile* m_tempFile;
+--- kexi/widget/tableview/kexidataawareobjectiface.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/widget/tableview/kexidataawareobjectiface.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,5 @@
+ /* This file is part of the KDE project
+- Copyright (C) 2005-2006 Jaroslaw Staniek <js at iidea.pl>
++ Copyright (C) 2005-2007 Jaroslaw Staniek <js at iidea.pl>
+
+ Based on KexiTableView code.
+ Copyright (C) 2002 Till Busch <till at bux.at>
+@@ -76,6 +76,7 @@
+ m_scrollbarToolTipsEnabled = true;
+ m_scrollBarTipTimerCnt = 0;
+ m_scrollBarTip = 0;
++ m_recentSearchDirection = KexiSearchAndReplaceViewInterface::Options::DefaultSearchDirection;
+
+ // setup scrollbar tooltip and related members
+ m_scrollBarTip = new QLabel("",0, "vScrollBarToolTip",
+@@ -204,6 +205,7 @@
+ m_verticalHeader->showInsertRow(m_data && isInsertingEnabled());
+
+ initDataContents();
++ updateIndicesForVisibleValues();
+
+ if (m_data)
+ /*emit*/ dataSet( m_data );
+@@ -224,7 +226,7 @@
+ if (m_data->columnsCount()>0) {
+ if (rows()>0) {
+ m_itemIterator->toFirst();
+- m_currentItem = **m_itemIterator; //m_data->first();
++ m_currentItem = **m_itemIterator;
+ curRow = 0;
+ curCol = 0;
+ }
+@@ -554,7 +556,7 @@
+ m_errorMessagePopup->close();
+ }
+
+- if (m_curRow != newrow) {//update current row info
++ if (m_curRow != newrow || forceSet) {//update current row info
+ m_navPanel->setCurrentRecordNumber(newrow+1);
+ // setNavRowNumber(newrow);
+ // d->navBtnPrev->setEnabled(newrow>0);
+@@ -604,6 +606,10 @@
+ }
+ }
+
++ // position changed, so subsequent searching should be started from scratch
++ // (e.g. from the current cell or the top-left cell)
++ m_positionOfRecentlyFoundValue.exists = false;
++
+ //show editor-dependent focus, if needed
+ editorShowFocus( m_curRow, m_curCol );
+
+@@ -619,7 +625,7 @@
+ // ensureVisible(pcenter.x(), pcenter.y(), columnWidth(d->curCol)/2, rh/2);
+
+ // ensureVisible(columnPos(d->curCol), rowPos(d->curRow) - contentsY(), columnWidth(d->curCol), rh);
+- if (m_verticalHeader && oldRow != m_curRow)
++ if (m_verticalHeader && (oldRow != m_curRow || forceSet))
+ m_verticalHeader->setCurrentRow(m_curRow);
+
+ if (m_updateEntireRowWhenMovingToOtherRow)
+@@ -627,7 +633,7 @@
+ else
+ updateCell( m_curRow, m_curCol );
+
+- if (m_curCol != oldCol || m_curRow != oldRow ) {//ensure this is also refreshed
++ if (m_curCol != oldCol || m_curRow != oldRow || forceSet) {//ensure this is also refreshed
+ if (!m_updateEntireRowWhenMovingToOtherRow) //only if entire row has not been updated
+ updateCell( oldRow, m_curCol );
+ }
+@@ -668,7 +674,7 @@
+ //quite clever: ensure the cell is visible:
+ ensureCellVisible(m_curRow, m_curCol);
+
+- if (m_horizontalHeader && oldCol != m_curCol)
++ if (m_horizontalHeader && (oldCol != m_curCol || forceSet))
+ m_horizontalHeader->setSelectedSection(m_curCol);
+
+ /*emit*/ itemSelected(m_currentItem);
+@@ -1364,6 +1370,7 @@
+ m_data->clearInternal();
+
+ clearColumnsInternal(repaint);
++ updateIndicesForVisibleValues();
+
+ if (repaint)
+ // viewport()->repaint();
+@@ -1839,3 +1846,263 @@
+
+ return KMessageBox::Ok;
+ }
++
++void KexiDataAwareObjectInterface::updateIndicesForVisibleValues()
++{
++ m_indicesForVisibleValues.resize( m_data ? m_data->columnsCount() : 0 );
++ if (!m_data)
++ return;
++ for (uint i=0; i < m_data->columnsCount(); i++) {
++ KexiTableViewColumn* tvCol = m_data->column(i);
++ if (tvCol->columnInfo && tvCol->columnInfo->indexForVisibleLookupValue()!=-1)
++ // retrieve visible value from lookup field
++ m_indicesForVisibleValues[ i ] = tvCol->columnInfo->indexForVisibleLookupValue();
++ else
++ m_indicesForVisibleValues[ i ] = i;
++ }
++}
++
++/*! Performs searching \a stringValue in \a where string.
++ \a matchAnyPartOfField, \a matchWholeField, \a wholeWordsOnly options are used to control how to search.
++
++ If \a matchWholeField is true, \a wholeWordsOnly is not checked.
++ \a firstCharacter is in/out parameter. If \a matchAnyPartOfField is true and \a matchWholeField is false,
++ \a firstCharacter >= 0, the search will be performed after skipping first \a firstCharacter characters.
++
++ If \a forward is false, we are searching backwart from \a firstCharacter position. \a firstCharacter == -1
++ means then the last character. \a firstCharacter == INT_MAX means "before first" place, so searching fails
++ immediately.
++ On success, true is returned and \a firstCharacter is set to position of the matched string. */
++static inline bool findInString(const QString& stringValue, int stringLength, const QString& where,
++ int& firstCharacter, bool matchAnyPartOfField, bool matchWholeField,
++ bool caseSensitive, bool wholeWordsOnly, bool forward)
++{
++ if (where.isEmpty()) {
++ firstCharacter = -1;
++ return false;
++ }
++
++ if (matchAnyPartOfField) {
++ if (forward) {
++ int pos = firstCharacter == -1 ? 0 : firstCharacter;
++ if (wholeWordsOnly) {
++ const int whereLength = where.length();
++ while (true) {
++ pos = where.find( stringValue, pos, caseSensitive );
++ if (pos == -1)
++ break;
++ if ((pos > 0 && where.at(pos-1).isLetterOrNumber())
++ ||((pos+stringLength-1) < (whereLength-1) && where.at(pos+stringLength-1+1).isLetterOrNumber()))
++ {
++ pos++; // invalid match because before or after the string there is non-white space
++ }
++ else
++ break;
++ }//while
++ firstCharacter = pos;
++ }
++ else {// !wholeWordsOnly
++ firstCharacter = where.find( stringValue, pos, caseSensitive );
++ }
++ return firstCharacter != -1;
++ }
++ else { // !matchAnyPartOfField
++ if (firstCharacter == INT_MAX) {
++ firstCharacter = -1; //next time we'll be looking at different cell
++ return false;
++ }
++ int pos = firstCharacter;
++ if (wholeWordsOnly) {
++ const int whereLength = where.length();
++ while (true) {
++ pos = where.findRev( stringValue, pos, caseSensitive );
++ if (pos == -1)
++ break;
++ if ((pos > 0 && where.at(pos-1).isLetterOrNumber())
++ ||((pos+stringLength-1) < (whereLength-1) && where.at(pos+stringLength-1+1).isLetterOrNumber()))
++ {
++ // invalid match because before or after the string there is non-white space
++ pos--;
++ if (pos < 0) // it can make pos < 0
++ break;
++ }
++ else
++ break;
++ }//while
++ firstCharacter = pos;
++ }
++ else {// !wholeWordsOnly
++ firstCharacter = where.findRev( stringValue, pos, caseSensitive );
++ }
++ return firstCharacter != -1;
++ }
++ }
++ else if (matchWholeField) {
++ if (firstCharacter != -1 && firstCharacter != 0) { //we're not at 0-th char
++ firstCharacter = -1;
++ }
++ else if ( (caseSensitive ? where : where.lower()) == stringValue) {
++ firstCharacter = 0;
++ return true;
++ }
++ }
++ else {// matchStartOfField
++ if (firstCharacter != -1 && firstCharacter != 0) { //we're not at 0-th char
++ firstCharacter = -1;
++ }
++ else if (where.startsWith(stringValue, caseSensitive)) {
++ if (wholeWordsOnly) {
++ // If where.length() < stringValue.length(), true will be returned too - fine.
++ return !where.at( stringValue.length() ).isLetterOrNumber();
++ }
++ firstCharacter = 0;
++ return true;
++ }
++ }
++ return false;
++}
++
++tristate KexiDataAwareObjectInterface::find(const QVariant& valueToFind,
++ const KexiSearchAndReplaceViewInterface::Options& options, bool next)
++{
++ if (!hasData())
++ return cancelled;
++ const QVariant prevSearchedValue( m_recentlySearchedValue );
++ m_recentlySearchedValue = valueToFind;
++ const KexiSearchAndReplaceViewInterface::Options::SearchDirection prevSearchDirection = m_recentSearchDirection;
++ m_recentSearchDirection = options.searchDirection;
++ if (valueToFind.isNull() || valueToFind.toString().isEmpty())
++ return cancelled;
++
++ const bool forward = (options.searchDirection == KexiSearchAndReplaceViewInterface::Options::SearchUp)
++ ? !next : next; //direction can be reversed
++
++ if ((!prevSearchedValue.isNull() && prevSearchedValue!=valueToFind)
++ || (prevSearchDirection!=options.searchDirection && options.searchDirection==KexiSearchAndReplaceViewInterface::Options::SearchAllRows))
++ {
++ // restart searching when value has been changed or new direction is SearchAllRows
++ m_positionOfRecentlyFoundValue.exists = false;
++ }
++
++ const bool startFrom1stRowAndCol = !m_positionOfRecentlyFoundValue.exists && next
++ && options.searchDirection == KexiSearchAndReplaceViewInterface::Options::SearchAllRows;
++ const bool startFromLastRowAndCol =
++ (!m_positionOfRecentlyFoundValue.exists && !next && options.searchDirection == KexiSearchAndReplaceViewInterface::Options::SearchAllRows)
++ ||(m_curRow >= rows() && !forward); //we're at "insert" row, and searching backwards: move to the last cell
++
++ if (!startFrom1stRowAndCol && !startFromLastRowAndCol && m_curRow >= rows()) {
++ //we're at "insert" row, and searching forward: no chances to find something
++ return false;
++ }
++ KexiTableViewData::Iterator it( (startFrom1stRowAndCol || startFromLastRowAndCol)
++ ? m_data->iterator() : *m_itemIterator /*start from the current cell*/ );
++ if (startFromLastRowAndCol)
++ it.toLast();
++ int firstCharacter;
++ if (m_positionOfRecentlyFoundValue.exists) {// start after the next/prev char position
++ if (forward)
++ firstCharacter = m_positionOfRecentlyFoundValue.lastCharacter + 1;
++ else {
++ firstCharacter = (m_positionOfRecentlyFoundValue.firstCharacter > 0) ?
++ (m_positionOfRecentlyFoundValue.firstCharacter - 1) : INT_MAX /* this means 'before first'*/;
++ }
++ }
++ else {
++ firstCharacter = -1; //forward ? -1 : INT_MAX;
++ }
++
++ const int columnsCount = m_data->columnsCount();
++ int row, col;
++ if (startFrom1stRowAndCol) {
++ row = 0;
++ col = 0;
++ }
++ else if (startFromLastRowAndCol) {
++ row = rows()-1;
++ col = columnsCount-1;
++ }
++ else {
++ row = m_curRow;
++ col = m_curCol;
++ }
++
++ //sache some flags for efficiency
++ const bool matchAnyPartOfField
++ = options.textMatching == KexiSearchAndReplaceViewInterface::Options::MatchAnyPartOfField;
++ const bool matchWholeField
++ = options.textMatching == KexiSearchAndReplaceViewInterface::Options::MatchWholeField;
++ const bool caseSensitive = options.caseSensitive;
++ const bool wholeWordsOnly = options.wholeWordsOnly;
++//unused const bool promptOnReplace = options.promptOnReplace;
++ int columnNumber = (options.columnNumber == KexiSearchAndReplaceViewInterface::Options::CurrentColumn)
++ ? m_curCol : options.columnNumber;
++ if (columnNumber>=0)
++ col = columnNumber;
++ const bool lookInAllColumns = columnNumber == KexiSearchAndReplaceViewInterface::Options::AllColumns;
++ int firstColumn; // real number of the first column, can be smaller than lastColumn if forward==true
++ int lastColumn; // real number of the last column
++ if (lookInAllColumns) {
++ firstColumn = forward ? 0 : columnsCount-1;
++ lastColumn = forward ? columnsCount-1 : 0;
++ }
++ else {
++ firstColumn = columnNumber;
++ lastColumn = columnNumber;
++ }
++ const QString stringValue( caseSensitive ? valueToFind.toString() : valueToFind.toString().lower() );
++ const int stringLength = stringValue.length();
++
++ // search
++ const int prevRow = m_curRow;
++ KexiTableItem *item;
++ while ( (item = it.current()) ) {
++ for (; forward ? col <= lastColumn : col >= lastColumn;
++ col = forward ? (col+1) : (col-1))
++ {
++ const QVariant cell( item->at( m_indicesForVisibleValues[ col ] ) );
++ if (findInString(stringValue, stringLength, cell.toString(), firstCharacter,
++ matchAnyPartOfField, matchWholeField, caseSensitive, wholeWordsOnly, forward))
++ {
++ //*m_itemIterator = it;
++ //m_currentItem = *it;
++ //m_curRow = row;
++ //m_curCol = col;
++ setCursorPosition(row, col, true/*forceSet*/);
++ if (prevRow != m_curRow)
++ updateRow(prevRow);
++ // remember the exact position for the found value
++ m_positionOfRecentlyFoundValue.exists = true;
++ m_positionOfRecentlyFoundValue.firstCharacter = firstCharacter;
++//! @todo for regexp lastCharacter should be computed
++ m_positionOfRecentlyFoundValue.lastCharacter = firstCharacter + stringLength - 1;
++ return true;
++ }
++ }//for
++ if (forward) {
++ ++it;
++ ++row;
++ }
++ else {
++ --it;
++ --row;
++ }
++ col = firstColumn;
++ }//while
++ return false;
++}
++
++tristate KexiDataAwareObjectInterface::findNextAndReplace(
++ const QVariant& valueToFind, const QVariant& replacement,
++ const KexiSearchAndReplaceViewInterface::Options& options, bool replaceAll)
++{
++ Q_UNUSED(replacement);
++ Q_UNUSED(options);
++ Q_UNUSED(replaceAll);
++
++ if (isReadOnly())
++ return cancelled;
++ if (valueToFind.isNull() || valueToFind.toString().isEmpty())
++ return cancelled;
++ //! @todo implement KexiDataAwareObjectInterface::findAndReplace()
++ return false;
++}
+--- kexi/widget/tableview/kexitableviewdata.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/widget/tableview/kexitableviewdata.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -121,10 +121,15 @@
+ //todo: compute other auto-name?
+ }
+ init();
+- //setup column's readonly flag:
+- // true if it's not from parent table's field or if the query itself is coming read-only connection
+- m_readOnly = (query.masterTable()!=columnInfo->field->table())
++ //setup column's readonly flag: true, if
++ // - it's not from parent table's field, or
++ // - if the query itself is coming from read-only connection, or
++ // - if the query itself is stored (i.e. has connection) and lookup column is defined
++ const bool columnFromMasterTable = query.masterTable()==columnInfo->field->table();
++ m_readOnly = !columnFromMasterTable
+ || (query.connection() && query.connection()->isReadOnly());
++// || (query.connection() && (query.connection()->isReadOnly() || visibleLookupColumnInfo));
++//! @todo 2.0: remove this when queries become editable ^^^^^^^^^^^^^^
+ // kdDebug() << "KexiTableViewColumn: query.masterTable()=="
+ // << (query.masterTable() ? query.masterTable()->name() : "notable") << ", columnInfo->field->table()=="
+ // << (columnInfo->field->table() ? columnInfo->field->table()->name() : "notable") << endl;
+@@ -195,6 +200,11 @@
+ m_relatedDataEditable = set;
+ }
+
++bool KexiTableViewColumn::isReadOnly() const
++{
++ return m_readOnly || (m_data && m_data->isReadOnly());
++}
++
+ bool KexiTableViewColumn::acceptsFirstChar(const QChar& ch) const
+ {
+ // the field we're looking at can be related to "visible lookup column"
+--- kexi/widget/kexidataawareview.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/widget/kexidataawareview.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,5 @@
+ /* This file is part of the KDE project
+- Copyright (C) 2005-2006 Jaroslaw Staniek <js at iidea.pl>
++ Copyright (C) 2005-2007 Jaroslaw Staniek <js at iidea.pl>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+@@ -21,6 +21,7 @@
+
+ #include <kexidataawareobjectiface.h>
+ #include <utils/kexisharedactionclient.h>
++#include <core/keximainwindow.h>
+
+ #include <qlayout.h>
+
+@@ -28,6 +29,7 @@
+
+ KexiDataAwareView::KexiDataAwareView(KexiMainWindow *mainWin, QWidget *parent, const char *name)
+ : KexiViewBase(mainWin, parent, name)
++ , KexiSearchAndReplaceViewInterface()
+ , m_internalView(0)
+ , m_actionClient(0)
+ , m_dataAwareObject(0)
+@@ -117,6 +119,23 @@
+
+ plugSharedAction("edit_paste", this, SLOT(paste()));
+ m_actionClient->plugSharedAction(sharedAction("edit_paste")); //for proper shortcut
++
++// plugSharedAction("edit_find", this, SLOT(editFind()));
++// m_actionClient->plugSharedAction(sharedAction("edit_find")); //for proper shortcut
++
++// plugSharedAction("edit_findnext", this, SLOT(editFindNext()));
++// m_actionClient->plugSharedAction(sharedAction("edit_findnext")); //for proper shortcut
++
++// plugSharedAction("edit_findprevious", this, SLOT(editFindPrevious()));
++// m_actionClient->plugSharedAction(sharedAction("edit_findprev")); //for proper shortcut
++
++//! @todo plugSharedAction("edit_replace", this, SLOT(editReplace()));
++//! @todo m_actionClient->plugSharedAction(sharedAction("edit_replace")); //for proper shortcut
++
++// setAvailable("edit_find", true);
++// setAvailable("edit_findnext", true);
++// setAvailable("edit_findprevious", true);
++//! @todo setAvailable("edit_replace", true);
+ }
+
+ void KexiDataAwareView::slotUpdateRowActions(int row)
+@@ -129,6 +148,8 @@
+ const bool sorting = m_dataAwareObject->isSortingEnabled();
+ const int rows = m_dataAwareObject->rows();
+
++ setAvailable("edit_cut", !ro);
++ setAvailable("edit_paste", !ro);
+ setAvailable("edit_delete", !ro); // && !(inserting && row==rows));
+ setAvailable("edit_delete_row", !ro && !(deleting && row==rows));
+ setAvailable("edit_insert_empty_row", !ro && emptyInserting);
+@@ -146,7 +167,7 @@
+
+ QSize KexiDataAwareView::minimumSizeHint() const
+ {
+- return m_internalView ? m_internalView->minimumSizeHint() : QSize(0,0);//KexiViewBase::minimumSizeHint();
++ return m_internalView ? m_internalView->minimumSizeHint() : QSize(0,0);//KexiViewBase::minimumSizeHint();
+ }
+
+ QSize KexiDataAwareView::sizeHint() const
+@@ -172,12 +193,20 @@
+ */
+ m_dataAwareObject->contextMenu()->clear();
+
++ plugSharedAction("edit_cut", m_dataAwareObject->contextMenu());
++ plugSharedAction("edit_copy", m_dataAwareObject->contextMenu());
++ plugSharedAction("edit_paste", m_dataAwareObject->contextMenu());
++
++ bool separatorNeeded = true;
++
+ unplugSharedAction("edit_clear_table");
+ plugSharedAction("edit_clear_table", this, SLOT(deleteAllRows()));
+
+ if (m_dataAwareObject->isEmptyRowInsertingEnabled()) {
+ unplugSharedAction("edit_insert_empty_row");
+ plugSharedAction("edit_insert_empty_row", m_internalView, SLOT(insertEmptyRow()));
++ if (separatorNeeded)
++ m_dataAwareObject->contextMenu()->insertSeparator();
+ plugSharedAction("edit_insert_empty_row", m_dataAwareObject->contextMenu());
+ }
+ else {
+@@ -185,11 +214,16 @@
+ unplugSharedAction("edit_insert_empty_row", m_dataAwareObject->contextMenu());
+ }
+
+- if (m_dataAwareObject->isDeleteEnabled())
++ if (m_dataAwareObject->isDeleteEnabled()) {
++ if (separatorNeeded)
++ m_dataAwareObject->contextMenu()->insertSeparator();
++ plugSharedAction("edit_delete", m_dataAwareObject->contextMenu());
+ plugSharedAction("edit_delete_row", m_dataAwareObject->contextMenu());
+- else
++ }
++ else {
+ unplugSharedAction("edit_delete_row", m_dataAwareObject->contextMenu());
+-
++ unplugSharedAction("edit_delete_row", m_dataAwareObject->contextMenu());
++ }
+ //if (!m_view->isSortingEnabled()) {
+ // unplugSharedAction("data_sort_az");
+ // unplugSharedAction("data_sort_za");
+@@ -200,11 +234,6 @@
+ slotCellSelected( m_dataAwareObject->currentColumn(), m_dataAwareObject->currentRow() );
+ }
+
+-/*void KexiDataAwareView::slotCellSelected(const QVariant& v)
+-{
+- slotCellSelected( v.toPoint().x(), v.toPoint().y() );
+-}*/
+-
+ void KexiDataAwareView::slotCellSelected(int /*col*/, int row)
+ {
+ slotUpdateRowActions(row);
+@@ -277,5 +306,78 @@
+ void KexiDataAwareView::slotGoToLastRow() { m_dataAwareObject->selectLastRow(); }
+ void KexiDataAwareView::slotGoToNewRow() { m_dataAwareObject->addNewRecordRequested(); }
+
++bool KexiDataAwareView::setupFindAndReplace(QStringList& columnNames, QStringList& columnCaptions,
++ QString& currentColumnName)
++{
++ if (!dataAwareObject() || !dataAwareObject()->data())
++ return false;
++ KexiTableViewColumn::List columns( dataAwareObject()->data()->columns );
++ for (KexiTableViewColumn::ListIterator it(columns); it.current(); ++it) {
++ if (!it.current()->visible())
++ continue;
++ columnNames.append( it.current()->field()->name() );
++ columnCaptions.append( it.current()->captionAliasOrName() );
++ }
+
++ //update "look in" selection if there was any
++ const int currentColumnNumber = dataAwareObject()->currentColumn();
++ if (currentColumnNumber!=-1) {
++ KexiTableViewColumn *col = columns.at( currentColumnNumber );
++ if (col && col->field())
++ currentColumnName = col->field()->name();
++ }
++ return true;
++}
++
++tristate KexiDataAwareView::find(const QVariant& valueToFind,
++ const KexiSearchAndReplaceViewInterface::Options& options, bool next)
++{
++ if (!dataAwareObject() || !dataAwareObject()->data())
++ return cancelled;
++
++// const KexiDataAwareObjectInterface::FindAndReplaceOptions options(dlg->options());
++/* if (res == KexiFindDialog::Find) {*/
++// QVariant valueToFind(dlg->valueToFind());
++ return dataAwareObject()->find( valueToFind, options, next );
++/*
++//! @todo result...
++
++ }
++ else if (res == KexiFindDialog::Replace) {
++//! @todo
++ }
++ else if (res == KexiFindDialog::ReplaceAll) {
++//! @todo
++ }
++ */
++}
++
++tristate KexiDataAwareView::findNextAndReplace(const QVariant& valueToFind,
++ const QVariant& replacement,
++ const KexiSearchAndReplaceViewInterface::Options& options, bool replaceAll)
++{
++ if (!dataAwareObject() || !dataAwareObject()->data())
++ return cancelled;
++
++ return dataAwareObject()->findNextAndReplace(valueToFind, replacement, options, replaceAll);
++}
++
++/*
++void KexiDataAwareView::editFindNext()
++{
++ //! @todo reuse code from editFind()
++}
++
++void KexiDataAwareView::editFindPrevious()
++{
++ //! @todo reuse code from editFind()
++}
++
++void KexiDataAwareView::editReplace()
++{
++ //! @todo editReplace()
++ //! @todo reuse code from editFind()
++ // When ready, update KexiDataAwareView::initActions() and KexiMainWindowImpl
++}*/
++
+ #include "kexidataawareview.moc"
+--- kexi/widget/kexidatatable.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/widget/kexidatatable.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,7 +1,7 @@
+ /* This file is part of the KDE project
+ Copyright (C) 2003 Lucijan Busch <lucijan at kde.org>
+ Copyright (C) 2003 Joseph Wenninger <jowenn at kde.org>
+- Copyright (C) 2003-2005 Jaroslaw Staniek <js at iidea.pl>
++ Copyright (C) 2003-2006 Jaroslaw Staniek <js at iidea.pl>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+@@ -63,39 +63,18 @@
+
+ virtual ~KexiDataTable();
+
+-//moved virtual QWidget* mainWidget();
+-
+ KexiTableView* tableView() const;
+
+-//moved virtual QSize minimumSizeHint() const;
+-//moved virtual QSize sizeHint() const;
+-
+ public slots:
+ /*! Sets data. Only works for db-aware table. */
+ void setData(KexiDB::Cursor *cursor);
+
+-//moved void deleteAllRows();
+-
+ protected slots:
+-#if 0 //moved
+- /*! Updates shared actions related to currently selected row.
+- Called for KexiTableView::rowEditStarted(), KexiTableView::rowEditTerminated(),
+- and KexiTableView::slotCellSelected() signals.
+- Call this implementation if you are reimplementing this method. */
+- virtual void slotUpdateRowActions(int row);
+-#endif
+ //! @todo
+ void filter();
+-//moved virtual void slotCellSelected(int col, int row);
+-//moved void reloadActions();
+
+ protected:
+-//moved void initActions();
+ void init();
+-//moved virtual void updateActions(bool activated);
+-
+-//moved KexiTableView *m_view;
+ };
+
+ #endif
+-
+--- kexi/widget/kexidatatable.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/widget/kexidatatable.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,7 +1,7 @@
+ /* This file is part of the KDE project
+ Copyright (C) 2003 Lucijan Busch <lucijan at kde.org>
+ Copyright (C) 2003 Joseph Wenninger <jowenn at kde.org>
+- Copyright (C) 2003-2005 Jaroslaw Staniek <js at iidea.pl>
++ Copyright (C) 2003-2006 Jaroslaw Staniek <js at iidea.pl>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+@@ -48,146 +48,21 @@
+ QString("%1_tableview").arg(name ? name : "KexiTableView").latin1());
+
+ KexiDataAwareView::init( view, view, view );
+-// init();
+ }
+
+-//KexiDataTable::KexiDataTable(KexiMainWindow *win, KexiDB::Cursor *cursor,
+-// const QString &caption)
+ KexiDataTable::KexiDataTable(KexiMainWindow *mainWin, QWidget *parent,
+ KexiDB::Cursor *cursor, const char *name)
+ : KexiDataAwareView( mainWin, parent, name )
+-// : KexiViewBase(mainWin, parent, name)
+-// , m_view(0)
+ {
+-// m_view = new KexiDataTableView(this, "view", cursor);
+ KexiTableView *view = new KexiDataTableView(this, "view", cursor);
+ KexiDataAwareView::init( view, view, view );
+-// init();
+ }
+
+ KexiDataTable::~KexiDataTable()
+ {
+ }
+
+-#if 0 //moved
+-
+-void KexiDataTable::init()
+-{
+- connect(m_view, SIGNAL(cellSelected(int,int)), this, SLOT(slotCellSelected(int,int)));
+- //! before closing - we'are accepting editing
+- connect(this,SIGNAL(closing()),m_view,SLOT(acceptRowEdit()));
+-
+- //! updating actions on start/stop editing
+- connect(m_view, SIGNAL(rowEditStarted(int)), this, SLOT(slotUpdateRowActions(int)));
+- connect(m_view, SIGNAL(rowEditTerminated(int)), this, SLOT(slotUpdateRowActions(int)));
+- connect(m_view, SIGNAL(reloadActions()), this, SLOT(reloadActions()));
+-
+- QVBoxLayout *box = new QVBoxLayout(this);
+- box->addWidget(m_view);
+-
+- //resize to preferred size
+-/* QSize preferredSize = m_view->sizeHint();
+- KexiDialogBase* dlg = parentDialog();
+- if (dlg && dlg->mdiParent()) {
+- QRect r = dlg->mdiParent()->mdiAreaContentsRect();
+- preferredSize = preferredSize.boundedTo( QSize(
+- r.width() - 10,
+- r.height() - dlg->mdiParent()->captionHeight() - 10
+- ) );
+- }*/
+-
+- setMinimumSize(m_view->minimumSizeHint().width(),m_view->minimumSizeHint().height());
+- resize( preferredSizeHint( m_view->sizeHint() ) );
+-//js m_view->show();
+- setFocusProxy(m_view);
+-// m_view->setFocus();
+-//not needed setIcon(SmallIcon("table"));
+-
+- initActions();
+-//js already done in keximainwindow: registerDialog();
+- reloadActions();
+-}
+-
+ void
+-KexiDataTable::initActions()
+-{
+- plugSharedAction("edit_delete_row", m_view, SLOT(deleteCurrentRow()));
+- m_view->plugSharedAction(sharedAction("edit_delete_row")); //for proper shortcut
+-
+- plugSharedAction("edit_delete",m_view, SLOT(deleteAndStartEditCurrentCell()));
+- m_view->plugSharedAction(sharedAction("edit_delete")); //for proper shortcut
+-
+- plugSharedAction("edit_edititem",m_view, SLOT(startEditOrToggleValue()));
+- m_view->plugSharedAction(sharedAction("edit_edititem")); //for proper shortcut
+-
+- plugSharedAction("data_save_row",m_view, SLOT(acceptRowEdit()));
+- m_view->plugSharedAction(sharedAction("data_save_row")); //for proper shortcut
+-
+- plugSharedAction("data_cancel_row_changes",m_view, SLOT(cancelRowEdit()));
+- m_view->plugSharedAction(sharedAction("data_cancel_row_changes")); //for proper shortcut
+-
+- if (m_view->isSortingEnabled()) {
+- plugSharedAction("data_sort_az", m_view, SLOT(sortAscending()));
+- plugSharedAction("data_sort_za", m_view, SLOT(sortDescending()));
+- }
+-
+- m_view->plugSharedAction(sharedAction("edit_insert_empty_row")); //for proper shortcut
+-
+- setAvailable("data_sort_az", m_view->isSortingEnabled());
+- setAvailable("data_sort_za", m_view->isSortingEnabled());
+-//! \todo plugSharedAction("data_filter", this, SLOT(???()));
+-}
+-
+-void KexiDataTable::reloadActions()
+-{
+-// m_view->initActions(guiClient()->actionCollection());
+-//warning FIXME Move this to the table part
+-/*
+- kdDebug()<<"INIT ACTIONS***********************************************************************"<<endl;
+- new KAction(i18n("Filter"), "filter", 0, this, SLOT(filter()), actionCollection(), "tablepart_filter");
+- setXMLFile("kexidatatableui.rc");
+-*/
+- m_view->popup()->clear();
+-
+- unplugSharedAction("edit_clear_table");
+- plugSharedAction("edit_clear_table", this, SLOT(deleteAllRows()));
+-
+- if (m_view->isEmptyRowInsertingEnabled()) {
+- unplugSharedAction("edit_insert_empty_row");
+- plugSharedAction("edit_insert_empty_row", m_view, SLOT(insertEmptyRow()));
+- plugSharedAction("edit_insert_empty_row", m_view->popup());
+- }
+- else {
+- unplugSharedAction("edit_insert_empty_row");
+- unplugSharedAction("edit_insert_empty_row", m_view->popup());
+- }
+-
+- if (m_view->isDeleteEnabled())
+- plugSharedAction("edit_delete_row", m_view->popup());
+- else
+- unplugSharedAction("edit_delete_row", m_view->popup());
+-
+- //if (!m_view->isSortingEnabled()) {
+-// unplugSharedAction("data_sort_az");
+-// unplugSharedAction("data_sort_za");
+- //}
+- setAvailable("data_sort_az", m_view->isSortingEnabled());
+- setAvailable("data_sort_za", m_view->isSortingEnabled());
+-
+- slotCellSelected( m_view->currentColumn(), m_view->currentRow() );
+-}
+-#endif
+-
+-/*moved
+-void
+-KexiDataTable::updateActions(bool activated)
+-{
+- setAvailable("data_sort_az", m_view->isSortingEnabled());
+- setAvailable("data_sort_za", m_view->isSortingEnabled());
+- KexiViewBase::updateActions(activated);
+-}*/
+-
+-void
+ KexiDataTable::setData(KexiDB::Cursor *c)
+ {
+ if (!dynamic_cast<KexiDataTableView*>(mainWidget()))
+@@ -199,48 +74,6 @@
+ {
+ }
+
+-/*moved
+-QSize KexiDataTable::minimumSizeHint() const
+-{
+-// QWidget*const w= (QWidget*const)mainWidget();
+- return m_view ? m_view->minimumSizeHint() : KexiViewBase::minimumSizeHint();
+-// return mainWidget() ? mainWidget()->minimumSizeHint() : KMdiChildView::minimumSizeHint();
+-}
+-
+-QSize KexiDataTable::sizeHint() const
+-{
+- return m_view ? m_view->sizeHint() : KexiViewBase::sizeHint();
+-}
+-*/
+-
+-// update actions --------------
+-#if 0
+-void KexiDataTable::slotCellSelected(int /*col*/, int row)
+-{
+- slotUpdateRowActions(row);
+-}
+-
+-void KexiDataTable::deleteAllRows()
+-{
+- m_view->deleteAllRows(true/*ask*/, true/*repaint*/);
+-}
+-
+-#endif
+-
+-/*moved
+-void KexiDataTable::slotUpdateRowActions(int row)
+-{
+- setAvailable("edit_delete", !m_view->isReadOnly() && !(m_view->isInsertingEnabled() && row==m_view->rows()));
+- setAvailable("edit_delete_row", !m_view->isReadOnly() && !(m_view->isDeleteEnabled() && row==m_view->rows()) );
+- setAvailable("edit_insert_empty_row", !m_view->isReadOnly() && m_view->isEmptyRowInsertingEnabled());
+- setAvailable("edit_clear_table", !m_view->isReadOnly() && m_view->isDeleteEnabled() && m_view->rows()>0);
+- setAvailable("data_save_row", m_view->rowEditing());
+- setAvailable("data_cancel_row_changes", m_view->rowEditing());
+- setAvailable("data_sort_az", m_view->isSortingEnabled());
+- setAvailable("data_sort_za", m_view->isSortingEnabled());
+-}*.
+-*/
+-
+ KexiTableView* KexiDataTable::tableView() const
+ {
+ return dynamic_cast<KexiTableView*>(m_internalView);
+--- kexi/widget/kexidataawareview.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/widget/kexidataawareview.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,5 @@
+ /* This file is part of the KDE project
+- Copyright (C) 2005-2006 Jaroslaw Staniek <js at iidea.pl>
++ Copyright (C) 2005-2007 Jaroslaw Staniek <js at iidea.pl>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+@@ -21,6 +21,7 @@
+ #define KEXIDATAAWAREVIEW_H
+
+ #include <kexiviewbase.h>
++#include <kexisearchandreplaceiface.h>
+
+ class KexiDataAwareObjectInterface;
+ class KexiSharedActionClient;
+@@ -34,8 +35,11 @@
+
+ Action implementations like data editing and deleting are shared for different
+ view types to keep even better consistency.
++ The view also implements KexiSearchAndReplaceViewInterface to support search/replace features
++ used by shared KexiFindDialog.
+ */
+-class KEXIEXTWIDGETS_EXPORT KexiDataAwareView : public KexiViewBase
++class KEXIEXTWIDGETS_EXPORT KexiDataAwareView : public KexiViewBase,
++ public KexiSearchAndReplaceViewInterface
+ {
+ Q_OBJECT
+
+@@ -45,9 +49,27 @@
+ QWidget* mainWidget();
+
+ virtual QSize minimumSizeHint() const;
++
+ virtual QSize sizeHint() const;
++
+ KexiDataAwareObjectInterface* dataAwareObject() const { return m_dataAwareObject; }
+
++ /*! Sets up data for find/replace dialog, based on view's data model.
++ Implemented for KexiSearchAndReplaceViewInterface. */
++ virtual bool setupFindAndReplace(QStringList& columnNames, QStringList& columnCaptions,
++ QString& currentColumnName);
++
++ /*! Finds \a valueToFind within the view.
++ Implemented for KexiSearchAndReplaceViewInterface. */
++ virtual tristate find(const QVariant& valueToFind,
++ const KexiSearchAndReplaceViewInterface::Options& options, bool next);
++
++ /*! Finds \a valueToFind within the view and replaces with \a replacement.
++ Implemented for KexiSearchAndReplaceViewInterface. */
++ virtual tristate findNextAndReplace(const QVariant& valueToFind,
++ const QVariant& replacement,
++ const KexiSearchAndReplaceViewInterface::Options& options, bool replaceAll);
++
+ public slots:
+ void deleteAllRows();
+ void deleteCurrentRow();
+@@ -65,6 +87,11 @@
+ void slotGoToNextRow();
+ void slotGoToLastRow();
+ void slotGoToNewRow();
++/* void editFind();
++ void slotFind();
++ void editFindNext();
++ void editFindPrevious();
++ void editReplace();*/
+
+ protected slots:
+ // void slotCellSelected(const QVariant& v); //!< @internal
+@@ -82,7 +109,6 @@
+ void initActions();
+ virtual void updateActions(bool activated);
+
+- //KexiViewBase
+ QWidget* m_internalView;
+ KexiSharedActionClient* m_actionClient;
+ KexiDataAwareObjectInterface* m_dataAwareObject;
+--- kexi/widget/relations/kexirelationviewtable.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/widget/relations/kexirelationviewtable.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,6 @@
+ /* This file is part of the KDE project
+ Copyright (C) 2002, 2003 Lucijan Busch <lucijan at gmx.at>
+- Copyright (C) 2003-2004 Jaroslaw Staniek <js at iidea.pl>
++ Copyright (C) 2003-2007 Jaroslaw Staniek <js at iidea.pl>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+@@ -301,49 +301,29 @@
+
+ connect(this, SIGNAL(dropped(QDropEvent *, QListViewItem *)), this, SLOT(slotDropped(QDropEvent *)));
+ connect(this, SIGNAL(contentsMoving(int, int)), this, SLOT(slotContentsMoving(int,int)));
+-// connect(this, SIGNAL(doubleClicked(QListViewItem*,const QPoint&,int)),
+-// this, SLOT(slotItemDoubleClicked(QListViewItem*,const QPoint&,int)));
+ }
+
+ KexiRelationViewTable::~KexiRelationViewTable()
+ {
+ }
+
+-QSize KexiRelationViewTable::sizeHint()
++QSize KexiRelationViewTable::sizeHint() const
+ {
+-/*
+- QFontMetrics fm(font());
+- kdDebug() << schema()->name() << " cw=" << columnWidth(0) + fm.width("i")
+- << ", " << fm.width(schema()->name()+" ") << endl;
+-//! @todo width is still not OK
+- int maxWidth = columnWidth(0) + fm.width("i");
+- const KexiDB::QueryColumnInfo::Vector columns(schema()->columns(true));
+- for (uint i=0; i<columns.count(); i++)
+- maxWidth = QMAX(maxWidth, fm.width(columns[i]->field->name())+20);
+-
+- QSize s(
+- QMAX( maxWidth, fm.width(schema()->name()+" ")+20),
+- childCount()*firstChild()->totalHeight() + 4 );
+-// QSize s( columnWidth(1), childCount()*firstChild()->totalHeight() + 3*firstChild()->totalHeight()/10);
+- return s;*/
+ QFontMetrics fm(fontMetrics());
+
+- kdDebug() << schema()->name() << " cw=" << columnWidth(0) + fm.width("i")
+- << ", " << fm.width(schema()->name()+" ") << endl;
++// kdDebug() << schema()->name() << " cw=" << columnWidth(0) + fm.width("i")
++// << ", " << fm.width(schema()->name()+" ") << endl;
+
+-//! @todo width is still not OK
+ int maxWidth = -1;
+- const int iconWidth = IconSize(KIcon::Small) + fm.width("i")+50;
++ const int iconWidth = IconSize(KIcon::Small) + fm.width("i")+20;
+ for (QListViewItem *item = firstChild(); item; item = item->nextSibling())
+ maxWidth = QMAX(maxWidth, iconWidth + fm.width(item->text(0)));
+-// const KexiDB::QueryColumnInfo::Vector columns(schema()->columns(true/*unique*/));
+-// for (uint i=0; i<columns.count(); i++)
+-// maxWidth = QMAX(maxWidth, col0Width + fm.width(columns[i]->field->name())+20);
+
++ const uint rowCount = QMIN( 8, childCount() );
++
+ QSize s(
+- QMAX( maxWidth, fm.width(schema()->name()+" ")+20),
+- childCount()*firstChild()->totalHeight() + 4 );
+-// QSize s( columnWidth(1), childCount()*firstChild()->totalHeight() + 3*firstChild()->totalHeight()/10);
++ QMAX( maxWidth, fm.width(schema()->name()+" ")),
++ rowCount*firstChild()->totalHeight() + 4 );
+ return s;
+ }
+
+@@ -359,19 +339,21 @@
+ KexiRelationViewTable::globalY(const QString &item)
+ {
+ QListViewItem *i = findItem(item, 0);
+- if(i)
+- {
+- int y=itemRect(i).y() + (itemRect(i).height() / 2);
+- return mapToGlobal(QPoint(0, y)).y();
+- }
+- return -1;
++ if (!i)
++ return -1;
++ int y = itemRect(i).y() + (itemRect(i).height() / 2);
++ if (contentsY() > itemPos(i))
++ y = 0;
++ else if (y == 0)
++ y = height();
++ return mapToGlobal(QPoint(0, y)).y();
+ }
+
+ bool
+ KexiRelationViewTable::acceptDrag(QDropEvent *ev) const
+ {
+ // kdDebug() << "KexiRelationViewTable::acceptDrag()" << endl;
+- QListViewItem *receiver = itemAt(ev->pos());
++ QListViewItem *receiver = itemAt(ev->pos() - QPoint(0,contentsY()));
+ if (!receiver || !KexiFieldDrag::canDecodeSingle(ev))
+ return false;
+ QString sourceMimeType;
+@@ -391,7 +373,7 @@
+ void
+ KexiRelationViewTable::slotDropped(QDropEvent *ev)
+ {
+- QListViewItem *recever = itemAt(ev->pos());
++ QListViewItem *recever = itemAt(ev->pos() - QPoint(0,contentsY()));
+ if (!recever || !KexiFieldDrag::canDecodeSingle(ev)) {
+ ev->ignore();
+ return;
+--- kexi/widget/relations/kexirelationwidget.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/widget/relations/kexirelationwidget.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -243,12 +243,8 @@
+
+ void KexiRelationWidget::tableContextMenuRequest(const QPoint& pos)
+ {
+-// if (m_focusedTableView != sender())
+-// return;
+- kdDebug() << "HEADER CTXT MENU!" <<endl;
+ invalidateActions();
+ executePopup( pos );
+-// m_tableQueryPopup->exec(pos);
+ }
+
+ void KexiRelationWidget::connectionContextMenuRequest(const QPoint& pos)
+--- kexi/widget/relations/kexirelationviewtable.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/widget/relations/kexirelationviewtable.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,6 @@
+ /* This file is part of the KDE project
+- Copyright (C) 2002, 2003 Lucijan Busch <lucijan at gmx.at>
+- Copyright (C) 2003-2004 Jaroslaw Staniek <js at iidea.pl>
++ Copyright (C) 2002, 2003 Lucijan Busch <lucijan at gmx.at>
++ Copyright (C) 2003-2007 Jaroslaw Staniek <js at iidea.pl>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+@@ -103,7 +103,7 @@
+ // KexiDB::TableSchema *table() const { return m_table; };
+ int globalY(const QString &item);
+ // void setReadOnly(bool);
+- virtual QSize sizeHint();
++ virtual QSize sizeHint() const;
+
+ signals:
+ void tableScrolling();
+--- kexi/widget/relations/kexirelationviewconnection.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/widget/relations/kexirelationviewconnection.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -43,7 +43,7 @@
+ SourceConnection &c, KexiRelationView *parent)
+ {
+ m_parent = parent;
+- kdDebug() << "KexiRelationViewConnection::KexiRelationViewConnection()" << endl;
++// kdDebug() << "KexiRelationViewConnection::KexiRelationViewConnection()" << endl;
+
+ m_masterTable = masterTbl;
+ if(!masterTbl || !detailsTbl)
+@@ -209,7 +209,7 @@
+
+ // return QRect(sx - 1, sy - 1, (rx + m_detailsTable->width()) - sx + 1, ry - sy + 1);
+ QRect rect(left - 150, top - 150, dx + 150, dy + 150);
+- kdDebug() << "KexiRelationViewConnection::connectionRect():" << m_oldRect << "," << rect << endl;
++// kdDebug() << "KexiRelationViewConnection::connectionRect():" << m_oldRect << "," << rect << endl;
+
+ m_oldRect = rect;
+
+--- kexi/widget/utils/kexiimagecontextmenu.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/widget/utils/kexiimagecontextmenu.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,99 +0,0 @@
+-/* This file is part of the KDE project
+- Copyright (C) 2006 Jaroslaw Staniek <js at iidea.pl>
+-
+- This program is free software; you can redistribute it and/or
+- modify it under the terms of the GNU Library General Public
+- License as published by the Free Software Foundation; either
+- version 2 of the License, or (at your option) any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public License
+- along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+- * Boston, MA 02110-1301, USA.
+-*/
+-
+-#ifndef KexiImageContextMenu_H
+-#define KexiImageContextMenu_H
+-
+-#include <kpopupmenu.h>
+-#include <kurl.h>
+-
+-class KActionCollection;
+-class KexiDataItemInterface;
+-
+-//! @short A context menu used for images within form and table views
+-/*! Used in KexiDBImageBox and KexiBlobTableEdit.
+- Contains actions like insert, save, copy, paste, clear.
+-
+- Signals like insertFromFileRequested() are all connected to
+- handlers in KexiDBImageBox and KexiBlobTableEdit so these objects can
+- respond on requests for data handling.
+-*/
+-class KEXIGUIUTILS_EXPORT KexiImageContextMenu : public KPopupMenu
+-{
+- Q_OBJECT
+-
+- public:
+- KexiImageContextMenu(QWidget *parent);
+- virtual ~KexiImageContextMenu();
+-
+- KActionCollection* actionCollection() const;
+-
+- /*! Updates title for context menu.
+- Used in KexiDBWidgetContextMenuExtender::createTitle(QPopupMenu *menu) and KexiDBImageBox.
+- \return true if the title has been added. */
+- static bool updateTitle(QPopupMenu *menu, const QString& title, const QString& icon = QString::null);
+-
+- public slots:
+- void updateActionsAvailability();
+-
+- virtual void insertFromFile();
+- virtual void saveAs();
+- virtual void cut();
+- virtual void copy();
+- virtual void paste();
+- virtual void clear();
+- virtual void showProperties();
+-
+- signals:
+- //! Emitted when actions availability should be performed. Just connect this signal
+- //! to a slot and set \a valueIsNull and \a valueIsReadOnly.
+- void updateActionsAvailabilityRequested(bool& valueIsNull, bool& valueIsReadOnly);
+-
+- /*! Emitted before "insertFromFile" action was requested. */
+- void insertFromFileRequested(const KURL &url);
+-
+- /*! Emitted before "saveAs" action was requested.
+- You should fill \a origFilename, \a fileExtension and \a dataIsEmpty values.
+- If \a dataIsEmpty is false, saving will be cancelled. */
+- void aboutToSaveAsRequested(QString& origFilename, QString& fileExtension, bool& dataIsEmpty);
+-
+- //! Emitted when "saveAs" action was requested
+- void saveAsRequested(const QString& fileName);
+-
+- //! Emitted when "cut" action was requested
+- void cutRequested();
+-
+- //! Emitted when "copy" action was requested
+- void copyRequested();
+-
+- //! Emitted when "paste" action was requested
+- void pasteRequested();
+-
+- //! Emitted when "clear" action was requested
+- void clearRequested();
+-
+- //! Emitted when "showProperties" action was requested
+- void showPropertiesRequested();
+-
+- protected:
+- class Private;
+- Private *d;
+-};
+-
+-#endif
+--- kexi/widget/utils/kexiimagecontextmenu.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/widget/utils/kexiimagecontextmenu.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,271 +0,0 @@
+-/* This file is part of the KDE project
+- Copyright (C) 2006 Jaroslaw Staniek <js at iidea.pl>
+-
+- This program is free software; you can redistribute it and/or
+- modify it under the terms of the GNU Library General Public
+- License as published by the Free Software Foundation; either
+- version 2 of the License, or (at your option) any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public License
+- along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+- * Boston, MA 02110-1301, USA.
+-*/
+-
+-#include "kexiimagecontextmenu.h"
+-
+-#include <kactioncollection.h>
+-#include <klocale.h>
+-#include <kiconloader.h>
+-#include <kfiledialog.h>
+-#include <kimageio.h>
+-#include <kdebug.h>
+-#include <kmessagebox.h>
+-
+-#include <qfiledialog.h>
+-#include <qapplication.h>
+-
+-#ifdef Q_WS_WIN
+-#include <win32_utils.h>
+-#include <krecentdirs.h>
+-#endif
+-
+-//! @internal
+-class KexiImageContextMenu::Private
+-{
+-public:
+- Private(QWidget *parent)
+- : actionCollection(parent)
+- {
+- }
+-
+- KActionCollection actionCollection;
+- KAction *insertFromFileAction, *saveAsAction, *cutAction, *copyAction, *pasteAction,
+- *deleteAction
+-#ifdef KEXI_NO_UNFINISHED
+- , *propertiesAction
+-#endif
+- ;
+-};
+-
+-//------------
+-
+-KexiImageContextMenu::KexiImageContextMenu(QWidget* parent)
+- : KPopupMenu(parent)
+- , d( new Private(this) )
+-{
+- setName("KexiImageContextMenu");
+- insertTitle(QString::null);
+-
+- d->insertFromFileAction = new KAction(i18n("Insert From &File..."), SmallIconSet("fileopen"), 0,
+- this, SLOT(insertFromFile()), &d->actionCollection, "insert");
+- d->insertFromFileAction->plug(this);
+- d->saveAsAction = KStdAction::saveAs(this, SLOT(saveAs()), &d->actionCollection);
+-// d->saveAsAction->setText(i18n("&Save &As..."));
+- d->saveAsAction->plug(this);
+- insertSeparator();
+- d->cutAction = KStdAction::cut(this, SLOT(cut()), &d->actionCollection);
+- d->cutAction->plug(this);
+- d->copyAction = KStdAction::copy(this, SLOT(copy()), &d->actionCollection);
+- d->copyAction->plug(this);
+- d->pasteAction = KStdAction::paste(this, SLOT(paste()), &d->actionCollection);
+- d->pasteAction->plug(this);
+- d->deleteAction = new KAction(i18n("&Clear"), SmallIconSet("editdelete"), 0,
+- this, SLOT(clear()), &d->actionCollection, "delete");
+- d->deleteAction->plug(this);
+-#ifdef KEXI_NO_UNFINISHED
+- d->propertiesAction = 0;
+-#else
+- insertSeparator();
+- d->propertiesAction = new KAction(i18n("Properties"), 0, 0,
+- this, SLOT(showProperties()), &d->actionCollection, "properties");
+- d->propertiesAction->plug(this);
+-#endif
+- connect(this, SIGNAL(aboutToShow()), this, SLOT(updateActionsAvailability()));
+-}
+-
+-KexiImageContextMenu::~KexiImageContextMenu()
+-{
+- delete d;
+-}
+-
+-void KexiImageContextMenu::insertFromFile()
+-{
+- QWidget *focusWidget = qApp->focusWidget();
+-#ifdef Q_WS_WIN
+- QString recentDir;
+- QString fileName = QFileDialog::getOpenFileName(
+- KFileDialog::getStartURL(":LastVisitedImagePath", recentDir).path(),
+- convertKFileDialogFilterToQFileDialogFilter(KImageIO::pattern(KImageIO::Reading)),
+- this, 0, i18n("Insert Image From File"));
+- KURL url;
+- if (!fileName.isEmpty())
+- url.setPath( fileName );
+-#else
+- KURL url( KFileDialog::getImageOpenURL(
+- ":LastVisitedImagePath", this, i18n("Insert Image From File")) );
+-// QString fileName = url.isLocalFile() ? url.path() : url.prettyURL();
+-
+- //! @todo download the file if remote, then set fileName properly
+-#endif
+- if (!url.isValid()) {
+- //focus the app again because to avoid annoying the user with unfocesed main window
+- if (focusWidget) {
+- focusWidget->raise();
+- focusWidget->setFocus();
+- }
+- return;
+- }
+- kexipluginsdbg << "fname=" << url.prettyURL() << endl;
+-
+-#ifdef Q_WS_WIN
+- //save last visited path
+-// KURL url(fileName);
+- if (url.isLocalFile())
+- KRecentDirs::add(":LastVisitedImagePath", url.directory());
+-#endif
+-
+- emit insertFromFileRequested(url);
+- if (focusWidget) {
+- focusWidget->raise();
+- focusWidget->setFocus();
+-// todo: fix
+- }
+-}
+-
+-void KexiImageContextMenu::saveAs()
+-{
+- QString origFilename, fileExtension;
+- bool dataIsEmpty = false;
+- emit aboutToSaveAsRequested(origFilename, fileExtension, dataIsEmpty);
+-
+- if (dataIsEmpty) {
+- kdWarning() << "KexiImageContextMenu::saveAs(): no data!" << endl;
+- return;
+- }
+- if (!origFilename.isEmpty())
+- origFilename = QString("/") + origFilename;
+-
+- if (fileExtension.isEmpty()) {
+- // PNG data is the default
+- fileExtension = "png";
+- }
+-
+-#ifdef Q_WS_WIN
+- QString recentDir;
+- QString fileName = QFileDialog::getSaveFileName(
+- KFileDialog::getStartURL(":LastVisitedImagePath", recentDir).path() + origFilename,
+- convertKFileDialogFilterToQFileDialogFilter(KImageIO::pattern(KImageIO::Writing)),
+- this, 0, i18n("Save Image to File"));
+-#else
+- //! @todo add originalFileName! (requires access to KRecentDirs)
+- QString fileName = KFileDialog::getSaveFileName(
+- ":LastVisitedImagePath", KImageIO::pattern(KImageIO::Writing), this, i18n("Save Image to File"));
+-#endif
+- if (fileName.isEmpty())
+- return;
+-
+- if (QFileInfo(fileName).extension().isEmpty())
+- fileName += (QString(".")+fileExtension);
+- kdDebug() << fileName << endl;
+- KURL url;
+- url.setPath( fileName );
+-
+-#ifdef Q_WS_WIN
+- //save last visited path
+- if (url.isLocalFile())
+- KRecentDirs::add(":LastVisitedImagePath", url.directory());
+-#endif
+-
+- QFile f(fileName);
+- if (f.exists() && KMessageBox::Yes != KMessageBox::warningYesNo(this,
+- "<qt>"+i18n("File \"%1\" already exists."
+- "<p>Do you want to replace it with a new one?")
+- .arg(QDir::convertSeparators(fileName))+"</qt>",0,
+- KGuiItem(i18n("&Replace")), KGuiItem(i18n("&Don't Replace"))))
+- {
+- return;
+- }
+-
+-//! @todo use KURL?
+- emit saveAsRequested(fileName);
+-}
+-
+-void KexiImageContextMenu::cut()
+-{
+- emit cutRequested();
+-}
+-
+-void KexiImageContextMenu::copy()
+-{
+- emit copyRequested();
+-}
+-
+-void KexiImageContextMenu::paste()
+-{
+- emit pasteRequested();
+-}
+-
+-void KexiImageContextMenu::clear()
+-{
+- emit clearRequested();
+-}
+-
+-void KexiImageContextMenu::showProperties()
+-{
+- emit showPropertiesRequested();
+-}
+-
+-void KexiImageContextMenu::updateActionsAvailability()
+-{
+- bool valueIsNull = true;
+- bool valueIsReadOnly = true;
+- emit updateActionsAvailabilityRequested(valueIsNull, valueIsReadOnly);
+-
+- d->insertFromFileAction->setEnabled( !valueIsReadOnly );
+- d->saveAsAction->setEnabled( !valueIsNull );
+- d->cutAction->setEnabled( !valueIsNull && !valueIsReadOnly );
+- d->copyAction->setEnabled( !valueIsNull );
+- d->pasteAction->setEnabled( !valueIsReadOnly );
+- d->deleteAction->setEnabled( !valueIsNull && !valueIsReadOnly );
+- if (d->propertiesAction)
+- d->propertiesAction->setEnabled( !valueIsNull );
+-}
+-
+-KActionCollection* KexiImageContextMenu::actionCollection() const
+-{
+- return &d->actionCollection;
+-}
+-
+-//static
+-bool KexiImageContextMenu::updateTitle(QPopupMenu *menu, const QString& title, const QString& icon)
+-{
+- if (title.isEmpty())
+- return false;
+-
+- /*! @todo look at makeFirstCharacterUpperCaseInCaptions setting [bool]
+- (see doc/dev/settings.txt) */
+- QString realTitle = i18n("%1 : Image").arg( title[0].upper() + title.mid(1) );
+-
+- const int id = menu->idAt(0);
+- QMenuItem *item = menu->findItem(id);
+- if (item && dynamic_cast<KPopupTitle *>(item->widget())) {
+- if (icon.isEmpty())
+- dynamic_cast<KPopupTitle *>(item->widget())->setTitle(realTitle);
+- else {
+- QPixmap pixmap(SmallIcon( icon ));
+- dynamic_cast<KPopupTitle *>(item->widget())->setTitle(realTitle, &pixmap);
+- }
+- }
+- else
+- return false;
+-
+- return true;
+-}
+-
+-#include "kexiimagecontextmenu.moc"
+--- kexi/widget/utils/kexicontextmenuutils.cpp (.../tags/koffice/1.6.2/koffice) (revision 0)
++++ kexi/widget/utils/kexicontextmenuutils.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -0,0 +1,283 @@
++/* This file is part of the KDE project
++ Copyright (C) 2006-2007 Jaroslaw Staniek <js at iidea.pl>
++
++ This program is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Library General Public
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public License
++ along with this program; see the file COPYING. If not, write to
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++*/
++
++#include "kexicontextmenuutils.h"
++
++#include <kactioncollection.h>
++#include <klocale.h>
++#include <kiconloader.h>
++#include <kfiledialog.h>
++#include <kimageio.h>
++#include <kdebug.h>
++#include <kmessagebox.h>
++
++#include <qfiledialog.h>
++#include <qapplication.h>
++
++#ifdef Q_WS_WIN
++#include <win32_utils.h>
++#include <krecentdirs.h>
++#endif
++
++//! @internal
++class KexiImageContextMenu::Private
++{
++public:
++ Private(QWidget *parent)
++ : actionCollection(parent)
++ {
++ }
++
++ KActionCollection actionCollection;
++ KAction *insertFromFileAction, *saveAsAction, *cutAction, *copyAction, *pasteAction,
++ *deleteAction
++#ifdef KEXI_NO_UNFINISHED
++ , *propertiesAction
++#endif
++ ;
++};
++
++//------------
++
++KexiImageContextMenu::KexiImageContextMenu(QWidget* parent)
++ : KPopupMenu(parent)
++ , d( new Private(this) )
++{
++ setName("KexiImageContextMenu");
++ insertTitle(QString::null);
++
++ d->insertFromFileAction = new KAction(i18n("Insert From &File..."), SmallIconSet("fileopen"), 0,
++ this, SLOT(insertFromFile()), &d->actionCollection, "insert");
++ d->insertFromFileAction->plug(this);
++ d->saveAsAction = KStdAction::saveAs(this, SLOT(saveAs()), &d->actionCollection);
++// d->saveAsAction->setText(i18n("&Save &As..."));
++ d->saveAsAction->plug(this);
++ insertSeparator();
++ d->cutAction = KStdAction::cut(this, SLOT(cut()), &d->actionCollection);
++ d->cutAction->plug(this);
++ d->copyAction = KStdAction::copy(this, SLOT(copy()), &d->actionCollection);
++ d->copyAction->plug(this);
++ d->pasteAction = KStdAction::paste(this, SLOT(paste()), &d->actionCollection);
++ d->pasteAction->plug(this);
++ d->deleteAction = new KAction(i18n("&Clear"), SmallIconSet("editdelete"), 0,
++ this, SLOT(clear()), &d->actionCollection, "delete");
++ d->deleteAction->plug(this);
++#ifdef KEXI_NO_UNFINISHED
++ d->propertiesAction = 0;
++#else
++ insertSeparator();
++ d->propertiesAction = new KAction(i18n("Properties"), 0, 0,
++ this, SLOT(showProperties()), &d->actionCollection, "properties");
++ d->propertiesAction->plug(this);
++#endif
++ connect(this, SIGNAL(aboutToShow()), this, SLOT(updateActionsAvailability()));
++}
++
++KexiImageContextMenu::~KexiImageContextMenu()
++{
++ delete d;
++}
++
++void KexiImageContextMenu::insertFromFile()
++{
++// QWidget *focusWidget = qApp->focusWidget();
++#ifdef Q_WS_WIN
++ QString recentDir;
++ QString fileName = QFileDialog::getOpenFileName(
++ KFileDialog::getStartURL(":LastVisitedImagePath", recentDir).path(),
++ convertKFileDialogFilterToQFileDialogFilter(KImageIO::pattern(KImageIO::Reading)),
++ this, 0, i18n("Insert Image From File"));
++ KURL url;
++ if (!fileName.isEmpty())
++ url.setPath( fileName );
++#else
++ KURL url( KFileDialog::getImageOpenURL(
++ ":LastVisitedImagePath", this, i18n("Insert Image From File")) );
++// QString fileName = url.isLocalFile() ? url.path() : url.prettyURL();
++
++ //! @todo download the file if remote, then set fileName properly
++#endif
++ if (!url.isValid()) {
++ //focus the app again because to avoid annoying the user with unfocused main window
++ if (qApp->mainWidget()) {
++ //focusWidget->raise();
++ //focusWidget->setFocus();
++ qApp->mainWidget()->raise();
++ }
++ return;
++ }
++ kexipluginsdbg << "fname=" << url.prettyURL() << endl;
++
++#ifdef Q_WS_WIN
++ //save last visited path
++// KURL url(fileName);
++ if (url.isLocalFile())
++ KRecentDirs::add(":LastVisitedImagePath", url.directory());
++#endif
++
++ emit insertFromFileRequested(url);
++ if (qApp->mainWidget()) {
++// focusWidget->raise();
++// focusWidget->setFocus();
++ qApp->mainWidget()->raise();
++ }
++}
++
++void KexiImageContextMenu::saveAs()
++{
++ QString origFilename, fileExtension;
++ bool dataIsEmpty = false;
++ emit aboutToSaveAsRequested(origFilename, fileExtension, dataIsEmpty);
++
++ if (dataIsEmpty) {
++ kdWarning() << "KexiImageContextMenu::saveAs(): no data!" << endl;
++ return;
++ }
++ if (!origFilename.isEmpty())
++ origFilename = QString("/") + origFilename;
++
++ if (fileExtension.isEmpty()) {
++ // PNG data is the default
++ fileExtension = "png";
++ }
++
++#ifdef Q_WS_WIN
++ QString recentDir;
++ QString fileName = QFileDialog::getSaveFileName(
++ KFileDialog::getStartURL(":LastVisitedImagePath", recentDir).path() + origFilename,
++ convertKFileDialogFilterToQFileDialogFilter(KImageIO::pattern(KImageIO::Writing)),
++ this, 0, i18n("Save Image to File"));
++#else
++ //! @todo add originalFileName! (requires access to KRecentDirs)
++ QString fileName = KFileDialog::getSaveFileName(
++ ":LastVisitedImagePath", KImageIO::pattern(KImageIO::Writing), this, i18n("Save Image to File"));
++#endif
++ if (fileName.isEmpty())
++ return;
++
++ if (QFileInfo(fileName).extension().isEmpty())
++ fileName += (QString(".")+fileExtension);
++ kdDebug() << fileName << endl;
++ KURL url;
++ url.setPath( fileName );
++
++#ifdef Q_WS_WIN
++ //save last visited path
++ if (url.isLocalFile())
++ KRecentDirs::add(":LastVisitedImagePath", url.directory());
++#endif
++
++ QFile f(fileName);
++ if (f.exists() && KMessageBox::Yes != KMessageBox::warningYesNo(this,
++ "<qt>"+i18n("File \"%1\" already exists."
++ "<p>Do you want to replace it with a new one?")
++ .arg(QDir::convertSeparators(fileName))+"</qt>",0,
++ KGuiItem(i18n("&Replace")), KGuiItem(i18n("&Don't Replace"))))
++ {
++ return;
++ }
++
++//! @todo use KURL?
++ emit saveAsRequested(fileName);
++}
++
++void KexiImageContextMenu::cut()
++{
++ emit cutRequested();
++}
++
++void KexiImageContextMenu::copy()
++{
++ emit copyRequested();
++}
++
++void KexiImageContextMenu::paste()
++{
++ emit pasteRequested();
++}
++
++void KexiImageContextMenu::clear()
++{
++ emit clearRequested();
++}
++
++void KexiImageContextMenu::showProperties()
++{
++ emit showPropertiesRequested();
++}
++
++void KexiImageContextMenu::updateActionsAvailability()
++{
++ bool valueIsNull = true;
++ bool valueIsReadOnly = true;
++ emit updateActionsAvailabilityRequested(valueIsNull, valueIsReadOnly);
++
++ d->insertFromFileAction->setEnabled( !valueIsReadOnly );
++ d->saveAsAction->setEnabled( !valueIsNull );
++ d->cutAction->setEnabled( !valueIsNull && !valueIsReadOnly );
++ d->copyAction->setEnabled( !valueIsNull );
++ d->pasteAction->setEnabled( !valueIsReadOnly );
++ d->deleteAction->setEnabled( !valueIsNull && !valueIsReadOnly );
++ if (d->propertiesAction)
++ d->propertiesAction->setEnabled( !valueIsNull );
++}
++
++KActionCollection* KexiImageContextMenu::actionCollection() const
++{
++ return &d->actionCollection;
++}
++
++//static
++bool KexiImageContextMenu::updateTitle(QPopupMenu *menu, const QString& title, const QString& iconName)
++{
++ return KexiContextMenuUtils::updateTitle(menu, title, i18n("Image"), iconName);
++}
++
++// -------------------------------------------
++
++//static
++bool KexiContextMenuUtils::updateTitle(QPopupMenu *menu, const QString& objectName,
++ const QString& objectTypeName, const QString& iconName)
++{
++ if (!menu || objectName.isEmpty() || objectTypeName.isEmpty())
++ return false;
++ const int id = menu->idAt(0);
++ QMenuItem *item = menu->findItem(id);
++ if (!item)
++ return false;
++ KPopupTitle *title = dynamic_cast<KPopupTitle *>(item->widget());
++ if (!title)
++ return false;
++
++/*! @todo look at makeFirstCharacterUpperCaseInCaptions setting [bool]
++ (see doc/dev/settings.txt) */
++ QString realTitle( i18n("Object name : Object type", "%1 : %2")
++ .arg( objectName[0].upper() + objectName.mid(1) )
++ .arg( objectTypeName ));
++
++ if (iconName.isEmpty())
++ title->setTitle(realTitle);
++ else {
++ QPixmap pixmap(SmallIcon( iconName ));
++ title->setTitle(realTitle, &pixmap);
++ }
++ return true;
++}
++
++#include "kexicontextmenuutils.moc"
+--- kexi/widget/utils/kexicontextmenuutils.h (.../tags/koffice/1.6.2/koffice) (revision 0)
++++ kexi/widget/utils/kexicontextmenuutils.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -0,0 +1,112 @@
++/* This file is part of the KDE project
++ Copyright (C) 2006-2007 Jaroslaw Staniek <js at iidea.pl>
++
++ This program is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Library General Public
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public License
++ along with this program; see the file COPYING. If not, write to
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++*/
++
++#ifndef KexiContextMenuUtils_H
++#define KexiContextMenuUtils_H
++
++#include <kexidb/queryschema.h>
++#include <kpopupmenu.h>
++#include <kurl.h>
++
++class KActionCollection;
++class KexiDataItemInterface;
++
++//! @short A set of helpers for updating popup menu titles
++/*! The functions set meaningful titles like "Emploee : Image".
++*/
++class KEXIGUIUTILS_EXPORT KexiContextMenuUtils
++{
++ public:
++ /*! Updates title for context menu.
++ \return true if the title has been updated. */
++ static bool updateTitle(QPopupMenu *menu, const QString& objectName,
++ const QString& objectTypeName, const QString& iconName);
++};
++
++//! @short A context menu used for images within form and table views
++/*! Used in KexiDBImageBox and KexiBlobTableEdit.
++ Contains actions like insert, save, copy, paste, clear.
++
++ Signals like insertFromFileRequested() are all connected to
++ handlers in KexiDBImageBox and KexiBlobTableEdit so these objects can
++ respond on requests for data handling.
++*/
++class KEXIGUIUTILS_EXPORT KexiImageContextMenu : public KPopupMenu
++{
++ Q_OBJECT
++
++ public:
++ KexiImageContextMenu(QWidget *parent);
++ virtual ~KexiImageContextMenu();
++
++ KActionCollection* actionCollection() const;
++
++ /*! Updates title for context menu.
++ Used in KexiDBWidgetContextMenuExtender::createTitle(QPopupMenu *menu) and KexiDBImageBox.
++ \return true if the title has been updated. */
++ static bool updateTitle(QPopupMenu *menu, const QString& title, const QString& iconName = QString::null);
++
++ public slots:
++ void updateActionsAvailability();
++
++ virtual void insertFromFile();
++ virtual void saveAs();
++ virtual void cut();
++ virtual void copy();
++ virtual void paste();
++ virtual void clear();
++ virtual void showProperties();
++
++ signals:
++ //! Emitted when actions availability should be performed. Just connect this signal
++ //! to a slot and set \a valueIsNull and \a valueIsReadOnly.
++ void updateActionsAvailabilityRequested(bool& valueIsNull, bool& valueIsReadOnly);
++
++ /*! Emitted before "insertFromFile" action was requested. */
++ void insertFromFileRequested(const KURL &url);
++
++ /*! Emitted before "saveAs" action was requested.
++ You should fill \a origFilename, \a fileExtension and \a dataIsEmpty values.
++ If \a dataIsEmpty is false, saving will be cancelled. */
++ void aboutToSaveAsRequested(QString& origFilename, QString& fileExtension, bool& dataIsEmpty);
++
++ //! Emitted when "saveAs" action was requested
++ void saveAsRequested(const QString& fileName);
++
++ //! Emitted when "cut" action was requested
++ void cutRequested();
++
++ //! Emitted when "copy" action was requested
++ void copyRequested();
++
++ //! Emitted when "paste" action was requested
++ void pasteRequested();
++
++ //! Emitted when "clear" action was requested
++ void clearRequested();
++
++ //! Emitted when "showProperties" action was requested
++ void showPropertiesRequested();
++
++ protected:
++ class Private;
++ Private *d;
++};
++
++#endif
+--- kexi/widget/utils/Makefile.am (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/widget/utils/Makefile.am (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ libkexiguiutils_la_SOURCES = kexisharedactionclient.cpp kexirecordnavigator.cpp \
+ kexigradientwidget.cpp kexirecordmarker.cpp kexidisplayutils.cpp \
+ kexiflowlayout.cpp kexidatetimeformatter.cpp kexitooltip.cpp kexiarrowtip.cpp \
+- kexidropdownbutton.cpp kexicomboboxdropdownbutton.cpp kexiimagecontextmenu.cpp
++ kexidropdownbutton.cpp kexicomboboxdropdownbutton.cpp kexicontextmenuutils.cpp
+
+ libkexiguiutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved
+ libkexiguiutils_la_LIBADD = $(LIB_KDEUI)
+--- kexi/main/keximainwindowimpl_p.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/main/keximainwindowimpl_p.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -47,6 +47,7 @@
+ closedDialogViewGUIClient=0;
+ nameDialog=0;
+ curDialog=0;
++ m_findDialog=0;
+ block_KMdiMainFrm_eventFilter=false;
+ focus_before_popup=0;
+ // relationPart=0;
+@@ -330,6 +331,85 @@
+ m_openedCustomObjectsForItem.insert( key.latin1(), object );
+ }
+
++ KexiFindDialog *findDialog() {
++ if (!m_findDialog) {
++ m_findDialog = new KexiFindDialog(wnd);
++ m_findDialog->setActions( action_edit_findnext, action_edit_findprev,
++ action_edit_replace, action_edit_replace_all );
++/* connect(m_findDialog, SIGNAL(findNext()), action_edit_findnext, SLOT(activate()));
++ connect(m_findDialog, SIGNAL(find()), wnd, SLOT(slotEditFindNext()));
++ connect(m_findDialog, SIGNAL(replace()), wnd, SLOT(slotEditReplaceNext()));
++ connect(m_findDialog, SIGNAL(replaceAll()), wnd, SLOT(slotEditReplaceAll()));*/
++ }
++ return m_findDialog;
++ }
++
++ /*! Updates the find/replace dialog depending on the active view.
++ Nothing is performed if the dialog is not instantiated yet or is invisible. */
++ void updateFindDialogContents(bool createIfDoesNotExist = false) {
++ if (!createIfDoesNotExist && (!m_findDialog || !m_findDialog->isVisible()))
++ return;
++ KexiSearchAndReplaceViewInterface* iface = currentViewSupportingSearchAndReplaceInterface();
++ if (!iface) {
++ if (m_findDialog) {
++ m_findDialog->setButtonsEnabled(false);
++ m_findDialog->setLookInColumnList(QStringList(), QStringList());
++ }
++ return;
++ }
++//! @todo use ->caption() here, depending on global settings related to displaying captions
++ findDialog()->setObjectNameForCaption(curDialog->partItem()->name());
++
++ QStringList columnNames;
++ QStringList columnCaptions;
++ QString currentColumnName; // for 'look in'
++ if (!iface->setupFindAndReplace(columnNames, columnCaptions, currentColumnName)) {
++ m_findDialog->setButtonsEnabled(false);
++ m_findDialog->setLookInColumnList(QStringList(), QStringList());
++ return;
++ }
++ m_findDialog->setButtonsEnabled(true);
++
++ /* //update "look in" list
++ KexiTableViewColumn::List columns( dataAwareObject()->data()->columns );
++ QStringList columnNames;
++ QStringList columnCaptions;
++ for (KexiTableViewColumn::ListIterator it(columns); it.current(); ++it) {
++ if (!it.current()->visible())
++ continue;
++ columnNames.append( it.current()->field()->name() );
++ columnCaptions.append( it.current()->captionAliasOrName() );
++ }*/
++ const QString prevColumnName( m_findDialog->currentLookInColumnName());
++ m_findDialog->setLookInColumnList(columnNames, columnCaptions);
++ m_findDialog->setCurrentLookInColumnName( prevColumnName );
++ }
++
++ //! \return the current view if it supports \a actionName, otherwise returns 0.
++ KexiViewBase *currentViewSupportingAction(const char* actionName) const
++ {
++ if (!curDialog)
++ return 0;
++ KexiViewBase *view = curDialog->selectedView();
++ if (!view)
++ return 0;
++ KAction *action = view->sharedAction(actionName);
++ if (!action || !action->isEnabled())
++ return 0;
++ return view;
++ }
++
++ //! \return the current view if it supports KexiSearchAndReplaceViewInterface.
++ KexiSearchAndReplaceViewInterface* currentViewSupportingSearchAndReplaceInterface() const
++ {
++ if (!curDialog)
++ return 0;
++ KexiViewBase *view = curDialog->selectedView();
++ if (!view)
++ return 0;
++ return dynamic_cast<KexiSearchAndReplaceViewInterface*>(view);
++ }
++
+ KexiMainWindowImpl *wnd;
+ KexiStatusBar *statusBar;
+ KexiProject *prj;
+@@ -381,6 +461,8 @@
+ //! edit menu
+ KAction *action_edit_delete, *action_edit_delete_row,
+ *action_edit_cut, *action_edit_copy, *action_edit_paste,
++ *action_edit_find, *action_edit_findnext, *action_edit_findprev,
++ *action_edit_replace, *action_edit_replace_all,
+ *action_edit_select_all,
+ *action_edit_undo, *action_edit_redo,
+ *action_edit_insert_empty_row,
+@@ -499,18 +581,19 @@
+ //! Used by openedCustomObjectsForItem() and addOpenedCustomObjectForItem()
+ QAsciiDict<QObject> m_openedCustomObjectsForItem;
+
+- int propEditorDockSeparatorPos, navDockSeparatorPos;
++ int propEditorDockSeparatorPos, navDockSeparatorPos;
+ // int navDockSeparatorPosWithAutoOpen;
+- bool wasAutoOpen;
+- bool dialogExistedBeforeCloseProject;
++ bool wasAutoOpen;
++ bool dialogExistedBeforeCloseProject;
+
+- KMdi::MdiMode mdiModeToSwitchAfterRestart;
++ KMdi::MdiMode mdiModeToSwitchAfterRestart;
+
+-protected:
+- //! @todo move to KexiProject
+- KexiDialogDict dialogs;
++ private:
++ //! @todo move to KexiProject
++ KexiDialogDict dialogs;
+ #ifndef KEXI_NO_PROCESS_EVENTS
+- QMap<int, PendingJobType> pendingDialogs; //!< part item identifiers for dialogs whoose opening has been started
+-//todo(threads) QMutex dialogsMutex; //!< used for locking dialogs and pendingDialogs dicts
++ QMap<int, PendingJobType> pendingDialogs; //!< part item identifiers for dialogs whoose opening has been started
++ //todo(threads) QMutex dialogsMutex; //!< used for locking dialogs and pendingDialogs dicts
+ #endif
++ KexiFindDialog *m_findDialog;
+ };
+--- kexi/main/kexifinddialogbase.ui (.../tags/koffice/1.6.2/koffice) (revision 0)
++++ kexi/main/kexifinddialogbase.ui (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -0,0 +1,357 @@
++<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
++<class>KexiFindDialogBase</class>
++<widget class="QDialog">
++ <property name="name">
++ <cstring>KexiFindDialogBase</cstring>
++ </property>
++ <property name="geometry">
++ <rect>
++ <x>0</x>
++ <y>0</y>
++ <width>472</width>
++ <height>247</height>
++ </rect>
++ </property>
++ <property name="caption">
++ <string>Find</string>
++ </property>
++ <grid>
++ <property name="name">
++ <cstring>unnamed</cstring>
++ </property>
++ <widget class="QLabel" row="0" column="0">
++ <property name="name">
++ <cstring>textLabel1</cstring>
++ </property>
++ <property name="text">
++ <string>Fi&nd:</string>
++ </property>
++ <property name="buddy" stdset="0">
++ <cstring>m_textToFind</cstring>
++ </property>
++ </widget>
++ <widget class="QLabel" row="1" column="0">
++ <property name="name">
++ <cstring>m_replaceLbl</cstring>
++ </property>
++ <property name="text">
++ <string>Re&place with:</string>
++ </property>
++ <property name="buddy" stdset="0">
++ <cstring>m_textToReplace</cstring>
++ </property>
++ </widget>
++ <widget class="KComboBox" row="2" column="1">
++ <property name="name">
++ <cstring>m_lookIn</cstring>
++ </property>
++ <property name="focusPolicy">
++ <enum>StrongFocus</enum>
++ </property>
++ <property name="insertionPolicy">
++ <enum>NoInsertion</enum>
++ </property>
++ </widget>
++ <widget class="QLabel" row="2" column="0">
++ <property name="name">
++ <cstring>textLabel2_2</cstring>
++ </property>
++ <property name="text">
++ <string>&Look in:</string>
++ </property>
++ <property name="buddy" stdset="0">
++ <cstring>m_lookIn</cstring>
++ </property>
++ </widget>
++ <widget class="QCheckBox" row="5" column="2">
++ <property name="name">
++ <cstring>m_wholeWords</cstring>
++ </property>
++ <property name="focusPolicy">
++ <enum>WheelFocus</enum>
++ </property>
++ <property name="text">
++ <string>&Whole words only</string>
++ </property>
++ </widget>
++ <widget class="QCheckBox" row="6" column="2">
++ <property name="name">
++ <cstring>m_promptOnReplace</cstring>
++ </property>
++ <property name="focusPolicy">
++ <enum>WheelFocus</enum>
++ </property>
++ <property name="text">
++ <string>Prompt on replace</string>
++ </property>
++ <property name="checked">
++ <bool>true</bool>
++ </property>
++ </widget>
++ <widget class="QLayoutWidget" row="0" column="4" rowspan="7" colspan="1">
++ <property name="name">
++ <cstring>layout_btn</cstring>
++ </property>
++ <vbox>
++ <property name="name">
++ <cstring>unnamed</cstring>
++ </property>
++ <property name="margin">
++ <number>0</number>
++ </property>
++ <widget class="KPushButton">
++ <property name="name">
++ <cstring>m_btnFind</cstring>
++ </property>
++ <property name="text">
++ <string></string>
++ </property>
++ <property name="accel">
++ <string></string>
++ </property>
++ <property name="autoDefault">
++ <bool>true</bool>
++ </property>
++ <property name="default">
++ <bool>true</bool>
++ </property>
++ </widget>
++ <widget class="KPushButton">
++ <property name="name">
++ <cstring>m_btnClose</cstring>
++ </property>
++ <property name="text">
++ <string></string>
++ </property>
++ </widget>
++ <widget class="KPushButton">
++ <property name="name">
++ <cstring>m_btnReplace</cstring>
++ </property>
++ <property name="text">
++ <string>&Replace</string>
++ </property>
++ </widget>
++ <widget class="KPushButton">
++ <property name="name">
++ <cstring>m_btnReplaceAll</cstring>
++ </property>
++ <property name="text">
++ <string>Replace All</string>
++ </property>
++ </widget>
++ <spacer>
++ <property name="name">
++ <cstring>spacer8</cstring>
++ </property>
++ <property name="orientation">
++ <enum>Vertical</enum>
++ </property>
++ <property name="sizeType">
++ <enum>Expanding</enum>
++ </property>
++ <property name="sizeHint">
++ <size>
++ <width>20</width>
++ <height>40</height>
++ </size>
++ </property>
++ </spacer>
++ </vbox>
++ </widget>
++ <widget class="QLabel" row="4" column="0">
++ <property name="name">
++ <cstring>textLabel2_2_3</cstring>
++ </property>
++ <property name="text">
++ <string>&Match:</string>
++ </property>
++ <property name="buddy" stdset="0">
++ <cstring>m_match</cstring>
++ </property>
++ </widget>
++ <widget class="KComboBox" row="4" column="1">
++ <item>
++ <property name="text">
++ <string>Any Part of Field</string>
++ </property>
++ </item>
++ <item>
++ <property name="text">
++ <string>Whole Field</string>
++ </property>
++ </item>
++ <item>
++ <property name="text">
++ <string>Start of Field</string>
++ </property>
++ </item>
++ <property name="name">
++ <cstring>m_match</cstring>
++ </property>
++ <property name="focusPolicy">
++ <enum>StrongFocus</enum>
++ </property>
++ <property name="insertionPolicy">
++ <enum>NoInsertion</enum>
++ </property>
++ </widget>
++ <widget class="QLabel" row="3" column="0">
++ <property name="name">
++ <cstring>textLabel2_2_2</cstring>
++ </property>
++ <property name="text">
++ <string>&Search:</string>
++ </property>
++ <property name="buddy" stdset="0">
++ <cstring>m_search</cstring>
++ </property>
++ </widget>
++ <widget class="KComboBox" row="3" column="1">
++ <item>
++ <property name="text">
++ <string>Up</string>
++ </property>
++ </item>
++ <item>
++ <property name="text">
++ <string>Down</string>
++ </property>
++ </item>
++ <item>
++ <property name="text">
++ <string>All Rows</string>
++ </property>
++ </item>
++ <property name="name">
++ <cstring>m_search</cstring>
++ </property>
++ <property name="focusPolicy">
++ <enum>StrongFocus</enum>
++ </property>
++ <property name="insertionPolicy">
++ <enum>NoInsertion</enum>
++ </property>
++ </widget>
++ <spacer row="7" column="2">
++ <property name="name">
++ <cstring>spacer3</cstring>
++ </property>
++ <property name="orientation">
++ <enum>Vertical</enum>
++ </property>
++ <property name="sizeType">
++ <enum>Expanding</enum>
++ </property>
++ <property name="sizeHint">
++ <size>
++ <width>20</width>
++ <height>2</height>
++ </size>
++ </property>
++ </spacer>
++ <widget class="QCheckBox" row="4" column="2">
++ <property name="name">
++ <cstring>m_caseSensitive</cstring>
++ </property>
++ <property name="focusPolicy">
++ <enum>WheelFocus</enum>
++ </property>
++ <property name="text">
++ <string>C&ase sensitive</string>
++ </property>
++ </widget>
++ <widget class="QLabel" row="8" column="0" rowspan="1" colspan="5">
++ <property name="name">
++ <cstring>m_messageLabel</cstring>
++ </property>
++ <property name="text">
++ <string></string>
++ </property>
++ </widget>
++ <spacer row="4" column="3">
++ <property name="name">
++ <cstring>spacer2</cstring>
++ </property>
++ <property name="orientation">
++ <enum>Horizontal</enum>
++ </property>
++ <property name="sizeType">
++ <enum>Expanding</enum>
++ </property>
++ <property name="sizeHint">
++ <size>
++ <width>70</width>
++ <height>20</height>
++ </size>
++ </property>
++ </spacer>
++ <widget class="KHistoryCombo" row="0" column="1" rowspan="1" colspan="3">
++ <property name="name">
++ <cstring>m_textToFind</cstring>
++ </property>
++ <property name="insertionPolicy">
++ <enum>AtTop</enum>
++ </property>
++ <property name="autoCompletion">
++ <bool>true</bool>
++ </property>
++ <property name="duplicatesEnabled">
++ <bool>false</bool>
++ </property>
++ </widget>
++ <widget class="KHistoryCombo" row="1" column="1" rowspan="1" colspan="3">
++ <property name="name">
++ <cstring>m_textToReplace</cstring>
++ </property>
++ <property name="insertionPolicy">
++ <enum>AtTop</enum>
++ </property>
++ <property name="autoCompletion">
++ <bool>true</bool>
++ </property>
++ <property name="duplicatesEnabled">
++ <bool>false</bool>
++ </property>
++ </widget>
++ </grid>
++</widget>
++<customwidgets>
++</customwidgets>
++<connections>
++ <connection>
++ <sender>m_btnClose</sender>
++ <signal>clicked()</signal>
++ <receiver>KexiFindDialogBase</receiver>
++ <slot>reject()</slot>
++ </connection>
++</connections>
++<tabstops>
++ <tabstop>m_textToFind</tabstop>
++ <tabstop>m_textToReplace</tabstop>
++ <tabstop>m_btnFind</tabstop>
++ <tabstop>m_btnClose</tabstop>
++ <tabstop>m_btnReplace</tabstop>
++ <tabstop>m_btnReplaceAll</tabstop>
++ <tabstop>m_lookIn</tabstop>
++ <tabstop>m_search</tabstop>
++ <tabstop>m_match</tabstop>
++ <tabstop>m_caseSensitive</tabstop>
++ <tabstop>m_wholeWords</tabstop>
++ <tabstop>m_promptOnReplace</tabstop>
++</tabstops>
++<layoutdefaults spacing="6" margin="11"/>
++<includehints>
++ <includehint>kcombobox.h</includehint>
++ <includehint>kpushbutton.h</includehint>
++ <includehint>kpushbutton.h</includehint>
++ <includehint>kpushbutton.h</includehint>
++ <includehint>kpushbutton.h</includehint>
++ <includehint>kcombobox.h</includehint>
++ <includehint>kcombobox.h</includehint>
++ <includehint>kcombobox.h</includehint>
++ <includehint>klineedit.h</includehint>
++ <includehint>kcombobox.h</includehint>
++ <includehint>klineedit.h</includehint>
++</includehints>
++</UI>
+--- kexi/main/printing/kexisimpleprintingengine.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/main/printing/kexisimpleprintingengine.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,5 @@
+ /* This file is part of the KDE project
+- Copyright (C) 2005 Jaroslaw Staniek <js at iidea.pl>
++ Copyright (C) 2005-2007 Jaroslaw Staniek <js at iidea.pl>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+@@ -79,7 +79,7 @@
+ bool eof() const { return m_eof; }
+
+ //! \return number of pages. Can be used after calculatePagesCount().
+- uint pagesCount() { return m_pagesCount; }
++ uint pagesCount() const { return m_pagesCount; }
+
+ //! \return number of painted pages so far.
+ //! If eof() is true, this number is equal to total page count.
+@@ -93,15 +93,16 @@
+
+ protected:
+ void paintRecord(QPainter& painter, KexiTableItem *item,
+- int cellMargin, uint &y, uint paintedRows, bool paint);
++ int cellMargin, double &y, uint paintedRows, bool paint, bool printing);
+
+ const KexiSimplePrintingSettings* m_settings;
+
+ // QPainter* m_painter;
+ QFont m_mainFont, m_headerFont;
+ QPaintDeviceMetrics m_pdm;
+- int m_dpiX, m_dpiY;
++ double m_dpiX, m_dpiY;
+ uint m_pageWidth, m_pageHeight;
++ uint m_SCALE;
+ //QFontMetrics m_headerFM, m_mainFM;
+ KexiDB::Cursor *m_cursor;
+ KexiTableViewData *m_data;
+@@ -119,10 +120,10 @@
+ uint m_pagesCount;
+ bool m_eof;
+ bool m_paintInitialized; //!< used by paintPage()
+- double leftMargin;
+- double rightMargin;
+- double topMargin;
+- double bottomMargin;
++ double m_leftMargin;
++ double m_rightMargin;
++ double m_topMargin;
++ double m_bottomMargin;
+ double m_fx, m_fy;
+ };
+
+--- kexi/main/printing/kexisimpleprintpreviewwindow.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/main/printing/kexisimpleprintpreviewwindow.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -92,13 +92,19 @@
+ // kdDebug() << widget->width() << " " << widget->height() << endl;
+ setUpdatesEnabled(false);
+ if (re->size().width() > (widget->width()+2*KexiSimplePrintPreviewScrollView_MARGIN)
+- || re->size().height() > (widget->height()+2*KexiSimplePrintPreviewScrollView_MARGIN)) {
++ || re->size().height() > (widget->height()+2*KexiSimplePrintPreviewScrollView_MARGIN))
++ {
+ resizeContents(
+ QMAX(re->size().width(), widget->width()+2*KexiSimplePrintPreviewScrollView_MARGIN),
+ QMAX(re->size().height(), widget->height()+2*KexiSimplePrintPreviewScrollView_MARGIN));
+ int vscrbarWidth = verticalScrollBar()->isVisible() ? verticalScrollBar()->width() : 0;
+- moveChild(widget, (contentsWidth() - vscrbarWidth - widget->width())/2,
+- (contentsHeight() - widget->height())/2);
++ int newContentsWidth
++ = QMAX(re->size().width(), widget->width()+2*KexiSimplePrintPreviewScrollView_MARGIN);
++ int newContentsHeight
++ = QMAX(re->size().height(), widget->height()+2*KexiSimplePrintPreviewScrollView_MARGIN);
++ moveChild(widget, (newContentsWidth - vscrbarWidth - widget->width())/2,
++ (newContentsHeight - widget->height())/2);
++ resizeContents( newContentsWidth, newContentsHeight );
+ }
+ setUpdatesEnabled(true);
+ }
+@@ -149,9 +155,8 @@
+ , m_engine(engine)
+ , m_settings(*m_engine.settings())
+ , m_pageNumber(-1)
++ , m_pagesCount(-1)
+ {
+-// m_pagesCount = INT_MAX;
+-
+ setCaption(i18n("%1 - Print Preview - %2").arg(previewName).arg(KEXI_APP_NAME));
+ setIcon(DesktopIcon("filequickprint"));
+ QVBoxLayout *lyr = new QVBoxLayout(this, 6);
+@@ -194,12 +199,19 @@
+ m_scrollView->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+ lyr->addWidget(m_scrollView);
+
+- m_navToolbar = new KToolBar(0, this);
++ QWidget* navToolbarWidget = new QWidget(this); //widget used to center the navigator toolbar
++ navToolbarWidget->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
++ QHBoxLayout *navToolbarLyr = new QHBoxLayout(navToolbarWidget);
++ lyr->addWidget(navToolbarWidget);
++
++ m_navToolbar = new KToolBar(0, navToolbarWidget);
++ navToolbarLyr->addStretch(1);
++ navToolbarLyr->addWidget(m_navToolbar);
++ navToolbarLyr->addStretch(1);
+ // m_navToolbar->setFullWidth(true);
+ m_navToolbar->setLineWidth(0);
+ m_navToolbar->setFrameStyle(QFrame::NoFrame);
+ m_navToolbar->setIconText(KToolBar::IconTextRight);
+- lyr->addWidget(m_navToolbar);
+
+ m_idFirst = m_navToolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("start"), i18n("First Page"), m_navToolbar));
+ m_navToolbar->addConnection(m_idFirst, SIGNAL(clicked()), this, SLOT(slotFirstClicked()));
+@@ -290,13 +302,13 @@
+
+ void KexiSimplePrintPreviewWindow::goToPage(int pageNumber)
+ {
+- if (pageNumber==m_pageNumber || pageNumber < 0 || pageNumber > ((int)m_engine.pagesCount()-1))
++ if ((pageNumber==m_pageNumber && m_pagesCount == (int)m_engine.pagesCount())
++ || pageNumber < 0 || pageNumber > ((int)m_engine.pagesCount()-1))
+ return;
+ m_pageNumber = pageNumber;
++ m_pagesCount = m_engine.pagesCount();
+
+ m_view->repaint(); //this will automatically paint a new page
+-// if (m_engine.eof())
+-// m_pagesCount = pageNumber+1;
+
+ m_navToolbar->setItemEnabled(m_idNext, pageNumber < ((int)m_engine.pagesCount()-1));
+ m_navToolbar->setItemEnabled(m_idLast, pageNumber < ((int)m_engine.pagesCount()-1));
+--- kexi/main/printing/kexisimpleprintingpagesetup.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/main/printing/kexisimpleprintingpagesetup.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -246,8 +246,7 @@
+ }
+ if (titleText.isEmpty())
+ titleText = tableOrQuery.captionOrName();
+- if (!m_previewWindow) {
+- backToPage0 = false;
++ if (!m_previewWindow || m_printPreviewNeedsReloading) {
+ QString errorMessage;
+ if (!m_previewEngine->init(
+ *conn, tableOrQuery, titleText, errorMessage)) {
+@@ -255,6 +254,9 @@
+ KMessageBox::sorry(m_mainWin, errorMessage, i18n("Print Preview"));
+ return false;
+ }
++ }
++ if (!m_previewWindow) {
++ backToPage0 = false;
+ m_previewWindow = new KexiSimplePrintPreviewWindow(
+ *m_previewEngine, tableOrQuery.captionOrName(), 0,
+ Qt::WStyle_Customize|Qt::WStyle_NormalBorder|Qt::WStyle_Title|
+--- kexi/main/printing/kexisimpleprintpreviewwindow.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/main/printing/kexisimpleprintpreviewwindow.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -71,7 +71,8 @@
+ KexiSimplePrintingEngine &m_engine;
+ const KexiSimplePrintingSettings& m_settings;
+ KToolBar *m_toolbar, *m_navToolbar;
+- int m_pageNumber;//, m_pagesCount;
++ int m_pageNumber;
++ int m_pagesCount; //!< needed to know that pages could has been changed
+ int m_idFirst, m_idLast, m_idPrevious, m_idNext, m_idPageNumberLabel;
+ KexiSimplePrintPreviewScrollView *m_scrollView;
+ KexiSimplePrintPreviewView *m_view;
+--- kexi/main/printing/kexisimpleprintingengine.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/main/printing/kexisimpleprintingengine.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,5 @@
+ /* This file is part of the KDE project
+- Copyright (C) 2005,2006 Jaroslaw Staniek <js at iidea.pl>
++ Copyright (C) 2005-2007 Jaroslaw Staniek <js at iidea.pl>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+@@ -35,9 +35,8 @@
+ #include <qcheckbox.h>
+ #include <qwhatsthis.h>
+ #include <qpaintdevicemetrics.h>
++#include <qimage.h>
+
+-#include <kprinter.h>
+-
+ #include <kexiutils/tristate.h>
+ #include <kexidb/connection.h>
+ #include <kexidb/tableschema.h>
+@@ -207,20 +206,21 @@
+ offset = *m_dataOffsets.at(pageNumber);
+ }
+
+- uint y = 0;
++ double y = 0.0;
+
+- const bool printer = painter.device()->devType() == QInternal::Printer;
++ const bool printing = painter.device()->devType() == QInternal::Printer;
++ m_SCALE = printing ? 1 : 20;
+
+- int w = 0, h = 0;
++ double w, h;
+ m_pdm = QPaintDeviceMetrics( painter.device() );
+
+ if (dynamic_cast<QWidget*>(painter.device())) {
+- w = dynamic_cast<QWidget*>(painter.device())->width();
+- h = dynamic_cast<QWidget*>(painter.device())->height();
++ w = dynamic_cast<QWidget*>(painter.device())->width() * m_SCALE;
++ h = dynamic_cast<QWidget*>(painter.device())->height() * m_SCALE;
+ }
+ else if (dynamic_cast<QPixmap*>(painter.device())) {
+- w = dynamic_cast<QPixmap*>(painter.device())->width();
+- h = dynamic_cast<QPixmap*>(painter.device())->height();
++ w = dynamic_cast<QPixmap*>(painter.device())->width() * m_SCALE;
++ h = dynamic_cast<QPixmap*>(painter.device())->height() * m_SCALE;
+ }
+ else {//KPrinter...
+ w = m_pdm.widthMM();
+@@ -238,44 +238,42 @@
+ m_dpiY = m_pdm.logicalDpiY();
+ m_dpiX = m_pdm.logicalDpiX();
+ #ifdef Q_WS_WIN //fix for 120dpi
+- if (!printer) {
+-// m_dpiY = 96;
+-// m_dpiX = 96;
+- m_dpiY = 86;
+- m_dpiX = 86;
++ if (!printing) {
++ m_dpiY = 96;
++ m_dpiX = 96;
++// m_dpiY = 86;
++// m_dpiX = 86;
+ }
+ #endif
+- int pdWidthMM = m_pdm.widthMM();
+- int pdHeightMM = m_pdm.heightMM();
++ double pdWidthMM = m_pdm.widthMM();
++ double pdHeightMM = m_pdm.heightMM();
+
+- double screenF;
+-// if (printer)
+- screenF = 1.0;
+-// else
+-// screenF = (double)96.0/120.0;
++// double screenF;
++// screenF = 1.0;
+
+- leftMargin = POINT_TO_INCH(m_settings->pageLayout.ptLeft)*m_dpiX* screenF;
+- rightMargin = POINT_TO_INCH(m_settings->pageLayout.ptRight)*m_dpiX* screenF;
+- topMargin = POINT_TO_INCH(m_settings->pageLayout.ptTop)*m_dpiY* screenF;
+- bottomMargin = POINT_TO_INCH(m_settings->pageLayout.ptBottom)*m_dpiY* screenF;
++ m_leftMargin = POINT_TO_INCH(m_settings->pageLayout.ptLeft)*m_dpiX * (double)m_SCALE;//* screenF;
++ m_rightMargin = POINT_TO_INCH(m_settings->pageLayout.ptRight)*m_dpiX * (double)m_SCALE;//* screenF;
++ m_topMargin = POINT_TO_INCH(m_settings->pageLayout.ptTop)*m_dpiY * (double)m_SCALE;//* screenF;
++ m_bottomMargin = POINT_TO_INCH(m_settings->pageLayout.ptBottom)*m_dpiY * (double)m_SCALE;//* screenF;
+
+- m_fx = widthMM / (pdWidthMM * screenF);
+- m_fy = heightMM / (pdHeightMM * screenF);
++ m_fx = widthMM / (pdWidthMM);// * screenF);
++ m_fy = heightMM / (pdHeightMM);// * screenF);
+
+ //screen only
+ // painter.fillRect(QRect(0,0,w,h), QBrush(white));
+- m_pageWidth = int( m_fx*(double)m_pdm.width() - leftMargin - rightMargin);
+- m_pageHeight = int( m_fy*(double)m_pdm.height() - topMargin - bottomMargin);
++ m_pageWidth = uint( m_fx*double(m_pdm.width()) * m_SCALE - m_leftMargin - m_rightMargin );
++ m_pageHeight = uint( m_fy*double(m_pdm.height()) * m_SCALE - m_topMargin - m_bottomMargin );
+ m_headerFont = m_settings->pageTitleFont;
+- if(!printer) {
+- int pixelSize = int( POINT_TO_INCH((double)QFontInfo(m_headerFont).pointSize())*m_dpiX );
++ if(!printing) {
++ int pixelSize = int( POINT_TO_INCH((double)QFontInfo(m_headerFont).pointSize())*m_dpiX ) * m_SCALE;
+ m_headerFont.setPixelSize(pixelSize);
+ }
+
+ //! @todo add setting
+ m_mainFont = kapp->font();
+- if(!printer) {
+- int pixelSize = int( POINT_TO_INCH(m_mainFont.pointSizeFloat())*m_dpiX );
++ if(!printing) {
++ int pixelSize = int( POINT_TO_INCH(m_mainFont.pointSizeFloat())*m_dpiX )
++ * m_SCALE;
+ m_mainFont.setPixelSize(pixelSize);
+ }
+ painter.setFont(m_mainFont);
+@@ -287,7 +285,7 @@
+ m_footerHeight = m_mainLineSpacing * 2; //2 lines
+ painter.setFont(m_headerFont);
+ m_headerTextRect = painter.fontMetrics().boundingRect(
+- (int)leftMargin, (int)topMargin,
++ (int)m_leftMargin, (int)m_topMargin,
+ m_pageWidth - m_dateTimeWidth,
+ m_pageHeight, Qt::AlignAuto|Qt::WordBreak, m_headerText);
+ m_headerTextRect.setRight(m_headerTextRect.right()+10);
+@@ -310,8 +308,8 @@
+ }
+
+ //screen only
+- if(!printer) {
+- painter.setWindow(0, 0, int((double)w*m_fx), int((double)h*m_fy));
++ if(!printing) {
++ painter.setWindow(0, 0, int(w*m_fx), int(h*m_fy));
+ }
+
+ //paint header
+@@ -321,32 +319,31 @@
+ }
+ painter.setFont(m_mainFont);
+ if (paint) {
+- painter.drawText((int)leftMargin + m_pageWidth - m_dateTimeWidth,
+- (int)topMargin, m_dateTimeWidth,
++ painter.drawText((int)m_leftMargin + m_pageWidth - m_dateTimeWidth,
++ (int)m_topMargin, m_dateTimeWidth,
+ m_headerTextRect.height(), Qt::AlignRight, m_dateTimeText);
+ //footer
+-
+ QString pageNumString;
+ if (m_pagesCount>0)
+ pageNumString = i18n("Page (number) of (total)", "Page %1 of %2")
+ .arg(pageNumber+1).arg(m_pagesCount);
+ else
+ pageNumString = i18n("Page %1").arg(pageNumber+1);
+- painter.drawText((int)leftMargin,
+- (int)topMargin + m_pageHeight - m_mainLineSpacing,
++ painter.drawText((int)m_leftMargin,
++ (int)m_topMargin + m_pageHeight - m_mainLineSpacing,
+ m_pageWidth, m_mainLineSpacing,
+ Qt::AlignRight | Qt::AlignBottom, pageNumString);
+- painter.drawLine((int)leftMargin,
+- (int)topMargin + m_pageHeight - m_mainLineSpacing*3/2,
+- (int)leftMargin + m_pageWidth,
+- (int)topMargin + m_pageHeight - m_mainLineSpacing*3/2);
++ painter.drawLine((int)m_leftMargin,
++ (int)m_topMargin + m_pageHeight - m_mainLineSpacing*3/2,
++ (int)m_leftMargin + m_pageWidth,
++ (int)m_topMargin + m_pageHeight - m_mainLineSpacing*3/2);
+ }
+- y = (int)topMargin + m_headerTextRect.height() + m_mainLineSpacing/2;
++ y = (double)m_topMargin + (double)m_headerTextRect.height() + double(m_mainLineSpacing)/2;
+ if (!m_settings->addTableBorders) {
+ //separator line
+ if (paint)
+- painter.drawLine((int)leftMargin, y, (int)leftMargin + m_pageWidth-1, y);
+- y += m_mainLineSpacing;
++ painter.drawLine((int)m_leftMargin, (int)y, (int)m_leftMargin + m_pageWidth-1, (int)y);
++ y += (double)m_mainLineSpacing;
+ }
+
+ //--print records
+@@ -362,22 +359,23 @@
+ item = m_data->at(offset);
+
+ //compute height of this record
+- uint newY = y;
+- paintRecord(painter, item, cellMargin, newY, paintedRows, false);
+- if ((int(topMargin + m_pageHeight-(int)newY-m_footerHeight)) < 0 /*(1)*/ && paintedRows > 0/*(2)*/) {
++ double newY = y;
++ paintRecord(painter, item, cellMargin, newY, paintedRows, false, printing);
++// if ((int(m_topMargin + m_pageHeight-newY-m_footerHeight)) < 0 /*(1)*/ && paintedRows > 0/*(2)*/) {
++ if (newY > (m_topMargin + m_pageHeight - m_mainLineSpacing*2 + m_mainLineSpacing) /*(1)*/ && paintedRows > 0/*(2)*/) {
+ //(1) do not break records between pages
+ //(2) but paint at least one record
+ //! @todo break large records anyway...
+ break;
+ }
+-/* if (int(count * m_mainLineSpacing) > int(topMargin + m_pageHeight-(int)y-m_footerHeight))
++/* if (int(count * m_mainLineSpacing) > int(m_topMargin + m_pageHeight-(int)y-m_footerHeight))
+ {
+ //do not break records between pages
+ break;
+ }*/
+ // kdDebug() << " -------- " << y << " / " << m_pageHeight << endl;
+ if (paint)
+- paintRecord(painter, item, cellMargin, y, paintedRows, paint);
++ paintRecord(painter, item, cellMargin, y, paintedRows, paint, printing);
+ else
+ y = newY; //speedup
+ paintedRows++;
+@@ -390,14 +388,14 @@
+ }
+
+ void KexiSimplePrintingEngine::paintRecord(QPainter& painter, KexiTableItem *item,
+- int cellMargin, uint &y, uint paintedRows, bool paint)
++ int cellMargin, double &y, uint paintedRows, bool paint, bool printing)
+ {
+ if (paintedRows>0 && !m_settings->addTableBorders) {//separator
+ if (paint) {
+ painter.setPen(Qt::darkGray);
+ painter.drawLine(
+- (int)leftMargin, y-m_mainLineSpacing,
+- (int)leftMargin+m_pageWidth-1, y-m_mainLineSpacing);
++ int(m_leftMargin), int( y-(double)m_mainLineSpacing ),
++ int(m_leftMargin)+m_pageWidth-1, int(y-(double)m_mainLineSpacing));
+ painter.setPen(Qt::black);
+ }
+ }
+@@ -406,7 +404,7 @@
+ // kdDebug() << "row"<<i<<": "<<row.at(i).toString()<<endl;
+ if (paint) {
+ painter.drawText(
+- (int)leftMargin+cellMargin, y, m_maxFieldNameWidth-cellMargin*2, m_mainLineSpacing,
++ (int)m_leftMargin+cellMargin, (int)y, m_maxFieldNameWidth-cellMargin*2, m_mainLineSpacing,
+ Qt::AlignTop, m_fieldsExpanded[i]->captionOrAliasOrName()
+ + (m_settings->addTableBorders ? "" : ":"));
+ }
+@@ -424,6 +422,9 @@
+
+ QVariant v(item->at( indexForVisibleLookupValue ));
+ KexiDB::Field::Type ftype = ci->field->type();
++ QRect rect( (int)m_leftMargin + m_maxFieldNameWidth + cellMargin, (int)y,
++ m_pageWidth - m_maxFieldNameWidth - cellMargin*2, m_pageHeight - (int)y);
++
+ if (v.isNull() || !v.isValid()) {
+ //nothing to do
+ }
+@@ -451,45 +452,86 @@
+ else if (ftype==KexiDB::Field::Boolean)
+ text = v.toBool()
+ ? i18n("Boolean Yes (true)","Yes") : i18n("Boolean No (false)", "No");
++ else if (ftype==KexiDB::Field::BLOB) {
++ const QByteArray ba( v.toByteArray() );
++ if (!ba.isEmpty()) {
++ QPixmap pixmap(ba);
++#define MAX_PIXMAP_HEIGHT (m_mainLineSpacing * 5)
++ double pixmapHeight = MAX_PIXMAP_HEIGHT;
++ double pixmapWidth = double(MAX_PIXMAP_HEIGHT) * pixmap.width() / (double)pixmap.height();
++ if (pixmapWidth > (double)rect.width()) { //too wide
++ pixmapHeight = pixmapHeight * (double)rect.width() / pixmapWidth;
++ pixmapWidth = rect.width();
++ }
++ rect.setHeight( int( pixmapHeight + m_mainLineSpacing / 2 ) );
++ if (paint && !pixmap.isNull()) {
++ if (printing) {
++ painter.drawPixmap(
++ QRect(rect.x(), rect.y()+m_mainLineSpacing/4,
++ int(pixmapWidth), int(pixmapHeight)), pixmap );
++ }
++ else {// we're just previewing the pixmap, so let's resize it and cache
++ // so redrawing will be faster
++ painter.save();
++ painter.setWindow( // set 1:1 scale to avoid unnecessary image scaling
++ QRect(painter.window().topLeft(),
++ painter.window().size() / (int)m_SCALE ) );
++ painter.drawImage(
++ int(rect.x() / m_SCALE),
++ int( (rect.y()+m_mainLineSpacing/4) / m_SCALE),
++ pixmap.convertToImage().smoothScale(
++ int(pixmapWidth / m_SCALE), int(pixmapHeight / m_SCALE),
++ QImage::ScaleMin ));
++ painter.restore(); // back to m_SCALE:1 scale
++ }
++ }
++ }
++ }
+ else
+ text = v.toString();
+- QRect rect( painter.fontMetrics().boundingRect(
+- (int)leftMargin + m_maxFieldNameWidth + cellMargin, y,
+- m_pageWidth - m_maxFieldNameWidth - cellMargin*2, m_pageHeight - y,
+- Qt::AlignAuto|Qt::WordBreak, text) );
+- if (paint) {
++
++ if (ftype!=KexiDB::Field::BLOB || v.isNull() || !v.isValid())
++ rect = QRect( painter.fontMetrics().boundingRect(
++ rect.x(), rect.y(), rect.width(), rect.height(),
++ Qt::AlignAuto|Qt::WordBreak, text) );
++ if (!text.isEmpty() && paint) {
++// kdDebug() << "print engine: painter.drawText: "
++// << rect.x() <<" "<< rect.y() <<" "<< m_pageWidth - m_maxFieldNameWidth - cellMargin*2
++// <<" "<< m_topMargin + m_pageHeight - (int)y <<" "<<m_pageHeight<<" "<<y<<" "<< text << endl;
+ painter.drawText(
+- rect.x(), rect.y(), rect.width(), rect.height(),
++// rect.x(), rect.y(), rect.width(), rect.height(),
++ rect.x(), rect.y(), m_pageWidth - m_maxFieldNameWidth - cellMargin*2,
++ int(m_topMargin + m_pageHeight - (int)y),
+ Qt::AlignTop|Qt::WordBreak, text);
+ }
+ if (m_settings->addTableBorders) {
+ if (paint) {
+ painter.setPen(Qt::darkGray);
+ painter.drawLine(
+- (int)leftMargin, rect.top(), (int)leftMargin+m_pageWidth-1, rect.top());
++ (int)m_leftMargin, rect.top(), (int)m_leftMargin+m_pageWidth-1, rect.top());
+ painter.drawLine(
+- (int)leftMargin, rect.top(), (int)leftMargin, rect.bottom());
++ (int)m_leftMargin, rect.top(), (int)m_leftMargin, rect.bottom());
+ painter.drawLine(
+- (int)leftMargin+m_pageWidth-1, rect.top(),
+- (int)leftMargin+m_pageWidth-1, rect.bottom());
++ (int)m_leftMargin+m_pageWidth-1, rect.top(),
++ (int)m_leftMargin+m_pageWidth-1, rect.bottom());
+ painter.drawLine(
+- (int)leftMargin+m_maxFieldNameWidth, rect.top(),
+- (int)leftMargin+m_maxFieldNameWidth, rect.bottom());
++ (int)m_leftMargin+m_maxFieldNameWidth, rect.top(),
++ (int)m_leftMargin+m_maxFieldNameWidth, rect.bottom());
+ painter.setPen(Qt::black);
+ }
+ }
+- y += rect.height();
++ y += (double)rect.height();
+ }
+ if (m_settings->addTableBorders) {
+ if (paint) {
+ painter.setPen(Qt::darkGray);
+ painter.drawLine(
+- (int)leftMargin, y, (int)leftMargin+m_pageWidth-1, y);
++ (int)m_leftMargin, (int)y, (int)m_leftMargin+m_pageWidth-1, (int)y);
+ painter.setPen(Qt::black);
+ }
+ }
+ //record spacing
+- y += m_mainLineSpacing*3/2;
++ y += double(m_mainLineSpacing)*3.0/2.0;
+ // if (m_settings->addTableBorders)
+ // y -= m_mainLineSpacing; //a bit less
+ }
+--- kexi/main/keximainwindowimpl.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/main/keximainwindowimpl.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -32,6 +32,9 @@
+ #include <qtooltip.h>
+ #include <qmutex.h>
+ #include <qwaitcondition.h>
++#include <qfiledialog.h>
++#include <qdockwindow.h>
++#include <qdockarea.h>
+
+ #include <kapplication.h>
+ #include <kcmdlineargs.h>
+@@ -54,6 +57,8 @@
+ #include <ktabwidget.h>
+ #include <kimageio.h>
+ #include <khelpmenu.h>
++#include <kfiledialog.h>
++#include <krecentdocument.h>
+
+ #include <kexidb/connection.h>
+ #include <kexidb/utils.h>
+@@ -76,6 +81,9 @@
+ #include "kexistatusbar.h"
+ #include "kexiinternalpart.h"
+ #include "kexiactioncategories.h"
++#include "kexifinddialog.h"
++#include "kexisearchandreplaceiface.h"
++
+ #include "kde2_closebutton.xpm"
+
+ #include <widget/kexibrowser.h>
+@@ -87,19 +95,18 @@
+ #include "startup/KexiStartup.h"
+ #include "startup/KexiNewProjectWizard.h"
+ #include "startup/KexiStartupDialog.h"
+-/*
+-#include "startup/KexiConnSelector.h"
+-#include "startup/KexiProjectSelectorBase.h"
+-#include "startup/KexiProjectSelector.h"
+-*/
++#include "startup/KexiStartupFileDialog.h"
+ #include "kexinamedialog.h"
+ #include "printing/kexisimpleprintingpart.h"
+ #include "printing/kexisimpleprintingpagesetup.h"
+
+ //Extreme verbose debug
+ #if defined(Q_WS_WIN)
++# include <krecentdirs.h>
++# include <win32_utils.h>
+ //# define KexiVDebug kdDebug()
+ #endif
++
+ #if !defined(KexiVDebug)
+ # define KexiVDebug if (0) kdDebug()
+ #endif
+@@ -145,6 +152,7 @@
+ QWidget *dummyWidget = 0; //needed to have icon for dialogs before KexiMainWindowImpl is created
+ //! @todo switch GUIenabled off when needed
+ KApplication* app = new KApplication(true, GUIenabled);
++
+ #ifdef KEXI_STANDALONE
+ KGlobal::locale()->removeCatalogue("kexi");
+ KGlobal::locale()->insertCatalogue("standalone_kexi");
+@@ -152,6 +160,10 @@
+ KGlobal::locale()->insertCatalogue("koffice");
+ KGlobal::locale()->insertCatalogue("koproperty");
+
++#ifdef CUSTOM_VERSION
++# include "custom_exec.h"
++#endif
++
+ #ifdef KEXI_DEBUG_GUI
+ QWidget* debugWindow = 0;
+ #endif
+@@ -187,10 +199,6 @@
+ return 0;
+ }
+
+-#ifdef CUSTOM_VERSION
+-# include "custom_exec.h"
+-#endif
+-
+ KexiMainWindowImpl *win = new KexiMainWindowImpl();
+ app->setMainWidget(win);
+ #ifdef KEXI_DEBUG_GUI
+@@ -362,7 +370,9 @@
+ QObject::connect( closeButton, SIGNAL( clicked() ), this, SLOT( closeActiveView() ) );
+ }
+
+-// manager()->readConfig( d->config, "DockWindows" );
++#ifdef KEXI_ADD_CUSTOM_KEXIMAINWINDOWIMPL
++# include "keximainwindowimpl_ctor.h"
++#endif
+ }
+
+ KexiMainWindowImpl::~KexiMainWindowImpl()
+@@ -682,6 +692,27 @@
+ d->action_edit_redo = createSharedAction( KStdAction::Redo, "edit_redo");
+ d->action_edit_redo->setWhatsThis(i18n("Reverts the most recent undo action."));
+
++#if 0 //old
++ d->action_edit_find = createSharedAction( KStdAction::Find, "edit_find");
++ d->action_edit_findnext = createSharedAction( KStdAction::FindNext, "edit_findnext");
++ d->action_edit_findprev = createSharedAction( KStdAction::FindPrev, "edit_findprevious");
++//! @todo d->action_edit_paste = createSharedAction( KStdAction::Replace, "edit_replace");
++#endif
++
++ d->action_edit_find = KStdAction::find(
++ this, SLOT(slotEditFind()), actionCollection(), "edit_find" );
++// d->action_edit_find = createSharedAction( KStdAction::Find, "edit_find");
++ d->action_edit_findnext = KStdAction::findNext(
++ this, SLOT(slotEditFindNext()), actionCollection(), "edit_findnext");
++ d->action_edit_findprev = KStdAction::findPrev(
++ this, SLOT(slotEditFindPrevious()), actionCollection(), "edit_findprevious");
++ d->action_edit_replace = 0;
++//! @todo d->action_edit_replace = KStdAction::replace(
++//! this, SLOT(slotEditReplace()), actionCollection(), "project_print_preview" );
++ d->action_edit_replace_all = 0;
++//! @todo d->action_edit_replace_all = new KAction( i18n("Replace All"), "", 0,
++//! this, SLOT(slotEditReplaceAll()), actionCollection(), "edit_replaceall");
++
+ d->action_edit_select_all = createSharedAction( KStdAction::SelectAll, "edit_select_all");
+
+ d->action_edit_delete = createSharedAction(i18n("&Delete"), "editdelete",
+@@ -974,6 +1005,18 @@
+ acat->addAction("edit_edititem", Kexi::PartItemActionCategory|Kexi::WindowActionCategory,
+ KexiPart::TableObjectType, KexiPart::QueryObjectType);
+
++ acat->addAction("edit_find", Kexi::GlobalActionCategory|Kexi::WindowActionCategory,
++ KexiPart::TableObjectType, KexiPart::QueryObjectType, KexiPart::FormObjectType);
++
++ acat->addAction("edit_findnext", Kexi::GlobalActionCategory|Kexi::WindowActionCategory,
++ KexiPart::TableObjectType, KexiPart::QueryObjectType, KexiPart::FormObjectType);
++
++ acat->addAction("edit_findprevious", Kexi::GlobalActionCategory|Kexi::WindowActionCategory,
++ KexiPart::TableObjectType, KexiPart::QueryObjectType, KexiPart::FormObjectType);
++
++ acat->addAction("edit_replace", Kexi::GlobalActionCategory|Kexi::WindowActionCategory,
++ KexiPart::TableObjectType, KexiPart::QueryObjectType, KexiPart::FormObjectType);
++
+ acat->addAction("edit_paste_special_data_table", Kexi::GlobalActionCategory);
+
+ acat->addAction("help_about_app", Kexi::GlobalActionCategory);
+@@ -1217,10 +1260,8 @@
+ if (d->propEditor)
+ makeDockInvisible( manager()->findWidgetParentDock(d->propEditorTabWidget) );
+ return createBlankProject();
+- case KexiStartupHandler::UseTemplate:
+- return cancelled;
+- //TODO
+- break;
++ case KexiStartupHandler::CreateFromTemplate:
++ return createProjectFromTemplate(*Kexi::startupHandler().projectData());
+ case KexiStartupHandler::OpenProject:
+ return openProject(*Kexi::startupHandler().projectData());
+ case KexiStartupHandler::ImportProject:
+@@ -1308,6 +1349,70 @@
+ return true;
+ }
+
++tristate KexiMainWindowImpl::createProjectFromTemplate(const KexiProjectData& projectData)
++{
++ QStringList mimetypes;
++ mimetypes.append( KexiDB::Driver::defaultFileBasedDriverMimeType() );
++ QString fname;
++ const QString startDir(":OpenExistingOrCreateNewProject"/*as in KexiNewProjectWizard*/);
++ const QString caption( i18n("Select New Project's Location") );
++
++ while (true) {
++#ifdef Q_WS_WIN
++ //! @todo remove
++ QString recentDir = KGlobalSettings::documentPath();
++ if (fname.isEmpty() && !projectData.constConnectionData()->dbFileName().isEmpty()) //propose filename from db template name
++ fname = KFileDialog::getStartURL(startDir, recentDir).path()
++ + '/' + projectData.constConnectionData()->dbFileName();
++ fname = QFileDialog::getSaveFileName(
++ KFileDialog::getStartURL(fname.isEmpty() ? startDir : fname, recentDir).path(),
++ KexiUtils::fileDialogFilterStrings(mimetypes, false),
++ this, "CreateProjectFromTemplate", caption);
++ if ( !fname.isEmpty() ) {
++ //save last visited path
++ KURL url;
++ url.setPath( fname );
++ if (url.isLocalFile())
++ KRecentDirs::add(startDir, url.directory());
++ }
++#else
++ Q_UNUSED(projectData);
++ if (fname.isEmpty() &&
++ !projectData.constConnectionData()->dbFileName().isEmpty())
++ {
++ //propose filename from db template name
++ fname = projectData.constConnectionData()->dbFileName();
++ }
++ const bool specialDir = fname.isEmpty();
++ kdDebug() << fname << "............." << endl;
++ KFileDialog dlg( specialDir ? startDir : QString::null,
++ mimetypes.join(" "), this, "filedialog", true);
++ if ( !specialDir )
++ dlg.setSelection( fname ); // may also be a filename
++ dlg.setOperationMode( KFileDialog::Saving );
++ dlg.setCaption( caption );
++ dlg.exec();
++ fname = dlg.selectedFile();
++ if (!fname.isEmpty())
++ KRecentDocument::add(fname);
++// fname = KFileDialog::getSaveFileName(fname.isEmpty() ? startDir : fname,
++ // mimetypes.join(" "), this, caption);
++#endif
++ if ( fname.isEmpty() )
++ return cancelled;
++ if (KexiStartupFileDialog::askForOverwriting(fname, this))
++ break;
++ }
++
++ if (KexiUtils::CopySuccess != KexiUtils::copyFile(
++ projectData.constConnectionData()->fileName(), fname ))
++ {
++ return false;
++ }
++
++ return openProject(fname, 0, QString::null, projectData.autoopenObjects/*copy*/);
++}
++
+ void KexiMainWindowImpl::updateReadOnlyState()
+ {
+ const bool readOnly = d->prj && d->prj->dbConnection() && d->prj->dbConnection()->isReadOnly();
+@@ -2354,6 +2459,7 @@
+ // d->last_checked_mode = d->actions_for_view_modes[ d->curDialog->currentViewMode() ];
+ invalidateViewModeActions();
+ invalidateActions();
++ d->updateFindDialogContents();
+ if (dlg)
+ dlg->setFocus();
+ }
+@@ -2557,7 +2663,7 @@
+ if (dlg.exec()!=QDialog::Accepted)
+ return;
+
+- openProject(dlg.selectedExistingFile(), dlg.selectedExistingConnection());
++ openProject(dlg.selectedFileName(), dlg.selectedExistingConnection());
+ }
+
+ tristate KexiMainWindowImpl::openProject(const QString& aFileName,
+@@ -2578,7 +2684,8 @@
+ }
+
+ tristate KexiMainWindowImpl::openProject(const QString& aFileName,
+- KexiDB::ConnectionData *cdata, const QString& dbName)
++ KexiDB::ConnectionData *cdata, const QString& dbName,
++ const QValueList<KexiProjectData::ObjectInfo>& autoopenObjects)
+ {
+ if (d->prj) {
+ return openProjectInExternalKexiInstance(aFileName, cdata, dbName);
+@@ -2632,6 +2739,7 @@
+ }
+ if (!projectData)
+ return false;
++ projectData->autoopenObjects = autoopenObjects;
+ const tristate res = openProject(*projectData);
+ if (deleteAfterOpen) //projectData object has been copied
+ delete projectData;
+@@ -2932,6 +3040,7 @@
+ d->updatePropEditorVisibility(viewMode);
+ invalidateProjectWideActions();
+ invalidateSharedActions();
++ d->updateFindDialogContents();
+ return true;
+ }
+
+@@ -3680,7 +3789,7 @@
+ if (KMessageBox::No == KMessageBox::warningYesNo(this,
+ "<p>"+i18n("Do you want to permanently delete:\n"
+ "%1\n"
+- "If you click Yes, you will not be able to undo the deletion.")
++ "If you click \"Delete\", you will not be able to undo the deletion.")
+ .arg( "</p><p>"+part->instanceCaption()+" \""+ item->name() + "\"?</p>" ),
+ 0, KGuiItem(i18n("Delete"), "editdelete"), KStdGuiItem::no()))
+ return cancelled;
+@@ -4055,12 +4164,12 @@
+ if (dlg.exec()!=QDialog::Accepted)
+ return;
+
+- if (dlg.selectedExistingFile().isEmpty()) {
++ if (dlg.selectedFileName().isEmpty()) {
+ //! @todo add support for server based if needed?
+ return;
+ }
+ KexiDB::ConnectionData cdata;
+- cdata.setFileName( dlg.selectedExistingFile() );
++ cdata.setFileName( dlg.selectedFileName() );
+
+ //detect driver name for the selected file
+ KexiStartupData::Import detectedImportAction;
+@@ -4241,7 +4350,9 @@
+
+ tristate KexiMainWindowImpl::printPreviewForItem(KexiPart::Item* item)
+ {
+- return printPreviewForItem(item, QString::null, false);
++ return printPreviewForItem(item, QString::null,
++//! @todo store cached row data?
++ true/*reload*/);
+ }
+
+ bool KexiMainWindowImpl::printPreviewForItem(KexiPart::Item* item,
+@@ -4412,6 +4523,79 @@
+ delete dlg;
+ }
+
++void KexiMainWindowImpl::slotEditFind()
++{
++// KexiViewBase *view = d->currentViewSupportingAction("edit_findnext");
++ KexiSearchAndReplaceViewInterface* iface = d->currentViewSupportingSearchAndReplaceInterface();
++ if (!iface)
++ return;
++ d->updateFindDialogContents(true/*create if does not exist*/);
++ d->findDialog()->setReplaceMode(false);
++
++ d->findDialog()->show();
++ d->findDialog()->setActiveWindow();
++ d->findDialog()->raise();
++}
++
++void KexiMainWindowImpl::slotEditFind(bool next)
++{
++ KexiSearchAndReplaceViewInterface* iface = d->currentViewSupportingSearchAndReplaceInterface();
++ if (!iface)
++ return;
++ tristate res = iface->find(
++ d->findDialog()->valueToFind(), d->findDialog()->options(), next);
++ if (~res)
++ return;
++ d->findDialog()->updateMessage( true == res );
++//! @todo result
++}
++
++void KexiMainWindowImpl::slotEditFindNext()
++{
++ slotEditFind( true );
++}
++
++void KexiMainWindowImpl::slotEditFindPrevious()
++{
++ slotEditFind( false );
++}
++
++void KexiMainWindowImpl::slotEditReplace()
++{
++ KexiSearchAndReplaceViewInterface* iface = d->currentViewSupportingSearchAndReplaceInterface();
++ if (!iface)
++ return;
++ d->updateFindDialogContents(true/*create if does not exist*/);
++ d->findDialog()->setReplaceMode(true);
++//! @todo slotEditReplace()
++ d->findDialog()->show();
++ d->findDialog()->setActiveWindow();
++}
++
++void KexiMainWindowImpl::slotEditReplaceNext()
++{
++ slotEditReplace( false );
++}
++
++void KexiMainWindowImpl::slotEditReplace(bool all)
++{
++ KexiSearchAndReplaceViewInterface* iface = d->currentViewSupportingSearchAndReplaceInterface();
++ if (!iface)
++ return;
++//! @todo add question: "Do you want to replace every occurence of \"%1\" with \"%2\"?
++//! You won't be able to undo this." + "Do not ask again".
++ tristate res = iface->findNextAndReplace(
++ d->findDialog()->valueToFind(), d->findDialog()->valueToReplaceWith(),
++ d->findDialog()->options(), all);
++ d->findDialog()->updateMessage( true == res );
++//! @todo result
++}
++
++void KexiMainWindowImpl::slotEditReplaceAll()
++{
++ slotEditReplace( true );
++}
++
+ void KexiMainWindowImpl::addWindow( KMdiChildView* pView, int flags )
+ {
+ //maximize this window, if it's
+--- kexi/main/kexifinddialog.cpp (.../tags/koffice/1.6.2/koffice) (revision 0)
++++ kexi/main/kexifinddialog.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -0,0 +1,279 @@
++/* This file is part of the KDE project
++ Copyright (C) 2004-2007 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
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public License
++ along with this library; see the file COPYING.LIB. If not, write to
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++*/
++
++#include "kexifinddialog.h"
++
++#include <kstdguiitem.h>
++#include <kstdaction.h>
++#include <kpushbutton.h>
++#include <kcombobox.h>
++#include <klocale.h>
++#include <kdebug.h>
++#include <kdialog.h>
++#include <kaction.h>
++#include <kiconloader.h>
++
++#include <qcheckbox.h>
++#include <qlabel.h>
++#include <qguardedptr.h>
++#include <qlayout.h>
++#include <qaccel.h>
++
++//! @internal
++class KexiFindDialog::Private
++{
++ public:
++ Private()
++ {
++ accels.setAutoDelete(true);
++ }
++ ~Private()
++ {
++ }
++ //! Connects action \a action with appropriate signal \a member
++ //! and optionally adds accel that will receive shortcut for \a action
++ //! at global scope of the dialog \a parent.
++ void setActionAndAccel(KAction *action, QWidget* parent, const char* member)
++ {
++ if (!action)
++ return;
++ QObject::connect(parent, member, action, SLOT(activate()));
++ if (action->shortcut().isNull())
++ return;
++ QAccel *accel = new QAccel(parent); // we want to handle dialog-wide shortcut as well
++ accels.append( accel );
++ accel->connectItem(
++ accel->insertItem( action->shortcut() ), parent, member );
++ }
++
++ QStringList lookInColumnNames;
++ QStringList lookInColumnCaptions;
++ QString objectName; //!< for caption
++ QGuardedPtr<KAction> findnextAction;
++ QGuardedPtr<KAction> findprevAction;
++ QGuardedPtr<KAction> replaceAction;
++ QGuardedPtr<KAction> replaceallAction;
++ QPtrList<QAccel> accels;
++ bool replaceMode : 1;
++};
++
++//------------------------------------------
++
++KexiFindDialog::KexiFindDialog( QWidget* parent )
++ : KexiFindDialogBase(parent, "KexiFindDialog", false/*!modal*/,
++ Qt::WType_Dialog|Qt::WStyle_NormalBorder|Qt::WStyle_Title
++ |Qt::WStyle_SysMenu|Qt::WStyle_Customize|Qt::WStyle_Tool)
++ , d( new Private() )
++{
++ m_search->setCurrentItem((int)KexiSearchAndReplaceViewInterface::Options::SearchDown);
++ layout()->setMargin( KDialog::marginHint() );
++ layout()->setSpacing( KDialog::spacingHint() );
++ KAction *a = KStdAction::findNext(0, 0, 0);
++ m_btnFind->setText(a->text());
++ m_btnFind->setIconSet(a->iconSet());
++ delete a;
++ m_btnClose->setText(KStdGuiItem::close().text());
++ m_btnClose->setIconSet(KStdGuiItem::close().iconSet());
++ connect(m_btnFind, SIGNAL(clicked()), this, SIGNAL(findNext()));
++ connect(m_btnClose, SIGNAL(clicked()), this, SLOT(slotCloseClicked()));
++ connect(m_btnReplace, SIGNAL(clicked()), this, SIGNAL(replaceNext()));
++ connect(m_btnReplaceAll, SIGNAL(clicked()), this, SIGNAL(replaceAll()));
++ // clear message after the text is changed
++ connect(m_textToFind, SIGNAL(textChanged()), this, SIGNAL(updateMessage()));
++ connect(m_textToReplace, SIGNAL(textChanged()), this, SIGNAL(updateMessage()));
++
++ d->replaceMode = true; //to force updating by setReplaceMode()
++ setReplaceMode(false);
++
++ setLookInColumnList(QStringList(), QStringList());
++}
++
++KexiFindDialog::~KexiFindDialog()
++{
++ delete d;
++}
++
++void KexiFindDialog::setActions( KAction *findnext, KAction *findprev,
++ KAction *replace, KAction *replaceall )
++{
++ d->findnextAction = findnext;
++ d->findprevAction = findprev;
++ d->replaceAction = replace;
++ d->replaceallAction = replaceall;
++ d->accels.clear();
++ d->setActionAndAccel(d->findnextAction, this, SIGNAL(findNext()));
++ d->setActionAndAccel(d->findprevAction, this, SIGNAL(findPrevious()));
++ d->setActionAndAccel(d->replaceAction, this, SIGNAL(replaceNext()));
++ d->setActionAndAccel(d->replaceallAction, this, SIGNAL(replaceAll()));
++}
++
++QStringList KexiFindDialog::lookInColumnNames() const
++{
++ return d->lookInColumnNames;
++}
++
++QStringList KexiFindDialog::lookInColumnCaptions() const
++{
++ return d->lookInColumnCaptions;
++}
++
++QString KexiFindDialog::currentLookInColumnName() const
++{
++ int index = m_lookIn->currentItem();
++ if (index <= 0 || index >= (int)d->lookInColumnNames.count())
++ return QString::null;
++ else if (index == 1)
++ return "(field)";
++ return d->lookInColumnNames[index - 1/*"(All fields)"*/ - 1/*"(Current field)"*/];
++}
++
++QVariant KexiFindDialog::valueToFind() const
++{
++ return m_textToFind->currentText();
++}
++
++QVariant KexiFindDialog::valueToReplaceWith() const
++{
++ return m_textToReplace->currentText();
++}
++
++void KexiFindDialog::setLookInColumnList(const QStringList& columnNames,
++ const QStringList& columnCaptions)
++{
++ d->lookInColumnNames = columnNames;
++ d->lookInColumnCaptions = columnCaptions;
++ m_lookIn->clear();
++ m_lookIn->insertItem(i18n("(All fields)"));
++ m_lookIn->insertItem(i18n("(Current field)"));
++ m_lookIn->insertStringList(d->lookInColumnCaptions);
++}
++
++void KexiFindDialog::setCurrentLookInColumnName(const QString& columnName)
++{
++ int index;
++ if (columnName.isEmpty())
++ index = 0;
++ else if (columnName == "(field)")
++ index = 1;
++ else {
++ index = d->lookInColumnNames.findIndex( columnName );
++ if (index == -1) {
++ kdWarning() << QString("KexiFindDialog::setCurrentLookInColumn(%1) column name not found on the list")
++ .arg(columnName) << endl;
++ return;
++ }
++ index = index + 1/*"(All fields)"*/ + 1/*"(Current field)"*/;
++ }
++ m_lookIn->setCurrentItem(index);
++}
++
++void KexiFindDialog::setReplaceMode(bool set)
++{
++ if (d->replaceMode == set)
++ return;
++ d->replaceMode = set;
++ if (d->replaceMode) {
++ m_promptOnReplace->show();
++ m_replaceLbl->show();
++ m_textToReplace->show();
++ m_btnReplace->show();
++ m_btnReplaceAll->show();
++ }
++ else {
++ m_promptOnReplace->hide();
++ m_replaceLbl->hide();
++ m_textToReplace->hide();
++ m_btnReplace->hide();
++ m_btnReplaceAll->hide();
++ resize(width(),height()-30);
++ }
++ setObjectNameForCaption(d->objectName);
++ updateGeometry();
++}
++
++void KexiFindDialog::setObjectNameForCaption(const QString& name)
++{
++ d->objectName = name;
++ if (d->replaceMode) {
++ if (name.isEmpty())
++ setCaption(i18n("Replace"));
++ else
++ setCaption(i18n("Replace in \"%1\"").arg(name));
++ }
++ else {
++ if (name.isEmpty())
++ setCaption(i18n("Find"));
++ else
++ setCaption(i18n("Find in \"%1\"").arg(name));
++ }
++}
++
++void KexiFindDialog::setButtonsEnabled(bool enable)
++{
++ m_btnFind->setEnabled(enable);
++ m_btnReplace->setEnabled(enable);
++ m_btnReplaceAll->setEnabled(enable);
++ if (!enable)
++ setObjectNameForCaption(QString::null);
++}
++
++void KexiFindDialog::setMessage(const QString& message)
++{
++ m_messageLabel->setText(message);
++}
++
++void KexiFindDialog::updateMessage( bool found )
++{
++ if (found)
++ setMessage(QString::null);
++ else
++ setMessage(i18n("The search item was not found"));
++}
++
++void KexiFindDialog::slotCloseClicked()
++{
++ reject();
++}
++
++void KexiFindDialog::show()
++{
++ m_textToFind->setFocus();
++ QDialog::show();
++}
++
++KexiSearchAndReplaceViewInterface::Options KexiFindDialog::options() const
++{
++ KexiSearchAndReplaceViewInterface::Options options;
++ if (m_lookIn->currentItem() <= 0) //"(All fields)"
++ options.columnNumber = KexiSearchAndReplaceViewInterface::Options::AllColumns;
++ else if (m_lookIn->currentItem() == 1) //"(Current field)"
++ options.columnNumber = KexiSearchAndReplaceViewInterface::Options::CurrentColumn;
++ else
++ options.columnNumber = m_lookIn->currentItem() - 1/*"(All fields)"*/ - 1/*"(Current field)"*/;
++ options.textMatching
++ = (KexiSearchAndReplaceViewInterface::Options::TextMatching)m_match->currentItem();
++ options.searchDirection
++ = (KexiSearchAndReplaceViewInterface::Options::SearchDirection)m_search->currentItem();
++ options.caseSensitive = m_caseSensitive->isChecked();
++ options.wholeWordsOnly = m_wholeWords->isChecked();
++ options.promptOnReplace = m_promptOnReplace->isChecked();
++ return options;
++}
++
++#include "kexifinddialog.moc"
+--- kexi/main/startup/KexiStartupDialog.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/main/startup/KexiStartupDialog.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,5 @@
+ /* This file is part of the KDE project
+- Copyright (C) 2003-2004 Jaroslaw Staniek <js at iidea.pl>
++ Copyright (C) 2003-2007 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
+@@ -18,7 +18,7 @@
+ */
+
+ #include "KexiStartupDialog.h"
+-
++#include "KexiStartupDialogTemplatesPage.h"
+ #include "kexi.h"
+ #include "KexiProjectSelector.h"
+ #include "KexiOpenExistingFile.h"
+@@ -52,65 +52,11 @@
+ #include <ktextbrowser.h>
+ #include <kconfig.h>
+
+-//! we'll remove this later...
+-#define NO_DB_TEMPLATES
+-
+ #ifdef KEXI_SHOW_UNIMPLEMENTED
+ #define KEXI_STARTUP_SHOW_TEMPLATES
+ #define KEXI_STARTUP_SHOW_RECENT
+ #endif
+
+-class TemplateItem : public KIconViewItem
+-{
+- public:
+- TemplateItem(KIconView* parent, const QString& name, const QPixmap& icon)
+- : KIconViewItem(parent,name,icon)
+- {}
+- ~TemplateItem() {}
+- QString key, name, description;
+-};
+-
+-TemplatesPage::TemplatesPage( Orientation o, QWidget * parent, const char * name )
+- : QSplitter(o, parent, name)
+-{
+- templates = new KIconView(this, "templates");
+- templates->setItemsMovable(false);
+- templates->setShowToolTips(false);
+- info = new KTextBrowser(this,"info");
+- setResizeMode(templates,KeepSize);
+- setResizeMode(info,KeepSize);
+-
+- connect(templates,SIGNAL(selectionChanged(QIconViewItem*)),this,SLOT(itemClicked(QIconViewItem*)));
+-}
+-
+-TemplatesPage::~TemplatesPage() {}
+-
+-void TemplatesPage::addItem(const QString& key, const QString& name,
+- const QString& description, const QPixmap& icon)
+-{
+- TemplateItem *item = new TemplateItem(templates, name, icon);
+- item->key=key;
+- item->name=name;
+- item->description=description;
+-}
+-
+-void TemplatesPage::itemClicked(QIconViewItem *item) {
+- if (!item) {
+- info->setText("");
+- return;
+- }
+- QString t = QString("<h2>%1</h2><p>%2</p>")
+- .arg(static_cast<TemplateItem*>(item)->name)
+- .arg(static_cast<TemplateItem*>(item)->description);
+-#ifdef NO_DB_TEMPLATES
+- t += QString("<p>") + i18n("We are sorry, templates are not yet available.") +"</p>";
+-#endif
+-
+- info->setText( t );
+-}
+-
+-/*================================================================*/
+-
+ //! @internal
+ class KexiStartupDialogPrivate {
+ public:
+@@ -141,8 +87,8 @@
+ int pageTemplatesID;
+ int pageOpenExistingID, pageOpenRecentID;
+ int templatesSectionID_blank, templatesSectionID_import;
+-#ifdef NO_DB_TEMPLATES
+- int templatesSectionID_custom1, templatesSectionID_custom2;
++#ifdef DB_TEMPLATES
++ int templatesSectionID_templates; //, templatesSectionID_custom2;
+ #endif
+ QCheckBox *chkDoNotShow;
+
+@@ -151,15 +97,15 @@
+ QObject *templatesWidget_IconListBox;//helper
+
+ QWidgetStack *viewBlankTempl;
+- TemplatesPage *viewPersonalTempl;
+- TemplatesPage *viewBusinessTempl;
++ KexiStartupDialogTemplatesPage *viewTemplates;
++ //TemplatesPage *viewBusinessTempl;
+
+ int result;
+
+ QPixmap kexi_sqlite_icon, kexi_shortcut_icon;
+
+- //! Key string of selected database template. \sa selectedTemplateKey()
+- QString selectedTemplateKey;
++// //! Key string of selected database template. \sa selectedTemplateKey()
++// QString selectedTemplateKey;
+
+ //! used for "open existing"
+ KexiDBConnectionSet *connSet;
+@@ -248,7 +194,7 @@
+ #endif
+
+ if (!d->singlePage) {
+- connect(this, SIGNAL(aboutToShowPage(QWidget*)), this, SLOT(tabShown(QWidget*)));
++ connect(this, SIGNAL(aboutToShowPage(QWidget*)), this, SLOT(slotPageShown(QWidget*)));
+ d->templatesWidget->setFocus();
+ }
+ showPage(0);
+@@ -257,7 +203,7 @@
+
+ KexiStartupDialog::~KexiStartupDialog()
+ {
+- delete d;
++ delete d;
+ }
+
+ bool KexiStartupDialog::shouldBeShown()
+@@ -269,7 +215,7 @@
+ void KexiStartupDialog::show()
+ {
+ //just some cleanup
+- d->selectedTemplateKey=QString::null;
++// d->selectedTemplateKey=QString::null;
+ d->existingFileToOpen=QString::null;
+ d->result=-1;
+
+@@ -288,14 +234,22 @@
+ return;
+
+ // kdDebug() << "KexiStartupDialog::done(" << r << ")" << endl;
+- updateSelectedTemplateKeyInfo();
++// updateSelectedTemplateKeyInfo();
+
+ if (r==QDialog::Rejected) {
+ d->result = CancelResult;
+ } else {
+ const int idx = activePageIndex();
+ if (idx == d->pageTemplatesID) {
+- d->result = TemplateResult;
++ const int templateIdx = d->templatesWidget->activePageIndex();
++ if (templateIdx == d->templatesSectionID_blank)
++ d->result = CreateBlankResult;
++#ifdef DB_TEMPLATES
++ else if (templateIdx == d->templatesSectionID_templates)
++ d->result = CreateFromTemplateResult;
++#endif
++ else if (templateIdx == d->templatesSectionID_import)
++ d->result = ImportResult;
+ }
+ else if (idx == d->pageOpenExistingID) {
+ // return file or connection:
+@@ -350,7 +304,7 @@
+ d->templatesWidget_IconListBox->installEventFilter(this);
+ }
+ lyr->addWidget(d->templatesWidget);
+- connect(d->templatesWidget, SIGNAL(aboutToShowPage(QWidget*)), this, SLOT(templatesPageShown(QWidget*)));
++ connect(d->templatesWidget, SIGNAL(aboutToShowPage(QWidget*)), this, SLOT(slotPageShown(QWidget*)));
+
+ if (d->dialogOptions & CheckBoxDoNotShowAgain) {
+ d->chkDoNotShow = new QCheckBox(i18n("Don't show me this dialog again"), d->pageTemplates, "chkDoNotShow");
+@@ -360,7 +314,6 @@
+ //template groups:
+ QFrame *templPageFrame;
+ QVBoxLayout *tmplyr;
+- QLabel *lbl_blank;
+ int itemID = 0; //used just to set up templatesSectionID_*
+
+ //- page "blank db"
+@@ -369,30 +322,38 @@
+ templPageFrame = d->templatesWidget->addPage(
+ i18n("Blank Database"), i18n("New Blank Database Project"), DesktopIcon("empty") );
+ tmplyr = new QVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint());
+- lbl_blank = new QLabel(
++ QLabel *lbl_blank = new QLabel(
+ i18n("Kexi will create a new blank database project.")+clickMsg, templPageFrame );
+ lbl_blank->setAlignment(Qt::AlignAuto|Qt::AlignTop|Qt::WordBreak);
+ lbl_blank->setMargin(0);
+ tmplyr->addWidget( lbl_blank );
+ tmplyr->addStretch(1);
+
+- //- page "import db"
+- d->templatesSectionID_import = itemID++;
+- templPageFrame = d->templatesWidget->addPage(
+- i18n("Import Existing\nDatabase"), i18n("Import Existing Database as New Database Project"),
+- DesktopIcon("database_import") );
++#ifdef DB_TEMPLATES
++ //- page "templates"
++ d->templatesSectionID_templates = itemID++;
++ QString none;
++ QString kexi_sqlite_icon_name
++ = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0);
++ templPageFrame = d->templatesWidget->addPage (
++ i18n("Keep this text narrow: split to multiple rows if needed", "Create From\nTemplate"),
++ i18n("New Database Project From Template"), DesktopIcon(kexi_sqlite_icon_name) );
+ tmplyr = new QVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint());
+- lbl_blank = new QLabel(
+- i18n("Kexi will import the structure and data of an existing database as a new database project.")
+- +clickMsg, templPageFrame );
+- lbl_blank->setAlignment(Qt::AlignAuto|Qt::AlignTop|Qt::WordBreak);
+- lbl_blank->setMargin(0);
+- tmplyr->addWidget( lbl_blank );
+- tmplyr->addStretch(1);
++ QLabel *lbl_templ = new QLabel(
++ i18n("Kexi will create a new database project using selected template.\n"
++ "Select template and click \"OK\" button to proceed."), templPageFrame );
++ lbl_templ->setAlignment(Qt::AlignAuto|Qt::AlignTop|Qt::WordBreak);
++ lbl_templ->setMargin(0);
++ tmplyr->addWidget( lbl_templ );
+
+-#ifdef KEXI_STARTUP_SHOW_TEMPLATES
+- //- page "personal db"
+- d->templatesSectionID_custom1 = itemID++;
++ d->viewTemplates = new KexiStartupDialogTemplatesPage( templPageFrame );
++ tmplyr->addWidget( d->viewTemplates );
++ connect(d->viewTemplates,SIGNAL(selected(const QString&)),
++ this,SLOT(templateSelected(const QString&)));
++/* connect(d->viewTemplates->templates,SIGNAL(returnPressed(QIconViewItem*)),
++ this,SLOT(templateItemExecuted(QIconViewItem*)));
++ connect(d->viewTemplates->templates,SIGNAL(currentChanged(QIconViewItem*)),
++ this,SLOT(templateItemSelected(QIconViewItem*)));*/
+ /*later
+ templPageFrame = d->templatesWidget->addPage (
+ i18n("Personal Databases"), i18n("New Personal Database Project Templates"), DesktopIcon("folder_home") );
+@@ -405,8 +366,8 @@
+ */
+
+ //- page "business db"
+- d->templatesSectionID_custom2 = itemID++;
+ /*later
++ d->templatesSectionID_custom2 = itemID++;
+ templPageFrame = d->templatesWidget->addPage (
+ i18n("Business Databases"), i18n("New Business Database Project Templates"),
+ DesktopIcon( "business_user" ));
+@@ -417,10 +378,24 @@
+ connect(d->viewBusinessTempl->templates,SIGNAL(returnPressed(QIconViewItem*)),this,SLOT(templateItemExecuted(QIconViewItem*)));
+ connect(d->viewBusinessTempl->templates,SIGNAL(currentChanged(QIconViewItem*)),this,SLOT(templateItemSelected(QIconViewItem*)));
+ */
+-#endif //KEXI_STARTUP_SHOW_TEMPLATES
++#endif //DB_TEMPLATES
++
++ //- page "import db"
++ d->templatesSectionID_import = itemID++;
++ templPageFrame = d->templatesWidget->addPage(
++ i18n("Import Existing\nDatabase"), i18n("Import Existing Database as New Database Project"),
++ DesktopIcon("database_import") );
++ tmplyr = new QVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint());
++ QLabel *lbl_import = new QLabel(
++ i18n("Kexi will import the structure and data of an existing database as a new database project.")
++ +clickMsg, templPageFrame );
++ lbl_import->setAlignment(Qt::AlignAuto|Qt::AlignTop|Qt::WordBreak);
++ lbl_import->setMargin(0);
++ tmplyr->addWidget( lbl_import );
++ tmplyr->addStretch(1);
+ }
+
+-void KexiStartupDialog::templatesPageShown(QWidget *page)
++void KexiStartupDialog::slotPageShown(QWidget *page)
+ {
+ int idx = d->templatesWidget->pageIndex(page);
+ // KIconView *templ = 0;
+@@ -429,18 +404,20 @@
+ }
+ else if (idx==d->templatesSectionID_import) {
+ }
+-#ifdef KEXI_STARTUP_SHOW_TEMPLATES
+- else if (idx==d->templatesSectionID_custom1) {//personal
+- templ = d->viewPersonalTempl->templates;
++#ifdef DB_TEMPLATES
++ else if (idx==d->templatesSectionID_templates) {
++ d->viewTemplates->populate();
++ }
++/*later? KIconView *templ = d->viewTemplates->templates;
+ if (templ->count()==0) {
+ //add items (on demand):
+- d->viewPersonalTempl->addItem("cd_catalog", i18n("CD Catalog"),
++ d->viewTemplates->addItem("cd_catalog", i18n("CD Catalog"),
+ i18n("Easy-to-use database for storing information about your CD collection."),
+ DesktopIcon("cdrom_unmount"));
+- d->viewPersonalTempl->addItem("expenses", i18n("Expenses"),
++ d->viewTemplates->addItem("expenses", i18n("Expenses"),
+ i18n("A database for managing your personal expenses."),
+ DesktopIcon("kcalc"));
+- d->viewPersonalTempl->addItem("image_gallery", i18n("Image Gallery"),
++ d->viewTemplates->addItem("image_gallery", i18n("Image Gallery"),
+ i18n("A database for archiving your image collection in a form of gallery."),
+ DesktopIcon("icons"));
+ }
+@@ -453,11 +430,12 @@
+ i18n("A database that offers you a contact information"),
+ DesktopIcon("contents"));
+ }
+- }
++ }*/
+ #endif
+ updateDialogOKButton(d->pageTemplates);
+ }
+
++#if 0
+ void KexiStartupDialog::templateItemSelected(QIconViewItem *)
+ {
+ updateDialogOKButton(d->pageTemplates);
+@@ -467,8 +445,8 @@
+ {
+ if (!item)
+ return;
+- updateSelectedTemplateKeyInfo();
+-#ifndef NO_DB_TEMPLATES
++// updateSelectedTemplateKeyInfo();
++#ifdef DB_TEMPLATES
+ accept();
+ #endif
+ }
+@@ -486,15 +464,16 @@
+ else if (d->templatesWidget->activePageIndex()==d->templatesSectionID_import) {
+ d->selectedTemplateKey = "import";
+ }
+-#ifdef NO_DB_TEMPLATES
+- else if (d->templatesWidget->activePageIndex()==d->templatesSectionID_custom1) {
+- item = d->viewPersonalTempl->templates->currentItem();
++#ifdef DB_TEMPLATES
++ else if (d->templatesWidget->activePageIndex()==d->templatesSectionID_templates) {
++ item = d->viewTemplates->templates->currentItem();
+ if (!item) {
+ d->selectedTemplateKey=QString::null;
+ return;
+ }
+ d->selectedTemplateKey=QString("personal/")+static_cast<TemplateItem*>(item)->key;
+ }
++/*later?
+ else if (d->templatesWidget->activePageIndex()==d->templatesSectionID_custom2) {
+ item = d->viewBusinessTempl->templates->currentItem();
+ if (!item) {
+@@ -502,9 +481,10 @@
+ return;
+ }
+ d->selectedTemplateKey=QString("business/")+static_cast<TemplateItem*>(item)->key;
+- }
++ }*/
+ #endif
+ }
++#endif // 0
+
+ void KexiStartupDialog::tabShown(QWidget *w)
+ {
+@@ -534,12 +514,11 @@
+ bool enable = true;
+ if (w==d->pageTemplates) {
+ int t_id = d->templatesWidget->activePageIndex();
+-#ifdef NO_DB_TEMPLATES
+- enable = (t_id==d->templatesSectionID_blank || d->templatesSectionID_import);
+-#else
++#ifdef DB_TEMPLATES
+ enable = (t_id==d->templatesSectionID_blank || d->templatesSectionID_import
+- || (t_id==d->templatesSectionID_custom1 && d->viewPersonalTempl->templates->currentItem()!=0)
+- || (t_id==d->templatesSectionID_custom1 && d->viewBusinessTempl->templates->currentItem()!=0));
++ || (t_id==d->templatesSectionID_templates && !d->viewTemplates->selectedFileName().isEmpty()));
++#else
++ enable = (t_id==d->templatesSectionID_blank || d->templatesSectionID_import);
+ #endif
+ }
+ else if (w==d->pageOpenExisting) {
+@@ -555,10 +534,10 @@
+ enableButton(Ok,enable);
+ }
+
+-QString KexiStartupDialog::selectedTemplateKey() const
++/*QString KexiStartupDialog::selectedTemplateKey() const
+ {
+ return d->selectedTemplateKey;
+-}
++}*/
+
+ void KexiStartupDialog::setupPageOpenExisting()
+ {
+@@ -623,11 +602,14 @@
+ d->openExistingConnWidget->showAdvancedConn();
+ }
+
+-QString KexiStartupDialog::selectedExistingFile() const
++QString KexiStartupDialog::selectedFileName() const
+ {
+-// kdDebug() << activePageIndex() << " " << d->openExistingFileDlg->isVisible()
+-// << ": " << d->existingFileToOpen << endl;
+- return d->existingFileToOpen;
++ if (d->result == OpenExistingResult)
++ return d->existingFileToOpen;
++ else if (d->result == CreateFromTemplateResult && d->viewTemplates)
++ return d->viewTemplates->selectedFileName();
++ else
++ return QString::null;
+ }
+
+ KexiDB::ConnectionData* KexiStartupDialog::selectedExistingConnection() const
+@@ -681,6 +663,7 @@
+ {
+ const int t_id = d->templatesWidget->activePageIndex();
+ if (t_id==d->templatesSectionID_blank || t_id==d->templatesSectionID_import) {
++
+ accept();
+ }
+ }
+@@ -699,4 +682,18 @@
+ return 0; //there is always "plain page" #0 selected
+ }
+
++void KexiStartupDialog::templateSelected(const QString& fileName)
++{
++ if (!fileName.isEmpty())
++ accept();
++}
++
++QValueList<KexiProjectData::ObjectInfo> KexiStartupDialog::autoopenObjects() const
++{
++ if (d->result != CreateFromTemplateResult || !d->viewTemplates)
++ QValueList<KexiProjectData::ObjectInfo>();
++
++ return d->viewTemplates->autoopenObjectsForSelectedTemplate();
++}
++
+ #include "KexiStartupDialog.moc"
+--- kexi/main/startup/KexiStartupFileDialog.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/main/startup/KexiStartupFileDialog.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -315,16 +315,27 @@
+ }
+ }
+ }
+- else if (m_confirmOverwrites && fi.exists()) {
+- if (KMessageBox::Yes!=KMessageBox::warningYesNo( this, i18n( "The file \"%1\" already exists.\n"
+- "Do you want to overwrite it?").arg( QDir::convertSeparators(path) ), QString::null, i18n("Overwrite"), KStdGuiItem::cancel() )) {
+- return false;
+- }
++ else if (m_confirmOverwrites && !askForOverwriting( path, this )) {
++ return false;
+ }
+ // }
+ return true;
+ }
+
++//static
++bool KexiStartupFileDialog::askForOverwriting(const QString& filePath, QWidget *parent)
++{
++ QFileInfo fi(filePath);
++ if (!fi.exists())
++ return true;
++ const int res = KMessageBox::warningYesNo( parent, i18n( "The file \"%1\" already exists.\n"
++ "Do you want to overwrite it?").arg( QDir::convertSeparators(filePath) ), QString::null,
++ i18n("Overwrite"), KStdGuiItem::no() );
++ if (res == KMessageBox::Yes)
++ return true;
++ return false;
++}
++
+ void KexiStartupFileDialog::accept()
+ {
+ // locationEdit->setFocus();
+--- kexi/main/startup/KexiStartupDialog.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/main/startup/KexiStartupDialog.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,5 @@
+ /* This file is part of the KDE project
+- Copyright (C) 2003 Jaroslaw Staniek <js at iidea.pl>
++ Copyright (C) 2003-2007 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
+@@ -30,28 +30,8 @@
+ #include <qsplitter.h>
+
+ #include <kexidb/connectiondata.h>
++#include <core/kexiprojectdata.h>
+
+-class KTextBrowser;
+-
+-/*! Helper class for displaying templates set with description. */
+-class KEXIMAIN_EXPORT TemplatesPage : public QSplitter
+-{
+- Q_OBJECT
+-
+- public:
+- TemplatesPage( Orientation o, QWidget * parent = 0, const char * name = 0 );
+- ~TemplatesPage();
+- void addItem(const QString& key, const QString& name,
+- const QString& description, const QPixmap& icon);
+- private slots:
+- void itemClicked(QIconViewItem *item);
+-
+- public:
+- KIconView *templates;
+- KTextBrowser *info;
+-};
+-
+-
+ class KexiStartupDialogPrivate;
+ class KexiProjectData;
+ class KexiProjectSet;
+@@ -71,11 +51,21 @@
+ /*! The Dialog returns one of these values depending
+ on the input of the user.
+ CancelResult The user pressed 'Cancel'
+- TemplateResult The user selected a template
++ CreateBlankResult The user selected a template
++ CreateFromTemplateResult The user selected a template
++ ImportResult The user selected a template
+ OpenExistingResult The user has chosen an existing connection or db file
+ OpenRecentResult The user selected one of recently used databases
+ */
+- enum Result { CancelResult=0, TemplateResult=1, OpenExistingResult=2, OpenRecentResult=3 };
++ enum Result {
++ CancelResult, //!< The user has pressed 'Cancel'
++ CreateBlankResult, //!< The user has selected a template
++ CreateFromTemplateResult, //!< The user has selected a template to be used for creating a new db
++ ImportResult, //!< The user has chosen to import db
++ OpenExistingResult, //!< The user has chosen an existing connection or db file
++ OpenRecentResult //!< The user has selected one of recently used databases
++ };
++
+ /*!
+ To configure the dialog you have to use this enum
+ (any !=0 or'ed value is ok)
+@@ -117,24 +107,23 @@
+ \return one of Result values. Use this after dialog is closed. */
+ int result() const;
+
+- /*! \return key string of selected database template if result() is TemplateResult,
+- otherwise null string. The key is of form: "<group>/<name>",
+- for example: "business/address_book".
+- For blank databases "blank" key is used - then additional information
+- about selected connection should be used with appropriate methods. */
+- QString selectedTemplateKey() const;
+-
+ /*! \return data of selected Kexi project (if "Open Recent" tab was selected).
+ Returns NULL if no selection has been made or other tab was selected.
+ */
+ KexiProjectData* selectedProjectData() const;
+
+ /*! \return name of selected Kexi project file
+- (if "Open Existing" tab was selected and this file was clicked).
++ (if result() == OpenExistingResult)
++ or name of template file to be used for creating a new database.
++ (if result() == CreateFromTemplateResult).
+ Returns empty string if no such selection has been made or other tab was selected.
+ */
+- QString selectedExistingFile() const;
++ QString selectedFileName() const;
+
++ /*! \return "autoopen" objects defined for selected template.
++ Only makes sense if template was used. */
++ QValueList<KexiProjectData::ObjectInfo> autoopenObjects() const;
++
+ /*! \return a pointer to selected Kexi connection data.
+ (if "Open Existing" tab was selected and this connection data was clicked).
+ Returns NULL if no such selection has been made or other tab was selected.
+@@ -152,17 +141,19 @@
+ virtual void slotOk();
+
+ //! slot activated when one of page in templates window is shown
+- void templatesPageShown(QWidget *page);
+-
++ void slotPageShown(QWidget *page);
++/*
+ //! Any icon view item has been executed (dblclicked)
+ void templateItemExecuted(QIconViewItem *item);
+
+ //! Any icon view item has been selected
+- void templateItemSelected(QIconViewItem *item);
++ void templateItemSelected(QIconViewItem *item);*/
+
+ //! Any tab has been selected
+ void tabShown(QWidget *w);
+
++ void templateSelected(const QString& fileName);
++
+ //! helper
+ void recentProjectItemExecuted(KexiProjectData *data);
+ void existingFileSelected(const QString &f);
+@@ -185,7 +176,7 @@
+ void setupPageOpenRecent();
+
+ //! used internally on accepting templates selection
+- void updateSelectedTemplateKeyInfo();
++// void updateSelectedTemplateKeyInfo();
+
+ KexiStartupDialogPrivate *d;
+ };
+--- kexi/main/startup/KexiStartupFileDialog.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/main/startup/KexiStartupFileDialog.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -53,6 +53,12 @@
+
+ virtual ~KexiStartupFileDialog();
+
++ /*! Helper. Displays "The file %1 already exists. Do you want to overwrite it?" yes/no message box.
++ \a parent is used as a parent of the KMessageBox.
++ \return true if \a filePath file does not exists or user has agreed on overwriting,
++ false in user do not want to overwrite. */
++ static bool askForOverwriting(const QString& filePath, QWidget *parent = 0);
++
+ void setMode(int mode);
+
+ QStringList additionalFilters() const;
+--- kexi/main/startup/KexiStartupDialogTemplatesPage.cpp (.../tags/koffice/1.6.2/koffice) (revision 0)
++++ kexi/main/startup/KexiStartupDialogTemplatesPage.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -0,0 +1,157 @@
++/* This file is part of the KDE project
++ Copyright (C) 2003-2007 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
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public License
++ along with this library; see the file COPYING.LIB. If not, write to
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++ */
++
++#include "KexiStartupDialogTemplatesPage.h"
++
++#include <core/kexi.h>
++#include <core/kexitemplateloader.h>
++#include "KexiProjectSelector.h"
++#include "KexiOpenExistingFile.h"
++#include "KexiConnSelector.h"
++#include "KexiConnSelectorBase.h"
++
++#include <qheader.h>
++
++#include <kdebug.h>
++#include <kiconloader.h>
++
++#ifdef KEXI_SHOW_UNIMPLEMENTED
++#define KEXI_STARTUP_SHOW_TEMPLATES
++#define KEXI_STARTUP_SHOW_RECENT
++#endif
++
++/*QPixmap createIcon()
++{
++
++}*/
++
++/*QString createText(const QString& name, const QString& description)
++{
++ QString txt = "<H2>" + name + "</H2>";
++ if (description.isEmpty())
++ return name + description
++}*/
++
++//! @internal
++class TemplateItem : public KListViewItem
++{
++ public:
++ TemplateItem(QListView* parent, const QString& aFilename,
++ const QString& name, const QString& description, const QPixmap& icon,
++ const QValueList<KexiProjectData::ObjectInfo>& aAutoopenObjects)
++ : KListViewItem(parent, name + "\n" + description)
++ , autoopenObjects(aAutoopenObjects)
++ , filename(aFilename)
++ {
++ setPixmap(0, icon);
++ }
++ ~TemplateItem() {}
++
++ QValueList<KexiProjectData::ObjectInfo> autoopenObjects;
++ QString filename;
++};
++
++//-----------------------
++
++KexiStartupDialogTemplatesPage::KexiStartupDialogTemplatesPage( QWidget * parent )
++ : KListView(parent, "KexiStartupDialogTemplatesPage")
++ , m_popuplated(false)
++{
++ addColumn(QString::null);
++ header()->hide();
++ setColumnWidthMode(0, Maximum);
++ setResizeMode(LastColumn);
++ setItemMargin(6);
++ connect(this,SIGNAL(executed(QListViewItem*)), this, SLOT(slotExecuted(QListViewItem*)));
++}
++
++KexiStartupDialogTemplatesPage::~KexiStartupDialogTemplatesPage()
++{
++}
++
++void KexiStartupDialogTemplatesPage::populate()
++{
++ if (m_popuplated)
++ return;
++ m_popuplated = true;
++ KexiTemplateInfo::List list = KexiTemplateLoader::loadListInfo();
++ foreach( QValueList<KexiTemplateInfo>::ConstIterator, it, list ) {
++ new TemplateItem(this, (*it).filename, (*it).name,
++ (*it).description, (*it).icon, (*it).autoopenObjects);
++ }
++ if (firstChild())
++ setSelected(firstChild(), true);
++
++// templates = new KIconView(this, "templates");
++// templates->setItemsMovable(false);
++// templates->setShowToolTips(false);
++// info = new KTextBrowser(this,"info");
++// setResizeMode(templates,KeepSize);
++// setResizeMode(info,KeepSize);
++// connect(templates,SIGNAL(selectionChanged(QIconViewItem*)),this,SLOT(itemClicked(QIconViewItem*)));
++}
++
++/*
++void TemplatesPage::addItem(const QString& key, const QString& name,
++ const QString& description, const QPixmap& icon)
++{
++ TemplateItem *item = new TemplateItem(templates, name, icon);
++ item->key=key;
++ item->name=name;
++ item->description=description;
++}
++
++void TemplatesPage::itemClicked(QIconViewItem *item) {
++ if (!item) {
++ info->setText("");
++ return;
++ }
++ QString t = QString("<h2>%1</h2><p>%2</p>")
++ .arg(static_cast<TemplateItem*>(item)->name)
++ .arg(static_cast<TemplateItem*>(item)->description);
++#ifndef DB_TEMPLATES
++ t += QString("<p>") + i18n("We are sorry, templates are not yet available.") +"</p>";
++#endif
++
++ info->setText( t );
++}*/
++
++QString KexiStartupDialogTemplatesPage::selectedFileName() const
++{
++ TemplateItem* templateItem = static_cast<TemplateItem*>(selectedItem());
++ return templateItem ? templateItem->filename : QString::null;
++}
++
++QValueList<KexiProjectData::ObjectInfo>
++KexiStartupDialogTemplatesPage::autoopenObjectsForSelectedTemplate() const
++{
++ TemplateItem* templateItem = static_cast<TemplateItem*>(selectedItem());
++ return templateItem ? templateItem->autoopenObjects : QValueList<KexiProjectData::ObjectInfo>();
++}
++
++void KexiStartupDialogTemplatesPage::slotExecuted(QListViewItem* item)
++{
++ TemplateItem* templateItem = static_cast<TemplateItem*>(item);
++ if (!templateItem)
++ return;
++
++ emit selected(templateItem->filename);
++}
++
++#include "KexiStartupDialogTemplatesPage.moc"
+--- kexi/main/startup/KexiStartup.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/main/startup/KexiStartup.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -48,13 +48,10 @@
+ #include <kprogress.h>
+ #include <ktextedit.h>
+ #include <kstaticdeleter.h>
++#include <kuser.h>
+
+ #include <unistd.h>
+
+-#if KDE_IS_VERSION(3,1,9)
+-# include <kuser.h>
+-#endif
+-
+ #include <qcstring.h>
+ #include <qapplication.h>
+ #include <qlayout.h>
+@@ -652,25 +649,34 @@
+ if (d->startupDialog->exec()!=QDialog::Accepted)
+ return true;
+
+- int r = d->startupDialog->result();
+- if (r==KexiStartupDialog::TemplateResult) {
+-// kdDebug() << "Template key == " << d->startupDialog->selectedTemplateKey() << endl;
+- QString selectedTemplateKey( d->startupDialog->selectedTemplateKey() );
+- if (selectedTemplateKey=="blank") {
+- m_action = CreateBlankProject;
+- return true;
+- }
+- else if (selectedTemplateKey=="import") {
+- m_action = ImportProject;
+- return true;
+- }
+-
+-//! @todo - templates: m_action = UseTemplate;
++ const int r = d->startupDialog->result();
++ if (r == KexiStartupDialog::CreateBlankResult) {
++ m_action = CreateBlankProject;
+ return true;
+ }
+- else if (r==KexiStartupDialog::OpenExistingResult) {
++ else if (r == KexiStartupDialog::ImportResult) {
++ m_action = ImportProject;
++ return true;
++ }
++ else if (r == KexiStartupDialog::CreateFromTemplateResult) {
++ const QString selFile( d->startupDialog->selectedFileName() );
++ cdata.setFileName( selFile );
++ QString detectedDriverName;
++ const tristate res = detectActionForFile( m_importActionData, detectedDriverName,
++ cdata.driverName, selFile );
++ if (true != res)
++ return res;
++ if (m_importActionData || detectedDriverName.isEmpty())
++ return false;
++ cdata.driverName = detectedDriverName;
++ m_projectData = new KexiProjectData(cdata, selFile);
++ m_projectData->autoopenObjects = d->startupDialog->autoopenObjects();
++ m_action = CreateFromTemplate;
++ return true;
++ }
++ else if (r == KexiStartupDialog::OpenExistingResult) {
+ // kdDebug() << "Existing project --------" << endl;
+- QString selFile = d->startupDialog->selectedExistingFile();
++ const QString selFile( d->startupDialog->selectedFileName() );
+ if (!selFile.isEmpty()) {
+ //file-based project
+ // kdDebug() << "Project File: " << selFile << endl;
+--- kexi/main/startup/KexiStartupDialogTemplatesPage.h (.../tags/koffice/1.6.2/koffice) (revision 0)
++++ kexi/main/startup/KexiStartupDialogTemplatesPage.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -0,0 +1,57 @@
++/* This file is part of the KDE project
++ Copyright (C) 2007 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
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public License
++ along with this library; see the file COPYING.LIB. If not, write to
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++ */
++
++#ifndef KexiStartupDialogTemplatesPage_h
++#define KexiStartupDialogTemplatesPage_h
++
++#include <klistview.h>
++#include <core/kexiprojectdata.h>
++
++/*! Helper class for displaying templates set with description. */
++class KEXIMAIN_EXPORT KexiStartupDialogTemplatesPage : public KListView
++{
++ Q_OBJECT
++
++ public:
++ KexiStartupDialogTemplatesPage( QWidget * parent = 0 );
++ ~KexiStartupDialogTemplatesPage();
++// void addItem(const QString& key, const QString& name,
++// const QString& description, const QPixmap& icon);
++
++ QString selectedFileName() const;
++
++ QValueList<KexiProjectData::ObjectInfo> autoopenObjectsForSelectedTemplate() const;
++
++ void populate();
++
++ signals:
++ void selected(const QString& filename);
++
++ protected slots:
++ void slotExecuted(QListViewItem* item);
++
++// void itemClicked(QIconViewItem *item);
++
++ private:
++ bool m_popuplated : 1;
++// KIconView *templates;
++// KTextBrowser *info;
++};
++
++#endif
+--- kexi/main/startup/Makefile.am (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/main/startup/Makefile.am (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -10,7 +10,7 @@
+ KexiConnSelector.cpp KexiProjectSelector.cpp \
+ KexiStartupDialog.cpp \
+ KexiStartupFileDialog.cpp KexiNewProjectWizard.cpp \
+- KexiStartup.cpp KexiStartup_p.cpp
++ KexiStartup.cpp KexiStartup_p.cpp KexiStartupDialogTemplatesPage.cpp
+
+ noinst_HEADERS = KexiStartup_p.h
+
+--- kexi/main/keximainwindowimpl.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/main/keximainwindowimpl.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,6 @@
+ /* This file is part of the KDE project
+ Copyright (C) 2003 Lucijan Busch <lucijan at kde.org>
+- Copyright (C) 2003-2006 Jaroslaw Staniek <js at iidea.pl>
++ Copyright (C) 2003-2007 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
+@@ -160,7 +160,7 @@
+ /*! Implemented for KexiMainWindow */
+ virtual void highlightObject(const QCString& mime, const QCString& name);
+
+- /*! Opens project pointed by \a projectData, \return true on success.
++ /*! Opens project pointed by \a projectData.
+ Application state (e.g. actions) is updated.
+ \a projectData is copied into a project structures.
+ \return true on success */
+@@ -177,7 +177,8 @@
+ 'kexi --skip-dialog file.kexic' is executed (or the connection is opened
+ directly if there's no porject opened in the current Kexi main window. */
+ tristate openProject(const QString& aFileName, KexiDB::ConnectionData *cdata,
+- const QString& dbName = QString::null);
++ const QString& dbName = QString::null,
++ const QValueList<KexiProjectData::ObjectInfo>& autoopenObjects = QValueList<KexiProjectData::ObjectInfo>());
+
+ /*! Helper. Opens project pointed by \a aFileName.
+ Like above but \a fileNameForConnectionData can be passed instead of
+@@ -188,6 +189,12 @@
+ tristate openProject(const QString& aFileName,
+ const QString& fileNameForConnectionData, const QString& dbName = QString::null);
+
++ /*! Creates a new project usign template pointed by \a projectData.
++ Application state (e.g. actions) is updated.
++ New project data is copied into a project structures.
++ \return true on success */
++ tristate createProjectFromTemplate(const KexiProjectData& projectData);
++
+ /*! Closes current project, \return true on success.
+ Application state (e.g. actions) is updated.
+ \return true on success.
+@@ -418,6 +425,14 @@
+ void slotProjectQuit();
+ void slotEditPasteSpecialDataTable();
+ void slotEditCopySpecialDataTable();
++ void slotEditFind();
++ void slotEditFind(bool next); //!< helper
++ void slotEditFindNext();
++ void slotEditFindPrevious();
++ void slotEditReplace(bool all); //!< helper
++ void slotEditReplace();
++ void slotEditReplaceNext();
++ void slotEditReplaceAll();
+ void slotViewNavigator();
+ void slotViewMainArea();
+ void slotViewPropertyEditor();
+--- kexi/main/kexifinddialog.h (.../tags/koffice/1.6.2/koffice) (revision 0)
++++ kexi/main/kexifinddialog.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -0,0 +1,130 @@
++/* This file is part of the KDE project
++ Copyright (C) 2004-2007 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
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public License
++ along with this library; see the file COPYING.LIB. If not, write to
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++*/
++
++#ifndef KEXIFINDDIALOG_H
++#define KEXIFINDDIALOG_H
++
++#include "kexifinddialogbase.h"
++#include <core/kexisearchandreplaceiface.h>
++
++class KAction;
++
++//! @short A Kexi-specific "Find text" dialog.
++/*! Also used for as replace dialog.
++
++ @todo replace m_textToFind and m_textToReplace KComboBoxes with Kexi's db-aware comboboxes,
++ so we ca adapt to datatype being searched, e.g. date, time and numbers
++*/
++class KexiFindDialog : public KexiFindDialogBase
++{
++ Q_OBJECT
++ public:
++ //! Creates a new find dialog. Replace mode is off by default.
++ KexiFindDialog(QWidget* parent);
++ virtual ~KexiFindDialog();
++
++ //! Sets actions that receive button clicks and shortcuts within the dialog. Should be called once.
++ void setActions( KAction *findnext, KAction *findprev,
++ KAction *replace, KAction *replaceall );
++
++ //! Shows the dialog as a modal dialog.
++ virtual void show();
++
++ //! \return current find and replace options set within the dialog
++//! @todo should we have setOptions() too?
++ KexiSearchAndReplaceViewInterface::Options options() const;
++
++ /*! \return a list of column names for 'look in column' combo box.
++ Neither "(All fields)" nor "(Current field)" items are prepended. */
++ QStringList lookInColumnNames() const;
++
++ /*! \return a list of column captions (i.e. visible values) for 'look in column' combo box.
++ Neither "(All fields)" nor "(Current field)" items are prepended. */
++ QStringList lookInColumnCaptions() const;
++
++ /*! \return column name selected in "look in column" combo box.
++ If "(All fields)" item is selected, empty string is returned.
++ If "(Current field)" item is selected, "(field)" string is returned. */
++ QString currentLookInColumnName() const;
++
++ //! \return value that to be used for searching
++ QVariant valueToFind() const;
++
++ //! \return value that to be used as a replacement
++ QVariant valueToReplaceWith() const;
++
++ public slots:
++ /*! Sets \a columnNames list and \a columnCaptions for 'look in column' combo box.
++ \a columnCaptions are visible values, while \a columnNames are used for returning
++ in currentLookInColumn().
++ "(All fields)" and "(Current field)" items are also prepended. */
++ void setLookInColumnList(const QStringList& columnNames,
++ const QStringList& columnCaptions);
++
++ /*! Selects \a columnName to be selected 'look in column'.
++ By default "(All fields)" item is selected. To select this item,
++ pass empty string as \a columnName.
++ To select "(Current field)" item, "(field)" string should be passed
++ as \a columnName. */
++ void setCurrentLookInColumnName(const QString& columnName);
++
++ /*! Sets or clears replace mode.
++ For replace mode 'prompt or replace' option is visible. */
++ void setReplaceMode(bool set);
++
++ /*! Sets object name for caption, so for example it will be set
++ to i18n("Find \"Persons\"")). */
++ void setObjectNameForCaption(const QString& name);
++
++ /*! Enables of disables the find/replace/replace all buttons.
++ This is used if for the current context the dialog could not be used.
++ If \a enable is false, object name for caption is cleared
++ using setObjectNameForCaption() too. */
++ void setButtonsEnabled(bool enable);
++
++ /*! Sets message at the bottom to \a message. */
++ void setMessage(const QString& message);
++
++ /*! Updates message at the bottom; "The search item was not found" is set if \a found is true,
++ else the message is cleared. */
++//! @todo add "Search again" hyperlink
++ void updateMessage( bool found = true );
++
++ signals:
++ //! Emitted after clicking "Find next" button or pressing appropriate shortcut set by setActions()
++ void findNext();
++
++ //! Emitted after pressing appropriate shortcut set by setActions()
++ void findPrevious();
++
++ //! Emitted after clicking "Replace" button or pressing appropriate shortcut set by setActions()
++ void replaceNext();
++
++ //! Emitted after clicking "Replace All" button or pressing appropriate shortcut set by setActions()
++ void replaceAll();
++
++ protected slots:
++ void slotCloseClicked();
++
++ protected:
++ class Private;
++ Private * const d;
++};
++
++#endif
+--- kexi/main/Makefile.am (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/main/Makefile.am (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,7 +5,7 @@
+ keximainwindowimpl.cpp \
+ kexistatusbar.cpp \
+ kexinamewidget.cpp kexinamedialog.cpp \
+- kexinewstuff.cpp
++ kexinewstuff.cpp kexifinddialogbase.ui kexifinddialog.cpp
+
+ libkeximain_la_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries) \
+ $(VER_INFO) -Wnounresolved
+--- kexi/core/kexisearchandreplaceiface.h (.../tags/koffice/1.6.2/koffice) (revision 0)
++++ kexi/core/kexisearchandreplaceiface.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -0,0 +1,106 @@
++/* This file is part of the KDE project
++ Copyright (C) 2007 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
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public License
++ along with this library; see the file COPYING.LIB. If not, write to
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++*/
++
++#ifndef KexiSearchAndReplaceViewInterface_H
++#define KexiSearchAndReplaceViewInterface_H
++
++#include <kexiutils/tristate.h>
++#include <qstring.h>
++class QVariant;
++class QStringList;
++
++//! @short An interface used by Kexi views (KexiViewBase) supporting search/replace features
++class KEXICORE_EXPORT KexiSearchAndReplaceViewInterface
++{
++ public:
++ KexiSearchAndReplaceViewInterface();
++ virtual ~KexiSearchAndReplaceViewInterface();
++
++ //! @short Specifies options for find and replace operations.
++ /*! A GUI for setting these options is provided by KexiFindDialog class. */
++ class KEXICORE_EXPORT Options {
++ public:
++ Options();
++
++ //! Special values for columnNumber.
++ enum SpecialLookInValue {
++ AllColumns = -1, //!< "all columns" (the default)
++ CurrentColumn = -2 //!< "current column"
++ };
++ //! Column number to look in, AllColumns means "all columns" (the default)
++ //! and CurrentColumn means "current column".
++ int columnNumber;
++
++ //! Specifies possible options for text matching
++ enum TextMatching {
++ MatchAnyPartOfField = 0, //!< Matched text can be any part of field (the default)
++ MatchWholeField = 1, //!< Matched text must be the whole field
++ MatchStartOfField = 2 //!< Matched text must be at the start of field
++ };
++
++ //! Specifies possible options for text matching
++ TextMatching textMatching;
++
++ //! Specifies search direction
++ enum SearchDirection {
++ SearchUp = 0, //!< Search up (previous) from the current position
++ SearchDown = 1, //!< Search down (next) from the current position (the default)
++ SearchAllRows = 2, //!< Search from the first to the last row
++ DefaultSearchDirection = SearchDown //! Used to mark the default
++ };
++
++ //! Specifies search direction
++ SearchDirection searchDirection;
++
++ //! True for searching is case-sensitive (false by default)
++ bool caseSensitive : 1;
++
++ //! True for searching for whole words only (false by default)
++ bool wholeWordsOnly : 1;
++
++ //! True if question should be displayed before every replacement made (true by default)
++ bool promptOnReplace : 1;
++ };
++
++ /*! Sets up data for find/replace dialog, based on view's data model.
++ \a columnNames should contain column name, \a columnCaptions should contain column captions,
++ and \a currentColumnName should beset to current column's name.
++ Implementation should set up values and return true if find/replace dialog should be filled. */
++ virtual bool setupFindAndReplace(QStringList& columnNames, QStringList& columnCaptions,
++ QString& currentColumnName) = 0;
++
++ /*! Finds \a valueToFind within the view.
++ \a options are used to control the process. Selection is moved to found value.
++ \return true if value has been found, false if value has not been found,
++ and cancelled if there is nothing to find or there is no data to search in.
++ If \a next is true, "find next" is performed, else "find previous" is performed. */
++ virtual tristate find(const QVariant& valueToFind,
++ const KexiSearchAndReplaceViewInterface::Options& options, bool next) = 0;
++
++ /*! Finds \a valueToFind within the view and replaces with \a replacement
++ \a options are used to control the process.
++ \return true if value has been found and replaced, false if value
++ has not been found and replaced, and cancelled if there is nothing
++ to find or there is no data to search in or the data is read only.
++ If \a replaceAll is true, all found values are replaced. */
++ virtual tristate findNextAndReplace(const QVariant& valueToFind, const QVariant& replacement,
++ const KexiSearchAndReplaceViewInterface::Options& options, bool replaceAll) = 0;
++};
++
++#endif
+--- kexi/core/kexitemplateloader.h (.../tags/koffice/1.6.2/koffice) (revision 0)
++++ kexi/core/kexitemplateloader.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -0,0 +1,44 @@
++/* This file is part of the KDE project
++ Copyright (C) 2007 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
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public License
++ along with this library; see the file COPYING.LIB. If not, write to
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++*/
++
++#ifndef KEXI_TEMPLLOADER_H
++#define KEXI_TEMPLLOADER_H
++
++#include <qpixmap.h>
++#include "kexiprojectdata.h"
++
++//! A structure providing information about single kexi database template file
++struct KEXICORE_EXPORT KexiTemplateInfo
++{
++ typedef QValueList<KexiTemplateInfo> List;
++
++ QString filename, name, description;
++ QPixmap icon;
++ QValueList<KexiProjectData::ObjectInfo> autoopenObjects;
++};
++
++//! Handles retrieving information about templates
++class KEXICORE_EXPORT KexiTemplateLoader
++{
++ public:
++ static KexiTemplateInfo::List loadListInfo();
++ static KexiTemplateInfo loadInfo(const QString& directory);
++};
++
++#endif
+--- kexi/core/kexisearchandreplaceiface.cpp (.../tags/koffice/1.6.2/koffice) (revision 0)
++++ kexi/core/kexisearchandreplaceiface.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -0,0 +1,41 @@
++/* This file is part of the KDE project
++ Copyright (C) 2007 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
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public License
++ along with this library; see the file COPYING.LIB. If not, write to
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++*/
++
++#include "kexisearchandreplaceiface.h"
++
++KexiSearchAndReplaceViewInterface::KexiSearchAndReplaceViewInterface()
++{
++}
++
++KexiSearchAndReplaceViewInterface::~KexiSearchAndReplaceViewInterface()
++{
++}
++
++//-----------------------------------------------------------------------
++
++KexiSearchAndReplaceViewInterface::Options::Options()
++ : columnNumber(AllColumns)
++ , textMatching(MatchAnyPartOfField)
++ , searchDirection(DefaultSearchDirection)
++ , caseSensitive(false)
++ , wholeWordsOnly(false)
++ , promptOnReplace(true)
++{
++}
++
+--- kexi/core/kexitemplateloader.cpp (.../tags/koffice/1.6.2/koffice) (revision 0)
++++ kexi/core/kexitemplateloader.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -0,0 +1,112 @@
++/* This file is part of the KDE project
++ Copyright (C) 2007 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
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public License
++ along with this library; see the file COPYING.LIB. If not, write to
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++*/
++
++#include "kexitemplateloader.h"
++
++#include <kstandarddirs.h>
++#include <kglobal.h>
++#include <klocale.h>
++#include <kconfig.h>
++#include <kdebug.h>
++#include <kiconloader.h>
++#include <kapplication.h>
++
++#include <qdir.h>
++
++//static
++KexiTemplateInfo::List KexiTemplateLoader::loadListInfo()
++{
++ KexiTemplateInfo::List list;
++ const QString subdir = QString(kapp->instanceName()) + "/templates";
++ QString lang( KGlobal::locale()->language() );
++ QStringList dirs( kapp->dirs()->findDirs("data", subdir) );
++ while (true) {
++ foreach( QStringList::ConstIterator, it, dirs) {
++ QDir dir((*it)+lang);
++ if (!dir.exists())
++ continue;
++ if (!dir.isReadable()) {
++ kdWarning() << "KexiTemplateLoader::loadListInfo() \"" << dir.absPath() << "\" not readable!" << endl;
++ continue;
++ }
++ const QStringList templateDirs( dir.entryList(QDir::Dirs, QDir::Name) );
++ const QString absDirPath( dir.absPath() + '/' );
++ foreach(QStringList::ConstIterator, templateIt, templateDirs) {
++ if ((*templateIt)=="." || (*templateIt==".."))
++ continue;
++ KexiTemplateInfo info = KexiTemplateLoader::loadInfo( absDirPath + *templateIt );
++ if (!info.name.isEmpty())
++ list.append( info );
++ }
++ }
++ if (lang != "en" && list.isEmpty()) //not found for current locale, try "en"
++ lang = "en";
++ else
++ break;
++ }
++ return list;
++}
++
++//static
++KexiTemplateInfo KexiTemplateLoader::loadInfo(const QString& directory)
++{
++ QDir dir(directory);
++ if (!dir.isReadable()) {
++ kdWarning() << "KexiTemplateLoader::loadInfo() \""
++ << directory << "\" not readable!" << endl;
++ return KexiTemplateInfo();
++ }
++ if (!QFileInfo(directory+"/info.txt").isReadable())
++ return KexiTemplateInfo();
++ KConfig infoTxt(directory+"/info.txt", true/*readonly*/, false/*local*/);
++ KexiTemplateInfo info;
++ info.name = infoTxt.readEntry("Name");
++ if (info.name.isEmpty()) {
++ kdWarning() << "KexiTemplateLoader::loadInfo() \"" << (directory+"/info.txt") << "\" contains no \"name\" field" << endl;
++ return KexiTemplateInfo();
++ }
++ const QStringList templateFiles( dir.entryList("*.kexi", QDir::Files|QDir::Readable, QDir::Name) );
++ if (templateFiles.isEmpty()) {
++ kdWarning() << "KexiTemplateLoader::loadInfo() no readable .kexi template file found in \"" << directory << "\"" << endl;
++ return KexiTemplateInfo();
++ }
++ info.filename = directory+"/"+templateFiles.first();
++ info.description = infoTxt.readEntry("Description");
++ const QString iconFileName( infoTxt.readEntry("Icon") );
++ if (!iconFileName.isEmpty())
++ info.icon = QPixmap(directory+'/'+iconFileName);
++ if (info.icon.isNull())
++ info.icon = DesktopIcon("kexiproject_sqlite"); //default
++ QStringList autoopenObjectsString = infoTxt.readListEntry("AutoOpenObjects");
++ foreach( QStringList::ConstIterator, it, autoopenObjectsString) {
++ KexiProjectData::ObjectInfo autoopenObject;
++ QStringList autoopenObjectNameSplitted( QStringList::split(':', *it) );
++ if (autoopenObjectNameSplitted.count()>1) {
++ autoopenObject["type"] = autoopenObjectNameSplitted[0];
++ autoopenObject["name"] = autoopenObjectNameSplitted[1];
++ }
++ else {
++ autoopenObject["type"] = "table";
++ autoopenObject["name"] = autoopenObjectNameSplitted[0];
++ }
++ autoopenObject["action"] = "open";
++ info.autoopenObjects.append( autoopenObject );
++ }
++ return info;
++}
+--- kexi/core/kexiblobbuffer.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/core/kexiblobbuffer.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -39,7 +39,7 @@
+ Use this class by acessing to its singleton: KexiBLOBBuffer::self().
+
+ This class is used for buffering BLOB data,
+- to avoid duplicating object's data in memory and a need for loding (decoding)
++ to avoid duplicating object's data in memory and a need for loading (decoding)
+ the same object many times.
+ The data is always local, what means database storage is not employed here.
+
+@@ -59,13 +59,13 @@
+ when KexiBLOBBuffer::Handle::stored() is false
+ KexiBLOBBuffer::Handle::setStoredWidthID() can be used to switch from unstored to stored state.
+ Among others, the state has effect on saving forms: only unstored BLOBs will be saved back
+- to the database; when a BLOB need to be removed, only it will be physically removed only if it was stored.
++ to the database; when a BLOB needs to be removed, only it will be physically removed only if it was stored.
+
+ KexiBLOBBuffer is also useful for two more reasons:
+ - Property editor's item for "image" property displays a preview of pixmap contents.
+ Without buffering, it would be needed to load pixmap data again: what if the file
+ it is loaded from is located remote and connection is slow? Memory would be also unnecessary doubled.
+- - Undo/Redo frameword requires to store previous property values. Having a reference defined
++ - Undo/Redo framework requires to store previous property values. Having a reference defined
+ by a single interger, memory can be handled more effectively.
+
+ Example use cases:
+@@ -73,7 +73,7 @@
+ integer identifier is returned.
+ Then, multiple image widgets are using "abc.jpg" for displaying.
+ Duplicating an image widget means only duplicating it's properties
+- like position and BLOB's id: BLOB itself (data of "abc.jpg")is not duplicated.
++ like position and BLOB's id: BLOB itself (data of "abc.jpg") is not duplicated.
+ Creating a new image widget and assiging the same "abc.jpg" pixmap, means only
+ referencing KexiBLOBBuffer using the same identifier.
+ */
+--- kexi/core/kexistartupdata.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/core/kexistartupdata.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -30,12 +30,12 @@
+ {
+ public:
+ typedef enum Action {
+- DoNothing = 0,
+- CreateBlankProject = 1,
+- UseTemplate = 2,
+- OpenProject = 3,
+- ImportProject = 4,
+- Exit = 5
++ DoNothing,
++ CreateBlankProject,
++ CreateFromTemplate,
++ OpenProject,
++ ImportProject,
++ Exit
+ };
+
+ /*! Data required to perform import action.
+--- kexi/core/Makefile.am (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/core/Makefile.am (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -14,7 +14,8 @@
+ kexidataiteminterface.cpp kexievents.cpp \
+ kexidbshortcutfile.cpp \
+ kexiblobbuffer.cpp kexistaticpart.cpp \
+- kexitabledesignerinterface.cpp
++ kexitabledesignerinterface.cpp kexisearchandreplaceiface.cpp \
++ kexitemplateloader.cpp
+
+ #kexipartdatasource.cpp
+
+--- kexi/migration/keximigrate.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/migration/keximigrate.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -185,7 +185,7 @@
+ }
+ }
+
+- uint i=0;
++// uint i=0;
+ // -- read table schemas and create them in memory (only for non-KexiDB-compat tables)
+ foreach (QStringList::ConstIterator, it, tables) {
+ if (destDriver->isSystemObjectName( *it ) //"kexi__objects", etc.
+--- kexi/migration/keximigration_driver.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/migration/keximigration_driver.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=Kexi/MigrationDriver
+ Comment=Kexi Data Migration Driver
++Comment[bg]=Драйвер на Kexi за мигриране на данни
+ Comment[ca]=Controlador de migració de dades de Kexi
+ Comment[cy]=Gyrrydd Mudo Data Kexi
+ Comment[da]=Kexi datamigrationsdriver
+@@ -16,6 +17,7 @@
+ Comment[fr]=Pilote de migration de données de Kexi
+ Comment[gl]=Controlador de Migración de Datos de Kexi
+ Comment[he]=מנהל התקן Data-Migration ל־Kexi
++Comment[hr]=Kexi upravljački program za migraciju podataka
+ Comment[hu]=Kexi adatmigrálási meghajtó
+ Comment[is]=Kexi gagnaflutningsrekill
+ Comment[it]=Driver di migrazione dei dati per Kexi
+@@ -25,6 +27,7 @@
+ Comment[ms]=Pemacu Migrasi Data Kexi
+ Comment[nb]=Kexi-driver for datamigrering
+ Comment[nds]=Datenutlagerndriever för Kexi
++Comment[ne]=केक्सी डेटा माइग्रेसन ड्राइभर
+ Comment[nl]=Kexi Datamigratie Stuurprogramma
+ Comment[nn]=Kexi-programtillegg for migrering av data
+ Comment[pl]=Wtyczka do migracji danych programu Kexi
+--- kexi/migration/keximigrate.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/migration/keximigrate.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -179,8 +179,11 @@
+ (so e.g. keximdb driver does not need this). */
+ //! @todo SQL-dependent!
+ virtual tristate drv_queryStringListFromSQL(
+- const QString& sqlStatement, uint columnNumber, QStringList& stringList, int numRecords = -1)
+- { return cancelled; }
++ const QString& sqlStatement, uint columnNumber, QStringList& stringList,
++ int numRecords = -1)
++ { Q_UNUSED(sqlStatement); Q_UNUSED(columnNumber); Q_UNUSED(stringList);
++ Q_UNUSED(numRecords);
++ return cancelled; }
+
+ /*! Fetches single string at column \a columnNumber from result obtained
+ by running \a sqlStatement.
+@@ -201,7 +204,8 @@
+ //! @todo SQL-dependent!
+ virtual tristate drv_fetchRecordFromSQL(const QString& sqlStatement,
+ KexiDB::RowData& data, bool &firstRecord)
+- { return cancelled; }
++ { Q_UNUSED(sqlStatement); Q_UNUSED(data); Q_UNUSED(firstRecord);
++ return cancelled; }
+
+ //! Copy a table from source DB to target DB (driver specific)
+ //! - create copies of KexiDB tables
+--- kexi/migration/pqxx/pqxxmigrate.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/migration/pqxx/pqxxmigrate.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -27,7 +27,7 @@
+ #include <kexidb/field.h>
+ #include <kexidb/connection.h>
+
+-#include <pqxx/all.h>
++#include <pqxx/pqxx>
+
+ namespace KexiMigration
+ {
+--- kexi/migration/pqxx/keximigrate_pqxx.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/migration/pqxx/keximigrate_pqxx.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,7 +2,9 @@
+ Encoding=UTF-8
+ Name=PostgreSQL
+ Name[hi]=पोस्टग्रे-एसक्यूएल
++Name[ne]=पोस्ट ग्रे एसक्यूएल
+ Comment=PostgreSQL Migration Driver for Kexi
++Comment[bg]=Драйвер за мигриране от PostgreSQL към Kexi
+ Comment[ca]=Controlador de migració de PostgreSQL per a Kexi
+ Comment[cy]=Gyrrydd Mudo PostgreSQL ar gyfer Kexi
+ Comment[da]=PostgreSQL Migrationsdriver for Kexi
+@@ -15,6 +17,7 @@
+ Comment[fi]=PostgreSQL yhdistämisajuri Kexille
+ Comment[fr]=Pilote de migration PostgreSQL pour Kexi
+ Comment[gl]=Controlador de Migración de PostgreSQL de Kexi
++Comment[hr]=PostgreSQL upravljački program migracije podataka za Kexi
+ Comment[hu]=Kexi PostgreSQL-migrálási meghajtó
+ Comment[is]=PostgreSQL gagnaflutngingsrekill fyrir Kexi
+ Comment[it]=Driver di migrazione PostgreSQL per Kexi
+@@ -23,6 +26,7 @@
+ Comment[lv]=PostgreSQL datu migrācijas draiveris priekš Kexi
+ Comment[nb]=Kexi-programmodul for migrering av MySQL-drivere
+ Comment[nds]=PostgreSQL-Datenutlagerndriever för Kexi
++Comment[ne]=केक्सीका लागि पोस्टग्रेसSQL मापग्रेसन ड्राइभर
+ Comment[nl]=PostgreSQL-migratiestuurprogramma voor Kexi
+ Comment[nn]=Kexi-programmodul for migrering av MySQL-drivarar
+ Comment[pl]=Wtyczka migracji danych z serwera PostgreSQL dla Kexi
+--- kexi/migration/mysql/keximigrate_mysql.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/migration/mysql/keximigrate_mysql.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,8 +1,10 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=MySQL
++Name[ne]=मेरो एसक्यूएल
+ Name[sk]=mySQL
+ Comment=MySQL Migration Driver for Kexi
++Comment[bg]=Драйвер за мигриране от MySQL към Kexi
+ Comment[ca]=Controlador de migració de MySQL per a Kexi
+ Comment[cy]=Gyrrydd Mudo MySQL ar gyfer Kexi
+ Comment[da]=MySQL Migrationsdriver for Kexi
+@@ -15,6 +17,7 @@
+ Comment[fi]=MySQL yhdistäjäajuri Kexille
+ Comment[fr]=Pilote de migration MySQL pour Kexi
+ Comment[gl]=Controlador de Migración de MySQL de Kexi
++Comment[hr]=MySQL upravljački program migracije podataka za Kexi
+ Comment[hu]=Kexi MySQL-migrálási meghajtó
+ Comment[is]=MySQL gagnaflutningsrekill fyrir Kexi
+ Comment[it]=Driver di migrazione MySQL per Kexi
+@@ -24,6 +27,7 @@
+ Comment[ms]=Pemacu Migrasi MySQL bagi Kexi
+ Comment[nb]=Kexi-programmodul for migrering av MySQL-drivere
+ Comment[nds]=MySQL-Datenutlagerndriever för Kexi
++Comment[ne]=केक्सीका लागि MySQL माइग्रेसन ड्राइभर
+ Comment[nl]=MySQL-migratiestuurprogramma voor Kexi
+ Comment[nn]=Kexi-programmodul for migrering av MySQL-drivarar
+ Comment[pl]=Wtyczka migracji danych z serwera MySQL dla Kexi
+--- kexi/kexi_version.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/kexi_version.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -30,12 +30,12 @@
+ #endif
+
+ #ifndef KEXI_VERSION_STRING
+-# define KEXI_VERSION_STRING "1.1.2"
++# define KEXI_VERSION_STRING "1.1.3-pre"
+ #endif
+
+ #define KEXI_VERSION_MAJOR 1
+ #define KEXI_VERSION_MINOR 1
+-#define KEXI_VERSION_RELEASE 2
++#define KEXI_VERSION_RELEASE 3
+
+ #define KEXI_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
+
+--- kexi/tests/gui/finddialog/kexifinddialogbase.ui (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/tests/gui/finddialog/kexifinddialogbase.ui (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,4 +1,4 @@
+-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
++<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
+ <class>KexiFindDialogBase</class>
+ <widget class="QDialog">
+ <property name="name">
+@@ -208,9 +208,6 @@
+ <property name="text">
+ <string>Prompt on replace</string>
+ </property>
+- <property name="accel">
+- <string></string>
+- </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+@@ -255,9 +252,6 @@
+ <property name="text">
+ <string>Close</string>
+ </property>
+- <property name="accel">
+- <string></string>
+- </property>
+ </widget>
+ <widget class="KPushButton">
+ <property name="name">
+--- kexi/doc/dev/compile_time_options.txt (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/doc/dev/compile_time_options.txt (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,7 +1,7 @@
+ Compile-Time Options for Kexi
+ -----------------------------
+
+-(c) 2005-2006, Jaroslaw Staniek, <js @ iidea . pl>
++(c) 2005-2007, Jaroslaw Staniek, <js @ iidea . pl>
+
+
+ See http://www.kexi-project.org/wiki/wikiview/index.php?AdvancedBuildNotes
+@@ -138,6 +138,11 @@
+ Default: undefined
+ Description: Defined means Kexi offers combo box form widget.
+
++* DB_TEMPLATES
++Type: defined/undefined
++Default: undefined
++Description: Defined means Kexi offers "Templates" in the startup dialog.
++
+ ==== Obsolete, don't use ====
+
+ * KDOCKWIDGET_P
+--- kexi/doc/dev/CHANGELOG-Kexi-js (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/doc/dev/CHANGELOG-Kexi-js (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,7 +2,7 @@
+ Kexi Development CHANGELOG Document
+ From jstaniek's Point of View
+
+- Copyright (C) 2003-2006 Jaroslaw Staniek js at iidea.pl / OpenOffice Polska
++ Copyright (C) 2003-2007 Jaroslaw Staniek js at iidea.pl / OpenOffice Polska
+ Kexi home page: http://www.kexi-project.org/
+ -----------------------------------------------------------------------------
+
+@@ -15,13 +15,137 @@
+ = -a fix for recently introduced bug or a minor/too technical fix not worth
+ mentioning in the public changelog
+
++TODO: fix displaying default values in comboboxes (form and tableview)
++TODO: use KCompletionBox in (editable/noneditable) comboboxes
++
++2007-04-11
++Forms
++- forms having parameter query as data source now ask for parameters
++2.0: merged
++
++2007-03-21, 22
++Table Designer
++- clear command history after successful saving of the design
++- on switching to data view, do not warn about removing data,
++ if the data will stay untouched
++2.0: merged
++Query Designer
++- removed possible crash in data view
++2.0: merged
++
++2007-03-16
++Query Designer
++- fixed table sizes in the Design View
++- fixed displaying relation connection lines when connected field is not visible
++- fixed mouse drop position when target points on a field of table with
++ scrolled-down contents
++- do not show internal relationships for visible lookup fields (JOINs) in SQL view
++2.0: merged
++Table View
++- make column readonly if query-based data source itself is stored (i.e. has connection)
++ and lookup column is defined
++2.0: merged
++
++2007-03-15
++KexiDB
++- SQL parser can work recursively now (needed when multiple parsers are used
++ in the same thread, removed possible crash)
++2.0: merged
++
++2007-03-12..14
++Main Window
++- main window is activated after closing "Insert image" file dialog
++= "find" action: restart searching from start for "Search all rows" mode if:
++== user has changed the value to find since previous searching, or
++== user has recently changed direction to "Search all rows"
++- searching is performed within lookup values as well
++Simple Printouts
++- fixed problem with records printed between page boundaries
++- fixed problem with updating print preview's page navigator when number of pages differs
++ compared to previous preview
++2.0: merged
++
++Table View
++- usability: within cells of type "Image" pressing Tab, Shift+Tab, Left
++ or Right keys now closes the popup and moves the cursor
++2.0: merged
++
++2007-03-07
++Simple Printouts
++- fixed refreshing print preview after table data or query results changed
++2.0: merged
++
++2007-03-02
++Simple Printouts
++- added support for printing and previewing images
++- improved previewing quality
++- fixed landscape mode
++2.0: merged
++
++2007-02-27
++Forms
++- hide popup in combo box or image box as soon as it loses focus
++- changes made to combo box selection is cancelled if the popup
++ loses focus without accepting
++- hide popup in combo box or image box as soon as user moves
++ to other record (usually with a shortcut)
++- fixed handling page down/page up keys within combo box popups
++ (previously it moved to other record)
++2.0: merged
++
++2007-02-23
++Forms
++- for buttons, left/up and right/down keys act like tab/backtab
++2.0: merged
++
++2007-02-19
++Forms
++- fixed displaying margin for image boxes
++- fixed assigning static images to image boxes without saving form's design;
++ the images can now be saved also in data view mode
++- fixed handling tab key for image boxes
++- automatic tab order:
++-- fixed ordering for widgets within containers (e.g. a group box)
++-- widgets within tab widget pages are ordered by page number
++-- widgets inside tab widget that are not visible are skipped when moving
++ focus using Tab/Shift+Tab key
++- Ctrl+Tab shortcut (for switching between tabs) works on windows
++ if multiline text editor is focused
++2.0: merged
++
++2007-02-12
++Forms
++- fields dragging & dropping works for containers (tab widgets, frames and group boxes)
++2.0: merged
++
++2007-02-09..14
++Main Window
++- Edit->Find action added, works within table, query and form views as a global,
++ context-dependent tool window.
++2.0: merged
++
+ ~~~~~~~~~~~~~~~~ 1.1.2 bugfix release (with KOffice 1.6.2) ~~~~~~~~~~~~~~~~
+
++2007-02-09
++Table View
++- added more actions to the context menu in data view
++
++2007-02-08
++Tools
++- added "Delete column" tool for deleting table columns without removing data;
++ translation enabled; with GUI wrapper
++- fixes for "Add column" tool
++2.0: merged
++
+ 2007-02-07
+ KexiDB
+ = fixed possible crash when running a query without primary key included
+- (encountered e.g. when a form contain static images)
++ (encountered e.g. when a form contains static images)
+ 2.0: merged
++Tools
++- added GUI version of "Add column" tool (with translation enabled)
++- the tool is now installed
++2.0: merged
+
+ 2007-02-06
+ KexiDB
+--- kexi/doc/dev/TODO-Kexi-js (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/doc/dev/TODO-Kexi-js (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,7 +5,7 @@
+ Also includes: win32 porting and multiplatform
+ features, planning, improving ideas, details
+
+- Copyright (C) 2003-2006 Jaroslaw Staniek js at iidea.pl / OpenOffice Polska
++ Copyright (C) 2003-2007 Jaroslaw Staniek js at iidea.pl / OpenOffice Polska
+ Kexi home page: http://www.kexi-project.org/
+ -----------------------------------------------------------------------------
+
+@@ -84,8 +84,6 @@
+
+ TODO: add possibility in cursor: "Operating in-place on data returned by sqlite_get_table()"
+
+-TODO: for import data from native-sqlite databases: use "pragma table_info"
+-TODO: maybe also use "pragma table_info" for sanity checking, or more in kexidb driver??
+ TODO: add custom collation using sqlite3_create_collation() for:
+ - non-latin1 characters
+ - non-latin1 characters with NOCASE option
+@@ -127,7 +125,22 @@
+ http://www.sqlite.org/cvstrac/wiki?p=LoadableExtensions
+ TODO: use Virtual Tables to get external virtual data like CSV live queries
+ http://www.sqlite.org/cvstrac/wiki?p=VirtualTables
++TODO: use triggers to get undo/redo: http://www.sqlite.org/cvstrac/wiki?p=UndoRedo
+
++TODO: implement autoincrement for any field (also multiple fields) using the triggers; example:
++ CREATE TABLE test (a integer, b integer, txt text);
++ CREATE TRIGGER test_a_seq_trigger AFTER INSERT ON test FOR EACH ROW BEGIN update test set a=(ifnull((select max(a)+1 from test), 1)) where rowid=new.rowid and new.a isnull; END;
++ CREATE TRIGGER test_b_seq_trigger AFTER INSERT ON test FOR EACH ROW BEGIN update test set b=(ifnull((select max(b)+1 from test), 1)) where rowid=new.rowid and new.b isnull; END;
++ insert into test values (null, null, 'foo');
++ insert into test values (null, 7, 'bar');
++ insert into test values (null, null, 'text');
++ a|b|txt
++ 1|1|foo
++ 2|7|bar
++ 3|8|text
++ Then, support the following grammar in KEXISQL:
++ CREATE TABLE test (a integer autoincrement, b integer autoincrement, txt text);
++ ^^^^^^^^^^^^^ ^^^^^^^^^^^^^
+
+ </SQLITE>
+
+@@ -187,9 +200,9 @@
+ -- wrapper secures server from too large data sets being sent to server
+ (parameters need to be configurable)
+ -- it's all dedicated for Kexi; so it's NOT a generic wrapper for any database client.
++- add "ADVANCED" find dialog: like in Mozilla Advanced Address Book Search window
+
+ === USABILITY TODO ===
+--string2Identifier(): convert national chars like '�' to similar latin-1, instead of '_'
+ -add "Simple/Advanced Usage" global option
+ --for simple usage:
+ --use captions everywhere possible, instead of names (tables, fiels, etc.); names should be autogenerated
+@@ -406,6 +419,7 @@
+ - support add "PARAMETERS [prompt1] datatype1, [prompt2] datatype2;" syntax to the parser,
+ and add query "Query parameters" dialog/pane, allowing to order parameters that user should
+ provide (Ks. eksp., p. 73)
++- ADDINs: a tree dialog showing query dependencies, and query templates like these http://www.4tops.com/query_tree.htm
+
+ ==== SQL Editor TODO: =====
+ - intergrate editor's (KPart) actions with KexiMainWindow's Actions
+@@ -561,6 +575,9 @@
+ - add setValue() to cursors: this will REQUIRE a buffered cursor, since we cannot run sql
+ before fetching is done... See http://kexi-project.org/cgi-bin/irclogger_log/kexi?date=2006-08-03,Thu&sel=229#l225
+ - use ThreadWeaver library for threaded KexiDB version
++- tables can use queries as a row source for lookup fields, what can lead to infinite recursion;
++ FIX this by either: 1) not allowing to use such table in a query (see kexi/to_fix/Ksiazka_adresowa2_recursive_query_deadlock.kexi)
++ or 2) delayed loading of query column
+
+ === KexiDB Parser TODO ===
+ - add a method for replacing a single given table name in the statement (useful on table renames)
+@@ -577,6 +594,8 @@
+ This can work in simple cases (when complex transactions are not involved).
+ - report "ambiguous field name 'id'" error for ambiguous queries like "SELECT a.id, b.id FROM a, b ORDER BY id"
+ - add types checking to **Expr::validate()
++- consider switching from bison/flex to http://www.antlr.org/
++- make parser reentrant (for now we've used a workaround)
+
+ === KexiDB MySQL Driver TODO ===
+ - use InnoDB instead of MyISAM tables because of transactions support
+@@ -640,6 +659,13 @@
+ -?? migrate english content to wiki format
+ -move polish content to .po translation file
+ -Add this to the preface http://encyklopedia.helion.pl/index.php/Kartotekowa_baza_danych
++-www: mention what features are already available and what is planned in terms of:
++-- general features, example: http://www.e-cen.pl/index.php?co=wiecej&id=26&dzial=8
++-- scripting, example: http://www.e-cen.pl/index.php?co=wiecej&id=22&dzial=6
++- add chapters for:
++-- simple printouts
++-- "assign action" to a button
++-- CSV import/export/copy/paste (csv import is explained on kexi at kde.org ML; 2007-03-23)
+
+ === 2005 PRO TODO ===
+ -greatly improve sql parser
+@@ -738,7 +764,6 @@
+ --pasting large images makes chooser button invisible; maybe place it on top of the widget?
+ --set better default for focusPolicy, implement setFocus()
+ --add filter property (using KImageEffect)
+---add QFrame container
+ --make image-related actions undoable/redoable in design time
+ --add 'print' action
+ --add for movies/animations support using QMovie to KexiDBImageBox
+@@ -853,8 +878,18 @@
+ - add "skip empty columns" and "skip empty rows" option
+ - (advanced) there can be a column that is a result of exporting combo box visible values;
+ in this case add option for normalizing the table using existing (or new) lookup table
++- add clear message when :
++-- primary key cannot be set because of non-unique values
++-- number cannot be set because non-number values
++-- etc.
++- add "fix non-unique valuesID /add missing ID values" option for PK column
++- add option for skipping particular columns
++- add option for filtering import results afterwards:
++-- to limit number of rows stored in db and
++-- to process columns using expressions
+
+ CSV Export TODO:
++- add progress bar and wizard
+ - add "Include row count as first column - include row number in the first
+ column of each row" option
+ - add "Include column types on top" option
+@@ -917,14 +952,19 @@
+ with one to four decimal places. Accurate to 15 digits on the left side of the decimal separator
+ and to 4 digits on the right side.
+ -Decimal Number (NUMERIC?)
+- MS Access: Decimal Stores numbers from 10^381 through 10^381 (.adp),
+- from 10^281 through 10^281 (.mdb); decimal precision: 28 B, storage size: 12 B
++ MS Access: Decimal Stores numbers from -10^381 through 10^381 (.adp),
++ from -10^281 through 10^281 (.mdb); decimal precision: 28 B, storage size: 12 B
+
+
+ TODO Migration from Native SQLite3
+ - use sqlite3_column_decltype() http://sqlite.org/capi3ref.html#sqlite3_column_decltype
+ and sqlite3_column_name() to know column names and types.
+ Add reasonable case-insensitive mappings like "INTEGER|integer|INT|int" -> [integer]
++ - or: for import data from native-sqlite databases: use "pragma table_info(tablename)"
++ -- maybe also use "pragma table_info" for sanity checking, or more in kexidb driver??
++- use "pragma user_version={32bit int}" (http://www.sqlite.org/pragma.html) to set, say, kexidb version.
++ This information is stored in a fixed place in the sqlite3 header, so it's possible to read it using
++ KDE Mime Type system (a magic data defined in share/mimelnk/magic).
+
+ MDB Import
+ - FIXME sometimes order of imported fields is invalid: PKEY field jumps to end.. (books2.mdb)
+@@ -1016,6 +1056,7 @@
+ === Simple Printouts TODO ===
+ - cell contents can be too large for a single page - split it to man pages if needed (true for large texts, blobs..)
+ - add support for BLOBs
++- fix printing and previewing for horizontal arragement
+
+
+ Form/TV Shortcuts:
+@@ -1039,13 +1080,6 @@
+
+
+ TODO:
+-add this to all container widgets
+- connect(m_dbform, SIGNAL(handleDragMoveEvent(QDragMoveEvent*)),
+- this, SLOT(slotHandleDragMoveEvent(QDragMoveEvent*)));
+- connect(m_dbform, SIGNAL(handleDropEvent(QDropEvent*)),
+- this, SLOT(slotHandleDropEvent(QDropEvent*)));
+-
+-- clicking on combo box contents in the design view does not select it
+ - fix crashes when table schema referenced by a combo box changes
+ - replace QDate{Time}Edit in koproperty with KLineEdit, similar to the one in KexiTableView
+
+@@ -1053,3 +1087,12 @@
+ TODO: PqxxMigrate::drv_copyTable(): we've switched from BLOBs to LongText
+ ==KexiDB::Field::LongText part shoud be removed; add other backward-copatibility code (how?)
+ if (fieldsExpanded.at(index)->field->type()==KexiDB::Field::BLOB || fieldsExpanded.at(index)->field->type()==KexiDB::Field::LongText)
++
++
++Startup templates
++- TODO: : use main/startup/TemplateItem.ui and main/startup/TemplateWidget.h
++ http://lxr.kde.org/source/KDE/kdebase/kicker/kicker/ui/addapplet.cpp?v=3.5-branch#188
++- TODO look at schemas at http://www.databaseanswers.org/data_models/index.htm
++
++Find/Replace REPLACE
++- use this for replace: virtual bool columnEditable(int col);
+--- kexi/kexidb/connection.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/kexidb/connection.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -56,6 +56,7 @@
+ Connection::SelectStatementOptions::SelectStatementOptions()
+ : identifierEscaping(Driver::EscapeDriver|Driver::EscapeAsNecessary)
+ , alsoRetrieveROWID(false)
++ , addVisibleLookupColumns(true)
+ {
+ }
+
+@@ -1139,7 +1140,8 @@
+ sql += (QString::fromLatin1(" AS ") + aliasString);
+ //! @todo add option that allows to omit "AS" keyword
+ }
+- LookupFieldSchema *lookupFieldSchema = f->table() ? f->table()->lookupFieldSchema( *f ) : 0;
++ LookupFieldSchema *lookupFieldSchema = (options.addVisibleLookupColumns && f->table())
++ ? f->table()->lookupFieldSchema( *f ) : 0;
+ if (lookupFieldSchema && lookupFieldSchema->boundColumn()>=0) {
+ // Lookup field schema found
+ // Now we also need to fetch "visible" value from the lookup table, not only the value of binding.
+@@ -1250,7 +1252,7 @@
+ else {
+ KexiDBWarn << "Connection::selectStatement(): unsupported row source type "
+ << rowSource.typeName() << endl;
+- return false;
++ return QString();
+ }
+ }
+ }
+--- kexi/kexidb/utils.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/kexidb/utils.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -100,6 +100,13 @@
+ 'type' property when user selects type group for a field. */
+ KEXI_DB_EXPORT Field::Type defaultTypeForGroup(Field::TypeGroup typeGroup);
+
++ /*! \return a slightly simplified type name for \a field.
++ For BLOB type it returns i18n'd "Image" string or other, depending on the mime type.
++ For numbers (either floating-point or integer) it returns i18n'd "Number: string.
++ For other types it the same string as Field::typeGroupName() is returned. */
++//! @todo support names of other BLOB subtypes
++ KEXI_DB_EXPORT QString simplifiedTypeName(const Field& field);
++
+ /*! \return true if \a v represents an empty (but not null) value.
+ Values of some types (as for strings) can be both empty and not null. */
+ inline bool isEmptyValue(Field *f, const QVariant &v) {
+--- kexi/kexidb/parser/parser_p.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/kexidb/parser/parser_p.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -81,7 +81,6 @@
+
+ extern KexiDB::Parser *parser;
+ extern KexiDB::Field *field;
+-extern bool requiresTable;
+
+
+ #endif
+--- kexi/kexidb/parser/parser_p.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/kexidb/parser/parser_p.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -29,8 +29,8 @@
+
+ using namespace KexiDB;
+
+-Parser *parser;
+-Field *field;
++Parser *parser = 0;
++Field *field = 0;
+ //bool requiresTable;
+ QPtrList<Field> fieldList;
+ int current = 0;
+--- kexi/kexidb/parser/parser.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/kexidb/parser/parser.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -118,7 +118,13 @@
+ init();
+ clear();
+ d->statement = statement;
+- return parseData(this, statement.utf8());
++
++ KexiDB::Parser *oldParser = parser;
++ KexiDB::Field *oldField = field;
++ bool res = parseData(this, statement.utf8());
++ parser = oldParser;
++ field = oldField;
++ return res;
+ }
+
+ void
+--- kexi/kexidb/queryschema.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/kexidb/queryschema.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -431,7 +431,7 @@
+ }
+ else {
+ if (includeTableName) {
+- tableName = m_column->field->table()->name();
++ tableName = m_field->table()->name();
+ if (drv)
+ tableName = drv->escapeIdentifier(tableName, identifierEscaping);
+ tableName += ".";
+@@ -598,7 +598,7 @@
+ Field *f;
+ if (dynamic_cast<QueryAsterisk*>( f_it.current() )) {
+ f = f_it.current()->copy();
+- if (f_it.current()->m_parent == &querySchema)
++ if (static_cast<const KexiDB::FieldList *>(f_it.current()->m_parent) == &querySchema)
+ f->m_parent = this;
+ }
+ else
+--- kexi/kexidb/connectiondata.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/kexidb/connectiondata.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -20,6 +20,8 @@
+ #ifndef KEXIDB_CONNECTION_DATA_H
+ #define KEXIDB_CONNECTION_DATA_H
+
++#include <kexidb/kexidb_export.h>
++
+ #include <qobject.h>
+ #include <qstring.h>
+ #include <qptrlist.h>
+--- kexi/kexidb/fieldlist.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/kexidb/fieldlist.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -143,13 +143,13 @@
+ See @ref Connection::selectStatement() for example use.
+ \a drvEscaping can be used to alter default escaping type.
+ */
+- QString sqlFieldsList(Driver *driver, const QString& separator = ",",
++ QString sqlFieldsList(Driver *driver, const QString& separator = QString::fromLatin1(","),
+ const QString& tableAlias = QString::null,
+ int drvEscaping = Driver::EscapeDriver|Driver::EscapeAsNecessary);
+
+ /*! Like above, but this is convenient static function, so you can pass any \a list here. */
+ static QString sqlFieldsList(Field::List* list, Driver *driver,
+- const QString& separator = ",", const QString& tableAlias = QString::null,
++ const QString& separator = QString::fromLatin1(","), const QString& tableAlias = QString::null,
+ int drvEscaping = Driver::EscapeDriver|Driver::EscapeAsNecessary);
+
+ /*! @internal Renames field \a oldName to \a newName.
+--- kexi/kexidb/utils.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/kexidb/utils.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1248,4 +1248,15 @@
+ return KexiDB::maximumForIntegerTypes(t2, t1); //swap
+ }
+
++QString KexiDB::simplifiedTypeName(const Field& field)
++{
++ if (field.isNumericType())
++ return i18n("Number"); //simplify
++ else if (field.type() == Field::BLOB)
++//! @todo support names of other BLOB subtypes
++ return i18n("Image"); //simplify
++
++ return field.typeGroupName();
++}
++
+ #include "utils_p.moc"
+--- kexi/kexidb/connection.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/kexidb/connection.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -678,6 +678,11 @@
+
+ //! True if ROWID should be also retrieved. False by default.
+ bool alsoRetrieveROWID : 1;
++
++ /*! True if relations (LEFT OUTER JOIN) for visible lookup columns should be added.
++ True by default. This is set to false when user-visible statement is generated
++ e.g. for the Query Designer. */
++ bool addVisibleLookupColumns : 1;
+ };
+
+ /*! \return "SELECT ..." statement's string needed for executing query
+--- kexi/kexidb/kexidb_driver.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/kexidb/kexidb_driver.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,14 +4,14 @@
+ X-KDE-ServiceType=Kexi/DBDriver
+ Comment=Kexi SQL-Driver plugin
+ Comment[ar]=ملحق سوّاقة SQL لدى Kexi
+-Comment[bg]=Приставка на Kexi за драйвери за SQL
++Comment[bg]=Приставка на Kexi за SQL драйвери
+ Comment[br]=Lugent SQL-Driver evit Kexi
+ Comment[ca]=Extensió del controlador SQL de Kexi
+ Comment[cy]=Ategyn Gyrrydd-SQL Kexi
+ Comment[da]=Kexi SQL-driver-plugin
+ Comment[de]=Kexi SQL-Treiber-Plugin
+ Comment[el]=Πρόσθετο οδηγού SQL του Kexi
+-Comment[es]=Plugin de SQL-Driver de kexi
++Comment[es]=Complemento de SQL-Driver de Kexi
+ Comment[et]=Kexi SQL-draiveri plugin
+ Comment[eu]=Kexi-en SQL-kontrolatzailearen plugina
+ Comment[fa]=وصلۀ گردانندۀ Kexi SQL
+@@ -30,6 +30,7 @@
+ Comment[ms]=Plugin Pemacu SQL Kexi
+ Comment[nb]=SQL-drivermodul for Kexi
+ Comment[nds]=SQL-Drievermoduul för Kexi
++Comment[ne]=केक्सी SQL-ड्राइभर प्लगइन
+ Comment[nl]=Kexi SQL-stuurprogramma-plugin
+ Comment[nn]=SQL-drivarmodul for Kexi
+ Comment[pl]=Wtyczka sterownika SQL dla programu Kexi
+--- kexi/kexidb/Makefile.am (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/kexidb/Makefile.am (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -50,7 +50,8 @@
+ simplecommandlineapp.h \
+ tableschema.h \
+ transaction.h \
+-utils.h
++utils.h \
++parser/parser.h
+
+ libkexidb_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO) \
+ $(top_builddir)/kexi/kexiutils/libkexiutils.la
+--- kexi/kexidb/drivers/pqxx/pqxxcursor.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/kexidb/drivers/pqxx/pqxxcursor.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -99,7 +99,7 @@
+ m_implicityStarted = true;
+ }
+
+- m_res = new pqxx::result(((pqxxSqlConnection*)connection())->m_trans->data->exec(m_sql.utf8()));
++ m_res = new pqxx::result(((pqxxSqlConnection*)connection())->m_trans->data->exec(std::string(m_sql.utf8())));
+ ((pqxxSqlConnection*)connection())
+ ->drv_commitTransaction(((pqxxSqlConnection*)connection())->m_trans);
+ // my_conn->m_trans->commit();
+--- kexi/kexidb/drivers/pqxx/pqxxconnection.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/kexidb/drivers/pqxx/pqxxconnection.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -277,7 +277,7 @@
+ // m_trans = new pqxx::nontransaction(*m_pqxxsql);
+ // KexiDBDrvDbg << "About to execute" << endl;
+ //Create a result object through the transaction
+- d->res = new pqxx::result(m_trans->data->exec(statement.utf8()));
++ d->res = new pqxx::result(m_trans->data->exec(std::string(statement.utf8())));
+ // KexiDBDrvDbg << "Executed" << endl;
+ //Commit the transaction
+ if (implicityStarted) {
+@@ -290,6 +290,12 @@
+ //If all went well then return true, errors picked up by the catch block
+ ok = true;
+ }
++ catch(const pqxx::sql_error& sqlerr) {
++ KexiDBDrvDbg << "pqxxSqlConnection::drv_executeSQL: sql_error exception - " << sqlerr.query().c_str() << endl;
++ }
++ catch (const pqxx::broken_connection& bcerr) {
++ KexiDBDrvDbg << "pqxxSqlConnection::drv_executeSQL: broken_connection exception" << endl;
++ }
+ catch (const std::exception &e)
+ {
+ //If an error ocurred then put the error description into _dbError
+--- kexi/kexidb/drivers/pqxx/pqxxconnection_p.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/kexidb/drivers/pqxx/pqxxconnection_p.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -31,7 +31,7 @@
+ #define PQXXSQLCONNECTIONINTERNAL_H
+
+ #include <kexidb/connection_p.h>
+-#include <pqxx/all.h>
++#include <pqxx/pqxx>
+
+ namespace KexiDB
+ {
+--- kexi/kexidb/drivers/pqxx/kexidb_pqxxsqldriver.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/kexidb/drivers/pqxx/kexidb_pqxxsqldriver.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Name=PostgreSQL
+ Name[hi]=पोस्टग्रे-एसक्यूएल
++Name[ne]=पोस्ट ग्रे एसक्यूएल
+ X-KDE-Library=kexidb_pqxxsqldriver
+ ServiceTypes=Kexi/DBDriver
+ Type=Service
+--- kexi/kexidb/drivers/pqxx/pqxxdriver.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/kexidb/drivers/pqxx/pqxxdriver.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -133,14 +133,18 @@
+ //
+ QString pqxxSqlDriver::escapeString( const QString& str) const
+ {
+- return QString(pqxx::Quote(str.ascii()).c_str());
++ return QString::fromLatin1("'")
++ + QString::fromAscii( pqxx::sqlesc(std::string(str.utf8())).c_str() )
++ + QString::fromLatin1("'");
+ }
+
+ //==================================================================================
+ //
+ QCString pqxxSqlDriver::escapeString( const QCString& str) const
+ {
+- return QCString(pqxx::Quote(QString(str).ascii()).c_str());
++ return QCString("'")
++ + QCString( pqxx::sqlesc(QString(str).ascii()).c_str() )
++ + QCString("'");
+ }
+
+ //==================================================================================
+--- kexi/kexidb/drivers/sqlite/kexidb_sqlite3driver.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/kexidb/drivers/sqlite/kexidb_sqlite3driver.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,7 +3,7 @@
+ Name=SQLite3
+ Name[sv]=Sqlite 3
+ Comment=SQLite is default Kexi embedded SQL engine
+-Comment[bg]=SQLite е малка и бърза СУБД, която е вградена в Kexi
++Comment[bg]=SQLite е СУБД по подразбиране в Kexi , с вградено SQL ядро
+ Comment[ca]=SQLite és el motor SQL encastat i per defecte de Kexi
+ Comment[cy]=Y peiriant SQL mewnadeiledig rhagosod Kexi yw SQLite
+ Comment[da]=SQLite er en standard Kexi-indlejret SQL-motor
+@@ -18,6 +18,7 @@
+ Comment[gl]=SQLite é o motor embebido de SQL de Kexi
+ Comment[he]=SQLite הוא מנוע ה־SQL המוטבע של Kexi המשמש כברירת מחדל
+ Comment[hi]=केएक्साई एम्बेडेड एसक्यूएल इंजिन के लिए एसक्यूएललाइट डिफ़ॉल्ट है
++Comment[hr]=SQLite je zadani Kexi ugrađeni pogon SQL pogona
+ Comment[hu]=Az SQLite a Kexi alapértelmezett, beépített SQL-motorja
+ Comment[is]=SQLite er sjálfgefna Kexi SQL vélin
+ Comment[it]=SQLite è il motore predefinito integrato in Kexi
+@@ -27,6 +28,7 @@
+ Comment[ms]=SQLite adalah KeXi piawai yang dipasang dalam enjin SQL
+ Comment[nb]=SQLite er den innebygde SQL-motoren i Kexi
+ Comment[nds]=SQLite is de standardinbett SQL-Driever för Kexi
++Comment[ne]=SQLite पूर्वनिर्धारित केक्सी सम्मिलित SQL इन्जिन हो
+ Comment[nl]=SQLite is de standaard SQL-database voor Kexi
+ Comment[nn]=SQLite er den innebygde SQL-motoren i Kexi
+ Comment[pl]=SQLite jest domyślnym wbudowanym silnikiem SQL dla Kexi
+--- kexi/kexidb/drivers/sqlite2/kexidb_sqlite2driver.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/kexidb/drivers/sqlite2/kexidb_sqlite2driver.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,7 +3,7 @@
+ Name=SQLite2
+ Name[sv]=Sqlite 2
+ Comment=SQLite is default Kexi embedded SQL engine
+-Comment[bg]=SQLite е малка и бърза СУБД, която е вградена в Kexi
++Comment[bg]=SQLite е СУБД по подразбиране в Kexi , с вградено SQL ядро
+ Comment[ca]=SQLite és el motor SQL encastat i per defecte de Kexi
+ Comment[cy]=Y peiriant SQL mewnadeiledig rhagosod Kexi yw SQLite
+ Comment[da]=SQLite er en standard Kexi-indlejret SQL-motor
+@@ -18,6 +18,7 @@
+ Comment[gl]=SQLite é o motor embebido de SQL de Kexi
+ Comment[he]=SQLite הוא מנוע ה־SQL המוטבע של Kexi המשמש כברירת מחדל
+ Comment[hi]=केएक्साई एम्बेडेड एसक्यूएल इंजिन के लिए एसक्यूएललाइट डिफ़ॉल्ट है
++Comment[hr]=SQLite je zadani Kexi ugrađeni pogon SQL pogona
+ Comment[hu]=Az SQLite a Kexi alapértelmezett, beépített SQL-motorja
+ Comment[is]=SQLite er sjálfgefna Kexi SQL vélin
+ Comment[it]=SQLite è il motore predefinito integrato in Kexi
+@@ -27,6 +28,7 @@
+ Comment[ms]=SQLite adalah KeXi piawai yang dipasang dalam enjin SQL
+ Comment[nb]=SQLite er den innebygde SQL-motoren i Kexi
+ Comment[nds]=SQLite is de standardinbett SQL-Driever för Kexi
++Comment[ne]=SQLite पूर्वनिर्धारित केक्सी सम्मिलित SQL इन्जिन हो
+ Comment[nl]=SQLite is de standaard SQL-database voor Kexi
+ Comment[nn]=SQLite er den innebygde SQL-motoren i Kexi
+ Comment[pl]=SQLite jest domyślnym wbudowanym silnikiem SQL dla Kexi
+--- kexi/kexidb/drivers/mySQL/kexidb_mysqldriver.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/kexidb/drivers/mySQL/kexidb_mysqldriver.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=MySQL
++Name[ne]=मेरो एसक्यूएल
+ Name[sk]=mySQL
+ X-KDE-Library=kexidb_mysqldriver
+ ServiceTypes=Kexi/DBDriver
+--- kexi/kexidb/drivers/odbc/kexidb_odbcdriver.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/kexidb/drivers/odbc/kexidb_odbcdriver.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -27,6 +27,7 @@
+ Comment[ms]=Pemacu Kesambungan Pangkalan Data Terbuka Kexi
+ Comment[nb]=Tilkoblingsdriver for Kexis åpne database
+ Comment[nds]=ODBC-Driever för Kexi
++Comment[ne]=केक्सी खुला डाटाबेस जडित ड्राइभर
+ Comment[nl]=Kexi Open Database Connectivity-stuurprogramma
+ Comment[pl]=Sterownik ODBC dla Kexi
+ Comment[pt]=Controlador de ODBC do Kexi
+--- kexi/kexi.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/kexi.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,13 +3,14 @@
+ Name=Kexi
+ Name[hi]=के-एक्जाई
+ Name[lo]=ສອຍຄີວ - K
++Name[ne]=केक्सी
+ Type=Application
+ Exec=kexi
+ Icon=kexi
+ MimeType=application/x-kexiproject-sqlite;application/x-sqlite2;application/x-kexiproject-shortcut;application/x-kexiproject-sqlite2;application/x-kexiproject-sqlite3;application/x-sqlite3;application/x-kexi-connectiondata;application/x-msaccess
+ Terminal=false
+ GenericName=Database Creator
+-GenericName[bg]=Създаване на бази от данни
++GenericName[bg]=Създаване на бази данни
+ GenericName[br]=Aozer ar stlennvon
+ GenericName[ca]=Creador de bases de dades
+ GenericName[cs]=Tvůrce databází
+@@ -25,15 +26,18 @@
+ GenericName[fr]=Créateur de base de données
+ GenericName[gl]=Criación de Bases de Datos
+ GenericName[he]=יוצר מסדי נתונים
++GenericName[hr]=Dizajner baza podataka
+ GenericName[hu]=Adatbázis-kezelő
+ GenericName[is]=Gagnagrunns hönnuður
+ GenericName[it]=Creatore di banche dati
+ GenericName[ja]=データベース作成
+ GenericName[km]=កម្មវិធីបង្កើតមូលដ្ឋានទិន្នន័យ
++GenericName[lt]=Duomenų bazių kūrimo programa
+ GenericName[lv]=Datu bāzu veidotājs
+ GenericName[ms]=Pencipta Pangkalan Data
+ GenericName[nb]=Databaseoppretting
+ GenericName[nds]=Datenbank-Opstellen
++GenericName[ne]=डाटाबेस सर्जक
+ GenericName[nl]=Database aanmaken
+ GenericName[nn]=Databaseoppretting
+ GenericName[pl]=Asystent tworzenia baz danych
+@@ -53,6 +57,7 @@
+ GenericName[zh_CN]=数据库创建器
+ GenericName[zh_TW]=資料庫建立程式
+ Comment=Develop desktop database applications
++Comment[bg]=Разработка на приложение за БД за работния плот
+ Comment[ca]=Aplicacions de desenvolupament de bases de dades d'escriptori
+ Comment[da]=Udvikl databaseprogrammer for desktoppen
+ Comment[de]=Desktop-Datenbankanwendungen entwickeln
+@@ -65,9 +70,11 @@
+ Comment[it]=Sviluppa applicazioni per banche dati da desktop
+ Comment[ja]=デスクトップ データベース アプリケーションを開発
+ Comment[km]= កម្មវិធីអភិវឌ្ឍន៍ មូលដ្ឋានទិន្នន័យផ្ទៃតុs
++Comment[lt]=Programa leidžia kurti darbastalio duomenų bazes
+ Comment[lv]=Darbvirsmas datu bāzu veidošanai
+ Comment[nb]=Utvikle databaseprogrammer for skrivebordet
+ Comment[nds]=Datenbankprogrammen för den Schriefdisch opstellen
++Comment[ne]=डेस्कटप डाटाबेस अनुप्रयोग विकास गर्नुहोस्
+ Comment[nl]=Ontwikkel databasetoepassingen
+ Comment[pl]=Rozwój aplikacji bazodanowych
+ Comment[pt]=Desenvolver aplicações de bases de dados para o utilizador
+--- kexi/data/kexiui.rc (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/data/kexiui.rc (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,5 @@
+ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
+-<kpartgui name="kexi" version="147">
++<kpartgui name="kexi" version="164">
+ <MenuBar>
+ <Menu name="file" noMerge="0">
+ <text>&Project</text>
+@@ -59,13 +59,15 @@
+ </Menu>
+ <MergeLocal name="edit_paste_merge"/>
+ <Separator/>
++ <Action name="edit_find"/>
++ <Action name="edit_replace"/>
++ <Separator/>
+ <Action name="edit_select_all"/>
+ <Separator/>
+ <Action name="edit_delete"/>
+ <Action name="edit_delete_row"/>
+ <ActionList name="edit_clear_table"/>
+ <ActionList name="edit_insert_empty_row"/>
+- <DefineGroup name="edit_find"/>
+ <Merge/>
+ </Menu>
+
+@@ -157,7 +159,7 @@
+ </Menu>
+ </MenuBar>
+
+-<ToolBar name="mainToolBar" noMerge="1" fullWidth="false">
++<ToolBar name="mainToolBar" noMerge="1" fullWidth="false" index="0">
+ <text>Main Toolbar</text>
+ <Action name="project_save"/>
+ <Separator/>
+@@ -166,27 +168,37 @@
+ <Action name="edit_cut"/>
+ <Action name="edit_copy"/>
+ <Action name="edit_paste"/>
+- <!-- Separator/>
+- <Action name="edit_find"/>
+- <Action name="view_zoom"/>
+- <Separator/ -->
++ <!-- Separator/ -->
++ <!-- Action name="view_zoom"/ -->
++ <!-- Separator/ -->
+ <Action name="project_relations"/>
+ </ToolBar>
+
+-<ToolBar name="viewToolBar" fullWidth="false" noMerge="1">
++<ToolBar name="viewToolBar" fullWidth="false" noMerge="1" index="1">
+ <text>View</text>
+ <Action name="view_data_mode" type="toggle" />
+ <Action name="view_design_mode" type="toggle" />
+ <Action name="view_text_mode" type="toggle" />
+ </ToolBar>
+
+-<ToolBar name="dataToolBar" fullWidth="false" noMerge="0">
++<ToolBar name="dataToolBar" fullWidth="false" noMerge="1" index="2">
+ <text>Data</text>
+ <Action name="data_cancel_row_changes"/>
+ <Action name="data_save_row"/>
++ <Separator/>
+ <Action name="data_sort_az"/>
+ <Action name="data_sort_za"/>
++ <Separator/>
++ <Action name="edit_find"/>
+ <!-- Action name="data_filter"/ -->
+ </ToolBar>
+
++<ToolBar name="designToolBar" fullWidth="false" noMerge="1" index="3">
++ <text>Design</text>
++</ToolBar>
++
++<ToolBar name="format" fullWidth="false" noMerge="1" index="4">
++ <text>Format</text>
++</ToolBar>
++
+ </kpartgui>
+--- kexi/data/x-kexiproject-sqlite.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/data/x-kexiproject-sqlite.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -6,6 +6,7 @@
+ Icon=kexiproject_sqlite
+ Patterns=
+ Comment=Kexi Database File-Based Project
++Comment[bg]=Проект на Kexi, базиран на файлове на СУБД
+ Comment[ca]=Projecte Kexi en una base de dades basada en fitxers
+ Comment[cy]=Cywaith Ffeil ar gyfer Cronfa Ddata Kexi
+ Comment[da]=Kexi database filbaseret projekt
+@@ -19,6 +20,7 @@
+ Comment[fr]=Projet de base de données Kexi basé sur un fichier
+ Comment[gl]=Proxecto de Kexi en Ficheiro de Base de Datos
+ Comment[he]=פרוייקט מסד נתונים מבוסס קבצים של Kexi
++Comment[hr]=Kexi projekt baze podataka datoteka
+ Comment[hu]=Kexi adatbázisfájl-alapú projekt
+ Comment[is]=Kexi verkefni byggt á gagnagrunni
+ Comment[it]=File di progetto banca dati con Kexi
+@@ -28,6 +30,7 @@
+ Comment[ms]=Projek Pangkalan Data Kexi Berasaskan Fail
+ Comment[nb]=Kexi database filbasert prosjekt
+ Comment[nds]=Dateibaseert Kexi-Datenbankprojekt
++Comment[ne]=केक्सी डाटाबेस फाइल आधारित परियोजना
+ Comment[nl]=Kexi Databasebestand-gebaseerd project
+ Comment[nn]=Databasefilbasert Kexi-prosjekt
+ Comment[pl]=Projekt Kexi zapisany w pliku
+--- kexi/data/x-kexi-connectiondata.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/data/x-kexi-connectiondata.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,6 +5,7 @@
+ Icon=kexi_connectiondata
+ Patterns=*.kexic
+ Comment=Data for Database Server Connection
++Comment[bg]=Данни за връзка към СУБД
+ Comment[ca]=Dades per a la connexió a servidor de bases de dades
+ Comment[cy]=Data ar gyfer Cysylltiad Gweinydd Cronfa Ddata
+ Comment[da]=Data for forbindelse til databaseserver
+@@ -25,6 +26,7 @@
+ Comment[lv]=Dati savienojumam ar datu bāzu serveri
+ Comment[nb]=Data for tilkobling til database-tjener
+ Comment[nds]=Daten för Datenbankserver-Verbinnen
++Comment[ne]=डाटाबेस सर्भर जडानका लागि डेटा
+ Comment[nl]=Gegevens van een databaseverbinding
+ Comment[pl]=Dane do połączenia z serwerem baz danych
+ Comment[pt]=Dados de Ligação à Base de Dados
+--- kexi/data/x-kexiproject-sqlite2.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/data/x-kexiproject-sqlite2.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -6,6 +6,7 @@
+ Patterns=*.kexi
+ X-KDE-IsAlso=application/x-sqlite2
+ Comment=Kexi Database File-Based Project
++Comment[bg]=Проект на Kexi, базиран на файлове на СУБД
+ Comment[ca]=Projecte Kexi en una base de dades basada en fitxers
+ Comment[cy]=Cywaith Ffeil ar gyfer Cronfa Ddata Kexi
+ Comment[da]=Kexi database filbaseret projekt
+@@ -19,6 +20,7 @@
+ Comment[fr]=Projet de base de données Kexi basé sur un fichier
+ Comment[gl]=Proxecto de Kexi en Ficheiro de Base de Datos
+ Comment[he]=פרוייקט מסד נתונים מבוסס קבצים של Kexi
++Comment[hr]=Kexi projekt baze podataka datoteka
+ Comment[hu]=Kexi adatbázisfájl-alapú projekt
+ Comment[is]=Kexi verkefni byggt á gagnagrunni
+ Comment[it]=File di progetto banca dati con Kexi
+@@ -28,6 +30,7 @@
+ Comment[ms]=Projek Pangkalan Data Kexi Berasaskan Fail
+ Comment[nb]=Kexi database filbasert prosjekt
+ Comment[nds]=Dateibaseert Kexi-Datenbankprojekt
++Comment[ne]=केक्सी डाटाबेस फाइल आधारित परियोजना
+ Comment[nl]=Kexi Databasebestand-gebaseerd project
+ Comment[nn]=Databasefilbasert Kexi-prosjekt
+ Comment[pl]=Projekt Kexi zapisany w pliku
+--- kexi/data/kexihandler.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/data/kexihandler.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -31,6 +31,7 @@
+ Comment[ms]=Pengendali Projek Kexi
+ Comment[nb]=Kexi prosjektbehandlere
+ Comment[nds]=Kexi-Projektpleeg
++Comment[ne]=केक्सी परियोजना ह्यान्डलरहरू
+ Comment[nl]=Kexi projecthandlers
+ Comment[nn]=Kexi-prosjekthandtering
+ Comment[pl]=Pliki obsługi projektu Kexi
+--- kexi/data/x-kexiproject-sqlite3.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/data/x-kexiproject-sqlite3.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -6,6 +6,7 @@
+ Patterns=*.kexi
+ X-KDE-IsAlso=application/x-sqlite3
+ Comment=Kexi Database File-Based Project
++Comment[bg]=Проект на Kexi, базиран на файлове на СУБД
+ Comment[ca]=Projecte Kexi en una base de dades basada en fitxers
+ Comment[cy]=Cywaith Ffeil ar gyfer Cronfa Ddata Kexi
+ Comment[da]=Kexi database filbaseret projekt
+@@ -19,6 +20,7 @@
+ Comment[fr]=Projet de base de données Kexi basé sur un fichier
+ Comment[gl]=Proxecto de Kexi en Ficheiro de Base de Datos
+ Comment[he]=פרוייקט מסד נתונים מבוסס קבצים של Kexi
++Comment[hr]=Kexi projekt baze podataka datoteka
+ Comment[hu]=Kexi adatbázisfájl-alapú projekt
+ Comment[is]=Kexi verkefni byggt á gagnagrunni
+ Comment[it]=File di progetto banca dati con Kexi
+@@ -28,6 +30,7 @@
+ Comment[ms]=Projek Pangkalan Data Kexi Berasaskan Fail
+ Comment[nb]=Kexi database filbasert prosjekt
+ Comment[nds]=Dateibaseert Kexi-Datenbankprojekt
++Comment[ne]=केक्सी डाटाबेस फाइल आधारित परियोजना
+ Comment[nl]=Kexi Databasebestand-gebaseerd project
+ Comment[nn]=Databasefilbasert Kexi-prosjekt
+ Comment[pl]=Projekt Kexi zapisany w pliku
+--- kexi/data/x-kexiproject-shortcut.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/data/x-kexiproject-shortcut.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -30,6 +30,7 @@
+ Comment[ms]=Jalan Pintas bagi Projek Kexi dalam Pelayan Pangkalan Data
+ Comment[nb]=Snarvei til Kexi-prosjektet med databasetjener
+ Comment[nds]=Tastkombinatschoon na Kexi-Projekt op Datenbankserver
++Comment[ne]=डाटाबेस सर्भर भित्र केक्सी परियोजनामा सर्टकट
+ Comment[nl]=Snelkoppeling naar Kexi-project op Databaseserver
+ Comment[nn]=Snarveg til Kexi-prosjekt på ein databasetenar
+ Comment[pl]=Skrót do projektu Kexi na serwerze baz danych
+--- kexi/data/kde34compat/x-sqlite2.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/data/kde34compat/x-sqlite2.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,6 +5,7 @@
+ Icon=empty
+ Patterns=
+ Comment=SQLite2 Database File
++Comment[bg]=Файл на SQLite2
+ Comment[br]=Restr stlennvon SQLite2
+ Comment[ca]=Fitxer de base de dades de SQLite2
+ Comment[cy]=Ffeil Gronfa DdataSQLite2
+@@ -31,6 +32,7 @@
+ Comment[ms]=Fail Pangkalan Data SQLite2
+ Comment[nb]=SQLite2-databasefil
+ Comment[nds]=SQLite2-Datenbankdatei
++Comment[ne]=SQLite2 डाटाबेस फाइल
+ Comment[nl]=SQLite2 databasebestand
+ Comment[nn]=SQLite2-databasefil
+ Comment[pl]=Plik bazy danych SQLite2
+--- kexi/data/kde34compat/x-sqlite3.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/data/kde34compat/x-sqlite3.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,6 +5,7 @@
+ Icon=empty
+ Patterns=
+ Comment=SQLite3 Database File
++Comment[bg]=Файл на SQLite3
+ Comment[br]=Restr stlennvon SQLite3
+ Comment[ca]=Fitxer de base de dades de SQLite3
+ Comment[cy]=Ffeil Gronfa DdataSQLite3
+@@ -31,6 +32,7 @@
+ Comment[ms]=Fail Pangkalan Data SQLite3
+ Comment[nb]=SQLite3-databasefil
+ Comment[nds]=SQLite3-Datenbankdatei
++Comment[ne]=SQLite3 डाटाबेस फाइल
+ Comment[nl]=SQLite3 databasebestand
+ Comment[nn]=SQLite3-databasefil
+ Comment[pl]=Plik bazy danych SQLite3
+--- kexi/Makefile.am (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/Makefile.am (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -51,17 +51,19 @@
+ # If a second directory must be "pruned", the syntax becomes:
+ # find . \( -name formeditor -o -name test \) -prune , -name \*.ui
+ # (The comma is needed or the pruned directory name would be printed to stdout)
++#
++# Temporary omitted files: kexifinddialog*
+ messages: rc.cpp
+ rm -f tips.cpp
+ # (cd data && $(PREPARETIPS) > ../tips.cpp)
+ EXCLUDE="-path ./formeditor -o -path ./doc \
+- -o -path ./plugins/importwizard -o -path ./tests -o -path ./plugins/macros/tests \
++ -o -path ./tests -o -path ./plugins/macros/tests \
+ -o -path ./scriptingplugins -o -path ./plugins/scripting -o -path ./3rdparty"; \
+- LIST="data/*.rc `find . \( \( $$EXCLUDE \) -prune -o -name \*.ui \) -type f | grep -v -e '/\.'`"; \
++ LIST="data/*.rc `find . \( \( $$EXCLUDE \) -prune -o -name \*.ui \) -type f | grep -v -e '/\.' -e kexifinddialog`"; \
+ if test -n "$$LIST"; then \
+ $(EXTRACTRC) $$LIST >> rc.cpp; \
+ fi; \
+- LIST=`find . \( \( $$EXCLUDE \) -prune -o -name \*.h -o -name \*.cpp \) -type f | grep -v -e '/\.' -e kexidswelcome.cpp`; \
++ LIST=`find . \( \( $$EXCLUDE \) -prune -o -name \*.h -o -name \*.cpp \) -type f | grep -v -e '/\.' -e kexidswelcome.cpp -e kexifinddialog`; \
+ if test -n "$$LIST"; then \
+ $(XGETTEXT) $$LIST -o $(podir)/kexi.pot; \
+ fi
+--- kexi/formeditor/factories/containerfactory.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/formeditor/factories/containerfactory.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,7 @@
+ /* This file is part of the KDE project
++ Copyright (C) 2003 Lucijan Busch <lucijan at kde.org>
+ Copyright (C) 2004 Cedric Pasteur <cedric.pasteur at free.fr>
++ Copyright (C) 2006-2007 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
+@@ -20,20 +22,10 @@
+ #ifndef CONTAINERFACTORY_H
+ #define CONTAINERFACTORY_H
+
+-#if KDE_VERSION < KDE_MAKE_VERSION(3,1,9)
+-# define KTabWidget QTabWidget
+-#include <qtabwidget.h>
+-#else
+-#include <ktabwidget.h>
+-#endif
+-
+-//! @todo replace QTabWidget by KTabWidget after the bug with & is fixed:
+-#define TabWidgetBase QTabWidget
+-//#define USE_KTabWidget //todo: uncomment
+-
+ #include <kcommand.h>
+
+ #include "widgetfactory.h"
++#include "../utils.h"
+
+ namespace KFormDesigner
+ {
+@@ -66,9 +58,9 @@
+
+ public:
+ HBox(QWidget *parent, const char *name);
+- ~HBox(){;}
++ virtual ~HBox(){;}
+ void setPreviewMode() {m_preview = true;}
+- void paintEvent(QPaintEvent *ev);
++ virtual void paintEvent(QPaintEvent *ev);
+
+ protected:
+ bool m_preview;
+@@ -81,9 +73,9 @@
+
+ public:
+ VBox(QWidget *parent, const char *name);
+- ~VBox(){;}
++ virtual ~VBox(){;}
+ void setPreviewMode() {m_preview = true;}
+- void paintEvent(QPaintEvent *ev);
++ virtual void paintEvent(QPaintEvent *ev);
+
+ protected:
+ bool m_preview;
+@@ -96,9 +88,9 @@
+
+ public:
+ Grid(QWidget *parent, const char *name);
+- ~Grid(){;}
++ virtual ~Grid(){;}
+ void setPreviewMode() {m_preview = true;}
+- void paintEvent(QPaintEvent *ev);
++ virtual void paintEvent(QPaintEvent *ev);
+
+ protected:
+ bool m_preview;
+@@ -111,9 +103,9 @@
+
+ public:
+ HFlow(QWidget *parent, const char *name);
+- ~HFlow(){;}
++ virtual ~HFlow(){;}
+ void setPreviewMode() {m_preview = true;}
+- void paintEvent(QPaintEvent *ev);
++ virtual void paintEvent(QPaintEvent *ev);
+
+ protected:
+ bool m_preview;
+@@ -126,28 +118,90 @@
+
+ public:
+ VFlow(QWidget *parent, const char *name);
+- ~VFlow(){;}
++ virtual ~VFlow(){;}
+ void setPreviewMode() {m_preview = true;}
+- void paintEvent(QPaintEvent *ev);
+- QSize sizeHint() const;
++ virtual void paintEvent(QPaintEvent *ev);
++ virtual QSize sizeHint() const;
+
+ protected:
+ bool m_preview;
+ };
+
+-class KFORMEDITOR_EXPORT KFDTabWidget : public TabWidgetBase
++//! A simple container widget
++class KFORMEDITOR_EXPORT ContainerWidget : public QWidget
+ {
+ Q_OBJECT
+
++ friend class KFDTabWidget;
++
+ public:
+- KFDTabWidget(QWidget *parent, const char *name)
+- : TabWidgetBase(parent, name)
+- {}
+- ~KFDTabWidget() {;}
++ ContainerWidget(QWidget *parent, const char *name);
++ virtual ~ContainerWidget();
+
+ virtual QSize sizeHint() const;
++
++ //! Used to emit handleDragMoveEvent() signal needed to control dragging over the container's surface
++ virtual void dragMoveEvent( QDragMoveEvent *e );
++
++ //! Used to emit handleDropEvent() signal needed to control dropping on the container's surface
++ virtual void dropEvent( QDropEvent *e );
++
++ signals:
++ //! Needed to control dragging over the container's surface
++ void handleDragMoveEvent(QDragMoveEvent *e);
++
++ //! Needed to control dropping on the container's surface
++ void handleDropEvent(QDropEvent *e);
+ };
+
++//! A tab widget
++class KFORMEDITOR_EXPORT KFDTabWidget : public KFormDesigner::TabWidget
++{
++ Q_OBJECT
++
++ public:
++ KFDTabWidget(QWidget *parent, const char *name);
++ virtual ~KFDTabWidget();
++
++ virtual QSize sizeHint() const;
++
++ //! Used to emit handleDragMoveEvent() signal needed to control dragging over the container's surface
++ virtual void dragMoveEvent( QDragMoveEvent *e );
++
++ //! Used to emit handleDropEvent() signal needed to control dropping on the container's surface
++ virtual void dropEvent( QDropEvent *e );
++
++ signals:
++ //! Needed to control dragging over the container's surface
++ void handleDragMoveEvent(QDragMoveEvent *e);
++
++ //! Needed to control dropping on the container's surface
++ void handleDropEvent(QDropEvent *e);
++};
++
++//! A group box widget
++class KFORMEDITOR_EXPORT GroupBox : public QGroupBox
++{
++ Q_OBJECT
++
++ public:
++ GroupBox(const QString & title, QWidget *parent, const char *name);
++ virtual ~GroupBox();
++
++ //! Used to emit handleDragMoveEvent() signal needed to control dragging over the container's surface
++ virtual void dragMoveEvent( QDragMoveEvent *e );
++
++ //! Used to emit handleDropEvent() signal needed to control dropping on the container's surface
++ virtual void dropEvent( QDropEvent *e );
++
++ signals:
++ //! Needed to control dragging over the container's surface
++ void handleDragMoveEvent(QDragMoveEvent *e);
++
++ //! Needed to control dropping on the container's surface
++ void handleDropEvent(QDropEvent *e);
++};
++
+ //! A form embedded as a widget inside other form
+ class KFORMEDITOR_EXPORT SubForm : public QScrollView
+ {
+@@ -176,7 +230,7 @@
+
+ public:
+ ContainerFactory(QObject *parent, const char *name, const QStringList &args);
+- ~ContainerFactory();
++ virtual ~ContainerFactory();
+
+ virtual QWidget *createWidget(const QCString & classname, QWidget *parent, const char *name, KFormDesigner::Container *container,
+ int options = DefaultOptions);
+--- kexi/formeditor/factories/kformdesigner_stdwidgets.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/formeditor/factories/kformdesigner_stdwidgets.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -19,6 +19,7 @@
+ Name[fr]=Éléments graphiques basiques
+ Name[gl]=Elementos Básicos
+ Name[he]=פריטים בסיסיים
++Name[hr]=Osnovni widgeti
+ Name[hu]=Alapelemek
+ Name[is]=Grunnhlutir
+ Name[it]=Oggetti di base
+@@ -28,6 +29,7 @@
+ Name[ms]=Widget Asas
+ Name[nb]=Elementære elementer
+ Name[nds]=Grundelementen
++Name[ne]=आधारभूत विजेट
+ Name[nl]=Basiswidgets
+ Name[nn]=Grunnleggjande element
+ Name[pl]=Proste kontrolki
+--- kexi/formeditor/factories/containerfactory.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/formeditor/factories/containerfactory.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,13 +1,24 @@
+-/***************************************************************************
+- * Copyright (C) 2003 by Lucijan Busch lucijan at kde.org *
+- * Copyright (C) 2004 Cedric Pasteur <cedric.pasteur at free.fr> *
+- * *
+- * This program is free software; you can redistribute it and/or modify *
+- * it under the terms of the GNU Library General Public License as *
+- * published by the Free Software Foundation; either version 2 of the *
+- * License, or (at your option) any later version. *
+- ***************************************************************************/
++/* This file is part of the KDE project
++ Copyright (C) 2003 Lucijan Busch <lucijan at kde.org>
++ Copyright (C) 2004 Cedric Pasteur <cedric.pasteur at free.fr>
++ Copyright (C) 2006-2007 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
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public License
++ along with this library; see the file COPYING.LIB. If not, write to
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++*/
++
+ #include <qwidgetstack.h>
+ #include <qframe.h>
+ #include <qbuttongroup.h>
+@@ -53,48 +64,66 @@
+ # include <kinputdialog.h>
+ #endif
+
+-/*
+-class KFORMEDITOR_EXPORT MyTabWidget : public KTabWidget
++ContainerWidget::ContainerWidget(QWidget *parent, const char *name)
++ : QWidget(parent, name)
+ {
+- public:
+- MyTabWidget(QWidget *parent, const char *name, QObject *container)
+- : KTabWidget(parent, name)
+- {
+- m_container = container;
++}
+
+- QObjectList *list = new QObjectList(*children());
+- for(QObject *obj = list->first(); obj; obj = list->next())
+- {
+- if(obj->isA("KTabBar"))
+- obj->installEventFilter(this);
+- }
+- delete list;
+- }
+- ~MyTabWidget() {;}
++ContainerWidget::~ContainerWidget()
++{
++}
+
+- void setContainer(QObject *container)
+- {
+- m_container = container;
+- }
+- virtual bool eventFilter(QObject *o, QEvent *ev)
+- {
+- if((!m_container) || (ev->type() != QEvent::MouseButtonRelease))
+- return KTabWidget::eventFilter(o, ev);
++QSize ContainerWidget::sizeHint() const
++{
++ return QSize(30,30); //default
++}
+
+- QMouseEvent *mev = static_cast<QMouseEvent*>(ev);
+- if(mev->button() != RightButton)
+- return KTabWidget::eventFilter(o, ev);
++void ContainerWidget::dragMoveEvent( QDragMoveEvent *e )
++{
++ QWidget::dragMoveEvent(e);
++ emit handleDragMoveEvent(e);
++}
+
+- bool ok = m_container->eventFilter(this, ev);
+- if(!ok)
+- return KTabWidget::eventFilter(o, ev);
+- return true;
+- }
++void ContainerWidget::dropEvent( QDropEvent *e )
++{
++ QWidget::dropEvent(e);
++ emit handleDropEvent(e);
++}
+
+- private:
+- QGuardedPtr<QObject> m_container;
+-};*/
++////////////////////////
+
++GroupBox::GroupBox(const QString & title, QWidget *parent, const char *name)
++ : QGroupBox(title, parent, name)
++{
++}
++
++GroupBox::~GroupBox()
++{
++}
++
++void GroupBox::dragMoveEvent( QDragMoveEvent *e )
++{
++ QGroupBox::dragMoveEvent(e);
++ emit handleDragMoveEvent(e);
++}
++
++void GroupBox::dropEvent( QDropEvent *e )
++{
++ QGroupBox::dropEvent(e);
++ emit handleDropEvent(e);
++}
++
++////////////////////////
++
++KFDTabWidget::KFDTabWidget(QWidget *parent, const char *name)
++ : KFormDesigner::TabWidget(parent, name)
++{
++}
++
++KFDTabWidget::~KFDTabWidget()
++{
++}
++
+ QSize
+ KFDTabWidget::sizeHint() const
+ {
+@@ -105,7 +134,22 @@
+ return s + QSize(10/*margin*/, tabBar()->height() + 20/*margin*/);
+ }
+
++void KFDTabWidget::dragMoveEvent( QDragMoveEvent *e )
++{
++ TabWidgetBase::dragMoveEvent( e );
++ if (dynamic_cast<ContainerWidget*>(currentPage()))
++ emit dynamic_cast<ContainerWidget*>(currentPage())->handleDragMoveEvent(e);
++ emit handleDragMoveEvent(e);
++}
+
++void KFDTabWidget::dropEvent( QDropEvent *e )
++{
++ TabWidgetBase::dropEvent( e );
++ if (dynamic_cast<ContainerWidget*>(currentPage()))
++ emit dynamic_cast<ContainerWidget*>(currentPage())->handleDropEvent(e);
++ emit handleDropEvent(e);
++}
++
+ /// Various layout widgets /////////////////:
+
+ HBox::HBox(QWidget *parent, const char *name)
+@@ -204,8 +248,9 @@
+ /*!numberSuffixRequired*/false);
+ }
+
+- QWidget *page = new QWidget(parent, m_name.latin1());
+- new KFormDesigner::Container(container, page, parent);
++ QWidget *page = container->form()->library()->createWidget("QWidget", parent, m_name.latin1(), container);
++// QWidget *page = new ContainerWidget(parent, m_name.latin1());
++// new KFormDesigner::Container(container, page, parent);
+
+ QCString classname = parent->className();
+ if(classname == "KFDTabWidget")
+@@ -291,7 +336,7 @@
+ // we create the container widget
+ delete m_widget;
+ m_widget = new QWidget(viewport(), "subform_widget");
+- m_widget->show();
++// m_widget->show();
+ addChild(m_widget);
+ m_form = new KFormDesigner::Form(
+ KFormDesigner::FormManager::self()->activeForm()->library(), this->name());
+@@ -340,6 +385,7 @@
+ KFormDesigner::WidgetInfo *wWidget = new KFormDesigner::WidgetInfo(this);
+ wWidget->setPixmap("frame");
+ wWidget->setClassName("QWidget");
++ wWidget->addAlternateClassName("ContainerWidget");
+ wWidget->setName(i18n("Basic container"));
+ wWidget->setNamePrefix(
+ i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "container"));
+@@ -349,6 +395,7 @@
+ KFormDesigner::WidgetInfo *wGroupBox = new KFormDesigner::WidgetInfo(this);
+ wGroupBox->setPixmap("groupbox");
+ wGroupBox->setClassName("QGroupBox");
++ wGroupBox->addAlternateClassName("GroupBox");
+ wGroupBox->setName(i18n("Group Box"));
+ wGroupBox->setNamePrefix(
+ i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "groupBox"));
+@@ -470,7 +517,6 @@
+ }
+ else if(c == "KFDTabWidget")
+ {
+- //MyTabWidget *tab = new MyTabWidget(p, n, container);
+ KFDTabWidget *tab = new KFDTabWidget(p, n);
+ #if defined(USE_KTabWidget) && KDE_VERSION >= KDE_MAKE_VERSION(3,1,9)
+ tab->setTabReorderingEnabled(true);
+@@ -492,16 +538,16 @@
+
+ return tab;
+ }
+- else if(c == "QWidget")
++ else if(c == "QWidget" || c=="ContainerWidget")
+ {
+- QWidget *w = new QWidget(p, n);
++ QWidget *w = new ContainerWidget(p, n);
+ new KFormDesigner::Container(container, w, p);
+ return w;
+ }
+- else if(c == "QGroupBox")
++ else if(c == "QGroupBox" || c == "GroupBox")
+ {
+ QString text = container->form()->library()->textForWidgetName(n, c);
+- QGroupBox *w = new QGroupBox(/*i18n("Group Box")*/text, p, n);
++ QGroupBox *w = new GroupBox(text, p, n);
+ new KFormDesigner::Container(container, w, container);
+ return w;
+ }
+@@ -663,7 +709,7 @@
+ createEditor(classname, group->title(), group, container, r, Qt::AlignAuto);
+ return true;
+ }
+- if(classname == "QGroupBox")
++ if(classname == "QGroupBox" || classname == "GroupBox")
+ {
+ QGroupBox *group = static_cast<QGroupBox*>(w);
+ QRect r = QRect(group->x()+2, group->y()-5, group->width()-10, w->fontMetrics().height() + 10);
+@@ -738,7 +784,7 @@
+ {
+ return property == "name" || property == "geometry";
+ }
+- else if (classname == "QGroupBox") {
++ else if (classname == "QGroupBox" || classname=="GroupBox") {
+ ok =
+ #ifdef KEXI_NO_UNFINISHED
+ /*! @todo Hidden for now in Kexi. "checkable" and "checked" props need adding
+--- kexi/formeditor/factories/kformdesigner_containers.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/formeditor/factories/kformdesigner_containers.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -18,6 +18,7 @@
+ Name[fr]=Conteneur d'éléments graphiques
+ Name[gl]=Elementos Contedores
+ Name[he]=כלי קיבול
++Name[hr]=Sadržajni widgeti
+ Name[hu]=Tartóelemek
+ Name[is]=Geymihlutir
+ Name[it]=Oggetti contenitori
+@@ -27,6 +28,7 @@
+ Name[ms]=Widget Bekas
+ Name[nb]=Beholder-elementer
+ Name[nds]=Gelaatselementen
++Name[ne]=कन्टेनर विजेट
+ Name[nl]=Containerwidgets
+ Name[nn]=Kjeraldelement
+ Name[pl]=Kontrolki pojemników
+--- kexi/formeditor/utils.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/formeditor/utils.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,6 @@
+ /* This file is part of the KDE project
+ Copyright (C) 2004 Cedric Pasteur <cedric.pasteur at free.fr>
++ Copyright (C) 2007 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
+@@ -21,52 +22,70 @@
+ #define FORMEDITORUTILS_H
+
+ #include <qptrlist.h>
+-#include <qwidget.h>
++#include <qtabbar.h>
++#include <qtabwidget.h>
+
++//! @todo replace QTabWidget by KTabWidget after the bug with & is fixed:
++#define TabWidgetBase QTabWidget
++//#define USE_KTabWidget //todo: uncomment
++
+ namespace KFormDesigner {
+
+ class Form;
+
++/*! \return parent object of \a o that inherits \a className or NULL if no such parent
++ If the parent is found, \a prevPrev is set to a child of child of the parent,
++ what for TabWidget means the page widget. */
++template<class type>
++type* findParent(QObject* o, const char* className, QObject* &prevPrev)
++{
++ if (!o || !className || className[0]=='\0')
++ return 0;
++ QObject *prev = o;
++ while ( ((o=o->parent())) && !o->inherits(className) ) {
++ prevPrev = prev;
++ prev = o;
++ }
++ return static_cast<type*>(o);
++}
++
++//! A tab widget providing information about height of the tab bar.
++class KFORMEDITOR_EXPORT TabWidget : public TabWidgetBase
++{
++ Q_OBJECT
++ public:
++ TabWidget(QWidget *parent, const char *name)
++ : TabWidgetBase(parent, name) {}
++ virtual ~TabWidget() {}
++ int tabBarHeight() const { return tabBar()->height(); }
++};
++
+ //! @short A list of widget pointers.
+ typedef QPtrList<QWidget> WidgetList;
+
+ //! @short An iterator for WidgetList.
+ typedef QPtrListIterator<QWidget> WidgetListIterator;
+
+-//! Helper classes for sorting widgets horizontally
++//! @short A helper for sorting widgets horizontally
+ class HorWidgetList : public WidgetList
+ {
+ public:
+- HorWidgetList() {;}
+- virtual int compareItems(QPtrCollection::Item item1, QPtrCollection::Item item2)
+- {
+- QWidget *w1 = static_cast<QWidget*>(item1);
+- QWidget *w2 = static_cast<QWidget*>(item2);
+-
+- if(w1->x() < w2->x())
+- return -1;
+- if(w1->x() > w2->x())
+- return 1;
+- return 0; // item1 == item2
+- }
++ HorWidgetList(QWidget *topLevelWidget);
++ virtual ~HorWidgetList();
++ protected:
++ virtual int compareItems(QPtrCollection::Item item1, QPtrCollection::Item item2);
++ QWidget *m_topLevelWidget;
+ };
+
+-//! Helper classes for sorting widgets vertically
++//! @short A helper for sorting widgets vertically
+ class VerWidgetList : public WidgetList
+ {
+ public:
+- VerWidgetList() {;}
+- virtual int compareItems(QPtrCollection::Item item1, QPtrCollection::Item item2)
+- {
+- QWidget *w1 = static_cast<QWidget*>(item1);
+- QWidget *w2 = static_cast<QWidget*>(item2);
+-
+- if(w1->y() < w2->y())
+- return -10;
+- if(w1->y() > w2->y())
+- return 1;
+- return 0; // item1 == item2
+- }
++ VerWidgetList(QWidget *topLevelWidget);
++ virtual ~VerWidgetList();
++ protected:
++ virtual int compareItems(QPtrCollection::Item item1, QPtrCollection::Item item2);
++ QWidget *m_topLevelWidget;
+ };
+
+ /*! This function is used to remove all the child widgets from a list, and
+--- kexi/formeditor/kdevelop_plugin/kformdesigner_kdev_part.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/formeditor/kdevelop_plugin/kformdesigner_kdev_part.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -7,7 +7,7 @@
+ Name[da]=Form Designer KDEvelop-plugin
+ Name[de]=KDevelop-Plugin zum Formularentwurf
+ Name[el]=Πρόσθετο σχεδίασης φόρμας του KDevelop
+-Name[es]=Extensión de diseñador de formularios de KDeevelop
++Name[es]=Extensión de diseñador de formularios de KDevelop
+ Name[et]=Vormikujundaja KDevelopi plugin
+ Name[eu]=Formularioak diseinatzeko KDevelop-en plugina
+ Name[fa]=وصلۀ KDevelop طراح برگه
+@@ -15,6 +15,7 @@
+ Name[fr]=Module externe KDevelop de composition d'interfaces graphiques
+ Name[gl]=Plugin de Deseño de Formularios para Kdevelop
+ Name[he]=תוסף מעצב טפסים ל־KDevelop
++Name[hr]=KDevelop dodatak dizajnera obrazaca
+ Name[hu]=Űrlaptervező modul a KDevelophoz
+ Name[is]=Form hönnunar KDevelop íforrit
+ Name[it]=Plugin di KDevelop per il progetto dei moduli
+@@ -24,6 +25,7 @@
+ Name[ms]=Plugin KDevelop Pereka Bentuk Borang
+ Name[nb]=KDevelop-tillegg for skjemautforming
+ Name[nds]=KDevelop-Moduul för't Opstellen vun Kiekwarken
++Name[ne]=फारम डिजाइनकर्ता केडीई विकास प्लगइन
+ Name[nl]=KDevelop-plugin FormDesigner
+ Name[nn]=KDevelop-tillegg for skjemautforming
+ Name[pl]=Wtyczka projektanta formularzy dla KDevelop
+--- kexi/formeditor/form.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/formeditor/form.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,7 +1,7 @@
+ /* This file is part of the KDE project
+ Copyright (C) 2003 Lucijan Busch <lucijan at gmx.at>
+ Copyright (C) 2004 Cedric Pasteur <cedric.pasteur at free.fr>
+- Copyright (C) 2004-2005 Jaroslaw Staniek <js at iidea.pl>
++ Copyright (C) 2004-2007 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
+@@ -272,7 +272,7 @@
+ void updateTabStopsOrder();
+
+ /*! Adds the widget at the end of tabstops list. Called on widget creation. */
+- void addWidgetToTabStops(ObjectTreeItem *c);
++ void addWidgetToTabStops(ObjectTreeItem *it);
+
+ /*! \return True if the Form automatically handles tab stops. */
+ bool autoTabStops() const { return d->autoTabstops; }
+@@ -285,7 +285,10 @@
+ void setAutoTabStops(bool autoTab) { d->autoTabstops = autoTab;}
+
+ /*! Tells the Form to reassign the tab stops because the widget layout has changed
+- (called for example before saving or displaying the tab order dialog) */
++ (called for example before saving or displaying the tab order dialog).
++ Automatically sorts widget from the top-left to bottom-right corner.
++ Widget can be grouped with containers. In paticular, for tab widgets,
++ child widgets should ordered by parent tab's order. */
+ void autoAssignTabStops();
+
+ #ifdef KEXI_DEBUG_GUI
+--- kexi/formeditor/widgetlibrary.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/formeditor/widgetlibrary.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,7 +1,7 @@
+ /* This file is part of the KDE project
+ Copyright (C) 2003 Lucijan Busch <lucijan at gmx.at>
+ Copyright (C) 2004 Cedric Pasteur <cedric.pasteur at free.fr>
+- Copyright (C) 2004-2006 Jaroslaw Staniek <js at iidea.pl>
++ Copyright (C) 2004-2007 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
+@@ -20,6 +20,7 @@
+ */
+
+ #include <qdom.h>
++#include <qstrlist.h>
+
+ #include <kdebug.h>
+ #include <klocale.h>
+@@ -372,8 +373,11 @@
+ if (wclass->inheritedClass())
+ widget = wclass->inheritedClass()->factory()->createWidget(
+ wclass->className(), parent, name, c, options);
++ if (!widget)
++ return 0;
+ }
+ widget->setAcceptDrops(true);
++ emit widgetCreated(widget);
+ return widget;
+ }
+
+--- kexi/formeditor/container.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/formeditor/container.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -603,13 +603,13 @@
+ case HBox:
+ {
+ m_layout = (QLayout*) new QHBoxLayout(m_container, m_margin, m_spacing);
+- createBoxLayout(new HorWidgetList());
++ createBoxLayout(new HorWidgetList(m_form->toplevelContainer()->widget()));
+ break;
+ }
+ case VBox:
+ {
+ m_layout = (QLayout*) new QVBoxLayout(m_container, m_margin, m_spacing);
+- createBoxLayout(new VerWidgetList());
++ createBoxLayout(new VerWidgetList(m_form->toplevelContainer()->widget()));
+ break;
+ }
+ case Grid:
+@@ -675,12 +675,12 @@
+ const int offset = 15;
+ WidgetList *list=0, *list2=0;
+ if(flow->orientation() == Horizontal) {
+- list = new VerWidgetList();
+- list2 = new HorWidgetList();
++ list = new VerWidgetList(m_form->toplevelContainer()->widget());
++ list2 = new HorWidgetList(m_form->toplevelContainer()->widget());
+ }
+ else {
+- list = new HorWidgetList();
+- list2 = new VerWidgetList();
++ list = new HorWidgetList(m_form->toplevelContainer()->widget());
++ list2 = new VerWidgetList(m_form->toplevelContainer()->widget());
+ }
+
+ // fill the list
+@@ -733,8 +733,8 @@
+ Container::createGridLayout(bool testOnly)
+ {
+ //Those lists sort widgets by y and x
+- VerWidgetList *vlist = new VerWidgetList();
+- HorWidgetList *hlist = new HorWidgetList();
++ VerWidgetList *vlist = new VerWidgetList(m_form->toplevelContainer()->widget());
++ HorWidgetList *hlist = new HorWidgetList(m_form->toplevelContainer()->widget());
+ // The vector are used to store the x (or y) beginning of each column (or row)
+ QValueVector<int> cols;
+ QValueVector<int> rows;
+--- kexi/formeditor/objecttree.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/formeditor/objecttree.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -78,7 +78,7 @@
+ The QVariant is the old value (ie first value) of the property whose name is the QString. */
+ const QVariantMap* modifiedProperties() const { return &m_props;}
+
+- //! \return the widget's Container, or 0if the widget is not a Container.
++ //! \return the widget's Container, or 0 if the widget is not a Container.
+ Container* container() const { return m_container;}
+
+ void setWidget(QWidget *w) { m_widget = w; }
+--- kexi/formeditor/formIO.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/formeditor/formIO.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1047,11 +1047,11 @@
+ // as we don't save geometry, we need to sort widgets in the right order, not creation order
+ WidgetList *list;
+ if(layout.tagName() == "hbox") {
+- list = new HorWidgetList();
++ list = new HorWidgetList(item->container()->form()->toplevelContainer()->widget());
+ layout.setTagName("hbox");
+ }
+ else {
+- list = new VerWidgetList();
++ list = new VerWidgetList(item->container()->form()->toplevelContainer()->widget());
+ layout.setTagName("vbox");
+ }
+
+--- kexi/formeditor/test/kformdesigner.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/formeditor/test/kformdesigner.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,6 +4,7 @@
+ Name[cs]=Návrhář formulářů
+ Name[cy]=DylunyddKForm
+ Name[fa]=طراح KForm
++Name[ne]=केडीई फाराम डिजाइनकर्ता
+ Name[sv]=Kformdesigner
+ Name[ta]=படிவம் வடிவமைப்பவர்
+ Name[tg]=KДизайнгари шакл
+@@ -14,6 +15,7 @@
+ Type=Application
+ DocPath=kformdesigner/kformdesigner.html
+ GenericName=Form Designer
++GenericName[bg]=Проектиране на форми
+ GenericName[ca]=Dissenyador de formulari
+ GenericName[cy]=Dylunydd Ffurflenni
+ GenericName[de]=Formular-Designer
+@@ -26,6 +28,7 @@
+ GenericName[fr]=Concepteur d'interfaces graphiques
+ GenericName[gl]=Deseño de Formularios
+ GenericName[he]=מעצב טפסים
++GenericName[hr]=Dizajner obrazaca
+ GenericName[hu]=Űrlaptervező
+ GenericName[is]=Form hönnuður
+ GenericName[it]=Progetto dei moduli
+@@ -35,6 +38,7 @@
+ GenericName[ms]=Pereka Bentuk Borang
+ GenericName[nb]=Skjemautforming
+ GenericName[nds]=Kiekwark-Maker
++GenericName[ne]=फारम डिजाइनकर्ता
+ GenericName[nn]=Skjemautforming
+ GenericName[pl]=Projektant formularzy
+ GenericName[pt]=Desenho de Formulários
+--- kexi/formeditor/test/kformdesigner_part.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/formeditor/test/kformdesigner_part.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -16,15 +16,18 @@
+ Name[fr]=Composeur d'interfaces graphiques
+ Name[gl]=Deseño de Formularios
+ Name[he]=מעצב טפסים
++Name[hr]=Dizajner obrazaca
+ Name[hu]=Űrlaptervező
+ Name[is]=Form hönnuður
+ Name[it]=Progetto dei moduli
+ Name[ja]=フォームデザイナー
+ Name[km]=កម្មវិធីរចនាសំណុំបែបបទ
++Name[lt]=Formų kūrimo programa
+ Name[lv]=Formu veidotājs
+ Name[ms]=Pereka Bentuk Borang
+ Name[nb]=Skjemautforming
+ Name[nds]=Kiekwark-Maker
++Name[ne]=फारम डिजाइनकर्ता
+ Name[nn]=Skjemautforming
+ Name[pl]=Projektant formularzy
+ Name[pt]=Desenho de Formulários
+--- kexi/formeditor/utils.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/formeditor/utils.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,6 @@
+ /* This file is part of the KDE project
+ Copyright (C) 2004 Cedric Pasteur <cedric.pasteur at free.fr>
++ Copyright (C) 2007 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
+@@ -19,7 +20,11 @@
+
+ #include <qcursor.h>
+ #include <qobjectlist.h>
++#include <qtabwidget.h>
++#include <qtabbar.h>
++
+ #include <kdebug.h>
++#include <kexiutils/utils.h>
+
+ #include "form.h"
+ #include "objecttree.h"
+@@ -27,7 +32,6 @@
+
+ using namespace KFormDesigner;
+
+-/// Helper function to clear a list (by removing all children)
+ void
+ KFormDesigner::removeChildrenFromList(WidgetList &list)
+ {
+@@ -46,7 +50,6 @@
+ }
+ }
+
+-//// Helper functions for event filtering on composed widgets
+ void
+ KFormDesigner::installRecursiveEventFilter(QObject *object, QObject *container)
+ {
+@@ -113,3 +116,69 @@
+ return QSize(tmpw, tmph) + QSize(10, 10);
+ }
+
++// -----------------
++
++HorWidgetList::HorWidgetList(QWidget *topLevelWidget)
++ : WidgetList()
++ , m_topLevelWidget(topLevelWidget)
++{
++}
++
++HorWidgetList::~HorWidgetList()
++{
++}
++
++int HorWidgetList::compareItems(QPtrCollection::Item item1, QPtrCollection::Item item2)
++{
++ QWidget *w1 = static_cast<QWidget*>(item1);
++ QWidget *w2 = static_cast<QWidget*>(item2);
++ return w1->mapTo(m_topLevelWidget, QPoint(0,0)).x() - w2->mapTo(m_topLevelWidget, QPoint(0,0)).x();
++}
++
++// -----------------
++
++VerWidgetList::VerWidgetList(QWidget *topLevelWidget)
++ : WidgetList()
++ , m_topLevelWidget(topLevelWidget)
++{
++}
++
++VerWidgetList::~VerWidgetList()
++{
++}
++
++int VerWidgetList::compareItems(QPtrCollection::Item item1, QPtrCollection::Item item2)
++{
++ QWidget *w1 = static_cast<QWidget*>(item1);
++ QWidget *w2 = static_cast<QWidget*>(item2);
++
++ int y1, y2;
++ QObject *page1 = 0;
++ TabWidget *tw1 = KFormDesigner::findParent<KFormDesigner::TabWidget>(w1, "KFormDesigner::TabWidget", page1);
++ if (tw1) // special case
++ y1 = w1->mapTo(m_topLevelWidget, QPoint(0,0)).y() + tw1->tabBarHeight() -2 -2;
++ else
++ y1 = w1->mapTo(m_topLevelWidget, QPoint(0,0)).y();
++
++ QObject *page2 = 0;
++ TabWidget *tw2 = KFormDesigner::findParent<KFormDesigner::TabWidget>(w2, "KFormDesigner::TabWidget", page2);
++ if (tw1 && tw2 && tw1 == tw2 && page1 != page2) {
++ // this sorts widgets by tabs there're put in
++ return tw1->indexOf(static_cast<QWidget*>(page1)) - tw2->indexOf(static_cast<QWidget*>(page2));
++ }
++
++ if (tw2) // special case
++ y2 = w2->mapTo(m_topLevelWidget, QPoint(0,0)).y() + tw2->tabBarHeight() -2 -2;
++ else
++ y2 = w2->mapTo(m_topLevelWidget, QPoint(0,0)).y();
++
++ kdDebug() << w1->name() << ": " << y1 << " "
++ << " | " << w2->name() << ": " << y2 << endl;
++
++
++ //kdDebug() << w1->name() << ": " << w1->mapTo(m_topLevelWidget, QPoint(0,0)) << " " << w1->y()
++ //<< " | " << w2->name() << ":" /*<< w2->mapFrom(m_topLevelWidget, QPoint(0,w2->y()))*/ << " " << w2->y() << endl;
++ return y1 - y2;
++}
++
++#include "utils.moc"
+--- kexi/formeditor/commands.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/formeditor/commands.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -856,11 +856,11 @@
+ case Container::Grid:
+ case Container::HSplitter:
+ case Container::HFlow:
+- m_list = new HorWidgetList(); break;
++ m_list = new HorWidgetList(form->toplevelContainer()->widget()); break;
+ case Container::VBox:
+ case Container::VSplitter:
+ case Container::VFlow:
+- m_list = new VerWidgetList(); break;
++ m_list = new VerWidgetList(form->toplevelContainer()->widget()); break;
+ }
+ for(QWidget *w = list.first(); w; w = list.next())
+ m_list->append(w);
+--- kexi/formeditor/widgetfactory.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/formeditor/widgetfactory.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -25,6 +25,7 @@
+ Comment[ms]=Pangkalan Kilang Widget
+ Comment[nb]=Base for elementfabrikk
+ Comment[nds]=Basis för't Opstellen vun Stüerelementen
++Comment[ne]=विजेट फ्याक्ट्री आधार
+ Comment[nn]=Base for elementfabrikk
+ Comment[pl]=Podstawowa fabryka kontrolek
+ Comment[pt]=Fábrica de Elementos
+--- kexi/formeditor/form.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/formeditor/form.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,7 +1,7 @@
+ /* This file is part of the KDE project
+ Copyright (C) 2003 Lucijan Busch <lucijan at gmx.at>
+ Copyright (C) 2004 Cedric Pasteur <cedric.pasteur at free.fr>
+- Copyright (C) 2004-2005 Jaroslaw Staniek <js at iidea.pl>
++ Copyright (C) 2004-2007 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
+@@ -22,6 +22,7 @@
+ #include <qwidget.h>
+ #include <qlabel.h>
+ #include <qobjectlist.h>
++#include <qptrdict.h>
+
+ #include <kdebug.h>
+ #include <klocale.h>
+@@ -39,10 +40,10 @@
+ #include "pixmapcollection.h"
+ #include "events.h"
+ #include "utils.h"
++#include "form.h"
+ #include <koproperty/property.h>
++#include <kexiutils/utils.h>
+
+-#include "form.h"
+-
+ using namespace KFormDesigner;
+
+ FormPrivate::FormPrivate()
+@@ -451,32 +452,27 @@
+ /////////////////////////// Tab stops ////////////////////////
+
+ void
+-Form::addWidgetToTabStops(ObjectTreeItem *c)
++Form::addWidgetToTabStops(ObjectTreeItem *it)
+ {
+- QWidget *w = c->widget();
++ QWidget *w = it->widget();
+ if(!w)
+ return;
+ if(!(w->focusPolicy() & QWidget::TabFocus))
+ {
+- if(!w->children())
++ if (!w->children())
+ return;
+-
+ // For composed widgets, we check if one of the child can have focus
+- QObjectList list = *(w->children());
+- for(QObject *obj = list.first(); obj; obj = list.next())
+- {
+-// if(obj->isWidgetType() && (((QWidget*)obj)->focusPolicy() != QWidget::NoFocus)) {
+-// if(obj->isWidgetType() && (((QWidget*)obj)->focusPolicy() & QWidget::TabFocus)) {
+- if(obj->isWidgetType()) {//QWidget::TabFocus flag will be checked later!
+- if(d->tabstops.findRef(c) == -1) {
+- d->tabstops.append(c);
++ for(QObjectListIterator chIt(*w->children()); chIt.current(); ++chIt) {
++ if(chIt.current()->isWidgetType()) {//QWidget::TabFocus flag will be checked later!
++ if(d->tabstops.findRef(it) == -1) {
++ d->tabstops.append(it);
+ return;
+ }
+ }
+ }
+ }
+- else if(d->tabstops.findRef(c) == -1) // not yet in the list
+- d->tabstops.append(c);
++ else if(d->tabstops.findRef(it) == -1) // not yet in the list
++ d->tabstops.append(it);
+ }
+
+ void
+@@ -492,32 +488,70 @@
+ }
+ }
+
++//! Collects all the containers reculsively. Used by Form::autoAssignTabStops().
++void collectContainers(ObjectTreeItem* item, QPtrDict<char>& containers)
++{
++ if (!item->container())
++ return;
++ if (!containers[ item->container() ]) {
++ kdDebug() << "collectContainers() " << item->container()->objectTree()->className()
++ << " " << item->container()->objectTree()->name() << endl;
++ containers.insert( item->container(), (const char *)1 );
++ }
++ for (ObjectTreeListIterator it(*item->children()); it.current(); ++it)
++ collectContainers(it.current(), containers);
++}
++
+ void
+ Form::autoAssignTabStops()
+ {
+- VerWidgetList list;
+- HorWidgetList hlist;
++ VerWidgetList list(toplevelContainer()->widget());
++ HorWidgetList hlist(toplevelContainer()->widget());
+
++ // 1. Collect all the containers, as we'll be sorting widgets groupped by containers
++ QPtrDict<char> containers;
++
++ collectContainers( toplevelContainer()->objectTree(), containers );
++
+ foreach_list(ObjectTreeListIterator, it, d->tabstops) {
+- if(it.current()->widget())
++ if(it.current()->widget()) {
++ kdDebug() << "Form::autoAssignTabStops() widget to sort: " << it.current()->widget() << endl;
+ list.append(it.current()->widget());
++ }
+ }
+
+ list.sort();
++ foreach_list(QPtrListIterator<QWidget>, iter, list)
++ kdDebug() << iter.current()->className() << " " << iter.current()->name() << endl;
++
+ d->tabstops.clear();
+
+ /// We automatically sort widget from the top-left to bottom-right corner
+- //! \todo Handle RTL layout (ie form top-right to bottom-left)
++ //! \todo Handle RTL layout (ie from top-right to bottom-left)
+ foreach_list(WidgetListIterator, it, list) {
+-// for(WidgetListIterator it(list); it.current() != 0; ++it)
+ QWidget *w = it.current();
+ hlist.append(w);
+
+ ++it;
+ QWidget *nextw = it.current();
+- while(nextw && (nextw->y() < (w->y() + 20))) {
++ QObject *page_w = 0;
++ KFormDesigner::TabWidget *tab_w = KFormDesigner::findParent<KFormDesigner::TabWidget>(w, "KFormDesigner::TabWidget", page_w);
++ while (nextw) {
++ if (KexiUtils::hasParent(w, nextw)) // do not group (sort) widgets where on is a child of another
++ break;
++ if (nextw->y() >= (w->y() + 20))
++ break;
++ if (tab_w) {
++ QObject *page_nextw = 0;
++ KFormDesigner::TabWidget *tab_nextw = KFormDesigner::findParent<KFormDesigner::TabWidget>(nextw, "KFormDesigner::TabWidget", page_nextw);
++ if (tab_w == tab_nextw) {
++ if (page_w != page_nextw) // 'nextw' widget within different tab page
++ break;
++ }
++ }
+ hlist.append(nextw);
+- ++it; nextw = it.current();
++ ++it;
++ nextw = it.current();
+ }
+ hlist.sort();
+
+--- kexi/formeditor/widgetlibrary.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/formeditor/widgetlibrary.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,7 +1,7 @@
+ /* This file is part of the KDE project
+ Copyright (C) 2003 Lucijan Busch <lucijan at gmx.at>
+ Copyright (C) 2004 Cedric Pasteur <cedric.pasteur at free.fr>
+- Copyright (C) 2004-2006 Jaroslaw Staniek <js at iidea.pl>
++ Copyright (C) 2004-2007 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
+@@ -173,6 +173,10 @@
+ signals:
+ void prepareInsert(const QCString &c);
+
++ //! Received by KexiFormPart::slotWidgetCreatedByFormsLibrary() so we can add drag/drop
++ //! connection for the new widget
++ void widgetCreated(QWidget *widget);
++
+ protected:
+ /**
+ * Adds a factory to the library, creates actions for widgets in the added factory.
+--- kexi/Makefile.global (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/Makefile.global (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -23,7 +23,7 @@
+ # temp: turn off advanced alter table
+ ##KDE_CXXFLAGS += -DKEXI_NO_UNDOREDO_ALTERTABLE
+
+-KDE_CXXFLAGS += -DKEXI_NO_CTXT_HELP -DKEXI_NO_SUBFORM -DKEXI_DB_COMBOBOX_WIDGET
++KDE_CXXFLAGS += -DKEXI_NO_CTXT_HELP -DKEXI_NO_SUBFORM -DKEXI_DB_COMBOBOX_WIDGET -DDB_TEMPLATES
+
+ # TODO: undefine this before release!
+ KDE_CXXFLAGS += -DKEXI_DEBUG_GUI
+--- kexi/examples/build_kexi_file.sh (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kexi/examples/build_kexi_file.sh (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -8,8 +8,10 @@
+ # ksqlite is needed on the $PATH.
+
+ KEXISQL3PATH=../3rdparty/kexisql3/src/.libs/
+-PATH=$PATH:$KEXISQL3PATH
+-LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH
++PATH=$KEXISQL3PATH:$PATH
++export PATH
++LD_LIBRARY_PATH=$KEXISQL3PATH:$LD_LIBRARY_PATH
++export LD_LIBRARY_PATH
+ which ksqlite > /dev/null || exit 1
+
+ [ $# -lt 1 ] && echo "Missing .sql filename." && exit 1
+--- tools/spell/kspelltool.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ tools/spell/kspelltool.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -39,6 +39,7 @@
+ Name[mt]=Għodda Spell Checker
+ Name[nb]=Stavekontrollverktøy
+ Name[nds]=Klookschriever
++Name[ne]=हिज्जे परीक्षक उपकरण
+ Name[nl]=Spellingcontrole
+ Name[nn]=Stavekontrollverktøy
+ Name[pl]=Narzędzie sprawdzania pisowni
+@@ -70,9 +71,9 @@
+ Comment=Check this Word's Spelling
+ Comment[af]=Bevestig hierdie Woord se Spelling
+ Comment[ar]=التَّدقيق في إملاء هذه الكلمة
+-Comment[bg]=Проверка на правописа на думата
++Comment[bg]=Проверка на правописа
+ Comment[bs]=Provjeri pravopis ove riječi
+-Comment[ca]=Comprova la ortografia d'aquesta paraula
++Comment[ca]=Comprova l'ortografia d'aquesta paraula
+ Comment[cs]=Zkontrolovat pravopis tohoto slova
+ Comment[cy]=Cywiro Sillafu'r Gair Yma
+ Comment[da]=Kontrollér dette ords stavning
+@@ -101,6 +102,7 @@
+ Comment[mt]=Iċċekkja kif tispelli dil-kelma
+ Comment[nb]=Sjekk stavingen av dette ordet
+ Comment[nds]=Dit Woort op Schrieffehlers kuntrulleren
++Comment[ne]=यो शब्दको हिज्जे जाँच गर्नुहोस्
+ Comment[nl]=Controleer de spelling van dit woord
+ Comment[nn]=Sjekk stavinga av dette ordet
+ Comment[pl]=Sprawdź poprawność pisowni tego słowa
+--- tools/thesaurus/thesaurustool.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ tools/thesaurus/thesaurustool.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -37,6 +37,7 @@
+ Name[mt]=Teżawru
+ Name[nb]=Synonymordbok
+ Name[nds]=Thesaurus-Warktüüch
++Name[ne]=पर्यायकोश उपकरण
+ Name[nl]=Thesaurus hulpprogramma
+ Name[nn]=Synonymordbok
+ Name[pl]=Thesaurus
+@@ -94,6 +95,7 @@
+ Comment[mt]=Uri kliem relatati
+ Comment[nb]=Vis ord som ligner
+ Comment[nds]=Tohören Wöör wiesen
++Comment[ne]=सम्बन्धित शब्दहरू देखाउनुहोस्
+ Comment[nl]=Toon gerelateerde woorden
+ Comment[nn]=Vis nærskylde ord
+ Comment[pl]=Pokaż wyrazy pokrewne
+--- tools/thumbnail/kofficethumbnail.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ tools/thumbnail/kofficethumbnail.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -38,6 +38,7 @@
+ Name[mt]=Fajls tal-KOffice
+ Name[nb]=KOffice-filer
+ Name[nds]=KOffice-Dateien
++Name[ne]=केडीई कार्यालय फाइल
+ Name[nl]=KOffice-bestanden
+ Name[nn]=KOffice-filer
+ Name[pa]=KOffice ਫਾਇਲਾਂ
+--- tools/thumbnail/otherofficethumbnail.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ tools/thumbnail/otherofficethumbnail.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -37,6 +37,7 @@
+ Name[mt]=Fajls oħra tal-programmi KOffice
+ Name[nb]=Andre Office-filer
+ Name[nds]=Anner Kontoor-Dateien
++Name[ne]=अन्य कार्यालय फाइल
+ Name[nl]=Overige office-bestanden
+ Name[nn]=Andre Office-filer
+ Name[pa]=ਹੋਰ ਦਫਤਰੀ ਫਾਇਲਾਂ
+--- tools/thumbnail/clipartthumbnail.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ tools/thumbnail/clipartthumbnail.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -24,6 +24,7 @@
+ Name[lv]=Daiļrade
+ Name[ms]=Lukisan Klip
+ Name[nb]=Bildesamling
++Name[ne]=क्लिपआर्ट
+ Name[nn]=Utklippsbilete
+ Name[pl]=Klipart
+ Name[pt]=Gravuras
+--- tools/kfile-plugins/koffice/kfile_koffice.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ tools/kfile-plugins/koffice/kfile_koffice.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -12,7 +12,7 @@
+ Name[da]=KOffice-information
+ Name[el]=Πληροφορίες KOffice
+ Name[eo]=Oficejo informo
+-Name[es]=Info de KOffice
++Name[es]=Información de KOffice
+ Name[et]=KOffice'i info
+ Name[eu]=KOffice-en informazioa
+ Name[fa]=اطلاعات KOffice
+@@ -34,6 +34,7 @@
+ Name[mt]=Info. KOffice
+ Name[nb]=KOffice-info
+ Name[nds]=KOffice-Info
++Name[ne]=केडीई कार्यालय सूचना
+ Name[nl]=Koffice-info
+ Name[nn]=KOffice-info
+ Name[pa]=KOffice ਜਾਣਕਾਰੀ
+--- tools/kfile-plugins/abiword/kfile_abiword.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ tools/kfile-plugins/abiword/kfile_abiword.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,12 +2,13 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=Abiword Info
++Name[bg]=Информация за Abiword
+ Name[br]=Titouroù Abiword
+ Name[ca]=Informació Abiword
+ Name[cy]=Gwybodaeth Abiword
+ Name[da]=Abiword-info
+ Name[el]=Πληροφορίες Abiword
+-Name[es]=Info de Abiword
++Name[es]=Información de Abiword
+ Name[et]=Abiword'i info
+ Name[fa]=اطلاعات Abiword
+ Name[fi]=Abiword-tiedot
+@@ -23,6 +24,7 @@
+ Name[lv]=Abiword informācija
+ Name[nb]=Abiword-info
+ Name[nds]=Abiword-Info
++Name[ne]=एबीआई वर्ड सूचना
+ Name[nl]=Abiword-info
+ Name[pl]=Informacje o Abiword
+ Name[pt]=Informação do Abiword
+--- tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,12 +2,13 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=Gnumeric Info
++Name[bg]=Информация за Gnumeric
+ Name[br]=Titouroù Gnumeric
+ Name[ca]=Informació Gnumericc
+ Name[cy]=Gwybodaeth Gnumeric
+ Name[da]=Gnumeric info
+ Name[el]=Πληροφορίες Gnumeric
+-Name[es]=Info de Gnumeric
++Name[es]=Información de Gnumeric
+ Name[et]=Gnumeric'i info
+ Name[fa]=اطلاعات Gnumeric
+ Name[fi]=Gnumeric-tiedot
+@@ -23,6 +24,7 @@
+ Name[lv]=Gnumeric informācija
+ Name[nb]=Gnumeric-info
+ Name[nds]=Gnumeric-Info
++Name[ne]=जीन्यूमेरिक सूचना
+ Name[nl]=Gnumeric-info
+ Name[pl]=Informacje o Gnumeric
+ Name[pt]=Informação do Gnumeric
+--- tools/kfile-plugins/ooo/kfile_ooo.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ tools/kfile-plugins/ooo/kfile_ooo.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -8,7 +8,7 @@
+ Name[cs]=OpenOffice.org info
+ Name[cy]=Gwybodaeth OpenOffice.org
+ Name[el]=Πληροφορίες OpenOffice.org
+-Name[es]=Info de OpenOffice.org
++Name[es]=Información de OpenOffice.org
+ Name[et]=OpenOffice.org-i info
+ Name[eu]=OpenOffice.org-en informazioa
+ Name[fa]=اطلاعات OpenOffice.org
+@@ -27,6 +27,7 @@
+ Name[ms]=Maklumat OpenOffice.org
+ Name[nb]=OpenOffice.org-info
+ Name[nds]=OpenOffice.org-Info
++Name[ne]=ओपनअफिस डट अर्ग इन्फो
+ Name[nl]=OpenOffice.org Informatie
+ Name[nn]=OpenOffice.org-info
+ Name[pa]=OpenOffice.org ਜਾਣਕਾਰੀ
+--- tools/quickprint/kword_konqi.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ tools/quickprint/kword_konqi.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -35,6 +35,7 @@
+ Name[ms]=Cetak...
+ Name[nb]=Skriv ut ...
+ Name[nds]=Drucken...
++Name[ne]=मुद्रण गर्नुहोस्...
+ Name[nl]=Afdrukken...
+ Name[nn]=Skriv ut ...
+ Name[pa]=ਛਾਪੋ...
+--- tools/quickprint/kspread_konqi.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ tools/quickprint/kspread_konqi.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -35,6 +35,7 @@
+ Name[ms]=Cetak...
+ Name[nb]=Skriv ut ...
+ Name[nds]=Drucken...
++Name[ne]=मुद्रण गर्नुहोस्...
+ Name[nl]=Afdrukken...
+ Name[nn]=Skriv ut ...
+ Name[pa]=ਛਾਪੋ...
+--- tools/quickprint/krita_konqi.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ tools/quickprint/krita_konqi.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -35,6 +35,7 @@
+ Name[ms]=Cetak...
+ Name[nb]=Skriv ut ...
+ Name[nds]=Drucken...
++Name[ne]=मुद्रण गर्नुहोस्...
+ Name[nl]=Afdrukken...
+ Name[nn]=Skriv ut ...
+ Name[pa]=ਛਾਪੋ...
+--- tools/quickprint/karbon_konqi.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ tools/quickprint/karbon_konqi.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -35,6 +35,7 @@
+ Name[ms]=Cetak...
+ Name[nb]=Skriv ut ...
+ Name[nds]=Drucken...
++Name[ne]=मुद्रण गर्नुहोस्...
+ Name[nl]=Afdrukken...
+ Name[nn]=Skriv ut ...
+ Name[pa]=ਛਾਪੋ...
+--- tools/quickprint/kchart_konqi.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ tools/quickprint/kchart_konqi.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -35,6 +35,7 @@
+ Name[ms]=Cetak...
+ Name[nb]=Skriv ut ...
+ Name[nds]=Drucken...
++Name[ne]=मुद्रण गर्नुहोस्...
+ Name[nl]=Afdrukken...
+ Name[nn]=Skriv ut ...
+ Name[pa]=ਛਾਪੋ...
+--- tools/quickprint/kexi_konqi.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ tools/quickprint/kexi_konqi.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -35,6 +35,7 @@
+ Name[ms]=Cetak...
+ Name[nb]=Skriv ut ...
+ Name[nds]=Drucken...
++Name[ne]=मुद्रण गर्नुहोस्...
+ Name[nl]=Afdrukken...
+ Name[nn]=Skriv ut ...
+ Name[pa]=ਛਾਪੋ...
+--- tools/quickprint/kformula_konqi.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ tools/quickprint/kformula_konqi.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -35,6 +35,7 @@
+ Name[ms]=Cetak...
+ Name[nb]=Skriv ut ...
+ Name[nds]=Drucken...
++Name[ne]=मुद्रण गर्नुहोस्...
+ Name[nl]=Afdrukken...
+ Name[nn]=Skriv ut ...
+ Name[pa]=ਛਾਪੋ...
+--- tools/quickprint/kivio_konqi.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ tools/quickprint/kivio_konqi.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -35,6 +35,7 @@
+ Name[ms]=Cetak...
+ Name[nb]=Skriv ut ...
+ Name[nds]=Drucken...
++Name[ne]=मुद्रण गर्नुहोस्...
+ Name[nl]=Afdrukken...
+ Name[nn]=Skriv ut ...
+ Name[pa]=ਛਾਪੋ...
+--- tools/quickprint/kpresenter_konqi.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ tools/quickprint/kpresenter_konqi.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -35,6 +35,7 @@
+ Name[ms]=Cetak...
+ Name[nb]=Skriv ut ...
+ Name[nds]=Drucken...
++Name[ne]=मुद्रण गर्नुहोस्...
+ Name[nl]=Afdrukken...
+ Name[nn]=Skriv ut ...
+ Name[pa]=ਛਾਪੋ...
+--- tools/kthesaurus/KThesaurus.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ tools/kthesaurus/KThesaurus.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -8,6 +8,7 @@
+ Name[hr]=KTezaurus
+ Name[lo]=ວັດຈະນານຸກົມຄໍາຟ້ອງ K
+ Name[ms]=KTesaurus
++Name[ne]=केडीई पर्यायकोश
+ Name[sl]=KTezaver
+ Name[sv]=Kthesaurus
+ Name[th]=พจนานุกรมคำพ้อง K
+@@ -48,6 +49,7 @@
+ GenericName[mt]=Kliem relatati (teżawru)
+ GenericName[nb]=Beslektede ord
+ GenericName[nds]=Tohören Wöör
++GenericName[ne]=सम्बन्धित शब्दहरू
+ GenericName[nl]=Gerelateerde woorden
+ GenericName[nn]=Samanhøyrande ord
+ GenericName[pl]=Słowa pokrewne
+--- koshell/koshell.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ koshell/koshell.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -39,6 +39,7 @@
+ Name[mt]=Spazju tax-Xogħol KOffice
+ Name[nb]=KOffice-arbeidsområde
+ Name[nds]=KOffice-Arbeitrebeet
++Name[ne]=केडीई कार्यालय कार्यस्थान
+ Name[nl]=KOffice-werkplek
+ Name[nn]=KOffice-arbeidsområde
+ Name[pl]=Pracownia KOffice
+@@ -101,6 +102,7 @@
+ GenericName[mt]=Sett tal-uffiċċju
+ GenericName[nb]=Kontorpakke
+ GenericName[nds]=Kontoorprogrammen
++GenericName[ne]=कार्यालय अनुगामी
+ GenericName[nl]=Officepakket
+ GenericName[nn]=Kontorpakke
+ GenericName[nso]=Suthu ya Ofisi
+--- doc/kexi/database.docbook (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ doc/kexi/database.docbook (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -547,7 +547,7 @@
+ </para></listitem>
+ <listitem><para>
+ You are unable to acquire the methodology of database construction.
+-You may however consider either outsorcing this task to someone else
++You may however consider either outsourcing this task to someone else
+ or using simpler tools.
+ </para></listitem>
+ <listitem><para>
+--- doc/Makefile.am (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ doc/Makefile.am (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,3 +4,4 @@
+ KDE_DOCS = koffice
+ SUBDIRS = $(AUTODIRS)
+
++xdg_apps_DATA = koffice.desktop
+--- doc/koffice.desktop (.../tags/koffice/1.6.2/koffice) (revision 0)
++++ doc/koffice.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -0,0 +1,8 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=Application
++Name=KOffice
++Name[sv]=Koffice
++NoDisplay=true
++DocPath=koffice/index.html
++Categories=Qt;KDE;Office;
+--- lib/kofficecore/kodocinfopropspage.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ lib/kofficecore/kodocinfopropspage.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -38,6 +38,7 @@
+ Name[mt]=Paġna ta' Informazzjoni dwar Dokumenti KOffice
+ Name[nb]=KOffice dokumentinformasjon
+ Name[nds]=Dokmentinformatschonen-Egenschappensiet för KOffice
++Name[ne]=केडीई कार्यालय कागजात सूचना गुणहरूको पृष्ठ
+ Name[nl]=KOffice Document Info Eigenschappen Pagina
+ Name[nn]=KOffice Dokumentinformasjon
+ Name[pl]=Strona właściwości dokumentu KOffice
+--- lib/kofficecore/kofficeversion.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ lib/kofficecore/kofficeversion.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -29,10 +29,10 @@
+ // - karbon/karbon_aboutdata.h
+ //
+
+-#define KOFFICE_VERSION_STRING "1.6.2"
++#define KOFFICE_VERSION_STRING "1.6.3pre"
+ #define KOFFICE_VERSION_MAJOR 1
+ #define KOFFICE_VERSION_MINOR 6
+-#define KOFFICE_VERSION_RELEASE 2
++#define KOFFICE_VERSION_RELEASE 3
+ #define KOFFICE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
+
+ #define KOFFICE_VERSION \
+--- filters/kformula/svg/kformula_svg_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kformula/svg/kformula_svg_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -8,6 +8,7 @@
+ ImportDescription=KFormula
+ Name=KFormula SVG Export Filter
+ Name[ar]=مرشح تصدير SVG لدى KFormula
++Name[bg]=Филтър за експортиране от KFormula в SVG
+ Name[br]=Sil ezporzh SVG evit KFormula
+ Name[ca]=Filtre d'exportació SVG per a KFormula
+ Name[cy]=Hidlen Allforio SVG KFormula
+@@ -31,6 +32,7 @@
+ Name[lv]=KFormula SVG eksporta filtrs
+ Name[nb]=SVG-eksportfilter for KFormula
+ Name[nds]=SVG-Exportfilter för KFormula
++Name[ne]=केडीई सूत्र एसभीजी निर्यात फिल्टर
+ Name[nl]=SVG-exportfilter voor KFormula
+ Name[pl]=Filtr eksportu do formatu SVG z KFormula
+ Name[pt]=Filtro de Exportação de SVG para o KFormula
+--- filters/kformula/mathml/kformula_mathml_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kformula/mathml/kformula_mathml_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -8,7 +8,7 @@
+ ImportDescription=MathM
+ Name=KFormula MathML Import Filter
+ Name[ar]=مِرْشَح استيراد MathML لدى KFormula
+-Name[bg]=Филтър за импорт от MathML в KFormula
++Name[bg]=Филтър за импортиране от MathML в KFormula
+ Name[br]=Sil enporzh MathML evit KFormula
+ Name[ca]=Filtre d'importació MathML per a KFormula
+ Name[cs]=Importní filtr formátu MathML pro KFormula
+@@ -36,6 +36,7 @@
+ Name[ms]=Penapis Import KFormula MathML
+ Name[nb]=MathML-importfilter for KFormula
+ Name[nds]=MathML-Importfilter för KFormula
++Name[ne]=केडीई सूत्र हिसाबएमएल आयात फिल्टर
+ Name[nl]=MathML-importfilter voor KFormula
+ Name[nn]=MathML-importfilter for KFormula
+ Name[pl]=Filtr importu formatu MathML do KFormula
+--- filters/kformula/mathml/kformula_mathml_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kformula/mathml/kformula_mathml_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -8,7 +8,7 @@
+ ImportDescription=KFormula
+ Name=KFormula MathML Export Filter
+ Name[ar]=مِرْشَح تصدير MathML لدى KFormula
+-Name[bg]=Филтър за експорт от KFormula в MathML
++Name[bg]=Филтър за експортиране от KFormula в MathML
+ Name[br]=Sil ezporzh MathML evit KFormula
+ Name[ca]=Filtre d'exportació MathML per a KFormula
+ Name[cs]=Exportní filtr formátu MathML pro KFormula
+@@ -36,6 +36,7 @@
+ Name[ms]=Penapis Eksport KFormula MathML
+ Name[nb]=MathML-eksportfilter for KFormula
+ Name[nds]=MathML-Exportfilter för KFormula
++Name[ne]=केडीई सूत्र हिसाबएमएल निर्यात फिल्टर
+ Name[nl]=MathML-exportfilter voor KFormula
+ Name[nn]=MathML-eksportfilter for KFormula
+ Name[pl]=Filtr eksportu do formatu MathML z KFormula
+--- filters/kformula/png/kformula_png_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kformula/png/kformula_png_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -9,7 +9,7 @@
+ Name=KFormula PNG Export Filter
+ Name[af]=Kformula Png Voer uit Filter
+ Name[ar]=مِرْشَح تصدير PNG لدى KFormula
+-Name[bg]=Филтър за експорт от KFormula в PNG
++Name[bg]=Филтър за експортиране от KFormula в PNG
+ Name[br]=Sil ezporzh PNG evit KFormula
+ Name[ca]=Filtre d'exportació PNG per a KFormula
+ Name[cs]=Exportní filtr formátu PNG pro KFormula
+@@ -41,6 +41,7 @@
+ Name[mt]=Filtru għall-esportazzjoni ta' PNG minn KFormula
+ Name[nb]=PNG-eksportfilter for KFormula
+ Name[nds]=PNG-Exportfilter för KFormula
++Name[ne]=केडीई सूत्र पीएनजी निर्यात फिल्टर
+ Name[nl]=PNG-exportfilter voor KFormula
+ Name[nn]=PNG-eksportfilter for KFormula
+ Name[pl]=Filtr eksportu do formatu PNG z KFormula
+--- filters/kformula/latex/kformula_latex_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kformula/latex/kformula_latex_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -9,7 +9,7 @@
+ Name=KFormula LaTeX Export Filter
+ Name[af]=Kformula Latex Voer uit Filter
+ Name[ar]=مِرْشَح تصدير LaTeX لدى KFormula
+-Name[bg]=Филтър за експорт от KFormula в LaTeX
++Name[bg]=Филтър за експортиране от KFormula в LaTeX
+ Name[br]=Sil ezporzh LaTeX evit KFormula
+ Name[ca]=Filtre d'exportació LaTeX per a KFormula
+ Name[cs]=Exportní filtr formátu LaTeX pro KFormula
+@@ -40,6 +40,7 @@
+ Name[mt]=Filtru għall-esportazzjoni ta' LaTeX minn ġo KFormula
+ Name[nb]=LaTeX-eksportfilter for KFormula
+ Name[nds]=LaTeX-Exportfilter för KFormula
++Name[ne]=केडीई सूत्र लाटेक्स निर्यात फिल्टर
+ Name[nl]=LaTeX-exportfilter voor KFormula
+ Name[nn]=LaTeX-eksportfilter for KFormula
+ Name[pl]=Filtr eksportu do formatu LaTeX z KFormula
+--- filters/kivio/imageexport/kivio_image_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kivio/imageexport/kivio_image_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Service
+ Name=Kivio Image Export Filter
+ Name[ar]=مرشح تصدير Image لدى Kivio
++Name[bg]=Филтър за експортиране на изображения в Kivio
+ Name[br]=Sil ezporzh skeudenn evit Kivio
+ Name[ca]=Filtre d'exportació d'imatges per a Kivio
+ Name[da]=Kivio billedeksportfilter
+@@ -25,6 +26,7 @@
+ Name[lv]=Kivio attēla eksporta filtrs
+ Name[nb]=Bilde-eksportfilter for Kivio
+ Name[nds]=Bild-Exportfilter för Kivio
++Name[ne]=किभियो छवि निर्यात फिल्टर
+ Name[nl]=Kivio-filter voor afbeeldingsexport
+ Name[pl]=Filtr eksportu do obrazków z Kivio
+ Name[pt]=Filtro de Exportação de Imagem para o Kivio
+--- filters/kpresenter/svg/kpresenter_svg_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kpresenter/svg/kpresenter_svg_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=KPresenter SVG Export Filter
++Name[bg]=Филтър за експортиране от KPresenter в SVG
+ Name[br]=Sil ezporzh SVG evit KPresenter
+ Name[ca]=Filtre d'exportació SVG per a KPresenter
+ Name[cy]=Hidlen Allforio SVG KPresenter
+@@ -25,6 +26,7 @@
+ Name[lv]=KPresenter SVG eksporta filtrs
+ Name[nb]=SVG-eksportfilter for KPresenter
+ Name[nds]=SVG-Exportfilter för KPresenter
++Name[ne]=केडीई प्रस्तुतकर्ता एसभीजी निर्यात फिल्टर
+ Name[nl]=KPresenter SVG Exportfilter
+ Name[pl]=Filtr eksportu do formatu SVG dla KPresenter
+ Name[pt]=Filtro de Exportação de SVG para o KPresenter
+--- filters/kpresenter/ooimpress/kpresenter_ooimpress_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kpresenter/ooimpress/kpresenter_ooimpress_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,7 +3,7 @@
+ Type=Service
+ Name=OpenOffice.org Impress Import Filter for KPresenter
+ Name[ar]=مِرْشَح استيراد OpenOffice.org Impress لدى KPresenter
+-Name[bg]=Филтър за импорт от OpenOffice.org Impress в KPresenter
++Name[bg]=Филтър за импортиране от OpenOffice.org Impress в KPresenter
+ Name[br]=Sil enporzh OpenOffice.org Impress evit KPresenter
+ Name[ca]=Filtre d'importació OpenOffice.org Impress per a KPresenter
+ Name[cs]=OpenOffice.org Impress importní filtr pro KPresenter
+@@ -31,6 +31,7 @@
+ Name[ms]=Penapis Import OpenOffice.org Impress bagi KPresenter
+ Name[nb]=OpenOffice.org Impress-importfilter for KPresenter
+ Name[nds]="OpenOffice.org Impress"-Importfilter för KPresenter
++Name[ne]=केडीई प्रस्तुतकर्ताका लागि OpenOffice.org इम्प्रेस निर्यात फिल्टर
+ Name[nl]=OpenOffice.org Impress-importfilter voor KPresenter
+ Name[nn]=OpenOffice.org Impress-importfilter for KPresenter
+ Name[pl]=Filtr importu z OpenOffice.org Impress dla KSpread
+--- filters/kpresenter/ooimpress/kpresenter_ooimpress_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kpresenter/ooimpress/kpresenter_ooimpress_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,7 +3,7 @@
+ Type=Service
+ Name=OpenOffice.org Impress Export Filter for KPresenter
+ Name[ar]=مِرْشَح استيراد OpenOffice.org Impress لدى KPresenter
+-Name[bg]=Филтър за експорт от KPresenter в OpenOffice.org Impress
++Name[bg]=Филтър за експортиране от OpenOffice.org Impress в KPresenter
+ Name[br]=Sil ezporzh OpenOffice.org Impress evit KPresenter
+ Name[ca]=Filtre d'exportació OpenOffice.org Impress per a KPresenter
+ Name[cs]=OpenOffice.org Impress exportní filtr pro KPresenter
+@@ -30,6 +30,7 @@
+ Name[ms]=Penapis Eksport OpenOffice.org Impress bagi KPresenter
+ Name[nb]=OpenOffice.org Impress-eksportfilter for KPresenter
+ Name[nds]="OpenOffice.org Impress"-Exportfilter för KPresenter
++Name[ne]=केडीई प्रस्तुतकर्ताका लागि OpenOffice.org इम्प्रेस निर्यात फिल्टर
+ Name[nl]=OpenOffice.org Impress-exportfilter voor KPresenter
+ Name[nn]=OpenOffice.org Impress-eksportfilter for KPresenter
+ Name[pl]=Filtr eksportu do OpenOffice.org Impress dla KPresenter
+--- filters/kpresenter/mng/kpresenter_mng_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kpresenter/mng/kpresenter_mng_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Service
+ Name=KPresenter MNG Export Filter
+ Name[ar]=مرشح تصدير MNG لدى KPresenter
++Name[bg]=Филтър за експортиране от Kpresenter в MNG
+ Name[br]=Sil ezporzh MNG evit KPresenter
+ Name[ca]=Filtre d'exportació MNG per a KPresenter
+ Name[da]=KPræsenter MNG-eksportfilter
+@@ -25,6 +26,7 @@
+ Name[lv]=KPresenter MNG eksporta filtrs
+ Name[nb]=MNG-eksportfilter for KPresenter
+ Name[nds]=MNG-Exportfilter för KPresenter
++Name[ne]=केडीई प्रस्तुतकर्ता एमएनजी निर्यात फिल्टर
+ Name[nl]=MNG-exportfilter voor KPresenter
+ Name[pl]=Filtr eksportu do formatu MNG z KPresenter
+ Name[pt]=Filtro de Exportação de MNG para o KPresenter
+--- filters/kpresenter/png/kpresenter_png_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kpresenter/png/kpresenter_png_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=KPresenter PNG Export Filter
++Name[bg]=Филтър за експортиране от Kpresenter в PNG
+ Name[br]=Sil ezporzh PNG evit KPresenter
+ Name[ca]=Filtre d'exportació PNG per a KPresenter
+ Name[cy]=Hidlen Allforio PNG KPresenter
+@@ -25,6 +26,7 @@
+ Name[lv]=KPresenter PNG eksporta filtrs
+ Name[nb]=PNG-eksportfilter for KPresenter
+ Name[nds]=PNG-Exportfilter för KPresenter
++Name[ne]=केडीई प्रस्तुतकर्ता पीएनजी निर्यात फिल्टर
+ Name[nl]=KPresenter PNG Exportfilter
+ Name[pl]=Filtr eksportu do formatu PNG dla KPresenter
+ Name[pt]=Filtro de Exportação de PNG para o KPresenter
+--- filters/kpresenter/xpm/kpresenter_xpm_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kpresenter/xpm/kpresenter_xpm_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=KPresenter XPM Export Filter
++Name[bg]=Филтър за експортиране от KPresenter в XPM
+ Name[br]=Sil ezporzh XPM evit KPresenter
+ Name[ca]=Filtre d'exportació XPM per a KPresenter
+ Name[da]=KPresenter XPM-eksportfilter
+@@ -24,6 +25,7 @@
+ Name[lv]=KPresenter XPM eksporta filtrs
+ Name[nb]=XPM_eksportfilter for KPresenter
+ Name[nds]=XPM-Exportfilter för KPresenter
++Name[ne]=केडीई प्रस्तुतकर्ता एक्सपीएम निर्यात फिल्टर
+ Name[nl]=KPresenter XPM Exportfilter
+ Name[pl]=Filtr eksportu do formatu XPM dla KPresenter
+ Name[pt]=Filtro de Exportação de XPM para o KPresenter
+--- filters/kpresenter/jpeg/kpresenter_jpeg_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kpresenter/jpeg/kpresenter_jpeg_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Service
+ Name=KPresenter JPEG Export Filter
+ Name[ar]=مرشح تصدير JPEG لدى KPresenter
++Name[bg]=Филтър за експортиране от Kpresenter в JPEG
+ Name[br]=Sil ezporzh JPEG evit KPresenter
+ Name[ca]=Filtre d'exportació JPEG per a KPresenter
+ Name[da]=KPræsenter JPEG-eksportfilter
+@@ -25,6 +26,7 @@
+ Name[lv]=KPresenter JPEG eksporta filtrs
+ Name[nb]=JPEG-eksportfilter for KPresenter
+ Name[nds]=JPEG-Exportfilter för KPresenter
++Name[ne]=केडीई प्रस्तुतकर्ता जेपीईजी निर्यात फिल्टर
+ Name[nl]=JPEG-exportfilter voor KPresenter
+ Name[pl]=Filtr eksportu do formatu JPEG z KPresenter
+ Name[pt]=Filtro de Exportação de JPEG para o KPresenter
+--- filters/kpresenter/kword/kprkword.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kpresenter/kword/kprkword.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Service
+ Name=KPresenter KWord Filter
+ Name[ar]=مِرْشَح KPresenter->KWord
++Name[bg]=Филтър KPresenter-> KWord
+ Name[br]=Sil KWord KPresenter
+ Name[ca]=Filtre de KWord per a KPresenter
+ Name[cs]=Filtr pro převod KPresenter->KWord
+@@ -29,6 +30,7 @@
+ Name[ms]=Penapis KPresenter KWord
+ Name[nb]=KPresenter KWord-filter
+ Name[nds]=KWord-Filter för KPresenter
++Name[ne]=केडीई प्रस्तुतकर्ता केडीई शब्द फिल्टर
+ Name[nl]=KWord-filter voor KPresenter
+ Name[nn]=KWord-filter for KPresenter
+ Name[pl]=Filtr KPresenter formatu KWord
+--- filters/kpresenter/powerpoint/import/kpresenter_powerpoint_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kpresenter/powerpoint/import/kpresenter_powerpoint_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=Microsoft PowerPoint Import Filter for KPresenter
++Name[bg]=Филтър за импортиране от Microsoft PowerPoint в KPresenter
+ Name[br]=Sil enporzh Microsoft PowerPoint evit KPresenter
+ Name[ca]=Filtre d'importació Microsoft PowerPoint per a KPresenter
+ Name[cy]=Hidlen Fewnforio Microsoft PowerPoint i KPresenter
+@@ -25,6 +26,7 @@
+ Name[lv]=Microsoft PowerPoint importa filtrs priekš KPresenter
+ Name[nb]=Microsoft PowerPoint-importfilter for KPresenter
+ Name[nds]="Microsoft PowerPoint"-Importfilter för KPresenter
++Name[ne]=केडीई प्रस्तुतकर्ताका लागि माइक्रोसफ्ट पावरपोइन्ट आयात फिल्टर
+ Name[nl]= Microsoft Powerpoint importfilter voor KPresenter
+ Name[pl]=Filtr importu formatu Microsoft PowerPoint dla KPresenter
+ Name[pt]=Filtro de Importação do Microsoft PowerPoint para o KPresenter
+--- filters/kpresenter/xbm/kpresenter_xbm_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kpresenter/xbm/kpresenter_xbm_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=KPresenter XBM Export Filter
++Name[bg]=Филтър за експортиране от KPresenter в BMP
+ Name[br]=Sil ezporzh XBM evit KPresenter
+ Name[ca]=Filtre d'exportació XBM per a KPresenter
+ Name[da]=KPresenter XBM-eksportfilter
+@@ -24,6 +25,7 @@
+ Name[lv]=KPresenter XBM eksporta filtrs
+ Name[nb]=XBM-eksportfilter for KPresenter
+ Name[nds]=XBM-Exportfilter för KPresenter
++Name[ne]=केडीई प्रस्तुतकर्ता एक्सबीएम निर्यात फिल्टर
+ Name[nl]=KPresenter XBM Exportfilter
+ Name[pl]=Filtr eksportu do formatu XBM dla KPresenter
+ Name[pt]=Filtro de Exportação de XBM para o KPresenter
+--- filters/kpresenter/magicpoint/kpresenter_magicpoint_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kpresenter/magicpoint/kpresenter_magicpoint_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ Exec=mgp2kpr.py
+ Name=Magicpoint Import Filter for KPresenter
+ Name[ar]=مِرْشَح استيراد Magicpoint لدى KPresenter
+-Name[bg]=Филтър за импорт от Magicpoint в KPresenter
++Name[bg]=Филтър за импортиране от Magicpoint в KPresenter
+ Name[br]=Sil enporzh Magicpoint evit KPresenter
+ Name[ca]=Filtre d'importació Magicpoint per a KPresenter
+ Name[cs]=Importní filtr Magicpoint pro KPresenter
+@@ -32,6 +32,7 @@
+ Name[ms]=Penapis Import Magicpoint bagi KPresenter
+ Name[nb]=Magicpoint-importfilter for KPresenter
+ Name[nds]=Magicpoint-Importfilter för KPresenter
++Name[ne]=केडीई प्रस्तुतकर्ताका लागि म्याजिकबिन्दु निर्यात फिल्टर
+ Name[nl]=Magicpoint-importfilter voor KPresenter
+ Name[nn]=Magicpoint-importfilter for KPresenter
+ Name[pl]=Filtr importu z Magicpoint dla KPresenter
+--- filters/kpresenter/bmp/kpresenter_bmp_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kpresenter/bmp/kpresenter_bmp_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Service
+ Name=KPresenter BMP Export Filter
+ Name[ar]=مرشح تصدير BMP لدى KPresenter
++Name[bg]=Филтър за експортиране от KPresenter в BMP
+ Name[br]=Sil ezporzh BMB evit KPresenter
+ Name[ca]=Filtre d'exportació BMP per a KPresenter
+ Name[cy]=Hidlen Allforio BMP KPresenter
+@@ -26,6 +27,7 @@
+ Name[lv]=KPresenter BMP eksporta filtrs
+ Name[nb]=BMP-eksportfilter for KPresenter
+ Name[nds]=BMP-Exportfilter för KPresenter
++Name[ne]=केडीई प्रस्तुतकर्ता बीएमपी निर्यात फिल्टर
+ Name[nl]=BMP-exportfilter voor KPresenter
+ Name[pl]=Filtr eksportu do formatu BMP z KPresenter
+ Name[pt]=Filtro de Exportação de BMP para o KPresenter
+--- filters/kword/palmdoc/kword_palmdoc_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/palmdoc/kword_palmdoc_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ Name=KWord Palm Doc Import Filter
+ Name[af]=Kword Palm Dok In voer Filter
+ Name[ar]=مِرْشَح استيراد Palm Doc لدى KWord
+-Name[bg]=Филтър за импорт от Palm Doc в KWord
++Name[bg]=Филтър за импортиране от Palm Doc в KWord
+ Name[br]=Sil enporzh Palm Doc evit KWord
+ Name[ca]=Filtre d'importació Palm Doc per a KWord
+ Name[cs]=Importní filtr Palm Doc pro KWord
+@@ -36,6 +36,7 @@
+ Name[mt]=Filtru għall-importazzjoni ta' "Palm Doc" ġo KWord
+ Name[nb]=Palm Doc importfilter for KWord
+ Name[nds]="Palm Doc"-Importfilter för KWord
++Name[ne]=केडीई शब्द हत्केला कागजात आयात फिल्टर
+ Name[nl]=KWord Palm Doc Importfilter
+ Name[nn]=Palm Doc-importfilter for KWord
+ Name[pl]=Filtr importu formatu Palm Doc do KWord
+--- filters/kword/palmdoc/kword_palmdoc_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/palmdoc/kword_palmdoc_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ Name=KWord Palm Doc Export Filter
+ Name[af]=Kword Palm Dok Voer uit Filter
+ Name[ar]=مِرْشَح تصدير Palm Doc لدى KWord
+-Name[bg]=Филтър за експорт от KWord в Palm Doc
++Name[bg]=Филтър за експортиране от KWord в Palm Doc
+ Name[br]=Sil ezporzh Palm Doc evit KWord
+ Name[ca]=Filtre d'exportació Palm Doc per a KWord
+ Name[cs]=Exportní filtr Palm Doc pro KWord
+@@ -36,6 +36,7 @@
+ Name[mt]=Filtru għall-esportazzjoni ta' "Palm Doc" minn ġo KWord
+ Name[nb]=Palm Doc-eksportfilter for KWord
+ Name[nds]="Palm Doc"-Exportfilter för KWord
++Name[ne]=केडीई शब्द हत्केला कागजात निर्यात फिल्टर
+ Name[nl]=KWord Palm Doc Exportfilter
+ Name[nn]=Palm Doc-eksportfilter for KWord
+ Name[pl]=Filtr eksportu do formatu Palm Doc z KWord
+--- filters/kword/docbook/kword_docbook_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/docbook/kword_docbook_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,7 +5,7 @@
+ Name[af]=Kword Sgml Docbook Voer uit Filter
+ Name[ar]=مِرْشَح تصدير SGML DocBook لدى KWord
+ Name[az]=KWord SGML DocBook Vermə Süzgəci
+-Name[bg]=Филтър за експорт от KWord в SGML DocBook
++Name[bg]=Филтър за експортиране от KWord в SGML DocBook
+ Name[br]=Sil ezporzh SGML DocBook evit KWord
+ Name[ca]=Filtre d'exportació SGML DocBook per a KWord
+ Name[cs]=KWord SGML Docbook exportní filtr
+@@ -38,6 +38,7 @@
+ Name[mt]=Filtru għall-esportazzjoni ta' SGML DocBook minn ġo KWord
+ Name[nb]=SGML DocBook eksportfilter for KWord
+ Name[nds]="SGML DocBook"-Exportfilter för KWord
++Name[ne]=केडीई शब्द एसजीएमएल कागजात पुस्तक निर्यात फिल्टर
+ Name[nl]=KWord SGML DocBook Exportfilter
+ Name[nn]=SGML DocBook-eksportfilter for KWord
+ Name[pl]=Filtr eksportu do formatu SGML DocBook z KWord
+--- filters/kword/wordperfect/export/kword_wp_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/wordperfect/export/kword_wp_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,7 +5,7 @@
+ Name[af]=Kword Wordperfect Voer uit Filter
+ Name[ar]=مِرْشَح تصدير WordPerfect لدى KWord
+ Name[az]=KWord WordPerfect Alma Süzgəci
+-Name[bg]=Филтър за експорт от KWord в WordPerfect
++Name[bg]=Филтър за експортиране от KWord в WordPerfect
+ Name[br]=Sil ezporzh WordPerfect evit KWord
+ Name[ca]=Filtre d'exportació WordPerfect per a KWord
+ Name[cs]=KWord WordPerfect exportní filtr
+@@ -37,6 +37,7 @@
+ Name[mt]=Filtru għall-esportazzjoni ta' WordPerfect minn ġo KWord
+ Name[nb]=WordPerfect-eksportfilter for KWord
+ Name[nds]=WordPerfect-Exportfilter för KWord
++Name[ne]=केडीई शब्द शब्दनिपूण निर्यात फिल्टर
+ Name[nl]=KWord WordPerfect Exportfilter
+ Name[nn]=Word Perfect-eksportfilter for KWord
+ Name[pl]=Filtr eksportu do formatu WordPerfect z KWord
+--- filters/kword/wordperfect/import/kword_wp_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/wordperfect/import/kword_wp_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,7 +5,7 @@
+ Name[af]=Kword Wordperfect In voer Filter
+ Name[ar]=مِرْشَح استيراد WordPerfect لدى KWord
+ Name[az]=KWord WordPerfect Qeyd Süzgəci
+-Name[bg]=Филтър за импорт от WordPerfect в KWord
++Name[bg]=Филтър за импортиране от WordPerfect в KWord
+ Name[br]=Sil enporzh WordPerfect evit KWord
+ Name[ca]=Filtre d'importació WordPerfect per a KWord
+ Name[cs]=KWord WordPerfect importní filtr
+@@ -37,6 +37,7 @@
+ Name[mt]=Filtru għall-importazzjoni ta' WordPerfect ġo KWord
+ Name[nb]=WordPerfect-importfilter for KWord
+ Name[nds]=WordPerfect-Importfilter för KWord
++Name[ne]=केडीई शब्द शब्दनिपूण आयात फिल्टर
+ Name[nl]=KWord WordPerfect Importfilter
+ Name[nn]=Word Perfect-importfilter for KWord
+ Name[pl]=Filtr importu formatu WordPerfect do KWord
+--- filters/kword/amipro/kword_amipro_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/amipro/kword_amipro_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ Name=KWord AmiPro Import Filter
+ Name[af]=Kword Amipro In voer Filter
+ Name[ar]=مِرْشَح استيراد AmiPro لدى KWord
+-Name[bg]=Филтър за импорт от AmiPro в KWord
++Name[bg]=Филтър за импортиране от AmiPro в KWord
+ Name[br]=Sil enporzh AmiPro evit KWord
+ Name[ca]=Filtre d'importació AmiPro per a KWord
+ Name[cs]=Importní filtr AmiPro pro KWord
+@@ -36,6 +36,7 @@
+ Name[mt]=Filtru għall-importazzjoni ta' AmiPro ġo KWord
+ Name[nb]=AmiPro-importfilter for KWord
+ Name[nds]=AmiPro-Importfilter för KWord
++Name[ne]=केडीई शब्द एमीप्रो आयात फिल्टर
+ Name[nl]=KWord AmiPro Importfilter
+ Name[nn]=AmiPro-importfilter for KWord
+ Name[pl]=Filtr importu formatu AmiPro do KWord
+--- filters/kword/amipro/kword_amipro_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/amipro/kword_amipro_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ Name=KWord AmiPro Export Filter
+ Name[af]=Kword Amipro Voer uit Filter
+ Name[ar]=مِرْشَح تصدير AmiPro لدى KWord
+-Name[bg]=Филтър за експорт от KWord в AmiPro
++Name[bg]=Филтър за експортиране от KWord в AmiPro
+ Name[br]=Sil ezporzh AmiPro evit KWord
+ Name[ca]=Filtre d'exportació AmiPro per a KWord
+ Name[cs]=Exportní filtr AmiPro pro KWord
+@@ -36,6 +36,7 @@
+ Name[mt]=Filtru għall-esportazzjoni ta' AmiPro minn ġo KWord
+ Name[nb]=AmiPro-eksportfilter for KWord
+ Name[nds]=AmiPro-Exportfilter för KWord
++Name[ne]=केडीई शब्द एमीप्रो निर्यात फिल्टर
+ Name[nl]=KWord AmiPro Exportfilter
+ Name[nn]=AmiPro-eksportfilter for KWord
+ Name[pl]=Filtr eksportu do formatu AmiPro z KWord
+--- filters/kword/abiword/kword_abiword_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/abiword/kword_abiword_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,7 +5,7 @@
+ Name[af]=Kword Abiword In voer Filter
+ Name[ar]=مِرْشَح استيراد AbiWord لدى KWord
+ Name[az]=KWord AbiWord Qeyd Süzgəci
+-Name[bg]=Филтър за импорт от AbiWord в KWord
++Name[bg]=Филтър за импортиране от AbiWord в KWord
+ Name[br]=Sil enporzh AbiWord evit KWord
+ Name[ca]=Filtre d'importació AbiWord per a KWord
+ Name[cs]=KWord AbiWord importní filtr
+@@ -39,6 +39,7 @@
+ Name[mt]=Filtru għall-importazzjoni ta' AbiWord ġo KWord
+ Name[nb]=AbiWord-importfilter for KWord
+ Name[nds]=AbiWord-Importfilter för KWord
++Name[ne]=केडीई शब्द एबीआई वर्ड आयात फिल्टर
+ Name[nl]=KWord AbiWord-importfilter
+ Name[nn]=AbiWord-importfilter for KWord
+ Name[pl]=Filtr importu formatu AbiWord do KWord
+--- filters/kword/abiword/kword_abiword_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/abiword/kword_abiword_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,7 +5,7 @@
+ Name[af]=Kword Abiword Voer uit Filter
+ Name[ar]=مِرْشَح تصدير AbiWord لدى KWord
+ Name[az]=KWord AbiWord Alma Süzgəci
+-Name[bg]=Филтър за експорт от KWord в AbiWord
++Name[bg]=Филтър за експортиране от KWord в AbiWord
+ Name[br]=Sil ezporzh AbiWord evit KWord
+ Name[ca]=Filtre d'exportació AbiWord per a KWord
+ Name[cs]=KWord AbiWord exportní filtr
+@@ -39,6 +39,7 @@
+ Name[mt]=Filtru għall-esportazzjoni ta' AbiWord minn ġo KWord
+ Name[nb]=AbiWord-eksportfilter for KWord
+ Name[nds]=AbiWord-Exportfilter för KWord
++Name[ne]=केडीई शब्द एबीआई वर्ड निर्यात फिल्टर
+ Name[nl]=KWord AbiWord-Exportfilter
+ Name[nn]=AbiWord-eksportfilter for KWord
+ Name[pl]=Filtr eksportu do formatu AbiWord z KWord
+--- filters/kword/ascii/kword_ascii_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/ascii/kword_ascii_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=KWord ASCII Import Filter
++Name[bg]=Филтър за импортиране ASCII в KWord
+ Name[br]=Sil Enporzh ASCII KWord
+ Name[ca]=Filtre d'importació ASCII per a KWord
+ Name[cs]=KWord ASCII importní filtr
+@@ -28,6 +29,7 @@
+ Name[ms]=Penapis Import KWord ASCII
+ Name[nb]=Ascii-importfilter for KWord
+ Name[nds]=ASCII-Importfilter för KWord
++Name[ne]=केडीई शब्द एएससीआईआई आयात फिल्टर
+ Name[nl]=KWord ASCII Importfilter
+ Name[nn]=ASCII-importfilter for KWord
+ Name[pl]=Filtr importu formatu ASCII do KWord
+--- filters/kword/ascii/kword_ascii_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/ascii/kword_ascii_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,7 +5,7 @@
+ Name[af]=Kword Ascii Voer uit Filter
+ Name[ar]=مِرْشَح تصدير Ascii لدى KWord
+ Name[az]=KWord Ascii Alma Süzgəci
+-Name[bg]=Филтър за експорт от KWord в обикновен текст
++Name[bg]=Филтър за експортиране от KWord в обикновен текст
+ Name[br]=Sil Ezporzh Ascii KWord
+ Name[ca]=Filtre d'exportació Applixword per a KWord
+ Name[cs]=KWord Ascii exportní filtr
+@@ -39,6 +39,7 @@
+ Name[mt]=Filtru għall-esportazzjoni ta' Ascii minn ġo KWord
+ Name[nb]=Ascii-eksportfilter for KWord
+ Name[nds]=ASCII-Exportfilter för KWord
++Name[ne]=केडीई शब्द एएससीआईआई निर्यात फिल्टर
+ Name[nl]=KWord's Ascii-Exportfilter
+ Name[nn]=Ascii-eksportfilter for KWord
+ Name[pl]=Filtr eksportu do formatu ASCII z KWord
+--- filters/kword/applixword/kword_applixword_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/applixword/kword_applixword_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,7 +5,7 @@
+ Name[af]=Kword Applixword In voer Filter
+ Name[ar]=مِرْشَح استيراد Applixword لدى KWord
+ Name[az]=KWord Applixword Alma Süzgəci
+-Name[bg]=Филтър за импорт от Applixword в KWord
++Name[bg]=Филтър за импортиране от Applixword в KWord
+ Name[br]=Sil enporzh Applixword evit KWord
+ Name[ca]=Filtre d'importació Applixword per a KWord
+ Name[cs]=KWord Applixword importní filtr
+@@ -38,6 +38,7 @@
+ Name[mt]=Filtru għall-importazzjoni ta' ApplixWord ġo KWord
+ Name[nb]=Applixword-importfilter for KWord
+ Name[nds]=Applixword-Importfilter för KWord
++Name[ne]=केडीई शब्द एप्लीक्सशब्द आयात फिल्टर
+ Name[nl]=KWord Applixword Import-filter
+ Name[nn]=Applixword-importfilter for KWord
+ Name[pl]=Filtr importu formatu Applixword do KWord
+--- filters/kword/mswrite/kword_mswrite_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/mswrite/kword_mswrite_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ Name=KWord Microsoft Write Import Filter
+ Name[af]=Kword Microsoft Skryf In voer Filter
+ Name[ar]=مِرْشَح استيراد Microsoft Write لدى KWord
+-Name[bg]=Филтър за импорт от Microsoft Write в KWord
++Name[bg]=Филтър за импортиране от Microsoft Write в KWord
+ Name[br]=Sil enporzh Microsoft Write evit KWord
+ Name[ca]=Filtre d'importació Microsoft Write per a KWord
+ Name[cs]=Importní filtr Microsoft Write pro KWord
+@@ -36,6 +36,7 @@
+ Name[mt]=Filtru għall-importazzjoni ta' Microsoft Write ġo KWord
+ Name[nb]=Microsoft Write-importfilter for KWord
+ Name[nds]="Microsoft Write"-Importfilter för KWord
++Name[ne]=केडीई शब्द माइक्रोसफ्ट लेखन आयात फिल्टर
+ Name[nl]=KWord Microsoft Write Importfilter
+ Name[nn]=Microsoft Write-importfilter for KWord
+ Name[pl]=Filtr importu formatu Microsoft Write do KWord
+--- filters/kword/mswrite/kword_mswrite_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/mswrite/kword_mswrite_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,7 +3,7 @@
+ Type=Service
+ Name=KWord Microsoft Write Export Filter
+ Name[ar]=مِرْشَح تصدير Microsoft Write لدى KWord
+-Name[bg]=Филтър за експорт от KWord в Microsoft Write
++Name[bg]=Филтър за експортиране от KWord в Microsoft Write
+ Name[br]=Sil ezporzh Microsoft Write evit KWord
+ Name[ca]=Filtre d'exportació Microsoft Write per a KWord
+ Name[cs]=Exportní filtr formátu MS Write pro KWord
+@@ -31,6 +31,7 @@
+ Name[ms]=Penapis Eksport KWord Microsoft Write
+ Name[nb]=Microsoft Write-eksportfilter for KWord
+ Name[nds]="Microsoft Write"-Exportfilter för KWord
++Name[ne]=केडीई शब्द माइक्रोसफ्ट लेखन निर्यात फिल्टर
+ Name[nl]=KWord Microsoft Write Exportfilter
+ Name[nn]=Microsoft Write-eksportfilter for KWord
+ Name[pl]=Filtr eksportu do formatu Microsoft Write z KWord
+--- filters/kword/rtf/export/kword_rtf_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/rtf/export/kword_rtf_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,7 +5,7 @@
+ Name[af]=Kword Rtf Voer uit Filter
+ Name[ar]=مِرْشَح تصدير RTF لدى KWord
+ Name[az]=KWord RTF İdxal Süzgəci
+-Name[bg]=Филтър за експорт от KWord в RTF
++Name[bg]=Филтър за експортиране от KWord в RTF
+ Name[br]=Sil Ezporzh RTF KWord
+ Name[ca]=Filtre d'exportació RTF per a KWord
+ Name[cs]=Exportní filtr formátu RTF pro KWord
+@@ -37,6 +37,7 @@
+ Name[mt]=Filtru għall-esportazzjoni ta' RTF minn ġo KWord
+ Name[nb]=RTF-eksportfilter for KWord
+ Name[nds]=RTF-Exportfilter för KWord
++Name[ne]=केडीई शब्द RTF निर्यात फिल्टर
+ Name[nl]=KWord RTF Exportfilter
+ Name[nn]=RTF-eksportfilter for KWord
+ Name[pl]=Filtr eksportu do formatu RTF z KWord
+--- filters/kword/rtf/import/kword_rtf_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/rtf/import/kword_rtf_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,7 +5,7 @@
+ Name[af]=Kword Rtf In voer Filter
+ Name[ar]=مِرْشَح استيراد RTF لدى KWord
+ Name[az]=KWord RTF İdxal Süzgəci
+-Name[bg]=Филтър за импорт от RTF в KWord
++Name[bg]=Филтър за импортиране от RTF в KWord
+ Name[br]=Sil enporzh RTF evit KWord
+ Name[ca]=Filtre d'exportació RTF per a KWord
+ Name[cs]=Dialog exportního filtru RTF pro KWord
+@@ -37,6 +37,7 @@
+ Name[mt]=Filtru għall-importazzjoni ta' RTF ġo KIllustrator
+ Name[nb]=RTF-importfilter for KWord
+ Name[nds]=RTF-Importfilter för KWord
++Name[ne]=केडीई शब्द RTF आयात फिल्टर
+ Name[nl]=KWord RTF Importfilter
+ Name[nn]=RTF-importfilter for KWord
+ Name[pl]=Filtr importu formatu RTF do KWord
+--- filters/kword/wml/kword_wml_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/wml/kword_wml_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,7 +3,7 @@
+ Type=Service
+ Name=KWord WML Import Filter
+ Name[ar]=مِرْشَح استيراد WML لدى KWord
+-Name[bg]=Филтър за импорт от WML в KWord
++Name[bg]=Филтър за импортиране от WML в KWord
+ Name[br]=Sil enporzh WML evit KWord
+ Name[ca]=Filtre d'importació WML per a KWord
+ Name[cs]=Importní filtr formátu WML pro KWord
+@@ -35,6 +35,7 @@
+ Name[mt]=Filtru għall-importazzjoni ta' WML ġo KWord
+ Name[nb]=WML-importfilter for KWord
+ Name[nds]=WML-Importfilter för KWord
++Name[ne]=केडीई शब्द WML आयात फिल्टर
+ Name[nl]=KWord WML Importfilter
+ Name[nn]=WML-importfilter for KWord
+ Name[pl]=Filtr importu formatu WML do KWord
+--- filters/kword/wml/kword_wml_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/wml/kword_wml_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,7 +3,7 @@
+ Type=Service
+ Name=KWord WML Export Filter
+ Name[ar]=مِرْشَح تصدير WML لدى KWord
+-Name[bg]=Филтър за експорт от KWord в WML
++Name[bg]=Филтър за експортиране от KWord в WML
+ Name[br]=Sil ezporzh WML evit KWord
+ Name[ca]=Filtre d'exportació WML per a KWord
+ Name[cs]=Exportní filtr formátu WML pro KWord
+@@ -35,6 +35,7 @@
+ Name[mt]=Filtru għall-esportazzjoni ta' WML minn ġo KWord
+ Name[nb]=WML-eksportfilter for KWord
+ Name[nds]=WML-Exportfilter för KWord
++Name[ne]=केडीई शब्द WML निर्यात फिल्टर
+ Name[nl]=KWord WML Exportfilter
+ Name[nn]=WML-eksportfilter for KWord
+ Name[pl]=Filtr eksportu do formatu WML z KWord
+--- filters/kword/hancomword/kword_hancomword_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/hancomword/kword_hancomword_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,7 +3,7 @@
+ Type=Service
+ Name=KWord HancomWord Import Filter
+ Name[ar]=مِرْشَح استيراد HancomWord لدى KWord
+-Name[bg]=Филтър за импорт от HancomWord в KWord
++Name[bg]=Филтър за импортиране от HancomWord в KWord
+ Name[br]=Sil enporzh HancomWord evit KWord
+ Name[ca]=Filtre d'importació HancomWord per a KWord
+ Name[cs]=Importní filtr HancomWord pro KWord
+@@ -34,6 +34,7 @@
+ Name[mt]=Filtru għall-importazzjoni ta' HancomWord ġo KWord
+ Name[nb]=HancomWord-importfilter for KWord
+ Name[nds]=HancomWord-Importfilter för KWord
++Name[ne]=केडीई शब्द HancomWord आयात फिल्टर
+ Name[nl]=KWord HancomWord Importfilter
+ Name[nn]=HancomWord-importfilter for KWord
+ Name[pl]=Filtr importu formatu HancomWord do KWord
+--- filters/kword/html/export/kword_html_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/html/export/kword_html_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,7 +5,7 @@
+ Name[af]=Kword Html Voer uit Filter
+ Name[ar]=مِرْشَح تصدير HTML لدى KWord
+ Name[az]=KWord HTML Vermə Süzgəci
+-Name[bg]=Филтър за експорт от KWord в HTML
++Name[bg]=Филтър за експортиране от KWord в HTML
+ Name[br]=Sil Ezporzh HTML KWord
+ Name[ca]=Filtre d'exportació HTML per a KWord
+ Name[cs]=KWord HTML exportní filtr
+@@ -39,6 +39,7 @@
+ Name[mt]=Filtru għall-esportazzjoni ta' HTML minn ġo KWord
+ Name[nb]=HTML-eksportfilter for KWord
+ Name[nds]=HTML-Exportfilter för KWord
++Name[ne]=केडीई शब्द एचटीएमएल निर्यात फिल्टर
+ Name[nl]=KWord's HTML-Exportfilter
+ Name[nn]=HTML-eksportfilter for KWord
+ Name[pl]=Filtr eksportu do formatu HTML z KWord
+--- filters/kword/html/import/test/ullevel2.htm (.../tags/koffice/1.6.2/koffice) (revision 0)
++++ filters/kword/html/import/test/ullevel2.htm (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -0,0 +1,5 @@
++<html>
++<head>
++</head>
++<body>line 1<ul><ul>this is line 2 on the level of line 3<li>first bulletpoint, line 3</li></ul></ul>line 4</body>
++</html>
+--- filters/kword/html/import/test/pretext.htm (.../tags/koffice/1.6.2/koffice) (revision 0)
++++ filters/kword/html/import/test/pretext.htm (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -0,0 +1,6 @@
++<html><body>
++<pre>
++this is line 1
++this is line 2
++</pre>
++</body></html>
+--- filters/kword/html/import/test/heading.htm (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/html/import/test/heading.htm (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -47,6 +47,6 @@
+ </style>
+ </head>
+ <body>
+-<p class="h1" style="text-align:left; ">aoei</p>
++<p class="h1" style="text-align:left; ">This is a heading</p>
+ </body>
+ </html>
+--- filters/kword/html/import/test/ultext2.htm (.../tags/koffice/1.6.2/koffice) (revision 0)
++++ filters/kword/html/import/test/ultext2.htm (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -0,0 +1,10 @@
++<html xmlns="http://www.w3.org/1999/xhtml">
++<body>
++<p class="Standard" style="text-align:left; ">line 1</p>
++<ul style="list-style-type:disc">
++<li class="Standard" style="text-align:left; ">first bulletpoint, line 2</li>
++</ul>
++<p class="Standard" style="text-align:left; ">line 3</p>
++<p class="Standard" style="text-align:left; "> </p>
++</body>
++</html>
+--- filters/kword/html/import/test/ullevel.htm (.../tags/koffice/1.6.2/koffice) (revision 0)
++++ filters/kword/html/import/test/ullevel.htm (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -0,0 +1,14 @@
++<html>
++<head>
++</head>
++<body>
++line 1
++<ul>
++this is line 2 on the level of line 3
++<li>
++first bulletpoint, line 3
++</li>
++</ul>
++line 4
++</body>
++</html>
+--- filters/kword/html/import/test/heading2.htm (.../tags/koffice/1.6.2/koffice) (revision 0)
++++ filters/kword/html/import/test/heading2.htm (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -0,0 +1,11 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
++<html xmlns="http://www.w3.org/1999/xhtml">
++<body>
++<p class="h2">This is heading </p>
++<p class="Standard"><a href="#blah">this is Standard 1</a></p>
++<p class="Standard"><a href="#blahblah">this is Standard 2</a> </p>
++<p class="Standard"><a href="#blahblahblah">this is Standard 3</a></p>
++<p class="h2" style="text-align:left; "> </p>
++</body>
++</html>
+--- filters/kword/html/import/test/ultext.htm (.../tags/koffice/1.6.2/koffice) (revision 0)
++++ filters/kword/html/import/test/ultext.htm (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -0,0 +1,13 @@
++<html>
++<head>
++</head>
++<body>
++line 1
++<ul>
++<li>
++first bulletpoint, line 2
++</li>
++</ul>
++line 3
++</body>
++</html>
+--- filters/kword/html/import/khtmlreader.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/html/import/khtmlreader.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -32,7 +32,8 @@
+ #include <dom/html_misc.h>
+ #include <qregexp.h>
+
+-KHTMLReader::KHTMLReader(KWDWriter *w){
++KHTMLReader::KHTMLReader(KWDWriter *w)
++{
+ _html=new KHTMLPart();
+ _writer=w;
+ _it_worked=false;
+@@ -43,7 +44,8 @@
+ void qt_leave_modal( QWidget *widget );
+
+
+-bool KHTMLReader::filter(KURL url) {
++bool KHTMLReader::filter(KURL url)
++{
+ kdDebug(30503) << "KHTMLReader::filter" << endl;
+ QObject::connect(_html,SIGNAL(completed()),this,SLOT(completed()));
+
+@@ -56,7 +58,8 @@
+ _html->setPluginsEnabled(false);
+ _html->setJavaEnabled(false);
+ _html->setMetaRefreshEnabled(false);
+- if (_html->openURL(url) == false) {
++ if (_html->openURL(url) == false)
++ {
+ kdWarning(30503) << "openURL returned false" << endl;
+ return false;
+ }
+@@ -69,8 +72,10 @@
+ return _it_worked;
+ }
+
+-HTMLReader_state *KHTMLReader::state() {
+- if (_state.count() == 0) {
++HTMLReader_state *KHTMLReader::state()
++{
++ if (_state.count() == 0)
++ {
+ HTMLReader_state *s=new HTMLReader_state;
+ s->frameset=_writer->mainFrameset();
+ s->paragraph = _writer->addParagraph(s->frameset);
+@@ -82,7 +87,8 @@
+ return _state.top();
+ }
+
+-HTMLReader_state *KHTMLReader::pushNewState() {
++HTMLReader_state *KHTMLReader::pushNewState()
++{
+ HTMLReader_state *s=new HTMLReader_state;
+ s->frameset=state()->frameset;
+ s->paragraph=state()->paragraph;
+@@ -95,7 +101,8 @@
+ }
+
+
+-void KHTMLReader::popState() {
++void KHTMLReader::popState()
++{
+ kdDebug(30503) << "Entering popState" << endl;
+
+ HTMLReader_state *s=_state.pop();
+@@ -109,43 +116,47 @@
+ if we go back into another frameset, we start a new paragraph.
+ **/
+ if (s->frameset == state()->frameset)
+- {
+- state()->paragraph=s->paragraph;
+- if ((state()->layout != s->layout)) {
+- if (_writer->getText(state()->paragraph).length()!=0) startNewLayout(false,state()->layout);
+- }
++ {
++ state()->paragraph=s->paragraph;
++ if ((state()->layout != s->layout))
++ {
++ if (_writer->getText(state()->paragraph).length()!=0) startNewLayout(false,state()->layout);
++ }
+ state()->format=_writer->startFormat(state()->paragraph, state()->format);
+ }
+ delete(s);
+ }
+
+-void KHTMLReader::startNewLayout(bool startNewFormat) {
++void KHTMLReader::startNewLayout(bool startNewFormat)
++{
+ QDomElement layout;
+ startNewLayout(startNewFormat,layout);
+ }
+
+-void KHTMLReader::startNewLayout(bool startNewFormat, QDomElement layout) {
++void KHTMLReader::startNewLayout(bool startNewFormat, QDomElement layout)
++{
+ kdDebug() << "entering startNewLayout" << endl;
+ startNewParagraph(startNewFormat,true);
+ state()->layout=_writer->setLayout(state()->paragraph,layout);
+ }
+
+-
+-void KHTMLReader::completed() {
++void KHTMLReader::completed()
++{
+ kdDebug(30503) << "KHTMLReader::completed" << endl;
+ qApp->exit_loop();
+ DOM::Document doc=_html->document(); // FIXME parse <HEAD> too
+ DOM::NodeList list=doc.getElementsByTagName("body");
+ DOM::Node docbody=list.item(0);
+
+- if (docbody.isNull()) {
++ if (docbody.isNull())
++ {
+ kdWarning(30503) << "no <BODY>, giving up" << endl;
+ _it_worked=false;
+ return;
+ }
+
+
+- parseNode(docbody);
++ parseNode(docbody); // start here (keyword: main)
+
+ list = doc.getElementsByTagName("head");
+ DOM::Node dochead=list.item(0);
+@@ -159,11 +170,13 @@
+ }
+
+
+-void KHTMLReader::parseNode(DOM::Node node) {
++void KHTMLReader::parseNode(DOM::Node node)
++{
+ kdDebug(30503) << "Entering parseNode" << endl;
+ // check if this is a text node.
+ DOM::Text t=node;
+- if (!t.isNull()) {
++ if (!t.isNull())
++ {
+ _writer->addText(state()->paragraph,t.data().string(),1,state()->in_pre_mode);
+ return; // no children anymore...
+ }
+@@ -177,23 +190,25 @@
+
+ bool go_recursive=true;
+
+- if (!e.isNull()) {
++ if (!e.isNull())
++ {
+ // get the CSS information
+ parseStyle(e);
+ // get the tag information
+ go_recursive=parseTag(e);
+ }
+- if (go_recursive) {
+- for (DOM::Node q=node.firstChild(); !q.isNull(); q=q.nextSibling()) {
++ if (go_recursive)
++ {
++ for (DOM::Node q=node.firstChild(); !q.isNull(); q=q.nextSibling())
++ {
+ parseNode(q);
+ }
+ }
+ popState();
+-
+-
+ }
+
+-void KHTMLReader::parse_head(DOM::Element e) {
++void KHTMLReader::parse_head(DOM::Element e)
++{
+ for (DOM::Element items=e.firstChild();!items.isNull();items=items.nextSibling()) {
+ if (items.tagName().string().lower() == "title") {
+ DOM::Text t=items.firstChild();
+@@ -204,11 +219,6 @@
+ }
+ }
+
+-#define _PP(x) { \
+- if (e.tagName().lower() == #x) \
+- return parse_##x(e); \
+- }
+-
+ #define _PF(x,a,b,c) { \
+ if (e.tagName().lower() == #x) \
+ { \
+@@ -232,50 +242,49 @@
+ }
+
+
+-bool KHTMLReader::parseTag(DOM::Element e) {
+- kdDebug(30503) << "Entering parseTag for " << e.tagName().lower() << endl;
+- _PP(a);
+- _PP(p);
+- _PP(br);
+- _PP(table);
+- _PP(pre);
+- _PP(ul);
+- _PP(ol);
+- _PP(font);
+- _PP(hr);
++bool KHTMLReader::parseTag(DOM::Element e)
++{
++ kdDebug(30503) << "Entering parseTag for " << e.tagName().lower() << endl;
++ if (e.tagName().lower()=="a") { return parse_a(e); }
++ if (e.tagName().lower()=="p") { return parse_p(e); }
++ if (e.tagName().lower()=="br") { return parse_br(e); }
++ if (e.tagName().lower()=="ul") { return parse_ul(e); }
++ if (e.tagName().lower()=="ol") { return parse_ol(e); }
++ if (e.tagName().lower()=="hr") { return parse_hr(e); }
++ if (e.tagName().lower()=="pre") { return parse_pre(e); }
++ if (e.tagName().lower()=="font") { return parse_font(e); }
++ if (e.tagName().lower()=="table") { return parse_table(e); }
+
+- // FIXME we can get rid of these, make things tons more simple
+- // when khtml finally implements getComputedStyle
+- _PF(b,WEIGHT,value,75);
+- _PF(strong,WEIGHT,value,75);
+- _PF(u,UNDERLINE,value,1);
+- _PF(i,ITALIC,value,1);
++ // FIXME we can get rid of these, make things tons more simple
++ // when khtml finally implements getComputedStyle
++ _PF(b,WEIGHT,value,75);
++ _PF(strong,WEIGHT,value,75);
++ _PF(u,UNDERLINE,value,1);
++ _PF(i,ITALIC,value,1);
+
+- _PL(center,FLOW,align,center);
+- _PL(right,FLOW,align,right);
+- _PL(left,FLOW,align,left);
++ _PL(center,FLOW,align,center);
++ _PL(right,FLOW,align,right);
++ _PL(left,FLOW,align,left);
+
+- _PL(h1,NAME,value,h1);
+- _PL(h2,NAME,value,h2);
+- _PL(h3,NAME,value,h3);
+- _PL(h4,NAME,value,h4);
+- _PL(h5,NAME,value,h5);
+- _PL(h6,NAME,value,h6);
+- kdDebug(30503) << "Leaving parseTag" << endl;
++ _PL(h1,NAME,value,h1);
++ _PL(h2,NAME,value,h2);
++ _PL(h3,NAME,value,h3);
++ _PL(h4,NAME,value,h4);
++ _PL(h5,NAME,value,h5);
++ _PL(h6,NAME,value,h6);
++ kdDebug(30503) << "Leaving parseTag" << endl;
+
+- // Don't handle the content of comment- or script-nodes.
+- if(e.nodeType() == DOM::Node::COMMENT_NODE || e.tagName().lower() == "script") {
+- return false;
+- }
++ // Don't handle the content of comment- or script-nodes.
++ if(e.nodeType() == DOM::Node::COMMENT_NODE || e.tagName().lower() == "script")
++ {
++ return false;
++ }
+
+- return true;
++ return true;
+ }
+
+-
+-
+-
+-
+-void KHTMLReader::startNewParagraph(bool startnewformat, bool startnewlayout) {
++void KHTMLReader::startNewParagraph(bool startnewformat, bool startnewlayout)
++{
+ kdDebug() << "Entering startNewParagraph" << endl;
+
+ QDomElement qf=state()->format;
+@@ -291,9 +300,12 @@
+
+
+
+- if (qf.isNull() || (startnewformat==true)) {
++ if (qf.isNull() || (startnewformat==true))
++ {
+ state()->format=_writer->startFormat(state()->paragraph/*,state()->format*/);
+- } else {
++ }
++ else
++ {
+ state()->format=_writer->startFormat(state()->paragraph,qf);
+ }
+
+@@ -303,7 +315,8 @@
+ we do this by incrementing the 'environment depth' and changing the numbering type to 'no numbering'
+ **/
+ QString ct=_writer->getLayoutAttribute(state()->paragraph,"COUNTER","type");
+- if ((!ct.isNull()) && (ct != "0")) {
++ if ((!ct.isNull()) && (ct != "0"))
++ {
+ _writer->layoutAttribute(state()->paragraph,"COUNTER","type","0");
+ _writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","0");
+ _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext","");
+@@ -326,22 +339,29 @@
+ //==============================================================
+
+
+-bool KHTMLReader::parse_CommonAttributes(DOM::Element e) {
+- kdDebug(30503) << "entering KHTMLReader::parse_CommonAttributes" << endl;
+- kdDebug(30503) << "tagName is " << e.tagName().string() << endl;
+- QString s=e.getAttribute("align").string();
+- if (!s.isEmpty())
+- {
+- _writer->formatAttribute(state()->paragraph,"FLOW","align",s);
+- }
+- QRegExp rx( "h[0-9]+" );
+- if ( 0 == rx.search( e.getAttribute("class").string() ) )
+- // example: <p class="h1" style="text-align:left; ">
+- {
+- _writer->layoutAttribute(state()->paragraph,"NAME","value",e.getAttribute("class").string());
+- }
+- kdDebug(30503) << "leaving parse_CommonAttributes" << endl;
+- return true;
++bool KHTMLReader::parse_CommonAttributes(DOM::Element e)
++{
++ kdDebug(30503) << "entering KHTMLReader::parse_CommonAttributes" << endl;
++ kdDebug(30503) << "tagName is " << e.tagName().string() << endl;
++ QString s=e.getAttribute("align").string();
++ if (!s.isEmpty())
++ {
++ _writer->formatAttribute(state()->paragraph,"FLOW","align",s);
++ }
++ QRegExp rx( "h[0-9]+" );
++ if ( 0 == rx.search( e.getAttribute("class").string() ) )
++ // example: <p class="h1" style="text-align:left; ">
++ {
++ kdDebug(30503) << "laying out with " << e.getAttribute("class").string() << endl;
++ _writer->layoutAttribute(state()->paragraph,"NAME","value",e.getAttribute("class").string());
++ }
++ if ( e.getAttribute("class").string()=="Standard" )
++ {
++ kdDebug(30503) << "laying out with " << e.getAttribute("class").string() << endl;
++ _writer->layoutAttribute(state()->paragraph,"NAME","value",e.getAttribute("class").string());
++ }
++ kdDebug(30503) << "leaving parse_CommonAttributes" << endl;
++ return true;
+ }
+
+ bool KHTMLReader::parse_a(DOM::Element e) {
+@@ -373,27 +393,33 @@
+ return true;
+ }
+
+-bool KHTMLReader::parse_hr(DOM::Element /*e*/) {
++bool KHTMLReader::parse_hr(DOM::Element /*e*/)
++{
+ startNewParagraph();
+ _writer->createHR(state()->paragraph);
+ startNewParagraph();
+ return true;
+ }
+
+-bool KHTMLReader::parse_br(DOM::Element /*e*/) {
++bool KHTMLReader::parse_br(DOM::Element /*e*/)
++{
+ startNewParagraph(false,false); //keep the current format and layout
+ return false; // a BR tag has no childs.
+ }
+
+-static const QColor parsecolor(const QString& colorstring) {
++static const QColor parsecolor(const QString& colorstring)
++{
+ QColor color;
+- if (colorstring[0]=='#') {
++ if (colorstring[0]=='#')
++ {
+ color.setRgb(
+ colorstring.mid(1,2).toInt(0,16),
+ colorstring.mid(3,2).toInt(0,16),
+ colorstring.mid(5,2).toInt(0,16)
+ );
+- } else {
++ }
++ else
++ {
+ QString colorlower=colorstring.lower();
+ // Grays
+ if (colorlower=="black")
+@@ -430,7 +456,8 @@
+ color.setRgb(128,0,128);
+ else if (colorlower=="teal")
+ color.setRgb(0,128,128);
+- else {
++ else
++ {
+ // H'm, we have still not found the color!
+ // Let us see if QT can do better!
+ color.setNamedColor(colorstring);
+@@ -439,7 +466,8 @@
+ return colorstring;
+ }
+
+-void KHTMLReader::parseStyle(DOM::Element e) {
++void KHTMLReader::parseStyle(DOM::Element e)
++{
+ // styles are broken broken broken broken broken broken.
+ //FIXME: wait until getComputedStyle is more than
+ // 'return 0' in khtml
+@@ -447,7 +475,6 @@
+ DOM::CSSStyleDeclaration s1=e.style();
+ DOM::Document doc=_html->document();
+ DOM::CSSStyleDeclaration s2=doc.defaultView().getComputedStyle(e,"");
+-
+ kdDebug(30503) << "font-weight=" << s1.getPropertyValue("font-weight").string() << endl;
+ if ( s1.getPropertyValue("font-weight").string() == "bolder" )
+ {
+@@ -479,7 +506,7 @@
+ }
+ // done
+ // process e.g. <style="text-align: center">this is in the center</style>
+- if ( s1.getPropertyValue("text-align").string() != QString() )
++ if ( s1.getPropertyValue("text-align").string() != QString() && s1.getPropertyValue("text-align").string() != QString("left") )
+ {
+ state()->layout=_writer->setLayout(state()->paragraph,state()->layout);
+ _writer->layoutAttribute(state()->paragraph, "FLOW","align",s1.getPropertyValue("text-align").string());
+@@ -502,7 +529,8 @@
+ */
+ }
+
+-bool KHTMLReader::parse_table(DOM::Element e) {
++bool KHTMLReader::parse_table(DOM::Element e)
++{
+ if(_writer->isInTable()) {
+ // We are already inside of a table. Tables in tables are not supported
+ // yet. So, just add that table-content as text.
+@@ -584,12 +612,14 @@
+ return false; // we do our own recursion
+ }
+
+-bool KHTMLReader::parse_img(DOM::Element /*e*/) {
++bool KHTMLReader::parse_img(DOM::Element /*e*/)
++{
+ //QRect e=e.getRect();
+ return true;
+ }
+
+-bool KHTMLReader::parse_pre(DOM::Element e) {
++bool KHTMLReader::parse_pre(DOM::Element e)
++{
+ #if 0 // see Bug #74601 (normal): kword doesn't recognize PRE-tags in HTML
+ //pushNewState();
+ /// \todo set fixed width font
+@@ -602,69 +632,86 @@
+ #else
+ pushNewState();
+ state()->in_pre_mode=true;
+- for (DOM::Node q=e.firstChild(); !q.isNull(); q=q.nextSibling()) {
++ QString face=e.getAttribute("face").string();
++ _writer->formatAttribute(state()->paragraph,"FONT","name",QString("Courier"));
++ for (DOM::Node q=e.firstChild(); !q.isNull(); q=q.nextSibling())
++ {
+ parseNode(q); // parse everything...
+ }
+ popState();
++ _writer->formatAttribute(state()->paragraph,"FONT","name",face);
+ return false; // children are already handled.
+ #endif
+ }
+
+-bool KHTMLReader::parse_ol(DOM::Element e) {
+- return parse_ul(e);
++bool KHTMLReader::parse_ol(DOM::Element e)
++{
++ return parse_ul(e);
+ }
+
+-bool KHTMLReader::parse_font(DOM::Element e) {
+- // fixme don't hardcode 12 font size ...
+- QString face=e.getAttribute("face").string();
+- QColor color=parsecolor("#000000");
+- if (!e.getAttribute("color").string().isEmpty())
+- color=parsecolor(e.getAttribute("color").string());
+- QString size=e.getAttribute("size").string();
+- int isize=-1;
+- if (size.startsWith("+"))
+- isize=12+size.right(size.length()-1).toInt();
+- else if (size.startsWith("-"))
+- isize=12-size.right(size.length()-1).toInt();
+- else
+- isize=12+size.toInt();
++bool KHTMLReader::parse_font(DOM::Element e)
++{
++ kdDebug(30503) << "Entering parse_font" << endl;
++ // fixme don't hardcode 12 font size ...
++ QString face=e.getAttribute("face").string();
++ QColor color=parsecolor("#000000");
++ if (!e.getAttribute("color").string().isEmpty())
++ color=parsecolor(e.getAttribute("color").string());
++ QString size=e.getAttribute("size").string();
++ int isize=-1;
++ if (size.startsWith("+"))
++ isize=12+size.right(size.length()-1).toInt();
++ else if (size.startsWith("-"))
++ isize=12-size.right(size.length()-1).toInt();
++ else
++ isize=12+size.toInt();
+
+- _writer->formatAttribute(state()->paragraph,"FONT","name",face);
+- if ((isize>=0) && (isize != 12))
+- _writer->formatAttribute(state()->paragraph,"SIZE","value",QString("%1").arg(isize));
++ _writer->formatAttribute(state()->paragraph,"FONT","name",face);
++ if ((isize>=0) && (isize != 12))
++ _writer->formatAttribute(state()->paragraph,"SIZE","value",QString("%1").arg(isize));
+
+- _writer->formatAttribute(state()->paragraph,"COLOR","red",QString("%1").arg(color.red()));
+- _writer->formatAttribute(state()->paragraph,"COLOR","green",QString("%1").arg(color.green()));
+- _writer->formatAttribute(state()->paragraph,"COLOR","blue",QString("%1").arg(color.blue()));
+- return true;
++ _writer->formatAttribute(state()->paragraph,"COLOR","red",QString("%1").arg(color.red()));
++ _writer->formatAttribute(state()->paragraph,"COLOR","green",QString("%1").arg(color.green()));
++ _writer->formatAttribute(state()->paragraph,"COLOR","blue",QString("%1").arg(color.blue()));
++ return true;
+ }
+
+-bool KHTMLReader::parse_ul(DOM::Element e) {
++bool KHTMLReader::parse_ul(DOM::Element e)
++{
+ // Parse the tag ul and all its subnodes. Take special care for the li tag.
+- _list_depth++;
+- for (DOM::Node items=e.firstChild();!items.isNull();items=items.nextSibling()) {
+- if (items.nodeName().string().lower() == "li") {
+- if (!(_writer->getText(state()->paragraph).isEmpty())) startNewLayout();
+- _writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","1");
+- _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext",".");
+- if (e.tagName().string().lower() == "ol")
+- {
+- _writer->layoutAttribute(state()->paragraph,"COUNTER","type","1");
+- _writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","1");
+- _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext",".");
+- }
+- else
+- {
+- _writer->layoutAttribute(state()->paragraph,"COUNTER","type","10");
+- _writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","");
+- _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext","");
+- }
+- _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",QString("%1").arg(_list_depth-1));
+- }
+- parseNode(items);
+- }
+- startNewLayout();
+- _list_depth--;
+- return false;
++ kdDebug(30503) << "Entering KHTMLReader::parse_ul" << endl;
++ kdDebug(30503) << "_writer->getText(state()->paragraph)=" << _writer->getText(state()->paragraph) << endl;
++ _list_depth++;
++ if (e.firstChild().nodeName().string().lower() == "#text") // e.g. <ul>this is indented<li>first listitem</li></ul>
++ {
++ _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",QString("%1").arg(_list_depth-1)); // indent
++ startNewLayout();
++ }
++ for (DOM::Node items=e.firstChild();!items.isNull();items=items.nextSibling())
++ {
++ if (items.nodeName().string().lower() == "li")
++ {
++ if (!(_writer->getText(state()->paragraph).isEmpty())) startNewLayout();
++ _writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","1");
++ _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext",".");
++ if (e.tagName().string().lower() == "ol")
++ {
++ _writer->layoutAttribute(state()->paragraph,"COUNTER","type","1");
++ _writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","1");
++ _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext",".");
++ }
++ else
++ {
++ _writer->layoutAttribute(state()->paragraph,"COUNTER","type","10");
++ _writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","");
++ _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext","");
++ }
++ _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",QString("%1").arg(_list_depth-1)); // indent
++ }
++ parseNode(items);
++ }
++ _list_depth--;
++ kdDebug(30503) << "Leaving KHTMLReader::parse_ul" << endl;
++ return false;
+ }
+
+--- filters/kword/html/import/kwdwriter.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/html/import/kwdwriter.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -405,21 +405,24 @@
+
+ QDomElement KWDWriter::layoutAttribute(QDomElement paragraph, QString name, QString attrName, QString attr)
+ {
+- kdDebug() << "Entering KWDWriter::layoutAttribute" << endl;
+- QDomElement currentLayout=paragraph.elementsByTagName("LAYOUT").item(0).toElement();
+- QDomNodeList qdnl= currentLayout.elementsByTagName(name);
++ kdDebug() << "Entering KWDWriter::layoutAttribute name=" << name << " attrName=" << attrName << " attr=" << attr << endl;
++ QDomElement currentLayout=paragraph.elementsByTagName("LAYOUT").item(0).toElement();
++ QDomNodeList qdnl= currentLayout.elementsByTagName(name);
+
+- if (qdnl.length()) {
+- QDomElement el;
+- el=qdnl.item(0).toElement();
+- el.setAttribute(attrName,attr);
+- return el;
+- } else {
+- QDomElement al=_doc->createElement(name);
+- currentLayout.appendChild(al);
+- al.setAttribute(attrName,attr);
+- return al;
+- }
++ if (qdnl.length())
++ {
++ QDomElement el;
++ el=qdnl.item(0).toElement();
++ el.setAttribute(attrName,attr);
++ return el;
++ }
++ else
++ {
++ QDomElement al=_doc->createElement(name);
++ currentLayout.appendChild(al);
++ al.setAttribute(attrName,attr);
++ return al;
++ }
+ }
+
+ void KWDWriter::addText(QDomElement paragraph, QString text, int format_id, bool keep_formatting) {
+@@ -428,12 +431,16 @@
+ if (temp.isNull()) { kdDebug(30503) << "no text" << endl; return; }
+ QString oldtext=currentText.data();
+ int oldLength=oldtext.length();
+- if (keep_formatting) {
+- if (oldLength) {
++ if (keep_formatting)
++ {
++ if (oldLength)
++ {
+ ++oldLength;
+ oldtext.append('\n');
+ }
+- } else {
++ }
++ else
++ {
+ if (oldLength)
+ ++oldLength; // add new trailing space char
+ text=text.simplifyWhiteSpace(); // drop all unprintable chars
+@@ -441,9 +448,12 @@
+ QString newtext;
+ if (keep_formatting)
+ newtext=oldtext + text;
+- else {
++ else
++ {
+ newtext=oldtext + " " + text;
+- newtext=newtext.simplifyWhiteSpace(); // strip possible new space at beginning.
++ // strip possible newline at beginning.
++ while (newtext.left(1)=="\n" || newtext.left(1)==" ") newtext=newtext.right(newtext.length()-1);
++
+ }
+ currentText.setData(newtext);
+ int newLength=text.length();
+--- filters/kword/html/import/kword_html_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/html/import/kword_html_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,7 +5,7 @@
+ Name[af]=Kword Html In voer Filter
+ Name[ar]=مِرْشَح استيراد HTML لدى KWord
+ Name[az]=KWord HTML Alma Filter
+-Name[bg]=Филтър за импорт от HTML в KWord
++Name[bg]=Филтър за импортиране от HTML в KWord
+ Name[br]=Sil Enporzh HTML KWord
+ Name[ca]=Filtre d'importació HTML per a KWord
+ Name[cs]=KWord HTML importní filtr
+@@ -39,6 +39,7 @@
+ Name[mt]=Filtru għall-importazzjoni ta' HTML ġo KWord
+ Name[nb]=HTML-importfilter for KWord
+ Name[nds]=HTML-Importfilter för KWord
++Name[ne]=केडीई शब्द एचटीएमएल आयात फिल्टर
+ Name[nl]=KWord's HTML-importfilter
+ Name[nn]=HTML-importfilter for KWord
+ Name[pl]=Filtr importu formatu HTML do KWord
+--- filters/kword/starwriter/kword_starwriter_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/starwriter/kword_starwriter_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,7 +3,7 @@
+ Icon=
+ Name=KWord StarWriter 5.x Import Filter
+ Name[ar]=مِرْشَح استيراد StarWriter 5.x لدى KWord
+-Name[bg]=Филтър за импорт от KWord в StarWriter 5.x
++Name[bg]=Филтър за импортиране от KWord в StarWriter 5.x
+ Name[br]=Sil enporzh StarWriter 5.x evit KWord
+ Name[ca]=Filtre d'importació StarWriter 5.x per a KWord
+ Name[cs]=Importní filtr StarWriter 5.x pro KWord
+@@ -32,6 +32,7 @@
+ Name[ms]=Penapis Import KWord StarWriter 5.x
+ Name[nb]=StarWriter 5.x-importfilter for KWord
+ Name[nds]=StarWriter 5.x Importfilter för KWord
++Name[ne]=केडीई शब्द तारालेखक ५.x आयात फिल्टर
+ Name[nl]=KWord StarWriter 5.x Importfilter
+ Name[nn]=StarWriter 5.x-importfilter for KWord
+ Name[pl]=Filtr importu formatu StarWriter 5.x do KWord
+--- filters/kword/kword1.3/import/kword_kword1dot3_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/kword1.3/import/kword_kword1dot3_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,7 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=KWord's KWord 1.3 Import Filter
+-Name[bg]=Филтър за импорт от KWord 1.3 в KWord
++Name[bg]=Филтър за импортиране от KWord 1.3 в KWord
+ Name[br]=Sil enporzh KWord 1.3 evit KWord's
+ Name[ca]=Filtre d'importació KWord 1.3 per a KWord
+ Name[cs]=Importní filtr formátu KWord 1.3
+@@ -30,6 +30,7 @@
+ Name[ms]=Penapis Import KWord 1.3 KWord
+ Name[nb]=KWord 1.3-importfilter for KWord
+ Name[nds]="KWord 1.3"-Importfilter för KWord
++Name[ne]=केडीई शब्दको केडीई शब्द १.३ आयात फिल्टर
+ Name[nl]=KWord's Kword 1.3 Importfilter
+ Name[nn]=KWord 1.3-importfilter for KWord
+ Name[pl]=Filtr importu formatu KWord 1.3 do KWord
+--- filters/kword/pdf/kword_pdf_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/pdf/kword_pdf_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,7 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=KWord PDF Import Filter
+-Name[bg]=Филтър за импорт от PDF в KWord
++Name[bg]=Филтър за импортиране от PDF в KWord
+ Name[br]=Sil enporzh PDF evit KWord
+ Name[ca]=Filtre d'importació PDF per a KWord
+ Name[cs]=Importní filtr PDF pro KWord
+@@ -30,6 +30,7 @@
+ Name[ms]=Penapis Import KWord PDF
+ Name[nb]=PDF-importfilter for KWord
+ Name[nds]=PDF-Importfilter för KWord
++Name[ne]=केडीई शब्द PDF आयात फिल्टर
+ Name[nl]=KWord PDF Importfilter
+ Name[nn]=PDF-importfilter for KWord
+ Name[pl]=Filtr importu formatu PDF do KWord
+--- filters/kword/oowriter/kword_oowriter_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/oowriter/kword_oowriter_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,7 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=OpenOffice.org Writer Import Filter for KWord
+-Name[bg]=Филтър за импорт от OpenOffice.org Writer в KWord
++Name[bg]=Филтър за импортиране от OpenOffice.org Writer в KWord
+ Name[br]=Sil enporzh OpenOffice.org Writer evit KWord
+ Name[ca]=Filtre d'importació OpenOffice.org Writer per a KWord
+ Name[cs]=Importní filtr formátu OpenOffice.org Writer pro KWord
+@@ -30,6 +30,7 @@
+ Name[ms]=Penapis Import OpenOffice.org Writer bagi KWord
+ Name[nb]=OpenOffice.org Writer-importfilter for KWord
+ Name[nds]="OpenOffice.org Writer"-Exportfilter för KWord
++Name[ne]=केडीई शब्दका लागि OpenOffice.org लेखक आयात फिल्टर
+ Name[nl]=OpenOffice.org Writer Importfilter voor KWord
+ Name[nn]=OpenOffice.org Writer-importfilter for KWord
+ Name[pl]=Filtr importu formatu OpenOffice.org Writer dla KWord
+--- filters/kword/oowriter/kword_oowriter_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/oowriter/kword_oowriter_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,7 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=OpenOffice.org Writer Export Filter for KWord
+-Name[bg]=Филтър за експорт от KWord в OpenOffice.org Writer
++Name[bg]=Филтър за експортиране от KWord в OpenOffice.org Writer
+ Name[br]=Sil ezporzh OpenOffice.org Writer evit KWord
+ Name[ca]=Filtre d'exportació OpenOffice.org Writer per a KWord
+ Name[cs]=Exportní filtr formátu OpenOffice.org Writer pro KWord
+@@ -30,6 +30,7 @@
+ Name[ms]=Penapis Eksport OpenOffice.org Writer bagi KWord
+ Name[nb]=OpenOffice.org Writer-eksportfilter for KWord
+ Name[nds]="OpenOffice.org Writer"-Exportfilter för KWord
++Name[ne]=केडीई शब्दका लागि OpenOffice.org लेखक निर्यात फिल्टर
+ Name[nl]=OpenOffice.org Writer Exportfilter voor KWord
+ Name[nn]=OpenOffice.org Writer-eksportfilter for KWord
+ Name[pl]=Filtr eksportu do formatu OpenOffice.org Writer dla KWord
+--- filters/kword/msword/kword_msword_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/msword/kword_msword_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,7 +3,7 @@
+ Type=Service
+ Name=KWord MS Word Import Filter
+ Name[ar]=مِرْشَح استيراد MS Word لدى KWord
+-Name[bg]=Филтър за импорт от MS Word в KWord
++Name[bg]=Филтър за импортиране от MS Word в KWord
+ Name[br]=Sil enporzh MS Word evit KWord
+ Name[ca]=Filtre d'importació MS Word per a KWord
+ Name[cs]=Importní filtr formátu MS Word pro KWord
+@@ -32,6 +32,7 @@
+ Name[ms]=Penapis Import KWord MS Word
+ Name[nb]=MSWord-importfilter for KWord
+ Name[nds]="Microsoft Word"-Importfilter för KWord
++Name[ne]=केडीई शब्द एमएस शब्द आयात फिल्टर
+ Name[nl]=KWord MS Word Importfilter
+ Name[nn]=MS Word-importfilter for KWord
+ Name[pl]=Filtr importu z formatu MS Word do KWord
+--- filters/kword/latex/export/kword_latex_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/latex/export/kword_latex_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -10,7 +10,7 @@
+ Name[af]=Kword Latex Voer uit Filter
+ Name[ar]=مِرْشَح تصدير LATEX لدى KWord
+ Name[az]=KWord LATEX Vermə Süzgəci
+-Name[bg]=Филтър за експорт от KWord в LATEX
++Name[bg]=Филтър за експортиране от KWord в LATEX
+ Name[br]=Sil ezporzh LATEX evit KWord
+ Name[ca]=Filtre d'exportació LATEX per a KWord
+ Name[cs]=KWord LaTeX exportní filtr
+@@ -43,6 +43,7 @@
+ Name[mt]=Filtru għall-esportazzjoni ta' LATEX minn ġo KWord
+ Name[nb]=LaTeX-eksportfilter for KWord
+ Name[nds]=LaTeX-Exportfilter för KWord
++Name[ne]=केडीई शब्द LATEX निर्यात फिल्टर
+ Name[nl]=KWord's LATEX-Exportfilter
+ Name[nn]=LaTeX-eksportfilter for KWord
+ Name[pl]=Filtr eksportu do formatu LaTeX z KWord
+--- filters/kword/latex/import/kword_latex_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kword/latex/import/kword_latex_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -8,7 +8,7 @@
+ ImportDescription=LATEX
+ Name=KWord Latex Import Filter
+ Name[ar]=مِرْشَح استيراد Latex لدى KWord
+-Name[bg]=Филтър за импорт от LATEX в KWord
++Name[bg]=Филтър за импортиране от Latex в KWord
+ Name[br]=Sil enporzh Latex evit KWord
+ Name[ca]=Filtre d'importació Latex per a KWord
+ Name[cs]=Importní filtr formátu LaTeX pro KWord
+@@ -36,6 +36,7 @@
+ Name[ms]=Penapis Import KWord Latex
+ Name[nb]=LaTeX-importfilter for KWord
+ Name[nds]=LaTeX-Importfilter för KWord
++Name[ne]=केडीई शब्द ल्याटेक्स आयात फिल्टर
+ Name[nl]=KWord Latex Importfilter
+ Name[nn]=LaTeX-importfilter for KWord
+ Name[pl]=Filtr importu formatu LaTeX do KWord
+--- filters/kspread/excel/kspread_excel_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kspread/excel/kspread_excel_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,7 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=Excel Export Filter for KSpread
+-Name[bg]=Филтър за експорт от KSpread в Excel
++Name[bg]=Филтър за експортиране от KSpread в Excel
+ Name[br]=Sil ezporzh Excel evit KSpread
+ Name[ca]=Filtre d'exportació Excel per a KSpread
+ Name[cs]=Exportní filtr Excel pro KSpread
+@@ -31,6 +31,7 @@
+ Name[ms]=Penapis Eksport Excel bagi KSpread
+ Name[nb]=Excel-eksportfilter for KSpread
+ Name[nds]=Microsoft Excel-Exportfilter för KSpread
++Name[ne]=केडीई स्प्रिडका लागि एक्सेल निर्यात
+ Name[nl]=Excel Exportfilter voor KSpread
+ Name[nn]=Excel-eksportfilter for KSpread
+ Name[pl]=Filtr eksportu do formatu Excela dla KSpread
+--- filters/kspread/excel/import/kspread_excel_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kspread/excel/import/kspread_excel_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,7 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=KSpread Microsoft Excel Import Filter
+-Name[bg]=Филтър за импорт от Microsoft Excel в KSpread
++Name[bg]=Филтър за импортиране от Microsoft Excel в KSpread
+ Name[br]=Sil enporzh Microsoft Excel evit KSpread
+ Name[ca]=Filtre d'importació Microsoft Excel per a KSpread
+ Name[cs]=Importní filtr Microsoft Excel pro KSpread
+@@ -30,6 +30,7 @@
+ Name[ms]=Penapis Import KSpread Microsoft Excel
+ Name[nb]=Microsoft Excel-importfilter for KSpread
+ Name[nds]=Microsoft Excel-Importfilter för KSpread
++Name[ne]=केडीई स्प्रिड माइक्रोसफ्ट एक्सेल आयात फिल्टर
+ Name[nl]=KSpread Microsoft Excell Importfilter
+ Name[nn]=Microsoft Excel-importfilter for KSpread
+ Name[pl]=Filtr importu formatu Microsoft Excel do KSpread
+--- filters/kspread/kexi/kspread_kexi_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kspread/kexi/kspread_kexi_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Icon=
+ Name=Kexi Import Filter for KSpread
++Name[bg]=Филтър за импортиране от Kexi в KSpread
+ Name[ca]=Filtre d'importació de Kexi per a KSpread
+ Name[da]=Kexi-importfilter for KSpread
+ Name[de]=Kexi-Importfilter für KSpread
+@@ -18,6 +19,7 @@
+ Name[lv]=Kexi importa filtrs priekš KSpread
+ Name[nb]=Kexi-importfilter for KSpread
+ Name[nds]=Kexi-Importfilter för KSpread
++Name[ne]=केडीई स्प्रिडका लागि केक्सी आयात फिल्टर
+ Name[nl]=Kexi-importfilter voor KSpread
+ Name[pl]=Filtr importu formatu Kexi dla KSpread
+ Name[pt]=Filtro de Importação do Kexi para o KSpread
+--- filters/kspread/qpro/kspread_qpro_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kspread/qpro/kspread_qpro_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,7 +5,7 @@
+ Name[af]=Quattro Pro In voer Filter vir Kspread
+ Name[ar]=مِرْشَح استيراد Quattro Pro لدى KSpread
+ Name[az]=KSpread üçün Quattro Pro Alma Süzgəci
+-Name[bg]=Филтър за импорт от Quattro Pro в KSpread
++Name[bg]=Филтър за импортиране от Quattro Pro в KSpread
+ Name[br]=Sil enporzh Quattro Pro evit KSpread
+ Name[bs]=Quattro Pro Import Filter za KSpread
+ Name[ca]=Filtre d'importació Quattro Pro per a KSpread
+@@ -38,6 +38,7 @@
+ Name[mt]=Filtru għall-importazzjoni ta' Quattro Pro ġo KSpread
+ Name[nb]=Quattro Pro-importfilter for KSpread
+ Name[nds]="Quattro Pro"-Importfilter för KSpread
++Name[ne]=केडीई स्प्रिडका लागि क्वाट्रो प्रो आयात फिल्टर
+ Name[nl]=Quattro Pro-importfilter voor KSpread
+ Name[nn]=Quattro Pro-importfilter for KSpread
+ Name[pl]=Filtr importu formatu Quattro Pro dla KSpread
+--- filters/kspread/html/kspread_html_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kspread/html/kspread_html_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,7 +5,7 @@
+ Name[af]=Html Voer uit Filter vir Kspread
+ Name[ar]=مِرْشَح تصدير HTML لدى KSpread
+ Name[az]=KSpread üçün HTML Vermə Süzgəci
+-Name[bg]=Филтър за експорт от KSpread в HTML
++Name[bg]=Филтър за експортиране от KSpread в HTML
+ Name[br]=Sil ezporzh HTML evit KSpread
+ Name[bs]=HTML Export Filter za KSpread
+ Name[ca]=Filtre d'exportació HTML per a KSpread
+@@ -38,6 +38,7 @@
+ Name[mt]=Filtru għall-esportazzjoni ta' fajls HTML minn ġo KSpread
+ Name[nb]=HTML-eksportfilter for KSpread
+ Name[nds]=HTML-Exportfilter för KSpread
++Name[ne]=केडीई स्प्रिडका लागि एचटीएमएल निर्यात फिल्टर
+ Name[nl]=HTML-Exportfilter voor KSpread
+ Name[nn]=HTML-eksportfilter for KSpread
+ Name[pl]=Filtr eksportu do formatu HTML dla KSpread
+--- filters/kspread/opencalc/kspread_opencalc_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kspread/opencalc/kspread_opencalc_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,7 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=OpenOffice.org Calc Import Filter for KSpread
+-Name[bg]=Филтър за импорт от OpenOffice.org Calc в KSpread
++Name[bg]=Филтър за импортиране от OpenOffice.org Calc в KSpread
+ Name[br]=Sil enporzh OpenOffice.org Calc evit KSpread
+ Name[ca]=Filtre d'importació OpenOffige.org Calc per a KSpread
+ Name[cs]=OpenOffice.org Calc importní filtr pro KSpread
+@@ -30,6 +30,7 @@
+ Name[ms]=Penapis Import OpenOffice.org Calc bagi KSpread
+ Name[nb]=OpenOffice.org Calc-importfilter for KSpread
+ Name[nds]="OpenOffice.org Calc"-Importfilter för KSpread
++Name[ne]=केडीई स्प्रिडका लागि OpenOffice.org क्याल्क आयात फिल्टर
+ Name[nl]=OpenOffice.org Calc Importfilter voor KSpread
+ Name[nn]=OpenOffice.org Calc-importfilter for KSpread
+ Name[pl]=Filtr importu formatu OpenOffice.org dla KSpread
+--- filters/kspread/opencalc/kspread_opencalc_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kspread/opencalc/kspread_opencalc_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,7 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=OpenOffice.org Calc Export Filter for KSpread
+-Name[bg]=Филтър за експорт от KSpread в OpenOffice.org Calc
++Name[bg]=Филтър за експортиране от KSpread в OpenOffice.org Calc
+ Name[br]=Sil ezporzh OpenOffice.org Calc evit KSpread
+ Name[ca]=Filtre d'exportació OpenOffige.org Calc per a KSpread
+ Name[cs]=OpenOffice.org Calc exportní filtr pro KSpread
+@@ -30,6 +30,7 @@
+ Name[ms]=Penapis Eksport OpenOffice.org Calc bagi KSpread
+ Name[nb]=OpenOffice.org Calc-eksportfilter for KSpread
+ Name[nds]="OpenOffice.org Calc"-Exportfilter för KSpread
++Name[ne]=केडीई स्प्रिडका लागि OpenOffice.org क्याल्क निर्यात फिल्टर
+ Name[nl]=OpenOffice.org Calc Exportfilter voor KSpread
+ Name[nn]=OpenOffice.org Calc-eksportfilter for KSpread
+ Name[pl]=Filtr eksportu do formatu OpenOffice.org Calc dla KSpread
+--- filters/kspread/gnumeric/kspread_gnumeric_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kspread/gnumeric/kspread_gnumeric_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,7 +5,7 @@
+ Name[af]=Gnumeric In voer Filter vir Kspread
+ Name[ar]=مِرْشَح استيراد GNUMERIC لدى KSpread
+ Name[az]=KSpread üçün GNUMERİC Alma Süzgəci
+-Name[bg]=Филтър за импорт от GNUmeric в KSpread
++Name[bg]=Филтър за импортиране от GNUmeric в KSpread
+ Name[br]=Sil enporzh GNUMERIC evit KSpread
+ Name[bs]=GNUMERIC Import Filter za KSpread
+ Name[ca]=Filtre d'importació GNUmeric per a KSpread
+@@ -39,6 +39,7 @@
+ Name[mt]=Filtru għall-importazzjoni ta' GNUmeric ġo KSpread
+ Name[nb]=GNUmeric-importfilter for KSpread
+ Name[nds]=GNUmeric-Importfilter för KSpread
++Name[ne]=केडीई स्प्रिडका लागि GNUMERIC आयात फिल्टर
+ Name[nl]=GNUmeric-Importfilter voor KSpread
+ Name[nn]=GNUmeric-importfilter for KSpread
+ Name[pl]=Filtr importu formatu GNUmeric dla KSpread
+--- filters/kspread/gnumeric/kspread_gnumeric_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kspread/gnumeric/kspread_gnumeric_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,7 +5,7 @@
+ Name[af]=Gnumeric Voer uit Filter vir Kspread
+ Name[ar]=مِرْشَح تصدير GNUmeric لدى KSpread
+ Name[az]=KSpread üçün GNUmeric Vermə Süzgəci
+-Name[bg]=Филтър за експорт от KSpread в GNUmeric
++Name[bg]=Филтър за експортиране от KSpread в GNUmeric
+ Name[br]=Sil ezporzh GNUMERIC evit KSpread
+ Name[bs]=GNUmeric Export Filter za KSpread
+ Name[ca]=Filtre d'exportació GNUmeric per a KSpread
+@@ -38,6 +38,7 @@
+ Name[mt]=Filtru għall-esportazzjoni ta' files GNUmeric minn ġo KSpread
+ Name[nb]=GNUmeric-eksportfilter for KSpread
+ Name[nds]=GNUmeric-Exportfilter för KSpread
++Name[ne]=केडीई स्प्रिडका लागि जिन्यूमेरिक निर्यात फिल्टर
+ Name[nl]=GNUmeric-Exportfilter voor KSpread
+ Name[nn]=GNUmeric-eksportfilter for KSpread
+ Name[pl]=Filtr eksportu do formatu GNUmeric dla KSpread
+--- filters/kspread/csv/kspread_csv_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kspread/csv/kspread_csv_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ Name=CSV Import Filter for KSpread
+ Name[af]=Cvs In voer Filter vir Kspread
+ Name[az]=KSpread üçün CSV Alma Süzgəci
+-Name[bg]=Филтър за импорт от CSV в KSpread
++Name[bg]=Филтър за импортиране от CSV в KSpread
+ Name[br]=Sil enporzh CSV evit KSpread
+ Name[bs]=CSV Import Filter za KSpread
+ Name[ca]=Filtre d'importació CSV per a KSpread
+@@ -39,6 +39,7 @@
+ Name[mt]=Filtru għall-importazzjoni ta' CSV ġo KSpread
+ Name[nb]=CSV-importfilter for KSpread
+ Name[nds]=CSV-Importfilter för KSpread
++Name[ne]=केडीई स्प्रिडका लागि CSV आयात फिल्टर
+ Name[nl]=CSV-Importfilter voor KSpread
+ Name[nn]=CSV-importfilter for KSpread
+ Name[pl]=Filtr importu formatu CSV dla KSpread
+--- filters/kspread/csv/kspread_csv_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kspread/csv/kspread_csv_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ Name=CSV Export Filter for KSpread
+ Name[af]=Cvs Voer uit Filter vir Kspread
+ Name[az]=KSpread üçün CSV Vermə Süzgəci
+-Name[bg]=Филтър за експорт от KSpread в CSV
++Name[bg]=Филтър за експортиране от KSpread в CSV
+ Name[br]=Sil ezporzh CSV evit KSpread
+ Name[bs]=CSV Export Filter za KSpread
+ Name[ca]=Filtre d'exportació CSV per a KSpread
+@@ -39,6 +39,7 @@
+ Name[mt]=Filtru għall-esportazzjoni ta' files CSV minn ġo KSpread
+ Name[nb]=CSV-eksportfilter for KSpread
+ Name[nds]=CSV-Exportfilter för KSpread
++Name[ne]=केडीई स्प्रिडका लागि CSV निर्यात फिल्टर
+ Name[nl]=CSV-Exportfilter voor KSpread
+ Name[nn]=CSV-eksportfilter for KSpread
+ Name[pl]=Filtr eksportu do formatu CSV dla KSpread
+--- filters/kspread/applixspread/kspread_applixspread_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kspread/applixspread/kspread_applixspread_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ Name=KSpread Applix Spreadsheet Import Filter
+ Name[af]=Kspread Applix Spreiblad In voer Filter
+ Name[az]=KSpread Applix Hesab Cədvəli Alma Süzgəci
+-Name[bg]=Филтър за импорт от Applix Spreadsheet в KSpread
++Name[bg]=Филтър за импортиране от Applix Spreadsheet в KSpread
+ Name[br]=Sil enporzh al loger Applix evit KSpread
+ Name[ca]=Filtre d'importació per a fulls per a càlcul Applix per a KSpread
+ Name[cs]=KSpread Applix Spreadsheet importní filtr
+@@ -35,6 +35,7 @@
+ Name[mt]=Filtru għall-importazzjoni ta' Spreadsheet Applix ġo KSpread
+ Name[nb]=Applix-regnearkimportfilter for KSpread
+ Name[nds]="Applix-Tabellenutreken"-Importfilter för KSpread
++Name[ne]=केडीई स्प्रिड एप्लिक्स स्प्रिडसिट आयात फिल्टर
+ Name[nl]=KSpread Applix Spreadsheet Importfilter
+ Name[nn]=Applix Spreadsheet-importfilter for KSpread
+ Name[pl]=Filtr importu formatu arkusza kalkulacyjnego Applix do KSpread
+--- filters/kspread/latex/export/kspread_latex_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kspread/latex/export/kspread_latex_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -8,7 +8,7 @@
+ ImportDescription=KSpread
+ Name=KSpread LATEX Export Filter
+ Name[ar]=مِرْشَح تصدير LATEX لدى KSpread
+-Name[bg]=Филтър за експорт от KSpread в LATEX
++Name[bg]=Филтър за експортиране от KSpread в LATEX
+ Name[br]=Sil ezporzh LATEX evit KSpread
+ Name[ca]=Filtre d'exportació LATEX per a KSpread
+ Name[cs]=KSpread LaTeX exportní filtr
+@@ -36,6 +36,7 @@
+ Name[ms]=Penapis Eksport KSpread LATEX
+ Name[nb]=LaTeX-eksportfilter for KSpread
+ Name[nds]=LaTeX-Exportfilter för KSpread
++Name[ne]=केडीई स्प्रिड LATEX निर्यात फिल्टर
+ Name[nl]=KSpread LATEX Exportfilter
+ Name[nn]=LaTeX-eksportfilter for KSpread
+ Name[pl]=Filtr eksportu do formatu LaTeX z KSpread
+--- filters/kspread/dbase/kspread_dbase_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kspread/dbase/kspread_dbase_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,7 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=KSpread dBASE Import Filter
+-Name[bg]=Филтър за импорт от dBASE в KSpread
++Name[bg]=Филтър за импортиране от dBASE в KSpread
+ Name[br]=Sil enporzh dBASE evit KSpread
+ Name[ca]=Filtre d'importació bBASE per a KSpread
+ Name[cs]=Importní filtr dBASE pro KSpread
+@@ -33,6 +33,7 @@
+ Name[mt]=Filtru għall-importazzjoni ta' dBase ġo KSpread
+ Name[nb]=dBASE-importfilter for KSpread
+ Name[nds]=dBASE-Importfilter för KSpread
++Name[ne]=केडीई स्प्रिड डिबेस आयात फिल्टर
+ Name[nl]=KSpread dBASE Importfilter
+ Name[nn]=dBASE-importfilter for KSpread
+ Name[pl]=Filtr importu formatu dBASE do KSpread
+--- filters/xsltfilter/export/xslt_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/xsltfilter/export/xslt_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -10,7 +10,7 @@
+ Name=KOffice XSLT Export Filter
+ Name[af]=Koffice Xslt Voer uit Filter
+ Name[ar]=مِرْشَح تصدير XSLT لدى KOffice
+-Name[bg]=Филтър за експорт от KOffice в XSLT
++Name[bg]=Филтър за експортиране от KOffice в XSLT
+ Name[br]=Sil ezporzh XSLT evit KOffice
+ Name[ca]=Filtre d'exportació XSLT per a KOfiice
+ Name[cs]=Exportní filtr typu XSLT pro KOffice
+@@ -42,6 +42,7 @@
+ Name[mt]=Filtru għall-esportazzjoni ta' XSLT minn KOffice
+ Name[nb]=XSLT-eksportfilter for KOffice
+ Name[nds]=XSLT-Exportfilter för KOffice
++Name[ne]=केडीई कार्यालय XSLT निर्यात फिल्टर
+ Name[nl]=XSLT-exportfilter voor KOffice
+ Name[nn]=XSLT-eksportfilter for KOffice
+ Name[pl]=Filtr eksportu do formatu XSLT z KOffice
+--- filters/xsltfilter/import/xslt_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/xsltfilter/import/xslt_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -9,7 +9,7 @@
+ Name=KOffice XSLT Import Filter
+ Name[af]=Koffice Xslt In voer Filter
+ Name[ar]=مِرْشَح استيراد XSLT لدى KOffice
+-Name[bg]=Филтър за импорт от XSLT в KOffice
++Name[bg]=Филтър за импортиране от XSLT в KOffice
+ Name[br]=Sil enporzh XSLT evit KOffice
+ Name[ca]=Filtre d'importació XSLT per a KOfiice
+ Name[cs]=Importní filtr typu XSLT pro KOffice
+@@ -41,6 +41,7 @@
+ Name[mt]=Filtru għall-importazzjoni ta' XSLT ġo KOffice
+ Name[nb]=XSLT-importfilter for KOffice
+ Name[nds]=XSLT-Importfilter för KOffice
++Name[ne]=केडीई कार्यालय XSLT आयात फिल्टर
+ Name[nl]=XSLT-importfilter voor KOffice
+ Name[nn]=XSLT-importfilter for KOffice
+ Name[pl]=Filtr importu formatu XSLT do KOffice
+--- filters/olefilters/powerpoint97/ole_powerpoint97_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/olefilters/powerpoint97/ole_powerpoint97_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ Name=KPresenter PowerPoint 97 Filter
+ Name[af]=Kpresenter Powerpoint 97 Filter
+ Name[az]=KPresenter PowerPoint 97 Süzgəci
+-Name[bg]=Филтър за импорт от PowerPoint 97 в KPresenter
++Name[bg]=Филтър за експортиране от KPresenter в PowerPoint 97
+ Name[br]=Sil PowerPoint 97 KPresenter
+ Name[ca]=Filtre d'exportació PowerPoint 97 per a KPresenter
+ Name[cy]=Hidlen PowerPoint 97 KPresenter
+@@ -33,6 +33,7 @@
+ Name[mt]=Filtru PowerPoint 97 għal KPresenter
+ Name[nb]=PowerPoint 97-filter for KPresenter
+ Name[nds]=PowerPoint97-Filter för KPresenter
++Name[ne]=केडीई प्रस्तुतकर्ता पावरपोइन्ट ९७ फिल्टर
+ Name[nl]=PowerPoint 97-filter voor KPresenter
+ Name[nn]=PowerPoint 97-filter for KPresenter
+ Name[pl]=Filtr PowerPoint 97 dla KPresenter
+--- filters/kugar/kugarnop/kugar_kugar_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kugar/kugarnop/kugar_kugar_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,7 +3,7 @@
+ Type=Service
+ Name=Kugar KugarXML Import Filter
+ Name[ar]=مِرْشَح استيراد KugarXML لدى Kugar
+-Name[bg]=Филтър за импорт от KugarXML в Kugar
++Name[bg]=Филтър за импортиране от KugarXML в Kugar
+ Name[br]=Sil enporzh KugarXML evit Kugar
+ Name[ca]=Filtre d'importació KugarXML per a Kugar
+ Name[cs]=Importní filtr Kugar XML
+@@ -31,6 +31,7 @@
+ Name[ms]=Penapis Import Kugar KugarXML
+ Name[nb]=KugarXML-importfilter for Kugar
+ Name[nds]=KugarXML-Importfilter för Kugar
++Name[ne]=कुगर कुगर एक्सएमएल आयात फिल्टर
+ Name[nl]=Kugar KugarXML Importfilter
+ Name[nn]=KugarXML-importfilter for Kugar
+ Name[pl]=Filtr importu formatu KugarXML do Kugar
+--- filters/krita/openexr/krita_openexr.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/krita/openexr/krita_openexr.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,8 +5,10 @@
+ Name[hi]=के-रिता
+ Name[km]= Krita
+ Name[lo]=ກຣິຕາ
++Name[ne]=क्रिता
+ Exec=krita %u
+ GenericName=Painting and Image Editing Application
++GenericName[bg]=Редактор на графични изображения
+ GenericName[ca]=Programa de dibuix i manipulació d'imatges
+ GenericName[cs]=Malování a úpravy obrázků
+ GenericName[cy]=Cymhwysiad Peintio Golygu Delweddau
+@@ -26,10 +28,11 @@
+ GenericName[is]=Málun og myndritill
+ GenericName[it]=Applicazione di disegno e di modifica delle immagini
+ GenericName[ja]=描画と画像編集のためのアプリケーション
+-GenericName[km]=កម្មវិធីគូរគំនូរ និង កែសម្រួលរូបភាព
++GenericName[km]=កម្មវិធីគូរគំនូរ និងកែសម្រួលរូបភាព
+ GenericName[lv]=Zīmēšanas un attēlu apstrādes programma
+ GenericName[nb]=Program for tegning og bilderedigering
+ GenericName[nds]=Programm för't Malen un Bildbewerken
++GenericName[ne]=पेन्टीङ्ग र छवि सम्पादन अनुप्रयोग
+ GenericName[nl]=Afbeeldingsmanipulatie
+ GenericName[pl]=Program do edycji zdjęć oraz rysunków
+ GenericName[pt]=Aplicação de Pintura e Edição de Imagens
+--- filters/krita/openexr/krita_openexr_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/krita/openexr/krita_openexr_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Krita OpenEXR Export Filter
++Name[bg]=Филтър за експортиране от Krita в OpenEXR
+ Name[br]=Sil ezporzh OpenEXR evit Krita
+ Name[ca]=Filtre d'exportació OpenEXR per a Krita
+ Name[cy]=Hidl Allforio OpenEXR Krita
+@@ -24,6 +25,7 @@
+ Name[lv]=Krita OpenEXR eksporta filtrs
+ Name[nb]=OpenEXR-eksportfilter for Krita
+ Name[nds]=OpenEXR-Exportfilter för Krita
++Name[ne]=क्रिता खुलाEXR निर्यात फिल्टर
+ Name[nl]=Krita OpenEXR Exportfilter
+ Name[pl]=Filtr eksportu do formatu OpenEXR z Krita
+ Name[pt]=Filtro de Exportação de OpenEXR do Krita
+--- filters/krita/openexr/krita_openexr_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/krita/openexr/krita_openexr_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=Krita OpenEXR Import Filter
++Name[bg]=Филтър за импортиране от OpenEXR в Krita
+ Name[br]=Sil enporzh OpenEXR evit Krita
+ Name[ca]=Filtre d'importació OpenEXR per a Krita
+ Name[cy]=Hidl Mewnforio OpenEXR Krita
+@@ -25,6 +26,7 @@
+ Name[lv]=Krita OpenEXR importa filtrs
+ Name[nb]=OpenEXR-importfilter for Krita
+ Name[nds]=OpenEXR-Importfilter för Krita
++Name[ne]=क्रिता खुलाEXR आयात फिल्टर
+ Name[nl]=Krita OpenEXR Importfilter
+ Name[pl]=Filtr importu formatu OpenEXR do Krita
+ Name[pt]=Filtro de Importação de OpenEXR para o Krita
+--- filters/krita/xcf/krita_xcf_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/krita/xcf/krita_xcf_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Krita XCF Export Filter
++Name[bg]=Филтър за експортиране от Krita в XCF
+ Name[br]=Sil ezporzh XCF evit Krita
+ Name[ca]=Filtre d'exportació XCF per a Krita
+ Name[cy]=Hidl Allforio XCF Krita
+@@ -24,6 +25,7 @@
+ Name[lv]=Krita XCF eksporta filtrs
+ Name[nb]=XCF-eksportfilter for Krita
+ Name[nds]=XCF-Exportfilter för Krita
++Name[ne]=क्रिता XFC निर्यात फिल्टर
+ Name[nl]=Krita XCF Exportfilter
+ Name[pl]=Filtr eksportu do formatu XCF dla Krita
+ Name[pt]=Filtro de Exportação de XCF para o Krita
+--- filters/krita/xcf/krita_xcf_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/krita/xcf/krita_xcf_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=Krita XCF Import Filter
++Name[bg]=Филтър за импортиране от XCF в Krita
+ Name[br]=Sil enporzh XCF evit Krita
+ Name[ca]=Filtre d'importació XCF per a Krita
+ Name[cy]=Hidl Mewnforio XCF Krita
+@@ -25,6 +26,7 @@
+ Name[lv]=Krita XCF importa filtrs
+ Name[nb]=XCF-importfilter for Krita
+ Name[nds]=XCF-Importfilter för Krita
++Name[ne]=क्रिता XCF आयात फिल्टर
+ Name[nl]=Krita XCF Importfilter
+ Name[pl]=Filtr importu formatu XCF dla Krita
+ Name[pt]=Filtro de Importação de XCF para o Krita
+--- filters/krita/gmagick/krita_magick_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/krita/gmagick/krita_magick_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,7 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=Krita Magick Import Filter
+-Name[bg]=Филтър за импорт от Magick в Krita
++Name[bg]=Филтър за импортиране от Magick в Krita
+ Name[br]=Sil enporzh Magick evit Krita
+ Name[ca]=Filtre d'importació Magick per a Krita
+ Name[cs]=Importní filtr formátu Magick pro Kritu
+@@ -31,6 +31,7 @@
+ Name[ms]=Penapis Import Krita Magick
+ Name[nb]=Magick-importfilter for Krita
+ Name[nds]=Magick-Importfilter för Krita
++Name[ne]=क्रिता म्याजिकके आयात फिल्टर
+ Name[nl]=Krita Magick Importfilter
+ Name[nn]=Magick-importfilter for Krita
+ Name[pl]=Filtr importu formatu Magick do Krita
+--- filters/krita/gmagick/krita_magick.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/krita/gmagick/krita_magick.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,8 +5,10 @@
+ Name[hi]=के-रिता
+ Name[km]= Krita
+ Name[lo]=ກຣິຕາ
++Name[ne]=क्रिता
+ Exec=krita %u
+ GenericName=Painting and Image Editing Application
++GenericName[bg]=Редактор на графични изображения
+ GenericName[ca]=Programa de dibuix i manipulació d'imatges
+ GenericName[cs]=Malování a úpravy obrázků
+ GenericName[cy]=Cymhwysiad Peintio Golygu Delweddau
+@@ -26,10 +28,11 @@
+ GenericName[is]=Málun og myndritill
+ GenericName[it]=Applicazione di disegno e di modifica delle immagini
+ GenericName[ja]=描画と画像編集のためのアプリケーション
+-GenericName[km]=កម្មវិធីគូរគំនូរ និង កែសម្រួលរូបភាព
++GenericName[km]=កម្មវិធីគូរគំនូរ និងកែសម្រួលរូបភាព
+ GenericName[lv]=Zīmēšanas un attēlu apstrādes programma
+ GenericName[nb]=Program for tegning og bilderedigering
+ GenericName[nds]=Programm för't Malen un Bildbewerken
++GenericName[ne]=पेन्टीङ्ग र छवि सम्पादन अनुप्रयोग
+ GenericName[nl]=Afbeeldingsmanipulatie
+ GenericName[pl]=Program do edycji zdjęć oraz rysunków
+ GenericName[pt]=Aplicação de Pintura e Edição de Imagens
+--- filters/krita/gmagick/krita_magick_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/krita/gmagick/krita_magick_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Krita Magick Export Filter
++Name[bg]=Филтър за експортиране от Krita в Magick
+ Name[br]=Sil ezporzh Magick evit Krita
+ Name[ca]=Filtre d'exportació Magick per a Krita
+ Name[cy]=Hidl Allforio Magick Krita
+@@ -26,6 +27,7 @@
+ Name[ms]=Penapis Eksport Krita Magick
+ Name[nb]=Magick-eksportfilter for Krita
+ Name[nds]=Magick-Exportfilter för Krita
++Name[ne]=क्रिता म्याजिकके निर्यात फिल्टर
+ Name[nl]=Krita Magick Exportfilter
+ Name[nn]=Magick-eksportfilter for Krita
+ Name[pl]=Filtr eksportu do formatu Magick z Krita
+--- filters/krita/png/krita_png_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/krita/png/krita_png_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=Krita PNG Import Filter
++Name[bg]=Филтър за импортиране от PNG в Krita
+ Name[br]=Sil enporzh PNG evit Krita
+ Name[ca]=Filtre d'importació PNG per a Krita
+ Name[da]=Krita PNG-importfilter
+@@ -24,6 +25,7 @@
+ Name[lv]=Krita PNG importa filtrs
+ Name[nb]=PNG-importfilter for Krita
+ Name[nds]=PNG-Importfilter för Krita
++Name[ne]=क्रिता पीएनजी आयात फिल्टर
+ Name[nl]=Krita PNG Importfilter
+ Name[pl]=Filtr importu z formatu PNG dla Krita
+ Name[pt]=Filtro de Importação de PNG para o Krita
+--- filters/krita/png/krita_png.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/krita/png/krita_png.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,8 +5,10 @@
+ Name[hi]=के-रिता
+ Name[km]= Krita
+ Name[lo]=ກຣິຕາ
++Name[ne]=क्रिता
+ Exec=krita %u
+ GenericName=Painting and Image Editing Application
++GenericName[bg]=Редактор на графични изображения
+ GenericName[ca]=Programa de dibuix i manipulació d'imatges
+ GenericName[cs]=Malování a úpravy obrázků
+ GenericName[cy]=Cymhwysiad Peintio Golygu Delweddau
+@@ -26,10 +28,11 @@
+ GenericName[is]=Málun og myndritill
+ GenericName[it]=Applicazione di disegno e di modifica delle immagini
+ GenericName[ja]=描画と画像編集のためのアプリケーション
+-GenericName[km]=កម្មវិធីគូរគំនូរ និង កែសម្រួលរូបភាព
++GenericName[km]=កម្មវិធីគូរគំនូរ និងកែសម្រួលរូបភាព
+ GenericName[lv]=Zīmēšanas un attēlu apstrādes programma
+ GenericName[nb]=Program for tegning og bilderedigering
+ GenericName[nds]=Programm för't Malen un Bildbewerken
++GenericName[ne]=पेन्टीङ्ग र छवि सम्पादन अनुप्रयोग
+ GenericName[nl]=Afbeeldingsmanipulatie
+ GenericName[pl]=Program do edycji zdjęć oraz rysunków
+ GenericName[pt]=Aplicação de Pintura e Edição de Imagens
+--- filters/krita/png/krita_png_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/krita/png/krita_png_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Krita PNG Export Filter
++Name[bg]=Филтър за експортиране от Krita в PNG
+ Name[br]=Sil ezporzh PNG evit Krita
+ Name[ca]=Filtre d'exportació PNG per a Krita
+ Name[da]=Krita PNG-eksportfilter
+@@ -23,6 +24,7 @@
+ Name[lv]=Krita PNG eksporta filtrs
+ Name[nb]=PNG-eksportfilter for Krita
+ Name[nds]=PNG-Exportfilter för Krita
++Name[ne]=क्रिता पीएनजी निर्यात फिल्टर
+ Name[nl]=Krita PNG Exportfilter
+ Name[pl]=Filtr eksportu do formatu PNG dla Krita
+ Name[pt]=Filtro de Exportação de PNG para o Krita
+--- filters/krita/jpeg/krita_jpeg_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/krita/jpeg/krita_jpeg_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Icon=
+ Name=Krita PNG Import Filter
++Name[bg]=Филтър за импортиране от PNG в Krita
+ Name[br]=Sil enporzh PNG evit Krita
+ Name[ca]=Filtre d'importació PNG per a Krita
+ Name[da]=Krita PNG-importfilter
+@@ -24,6 +25,7 @@
+ Name[lv]=Krita PNG importa filtrs
+ Name[nb]=PNG-importfilter for Krita
+ Name[nds]=PNG-Importfilter för Krita
++Name[ne]=क्रिता पीएनजी आयात फिल्टर
+ Name[nl]=Krita PNG Importfilter
+ Name[pl]=Filtr importu z formatu PNG dla Krita
+ Name[pt]=Filtro de Importação de PNG para o Krita
+--- filters/krita/jpeg/kis_jpeg_converter.cc (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/krita/jpeg/kis_jpeg_converter.cc (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -282,24 +282,24 @@
+ layer->paintDevice()->mirrorY();
+ break;
+ case 3:
+- image()->rotate(180, 0);
++ image()->rotate(M_PI, 0);
+ break;
+ case 4:
+ layer->paintDevice()->mirrorX();
+ break;
+ case 5:
+- image()->rotate(90, 0);
++ image()->rotate(M_PI/2, 0);
+ layer->paintDevice()->mirrorY();
+ break;
+ case 6:
+- image()->rotate(90, 0);
++ image()->rotate(M_PI/2, 0);
+ break;
+ case 7:
+- image()->rotate(90, 0);
++ image()->rotate(M_PI/2, 0);
+ layer->paintDevice()->mirrorX();
+ break;
+ case 8:
+- image()->rotate(270, 0);
++ image()->rotate(-M_PI/2 + 2*M_PI, 0);
+ break;
+ default:
+ break;
+--- filters/krita/jpeg/krita_jpeg.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/krita/jpeg/krita_jpeg.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Encoding=UTF-8
+ Exec=krita %u
+ GenericName=Application for Drawing and Handling of Images
++GenericName[bg]=Приложение за рисуване и обработка на изображения
+ GenericName[ca]=Aplicació per a dibuix i modificació d'imatges
+ GenericName[da]=Tegne- og billedbehandlingsprogram
+ GenericName[de]=Programm zum Zeichnen und Bearbeiten von Bildern
+@@ -18,10 +19,11 @@
+ GenericName[is]=Teikni og myndvinnsluforrit
+ GenericName[it]=Applicazione di disegno e gestione di immagini
+ GenericName[ja]=描画と画像操作のためのアプリケーション
+-GenericName[km]=កម្មវិធីសម្រាប់គូរ និង ដោះស្រាយនៃរូបភាព
++GenericName[km]=កម្មវិធីសម្រាប់គូរ និងដោះស្រាយនៃរូបភាព
+ GenericName[lv]=Programma zīmēšanai un attēlu apstrādei
+ GenericName[nb]=Program for tegning og bildehåndtering
+ GenericName[nds]=Programm för't Teken un Bildhanteren
++GenericName[ne]=रेखाचित्र र छविहरूको ह्यान्डल गर्न अनुप्रयोग
+ GenericName[nl]=Toepassing om afbeeldingen te tekenen en te bewerken
+ GenericName[pl]=Program do rysowania i obróbki obrazków
+ GenericName[pt]=Aplicação de Desenho e Manipulação de Imagens
+@@ -43,6 +45,7 @@
+ Name[hi]=के-रिता
+ Name[km]= Krita
+ Name[lo]=ກຣິຕາ
++Name[ne]=क्रिता
+ Path=
+ StartupNotify=true
+ Terminal=false
+--- filters/krita/jpeg/krita_jpeg_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/krita/jpeg/krita_jpeg_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Icon=
+ Name=Krita PNG Export Filter
++Name[bg]=Филтър за експортиране от Krita в PNG
+ Name[br]=Sil ezporzh PNG evit Krita
+ Name[ca]=Filtre d'exportació PNG per a Krita
+ Name[da]=Krita PNG-eksportfilter
+@@ -24,6 +25,7 @@
+ Name[lv]=Krita PNG eksporta filtrs
+ Name[nb]=PNG-eksportfilter for Krita
+ Name[nds]=PNG-Exportfilter för Krita
++Name[ne]=क्रिता पीएनजी निर्यात फिल्टर
+ Name[nl]=Krita PNG Exportfilter
+ Name[pl]=Filtr eksportu do formatu PNG dla Krita
+ Name[pt]=Filtro de Exportação de PNG para o Krita
+--- filters/krita/tiff/krita_tiff_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/krita/tiff/krita_tiff_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Icon=
+ Name=Krita TIFF Import Filter
++Name[bg]=Филтър за импортиране от TIFF в Krita
+ Name[br]=Sil enporzh TIFF evit Krita
+ Name[ca]=Filtre d'importació TIFF per a Krita
+ Name[da]=Krita TIFF-importfilter
+@@ -24,6 +25,7 @@
+ Name[lv]=Krita TIFF importa filtrs
+ Name[nb]=TIFF-importfilter for Krita
+ Name[nds]=TIFF-Importfilter för Krita
++Name[ne]=क्रिता TIFF आयात फिल्टर
+ Name[nl]=Krita TIFF Importfilter
+ Name[pl]=Filtr importu formatu TIFF dla Krita
+ Name[pt]=Filtro de Importação de TIFF para o Krita
+--- filters/krita/tiff/krita_tiff.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/krita/tiff/krita_tiff.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Encoding=UTF-8
+ Exec=krita %u
+ GenericName=Painting and Image Editing Application
++GenericName[bg]=Редактор на графични изображения
+ GenericName[ca]=Programa de dibuix i manipulació d'imatges
+ GenericName[cs]=Malování a úpravy obrázků
+ GenericName[cy]=Cymhwysiad Peintio Golygu Delweddau
+@@ -22,10 +23,11 @@
+ GenericName[is]=Málun og myndritill
+ GenericName[it]=Applicazione di disegno e di modifica delle immagini
+ GenericName[ja]=描画と画像編集のためのアプリケーション
+-GenericName[km]=កម្មវិធីគូរគំនូរ និង កែសម្រួលរូបភាព
++GenericName[km]=កម្មវិធីគូរគំនូរ និងកែសម្រួលរូបភាព
+ GenericName[lv]=Zīmēšanas un attēlu apstrādes programma
+ GenericName[nb]=Program for tegning og bilderedigering
+ GenericName[nds]=Programm för't Malen un Bildbewerken
++GenericName[ne]=पेन्टीङ्ग र छवि सम्पादन अनुप्रयोग
+ GenericName[nl]=Afbeeldingsmanipulatie
+ GenericName[pl]=Program do edycji zdjęć oraz rysunków
+ GenericName[pt]=Aplicação de Pintura e Edição de Imagens
+@@ -48,6 +50,7 @@
+ Name[hi]=के-रिता
+ Name[km]= Krita
+ Name[lo]=ກຣິຕາ
++Name[ne]=क्रिता
+ Path=
+ StartupNotify=true
+ Terminal=false
+--- filters/krita/tiff/krita_tiff_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/krita/tiff/krita_tiff_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Icon=
+ Name=Krita TIFF Export Filter
++Name[bg]=Филтър за експортиране от Krita в TIFF
+ Name[br]=Sil ezporzh TIFF evit Krita
+ Name[ca]=Filtre d'exportació TIFF per a Krita
+ Name[da]=Krita TIFF-eksportfilter
+@@ -24,6 +25,7 @@
+ Name[lv]=Krita TIFF eksporta filtrs
+ Name[nb]=TIFF-eksportfilter for Krita
+ Name[nds]=TIFF-Exportfilter för Krita
++Name[ne]=क्रिता TIFF निर्यात फिल्टर
+ Name[nl]=Krita TIFF Exportfilter
+ Name[pl]=Filtr eksportu do formatu TIFF dla Krita
+ Name[pt]=Filtro de Exportação de TIFF para o Krita
+--- filters/krita/pdf/pdfimportwidgetbase.ui (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/krita/pdf/pdfimportwidgetbase.ui (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -298,6 +298,16 @@
+ </widget>
+ <customwidgets>
+ </customwidgets>
++<tabstops>
++ <tabstop>boolFirstPage</tabstop>
++ <tabstop>listPages</tabstop>
++ <tabstop>intHorizontal</tabstop>
++ <tabstop>kComboBox1</tabstop>
++ <tabstop>intVertical</tabstop>
++ <tabstop>kComboBox2</tabstop>
++ <tabstop>intWidth</tabstop>
++ <tabstop>intHeight</tabstop>
++</tabstops>
+ <layoutdefaults spacing="6" margin="11"/>
+ <includehints>
+ <includehint>kcombobox.h</includehint>
+--- filters/krita/pdf/krita_pdf_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/krita/pdf/krita_pdf_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=Krita PDF Import Filter
++Name[bg]=Филтър за импортиране от PDF в Krita
+ Name[br]=Sil enporzh PDF evit Krita
+ Name[ca]=Filtre d'importació PDF per a Krita
+ Name[da]=Krita PDF-importfilter
+@@ -21,6 +22,7 @@
+ Name[lv]=Krita PDF importa filtrs
+ Name[nb]=PDF-importfilter for Krita
+ Name[nds]=PDF-Importfilter för Krita
++Name[ne]=क्रिता PDF आयात फिल्टर
+ Name[nl]=Krita PDF Importfilter
+ Name[pl]=Filtr importu formatu PDF do Krita
+ Name[pt]=Filtro de Importação de PDF para o Krita
+--- filters/krita/pdf/krita_pdf.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/krita/pdf/krita_pdf.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Encoding=UTF-8
+ Exec=krita %u
+ GenericName=Painting and Image Editing Application
++GenericName[bg]=Редактор на графични изображения
+ GenericName[ca]=Programa de dibuix i manipulació d'imatges
+ GenericName[cs]=Malování a úpravy obrázků
+ GenericName[cy]=Cymhwysiad Peintio Golygu Delweddau
+@@ -22,10 +23,11 @@
+ GenericName[is]=Málun og myndritill
+ GenericName[it]=Applicazione di disegno e di modifica delle immagini
+ GenericName[ja]=描画と画像編集のためのアプリケーション
+-GenericName[km]=កម្មវិធីគូរគំនូរ និង កែសម្រួលរូបភាព
++GenericName[km]=កម្មវិធីគូរគំនូរ និងកែសម្រួលរូបភាព
+ GenericName[lv]=Zīmēšanas un attēlu apstrādes programma
+ GenericName[nb]=Program for tegning og bilderedigering
+ GenericName[nds]=Programm för't Malen un Bildbewerken
++GenericName[ne]=पेन्टीङ्ग र छवि सम्पादन अनुप्रयोग
+ GenericName[nl]=Afbeeldingsmanipulatie
+ GenericName[pl]=Program do edycji zdjęć oraz rysunków
+ GenericName[pt]=Aplicação de Pintura e Edição de Imagens
+@@ -48,6 +50,7 @@
+ Name[hi]=के-रिता
+ Name[km]= Krita
+ Name[lo]=ກຣິຕາ
++Name[ne]=क्रिता
+ Path=
+ StartupNotify=true
+ Terminal=false
+--- filters/krita/raw/krita_raw_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/krita/raw/krita_raw_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=Krita RAW Import Filter
++Name[bg]=Филтър за импортиране на RAW в Krita
+ Name[br]=Sil enporzh RAW evit Krita
+ Name[ca]=Filtre d'importació RAW per a Krita
+ Name[da]=Krita RAW-importfilter
+@@ -24,6 +25,7 @@
+ Name[lv]=Krita RAW importa filtrs
+ Name[nb]=RAW importfilter for Krita
+ Name[nds]=RAW-Importfilter för Krita
++Name[ne]=क्रिता RAW आयात फिल्टर
+ Name[nl]=Krita RAW Importfilter
+ Name[pl]=Filtr importu formatu RAW dla Krita
+ Name[pt]=Filtro de Importação RAW para o Krita
+--- filters/krita/raw/krita_raw.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/krita/raw/krita_raw.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,8 +5,10 @@
+ Name[hi]=के-रिता
+ Name[km]= Krita
+ Name[lo]=ກຣິຕາ
++Name[ne]=क्रिता
+ Exec=krita %u
+ GenericName=Painting and Image Editing Application
++GenericName[bg]=Редактор на графични изображения
+ GenericName[ca]=Programa de dibuix i manipulació d'imatges
+ GenericName[cs]=Malování a úpravy obrázků
+ GenericName[cy]=Cymhwysiad Peintio Golygu Delweddau
+@@ -26,10 +28,11 @@
+ GenericName[is]=Málun og myndritill
+ GenericName[it]=Applicazione di disegno e di modifica delle immagini
+ GenericName[ja]=描画と画像編集のためのアプリケーション
+-GenericName[km]=កម្មវិធីគូរគំនូរ និង កែសម្រួលរូបភាព
++GenericName[km]=កម្មវិធីគូរគំនូរ និងកែសម្រួលរូបភាព
+ GenericName[lv]=Zīmēšanas un attēlu apstrādes programma
+ GenericName[nb]=Program for tegning og bilderedigering
+ GenericName[nds]=Programm för't Malen un Bildbewerken
++GenericName[ne]=पेन्टीङ्ग र छवि सम्पादन अनुप्रयोग
+ GenericName[nl]=Afbeeldingsmanipulatie
+ GenericName[pl]=Program do edycji zdjęć oraz rysunków
+ GenericName[pt]=Aplicação de Pintura e Edição de Imagens
+--- filters/krita/magick/krita_magick_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/krita/magick/krita_magick_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,7 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=Krita Magick Import Filter
+-Name[bg]=Филтър за импорт от Magick в Krita
++Name[bg]=Филтър за импортиране от Magick в Krita
+ Name[br]=Sil enporzh Magick evit Krita
+ Name[ca]=Filtre d'importació Magick per a Krita
+ Name[cs]=Importní filtr formátu Magick pro Kritu
+@@ -31,6 +31,7 @@
+ Name[ms]=Penapis Import Krita Magick
+ Name[nb]=Magick-importfilter for Krita
+ Name[nds]=Magick-Importfilter för Krita
++Name[ne]=क्रिता म्याजिकके आयात फिल्टर
+ Name[nl]=Krita Magick Importfilter
+ Name[nn]=Magick-importfilter for Krita
+ Name[pl]=Filtr importu formatu Magick do Krita
+--- filters/krita/magick/krita_magick.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/krita/magick/krita_magick.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,8 +5,10 @@
+ Name[hi]=के-रिता
+ Name[km]= Krita
+ Name[lo]=ກຣິຕາ
++Name[ne]=क्रिता
+ Exec=krita %u
+ GenericName=Painting and Image Editing Application
++GenericName[bg]=Редактор на графични изображения
+ GenericName[ca]=Programa de dibuix i manipulació d'imatges
+ GenericName[cs]=Malování a úpravy obrázků
+ GenericName[cy]=Cymhwysiad Peintio Golygu Delweddau
+@@ -26,10 +28,11 @@
+ GenericName[is]=Málun og myndritill
+ GenericName[it]=Applicazione di disegno e di modifica delle immagini
+ GenericName[ja]=描画と画像編集のためのアプリケーション
+-GenericName[km]=កម្មវិធីគូរគំនូរ និង កែសម្រួលរូបភាព
++GenericName[km]=កម្មវិធីគូរគំនូរ និងកែសម្រួលរូបភាព
+ GenericName[lv]=Zīmēšanas un attēlu apstrādes programma
+ GenericName[nb]=Program for tegning og bilderedigering
+ GenericName[nds]=Programm för't Malen un Bildbewerken
++GenericName[ne]=पेन्टीङ्ग र छवि सम्पादन अनुप्रयोग
+ GenericName[nl]=Afbeeldingsmanipulatie
+ GenericName[pl]=Program do edycji zdjęć oraz rysunków
+ GenericName[pt]=Aplicação de Pintura e Edição de Imagens
+--- filters/krita/magick/krita_magick_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/krita/magick/krita_magick_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Krita Magick Export Filter
++Name[bg]=Филтър за експортиране от Krita в Magick
+ Name[br]=Sil ezporzh Magick evit Krita
+ Name[ca]=Filtre d'exportació Magick per a Krita
+ Name[cy]=Hidl Allforio Magick Krita
+@@ -26,6 +27,7 @@
+ Name[ms]=Penapis Eksport Krita Magick
+ Name[nb]=Magick-eksportfilter for Krita
+ Name[nds]=Magick-Exportfilter för Krita
++Name[ne]=क्रिता म्याजिकके निर्यात फिल्टर
+ Name[nl]=Krita Magick Exportfilter
+ Name[nn]=Magick-eksportfilter for Krita
+ Name[pl]=Filtr eksportu do formatu Magick z Krita
+--- filters/kchart/svg/kchart_svg_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kchart/svg/kchart_svg_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Service
+ Name=KChart SVG Export Filter
+ Name[ar]=مِرْشَح تصدير SVG لدى KChart
++Name[bg]=Филтър за експортиране от KChart в SVG
+ Name[br]=Sil ezporzh SVG evit KChart
+ Name[ca]=Filtre d'exportació SVG per a KChart
+ Name[cs]=Exportní filtr do formátu SVG pro KChart
+@@ -29,6 +30,7 @@
+ Name[ms]=Penapis Eksport KChart SVG
+ Name[nb]=SVG-eksportfilter for KChart
+ Name[nds]=SVG-Exportfilter för KChart
++Name[ne]=केडीई चित्रपट एसभीजी निर्यात फिल्टर
+ Name[nl]=SVG-exportfilter voor KChart
+ Name[nn]=SVG-eksportfilter for KChart
+ Name[pl]=Filtr eksportu do formatu SVG z KChart
+--- filters/kchart/mng/kchart_mng_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kchart/mng/kchart_mng_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=KChart MNG Export Filter
++Name[bg]=Филтър за експортиране от KChart в MNG
+ Name[ca]=Filtre d'exportació MNG per a KChart
+ Name[da]=KChart MNG-eksportfilter
+ Name[de]=KChart MNG-Exportfilter
+@@ -19,6 +20,7 @@
+ Name[lv]=KChart MNG eksporta filtrs
+ Name[nb]=MNG-eksportfilter for KChart
+ Name[nds]=KMNG-Exportfilter för KChart
++Name[ne]=केडीई चित्रपट एमएनजी निर्यात फिल्टर
+ Name[nl]=MNG-exportfilter voor KChart
+ Name[pl]=Filtr eksportu do formatu MNG z KChart
+ Name[pt]=Filtro de Exportação de MNG para o KChart
+--- filters/kchart/png/kchart_png_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kchart/png/kchart_png_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Service
+ Name=KChart PNG Export Filter
+ Name[ar]=مِرْشَح تصدير PNG لدى KChart
++Name[bg]=Филтър за експортиране от KChart в PNG
+ Name[br]=Sil ezporzh PNG evit KChart
+ Name[ca]=Filtre d'exportació PNG per a KChart
+ Name[cs]=Exportní filtr do formátu PNG pro KChart
+@@ -29,6 +30,7 @@
+ Name[ms]=Penapis Eksport KChart PNG
+ Name[nb]=PNG-eksportfilter for KChart
+ Name[nds]=PNG-Exportfilter för KChart
++Name[ne]=केडीई चित्रपट पीएनजी निर्यात फिल्टर
+ Name[nl]=PNG-exportfilter voor KChart
+ Name[nn]=PNG-eksportfilter for KChart
+ Name[pl]=Filtr eksportu do formatu PNG z KChart
+--- filters/kchart/xpm/kchart_xpm_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kchart/xpm/kchart_xpm_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Service
+ Name=KChart XPM Export Filter
+ Name[ar]=مرشح تصدير XPM لدى KChart
++Name[bg]=Филтър за експортиране от KChart в XPM
+ Name[br]=Sil ezporzh XPM evit KChart
+ Name[ca]=Filtre d'exportació XPM per a KChart
+ Name[da]=KChart XPM-eksportfilter
+@@ -25,6 +26,7 @@
+ Name[lv]=KChart XPM eksporta filtrs
+ Name[nb]=XPM-eksportfilter for KChart
+ Name[nds]=XPM-Exportfilter för KChart
++Name[ne]=केडीई चित्रपट एक्सपीएम निर्यात फिल्टर
+ Name[nl]=XPM-exportfilter voor KChart
+ Name[pl]=Filtr eksportu do formatu XPM z KChart
+ Name[pt]=Filtro de Exportação de XPM para o KChart
+--- filters/kchart/jpeg/kchart_jpeg_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kchart/jpeg/kchart_jpeg_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Service
+ Name=KChart JPEG Export Filter
+ Name[ar]=مرشح تصدير KChart JPEG
++Name[bg]=Филтър за експортиране от KChart в JPEG
+ Name[br]=Sil ezporzh JPEG evit KChart
+ Name[ca]=Filtre d'exportació JPEG per a KChart
+ Name[da]=KChart JPEG-eksportfilter
+@@ -25,6 +26,7 @@
+ Name[lv]=KChart JPEG eksporta filtrs
+ Name[nb]=JPEG-eksportfilter for KChart
+ Name[nds]=JPEG-Exportfilter för KChart
++Name[ne]=केडीई चित्रपट जेपीईजी निर्यात फिल्टर
+ Name[nl]=JPEG-exportfilter voor KChart
+ Name[pl]=Filtr eksportu do formatu JPEG z KChart
+ Name[pt]=Filtro de Exportação de JPEG para o KChart
+--- filters/kchart/xbm/kchart_xbm_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kchart/xbm/kchart_xbm_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Service
+ Name=KChart XBM Export Filter
+ Name[ar]=مرشح تصدير XBM لدى KChart
++Name[bg]=Филтър за експортиране от KChart в XBM
+ Name[br]=Sil ezporzh XBM evit KChart
+ Name[ca]=Filtre d'exportació XBM per a KChart
+ Name[da]=KChart XBM-eksportfilter
+@@ -25,6 +26,7 @@
+ Name[lv]=KChart XBM eksporta filtrs
+ Name[nb]=XMB-eksportfilter for KChart
+ Name[nds]=XBM-Exportfilter för KChart
++Name[ne]=केडीई चित्रपट एक्सबीएम निर्यात फिल्टर
+ Name[nl]=PNG-exportfilter voor KChart
+ Name[pl]=Filtr eksportu do formatu XBM z KChart
+ Name[pt]=Filtro de Exportação de XBM para o KChart
+--- filters/kchart/bmp/kchart_bmp_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/kchart/bmp/kchart_bmp_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Service
+ Name=KChart BMP Export Filter
+ Name[ar]=مِرْشَح تصدير BMP لدى Karbon14
++Name[bg]=Филтър за експортиране от KChart в BMP
+ Name[br]=Sil ezporzh BMP evit KChart
+ Name[ca]=Filtre d'exportació BMP per a KChart
+ Name[da]=KChart BMP-eksportfilter
+@@ -25,6 +26,7 @@
+ Name[lv]=KChart BMP eksporta filtrs
+ Name[nb]=BMP-eksportfilter for KChart
+ Name[nds]=BMP-Exportfilter för KChart
++Name[ne]=केडीई चित्रपट बीएमपी निर्यात फिल्टर
+ Name[nl]=BMP-exportfilter voor KChart
+ Name[pl]=Filtr eksportu do formatu BMP z KChart
+ Name[pt]=Filtro de Exportação de BMP para o KChart
+--- filters/karbon/svg/karbon_svg_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/karbon/svg/karbon_svg_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ Name=Karbon14 SVG Export Filter
+ Name[af]=Karbon14 Svg Voer uit Filter
+ Name[ar]=مِرْشَح تصدير SVG لدى Karbon14
+-Name[bg]=Филтър за експорт от Karbon14 в SVG
++Name[bg]=Филтър за експортиране от Karbon14 в SVG
+ Name[br]=Sil ezporzh SVG evit Karbon14
+ Name[ca]=Filtre d'exportació SVG per a Karbon14
+ Name[cs]=Exportní filtr do formátu SVG pro Karbon14
+@@ -34,6 +34,7 @@
+ Name[mt]=Filtru għall-esportazzjoni ta' SVG minn ġo Karbon14
+ Name[nb]=SVG-eksportfiler for Karbon14
+ Name[nds]=SVG-Exportfilter för Karbon14
++Name[ne]=कार्बन१४ एसभीजी निर्यात फिल्टर
+ Name[nl]=SVG-exportfilter voor Karbon14
+ Name[nn]=SVG-eksportfilter for Karbon14
+ Name[pl]=Filtr eksportu do formatu SVG z Karbon14
+--- filters/karbon/svg/karbon_svg_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/karbon/svg/karbon_svg_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ Name=Karbon SVG Import Filter
+ Name[af]=Karbon Svg In voer Filter
+ Name[ar]=مِرْشَح استيراد SVG لدى Karbon
+-Name[bg]=Филтър за импорт от SVG в Karbon
++Name[bg]=Филтър за импортиране от SVG в Karbon
+ Name[br]=Sil enporzh SVG evit Karbon
+ Name[ca]=Filtre d'importació SVG per a Karbon
+ Name[cs]=Exportní filtr do formátu SVG pro Karbon
+@@ -32,6 +32,7 @@
+ Name[ms]=Penapis Import Karbon SVG
+ Name[nb]=SVG-importfilter for Karbon
+ Name[nds]=SVG-Importfilter för Karbon
++Name[ne]=कार्बन एसभीजी निर्यात फिल्टर
+ Name[nl]=SVG-importfilter voor Karbon14
+ Name[nn]=SVG-importfilter for Karbon
+ Name[pl]=Filtr importu formatu SVG do Karbon
+--- filters/karbon/xcf/karbon_xcf_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/karbon/xcf/karbon_xcf_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ Name=Karbon14 Gimp Export Filter
+ Name[af]=Karbon14 Gimp Voer uit Filter
+ Name[ar]=مِرْشَح تصدير Gimp لدى Karbon14
+-Name[bg]=Филтър за експорт от Karbon14 в Gimp
++Name[bg]=Филтър за експортиране от Karbon14 в Gimp
+ Name[br]=Sil ezporzh Gimp evit Karbon14
+ Name[ca]=Filtre d'exportació Gimp per a Karbon14
+ Name[cs]=Exportní filtr do formátu Gimp pro Karbon
+@@ -33,6 +33,7 @@
+ Name[ms]=Penapis Eksport Karbon14 Gimp
+ Name[nb]=Gimp-eksportfiler for Karbon14
+ Name[nds]=Gimp-Exportfilter för Karbon14
++Name[ne]=कार्बन१४ गिम्प निर्यात फिल्टर
+ Name[nl]=Gimp-exportfilter voor Karbon14
+ Name[nn]=Gimp-eksportfilter for Karbon14
+ Name[pl]=Filtr eksportu do formatu Gimpa z Karbon14
+--- filters/karbon/kontour/karbon_kontour_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/karbon/kontour/karbon_kontour_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ Name=Karbon Kontour Import Filter
+ Name[af]=Karbon Kontoer In voer Filter
+ Name[ar]=مِرْشَح استيراد Kontour لدى Karbon
+-Name[bg]=Филтър за импорт от Kontour в Karbon
++Name[bg]=Филтър за импортиране от Kontour в Karbon
+ Name[br]=Sil enporzh Kontour evit Karbon
+ Name[ca]=Filtre d'importació Kontour per a Karbon
+ Name[cs]=Importní filtr Kontour pro Karbon14
+@@ -34,6 +34,7 @@
+ Name[mt]=Filtru għall-importazzjoni ta' Kontour ġo Karbon14
+ Name[nb]=Kontour-importfilter for Karbon
+ Name[nds]=Kontour-Importfilter för Karbon
++Name[ne]=कार्बन रूपरेखा आयात फिल्टर
+ Name[nl]= Kontour-importfilter voor Karbon
+ Name[nn]=Kontour-importfilter for Karbon
+ Name[pl]=Filtr importu formatu Kontour do Karbon
+--- filters/karbon/xaml/karbon_xaml_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/karbon/xaml/karbon_xaml_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Service
+ Name=Karbon XAML Import Filter
+ Name[ar]=مِرْشَح استيراد XAML لدى Karbon
++Name[bg]=Филтър за импортиране от XAML в Karbon
+ Name[br]=Sil enporzh XAML evit Karbon
+ Name[ca]=Filtre d'importació XAML per a Karbon
+ Name[cy]=Hidlen Fewnforio XAML Karbon
+@@ -26,6 +27,7 @@
+ Name[lv]=Karbon XAML importa filtrs
+ Name[nb]=XAML-importfilter for Karbon
+ Name[nds]=XAML-Importfilter för Karbon
++Name[ne]=कार्बन एक्सएएमएल निर्यात फिल्टर
+ Name[nl]=XAML-importfilter voor Karbon
+ Name[pl]=Filtr importu formatu XAML do Karbon
+ Name[pt]=Filtro de Importação de XAML para o Karbon
+--- filters/karbon/xaml/karbon_xaml_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/karbon/xaml/karbon_xaml_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Icon=
+ Name=Karbon14 WVG Export Filter
+ Name[ar]=مِرْشَح تصدير WVG لدى Karbon14
++Name[bg]=Филтър за експортиране от Karbon14 в WVG
+ Name[br]=Sil ezporzh WVG evit Karbon14
+ Name[ca]=Filtre d'exportació WVG per a Karbon14
+ Name[cy]=Hidlen Allforio WVG Karbon14
+@@ -26,6 +27,7 @@
+ Name[lv]=Karbon14 WVG eksporta filtrs
+ Name[nb]=WVG-eksportfiler for Karbon14
+ Name[nds]=WVG-Exportfilter för Karbon14
++Name[ne]=कार्बन१४ डब्लुभीजी निर्यात फिल्टर
+ Name[nl]= WVG-exportfilter voor Karbon14
+ Name[pl]=Filtr eksportu do formatu WVG z Karbon14
+ Name[pt]=Filtro de Exportação de WVG para o Karbon14
+--- filters/karbon/msod/karbon_msod_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/karbon/msod/karbon_msod_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,7 +3,7 @@
+ Type=Service
+ Name=Karbon's MS Office Drawing Import Filter
+ Name[ar]=مِرْشَح استيراد رسم MS Office الخاص بـ Karbon
+-Name[bg]=Филтър за импорт от MS Office в Karbon
++Name[bg]=Филтър за импортиране на MS Office Drawing в Karbon
+ Name[br]=Sil enporzh MS Office Drawing evit Karbon's
+ Name[ca]=Filtre d'importació MS Office Drawing per a Karbon
+ Name[cs]=Importní filtr Kreslení MS Office pro Karbon
+@@ -30,6 +30,7 @@
+ Name[ms]=Penapis Import MS Office Drawing Karbon
+ Name[nb]=Importfilter fra MS Office-tegning til Karbon
+ Name[nds]=Tekenimportfilter för Karbon
++Name[ne]=कार्बनको एमएस कार्यालय रेखाचित्र आयात फिल्टर
+ Name[nl]=MS Office Drawing-importfilter voor Karbon
+ Name[nn]=Importfilter frå MS Office-teikning til Karbon
+ Name[pl]=Filtr importu z formatu MS Office Draw do Karbon
+--- filters/karbon/png/karbon_png_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/karbon/png/karbon_png_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ Name=Karbon14 PNG Export Filter
+ Name[af]=Karbon14 Png Voer uit Filter
+ Name[ar]=مِرْشَح تصدير PNG لدى Karbon14
+-Name[bg]=Филтър за експорт от Karbon14 в PNG
++Name[bg]=Филтър за експортиране от Karbon14 в PNG
+ Name[br]=Sil ezporzh PNG evit Karbon14
+ Name[ca]=Filtre d'exportació PNG per a Karbon14
+ Name[cs]=Exportní filtr do formátu PNG pro Karbon14
+@@ -34,6 +34,7 @@
+ Name[mt]=Filtru għall-esportazzjoni ta' PNG minn ġo Karbon14
+ Name[nb]=PNG-eksportfilter for Karbon14
+ Name[nds]=PNG-Exportfilter för Karbon14
++Name[ne]=कार्बन१४ पीएनजी निर्यात फिल्टर
+ Name[nl]=PNG-exportfilter voor Karbon14
+ Name[nn]=PNG-eksportfilter for Karbon14
+ Name[pl]=Filtr eksportu do formatu PNG z Karbon14
+--- filters/karbon/eps/karbon_ps_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/karbon/eps/karbon_ps_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ Name=Karbon14 EPS Import Filter
+ Name[af]=Karbon14 Eps In voer Filter
+ Name[ar]=مِرْشَح استيراد EPS لدى Karbon14
+-Name[bg]=Филтър за импорт от EPS в Karbon14
++Name[bg]=Филтър за импортиране от EPS в Karbon14
+ Name[br]=Sil enporzh EPS evit Karbon14
+ Name[ca]=Filtre d'importació EPS per a Karbon14
+ Name[cs]=Exportní filtr do formátu EPS pro Karbon14
+@@ -34,6 +34,7 @@
+ Name[mt]=Filtru għall-importazzjoni ta' EPS għal Karbon14
+ Name[nb]=EPS-importfilter for Karbon14
+ Name[nds]=EPS-Importfilter för Karbon14
++Name[ne]=कार्बन१४ इपिएस आयात फिल्टर
+ Name[nl]=EPS-importfilter voor Karbon14
+ Name[nn]=EPS-eksportfilter for Karbon14
+ Name[pl]=Filtr importu formatu EPS do Karbon14
+--- filters/karbon/eps/karbon_eps_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/karbon/eps/karbon_eps_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ Name=Karbon14 EPS Import Filter
+ Name[af]=Karbon14 Eps In voer Filter
+ Name[ar]=مِرْشَح استيراد EPS لدى Karbon14
+-Name[bg]=Филтър за импорт от EPS в Karbon14
++Name[bg]=Филтър за импортиране от EPS в Karbon14
+ Name[br]=Sil enporzh EPS evit Karbon14
+ Name[ca]=Filtre d'importació EPS per a Karbon14
+ Name[cs]=Exportní filtr do formátu EPS pro Karbon14
+@@ -34,6 +34,7 @@
+ Name[mt]=Filtru għall-importazzjoni ta' EPS għal Karbon14
+ Name[nb]=EPS-importfilter for Karbon14
+ Name[nds]=EPS-Importfilter för Karbon14
++Name[ne]=कार्बन१४ इपिएस आयात फिल्टर
+ Name[nl]=EPS-importfilter voor Karbon14
+ Name[nn]=EPS-eksportfilter for Karbon14
+ Name[pl]=Filtr importu formatu EPS do Karbon14
+--- filters/karbon/eps/karbon_eps_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/karbon/eps/karbon_eps_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ Name=Karbon14 EPS Export Filter
+ Name[af]=Karbon14 Eps Voer uit Filter
+ Name[ar]=مِرْشَح تصدير EPS لدى Karbon14
+-Name[bg]=Филтър за експорт от Karbon14 в EPS
++Name[bg]=Филтър за експортиране от Karbon14 в EPS
+ Name[br]=Sil ezporzh EPS evit Karbon14
+ Name[ca]=Filtre d'exportació EPS per a Karbon14
+ Name[cs]=Exportní filtr do formátu EPS pro Karbon14
+@@ -34,6 +34,7 @@
+ Name[mt]=Filtru għall-esportazzjoni ta' EPS minn ġo Karbon14
+ Name[nb]=EPS-eksportfiler for Karbon14
+ Name[nds]=EPS-Exportfilter för Karbon14
++Name[ne]=कार्बन१४ इपिएस निर्यात फिल्टर
+ Name[nl]=EPS-exportfilter voor Karbon14
+ Name[nn]=EPS-eksportfilter for Karbon14
+ Name[pl]=Filtr eksportu do formatu EPS z Karbon14
+--- filters/karbon/ai/karbon_ai_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/karbon/ai/karbon_ai_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ Name=Karbon14 Illustrator Import Filter
+ Name[af]=Karbon14 Illustreerder In voer Filter
+ Name[ar]=مِرْشَح استيراد Illustrator لدى Karbon14
+-Name[bg]=Филтър за импорт от Illustrator в Karbon14
++Name[bg]=Филтър за импортиране от Illustrator в Karbon14
+ Name[br]=Sil enporzh Illustrator evit Karbon14
+ Name[ca]=Filtre d'importació Illustrator per a Karbon14
+ Name[cs]=Importní filtr souborů aplikace Illustrator pro Karbon14
+@@ -35,6 +35,7 @@
+ Name[mt]=Filtru għall-importazzjoni Illustrator għal Karbon14
+ Name[nb]=Illustrator-importfilter for Karbon14
+ Name[nds]=Illustrator-Importfilter för Karbon14
++Name[ne]=कार्बन१४ ब्याख्याकर्ता आयात फिल्टर
+ Name[nl]=Illustrator-importfilter voor Karbon14
+ Name[nn]=Illustrator-importfilter for Karbon14
+ Name[pl]=Filtr importu formatu Illustrator do Karbon14
+--- filters/karbon/wmf/karbon_wmf_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/karbon/wmf/karbon_wmf_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ Name=Karbon WMF Import Filter
+ Name[af]=Karbon Wmf In voer Filter
+ Name[ar]=مِرْشَح استيراد WMF لدى Karbon
+-Name[bg]=Филтър за импорт от WMF в Karbon
++Name[bg]=Филтър за импортиране от WMF в Karbon
+ Name[br]=Sil enporzh WMF evit Karbon
+ Name[ca]=Filtre d'importació WMF per a Karbon
+ Name[cs]=Importní filtr WMF pro Karbon14
+@@ -34,6 +34,7 @@
+ Name[mt]=Filtru għall-importazzjoni ta' WMF ġo Karbon14
+ Name[nb]=WMF-importfilter for Karbon
+ Name[nds]=WMF-Importfilter för Karbon
++Name[ne]=कार्बन डब्लुएमएफ निर्यात फिल्टर
+ Name[nl]=WMF-importfilter voor Karbon
+ Name[nn]=WMF-importfilter for Karbon14
+ Name[pl]=Filtr importu formatu WMF do Karbon
+--- filters/karbon/wmf/karbon_wmf_export.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/karbon/wmf/karbon_wmf_export.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,7 +3,7 @@
+ Icon=
+ Name=Karbon14 WMF Export Filter
+ Name[ar]=مِرْشَح تصدير WMF لدى Karbon14
+-Name[bg]=Филтър за експорт от Karbon14 в WMF
++Name[bg]=Филтър за експортиране от Karbon14 в WMF
+ Name[br]=Sil ezporzh WMF evit Karbon14
+ Name[ca]=Filtre d'exportació WMF per a Karbon14
+ Name[cs]=Exportní filtr do formátu WMF pro Karbon14
+@@ -30,6 +30,7 @@
+ Name[ms]=Penapis Eksport Karbon14 WMF
+ Name[nb]=WMF-eksportfilter for Karbon14
+ Name[nds]=WMF-Exportfilter för Karbon14
++Name[ne]=कार्बन१४ डब्लुएमएफ निर्यात फिल्टर
+ Name[nl]=WMF-exportfilter voor Karbon14
+ Name[nn]=WMF-eksportfilter for Karbon14
+ Name[pl]=Filtr eksportu do formatu WMF z Karbon14
+--- filters/karbon/oodraw/karbon_oodraw_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/karbon/oodraw/karbon_oodraw_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,7 +3,7 @@
+ Type=Service
+ Name=OpenOffice.org Draw Import Filter for Karbon14
+ Name[ar]=مِرْشَح استيراد رسم OpenOffice.org لـ Karbon14
+-Name[bg]=Филтър за импорт от OpenOffice.org Draw в Karbon14
++Name[bg]=Филтър за импортиране от OpenOffice.org Draw в Karbon14
+ Name[br]=Sil enporzh OpenOffice.org Draw evit Karbon14
+ Name[ca]=Filtre d'importació OpenOffice.org Draw per a Karbon14
+ Name[cs]=OpenOffice.org Draw importní filtr pro Karbon14
+@@ -30,6 +30,7 @@
+ Name[ms]=Penapis Import OpenOffice.org Draw bagi Karbon14
+ Name[nb]=OpenOffice.org Draw-importfilter for Karbon14
+ Name[nds]="OpenOffice.org Draw"-Importfilter för Karbon14
++Name[ne]=कार्बन१४का लागि OpenOffice.org रेखाचित्र आयात फिल्टर
+ Name[nl]=OpenOffice.org Draw-importfilter voor Karbon14
+ Name[nn]=OpenOffice.org Draw-importfilter for Karbon14
+ Name[pl]=Filtr importu z OpenOffice.org Draw do Karbon14
+--- filters/karbon/xfig/karbon_xfig_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/karbon/xfig/karbon_xfig_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,7 +3,7 @@
+ Type=Service
+ Name=Karbon XFig Import Filter
+ Name[ar]=مِرْشَح استيراد XFig لدى Karbon
+-Name[bg]=Филтър за импорт от XFig в Karbon
++Name[bg]=Филтър за импортиране от XFig в Karbon
+ Name[br]=Sil enporzh XFig evit Karbon
+ Name[ca]=Filtre d'importació XFig per a Karbon
+ Name[cs]=Importní filtr Xfig pro Karbon
+@@ -30,6 +30,7 @@
+ Name[ms]=Penapis Import Karbon XFig
+ Name[nb]=XFig-importfilter for Karbon
+ Name[nds]=XFig-Importfilter för Karbon14
++Name[ne]=कार्बन एक्सआकृति निर्यात फिल्टर
+ Name[nl]=Xfig-importfilter voor Karbon
+ Name[nn]=XFig-importfilter for Karbon
+ Name[pl]=Filtr importu formatu XFig do Karbon
+--- filters/karbon/applixgraphics/kontour_applixgraphic_import.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/karbon/applixgraphics/kontour_applixgraphic_import.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,7 +5,7 @@
+ Name[af]=Kontoer Applixgrafika In voer Filter
+ Name[ar]=مِرْشَح استيراد Applixgraphics لدى Kontour
+ Name[az]=Kontour Applixgraphics Alma Süzgəci
+-Name[bg]=Филтър за импорт от Applixgraphics в Kontour
++Name[bg]=Филтър за импортиране от Applixgraphics в Kontour
+ Name[br]=Sil enporzh Applixgraphics evit Kontour
+ Name[ca]=Filtre d'importació Applixgraphics per a Kontour
+ Name[cs]=Importní filtr Applixgraphics pro Kontour
+@@ -37,6 +37,7 @@
+ Name[mt]=Filtru għall-importazzjoni ta' Applixgraphics ġo Kontour
+ Name[nb]=Applixgraphics-importfilter for Kontour
+ Name[nds]=Applixgraphics-Importfilter för Kontour
++Name[ne]=रूपरेखा एप्लिक्सग्राफिक्स आयात फिल्टर
+ Name[nl]=Kontour Applixgraphics-importfilter
+ Name[nn]=Applixgraphics-importfilter for Kontour
+ Name[pl]=Filtr importu formatu Applixgraphics do Kontour
+--- filters/generic_wrapper/generic_filter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ filters/generic_wrapper/generic_filter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Name=Generic KOffice Filter
+ Name[ar]=مِرْشَح نوعيّ لـ KOffice
++Name[bg]=Общ филтър за KOffice
+ Name[br]=Sil KOffice rummel
+ Name[ca]=Filtre genèric de KOffice
+ Name[cs]=Obecný filtr KOffice
+@@ -28,6 +29,7 @@
+ Name[ms]=Penapis KOffice Biasa
+ Name[nb]=Alment KOffice-filter
+ Name[nds]=Allgemeen KOffice-Filter
++Name[ne]=जेनेरिक केडीई कार्यालय फिल्टर
+ Name[nl]=Generiek KOffice-filter
+ Name[nn]=Generelt KOffice-filter
+ Name[pl]=Generyczny filtr KOffice
+--- kugar/kudesigner/templates/General/Letter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kugar/kudesigner/templates/General/Letter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,6 +5,7 @@
+ Name=US Letter
+ Name[af]=Us Brief
+ Name[az]=Zərf
++Name[bg]=Американско писмо
+ Name[br]=Lizher US
+ Name[ca]=Carta US
+ Name[cy]=Llythyr US
+@@ -19,6 +20,7 @@
+ Name[id]=Letter AS
+ Name[km]=សំបុត្រអាមេរិក
+ Name[lv]=ASV Vēstule
++Name[ne]=US अक्षर
+ Name[pt]=Carta dos EUA
+ Name[pt_BR]=Carta US
+ Name[sk]=List
+--- kugar/kudesigner/templates/General/Legal.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kugar/kudesigner/templates/General/Legal.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -16,6 +16,7 @@
+ Name[hr]=Pravno
+ Name[it]=US legal
+ Name[nds]=US Legal
++Name[ne]=कानूनी
+ Name[pl]=Wzorce
+ Name[sr]=Легал
+ Name[tr]=Yasal
+--- kugar/kudesigner/templates/General/Ledger.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kugar/kudesigner/templates/General/Ledger.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -14,6 +14,7 @@
+ Name[lo]=Ledger
+ Name[lv]=Virsgrāmata
+ Name[ms]=Lejar
++Name[ne]=लेजर
+ Name[pt_BR]=Carta
+ Name[sk]=Kniha
+ Name[tg]=Гроссбух
+--- kugar/kudesigner/templates/General/Folio.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kugar/kudesigner/templates/General/Folio.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Link
+ URL=.source/Folio.ktm
+ Name=Folio
++Name[bg]=Фолио
+ Name[ca]=Foli
+ Name[cy]=Ffolio
+ Name[et]=Foolio
+@@ -14,6 +15,7 @@
+ Name[km]= សន្លឹកក្រដាសធំបត់ជាពីរ
+ Name[lo]=ສາຍນໍ້າ
+ Name[lv]=Kolontituls
++Name[ne]=फोलियो
+ Name[sk]=Fólia
+ Name[tr]=Folyo
+ Name[zh_CN]=对开
+--- kugar/kudesigner/templates/General/.directory (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kugar/kudesigner/templates/General/.directory (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,7 +2,7 @@
+ Name=General
+ Name[af]=Algemeen
+ Name[ar]=عام
+-Name[bg]=Базов
++Name[bg]=Основен
+ Name[br]=Pennañ
+ Name[bs]=Općenito
+ Name[cy]=Cyffredinol
+@@ -29,6 +29,7 @@
+ Name[mt]=Ġenerali
+ Name[nb]=Generelt
+ Name[nds]=Allgemeen
++Name[ne]=सामान्य
+ Name[nl]=Algemeen
+ Name[pl]=Ogólny
+ Name[pt]=Geral
+--- kugar/kudesigner/templates/General/Tabloid.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kugar/kudesigner/templates/General/Tabloid.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,6 +4,7 @@
+ URL=.source/Tabloid.ktm
+ Name=Tabloid
+ Name[ar]=صحيفة نصفيّة
++Name[bg]=Таблоид
+ Name[ca]=Tabloide
+ Name[da]=Infospalte
+ Name[eu]=Tabloidea
+@@ -17,6 +18,7 @@
+ Name[lo]=ລາຍໄມ້
+ Name[lv]=Tabloīds
+ Name[nds]=US Tabloid
++Name[ne]=ट्याबलोइड
+ Name[pt]=Tablóide
+ Name[pt_BR]=Tablóide
+ Name[sk]=Noviny
+--- kugar/kudesigner/templates/General/Executive.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kugar/kudesigner/templates/General/Executive.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -14,6 +14,7 @@
+ Name[lo]=ເອົາແຜ່ນອອກ
+ Name[ms]=Eksekutif
+ Name[nds]=US Executive
++Name[ne]=कार्यकारिनी
+ Name[pt_BR]=Executivo
+ Name[sk]=Úradnícky
+ Name[ta]=நிறைவேற்று
+--- kugar/kudesigner/kudesigner.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kugar/kudesigner/kudesigner.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -32,6 +32,7 @@
+ Name[mt]=Diżinjatur Kugar
+ Name[nb]=Kugar designer
+ Name[nds]=Kugar-Maker
++Name[ne]=कुगर डिजाइनर
+ Name[pl]=Projektant Kugar
+ Name[sk]=Návrhár Kugar
+ Name[sl]=Snovalnik Kugar
+@@ -48,6 +49,7 @@
+ Name[zh_CN]=Kugar 设计器
+ Name[zh_TW]=Kugar 設計家
+ GenericName=Report Template
++GenericName[bg]=Шаблон за отчети
+ GenericName[ca]=Plantilla d'informe
+ GenericName[cy]=Patrymlun Adroddiad
+ GenericName[da]=Rapport-skabelon
+@@ -64,12 +66,13 @@
+ GenericName[hu]=Jelentéstervező
+ GenericName[is]=Skýrslusnið
+ GenericName[it]=Modello di rapporto
+-GenericName[ja]=レポート テンプレート
++GenericName[ja]=レポートテンプレート
+ GenericName[km]=ពុម្ពរបាយការណ៍
+ GenericName[lv]=Atskaites šablons
+ GenericName[ms]=Templat Laporan
+ GenericName[nb]=Utforming av rapportmaler
+ GenericName[nds]=Berichtvörlaag
++GenericName[ne]=प्रतिवेदन टेम्प्लेट
+ GenericName[nl]=Rapportsjabloon
+ GenericName[nn]=Rapportmal
+ GenericName[pl]=Szablon raportu
+@@ -119,6 +122,7 @@
+ Comment[mt]=Diżinjatur tar-rapporti
+ Comment[nb]=Formgivingsprogram for rapporter
+ Comment[nds]=Bericht-Maker
++Comment[ne]=प्रतिवेदन डिजाइनर
+ Comment[nl]=Rapportengenerator
+ Comment[nn]=Rapportformgjevar
+ Comment[pl]=Projektant raportów
+--- kugar/part/kugar.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kugar/part/kugar.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,6 +4,7 @@
+ Name[eo]=Raportilo
+ Name[hi]=कुगर
+ Name[lo]=ຄູການ
++Name[ne]=कुगर
+ Name[th]=คูการ์
+ Exec=kugar %u
+ Icon=kugar
+@@ -45,6 +46,7 @@
+ GenericName[mt]=Ġeneratur tar-Rapporti
+ GenericName[nb]=Rapport-oppretter
+ GenericName[nds]=Bericht-Maker
++GenericName[ne]=प्रतिवेदन सर्जक
+ GenericName[nl]=Rapportengenerator
+ GenericName[nn]=Rapportgenerator
+ GenericName[pl]=Generator raportów
+--- kugar/part/kugarpart.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kugar/part/kugarpart.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=KOffice Report Generator Component
++Name[bg]=Компонент за генератор на отчети в KOffice
+ Name[ca]=Component generador d'informes de KOffice
+ Name[cy]=Cydran Gynhyrchydd Adroddiad KOffice
+ Name[da]=Koffice rapportgeneratorkomponent
+@@ -24,6 +25,7 @@
+ Name[ms]=Komponen Penjana Laporan KOffice
+ Name[nb]=Rapportopprettings-komponent for KOffice
+ Name[nds]=Berichtopstell-Komponent för KOffice
++Name[ne]=केडीई कार्यालय प्रतिवेदन सर्जक अवयव
+ Name[nl]=Koffice Rapportgeneratorcomponent
+ Name[nn]=Rapportgenerator-komponent for KOffice
+ Name[pl]=Komponent generowania raportów dla KOffice
+@@ -83,6 +85,7 @@
+ GenericName[mt]=Ġeneratur tar-Rapporti
+ GenericName[nb]=Rapport-oppretter
+ GenericName[nds]=Bericht-Maker
++GenericName[ne]=प्रतिवेदन सर्जक
+ GenericName[nl]=Rapportengenerator
+ GenericName[nn]=Rapportgenerator
+ GenericName[pl]=Generator raportów
+--- krita/plugins/tools/tool_crop/kritatoolcrop.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/tools/tool_crop/kritatoolcrop.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Crop Tool
++Name[bg]=Инструмент за изрязване
+ Name[br]=Ostilh krennañ
+ Name[ca]=Eina de tall
+ Name[cy]=Hidlen Docio
+@@ -23,6 +24,7 @@
+ Name[ms]=Alat Pangkas
+ Name[nb]=Beskjæringsverktøy
+ Name[nds]=Tosniedwarktüüch
++Name[ne]=उपकरण काँटछाँट गर्नुहोस्
+ Name[nl]=Snijgereedschap
+ Name[nn]=Beskjæringsverktøy
+ Name[pl]=Narzędzie przycinania
+--- krita/plugins/tools/tool_filter/kritatoolfilter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/tools/tool_filter/kritatoolfilter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Filter Tool
++Name[bg]=Инструмент за филтриране
+ Name[br]=Ostil ar sil
+ Name[ca]=Eina de filtre
+ Name[cy]=Erfyn Hidlen
+@@ -25,6 +26,7 @@
+ Name[ms]=Alat Penapis
+ Name[nb]=Filterverktøy
+ Name[nds]=Filterwarktüüch
++Name[ne]=फिल्टर उपकरण
+ Name[nl]=Filtergereedschap
+ Name[nn]=Filterverktøy
+ Name[pl]=Narzędzie filtru
+@@ -42,6 +44,7 @@
+ Name[zh_CN]=过滤工具
+ Name[zh_TW]=濾鏡工具
+ Comment=Filter tool and paint operation
++Comment[bg]=Инструмент за филтриране и рисуване
+ Comment[ca]=Operació d'eina de filtre i pintura
+ Comment[cy]=Erfyn hidlen a gweithrediadau paent
+ Comment[da]=Filterværktøj og maleoperation
+@@ -59,10 +62,11 @@
+ Comment[is]=Síutól og málunaraðgerðir
+ Comment[it]=Strumento di filtro e operazione di disegno
+ Comment[ja]=フィルタツールと画像操作
+-Comment[km]=ដំណើរការគូរ និង ឧបករណ៍តម្រង
++Comment[km]=ដំណើរការគូរ និងឧបករណ៍តម្រង
+ Comment[ms]=Alat penapis dan operasi warna
+ Comment[nb]=Filterverktøy og maleteknikker
+ Comment[nds]=Filterwarktüüch un Malen
++Comment[ne]=फिल्टर उपकरण र पेन्ट अपरेसन
+ Comment[nl]=Filtergereedschap en schilderoperatie
+ Comment[nn]=Filterverktøy og måleoperasjon
+ Comment[pl]=Narzędzie filtrat oraz operacje malowania
+--- krita/plugins/tools/tool_perspectivetransform/kritatoolperspectivetransform.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/tools/tool_perspectivetransform/kritatoolperspectivetransform.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Icon=
+ Name=Perspective transform Tool
++Name[bg]=Инструмент трансформиране
+ Name[ca]=Eina de transformació de perspectiva
+ Name[da]=Perspectivetransformeringsværktøj
+ Name[de]=Perspektive-Transformationswerkzeug
+@@ -16,6 +17,7 @@
+ Name[km]=ឧបករណ៍ប្លែងយថាទស្សន៍
+ Name[nb]=Verktøy for perspektivtransformasjon
+ Name[nds]=Warktüüch för't Kiekwinkeltopassen
++Name[ne]=दृश्यात्मक रूपान्तरण उपकरण
+ Name[nl]=Perspectiefrooster-gereedschap
+ Name[pl]=Narzędzie zmiany perspektywy
+ Name[pt]=Ferramenta de Transformação em Perspectiva
+--- krita/plugins/tools/tool_curves/kritatoolcurves.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/tools/tool_curves/kritatoolcurves.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Curves Tool
++Name[bg]=Инструмент криви
+ Name[ca]=Eina de corbes
+ Name[da]=Kurveværktøj
+ Name[de]=Kurvenwerkzeug
+@@ -15,6 +16,7 @@
+ Name[km]=ឧបករណ៍ខ្សែកោង
+ Name[nb]=Kurveverktøy
+ Name[nds]=Bagenwarktüüch
++Name[ne]=वक्र उपकरण
+ Name[nl]=Krommen-gereedschap
+ Name[pl]=Narzędzie krzywych
+ Name[pt]=Ferramenta de Curvas
+--- krita/plugins/tools/tool_polygon/kritatoolpolygon.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/tools/tool_polygon/kritatoolpolygon.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Polygon Tool
++Name[bg]=Инструмент многоъгълник
+ Name[br]=Ostilh liestueg
+ Name[ca]=Eina de polígon
+ Name[cy]=Erfyn Polygon
+@@ -25,6 +26,7 @@
+ Name[ms]=Alat Poligon
+ Name[nb]=Verktøy for mangekanter
+ Name[nds]=Veeleck-Warktüüch
++Name[ne]=बहुभुज उपकरण
+ Name[nl]=Veelhoeksgereedschap
+ Name[nn]=Verktøy for mangekant
+ Name[pl]=Narzędzie do rysowania wielokątów
+--- krita/plugins/tools/defaulttools/kritadefaulttools.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/tools/defaulttools/kritadefaulttools.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -28,6 +28,7 @@
+ Name[ms]=Alat Piawai
+ Name[nb]=Standardverktøy
+ Name[nds]=Standardwarktüüch
++Name[ne]=पूर्वनिर्धारित उपकरणहरू
+ Name[nl]=Standaardgereedschappen
+ Name[nn]=Standardverktøy
+ Name[pl]=Domyślne narzędzia
+--- krita/plugins/tools/selectiontools/kritaselectiontools.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/tools/selectiontools/kritaselectiontools.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Selection Tools
++Name[bg]=Инструмент за маркиране
+ Name[br]=Ostilhoù choazh
+ Name[ca]=Eines de selecció
+ Name[cy]=Offer Detholi
+@@ -25,6 +26,7 @@
+ Name[ms]=Alat Pemilihan
+ Name[nb]=Velgeverktøy
+ Name[nds]=Utwahlwarktüüch
++Name[ne]=चयन उपकरण
+ Name[nl]=Selectiegereedschappen
+ Name[nn]=Veljeverktøy
+ Name[pl]=Narzędzia wyboru
+--- krita/plugins/tools/tool_star/kritatoolstar.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/tools/tool_star/kritatoolstar.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Star Tool
++Name[bg]=Инструмент звезда
+ Name[br]=Ostilh steredenn
+ Name[ca]=Eina d'estrella
+ Name[cy]=Erfyn Seren
+@@ -25,6 +26,7 @@
+ Name[ms]=Alat Bintang
+ Name[nb]=Stjerneverktøy
+ Name[nds]=Steern-Warktüüch
++Name[ne]=तारा उपकरण
+ Name[nl]=Stergereedschap
+ Name[nn]=Stjerneverktøy
+ Name[pl]=Narzędzie do rysowania gwiazdki
+--- krita/plugins/tools/tool_polyline/kritatoolpolyline.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/tools/tool_polyline/kritatoolpolyline.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Polyline Tool
++Name[bg]=Инструмент съставна линия
+ Name[br]=Ostilh lieslinenn
+ Name[ca]=Eina de polilínia
+ Name[cy]=Erfyn Polylinell
+@@ -23,6 +24,7 @@
+ Name[ms]=Alat Poligaris
+ Name[nb]=Verktøy for flerstrekslinje
+ Name[nds]=Lienenkeden-Warktüüch (Polygon-Tog)
++Name[ne]=बहुरेखा उपकरण
+ Name[nl]=Gebroken-lijngereedschap
+ Name[nn]=Verktøy for fleirstrekslinje
+ Name[pl]=Narzędzie do rysowania łamanej
+--- krita/plugins/tools/tool_transform/kritatooltransform.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/tools/tool_transform/kritatooltransform.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Transform Tool
++Name[bg]=Инструмент за трансформиране
+ Name[br]=Ostilh treuzfurmiñ
+ Name[ca]=Eina de transformació
+ Name[cy]=Erfyn Trawsffurfio
+@@ -21,6 +22,7 @@
+ Name[lv]=Transformāciju rīks
+ Name[nb]=Transformeringsverktøy
+ Name[nds]=Ümwanneln-Warktüüch
++Name[ne]=रूपान्तरण उपकरण
+ Name[nl]=Vervormgereedschap
+ Name[pl]=Narzędzie przekształcania
+ Name[pt]=Ferramenta de Transformação
+--- krita/plugins/tools/tool_perspectivegrid/kritatoolperspectivegrid.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/tools/tool_perspectivegrid/kritatoolperspectivegrid.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,10 +1,11 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Perspective Grid Tool
++Name[bg]=Инструмент мрежа
+ Name[ca]=Eina de graella de perspectiva
+ Name[da]=Perspektivgitterværktøj
+ Name[de]=Perspektive-Raster-Werkzeug
+-Name[el]=Εργαλείο προοπτικού pl;egmatow
++Name[el]=Εργαλείο προοπτικού πλέγματος
+ Name[es]=Herramienta Cuadrícula de perspectiva
+ Name[et]=Perspektiivvõrgu tööriist
+ Name[fa]=ابزار توری بُعدنما
+@@ -14,6 +15,7 @@
+ Name[km]=ឧបករណ៍ក្រឡាចត្រង្គយថាទស្សន៍
+ Name[nb]=Perspektivnett-verktøy
+ Name[nds]=Kiekwinkelgadder-Warktüüch
++Name[ne]=दृश्यात्मक ग्रीड उपकरण
+ Name[nl]=Perspectiefraster-gereedschap
+ Name[pl]=Narzędzie siatki perspektywy
+ Name[pt]=Ferramenta de Grelha em Perspectiva
+--- krita/plugins/tools/tool_selectsimilar/kritatoolselectsimilar.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/tools/tool_selectsimilar/kritatoolselectsimilar.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Select Similar Colors Tool
++Name[bg]=Инструмент за маркиране на подобни цветове
+ Name[ca]=Selecciona eines de colors similars
+ Name[cy]=Offer Detholi Lliwiau Tebyg
+ Name[da]=Vælg lignende farve-værktøjer
+@@ -20,6 +21,7 @@
+ Name[km]=ឧបករណ៍ជ្រើសពណ៌ស្រដៀងគ្នា
+ Name[nb]=Verktøy som velger liknende farger
+ Name[nds]=Warktüüch för de Utwahl vun lieke Klören
++Name[ne]=समान रङ उपकरणहरू चयन गर्नुहोस्
+ Name[nl]=Gereedschap voor soortgelijke kleuren
+ Name[pl]=Narzędzie wyboru podobnych kolorów
+ Name[pt]=Ferramenta de Selecção de Cores Semelhantes
+--- krita/plugins/filters/cimg/kritacimg.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/cimg/kritacimg.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=CImg Image Restoration Filter
++Name[bg]=Филтър за възстановяване на изображение CImg
+ Name[ca]=Filtre de restauració d'imatges Clmg
+ Name[cy]=Hidlen adfer Delwedd CImg
+ Name[da]=Cimg-billedrestaureringsfilter
+@@ -20,6 +21,7 @@
+ Name[ms]=Penapis Pemulihan Imej Clmg
+ Name[nb]=CImg-filter for bilderestaurering
+ Name[nds]=CImg-Filter för't Bild-Wedderherstellen
++Name[ne]=सीआईएमजी छवि आरोग्यता फिल्टर
+ Name[nl]=CImg afbeeldingsrestauratiefilter
+ Name[nn]=CImg-filter for biletrestaurering
+ Name[pl]=Filtr CImg do restaurowania obrazków
+@@ -35,6 +37,7 @@
+ Name[zh_CN]=CImg 图像修复滤镜
+ Name[zh_TW]=CImg 圖片修復過濾器
+ Comment=CImg Image restoration filter
++Comment[bg]=Филтър за възстановяване на изображение CImg
+ Comment[ca]=Filtre de restauració d'imatges Clmg
+ Comment[cy]=Hidlen adfer Delwedd CImg
+ Comment[da]=Cimg-billedforbedringsfilter
+@@ -54,6 +57,7 @@
+ Comment[ms]=Penapis pemulihan Imej Clmg
+ Comment[nb]=CImg-filter for bilderestaurering
+ Comment[nds]=Op CImg opbuut Filter för't Bild-Wedderherstellen
++Comment[ne]=सिआईएमजी छवि आरोग्यता फिल्टर
+ Comment[nl]=CImg afbeeldingrestauratiefilter
+ Comment[nn]=CImg-filter for biletrestaurering
+ Comment[pl]=Filtr CImg do restaurowania obrazków
+--- krita/plugins/filters/smalltilesfilter/kritasmalltilesfilter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/smalltilesfilter/kritasmalltilesfilter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Small Tiles Filter
++Name[bg]=Филтър "малки плочки"
+ Name[br]=Sil teoloù bihan
+ Name[ca]=Filtre de petites rajoles
+ Name[cy]=Hidlen Deiliau Bychain
+@@ -19,6 +20,7 @@
+ Name[km]=តម្រងក្រឡាក្បឿងតូច
+ Name[nb]=Små fliser-filter
+ Name[nds]=Lüttkachel-Filter
++Name[ne]=सानो टाइल फिल्टर
+ Name[nl]=Kleine tegeltjes
+ Name[pl]=Filtr małych kafelków
+ Name[pt]=Filtro de Pequenos Padrões
+--- krita/plugins/filters/unsharp/kritaunsharpfilter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/unsharp/kritaunsharpfilter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Icon=
+ Name=Image enhancement Filters (Extension)
++Name[bg]=Филтри за подобрения (разширения)
+ Name[ca]=Filtres de millora d'imatge (Extensió)
+ Name[da]=Billedforbedringsfiltre (Udvidelse)
+ Name[de]=Verbesserungsfilter (Erweiterung)
+@@ -17,6 +18,7 @@
+ Name[km]=តម្រងធ្វើឲ្យរូបភាពប្រសើរ (ផ្នែកបន្ថែម)
+ Name[nb]=Bildeforbedringsfiltre (Utvidelse)
+ Name[nds]=Verbeternfilter (Verwiedern)
++Name[ne]=छवि अधिकता फिल्टरहरू (अपवाद)
+ Name[nl]=Afbeeldingsfilters (extensie)
+ Name[pl]=Filtry poprawy jakości (rozszerzenie)
+ Name[pt]=Filtros de Melhoramento de Imagem (Extensão)
+--- krita/plugins/filters/noisefilter/kritanoisefilter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/noisefilter/kritanoisefilter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Noise Filter
++Name[bg]=Шумов филтър
+ Name[ca]=Filtre de soroll
+ Name[da]=Støjfilter
+ Name[de]=Rauschfilter
+@@ -18,6 +19,7 @@
+ Name[lv]=Trokšņu filtrs
+ Name[nb]=Støyfilter
+ Name[nds]=Ruusfilter
++Name[ne]=ध्वनि फिल्टर
+ Name[nl]=Ruisfilter
+ Name[pl]=Filtr dodania szumu
+ Name[pt]=Filtro de Ruído
+@@ -32,6 +34,7 @@
+ Name[uz]=Шовқин филтери
+ Name[zh_TW]=雜訊過濾器
+ Comment=Add noise to an image
++Comment[bg]=Добавяне на шум към изображение
+ Comment[ca]=Afegeig soroll a una imatge
+ Comment[da]=Tilføj støj til et billede
+ Comment[de]=Einem Bild Rauschen hinzufügen
+@@ -48,6 +51,7 @@
+ Comment[lv]=Pievieno attēlam troksni
+ Comment[nb]=Legg til støy i et bilde
+ Comment[nds]=En Bild Rusen tofögen
++Comment[ne]=एउटा छविमा ध्वनि थप्नुहोस्
+ Comment[nl]=Voeg ruis toe aan een afbeelding
+ Comment[pl]=Dodaje szum do obrazka
+ Comment[pt]=Adiciona ruído a uma imagem
+--- krita/plugins/filters/roundcorners/kritaroundcornersfilter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/roundcorners/kritaroundcornersfilter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Sobel Filter
++Name[bg]=Филтър Sobel
+ Name[ca]=Filtre Sobel
+ Name[cy]=Hidlen Sobel
+ Name[da]=Sobelfilter
+@@ -18,6 +19,7 @@
+ Name[ja]=ソーベルフィルタ
+ Name[km]=តម្រងស៊ូបែល
+ Name[nds]=Sobelfilter
++Name[ne]=सोबेल फिल्टर
+ Name[nl]=Sobelfilter
+ Name[pl]=Filtr Sobela
+ Name[pt]=Filtro Sobel
+--- krita/plugins/filters/oilpaintfilter/kritaoilpaintfilter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/oilpaintfilter/kritaoilpaintfilter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Oilpaint Filter
++Name[bg]=Филтър маслена боя
+ Name[ca]=Filtre de pintura a l'oli
+ Name[cy]=Hidlen Baent Olew
+ Name[da]=Oliemalerifilter
+@@ -20,6 +21,7 @@
+ Name[km]=តម្រងគំនូរពណ៌ប្រេង
+ Name[nb]=Oljemalingsfilter
+ Name[nds]=Öölbild-Filter
++Name[ne]=ओइलपेन्ट फिल्टर
+ Name[nl]=Olieverffilter
+ Name[pl]=Filtr farb olejnych
+ Name[pt]=Filtro de Pintura a Óleo
+@@ -33,6 +35,7 @@
+ Name[uk]=Фільтр олійних фарб
+ Name[zh_TW]=油畫過濾器
+ Comment=Oilpaint filter
++Comment[bg]=Филтър маслена боя
+ Comment[ca]=Filtre de pintura a l'oli
+ Comment[cy]=Hidlen baent olew
+ Comment[da]=Oliemalerifilter
+@@ -52,6 +55,7 @@
+ Comment[km]=តម្រងគំនូរពណ៌ប្រេង
+ Comment[nb]=Oljemalingsfilter
+ Comment[nds]=Öölbild-Filter
++Comment[ne]=ओइलपेन्ट फिल्टर
+ Comment[nl]=Olieverffilter
+ Comment[pl]=Filtr farb olejnych
+ Comment[pt]=Filtro de pintura a óleo
+--- krita/plugins/filters/colorify/kritacolorifyfilter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/colorify/kritacolorifyfilter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Icon=
+ Name=Color Filters (Extension)
++Name[bg]=Цветови филтри (разширения)
+ Name[ca]=Filtres de color (Extensió)
+ Name[da]=Farvefiltre (Udvidelse)
+ Name[de]=Farbfilter (Erweiterung)
+@@ -18,6 +19,7 @@
+ Name[km]=តម្រងពណ៌ (ផ្នែកបន្ថែម)
+ Name[nb]=Fargefiltre (utvidelse)
+ Name[nds]=Klörenfilters (Verwiedern)
++Name[ne]=रङ फिल्टरहरू (अपवाद)
+ Name[nl]=Kleurfilters (extensie)
+ Name[pl]=Filtry kolorów (rozszerzenie)
+ Name[pt]=Filtros de Cores (Extensão)
+--- krita/plugins/filters/imageenhancement/kritaimageenhancement.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/imageenhancement/kritaimageenhancement.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Enhancement Filters
++Name[bg]=Филтри за подобрения
+ Name[ca]=Filtres de millora
+ Name[cy]=Hidlau Tecáu
+ Name[da]=Forbedringsfilter
+@@ -18,6 +19,7 @@
+ Name[km]=តម្រងធ្វើឲ្យប្រសើរ
+ Name[nb]=Forbedringsfiltre
+ Name[nds]=Verbeternfilter
++Name[ne]=अधिकतम फिल्टरहरू
+ Name[nl]=Correctiefilters
+ Name[pl]=Filtry poprawy jakości
+ Name[pt]=Filtros de Melhoramento
+@@ -33,6 +35,7 @@
+ Name[zh_CN]=增强过滤器
+ Name[zh_TW]=增強過濾器
+ Comment=Enhance the quality of an image
++Comment[bg]=Подобряване на качеството на изображения
+ Comment[ca]=Millora la qualitat de la imatge
+ Comment[cy]=Tecâu ansawdd delwedd
+ Comment[da]=Forbedr kvaliteten af et billede
+@@ -50,6 +53,7 @@
+ Comment[km]=បង្កើនគុណភាពរូបភាព
+ Comment[nb]=Forbedre kvaliteten på et bilde
+ Comment[nds]=De Gööd vun en Bild verbetern
++Comment[ne]=एउटा छविको गुण बढाउनुहोस्
+ Comment[nl]=De kwaliteit van een afbeelding verbeteren
+ Comment[pl]=Filtry poprawiające jakość obrazka
+ Comment[pt]=Melhora a qualidade de uma imagem
+--- krita/plugins/filters/cubismfilter/kritacubismfilter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/cubismfilter/kritacubismfilter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Cubism Filter
++Name[bg]=Кубичен филтър
+ Name[ca]=Filtre de cubisme
+ Name[cy]=Hidlen Giwbiaeth
+ Name[da]=Kubismefilter
+@@ -20,6 +21,7 @@
+ Name[lv]=Kubisma filtrs
+ Name[nb]=Kubisme-filter
+ Name[nds]=Wörpel-Filter
++Name[ne]=क्यूबिजम फिल्टर
+ Name[nl]=Kubismefilter
+ Name[pl]=Filtr kubistyczny
+ Name[pt]=Filtro de Cubismo
+@@ -34,6 +36,7 @@
+ Name[uz]=Кубизм филтери
+ Name[zh_TW]=立體過濾器
+ Comment=Cubism filter
++Comment[bg]=Кубичен филтър
+ Comment[ca]=Filtre de cubisme
+ Comment[cy]=Hidlen Giwbiaeth
+ Comment[da]=Kubismefilter
+@@ -53,6 +56,7 @@
+ Comment[lv]=Kubisma filtrs
+ Comment[nb]=Kubisme-filter
+ Comment[nds]=Wörpel-Filter
++Comment[ne]=क्यूबिजम फिल्टर
+ Comment[nl]=Kubismefilter
+ Comment[pl]=Filtr kubistyczny
+ Comment[pt]=Filtro de cubismo
+--- krita/plugins/filters/colorsfilters/kritacolorsfilter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/colorsfilters/kritacolorsfilter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Color Filters
++Name[bg]=Цветови филтри
+ Name[br]=Siloù liv
+ Name[ca]=Filtres de color
+ Name[cy]=Hidlau lliw
+@@ -24,6 +25,7 @@
+ Name[lv]=Krāsu filtri
+ Name[nb]=Fargefiltre
+ Name[nds]=Klörenfilters
++Name[ne]=रङ फिल्टरहरू
+ Name[nl]=Kleurfilters
+ Name[pl]=Filtry kolorów
+ Name[pt]=Filtros de Cores
+@@ -38,6 +40,7 @@
+ Name[uz]=Ранг филтерлари
+ Name[zh_TW]=色彩過濾器
+ Comment=Color filters
++Comment[bg]=Цветови филтри
+ Comment[br]=Siloù liv
+ Comment[ca]=Filtres de color
+ Comment[cy]=Hidlau lliw
+@@ -61,6 +64,7 @@
+ Comment[lv]=Krāsu filtri
+ Comment[nb]=Fargefiltre
+ Comment[nds]=Klörenfilters
++Comment[ne]=रङ फिल्टरहरू
+ Comment[nl]=Kleurfilters
+ Comment[pl]=Filtry kolorów
+ Comment[pt]=Filtros de cores
+--- krita/plugins/filters/example/kritaexample.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/example/kritaexample.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Invert Filter
++Name[bg]=Инвертиращ филтър
+ Name[ca]=Inverteix filtre
+ Name[cy]=Hidlen Wrthdroi
+ Name[da]=Inverteringsfilter
+@@ -19,6 +20,7 @@
+ Name[km]=តម្រងបញ្ច្រាស
+ Name[nb]=Inverteringsfilter
+ Name[nds]=Ümdreih-Filter
++Name[ne]=फिल्टर उल्टाउनुहोस्
+ Name[nl]=Inversefilter
+ Name[pl]=Filtr inwersji
+ Name[pt]=Filtro de Inversão
+@@ -32,6 +34,7 @@
+ Name[uk]=Фільтр інвертування
+ Name[zh_TW]=倒轉過濾器
+ Comment=Invert the colors of an image
++Comment[bg]=Инвертиращ филтър
+ Comment[ca]=Inverteix els colors d'una imatge
+ Comment[cy]=Gwrthdroi lliwiau delwedd
+ Comment[da]=Invertér farverne i et billede
+@@ -50,6 +53,7 @@
+ Comment[km]=បញ្ច្រាសពណ៌រូបភាព
+ Comment[nb]=Snu om fargene i et bilde
+ Comment[nds]=De Klören vun en Bild ümdreihen
++Comment[ne]=एउटा छविको रङहरू उल्टाउनुहोस्
+ Comment[nl]=Keert de kleuren van een afbeelding om
+ Comment[pl]=Odwraca kolory obrazka
+ Comment[pt]=Inverter as cores de uma imagem
+--- krita/plugins/filters/randompickfilter/kritarandompickfilter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/randompickfilter/kritarandompickfilter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Comment=Random pick to an image
++Comment[bg]=Случайно избиране на изображение
+ Comment[ca]=Agafa aleatòriament una imatge
+ Comment[da]=Udfør tilfældigt valg i et billede
+ Comment[de]=Zufallsauswahl zu einem Bild
+@@ -13,6 +14,7 @@
+ Comment[km]=រើសដោយចៃដន្យទៅរូបភាព
+ Comment[nb]=Tilfeldig plukk til et bilde
+ Comment[nds]=Tofällig Bildutwahl
++Comment[ne]=एउटा छविमा अनियन्त्रित तरिकाले टिप्नुहोस्
+ Comment[nl]=Willekeurige keuze voor een afbeelding
+ Comment[pl]=Losowy wybór fragmentu obrazka
+ Comment[pt]=Extrai aleatoriamente para uma imagem
+@@ -23,10 +25,12 @@
+ Comment[sr]=Насумичан избор са слике
+ Comment[sr at Latn]=Nasumičan izbor sa slike
+ Comment[sv]=Utför slumpmässigt urval i en bild
++Comment[uk]=Міняє місцями деякі точки зображення
+ Comment[zh_TW]=隨機挑選圖片
+ Encoding=UTF-8
+ Icon=
+ Name=Random pick Filter
++Name[bg]=Филтър за случайно избиране
+ Name[ca]=Aplica un filtre aleatòriament
+ Name[da]=Tilfældigt udvalgsfilter
+ Name[de]=Zufallsauswahlfilter
+@@ -41,6 +45,7 @@
+ Name[km]=តម្រងរើសដោយចៃដន្យ
+ Name[nb]=Tilfeldig plukk-filter
+ Name[nds]=Filter för tofällig Bildutwahl
++Name[ne]=फिल्टर अनियन्त्रित तरिकाले टिप्नुहोस्
+ Name[nl]=Willekeurige-keuze-filter
+ Name[pl]=Filtr losowego wyboru
+ Name[pt]=Filtro de Extracção Aleatória
+@@ -51,6 +56,7 @@
+ Name[sr]=Филтер за насумичан избор
+ Name[sr at Latn]=Filter za nasumičan izbor
+ Name[sv]=Slumpmässigt urvalsfilter
++Name[uk]=Випадковий вибір
+ Name[zh_TW]=隨機挑選過濾器
+ ServiceTypes=Krita/Filter
+ Type=Service
+--- krita/plugins/filters/embossfilter/kritaembossfilter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/embossfilter/kritaembossfilter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Emboss Filter
++Name[bg]=Релефен филтър
+ Name[ca]=Filtre d'Emboss
+ Name[cy]=Hidlen Foglynnu
+ Name[da]=Relieffilter
+@@ -18,6 +19,7 @@
+ Name[km]=តម្រងក្រឡោប
+ Name[nb]=Pregefilter
+ Name[nds]=Ingraven-Filter
++Name[ne]=अलंकृत फिल्टर
+ Name[nl]=Reliëffilter
+ Name[pl]=Filtr wytłaczania
+ Name[pt]=Filtro de Gravação
+@@ -30,6 +32,7 @@
+ Name[uk]=Фільтр барельєфу
+ Name[zh_TW]=浮雕過濾器
+ Comment=Emboss filter
++Comment[bg]=Релефен филтър
+ Comment[ca]=Filtre d'Emboss
+ Comment[cy]=Hidlen foglynnu
+ Comment[da]=Relieffilter
+@@ -47,6 +50,7 @@
+ Comment[km]=តម្រងក្រឡោប
+ Comment[nb]=Pregefilter
+ Comment[nds]=Ingraven-Filter
++Comment[ne]=अलंकृत फिल्टर
+ Comment[nl]=Reliëffilter
+ Comment[pl]=Filtr wytłaczania
+ Comment[pt]=Filtro de gravação
+--- krita/plugins/filters/lenscorrectionfilter/kritalenscorrectionfilter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/lenscorrectionfilter/kritalenscorrectionfilter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Comment=Transform an image in a lenscorrection
++Comment[bg]=Преобразуване на изображение в коригиране на лещи
+ Comment[ca]=Transforma una imatge en una lent correctora
+ Comment[da]=Transformér et billede med linsekorrektion
+ Comment[de]=Ein Bild mit einer Linsenkorrektur transformieren
+@@ -14,6 +15,7 @@
+ Comment[km]=ប្លែងរូបភាពក្នុងការកែកែវម៉ាស៊ីនថតរូប
+ Comment[nb]=Transformer et bilde med linsekorreksjon
+ Comment[nds]=En Bild mit Glööskorrektuur ümwanneln
++Comment[ne]=लेन्ससुधारमा छवि रूपान्तरण गर्नुहोस्
+ Comment[nl]=Transformeer een afbeelding in een lenscorrectie
+ Comment[pl]=Usuwa efekt soczewki ze zdjęcia
+ Comment[pt]=Transformar uma imagem numa correcção de lentes
+@@ -29,6 +31,7 @@
+ Encoding=UTF-8
+ Icon=
+ Name=LensCorrection Filter
++Name[bg]=Филтри за коригиране на лещи
+ Name[ca]=Filtre de Lent correctora
+ Name[da]=Linekorrektionsfilter
+ Name[de]=Linsenkorrekturfilter
+@@ -43,6 +46,7 @@
+ Name[km]=តម្រងការកែកែវម៉ាស៊ីនថតរូប
+ Name[nb]=Linsekorreksjonsfilter
+ Name[nds]=Glööskorrektuurfilter
++Name[ne]=लेन्ससुधार फिल्टर
+ Name[nl]=Lenscorrectiefilter
+ Name[pl]=Filtr korekcji efektu soczewki
+ Name[pt]=Filtro de Correcção de Lentes
+--- krita/plugins/filters/pixelizefilter/kritapixelizefilter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/pixelizefilter/kritapixelizefilter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Pixelize Filter
++Name[bg]=Филтър Pixelize
+ Name[ca]=Filtre de pixelació
+ Name[cy]=Hidlen bicseleiddio
+ Name[da]=Billedpunktfilter
+@@ -21,6 +22,7 @@
+ Name[km]=តម្រងធ្វើភីកសែល
+ Name[nb]=Pikseleringsfilter
+ Name[nds]=Pixelfilter
++Name[ne]=फिल्टर पिक्सेलाइज गर्नुहोस्
+ Name[nl]=Pixelfilter
+ Name[pl]=Filtr pikselizacji
+ Name[pt]=Filtro de Pixelização
+@@ -35,6 +37,7 @@
+ Name[uz]=Пикселлаштириш филтери
+ Name[zh_TW]=像素化過濾器
+ Comment=Pixelize filter
++Comment[bg]=Филтър Pixelize
+ Comment[ca]=Filtre de pixelació
+ Comment[cy]=Hidlen bicseleiddio
+ Comment[da]=Billedpunktfilter
+@@ -55,6 +58,7 @@
+ Comment[km]=តម្រងធ្វើភីកសែល
+ Comment[nb]=Pikseleringsfilter
+ Comment[nds]=Pixelfilter
++Comment[ne]=फिल्टर पिक्सेलाइज गर्नुहोस्
+ Comment[nl]=Pixelfilter
+ Comment[pl]=Filtr pikselizacji
+ Comment[pt]=Filtro de pixelização
+--- krita/plugins/filters/fastcolortransfer/kritafastcolortransfer.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/fastcolortransfer/kritafastcolortransfer.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Comment=This plugins allow to transfer color from an image to an other image
++Comment[bg]=Тази приставка позволява прехвърлянето на цвят от едно в друго изображение
+ Comment[ca]=Aquest endollats permeten de transferir el color d'una imatge a una altra
+ Comment[da]=Dette plugin gør det muligt at overføre en farve fra et billede til et andet billede
+ Comment[de]=Diese Plugins ermöglichen die Farbübertragung von einem Bild zu einem anderen
+@@ -15,6 +16,7 @@
+ Comment[km]=កម្មវិធីជំនួយនេះអនុញ្ញាតឲ្យផ្ទេរពណ៌ពីរូបភាពមួយទៅរូបភាពមួយផ្សេងទៀត
+ Comment[nb]=Med dette programtillegget kan farger overføres fra ett bilde til et annet
+ Comment[nds]=Mit dissen Moduul laat sik Klören vun een Bild na en anner överdregen
++Comment[ne]=यो प्लगइनले एउटा छविबाट अर्को छविमा रङ स्थान्तरण गर्न अनुमति दिन्छ
+ Comment[nl]=Met deze plugin kunt u kleur van een afbeelding naar een andere overzetten
+ Comment[pl]=Ta wtyczka pozwala na przeniesienie koloru z jednego obrazka do drugiego
+ Comment[pt]=Este 'plugin' permite transferir a cor de uma imagem para outra
+@@ -30,6 +32,7 @@
+ Encoding=UTF-8
+ Icon=
+ Name=Color Transfer Filter
++Name[bg]=Филтри за прехвърляне на цвят
+ Name[ca]=Filtre de transferència de color
+ Name[da]=Farveoverførselsfilter
+ Name[de]=Farbübertragungsfilter
+@@ -45,6 +48,7 @@
+ Name[km]=តម្រងផ្ទេរពណ៌
+ Name[nb]=Fargeoverføringsfilter
+ Name[nds]=Klööröverdregenfilter
++Name[ne]=रङ स्थान्तरण फिल्टर
+ Name[nl]=Kleuroverzetfilter
+ Name[pl]=Filtr przeniesienia koloru
+ Name[pt]=Filtro de Transferência de Cores
+--- krita/plugins/filters/colors/kritaextensioncolorsfilters.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/colors/kritaextensioncolorsfilters.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Icon=
+ Name=Color Filters (Extension)
++Name[bg]=Цветови филтри (разширения)
+ Name[ca]=Filtres de color (Extensió)
+ Name[da]=Farvefiltre (Udvidelse)
+ Name[de]=Farbfilter (Erweiterung)
+@@ -18,6 +19,7 @@
+ Name[km]=តម្រងពណ៌ (ផ្នែកបន្ថែម)
+ Name[nb]=Fargefiltre (utvidelse)
+ Name[nds]=Klörenfilters (Verwiedern)
++Name[ne]=रङ फिल्टरहरू (अपवाद)
+ Name[nl]=Kleurfilters (extensie)
+ Name[pl]=Filtry kolorów (rozszerzenie)
+ Name[pt]=Filtros de Cores (Extensão)
+--- krita/plugins/filters/bumpmap/wdgbumpmap.ui (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/bumpmap/wdgbumpmap.ui (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -8,15 +8,15 @@
+ <rect>
+ <x>0</x>
+ <y>0</y>
+- <width>464</width>
+- <height>520</height>
++ <width>520</width>
++ <height>603</height>
+ </rect>
+ </property>
+ <grid>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+- <widget class="QFrame" row="3" column="0" rowspan="1" colspan="4">
++ <widget class="QFrame" row="3" column="0" rowspan="1" colspan="3">
+ <property name="name">
+ <cstring>frame3</cstring>
+ </property>
+@@ -75,7 +75,7 @@
+ </spacer>
+ </grid>
+ </widget>
+- <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="4">
++ <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="3">
+ <property name="name">
+ <cstring>grpSettings</cstring>
+ </property>
+@@ -279,7 +279,7 @@
+ </widget>
+ </grid>
+ </widget>
+- <widget class="QGroupBox" row="1" column="2" rowspan="1" colspan="2">
++ <widget class="QGroupBox" row="1" column="2">
+ <property name="name">
+ <cstring>grpOptions</cstring>
+ </property>
+@@ -323,32 +323,31 @@
+ <property name="name">
+ <cstring>lblLayer</cstring>
+ </property>
++ <property name="sizePolicy">
++ <sizepolicy>
++ <hsizetype>5</hsizetype>
++ <vsizetype>5</vsizetype>
++ <horstretch>0</horstretch>
++ <verstretch>0</verstretch>
++ </sizepolicy>
++ </property>
+ <property name="text">
+- <string>&Bumpmap layer:</string>
++ <string>Bumpmap layer:</string>
+ </property>
+ <property name="buddy" stdset="0">
+ <cstring>txtSourceLayer</cstring>
+ </property>
+ </widget>
+- <widget class="QPushButton" row="0" column="3">
++ <widget class="KComboBox" row="0" column="1" rowspan="1" colspan="2">
+ <property name="name">
+- <cstring>bnRefresh</cstring>
++ <cstring>cboxSourceLayer</cstring>
+ </property>
+- <property name="text">
+- <string>&Preview</string>
+- </property>
+ </widget>
+- <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="2">
+- <property name="name">
+- <cstring>txtSourceLayer</cstring>
+- </property>
+- </widget>
+ </grid>
+ </widget>
+ <customwidgets>
+ </customwidgets>
+ <tabstops>
+- <tabstop>txtSourceLayer</tabstop>
+ <tabstop>radioLinear</tabstop>
+ <tabstop>chkCompensate</tabstop>
+ <tabstop>chkInvert</tabstop>
+@@ -360,7 +359,6 @@
+ <tabstop>intYOffset</tabstop>
+ <tabstop>intWaterLevel</tabstop>
+ <tabstop>intAmbient</tabstop>
+- <tabstop>bnRefresh</tabstop>
+ </tabstops>
+ <layoutdefaults spacing="6" margin="11"/>
+ <includehints>
+@@ -371,5 +369,6 @@
+ <includehint>knuminput.h</includehint>
+ <includehint>knuminput.h</includehint>
+ <includehint>knuminput.h</includehint>
++ <includehint>kcombobox.h</includehint>
+ </includehints>
+ </UI>
+--- krita/plugins/filters/bumpmap/bumpmap.cc (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/bumpmap/bumpmap.cc (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ * This file is part of the KDE project
+ *
+ * Copyright (c) 2005 Boudewijn <boud at valdyas.org>
++ * Copyright (c) 2007 Benjamin Schleimer <bensch128 at yahoo.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -34,6 +35,7 @@
+ #include <qcombobox.h>
+ #include <qcheckbox.h>
+ #include <qbuttongroup.h>
++#include <qradiobutton.h>
+ #include <qstring.h>
+ #include <qpushbutton.h>
+ #include <qlineedit.h>
+@@ -47,6 +49,7 @@
+ #include <ktempfile.h>
+ #include <kdebug.h>
+ #include <kgenericfactory.h>
++#include <kcombobox.h>
+
+ #include <kis_doc.h>
+ #include <kis_image.h>
+@@ -117,6 +120,7 @@
+
+ KisBumpmapConfiguration * config = (KisBumpmapConfiguration*)cfg;
+
++ Q_INT32 xofs, yofs; /// The x,y offset values
+ Q_INT32 lx, ly; /* X and Y components of light vector */
+ Q_INT32 nz2, nzlz; /* nz^2, nz*lz */
+ Q_INT32 background; /* Shade for vertical normals */
+@@ -131,6 +135,10 @@
+
+ // ------------------ Prepare parameters
+
++ /* Convert the offsets */
++ xofs = -config->xofs;
++ yofs = -config->yofs;
++
+ /* Convert to radians */
+ azimuth = M_PI * config->azimuth / 180.0;
+ elevation = M_PI * config->elevation / 180.0;
+@@ -214,144 +222,119 @@
+ bumpmap = src;
+ }
+ }
+- else {
+- bmRect = rect;
+- bumpmap = src;
++
++ if(!bmRect.isValid()) {
++ bmRect = rect;
++ bumpmap = src;
+ }
+
++ kdDebug(12345) << "KisFilterBumpmap::process: rect=" << rect << ", bumpmap rect=" << bmRect << "\n";
++
++ setProgressTotalSteps(rect.height());
+
+- Q_INT32 sel_h = rect.height();
+- Q_INT32 sel_w = rect.width();
+- Q_INT32 sel_x = rect.x();
+- Q_INT32 sel_y = rect.y();
++ // ---------------------- Load initial three bumpmap scanlines
+
+- Q_INT32 bm_h = bmRect.height();
+- Q_INT32 bm_w = bmRect.width();
+- Q_INT32 bm_x = bmRect.x();
++ KisColorSpace * srcCs = src->colorSpace();
++ QValueVector<KisChannelInfo *> channels = srcCs->channels();
+
+- setProgressTotalSteps(sel_h);
++ // One byte per pixel, converted from the bumpmap layer.
++ Q_UINT8 * bm_row1 = new Q_UINT8[bmRect.width()];
++ Q_UINT8 * bm_row2 = new Q_UINT8[bmRect.width()];
++ Q_UINT8 * bm_row3 = new Q_UINT8[bmRect.width()];
++ Q_UINT8 * tmp_row;
+
+ // ------------------- Map the bumps
+ Q_INT32 yofs1, yofs2, yofs3;
+-
++
+ // ------------------- Initialize offsets
+ if (config->tiled) {
+- yofs2 = MOD (config->yofs + sel_y, bm_h);
+- yofs1 = MOD (yofs2 - 1, bm_h);
+- yofs3 = MOD (yofs2 + 1, bm_h);
++ yofs2 = MOD (yofs, bmRect.height());
++ yofs1 = MOD (yofs2 - 1, bmRect.height());
++ yofs3 = MOD (yofs2 + 1, bmRect.height());
+ }
+ else {
+- yofs2 = CLAMP (config->yofs + sel_y, 0, bm_h - 1);
+- yofs1 = yofs2;
+- yofs3 = CLAMP (yofs2 + 1, 0, bm_h - 1);
+-
++ yofs2 = 0;
++ yofs1 = yofs2 - 1;
++ yofs3 = yofs2 + 1;
+ }
++ convertRow(bumpmap, bm_row1, bmRect.x(), yofs1+bmRect.top(), bmRect.width(), lut, config->waterlevel);
++ convertRow(bumpmap, bm_row2, bmRect.x(), yofs2+bmRect.top(), bmRect.width(), lut, config->waterlevel);
++ convertRow(bumpmap, bm_row3, bmRect.x(), yofs3+bmRect.top(), bmRect.width(), lut, config->waterlevel);
+
+- // ---------------------- Load initial three bumpmap scanlines
++ for (int y = rect.top(); y<=rect.bottom(); y++) {
++ const Q_INT32 yBump = y+yofs;
++ if(config->tiled || (bmRect.top()<=yBump && yBump<=bmRect.bottom()) ) {
++ // Get the iterators
++ KisHLineIteratorPixel dstIt = dst->createHLineIterator(rect.x(), y, rect.width(), true);
++ KisHLineIteratorPixel srcIt = src->createHLineIterator(rect.x(), y, rect.width(), false);
+
+- KisColorSpace * srcCs = src->colorSpace();
+- QValueVector<KisChannelInfo *> channels = srcCs->channels();
++ //while (x < sel_w || cancelRequested()) {
++ while (!srcIt.isDone() && !cancelRequested()) {
++ if (srcIt.isSelected()) {
++
++ const Q_INT32 xBump = srcIt.x()+xofs;
++ Q_INT32 nx, ny;
++ // Calculate surface normal from bumpmap
++ if (config->tiled || bmRect.left() <= xBump && xBump <= bmRect.right()) {
++
++ Q_INT32 xofs1, xofs2, xofs3;
++ if (config->tiled) {
++ xofs2 = MOD (xBump-bmRect.left(), bmRect.width());
++ xofs1 = MOD (xofs2 - 1, bmRect.width());
++ xofs3 = MOD (xofs2 + 1, bmRect.width());
++ } else {
++ xofs2 = MOD (xBump-bmRect.left(), bmRect.width());
++ xofs1 = ::max (xofs2 - 1, 0);
++ xofs3 = ::min (xofs2 + 1, bmRect.width());
++ }
+
+- // One byte per pixel, converted from the bumpmap layer.
+- Q_UINT8 * bm_row1 = new Q_UINT8[bm_w];
+- Q_UINT8 * bm_row2 = new Q_UINT8[bm_w];
+- Q_UINT8 * bm_row3 = new Q_UINT8[bm_w];
+- Q_UINT8 * tmp_row;
++ nx = (bm_row1[xofs1] + bm_row2[xofs1] + bm_row3[xofs1] -
++ bm_row1[xofs3] - bm_row2[xofs3] - bm_row3[xofs3]);
++ ny = (bm_row3[xofs1] + bm_row3[xofs2] + bm_row3[xofs3] -
++ bm_row1[xofs1] - bm_row1[xofs2] - bm_row1[xofs3]);
++ } else {
++ nx = 0;
++ ny = 0;
++ }
+
+- convertRow(bumpmap, bm_row1, bm_x, yofs1, bm_w, lut, config->waterlevel);
+- convertRow(bumpmap, bm_row2, bm_x, yofs2, bm_w, lut, config->waterlevel);
+- convertRow(bumpmap, bm_row3, bm_x, yofs3, bm_w, lut, config->waterlevel);
+-
+- bool row_in_bumpmap;
+-
+- Q_INT32 xofs1, xofs2, xofs3, shade, ndotl, nx, ny;
+- for (int y = sel_y; y < sel_h + sel_y; y++) {
+-
+- row_in_bumpmap = (y >= - config->yofs && y < - config->yofs + bm_h);
+-
+- // Bumpmap
+-
+- KisHLineIteratorPixel dstIt = dst->createHLineIterator(rect.x(), y, sel_w, true);
+- KisHLineIteratorPixel srcIt = src->createHLineIterator(rect.x(), y, sel_w, false);
+-
+- Q_INT32 tmp = config->xofs + sel_x;
+- xofs2 = MOD (tmp, bm_w);
+-
+- Q_INT32 x = 0;
+- //while (x < sel_w || cancelRequested()) {
+- while (!srcIt.isDone() && !cancelRequested()) {
+- if (srcIt.isSelected()) {
+- // Calculate surface normal from bumpmap
+- if (config->tiled || row_in_bumpmap &&
+- x >= - tmp&& x < - tmp + bm_w) {
+-
+- if (config->tiled) {
+- xofs1 = MOD (xofs2 - 1, bm_w);
+- xofs3 = MOD (xofs2 + 1, bm_w);
++ // Shade
++ Q_INT32 shade;
++ if ((nx == 0) && (ny == 0)) {
++ shade = background;
++ } else {
++ Q_INT32 ndotl = (nx * lx) + (ny * ly) + nzlz;
++
++ if (ndotl < 0) {
++ shade = (Q_INT32)(compensation * config->ambient);
++ } else {
++ shade = (Q_INT32)(ndotl / sqrt(nx * nx + ny * ny + nz2));
++ shade = (Q_INT32)(shade + QMAX(0, (255 * compensation - shade)) * config->ambient / 255);
++ }
+ }
+- else {
+- xofs1 = CLAMP (xofs2 - 1, 0, bm_w - 1);
+- xofs3 = CLAMP (xofs2 + 1, 0, bm_w - 1);
+- }
+
+- nx = (bm_row1[xofs1] + bm_row2[xofs1] + bm_row3[xofs1] -
+- bm_row1[xofs3] - bm_row2[xofs3] - bm_row3[xofs3]);
+- ny = (bm_row3[xofs1] + bm_row3[xofs2] + bm_row3[xofs3] -
+- bm_row1[xofs1] - bm_row1[xofs2] - bm_row1[xofs3]);
+-
+-
++ // Paint
++ srcCs->darken(srcIt.rawData(), dstIt.rawData(), shade, config->compensate, compensation, 1);
+ }
+- else {
+- nx = 0;
+- ny = 0;
+- }
+
+- // Shade
+-
+- if ((nx == 0) && (ny == 0)) {
+- shade = background;
+- }
+- else {
+- ndotl = (nx * lx) + (ny * ly) + nzlz;
+-
+- if (ndotl < 0) {
+- shade = (Q_INT32)(compensation * config->ambient);
+- }
+- else {
+- shade = (Q_INT32)(ndotl / sqrt(nx * nx + ny * ny + nz2));
+- shade = (Q_INT32)(shade + QMAX(0, (255 * compensation - shade)) * config->ambient / 255);
+- }
+- }
+-
+- // Paint
+- srcCs->darken(srcIt.rawData(), dstIt.rawData(), shade, config->compensate, compensation, 1);
++ ++srcIt;
++ ++dstIt;
+ }
+- if (++xofs2 == bm_w)
+- xofs2 = 0;
+- ++srcIt;
+- ++dstIt;
+- ++x;
+- }
+
+-
+- // Next line
+- if (config->tiled || row_in_bumpmap) {
++ // Go to the next row
+ tmp_row = bm_row1;
+ bm_row1 = bm_row2;
+ bm_row2 = bm_row3;
+ bm_row3 = tmp_row;
+
+- if (++yofs2 == bm_h) {
+- yofs2 = 0;
+- }
++ yofs2++;
++ if (yofs2 >= bmRect.height()) { yofs2 = 0; }
++
+ if (config->tiled) {
+- yofs3 = MOD(yofs2 + 1, bm_h);
++ yofs3 = MOD (yofs2 + 1, bmRect.height());
++ } else {
++ yofs3 = yofs2 + 1;
+ }
+- else {
+- yofs3 = CLAMP(yofs2 + 1, 0, bm_h - 1);
+- }
+-
+- convertRow(bumpmap, bm_row3, bm_x, yofs3, bm_w, lut, config->waterlevel);
++ convertRow(bumpmap, bm_row3, bmRect.x(), yofs3+bmRect.top(), bmRect.width(), lut, config->waterlevel);
+ }
+
+ incProgress();
+@@ -473,28 +456,44 @@
+ return KisFilterConfiguration::toString();
+ }
+
+-KisBumpmapConfigWidget::KisBumpmapConfigWidget(KisFilter * filter, KisPaintDeviceSP dev, QWidget * parent, const char * name, WFlags f)
+- : KisFilterConfigWidget(parent, name, f),
+- m_filter(filter),
+- m_device(dev)
++KisBumpmapConfigWidget::KisBumpmapConfigWidget(KisFilter *, KisPaintDeviceSP dev, QWidget * parent, const char * name, WFlags f)
++ : KisFilterConfigWidget(parent, name, f)
+ {
+- Q_ASSERT(m_filter);
+- Q_ASSERT(m_device);
+-
+ m_page = new WdgBumpmap(this);
+ QHBoxLayout * l = new QHBoxLayout(this);
+ Q_CHECK_PTR(l);
+
+ l->add(m_page);
+- m_filter->setAutoUpdate(false);
+- m_page->txtSourceLayer->setText( "" );
+- connect( m_page->bnRefresh, SIGNAL(clicked()), SIGNAL(sigPleaseUpdatePreview()));
++
++ // Find all of the layers in the group
++ if(dev->image() ) {
++ KisGroupLayerSP root = dev->image()->rootLayer();
++ for(KisLayerSP layer = root->firstChild(); layer; layer = layer->nextSibling())
++ {
++ m_page->cboxSourceLayer->insertItem(layer->name());
++ }
++ }
++
++ // Connect all of the widgets to update signal
++ connect( m_page->radioLinear, SIGNAL( toggled(bool)), SIGNAL(sigPleaseUpdatePreview()));
++ connect( m_page->radioSpherical, SIGNAL( toggled(bool)), SIGNAL(sigPleaseUpdatePreview()));
++ connect( m_page->radioSinusoidal, SIGNAL( toggled(bool)), SIGNAL(sigPleaseUpdatePreview()));
++ connect( m_page->chkCompensate, SIGNAL( toggled(bool)), SIGNAL(sigPleaseUpdatePreview()));
++ connect( m_page->chkInvert, SIGNAL( toggled(bool)), SIGNAL(sigPleaseUpdatePreview()));
++ connect( m_page->chkTiled, SIGNAL( toggled(bool)), SIGNAL(sigPleaseUpdatePreview()));
++ connect( m_page->dblAzimuth, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview()));
++ connect( m_page->dblElevation, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview()));
++ connect( m_page->dblDepth, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview()));
++ connect( m_page->intXOffset, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview()));
++ connect( m_page->intYOffset, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview()));
++ connect( m_page->intWaterLevel, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview()));
++ connect( m_page->intAmbient, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview()));
+ }
+
+ KisBumpmapConfiguration * KisBumpmapConfigWidget::config()
+ {
+ KisBumpmapConfiguration * cfg = new KisBumpmapConfiguration();
+- cfg->bumpmap = m_page->txtSourceLayer->text();
++ cfg->bumpmap = m_page->cboxSourceLayer->currentText();
+ cfg->azimuth = m_page->dblAzimuth->value();
+ cfg->elevation = m_page->dblElevation->value();
+ cfg->depth = m_page->dblDepth->value();
+@@ -515,7 +514,8 @@
+ KisBumpmapConfiguration * cfg = dynamic_cast<KisBumpmapConfiguration*>(config);
+ if (!cfg) return;
+
+- m_page->txtSourceLayer->setText( cfg->bumpmap );
++ // NOTE: maybe we should find the item instead?
++ m_page->cboxSourceLayer->setCurrentText( cfg->bumpmap );
+ m_page->dblAzimuth->setValue(cfg->azimuth);
+ m_page->dblElevation->setValue(cfg->elevation);
+ m_page->dblDepth->setValue(cfg->depth);
+--- krita/plugins/filters/bumpmap/bumpmap.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/bumpmap/bumpmap.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ * This file is part of Krita
+ *
+ * Copyright (c) 2005 Boudewijn Rempt <boud at valdyas.org>
++ * Copyright (c) 2007 Benjamin Schleimer <bensch128 at yahoo.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -73,6 +74,7 @@
+ virtual bool supportsPreview() { return true; }
+ virtual bool supportsIncrementalPainting() { return true; }
+ virtual bool supportsAdjustmentLayers() { return false; }
++ virtual bool supportsThreading() { return false; }
+
+ virtual KisFilterConfigWidget * createConfigurationWidget(QWidget* parent, KisPaintDeviceSP dev);
+ virtual KisFilterConfiguration * configuration(QWidget*);
+@@ -119,13 +121,9 @@
+ KisBumpmapConfiguration * config();
+ void setConfiguration(KisFilterConfiguration * config);
+
+- WdgBumpmap * m_page;
+-
+ private:
+
+- KisFilter * m_filter;
+- KisPaintDeviceSP m_device;
+-
++ WdgBumpmap * m_page;
+ };
+
+ #endif
+--- krita/plugins/filters/bumpmap/kritabumpmapfilter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/bumpmap/kritabumpmapfilter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Bumpmap Filter
++Name[bg]=Филтър Bumpmap
+ Name[ca]=Filtre Bumpmap
+ Name[cy]=Hidlen chwyddfap
+ Name[da]=Bumpkortfilter
+@@ -19,6 +20,7 @@
+ Name[km]=តម្រងផែនទីរដិបរដុប
+ Name[nb]=Dumpkart-filter
+ Name[nds]=Bumpmap-Filter
++Name[ne]=बम्पम्याप फिल्टर
+ Name[nl]=Bumpmapfilter
+ Name[pl]=Filtr odwzorowania nierówności
+ Name[pt]=Filtro de 'Bumpmaps'
+@@ -31,6 +33,7 @@
+ Name[uk]=Рельєф
+ Name[zh_TW]=Bumpmap 過濾器
+ Comment=Bumpmap filter
++Comment[bg]=Филтър Bumpmap
+ Comment[ca]=Filtre de Bumpmap
+ Comment[cy]=Hidlen chwyddfap
+ Comment[da]=Bumpkortfilter
+@@ -49,6 +52,7 @@
+ Comment[km]=តម្រងផែនទីរដិបរដុប
+ Comment[nb]=Dumpkart-filter
+ Comment[nds]=Bumpmap-Filter
++Comment[ne]=बम्पम्याप फिल्टर
+ Comment[nl]=Bumpmapfilter
+ Comment[pl]=Filtr odwzorowania nierówności (ang. bumpmap)
+ Comment[pt]=Filtro de 'bumpmaps'
+--- krita/plugins/filters/blur/kis_blur_filter.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/blur/kis_blur_filter.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ * This file is part of Krita
+ *
+ * Copyright (c) 2006 Cyrille Berger <cberger at cberger.net>
++ * Copyright (c) 2007 Benjamin Schleimer <bensch128 at yahoo.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -38,6 +39,7 @@
+ virtual bool supportsPreview() { return true; }
+ virtual bool supportsIncrementalPainting() { return false; }
+ virtual bool supportsAdjustmentLayers() { return false; }
++ virtual bool supportsThreading() { return false; }
+ virtual ColorSpaceIndependence colorSpaceIndependence() { return FULLY_INDEPENDENT; };
+ public:
+ virtual KisFilterConfigWidget * createConfigurationWidget(QWidget* parent, KisPaintDeviceSP dev);
+--- krita/plugins/filters/blur/kritablurfilter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/blur/kritablurfilter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Icon=
+ Name=Convolution Filters (Extension)
++Name[bg]=Изкривяващи филтри (разширения)
+ Name[ca]=Filtres d'enrotllament (Extensió)
+ Name[da]=Foldningsfiltre (Udvidelse)
+ Name[de]=Faltungsfilter (Erweiterung)
+@@ -14,10 +15,11 @@
+ Name[gl]=Filtros de Convolución (Extensións)
+ Name[hu]=Konvolúciószűrők (kiterjesztés)
+ Name[it]=Filtri di convoluzione (estensione)
+-Name[ja]=コンヴォリューションフィルタ (拡張)
++Name[ja]=コンボリューションフィルタ (拡張)
+ Name[km]=តម្រងអង្កាញ់ (ផ្នែកបន្ថែម)
+ Name[nb]=Konvolusjonsfiltre (Utvidelse)
+ Name[nds]=Fooldenfilters (Verwiedern)
++Name[ne]=कुण्डलीकरण फिल्टरहरू (अपवाद)
+ Name[nl]=Verdraaiïngsfilters (uitbreiding)
+ Name[pl]=Filtry splotowe (rozszerzenie)
+ Name[pt]=Filtros de Convolução (Extensão)
+--- krita/plugins/filters/raindropsfilter/kritaraindropsfilter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/raindropsfilter/kritaraindropsfilter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Raindrops Filter
++Name[bg]=Филтър за дъждовни капки
+ Name[ca]=Filtre de gotes de pluja
+ Name[cy]=Hidlen Ddiferion Glaw
+ Name[da]=Regndråbefilter
+@@ -19,6 +20,7 @@
+ Name[km]=តម្រងតំណក់ទឹកភ្លៀង
+ Name[nb]=Regndråpefilter
+ Name[nds]=Regendrüppen-Filter
++Name[ne]=वर्षाथोपा फिल्टर
+ Name[nl]=Regendruppelfilter
+ Name[pl]=Filtr symulujący krople deszczu
+ Name[pt]=Filtro de Pingos de Chuva
+@@ -33,6 +35,7 @@
+ Name[uz]=Ёмғир томчилари филтери
+ Name[zh_TW]=雨滴過濾器
+ Comment=Raindrops filter
++Comment[bg]=Филтър за дъждовни капки
+ Comment[ca]=Filtre de gotes de pluja
+ Comment[cy]=Hidlen ddiferion glaw
+ Comment[da]=Regndråbefilter
+@@ -51,6 +54,7 @@
+ Comment[km]=តម្រងតំណក់ទឹកភ្លៀង
+ Comment[nb]=Regndråpefilter
+ Comment[nds]=Regendrüppen-Filter
++Comment[ne]=वर्षाथोपा फिल्टर
+ Comment[nl]=Regendruppelfilter
+ Comment[pl]=Filtr symulujący krople deszczu
+ Comment[pt]=Filtro de pingos de chuva
+--- krita/plugins/filters/threadtest/kritathreadtest.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/threadtest/kritathreadtest.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Invert Filter with Threads
++Name[bg]=Инвертиращ филтър с нишки
+ Name[ca]=Inverteix filtre amb fils
+ Name[cy]=Gwrthdroi Hidlen efo Edeifion
+ Name[da]=Inverteringsfilter med tråde
+@@ -18,6 +19,7 @@
+ Name[km]=បញ្ច្រាសតម្រងជាមួយសរសៃ
+ Name[nb]=Inverteringsfilter med tråder
+ Name[nds]=Ümdreihfilter mit Sträng
++Name[ne]=धागोसँग फिल्टर उल्टाउनुहोस्
+ Name[nl]=Filter met threads omkeren
+ Name[pl]=Filtr inwersji z wątkami
+ Name[pt]=Filtro de Inversão Multitarefa
+--- krita/plugins/filters/convolutionfilters/kritaconvolutionfilters.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/convolutionfilters/kritaconvolutionfilters.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Convolution Filters
++Name[bg]=Изкривяващи филтри
+ Name[ca]=Filtres de Convolotion
+ Name[cy]=Hidlau cordeddiadau
+ Name[da]=Foldningsfilter
+@@ -15,10 +16,11 @@
+ Name[hu]=Konvolúciószűrők
+ Name[is]=Fléttunarsíur
+ Name[it]=Filtri di convoluzione
+-Name[ja]=コンヴォリューションフィルタ
++Name[ja]=コンボリューションフィルタ
+ Name[km]=តម្រងអង្កាញ់
+ Name[nb]=Konvolusjonsfiltre
+ Name[nds]=Fooldenfilters
++Name[ne]=कुण्डलीकरण फिल्टरहरू
+ Name[nl]=Verdraaïngs
+ Name[pl]=Filtry splotowe
+ Name[pt]=Filtros de Convolução
+@@ -32,6 +34,7 @@
+ Name[uk]=Фільтри згортки
+ Name[zh_TW]=皺褶過濾器
+ Comment=Convolution filters
++Comment[bg]=Изкривяващи филтри
+ Comment[ca]=Filtres de Convolution
+ Comment[cy]=Hidlau cordeddiadau
+ Comment[da]=Foldningsfilter
+@@ -46,10 +49,11 @@
+ Comment[hu]=CImg képhelyreállító szűrő
+ Comment[is]=Fléttunarsíur
+ Comment[it]=Filtri di convoluzione
+-Comment[ja]=コンヴォリューションフィルタ
++Comment[ja]=コンボリューションフィルタ
+ Comment[km]=តម្រងអង្កាញ់
+ Comment[nb]=Konvolusjonsfiltre
+ Comment[nds]=Fooldenfilters
++Comment[ne]=कुण्डलीकरण फिल्टरहरू
+ Comment[nl]=Verdraaiingsfilters
+ Comment[pl]=Filtry splotowe
+ Comment[pt]=Filtros de convolução
+--- krita/plugins/filters/wavefilter/kritawavefilter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/wavefilter/kritawavefilter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Comment=Transform an image in a wave
++Comment[bg]=Превръщане на изображение във вълна
+ Comment[ca]=Transforma una imatge en una ona
+ Comment[da]=Tranbsformér et billede med en bølge
+ Comment[de]=Ein Bild in eine Welle transformieren
+@@ -15,6 +16,7 @@
+ Comment[km]=ប្លែងរូបភាពក្នុងរលក
+ Comment[nb]=Transformer et bilde i en bølge
+ Comment[nds]=En Bild na en Bülg ümwanneln
++Comment[ne]=तरङमा छवि रूपान्तरण गर्नुहोस्
+ Comment[nl]=Transformeer een afbeelding in een golf
+ Comment[pl]=Przekształca obrazek w falę
+ Comment[pt]=Transforma uma imagem numa onda
+@@ -30,6 +32,7 @@
+ Encoding=UTF-8
+ Icon=
+ Name=Wave Filter
++Name[bg]=Вълнови филтър
+ Name[ca]=Filtre d'ona
+ Name[da]=Bølgefilter
+ Name[de]=Wellenfilter
+@@ -45,6 +48,7 @@
+ Name[km]=តម្រងរលក
+ Name[nb]=Bølgefilter
+ Name[nds]=Bülgenfilter
++Name[ne]=तरङ फिल्टर
+ Name[nl]=Golffilter
+ Name[pl]=Filtr fali
+ Name[pt]=Filtro de Onda
+--- krita/plugins/filters/sobelfilter/kritasobelfilter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/sobelfilter/kritasobelfilter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Sobel Filter
++Name[bg]=Филтър Sobel
+ Name[ca]=Filtre Sobel
+ Name[cy]=Hidlen Sobel
+ Name[da]=Sobelfilter
+@@ -18,6 +19,7 @@
+ Name[ja]=ソーベルフィルタ
+ Name[km]=តម្រងស៊ូបែល
+ Name[nds]=Sobelfilter
++Name[ne]=सोबेल फिल्टर
+ Name[nl]=Sobelfilter
+ Name[pl]=Filtr Sobela
+ Name[pt]=Filtro Sobel
+--- krita/plugins/filters/levelfilter/kritalevelfilter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/filters/levelfilter/kritalevelfilter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Levels
++Name[bg]=Нива
+ Name[br]=Liveoù
+ Name[ca]=Nivells
+ Name[da]=Niveauer
+@@ -16,6 +17,7 @@
+ Name[km]=កម្រិត
+ Name[nb]=Nivåer
+ Name[nds]=Stopen
++Name[ne]=स्तर
+ Name[nl]=Niveaus
+ Name[pl]=Poziomy
+ Name[pt]=Níveis
+@@ -29,6 +31,7 @@
+ Name[uk]=Рівні
+ Name[zh_TW]=等級
+ Comment=Levels
++Comment[bg]=Нива
+ Comment[br]=Liveoù
+ Comment[ca]=Nivells
+ Comment[da]=Niveauer
+@@ -44,6 +47,7 @@
+ Comment[km]=កម្រិត
+ Comment[nb]=Nivåer
+ Comment[nds]=Stopen
++Comment[ne]=स्तर
+ Comment[nl]=Niveaus
+ Comment[pl]=Poziomy
+ Comment[pt]=Níveis
+--- krita/plugins/viewplugins/separate_channels/kritaseparatechannels.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/viewplugins/separate_channels/kritaseparatechannels.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Separate Channels Plugin
++Name[bg]=Приставка за отделен канал
+ Name[ca]=Connector de canals separats
+ Name[da]=Plugin for separate kanaler
+ Name[de]="Kanäle trennen"-Plugin
+@@ -18,6 +19,7 @@
+ Name[km]=កម្មវិធីជំនួយដើម្បីបំបែកឆានែល
+ Name[nb]=Programtillegg for atskilte kanaler
+ Name[nds]=Kanaaltrenn-Moduul
++Name[ne]=च्यानल प्लगइन छुट्याउनुहोस्
+ Name[nl]=Plugin voor aparte kanalen
+ Name[pl]=Wtyczka oddzielania kanałów
+ Name[pt]='Plugin' de Separação de Canais
+--- krita/plugins/viewplugins/variations/kritavariations.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/viewplugins/variations/kritavariations.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Variations Plugin
++Name[bg]=Приставка за вариации
+ Name[ca]=Connector de variacions
+ Name[da]=Plugin med variationer
+ Name[de]=Variationen-Plugin
+@@ -17,6 +18,7 @@
+ Name[km]=កម្មវិធីជំនួយភាពប្រែប្រួល
+ Name[nb]=Programtillegg for variasjoner
+ Name[nds]=Varianten-Moduul
++Name[ne]=भिन्नता प्लगइन
+ Name[nl]=Variatieplugin
+ Name[pl]=Wtyczka wariacji
+ Name[pt]='Plugin' de Variações
+--- krita/plugins/viewplugins/histogram_docker/kritahistogramdocker.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/viewplugins/histogram_docker/kritahistogramdocker.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Histogram Docker
++Name[ca]=Amarrador de l'histograma
+ Name[cy]=Bachydd Histogram
+ Name[da]=Histogramdokning
+ Name[de]=Histogramm-Docker
+@@ -17,6 +18,7 @@
+ Name[km]=កន្លែងចតអ៊ីស្តូក្រាម
+ Name[nb]=Histogramdokker
+ Name[nds]=Histogramm-Docker
++Name[ne]=हिस्टोग्राम डकर
+ Name[nl]=Histogramcomponent
+ Name[pl]=Doker histogramu
+ Name[pt]=Acoplador de Histogramas
+--- krita/plugins/viewplugins/history_docker/kritahistorydocker.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/viewplugins/history_docker/kritahistorydocker.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=History Docker
++Name[ca]=Amarrador d'història
+ Name[cy]=Bachydd Hanes
+ Name[da]=Historikdokning
+ Name[de]=Verlauf-Docker
+@@ -17,6 +18,7 @@
+ Name[km]=កន្លែងចតប្រវត្តិ
+ Name[nb]=Hiastoriedokker
+ Name[nds]=Vörgeschicht-Docker
++Name[ne]=इतिहास डकर
+ Name[nl]=Geschiedeniscomponent
+ Name[pl]=Doker historii
+ Name[pt]=Acoplador de Histórico
+@@ -30,7 +32,8 @@
+ Name[uk]=Швартувальник історії
+ Name[zh_TW]=歷史紀錄停駐點
+ Comment=Command history docker for Krita
+-Comment[ca]=Amarrador d'història de comanda per a Krita
++Comment[bg]=Основната функционалност на Krita
++Comment[ca]=Amarrador d'història d'ordres per a Krita
+ Comment[cy]=Bachydd yr hanes gorchmynion ar gyfer Krita
+ Comment[da]=Dokning af kommandohistorik for Krita
+ Comment[de]=Befehlsverlauf-Docker für Krita
+@@ -47,6 +50,7 @@
+ Comment[km]=កន្លែងចតប្រវត្តិពាក្យបញ្ជាសម្រាប់ Krita
+ Comment[nb]=Kommandohistorie-dokker for Krita
+ Comment[nds]=Befehlsvörgeschicht-Docker för Krita
++Comment[ne]=क्रिताका लागि आदेश इतिहास
+ Comment[nl]=Component met bewerkingsgeschiedenis voor Krita
+ Comment[pl]=Doker historii poleceń dla Krita
+ Comment[pt]=Um módulo acoplado de histórico de comandos do Krita
+--- krita/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ * This file is part of Krita
+ *
+ * Copyright (c) 2005-2006 Cyrille Berger <cberger at cberger.net>
++ * Copyright (c) 2007 Benjamin Schleimer <bensch128 at yahoo.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -118,19 +119,11 @@
+
+ void KisDlgFiltersGallery::refreshPreview( )
+ {
+- if(!m_currentFilter)
+- return;
++ if(!m_currentFilter) return;
+
+- KisPaintDeviceSP layer = m_widget->previewWidget->getDevice();
+-
+- KisTransaction cmd("Temporary transaction", layer.data());
+ KisFilterConfiguration* config = m_currentFilter->configuration(m_currentConfigWidget);
+
+- QRect rect = layer->exactBounds();
+- m_currentFilter->process(layer.data(), layer.data(), config, rect);
+- m_widget->previewWidget->slotUpdate();
+- cmd.unexecute();
+-
++ m_widget->previewWidget->runFilter(m_currentFilter, config);
+ }
+
+ }
+--- krita/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ * This file is part of Krita
+ *
+ * Copyright (c) 2005-2006 Cyrille Berger <cberger at cberger.net>
++ * Copyright (c) 2007 Benjamin Schleimer <bensch128 at yahoo.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+--- krita/plugins/viewplugins/filtersgallery/kritafiltersgallery.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/viewplugins/filtersgallery/kritafiltersgallery.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Filters Gallery
++Name[bg]=Галерия с филтри
+ Name[ca]=Galeria de filtres
+ Name[da]=Filtergalleri
+ Name[de]=Filtergallerie
+@@ -20,6 +21,7 @@
+ Name[lv]=Filtru galerija
+ Name[nb]=Filtergalleri
+ Name[nds]=Filtersammeln
++Name[ne]=फिल्टर ग्यालेरी
+ Name[nl]=Filtergalerij
+ Name[pl]=Galeria filtrów
+ Name[pt]=Galeria de Filtros
+--- krita/plugins/viewplugins/selectopaque/kritaselectopaque.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/viewplugins/selectopaque/kritaselectopaque.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,17 +1,22 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=SelectOpaque
++Name[bg]=Негатив
+ Name[da]=Markér ugennemsigtig
+ Name[de]=UndurchsichtigeAuswählen
+ Name[et]=Läbipaistmatute pikslite valik
+ Name[it]=Seleziona i pixel opachi
+ Name[km]=ជ្រើសស្រអាប់
+ Name[nds]=Decken utsöken
++Name[ne]=अपारदर्शी चयन
+ Name[nl]=Ondoorzichtige selecteren
++Name[pl]=Zaznaczanie nieprzezroczystości
+ Name[pt]=Selecção Opaca
+-Name[pt_BR]=Selecção Opaca
++Name[pt_BR]=Seleção Opaca
+ Name[ru]=Выделение непрозрачных областей
+ Name[sk]=Invertovať Výber
++Name[sr]=Избор непрозирног
++Name[sr at Latn]=Izbor neprozirnog
+ Name[sv]=Markera ogenomskinliga
+ Name[uk]=Виділення непрозорих ділянок
+ Name[zh_TW]=選擇不透明
+--- krita/plugins/viewplugins/colorrange/kritacolorrange.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/viewplugins/colorrange/kritacolorrange.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Colorrange
++Name[bg]=Цветови обхват
+ Name[ca]=Rang de color
+ Name[da]=Farveområde
+ Name[de]=Farbbereich
+@@ -18,6 +19,7 @@
+ Name[km]=ជួរពណ៌
+ Name[nb]=Fargeområde
+ Name[nds]=Klörenrebeet
++Name[ne]=रङदायरा
+ Name[nl]=Kleurbereik
+ Name[pl]=Zakres kolorów
+ Name[pt]=Gamas de Cores
+--- krita/plugins/viewplugins/modify_selection/kritamodifyselection.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/viewplugins/modify_selection/kritamodifyselection.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Modify Selection
++Name[bg]=Промяна на маркираното
+ Name[br]=Kemmañ an dibab
+ Name[ca]=Selecció de modificació
+ Name[da]=Ændr markering
+@@ -19,6 +20,7 @@
+ Name[lv]=Mainīt izvēli
+ Name[nb]=Endre utvalg
+ Name[nds]=Utwahl ännern
++Name[ne]=चयन परिमार्जन गर्नुहोस्
+ Name[nl]=Selectie aanpassen
+ Name[pl]=Zmiana wyboru
+ Name[pt]=Modificar a Selecção
+--- krita/plugins/viewplugins/histogram/kritahistogram.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/viewplugins/histogram/kritahistogram.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Histogram Plugin
++Name[bg]=Приставка за Histogram
+ Name[ca]=Connector d'histograma
+ Name[da]=Plugin med histogram
+ Name[de]=Histogramm-Plugin
+@@ -17,6 +18,7 @@
+ Name[km]=កម្មវិធីជំនួយអ៊ីស្តូក្រាម
+ Name[nb]=Programtillegg for histogram
+ Name[nds]=Histogramm-Moduul
++Name[ne]=हिस्टोग्राम प्लगइन
+ Name[nl]=Histogramplugin
+ Name[pl]=Wtyczka histogramu
+ Name[pt]='Plugin' do Histograma
+--- krita/plugins/viewplugins/colorspaceconversion/kritacolorspaceconversion.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/viewplugins/colorspaceconversion/kritacolorspaceconversion.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Colorspace Conversion
++Name[bg]=Цветово обръщане
+ Name[ca]=Conversió d'espai de color
+ Name[da]=Farverumskonvertering
+ Name[de]=Farbraumumwandlung
+@@ -18,6 +19,7 @@
+ Name[km]=បម្លែងប្រភេទពណ៌
+ Name[nb]=Fargerom-konvertering
+ Name[nds]=Klörenruum-Ümwanneln
++Name[ne]=रङ खालीस्थान रूपानान्तरण
+ Name[nl]=Conversie van kleurspectrum
+ Name[pl]=Konwersja przestrzeni barw
+ Name[pt]=Conversão de Espaços de Cores
+--- krita/plugins/viewplugins/rotateimage/kritarotateimage.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/viewplugins/rotateimage/kritarotateimage.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Rotate Image Plugin
++Name[bg]=Приставка за въртене на изображение
+ Name[ca]=Connector de rotació d'imatge
+ Name[da]=Plugin for rotering af billede
+ Name[de]="Bild rotieren"-Plugin
+@@ -18,6 +19,7 @@
+ Name[km]=កម្មវិធីត្រឡប់រូបភាព
+ Name[nb]=Programtillegg for bilderotering
+ Name[nds]=Moduul för't Bilddreihen
++Name[ne]=छवि प्लगइन परिक्रमा गर्नुहोस्
+ Name[nl]=Plugin voor afbeeldingrotatie
+ Name[pl]=Wtyczka obrotu obrazków
+ Name[pt]='Plugin' para Rodar a Imagem
+--- krita/plugins/viewplugins/performancetest/kritaperftest.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/viewplugins/performancetest/kritaperftest.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Performance Test
++Name[bg]=Тест за производителност
+ Name[ca]=Prova d'execució
+ Name[da]=Ydelsestest
+ Name[de]=Leistungstest
+@@ -19,6 +20,7 @@
+ Name[lv]=Veiktspējas tests
+ Name[nb]=Ytelsestest
+ Name[nds]=Leistenprööv
++Name[ne]=कार्य सम्पादन परीक्षण
+ Name[nl]=Prestatiemeting
+ Name[pl]=Test wydajności
+ Name[pt]=Teste de Performance
+--- krita/plugins/viewplugins/scripting/kritascripting.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/viewplugins/scripting/kritascripting.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Scripting plugin
++Name[bg]=Приставка за скриптове
+ Name[ca]=Connector de seqüenciació
+ Name[da]=Scriptplugin
+ Name[de]=Skripting-Plugin
+@@ -19,6 +20,7 @@
+ Name[km]=កម្មវិធីជំនួយសម្រាប់ស្គ្រីប
+ Name[nb]=Programtillegg for skripting
+ Name[nds]=Skriptmoduul
++Name[ne]=प्लगइन स्क्रिप्ट गर्दै
+ Name[nl]=Scriptplugin
+ Name[pl]=Wtyczka obsługi języków skryptowych
+ Name[pt]='Plugin' de programação
+@@ -34,6 +36,7 @@
+ Name[zh_CN]=脚本插件
+ Name[zh_TW]=命令稿外掛程式
+ Comment=Allow execution of scripts
++Comment[bg]=Изпълнение на скриптове
+ Comment[ca]=Permet l'execució de seqüències
+ Comment[da]=Tillad kørsel af script
+ Comment[de]=Ermöglicht das Ausführen von Skripten
+@@ -52,6 +55,7 @@
+ Comment[lv]=Atļaut skriptu izpildi
+ Comment[nb]=Tillater skriptkjøring
+ Comment[nds]=Skripten utföhren
++Comment[ne]=स्क्रिप्टको कार्यान्वयनलाई अनुमति दिनुहोस्
+ Comment[nl]=Hiermee kunnen scripts uitgevoerd worden
+ Comment[pl]=Zezwala na wykonywanie skryptów
+ Comment[pt]=Permitir executar programas ou 'scripts'
+--- krita/plugins/viewplugins/shearimage/kritashearimage.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/viewplugins/shearimage/kritashearimage.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Shear Image Plugin
++Name[bg]=Приставка за отрязване на изображение
+ Name[ca]=Connector de tall d'imatge
+ Name[da]=Plugin for skævvrid billede
+ Name[de]="Bild scheren"-Plugin
+@@ -17,6 +18,7 @@
+ Name[km]=កម្មវិធីជំនួយដើម្បីកាត់រូបភាព
+ Name[nb]=Programtillegg for bildeskjæring
+ Name[nds]=Bildscheer-Moduul
++Name[ne]=छवि प्लगइन अपूर्ण गर्नुहोस्
+ Name[nl]=Afbeelding schuintrekken
+ Name[pl]=Wtyczka obcinania obrazków
+ Name[pt]='Plugin' de Inclinação da Imagem
+@@ -27,7 +29,7 @@
+ Name[sr]=Прикључак за смицање слике
+ Name[sr at Latn]=Priključak za smicanje slike
+ Name[sv]=Insticksprogram för skjuva bild
+-Name[uk]=Втулок викривлення зображення
++Name[uk]=Втулок перекошення зображення
+ Name[zh_TW]=修剪圖片外掛程式
+ ServiceTypes=Krita/ViewPlugin
+ Type=Service
+--- krita/plugins/viewplugins/Makefile.am (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/viewplugins/Makefile.am (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -16,9 +16,9 @@
+ screenshot \
+ separate_channels \
+ shearimage \
++ selectopaque \
+ $(SCRIPTINGDIR)
+
+-#selectopaque
+ # variations
+ # history_docker
+ # performancetest
+--- krita/plugins/viewplugins/dropshadow/kritadropshadow.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/viewplugins/dropshadow/kritadropshadow.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Dropshadow
++Name[bg]=Сянка
+ Name[ca]=Gota d'ombra
+ Name[da]=Faldskygge
+ Name[de]=Schattenwurf
+@@ -16,6 +17,7 @@
+ Name[km]=ទម្លាក់ស្រមោល
+ Name[nb]=Skygge
+ Name[nds]=Schaddeneffekt
++Name[ne]=छाँया छोड्नुहोस्
+ Name[nl]=Schaduw plaatsen
+ Name[pl]=Dodaj cień
+ Name[pt]=Sombreado
+--- krita/plugins/viewplugins/substrate/kritasubstrate.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/viewplugins/substrate/kritasubstrate.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Substrate
++Name[bg]=Основа
+ Name[ca]=Substrat
+ Name[da]=Substrat
+ Name[de]=Träger
+@@ -15,6 +16,7 @@
+ Name[ja]=下地
+ Name[nb]=Substrat
+ Name[nds]=Wassboden
++Name[ne]=जीवाधार
+ Name[nl]=Substraat
+ Name[pl]=Wycięcie
+ Name[pt]=Substrato
+--- krita/plugins/viewplugins/screenshot/kritascreenshot.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/viewplugins/screenshot/kritascreenshot.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Screenshot
++Name[bg]=Снимка на екрана
+ Name[br]=Skrammpaker
+ Name[ca]=Captura de pantalla
+ Name[cy]=Sgrinlun
+@@ -22,6 +23,7 @@
+ Name[lv]=Ekrānattēls
+ Name[nb]=Skjermbilde
+ Name[nds]=Schirmbild
++Name[ne]=स्क्रिनसट
+ Name[nl]=Schermafbeelding
+ Name[pl]=Zrzut ekranu
+ Name[pt]=Captura
+--- krita/plugins/viewplugins/imagesize/kritaimagesize.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/viewplugins/imagesize/kritaimagesize.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Image Resize and Scale Plugin
++Name[bg]=Приставка за оразмеряване
+ Name[ca]=Connector de redimensionament i escala d'imatge
+ Name[da]=Plugin for størrelsesændring og skalering
+ Name[de]=Bildgrößenänderungs- und Skalierungsplugin
+@@ -15,9 +16,10 @@
+ Name[is]=Breytingar á stærð og skala mynda íforrit
+ Name[it]=Plugin di ridimensionamento e riscalamento delle immagini
+ Name[ja]=画像 リサイズ/スケール プラグイン
+-Name[km]=កម្មវិធីជំនួយដើម្បីប្ដូរទំហំ និង ធ្វើមាត្រដ្ឋានរូបភាព
++Name[km]=កម្មវិធីជំនួយដើម្បីប្ដូរទំហំ និងធ្វើមាត្រដ្ឋានរូបភាព
+ Name[nb]=Programtillegg for skalering og endring av bildestørrelse
+ Name[nds]=Moduul för't Ännern un Topassen vun de Bildgrött
++Name[ne]=छवि रिसाइज र स्केल प्लगइन
+ Name[nl]=Grootte wijzigen en schalen van afbeelding
+ Name[pl]=Wtyczka skalowania i zmiany rozmiarów obrazków
+ Name[pt]='Plugin' de Dimensionamento e Escala da Imagem
+--- krita/plugins/paintops/defaultpaintops/kritadefaultpaintops.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/plugins/paintops/defaultpaintops/kritadefaultpaintops.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Default Paint Operations
++Name[bg]=Операции за рисуване по подразбиране
+ Name[ca]=Operacions de pintura per defecte
+ Name[cy]=Gweithrediadau Paent Rhagosodol
+ Name[da]=Standard maleoperationer
+@@ -23,6 +24,7 @@
+ Name[ms]=Operasi Cat Piawai
+ Name[nb]=Standard maleteknikker
+ Name[nds]=Standard-Maalakschonen
++Name[ne]=पूर्वनिर्धारित पेन्ट सञ्चालन
+ Name[nl]=Standaardschilderoperaties
+ Name[nn]=Standard måleoperasjonar
+ Name[pl]=Domyślne operacje na obrazkach
+@@ -40,6 +42,7 @@
+ Name[zh_CN]=默认绘图操作
+ Name[zh_TW]=預設繪圖操作
+ Comment=Default paint operations
++Comment[bg]=Операции за рисуване по подразбиране
+ Comment[ca]=Operacions de pintura per defecte
+ Comment[cy]=Gweithrediadau paent rhagosodol
+ Comment[da]=Standard maleoperationer
+@@ -62,6 +65,7 @@
+ Comment[ms]=Operasi cat piawai
+ Comment[nb]=Standard maleteknikker
+ Comment[nds]=Standard-Maalakschonen
++Comment[ne]=पूर्वनिर्धारित पेन्ट सञ्चालन
+ Comment[nl]=Standaardschilderoperaties
+ Comment[nn]=Standard måleoperasjonar
+ Comment[pl]=Domyślne operacje na obrazkach
+--- krita/krita.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/krita.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,9 +5,11 @@
+ Name[hi]=के-रिता
+ Name[km]= Krita
+ Name[lo]=ກຣິຕາ
++Name[ne]=क्रिता
+ Exec=krita %U
+ DocPath=krita/index.html
+ Comment=Edit and paint images
++Comment[bg]=Редактиране и оцветяване на изображения
+ Comment[ca]=Edita i pinta imatges
+ Comment[da]=Redigér og mal billeder
+ Comment[de]=Bilder zeichnen und bearbeiten
+@@ -22,10 +24,11 @@
+ Comment[hu]=Képek szerkesztése
+ Comment[it]=Modifica e disegna immagini
+ Comment[ja]=描画と画像の編集
+-Comment[km]=កែសម្រួល និង គូររូបភាព
++Comment[km]=កែសម្រួល និងគូររូបភាព
+ Comment[lv]=Labot un zīmēt attēlus
+ Comment[nb]=Rediger og mal bilder
+ Comment[nds]=Biller malen un bewerken
++Comment[ne]=छविहरू सम्पादन र पेन्ट गर्नुहोस्
+ Comment[nl]=Afbeeldingen bewerken en schilderen
+ Comment[pl]=Edycja i tworzenie obrazków
+ Comment[pt]=Editar e pintar as imagens
+@@ -40,6 +43,7 @@
+ Comment[uz]=Расм билан ишлаш дастури
+ Comment[zh_TW]=編輯與畫圖片
+ GenericName=Painting and Image Editing
++GenericName[bg]=Редактор на графични изображения
+ GenericName[ca]=Programa d'edició d'imatges
+ GenericName[da]=Maling & billedredigering
+ GenericName[de]=Mal- und Bildbearbeitungsprogramm
+@@ -56,10 +60,11 @@
+ GenericName[is]=Málun og myndsýsl
+ GenericName[it]=Disegno e modifica di immagini
+ GenericName[ja]=描画と画像編集
+-GenericName[km]=គូរគំនូរ និង កែសម្រួលរូបភាព
++GenericName[km]=គូរគំនូរ និងកែសម្រួលរូបភាព
+ GenericName[lv]=Zīmēšana un attēlu apstrāde
+ GenericName[nb]=Program for maling og bilderedigering
+ GenericName[nds]=Malen un Biller bewerken
++GenericName[ne]=पेन्टिङ्ग र छवि सम्पादन
+ GenericName[nl]=Afbeeldingsmanipulatie
+ GenericName[pl]=Edycja zdjęć oraz rysunków
+ GenericName[pt]=Pintura e Manipulação de Imagens
+--- krita/core/kis_filter.cc (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/core/kis_filter.cc (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -60,6 +60,7 @@
+ void KisFilter::disableProgress() {
+ m_progressEnabled = false;
+ m_cancelRequested = false;
++ m_progressDisplay = 0;
+ }
+
+ void KisFilter::setProgressTotalSteps(Q_INT32 totalSteps)
+--- krita/core/Makefile.am (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/core/Makefile.am (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -42,7 +42,7 @@
+ kis_paint_device_iface.h kis_paint_device.h kis_painter.h kis_paintop.h kis_paintop_registry.h \
+ kis_palette.h kis_pattern.h kis_point.h kis_rect.h kis_resource.h kis_selection.h \
+ kis_transaction.h kis_types.h kis_vec.h kis_filter_config_widget.h \
+- kis_filter_configuration.h kis_exif_info.h kis_exif_value.h kis_substrate.h kis_perspective_math.h kis_scale_visitor.h
++ kis_filter_configuration.h kis_exif_info.h kis_exif_value.h kis_substrate.h kis_perspective_math.h kis_scale_visitor.h kis_paint_layer.h kis_layer_visitor.h kis_filter_strategy.h kis_transform_worker.h
+
+ libkritaimage_la_LDFLAGS = -version-info 1:0:0 -no-undefined $(all_libraries)
+ libkritaimage_la_LIBADD = ../sdk/libkritasdk.la ../kritacolor/libkritacolor.la tiles/libkritatile.la $(OPENEXR_LIBS) $(LCMS_LIBS) $(LIB_KOFFICECORE) $(LIB_KOPAINTER) $(LIB_KDECORE) $(LIB_QT) $(OPENEXR_LIBS)
+--- krita/core/kis_paint_device.cc (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/core/kis_paint_device.cc (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -717,7 +717,7 @@
+ {
+ kdDebug(41004) << "Converting " << name() << " to " << dstColorSpace->id().id() << " from "
+ << m_colorSpace->id().id() << "\n";
+- if ( (colorSpace()->id() == dstColorSpace->id()) )
++ if ( colorSpace() == dstColorSpace )
+ {
+ return;
+ }
+--- krita/core/kis_adjustment_layer.cc (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/core/kis_adjustment_layer.cc (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -50,8 +50,6 @@
+ m_selection = new KisSelection( *rhs.m_selection.data() );
+ m_selection->setParentLayer(this);
+ m_selection->setInterestedInDirtyness(true);
+- if (!m_selection->hasSelection())
+- m_selection->setSelection(m_selection);
+ connect(rhs.image(), SIGNAL(sigSelectionChanged(KisImageSP)),
+ this, SLOT(slotSelectionChanged(KisImageSP)));
+ }
+@@ -113,9 +111,6 @@
+
+ m_selection->setParentLayer(this);
+ m_selection->setInterestedInDirtyness(true);
+-
+- if (!m_selection->hasSelection())
+- m_selection->setSelection(m_selection);
+ }
+
+ void KisAdjustmentLayer::clearSelection()
+--- krita/core/kis_group_layer.cc (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/core/kis_group_layer.cc (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -46,7 +46,7 @@
+ {
+ for(vKisLayerSP_cit it = rhs.m_layers.begin(); it != rhs.m_layers.end(); ++it)
+ {
+- m_layers.push_back( it->data()->clone() );
++ this->addLayer(it->data()->clone(), 0);
+ }
+ m_projection = new KisPaintDevice(*rhs.m_projection.data());
+ m_projection->setParentLayer(this);
+--- krita/core/kis_image.cc (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/core/kis_image.cc (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,6 @@
+ /*
+ * Copyright (c) 2002 Patrick Julien <freak at codepimps.org>
++ * Copyright (c) 2007 Benjamin Schleimer <bensch128 at yahoo.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -545,13 +546,26 @@
+
+ m_rootLayer = static_cast<KisGroupLayer*>(rhs.m_rootLayer->clone().data());
+ connect(m_rootLayer, SIGNAL(sigDirty(QRect)), this, SIGNAL(sigImageUpdated(QRect)));
+-
++
+ m_annotations = rhs.m_annotations; // XXX the annotations would probably need to be deep-copied
+
+ m_nserver = new KisNameServer(i18n("Layer %1"), rhs.m_nserver->currentSeed() + 1);
+ Q_CHECK_PTR(m_nserver);
+
+ //m_guides = rhs.m_guides;
++
++ // Set this as the current image for the layers
++ m_rootLayer->setImage(this);
++ // Set the active paint layer
++ if(rhs.activeLayer() != NULL) {
++ QString layerName = rhs.activeLayer()->name();
++ // kdDebug(12345) << "KisImage::KisImage: active layer = " << layerName << "\n";
++ KisLayerSP activeLayer = rootLayer()->findLayer(layerName);
++ Q_ASSERT(activeLayer);
++ activate(activeLayer);
++ } else {
++ activate(NULL);
++ }
+ }
+ }
+
+--- krita/core/kis_transform_worker.cc (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/core/kis_transform_worker.cc (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -266,38 +266,30 @@
+ return dev->createVLineIterator(lineNum, start, len, true);
+ }
+
+-template <class iter> void calcDimensions (KisPaintDevice *dev, Q_INT32 &srcStart, Q_INT32 &srcLen, Q_INT32 &firstLine, Q_INT32 &numLines, Q_INT32 &srcStartData, Q_INT32 &srcLenData);
++template <class iter> void calcDimensions (KisPaintDevice *dev, Q_INT32 &srcStart, Q_INT32 &srcLen, Q_INT32 &firstLine, Q_INT32 &numLines);
+
+ template <> void calcDimensions <KisHLineIteratorPixel>
+- (KisPaintDevice *dev, Q_INT32 &srcStart, Q_INT32 &srcLen, Q_INT32 &firstLine, Q_INT32 &numLines, Q_INT32 &srcStartData, Q_INT32 &srcLenData)
++(KisPaintDevice *dev, Q_INT32 &srcStart, Q_INT32 &srcLen, Q_INT32 &firstLine, Q_INT32 &numLines)
+ {
+- dev->exactBounds(srcStartData, firstLine, srcLenData, numLines);
+ if(dev->hasSelection())
+ {
+ QRect r = dev->selection()->selectedExactRect();
+ r.rect(&srcStart, &firstLine, &srcLen, &numLines);
+ }
+ else
+- {
+- srcStart = srcStartData;
+- srcLen = srcLenData;
+- }
++ dev->exactBounds(srcStart, firstLine, srcLen, numLines);
+ }
+
+ template <> void calcDimensions <KisVLineIteratorPixel>
+- (KisPaintDevice *dev, Q_INT32 &srcStart, Q_INT32 &srcLen, Q_INT32 &firstLine, Q_INT32 &numLines, Q_INT32 &srcStartData, Q_INT32 &srcLenData)
++(KisPaintDevice *dev, Q_INT32 &srcStart, Q_INT32 &srcLen, Q_INT32 &firstLine, Q_INT32 &numLines)
+ {
+- dev->exactBounds(firstLine, srcStartData, numLines, srcLenData);
+ if(dev->hasSelection())
+ {
+ QRect r = dev->selection()->selectedExactRect();
+ r.rect(&firstLine, &srcStart, &numLines, &srcLen);
+ }
+ else
+- {
+- srcStart = srcStartData;
+- srcLen = srcLenData;
+- }
++ dev->exactBounds(firstLine, srcStart, numLines, srcLen);
+ }
+
+ struct FilterValues
+@@ -309,7 +301,7 @@
+
+ template <class T> void KisTransformWorker::transformPass(KisPaintDevice *src, KisPaintDevice *dst, double floatscale, double shear, Q_INT32 dx, KisFilterStrategy *filterStrategy)
+ {
+- Q_INT32 lineNum,srcStart,firstLine,srcLen,numLines,srcStartData,srcLenData;
++ Q_INT32 lineNum,srcStart,firstLine,srcLen,numLines;
+ Q_INT32 center, begin, end; /* filter calculation variables */
+ Q_UINT8 *data;
+ Q_UINT8 pixelSize = src->pixelSize();
+@@ -324,7 +316,7 @@
+ else
+ dstSelection = new KisSelection(dst); // essentially a dummy to be deleted
+
+- calcDimensions <T>(src, srcStart, srcLen, firstLine, numLines,srcStartData,srcLenData);
++ calcDimensions <T>(src, srcStart, srcLen, firstLine, numLines);
+
+ scale = int(floatscale*srcLen);
+ scaleDenom = srcLen;
+@@ -432,31 +424,25 @@
+ dstStart += int(floor(lineNum * shear));
+
+ // Build a temporary line
+- T srcIt = createIterator <T>(src, QMAX(srcStart - extraLen, srcStartData), lineNum, srcLen+2*extraLen);
++ T srcIt = createIterator <T>(src, srcStart - extraLen, lineNum, srcLen+2*extraLen);
+ Q_INT32 i = 0;
+- Q_INT32 x = srcStart - extraLen;
+- while(i < srcLen + 2*extraLen)
++ while(!srcIt.isDone())
+ {
+ Q_UINT8 *data;
+
+- data = srcIt.rawData();
+- memcpy(&tmpLine[i*pixelSize], data, pixelSize);
++ data = srcIt.rawData();
++ memcpy(&tmpLine[i*pixelSize], data, pixelSize);
++
++ // XXX: Should set alpha = alpha*(1-selectedness)
++ cs->setAlpha(data, 0, 1);
+ if(srcIt.isSelected())
+ {
+ tmpSel[i] = 255;
+ }
+ else
+- {
+ tmpSel[i] = 0;
+- }
+- if(x >= srcStartData && x < srcStartData + srcLenData - 1)
+- {
+- // XXX: Should set alpha = alpha*(1-selectedness)
+- cs->setAlpha(data, 0, 1);
+- ++srcIt;
+- }
++ ++srcIt;
+ i++;
+- x++;
+ }
+
+ T dstIt = createIterator <T>(dst, dstStart, lineNum, dstLen);
+--- krita/configure.in.in (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/configure.in.in (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -23,13 +23,28 @@
+ # Alternative! Debian does it this way...
+ KDE_CHECK_HEADER(lcms.h,have_lcms_header='yes',,)
+
++ if test "$have_lcms_header" = 'yes'
++ then
+ AC_DEFINE(LCMS_HEADER, <lcms.h>, [The correct header])
+
+- echo "#include <lcms.h>" > conftest.$ac_ext
+- echo "#if LCMS_VERSION < 115" >> conftest.$ac_ext
+- echo "#error Need lcms >= 1.15" >> conftest.$ac_ext
+- echo "#endif" >> conftest.$ac_ext
+- echo "int main() {}" >> conftest.$ac_ext
++ echo "#include <lcms.h>" > conftest.$ac_ext
++ echo "#if LCMS_VERSION < 115" >> conftest.$ac_ext
++ echo "#error Need lcms >= 1.15" >> conftest.$ac_ext
++ echo "#endif" >> conftest.$ac_ext
++ echo "int main() {}" >> conftest.$ac_ext
++ else
++ KDE_CHECK_HEADER(lcms.h,have_lcms_header='yes',,)
++ # and now debian also does it this way... can't they decide for one way of doing stuff ?
++
++ AC_DEFINE(LCMS_HEADER, <liblcms1/lcms.h>, [The correct header])
++
++ echo "#include <liblcms1/lcms.h>" > conftest.$ac_ext
++ echo "#if LCMS_VERSION < 115" >> conftest.$ac_ext
++ echo "#error Need lcms >= 1.15" >> conftest.$ac_ext
++ echo "#endif" >> conftest.$ac_ext
++ echo "int main() {}" >> conftest.$ac_ext
++
++ fi
+ fi
+
+
+@@ -48,19 +63,6 @@
+
+ AC_SUBST(LCMS_LIBS)
+
+-# Check if the 1.14 version of lcms is detected
+-if test ! "$LCMS_LIBS" = ""
+-then
+-AC_LANG_SAVE
+-AC_LANG_CPLUSPLUS
+-AC_TRY_COMPILE(
+- [#include LCMS_HEADER
+- #if LCMS_VERSION == 114
+- #error lcms 1.14 detected
+- #endif ] , [ ], lcms_version_114='no', lcms_version_114='yes' )
+-AC_LANG_RESTORE
+-fi
+-
+ # IM 6.1.3 changed the number of arguments to GetMagickInfoList
+
+ AC_MSG_CHECKING(if GetMagickInfoList has only 2 arguments)
+--- krita/data/krita_tool.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/data/krita_tool.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=Krita/Tool
+ Comment=Tool plugin for Krita
++Comment[bg]=Приставка за инструмент за Krita
+ Comment[ca]=Connector d'eines per a Krita
+ Comment[da]=Værktøjsplugin for Krita
+ Comment[de]=Werkzeug-Plugin für Krita
+@@ -23,6 +24,7 @@
+ Comment[ms]=Plugin alat Krita
+ Comment[nb]=Krita-programtillegg for verktøy
+ Comment[nds]=Warktüüchmoduul för Krita
++Comment[ne]=क्रिताका लागि उपकरण प्लगइन
+ Comment[nl]=Gereedschapsplugin voor Krita
+ Comment[nn]=Krita-programtillegg for verktøy
+ Comment[pl]=Wtyczka narzędzi dla Krita
+--- krita/data/krita_plugin.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/data/krita_plugin.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=Krita/ViewPlugin
+ Comment=GUI functionality for Krita
++Comment[bg]=ГПИ функционалност за Krita
+ Comment[ca]=Funcionalitat d'interfície d'usuari per a Krita
+ Comment[cy]=Swyddogaeth GUI ar gyfer Krita
+ Comment[da]=GUI-funktionalitet for Krita
+@@ -21,6 +22,7 @@
+ Comment[km]=មុខងារចំណុចប្រទាក់អ្នកប្រើ សម្រាប់ Krita
+ Comment[nb]=Krita-modul for GUI-funksjonalitet
+ Comment[nds]=Böversietfunkschonen för Krita
++Comment[ne]=क्रिताका लागि GUI कार्यात्मक
+ Comment[nl]=Interfacefunctionaliteit voor Krita
+ Comment[pl]=Graficzny interfejs użytkownika programu Krita
+ Comment[pt]=Funcionalidade gráfica para o Krita
+--- krita/data/krita_filter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/data/krita_filter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=Krita/Filter
+ Comment=Filter plugin for Krita
++Comment[bg]=Приставка за филтриране за Krita
+ Comment[ca]=Connector de filtre per a Krita
+ Comment[da]=Plugin med filter for Krita
+ Comment[de]=Filter-Plugin für Krita
+@@ -24,6 +25,7 @@
+ Comment[ms]=Plugin penapis Krita
+ Comment[nb]=Filter-programtillegg for Krita
+ Comment[nds]=Filtermoduul för Krita
++Comment[ne]=क्रिताका लागि फिल्टर प्लगइन
+ Comment[nl]=Filterplugin voor Krita
+ Comment[nn]=Krita-programtillegg for filter
+ Comment[pl]=Wtyczka filtrów dla Krita
+--- krita/data/krita_paintop.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/data/krita_paintop.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=Krita/Paintop
+ Comment=Paint operation plugin for Krita
++Comment[bg]=Приставка за рисуване за Krita
+ Comment[ca]=Connector d'operació de pintura per a Krita
+ Comment[da]=Plugin med malehandlinger for Krita
+ Comment[de]=Maloperation-Plugin für Krita
+@@ -21,6 +22,7 @@
+ Comment[km]=កម្មវិធីជំនួយក្នុងការគូរ សម្រាប់ Krita
+ Comment[nb]=Krita-programtillegg for male-handlinger
+ Comment[nds]=Maalmoduul för Krita
++Comment[ne]=क्रिताका लागि पेन्ट अपरेसन प्लगइन
+ Comment[nl]=Verfverrichtingplugin voor Krita
+ Comment[pl]=Wtyczka operacji malowania dla Krita
+ Comment[pt]='Plugin' de operações de pintura do Krita
+--- krita/data/templates/.directory (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/data/templates/.directory (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -28,6 +28,7 @@
+ Name[ms]=Kosong
+ Name[nb]=Tom
+ Name[nds]=Leddig
++Name[ne]=खाली
+ Name[nl]=Leeg
+ Name[nn]=Tomt
+ Name[pl]=Pusta
+--- krita/configure.in.bot (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/configure.in.bot (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,19 +4,9 @@
+ echo ""
+ echo "If you want to compile Krita you should install:"
+ echo " * lcms 1.15 or newer (http://www.littlecms.com/)"
+- echo " and avoid 1.14 as it has a major bugs in CMYK"
+ echo ""
+ all_tests=bad
+ else
+- if test "$lcms_version_114" = 'yes'; then
+- echo "=============================================="
+- echo "WARNING: you are using version 1.14 of lcms"
+- echo " this version has a bug that break filling"
+- echo " and select similar colors in at least CMYK"
+- echo " you might want to use a newer version, or"
+- echo " an older"
+- echo "=============================================="
+- fi
+ if test -z "$GLLIB"; then
+ echo ""
+ echo "You're missing OpenGL libraries. krita will"
+--- krita/kritacolor/krita_colorspace.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/kritacolor/krita_colorspace.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=Krita/ColorSpace
+ Comment=A module implementing a complete colorspace for use with libkritacolor
++Comment[bg]=Модул, реализиращ пълна цветова гама за употреба с libkritacolor
+ Comment[ca]=Un mòdul que implementa un complet espai de colors per a usar-lo amb libkritacolor
+ Comment[cy]=Modiwl sy'n gweithredoli gofod lliw cyflawn i'w ddefnyddio efo libkritacolor
+ Comment[da]=Et modul som implementerer et fuldstændigt farverum til brug med libkritacolor
+@@ -20,6 +21,7 @@
+ Comment[km]=ម៉ូឌុលដែលអនុវត្តប្រភេទពណ៌ពេញលេញ ដើម្បីប្រើជាមួយ libkritacolor
+ Comment[nb]=En modul som implementerer et komplett fargerom til bruk med libkritacolor
+ Comment[nds]=En Moduul, dat en helen Klörenruum för den Bruuk mit libkritacolor inbuut
++Comment[ne]=लिबक्रितारङसँग प्रयोग गर्नका लागि सम्पूर्ण रङ खालीस्थानलाई मोड्युललाई औजार बनाइदै
+ Comment[nl]=Een module die een volledig kleurgebied implementeert dat gebruikt kan worden met libkritacolor
+ Comment[pl]=Moduł implementujący kompletną przestrzeń barw do użytku z libkritacolor
+ Comment[pt]=Um módulo que implementa um espaço de cores completo para usar com a 'libkritacolor'
+--- krita/kritacolor/kis_colorspace.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/kritacolor/kis_colorspace.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -179,7 +179,7 @@
+ /**
+ * Return the profile of this color space. This may be 0
+ */
+- virtual KisProfile * getProfile() = 0;
++ virtual KisProfile * getProfile() const = 0;
+
+ //================= Conversion functions ==================================//
+
+--- krita/kritacolor/kis_abstract_colorspace.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/kritacolor/kis_abstract_colorspace.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -120,7 +120,7 @@
+
+ //========== Display profiles =============================================//
+
+- virtual KisProfile * getProfile() { return m_profile; };
++ virtual KisProfile * getProfile() const { return m_profile; };
+
+
+ //================= Conversion functions ==================================//
+--- krita/kritapart.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/kritapart.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=KOffice Painting and Image Editor Component
++Name[bg]=Компонент за рисуване и редактиране на изображения в KOffice
+ Name[ca]=Component de manipulació d'imatges de KOffice
+ Name[cy]=Cydran Peintio a Golygu Delweddau KOffice
+ Name[da]=Koffice male- og billedredigeringskomponent
+@@ -21,6 +22,7 @@
+ Name[lv]=KOffice zīmēšanas un attelu apstrādes komponente
+ Name[nb]=KOffice-komponent for maling og bildemanipulasjon
+ Name[nds]=KOffice-Komponent för't Malen un Bildbewerken
++Name[ne]=केडीई कार्यालय पेन्टिङ्ग र छवि सम्पादक अवयव
+ Name[nl]=KOffice-component voor afbeeldingsmanipulatie
+ Name[pl]=Komponent edycji zdjęć oraz rysunków dla KOffice
+ Name[pt]=Componente de Edição e Pintura de Imagens do KOffice
+@@ -41,6 +43,7 @@
+ ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
+ X-KDE-NativeMimeType=application/x-krita
+ GenericName=Image Object
++GenericName[bg]=Обект изображение
+ GenericName[br]=Tra skeudenn
+ GenericName[ca]=Objecte d'imatge
+ GenericName[cy]=Gwrthrych Delwedd
+@@ -63,6 +66,7 @@
+ GenericName[lv]=Attēla objekts
+ GenericName[nb]=Bildeobjekt
+ GenericName[nds]=Bildobjekt
++GenericName[ne]=छवि वस्तु
+ GenericName[nl]=Afbeelding
+ GenericName[pl]=Obrazek
+ GenericName[pt]=Objecto de Imagem
+--- krita/colorspaces/cmyk_u8/kritacmykplugin.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/colorspaces/cmyk_u8/kritacmykplugin.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -26,6 +26,7 @@
+ Name[ms]=Model Warna CMYK
+ Name[nb]=CMYK-fargemodell
+ Name[nds]=CMYK-Klöörmodell
++Name[ne]=CMYK रङ मोडेलल
+ Name[nl]=CMYK-kleurmodel
+ Name[nn]=CMYK-fargemodell
+ Name[pl]=Przestrzeń barw CMYK
+@@ -45,7 +46,7 @@
+ Name[zh_CN]=CMYK 色彩模型
+ Name[zh_TW]=CMYK 色彩模型
+ Comment=Color model for 8-bit/channel CMYK images
+-Comment[bg]=Цветови модел за 8 битови CMYK изображения
++Comment[bg]=Цветови модел за 8 битови изображения CMYK
+ Comment[ca]=Model de color d'enters de 8 bits per a canal d'imatges CMYK
+ Comment[cy]=Model lliw ar gyfer delweddau CMYK 8-did/sianel
+ Comment[da]=Farvemodel for 8-bit/kanal CMYK-billeder
+@@ -69,6 +70,7 @@
+ Comment[ms]=Model warna bagi imej CMYK 8-bit/saluran
+ Comment[nb]=Fargemodell for CMYK-bilder med 8 bit per kanal
+ Comment[nds]=Klöörmodell för CMYK-Biller mit 8-Bit Heeltall per Kanaal
++Comment[ne]=८-बिट/च्यानल CMYK छविहरूका लागि रङ मोडेल
+ Comment[nl]=Kleurmodel voor 8-bit/kanaal CMYK-afbeeldingen
+ Comment[nn]=Fargemodell for CMYK-bilete med 8 bit per kanal
+ Comment[pl]=Przestrzeń barw dla obrazków CMYK 8 bitów/kanał
+--- krita/colorspaces/cmyk_u8/templates/white_2000x800.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/colorspaces/cmyk_u8/templates/white_2000x800.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ URL=.source/white_2000x800.kra
+ Icon=template_cmyk_empty
+ Name=White 2000 x 800
+-Name[bg]=Бяло 2000 x 800
++Name[bg]=Бяло 2000x800
+ Name[br]=Gwenn 2000 x 800
+ Name[ca]=Blanc 2000 x 800
+ Name[cy]=Gwyn 2000 x 800
+@@ -30,6 +30,7 @@
+ Name[ms]=Putih 2000 x 800
+ Name[nb]=Hvit 2000 x 800
+ Name[nds]=Witt 2000 x 800
++Name[ne]=सेतो २००० x ८००
+ Name[nl]=Wit 2000 x 800
+ Name[nn]=Kvitt 2000 × 800
+ Name[pl]=Biały 2000 x 800
+@@ -49,7 +50,7 @@
+ Name[zh_CN]=白色 2000 x 800
+ Name[zh_TW]=白色 2000 x 800
+ Comment=Creates a white CMYK image of 2000 x 800 pixels.
+-Comment[bg]=Създаване на бяло CMYK изображение с размери 2000 x 800 точки.
++Comment[bg]=Създаване на бяло изображения CMYK с размери 2000x800 пиксела.
+ Comment[ca]=Crea una imatge blanca CMYK de 2000 x 800 píxels
+ Comment[cy]=Creu delwedd CMYK wen o 2000 x 800 picsel.
+ Comment[da]=Laver et hvidt CMYK-billede på 2000 x 800 biledpunkter.
+@@ -72,6 +73,7 @@
+ Comment[ms]=Cipta imej CMYK putih 2000 x 800 piksel.
+ Comment[nb]=Lager et hvitt CMYK-bilde på 2000 x 800 piksler.
+ Comment[nds]=Stellt en wittet CMYK-Bild mit 2000 x 800 Pixels op.
++Comment[ne]=२००० x ८०० पिक्सेलको सेतो CMYK छवि सिर्जना गर्दछ ।
+ Comment[nl]=Maakt een witte CMYK-afbeelding aan van 2000 x 2000 pixels.
+ Comment[nn]=Lagar eit kvitt CMYK-bilete på 2000 × 800 pikslar.
+ Comment[pl]=Tworzy biały obrazek CMYK o rozmiarach 2000 na 800 pikseli.
+--- krita/colorspaces/wet/kritawetplugin.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/colorspaces/wet/kritawetplugin.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Watercolor Paint Plugin
++Name[bg]=Приставка акварелни бои
+ Name[ca]=Connector de pintura aquarel·la
+ Name[cy]=Ategyn Paent Dyfrlliw
+ Name[da]=Plugin for vandfarvemaling
+@@ -23,6 +24,7 @@
+ Name[ms]=Plugin Warna Cat Air
+ Name[nb]=Paint-programtillegg for vannfarger
+ Name[nds]=Waterklöör-Effektmoduul
++Name[ne]=पानी रङ पेन्ट प्लगइन
+ Name[nl]=Waterkleur schilderplugin
+ Name[nn]=Programtillegg for vassfargar
+ Name[pl]=Wtyczka malowania akwarelami
+@@ -38,6 +40,7 @@
+ Name[zh_CN]=水彩绘画插件
+ Name[zh_TW]=水色繪畫外掛程式
+ Comment=Color model and tools for painting with simulated watercolors
++Comment[bg]=Цветови модел и инструменти за рисуване със симулирани акварелни бои
+ Comment[ca]=Model de color i eines per a pintar amb aquarel·les simulades
+ Comment[cy]=Model lliw ac offer ar gyfer paentio efo dyfrliwiau wedi'u hefelychu
+ Comment[da]=Farvemodel og værktøjer til at male med simulerede vandfarver
+@@ -56,10 +59,11 @@
+ Comment[is]=Litategundir og tól til að teikna með vatnslitum
+ Comment[it]=Modello di colore e strumenti per il disegno con acquerelli simulati
+ Comment[ja]=水彩画をシミュレートして描画するためのカラーモデルとツール
+-Comment[km]=គំរូពណ៌ និង ឧបករណ៍សម្រាប់គូរគំនូរដែលមានពណ៌ស្រដៀងទឹក
++Comment[km]=គំរូពណ៌ និងឧបករណ៍សម្រាប់គូរគំនូរដែលមានពណ៌ស្រដៀងទឹក
+ Comment[ms]=Model warna dan alat lukisan dengan cat air tiruan
+ Comment[nb]=Fargemodell og verktøy for maling med simulerte vannfarger
+ Comment[nds]=Klöörmodell un Warktüüch för't Malen mit Waterklöreneffekten
++Comment[ne]=बनावटी पानीरङहरू सँग पेन्टीङ्गका लागि रङ मोडेल
+ Comment[nl]=Kleurmodel en -gereedschappen voor het schilderen met gesimuleerde waterkleuren
+ Comment[nn]=Fargemodell og verktøy for måling med simulerte vassfargar
+ Comment[pl]=Przestrzeń barw oraz narzędzia do symulacji malowania farbami akwarelowymi
+--- krita/colorspaces/rgb_f16half/krita_rgb_f16half_plugin.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/colorspaces/rgb_f16half/krita_rgb_f16half_plugin.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=RGB Color Model (16-bit float 'half')
++Name[bg]=Цветови модел RGB (16-bit float 'half')
+ Name[ca]=Model de color RGB (paleta 'mitja' de 16 bits)
+ Name[cy]=Model Lliw RGB (arnawf 16-did 'hanner')
+ Name[da]=RGB-farvemodel (16-bit heltal 'halv')
+@@ -20,6 +21,7 @@
+ Name[km]=ម៉ូដែលពណ៌RGB (ចំនួនទសភាគ 16 ប៊ីត 'ពាក់កណ្ដាល')
+ Name[nb]=RGB-fargemodell (16-bit flytende 'halv')
+ Name[nds]=RGB-Klöörmodell (16-Bit Fleetkomma "half")
++Name[ne]=RGB रङ मोडेल (१६-बिट उत्प्लावन 'आधा')
+ Name[nl]=RGB-kleurmodel (16-bit float 'half')
+ Name[pl]=Przestrzeń barw RGB ("połowa" 16-bitowej liczby zmiennoprzecinkowej)
+ Name[pt]=Modelo de Cor RGB (v. flutuante de 16-bits 'half')
+@@ -34,6 +36,7 @@
+ Name[uz]=RGB ранг усули (16-бит 'ярим' каср)
+ Name[zh_TW]=RGB 色彩模型 (32-bit 浮點數「半」)
+ Comment=Color model for 16-bit floating point 'half' per channel RGB images
++Comment[bg]=Цветови модел за 16 битови изображения RGB за полуканал
+ Comment[ca]=Model de color per a paleta 'mitja' de 16 bits-canal d'imatges RGB
+ Comment[da]=Farvemodel for 16-bit decimaltal 'halvdel' pr kanal RGB-billeder
+ Comment[de]=Farbmodell für 16-bit Fließkomma 'Halb' pro Kanal RGB-Bilder
+@@ -51,6 +54,7 @@
+ Comment[km]=ម៉ូលដែលពណ៌ 16 ប៊ីតចំណុចដែលអណ្ដែត 'ពាក្យកណ្ដាល' ក្នុងឆានែលរូបភាព RGB
+ Comment[nb]=Fargemodell for RGB-bilde med 16 bit flyttall 'halv' per kanal
+ Comment[nds]=Klöörmodell för RGB-Biller mit 16-Bit Fleetkomma "half" per Kanaal
++Comment[ne]='आधा' प्रति च्यानल RGB छविहरूको १६-बिट उत्प्लावन बिन्दुका लागि रङ मोडेल
+ Comment[nl]=Kleurmodel voor RGB-afbeeldingen met 16-bit drijvende komma 'half' per kanaal
+ Comment[pl]=Przestrzeń barw dla obrazków RGB z "połową" 16-bitowej liczby zmiennoprzecinkowej na kanał
+ Comment[pt]=Modelo de cor para imagens RGB com 16 bits de vírgula flutuante 'half' por canal
+--- krita/colorspaces/rgb_f32/krita_rgb_f32_plugin.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/colorspaces/rgb_f32/krita_rgb_f32_plugin.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=RGB Color Model (32-bit float)
++Name[bg]=Цветови модел RGB (32 бита)
+ Name[ca]=Model de color RGB (paleta de 32 bits)
+ Name[cy]=Model Lliw RGB (arnawf 32-did)
+ Name[da]=RGB-farvemodel (32-bit float)
+@@ -20,6 +21,7 @@
+ Name[km]=គំរូពណ៌ RGB (ចំនួនទស្សភាគ 32 ប៊ីត)
+ Name[nb]=RGB-fargemodell (32-bit flyttall)
+ Name[nds]=RGB-Klöörmodell (32-Bit Fleetkomma)
++Name[ne]=RGB रङ मोडेल (३२-बिट उत्प्लावन)
+ Name[nl]=RGB-kleurmodel (32-bit float)
+ Name[pl]=Przestrzeń barw RGB (32-bitowa zmiennoprzecinkowa)
+ Name[pt]=Modelo de Cor RGB (v. flutuante de 32-bits)
+@@ -34,6 +36,7 @@
+ Name[uz]=RGB ранг усули (32-бит каср)
+ Name[zh_TW]=RGB 色彩模型 (32-bit 浮點數)
+ Comment=Color model for 32-bit floating point per channel RGB images
++Comment[bg]=Цветови модел за 32 битови изображения RGB
+ Comment[ca]=Model de color per a punt flotant de 32 bits-canal d'imatges RGB
+ Comment[da]=Farvemodel for 32-bit decimaltal pr kanal RGB-billeder
+ Comment[de]=Farbmodell für 32-bit Fließkomma pro Kanal RGB-Bilder
+@@ -52,6 +55,7 @@
+ Comment[km]=ម៉ូដែលពណ៌សម្រាប់ចំណុចចំនួនទស្សភាគ 32-bit ក្នុងឆានែលរូបភាព RGB
+ Comment[nb]=Fargemodell for RGB-bilde med 32 bit flyttall per kanal
+ Comment[nds]=Klöörmodell för RGB-Biller mit 32-Bit Fleetkomma per Kanaal
++Comment[ne]=प्रति च्यानल RGB छविहरूको ३२-बिट उत्प्लावन बिन्दुका लागि रङ मोडेल
+ Comment[nl]=Kleurmodel voor RGB-afbeeldingen met 32-bit drijvende komma per kanaal
+ Comment[pl]=Przestrzeń barw dla obrazków RGB z 32-bitową liczbą zmiennoprzecinkową na kanał
+ Comment[pt]=Modelo de cor para imagens RGB com 32 bits de vírgula flutuante por canal
+--- krita/colorspaces/lms_f32/krita_lms_f32_plugin.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/colorspaces/lms_f32/krita_lms_f32_plugin.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=LMS Color Model (32-bit float)
++Name[bg]=Цветови модел LMS (32 бита)
+ Name[ca]=Model de color LMS (paleta de 32 bits)
+ Name[cy]=Model Lliw LMS (arnawf 32-did)
+ Name[da]=LMS-farvemodel (32-bit float)
+@@ -20,6 +21,7 @@
+ Name[km]=គំរូពណ៌ LMS (ចំនួនទស្សភាគ ៣២ ប៊ីត)
+ Name[nb]=LMS-fargemodell (32-bit flyttall)
+ Name[nds]=LMS-Klöörmodell (32-Bit Fleetkomma)
++Name[ne]=LMS रङ मोडेल (३२-बिट उत्प्लावन)
+ Name[nl]=LMS-kleurmodel (32-bit float)
+ Name[pl]=Przestrzeń barw LMS (32-bitowa liczba zmiennoprzecinkowa)
+ Name[pt]=Modelo de Cor LMS (v. flutuante de 32-bits)
+@@ -35,6 +37,7 @@
+ Name[zh_CN]=LMS 色彩模型(32 位浮点)
+ Name[zh_TW]=LMS 色彩模型 (32-bit 浮點數)
+ Comment=Color model for LMS cone space (Long Middle and Short wavelengths)
++Comment[bg]=Цветови модел за интервали LMS (дълги, средни и къси вълни)
+ Comment[ca]=Model de color per a conus d'espai LMC (amples d'ona llargs, mitjos i curts)
+ Comment[cy]=Model lliw ar gyfer gofod côn LMS (tonfeddi Hir, Canolig a Byr)
+ Comment[da]=Farvemodel for LMS-keglerum (Lange, mellemliggende og korte bølgelængder)
+@@ -52,6 +55,7 @@
+ Comment[km]=មូដែលពណ៌សម្រាប់ LMS ដែលមានចន្លោះរាងសាជីមូល (ប្រវែងរលកខ្លី និងពាក់កណ្ដាលវែង)
+ Comment[nb]=Fargemodell for LMS-kjeglerom (Long Middle og Short bølgelengder)
+ Comment[nds]=Klöörmodell för LMS-Kegelruum (Lang, middel un kort Bülgenlängden)
++Comment[ne]=LMS शंकु खाली स्थान (लामो मध्य र छोटो तरङलम्बाईहरू) का लागि रङ मोडेल
+ Comment[nl]=Kleurmodel voor LMS-kegelruimte (lange, middel en korte golflengten)
+ Comment[pl]=Przestrzeń barw dla przestrzeni stożkowej LMS (średnie długie i krótkie długości fal)
+ Comment[pt]=Modelo de cor para o espaço cónico do LMS (comprimentos de onda longos, médios e curtos)
+--- krita/colorspaces/rgb_u16/krita_rgb_u16_plugin.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/colorspaces/rgb_u16/krita_rgb_u16_plugin.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=RGB Color Model (16-bit integer)
++Name[bg]=Цветови модел RGB (16 бита)
+ Name[ca]=Model de color RGB (enter de 16 bits)
+ Name[cy]=Model Lliw RGB (cyfanrif 16-did)
+ Name[da]=RGB-farvemodel (16-bit heltal)
+@@ -20,6 +21,7 @@
+ Name[km]=គំរូពណ៌ RGB (ចំនួនគត់ 16 ប៊ីត)
+ Name[nb]=RGB-fargemodell (16-bit heltall)
+ Name[nds]=RGB-Klöörmodell (16-Bit Heeltall)
++Name[ne]=RGB रङ मोडेल (१६-बिट इन्टिजर)
+ Name[nl]=RGB-kleurmodel (16-bit integer)
+ Name[pl]=Przestrzeń barw RGB (16-bitowa liczba całkowita)
+ Name[pt]=Modelo de Cor RGB (inteiro de 16-bits)
+@@ -34,6 +36,7 @@
+ Name[uz]=RGB ранг усули (16-бит бутун)
+ Name[zh_TW]=RGB 色彩模型 (16-bit 整數)
+ Comment=Color model for 16-bit integer per channel RGB images
++Comment[bg]=Цветови модел за 16 битови изображения RGB
+ Comment[ca]=Model de color enter de 16 bits per canal d'imatges RGB
+ Comment[cy]=Model lliw ar gyfer delweddau RGB â chyfanrif 16-did/sianel
+ Comment[da]=Farvemodel for 16-bit heltal pr kanal RGB-billeder
+@@ -53,6 +56,7 @@
+ Comment[km]=គំរូពណ៌សម្រាប់រូបភាព RGB ចំនួនគត់ 16 ប៊ីតក្នុងមួយឆានែល
+ Comment[nb]=Fargemodell for RGB-bilde med 16 bit heltall per kanal
+ Comment[nds]=Klöörmodell för RGB-Biller mit 16-Bit Heeltall per Kanaal
++Comment[ne]=प्रति च्यानल RGB छविहरूको १६-बिट इन्टिजरका लागि रङ मोडेल
+ Comment[nl]=Kleurmodel voor RGB-afbeeldingen met 16-bit/kanaal
+ Comment[pl]=Przestrzeń barw dla obrazków RGB o 16-bitowych liczbach całkowitych na kanał
+ Comment[pt]=Modelo de cor para imagens RGB com 16 bits por canal
+--- krita/colorspaces/rgb_u8/kritargbplugin.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/colorspaces/rgb_u8/kritargbplugin.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -27,6 +27,7 @@
+ Name[ms]=Model Warna RGB
+ Name[nb]=RGB-fargemodell
+ Name[nds]=RGB-Klöörmodell
++Name[ne]=RGB रङ मोडेल
+ Name[nl]=RGB-kleurmodel
+ Name[nn]=RGB-fargemodell
+ Name[pl]=Przestrzeń barw RGB
+@@ -46,7 +47,7 @@
+ Name[zh_CN]=RGB 色彩模型
+ Name[zh_TW]=RGB 色彩模型
+ Comment=Color model for 8-bit/channel RGB images
+-Comment[bg]=Цветови модел за 8 битови RGB изображения
++Comment[bg]=Цветови модел за 8 битови изображения RGB
+ Comment[ca]=Model de color per a 8 bits/canal d'imatges RGB
+ Comment[cy]=Model lliw ar gyfer delweddau RGB 8-did/sianel
+ Comment[da]=Farvemodel for 8-bit/kanal RGB-billeder
+@@ -70,6 +71,7 @@
+ Comment[ms]=Model warna imej RGB 8-bit/saluran
+ Comment[nb]=Fargemodell for RGB-bilde med 8 bit per kanal
+ Comment[nds]=Klöörmodell för RGB-Biller mit 8-Bit per Kanaal
++Comment[ne]=८-बिट/च्यानल RGB छविहरूका लागि रङ मोडेल
+ Comment[nl]=Kleurmodel voor 8-bit/kanaal RGB-afbeeldingen
+ Comment[nn]=Fargemodell for RGB-bilete med 8 bit per kanal
+ Comment[pl]=Przestrzeń barw dla obrazków RGB 8-bitów/kanał
+--- krita/colorspaces/rgb_u8/templates/transparent_1280x1024.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/colorspaces/rgb_u8/templates/transparent_1280x1024.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,6 +4,7 @@
+ URL=.source/transparent_1280x1024.kra
+ Icon=template_rgb_empty
+ Name=Transparent 1280 x 1024
++Name[bg]=Прозрачно 1280x1204
+ Name[br]=Treuzwelus 1280 x 1024
+ Name[cy]=Tryloyw 1280 x 1024
+ Name[da]=Gennemsigtig 1280 x 1024
+@@ -25,6 +26,7 @@
+ Name[ms]=Lutsinar 1280 x 1024
+ Name[nb]=Gjennomsiktig 1280 x 1024
+ Name[nds]=Dörsichtig 1280 x 1024
++Name[ne]=पारदर्शी १२८० x १०२४
+ Name[nn]=Gjennomsiktig 1280 × 1024
+ Name[pl]=Przezroczysty 1280 x 1024
+ Name[pt]=Transparente 1280 x 1024
+@@ -41,6 +43,7 @@
+ Name[zh_CN]=透明 1280 x 1024
+ Name[zh_TW]=透明 1280 x 1024
+ Comment=Creates a transparent image of 1280 x 1024 pixels.
++Comment[bg]=Създава прозрачно изображение с размери 1280x1024 пиксела.
+ Comment[ca]=Crea una imatge transparent de 1280 x 1024 píxels.
+ Comment[cy]=Creu delwedd dryloyw o 1280 x 1024 picsel.
+ Comment[da]=Laver et gennemsigtigt billede på 1280 x 1024 billedpunkter.
+@@ -62,6 +65,7 @@
+ Comment[ms]=Cipta imej lutsinar 1280 x 1024 piksel.
+ Comment[nb]=Lager et gjennomsiktig bilde på 1280 x 1024 piksler.
+ Comment[nds]=Stellt en dörsichtig Bild mit 1280 x 1024 Pixels op.
++Comment[ne]=१२८० x १०२४ पिक्सेलको पारदर्शी छवि सिर्जना गर्दछ ।
+ Comment[nl]=Maakt een transparante afbeelding aan van 1280 x 1024 pixels.
+ Comment[nn]=Lagar eit gjennomsiktig bilete på 1280 × 1024 pikslar.
+ Comment[pl]=Tworzy przezroczysty obrazek o rozmiarach 1280 x 1024 pikseli.
+--- krita/colorspaces/rgb_u8/templates/transparent_640x480.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/colorspaces/rgb_u8/templates/transparent_640x480.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,6 +4,7 @@
+ URL=.source/transparent_640x480.kra
+ Icon=template_rgb_empty
+ Name=Transparent 640 x 480
++Name[bg]=Прозрачно 640x480
+ Name[br]=Treuzwelus 640 x 480
+ Name[cy]=Tryloyw 640 x 480
+ Name[da]=Gennemsigtig 640 x 480
+@@ -25,6 +26,7 @@
+ Name[ms]=Lutsinar 640 x 480
+ Name[nb]=Gjennomsiktig 640 x 480
+ Name[nds]=Dörsichtig 640 x 480
++Name[ne]=पारदर्शी ६४० x ४८०
+ Name[nn]=Gjennomsiktig 640 × 480
+ Name[pl]=Przezroczysty 640 x 480
+ Name[pt]=Transparente 640 x 480
+@@ -41,6 +43,7 @@
+ Name[zh_CN]=透明 640 x 480
+ Name[zh_TW]=透明 640 x 480
+ Comment=Creates a transparent image of 640 x 480 pixels.
++Comment[bg]=Създаване на прозрачно изображение с размери 640x480 пиксела.
+ Comment[ca]=Crea una imatge transparent de 640 x 480 píxels.
+ Comment[cy]=Creu delwedd dryloyw o 640 x 480 picsel.
+ Comment[da]=Laver et gennemsigtigt billede på 640 x 480 billedpunkter.
+@@ -62,6 +65,7 @@
+ Comment[ms]=Cipta imej lutsinar 640 x 480 piksel.
+ Comment[nb]=Lager et gjennomsiktig bilde på 640 x 480 piksler.
+ Comment[nds]=Stellt en dörsichtig Bild mit 640 x 480 Pixels op.
++Comment[ne]=६४० x ४८० पिक्सेलको पारदर्शी सिर्जना गर्दछ ।
+ Comment[nl]=Maakt een transparante afbeelding aan van 640 x 480 pixels.
+ Comment[nn]=Lagar eit gjennomsiktig bilete på 640 × 480 pikslar.
+ Comment[pl]=Tworzy przezroczysty obrazek o rozmiarach 640 x 480 pikseli.
+--- krita/colorspaces/rgb_u8/templates/white_1600x1200.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/colorspaces/rgb_u8/templates/white_1600x1200.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,6 +4,7 @@
+ URL=.source/white_1600x1200.kra
+ Icon=template_rgb_empty
+ Name=White 1600 x 1200
++Name[bg]=Бяло 1600x1200
+ Name[br]=Gwenn 1600 x 1200
+ Name[ca]=Blanc 1600 x 1200
+ Name[cy]=Gwyn 1600 x 1200
+@@ -28,6 +29,7 @@
+ Name[ms]=Putih 1600 x 1200
+ Name[nb]=Hvit 1600 x 1200
+ Name[nds]=Witt 1600 x 1200
++Name[ne]=सेतो १६०० x १२००
+ Name[nn]=Kvitt 1600 × 1200
+ Name[pl]=Biały 1600 x 1200
+ Name[pt]=Branca 1600 x 1200
+@@ -44,6 +46,7 @@
+ Name[zh_CN]=白色 1600 x 1200
+ Name[zh_TW]=白色 1600 x 1200
+ Comment=Creates a white RGB image of 1600 x 1200 pixels.
++Comment[bg]=Създаване на бяло изображение RGB с размери 1600x1200 пиксела.
+ Comment[ca]=Crea una imatge blanca RGB de 1600 x 1200 píxels
+ Comment[cy]=Creu delwedd RGB wen o 1600 x 1200 picsel.
+ Comment[da]=Laver et hvidt RGB-billede på 1600 x 1200 billedpunkter.
+@@ -65,6 +68,7 @@
+ Comment[ms]=Cipta imej RGB putih 1600 x 1200 piksel.
+ Comment[nb]=Lager et hvitt bilde på 1600 x 1200 piksler.
+ Comment[nds]=Stellt en witt RGB-Bild mit 1600 x 1200 Pixels op
++Comment[ne]=१६०० x १२०० पिक्सेलको सेतो RGB छवि सिर्जना गर्दछ ।
+ Comment[nl]=Maakt een witte RGB-afbeelding aan van 1600 x 1200 pixels.
+ Comment[nn]=Lagar eit kvitt RGB-bilete på 1600 × 1200 pikslar.
+ Comment[pl]=Tworzy biały obrazek RGB o rozmiarach 1600 x1200 pikseli.
+--- krita/colorspaces/rgb_u8/templates/white_1024x768.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/colorspaces/rgb_u8/templates/white_1024x768.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ URL=.source/white_1024x768.kra
+ Icon=template_rgb_empty
+ Name=White 1024 x 768
+-Name[bg]=Бяло 1024 x 768
++Name[bg]=Бяло 1024x768
+ Name[br]=Gwenn 1024 x 768
+ Name[ca]=Blanc 1024 x 768
+ Name[cy]=Gwyn 1024 x 768
+@@ -30,6 +30,7 @@
+ Name[ms]=Putih 1024 x 768
+ Name[nb]=Hvitt 1024 x 768
+ Name[nds]=Witt 1024 x 768
++Name[ne]=सेतो १०२४ x ७६८
+ Name[nl]=Wit 1024 x 768
+ Name[nn]=Kvitt 1024 × 768
+ Name[pl]=Biały 1024 x 768
+@@ -49,13 +50,13 @@
+ Name[zh_CN]=白色 1024 x 768
+ Name[zh_TW]=白色 1024 x 768
+ Comment=Creates a white RGB image of 1024 x 768 pixels.
+-Comment[bg]=Създаване на бяло RGB изображение с размери 1024 x 768 точки.
++Comment[bg]=Създаване на бяло изображение RGB с размери 1024x768 пиксела.
+ Comment[ca]=Crea una imatge blanca RGB de 1024 x 768 píxels
+ Comment[cy]=Creu delwedd RGB wen o 1024 x 768 picsel.
+ Comment[da]=Laver et hvidt RGB-billede på 1024 x 768 billedpunkter.
+ Comment[de]=Erstellt ein weißes RGB-Bild mit 1024 x 768 Pixeln.
+ Comment[el]=Δημιουργεί μία λευκή RGB εικόνα μεγέθους 1024 x 768 εικονοστοιχείων.
+-Comment[es]=Create una imagen RGB de 1024 x 768 píxeles.
++Comment[es]=Crea una imagen RGB de 1024 x 768 píxeles.
+ Comment[et]=Loob valge RGB-pildi mõõtmetega 1024 x 768 pikslit.
+ Comment[eu]=1024 x 768 pixeleko RGB irudi zuri bat sortzen du.
+ Comment[fa]=یک تصویر RGB سفید ۷۶۸ × ۱۰۲۴ تصویردانهای ایجاد میکند.
+@@ -72,6 +73,7 @@
+ Comment[ms]=Cipta imej RGB putih 1024 x 768 piksel.
+ Comment[nb]=Lager et hvitt RGB-bilde på 1024 x 768 piksler.
+ Comment[nds]=Stellt en witt RGB-Bild mit 1024 x 768 Pixels op.
++Comment[ne]=१०२४ x ७६८ पिक्सेलको सेतो RGB छवि सिर्जना गर्दछ ।
+ Comment[nl]=Maakt een witte RGB-afbeelding aan van 1024 x 768 pixels.
+ Comment[nn]=Lagar eit kvitt RGB-bilete på 1024 × 768 pikslar.
+ Comment[pl]=Tworzy biały obrazek RGB o rozmiarach 1024 x 768 pikseli.
+--- krita/colorspaces/rgb_u8/templates/white_1280x1024.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/colorspaces/rgb_u8/templates/white_1280x1024.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,6 +4,7 @@
+ URL=.source/white_1280x1024.kra
+ Icon=template_rgb_empty
+ Name=White 1280 x 1024
++Name[bg]=Бяло 1280x1024
+ Name[br]=Gwenn 1280 x 1024
+ Name[ca]=Blanc 1280 x 1024
+ Name[cy]=Gwyn 1280 x 1024
+@@ -28,6 +29,7 @@
+ Name[ms]=Putih 1280 x 1024
+ Name[nb]=Hvit 1280 x 1024
+ Name[nds]=Witt 1280 x 1024
++Name[ne]=सेतो १२८० x १०२४
+ Name[nn]=Kvitt 1280 × 1024
+ Name[pl]=Biały 1280 x 1024
+ Name[pt]=Branca 1280 x 1024
+@@ -44,6 +46,7 @@
+ Name[zh_CN]=白色 1280 x 1024
+ Name[zh_TW]=白色 1280 x 1024
+ Comment=Creates a white RGB image of 1280 x 1024 pixels.
++Comment[bg]=Създаване на бяло изображение RGB с размери 1280x1024 пиксела.
+ Comment[ca]=Crea una imatge blanca RGB de 1280 x 1024 píxels
+ Comment[cy]=Creu delwedd RGB wen o 1280 x 1024 picsel.
+ Comment[da]=Laver et hvidt RGB-billede på 1280 x 1024 billedpunkter.
+@@ -65,6 +68,7 @@
+ Comment[ms]=Cipta imej RGB putih 1280 x 1024 piksel.
+ Comment[nb]=Lager et hvitt bilde på 1280 x 1024 piksler.
+ Comment[nds]=Stellt en witt RGB-Bild mit 1280 x 1024 Pixels op.
++Comment[ne]=१२८० x १०२४ पिक्सेलको सेतो RGB छवि सिर्जना गर्दछ ।
+ Comment[nl]=Maakt een witte RGB-afbeelding aan van 1280 x 1024 pixels.
+ Comment[nn]=Lagar eit kvitt RGB-bilete på 1280 × 1024 pikslar.
+ Comment[pl]=Tworzy biały obrazek RGB o rozmiarach 1280 x 1024 pikseli.
+--- krita/colorspaces/rgb_u8/templates/white_640x480.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/colorspaces/rgb_u8/templates/white_640x480.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -30,6 +30,7 @@
+ Name[ms]=Putih 640x480
+ Name[nb]=Hvitt 640 x 480
+ Name[nds]=Witt 640x480
++Name[ne]=सेतो ६४०x४८०
+ Name[nl]=Wit 640 x 480
+ Name[nn]=Kvitt 640 × 480
+ Name[pl]=Biały 640x480
+@@ -49,7 +50,7 @@
+ Name[zh_CN]=白色 640 x 480
+ Name[zh_TW]=白色 640x480
+ Comment=Creates a white RGB image of 640 x 480 pixels.
+-Comment[bg]=Създаване на бяло RGB изображение с размери 640 x 480 точки.
++Comment[bg]=Създаване на бяло изображение RGB с размери 640x480 пиксела.
+ Comment[ca]=Crea una imatge blanca RGB de 640 x 480 píxels
+ Comment[cy]=Creu delwedd RGB wen o 640 x 480 picsel.
+ Comment[da]=Laver et hvidt RGB-billede på 640 x 480 billedpunkter.
+@@ -72,6 +73,7 @@
+ Comment[ms]=Cipta imej RGB putih 640 x 480 piksel.
+ Comment[nb]=Lager et hvitt bilde på 640 x 480 piksler.
+ Comment[nds]=Stellt en witt RGB-Bild mit 640 x 480 Pixels op.
++Comment[ne]=६४० x ४८० पिक्सेलको सेतो RGB छवि सिर्जना गर्दछ ।
+ Comment[nl]=Maakt een witte RGB-afbeelding aan van 640 x 480 pixels.
+ Comment[nn]=Lagar eit kvitt RGB-bilete på 640 × 480 pikslar.
+ Comment[pl]=Tworzy biały obrazek RGB o rozmiarach 640 x 480 pikseli.
+--- krita/colorspaces/rgb_u8/templates/transparent_1600x1200.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/colorspaces/rgb_u8/templates/transparent_1600x1200.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ URL=.source/transparent_1600x1200.kra
+ Icon=template_rgb_empty
+ Name=Transparent 1600 x 1200
+-Name[bg]=Прозрачно 1600 x 1200
++Name[bg]=Прозрачно 1600x1200
+ Name[br]=Treuzwelus 1600 x 1200
+ Name[cy]=Tryloyw 1600 x 1200
+ Name[da]=Gennemsigtig 1600 x 1200
+@@ -27,6 +27,7 @@
+ Name[ms]=Lutsinar 1600 x 1200
+ Name[nb]=Gjennomsiktig 1600 × 1200
+ Name[nds]=Dörsichtig 1600 x 1200
++Name[ne]=पारदर्शी १६०० x १२००
+ Name[nl]=Transparant 1600 x 1200
+ Name[nn]=Gjennomsiktig 1600 × 1200
+ Name[pl]=Przezroczysty 1600 x 1200
+@@ -46,7 +47,7 @@
+ Name[zh_CN]=透明 1600 x 1200
+ Name[zh_TW]=透明 1600 x 1200
+ Comment=Creates a transparent image of 1600 x 1200 pixels.
+-Comment[bg]=Създаване на прозрачно изображение с размери 1600 x 1200 точки.
++Comment[bg]=Създаване на прозрачно изображение с размери 1600x1200 пиксела.
+ Comment[ca]=Crea una imatge transparent de 1600 x 1200 píxels.
+ Comment[cy]=Creu delwedd dryloyw o 1600 x 1200 picsel.
+ Comment[da]=Laver et gennemsigtigt billede på 1600 x 1200 billedpunkter.
+@@ -69,6 +70,7 @@
+ Comment[ms]=Cipta imej lutsinar 1600 x 1200 piksel.
+ Comment[nb]=Lager et gjennomsiktig bilde på 1600 x 1200 piksler.
+ Comment[nds]=Stellt en dörsichtig Bild mit 1600 x 1200 Pixels op.
++Comment[ne]=१६०० x १२०० पिक्सेलको पारदर्शी छवि सिर्जना गर्दछ।
+ Comment[nl]=Maakt een transparante afbeelding aan van 1600 x 1200 pixels.
+ Comment[nn]=Lagar eit gjennomsiktig bilete på 1600 × 1200 pikslar.
+ Comment[pl]=Tworzy przezroczysty obrazek o rozmiarach 1600 x 1200 pikseli.
+--- krita/colorspaces/rgb_u8/templates/transparent_1024x768.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/colorspaces/rgb_u8/templates/transparent_1024x768.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,6 +4,7 @@
+ URL=.source/transparent_1024x768.kra
+ Icon=template_rgb_empty
+ Name=Transparent 1024 x 768
++Name[bg]=Прозрачно 1024x768
+ Name[br]=Treuzwelus 1024 x 768
+ Name[cy]=Tryloyw 1024 x 768
+ Name[da]=Gennemsigtig 1024 x 768
+@@ -25,6 +26,7 @@
+ Name[ms]=Lutsinar 1024 x 768
+ Name[nb]=Gjennomsiktig 1024 × 768
+ Name[nds]=Dörsichtig 1024 x 768
++Name[ne]=पारदर्शी १०२४ x ७६८
+ Name[nn]=Gjennomsiktig 1024 × 768
+ Name[pl]=Przezroczysty 1024 x 768
+ Name[pt]=Transparente 1024 x 768
+@@ -41,6 +43,7 @@
+ Name[zh_CN]=透明 1024 x 768
+ Name[zh_TW]=透明 1024 x 768
+ Comment=Creates a transparent image of 1024 x 768 pixels.
++Comment[bg]=Създава прозрачно изображение с размери 1024x768 пиксела.
+ Comment[ca]=Crea una imatge transparent de 1024 x 768 píxels.
+ Comment[cy]=Creu delwedd dryloyw o 1024 x 768 picsel.
+ Comment[da]=Laver et gennemsigtigt billede på 1024 x 768 billedpunkter.
+@@ -62,6 +65,7 @@
+ Comment[ms]=Cipta imej lutsinar 1024 x 768 piksel.
+ Comment[nb]=Lager et gjennomsiktig bilde på 1024 x 768 piksler.
+ Comment[nds]=Stellt en dörsichtig Bild mit 1024 x 768 Pixels op.
++Comment[ne]=१०२४ x ७६८ पिक्सेलको पारदर्शी छवि सिर्जना गर्दछ ।
+ Comment[nl]=Maakt een transparante afbeelding aan van 1024 x 768 pixels.
+ Comment[nn]=Lagar eit gjennomsiktig bilete på 1024 × 768 pikslar.
+ Comment[pl]=Tworzy przezroczysty obrazek o rozmiarach 1024 x 768 pikseli.
+--- krita/colorspaces/wetsticky/brushop/kritawsbrushpaintop.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/colorspaces/wetsticky/brushop/kritawsbrushpaintop.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Wet & Sticky Paintbrush Paintop
++Name[bg]=Мокра и лепкава четка
+ Name[ca]=Pinzell humit i viscós de Paintop
+ Name[cy]=Brws paent gwlyb gludiog
+ Name[da]=Maleoperation med våd og klæbrig malerpensel
+@@ -17,6 +18,7 @@
+ Name[km]=ជក់ទឹក & ស្អិត Paintop
+ Name[nb]=Fargemodell for våt og klissete pensel
+ Name[nds]=Malen mit en natten backigen Pinsel
++Name[ne]=ओसिलो र टाँसिने पेन्टब्रस पेन्टप
+ Name[nl]=Kwasten voor natte en kleverige verfverrichtingen
+ Name[pl]=Mokre i lepkie włosie pędzla
+ Name[pt]=Modelo de Cores Molhado e Pegajoso
+@@ -31,6 +33,7 @@
+ Name[zh_CN]=湿性和粘性画布
+ Name[zh_TW]=濕 & 黏的筆刷頭
+ Comment=Wet & Sticky paintbrush
++Comment[bg]=Мокра и лепкава четка
+ Comment[ca]=Pinzell humit i viscós
+ Comment[cy]=Brws paent gwlyb gludiog
+ Comment[da]=Våd og klæbrig malerpensel
+@@ -48,6 +51,7 @@
+ Comment[km]=ជក់ទឹក & ស្អិត
+ Comment[nb]=Våt og klissete pensel
+ Comment[nds]=Natt un backig Pinsel
++Comment[ne]=ओसिलो र टाँसिने पेन्टब्रस
+ Comment[nl]=Kwast voor nat en kleverige verfverichtingen
+ Comment[pl]=Mokry i lepki pędzel
+ Comment[pt]=Um pincel molhado e pegajoso
+--- krita/colorspaces/wetsticky/kritawsplugin.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/colorspaces/wetsticky/kritawsplugin.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Wet & Sticky Canvas Color Model
++Name[bg]=Цветови модел за мокро и лепкаво платно
+ Name[ca]=Model de color de llenç humit i viscós
+ Name[cy]=Model Lliw Cynfas Gwlyb a Gludiog
+ Name[da]=Våd & klæbrig kanvasfarve-model
+@@ -22,6 +23,7 @@
+ Name[ms]=Model Warna Kanvas Basah & Lekit
+ Name[nb]=Fargemodell for vått og klissete lerret
+ Name[nds]=Klöörmodell natt un backig Lienwand
++Name[ne]=ओसिलो र टाँसिने चित्रपट रङ मोडेल
+ Name[nl]=Nat en kleverig canvasmodel
+ Name[nn]=Fargemodell for vått lerret
+ Name[pl]=Przestrzeń barw mokrego i lepkiego płótna
+--- krita/colorspaces/gray_u16/krita_gray_u16_plugin.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/colorspaces/gray_u16/krita_gray_u16_plugin.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Grayscale Color Model (16-bit integer)
++Name[bg]=Цветови модел сива гама (16 бита)
+ Name[ca]=Model de color d'escala de grisos (enters de 16 bits)
+ Name[cy]=Model Lliw Graddlwyd (cyfanrif 16-did)
+ Name[da]=Farvemodel med gråskala (16-bit heltal)
+@@ -20,6 +21,7 @@
+ Name[km]=គំរូពណ៌មាត្រដ្ឋានប្រផេះ (ចំនួនគត់ ១៦ ប៊ីត)
+ Name[nb]=Fargemodell med gråtoner (16-bit heltall)
+ Name[nds]=Griestöön-Klöörmodell (16-Bit Heeltall)
++Name[ne]=ग्रेस्केल रङ मोडेल (१६-बिट इन्टिजर)
+ Name[nl]=Kleurmodel voor grijswaarden (16-bit integers)
+ Name[pl]=Skala szarości (16-bitowa liczba całkowita)
+ Name[pt]=Modelo de Cor de Tons de Cinzento (inteiros de 16 bits)
+@@ -35,6 +37,7 @@
+ Name[zh_CN]=灰度色彩模型(16 位整数)
+ Name[zh_TW]=灰階色彩模型 (16-bit 整數)
+ Comment=Color model for 16-bit integer per channel Grayscale images
++Comment[bg]=Цветови модел за 16 битови изображения в сива гама
+ Comment[ca]=Model de color d'enters de 16 bits per a canal d'imatges d'escala de grisos
+ Comment[cy]=Model lliw ar gyfer delweddau Graddlwyd â chyfanrif 16-did/sianel
+ Comment[da]=Farvemodel for 16-bit heltal pr kanal Gråskala-billeder
+@@ -54,6 +57,7 @@
+ Comment[km]=គំរូពណ៌សម្រាប់រូបភាពមាត្រដ្ឋានប្រផេះចំនួនគត់ ១៦ ប៊ីតក្នុងមួយឆានែល
+ Comment[nb]=Fargemodell for gråtonebilde med 16 bit per kanal
+ Comment[nds]=Klöörmodell för Griestöön-Biller mit 16-Bit Heeltall per Kanaal
++Comment[ne]=प्रति च्यानल ग्रेस्केल छविहरूका १६-बिट च्यानलका लागि रङ मोडेल
+ Comment[nl]=Kleurmodel voor 16-bit/kanaal grijswaarde-afbeeldingen
+ Comment[pl]=Przestrzeń barw dla obrazków w skali szarości z 16-bitową liczbą całkowitą na kanał
+ Comment[pt]=Modelo de cor para imagens de tons de cinzento com 16 bits por canal
+--- krita/colorspaces/ycbcr_u16/krita_ycbcr_u16_plugin.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/colorspaces/ycbcr_u16/krita_ycbcr_u16_plugin.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=YCbCr Color Model (16-bit integer)
++Name[bg]=Цветови модел YCbCr (16 бита)
+ Name[ca]=Model de color YCbCr (enters de 16 bits)
+ Name[da]=YCbCr-farvemodel (16-bit heltal)
+ Name[de]=YCbCr-Farbmodell (16-bit Ganzzahl)
+@@ -16,6 +17,7 @@
+ Name[km]=គំរូពណ៌ CMYK (ចំនួនគត់ ១៦ ប៊ីត)
+ Name[nb]=YCbCr-fargemodell (16-bit heltall)
+ Name[nds]=YCbCr-Klöörmodell (16-Bit Heeltall)
++Name[ne]=वाईसी ी ी आर रङ मोडेल (१६-बिट इन्टिजर)
+ Name[nl]=YCbCr-kleurmodel (16-bit integer)
+ Name[pl]=Przestrzeń barw YCbCr (16-bitowa liczbowa całkowita)
+ Name[pt]=Modelo de Cor YCbCr (inteiros de 16 bits)
+@@ -30,6 +32,7 @@
+ Name[uz]=YCbCr ранг усули (16-бит бутун)
+ Name[zh_TW]=YCbCr 色彩模型 (16-bit 整數)
+ Comment=Color model for 16-bit integer per channel YCbCr images
++Comment[bg]=Цветови модел за 16 битови YCbCr изображения
+ Comment[ca]=Model de color d'enters de 16 bits per a canal d'imatges YCbCr
+ Comment[da]=Farvemodel for 16-bit heltal pr kanal YCbCr-billeder
+ Comment[de]=Farbmodell für 16-bit pro Kanal YCbCr-Bilder
+@@ -45,6 +48,7 @@
+ Comment[km]=គំរូពណ៌សម្រាប់រូបភាព CMYK ចំនួនគត់ ១៦ ប៊ីតក្នុងមួយឆានែល
+ Comment[nb]=Fargemodell for YCbCr-bilder med 16-bit heltall per kanal
+ Comment[nds]=Klöörmodell för YCbCr-Biller mit 16-Bit Heeltall pro Kanaal
++Comment[ne]=प्रति च्यानल वाईसीबीसीआर छविहरूको १६-बिट इन्टिजरका लागि रङ मोडेल
+ Comment[nl]=Kleurmodel voor 16-bit/kanaal van YCbCr-afbeeldingen
+ Comment[pl]=Przestrzeń barw dla obrazków YCbCr z 16-bitowymi liczbami całkowitymi na kanał
+ Comment[pt]=Modelo de cor para imagens YCbCr com 16 bits por canal
+--- krita/colorspaces/cmyk_u16/krita_cmyk_u16_plugin.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/colorspaces/cmyk_u16/krita_cmyk_u16_plugin.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=CMYK Color Model (16-bit integer)
++Name[bg]=Цветови модел CMYK (16 бита)
+ Name[ca]=Model de color CMYK (enters de 16 bits)
+ Name[cy]=Model Lliw CMYK (cyfanrif 16-did)
+ Name[da]=CMYK-farvemodel (16-bit heltal)
+@@ -20,6 +21,7 @@
+ Name[km]=គំរូពណ៌ CMYK (ចំនួនគត់ ១៦ ប៊ីត)
+ Name[nb]=CMYK-fargemodell (16-bit heltall)
+ Name[nds]=CMYK-Klöörmodell (16-Bit Heeltall)
++Name[ne]=CMYK रङ मोडेल (१६-बिट इन्टिजर)
+ Name[nl]=CMYK-kleurmodel (16-bit integer)
+ Name[pl]=Przestrzeń barw CMYK (16-bitowa liczbowa całkowita)
+ Name[pt]=Modelo de Cor CMYK (inteiros de 16 bits)
+@@ -35,6 +37,7 @@
+ Name[zh_CN]=CMYK 色彩模型(16 位整数)
+ Name[zh_TW]=CMYK 色彩模型 (16-bit 整數)
+ Comment=Color model for 16-bit integer per channel CMYK images
++Comment[bg]=Цветови модел за 16 битови изображения CMYK
+ Comment[ca]=Model de color d'enters de 16 bits per a canal d'imatges CMYK
+ Comment[cy]=Model lliw ar gyfer delweddau CMYK â chyfanrif 16-did/sianel
+ Comment[da]=Farvemodel for 16-bit heltal pr kanal CMYK-billeder
+@@ -54,6 +57,7 @@
+ Comment[km]=គំរូពណ៌សម្រាប់រូបភាព CMYK ចំនួនគត់ ១៦ ប៊ីតក្នុងមួយឆានែល
+ Comment[nb]=Fargemodell for CMYK-bilder med 16 bit per kanal
+ Comment[nds]=Klöörmodell för CMYK-Biller mit 16-Bit Heeltall per Kanaal
++Comment[ne]=प्रति च्यानल CMYK छविहरूको १६ बिट इन्टिजरका लागि रङ मोडेल
+ Comment[nl]=Kleurmodel voor 16-bit/kanaal van CMYK-afbeeldingen
+ Comment[pl]=Przestrzeń barw dla obrazków CMYK z 16-bitowymi liczbami całkowitymi na kanał
+ Comment[pt]=Modelo de cor para imagens CMYK com 16 bits por canal
+--- krita/colorspaces/gray_u8/kritagrayplugin.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/colorspaces/gray_u8/kritagrayplugin.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -26,6 +26,7 @@
+ Name[ms]=Model Warna Skala Kelabu
+ Name[nb]=Fargemodell med gråtoner
+ Name[nds]=Griestöön-Klöörmodell
++Name[ne]=ग्रेस्केल रङ मोडेल
+ Name[nl]=Grijswaarden kleurmodel
+ Name[nn]=Fargemodell med gråtonar
+ Name[pl]=Skala szarości
+@@ -69,6 +70,7 @@
+ Comment[ms]=Model warna bagi imej skala kelabu 8-bit
+ Comment[nb]=Fargemodell for 8-bits gråtonebilder
+ Comment[nds]=Klöörmodell för Griestöön-Biller mit 8-Bit Heeltall
++Comment[ne]=८-बिट ग्रेस्केल छविहरूका लागि रङ मोडेल
+ Comment[nl]=Kleurmodel voor afbeeldingen in 8-bit grijswaarden
+ Comment[nn]=Fargemodell for 8-bits gråtonebilete
+ Comment[pl]=Przestrzeń braw dla 8-bitowych obrazków w skali szarości
+--- krita/colorspaces/gray_u8/templates/.directory (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/colorspaces/gray_u8/templates/.directory (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Name=Grayscale
+-Name[bg]=Степени на сивото
++Name[bg]=Гама на сивото
+ Name[br]=SkeulLouet
+ Name[ca]=Escala de grisos
+ Name[cy]=Graddlwyd
+@@ -23,6 +23,7 @@
+ Name[lv]=Pelēktoņu
+ Name[nb]=Gråtoner
+ Name[nds]=Griestöön
++Name[ne]=ग्रेस्केल
+ Name[nl]=Grijswaarden
+ Name[pl]=Skala szarości
+ Name[pt]=Tons de Cinzento
+--- krita/colorspaces/gray_u8/templates/white_640x480.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/colorspaces/gray_u8/templates/white_640x480.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ URL=.source/white_640x480.kra
+ Icon=template_gray_empty
+ Name=White Background, 640 x 480
+-Name[bg]=Бял фон, 640 x 480
++Name[bg]=Бял фон, 640x480
+ Name[ca]=Fons blanc, 640 x 480
+ Name[cy]=Cefndir Gwyn, 640 x 480
+ Name[da]=Hvid baggrund, 640 x 480
+@@ -29,6 +29,7 @@
+ Name[ms]=Latar Belakang Putih, 640 x 480
+ Name[nb]=Hvit bakgrunn, 640 x 480
+ Name[nds]=Witt Achtergrund, 640 x 480
++Name[ne]=सेतो पृष्ठभूमि, ६४० x ४८०
+ Name[nl]=Witte achtergrond, 640 x 480
+ Name[nn]=Kvit bakgrunn, 640 × 480
+ Name[pl]=Białe tło, 640 x 480
+@@ -48,7 +49,7 @@
+ Name[zh_CN]=白色背景，640 x 480
+ Name[zh_TW]=白色背景， 640 x 480
+ Comment=Creates an image of 640 x 480 pixels with a white background.
+-Comment[bg]=Създаване на изображение с размери 640 x 480 точки и бял фон.
++Comment[bg]=Създаване на изображение с размери 640x480 пиксела и бял фон.
+ Comment[ca]=Crea una imatge de 640 x 480 píxels amb el fons blanc.
+ Comment[cy]=Creu delwedd o 640 x 480 o bicseli efo cefndir gwyn.
+ Comment[da]=Laver et billede på 640 x 480 billedpunkter med en hvid baggrund.
+@@ -71,6 +72,7 @@
+ Comment[ms]=Cipta imej 640 x 480 piksel dengan latar belakang putih.
+ Comment[nb]=Lager et bilde på 640 x 480 piksler med hvit bakgrunn.
+ Comment[nds]=Stellt en Bild mit 640 x 480 Pixels mit witten Achtergrund op.
++Comment[ne]=सेतो पृष्ठभूमि सहित ६४० x ४८० पिक्सेलको छवि सिर्जना गर्दछ ।
+ Comment[nl]=Maakt een afbeelding aan van 640 x 480 pixels, met een witte achtergrond.
+ Comment[nn]=Lagar eit bilete på 640 × 480 pikslar med ein kvit bakgrunn.
+ Comment[pl]=Tworzy obrazek z białym tłem o rozmiarach 640 x 480 pikseli.
+--- krita/colorspaces/ycbcr_u8/krita_ycbcr_u8_plugin.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/colorspaces/ycbcr_u8/krita_ycbcr_u8_plugin.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=YCbCr Color Model (8-bit integer)
++Name[bg]=Цветови модел YCbCr (16 бита)
+ Name[ca]=Model de color YCbCr (enters de 16 bits)
+ Name[da]=YCbCr-farvemodel (8-bit heltal)
+ Name[de]=YCbCr-Farbmodell (8-bit Ganzzahl)
+@@ -16,6 +17,7 @@
+ Name[km]=គំរូពណ៌ CMYK (ចំនួនគត់ ១៦ ប៊ីត)
+ Name[nb]=YCbCr fargemodell (8-bit heltall)
+ Name[nds]=YCbCr-Klöörmodell (8-Bit Heeltall)
++Name[ne]=वाईसीबीसीआर रङ मोडेल (८-बिट इन्टिजर)
+ Name[nl]=YCbCr-kleurmodel (8-bit integer)
+ Name[pl]=Przestrzeń barw YCbCr (8-bitowa liczbowa całkowita)
+ Name[pt]=Modelo de Cor YCbCr (inteiros de 8 bits)
+@@ -30,6 +32,7 @@
+ Name[uz]=YCbCr ранг усули (8-бит бутун)
+ Name[zh_TW]=YCbCr 色彩模型 (16-bit 整數)
+ Comment=Color model for 8-bit integer per channel YCbCr images
++Comment[bg]=Цветови модел за 16 битови YCbCr изображения
+ Comment[ca]=Model de color d'enters de 16 bits per a canal d'imatges YCbCr
+ Comment[da]=Farvemodel for 8-bit heltal pr kanal YCbCr-billeder
+ Comment[de]=Farbmodell für 8-bit pro Kanal YCbCr-Bilder
+@@ -45,6 +48,7 @@
+ Comment[km]=ម៉ូដែលពណ៌សម្រាប់ចំនួនគត់ 8-bit ក្នុងឆានែលរូបភាព YCbCr
+ Comment[nb]=Fargemodell for YCbCr-bilder med 8 bit heltall per kanal
+ Comment[nds]=Klöörmodell för YCbCr-Biller mit 8-Bit Heeltall pro Kanaal
++Comment[ne]=प्रति वाईसीबीसीआर छविहरूको ८-बिट इन्टिजरका लागि रङ मोडेल
+ Comment[nl]=Kleurmodel voor 8-bit/kanaal van YCbCr-afbeeldingen
+ Comment[pl]=Przestrzeń barw dla obrazków YCbCr z 8-bitowymi liczbami całkowitymi na kanał
+ Comment[pt]=Modelo de cor para imagens YCbCr com 8 bits por canal
+--- krita/ui/kis_filter_manager.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/ui/kis_filter_manager.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -81,7 +81,6 @@
+ QSignalMapper * m_filterMapper;
+
+ QDict<KActionMenu> m_filterActionMenus;
+- QTimer m_delayer;
+ };
+
+ #endif
+--- krita/ui/kis_previewwidget.cc (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/ui/kis_previewwidget.cc (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,6 +4,7 @@
+ * Copyright (c) 2001 John Califf <jwcaliff at compuzone.net>
+ * Copyright (c) 2004 Bart Coppens <kde at bartcoppens.be>
+ * Copyright (c) 2005 Cyrille Berger <cberger at cberger.net>
++ * Copyright (c) 2007 Ben Schleimer <bensch128 at yahoo.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -31,6 +32,7 @@
+ #include <qcolor.h>
+ #include <qgroupbox.h>
+ #include <qcursor.h>
++#include <qtimer.h>
+
+ #include <kdebug.h>
+ #include <kiconloader.h>
+@@ -44,22 +46,45 @@
+ #include <kis_global.h>
+ #include <kis_image.h>
+ #include <kis_layer.h>
++#include <kis_paint_layer.h>
++#include <kis_group_layer.h>
+ #include <kis_meta_registry.h>
+ #include <kis_painter.h>
+ #include <kis_profile.h>
+ #include <kis_types.h>
+ #include <kis_undo_adapter.h>
++#include <kis_label_progress.h>
++#include <kis_selection.h>
++#include <kis_transform_worker.h>
+
+ #include "kis_previewwidgetbase.h"
+ #include "kis_previewwidget.h"
+ #include "imageviewer.h"
+
++static const int ZOOM_PAUSE = 100;
++static const int FILTER_PAUSE = 500;
++static const double ZOOM_FACTOR = 1.1;
++
+ KisPreviewWidget::KisPreviewWidget( QWidget* parent, const char* name )
+- : PreviewWidgetBase( parent, name )/*, m_image(0)*/
++ : PreviewWidgetBase( parent, name )
++ , m_autoupdate(true)
++ , m_previewIsDisplayed(true)
++ , m_scaledOriginal()
++ , m_dirtyOriginal(true)
++ , m_origDevice(new KisPaintDevice(KisMetaRegistry::instance()->csRegistry()->getRGB8(), "temp"))
++ , m_scaledPreview()
++ , m_dirtyPreview(true)
++ , m_previewDevice(new KisPaintDevice(KisMetaRegistry::instance()->csRegistry()->getRGB8(), "temp"))
++ , m_scaledImage(NULL)
++ , m_filterZoom(1.0)
++ , m_zoom(-1.0)
++ , m_profile(NULL)
++ , m_progress( 0 )
++ , m_zoomTimer(new QTimer(this))
++ , m_filterTimer(new QTimer(this))
++ , m_firstFilter(true)
++ , m_firstZoom(true)
+ {
+- m_autoupdate = true;
+- m_previewIsDisplayed = true;
+-
+ btnZoomIn->setIconSet(KGlobal::instance()->iconLoader()->loadIconSet( "viewmag+", KIcon::MainToolbar, 16 ));
+ connect(btnZoomIn, SIGNAL(clicked()), this, SLOT(zoomIn()));
+ btnZoomOut->setIconSet(KGlobal::instance()->iconLoader()->loadIconSet( "viewmag-", KIcon::MainToolbar, 16 ));
+@@ -73,7 +98,14 @@
+ btnZoomOneToOne->setIconSet(KGlobal::instance()->iconLoader()->loadIconSet( "viewmag1", KIcon::MainToolbar, 16 ));
+ connect(btnZoomOneToOne, SIGNAL(clicked()), this, SLOT(zoomOneToOne()));
+
++ m_progress = new KisLabelProgress(frmProgress);
++ m_progress->setMaximumHeight(fontMetrics().height() );
++ QVBoxLayout *vbox = new QVBoxLayout( frmProgress );
++ vbox->addWidget(m_progress);
++ m_progress->hide();
+
++ connect(m_zoomTimer, SIGNAL(timeout()), this, SLOT(updateZoom()));
++ connect(m_filterTimer, SIGNAL(timeout()), this, SLOT(runFilterHelper()));
+
+ /* kToolBar1->insertLineSeparator();
+ kToolBar1->insertButton("reload",2, true, i18n("Update"));
+@@ -89,9 +121,10 @@
+ // kToolBar1->insertButton("",5, true, i18n("Popup Original and Preview"));
+ }
+
++KisPreviewWidget::~KisPreviewWidget() { }
++
+ void KisPreviewWidget::forceUpdate()
+ {
+- if (!m_origDevice) return;
+ if(m_previewIsDisplayed)
+ {
+ m_groupBox->setTitle(m_origDevice->name());
+@@ -106,6 +139,8 @@
+ if (!dev) return;
+
+ m_origDevice = dev;
++ m_previewDevice = dev;
++ m_filterZoom = 1.0;
+
+ KisConfig cfg;
+ QString monitorProfileName = cfg.monitorProfile();
+@@ -116,31 +151,43 @@
+ m_groupBox->setTitle(i18n("Preview: ") + dev->name());
+ m_previewIsDisplayed = true;
+
+- m_zoom = (double)m_preview->width() / (double)r.width();
+- zoomChanged();
++ m_zoom = -1.0;
++ zoomChanged(double(m_preview->width()) / double(r.width()) );
+ }
+
+-
+-KisPaintDeviceSP KisPreviewWidget::getDevice()
++void KisPreviewWidget::updateZoom()
+ {
+- return m_previewDevice;
+-}
++ QApplication::setOverrideCursor(KisCursor::waitCursor());
+
+-void KisPreviewWidget::slotUpdate()
+-{
+- QRect r = m_previewDevice->exactBounds();
+- m_scaledPreview = m_previewDevice->convertToQImage(m_profile, 0, 0, r.width(), r.height());
+- if(m_zoom > 1.0)
+- {
+- int w, h;
+- w = (int) ceil(r.width() * m_zoom );
+- h = (int) ceil(r.height() * m_zoom );
+- m_scaledPreview = m_scaledPreview.smoothScale (w,h, QImage::ScaleMax);
+- }
+ if(m_previewIsDisplayed)
+ {
++ if(m_dirtyPreview)
++ {
++ QSize r = m_previewDevice->extent().size();
++ int w = r.width(), h = r.height();
++ int sw = int(ceil(m_zoom * w / m_filterZoom));
++ int sh = int(ceil(m_zoom * h / m_filterZoom));
++ m_dirtyPreview = false;
++ m_scaledPreview = m_previewDevice->convertToQImage(m_profile, 0, 0, w, h);
++ m_scaledPreview = m_scaledPreview.scale(sw,sh, QImage::ScaleMax); // Use scale instead of smoothScale for speed up
++ }
+ m_preview->setImage(m_scaledPreview);
++ } else
++ {
++ if(m_dirtyOriginal)
++ {
++ QSize r = m_origDevice->extent().size();
++ int w = r.width(), h = r.height();
++ int sw = int(ceil(m_zoom * w));
++ int sh = int(ceil(m_zoom * h));
++ m_dirtyOriginal = false;
++ m_scaledOriginal = m_origDevice->convertToQImage(m_profile, 0, 0, w, h);
++ m_scaledOriginal = m_scaledOriginal.scale(sw,sh, QImage::ScaleMax); // Use scale instead of smoothScale for speed up
++ }
++ m_preview->setImage(m_scaledOriginal);
+ }
++
++ QApplication::restoreOverrideCursor();
+ }
+
+ void KisPreviewWidget::slotSetAutoUpdate(bool set) {
+@@ -149,27 +196,26 @@
+
+ void KisPreviewWidget::wheelEvent(QWheelEvent * e)
+ {
+- if (e->delta() > 0)
++ if (e->delta() > 0) {
+ zoomIn();
+- else
++ } else {
+ zoomOut();
++ }
+ e->accept();
+ }
+
+ void KisPreviewWidget::setPreviewDisplayed(bool v)
+ {
+- if (!m_origDevice) return;
+- if (!m_preview) return;
+- if (m_scaledPreview == 0) return;
+-
+- m_previewIsDisplayed = v;
+- if(m_previewIsDisplayed)
++ if(v != m_previewIsDisplayed)
+ {
+- m_groupBox->setTitle(i18n("Preview: ") + m_origDevice->name());
+- m_preview->setImage(m_scaledPreview);
+- } else {
+- m_groupBox->setTitle(i18n("Original: ") + m_origDevice->name());
+- m_preview->setImage(m_scaledOriginal);
++ m_previewIsDisplayed = v;
++ if(m_previewIsDisplayed) {
++ m_groupBox->setTitle(i18n("Preview: ") + m_origDevice->name());
++ } else {
++ m_groupBox->setTitle(i18n("Original: ") + m_origDevice->name());
++ }
++ // Call directly without any pause because there is no scaling
++ updateZoom();
+ }
+ }
+
+@@ -183,64 +229,181 @@
+ return m_autoupdate;
+ }
+
+-bool KisPreviewWidget::zoomChanged()
++void KisPreviewWidget::zoomChanged(const double zoom)
+ {
+- QApplication::setOverrideCursor(KisCursor::waitCursor());
+- if (!m_origDevice) return false;
++ // constrain the zoom
++ double tZoom = zoom;
++ if(zoom <= 1./8.) { tZoom = 1./8.; }
++ if(zoom > 8.) { tZoom = 8.; }
+
+- QRect r = m_origDevice->exactBounds();
+- int w = (int) ceil(r.width() * m_zoom );
+- int h = (int) ceil(r.height() * m_zoom );
++ if(tZoom != m_zoom)
++ {
++ m_zoom = tZoom;
++ m_dirtyOriginal = true;
++ m_dirtyPreview = true;
+
+- if( w == 0 || h == 0 )
+- return false;
++ if(m_firstZoom) {
++ m_firstZoom = false;
++ updateZoom();
++ } else {
++ m_zoomTimer->start(ZOOM_PAUSE, true);
++ }
++ }
++}
+
+- if(m_zoom < 1.0) // if m_zoom > 1.0, we will scale after applying the filter
+- {
+- m_previewDevice = m_origDevice->createThumbnailDevice(w, h);
++void KisPreviewWidget::zoomIn() {
++ zoomChanged(m_zoom * ZOOM_FACTOR);
++}
++
++void KisPreviewWidget::zoomOut() {
++ zoomChanged(m_zoom / ZOOM_FACTOR);
++}
++
++void KisPreviewWidget::zoomOneToOne() {
++ zoomChanged(1.0);
++}
++
++static inline void cropDevice(KisPaintDevice * device, const double & zoom) {
++ QRect r = device->exactBounds();
++ r.setX(int(zoom * r.x()) );
++ r.setY(int(zoom * r.y()) );
++ r.setWidth(int(zoom * r.width()) );
++ r.setHeight(int(zoom * r.height()) );
++ device->crop(r);
++}
++
++class MyCropVisitor : public KisLayerVisitor {
++ const double m_zoom;
++
++public:
++ MyCropVisitor(const double & z) : m_zoom(z) { }
++ virtual ~MyCropVisitor() { }
++
++ virtual bool visit(KisPaintLayer *layer) {
++ KisPaintDeviceSP device = layer->paintDevice();
++ ::cropDevice(device.data(), m_zoom);
++ // Make sure we have a tight fit for the selection
++ if(device->hasSelection()) {
++ ::cropDevice(device->selection().data(), m_zoom);
++ }
++
++ return true;
+ }
+- else {
+- m_previewDevice = new KisPaintDevice( *m_origDevice );
++ virtual bool visit(KisGroupLayer *layer) {
++ for(KisLayerSP l = layer->firstChild(); l; l = l->nextSibling()) {
++ l->accept(*this);
++ }
++ return true;
+ }
++ virtual bool visit(KisPartLayer *) { return true; }
++ virtual bool visit(KisAdjustmentLayer *) { return true; }
++};
++
++void KisPreviewWidget::runFilter(KisFilter * filter, KisFilterConfiguration * config) {
++ if(!filter) return;
++ if(!config) return;
++
++ m_filter = filter;
++ m_config = config;
++
++ if(m_firstFilter) {
++ m_firstFilter = false;
++ runFilterHelper();
++ } else {
++ m_filterTimer->start(FILTER_PAUSE, true);
++ }
++}
++
++/**
++ * XXX: Fix the situations which m_origDevice is NOT associated with a image.
++ * If it comes from a adjustment layer or projection or thumbnail. Currently, nothing happens
++ */
++void KisPreviewWidget::runFilterHelper() {
+
+- m_scaledOriginal = m_previewDevice->convertToQImage(m_profile, 0, 0, w, h);
++ m_filterZoom = m_zoom;
++ // Dont scale more then 1.0 so we don't waste time in preview widget for large scaling.
++ if(m_filterZoom > 1.0) {
++ m_filterZoom = 1.0;
++ }
+
++ KisPaintDeviceSP scaledDevice;
++ KisHermiteFilterStrategy strategy;
+
+- if(!m_previewIsDisplayed)
++ // Copy the image and scale
++ if (m_origDevice->image())
+ {
+- m_preview->setImage(m_scaledOriginal);
++ m_scaledImage = new KisImage(*m_origDevice->image());
++ if(!m_origDevice->parentLayer()) return;
++ QString layerName = m_origDevice->parentLayer()->name();
++ KisPaintLayerSP pl = ::qt_cast<KisPaintLayer*>(m_scaledImage->findLayer(layerName));
++ if(!pl) return;
++ scaledDevice = pl->paintDevice();
++
++ KisSelectionSP select;
++ if(scaledDevice->hasSelection())
++ {
++ select = new KisSelection(*scaledDevice->selection());
++ scaledDevice->deselect();
++ }
++ // Scale
++ m_scaledImage->setUndoAdapter(NULL);
++ m_scaledImage->scale(m_filterZoom, m_filterZoom, NULL, &strategy);
++ // Scale the selection
++ if(select)
++ {
++ KisPaintDeviceSP t = select.data();
++ KisTransformWorker tw(t, m_filterZoom, m_filterZoom,
++ 0.0, 0.0, 0.0, 0, 0, NULL, &strategy);
++ tw.run();
++ scaledDevice->setSelection(select);
++ select->setParentLayer(scaledDevice->parentLayer());
++ }
++
++ // Crop by the zoom value instead of cropping by rectangle. It gives better results
++ MyCropVisitor v(m_filterZoom);
++ m_scaledImage->rootLayer()->accept(v);
++ } else
++ {
++ scaledDevice = new KisPaintDevice(*m_origDevice);
++ KisSelectionSP select;
++ if(scaledDevice->hasSelection())
++ {
++ select = new KisSelection(*scaledDevice->selection());
++ scaledDevice->deselect();
++ }
++ KisTransformWorker tw(scaledDevice, m_filterZoom, m_filterZoom,
++ 0.0, 0.0, 0.0, 0, 0, NULL, &strategy);
++ tw.run();
++ // Scale the selection
++ if(select)
++ {
++ KisPaintDeviceSP t = select.data();
++ KisTransformWorker tw(t, m_filterZoom, m_filterZoom,
++ 0.0, 0.0, 0.0, 0, 0, NULL, &strategy);
++ tw.run();
++ scaledDevice->setSelection(select);
++ ::cropDevice(select.data(), m_filterZoom);
++ }
++ ::cropDevice(scaledDevice.data(), m_filterZoom);
+ }
+-
+- emit updated();
+
+- QApplication::restoreOverrideCursor();
++ m_previewDevice = new KisPaintDevice(*scaledDevice);
+
+- return true;
+-}
++ // Setup the progress display
++ m_filter->enableProgress();
++ m_progress->setSubject(m_filter, true, true);
++ m_filter->setProgressDisplay(m_progress);
++ m_filter->process(scaledDevice, m_previewDevice, m_config, scaledDevice->exactBounds());
++ m_filter->disableProgress();
+
+-void KisPreviewWidget::zoomIn() {
+- double oldZoom = m_zoom;
+- if (m_zoom > 0 && m_zoom * 1.5 < 8) {
+- m_zoom = m_zoom * 1.5;
+- if( !zoomChanged() )
+- m_zoom = oldZoom;
++ m_dirtyPreview = true;
++
++ if(m_firstZoom) {
++ m_firstZoom = false;
++ updateZoom();
++ } else {
++ m_zoomTimer->start(ZOOM_PAUSE, true);
+ }
+ }
+
+-void KisPreviewWidget::zoomOut() {
+- double oldZoom = m_zoom;
+- if (m_zoom > 0 && m_zoom / 1.5 > 1/8) {
+- m_zoom = m_zoom / 1.5;
+- if( !zoomChanged() )
+- m_zoom = oldZoom;
+- }
+-}
+-
+-void KisPreviewWidget::zoomOneToOne() {
+- double oldZoom = m_zoom;
+- m_zoom = 1;
+- if( !zoomChanged() ) m_zoom = oldZoom;
+-}
+-
+-
+ #include "kis_previewwidget.moc"
+--- krita/ui/kis_previewwidget.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/ui/kis_previewwidget.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,6 +4,7 @@
+ * Copyright (c) 2001 John Califf <jcaliff at compuzone.net>
+ * Copyright (c) 2004 Bart Coppens <kde at bartcoppens.be>
+ * Copyright (c) 2005 Cyrille Berger <cberger at cberger.net>
++ * Copyright (c) 2007 Benjamin Schleimer <bensch128 at yahoo.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -31,6 +32,11 @@
+
+ class QWidget;
+ class KisProfile;
++class KisFilter;
++class KisFilterConfiguration;
++class QTimer;
++class KisLabelProgress;
++
+ /**
+ * A widget that can be used by plugins to show a preview of the effect of the
+ * plugin to the user. This is a convenience class thand handily packs a source and a
+@@ -46,25 +52,26 @@
+ public:
+ /** Constructs the widget */
+ KisPreviewWidget( QWidget* parent = 0, const char* name = 0 );
++ virtual ~KisPreviewWidget();
+
+- /** @return the scaled down copy of the layer, so the dialog can apply its effect on it. */
+- KisPaintDeviceSP getDevice();
+-
+ /** returns if the preview is automatically updated */
+ bool getAutoUpdate() const;
+
+ void wheelEvent(QWheelEvent * e);
+-
++
++ /** Instructs the KisPreviewWidget to eventually update the preview.
++ * KisPreviewWidget delays the actual running of the filter for 500ms
++ * so if the user is changing a configuration setting, it won't run multiple time.
++ * @param filter to run on the image
++ * @config to use when filtering.
++ */
++ void runFilter(KisFilter * filter, KisFilterConfiguration * config);
++
+ public slots:
+
+ /** Sets the preview to use the layer specified as argument */
+ void slotSetDevice(KisPaintDeviceSP dev);
+
+- /**
+- * Call this when the effect has finished updating the layer. Makes the preview
+- * repaint itself. */
+- void slotUpdate();
+-
+ /** Enables or disables the automatically updating of the preview */
+ void slotSetAutoUpdate(bool set);
+
+@@ -84,22 +91,50 @@
+ void zoomOut();
+ void zoomOneToOne();
+
++ /**
++ * Called when the "Force Update" button is clicked
++ */
+ void forceUpdate();
+-
++
++ /**
++ * Updates the zoom and redisplays either the original or the preview (filtered) image
++ */
++ void updateZoom();
++
++ /** Internal method which actually runs the filter
++ */
++ void runFilterHelper();
++
+ private:
++ /**
++ * Recalculates the zoom factor
++ */
++ void zoomChanged(const double zoom);
+
+- bool zoomChanged();
+-
+- bool m_autoupdate, m_previewIsDisplayed;
++ bool m_autoupdate; /// Flag indicating that the widget should auto update whenever a setting is changed
++ bool m_previewIsDisplayed; /// Flag indicating whether the filtered or original image is displayed
+
+- QImage m_scaledOriginal;
+- QImage m_scaledPreview;
+- KisPaintDeviceSP m_previewDevice;
++ QImage m_scaledOriginal; /// QImage copy of the original image
++ bool m_dirtyOriginal; /// flag indicating that the original image is dirty
++ KisPaintDeviceSP m_origDevice; /// Pointer to the original image
+
+- double m_zoom;
+- KisProfile * m_profile;
++ QImage m_scaledPreview; /// QImage copy of the filtered image
++ bool m_dirtyPreview; /// flag indicating that the preview image is dirty
++ KisPaintDeviceSP m_previewDevice; /// Pointer to the preview image
++ KisImageSP m_scaledImage; /// Scaled image copied from the original
+
+- KisPaintDeviceSP m_origDevice;
++ double m_filterZoom; /// Zoom amount when the filtering occurred
++ double m_zoom; /// Current zoom amount
++ KisProfile * m_profile; /// the color profile to use when converting to QImage
++
++ KisLabelProgress *m_progress; /// Progress bar of the preview.
++
++ QTimer * m_zoomTimer; /// Timer used to update the view whenever the zoom changes
++ QTimer * m_filterTimer; /// Timer used to update the view whenever the filter changes
++ KisFilter * m_filter; /// Filter used
++ KisFilterConfiguration * m_config; /// Configuration used
++ bool m_firstFilter; /// Flag to determine if we should delay the first filter or not
++ bool m_firstZoom; /// Flag to determine if we should delay the first zoom or not
+ };
+
+ #endif
+--- krita/ui/kis_filter_manager.cc (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/ui/kis_filter_manager.cc (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,6 @@
+ /*
+ * Copyright (c) 2005 Boudewijn Rempt <boud at valdyas.org>
++ * Copyright (c) 2007 Benjamin Schleimer <bensch128 at yahoo.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -24,6 +25,7 @@
+ #include <kmessagebox.h>
+ #include <kguiitem.h>
+
++#include <kis_cursor.h>
+ #include "kaction.h"
+
+ #include "kis_part_layer.h"
+@@ -55,7 +57,6 @@
+ : m_view(view),
+ m_doc(doc)
+ {
+- connect(&m_delayer, SIGNAL(timeout()), this, SLOT(refreshPreview()));
+ // XXX: Store & restore last filter & last filter configuration in session settings
+ m_reapplyAction = 0;
+ m_lastFilterConfig = 0;
+@@ -242,7 +243,7 @@
+ KisPaintDeviceSP dev = img->activeDevice();
+ if (!dev) return false;
+
+- QApplication::setOverrideCursor( Qt::waitCursor );
++ QApplication::setOverrideCursor( KisCursor::waitCursor() );
+
+ //Apply the filter
+ m_lastFilterConfig = m_lastFilter->configuration(m_lastWidget);
+@@ -275,22 +276,22 @@
+ else
+ m_reapplyAction->setText(i18n("Apply Filter Again"));
+
++ m_lastFilter->disableProgress();
++ QApplication::restoreOverrideCursor();
++
++
+ if (m_lastFilter->cancelRequested()) {
+ delete m_lastFilterConfig;
+ if (cmd) {
+ cmd->unexecute();
+ delete cmd;
+ }
+- m_lastFilter->disableProgress();
+- QApplication::restoreOverrideCursor();
+ return false;
+
+ } else {
+ if (dev->parentLayer()) dev->parentLayer()->setDirty(rect);
+ m_doc->setModified(true);
+ if (img->undo() && cmd) img->undoAdapter()->addCommand(cmd);
+- m_lastFilter->disableProgress();
+- QApplication::restoreOverrideCursor();
+ return true;
+ }
+ }
+@@ -344,6 +345,7 @@
+ Q_CHECK_PTR(m_lastDialog);
+ m_lastWidget = m_lastFilter->createConfigurationWidget( (QWidget*)m_lastDialog->container(), dev );
+
++ bool accepted = true;
+
+ if( m_lastWidget != 0)
+ {
+@@ -363,16 +365,14 @@
+
+ if(m_lastDialog->exec() == QDialog::Rejected )
+ {
+- delete m_lastDialog;
+- m_lastFilterConfig = oldConfig;
+- m_lastDialog = oldDialog;
+- m_lastFilter = oldFilter;
+- return;
++ accepted = false;
+ }
+ }
+
+- if (!apply()) {
+- delete m_lastDialog;
++ delete m_lastDialog;
++
++ if (!accepted || !apply()) {
++ // Override the old configuration
+ m_lastFilterConfig = oldConfig;
+ m_lastDialog = oldDialog;
+ m_lastFilter = oldFilter;
+@@ -386,8 +386,7 @@
+ return;
+ if(m_lastDialog->previewWidget()->getAutoUpdate())
+ {
+-// refreshPreview();
+- m_delayer.start(1000, true);
++ refreshPreview();
+ } else {
+ m_lastDialog->previewWidget()->needUpdate();
+ }
+@@ -396,19 +395,12 @@
+
+ void KisFilterManager::refreshPreview( )
+ {
+- if( m_lastDialog == 0 )
+- return;
++ if( m_lastDialog == 0 ) return;
+
+- KisPaintDeviceSP dev = m_lastDialog->previewWidget()->getDevice();
+- if (!dev) return;
+-
+ KisFilterConfiguration* config = m_lastFilter->configuration(m_lastWidget);
+
+- QRect rect = dev->extent();
+- KisTransaction cmd("Temporary transaction", dev);
+- m_lastFilter->process(dev, dev, config, rect);
+- m_lastDialog->previewWidget()->slotUpdate();
+- cmd.unexecute();
++ // The preview widget is in charge of running the filter so it can optimize the performance
++ m_lastDialog->previewWidget()->runFilter(m_lastFilter, config);
+ }
+
+
+--- krita/ui/kis_dlg_adjustment_layer.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/ui/kis_dlg_adjustment_layer.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,6 @@
+ /*
+ * Copyright (c) 2006 Boudewijn Rempt <boud at valdyas.org>
++ * Copyright (c) 2007 Benjamin Schleimer <bensch128 at yahoo.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+--- krita/ui/kis_dlg_adj_layer_props.cc (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/ui/kis_dlg_adj_layer_props.cc (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,6 @@
+ /*
+ * Copyright (c) 2006 Boudewijn Rempt <boud at valdyas.org>
++ * Copyright (c) 2007 Benjamin Schleimer <bensch128 at yahoo.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -122,7 +123,6 @@
+
+ refreshPreview();
+ enableButtonOK( !m_layerName->text().isEmpty() );
+-
+ }
+
+ void KisDlgAdjLayerProps::slotNameChanged( const QString & text )
+@@ -157,22 +157,12 @@
+ return;
+ }
+
+- KisPaintDeviceSP layer = m_preview->getDevice();
+-
+- if (!layer) {
+- return;
+- }
+-
+ if (!m_currentFilter) {
+ return;
+ }
+ KisFilterConfiguration* config = m_currentFilter->configuration(m_currentConfigWidget);
+
+- QRect rect = layer->extent();
+- KisTransaction cmd("Temporary transaction", layer.data());
+- m_currentFilter->process(layer.data(), layer.data(), config, rect);
+- m_preview->slotUpdate();
+- cmd.unexecute();
++ m_preview->runFilter(m_currentFilter, config);
+ }
+
+ #include "kis_dlg_adj_layer_props.moc"
+--- krita/ui/kis_previewwidgetbase.ui (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/ui/kis_previewwidgetbase.ui (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -26,14 +26,14 @@
+ <height>0</height>
+ </size>
+ </property>
+- <grid>
++ <vbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <property name="margin">
+ <number>0</number>
+ </property>
+- <widget class="QGroupBox" row="0" column="0">
++ <widget class="QGroupBox">
+ <property name="name">
+ <cstring>m_groupBox</cstring>
+ </property>
+@@ -71,9 +71,9 @@
+ </widget>
+ </vbox>
+ </widget>
+- <widget class="QLayoutWidget" row="1" column="0">
++ <widget class="QLayoutWidget">
+ <property name="name">
+- <cstring>layout10</cstring>
++ <cstring>layout4</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+@@ -210,26 +210,20 @@
+ </widget>
+ </vbox>
+ </widget>
+- <spacer>
++ <widget class="QFrame">
+ <property name="name">
+- <cstring>spacer1</cstring>
++ <cstring>frmProgress</cstring>
+ </property>
+- <property name="orientation">
+- <enum>Horizontal</enum>
++ <property name="frameShape">
++ <enum>NoFrame</enum>
+ </property>
+- <property name="sizeType">
+- <enum>Expanding</enum>
++ <property name="frameShadow">
++ <enum>Raised</enum>
+ </property>
+- <property name="sizeHint">
+- <size>
+- <width>16</width>
+- <height>20</height>
+- </size>
+- </property>
+- </spacer>
++ </widget>
+ </hbox>
+ </widget>
+- </grid>
++ </vbox>
+ </widget>
+ <customwidgets>
+ <customwidget>
+--- krita/ui/kis_dlg_adj_layer_props.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/ui/kis_dlg_adj_layer_props.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,6 @@
+ /*
+ * Copyright (c) 2006 Boudewijn Rempt <boud at valdyas.org>
++ * Copyright (c) 2007 Benjamin Schleimer <bensch128 at yahoo.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+--- krita/ui/kis_dlg_adjustment_layer.cc (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ krita/ui/kis_dlg_adjustment_layer.cc (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,6 @@
+ /*
+ * Copyright (c) 2006 Boudewijn Rempt <boud at valdyas.org>
++ * Copyright (c) 2007 Benjamin Schleimer <bensch128 at yahoo.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -142,15 +143,9 @@
+
+ void KisDlgAdjustmentLayer::refreshPreview()
+ {
+- KisPaintDeviceSP layer = m_preview->getDevice();
+-
+- KisTransaction cmd("Temporary transaction", layer.data());
+ KisFilterConfiguration* config = m_currentFilter->configuration(m_currentConfigWidget);
+
+- QRect rect = layer->extent();
+- m_currentFilter->process(layer.data(), layer.data(), config, rect);
+- m_preview->slotUpdate();
+- cmd.unexecute();
++ m_preview->runFilter(m_currentFilter, config);
+ }
+
+ void KisDlgAdjustmentLayer::selectionHasChanged ( QIconViewItem * item )
+--- kchart/kchartpart.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kchart/kchartpart.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=KOffice Chart Component
++Name[bg]=Компонент за диаграми в KOffice
+ Name[ca]=Component KChart de KOffice
+ Name[cs]=Komponenta grafu KOffice
+ Name[cy]=Cydran Siart KOffice
+@@ -27,6 +28,7 @@
+ Name[ms]=Komponen Carta KOffice
+ Name[nb]=Diagramkomponent for KOffice
+ Name[nds]=Diagrammkomponent vun KOffice
++Name[ne]=केडीई कार्यालय चित्रपट अवयव
+ Name[nl]=KOffice Grafiek Component
+ Name[nn]=Diagramkomponent for KOffice
+ Name[pl]=Komponent KOffice dla wykresów
+@@ -89,6 +91,7 @@
+ GenericName[mt]=Graff
+ GenericName[nb]=Diagram
+ GenericName[nds]=Diagramm
++GenericName[ne]=चित्रपट
+ GenericName[nl]=Grafiek
+ GenericName[nn]=Diagram
+ GenericName[pl]=Wykres
+--- kchart/kdchart/kdchart_export.h (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kchart/kdchart/kdchart_export.h (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,7 +4,7 @@
+ #include <qglobal.h>
+
+ #if 1
+-#include <../../lib/kofficecore/koffice_export.h>
++#include <koffice_export.h>
+ #else
+
+ #if defined(Q_OS_WIN32) && defined(KDCHART_DLL)
+--- kchart/kchart.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kchart/kchart.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -6,6 +6,7 @@
+ Name[eo]=Diagramilo
+ Name[hi]=के-चार्ट
+ Name[lo]=ແຜນພູມิ K
++Name[ne]=केडीई चित्रपट
+ Name[sv]=Kchart
+ Name[th]=แผนภูมิ K
+ Name[ven]=Tshati ya K
+@@ -45,6 +46,7 @@
+ GenericName[mt]=Graff
+ GenericName[nb]=Diagram
+ GenericName[nds]=Diagramm
++GenericName[ne]=चित्रपट
+ GenericName[nl]=Grafiek
+ GenericName[nn]=Diagram
+ GenericName[pl]=Wykres
+@@ -63,6 +65,7 @@
+ GenericName[xh]=Itshati
+ GenericName[zh_CN]=图表
+ Comment=Create graphics and charts
++Comment[bg]=Създаване на графика и таблици
+ Comment[ca]=Crea un document de gràfics i diagrames
+ Comment[da]=Opret grafik og diagrammer
+ Comment[de]=Graphiken und Diagramme erstellen
+@@ -77,10 +80,11 @@
+ Comment[hu]=Grafikonok és diagramok készítése
+ Comment[it]=Crea grafici
+ Comment[ja]=グラフィックとグラフを作成
+-Comment[km]=បង្កើតក្រាហ្វិក និង គំនូសតាង
++Comment[km]=បង្កើតក្រាហ្វិក និងគំនូសតាង
+ Comment[lv]=Izveido grafikus un diagrammas
+ Comment[nb]=Lag grafer og diagrammer
+ Comment[nds]=Grafiken un Diagrammen opstellen
++Comment[ne]=ग्राफिक्स र चित्रपट सिर्जना गर्नुहोस्
+ Comment[nl]=Grafieken en diagrammen maken
+ Comment[pl]=Tworzy grafikę oraz wykresy
+ Comment[pt]=Criar imagens e gráficos
+--- kchart/templates/.directory (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kchart/templates/.directory (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Name=Charts
++Name[bg]=Диаграми
+ Name[ca]=Diagrames
+ Name[da]=Diagrammer
+ Name[de]=Diagramme
+@@ -20,6 +21,7 @@
+ Name[lv]=Diagrammas
+ Name[nb]=Diagrammer
+ Name[nds]=Diagrammen
++Name[ne]=चित्रपटहरू
+ Name[nl]=Diagrammen
+ Name[pl]=Wykresy
+ Name[pt]=Gráficos
+--- kchart/templates/Empty.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kchart/templates/Empty.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -36,6 +36,7 @@
+ Name[mt]=Folja vojta
+ Name[nb]=Tomt arbeidsark
+ Name[nds]=Leddig Arbeitblatt
++Name[ne]=खाली कार्यपाना
+ Name[nl]=Leeg werkblad
+ Name[nn]=Tomt arbeidsark
+ Name[pl]=Pusty arkusz
+--- kchart/templates/BarChart.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kchart/templates/BarChart.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Link
+ URL=.source/BarChart.chrt
+ Name=Bar Chart
++Name[bg]=Лентова диаграма
+ Name[ca]=Diagrama de barres
+ Name[cs]=Sloupcový graf
+ Name[cy]=Siart Bar
+@@ -28,6 +29,7 @@
+ Name[ms]=Carta Bar
+ Name[nb]=Stolpediagram
+ Name[nds]=Balkendiagramm
++Name[ne]=पट्टी चित्रपट
+ Name[nl]=Balkgrafiek
+ Name[nn]=Stolpediagram
+ Name[pl]=Wykres słupkowy
+@@ -45,11 +47,12 @@
+ Name[zh_CN]=条形图
+ Name[zh_TW]=長條圖
+ Comment=An example of a bar chart
++Comment[bg]=Пример за лентова диаграма
+ Comment[ca]=Un exemple de diagrama de barres
+ Comment[cy]=Enghraifft o siart bar
+ Comment[da]=Et eksempel på et bjælkediagram
+ Comment[de]=Beispiel für ein Balkendiagramm.
+-Comment[el]=Ένα παράδειγμα ραβδογράμματος.
++Comment[el]=Ένα παράδειγμα ραβδογράμματος
+ Comment[es]=Un ejemplo de una gráfica de barras
+ Comment[et]=Näidistulpdiagramm
+ Comment[fa]=نمونهای از یک نمودار میله
+@@ -66,6 +69,7 @@
+ Comment[lv]=Stabiņveida diagrammas piemērs
+ Comment[nb]=Et eksempel på et stolpediagram
+ Comment[nds]=Bispeel för en Balkendiagramm.
++Comment[ne]=पट्टी चित्रपटको एउटा उदाहरण
+ Comment[nl]=Een voorbeeld van een balkgrafiek
+ Comment[pl]=Przykład wykresu słupkowego
+ Comment[pt]=Um exemplo de um gráfico de barras
+--- mimetypes/kde33/vnd.oasis.opendocument.formula.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ mimetypes/kde33/vnd.oasis.opendocument.formula.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -32,6 +32,7 @@
+ Comment[ms]=Formula Dokumen Terbuka OASIS
+ Comment[nb]=OASIS OpenDocument-formel
+ Comment[nds]=OpenDocument-Formel för OASIS
++Comment[ne]=OASIS खुला कागजात सूत्र
+ Comment[nl]=OASIS OpenDocument-formule
+ Comment[nn]=OASIS OpenDocument-formel
+ Comment[pl]=Wyrażenie matematyczne w formacie OASIS OpenDocument
+--- mimetypes/kde33/vnd.oasis.opendocument.spreadsheet.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ mimetypes/kde33/vnd.oasis.opendocument.spreadsheet.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -32,6 +32,7 @@
+ Comment[ms]=Hamparan Dokumen Terbuka OASIS
+ Comment[nb]=OASIS OpenDocument-regneark
+ Comment[nds]=OpenDocument-Tabellenutreken för OASIS
++Comment[ne]=OASIS खुला कागजात स्प्रिडसिट
+ Comment[nl]=OASIS OpenDocument Werkblad
+ Comment[nn]=OASIS OpenDocument-rekneark
+ Comment[pl]=Arkusz kalkulacyjny w formacie OASIS OpenDocument
+--- mimetypes/kde33/vnd.oasis.opendocument.graphics-template.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ mimetypes/kde33/vnd.oasis.opendocument.graphics-template.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -25,13 +25,14 @@
+ Comment[hu]=OASIS OpenDocument grafikai sablon
+ Comment[is]=OASIS OpenDocument grafíksnið
+ Comment[it]=Modello di grafica OpenDocument OASIS
+-Comment[ja]=OASIS OpenDocument 図形描画 テンプレート
++Comment[ja]=OASIS OpenDocument 図形描画テンプレート
+ Comment[km]=ពុម្ពក្រាហ្វិក OpenDocument របស់ OASIS
+ Comment[lt]=OASIS OpenDocument grafikos šablonas
+ Comment[lv]=OASIS OpenDocument grafikas sagatave
+ Comment[ms]=Templat Grafik Dokumen Terbuka OASIS
+ Comment[nb]=OASIS OpenDocument-tegningsmal
+ Comment[nds]=OpenDocument-Grafikvörlaag för OASIS
++Comment[ne]=OASIS खुला कागजात ग्राफिक्स टेम्प्लेट
+ Comment[nl]=OASIS OpenDocument illustratiesjabloon
+ Comment[nn]=OASIS OpenDocument-teikningsmal
+ Comment[pl]=Szablon graficzny w formacie OASIS OpenDocument
+--- mimetypes/kde33/vnd.oasis.opendocument.presentation.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ mimetypes/kde33/vnd.oasis.opendocument.presentation.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -32,6 +32,7 @@
+ Comment[ms]=Persembahan Dokumen Terbuka OASIS
+ Comment[nb]=OASIS OpenDocument-presentasjon
+ Comment[nds]=OpenDocument-Presentatschoon för OASIS
++Comment[ne]=OASIS खुला कागजात प्रस्तुतिकरण
+ Comment[nl]=OASIS OpenDocument Presentatie
+ Comment[nn]=OASIS OpenDocument-presentasjon
+ Comment[pl]=Prezentacja w formacie OASIS OpenDocument
+--- mimetypes/kde33/vnd.oasis.opendocument.text-template.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ mimetypes/kde33/vnd.oasis.opendocument.text-template.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -25,13 +25,14 @@
+ Comment[hu]=OASIS OpenDocument szövegsablon
+ Comment[is]=OASIS OpenDocument textasnið
+ Comment[it]=Modello di testo OpenDocument OASIS
+-Comment[ja]=OASIS OpenDocument テキスト テンプレート
++Comment[ja]=OASIS OpenDocument テキストテンプレート
+ Comment[km]=ពុម្ពអត្ថបទ OpenDocument របស់ OASIS
+ Comment[lt]=OASIS OpenDocument teksto dokumento šablonas
+ Comment[lv]=OASIS OpenDocument teksta sagatave
+ Comment[ms]=Templat Teks Dokumen Terbuka OASIS
+ Comment[nb]=OASIS OpenDocument-tekstmal
+ Comment[nds]=OpenDocument-Textvörlaag för OASIS
++Comment[ne]=OASIS खुला कागजात पाठ टेम्प्लेट
+ Comment[nl]=OpenOffice.org Tekstsjabloon
+ Comment[nn]=OASIS OpenDocument-tekstmal
+ Comment[pl]=Szablon tekstowy w formacie OASIS OpenDocument
+--- mimetypes/kde33/vnd.oasis.opendocument.graphics.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ mimetypes/kde33/vnd.oasis.opendocument.graphics.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -32,6 +32,7 @@
+ Comment[ms]=Grafik Dokumen Terbuka OASIS
+ Comment[nb]=OASIS OpenDocument-tegning
+ Comment[nds]=OpenDocument-Grafik för OASIS
++Comment[ne]=OASIS खुला कागजात ग्राफिक्स
+ Comment[nl]=OASIS OpenDocument-illustraties
+ Comment[nn]=OASIS OpenDocument-teikning
+ Comment[pl]=Grafika w formacie OASIS OpenDocument
+--- mimetypes/kde33/vnd.oasis.opendocument.spreadsheet-template.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ mimetypes/kde33/vnd.oasis.opendocument.spreadsheet-template.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -25,13 +25,14 @@
+ Comment[hu]=OASIS OpenDocument munkafüzetsablon
+ Comment[is]=OASIS OpenDocument töflureiknissnið
+ Comment[it]=Modello di foglio di calcolo OpenDocument OASIS
+-Comment[ja]=OASIS OpenDocument 表計算 テンプレート
++Comment[ja]=OASIS OpenDocument 表計算テンプレート
+ Comment[km]=ពុម្ពសៀវភៅបញ្ជី OpenDocument របស់ OASIS
+ Comment[lt]=OASIS OpenDocument elektroninės lentelės šablonas
+ Comment[lv]=OASIS OpenDocument tabullapas sagatave
+ Comment[ms]=Templat Hamparan Dokumen Terbuka OASIS
+ Comment[nb]=OASIS OpenDocument-regnearkmal
+ Comment[nds]=OpenDocument-Tabellenutrekenvörlaag för OASIS
++Comment[ne]=OASIS खुला कागजात स्प्रिडसिट टेम्प्लेट
+ Comment[nl]=OASIS OpenDocument Werkbladsjabloon
+ Comment[nn]=OASIS OpenDocument-reknearkmal
+ Comment[pl]=Szablon arkusza kalkulacyjnego w formacie OASIS OpenDocument
+--- mimetypes/kde33/vnd.oasis.opendocument.chart.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ mimetypes/kde33/vnd.oasis.opendocument.chart.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -31,6 +31,7 @@
+ Comment[ms]=Carta Dokumen Terbuka OASIS
+ Comment[nb]=OASIS OpenDocument-diagram
+ Comment[nds]=OpenDocument-Diagramm för OASIS
++Comment[ne]=OASIS खुला कागजात चित्रपट
+ Comment[nl]=OASIS OpenDocument-grafiek
+ Comment[nn]=OASIS OpenDocument-diagram
+ Comment[pl]=Wykres w formacie OASIS OpenDocument
+--- mimetypes/kde33/vnd.oasis.opendocument.image.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ mimetypes/kde33/vnd.oasis.opendocument.image.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -32,6 +32,7 @@
+ Comment[ms]=Imej Dokumen Terbuka OASIS
+ Comment[nb]=OASIS OpenDocument-bilde
+ Comment[nds]=OpenDocument-Bild för OASIS
++Comment[ne]=OASIS खुला कागजात छवि
+ Comment[nl]=OASIS OpenDocument-afbeelding
+ Comment[nn]=OASIS OpenDocument-bilete
+ Comment[pl]=Obrazek w formacie OASIS OpenDocument
+--- mimetypes/kde33/vnd.oasis.opendocument.presentation-template.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ mimetypes/kde33/vnd.oasis.opendocument.presentation-template.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -25,13 +25,14 @@
+ Comment[hu]=OASIS OpenDocument bemutatósablon
+ Comment[is]=OASIS OpenDocument kynningarsnið
+ Comment[it]=Modello di presentazione OpenDocument OASIS
+-Comment[ja]=OASIS OpenDocument プレゼンテーション テンプレート
++Comment[ja]=OASIS OpenDocument プレゼンテーションテンプレート
+ Comment[km]=ពុម្ពការបង្ហាញ OpenDocument របស់ OASIS
+ Comment[lt]=OASIS OpenDocument pateikčių šablonas
+ Comment[lv]=OASIS OpenDocument prezentācijas sagatave
+ Comment[ms]=Templat Persembahan Dokumen Terbuka OASIS
+ Comment[nb]=OASIS OpenDocument-presentasjonsmal
+ Comment[nds]=OpenDocument-Presentatschoonvörlaag för OASIS
++Comment[ne]=OASIS खुला कागजात प्रस्तुतिकरण टेम्प्लेट
+ Comment[nl]=OASIS OpenDocument Presentatiesjabloon
+ Comment[nn]=OASIS OpenDocument-presentasjonsmal
+ Comment[pl]=Szablon prezentacji w formacie OASIS OpenDocument
+--- mimetypes/kde33/vnd.oasis.opendocument.text.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ mimetypes/kde33/vnd.oasis.opendocument.text.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -32,6 +32,7 @@
+ Comment[ms]=Teks Dokumen Terbuka OASIS
+ Comment[nb]=OASIS OpenDocument-tekst
+ Comment[nds]=OpenDocument-Text för OASIS
++Comment[ne]=OASIS खुला कागजात पाठ
+ Comment[nl]=OASIS OpenDocument Tekst
+ Comment[nn]=OASIS OpenDocument-tekst
+ Comment[pl]=Tekst w formacie OASIS OpenDocument
+--- mimetypes/kde351/x-raw.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ mimetypes/kde351/x-raw.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,6 +5,7 @@
+ Icon=image
+ Patterns=*.raw;*.RAW;*.dcr;*.DCR;*.dng;*.DNG;*.crw;*.CRW;*.cr2,*.CR2;*.nef;*.NEF;*.mrw;*.MRW;
+ Comment=RAW Camera Image
++Comment[bg]=RAW изображение от камера
+ Comment[ca]=Imatge de Càmera RAW
+ Comment[da]=Ubehandlet kamerabillede
+ Comment[de]=Kamera RAW-Bild
+@@ -24,6 +25,7 @@
+ Comment[lv]=RAW kameras attēls
+ Comment[nb]=RAW kamera-bilde
+ Comment[nds]=Kamera Roh-Bild
++Comment[ne]=RAW क्यामेरा छवि
+ Comment[nl]=RAW camera-afbeelding
+ Comment[pl]=Nieobrobione zdjęcie (RAW)
+ Comment[pt]=Imagem RAW da Máquina Fotográfica
+--- kivio/plugins/kivioselecttool/kivioselecttool.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kivio/plugins/kivioselecttool/kivioselecttool.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,6 +5,7 @@
+ Name[af]=Kies gereedskap vir Kivio
+ Name[ar]=أداة انتقاء Kivio
+ Name[az]=Kivio üçün seçim vasitəsi
++Name[bg]=Инструмент за маркиране за Kivio
+ Name[br]=Ostilh dibab evit Kivio
+ Name[bs]=Odaberi alat za kivio
+ Name[ca]=Eina selectora per a Kivio
+@@ -36,6 +37,7 @@
+ Name[mt]=Għodda tal-Għażla għall-Kivio
+ Name[nb]=Merkingsverktøy for Kivio
+ Name[nds]=Utwahlwarktüüch för Kivio
++Name[ne]=किभियोका लागि उपकरण चयन गर्नुहोस्
+ Name[nl]=Selecteergereedschap voor Kivio
+ Name[nn]=Merkingsverktøy for Kivio
+ Name[pl]=Narzędzie zaznaczenia dla Kivio
+--- kivio/plugins/kiviotexttool/kiviotexttool.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kivio/plugins/kiviotexttool/kiviotexttool.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,6 +5,7 @@
+ Name[af]=Teks gereedskap vir Kivio
+ Name[ar]=أداة النّص لدى Kivio
+ Name[az]=Kivio üçün mətn vasitəsi
++Name[bg]=Текстов инструмент за Kivio
+ Name[br]=Ostilh skrid evit Kivio
+ Name[bs]=Tekst alat za Kivio
+ Name[ca]=Eina de text per a Kivio
+@@ -36,6 +37,7 @@
+ Name[mt]=Għodda tat-Test għall-Kivio
+ Name[nb]=Tekstverktøy for Kivio
+ Name[nds]=Textwarktüüch för Kivio
++Name[ne]=किभियोका लागि पाठउपकरण
+ Name[nl]=Tekstgereedschap voor Kivio
+ Name[nn]=Tekstverktøy for Kivio
+ Name[pl]=Narzędzie tekstowe dla Kivio
+--- kivio/plugins/kiviozoomtool/kiviozoomtool.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kivio/plugins/kiviozoomtool/kiviozoomtool.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,6 +5,7 @@
+ Name[af]=Vergroting gereedskap vir Kivio
+ Name[ar]=أداة التّحجيم لدى Kivio
+ Name[az]=Kivio üçün böyütmə vasitəsi
++Name[bg]=Инструмент за мащабиране за Kivio
+ Name[br]=Ostilh zoom evit Kivio
+ Name[bs]=Zoom alat za Kivio
+ Name[ca]=Eina d'apropament per a Kivio
+@@ -36,6 +37,7 @@
+ Name[mt]=Għodda tat-Tkabbir għall-Kivio
+ Name[nb]=Skaleringsverktøy for Kivio
+ Name[nds]=Vergrötternwarktüüch för Kivio
++Name[ne]=किभियोका लागि जूमउपकरण
+ Name[nl]=Zoomgereedschap voor Kivio
+ Name[nn]=Skaleringsverktøy for Kivio
+ Name[pl]=Narzędzie powiększania dla Kivio
+--- kivio/plugins/kiviotargettool/kiviotargettool.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kivio/plugins/kiviotargettool/kiviotargettool.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ X-KDE-Library=libkiviotargettool
+ Name=Target Tool for Kivio
++Name[bg]=Целеви инструмент за Kivio
+ Name[br]=Ostilh wenn evit Kivio
+ Name[ca]=Eina d'objectiu per a Kivio
+ Name[cy]=Erfyn Targed ar gyfer Kivio
+@@ -16,6 +17,7 @@
+ Name[fr]=Outil cible pour Kivio
+ Name[gl]=Ferramenta de Obxectivo para Kivio
+ Name[he]=כלי יעד של Kivio
++Name[hr]=Alat cilja za Kivio
+ Name[hu]=Célkezelő eszköz a Kivióhoz
+ Name[it]=Strumento di destinazione per Kivio
+ Name[ja]=Kivio ターゲットツール
+@@ -24,6 +26,7 @@
+ Name[ms]=Alat Sasaran bagi Kivio
+ Name[nb]=Målverktøy for Kivio
+ Name[nds]=Teelwarktüüch för Kivio
++Name[ne]=किभियोका लागि लक्ष्य उपकरण
+ Name[nl]=Targettool voor Kivio
+ Name[nn]=Målverktøy for Kivio
+ Name[pl]=Narzędzie wyboru elementu docelowego dla Kivio
+--- kivio/plugins/kiviosmlconnector/kiviosmlconnector.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kivio/plugins/kiviosmlconnector/kiviosmlconnector.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ X-KDE-Library=libkiviosmlconnector
+ Name=SML Based ConnectorTool for Kivio
++Name[bg]=Инструмент базиран на SML за свързване за Kivio
+ Name[ca]=Eina de connexió per a Kivio basada en SML
+ Name[cs]=Spojovací nástroj pro Kivio (SML)
+ Name[cy]=ErfynCysylltu i Kivio, wedi'i Seilio ar SML
+@@ -16,6 +17,7 @@
+ Name[fr]=Outil connexion, basé sur SML, pour Kivio
+ Name[gl]=Ferramenta de Conexón baseada en SML para Kivio
+ Name[he]=כלי חיבור מבוסס SML עבור Kivio
++Name[hr]=Alat povezivanja za Kivio zasnovan na SML
+ Name[hu]=SML-alapú összekapcsoló eszköz a Kivióhoz
+ Name[is]=SML byggt tengitól fyrir Kivio
+ Name[it]=Strumento di connessione basato su SML per Kivio
+@@ -25,6 +27,7 @@
+ Name[ms]=Alat Penyambung Berasaskan SML bagi Kivio
+ Name[nb]=SML-basert koblingsverktøy for Kivio
+ Name[nds]=Op SML opbuut Tokoppelwarktüüch för Kivio
++Name[ne]=किभियोका लागि SML आधारित योजक
+ Name[nl]=SML-gebaseerd verbindingshulpprogramma voor Kivio
+ Name[nn]=SML-basert sambandsverktøy for Kivio
+ Name[pl]=Narzędzie łącznika oparte na SML dla Kivio
+--- kivio/plugins/kivioconnectortool/kivioconnectortool.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kivio/plugins/kivioconnectortool/kivioconnectortool.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -5,6 +5,7 @@
+ Name[af]=Konnekteer gereedskap vir Kivio
+ Name[ar]=أداة اتصال Kivio
+ Name[az]=Kivio üçün bağlantı vasitəsi
++Name[bg]=Инструмент за свързване за Kivio
+ Name[bs]=Konektor alat za Kivio
+ Name[ca]=Eina connectora per a Kivio
+ Name[cs]=Spojovací nástroj pro Kivio
+@@ -13,7 +14,7 @@
+ Name[de]=Verbindungs-Programm für Kivio
+ Name[el]=Εργαλείο σύνδεσης για το Kivio
+ Name[eo]=Konektilo por Kivio
+-Name[es]=Herramienta plugin para Kivio
++Name[es]=Herramienta de conexiones para Kivio
+ Name[et]=Kivio ühenduste loomise tööriist
+ Name[eu]=Kivio-ren konexiorako tresna
+ Name[fa]=ابزار اتصال برای Kivio
+@@ -35,6 +36,7 @@
+ Name[mt]=Għodda tal-Konnessjoni għall-Kivio
+ Name[nb]=Koblingsverktøy for Kivio
+ Name[nds]=Tokoppelwarktüüch för Kivio
++Name[ne]=किभियोका लागि योजक उपकरण
+ Name[nl]=Verbindingsgereedschap voor Kivio
+ Name[nn]=Sambandsverktøy for Kivio
+ Name[pl]=Narzędzie łącznika dla Kivio
+--- kivio/kiviopart/kivio.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kivio/kiviopart/kivio.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Name=Kivio
+ Name[hi]=किवियो
+ Name[lo]=ແຜນຜັງໄດອະແກຣມ
++Name[ne]=किभियो
+ Name[th]=แผนผังไดอะแกรม K
+ Exec=kivio %u
+ GenericName=Flowchart & Diagram Editing
+@@ -29,12 +30,13 @@
+ GenericName[is]=Flæðirits og skýringamynda vinnsla
+ GenericName[it]=Editor di diagrammi di flusso
+ GenericName[ja]=フローチャート & ダイアグラム編集
+-GenericName[km]=កែសម្រួលគំនូសតាងលំហូរ និង ដ្យាក្រាម
++GenericName[km]=កែសម្រួលគំនូសតាងលំហូរ និងដ្យាក្រាម
+ GenericName[lo]=ການສ້າງໂຟລຊາດແລະໄດອະແກຣມ
+ GenericName[lv]=Plūsmasgrafēšana un diagrammu labošana
+ GenericName[ms]=Pengeditan Carta Aliran & Rajah
+ GenericName[nb]=Flytskjema- og diagramredigering
+ GenericName[nds]=Afloopdiagrammen un Diagrammbewerken
++GenericName[ne]=फ्लोचित्रपट र चित्र सम्पादन
+ GenericName[nl]=Bewerken van (stroom)diagrammen
+ GenericName[nn]=Flytskjema- og diagramredigering
+ GenericName[pl]=Edycja diagramów oraz schematów przepływów
+--- kivio/kiviopart/kiviopart.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kivio/kiviopart/kiviopart.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=KOffice Flowchart & Diagram Editing Component
++Name[bg]=Компонент за диаграми и схеми в KOffice
+ Name[ca]=Component editor de diagrames de fluxos i diagrames de KOffice
+ Name[cy]=Cydran Golygu Siartiau Llif & Diagram KOffice
+ Name[da]=Koffice flydediagrammer & diagramredigeringskomponent
+@@ -18,11 +19,12 @@
+ Name[is]=KOffice flæðirits og skýringamynda hluti
+ Name[it]=Componente per la modifica di diagrammi di flusso di KOffice
+ Name[ja]=KOffice フローチャート & ダイアグラム編集コンポーネント
+-Name[km]=សមាសភាគកែសម្រួលគំនូសតាងលំហូរ និង ដ្យាក្រាមសម្រាប់ KOffice
++Name[km]=សមាសភាគកែសម្រួលគំនូសតាងលំហូរ និងដ្យាក្រាមសម្រាប់ KOffice
+ Name[lv]=KOffice plūsmasgrafēšanas un diagrammu labošanas komponente
+ Name[ms]=Komponen Pengeditan Carta Aliran & Rajah KOffice
+ Name[nb]=KOffice-komponent for flytskjema- og diagramredigering
+ Name[nds]=KOffice-Komponent för Afloopdiagrammen un Diagrammbewerken
++Name[ne]=केडीई कार्यालय फ्लोचित्रपट र चित्र सम्पादन अवयव
+ Name[nl]=KOffice Stroomdiagram Bewerkingscomponent
+ Name[nn]=KOffice-komponent for flytskjema- og diagramredigering
+ Name[pl]=Komponent edycji diagramów oraz schematów przepływów dla KOffice
+@@ -48,6 +50,7 @@
+ X-KDE-NativeMimeType=application/x-kivio
+ Categories=Qt;KDE;Office;
+ GenericName=Flowchart & Diagram
++GenericName[bg]=Диаграми и схеми
+ GenericName[ca]=Editor de diagrames de fluxos i diagrames
+ GenericName[cy]=Siart Llif & Diagram
+ GenericName[da]=Flydediagrammer & diagrammer
+@@ -61,15 +64,17 @@
+ GenericName[fr]=Diagramme et tableau
+ GenericName[gl]=Diagramas de Fluxo e Outros
+ GenericName[he]=תרשימי זרימה ודיאגרמות
++GenericName[hr]=Prikaz protoka i dijagrami
+ GenericName[hu]=Folyamatábrák és diagramok
+ GenericName[is]=Flæðirit og skýringamyndir
+ GenericName[it]=Diagrammi di flusso
+ GenericName[ja]=フローチャート & ダイアグラム編集
+-GenericName[km]=គំនូសតាងលំហូរ និង ដ្យាក្រាម
++GenericName[km]=គំនូសតាងលំហូរ និងដ្យាក្រាម
+ GenericName[lv]=Plūsmasgrafēšana un diagrammu labošana
+ GenericName[ms]=Carta Aliran & Rajah
+ GenericName[nb]=Flytskjema- og diagramredigering
+ GenericName[nds]=Afloopdiagramm
++GenericName[ne]=फ्लोचित्रपट र रेखाचित्र
+ GenericName[nl]=Stroomdiagrammen
+ GenericName[nn]=Flytskjema og diagram
+ GenericName[pl]=Schematy przepływów oraz diagramy
+--- kivio/templates/basic/basicflow.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kivio/templates/basic/basicflow.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -19,6 +19,7 @@
+ Name[fr]=Diagramme de base
+ Name[gl]=Diagramas de Fluxo Básicos
+ Name[he]=תרשימי זרימה בסיסיים
++Name[hr]=Osnovno iscrtavanje protoka
+ Name[hu]=Egyszerű folyamatábra
+ Name[is]=Einfalt flæðirit
+ Name[it]=Diagramma di flusso semplice
+@@ -28,6 +29,7 @@
+ Name[ms]=Pencartaaliran Asas
+ Name[nb]=Enkelt flytdiagram
+ Name[nds]=Eenfach Afloopdiagramm
++Name[ne]=आधारभूत फ्लोचित्रपट
+ Name[nl]=Basis stroomdiagrammen
+ Name[nn]=Enkelt flytdiagram
+ Name[pl]=Podstawowe schematy przepływów
+@@ -69,6 +71,7 @@
+ Comment[ms]=Cipta dokumen dengan stensil asas bagi pencartaaliran yang dimuatkan.
+ Comment[nb]=Lager et dokument der de enkle flytdiagramstensilene er lastet inn.
+ Comment[nds]=Stellt en Dokment mit Grundvörlagen för laadt Afloopdiagrammen op.
++Comment[ne]=लोड गरिएको फ्लोचित्रपटका लागि आधारभूत स्टेनसिलहरू सहितको कागजात सिर्जना गर्दछ ।
+ Comment[nl]=Maakt een document met de basis-stencils voor stroomdiagrammen geladen.
+ Comment[nn]=Lagar eit dokument der dei enkle flytdiagramstensilane er lasta inn.
+ Comment[pl]=Tworzy dokument zawierający podstawowe szablony do diagramów przepływu.
+--- kivio/templates/basic/.directory (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kivio/templates/basic/.directory (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Name=Basic
+-Name[bg]=Базов
++Name[bg]=Основни
+ Name[br]=Diazez
+ Name[ca]=Bàsic
+ Name[cy]=Sylfaenol
+@@ -26,6 +26,7 @@
+ Name[ms]=Asas
+ Name[nb]=Grunnleggende
+ Name[nds]=Eenfach
++Name[ne]=आधारभूत
+ Name[nl]=Basis
+ Name[pl]=Podstawowy
+ Name[pt]=Básico
+--- kivio/templates/basic/empty.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kivio/templates/basic/empty.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -32,6 +32,7 @@
+ Name[ms]=Dokumen Kosong
+ Name[nb]=Tomt dokument
+ Name[nds]=Leddig Dokment
++Name[ne]=खाली कागजात
+ Name[nl]=Leeg Document
+ Name[nn]=Tomt dokument
+ Name[pl]=Pusty dokument
+@@ -77,6 +78,7 @@
+ Comment[ms]=Cipta dokumen tanpa memuatkan stensil.
+ Comment[nb]=Lagar et dokument uten å laste inn noen stensiler.
+ Comment[nds]=Stellt en Dokment ahn Vörlagen op.
++Comment[ne]=कुनै पनि स्टेनसिलहरू लोड नगरिकन नै कागजात सिर्जना गर्दछ ।
+ Comment[nl]=Maakt een document aan zonder geladen stencils.
+ Comment[nn]=Lagar eit dokument utan å lasta inn nokon stensilar.
+ Comment[pl]=Tworzy dokument bez załadowanych żadnych szablonów.
+--- kpresenter/kpresenterpart.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/kpresenterpart.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -8,6 +8,7 @@
+ Name[hi]=के-प्रेज़ेन्टर
+ Name[lo]=ການນຳສະເຫນີຊໍ້ມູນ
+ Name[mk]=K-презентација
++Name[ne]=केडीई प्रस्तुतकर्ता
+ Name[nl]=Kpresenter
+ Name[sv]=Kpresenter
+ Name[th]=การนำเสนอข้อมูล
+@@ -56,6 +57,7 @@
+ GenericName[mt]=Preżentazzjonijiet bi slajds
+ GenericName[nb]=Presentasjoner
+ GenericName[nds]=Bildfolg-Presentatschoon
++GenericName[ne]=स्लाइड प्रस्तुतिकरण
+ GenericName[nl]=Diapresentaties
+ GenericName[nn]=Presentasjonar
+ GenericName[pl]=Prezentacje w postaci slajdów
+--- kpresenter/autoforms/Connections/Connection1.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/autoforms/Connections/Connection1.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -41,6 +41,7 @@
+ Name[mt]=Konnessjoni 01
+ Name[nb]=Kobling 01
+ Name[nds]=Verbinnen 01
++Name[ne]=जडान ०१
+ Name[nl]=Verbinding 01
+ Name[nn]=Samband 01
+ Name[pl]=Połączenie 01
+--- kpresenter/autoforms/Connections/Connection2.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/autoforms/Connections/Connection2.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -41,6 +41,7 @@
+ Name[mt]=Konnessjoni 02
+ Name[nb]=Kobling 02
+ Name[nds]=Verbinnen 02
++Name[ne]=जडान ०२
+ Name[nl]=Verbinding 02
+ Name[nn]=Samband 02
+ Name[pl]=Połączenie 02
+--- kpresenter/autoforms/Connections/Connection3.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/autoforms/Connections/Connection3.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -41,6 +41,7 @@
+ Name[mt]=Konnessjoni 03
+ Name[nb]=Kobling 03
+ Name[nds]=Verbinnen 03
++Name[ne]=जडान ०३
+ Name[nl]=Verbinding 03
+ Name[nn]=Samband 03
+ Name[pl]=Połączenie 03
+--- kpresenter/autoforms/Connections/Connection4.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/autoforms/Connections/Connection4.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -41,6 +41,7 @@
+ Name[mt]=Konnessjoni 04
+ Name[nb]=Kobling 04
+ Name[nds]=Verbinnen 04
++Name[ne]=जडान ०४
+ Name[nl]=Verbinding 04
+ Name[nn]=Samband 04
+ Name[pl]=Połączenie 04
+--- kpresenter/autoforms/Connections/Connection5.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/autoforms/Connections/Connection5.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -41,6 +41,7 @@
+ Name[mt]=Konnessjoni 05
+ Name[nb]=Kobling 05
+ Name[nds]=Verbinnen 05
++Name[ne]=जडान ०५
+ Name[nl]=Verbinding 05
+ Name[nn]=Samband 05
+ Name[pl]=Połączenie 05
+--- kpresenter/autoforms/Connections/Connection6.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/autoforms/Connections/Connection6.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -41,6 +41,7 @@
+ Name[mt]=Konnessjoni 06
+ Name[nb]=Kobling 06
+ Name[nds]=Verbinnen 06
++Name[ne]=जडान ०६
+ Name[nl]=Verbinding 06
+ Name[nn]=Samband 06
+ Name[pl]=Połączenie 06
+--- kpresenter/autoforms/Connections/Connection7.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/autoforms/Connections/Connection7.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -41,6 +41,7 @@
+ Name[mt]=Konnessjoni 07
+ Name[nb]=Kobling 07
+ Name[nds]=Verbinnen 07
++Name[ne]=जडान ०७
+ Name[nl]=Verbinding 07
+ Name[nn]=Samband 07
+ Name[pl]=Połączenie 07
+--- kpresenter/autoforms/Connections/Connection8.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/autoforms/Connections/Connection8.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -41,6 +41,7 @@
+ Name[mt]=Konnessjoni 08
+ Name[nb]=Kobling 08
+ Name[nds]=Verbinnen 08
++Name[ne]=जडान ०८
+ Name[nl]=Verbinding 08
+ Name[nn]=Samband 08
+ Name[pl]=Połączenie 08
+--- kpresenter/autoforms/Connections/Connection9.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/autoforms/Connections/Connection9.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -41,6 +41,7 @@
+ Name[mt]=Konnessjoni 09
+ Name[nb]=Kobling 09
+ Name[nds]=Verbinnen 09
++Name[ne]=जडान ०९
+ Name[nl]=Verbinding 09
+ Name[nn]=Samband 09
+ Name[pl]=Połączenie 09
+--- kpresenter/autoforms/Connections/Connection10.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/autoforms/Connections/Connection10.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -41,6 +41,7 @@
+ Name[mt]=Konnessjoni 10
+ Name[nb]=Kobling 10
+ Name[nds]=Verbinnen 10
++Name[ne]=जडान १०
+ Name[nl]=Verbinding 10
+ Name[nn]=Samband 10
+ Name[pl]=Połączenie 10
+--- kpresenter/autoforms/Connections/Connection11.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/autoforms/Connections/Connection11.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -41,6 +41,7 @@
+ Name[mt]=Konnessjoni 11
+ Name[nb]=Kobling 11
+ Name[nds]=Verbinnen 11
++Name[ne]=जडान ११
+ Name[nl]=Verbinding 11
+ Name[nn]=Samband 11
+ Name[pl]=Połączenie 11
+--- kpresenter/autoforms/Connections/Connection12.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/autoforms/Connections/Connection12.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -41,6 +41,7 @@
+ Name[mt]=Konnessjoni 12
+ Name[nb]=Kobling 12
+ Name[nds]=Verbinnen 12
++Name[ne]=जडान १२
+ Name[nl]=Verbinding 12
+ Name[nn]=Samband 12
+ Name[pl]=Połączenie 12
+--- kpresenter/autoforms/Arrows/ArrowLeftUp.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/autoforms/Arrows/ArrowLeftUp.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Link
+ URL=.source/ArrowLeftUp.atf
+ Name=Arrow Left/Up
++Name[bg]=Стрелка наляво/нагоре
+ Name[ca]=Fletxa esquerra/a dalt
+ Name[cy]=Saeth i'r Chwith/i Fyny
+ Name[da]=Pil til venstre/op
+@@ -26,6 +27,7 @@
+ Name[ms]=Anak Panah Kiri/Ke atas
+ Name[nb]=Pil opp til venstre
+ Name[nds]=Piel na links/hooch
++Name[ne]=बायाँ/माथि बाँण
+ Name[nl]=Pijl linksboven
+ Name[nn]=Pil opp til venstre
+ Name[pl]=Strzałka w lewo/górę
+--- kpresenter/autoforms/Arrows/ArrowRightDown.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/autoforms/Arrows/ArrowRightDown.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Link
+ URL=.source/ArrowRightDown.atf
+ Name=Arrow Right/Down
++Name[bg]=Стрелка надясно/надолу
+ Name[ca]=Fletxa dreta/a baix
+ Name[cy]=Saeth i'r Dde/i Lawr
+ Name[da]=Pil til højre/ned
+@@ -26,6 +27,7 @@
+ Name[ms]=Anak Panah Kanan/Ke bawah
+ Name[nb]=Pil ned til høyre
+ Name[nds]=Piel na rechts/nerrn
++Name[ne]=दायाँ/तल बाँण
+ Name[nl]=Pijl rechtsonder
+ Name[nn]=Pil ned til høgre
+ Name[pl]=Strzałka w prawo/dół
+--- kpresenter/autoforms/Arrows/ArrowDown.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/autoforms/Arrows/ArrowDown.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Link
+ URL=.source/ArrowDown.atf
+ Name=Arrow Down
++Name[bg]=Стрелка надолу
+ Name[ca]=Fletxa a baix
+ Name[cy]=Saeth i Lawr
+ Name[da]=Pil ned
+@@ -26,6 +27,7 @@
+ Name[ms]=Anak Panah Ke bawah
+ Name[nb]=Pil ned
+ Name[nds]=Piel daal
++Name[ne]=तल्लो बाँण
+ Name[nl]=Pijl omlaag
+ Name[nn]=Pil ned
+ Name[pl]=Strzałka w dół
+--- kpresenter/autoforms/Arrows/ArrowRight.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/autoforms/Arrows/ArrowRight.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Link
+ URL=.source/ArrowRight.atf
+ Name=Arrow Right
++Name[bg]=Стрелка надясно
+ Name[ca]=Fletxa dreta
+ Name[cy]=Saeth i'r Dde
+ Name[da]=Pil til højre
+@@ -26,6 +27,7 @@
+ Name[ms]=Anak Panah Kanan
+ Name[nb]=Pil til høyre
+ Name[nds]=Piel rechts
++Name[ne]=दायाँ बाँण
+ Name[nl]=Pijl rechts
+ Name[nn]=Pil til høgre
+ Name[pl]=Strzałka w prawo
+--- kpresenter/autoforms/Arrows/ArrowLeftDown.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/autoforms/Arrows/ArrowLeftDown.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Link
+ URL=.source/ArrowLeftDown.atf
+ Name=Arrow Left/Down
++Name[bg]=Стрелка наляво/надолу
+ Name[ca]=Fletxa esquerra/a baix
+ Name[cy]=Saeth i'r Chwith/i Lawr
+ Name[da]=Pil til venstre/ned
+@@ -26,6 +27,7 @@
+ Name[ms]=Anak Panah Kiri/Ke bawah
+ Name[nb]=Pil ned til venstre
+ Name[nds]=Piel na links/nerrn
++Name[ne]=बायाँ/तल बाँण
+ Name[nl]=Pijl linksonder
+ Name[nn]=Pil ned til venstre
+ Name[pl]=Strzałka w lewo/dół
+--- kpresenter/autoforms/Arrows/ArrowRightUp.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/autoforms/Arrows/ArrowRightUp.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Link
+ URL=.source/ArrowRightUp.atf
+ Name=Arrow Right/Up
++Name[bg]=Стрелка надясно/нагоре
+ Name[ca]=Fletxa dreta/a dalt
+ Name[cy]=Saeth i'r Chwith/i Fyny
+ Name[da]=Pil til højre/op
+@@ -26,6 +27,7 @@
+ Name[ms]=Anak Panah Kanan/Ke atas
+ Name[nb]=Pil opp til høyre
+ Name[nds]=Piel na rechts/hooch
++Name[ne]=दायाँ/माथि बाँण
+ Name[nl]=Pijl rechtsboven
+ Name[nn]=Pil opp til høgre
+ Name[pl]=Strzałka w prawo/górę
+--- kpresenter/autoforms/Arrows/ArrowUp.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/autoforms/Arrows/ArrowUp.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Link
+ URL=.source/ArrowUp.atf
+ Name=Arrow Up
++Name[bg]=Стрелка нагоре
+ Name[ca]=Fletxa a dalt
+ Name[cy]=Saeth i Fyny
+ Name[da]=Pil op
+@@ -26,6 +27,7 @@
+ Name[ms]=Anak Panah Ke atas
+ Name[nb]=Pil opp
+ Name[nds]=Piel hooch
++Name[ne]=माथि बाँण
+ Name[nl]=Pijl omhoog
+ Name[nn]=Pil opp
+ Name[pl]=Strzałka w górę
+--- kpresenter/autoforms/Arrows/ArrowLeft.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/autoforms/Arrows/ArrowLeft.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Link
+ URL=.source/ArrowLeft.atf
+ Name=Arrow Left
++Name[bg]=Стрелка наляво
+ Name[ca]=Fletxa esquerra
+ Name[cy]=Saeth i'r Chwith
+ Name[da]=Pil til venstre
+@@ -26,6 +27,7 @@
+ Name[ms]=Anak Panah Kiri
+ Name[nb]=Pil til venstre
+ Name[nds]=Piel links
++Name[ne]=बायाँ बाँण
+ Name[nl]=Pijl links
+ Name[nn]=Pil til venstre
+ Name[pl]=Strzałka w lewo
+--- kpresenter/kpresenter.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/kpresenter.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -8,6 +8,7 @@
+ Name[hi]=के-प्रेज़ेन्टर
+ Name[lo]=ການນຳສະເຫນີຊໍ້ມູນ
+ Name[mk]=K-презентација
++Name[ne]=केडीई प्रस्तुतकर्ता
+ Name[nl]=Kpresenter
+ Name[sv]=Kpresenter
+ Name[th]=การนำเสนอข้อมูล
+@@ -50,6 +51,7 @@
+ GenericName[mt]=Preżentazzjonijiet bi slajds
+ GenericName[nb]=Presentasjoner
+ GenericName[nds]=Bildfolg-Presentatschoon
++GenericName[ne]=स्लाइड प्रस्तुतिकरण
+ GenericName[nl]=Diapresentaties
+ GenericName[nn]=Presentasjonar
+ GenericName[pl]=Prezentacje w postaci slajdów
+--- kpresenter/KPrPixmapObject.cpp (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/KPrPixmapObject.cpp (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -251,6 +251,10 @@
+ {
+ // ### FIXME: this seems wrong, KoPictureCollection will never reload it (or perhaps it is the function name that is wrong)
+ setPicture( image.getKey() );
++ if (image.isNull()) {
++ // this happens for example when doing copy&paste from a different KPresenter instance
++ image = imageCollection->loadPicture( image.getKey().filename() );
++ }
+ }
+
+ QDomDocumentFragment KPrPixmapObject::save( QDomDocument& doc, double offset )
+--- kpresenter/templates/Screen/.directory (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/templates/Screen/.directory (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -31,6 +31,7 @@
+ Name[mt]=Skrin
+ Name[nb]=Skjerm
+ Name[nds]=Schirm
++Name[ne]=पर्दा
+ Name[nl]=Scherm
+ Name[pl]=Ekran
+ Name[pt]=Ecrã
+--- kpresenter/templates/letter/.directory (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/templates/letter/.directory (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,7 +2,7 @@
+ Name=Letter
+ Name[af]=Brief
+ Name[az]=Məktub
+-Name[bg]=Писмо
++Name[bg]=писмо
+ Name[br]=Lizher
+ Name[ca]=Carta
+ Name[cy]=Llythyr
+@@ -21,6 +21,7 @@
+ Name[km]=សំបុត្រ
+ Name[lv]=Vēstule
+ Name[nds]=US Letter
++Name[ne]=अक्षर
+ Name[nl]=Brief
+ Name[pl]=List
+ Name[pt]=Carta
+--- kpresenter/templates/common_desktop/emptyLandscape.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/templates/common_desktop/emptyLandscape.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -30,6 +30,7 @@
+ Name[ms]=Kosong
+ Name[nb]=Tom
+ Name[nds]=Leddig
++Name[ne]=खाली
+ Name[nl]=Leeg
+ Name[nn]=Tomt
+ Name[pl]=Pusta
+@@ -51,6 +52,7 @@
+ Name[zh_CN]=空
+ Name[zh_TW]=空白
+ Comment=Empty presentation
++Comment[bg]=Празна презентация
+ Comment[ca]=Presentació buida
+ Comment[cy]=Cyflwyniad gwag
+ Comment[da]=Tom præsentation
+@@ -71,6 +73,7 @@
+ Comment[lv]=Tukša prezentācija
+ Comment[nb]=Tom presentasjon
+ Comment[nds]=Leddig Presentatschoon
++Comment[ne]=खाली प्रस्तुतिकरण
+ Comment[nl]=Lege presentatie
+ Comment[pl]=Pusta prezentacja
+ Comment[pt]=Uma apresentação em branco
+--- kpresenter/templates/common_desktop/OneColumnLandscape.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/templates/common_desktop/OneColumnLandscape.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -39,6 +39,7 @@
+ Name[mt]=Kolonna Waħda
+ Name[nb]=En spalte
+ Name[nds]=Een Striep
++Name[ne]=एउटा स्तम्भ
+ Name[nl]=Eén kolom, landschap
+ Name[nn]=Ei spalte
+ Name[pl]=Jedna kolumna
+@@ -65,6 +66,7 @@
+ Name[zh_TW]=單列
+ Name[zu]=Ikholamu Eyodwa
+ Comment=Presentation with a page title and single large text area
++Comment[bg]=Презентация със заглавие на страница и едно голямо текстово поле
+ Comment[ca]=Presentació amb un títol de pàgina i una gran àrea de text
+ Comment[cy]=Cyflwyniad efo teitl tudalen ac ardal testun mawr sengl
+ Comment[da]=Præsentation med sideoverskrift og et enkelt stort tekstområde
+@@ -83,6 +85,7 @@
+ Comment[km]=ការបង្ហាញមានចំណងជើងទំព័រ និងផ្ទៃអត្ថបទធំតែមួយ
+ Comment[nb]=Presentasjon med en sidetittel og ett stort tekstfelt
+ Comment[nds]=Presentatschoon mit Siedentitel un en groot Textrebeet
++Comment[ne]=पृष्ठ शीर्षक र एक्लो लामो पाठ क्षेत्र सँगको प्रस्तुतिकरण
+ Comment[nl]=Presentatie met een paginatitel en een grote ruimte voor tekst
+ Comment[pl]=Prezentacja z tytułem strony oraz dużym miejscem na tekst
+ Comment[pt]=Uma apresentação com um título e uma área de texto grande
+--- kpresenter/templates/common_desktop/TitleLandscape.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/templates/common_desktop/TitleLandscape.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -39,6 +39,7 @@
+ Name[mt]=Titolu
+ Name[nb]=Tittel
+ Name[nds]=Titel
++Name[ne]=शीर्षक
+ Name[nl]=Titel, landschap
+ Name[nn]=Tittel
+ Name[pl]=Tytuł
+@@ -65,6 +66,7 @@
+ Name[zh_TW]=標題
+ Name[zu]=Ibizo
+ Comment=Presentation with a page title
++Comment[bg]=Презентация със заглавие на страницата
+ Comment[ca]=Presentació amb un títol de pàgina
+ Comment[cy]=Cyflwyniad â theitl tudalen
+ Comment[da]=Præsentation med en sideoverskrift
+@@ -84,6 +86,7 @@
+ Comment[lv]=Prezentācija ar lapas virsrakstu
+ Comment[nb]=Presentasjon med en sidetittel
+ Comment[nds]=Presentatschoon mit Siedentitel
++Comment[ne]=पृष्ठ शीर्षकसँग प्रस्तुतिकरण
+ Comment[nl]=Presentatie met een paginatitel
+ Comment[pl]=Prezentacja z tytułem strony
+ Comment[pt]=Uma apresentação com uma página de título
+--- kpresenter/templates/common_desktop/TwoColumnPortrait.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/templates/common_desktop/TwoColumnPortrait.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -35,6 +35,7 @@
+ Name[mt]=Żewġ Kolonni, għat-Tul
+ Name[nb]=To spalter stående
+ Name[nds]=Twee Striepen Hoochformaat
++Name[ne]=दुई स्तम्भ पोर्ट्रेट
+ Name[nl]=Twee kolommen, portret
+ Name[nn]=To spalter ståande
+ Name[pl]=Dwie kolumny (format portretu)
+@@ -61,6 +62,7 @@
+ Name[zh_TW]=兩列肖象
+ Name[zu]=Umdwebo Wamakholamu Amabili
+ Comment=Presentation with a page title and two text columns (portrait-oriented)
++Comment[bg]=Презентация със заглавие на страница и две текстови колони(вертикална ориентация)
+ Comment[ca]=Presentació amb un títol de pàgina i dues columnes de text (orientada a retrats)
+ Comment[cy]=Cyflwyniad efo teitl tudalen a dwy golofn destun (cyfeiriadaeth ddarlun)
+ Comment[da]=Præsentation med en sideoverskrift og to tekstsøjler (stående format)
+@@ -78,6 +80,7 @@
+ Comment[km]=ការបង្ហាញចំណងជើងទំព័រនិងជួរឈរអត្ថបទពីរ (ទិសឈរ)
+ Comment[nb]=Presentasjon med en sidetittel og to tekstspalter (stående format)
+ Comment[nds]=Presentatschoon mit Siedentitel un twee Textstriepen (Hoochformaat)
++Comment[ne]=पृष्ठ शीर्षक र दुई पाठ स्तम्भहरू (पोर्ट्रेट-अभिविन्यस्त) सँगको प्रस्तुतिकरण
+ Comment[nl]=Presentatie met een paginatitel en twee tekstkolommen (portretoriëntatie)
+ Comment[pl]=Prezentacja z tytułem strony oraz dwiema kolumnami na tekst (format portretu)
+ Comment[pt]=Uma apresentação com um título e duas colunas de texto (com o formato de retrato)
+--- kpresenter/templates/common_desktop/TwoColumnLandscape.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/templates/common_desktop/TwoColumnLandscape.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -38,6 +38,7 @@
+ Name[mt]=Żewġ Kolonni
+ Name[nb]=To spalter
+ Name[nds]=Twee Striepen
++Name[ne]=दुई स्तम्भ
+ Name[nl]=Twee kolommen, landschap
+ Name[nn]=To spalter
+ Name[pl]=Dwie kolumny
+@@ -64,6 +65,7 @@
+ Name[zh_TW]=兩列
+ Name[zu]=Amakholamu Amabili
+ Comment=Presentation with a page title and two text columns
++Comment[bg]=Презентация със заглавие на страница и две текстови колони
+ Comment[ca]=Presentació amb un títol de pàgina i dues columnes de text
+ Comment[cy]=Cyflwyniad efo teitl tudalen a dwy golofn destun
+ Comment[da]=Præsentation med en sideoverskrift og to tekstsøjler
+@@ -79,9 +81,10 @@
+ Comment[is]=Kynning með síðutitli og tveimur textadálkum
+ Comment[it]=Presentazione con un titolo di pagina e due colonne di testo
+ Comment[ja]=タイトルと二つのテキスト欄で構成するプレゼンテーション
+-Comment[km]= ការបង្ហាញចំណងជើងនិង អត្ថបទជួរឈរពីរ
++Comment[km]= ការបង្ហាញចំណងជើង និងអត្ថបទជួរឈរពីរ
+ Comment[nb]=Presentasjon med en sidetittel og to tekstspalter
+ Comment[nds]=Presentatschoon mit Siedentitel un twee Textstriepen
++Comment[ne]=पृष्ठ शीर्षक र दुई पाठ स्तम्भहरूसँगको प्रस्तुतिकरण
+ Comment[nl]=Presentatie met een paginatitel en twee tekstkolommen
+ Comment[pl]=Prezentacja z tytułem strony oraz dwiema kolumnami na tekst
+ Comment[pt]=Uma apresentação com um título e duas colunas de texto
+--- kpresenter/templates/common_desktop/emptyPortrait.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/templates/common_desktop/emptyPortrait.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -27,6 +27,7 @@
+ Name[ms]=Potret Kosong
+ Name[nb]=Tomt stående
+ Name[nds]=Leddig Hoochformaat
++Name[ne]=खाली पोर्ट्रेट
+ Name[nl]=Leeg, portret
+ Name[nn]=Tomt ståande
+ Name[pl]=Pusta (format portretu)
+@@ -48,6 +49,7 @@
+ Name[zh_CN]=空纵向
+ Name[zh_TW]=空白縱向
+ Comment=Empty presentation (portrait-oriented)
++Comment[bg]=Празна презентация (вертикална ориентация)
+ Comment[ca]=Presentació buida (orientada a retrats)
+ Comment[cy]=Cyflwyniad gwag (cyfeiriadaeth ddarlun)
+ Comment[da]=Tom præsentation (stående format)
+@@ -65,6 +67,7 @@
+ Comment[km]=ការបង្ហាញទទេ (ទិសផ្ដេក)
+ Comment[nb]=Tom presentasjon (stående format)
+ Comment[nds]=Leddig Presentatschoon (Hoochformaat)
++Comment[ne]=खाली प्रस्तुतिकरण (पोर्ट्रेट-अभिविन्यस्त)
+ Comment[nl]=Lege presentatie (portretoriëntatie)
+ Comment[pl]=Pusta prezentacja (format portretu)
+ Comment[pt]=Uma apresentação em branco (com o formato de retrato)
+--- kpresenter/templates/common_desktop/OneColumnPortrait.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/templates/common_desktop/OneColumnPortrait.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -35,6 +35,7 @@
+ Name[mt]=Kolonna Waħda, għat-Tul
+ Name[nb]=En spalte stående
+ Name[nds]=Een Striep Hoochformaat
++Name[ne]=एउटा स्तम्भ पोर्ट्रेट
+ Name[nl]=Eén kolom, portret
+ Name[nn]=Ei spalte ståande
+ Name[pl]=Jedna kolumna (format portretu)
+@@ -61,6 +62,7 @@
+ Name[zh_TW]=單列肖象
+ Name[zu]=Eyodwa Ikholamu Yodwebu
+ Comment=Presentation with a page title and single large text area (portrait-oriented)
++Comment[bg]=Презентация със заглавие на страница и едно голямо текстово поле (вертикална ориентация)
+ Comment[ca]=Presentació amb un títol de pàgina i una gran àrea de text (orientada a retrat)
+ Comment[cy]=Cyflwyniad efo teitl tudalen ac ardal testun mawr sengl (cyfeiriadaeth ddarlun)
+ Comment[da]=Præsentation med sideoverskrift og et enkelt stort tekstområde (portrætformat)
+@@ -75,9 +77,10 @@
+ Comment[is]=Kynning með síðutitli og einu stóru textasvæði (lóðrétt síða)
+ Comment[it]=Presentazione con titolo della pagina e una sola grande area di testo (orientata in verticale)
+ Comment[ja]=ページタイトルと一つの大きなテキスト欄で構成するプレゼンテーション (縦長)
+-Comment[km]=ការបង្ហាញចំណងជើងទំព័រនិង អត្ថបទធំតែមួយ (ទិសឈរ)
++Comment[km]=ការបង្ហាញចំណងជើងទំព័រនិងអត្ថបទធំតែមួយ (ទិសឈរ)
+ Comment[nb]=Presentasjon med en sidetittel og ett stort tekstfelt (stående format)
+ Comment[nds]=Presentatschoon mit Siedentitel un en groot Textrebeet (Hoochformaat)
++Comment[ne]=पृष्ठ शीर्षक र एक्लो लामो पाठ क्षेत्रसँग प्रस्तुतिकरण (पोर्ट्रेट-अभिविन्यस्त)
+ Comment[nl]=Presentatie met een paginatitel en een grote ruimte voor tekst (portretoriëntatie)
+ Comment[pl]=Prezentacja z tytułem strony oraz dużym miejscem na tekst (format portretu)
+ Comment[pt]=Uma apresentação com um título e uma área de texto grande (no formato de retrato)
+--- kpresenter/templates/common_desktop/TitlePortrait.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/templates/common_desktop/TitlePortrait.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -35,6 +35,7 @@
+ Name[mt]=Titolu, għat-Tul
+ Name[nb]=Tittel stående
+ Name[nds]=Titel Hoochformaat
++Name[ne]=शीर्षक पोर्ट्रेट
+ Name[nl]=Titel, portret
+ Name[nn]=Tittel ståande
+ Name[pl]=Tytuł (format portretu)
+@@ -61,6 +62,7 @@
+ Name[zh_TW]=標題肖象
+ Name[zu]=Umdwebi Onebizo
+ Comment=Presentation with a page title (portrait-oriented)
++Comment[bg]=Презентация със заглавие на страница (вертикална ориентация)
+ Comment[ca]=Presentació amb un títol de pàgina (orientada a retrat)
+ Comment[cy]=Cyflwyniad efo teitl tudalen (cyfeiriadaeth ddarlun)
+ Comment[da]=Præsentation med en sideoverskrift (stående format)
+@@ -78,6 +80,7 @@
+ Comment[km]=ការបង្ហាញចំណងជើងទំព័រ (ទិសឈរ)
+ Comment[nb]=Presentasjon med en sidetittel (stående format)
+ Comment[nds]=Presentatschoon mit Siedentitel (Hoochformaat)
++Comment[ne]=पृष्ठ शीर्षक (पोर्ट्रेट-अभिविन्यस्त) सँगको प्रस्तुतिकरण
+ Comment[nl]=Presentatie met een paginatitel (portretoriëntatie)
+ Comment[pl]=Prezentacja z tytułem strony (format portretu)
+ Comment[pt]=Uma apresentação com um título (com o formato de retrato)
+--- kpresenter/templates/legal/.directory (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/templates/legal/.directory (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -13,6 +13,7 @@
+ Name[hr]=Pravno
+ Name[it]=US legal
+ Name[nds]=US Legal
++Name[ne]=कानूनी
+ Name[pl]=Wzorce
+ Name[sr]=Легал
+ Name[tr]=Yasal
+--- kpresenter/templates/Screenpresentations/.directory (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/templates/Screenpresentations/.directory (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Name=Screen Presentations
+ Name[ar]=تقديمات على امتداد الشّاشة
+-Name[bg]=Екранна презентация
++Name[bg]=Екранни презентации
+ Name[br]=Emginnigoù srakmm
+ Name[ca]=Presentacions per pantalla
+ Name[cy]=Cyflwyniadau Sgrîn
+@@ -15,6 +15,7 @@
+ Name[gl]=Presentations na Pantalla
+ Name[he]=מסך שקופיות
+ Name[hi]=स्क्रीन प्रस्तुतीकरण
++Name[hr]=Prezentacije u slajdovima
+ Name[hu]=Képernyőbemutatók
+ Name[is]=Kynningar á skjá
+ Name[it]=Presentazioni a schermo
+@@ -23,6 +24,7 @@
+ Name[lv]=Ekrāna prezentācijas
+ Name[nb]=Skjermpresentasjoner
+ Name[nds]=Schirm-Presentatschonen
++Name[ne]=पर्दा प्रस्तुतिकरण
+ Name[nl]=Diapresentaties
+ Name[pl]=Prezentacje ekranowe
+ Name[pt]=Apresentações no Ecrã
+--- kpresenter/templates/Screenpresentations/SnowyMountains.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/templates/Screenpresentations/SnowyMountains.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -34,6 +34,7 @@
+ Name[mt]=Muntanji Bis-Silġ
+ Name[nb]=Snødekte fjell
+ Name[nds]=Bargen mit Snee
++Name[ne]=हिउँ भएको हिमालयहरू
+ Name[nl]=Besneeuwde bergen
+ Name[nn]=Snødekte fjell
+ Name[pl]=Zaśnieżone góry
+@@ -59,6 +60,7 @@
+ Name[zh_TW]=雪山
+ Name[zu]=Izintaba Ezikhithikayo
+ Comment=A cool and smooth presentation
++Comment[bg]=Супер презентация
+ Comment[ca]=Una presentació fresca i suau
+ Comment[cy]=Cyflwyniad cŵl llyfn
+ Comment[da]=En smart og indsmigrende præsentation
+@@ -73,10 +75,11 @@
+ Comment[hu]=Hideg, sima érzetű bemutató
+ Comment[is]=Köld og einföld kynning
+ Comment[it]=Una presentazione fresca e pulita
+-Comment[km]=ការបង្ហាញភាពស្រស់ស្អាតនិង ភាពរលូន
++Comment[km]=ការបង្ហាញភាពស្រស់ស្អាត និងភាពរលូន
+ Comment[lv]=Forša un gluda prezentācija
+ Comment[nb]=En kjølig, rolig presentasjon
+ Comment[nds]=Eine koolt un week Presentatschoon
++Comment[ne]=शीतल र महीन प्रस्तुतिकरण
+ Comment[nl]=Een flitsende en strakke presentatie
+ Comment[pl]=Chłodna i wysublimowana prezentacja
+ Comment[pt]=Uma apresentação bonita e suave
+--- kpresenter/templates/Screenpresentations/BlueBreezePicture.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/templates/Screenpresentations/BlueBreezePicture.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -29,6 +29,7 @@
+ Name[lv]=Zilās brīzes bilde
+ Name[nb]=«Blå bris»-bilde
+ Name[nds]=Blaag Bries, Bild
++Name[ne]=नीलो अंगार तस्विर
+ Name[nn]=Blå bris-bilete
+ Name[pl]=Niebieska bryza z obrazkiem
+ Name[pt]=Imagem Brisa Azul
+@@ -50,6 +51,7 @@
+ Name[zh_TW]=藍色和風圖片
+ Name[zu]=Umfanekiso Womoya Oluhlaza (okwesibhaka-bhaka)
+ Comment=A peaceful presentation with a title and picture area
++Comment[bg]=Семпла презентация със заглавие и място за снимки
+ Comment[ca]=Una presentació plàcida amb un títol i una àrea de dibuix
+ Comment[cy]=Cyflwyniad heddychlon efo teitl ac ardal llun
+ Comment[da]=En fredfyldt præsentation med en overskrift og et billedområde
+@@ -65,10 +67,11 @@
+ Comment[is]=Einföld kynning með titli og myndasvæði
+ Comment[it]=Una presentazione rilassante con un titolo e un'area per immagini
+ Comment[ja]=タイトルと画像領域で構成するおとなしいプレゼンテーション
+-Comment[km]=ការបង្ហាញចំណងជើងនិង តំបន់រូបភាព
++Comment[km]=ការបង្ហាញចំណងជើងនិងតំបន់រូបភាព
+ Comment[lv]=Mierīga prezentācija ar nosaukumu un bildes apgabalu
+ Comment[nb]=En fredelig presentasjon med en tittel og et bildefelt
+ Comment[nds]=En sinnig Presentatschoon mit Titel un Bildrebeet
++Comment[ne]=शीर्षक र चित्र क्षेत्रसँग शान्त प्रस्तुतिकरण
+ Comment[nl]=Een rustige presentatie met een titel en ruimte voor een afbeelding
+ Comment[pl]=Spokojna prezentacja z tytułem i miejscem na obrazek
+ Comment[pt]=Uma apresentação pacífica com um título e uma área de imagem
+--- kpresenter/templates/Screenpresentations/savannah.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/templates/Screenpresentations/savannah.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -11,6 +11,7 @@
+ Name[ja]=サバンナ
+ Name[lv]=Savanna
+ Name[nds]=Savann
++Name[ne]=साभान्नाह
+ Name[nl]=Savanne
+ Name[pl]=Sawanna
+ Name[pt]=Savana
+@@ -24,6 +25,7 @@
+ Name[uz]=Саванна
+ Name[zh_TW]=薩凡納
+ Comment=Savannah by dannya
++Comment[bg]=Savannah на dannya
+ Comment[br]=Savannah gant dannya
+ Comment[da]=Savanna af dannya
+ Comment[de]=Savanne von dannya
+@@ -39,6 +41,7 @@
+ Comment[km]=Savannah ដោយ dannya
+ Comment[nb]=Savannah av dannya
+ Comment[nds]=Savann vun dannya
++Comment[ne]=डान्याद्वारा साभान्नाह
+ Comment[nl]=Savanne door dannya
+ Comment[pl]=Prezentacja Sawanna (autor: dannya)
+ Comment[pt]=Savana por dannya
+--- kpresenter/templates/Screenpresentations/classroom.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/templates/Screenpresentations/classroom.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Icon=template_classroom
+ Name=Classroom
++Name[bg]=Класна стая
+ Name[ca]=Aula
+ Name[de]=Klassenraum
+ Name[el]=Σχολική τάξη
+@@ -18,6 +19,7 @@
+ Name[km]=ថ្នាក់រៀន
+ Name[nb]=Klasserom
+ Name[nds]=Klassruum
++Name[ne]=कक्षाकोठा
+ Name[nl]=Schoolbord
+ Name[pl]=Klasa
+ Name[pt]=Sala de Aulas
+@@ -33,6 +35,7 @@
+ Name[zh_CN]=教室
+ Name[zh_TW]=教室
+ Comment=Classroom by dannya
++Comment[bg]=Класна стая на dannya
+ Comment[ca]=Aula per dannya
+ Comment[da]=Klasseværelse af dannya
+ Comment[de]=Klassenraum von dannya
+@@ -48,6 +51,7 @@
+ Comment[km]=ថ្នាក់រៀនដោយ dannya
+ Comment[nb]=Klasserom, av dannya
+ Comment[nds]=Klassruum vun dannya
++Comment[ne]=डान्याद्वारा कक्षाकोठा
+ Comment[nl]=Schoolbord door dannya
+ Comment[pl]=Prezentacja Klasa (autor: dannya)
+ Comment[pt]=Sala de aula por dannya
+--- kpresenter/templates/Screenpresentations/CopperPlain.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/templates/Screenpresentations/CopperPlain.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -27,6 +27,7 @@
+ Name[mt]=Ram sempliċi
+ Name[nb]=Vanlig kobber
+ Name[nds]=Kopper eenfach
++Name[ne]=सादा तामा
+ Name[nn]=Vanleg kopar
+ Name[pl]=Zwykła miedź
+ Name[pt]=Cobre Simples
+@@ -46,6 +47,7 @@
+ Name[zh_CN]=金色年华
+ Name[zh_TW]=單銅色
+ Comment=An elegant, uplifting presentation
++Comment[bg]=Елегантна, раздвижена презентация
+ Comment[ca]=Una presentació elegant i inspiradora
+ Comment[cy]=Cyflwyniad cain dycrhafol
+ Comment[da]=En elegant, opløftende præsentation
+@@ -63,6 +65,7 @@
+ Comment[lv]=Eleganta, pacilājoša prezentācija
+ Comment[nb]=En elegant, stimulerende presentasjon
+ Comment[nds]=En smuck, kommodig Presentatschoon
++Comment[ne]=मनोहर; प्रस्तुतिकरण उत्थान गर्दै
+ Comment[nl]=Een elegante en verheffende presentatie
+ Comment[pl]=Elegancka, dostojna prezentacja
+ Comment[pt]=Uma apresentação elegante e positiva
+--- kpresenter/templates/Screenpresentations/BlueBreezeDouble.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/templates/Screenpresentations/BlueBreezeDouble.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -27,6 +27,7 @@
+ Name[lv]=Zilā dubult brīze
+ Name[nb]=Dobbel blå bris
+ Name[nds]=Blaag Bries, dubbelt
++Name[ne]=नीलो डबल अंगार
+ Name[nn]=Blå bris dobbel
+ Name[pl]=Podwójna niebieska bryza
+ Name[pt]=Brisa Azul Duplo
+@@ -48,6 +49,7 @@
+ Name[zh_TW]=雙頁藍色和風
+ Name[zu]=Uphindo kabili lomoya oluhlaza (okwesibhaka-bhaka)
+ Comment=A peaceful presentation with a title and two text columns
++Comment[bg]=Семпла презентация със заглавие и две текстови колони
+ Comment[ca]=Una presentació plàcida amb un títol i dues columnes de text
+ Comment[cy]=Cyflwyniad heddychlon efo teitl a dwy golofn destun
+ Comment[da]=En fredfyldt præsentation med en overskrift og to tekstsøjler
+@@ -63,10 +65,11 @@
+ Comment[is]=Einföld kynning með titil og tvo textadálka
+ Comment[it]=Una presentazione rilassante con un titolo e due colonne
+ Comment[ja]=タイトルとふたつのテキスト欄で構成するおとなしいプレゼンテーション
+-Comment[km]=ការបង្ហាញស្ងប់ស្ងាត់ដែលមានចំណងជើង និង ជួរឈរអត្ថបទពីរ
++Comment[km]=ការបង្ហាញស្ងប់ស្ងាត់ដែលមានចំណងជើង និងជួរឈរអត្ថបទពីរ
+ Comment[lv]=Mierīga prezentācija ar nosaukumu un divām teksta kolonnām
+ Comment[nb]=En fredelig presentasjon med en tittel og to tekstspalter
+ Comment[nds]=En sinnig Presentatschoon mit en Titel un twee Textstriepen
++Comment[ne]=शीर्षक र दुई वटा पाठ स्तम्भहरूसँग शान्त प्रस्तुतिकरण
+ Comment[nl]=Een rustige presentatie met een titel en twee tekstkolommen
+ Comment[pl]=Spokojna prezentacja z tytułem oraz dwiema kolumnami na tekst
+ Comment[pt]=Uma apresentação pacífica com um título e duas colunas de texto
+--- kpresenter/templates/Screenpresentations/kde2.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/templates/Screenpresentations/kde2.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,9 +4,10 @@
+ URL=.source/kde2.kpt
+ Name=KDE 2
+ Name[af]=Kde 2
+-Name[bg]=КДЕ 2
+ Name[hi]=केडीई 2
++Name[ne]=KDE २
+ Comment=A presentation with KDE 2 theming
++Comment[bg]=Презентация с теми за KDE 2
+ Comment[ca]=Una presentació amb el tema de KDE 2
+ Comment[cy]=Cyflwyniad efo thema KDE 2
+ Comment[da]=En præsentation med KDE 2 tema
+@@ -26,6 +27,7 @@
+ Comment[km]=ការបង្ហាញដែលមានស្បែក KDE 2
+ Comment[nb]=En presentasjon med KDE2-drakt
+ Comment[nds]=En Presentatschoon mit dat Orginaalmuster vun KDE 2
++Comment[ne]=KDE २ विषयवस्तु सँग प्रस्तुतिकरण
+ Comment[nl]=Een presentatie met het thema van KDE 2
+ Comment[pl]=Prezentacja z motywem z KDE 2
+ Comment[pt]=Uma apresentação com o tema do KDE 2
+--- kpresenter/templates/Screenpresentations/BlueBreezeSingle.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/templates/Screenpresentations/BlueBreezeSingle.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -27,6 +27,7 @@
+ Name[lv]=Viena zilā brīze
+ Name[nb]=Enkel blå bris
+ Name[nds]=Blaag Bries, eenfach
++Name[ne]=नीलो एक्लो अंगार
+ Name[nn]=Blå bris enkel
+ Name[pl]=Pojedyncza niebieska bryza
+ Name[pt]=Brisa Azul Simples
+@@ -48,6 +49,7 @@
+ Name[zh_TW]=單頁藍色和風
+ Name[zu]=Owodwa Umoya Oluhlaza (okwesibhaka-bhaka)
+ Comment=A peaceful presentation with a title and single large text area
++Comment[bg]=Семпла презентация със заглавие и място за текст с едър шрифт
+ Comment[ca]=Una presentació plàcida amb un títol i una gran àrea de text
+ Comment[cy]=Cyflwyniad heddychlon efo teitl ac ardal testun mawr sengl
+ Comment[da]=En fredfyldt præsentation med en overskrift og et enkelt stort tekstområde
+@@ -63,10 +65,11 @@
+ Comment[is]=Einföld kynning með titil og eitt stórt textasvæði
+ Comment[it]=Una presentazione rilassante con un titolo e una sola grande area di testo
+ Comment[ja]=タイトルとひとつの大きなテキスト欄で構成するおとなしいプレゼンテーション
+-Comment[km]=ការបង្ហាញមានចំណងជើងនិង អត្ថបទធំតែមួយគត់
++Comment[km]=ការបង្ហាញមានចំណងជើងនិងអត្ថបទធំតែមួយគត់
+ Comment[lv]=Mierīga prezentācija ar virsrakstu un vienu lielu teksta apgabalu
+ Comment[nb]=En fredelig presentasjon med en tittel og ett stort tekstområde
+ Comment[nds]=En sinnig Presentatschoon mit Titel un en groot Textrebeet
++Comment[ne]=शीर्षक र एक्लो लामो पाठ क्षेत्रसँग शान्त प्रस्तुतिकरण
+ Comment[nl]=Een rustige presentatie met een titel en veel ruimte voor tekst
+ Comment[pl]=Spokojna prezentacja z tytułem oraz kolumną na tekst
+ Comment[pt]=Uma apresentação pacífica com um título e uma única área de texto grande
+--- kpresenter/templates/Screenpresentations/kde3.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/templates/Screenpresentations/kde3.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,7 +3,9 @@
+ Type=Link
+ URL=.source/kde3.kpt
+ Name=KDE 3
++Name[ne]=KDE ३
+ Comment=A presentation with KDE 3 theming
++Comment[bg]=Презентация с теми за KDE 3
+ Comment[ca]=Una presentació amb el tema de KDE 3
+ Comment[cy]=Cyflwyniad efo thema KDE 3
+ Comment[da]=En præsentation med KDE 3 tema
+@@ -23,6 +25,7 @@
+ Comment[km]=ការបង្ហាញដែលមានស្បែក KDE 3
+ Comment[nb]=En presentasjon med KDE3-drakt
+ Comment[nds]=En Presentatschoon mit dat Orginaalmuster vun KDE 3
++Comment[ne]=KDE ३ विषयवस्तु सँग प्रस्तुतिकरण
+ Comment[nl]=Een presentatie met het thema van KDE 3
+ Comment[pl]=Prezentacja z motywem z KDE 3
+ Comment[pt]=Uma apresentação com o tema do KDE 3
+--- kpresenter/templates/Screenpresentations/GradientBlueRed.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/templates/Screenpresentations/GradientBlueRed.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -37,6 +37,7 @@
+ Name[mt]=Gradjent Blù-Aħmar
+ Name[nb]=Overgang mellom blå og rød
+ Name[nds]=Klöörövergang vun Blaag na Root
++Name[ne]=ग्रेडियन्ट नीलो-रातो
+ Name[nl]=Blauw-rode kleurverloop
+ Name[nn]=Overgang blå-raud
+ Name[pl]=Niebiesko-czerwony gradient
+@@ -61,6 +62,7 @@
+ Name[zh_TW]=漸層 藍-紅
+ Name[zu]=Ithambile ngendlela eliluhlaza-bomvu (okwesibhaka-bhaka)
+ Comment=A presentation themed for the evening sky
++Comment[bg]=Презентация с тема вечерно небе
+ Comment[ca]=Una presentació inspirada en el cel del vespre
+ Comment[cy]=Cyflwyniad efo thema awyr y machlud
+ Comment[da]=En præsentation med temaet aftenhimmel
+@@ -80,6 +82,7 @@
+ Comment[lv]=Vakara debess stila prezentācija
+ Comment[nb]=En presentasjon med kveldshimmelen som tema
+ Comment[nds]=En Presentatschoon mit Avendhimmel-Muster
++Comment[ne]=बेलुकी आकाशका लागि प्रस्तुतिकरण विषयवस्तु
+ Comment[nl]=Een presentatie met als thema een avondhemel
+ Comment[pl]=Prezentacja inspirowana wieczornym niebem
+ Comment[pt]=Uma apresentação com o tema do anoitecer
+--- kpresenter/templates/Screenpresentations/kde.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/templates/Screenpresentations/kde.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,10 +4,10 @@
+ URL=.source/kde.kpt
+ Name=KDE
+ Name[af]=Kde
+-Name[bg]=КДЕ
+ Name[hi]=केडीई
+ Name[sk]=KDEComment=Prezentácia
+ Comment=A presentation with original KDE theming
++Comment[bg]=Презентация с оригинални теми за KDE
+ Comment[ca]=Una presentació amb el tema original de KDE
+ Comment[cy]=Cyflwyniad efo thema KDE gwreiddiol
+ Comment[da]=En præsentation med KDE-originaltema
+@@ -27,6 +27,7 @@
+ Comment[km]=ការបង្ហាញដែលមានស្បែក KDE ដើម
+ Comment[nb]=En presentasjon med original KDE-drakt
+ Comment[nds]=En Presentatschoon mit dat Orginaalmuster vun KDE
++Comment[ne]=मौलिक KDE विषयवस्तुसँग प्रस्तुतिकरण
+ Comment[nl]=Een presentatie met het originele thema van KDE
+ Comment[pl]=Prezentacja z oryginalnym motywem KDE
+ Comment[pt]=Uma apresentação com o tema original do KDE
+--- kpresenter/templates/Screenpresentations/TotallyNewProduct.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kpresenter/templates/Screenpresentations/TotallyNewProduct.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -35,6 +35,7 @@
+ Name[mt]=Prodott Totalment Ġdid
+ Name[nb]=Helt nytt produkt
+ Name[nds]=Heel nieg Produkt
++Name[ne]=सम्पूर्ण नयाँ उत्पादन
+ Name[nl]=Totaal nieuw product
+ Name[nn]=Heilt nytt produkt
+ Name[pl]=Całkowicie nowy produkt
+@@ -60,6 +61,7 @@
+ Name[zh_TW]=新產品
+ Name[zu]=Entsha sha Iprodakhti
+ Comment=An informal, green-swirl presentation
++Comment[bg]=Информационна презентация в зелено
+ Comment[ca]=Una presentació informal, remolí verd
+ Comment[cy]=Cyflwyniad anffurfiol â throelliadau gwyrdd
+ Comment[da]=En uformel, grøn hvirvlende præsentation
+@@ -76,6 +78,7 @@
+ Comment[km]=ការបង្ហាញកំនួចពណ៌បៃតងធម្មតា
+ Comment[nb]=En uformell presentasjon med grønne hvirvler
+ Comment[nds]=En dwangloos, gröön-küselig Presentatschoon
++Comment[ne]=एउटा अनौपचारिक, हरियो-घुमाउरो प्रस्तुतिकरण
+ Comment[nl]=Een informele, groenachtige presentatie
+ Comment[pl]=Nieformalna, zazieleniona prezentacja
+ Comment[pt]=Uma apresentação informal com um remoinho verde
+--- kspread/kspread.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kspread/kspread.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -6,6 +6,7 @@
+ Name[fo]=KRokni
+ Name[hi]=के-स्प्रेड
+ Name[lo]=ເຈ້ຍຄິດໄລ່ K
++Name[ne]=केडीई स्प्रिड
+ Name[sv]=Kspread
+ Name[th]=กระดาษคำนวณ K
+ Name[ven]=U phadaladza ha K
+@@ -25,7 +26,7 @@
+ GenericName[el]=Λογιστικά φύλλα
+ GenericName[eo]=Tabelkalkulilo
+ GenericName[es]=Hojas de cálculo
+-GenericName[et]=Tabelitöötlus
++GenericName[et]=Tabelarvutus
+ GenericName[eu]=Kalkulu-orriak
+ GenericName[fa]=صفحات گسترده
+ GenericName[fi]=Laskentataulukot
+@@ -47,6 +48,7 @@
+ GenericName[ms]=Hamparan
+ GenericName[nb]=Regneark
+ GenericName[nds]=Tabellenutreken
++GenericName[ne]=स्प्रिडसिट
+ GenericName[nn]=Rekneark
+ GenericName[pl]=Arkusze kalkulacyjne
+ GenericName[pt]=Folhas de cálculo
+--- kspread/kspreadpart.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kspread/kspreadpart.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,13 +1,14 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=KOffice Spreadsheet Component
++Name[bg]=Компонент за електронна таблица за KOffice
+ Name[ca]=Component de full de càlcul de KOffice
+ Name[cy]=Cydran Taenlen KOffice
+ Name[da]=KOffice regnearkkomponent
+ Name[de]=KOffice-Komponente für Tabellenkalkulation
+ Name[el]=Συστατικό λογιστικών φύλλων του KOffice
+ Name[es]=Componente de hoja de cálculo de KOffice
+-Name[et]=KOffice'i tabelitöötluse komponent
++Name[et]=KOffice'i tabelarvutuse komponent
+ Name[eu]=KOffice kalkulu-orri osagaia
+ Name[fa]=مؤلفۀ صفحه گستردۀ KOffice
+ Name[fi]=KOfficen taulukkolaskentaohjelma
+@@ -24,6 +25,7 @@
+ Name[ms]=Komponen Hamparan KOffice
+ Name[nb]=Regneark-komponent for KOffice
+ Name[nds]=KOffice-Komponent för't Tabellenutreken
++Name[ne]=केडीई कार्यालय स्प्रिडसिट अवयव
+ Name[nl]=Koffice Spreadsheet-component
+ Name[nn]=Rekneark-komponent for KOffice
+ Name[pl]=Komponent arkusza kalkulacyjnego dla KOffice
+@@ -64,7 +66,7 @@
+ GenericName[el]=Λογιστικά φύλλα
+ GenericName[eo]=Tabelkalkulilo
+ GenericName[es]=Hojas de cálculo
+-GenericName[et]=Tabelitöötlus
++GenericName[et]=Tabelarvutus
+ GenericName[eu]=Kalkulu-orriak
+ GenericName[fa]=صفحات گسترده
+ GenericName[fi]=Laskentataulukot
+@@ -86,6 +88,7 @@
+ GenericName[ms]=Hamparan
+ GenericName[nb]=Regneark
+ GenericName[nds]=Tabellenutreken
++GenericName[ne]=स्प्रिडसिट
+ GenericName[nn]=Rekneark
+ GenericName[pl]=Arkusze kalkulacyjne
+ GenericName[pt]=Folhas de cálculo
+--- kspread/plugins/scripting/kspreadscripting.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kspread/plugins/scripting/kspreadscripting.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Scripting plugin
++Name[bg]=Приставка за скриптове
+ Name[ca]=Connector de seqüenciació
+ Name[da]=Scriptplugin
+ Name[de]=Skripting-Plugin
+@@ -19,6 +20,7 @@
+ Name[km]=កម្មវិធីជំនួយសម្រាប់ស្គ្រីប
+ Name[nb]=Programtillegg for skripting
+ Name[nds]=Skriptmoduul
++Name[ne]=प्लगइन स्क्रिप्ट गर्दै
+ Name[nl]=Scriptplugin
+ Name[pl]=Wtyczka obsługi języków skryptowych
+ Name[pt]='Plugin' de programação
+@@ -34,6 +36,7 @@
+ Name[zh_CN]=脚本插件
+ Name[zh_TW]=命令稿外掛程式
+ Comment=Allow execution of scripts
++Comment[bg]=Изпълнение на скриптове
+ Comment[ca]=Permet l'execució de seqüències
+ Comment[da]=Tillad kørsel af script
+ Comment[de]=Ermöglicht das Ausführen von Skripten
+@@ -52,6 +55,7 @@
+ Comment[lv]=Atļaut skriptu izpildi
+ Comment[nb]=Tillater skriptkjøring
+ Comment[nds]=Skripten utföhren
++Comment[ne]=स्क्रिप्टको कार्यान्वयनलाई अनुमति दिनुहोस्
+ Comment[nl]=Hiermee kunnen scripts uitgevoerd worden
+ Comment[pl]=Zezwala na wykonywanie skryptów
+ Comment[pt]=Permitir executar programas ou 'scripts'
+--- kspread/templates/HomeFamily/BMI.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kspread/templates/HomeFamily/BMI.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -34,6 +34,7 @@
+ Name[ms]=Kalkulator BMI
+ Name[nb]=BMI-kalkulator
+ Name[nds]=Liefmaat-Reekner
++Name[ne]=बीएमआई गणकयन्त्र
+ Name[nl]=BMI-calculator
+ Name[nn]=BMI-kalkulator
+ Name[pl]=Kalkulator wskaźnika masy ciała (BMI)
+@@ -55,6 +56,7 @@
+ Name[zh_CN]=BMI 计算器
+ Name[zh_TW]=BMI 計算機
+ Comment=Simple Body Mass Index Calculator
++Comment[bg]=Калкулатор за изчисление на индекса на теглото на тяло
+ Comment[ca]=Calculadora senzilla per a índexs de massa corporal.
+ Comment[cy]=Cyfrifiannell Indecs Mas Corff Syml
+ Comment[da]=Simpel Body Mass Index regnemaskine
+@@ -73,6 +75,7 @@
+ Comment[km]=កម្មវិធីគណនាលិបិក្រមម៉ាស់តួទូទៅ
+ Comment[nb]=Enkel kalkulator for kroppsmasseindeks
+ Comment[nds]=Eenfach Liefmaat-Reekner
++Comment[ne]=साधारण मुख्य बढी अनुक्रमणिका गणकयन्त्र
+ Comment[nl]=Eenvoudige berekening van lichaamsgewichtindex (BMI)
+ Comment[pl]=Prosty kalkulator wskaźnika masy ciała
+ Comment[pt]=Calculadora Simples do Índice de Massa Corporal
+--- kspread/templates/HomeFamily/.directory (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kspread/templates/HomeFamily/.directory (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Name=Home and Family
+-Name[bg]=Къща и семейство
++Name[bg]=Дом и семейство
+ Name[br]=Kêr ha Tud
+ Name[ca]=Domicili i família
+ Name[cy]=Cartref a Theulu
+@@ -18,10 +18,11 @@
+ Name[is]=Heimili og fjölskylda
+ Name[it]=Casa e famiglia
+ Name[ja]=家庭
+-Name[km]=ផ្ទះ និង គ្រួសារ
++Name[km]=ផ្ទះ និងគ្រួសារ
+ Name[lv]=Māja un ģimene
+ Name[nb]=Hjem og familie
+ Name[nds]=Tohuus un Familie
++Name[ne]=गृह र परिवार
+ Name[nl]=Thuis en familie
+ Name[pl]=Dom i rodzina
+ Name[pt]=Casa e Família
+--- kspread/templates/HomeFamily/MenuPlan.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kspread/templates/HomeFamily/MenuPlan.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -26,6 +26,7 @@
+ Name[ms]=Pelan Menu
+ Name[nb]=Menyplan
+ Name[nds]=Spieskoort
++Name[ne]=मेनु योजना
+ Name[nl]=Menuplan
+ Name[nn]=Menyplan
+ Name[pl]=Plan menu
+--- kspread/templates/HomeFamily/CreditCardTracker.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kspread/templates/HomeFamily/CreditCardTracker.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -28,6 +28,7 @@
+ Name[ms]=Pengesan Kad Kredit
+ Name[nb]=Kredittkortbruk
+ Name[nds]=Kreditkoort-Programm
++Name[ne]=क्रेडिट कार्ड खोजी
+ Name[nl]=Creditkaart-programma
+ Name[nn]=Kredittkortbruk
+ Name[pl]=Zestawienie transakcji kartą kredytową
+--- kspread/templates/HomeFamily/VacationChecklist.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kspread/templates/HomeFamily/VacationChecklist.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -27,6 +27,7 @@
+ Name[ms]=Senarai Semak Percutian
+ Name[nb]=Sjekkliste for ferie
+ Name[nds]=Oorlööf-Pröövlist
++Name[ne]=बिदा जाँचसूची
+ Name[nl]=Vakantie-controlelijst
+ Name[nn]=Sjekkliste for ferie
+ Name[pl]=Wakacyjny spis kontrolny
+--- kspread/templates/Business/.directory (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kspread/templates/Business/.directory (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -29,6 +29,7 @@
+ Name[lv]=Bizness
+ Name[nb]=Firmadrift
+ Name[nds]=Weertschap
++Name[ne]=व्यवसाय
+ Name[nl]=Zakelijk
+ Name[pl]=Biznes
+ Name[pt]=Negócios
+--- kspread/templates/Business/BalanceSheet.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kspread/templates/Business/BalanceSheet.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -27,6 +27,7 @@
+ Name[ms]=Kunci Kira-kira
+ Name[nb]=Balanse
+ Name[nds]=Afreken opstellen
++Name[ne]=वासलात
+ Name[nl]=Balans-werkblad
+ Name[nn]=Balanseark
+ Name[pl]=Arkusz salda
+--- kspread/templates/Business/Invoice.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kspread/templates/Business/Invoice.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -31,6 +31,7 @@
+ Name[ms]=Invois
+ Name[nb]=Faktura
+ Name[nds]=Reken/Tell
++Name[ne]=बीजक
+ Name[nl]=Rekening
+ Name[nn]=Faktura
+ Name[pl]=Faktura
+--- kspread/templates/Business/ExpenseReport.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kspread/templates/Business/ExpenseReport.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -33,6 +33,7 @@
+ Name[ms]=Laporan Belanja
+ Name[nb]=Utgiftsrapport
+ Name[nds]=Utgavenafreken
++Name[ne]=खर्च प्रतिवेदन
+ Name[nl]=Uitgavenrapport
+ Name[nn]=Utgiftsrapport
+ Name[pl]=Raport wydatków
+--- kspread/templates/Business/PackingSlip.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kspread/templates/Business/PackingSlip.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -24,6 +24,7 @@
+ Name[ms]=Slip Pembungkusan
+ Name[nb]=Pakkseddel
+ Name[nds]=Packzedel
++Name[ne]=प्याकिङ्ग स्लिप
+ Name[nl]=Pakbon
+ Name[nn]=Pakksetel
+ Name[pl]=Druk wysyłki
+--- kspread/templates/Business/PriceQuotation.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kspread/templates/Business/PriceQuotation.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -26,6 +26,7 @@
+ Name[ms]=Sebut Harga
+ Name[nb]=Pristilbud
+ Name[nds]=Anbott
++Name[ne]=मूल्य उद्धरण
+ Name[nl]=Prijsopgave
+ Name[nn]=Pristilbod
+ Name[pl]=Rachunek
+--- kspread/templates/General/.directory (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kspread/templates/General/.directory (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,7 +2,7 @@
+ Name=General
+ Name[af]=Algemeen
+ Name[ar]=عام
+-Name[bg]=Базов
++Name[bg]=Основен
+ Name[br]=Pennañ
+ Name[bs]=Općenito
+ Name[cy]=Cyffredinol
+@@ -29,6 +29,7 @@
+ Name[mt]=Ġenerali
+ Name[nb]=Generelt
+ Name[nds]=Allgemeen
++Name[ne]=सामान्य
+ Name[nl]=Algemeen
+ Name[pl]=Ogólny
+ Name[pt]=Geral
+--- kspread/templates/General/Worksheet.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kspread/templates/General/Worksheet.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -36,6 +36,7 @@
+ Name[mt]=Folja vojta
+ Name[nb]=Tomt arbeidsark
+ Name[nds]=Leddig Arbeitblatt
++Name[ne]=खाली कार्यपाना
+ Name[nl]=Leeg werkblad
+ Name[nn]=Tomt arbeidsark
+ Name[pl]=Pusty arkusz
+--- kspread/templates/General/StudentIDCard.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kspread/templates/General/StudentIDCard.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -33,6 +33,7 @@
+ Name[ms]=Kad ID Pelajar
+ Name[nb]=Studentkort
+ Name[nds]=Hoochschoolutwies
++Name[ne]=विद्यार्थी आईडी कार्ड
+ Name[nl]=Studentenkaart
+ Name[nn]=Studentkort
+ Name[pl]=Studencka karta identyfikacyjna
+--- kplato/reports/tasklist.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kplato/reports/tasklist.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=List of Tasks
++Name[bg]=Списък със задачи
+ Name[ca]=Llista de tasques
+ Name[da]=Opgaveliste
+ Name[de]=Liste von Aufgaben
+@@ -12,6 +13,7 @@
+ Name[fr]=Liste de tâches
+ Name[gl]=Lista de Tarefas
+ Name[he]=רשימת מטלות
++Name[hr]=Popis zadataka
+ Name[hu]=Feladatlista
+ Name[is]=Listi yfir verkefni
+ Name[it]=Elenco di attività
+@@ -20,6 +22,7 @@
+ Name[lv]=Darbu saraksts
+ Name[nb]=Oppgaveliste
+ Name[nds]=Opgavenlist
++Name[ne]=कार्यहरूको सूची
+ Name[nl]=Lijst van taken
+ Name[pl]=Lista zadań
+ Name[pt]=Lista de Tarefas
+--- kplato/reports/resourcelist.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kplato/reports/resourcelist.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=List of Resources
++Name[bg]=Списък с ресурси
+ Name[ca]=Llista de recursos
+ Name[da]=Liste af ressourcer
+ Name[de]=List von Ressourcen
+@@ -12,6 +13,7 @@
+ Name[fr]=Liste de ressources
+ Name[gl]=Lista de Recursos
+ Name[he]=רשימת מאגרים
++Name[hr]=Popis resursa
+ Name[hu]=Erőforráslista
+ Name[is]=Listi yfir auðlindir
+ Name[it]=Elenco di risorse
+@@ -20,6 +22,7 @@
+ Name[lv]=Resursu saraksts
+ Name[nb]=Ressursliste
+ Name[nds]=Ressourcenlist
++Name[ne]=संसाधनहरूको सूची
+ Name[nl]=Lijst van gegevensbronnen
+ Name[pl]=Lista zasobów
+ Name[pt]=Acoplador de Histórico
+--- kplato/kplatopart.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kplato/kplatopart.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=KOffice Project Management Component
++Name[bg]=Компонент за управление на компоненти в KOffice
+ Name[ca]=Component de gestió de projectes de KOffice
+ Name[cy]=Cydran Rheoli Cywaith KOffice
+ Name[da]=KOffice projekthåndteringskomponent
+@@ -14,6 +15,7 @@
+ Name[gl]=Componente de Xestión de Proxectos de KOffice
+ Name[he]=רכיב של KOffice לניהול פרוייקטים
+ Name[hi]=के-ऑफ़िस परियोजना प्रबंधक अवयव
++Name[hr]=KOffice komponenta upravljanja projektima
+ Name[hu]=KOffice projektkezelő komponens
+ Name[is]=Verkefnisstjórnarhluti KOffice
+ Name[it]=Componente per la gestione dei progetti di KOffice
+@@ -23,6 +25,7 @@
+ Name[ms]=Komponen Pengurusan Projek KOffice
+ Name[nb]=KOffice-komponent for prosjektstyring
+ Name[nds]=KOffice-Komponent för Projektpleeg
++Name[ne]=केडीई कार्यालय परियोजना व्यवस्थापन अवयव
+ Name[nl]=Koffice Projectbeheer Component
+ Name[nn]=KOffice-komponent for prosjektstyring
+ Name[pl]=Komponent zarządzania projektami dla KOffice
+@@ -62,6 +65,7 @@
+ GenericName[ga]=Bainisteoireacht Tionscadal
+ GenericName[gl]=Xestión de Proxectos
+ GenericName[he]=ניהול פרוייקטים
++GenericName[hr]=Upravljanje projektima
+ GenericName[hu]=Projektkezelő
+ GenericName[is]=Verkefnisstjórn
+ GenericName[it]=Gestione dei progetti
+@@ -71,6 +75,7 @@
+ GenericName[ms]=Pengurusan Projek
+ GenericName[nb]=Prosjektstyring
+ GenericName[nds]=Projektpleeg
++GenericName[ne]=परियोजना व्यवस्थापन
+ GenericName[nl]=Projectbeheer
+ GenericName[nn]=Prosjektstyring
+ GenericName[pl]=Zarządzanie projektami
+--- kplato/Makefile.am (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kplato/Makefile.am (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -123,7 +123,7 @@
+
+ ## NOTE: extractattr needs <Label & Text on same line!
+ messages: rc.cpp
+- $(EXTRACTATTR) --attr=Label,Text reports/*.ktf >>rp.cpp
++ $(EXTRACTATTR) --attr=Label,Text reports/*.ktf >>rc.cpp
+ $(XGETTEXT) rc.cpp *.cc kptaboutdata.h -o $(podir)/kplato.pot
+
+ kde_services_DATA = kplatopart.desktop
+--- kplato/kplato.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kplato/kplato.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Name=KPlato
+ Name[eo]=Prokektplanilo
+ Name[hi]=के-प्लेटो
++Name[ne]=केडीई प्लाटो
+ Name[sv]=Kplato
+ Name[zh_TW]=KDE 繪圖
+ GenericName=Project Management
+@@ -21,6 +22,7 @@
+ GenericName[ga]=Bainisteoireacht Tionscadal
+ GenericName[gl]=Xestión de Proxectos
+ GenericName[he]=ניהול פרוייקטים
++GenericName[hr]=Upravljanje projektima
+ GenericName[hu]=Projektkezelő
+ GenericName[is]=Verkefnisstjórn
+ GenericName[it]=Gestione dei progetti
+@@ -30,6 +32,7 @@
+ GenericName[ms]=Pengurusan Projek
+ GenericName[nb]=Prosjektstyring
+ GenericName[nds]=Projektpleeg
++GenericName[ne]=परियोजना व्यवस्थापन
+ GenericName[nl]=Projectbeheer
+ GenericName[nn]=Prosjektstyring
+ GenericName[pl]=Zarządzanie projektami
+--- kplato/templates/Simple/.directory (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kplato/templates/Simple/.directory (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -2,7 +2,7 @@
+ Name=Simple
+ Name[af]=Eenvoudige
+ Name[az]=Bəsit
+-Name[bg]=Семпъл
++Name[bg]=Обикновен
+ Name[br]=Eeun
+ Name[bs]=Jednostavno
+ Name[cy]=Syml
+@@ -31,6 +31,7 @@
+ Name[mt]=Sempliċi
+ Name[nb]=Enkel
+ Name[nds]=Eenfach
++Name[ne]=साधारण
+ Name[nl]=Eenvoudig
+ Name[pl]=Prosty
+ Name[pt]=Simples
+--- kplato/templates/Simple/8HourDay-40HourWeek.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kplato/templates/Simple/8HourDay-40HourWeek.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=Link
+ URL=.source/8HourDay-40HourWeek.kplatot
+ Name=8 hour day, 40 hour week
++Name[bg]=8 часа дневно, 40 часа седмично
+ Name[ca]=Dia de 8 hores, setmana de 40 hores
+ Name[da]=8-timers dag, 40-timers uge
+ Name[de]=8 Stunden / Tag, 40 Stunden / Woche
+@@ -22,6 +23,7 @@
+ Name[lv]=8 stundu diena, 40 stundu nedēļa
+ Name[nb]=8-timers dag, 40-timers uke
+ Name[nds]=8 Stünnen-Dag, 40 Stünnen-Week
++Name[ne]=दिनको ८ घण्टा, हप्ताको ४० घण्टा
+ Name[nl]=8-urige dag, 40-urige week
+ Name[pl]=8 godzin na dzień, 40 na tydzień
+ Name[pt]=8 horas por dia, com semana de 40 horas
+--- kplato/templates/Simple/Plain.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ kplato/templates/Simple/Plain.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -41,6 +41,7 @@
+ Name[ms]=Biasa
+ Name[nb]=Vanlig
+ Name[nds]=Eenfach
++Name[ne]=सादा
+ Name[nl]=Normaal
+ Name[nn]=Vanleg
+ Name[pl]=Zwykły
+--- templates/SpreadSheet.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ templates/SpreadSheet.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -29,6 +29,7 @@
+ Name[ms]=Dokumen Hamparan...
+ Name[nb]=Regneark ...
+ Name[nds]=Tabellenutreken-Dokment...
++Name[ne]=स्प्रेडसिट कागजात...
+ Name[nl]=Spreadsheetdocument...
+ Name[nn]=Rekneark ...
+ Name[pl]=Arkusz kalkulacyjny...
+@@ -83,6 +84,7 @@
+ Comment[ms]=Dokumen KSpread Baru:
+ Comment[nb]=Nytt KSpread-dokument:
+ Comment[nds]=Nieg KSpread-Dokment:
++Comment[ne]=नयाँ केडीई स्प्रिड कागजात:
+ Comment[nl]=Nieuw KSpread-document:
+ Comment[nn]=Nytt KSpread-dokument:
+ Comment[pl]=Nowy arkusz KSpread:
+--- templates/Illustration.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ templates/Illustration.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -27,6 +27,7 @@
+ Name[ms]=Dokumen Ilustrasi...
+ Name[nb]=Illustrasjon ...
+ Name[nds]=Afbillen-Dokment...
++Name[ne]=दृष्टान्त कागजात...
+ Name[nl]=Illustratiedocument...
+ Name[nn]=Illustrasjon ...
+ Name[pl]=Ilustracja...
+@@ -76,6 +77,7 @@
+ Comment[ms]=Dokumen Karbon 14 Baru:
+ Comment[nb]=Nytt Karbon14-dokument:
+ Comment[nds]=Nieg Karbon14-Dokment
++Comment[ne]=नयाँ कार्बन१४ कागजात:
+ Comment[nl]=Nieuw Karbon14-document:
+ Comment[nn]=Nytt Karbon14-dokument:
+ Comment[pl]=Nowy dokument Karbon14:
+--- templates/Presentation.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ templates/Presentation.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -28,6 +28,7 @@
+ Name[ms]=Dokumen Persembahan...
+ Name[nb]=Presentasjon ...
+ Name[nds]=Presentatschoon-Dokment...
++Name[ne]=प्रस्तुतिकरण कागजात...
+ Name[nl]=Presentatie-document...
+ Name[nn]=Presentasjon ...
+ Name[pl]=Prezentacja...
+@@ -81,6 +82,7 @@
+ Comment[ms]=Dokumen persembahan KPresenter Baru:
+ Comment[nb]=Ny KPresenter-presentasjon:
+ Comment[nds]=Nieg Presentatschoon-Dokment för KPresenter:
++Comment[ne]=नयाँ केडीई प्रस्तुतकर्ता प्रस्तुतिकरण कागजात:
+ Comment[nl]=Nieuw KPresenter-presentatiedocument:
+ Comment[nn]=Ny KPresenter-presentasjon:
+ Comment[pl]=Nowa prezentacja KPresenter:
+--- templates/TextDocument.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ templates/TextDocument.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -29,6 +29,7 @@
+ Name[ms]=Dokumen Teks...
+ Name[nb]=Tekstdokument ...
+ Name[nds]=Textdokment...
++Name[ne]=पाठ कागजात...
+ Name[nl]=Tekstdocument...
+ Name[nn]=Tekstdokument ...
+ Name[pa]=ਪਾਠ ਦਸਤਾਵੇਜ਼...
+@@ -84,6 +85,7 @@
+ Comment[ms]=Dokumen KWord baru:
+ Comment[nb]=Nytt KWord-dokument:
+ Comment[nds]=Nieg KWord-Dokment:
++Comment[ne]=नयाँ केडीई शब्द कागजात:
+ Comment[nl]=Nieuw KWord-document:
+ Comment[nn]=Nytt KWord-dokument:
+ Comment[pl]=Nowy dokument KWord:
+--- karbon/tools/karbondefaulttools.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ karbon/tools/karbondefaulttools.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -28,6 +28,7 @@
+ Name[ms]=Alat Piawai
+ Name[nb]=Standardverktøy
+ Name[nds]=Standardwarktüüch
++Name[ne]=पूर्वनिर्धारित उपकरणहरू
+ Name[nl]=Standaardgereedschappen
+ Name[nn]=Standardverktøy
+ Name[pl]=Domyślne narzędzia
+--- karbon/data/karbon.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ karbon/data/karbon.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -4,6 +4,7 @@
+ Name[eo]=Karbono14
+ Name[hi]=कार्बन 14
+ Name[lo]=ຄາຣ໌ບອບ14
++Name[ne]=कार्बन१४
+ Name[th]=คาร์บอน14
+ Exec=karbon %u
+ GenericName=Scalable Graphics
+@@ -38,6 +39,7 @@
+ GenericName[mt]=Grafika tiddaqqas
+ GenericName[nb]=Skalerbar grafikk
+ GenericName[nds]=Vektorgrafik
++GenericName[ne]=मापनयोग्य ग्राफिक्स
+ GenericName[nl]=Vectorafbeeldingen
+ GenericName[nn]=Skalerbar grafikk
+ GenericName[pl]=Skalowalna grafika
+--- karbon/data/karbon_module.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ karbon/data/karbon_module.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -3,6 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=Karbon/CoreModule
+ Comment=Core functionality module for Karbon
++Comment[bg]=Модул с основната функционалност на Karbon
+ Comment[ca]=Mòdul principal de funcionabilitat per a Karbon
+ Comment[cy]=Modiwl swyddogaeth craidd ar gyfer Karbon
+ Comment[da]=Kernefunktionalitetsmodul for Karbon
+@@ -23,6 +24,7 @@
+ Comment[lv]=Pamatfunkcionalitātes modulis priekš Karbon
+ Comment[nb]=Karbon-modul for kjernefunksjonalitet
+ Comment[nds]=Karnmoduul för Karbon
++Comment[ne]=कार्बनका लागि कोर कार्यात्मक मोड्युल
+ Comment[nl]=Kernfunctionaliteitmodule voor Karbon
+ Comment[pl]=Moduł podstawowej funkcjonalności dla Karbon
+ Comment[pt]=Módulo de funcionalidade de base para o Karbon
+--- karbon/data/karbonpart.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ karbon/data/karbonpart.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=KOffice Scalable Graphics Component
++Name[bg]=Компонент за векторна графика в KOffice
+ Name[ca]=Component de gràfics escalables de KOffice
+ Name[cs]=SVG komponenta pro KOffice
+ Name[cy]=Cydran Graffeg Graddadwy KOffice
+@@ -24,6 +25,7 @@
+ Name[ms]=Komponen Grafik Boleh Skala KOffice
+ Name[nb]=Skalerbar grafikk-komponent for KOffice
+ Name[nds]=KOffice-Komponent för Vektorgrafiken
++Name[ne]=केडीई कार्यालय मापनयोग्य ग्राफिक्स अवयव
+ Name[nl]=Koffice Vectorafbeeldingen Component
+ Name[nn]=Skalerbar grafikkomponent for KOffice
+ Name[pl]=Komponent KOffice dla skalowalnej grafiki
+@@ -84,6 +86,7 @@
+ GenericName[mt]=Grafika tiddaqqas
+ GenericName[nb]=Skalerbar grafikk
+ GenericName[nds]=Vektorgrafik
++GenericName[ne]=मापनयोग्य ग्राफिक्स
+ GenericName[nl]=Vectorafbeeldingen
+ GenericName[nn]=Skalerbar grafikk
+ GenericName[pl]=Skalowalna grafika
+--- karbon/plugins/imagetool/karbonimagetool.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ karbon/plugins/imagetool/karbonimagetool.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Image Tool
++Name[bg]=Инструмент за изображения
+ Name[br]=Ostilh skeudenn
+ Name[ca]=Eina d'imatge
+ Name[cy]=Erfyn Delwedd
+@@ -24,6 +25,7 @@
+ Name[lv]=Attēlu rīks
+ Name[nb]=Bildeverktøy
+ Name[nds]=Bild-Warktüüch
++Name[ne]=छवि उपकरण
+ Name[nl]=Afbeeldingsgereedschap
+ Name[pl]=Narzędzie do obrazków
+ Name[pt]=Ferramenta de Imagens
+--- karbon/plugins/zoomtool/karbonzoomtool.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ karbon/plugins/zoomtool/karbonzoomtool.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Zoom Tool
++Name[bg]=Инструмент за мащаб
+ Name[br]=Ostilh Zoom
+ Name[ca]=Eina per a apropar/allunyar
+ Name[cy]=Erfyn Chwyddo
+@@ -23,6 +24,7 @@
+ Name[lv]=Tālummaiņas rīks
+ Name[nb]=Verktøy som forstørrer/forminsker
+ Name[nds]=Vergröttern-Warktüüch
++Name[ne]=जूम उपकरण
+ Name[nl]=Zoomgereedschap
+ Name[pl]=Narzędzie powiększenia
+ Name[pt]=Ferramenta de Ampliação
+--- karbon/templates/basic/.directory (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ karbon/templates/basic/.directory (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Name=Basic
+-Name[bg]=Базов
++Name[bg]=Основни
+ Name[br]=Diazez
+ Name[ca]=Bàsic
+ Name[cy]=Sylfaenol
+@@ -26,6 +26,7 @@
+ Name[ms]=Asas
+ Name[nb]=Grunnleggende
+ Name[nds]=Eenfach
++Name[ne]=आधारभूत
+ Name[nl]=Basis
+ Name[pl]=Podstawowy
+ Name[pt]=Básico
+--- karbon/templates/basic/empty.desktop (.../tags/koffice/1.6.2/koffice) (revision 662493)
++++ karbon/templates/basic/empty.desktop (.../branches/koffice/1.6/koffice) (revision 662493)
+@@ -32,6 +32,7 @@
+ Name[ms]=Dokumen Kosong
+ Name[nb]=Tomt dokument
+ Name[nds]=Leddig Dokment
++Name[ne]=खाली कागजात
+ Name[nl]=Leeg Document
+ Name[nn]=Tomt dokument
+ Name[pl]=Pusty dokument
+@@ -53,6 +54,7 @@
+ Name[zh_CN]=空文档
+ Name[zh_TW]=空白文件
+ Comment=Creates an empty document
++Comment[bg]=Създаване на празен документ
+ Comment[br]=Krouiñ un teul goullo
+ Comment[ca]=Crea un document buit
+ Comment[cy]=Creuir dogfen wag
+@@ -76,6 +78,7 @@
+ Comment[lv]=Izveido tukšu dokumentu
+ Comment[nb]=Lager et tomt dokument
+ Comment[nds]=Stellt en leddig Dokment op
++Comment[ne]=एउटा खाली कागजात सिर्जना गर्दछ
+ Comment[nl]=Een leeg document aanmaken
+ Comment[pl]=Tworzy pusty dokument
+ Comment[pt]=Cria um documento vazio
Deleted: trunk/packages/koffice/debian/patches/28_libwv2.diff
Modified: trunk/packages/koffice/debian/patches/98_buildprep.diff
===================================================================
More information about the pkg-kde-commits
mailing list