aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.kde4.mk2
-rw-r--r--chinese/calligra-l10n-zh_CN/distinfo4
-rw-r--r--chinese/calligra-l10n-zh_CN/pkg-plist3
-rw-r--r--chinese/calligra-l10n-zh_TW/distinfo4
-rw-r--r--chinese/calligra-l10n-zh_TW/pkg-plist6
-rw-r--r--chinese/koffice-kde4-l10n-zh_CN/distinfo4
-rw-r--r--chinese/koffice-kde4-l10n-zh_CN/pkg-plist3
-rw-r--r--chinese/koffice-kde4-l10n-zh_TW/distinfo4
-rw-r--r--chinese/koffice-kde4-l10n-zh_TW/pkg-plist6
-rw-r--r--editors/calligra-l10n-ca/distinfo4
-rw-r--r--editors/calligra-l10n-ca/pkg-plist17
-rw-r--r--editors/calligra-l10n-ca_valencia/distinfo4
-rw-r--r--editors/calligra-l10n-ca_valencia/pkg-plist6
-rw-r--r--editors/calligra-l10n-da/distinfo4
-rw-r--r--editors/calligra-l10n-da/pkg-plist18
-rw-r--r--editors/calligra-l10n-el/distinfo4
-rw-r--r--editors/calligra-l10n-en_GB/distinfo4
-rw-r--r--editors/calligra-l10n-en_GB/pkg-plist6
-rw-r--r--editors/calligra-l10n-es/distinfo4
-rw-r--r--editors/calligra-l10n-es/pkg-plist17
-rw-r--r--editors/calligra-l10n-et/distinfo4
-rw-r--r--editors/calligra-l10n-et/pkg-plist14
-rw-r--r--editors/calligra-l10n-it/distinfo4
-rw-r--r--editors/calligra-l10n-it/pkg-plist17
-rw-r--r--editors/calligra-l10n-kk/distinfo4
-rw-r--r--editors/calligra-l10n-nb/distinfo4
-rw-r--r--editors/calligra-l10n-nb/pkg-plist10
-rw-r--r--editors/calligra-l10n-nds/distinfo4
-rw-r--r--editors/calligra-l10n-nds/pkg-plist9
-rw-r--r--editors/calligra-l10n-nl/distinfo4
-rw-r--r--editors/calligra-l10n-nl/pkg-plist14
-rw-r--r--editors/calligra-l10n-sv/distinfo4
-rw-r--r--editors/calligra-l10n-sv/pkg-plist14
-rw-r--r--editors/calligra-l10n/Makefile3
-rw-r--r--editors/calligra-l10n/files/bsd.l10n.mk2
-rw-r--r--editors/calligra/Makefile18
-rw-r--r--editors/calligra/distinfo4
-rw-r--r--editors/calligra/files/patch-cmake__modules__FindWPD.cmake16
-rw-r--r--editors/calligra/files/patch-cmake__modules__FindWPG.cmake21
-rw-r--r--editors/calligra/files/patch-krita_plugins_formats_CMakeLists.txt11
-rw-r--r--editors/calligra/files/patch-libwpg02-libwpd091334
-rw-r--r--editors/calligra/pkg-plist804
-rw-r--r--editors/koffice-kde4-l10n-ca/distinfo4
-rw-r--r--editors/koffice-kde4-l10n-ca/pkg-plist17
-rw-r--r--editors/koffice-kde4-l10n-ca_valencia/distinfo4
-rw-r--r--editors/koffice-kde4-l10n-ca_valencia/pkg-plist6
-rw-r--r--editors/koffice-kde4-l10n-da/distinfo4
-rw-r--r--editors/koffice-kde4-l10n-da/pkg-plist18
-rw-r--r--editors/koffice-kde4-l10n-el/distinfo4
-rw-r--r--editors/koffice-kde4-l10n-en_GB/distinfo4
-rw-r--r--editors/koffice-kde4-l10n-en_GB/pkg-plist6
-rw-r--r--editors/koffice-kde4-l10n-es/distinfo4
-rw-r--r--editors/koffice-kde4-l10n-es/pkg-plist17
-rw-r--r--editors/koffice-kde4-l10n-et/distinfo4
-rw-r--r--editors/koffice-kde4-l10n-et/pkg-plist14
-rw-r--r--editors/koffice-kde4-l10n-gl/distinfo4
-rw-r--r--editors/koffice-kde4-l10n-it/distinfo4
-rw-r--r--editors/koffice-kde4-l10n-it/pkg-plist17
-rw-r--r--editors/koffice-kde4-l10n-kk/distinfo4
-rw-r--r--editors/koffice-kde4-l10n-nb/distinfo4
-rw-r--r--editors/koffice-kde4-l10n-nb/pkg-plist10
-rw-r--r--editors/koffice-kde4-l10n-nds/distinfo4
-rw-r--r--editors/koffice-kde4-l10n-nds/pkg-plist9
-rw-r--r--editors/koffice-kde4-l10n-nl/distinfo4
-rw-r--r--editors/koffice-kde4-l10n-nl/pkg-plist14
-rw-r--r--editors/koffice-kde4-l10n-sv/distinfo4
-rw-r--r--editors/koffice-kde4-l10n-sv/pkg-plist14
-rw-r--r--editors/koffice-kde4-l10n-tr/distinfo4
-rw-r--r--editors/koffice-kde4-l10n-tr/pkg-plist3
-rw-r--r--editors/koffice-kde4-l10n-wa/Makefile2
-rw-r--r--editors/koffice-kde4-l10n/Makefile3
-rw-r--r--editors/koffice-kde4-l10n/files/bsd.l10n.mk2
-rw-r--r--editors/koffice-kde4/Makefile18
-rw-r--r--editors/koffice-kde4/distinfo4
-rw-r--r--editors/koffice-kde4/files/patch-cmake__modules__FindWPD.cmake16
-rw-r--r--editors/koffice-kde4/files/patch-cmake__modules__FindWPG.cmake21
-rw-r--r--editors/koffice-kde4/files/patch-krita_plugins_formats_CMakeLists.txt11
-rw-r--r--editors/koffice-kde4/files/patch-libwpg02-libwpd091334
-rw-r--r--editors/koffice-kde4/pkg-plist804
-rw-r--r--french/calligra-l10n/distinfo5
-rw-r--r--french/calligra-l10n/pkg-plist68
-rw-r--r--french/koffice-kde4-l10n/distinfo5
-rw-r--r--french/koffice-kde4-l10n/pkg-plist68
-rw-r--r--german/calligra-l10n/distinfo4
-rw-r--r--german/calligra-l10n/pkg-plist17
-rw-r--r--german/koffice-kde4-l10n/distinfo4
-rw-r--r--german/koffice-kde4-l10n/pkg-plist17
-rw-r--r--hungarian/calligra-l10n/Makefile18
-rw-r--r--hungarian/calligra-l10n/distinfo2
-rw-r--r--hungarian/calligra-l10n/pkg-descr3
-rw-r--r--hungarian/calligra-l10n/pkg-plist50
-rw-r--r--hungarian/koffice-kde4-l10n/Makefile18
-rw-r--r--hungarian/koffice-kde4-l10n/distinfo2
-rw-r--r--hungarian/koffice-kde4-l10n/pkg-descr3
-rw-r--r--hungarian/koffice-kde4-l10n/pkg-plist50
-rw-r--r--japanese/koffice-kde4-l10n/distinfo4
-rw-r--r--japanese/koffice-kde4-l10n/pkg-plist6
-rw-r--r--polish/calligra-l10n/Makefile2
-rw-r--r--polish/koffice-kde4-l10n/Makefile2
-rw-r--r--portuguese/calligra-l10n-pt_BR/distinfo4
-rw-r--r--portuguese/calligra-l10n-pt_BR/pkg-plist14
-rw-r--r--portuguese/calligra-l10n/distinfo4
-rw-r--r--portuguese/calligra-l10n/pkg-plist109
-rw-r--r--portuguese/koffice-kde4-l10n-pt_BR/distinfo4
-rw-r--r--portuguese/koffice-kde4-l10n-pt_BR/pkg-plist14
-rw-r--r--portuguese/koffice-kde4-l10n/distinfo4
-rw-r--r--portuguese/koffice-kde4-l10n/pkg-plist109
-rw-r--r--ukrainian/calligra-l10n/distinfo4
-rw-r--r--ukrainian/calligra-l10n/pkg-plist14
-rw-r--r--ukrainian/koffice-kde4-l10n/distinfo4
-rw-r--r--ukrainian/koffice-kde4-l10n/pkg-plist14
111 files changed, 4141 insertions, 1368 deletions
diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk
index ef68c21597cc..75b97eb3b0df 100644
--- a/Mk/bsd.kde4.mk
+++ b/Mk/bsd.kde4.mk
@@ -58,7 +58,7 @@ KDE4_VERSION= 4.6.1
KDE4_BRANCH?= stable
KDEPIM4_VERSION= 4.4.10
KDEPIM4_BRANCH?= stable
-KOFFICE2_VERSION= 2.2.2
+KOFFICE2_VERSION= 2.3.1
KOFFICE2_BRANCH?= stable
KDEVELOP_VERSION= 4.1.0
KDEVELOP_BRANCH?= stable
diff --git a/chinese/calligra-l10n-zh_CN/distinfo b/chinese/calligra-l10n-zh_CN/distinfo
index 539573487465..669d248eabc4 100644
--- a/chinese/calligra-l10n-zh_CN/distinfo
+++ b/chinese/calligra-l10n-zh_CN/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-zh_CN-2.2.2.tar.bz2) = cd1cc3bb0199b23fc67d696e2578269d998f7b34fde038e0737d735329321527
-SIZE (KDE/koffice-l10n/koffice-l10n-zh_CN-2.2.2.tar.bz2) = 281061
+SHA256 (KDE/koffice-l10n/koffice-l10n-zh_CN-2.3.1.tar.bz2) = 05d0c9f04128fd0a1e3e9c75688fea4e5e5bb84379853114c3f8d9f0ae6a42db
+SIZE (KDE/koffice-l10n/koffice-l10n-zh_CN-2.3.1.tar.bz2) = 292760
diff --git a/chinese/calligra-l10n-zh_CN/pkg-plist b/chinese/calligra-l10n-zh_CN/pkg-plist
index b2ec6273b55b..48e209f164ff 100644
--- a/chinese/calligra-l10n-zh_CN/pkg-plist
+++ b/chinese/calligra-l10n-zh_CN/pkg-plist
@@ -11,6 +11,8 @@ share/locale/zh_CN/LC_MESSAGES/MusicShape.mo
share/locale/zh_CN/LC_MESSAGES/ParagraphTool.mo
share/locale/zh_CN/LC_MESSAGES/PathShapes.mo
share/locale/zh_CN/LC_MESSAGES/PictureShape.mo
+share/locale/zh_CN/LC_MESSAGES/PluginShape.mo
+share/locale/zh_CN/LC_MESSAGES/ShapePlugin.mo
share/locale/zh_CN/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/zh_CN/LC_MESSAGES/TableShape.mo
share/locale/zh_CN/LC_MESSAGES/TextShape.mo
@@ -32,6 +34,7 @@ share/locale/zh_CN/LC_MESSAGES/koproperty.mo
share/locale/zh_CN/LC_MESSAGES/kounavail.mo
share/locale/zh_CN/LC_MESSAGES/kplato.mo
share/locale/zh_CN/LC_MESSAGES/kplatolibs.mo
+share/locale/zh_CN/LC_MESSAGES/kplatorcpsplugin.mo
share/locale/zh_CN/LC_MESSAGES/kplatowork.mo
share/locale/zh_CN/LC_MESSAGES/kpresenter.mo
share/locale/zh_CN/LC_MESSAGES/krita.mo
diff --git a/chinese/calligra-l10n-zh_TW/distinfo b/chinese/calligra-l10n-zh_TW/distinfo
index f504aa952f64..0f703460114f 100644
--- a/chinese/calligra-l10n-zh_TW/distinfo
+++ b/chinese/calligra-l10n-zh_TW/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-zh_TW-2.2.2.tar.bz2) = eb580579e136ec1b481b987f159def30fa8f84379305a9c44d59769640634476
-SIZE (KDE/koffice-l10n/koffice-l10n-zh_TW-2.2.2.tar.bz2) = 328030
+SHA256 (KDE/koffice-l10n/koffice-l10n-zh_TW-2.3.1.tar.bz2) = 27bf6563ee86b618a1fc6128713347dc35f41e888072b2db851a3fd47786d21c
+SIZE (KDE/koffice-l10n/koffice-l10n-zh_TW-2.3.1.tar.bz2) = 334298
diff --git a/chinese/calligra-l10n-zh_TW/pkg-plist b/chinese/calligra-l10n-zh_TW/pkg-plist
index 854d0102ba82..4adaad8ef5a5 100644
--- a/chinese/calligra-l10n-zh_TW/pkg-plist
+++ b/chinese/calligra-l10n-zh_TW/pkg-plist
@@ -1,17 +1,21 @@
share/locale/zh_TW/LC_MESSAGES/ArtisticTextShape.mo
share/locale/zh_TW/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/zh_TW/LC_MESSAGES/BarcodePlugin.mo
share/locale/zh_TW/LC_MESSAGES/CalendarTool.mo
share/locale/zh_TW/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/zh_TW/LC_MESSAGES/ChartPlugin.mo
share/locale/zh_TW/LC_MESSAGES/ChartShape.mo
+share/locale/zh_TW/LC_MESSAGES/CommentShape.mo
share/locale/zh_TW/LC_MESSAGES/DivineProportion.mo
share/locale/zh_TW/LC_MESSAGES/FormulaShape.mo
-share/locale/zh_TW/LC_MESSAGES/FreOffice.mo
share/locale/zh_TW/LC_MESSAGES/KarbonTools.mo
share/locale/zh_TW/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/zh_TW/LC_MESSAGES/MusicShape.mo
share/locale/zh_TW/LC_MESSAGES/ParagraphTool.mo
share/locale/zh_TW/LC_MESSAGES/PathShapes.mo
share/locale/zh_TW/LC_MESSAGES/PictureShape.mo
+share/locale/zh_TW/LC_MESSAGES/PluginShape.mo
+share/locale/zh_TW/LC_MESSAGES/ShapePlugin.mo
share/locale/zh_TW/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/zh_TW/LC_MESSAGES/TableShape.mo
share/locale/zh_TW/LC_MESSAGES/TextShape.mo
diff --git a/chinese/koffice-kde4-l10n-zh_CN/distinfo b/chinese/koffice-kde4-l10n-zh_CN/distinfo
index 539573487465..669d248eabc4 100644
--- a/chinese/koffice-kde4-l10n-zh_CN/distinfo
+++ b/chinese/koffice-kde4-l10n-zh_CN/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-zh_CN-2.2.2.tar.bz2) = cd1cc3bb0199b23fc67d696e2578269d998f7b34fde038e0737d735329321527
-SIZE (KDE/koffice-l10n/koffice-l10n-zh_CN-2.2.2.tar.bz2) = 281061
+SHA256 (KDE/koffice-l10n/koffice-l10n-zh_CN-2.3.1.tar.bz2) = 05d0c9f04128fd0a1e3e9c75688fea4e5e5bb84379853114c3f8d9f0ae6a42db
+SIZE (KDE/koffice-l10n/koffice-l10n-zh_CN-2.3.1.tar.bz2) = 292760
diff --git a/chinese/koffice-kde4-l10n-zh_CN/pkg-plist b/chinese/koffice-kde4-l10n-zh_CN/pkg-plist
index b2ec6273b55b..48e209f164ff 100644
--- a/chinese/koffice-kde4-l10n-zh_CN/pkg-plist
+++ b/chinese/koffice-kde4-l10n-zh_CN/pkg-plist
@@ -11,6 +11,8 @@ share/locale/zh_CN/LC_MESSAGES/MusicShape.mo
share/locale/zh_CN/LC_MESSAGES/ParagraphTool.mo
share/locale/zh_CN/LC_MESSAGES/PathShapes.mo
share/locale/zh_CN/LC_MESSAGES/PictureShape.mo
+share/locale/zh_CN/LC_MESSAGES/PluginShape.mo
+share/locale/zh_CN/LC_MESSAGES/ShapePlugin.mo
share/locale/zh_CN/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/zh_CN/LC_MESSAGES/TableShape.mo
share/locale/zh_CN/LC_MESSAGES/TextShape.mo
@@ -32,6 +34,7 @@ share/locale/zh_CN/LC_MESSAGES/koproperty.mo
share/locale/zh_CN/LC_MESSAGES/kounavail.mo
share/locale/zh_CN/LC_MESSAGES/kplato.mo
share/locale/zh_CN/LC_MESSAGES/kplatolibs.mo
+share/locale/zh_CN/LC_MESSAGES/kplatorcpsplugin.mo
share/locale/zh_CN/LC_MESSAGES/kplatowork.mo
share/locale/zh_CN/LC_MESSAGES/kpresenter.mo
share/locale/zh_CN/LC_MESSAGES/krita.mo
diff --git a/chinese/koffice-kde4-l10n-zh_TW/distinfo b/chinese/koffice-kde4-l10n-zh_TW/distinfo
index f504aa952f64..0f703460114f 100644
--- a/chinese/koffice-kde4-l10n-zh_TW/distinfo
+++ b/chinese/koffice-kde4-l10n-zh_TW/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-zh_TW-2.2.2.tar.bz2) = eb580579e136ec1b481b987f159def30fa8f84379305a9c44d59769640634476
-SIZE (KDE/koffice-l10n/koffice-l10n-zh_TW-2.2.2.tar.bz2) = 328030
+SHA256 (KDE/koffice-l10n/koffice-l10n-zh_TW-2.3.1.tar.bz2) = 27bf6563ee86b618a1fc6128713347dc35f41e888072b2db851a3fd47786d21c
+SIZE (KDE/koffice-l10n/koffice-l10n-zh_TW-2.3.1.tar.bz2) = 334298
diff --git a/chinese/koffice-kde4-l10n-zh_TW/pkg-plist b/chinese/koffice-kde4-l10n-zh_TW/pkg-plist
index 854d0102ba82..4adaad8ef5a5 100644
--- a/chinese/koffice-kde4-l10n-zh_TW/pkg-plist
+++ b/chinese/koffice-kde4-l10n-zh_TW/pkg-plist
@@ -1,17 +1,21 @@
share/locale/zh_TW/LC_MESSAGES/ArtisticTextShape.mo
share/locale/zh_TW/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/zh_TW/LC_MESSAGES/BarcodePlugin.mo
share/locale/zh_TW/LC_MESSAGES/CalendarTool.mo
share/locale/zh_TW/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/zh_TW/LC_MESSAGES/ChartPlugin.mo
share/locale/zh_TW/LC_MESSAGES/ChartShape.mo
+share/locale/zh_TW/LC_MESSAGES/CommentShape.mo
share/locale/zh_TW/LC_MESSAGES/DivineProportion.mo
share/locale/zh_TW/LC_MESSAGES/FormulaShape.mo
-share/locale/zh_TW/LC_MESSAGES/FreOffice.mo
share/locale/zh_TW/LC_MESSAGES/KarbonTools.mo
share/locale/zh_TW/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/zh_TW/LC_MESSAGES/MusicShape.mo
share/locale/zh_TW/LC_MESSAGES/ParagraphTool.mo
share/locale/zh_TW/LC_MESSAGES/PathShapes.mo
share/locale/zh_TW/LC_MESSAGES/PictureShape.mo
+share/locale/zh_TW/LC_MESSAGES/PluginShape.mo
+share/locale/zh_TW/LC_MESSAGES/ShapePlugin.mo
share/locale/zh_TW/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/zh_TW/LC_MESSAGES/TableShape.mo
share/locale/zh_TW/LC_MESSAGES/TextShape.mo
diff --git a/editors/calligra-l10n-ca/distinfo b/editors/calligra-l10n-ca/distinfo
index 6d38a9fdc888..d4854c8de1a6 100644
--- a/editors/calligra-l10n-ca/distinfo
+++ b/editors/calligra-l10n-ca/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-ca-2.2.2.tar.bz2) = e5682579bdd4a8dd6235900215fbf5fa07f947fc459105740e96200d4667ed23
-SIZE (KDE/koffice-l10n/koffice-l10n-ca-2.2.2.tar.bz2) = 609607
+SHA256 (KDE/koffice-l10n/koffice-l10n-ca-2.3.1.tar.bz2) = 7471fb7811d3455364ce068047a40bf4fc00b8d080d331a1f1f83c6442cb5c43
+SIZE (KDE/koffice-l10n/koffice-l10n-ca-2.3.1.tar.bz2) = 602505
diff --git a/editors/calligra-l10n-ca/pkg-plist b/editors/calligra-l10n-ca/pkg-plist
index af9b1554cdfc..51ee28868da2 100644
--- a/editors/calligra-l10n-ca/pkg-plist
+++ b/editors/calligra-l10n-ca/pkg-plist
@@ -1,4 +1,3 @@
-share/apps/koffice/autocorrect/ca.xml
share/doc/HTML/ca/karbon/common
share/doc/HTML/ca/karbon/index.cache.bz2
share/doc/HTML/ca/karbon/index.docbook
@@ -23,6 +22,13 @@ share/doc/HTML/ca/kexi/querydesigning.docbook
share/doc/HTML/ca/kformula/common
share/doc/HTML/ca/kformula/index.cache.bz2
share/doc/HTML/ca/kformula/index.docbook
+share/doc/HTML/ca/kivio/common
+share/doc/HTML/ca/kivio/credits.docbook
+share/doc/HTML/ca/kivio/index.cache.bz2
+share/doc/HTML/ca/kivio/index.docbook
+share/doc/HTML/ca/kivio/introduction.docbook
+share/doc/HTML/ca/kivio/usage.docbook
+share/doc/HTML/ca/kivio/working.docbook
share/doc/HTML/ca/koffice/common
share/doc/HTML/ca/koffice/index.cache.bz2
share/doc/HTML/ca/koffice/index.docbook
@@ -54,18 +60,22 @@ share/doc/HTML/ca/thesaurus/index.cache.bz2
share/doc/HTML/ca/thesaurus/index.docbook
share/locale/ca/LC_MESSAGES/ArtisticTextShape.mo
share/locale/ca/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/ca/LC_MESSAGES/BarcodePlugin.mo
share/locale/ca/LC_MESSAGES/CalendarTool.mo
share/locale/ca/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/ca/LC_MESSAGES/ChartPlugin.mo
share/locale/ca/LC_MESSAGES/ChartShape.mo
+share/locale/ca/LC_MESSAGES/CommentShape.mo
share/locale/ca/LC_MESSAGES/DivineProportion.mo
share/locale/ca/LC_MESSAGES/FormulaShape.mo
-share/locale/ca/LC_MESSAGES/FreOffice.mo
share/locale/ca/LC_MESSAGES/KarbonTools.mo
share/locale/ca/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/ca/LC_MESSAGES/MusicShape.mo
share/locale/ca/LC_MESSAGES/ParagraphTool.mo
share/locale/ca/LC_MESSAGES/PathShapes.mo
share/locale/ca/LC_MESSAGES/PictureShape.mo
+share/locale/ca/LC_MESSAGES/PluginShape.mo
+share/locale/ca/LC_MESSAGES/ShapePlugin.mo
share/locale/ca/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/ca/LC_MESSAGES/TableShape.mo
share/locale/ca/LC_MESSAGES/TextShape.mo
@@ -104,9 +114,8 @@ share/locale/ca/LC_MESSAGES/thesaurus_tool.mo
@dirrm share/doc/HTML/ca/kspread
@dirrm share/doc/HTML/ca/kpresenter
@dirrm share/doc/HTML/ca/koffice
+@dirrm share/doc/HTML/ca/kivio
@dirrm share/doc/HTML/ca/kformula
@dirrm share/doc/HTML/ca/kexi
@dirrm share/doc/HTML/ca/kchart
@dirrm share/doc/HTML/ca/karbon
-@dirrmtry share/apps/koffice/autocorrect
-@dirrmtry share/apps/koffice
diff --git a/editors/calligra-l10n-ca_valencia/distinfo b/editors/calligra-l10n-ca_valencia/distinfo
index bf0731ec0f7b..41fae6c10982 100644
--- a/editors/calligra-l10n-ca_valencia/distinfo
+++ b/editors/calligra-l10n-ca_valencia/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-ca@valencia-2.2.2.tar.bz2) = f330d0838915b98fd4aa6b348bdaf39d2fb4289732772e08f4307fd450d4cd1d
-SIZE (KDE/koffice-l10n/koffice-l10n-ca@valencia-2.2.2.tar.bz2) = 322040
+SHA256 (KDE/koffice-l10n/koffice-l10n-ca@valencia-2.3.1.tar.bz2) = 4552b512bff48dce5326b350ab77e68dd5b79476719c9b50ff5afdb3f28cd45b
+SIZE (KDE/koffice-l10n/koffice-l10n-ca@valencia-2.3.1.tar.bz2) = 333798
diff --git a/editors/calligra-l10n-ca_valencia/pkg-plist b/editors/calligra-l10n-ca_valencia/pkg-plist
index 06f878d3c7a8..27cf4c451e29 100644
--- a/editors/calligra-l10n-ca_valencia/pkg-plist
+++ b/editors/calligra-l10n-ca_valencia/pkg-plist
@@ -1,17 +1,21 @@
share/locale/ca@valencia/LC_MESSAGES/ArtisticTextShape.mo
share/locale/ca@valencia/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/ca@valencia/LC_MESSAGES/BarcodePlugin.mo
share/locale/ca@valencia/LC_MESSAGES/CalendarTool.mo
share/locale/ca@valencia/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/ca@valencia/LC_MESSAGES/ChartPlugin.mo
share/locale/ca@valencia/LC_MESSAGES/ChartShape.mo
+share/locale/ca@valencia/LC_MESSAGES/CommentShape.mo
share/locale/ca@valencia/LC_MESSAGES/DivineProportion.mo
share/locale/ca@valencia/LC_MESSAGES/FormulaShape.mo
-share/locale/ca@valencia/LC_MESSAGES/FreOffice.mo
share/locale/ca@valencia/LC_MESSAGES/KarbonTools.mo
share/locale/ca@valencia/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/ca@valencia/LC_MESSAGES/MusicShape.mo
share/locale/ca@valencia/LC_MESSAGES/ParagraphTool.mo
share/locale/ca@valencia/LC_MESSAGES/PathShapes.mo
share/locale/ca@valencia/LC_MESSAGES/PictureShape.mo
+share/locale/ca@valencia/LC_MESSAGES/PluginShape.mo
+share/locale/ca@valencia/LC_MESSAGES/ShapePlugin.mo
share/locale/ca@valencia/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/ca@valencia/LC_MESSAGES/TableShape.mo
share/locale/ca@valencia/LC_MESSAGES/TextShape.mo
diff --git a/editors/calligra-l10n-da/distinfo b/editors/calligra-l10n-da/distinfo
index 3af8e66ba3e3..7264b974102c 100644
--- a/editors/calligra-l10n-da/distinfo
+++ b/editors/calligra-l10n-da/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-da-2.2.2.tar.bz2) = 04528abc8dfd2785a282fc4228f7c9a88a8760376e79fd9e8c6b129a299d8dc5
-SIZE (KDE/koffice-l10n/koffice-l10n-da-2.2.2.tar.bz2) = 601612
+SHA256 (KDE/koffice-l10n/koffice-l10n-da-2.3.1.tar.bz2) = 0e68b45c8a2f0e357eaa24905605ea16f6ee4877363319afb9f484c261bbcf53
+SIZE (KDE/koffice-l10n/koffice-l10n-da-2.3.1.tar.bz2) = 574070
diff --git a/editors/calligra-l10n-da/pkg-plist b/editors/calligra-l10n-da/pkg-plist
index 140e1b40126d..33bc29023ca0 100644
--- a/editors/calligra-l10n-da/pkg-plist
+++ b/editors/calligra-l10n-da/pkg-plist
@@ -25,17 +25,6 @@ share/doc/HTML/da/kformula/index.docbook
share/doc/HTML/da/koffice/common
share/doc/HTML/da/koffice/index.cache.bz2
share/doc/HTML/da/koffice/index.docbook
-share/doc/HTML/da/kpresenter/a11y.docbook
-share/doc/HTML/da/kpresenter/common
-share/doc/HTML/da/kpresenter/faq.docbook
-share/doc/HTML/da/kpresenter/great-presentations.docbook
-share/doc/HTML/da/kpresenter/guides.docbook
-share/doc/HTML/da/kpresenter/index.cache.bz2
-share/doc/HTML/da/kpresenter/index.docbook
-share/doc/HTML/da/kpresenter/menus.docbook
-share/doc/HTML/da/kpresenter/options.docbook
-share/doc/HTML/da/kpresenter/screen.docbook
-share/doc/HTML/da/kpresenter/tutorial.docbook
share/doc/HTML/da/kspread/a11y.docbook
share/doc/HTML/da/kspread/advanced.docbook
share/doc/HTML/da/kspread/basics.docbook
@@ -53,18 +42,22 @@ share/doc/HTML/da/thesaurus/index.cache.bz2
share/doc/HTML/da/thesaurus/index.docbook
share/locale/da/LC_MESSAGES/ArtisticTextShape.mo
share/locale/da/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/da/LC_MESSAGES/BarcodePlugin.mo
share/locale/da/LC_MESSAGES/CalendarTool.mo
share/locale/da/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/da/LC_MESSAGES/ChartPlugin.mo
share/locale/da/LC_MESSAGES/ChartShape.mo
+share/locale/da/LC_MESSAGES/CommentShape.mo
share/locale/da/LC_MESSAGES/DivineProportion.mo
share/locale/da/LC_MESSAGES/FormulaShape.mo
-share/locale/da/LC_MESSAGES/FreOffice.mo
share/locale/da/LC_MESSAGES/KarbonTools.mo
share/locale/da/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/da/LC_MESSAGES/MusicShape.mo
share/locale/da/LC_MESSAGES/ParagraphTool.mo
share/locale/da/LC_MESSAGES/PathShapes.mo
share/locale/da/LC_MESSAGES/PictureShape.mo
+share/locale/da/LC_MESSAGES/PluginShape.mo
+share/locale/da/LC_MESSAGES/ShapePlugin.mo
share/locale/da/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/da/LC_MESSAGES/TableShape.mo
share/locale/da/LC_MESSAGES/TextShape.mo
@@ -101,7 +94,6 @@ share/locale/da/LC_MESSAGES/kword.mo
share/locale/da/LC_MESSAGES/thesaurus_tool.mo
@dirrm share/doc/HTML/da/thesaurus
@dirrm share/doc/HTML/da/kspread
-@dirrm share/doc/HTML/da/kpresenter
@dirrm share/doc/HTML/da/koffice
@dirrm share/doc/HTML/da/kformula
@dirrm share/doc/HTML/da/kexi
diff --git a/editors/calligra-l10n-el/distinfo b/editors/calligra-l10n-el/distinfo
index 948578079b22..1e33ac4a1859 100644
--- a/editors/calligra-l10n-el/distinfo
+++ b/editors/calligra-l10n-el/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-el-2.2.2.tar.bz2) = 3846c902fa59e473c823bb783f7036c860a5329cd34d3430a3ba08b01e2b3dff
-SIZE (KDE/koffice-l10n/koffice-l10n-el-2.2.2.tar.bz2) = 334551
+SHA256 (KDE/koffice-l10n/koffice-l10n-el-2.3.1.tar.bz2) = 76804f96c3a931f369fdbc0b8a5d2041870bb7273995822973273ef715ed52a3
+SIZE (KDE/koffice-l10n/koffice-l10n-el-2.3.1.tar.bz2) = 344757
diff --git a/editors/calligra-l10n-en_GB/distinfo b/editors/calligra-l10n-en_GB/distinfo
index 03f5c3f62b49..cdd9d9779cf3 100644
--- a/editors/calligra-l10n-en_GB/distinfo
+++ b/editors/calligra-l10n-en_GB/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-en_GB-2.2.2.tar.bz2) = f1b8962de072c2304b70c271ec75918e3c71590a900575552a7b8d1481095934
-SIZE (KDE/koffice-l10n/koffice-l10n-en_GB-2.2.2.tar.bz2) = 346856
+SHA256 (KDE/koffice-l10n/koffice-l10n-en_GB-2.3.1.tar.bz2) = 965533eb638a1246db6bb0bc4ab208783eaa860a447bc653551e2c91cc9731af
+SIZE (KDE/koffice-l10n/koffice-l10n-en_GB-2.3.1.tar.bz2) = 335483
diff --git a/editors/calligra-l10n-en_GB/pkg-plist b/editors/calligra-l10n-en_GB/pkg-plist
index 6c0b2c94bcf8..9af23af103db 100644
--- a/editors/calligra-l10n-en_GB/pkg-plist
+++ b/editors/calligra-l10n-en_GB/pkg-plist
@@ -1,17 +1,21 @@
share/locale/en_GB/LC_MESSAGES/ArtisticTextShape.mo
share/locale/en_GB/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/en_GB/LC_MESSAGES/BarcodePlugin.mo
share/locale/en_GB/LC_MESSAGES/CalendarTool.mo
share/locale/en_GB/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/en_GB/LC_MESSAGES/ChartPlugin.mo
share/locale/en_GB/LC_MESSAGES/ChartShape.mo
+share/locale/en_GB/LC_MESSAGES/CommentShape.mo
share/locale/en_GB/LC_MESSAGES/DivineProportion.mo
share/locale/en_GB/LC_MESSAGES/FormulaShape.mo
-share/locale/en_GB/LC_MESSAGES/FreOffice.mo
share/locale/en_GB/LC_MESSAGES/KarbonTools.mo
share/locale/en_GB/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/en_GB/LC_MESSAGES/MusicShape.mo
share/locale/en_GB/LC_MESSAGES/ParagraphTool.mo
share/locale/en_GB/LC_MESSAGES/PathShapes.mo
share/locale/en_GB/LC_MESSAGES/PictureShape.mo
+share/locale/en_GB/LC_MESSAGES/PluginShape.mo
+share/locale/en_GB/LC_MESSAGES/ShapePlugin.mo
share/locale/en_GB/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/en_GB/LC_MESSAGES/TableShape.mo
share/locale/en_GB/LC_MESSAGES/TextShape.mo
diff --git a/editors/calligra-l10n-es/distinfo b/editors/calligra-l10n-es/distinfo
index c98687a9d623..01b983b69996 100644
--- a/editors/calligra-l10n-es/distinfo
+++ b/editors/calligra-l10n-es/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-es-2.2.2.tar.bz2) = 9624407d6099a0e29abb7019062ead5e53886f4bd2496240cd2c9b7105e37a56
-SIZE (KDE/koffice-l10n/koffice-l10n-es-2.2.2.tar.bz2) = 6222081
+SHA256 (KDE/koffice-l10n/koffice-l10n-es-2.3.1.tar.bz2) = 44a83ca8e92159e8121a2535244db45595d78044a8cee5297e4652d0591c2e3f
+SIZE (KDE/koffice-l10n/koffice-l10n-es-2.3.1.tar.bz2) = 6264314
diff --git a/editors/calligra-l10n-es/pkg-plist b/editors/calligra-l10n-es/pkg-plist
index a84a70fae0ba..1ae4e5902896 100644
--- a/editors/calligra-l10n-es/pkg-plist
+++ b/editors/calligra-l10n-es/pkg-plist
@@ -1,4 +1,3 @@
-share/apps/koffice/autocorrect/es.xml
share/doc/HTML/es/karbon/common
share/doc/HTML/es/karbon/index.cache.bz2
share/doc/HTML/es/karbon/index.docbook
@@ -74,6 +73,13 @@ share/doc/HTML/es/kformula/shortcut1.png
share/doc/HTML/es/kformula/sin.png
share/doc/HTML/es/kformula/toolbars.png
share/doc/HTML/es/kformula/upper-index.png
+share/doc/HTML/es/kivio/common
+share/doc/HTML/es/kivio/credits.docbook
+share/doc/HTML/es/kivio/index.cache.bz2
+share/doc/HTML/es/kivio/index.docbook
+share/doc/HTML/es/kivio/introduction.docbook
+share/doc/HTML/es/kivio/usage.docbook
+share/doc/HTML/es/kivio/working.docbook
share/doc/HTML/es/koffice/common
share/doc/HTML/es/koffice/index.cache.bz2
share/doc/HTML/es/koffice/index.docbook
@@ -138,18 +144,22 @@ share/doc/HTML/es/thesaurus/index.cache.bz2
share/doc/HTML/es/thesaurus/index.docbook
share/locale/es/LC_MESSAGES/ArtisticTextShape.mo
share/locale/es/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/es/LC_MESSAGES/BarcodePlugin.mo
share/locale/es/LC_MESSAGES/CalendarTool.mo
share/locale/es/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/es/LC_MESSAGES/ChartPlugin.mo
share/locale/es/LC_MESSAGES/ChartShape.mo
+share/locale/es/LC_MESSAGES/CommentShape.mo
share/locale/es/LC_MESSAGES/DivineProportion.mo
share/locale/es/LC_MESSAGES/FormulaShape.mo
-share/locale/es/LC_MESSAGES/FreOffice.mo
share/locale/es/LC_MESSAGES/KarbonTools.mo
share/locale/es/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/es/LC_MESSAGES/MusicShape.mo
share/locale/es/LC_MESSAGES/ParagraphTool.mo
share/locale/es/LC_MESSAGES/PathShapes.mo
share/locale/es/LC_MESSAGES/PictureShape.mo
+share/locale/es/LC_MESSAGES/PluginShape.mo
+share/locale/es/LC_MESSAGES/ShapePlugin.mo
share/locale/es/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/es/LC_MESSAGES/TableShape.mo
share/locale/es/LC_MESSAGES/TextShape.mo
@@ -188,8 +198,7 @@ share/locale/es/LC_MESSAGES/thesaurus_tool.mo
@dirrm share/doc/HTML/es/kspread
@dirrm share/doc/HTML/es/kpresenter
@dirrm share/doc/HTML/es/koffice
+@dirrm share/doc/HTML/es/kivio
@dirrm share/doc/HTML/es/kformula
@dirrm share/doc/HTML/es/kchart
@dirrm share/doc/HTML/es/karbon
-@dirrmtry share/apps/koffice/autocorrect
-@dirrmtry share/apps/koffice
diff --git a/editors/calligra-l10n-et/distinfo b/editors/calligra-l10n-et/distinfo
index 7ae9f1fa1be5..55395324322c 100644
--- a/editors/calligra-l10n-et/distinfo
+++ b/editors/calligra-l10n-et/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-et-2.2.2.tar.bz2) = c857460c23c24a3a031dbdf740d9d08d0b74699874f01586ec5ea7630360851f
-SIZE (KDE/koffice-l10n/koffice-l10n-et-2.2.2.tar.bz2) = 700518
+SHA256 (KDE/koffice-l10n/koffice-l10n-et-2.3.1.tar.bz2) = 1afdea159e43e0d2e1e4b6eff9307e53c6f42fea2dfb1ff23a8138f4792c4a5f
+SIZE (KDE/koffice-l10n/koffice-l10n-et-2.3.1.tar.bz2) = 732850
diff --git a/editors/calligra-l10n-et/pkg-plist b/editors/calligra-l10n-et/pkg-plist
index aeefc31ea46a..0c33162c3bfe 100644
--- a/editors/calligra-l10n-et/pkg-plist
+++ b/editors/calligra-l10n-et/pkg-plist
@@ -22,6 +22,13 @@ share/doc/HTML/et/kexi/querydesigning.docbook
share/doc/HTML/et/kformula/common
share/doc/HTML/et/kformula/index.cache.bz2
share/doc/HTML/et/kformula/index.docbook
+share/doc/HTML/et/kivio/common
+share/doc/HTML/et/kivio/credits.docbook
+share/doc/HTML/et/kivio/index.cache.bz2
+share/doc/HTML/et/kivio/index.docbook
+share/doc/HTML/et/kivio/introduction.docbook
+share/doc/HTML/et/kivio/usage.docbook
+share/doc/HTML/et/kivio/working.docbook
share/doc/HTML/et/koffice/common
share/doc/HTML/et/koffice/index.cache.bz2
share/doc/HTML/et/koffice/index.docbook
@@ -59,18 +66,22 @@ share/doc/HTML/et/thesaurus/index.cache.bz2
share/doc/HTML/et/thesaurus/index.docbook
share/locale/et/LC_MESSAGES/ArtisticTextShape.mo
share/locale/et/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/et/LC_MESSAGES/BarcodePlugin.mo
share/locale/et/LC_MESSAGES/CalendarTool.mo
share/locale/et/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/et/LC_MESSAGES/ChartPlugin.mo
share/locale/et/LC_MESSAGES/ChartShape.mo
+share/locale/et/LC_MESSAGES/CommentShape.mo
share/locale/et/LC_MESSAGES/DivineProportion.mo
share/locale/et/LC_MESSAGES/FormulaShape.mo
-share/locale/et/LC_MESSAGES/FreOffice.mo
share/locale/et/LC_MESSAGES/KarbonTools.mo
share/locale/et/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/et/LC_MESSAGES/MusicShape.mo
share/locale/et/LC_MESSAGES/ParagraphTool.mo
share/locale/et/LC_MESSAGES/PathShapes.mo
share/locale/et/LC_MESSAGES/PictureShape.mo
+share/locale/et/LC_MESSAGES/PluginShape.mo
+share/locale/et/LC_MESSAGES/ShapePlugin.mo
share/locale/et/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/et/LC_MESSAGES/TableShape.mo
share/locale/et/LC_MESSAGES/TextShape.mo
@@ -109,6 +120,7 @@ share/locale/et/LC_MESSAGES/thesaurus_tool.mo
@dirrm share/doc/HTML/et/kspread
@dirrm share/doc/HTML/et/kpresenter
@dirrm share/doc/HTML/et/koffice
+@dirrm share/doc/HTML/et/kivio
@dirrm share/doc/HTML/et/kformula
@dirrm share/doc/HTML/et/kexi
@dirrm share/doc/HTML/et/kchart
diff --git a/editors/calligra-l10n-it/distinfo b/editors/calligra-l10n-it/distinfo
index d7c928c4f646..2d5982b3b35f 100644
--- a/editors/calligra-l10n-it/distinfo
+++ b/editors/calligra-l10n-it/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-it-2.2.2.tar.bz2) = 921f2d5ae5e96fb7050de23d7bce95373b3b6afd3161b4a7905ef59eba158f54
-SIZE (KDE/koffice-l10n/koffice-l10n-it-2.2.2.tar.bz2) = 680382
+SHA256 (KDE/koffice-l10n/koffice-l10n-it-2.3.1.tar.bz2) = 28968c68a511f49a1dad01b583a02344ee2999767ef77fe915f11ef35bc197aa
+SIZE (KDE/koffice-l10n/koffice-l10n-it-2.3.1.tar.bz2) = 709310
diff --git a/editors/calligra-l10n-it/pkg-plist b/editors/calligra-l10n-it/pkg-plist
index accd4348e14b..0ee71e024c12 100644
--- a/editors/calligra-l10n-it/pkg-plist
+++ b/editors/calligra-l10n-it/pkg-plist
@@ -1,4 +1,3 @@
-share/apps/koffice/autocorrect/it.xml
share/doc/HTML/it/karbon/common
share/doc/HTML/it/karbon/index.cache.bz2
share/doc/HTML/it/karbon/index.docbook
@@ -23,6 +22,13 @@ share/doc/HTML/it/kexi/querydesigning.docbook
share/doc/HTML/it/kformula/common
share/doc/HTML/it/kformula/index.cache.bz2
share/doc/HTML/it/kformula/index.docbook
+share/doc/HTML/it/kivio/common
+share/doc/HTML/it/kivio/credits.docbook
+share/doc/HTML/it/kivio/index.cache.bz2
+share/doc/HTML/it/kivio/index.docbook
+share/doc/HTML/it/kivio/introduction.docbook
+share/doc/HTML/it/kivio/usage.docbook
+share/doc/HTML/it/kivio/working.docbook
share/doc/HTML/it/koffice/common
share/doc/HTML/it/koffice/index.cache.bz2
share/doc/HTML/it/koffice/index.docbook
@@ -54,18 +60,22 @@ share/doc/HTML/it/thesaurus/index.cache.bz2
share/doc/HTML/it/thesaurus/index.docbook
share/locale/it/LC_MESSAGES/ArtisticTextShape.mo
share/locale/it/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/it/LC_MESSAGES/BarcodePlugin.mo
share/locale/it/LC_MESSAGES/CalendarTool.mo
share/locale/it/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/it/LC_MESSAGES/ChartPlugin.mo
share/locale/it/LC_MESSAGES/ChartShape.mo
+share/locale/it/LC_MESSAGES/CommentShape.mo
share/locale/it/LC_MESSAGES/DivineProportion.mo
share/locale/it/LC_MESSAGES/FormulaShape.mo
-share/locale/it/LC_MESSAGES/FreOffice.mo
share/locale/it/LC_MESSAGES/KarbonTools.mo
share/locale/it/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/it/LC_MESSAGES/MusicShape.mo
share/locale/it/LC_MESSAGES/ParagraphTool.mo
share/locale/it/LC_MESSAGES/PathShapes.mo
share/locale/it/LC_MESSAGES/PictureShape.mo
+share/locale/it/LC_MESSAGES/PluginShape.mo
+share/locale/it/LC_MESSAGES/ShapePlugin.mo
share/locale/it/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/it/LC_MESSAGES/TableShape.mo
share/locale/it/LC_MESSAGES/TextShape.mo
@@ -104,9 +114,8 @@ share/locale/it/LC_MESSAGES/thesaurus_tool.mo
@dirrm share/doc/HTML/it/kspread
@dirrm share/doc/HTML/it/kpresenter
@dirrm share/doc/HTML/it/koffice
+@dirrm share/doc/HTML/it/kivio
@dirrm share/doc/HTML/it/kformula
@dirrm share/doc/HTML/it/kexi
@dirrm share/doc/HTML/it/kchart
@dirrm share/doc/HTML/it/karbon
-@dirrmtry share/apps/koffice/autocorrect
-@dirrmtry share/apps/koffice
diff --git a/editors/calligra-l10n-kk/distinfo b/editors/calligra-l10n-kk/distinfo
index 1539e54255e7..ec204fc4f491 100644
--- a/editors/calligra-l10n-kk/distinfo
+++ b/editors/calligra-l10n-kk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-kk-2.2.2.tar.bz2) = a5dac93be9fda80bc9096b47f85e86073e5cc91809bbf6e48ce197b8f1b9867c
-SIZE (KDE/koffice-l10n/koffice-l10n-kk-2.2.2.tar.bz2) = 323371
+SHA256 (KDE/koffice-l10n/koffice-l10n-kk-2.3.1.tar.bz2) = 5693c247306be4de0eabdb17abfb834053914ca9d9af65d6a194918dce40ab8f
+SIZE (KDE/koffice-l10n/koffice-l10n-kk-2.3.1.tar.bz2) = 333063
diff --git a/editors/calligra-l10n-nb/distinfo b/editors/calligra-l10n-nb/distinfo
index 4a89c66d01b0..3211936459ce 100644
--- a/editors/calligra-l10n-nb/distinfo
+++ b/editors/calligra-l10n-nb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-nb-2.2.2.tar.bz2) = 299f406d52bb0230e868044a15fe99a743b3683648be84289b9e033f854a5ba7
-SIZE (KDE/koffice-l10n/koffice-l10n-nb-2.2.2.tar.bz2) = 319304
+SHA256 (KDE/koffice-l10n/koffice-l10n-nb-2.3.1.tar.bz2) = b4cdaf535836c7cbbf8c86661e564fa6a32a2f157e846c9bd76294dc004b0bc8
+SIZE (KDE/koffice-l10n/koffice-l10n-nb-2.3.1.tar.bz2) = 329384
diff --git a/editors/calligra-l10n-nb/pkg-plist b/editors/calligra-l10n-nb/pkg-plist
index 691d9c9feac7..5e1e98f18df4 100644
--- a/editors/calligra-l10n-nb/pkg-plist
+++ b/editors/calligra-l10n-nb/pkg-plist
@@ -1,18 +1,22 @@
share/apps/koffice/autocorrect/nb.xml
share/locale/nb/LC_MESSAGES/ArtisticTextShape.mo
share/locale/nb/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/nb/LC_MESSAGES/BarcodePlugin.mo
share/locale/nb/LC_MESSAGES/CalendarTool.mo
share/locale/nb/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/nb/LC_MESSAGES/ChartPlugin.mo
share/locale/nb/LC_MESSAGES/ChartShape.mo
+share/locale/nb/LC_MESSAGES/CommentShape.mo
share/locale/nb/LC_MESSAGES/DivineProportion.mo
share/locale/nb/LC_MESSAGES/FormulaShape.mo
-share/locale/nb/LC_MESSAGES/FreOffice.mo
share/locale/nb/LC_MESSAGES/KarbonTools.mo
share/locale/nb/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/nb/LC_MESSAGES/MusicShape.mo
share/locale/nb/LC_MESSAGES/ParagraphTool.mo
share/locale/nb/LC_MESSAGES/PathShapes.mo
share/locale/nb/LC_MESSAGES/PictureShape.mo
+share/locale/nb/LC_MESSAGES/PluginShape.mo
+share/locale/nb/LC_MESSAGES/ShapePlugin.mo
share/locale/nb/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/nb/LC_MESSAGES/TableShape.mo
share/locale/nb/LC_MESSAGES/TextShape.mo
@@ -47,5 +51,5 @@ share/locale/nb/LC_MESSAGES/kspreadsolver.mo
share/locale/nb/LC_MESSAGES/kthesaurus.mo
share/locale/nb/LC_MESSAGES/kword.mo
share/locale/nb/LC_MESSAGES/thesaurus_tool.mo
-@dirrmtry share/apps/koffice/autocorrect
-@dirrmtry share/apps/koffice
+@dirrm share/apps/koffice/autocorrect
+@dirrm share/apps/koffice
diff --git a/editors/calligra-l10n-nds/distinfo b/editors/calligra-l10n-nds/distinfo
index edd3c12212ab..aee71fd06280 100644
--- a/editors/calligra-l10n-nds/distinfo
+++ b/editors/calligra-l10n-nds/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-nds-2.2.2.tar.bz2) = bb110c368203d0a2de8e60baa9006bc5d55dc296e75378d72a5ae0a18ec17da6
-SIZE (KDE/koffice-l10n/koffice-l10n-nds-2.2.2.tar.bz2) = 960450
+SHA256 (KDE/koffice-l10n/koffice-l10n-nds-2.3.1.tar.bz2) = 0d0328d7a9595869960eb2aa52d3b4ca4eefa95a9ccd205fea8ae7316d472fab
+SIZE (KDE/koffice-l10n/koffice-l10n-nds-2.3.1.tar.bz2) = 971559
diff --git a/editors/calligra-l10n-nds/pkg-plist b/editors/calligra-l10n-nds/pkg-plist
index e18a297e0ee4..cc7ca7fb38a3 100644
--- a/editors/calligra-l10n-nds/pkg-plist
+++ b/editors/calligra-l10n-nds/pkg-plist
@@ -1,18 +1,21 @@
-share/apps/koffice/autocorrect/nds.xml
share/locale/nds/LC_MESSAGES/ArtisticTextShape.mo
share/locale/nds/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/nds/LC_MESSAGES/BarcodePlugin.mo
share/locale/nds/LC_MESSAGES/CalendarTool.mo
share/locale/nds/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/nds/LC_MESSAGES/ChartPlugin.mo
share/locale/nds/LC_MESSAGES/ChartShape.mo
+share/locale/nds/LC_MESSAGES/CommentShape.mo
share/locale/nds/LC_MESSAGES/DivineProportion.mo
share/locale/nds/LC_MESSAGES/FormulaShape.mo
-share/locale/nds/LC_MESSAGES/FreOffice.mo
share/locale/nds/LC_MESSAGES/KarbonTools.mo
share/locale/nds/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/nds/LC_MESSAGES/MusicShape.mo
share/locale/nds/LC_MESSAGES/ParagraphTool.mo
share/locale/nds/LC_MESSAGES/PathShapes.mo
share/locale/nds/LC_MESSAGES/PictureShape.mo
+share/locale/nds/LC_MESSAGES/PluginShape.mo
+share/locale/nds/LC_MESSAGES/ShapePlugin.mo
share/locale/nds/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/nds/LC_MESSAGES/TableShape.mo
share/locale/nds/LC_MESSAGES/TextShape.mo
@@ -47,5 +50,3 @@ share/locale/nds/LC_MESSAGES/kspreadsolver.mo
share/locale/nds/LC_MESSAGES/kthesaurus.mo
share/locale/nds/LC_MESSAGES/kword.mo
share/locale/nds/LC_MESSAGES/thesaurus_tool.mo
-@dirrmtry share/apps/koffice/autocorrect
-@dirrmtry share/apps/koffice
diff --git a/editors/calligra-l10n-nl/distinfo b/editors/calligra-l10n-nl/distinfo
index d7e3bd20fc8f..0c63c62da5b8 100644
--- a/editors/calligra-l10n-nl/distinfo
+++ b/editors/calligra-l10n-nl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-nl-2.2.2.tar.bz2) = c304a1ff3f4cd4582057bc6585ba6acdfca4759bffa81df95301d6da61fb72f4
-SIZE (KDE/koffice-l10n/koffice-l10n-nl-2.2.2.tar.bz2) = 2751492
+SHA256 (KDE/koffice-l10n/koffice-l10n-nl-2.3.1.tar.bz2) = 13785ed2b38303f5dc3e98b7d133abdf350d2d66453682583ed57b7e38f0f810
+SIZE (KDE/koffice-l10n/koffice-l10n-nl-2.3.1.tar.bz2) = 2789033
diff --git a/editors/calligra-l10n-nl/pkg-plist b/editors/calligra-l10n-nl/pkg-plist
index 4d4120d5ffc0..377260caf2a1 100644
--- a/editors/calligra-l10n-nl/pkg-plist
+++ b/editors/calligra-l10n-nl/pkg-plist
@@ -53,6 +53,13 @@ share/doc/HTML/nl/kformula/shortcut1.png
share/doc/HTML/nl/kformula/sin.png
share/doc/HTML/nl/kformula/toolbars.png
share/doc/HTML/nl/kformula/upper-index.png
+share/doc/HTML/nl/kivio/common
+share/doc/HTML/nl/kivio/credits.docbook
+share/doc/HTML/nl/kivio/index.cache.bz2
+share/doc/HTML/nl/kivio/index.docbook
+share/doc/HTML/nl/kivio/introduction.docbook
+share/doc/HTML/nl/kivio/usage.docbook
+share/doc/HTML/nl/kivio/working.docbook
share/doc/HTML/nl/koffice/common
share/doc/HTML/nl/koffice/index.cache.bz2
share/doc/HTML/nl/koffice/index.docbook
@@ -156,18 +163,22 @@ share/doc/HTML/nl/thesaurus/index.cache.bz2
share/doc/HTML/nl/thesaurus/index.docbook
share/locale/nl/LC_MESSAGES/ArtisticTextShape.mo
share/locale/nl/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/nl/LC_MESSAGES/BarcodePlugin.mo
share/locale/nl/LC_MESSAGES/CalendarTool.mo
share/locale/nl/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/nl/LC_MESSAGES/ChartPlugin.mo
share/locale/nl/LC_MESSAGES/ChartShape.mo
+share/locale/nl/LC_MESSAGES/CommentShape.mo
share/locale/nl/LC_MESSAGES/DivineProportion.mo
share/locale/nl/LC_MESSAGES/FormulaShape.mo
-share/locale/nl/LC_MESSAGES/FreOffice.mo
share/locale/nl/LC_MESSAGES/KarbonTools.mo
share/locale/nl/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/nl/LC_MESSAGES/MusicShape.mo
share/locale/nl/LC_MESSAGES/ParagraphTool.mo
share/locale/nl/LC_MESSAGES/PathShapes.mo
share/locale/nl/LC_MESSAGES/PictureShape.mo
+share/locale/nl/LC_MESSAGES/PluginShape.mo
+share/locale/nl/LC_MESSAGES/ShapePlugin.mo
share/locale/nl/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/nl/LC_MESSAGES/TableShape.mo
share/locale/nl/LC_MESSAGES/TextShape.mo
@@ -206,6 +217,7 @@ share/locale/nl/LC_MESSAGES/thesaurus_tool.mo
@dirrm share/doc/HTML/nl/kspread
@dirrm share/doc/HTML/nl/kpresenter
@dirrm share/doc/HTML/nl/koffice
+@dirrm share/doc/HTML/nl/kivio
@dirrm share/doc/HTML/nl/kformula
@dirrm share/doc/HTML/nl/kexi
@dirrm share/doc/HTML/nl/kchart
diff --git a/editors/calligra-l10n-sv/distinfo b/editors/calligra-l10n-sv/distinfo
index 0f98ac5e1d7d..0e37289caac5 100644
--- a/editors/calligra-l10n-sv/distinfo
+++ b/editors/calligra-l10n-sv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-sv-2.2.2.tar.bz2) = a902a61469be30dcb76c128d577e0e24243cd8bb8a0706b4dc6fc637568463e3
-SIZE (KDE/koffice-l10n/koffice-l10n-sv-2.2.2.tar.bz2) = 2414809
+SHA256 (KDE/koffice-l10n/koffice-l10n-sv-2.3.1.tar.bz2) = 556dd84f3db05ac890888f661f742afe7ac40252bf5d1ff76ab03aee701bde6f
+SIZE (KDE/koffice-l10n/koffice-l10n-sv-2.3.1.tar.bz2) = 2447893
diff --git a/editors/calligra-l10n-sv/pkg-plist b/editors/calligra-l10n-sv/pkg-plist
index 9ed75becae39..9dc75262dea5 100644
--- a/editors/calligra-l10n-sv/pkg-plist
+++ b/editors/calligra-l10n-sv/pkg-plist
@@ -68,6 +68,13 @@ share/doc/HTML/sv/kformula/scilab-edit.png
share/doc/HTML/sv/kformula/shortcut0.png
share/doc/HTML/sv/kformula/shortcut1.png
share/doc/HTML/sv/kformula/toolbars.png
+share/doc/HTML/sv/kivio/common
+share/doc/HTML/sv/kivio/credits.docbook
+share/doc/HTML/sv/kivio/index.cache.bz2
+share/doc/HTML/sv/kivio/index.docbook
+share/doc/HTML/sv/kivio/introduction.docbook
+share/doc/HTML/sv/kivio/usage.docbook
+share/doc/HTML/sv/kivio/working.docbook
share/doc/HTML/sv/koffice/common
share/doc/HTML/sv/koffice/index.cache.bz2
share/doc/HTML/sv/koffice/index.docbook
@@ -208,18 +215,22 @@ share/doc/HTML/sv/thesaurus/index.cache.bz2
share/doc/HTML/sv/thesaurus/index.docbook
share/locale/sv/LC_MESSAGES/ArtisticTextShape.mo
share/locale/sv/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/sv/LC_MESSAGES/BarcodePlugin.mo
share/locale/sv/LC_MESSAGES/CalendarTool.mo
share/locale/sv/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/sv/LC_MESSAGES/ChartPlugin.mo
share/locale/sv/LC_MESSAGES/ChartShape.mo
+share/locale/sv/LC_MESSAGES/CommentShape.mo
share/locale/sv/LC_MESSAGES/DivineProportion.mo
share/locale/sv/LC_MESSAGES/FormulaShape.mo
-share/locale/sv/LC_MESSAGES/FreOffice.mo
share/locale/sv/LC_MESSAGES/KarbonTools.mo
share/locale/sv/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/sv/LC_MESSAGES/MusicShape.mo
share/locale/sv/LC_MESSAGES/ParagraphTool.mo
share/locale/sv/LC_MESSAGES/PathShapes.mo
share/locale/sv/LC_MESSAGES/PictureShape.mo
+share/locale/sv/LC_MESSAGES/PluginShape.mo
+share/locale/sv/LC_MESSAGES/ShapePlugin.mo
share/locale/sv/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/sv/LC_MESSAGES/TableShape.mo
share/locale/sv/LC_MESSAGES/TextShape.mo
@@ -258,6 +269,7 @@ share/locale/sv/LC_MESSAGES/thesaurus_tool.mo
@dirrm share/doc/HTML/sv/kspread
@dirrm share/doc/HTML/sv/kpresenter
@dirrm share/doc/HTML/sv/koffice
+@dirrm share/doc/HTML/sv/kivio
@dirrm share/doc/HTML/sv/kformula
@dirrm share/doc/HTML/sv/kexi
@dirrm share/doc/HTML/sv/kchart
diff --git a/editors/calligra-l10n/Makefile b/editors/calligra-l10n/Makefile
index 4bf0801dea02..41b28656de6e 100644
--- a/editors/calligra-l10n/Makefile
+++ b/editors/calligra-l10n/Makefile
@@ -19,12 +19,13 @@ NO_BUILD= yes
# NO_INSTALL= yes
USE_KDE4= kdeprefix
-KOFFICE2_LANG_ALL= ca ca@valencia da de el en_GB es et fr gl it ja kk \
+KOFFICE2_LANG_ALL= ca ca@valencia da de el en_GB es et fr gl hu it ja kk \
nb nds nl pl pt pt_BR ru sv tr uk wa zh_CN zh_TW
ca@valencia_PORT= editors/koffice-kde4-l10n-ca_valencia
de_PORT= german/koffice-kde4-l10n
fr_PORT= french/koffice-kde4-l10n
+hu_PORT= hungarian/koffice-kde4-l10n
ja_PORT= japanese/koffice-kde4-l10n
pl_PORT= polish/koffice-kde4-l10n
pt_BR_PORT= portuguese/koffice-kde4-l10n-pt_BR
diff --git a/editors/calligra-l10n/files/bsd.l10n.mk b/editors/calligra-l10n/files/bsd.l10n.mk
index 11ccaafa38c5..d25c266004c5 100644
--- a/editors/calligra-l10n/files/bsd.l10n.mk
+++ b/editors/calligra-l10n/files/bsd.l10n.mk
@@ -5,8 +5,6 @@ PKGNAMEPREFIX= ${KOFFICE2_L10N:S/@/_/}-
DISTNAME= ${PORTNAME}-${KOFFICE2_L10N}-${PORTVERSION}
DIST_SUBDIR= KDE/koffice-l10n
-BUILD_DEPENDS= ${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
-
USE_BZIP2= yes
USE_QT_VER= 4
QT_COMPONENTS= uic_build moc_build qmake_build rcc_build xml
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 7652082a8fa9..e075c1d769be 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -7,10 +7,9 @@
PORTNAME= koffice
PORTVERSION= ${KOFFICE2_VERSION}
-PORTREVISION= 6
CATEGORIES= editors kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTNAME}-${PORTVERSION}/
+MASTER_SITE_SUBDIR= ${KOFFICE2_BRANCH}/${PORTNAME}-${PORTVERSION}/
PKGNAMESUFFIX= -kde4
DIST_SUBDIR= KDE
@@ -19,17 +18,16 @@ COMMENT= Office suite for KDE
BUILD_DEPENDS= eigen>=2.0.b3:${PORTSDIR}/math/eigen2 \
gmm++>=3.0.4:${PORTSDIR}/math/gmm++ \
- ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx30 \
- ${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
+ ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx30
LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs \
qca.2:${PORTSDIR}/devel/qca \
GraphicsMagick++.1:${PORTSDIR}/graphics/GraphicsMagick \
IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
exiv2.9:${PORTSDIR}/graphics/exiv2 \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- kipi.7:${PORTSDIR}/graphics/kdegraphics4 \
- lcms.1:${PORTSDIR}/graphics/lcms \
- wpg-0.1:${PORTSDIR}/graphics/libwpg01 \
+ kdcraw.9:${PORTSDIR}/graphics/kdegraphics4 \
+ lcms2.2:${PORTSDIR}/graphics/lcms2 \
+ wpg-0.2:${PORTSDIR}/graphics/libwpg \
png.6:${PORTSDIR}/graphics/png \
poppler-qt4.3:${PORTSDIR}/graphics/poppler-qt4 \
tiff.4:${PORTSDIR}/graphics/tiff \
@@ -38,7 +36,8 @@ LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs \
freetype.9:${PORTSDIR}/print/freetype2 \
qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
- fftw3.5:${PORTSDIR}/math/fftw3
+ fftw3.5:${PORTSDIR}/math/fftw3 \
+ dcmdata.3:${PORTSDIR}/devel/dcmtk
RUN_DEPENDS= ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx30
USE_BZIP2= yes
@@ -66,7 +65,7 @@ OPTIONS+= XBASE "XBase support in Kexi" off
.include <bsd.port.options.mk>
.if exists(${LOCALBASE}/include/qconfig.h)
-IGNORE= does not build with x11-toolkits/qt33 installed. Please, deinstall qt-3.x first
+IGNORE= does not build with x11-toolkits/qt33 installed. Please deinstall qt-3.x first
.endif
.if !defined(WITHOUT_GTL) || exists (${LOCALBASE}/lib/libQtShiva.so)
@@ -78,6 +77,7 @@ PLIST_SUB+= GTL="@comment "
.endif
.if exists(${LOCALBASE}/lib/pstoedit/libp2edrvlplot.so)
+QT_COMPONENTS+= qt3support
BUILD_DEPENDS+= ${LOCALBASE}/lib/pstoedit/libp2edrvlplot.so:${PORTSDIR}/graphics/pstoedit
RUN_DEPENDS+= ${LOCALBASE}/lib/pstoedit/libp2edrvlplot.so:${PORTSDIR}/graphics/pstoedit
PLIST_SUB+= EPS=""
diff --git a/editors/calligra/distinfo b/editors/calligra/distinfo
index 41fd5054a1a3..2f3345de45c3 100644
--- a/editors/calligra/distinfo
+++ b/editors/calligra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-2.2.2.tar.bz2) = e5b060f640dd7ecd13b5d17f7e9ace7c0d1c0621e5fb83529f6e6db2d5c1edcb
-SIZE (KDE/koffice-2.2.2.tar.bz2) = 56470974
+SHA256 (KDE/koffice-2.3.1.tar.bz2) = e73da38cfbfb2c6b7170767065addc0de38725e82c4fa49c76bcf375ee44f143
+SIZE (KDE/koffice-2.3.1.tar.bz2) = 75687214
diff --git a/editors/calligra/files/patch-cmake__modules__FindWPD.cmake b/editors/calligra/files/patch-cmake__modules__FindWPD.cmake
index 9567bcb4515f..c3b84828ea03 100644
--- a/editors/calligra/files/patch-cmake__modules__FindWPD.cmake
+++ b/editors/calligra/files/patch-cmake__modules__FindWPD.cmake
@@ -1,11 +1,17 @@
---- ./cmake/modules/FindWPD.cmake.orig 2010-03-30 13:10:16.507260418 +1100
-+++ ./cmake/modules/FindWPD.cmake 2010-03-30 13:09:54.253774780 +1100
-@@ -24,7 +24,7 @@
+--- ./cmake/modules/FindWPD.cmake.orig 2011-03-25 01:34:51.930775929 +0100
++++ ./cmake/modules/FindWPD.cmake 2011-03-25 01:37:46.910772674 +0100
+@@ -19,13 +19,11 @@
+ else (WPD_INCLUDE_DIR AND WPD_LIBRARIES)
+ if(NOT WIN32)
+ INCLUDE(FindPkgConfig)
+- pkg_check_modules(WPD libwpd-0.8)
+ pkg_check_modules(WPD libwpd-0.9)
+ endif(NOT WIN32)
FIND_PATH(WPD_INCLUDE_DIR libwpd/libwpd.h
${WPD_INCLUDE_DIR}
- /usr/include/libwpd-0.8
-+ PATH_SUFFIXES libwpd-0.8
+- /usr/include/libwpd-0.9
++ PATH_SUFFIXES libwpd-0.9
)
-
diff --git a/editors/calligra/files/patch-cmake__modules__FindWPG.cmake b/editors/calligra/files/patch-cmake__modules__FindWPG.cmake
index fe0baab4eb6f..307c72f717b9 100644
--- a/editors/calligra/files/patch-cmake__modules__FindWPG.cmake
+++ b/editors/calligra/files/patch-cmake__modules__FindWPG.cmake
@@ -1,11 +1,24 @@
---- ./cmake/modules/FindWPG.cmake.orig 2010-03-30 00:05:52.000000000 +1100
-+++ ./cmake/modules/FindWPG.cmake 2010-03-30 13:07:46.392743489 +1100
-@@ -29,7 +29,7 @@
+--- ./cmake/modules/FindWPG.cmake.orig 2011-03-25 01:38:36.660731693 +0100
++++ ./cmake/modules/FindWPG.cmake 2011-03-25 01:40:49.690727037 +0100
+@@ -18,11 +18,10 @@
+
+ IF (NOT WIN32)
+ INCLUDE(FindPkgConfig)
+- pkg_check_modules(LIBWPG libwpg-0.1)
+ pkg_check_modules(LIBWPG libwpg-0.2)
+ ENDIF (NOT WIN32)
+
+- FIND_LIBRARY(LIBWPG_STREAM_LIBRARIES NAMES libwpg-stream-0.1 wpg-stream-0.1 libwpd-stream-0.9 wpd-stream-0.9
++ FIND_LIBRARY(LIBWPG_STREAM_LIBRARIES NAMES libwpd-stream-0.9 wpd-stream-0.9
+ PATHS
+ ${LIBWPG_LIBRARIES}
+ )
+@@ -30,7 +29,7 @@
FIND_PATH(LIBWPG_INCLUDE_DIR libwpg/libwpg.h
PATHS
${LIBWPG_INCLUDE_DIRS}
- PATH_SUFFIXES libwpg
-+ PATH_SUFFIXES libwpg-0.1
++ PATH_SUFFIXES libwpg-0.2
)
IF (LIBWPG_INCLUDE_DIR AND LIBWPG_LIBRARIES)
diff --git a/editors/calligra/files/patch-krita_plugins_formats_CMakeLists.txt b/editors/calligra/files/patch-krita_plugins_formats_CMakeLists.txt
index a9fa28617d33..277c45975334 100644
--- a/editors/calligra/files/patch-krita_plugins_formats_CMakeLists.txt
+++ b/editors/calligra/files/patch-krita_plugins_formats_CMakeLists.txt
@@ -1,8 +1,8 @@
---- ./krita/plugins/formats/CMakeLists.txt.orig 2009-08-24 01:58:24.000000000 +1100
-+++ ./krita/plugins/formats/CMakeLists.txt 2009-09-04 23:56:05.000000000 +1100
-@@ -15,15 +15,23 @@
+--- krita/plugins/formats/CMakeLists.txt.orig 2010-11-30 04:06:29.223954558 +0100
++++ krita/plugins/formats/CMakeLists.txt 2010-11-30 04:14:21.883911180 +0100
+@@ -15,15 +15,22 @@
macro_optional_find_package(Poppler)
- macro_log_feature( POPPLER_FOUND "poppler-qt4" "The Poppler Qt4 interface library" "http://poppler.freedesktop.org" FALSE "" "Required by the Krita PDF filter (version 0.6.x is currently required)")
+ macro_log_feature( POPPLER_FOUND "poppler-qt4" "The Poppler Qt4 interface library" "http://poppler.freedesktop.org" FALSE "" "Required by the Krita PDF filter")
-macro_optional_find_package(Kdcraw)
-macro_log_feature( KDCRAW_FOUND "kdcraw" "The KDCraw library" "http://www.digikam.org/" FALSE "" "Required by the Krita RAW filter")
@@ -11,7 +11,7 @@
macro_log_feature(OPENJPEG_FOUND "openjpeg" "Free library for JPEG 2000 image compression" "http://www.openjpeg.org" FALSE "" "Required by the Krita JPEG 2000 filter")
macro_optional_find_package(GIF2)
- macro_log_feature(GIF_FOUND "libungif/giflib" "Free library for reading and writing GIF images" "htt://XXX!!!" FALSE "" "Required by the Krita GIF filter")
+ macro_log_feature(GIF_FOUND "libungif/giflib" "Free library for reading and writing GIF images" "http://directory.fsf.org/project/libungif/" FALSE "" "Required by the Krita GIF filter")
+# Check for Kdcraw
+PKG_CHECK_MODULES(LIBKDCRAW libkdcraw-kde4>=0.4.0)
@@ -19,7 +19,6 @@
+ PATHS ${LIBKDCRAW_INCLUDE_DIRS} ${KDE4_INCLUDE_DIR} NO_DEFAULT_PATH)
+FIND_LIBRARY(KDCRAW_LIBRARY NAMES kdcraw
+ PATHS ${LIBKDCRAW_LIBRARY_DIRS} ${KDE4_LIB_DIR} NO_DEFAULT_PATH)
-+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(KDCRAW DEFAULT_MSG KDCRAW_LIBRARY KDCRAW_INCLUDE_DIR)
+macro_log_feature( KDCRAW_FOUND "kdcraw" "The KDCraw library" "http://www.digikam.org/" FALSE "" "Required by the Krita RAW filter")
diff --git a/editors/calligra/files/patch-libwpg02-libwpd09 b/editors/calligra/files/patch-libwpg02-libwpd09
new file mode 100644
index 000000000000..ee14437564d5
--- /dev/null
+++ b/editors/calligra/files/patch-libwpg02-libwpd09
@@ -0,0 +1,1334 @@
+diff -Nur ./filters/karbon/wpg/import/CMakeLists.txt ./filters/karbon/wpg/import/CMakeLists.txt
+--- ./filters/karbon/wpg/import/CMakeLists.txt 2011-01-15 21:05:35.000000000 +0100
++++ ./filters/karbon/wpg/import/CMakeLists.txt 2011-01-18 07:40:25.000000000 +0100
+@@ -1,16 +1,11 @@
+
+-
+ include_directories(${CMAKE_BINARY_DIR}/filters/ ${WPD_INCLUDE_DIR} ${LIBWPG_INCLUDE_DIR}/)
+
+-set(wpgimport_PART_SRCS
+-WPGImport.cpp
+-OdgExporter.cxx
+-FileOutputHandler.cxx
+-GraphicsElement.cxx)
++set(wpgimport_PART_SRCS WPGImport.cpp)
+
+ kde4_add_plugin(wpgimport ${wpgimport_PART_SRCS})
+
+-target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES})
++target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES} ${WPD_LIBRARIES})
+
+ install(TARGETS wpgimport DESTINATION ${PLUGIN_INSTALL_DIR})
+ install(FILES karbon_wpg_import.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+diff -Nur ./filters/karbon/wpg/import/FileOutputHandler.cxx ./filters/karbon/wpg/import/FileOutputHandler.cxx
+--- ./filters/karbon/wpg/import/FileOutputHandler.cxx 2011-01-15 21:05:35.000000000 +0100
++++ ./filters/karbon/wpg/import/FileOutputHandler.cxx 1970-01-01 01:00:00.000000000 +0100
+@@ -1,95 +0,0 @@
+-/* libwpg
+- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
+- *
+- * 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; if not, write to the
+- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+- * Boston, MA 02111-1301 USA
+- *
+- * For further information visit http://libwpg.sourceforge.net
+- */
+-
+-/* "This product is not manufactured, approved, or supported by
+- * Corel Corporation or Corel Corporation Limited."
+- */
+-
+-#include "FileOutputHandler.hxx"
+-
+-FileOutputHandler::FileOutputHandler(std::ostringstream &contentStream) :
+- mbIsTagOpened(false),
+- mContentStream(contentStream)
+-{
+-}
+-
+-void FileOutputHandler::startDocument()
+-{
+-}
+-
+-void FileOutputHandler::startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList)
+-{
+- if (mbIsTagOpened)
+- {
+- mContentStream << ">";
+- mbIsTagOpened = false;
+- }
+- mContentStream << "<" << psName;
+-
+- for (std::vector<std::pair<std::string, std::string> >::const_iterator i = xPropList.begin(); i != xPropList.end(); i++)
+- {
+- mContentStream << " " << (*i).first.c_str() << "=\"" << (*i).second.c_str() << "\"";
+- }
+- mbIsTagOpened = true;
+- msOpenedTagName = psName;
+-}
+-
+-void FileOutputHandler::endElement(const char *psName)
+-{
+- if (mbIsTagOpened)
+- {
+- if( msOpenedTagName == psName )
+- {
+- mContentStream << "/>";
+- mbIsTagOpened = false;
+- }
+- else // should not happen, but handle it
+- {
+- mContentStream << ">";
+- mContentStream << "</" << psName << ">";
+- mbIsTagOpened = false;
+- }
+- }
+- else
+- {
+- mContentStream << "</" << psName << ">";
+- mbIsTagOpened = false;
+- }
+-}
+-
+-void FileOutputHandler::characters(const std::string &sCharacters)
+-{
+- if (mbIsTagOpened)
+- {
+- mContentStream << ">";
+- mbIsTagOpened = false;
+- }
+- mContentStream << sCharacters.c_str();
+-}
+-
+-void FileOutputHandler::endDocument()
+-{
+- if (mbIsTagOpened)
+- {
+- mContentStream << ">";
+- mbIsTagOpened = false;
+- }
+-}
+diff -Nur ./filters/karbon/wpg/import/FileOutputHandler.hxx ./filters/karbon/wpg/import/FileOutputHandler.hxx
+--- ./filters/karbon/wpg/import/FileOutputHandler.hxx 2011-01-15 21:05:35.000000000 +0100
++++ ./filters/karbon/wpg/import/FileOutputHandler.hxx 1970-01-01 01:00:00.000000000 +0100
+@@ -1,49 +0,0 @@
+-/* libwpg
+- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
+- *
+- * 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; if not, write to the
+- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+- * Boston, MA 02111-1301 USA
+- *
+- * For further information visit http://libwpg.sourceforge.net
+- */
+-
+-/* "This product is not manufactured, approved, or supported by
+- * Corel Corporation or Corel Corporation Limited."
+- */
+-
+-#ifndef FILEOUTPUTHANDLER_H
+-#define FILEOUTPUTHANDLER_H
+-
+-#include <iostream>
+-#include <sstream>
+-#include <string>
+-#include "GraphicsHandler.hxx"
+-
+-class FileOutputHandler : public GraphicsHandler
+-{
+- public:
+- explicit FileOutputHandler(std::ostringstream &contentStream);
+- virtual void startDocument();
+- virtual void endDocument();
+- virtual void startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList);
+- virtual void endElement(const char *psName);
+- virtual void characters(const std::string &sCharacters);
+-
+- private:
+- bool mbIsTagOpened;
+- std::string msOpenedTagName;
+- std::ostringstream &mContentStream;
+-};
+-#endif
+diff -Nur ./filters/karbon/wpg/import/GraphicsElement.cxx ./filters/karbon/wpg/import/GraphicsElement.cxx
+--- ./filters/karbon/wpg/import/GraphicsElement.cxx 2011-01-15 21:05:35.000000000 +0100
++++ ./filters/karbon/wpg/import/GraphicsElement.cxx 1970-01-01 01:00:00.000000000 +0100
+@@ -1,66 +0,0 @@
+-/* GraphicsElement: The items we are collecting to be put into the Writer
+- * document: paragraph and spans of text, as well as section breaks.
+- *
+- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca)
+- *
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 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 library; if not, write to the
+- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+- * Boston, MA 02111-1301 USA
+- *
+- * For further information visit http://libwpg.sourceforge.net
+- *
+- */
+-
+-/* "This product is not manufactured, approved, or supported by
+- * Corel Corporation or Corel Corporation Limited."
+- */
+-
+-#include "GraphicsElement.hxx"
+-#include "GraphicsHandler.hxx"
+-#include <string.h>
+-
+-#define ASCII_SPACE 0x0020
+-
+-void TagGraphicsElement::print() const
+-{
+-}
+-
+-void OpenTagGraphicsElement::write(GraphicsHandler *pHandler) const
+-{
+- pHandler->startElement(getTagName().c_str(), maAttrList);
+-}
+-
+-void OpenTagGraphicsElement::print() const
+-{
+- TagGraphicsElement::print();
+-}
+-
+-void OpenTagGraphicsElement::addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue)
+-{
+- std::pair<std::string, std::string> tmpAttribute;
+- tmpAttribute.first = szAttributeName;
+- tmpAttribute.second = sAttributeValue;
+- maAttrList.push_back(tmpAttribute);
+-}
+-
+-void CloseTagGraphicsElement::write(GraphicsHandler *pHandler) const
+-{
+-
+- pHandler->endElement(getTagName().c_str());
+-}
+-
+-void CharDataGraphicsElement::write(GraphicsHandler *pHandler) const
+-{
+- pHandler->characters(msData);
+-}
+diff -Nur ./filters/karbon/wpg/import/GraphicsElement.hxx ./filters/karbon/wpg/import/GraphicsElement.hxx
+--- ./filters/karbon/wpg/import/GraphicsElement.hxx 2011-01-15 21:05:35.000000000 +0100
++++ ./filters/karbon/wpg/import/GraphicsElement.hxx 1970-01-01 01:00:00.000000000 +0100
+@@ -1,84 +0,0 @@
+-/* GraphicsElement: The items we are collecting to be put into the Writer
+- * document: paragraph and spans of text, as well as section breaks.
+- *
+- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca)
+- *
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 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 library; if not, write to the
+- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+- * Boston, MA 02111-1301 USA
+- *
+- * For further information visit http://libwpd.sourceforge.net
+- *
+- */
+-
+-/* "This product is not manufactured, approved, or supported by
+- * Corel Corporation or Corel Corporation Limited."
+- */
+-
+-#ifndef _GRAPHICSELEMENT_H
+-#define _GRAPHICSELEMENT_H
+-#include <string>
+-#include <map>
+-#include <vector>
+-
+-#include "GraphicsHandler.hxx"
+-
+-class GraphicsElement
+-{
+-public:
+- virtual ~GraphicsElement() {}
+- virtual void write(GraphicsHandler *pHandler) const = 0;
+- virtual void print() const {}
+-};
+-
+-class TagGraphicsElement : public GraphicsElement
+-{
+-public:
+- explicit TagGraphicsElement(const char *szTagName) : msTagName(szTagName) {}
+- const std::string &getTagName() const { return msTagName; }
+- virtual void print() const;
+-private:
+- const std::string msTagName;
+-};
+-
+-class OpenTagGraphicsElement : public TagGraphicsElement
+-{
+-public:
+- explicit OpenTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {}
+- ~OpenTagGraphicsElement() {}
+- void addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue);
+- virtual void write(GraphicsHandler *pHandler) const;
+- virtual void print () const;
+-private:
+- std::vector<std::pair<std::string, std::string> > maAttrList;
+-};
+-
+-class CloseTagGraphicsElement : public TagGraphicsElement
+-{
+-public:
+- explicit CloseTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {}
+- virtual void write(GraphicsHandler *pHandler) const;
+-};
+-
+-class CharDataGraphicsElement : public GraphicsElement
+-{
+-public:
+- CharDataGraphicsElement(const char *sData) : GraphicsElement(), msData(sData) {}
+- virtual void write(GraphicsHandler *pHandler) const;
+-private:
+- std::string msData;
+-};
+-
+-
+-#endif
+diff -Nur ./filters/karbon/wpg/import/GraphicsHandler.hxx ./filters/karbon/wpg/import/GraphicsHandler.hxx
+--- ./filters/karbon/wpg/import/GraphicsHandler.hxx 2011-01-15 21:05:35.000000000 +0100
++++ ./filters/karbon/wpg/import/GraphicsHandler.hxx 1970-01-01 01:00:00.000000000 +0100
+@@ -1,43 +0,0 @@
+-/*
+- * Copyright (C) 2004 William Lachance (wlach@interlog.com)
+- * Copyright (C) 2004 Net Integration Technologies (http://www.net-itech.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 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 General Public License for more details.
+- *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+- * Boston, MA 02111-1301 USA
+- *
+- * Contributor(s): Martin Gallwey (gallwey@sun.com)
+- *
+- */
+-
+-/* "This product is not manufactured, approved, or supported by
+- * Corel Corporation or Corel Corporation Limited."
+- */
+-#ifndef _GRAPHICSHANDLER_H
+-#define _GRAPHICSHANDLER_H
+-#include <string>
+-#include <map>
+-#include <vector>
+-
+-class GraphicsHandler
+-{
+-public:
+- virtual ~GraphicsHandler() {}
+- virtual void startDocument() = 0;
+- virtual void endDocument() = 0;
+- virtual void startElement(const char *psName, const std::vector< std::pair <std::string, std::string> > &xPropList) = 0;
+- virtual void endElement(const char *psName) = 0;
+- virtual void characters(const std::string &sCharacters) = 0;
+-};
+-#endif
+diff -Nur ./filters/karbon/wpg/import/karbon_wpg_import.desktop ./filters/karbon/wpg/import/karbon_wpg_import.desktop
+--- ./filters/karbon/wpg/import/karbon_wpg_import.desktop 2011-01-15 21:05:35.000000000 +0100
++++ ./filters/karbon/wpg/import/karbon_wpg_import.desktop 2011-01-18 07:41:33.000000000 +0100
+@@ -42,7 +42,7 @@
+ Name[x-test]=xxKarbon WPG Import Filterxx
+ Name[zh_CN]=Karbon WPG 导入过滤器
+ Name[zh_TW]=Karbon WPG 匯入過濾程式
+-X-KDE-Export=application/vnd.oasis.opendocument.graphics
++X-KDE-Export=image/svg+xml
+ X-KDE-Import=application/x-wpg
+ X-KDE-Weight=1
+ X-KDE-Library=wpgimport
+diff -Nur ./filters/karbon/wpg/import/OdgExporter.cxx ./filters/karbon/wpg/import/OdgExporter.cxx
+--- ./filters/karbon/wpg/import/OdgExporter.cxx 2011-01-15 21:05:35.000000000 +0100
++++ ./filters/karbon/wpg/import/OdgExporter.cxx 1970-01-01 01:00:00.000000000 +0100
+@@ -1,662 +0,0 @@
+-/* libwpg
+- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
+- *
+- * 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; if not, write to the
+- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+- * Boston, MA 02111-1301 USA
+- *
+- * For further information visit http://libwpg.sourceforge.net
+- */
+-
+-/* "This product is not manufactured, approved, or supported by
+- * Corel Corporation or Corel Corporation Limited."
+- */
+-
+-#include "OdgExporter.hxx"
+-#include "GraphicsElement.hxx"
+-#include "GraphicsHandler.hxx"
+-#include <locale.h>
+-
+-static std::string doubleToString(const double value)
+-{
+- std::ostringstream tempStream;
+- tempStream << value;
+- std::string decimalPoint(localeconv()->decimal_point);
+- if ((decimalPoint.size() == 0) || (decimalPoint == "."))
+- return tempStream.str();
+- std::string stringValue(tempStream.str());
+- if (!stringValue.empty())
+- {
+- std::string::size_type pos;
+- while ((pos = stringValue.find(decimalPoint)) != std::string::npos)
+- stringValue.replace(pos,decimalPoint.size(),".");
+- }
+- return stringValue;
+-}
+-
+-
+-OdgExporter::OdgExporter(GraphicsHandler *pHandler, const bool isFlatXML):
+- mpHandler(pHandler),
+- m_fillRule(AlternatingFill),
+- m_gradientIndex(1),
+- m_dashIndex(1),
+- m_styleIndex(1),
+- m_width(0.0f),
+- m_height(0.0f),
+- m_isFlatXML(isFlatXML)
+-{
+-}
+-
+-OdgExporter::~OdgExporter()
+-{
+- for (std::vector <GraphicsElement *>::iterator iterStroke = mStrokeDashElements.begin();
+- iterStroke != mStrokeDashElements.end(); iterStroke++)
+- delete (*iterStroke);
+-
+- for (std::vector <GraphicsElement *>::iterator iterGradient = mGradientElements.begin();
+- iterGradient != mGradientElements.end(); iterGradient++)
+- delete (*iterGradient);
+-
+- for (std::vector <GraphicsElement *>::iterator iterAutomaticStyles = mAutomaticStylesElements.begin();
+- iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++)
+- delete (*iterAutomaticStyles);
+-
+- for (std::vector<GraphicsElement *>::iterator bodyIter = mBodyElements.begin();
+- bodyIter != mBodyElements.end(); bodyIter++)
+- delete (*bodyIter);
+-}
+-
+-void OdgExporter::startGraphics(double width, double height)
+-{
+- m_gradientIndex = 1;
+- m_dashIndex = 1;
+- m_styleIndex = 1;
+- m_width = width;
+- m_height = height;
+-
+-
+- mpHandler->startDocument();
+- OpenTagGraphicsElement tmpOfficeDocumentContent("office:document");
+- tmpOfficeDocumentContent.addAttribute("xmlns:office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0");
+- tmpOfficeDocumentContent.addAttribute("xmlns:style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0");
+- tmpOfficeDocumentContent.addAttribute("xmlns:text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0");
+- tmpOfficeDocumentContent.addAttribute("xmlns:draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0");
+- tmpOfficeDocumentContent.addAttribute("xmlns:dc", "http://purl.org/dc/elements/1.1/");
+- tmpOfficeDocumentContent.addAttribute("xmlns:svg", "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0");
+- tmpOfficeDocumentContent.addAttribute("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0");
+- tmpOfficeDocumentContent.addAttribute("xmlns:config", "urn:oasis:names:tc:opendocument:xmlns:config:1.0");
+- tmpOfficeDocumentContent.addAttribute("xmlns:ooo", "http://openoffice.org/2004/office");
+- tmpOfficeDocumentContent.addAttribute("office:version", "1.0");
+- if (m_isFlatXML)
+- tmpOfficeDocumentContent.addAttribute("office:mimetype", "application/x-vnd.oasis.openoffice.drawing");
+- tmpOfficeDocumentContent.write(mpHandler);
+-
+- OpenTagGraphicsElement("office:settings").write(mpHandler);
+-
+- OpenTagGraphicsElement configItemSetOpenElement("config:config-item-set");
+- configItemSetOpenElement.addAttribute("config:name", "ooo:view-settings");
+- configItemSetOpenElement.write(mpHandler);
+-
+- OpenTagGraphicsElement configItemOpenElement1("config:config-item");
+- configItemOpenElement1.addAttribute("config:name", "VisibleAreaTop");
+- configItemOpenElement1.addAttribute("config:type", "int");
+- configItemOpenElement1.write(mpHandler);
+- mpHandler->characters("0");
+- mpHandler->endElement("config:config-item");
+-
+- OpenTagGraphicsElement configItemOpenElement2("config:config-item");
+- configItemOpenElement2.addAttribute("config:name", "VisibleAreaLeft");
+- configItemOpenElement2.addAttribute("config:type", "int");
+- configItemOpenElement2.write(mpHandler);
+- mpHandler->characters("0");
+- mpHandler->endElement("config:config-item");
+-
+- OpenTagGraphicsElement configItemOpenElement3("config:config-item");
+- configItemOpenElement3.addAttribute("config:name", "VisibleAreaWidth");
+- configItemOpenElement3.addAttribute("config:type", "int");
+- configItemOpenElement3.write(mpHandler);
+- m_value.str("");
+- m_value << (unsigned)(2540 * width);
+- mpHandler->characters(m_value.str());
+- mpHandler->endElement("config:config-item");
+-
+- OpenTagGraphicsElement configItemOpenElement4("config:config-item");
+- configItemOpenElement4.addAttribute("config:name", "VisibleAreaHeight");
+- configItemOpenElement4.addAttribute("config:type", "int");
+- configItemOpenElement4.write(mpHandler);
+- m_value.str("");
+- m_value << (unsigned)(2540 * height);
+- mpHandler->characters(m_value.str());
+- mpHandler->endElement("config:config-item");
+-
+- mpHandler->endElement("config:config-item-set");
+-
+- mpHandler->endElement("office:settings");
+-
+-}
+-
+-void OdgExporter::endGraphics()
+-{
+- OpenTagGraphicsElement("office:styles").write(mpHandler);
+-
+- for (std::vector <GraphicsElement *>::const_iterator iterStroke = mStrokeDashElements.begin();
+- iterStroke != mStrokeDashElements.end(); iterStroke++)
+- (*iterStroke)->write(mpHandler);
+-
+- for (std::vector <GraphicsElement *>::const_iterator iterGradient = mGradientElements.begin();
+- iterGradient != mGradientElements.end(); iterGradient++)
+- (*iterGradient)->write(mpHandler);
+-
+- mpHandler->endElement("office:styles");
+-
+- OpenTagGraphicsElement("office:automatic-styles").write(mpHandler);
+-
+- for (std::vector <GraphicsElement *>::const_iterator iterAutomaticStyles = mAutomaticStylesElements.begin();
+- iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++)
+- (*iterAutomaticStyles)->write(mpHandler);
+-
+- OpenTagGraphicsElement tmpStylePageLayoutOpenElement("style:page-layout");
+- tmpStylePageLayoutOpenElement.addAttribute("style:name", "PM0");
+- tmpStylePageLayoutOpenElement.write(mpHandler);
+-
+- OpenTagGraphicsElement tmpStylePageLayoutPropertiesOpenElement("style:page-layout-properties");
+- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-top", "0in");
+- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-bottom", "0in");
+- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-left", "0in");
+- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-right", "0in");
+- m_value.str("");
+- m_value << doubleToString(m_width) << "in";
+- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-width", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(m_height) << "in";
+- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-height", m_value.str());
+- m_value.str("");
+- tmpStylePageLayoutPropertiesOpenElement.addAttribute("style:print-orientation", "portrait");
+- tmpStylePageLayoutPropertiesOpenElement.write(mpHandler);
+-
+- mpHandler->endElement("style:page-layout-properties");
+-
+- mpHandler->endElement("style:page-layout");
+-
+- OpenTagGraphicsElement tmpStyleStyleOpenElement("style:style");
+- tmpStyleStyleOpenElement.addAttribute("style:name", "dp1");
+- tmpStyleStyleOpenElement.addAttribute("style:family", "drawing-page");
+- tmpStyleStyleOpenElement.write(mpHandler);
+-
+- OpenTagGraphicsElement tmpStyleDrawingPagePropertiesOpenElement("style:drawing-page-properties");
+- // tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:background-size", "border");
+- tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:fill", "none");
+- tmpStyleDrawingPagePropertiesOpenElement.write(mpHandler);
+-
+- mpHandler->endElement("style:drawing-page-properties");
+-
+- mpHandler->endElement("style:style");
+-
+- mpHandler->endElement("office:automatic-styles");
+-
+- OpenTagGraphicsElement("office:master-styles").write(mpHandler);
+-
+- OpenTagGraphicsElement tmpStyleMasterPageOpenElement("style:master-page");
+- tmpStyleMasterPageOpenElement.addAttribute("style:name", "Default");
+- tmpStyleMasterPageOpenElement.addAttribute("style:page-layout-name", "PM0");
+- tmpStyleMasterPageOpenElement.addAttribute("draw:style-name", "dp1");
+- tmpStyleMasterPageOpenElement.write(mpHandler);
+-
+- mpHandler->endElement("style:master-page");
+-
+- mpHandler->endElement("office:master-styles");
+-
+- OpenTagGraphicsElement("office:body").write(mpHandler);
+-
+- OpenTagGraphicsElement("office:drawing").write(mpHandler);
+-
+- OpenTagGraphicsElement tmpDrawPageOpenElement("draw:page");
+- tmpDrawPageOpenElement.addAttribute("draw:name", "page1");
+- tmpDrawPageOpenElement.addAttribute("draw:style-name", "dp1");
+- tmpDrawPageOpenElement.addAttribute("draw:master-page-name", "Default");
+- tmpDrawPageOpenElement.write(mpHandler);
+-
+- for (std::vector<GraphicsElement *>::const_iterator bodyIter = mBodyElements.begin();
+- bodyIter != mBodyElements.end(); bodyIter++)
+- {
+- (*bodyIter)->write(mpHandler);
+- }
+-
+- mpHandler->endElement("draw:page");
+- mpHandler->endElement("office:drawing");
+- mpHandler->endElement("office:body");
+- mpHandler->endElement("office:document");
+-
+- mpHandler->endDocument();
+-}
+-
+-void OdgExporter::setPen(const libwpg::WPGPen& pen)
+-{
+- m_pen = pen;
+-}
+-
+-void OdgExporter::setBrush(const libwpg::WPGBrush& brush)
+-{
+- m_brush = brush;
+-}
+-
+-void OdgExporter::setFillRule(FillRule rule)
+-{
+- m_fillRule = rule;
+-}
+-
+-void OdgExporter::startLayer(unsigned int)
+-{
+-}
+-
+-void OdgExporter::endLayer(unsigned int)
+-{
+-}
+-
+-void OdgExporter::drawRectangle(const libwpg::WPGRect& rect, double rx, double )
+-{
+- writeStyle();
+- OpenTagGraphicsElement *pDrawRectElement = new OpenTagGraphicsElement("draw:rect");
+- m_value.str("");
+- m_value << "gr" << m_styleIndex-1;
+- pDrawRectElement->addAttribute("draw:style-name", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(rect.x1) << "in";
+- pDrawRectElement->addAttribute("svg:x", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(rect.y1) << "in";
+- pDrawRectElement->addAttribute("svg:y", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(rect.x2-rect.x1) << "in";
+- pDrawRectElement->addAttribute("svg:width", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(rect.y2-rect.y1) << "in";
+- pDrawRectElement->addAttribute("svg:height", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(rx) << "in";
+- // FIXME: what to do when rx != ry ?
+- pDrawRectElement->addAttribute("draw:corner-radius", m_value.str());
+- m_value.str("");
+- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawRectElement));
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:rect")));
+-}
+-
+-void OdgExporter::drawEllipse(const libwpg::WPGPoint& center, double rx, double ry)
+-{
+- writeStyle();
+- OpenTagGraphicsElement *pDrawEllipseElement = new OpenTagGraphicsElement("draw:ellipse");
+- m_value.str("");
+- m_value << "gr" << m_styleIndex-1;
+- pDrawEllipseElement->addAttribute("draw:style-name", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(center.x - rx) << "in";
+- pDrawEllipseElement->addAttribute("svg:x", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(center.y - ry) << "in";
+- pDrawEllipseElement->addAttribute("svg:y", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(2 * rx) << "in";
+- pDrawEllipseElement->addAttribute("svg:width", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(2 * ry) << "in";
+- pDrawEllipseElement->addAttribute("svg:height", m_value.str());
+- m_value.str("");
+- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawEllipseElement));
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:ellipse")));
+-}
+-
+-void OdgExporter::drawPolygon(const libwpg::WPGPointArray& vertices)
+-{
+- if(vertices.count() < 2)
+- return;
+-
+- if(vertices.count() == 2)
+- {
+- const libwpg::WPGPoint& p1 = vertices[0];
+- const libwpg::WPGPoint& p2 = vertices[1];
+-
+- writeStyle();
+- OpenTagGraphicsElement *pDrawLineElement = new OpenTagGraphicsElement("draw:line");
+- m_value.str("");
+- m_value << "gr" << m_styleIndex-1;
+- pDrawLineElement->addAttribute("draw:style-name", m_value.str());
+- m_value.str("");
+- pDrawLineElement->addAttribute("draw:text-style-name", "P1");
+- pDrawLineElement->addAttribute("draw:layer", "layout");
+- m_value << doubleToString(p1.x) << "in";
+- pDrawLineElement->addAttribute("svg:x1", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(p1.y) << "in";
+- pDrawLineElement->addAttribute("svg:y1", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(p2.x) << "in";
+- pDrawLineElement->addAttribute("svg:x2", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(p2.y) << "in";
+- pDrawLineElement->addAttribute("svg:y2", m_value.str());
+- m_value.str("");
+- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawLineElement));
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:line")));
+- }
+- else
+- {
+- // draw as path
+- libwpg::WPGPath path;
+- path.moveTo(vertices[0]);
+- for(unsigned long ii = 1; ii < vertices.count(); ii++)
+- path.lineTo(vertices[ii]);
+- path.closed = true;
+- drawPath(path);
+- }
+-}
+-
+-void OdgExporter::drawPath(const libwpg::WPGPath& path)
+-{
+- if(path.count() == 0)
+- return;
+-
+- // try to find the bounding box
+- // this is simple convex hull technique, the bounding box might not be
+- // accurate but that should be enough for this purpose
+- libwpg::WPGPoint p = path.element(0).point;
+- libwpg::WPGPoint q = path.element(0).point;
+- for(unsigned k = 0; k < path.count(); k++)
+- {
+- libwpg::WPGPathElement element = path.element(k);
+- p.x = (p.x > element.point.x) ? element.point.x : p.x;
+- p.y = (p.y > element.point.y) ? element.point.y : p.y;
+- q.x = (q.x < element.point.x) ? element.point.x : q.x;
+- q.y = (q.y < element.point.y) ? element.point.y : q.y;
+- if(element.type == libwpg::WPGPathElement::CurveToElement)
+- {
+- p.x = (p.x > element.extra1.x) ? element.extra1.x : p.x;
+- p.y = (p.y > element.extra1.y) ? element.extra1.y : p.y;
+- q.x = (q.x < element.extra1.x) ? element.extra1.x : q.x;
+- q.y = (q.y < element.extra1.y) ? element.extra1.y : q.y;
+- p.x = (p.x > element.extra2.x) ? element.extra2.x : p.x;
+- p.y = (p.y > element.extra2.y) ? element.extra2.y : p.y;
+- q.x = (q.x < element.extra2.x) ? element.extra2.x : q.x;
+- q.y = (q.y < element.extra2.y) ? element.extra2.y : q.y;
+- }
+- }
+- double vw = q.x - p.x;
+- double vh = q.y - p.y;
+-
+- writeStyle();
+-
+- OpenTagGraphicsElement *pDrawPathElement = new OpenTagGraphicsElement("draw:path");
+- m_value.str("");
+- m_value << "gr" << m_styleIndex-1;
+- pDrawPathElement->addAttribute("draw:style-name", m_value.str());
+- m_value.str("");
+- pDrawPathElement->addAttribute("draw:text-style-name", "P1");
+- pDrawPathElement->addAttribute("draw:layer", "layout");
+- m_value << doubleToString(p.x) << "in";
+- pDrawPathElement->addAttribute("svg:x", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(p.y) << "in";
+- pDrawPathElement->addAttribute("svg:y", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(vw) << "in";
+- pDrawPathElement->addAttribute("svg:width", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(vh) << "in";
+- pDrawPathElement->addAttribute("svg:height", m_value.str());
+- m_value.str("");
+- m_value << "0 0 " << (int)(vw*2540) << " " << (int)(vh*2540);
+- pDrawPathElement->addAttribute("svg:viewBox", m_value.str());
+- m_value.str("");
+-
+- for(unsigned i = 0; i < path.count(); i++)
+- {
+- libwpg::WPGPathElement element = path.element(i);
+- libwpg::WPGPoint point = element.point;
+- switch(element.type)
+- {
+- // 2540 is 2.54*1000, 2.54 in = 1 in
+- case libwpg::WPGPathElement::MoveToElement:
+- m_value << "M" << (int)((point.x-p.x)*2540) << " ";
+- m_value << (int)((point.y-p.y)*2540);
+- break;
+-
+- case libwpg::WPGPathElement::LineToElement:
+- m_value << "L" << (int)((point.x-p.x)*2540) << " ";
+- m_value << (int)((point.y-p.y)*2540);
+- break;
+-
+- case libwpg::WPGPathElement::CurveToElement:
+- m_value << "C" << (int)((element.extra1.x-p.x)*2540) << " ";
+- m_value << (int)((element.extra1.y-p.y)*2540) << " ";
+- m_value << (int)((element.extra2.x-p.x)*2540) << " ";
+- m_value << (int)((element.extra2.y-p.y)*2540) << " ";
+- m_value << (int)((point.x-p.x)*2540) << " ";
+- m_value << (int)((point.y-p.y)*2540);
+- break;
+-
+- default:
+- break;
+- }
+- }
+- if(path.closed)
+- m_value << " Z";
+- pDrawPathElement->addAttribute("svg:d", m_value.str());
+- m_value.str("");
+- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawPathElement));
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:path")));
+-}
+-
+-
+-void OdgExporter::drawBitmap(const libwpg::WPGBitmap& bitmap)
+-{
+- OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame");
+- m_value.str("");
+- m_value << doubleToString(bitmap.rect.x1) << "in";
+- pDrawFrameElement->addAttribute("svg:x", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(bitmap.rect.y1) << "in";
+- pDrawFrameElement->addAttribute("svg:y", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(bitmap.rect.height()) << "in";
+- pDrawFrameElement->addAttribute("svg:height", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(bitmap.rect.width()) << "in";
+- pDrawFrameElement->addAttribute("svg:width", m_value.str());
+- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement));
+-
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image")));
+-
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data")));
+-
+- libwpg::WPGString base64Binary;
+- bitmap.generateBase64DIB(base64Binary);
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr())));
+-
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data")));
+-
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image")));
+-
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame")));
+-}
+-
+-void OdgExporter::drawImageObject(const libwpg::WPGBinaryData& binaryData)
+-{
+- if (binaryData.mimeType.length() <= 0)
+- return;
+- OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame");
+- m_value.str("");
+- m_value << doubleToString(binaryData.rect.x1) << "in";
+- pDrawFrameElement->addAttribute("svg:x", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(binaryData.rect.y1) << "in";
+- pDrawFrameElement->addAttribute("svg:y", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(binaryData.rect.height()) << "in";
+- pDrawFrameElement->addAttribute("svg:height", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(binaryData.rect.width()) << "in";
+- pDrawFrameElement->addAttribute("svg:width", m_value.str());
+- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement));
+-
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image")));
+-
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data")));
+-
+- libwpg::WPGString base64Binary = binaryData.getBase64Data();
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr())));
+-
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data")));
+-
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image")));
+-
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame")));
+-}
+-
+-
+-static std::string colorToHex(const libwpg::WPGColor& color)
+-{
+- char hexdigits[] = "0123456789abcdef";
+- char buffer[] = "123456";
+- buffer[0] = hexdigits[(color.red >> 4) & 15];
+- buffer[1] = hexdigits[color.red & 15];
+- buffer[2] = hexdigits[(color.green >> 4) & 15];
+- buffer[3] = hexdigits[color.green & 15];
+- buffer[4] = hexdigits[(color.blue >> 4) & 15];
+- buffer[5] = hexdigits[color.blue & 15];
+- return std::string(buffer);
+-}
+-
+-void OdgExporter::writeStyle()
+-{
+- m_value.str("");
+- m_name.str("");
+-
+- if(!m_pen.solid && (m_pen.dashArray.count() >=2 ) )
+- {
+- // ODG only supports dashes with the same length of spaces inbetween
+- // here we take the first space and assume everything else the same
+- // note that dash length is written in percentage
+- double distance = m_pen.dashArray.at(1);
+- OpenTagGraphicsElement *tmpDrawStrokeDashElement = new OpenTagGraphicsElement("draw:stroke-dash");
+- tmpDrawStrokeDashElement->addAttribute("draw:style", "rect");
+- m_value << "Dash_" << m_dashIndex++;
+- tmpDrawStrokeDashElement->addAttribute("draw:name", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(distance*100) << "%";
+- tmpDrawStrokeDashElement->addAttribute("draw:distance", m_value.str());
+- m_value.str("");
+- for(unsigned i = 0; i < m_pen.dashArray.count()/2; i++)
+- {
+- m_name << "draw:dots" << i+1;
+- tmpDrawStrokeDashElement->addAttribute(m_name.str(), "1");
+- m_name.str("");
+- m_name << "draw:dots" << i+1 << "-length";
+- m_value << doubleToString(100*m_pen.dashArray.at(i*2)) << "%";
+- tmpDrawStrokeDashElement->addAttribute(m_name.str(), m_value.str());
+- m_name.str("");
+- m_value.str("");
+- }
+- mStrokeDashElements.push_back(static_cast<GraphicsElement *>(tmpDrawStrokeDashElement));
+- mStrokeDashElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:stroke-dash")));
+- }
+-
+- if(m_brush.style == libwpg::WPGBrush::Gradient)
+- {
+- OpenTagGraphicsElement *tmpDrawGradientElement = new OpenTagGraphicsElement("draw:gradient");
+- tmpDrawGradientElement->addAttribute("draw:style", "linear");
+- m_value << "Gradient_" << m_gradientIndex++;
+- tmpDrawGradientElement->addAttribute("draw:name", m_value.str());
+- m_value.str("");
+-
+- // ODG angle unit is 0.1 degree
+- double angle = -m_brush.gradient.angle();
+- while(angle < 0)
+- angle += 360;
+- while(angle > 360)
+- angle -= 360;
+-
+- m_value << (unsigned)(angle*10);
+- tmpDrawGradientElement->addAttribute("draw:angle", m_value.str());
+- m_value.str("");
+-
+- libwpg::WPGColor startColor = m_brush.gradient.stopColor(0);
+- libwpg::WPGColor stopColor = m_brush.gradient.stopColor(1);
+- m_value << "#" << colorToHex(startColor);
+- tmpDrawGradientElement->addAttribute("draw:start-color", m_value.str());
+- m_value.str("");
+- m_value << "#" << colorToHex(stopColor);
+- tmpDrawGradientElement->addAttribute("draw:end-color", m_value.str());
+- m_value.str("");
+- tmpDrawGradientElement->addAttribute("draw:start-intensity", "100%");
+- tmpDrawGradientElement->addAttribute("draw:end-intensity", "100%");
+- tmpDrawGradientElement->addAttribute("draw:border", "0%");
+- mGradientElements.push_back(static_cast<GraphicsElement *>(tmpDrawGradientElement));
+- mGradientElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:gradient")));
+- }
+-
+- OpenTagGraphicsElement *tmpStyleStyleElement = new OpenTagGraphicsElement("style:style");
+- m_value << "gr" << m_styleIndex;
+- tmpStyleStyleElement->addAttribute("style:name", m_value.str());
+- m_value.str("");
+- tmpStyleStyleElement->addAttribute("style:family", "graphic");
+- tmpStyleStyleElement->addAttribute("style:parent-style-name", "standard");
+- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleStyleElement));
+-
+- OpenTagGraphicsElement *tmpStyleGraphicPropertiesElement = new OpenTagGraphicsElement("style:graphic-properties");
+-
+- if(m_pen.width > 0.0)
+- {
+- m_value << doubleToString(m_pen.width) << "in";
+- tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-width", m_value.str());
+- m_value.str("");
+- m_value << "#" << colorToHex(m_pen.foreColor);
+- tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-color", m_value.str());
+- m_value.str("");
+-
+- if(!m_pen.solid)
+- {
+- tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "dash");
+- m_value << "Dash_" << m_dashIndex-1;
+- tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke-dash", m_value.str());
+- m_value.str("");
+- }
+- }
+- else
+- tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "none");
+-
+- if(m_brush.style == libwpg::WPGBrush::NoBrush)
+- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "none");
+-
+- if(m_brush.style == libwpg::WPGBrush::Solid)
+- {
+- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "solid");
+- m_value << "#" << colorToHex(m_brush.foreColor);
+- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-color", m_value.str());
+- m_value.str("");
+- }
+-
+- if(m_brush.style == libwpg::WPGBrush::Gradient)
+- {
+- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "gradient");
+- m_value << "Gradient_" << m_gradientIndex-1;
+- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-gradient-name", m_value.str());
+- m_value.str("");
+- }
+-
+- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleGraphicPropertiesElement));
+- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:graphic-properties")));
+-
+- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:style")));
+- m_styleIndex++;
+-}
+diff -Nur ./filters/karbon/wpg/import/OdgExporter.hxx ./filters/karbon/wpg/import/OdgExporter.hxx
+--- ./filters/karbon/wpg/import/OdgExporter.hxx 2011-01-15 21:05:35.000000000 +0100
++++ ./filters/karbon/wpg/import/OdgExporter.hxx 1970-01-01 01:00:00.000000000 +0100
+@@ -1,116 +0,0 @@
+-/* libwpg
+- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
+- *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+- * Boston, MA 02111-1301 USA
+- *
+- * For further information visit http://libwpg.sourceforge.net
+- */
+-
+-/* "This product is not manufactured, approved, or supported by
+- * Corel Corporation or Corel Corporation Limited."
+- */
+-
+-#ifndef __ODGEXPORTER_H__
+-#define __ODGEXPORTER_H__
+-
+-#include <iostream>
+-#include <sstream>
+-#include <string>
+-
+-#include <libwpg/libwpg.h>
+-#include "GraphicsElement.hxx"
+-
+-class OdgExporter : public libwpg::WPGPaintInterface {
+-public:
+- explicit OdgExporter(GraphicsHandler *pHandler,
+- const bool isFlatXML = false);
+- ~OdgExporter();
+-
+-#if LIBWPG_VERSION_MINOR<2
+- void startGraphics(double imageWidth, double imageHeight);
+- void endGraphics();
+- void startLayer(unsigned int id);
+- void endLayer(unsigned int id);
+-
+- void setPen(const libwpg::WPGPen& pen);
+- void setBrush(const libwpg::WPGBrush& brush);
+- void setFillRule(FillRule rule);
+-
+- void drawRectangle(const libwpg::WPGRect& rect, double rx, double ry);
+- void drawEllipse(const libwpg::WPGPoint& center, double rx, double ry);
+- void drawPolygon(const libwpg::WPGPointArray& vertices);
+- void drawPath(const libwpg::WPGPath& path);
+- void drawBitmap(const libwpg::WPGBitmap& bitmap);
+- void drawImageObject(const libwpg::WPGBinaryData& binaryData);
+-
+-private:
+- std::vector <GraphicsElement *> mBodyElements;
+- std::vector <GraphicsElement *> mAutomaticStylesElements;
+- std::vector <GraphicsElement *> mStrokeDashElements;
+- std::vector <GraphicsElement *> mGradientElements;
+- GraphicsHandler *mpHandler;
+-
+- libwpg::WPGPen m_pen;
+- libwpg::WPGBrush m_brush;
+- FillRule m_fillRule;
+- int m_gradientIndex;
+- int m_dashIndex;
+- int m_styleIndex;
+- void writeStyle();
+- std::ostringstream m_value, m_name;
+- double m_width, m_height;
+- const bool m_isFlatXML;
+-#else
+- virtual void startGraphics(const ::WPXPropertyList &propList);
+- virtual void endGraphics();
+- virtual void setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &gradient);
+- virtual void startLayer(const ::WPXPropertyList &propList);
+- virtual void endLayer();
+- virtual void drawRectangle(const ::WPXPropertyList& propList);
+- virtual void drawEllipse(const ::WPXPropertyList& propList);
+- virtual void drawPolygon(const ::WPXPropertyListVector &vertices);
+- virtual void drawPath(const ::WPXPropertyListVector &path);
+- virtual void drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData &binaryData);
+- virtual void startEmbeddedGraphics(const ::WPXPropertyList &propList);
+- virtual void endEmbeddedGraphics();
+- virtual void drawPolyline(const ::WPXPropertyListVector &vertices);
+- virtual void startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path);
+- virtual void endTextObject();
+- virtual void startTextLine(const ::WPXPropertyList &propList);
+- virtual void endTextLine();
+- virtual void startTextSpan(const ::WPXPropertyList &propList);
+- virtual void endTextSpan();
+- virtual void insertText(const ::WPXString &str);
+-
+-
+-private:
+- std::vector <GraphicsElement *> mBodyElements;
+- std::vector <GraphicsElement *> mAutomaticStylesElements;
+- std::vector <GraphicsElement *> mStrokeDashElements;
+- std::vector <GraphicsElement *> mGradientElements;
+- GraphicsHandler *mpHandler;
+-
+- int m_gradientIndex;
+- int m_dashIndex;
+- int m_styleIndex;
+- void writeStyle();
+- std::ostringstream m_value, m_name;
+- double m_width, m_height;
+- const bool m_isFlatXML;
+-#endif
+-};
+-
+-#endif // __ODGEXPORTER_H__
+diff -Nur ./filters/karbon/wpg/import/WPGImport.cpp ./filters/karbon/wpg/import/WPGImport.cpp
+--- ./filters/karbon/wpg/import/WPGImport.cpp 2011-01-15 21:05:35.000000000 +0100
++++ ./filters/karbon/wpg/import/WPGImport.cpp 2011-01-02 17:46:15.000000000 +0100
+@@ -20,28 +20,26 @@
+ #include <WPGImport.h>
+ #include <WPGImport.moc>
+
+-#include <QBuffer>
+-#include <QByteArray>
+-#include <QString>
+-
+-#include <kdebug.h>
+ #include <KoFilterChain.h>
+ #include <KoGlobal.h>
+ #include <KoUnit.h>
++#include <KoXmlWriter.h>
++
+ #include <kpluginfactory.h>
++#include <KDebug>
+
+-#include <KoXmlWriter.h>
++
++#include <QtCore/QString>
++#include <QtCore/QFile>
+
+ #include <libwpg/libwpg.h>
+ #if LIBWPG_VERSION_MINOR<2
+ #include <libwpg/WPGStreamImplementation.h>
+ #else
+ #include <libwpd-stream/libwpd-stream.h>
++#include <libwpd/libwpd.h>
+ #endif
+
+-#include "FileOutputHandler.hxx"
+-#include "OdgExporter.hxx"
+-
+ #include <iostream>
+
+ K_PLUGIN_FACTORY(WPGImportFactory, registerPlugin<WPGImport>();)
+@@ -56,35 +54,13 @@
+ {
+ }
+
+-static QByteArray createManifest()
+-{
+- KoXmlWriter* manifestWriter;
+- QByteArray manifestData;
+- QBuffer manifestBuffer(&manifestData);
+-
+- manifestBuffer.open(QIODevice::WriteOnly);
+- manifestWriter = new KoXmlWriter(&manifestBuffer);
+-
+- manifestWriter->startDocument("manifest:manifest");
+- manifestWriter->startElement("manifest:manifest");
+- manifestWriter->addAttribute("xmlns:manifest", "urn:oasis:names:tc:openoffice:xmlns:manifest:1.0");
+- manifestWriter->addManifestEntry("/", "application/vnd.oasis.opendocument.graphics");
+- //manifestWriter->addManifestEntry( "styles.xml", "text/xml" );
+- manifestWriter->addManifestEntry("content.xml", "text/xml");
+- manifestWriter->endElement();
+- manifestWriter->endDocument();
+- delete manifestWriter;
+-
+- return manifestData;
+-}
+-
+
+ KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByteArray& to)
+ {
+ if (from != "application/x-wpg")
+ return KoFilter::NotImplemented;
+
+- if (to != "application/vnd.oasis.opendocument.graphics")
++ if (to != "image/svg+xml")
+ return KoFilter::NotImplemented;
+
+ #if LIBWPG_VERSION_MINOR<2
+@@ -96,6 +72,7 @@
+ input = olestream;
+ }
+ }
++ libwpg::WPGString output;
+ #else
+ WPXInputStream* input = new WPXFileStream(m_chain->inputFile().toLocal8Bit());
+ if (input->isOLEStream()) {
+@@ -105,59 +82,31 @@
+ input = olestream;
+ }
+ }
++ ::WPXString output;
+ #endif
+
+ if (!libwpg::WPGraphics::isSupported(input)) {
+- std::cerr << "ERROR: Unsupported file format (unsupported version) or file is encrypted!" << std::endl;
++ kWarning() << "ERROR: Unsupported file format (unsupported version) or file is encrypted!";
+ delete input;
+ return KoFilter::NotImplemented;
+ }
+
+- // do the conversion
+- std::ostringstream tmpStringStream;
+- FileOutputHandler tmpHandler(tmpStringStream);
+- OdgExporter exporter(&tmpHandler);
+- libwpg::WPGraphics::parse(input, &exporter);
+- delete input;
+-
+-
+- // create output store
+- KoStore* storeout;
+- storeout = KoStore::createStore(m_chain->outputFile(), KoStore::Write,
+- "application/vnd.oasis.opendocument.graphics", KoStore::Zip);
+-
+- if (!storeout) {
+- kWarning() << "Couldn't open the requested file.";
+- return KoFilter::FileNotFound;
+- }
+-
+-#if 0
+- if (!storeout->open("styles.xml")) {
+- kWarning() << "Couldn't open the file 'styles.xml'.";
+- return KoFilter::CreationError;
++ if (!libwpg::WPGraphics::generateSVG(input, output)) {
++ kWarning() << "ERROR: SVG Generation failed!";
++ delete input;
++ return KoFilter::ParsingError;
+ }
+- //storeout->write( createStyles() );
+- storeout->close();
+-#endif
+
+- if (!storeout->open("content.xml")) {
+- kWarning() << "Couldn't open the file 'content.xml'.";
+- return KoFilter::CreationError;
+- }
+- storeout->write(tmpStringStream.str().c_str());
+- storeout->close();
++ delete input;
+
+- // store document manifest
+- storeout->enterDirectory("META-INF");
+- if (!storeout->open("manifest.xml")) {
+- kWarning() << "Couldn't open the file 'META-INF/manifest.xml'.";
+- return KoFilter::CreationError;
++ QFile outputFile(m_chain->outputFile());
++ if(!outputFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
++ kWarning() << "ERROR: Could not open output file" << m_chain->outputFile();
++ return KoFilter::InternalError;
+ }
+- storeout->write(createManifest());
+- storeout->close();
+
+- // we are done!
+- delete storeout;
++ outputFile.write(output.cstr());
++ outputFile.close();
+
+ return KoFilter::OK;
+ }
diff --git a/editors/calligra/pkg-plist b/editors/calligra/pkg-plist
index 47db91fc016f..f7030a3a735a 100644
--- a/editors/calligra/pkg-plist
+++ b/editors/calligra/pkg-plist
@@ -1,5 +1,6 @@
bin/karbon
bin/kexi
+bin/kformula
bin/koconverter
bin/kplato
bin/kplatowork
@@ -12,6 +13,17 @@ include/DebugPigment.h
include/InsertSemanticObjectActionBase.h
include/InsertSemanticObjectCreateAction.h
include/InsertSemanticObjectReferenceAction.h
+include/KWApplicationConfig.h
+include/KWCanvas.h
+include/KWCanvasBase.h
+include/KWCanvasItem.h
+include/KWDocument.h
+include/KWFrameLayout.h
+include/KWPage.h
+include/KWPageManager.h
+include/KWPageStyle.h
+include/KWViewMode.h
+include/KWord.h
include/KoApplication.h
include/KoApplicationAdaptor.h
include/KoBasicHistogramProducers.h
@@ -20,12 +32,12 @@ include/KoBookmarkManager.h
include/KoBorder.h
include/KoCanvasBase.h
include/KoCanvasController.h
+include/KoCanvasControllerWidget.h
include/KoCanvasObserverBase.h
include/KoCanvasSupervisor.h
include/KoChannelInfo.h
include/KoChartInterface.h
include/KoChartModel.h
-include/KoChildrenData.h
include/KoColor.h
include/KoColorConversionTransformation.h
include/KoColorConversionTransformationAbstractFactory.h
@@ -40,6 +52,7 @@ include/KoColorSpace.h
include/KoColorSpaceAbstract.h
include/KoColorSpaceConstants.h
include/KoColorSpaceEngine.h
+include/KoColorSpaceFactory.h
include/KoColorSpaceMaths.h
include/KoColorSpaceRegistry.h
include/KoColorSpaceTraits.h
@@ -48,6 +61,7 @@ include/KoColorTransformationFactory.h
include/KoColorTransformationFactoryRegistry.h
include/KoColumns.h
include/KoCompositeOp.h
+include/KoConfig.h
include/KoConvolutionOp.h
include/KoCopyController.h
include/KoCutController.h
@@ -77,6 +91,13 @@ include/KoFallBackColorTransformation.h
include/KoFilter.h
include/KoFilterChain.h
include/KoFilterChainLinkList.h
+include/KoFilterEffect.h
+include/KoFilterEffectConfigWidgetBase.h
+include/KoFilterEffectFactoryBase.h
+include/KoFilterEffectLoadingContext.h
+include/KoFilterEffectRegistry.h
+include/KoFilterEffectRenderContext.h
+include/KoFilterEffectStack.h
include/KoFilterManager.h
include/KoFlake.h
include/KoFontFace.h
@@ -96,6 +117,8 @@ include/KoImageCollection.h
include/KoImageData.h
include/KoImageSelectionWidget.h
include/KoInlineObject.h
+include/KoInlineObjectFactoryBase.h
+include/KoInlineObjectRegistry.h
include/KoInlineTextObjectManager.h
include/KoInputDevice.h
include/KoInsets.h
@@ -119,12 +142,16 @@ include/KoOdfReadStore.h
include/KoOdfStylesReader.h
include/KoOdfWriteStore.h
include/KoPACanvas.h
+include/KoPACanvasBase.h
+include/KoPACanvasItem.h
include/KoPADocument.h
include/KoPALoadingContext.h
include/KoPAPageBase.h
include/KoPAPageContainerModel.h
include/KoPAUtil.h
include/KoPAView.h
+include/KoPAViewBase.h
+include/KoPAViewMode.h
include/KoPageApp.h
include/KoPageFormat.h
include/KoPageLayout.h
@@ -169,6 +196,7 @@ include/KoShapeBorderCommand.h
include/KoShapeBorderModel.h
include/KoShapeConfigWidgetBase.h
include/KoShapeContainer.h
+include/KoShapeContainerDefaultModel.h
include/KoShapeContainerModel.h
include/KoShapeController.h
include/KoShapeControllerBase.h
@@ -202,7 +230,6 @@ include/KoStore.h
include/KoStoreDevice.h
include/KoStyleStack.h
include/KoSubpathRemoveCommand.h
-include/KoTableInterface.h
include/KoText.h
include/KoTextAnchor.h
include/KoTextBlockBorderData.h
@@ -215,10 +242,12 @@ include/KoTextEditor.h
include/KoTextInlineRdf.h
include/KoTextLocator.h
include/KoTextMeta.h
+include/KoTextOnShapeContainer.h
include/KoTextPage.h
include/KoTextPaste.h
include/KoTextRdfCore.h
include/KoTextShapeData.h
+include/KoTextShapeDataBase.h
include/KoToolBase.h
include/KoToolFactoryBase.h
include/KoToolManager.h
@@ -231,9 +260,7 @@ include/KoUniColorDialog.h
include/KoUnit.h
include/KoUpdater.h
include/KoVariable.h
-include/KoVariableFactory.h
include/KoVariableManager.h
-include/KoVariableRegistry.h
include/KoVersionDialog.h
include/KoView.h
include/KoViewAdaptor.h
@@ -254,14 +281,12 @@ include/RdfSemanticTreeWidgetSelectAction.h
include/changetracker/KoChangeTracker.h
include/changetracker/KoChangeTrackerElement.h
include/changetracker/KoDeleteChangeMarker.h
-include/config-openexr.h
-include/config-opengl.h
include/flake_export.h
include/kexi/forms/FormWidget.h
include/kexi/forms/FormWidgetInterface.h
include/kexi/forms/WidgetInfo.h
+include/kexi/forms/WidgetTreeWidget.h
include/kexi/forms/objecttree.h
-include/kexi/forms/objecttreeview.h
include/kexi/forms/widgetfactory.h
include/kexi/forms/widgetlibrary.h
include/kexi/forms/widgetwithsubpropertiesinterface.h
@@ -273,6 +298,7 @@ include/kis_config_widget.h
include/kis_convolution_kernel.h
include/kis_convolution_painter.h
include/kis_convolution_worker.h
+include/kis_coordinates_converter.h
include/kis_cubic_curve.h
include/kis_cursor.h
include/kis_debug.h
@@ -299,13 +325,13 @@ include/kis_node_facade.h
include/kis_node_graph_listener.h
include/kis_paint_device.h
include/kis_painter.h
+include/kis_perspectivetransform_worker.h
include/kis_processing_information.h
include/kis_properties_configuration.h
include/kis_random_accessor.h
include/kis_selection.h
include/kis_serializable_configuration.h
include/kis_shared.h
-include/kis_shared_data.h
include/kis_shared_ptr.h
include/kis_shared_ptr_vector.h
include/kis_tiled_data_manager.h
@@ -313,7 +339,9 @@ include/kis_tool.h
include/kis_transaction.h
include/kis_transform_worker.h
include/kis_types.h
+include/kis_ui_types.h
include/kis_view2.h
+include/kis_warptransform_worker.h
include/koChart.h
include/kofficeversion.h
include/komain_export.h
@@ -322,6 +350,7 @@ include/kopageapp_export.h
include/kotext_export.h
include/kowidgets_export.h
include/krita_export.h
+include/kword_export.h
include/pigment_export.h
include/styles/KoCharacterStyle.h
include/styles/KoListLevelProperties.h
@@ -330,27 +359,58 @@ include/styles/KoParagraphStyle.h
include/styles/KoSectionStyle.h
include/styles/KoStyleManager.h
include/styles/KoTableCellStyle.h
-include/styles/KoTableColumnFormat.h
include/styles/KoTableColumnStyle.h
include/styles/KoTableFormat.h
-include/styles/KoTableRowFormat.h
include/styles/KoTableRowStyle.h
+lib/kde4/Filterkpr2odf.so
+lib/kde4/abiwordexport.so
+lib/kde4/abiwordimport.so
+lib/kde4/amiproexport.so
+lib/kde4/amiproimport.so
+lib/kde4/applixspreadimport.so
+lib/kde4/applixwordimport.so
lib/kde4/artistictextshape.so
+lib/kde4/asciiexport.so
+lib/kde4/asciiimport.so
lib/kde4/autocorrect.so
lib/kde4/changecase.so
lib/kde4/chartshape.so
+lib/kde4/commentshape.so
+lib/kde4/csvexport.so
+lib/kde4/csvimport.so
+lib/kde4/dbaseimport.so
+lib/kde4/dcmimport.so
lib/kde4/defaulttools.so
lib/kde4/divineproportionshape.so
+lib/kde4/docbookexport.so
+lib/kde4/docximport.so
+lib/kde4/excelimporttodoc.so
lib/kde4/formulashape.so
+lib/kde4/generickofilter.so
+lib/kde4/gnumericexport.so
+lib/kde4/gnumericimport.so
+lib/kde4/hancomwordimport.so
+lib/kde4/htmlexport.so
+lib/kde4/htmlimport.so
+lib/kde4/htmlodf_export.so
+lib/kde4/icalendarexport.so
+lib/kde4/karbon1ximport.so
lib/kde4/karbon_flattenpathplugin.so
lib/kde4/karbon_refinepathplugin.so
lib/kde4/karbon_roundcornersplugin.so
lib/kde4/karbon_whirlpinchplugin.so
+%%EPS%%lib/kde4/karbonepsimport.so
lib/kde4/karbonfiltereffects.so
+lib/kde4/karbonpart.so
+lib/kde4/karbonpdfimport.so
+lib/kde4/karbonpngexport.so
+lib/kde4/karbonsvgexport.so
+lib/kde4/karbonsvgimport.so
lib/kde4/karbontools.so
lib/kde4/kexidb_mysqldriver.so
lib/kde4/kexidb_pqxxsqldriver.so
lib/kde4/kexidb_sqlite3driver.so
+%%SYBASE%%lib/kde4/kexidb_sybasedriver.so
%%XBASE%%lib/kde4/kexidb_xbasedriver.so
lib/kde4/kexihandler_csv_importexport.so
lib/kde4/kexihandler_form.so
@@ -370,31 +430,43 @@ lib/kde4/kexirelationdesignshape.so
lib/kde4/kformdesigner_containers.so
lib/kde4/kformdesigner_kexidbwidgets.so
lib/kde4/kformdesigner_stdwidgets.so
+lib/kde4/kformulapart.so
+lib/kde4/kodocinfopropspage.so
lib/kde4/kofficedockers.so
lib/kde4/kofficescan.so
lib/kde4/kofficethumbnail.so
lib/kde4/kolcmsengine.so
lib/kde4/kopabackgroundtool.so
+lib/kde4/koreport_barcodeplugin.so
+lib/kde4/koreport_chartplugin.so
+lib/kde4/koreport_shapeplugin.so
+lib/kde4/kounavailpart.so
+lib/kde4/kplatopart.so
+lib/kde4/kplatoworkpart.so
lib/kde4/kpr_pageeffect_barwipe.so
lib/kde4/kpr_pageeffect_clockwipe.so
lib/kde4/kpr_pageeffect_edgewipe.so
+lib/kde4/kpr_pageeffect_fade.so
lib/kde4/kpr_pageeffect_iriswipe.so
lib/kde4/kpr_pageeffect_matrixwipe.so
lib/kde4/kpr_pageeffect_slidewipe.so
+lib/kde4/kpr_pageeffect_spacerotation.so
+lib/kde4/kpr_pageeffect_swapeffect.so
lib/kde4/kpr_shapeanimation_example.so
lib/kde4/kpresentereventactions.so
+lib/kde4/kpresenterpart.so
lib/kde4/kpresentertoolanimation.so
lib/kde4/kprvariables.so
lib/kde4/krita_colorspaces_extensions.so
%%GTL%%lib/kde4/krita_ctlcs_plugin.so
-lib/kde4/kritabackgrounds.so
+lib/kde4/krita_raw_import.so
lib/kde4/kritabigbrother.so
lib/kde4/kritablurfilter.so
-lib/kde4/kritabracketing2hdr.so
-lib/kde4/kritabumpmap.so
-lib/kde4/kritachalkpaintop.so
+lib/kde4/kritabmpexport.so
+lib/kde4/kritabmpimport.so
lib/kde4/kritacolorgenerator.so
lib/kde4/kritacolorrange.so
+lib/kde4/kritacolorselectorng.so
lib/kde4/kritacolorsfilters.so
lib/kde4/kritacolorspaceconversion.so
lib/kde4/kritaconvolutionfilters.so
@@ -409,47 +481,60 @@ lib/kde4/kritadropshadow.so
lib/kde4/kritadynapaintop.so
lib/kde4/kritaembossfilter.so
lib/kde4/kritaexample.so
+%%GTL%%lib/kde4/kritaexrexport.so
+%%GTL%%lib/kde4/kritaexrimport.so
lib/kde4/kritaextensioncolorsfilters.so
lib/kde4/kritaextensionsmanager.so
lib/kde4/kritafastcolortransferfilter.so
lib/kde4/kritafilterop.so
+lib/kde4/kritagifimport.so
lib/kde4/kritagridpaintop.so
lib/kde4/kritahairypaintop.so
+lib/kde4/kritahatchingpaintop.so
lib/kde4/kritahistogram.so
lib/kde4/kritaimageenhancement.so
lib/kde4/kritaimagesize.so
+lib/kde4/kritajp2export.so
+lib/kde4/kritajp2import.so
+lib/kde4/kritajpegexport.so
+lib/kde4/kritajpegimport.so
lib/kde4/kritalayercompose.so
lib/kde4/kritalevelfilter.so
lib/kde4/kritametadataeditor.so
lib/kde4/kritamodifyselection.so
lib/kde4/kritanoisefilter.so
-lib/kde4/kritaoilpaintfilter.so
+lib/kde4/kritaoraexport.so
+lib/kde4/kritaoraimport.so
+lib/kde4/kritapart.so
lib/kde4/kritaparticlepaintop.so
+lib/kde4/kritapdfimport.so
lib/kde4/kritapixelizefilter.so
+lib/kde4/kritapngexport.so
+lib/kde4/kritapngimport.so
+lib/kde4/kritappmexport.so
+lib/kde4/kritappmimport.so
lib/kde4/kritaraindropsfilter.so
lib/kde4/kritarandompickfilter.so
lib/kde4/kritarotateimage.so
lib/kde4/kritaroundcornersfilter.so
lib/kde4/kritarulerassistanttool.so
-lib/kde4/kritascripting.so
lib/kde4/kritaselectiontools.so
lib/kde4/kritaseparatechannels.so
lib/kde4/kritashearimage.so
%%GTL%%lib/kde4/kritashivafilters.so
%%GTL%%lib/kde4/kritashivagenerators.so
+lib/kde4/kritasketchpaintop.so
lib/kde4/kritasmallcolorselector.so
-lib/kde4/kritasmalltilesfilter.so
-lib/kde4/kritasobelfilter.so
-lib/kde4/kritasoftpaintop.so
lib/kde4/kritaspecificcolorselector.so
lib/kde4/kritaspraypaintop.so
+lib/kde4/kritatiffexport.so
+lib/kde4/kritatiffimport.so
lib/kde4/kritatogether.so
lib/kde4/kritatonemapping.so
lib/kde4/kritatoolcrop.so
lib/kde4/kritatooldyna.so
lib/kde4/kritatoolgrid.so
lib/kde4/kritatoolperspectivegrid.so
-lib/kde4/kritatoolperspectivetransform.so
lib/kde4/kritatoolpolygon.so
lib/kde4/kritatoolpolyline.so
lib/kde4/kritatoolstar.so
@@ -457,6 +542,7 @@ lib/kde4/kritatooltransform.so
lib/kde4/kritatrianglecolorselector.so
lib/kde4/kritaunsharpfilter.so
lib/kde4/kritawavefilter.so
+lib/kde4/kritaxcfimport.so
lib/kde4/krossmodulekexidb.so
lib/kde4/krossmodulekplato.so
lib/kde4/krossmodulekspread.so
@@ -468,128 +554,68 @@ lib/kde4/kspreaddatabasemodule.so
lib/kde4/kspreaddatetimemodule.so
lib/kde4/kspreadengineeringmodule.so
lib/kde4/kspreadfinancialmodule.so
+lib/kde4/kspreadhtmlexport.so
+lib/kde4/kspreadhtmlimport.so
lib/kde4/kspreadinformationmodule.so
+lib/kde4/kspreadlatexexport.so
lib/kde4/kspreadlogicmodule.so
lib/kde4/kspreadmathmodule.so
+lib/kde4/kspreadpart.so
lib/kde4/kspreadreferencemodule.so
+lib/kde4/kspreadsolver.so
lib/kde4/kspreadstatisticalmodule.so
lib/kde4/kspreadtextmodule.so
lib/kde4/kspreadtrigonometrymodule.so
-lib/kde4/libFilterkpr2odf.so
-lib/kde4/libabiwordexport.so
-lib/kde4/libabiwordimport.so
-lib/kde4/libamiproexport.so
-lib/kde4/libamiproimport.so
-lib/kde4/libapplixspreadimport.so
-lib/kde4/libapplixwordimport.so
-lib/kde4/libasciiexport.so
-lib/kde4/libasciiimport.so
-lib/kde4/libcsvexport.so
-lib/kde4/libcsvimport.so
-lib/kde4/libdbaseimport.so
-lib/kde4/libdocbookexport.so
-lib/kde4/libdocximport.so
-lib/kde4/libexcelimport.so
-lib/kde4/libgenerickofilter.so
-lib/kde4/libgnumericexport.so
-lib/kde4/libgnumericimport.so
-lib/kde4/libhancomwordimport.so
-lib/kde4/libhtmlexport.so
-lib/kde4/libhtmlimport.so
-lib/kde4/libicalendarexport.so
-lib/kde4/libkarbon1ximport.so
-%%EPS%%lib/kde4/libkarbonepsimport.so
-lib/kde4/libkarbonpart.so
-lib/kde4/libkarbonpdfimport.so
-lib/kde4/libkarbonpngexport.so
-lib/kde4/libkarbonsvgexport.so
-lib/kde4/libkarbonsvgimport.so
-lib/kde4/libkchartgenericimageexport.so
-lib/kde4/libkchartsvgexport.so
-lib/kde4/libkformulapart.so
-lib/kde4/libkounavailpart.so
-lib/kde4/libkplatopart.so
-lib/kde4/libkplatoworkpart.so
-lib/kde4/libkpresenterpart.so
-lib/kde4/libkrita_raw_import.so
-lib/kde4/libkritabmpexport.so
-lib/kde4/libkritabmpimport.so
-%%GTL%%lib/kde4/libkritaexrexport.so
-%%GTL%%lib/kde4/libkritaexrimport.so
-lib/kde4/libkritagifimport.so
-lib/kde4/libkritajp2export.so
-lib/kde4/libkritajp2import.so
-lib/kde4/libkritajpegexport.so
-lib/kde4/libkritajpegimport.so
-lib/kde4/libkritaoraexport.so
-lib/kde4/libkritaoraimport.so
-lib/kde4/libkritapart.so
-lib/kde4/libkritapdfimport.so
-lib/kde4/libkritapngexport.so
-lib/kde4/libkritapngimport.so
-lib/kde4/libkritappmexport.so
-lib/kde4/libkritappmimport.so
-lib/kde4/libkritapsdimport.so
-lib/kde4/libkritatiffexport.so
-lib/kde4/libkritatiffimport.so
-lib/kde4/libkritaxcfimport.so
-lib/kde4/libkspreadhtmlexport.so
-lib/kde4/libkspreadhtmlimport.so
-lib/kde4/libkspreadlatexexport.so
-lib/kde4/libkspreadpart.so
-lib/kde4/libkspreadsolver.so
-lib/kde4/libkwordkword1dot3import.so
-lib/kde4/libkwordpart.so
-lib/kde4/liboowriterexport.so
-lib/kde4/liboowriterimport.so
-lib/kde4/libopencalcexport.so
-lib/kde4/libopencalcimport.so
-lib/kde4/libpalmdocexport.so
-lib/kde4/libpalmdocimport.so
-lib/kde4/libpowerpointimport.so
-lib/kde4/libpptximport.so
-lib/kde4/libqproimport.so
-lib/kde4/librtfexport.so
-lib/kde4/librtfimport.so
-lib/kde4/libwmfexport.so
-lib/kde4/libwmfimport.so
-lib/kde4/libwmlexport.so
-lib/kde4/libwmlimport.so
-lib/kde4/libwpexport.so
-lib/kde4/libwpgimport.so
-lib/kde4/libwpimport.so
-lib/kde4/libxlsximport.so
-lib/kde4/libxsltexport.so
-lib/kde4/libxsltimport.so
+lib/kde4/kwordkword1dot3import.so
+lib/kde4/kwordpart.so
lib/kde4/musicshape.so
+lib/kde4/okularGenerator_odp.so
+lib/kde4/oowriterexport.so
+lib/kde4/oowriterimport.so
+lib/kde4/opencalcexport.so
+lib/kde4/opencalcimport.so
+lib/kde4/palmdocexport.so
+lib/kde4/palmdocimport.so
lib/kde4/paragraphtool.so
lib/kde4/pathshapes.so
lib/kde4/pictureshape.so
+lib/kde4/pluginshape.so
+lib/kde4/powerpointimport.so
+lib/kde4/pptximport.so
+lib/kde4/qproimport.so
+lib/kde4/rtfexport.so
+lib/kde4/rtfimport.so
lib/kde4/spellcheck.so
lib/kde4/spreadsheetshape.so
lib/kde4/textshape.so
lib/kde4/textvariables.so
lib/kde4/thesaurustool.so
-lib/kde4/vectorshape.so
lib/kde4/videoshape.so
+lib/kde4/wmfexport.so
+lib/kde4/wmfimport.so
+lib/kde4/wmlexport.so
+lib/kde4/wmlimport.so
+lib/kde4/wpexport.so
+lib/kde4/wpgimport.so
+lib/kde4/wpimport.so
+lib/kde4/xlsximport.so
+lib/kde4/xsltexport.so
+lib/kde4/xsltimport.so
lib/libchartshapelib.so
-lib/libchartshapelib.so.7
-lib/libchartshapelib.so.7.0.0
+lib/libchartshapelib.so.8
+lib/libchartshapelib.so.8.0.0
lib/libflake.so
-lib/libflake.so.7
-lib/libflake.so.7.0.0
+lib/libflake.so.8
+lib/libflake.so.8.0.0
lib/libkarboncommon.so
-lib/libkarboncommon.so.7
-lib/libkarboncommon.so.7.0.0
+lib/libkarboncommon.so.8
+lib/libkarboncommon.so.8.0.0
lib/libkarbonui.so
-lib/libkarbonui.so.7
-lib/libkarbonui.so.7.0.0
-lib/libkchartcommon.so
-lib/libkchartcommon.so.7
-lib/libkchartcommon.so.7.0.0
+lib/libkarbonui.so.8
+lib/libkarbonui.so.8.0.0
lib/libkdchart.so
-lib/libkdchart.so.7
-lib/libkdchart.so.7.0.0
+lib/libkdchart.so.8
+lib/libkdchart.so.8.0.0
lib/libkdeinit4_karbon.so
lib/libkdeinit4_kplato.so
lib/libkdeinit4_kplatowork.so
@@ -598,134 +624,137 @@ lib/libkdeinit4_krita.so
lib/libkdeinit4_kspread.so
lib/libkdeinit4_kthesaurus.so
lib/libkdeinit4_kword.so
+lib/libkdeinit_kformula.so
lib/libkexicore.so
-lib/libkexicore.so.7
-lib/libkexicore.so.7.0.0
+lib/libkexicore.so.8
+lib/libkexicore.so.8.0.0
lib/libkexidatatable.so
-lib/libkexidatatable.so.7
-lib/libkexidatatable.so.7.0.0
+lib/libkexidatatable.so.8
+lib/libkexidatatable.so.8.0.0
lib/libkexidb.so
-lib/libkexidb.so.7
-lib/libkexidb.so.7.0.0
+lib/libkexidb.so.8
+lib/libkexidb.so.8.0.0
lib/libkexiextendedwidgets.so
-lib/libkexiextendedwidgets.so.7.0.0
+lib/libkexiextendedwidgets.so.8
+lib/libkexiextendedwidgets.so.8.0.0
lib/libkexiformutils.so
-lib/libkexiformutils.so.7
-lib/libkexiformutils.so.7.0.0
+lib/libkexiformutils.so.8
+lib/libkexiformutils.so.8.0.0
lib/libkexiguiutils.so
-lib/libkexiguiutils.so.7
-lib/libkexiguiutils.so.7.0.0
+lib/libkexiguiutils.so.8
+lib/libkexiguiutils.so.8.0.0
lib/libkeximain.so
-lib/libkeximain.so.7
-lib/libkeximain.so.7.0.0
+lib/libkeximain.so.8
+lib/libkeximain.so.8.0.0
lib/libkeximigrate.so
-lib/libkeximigrate.so.7
-lib/libkeximigrate.so.7.0.0
+lib/libkeximigrate.so.8
+lib/libkeximigrate.so.8.0.0
lib/libkexirelationsview.so
-lib/libkexirelationsview.so.7
-lib/libkexirelationsview.so.7.0.0
+lib/libkexirelationsview.so.8
+lib/libkexirelationsview.so.8.0.0
lib/libkexiutils.so
-lib/libkexiutils.so.7
-lib/libkexiutils.so.7.0.0
+lib/libkexiutils.so.8
+lib/libkexiutils.so.8.0.0
lib/libkformdesigner.so
-lib/libkformdesigner.so.7
-lib/libkformdesigner.so.7.0.0
+lib/libkformdesigner.so.8
+lib/libkformdesigner.so.8.0.0
lib/libkformulalib.so
-lib/libkformulalib.so.7
-lib/libkformulalib.so.7.0.0
+lib/libkformulalib.so.8
+lib/libkformulalib.so.8.0.0
lib/libkformulaprivate.so
-lib/libkformulaprivate.so.7
-lib/libkformulaprivate.so.7.0.0
+lib/libkformulaprivate.so.8
+lib/libkformulaprivate.so.8.0.0
lib/libkochart.so
-lib/libkochart.so.7
-lib/libkochart.so.7.0.0
+lib/libkochart.so.8
+lib/libkochart.so.8.0.0
lib/libkokross.so
-lib/libkokross.so.7
-lib/libkokross.so.7.0.0
+lib/libkokross.so.8
+lib/libkokross.so.8.0.0
lib/libkomain.so
-lib/libkomain.so.7
-lib/libkomain.so.7.0.0
+lib/libkomain.so.8
+lib/libkomain.so.8.0.0
lib/libkoodf.so
-lib/libkoodf.so.7
-lib/libkoodf.so.7.0.0
+lib/libkoodf.so.8
+lib/libkoodf.so.8.0.0
lib/libkopageapp.so
-lib/libkopageapp.so.7
-lib/libkopageapp.so.7.0.0
+lib/libkopageapp.so.8
+lib/libkopageapp.so.8.0.0
lib/libkoplugin.so
-lib/libkoplugin.so.7
-lib/libkoplugin.so.7.0.0
+lib/libkoplugin.so.8
+lib/libkoplugin.so.8.0.0
lib/libkoproperty.so
-lib/libkoproperty.so.7
-lib/libkoproperty.so.7.0.0
+lib/libkoproperty.so.8
+lib/libkoproperty.so.8.0.0
lib/libkoreport.so
-lib/libkoreport.so.7
-lib/libkoreport.so.7.0.0
+lib/libkoreport.so.8
+lib/libkoreport.so.8.0.0
lib/libkotext.so
-lib/libkotext.so.7
-lib/libkotext.so.7.0.0
+lib/libkotext.so.8
+lib/libkotext.so.8.0.0
lib/libkowidgets.so
-lib/libkowidgets.so.7
-lib/libkowidgets.so.7.0.0
+lib/libkowidgets.so.8
+lib/libkowidgets.so.8.0.0
lib/libkowmf.so
-lib/libkowmf.so.7
-lib/libkowmf.so.7.0.0
+lib/libkowmf.so.8
+lib/libkowmf.so.8.0.0
lib/libkplatokernel.so
-lib/libkplatokernel.so.7
-lib/libkplatokernel.so.7.0.0
+lib/libkplatokernel.so.8
+lib/libkplatokernel.so.8.0.0
lib/libkplatomodels.so
-lib/libkplatomodels.so.7
-lib/libkplatomodels.so.7.0.0
+lib/libkplatomodels.so.8
+lib/libkplatomodels.so.8.0.0
lib/libkplatoprivate.so
-lib/libkplatoprivate.so.7
-lib/libkplatoprivate.so.7.0.0
+lib/libkplatoprivate.so.8
+lib/libkplatoprivate.so.8.0.0
lib/libkplatoui.so
-lib/libkplatoui.so.7
-lib/libkplatoui.so.7.0.0
+lib/libkplatoui.so.8
+lib/libkplatoui.so.8.0.0
lib/libkplatoworkapp.so
-lib/libkplatoworkapp.so.7
-lib/libkplatoworkapp.so.7.0.0
+lib/libkplatoworkapp.so.8
+lib/libkplatoworkapp.so.8.0.0
lib/libkplatoworkfactory.so
-lib/libkplatoworkfactory.so.7
-lib/libkplatoworkfactory.so.7.0.0
+lib/libkplatoworkfactory.so.8
+lib/libkplatoworkfactory.so.8.0.0
lib/libkpresenterprivate.so
-lib/libkpresenterprivate.so.7
-lib/libkpresenterprivate.so.7.0.0
+lib/libkpresenterprivate.so.8
+lib/libkpresenterprivate.so.8.0.0
lib/libkritaimage.so
-lib/libkritaimage.so.7
-lib/libkritaimage.so.7.0.0
+lib/libkritaimage.so.8
+lib/libkritaimage.so.8.0.0
lib/libkritalibbrush.so
-lib/libkritalibbrush.so.7
-lib/libkritalibbrush.so.7.0.0
+lib/libkritalibbrush.so.8
+lib/libkritalibbrush.so.8.0.0
lib/libkritalibpaintop.so
-lib/libkritalibpaintop.so.7
-lib/libkritalibpaintop.so.7.0.0
+lib/libkritalibpaintop.so.8
+lib/libkritalibpaintop.so.8.0.0
lib/libkritaui.so
-lib/libkritaui.so.7
-lib/libkritaui.so.7.0.0
-lib/libkrossmodulekrita.so
-lib/libkrossmodulekrita.so.7
-lib/libkrossmodulekrita.so.7.0.0
+lib/libkritaui.so.8
+lib/libkritaui.so.8.0.0
lib/libkspreadcommon.so
-lib/libkspreadcommon.so.7
-lib/libkspreadcommon.so.7.0.0
+lib/libkspreadcommon.so.8
+lib/libkspreadcommon.so.8.0.0
+lib/libkspreadodf.so
+lib/libkspreadodf.so.8
+lib/libkspreadodf.so.8.0.0
lib/libkwmf.so
-lib/libkwmf.so.7
-lib/libkwmf.so.7.0.0
+lib/libkwmf.so.8
+lib/libkwmf.so.8.0.0
lib/libkwordexportfilters.so
-lib/libkwordexportfilters.so.7
-lib/libkwordexportfilters.so.7.0.0
+lib/libkwordexportfilters.so.8
+lib/libkwordexportfilters.so.8.0.0
lib/libkwordprivate.so
-lib/libkwordprivate.so.7
-lib/libkwordprivate.so.7.0.0
+lib/libkwordprivate.so.8
+lib/libkwordprivate.so.8.0.0
lib/libmsooxml.so
-lib/libmsooxml.so.7
-lib/libmsooxml.so.7.0.0
+lib/libmsooxml.so.8
+lib/libmsooxml.so.8.0.0
lib/libpigmentcms.so
-lib/libpigmentcms.so.7
-lib/libpigmentcms.so.7.0.0
+lib/libpigmentcms.so.8
+lib/libpigmentcms.so.8.0.0
share/applications/kde4/KThesaurus.desktop
share/applications/kde4/karbon.desktop
share/applications/kde4/kexi.desktop
+share/applications/kde4/kformula.desktop
share/applications/kde4/koffice.desktop
share/applications/kde4/kplato.desktop
share/applications/kde4/kplatowork.desktop
@@ -745,6 +774,7 @@ share/applications/kde4/krita_tiff.desktop
share/applications/kde4/krita_xcf.desktop
share/applications/kde4/kspread.desktop
share/applications/kde4/kword.desktop
+share/applications/kde4/okularApplication_odp.desktop
share/apps/cmake/modules/FindKOfficeLibs.cmake
share/apps/formulashape/fonts/Arev.ttf
share/apps/formulashape/fonts/ArevBI.ttf
@@ -811,109 +841,6 @@ share/apps/karbon/kpartplugins/WhirlPinchPlugin.rc
share/apps/karbon/templates/Basic/.directory
share/apps/karbon/templates/Basic/.source/empty.odg
share/apps/karbon/templates/Basic/empty.desktop
-share/apps/kchart/icons/hicolor/16x16/actions/chart_area.png
-share/apps/kchart/icons/hicolor/16x16/actions/chart_area_3d.png
-share/apps/kchart/icons/hicolor/16x16/actions/chart_bar.png
-share/apps/kchart/icons/hicolor/16x16/actions/chart_bar_3d.png
-share/apps/kchart/icons/hicolor/16x16/actions/chart_boxwhisker.png
-share/apps/kchart/icons/hicolor/16x16/actions/chart_hilo.png
-share/apps/kchart/icons/hicolor/16x16/actions/chart_line.png
-share/apps/kchart/icons/hicolor/16x16/actions/chart_line_3d.png
-share/apps/kchart/icons/hicolor/16x16/actions/chart_pie.png
-share/apps/kchart/icons/hicolor/16x16/actions/chart_pie_3d.png
-share/apps/kchart/icons/hicolor/16x16/actions/chart_polar.png
-share/apps/kchart/icons/hicolor/16x16/actions/chart_ring.png
-share/apps/kchart/icons/hicolor/16x16/actions/data.png
-share/apps/kchart/icons/hicolor/16x16/actions/options.png
-share/apps/kchart/icons/hicolor/16x16/actions/wizard.png
-share/apps/kchart/icons/hicolor/22x22/actions/chart_area.png
-share/apps/kchart/icons/hicolor/22x22/actions/chart_area_3d.png
-share/apps/kchart/icons/hicolor/22x22/actions/chart_bar.png
-share/apps/kchart/icons/hicolor/22x22/actions/chart_bar_3d.png
-share/apps/kchart/icons/hicolor/22x22/actions/chart_boxwhisker.png
-share/apps/kchart/icons/hicolor/22x22/actions/chart_hilo.png
-share/apps/kchart/icons/hicolor/22x22/actions/chart_line.png
-share/apps/kchart/icons/hicolor/22x22/actions/chart_line_3d.png
-share/apps/kchart/icons/hicolor/22x22/actions/chart_pie.png
-share/apps/kchart/icons/hicolor/22x22/actions/chart_pie_3d.png
-share/apps/kchart/icons/hicolor/22x22/actions/chart_polar.png
-share/apps/kchart/icons/hicolor/22x22/actions/chart_ring.png
-share/apps/kchart/icons/hicolor/22x22/actions/data.png
-share/apps/kchart/icons/hicolor/22x22/actions/options.png
-share/apps/kchart/icons/hicolor/22x22/actions/wizard.png
-share/apps/kchart/icons/hicolor/32x32/actions/chart_area.png
-share/apps/kchart/icons/hicolor/32x32/actions/chart_area_3d.png
-share/apps/kchart/icons/hicolor/32x32/actions/chart_bar.png
-share/apps/kchart/icons/hicolor/32x32/actions/chart_bar_3d.png
-share/apps/kchart/icons/hicolor/32x32/actions/chart_boxwhisker.png
-share/apps/kchart/icons/hicolor/32x32/actions/chart_hilo.png
-share/apps/kchart/icons/hicolor/32x32/actions/chart_line.png
-share/apps/kchart/icons/hicolor/32x32/actions/chart_line_3d.png
-share/apps/kchart/icons/hicolor/32x32/actions/chart_pie.png
-share/apps/kchart/icons/hicolor/32x32/actions/chart_pie_3d.png
-share/apps/kchart/icons/hicolor/32x32/actions/chart_polar.png
-share/apps/kchart/icons/hicolor/32x32/actions/chart_ring.png
-share/apps/kchart/icons/hicolor/32x32/actions/data.png
-share/apps/kchart/icons/hicolor/32x32/actions/options.png
-share/apps/kchart/icons/hicolor/32x32/actions/wizard.png
-share/apps/kchart/icons/hicolor/48x48/actions/chart_area.png
-share/apps/kchart/icons/hicolor/48x48/actions/chart_area_3d.png
-share/apps/kchart/icons/hicolor/48x48/actions/chart_bar.png
-share/apps/kchart/icons/hicolor/48x48/actions/chart_bar_3d.png
-share/apps/kchart/icons/hicolor/48x48/actions/chart_boxwhisker.png
-share/apps/kchart/icons/hicolor/48x48/actions/chart_hilo.png
-share/apps/kchart/icons/hicolor/48x48/actions/chart_line.png
-share/apps/kchart/icons/hicolor/48x48/actions/chart_line_3d.png
-share/apps/kchart/icons/hicolor/48x48/actions/chart_pie.png
-share/apps/kchart/icons/hicolor/48x48/actions/chart_pie_3d.png
-share/apps/kchart/icons/hicolor/48x48/actions/chart_polar.png
-share/apps/kchart/icons/hicolor/48x48/actions/chart_ring.png
-share/apps/kchart/icons/hicolor/48x48/actions/options.png
-share/apps/kchart/icons/hicolor/48x48/actions/template_barchart.png
-share/apps/kchart/icons/hicolor/48x48/actions/template_empty.png
-share/apps/kchart/icons/hicolor/scalable/actions/chart_area.svgz
-share/apps/kchart/icons/hicolor/scalable/actions/chart_area_3d.svgz
-share/apps/kchart/icons/hicolor/scalable/actions/chart_bar.svgz
-share/apps/kchart/icons/hicolor/scalable/actions/chart_bar_3d.svgz
-share/apps/kchart/icons/hicolor/scalable/actions/chart_boxwhisker.svgz
-share/apps/kchart/icons/hicolor/scalable/actions/chart_hilo.svgz
-share/apps/kchart/icons/hicolor/scalable/actions/chart_line.svgz
-share/apps/kchart/icons/hicolor/scalable/actions/chart_line_3d.svgz
-share/apps/kchart/icons/hicolor/scalable/actions/chart_pie.svgz
-share/apps/kchart/icons/hicolor/scalable/actions/chart_pie_3d.svgz
-share/apps/kchart/icons/hicolor/scalable/actions/chart_polar.svgz
-share/apps/kchart/icons/hicolor/scalable/actions/chart_ring.svgz
-share/apps/kchart/icons/hicolor/scalable/actions/template_barchart.svgz
-share/apps/kchart/icons/hicolor/scalable/actions/template_empty.svgz
-share/apps/kchart/pics/chart_area_normal.png
-share/apps/kchart/pics/chart_area_percent.png
-share/apps/kchart/pics/chart_area_stacked.png
-share/apps/kchart/pics/chart_bar_beside.png
-share/apps/kchart/pics/chart_bar_layer.png
-share/apps/kchart/pics/chart_bar_percent.png
-share/apps/kchart/pics/chart_hilo_close.png
-share/apps/kchart/pics/chart_hilo_normal.png
-share/apps/kchart/pics/chart_hilo_openclose.png
-share/apps/kchart/pics/chart_legend_bottom.png
-share/apps/kchart/pics/chart_legend_bottomleft.png
-share/apps/kchart/pics/chart_legend_bottomright.png
-share/apps/kchart/pics/chart_legend_left.png
-share/apps/kchart/pics/chart_legend_nolegend.png
-share/apps/kchart/pics/chart_legend_right.png
-share/apps/kchart/pics/chart_legend_top.png
-share/apps/kchart/pics/chart_legend_topleft.png
-share/apps/kchart/pics/chart_legend_topright.png
-share/apps/kchart/pics/chart_line_normal.png
-share/apps/kchart/pics/chart_line_percent.png
-share/apps/kchart/pics/chart_line_stacked.png
-share/apps/kchart/pics/chart_polar_normal.png
-share/apps/kchart/pics/chart_polar_percent.png
-share/apps/kchart/pics/chart_polar_stacked.png
-share/apps/kchart/templates/chart/.directory
-share/apps/kchart/templates/chart/.source/BarChart.chrt
-share/apps/kchart/templates/chart/.source/Empty.chrt
-share/apps/kchart/templates/chart/BarChart.desktop
-share/apps/kchart/templates/chart/Empty.desktop
share/apps/kexi/icons/hicolor/128x128/actions/form_action.png
share/apps/kexi/icons/hicolor/16x16/actions/add_field.png
share/apps/kexi/icons/hicolor/16x16/actions/aofit.png
@@ -963,6 +890,7 @@ share/apps/kexi/icons/hicolor/16x16/actions/state_text.png
share/apps/kexi/icons/hicolor/16x16/actions/subform.png
share/apps/kexi/icons/hicolor/16x16/actions/table.png
share/apps/kexi/icons/hicolor/16x16/actions/table_newobj.png
+share/apps/kexi/icons/hicolor/16x16/actions/tabwidget-tab.png
share/apps/kexi/icons/hicolor/16x16/actions/tabwidget.png
share/apps/kexi/icons/hicolor/16x16/actions/test_it.png
share/apps/kexi/icons/hicolor/16x16/actions/textedit.png
@@ -1029,6 +957,7 @@ share/apps/kexi/icons/hicolor/22x22/actions/state_text.png
share/apps/kexi/icons/hicolor/22x22/actions/subform.png
share/apps/kexi/icons/hicolor/22x22/actions/table.png
share/apps/kexi/icons/hicolor/22x22/actions/table_newobj.png
+share/apps/kexi/icons/hicolor/22x22/actions/tabwidget-tab.png
share/apps/kexi/icons/hicolor/22x22/actions/tabwidget.png
share/apps/kexi/icons/hicolor/22x22/actions/test_it.png
share/apps/kexi/icons/hicolor/22x22/actions/textedit.png
@@ -1161,6 +1090,9 @@ share/apps/koffice/icons/hicolor/16x16/actions/tab_last.png
share/apps/koffice/icons/hicolor/16x16/actions/tab_left.png
share/apps/koffice/icons/hicolor/16x16/actions/tab_right.png
share/apps/koffice/icons/hicolor/16x16/actions/textcolor.png
+share/apps/koffice/icons/hicolor/16x16/actions/tool-changetracking.png
+share/apps/koffice/icons/hicolor/16x16/actions/tool-paragraph.png
+share/apps/koffice/icons/hicolor/16x16/actions/tool-text.png
share/apps/koffice/icons/hicolor/16x16/actions/under.png
share/apps/koffice/icons/hicolor/16x16/actions/view-barcode.png
share/apps/koffice/icons/hicolor/16x16/actions/view-sort-ascending.png
@@ -1440,8 +1372,10 @@ share/apps/kplato/scripts/samples/sample_project.py
share/apps/kplato/scripts/scripts.rc
share/apps/kplato/templates/Simple/.directory
share/apps/kplato/templates/Simple/.source/8HourDay-40HourWeek.kplatot
+share/apps/kplato/templates/Simple/.source/Basicproject.kplatot
share/apps/kplato/templates/Simple/.source/Plain.kplatot
share/apps/kplato/templates/Simple/8HourDay-40HourWeek.desktop
+share/apps/kplato/templates/Simple/Basicproject.desktop
share/apps/kplato/templates/Simple/Plain.desktop
share/apps/kplatowork/icons/hicolor/128x128/actions/template_empty.png
share/apps/kplatowork/icons/hicolor/16x16/actions/template_empty.png
@@ -1464,6 +1398,19 @@ share/apps/kpresenter/icons/hicolor/48x48/actions/template_titlelandscape.png
share/apps/kpresenter/icons/hicolor/48x48/actions/template_titleportrait.png
share/apps/kpresenter/icons/hicolor/48x48/actions/template_twocolumnlandscape.png
share/apps/kpresenter/icons/hicolor/48x48/actions/template_twocolumnportrait.png
+share/apps/kpresenter/icons/hicolor/64x64/actions/blue_orange_vector.png
+share/apps/kpresenter/icons/hicolor/64x64/actions/burning_desire.png
+share/apps/kpresenter/icons/hicolor/64x64/actions/business.png
+share/apps/kpresenter/icons/hicolor/64x64/actions/flood_light.png
+share/apps/kpresenter/icons/hicolor/64x64/actions/rounded_square.png
+share/apps/kpresenter/icons/hicolor/64x64/actions/simple_waves.png
+share/apps/kpresenter/icons/hicolor/64x64/actions/skyline_monotone.png
+share/apps/kpresenter/icons/hicolor/64x64/actions/skyline_monotone_wide.png
+share/apps/kpresenter/icons/hicolor/64x64/actions/skyline_morning.png
+share/apps/kpresenter/icons/hicolor/64x64/actions/skyline_morning_wide.png
+share/apps/kpresenter/icons/hicolor/64x64/actions/skyline_night.png
+share/apps/kpresenter/icons/hicolor/64x64/actions/skyline_night_wide.png
+share/apps/kpresenter/icons/hicolor/64x64/actions/strange_far_hills.png
share/apps/kpresenter/icons/hicolor/scalable/actions/template_emptylandscape.svgz
share/apps/kpresenter/icons/hicolor/scalable/actions/template_emptyportrait.svgz
share/apps/kpresenter/icons/hicolor/scalable/actions/template_onecolumnlandscape.svgz
@@ -1499,6 +1446,36 @@ share/apps/kpresenter/templates/Screen/.source/emptyLandscape.otp
share/apps/kpresenter/templates/Screen/.source/emptyLandscapeWide.otp
share/apps/kpresenter/templates/Screen/emptyLandscape.desktop
share/apps/kpresenter/templates/Screen/emptyLandscapeWide.desktop
+share/apps/kpresenter/templates/exportHTML/slides.html
+share/apps/kpresenter/templates/exportHTML/templates/Default.zip
+share/apps/kpresenter/templates/exportHTML/toc.html
+share/apps/kpresenter/templates/odf/.directory
+share/apps/kpresenter/templates/odf/.source/blue_orange_vector.otp
+share/apps/kpresenter/templates/odf/.source/burning_desire.otp
+share/apps/kpresenter/templates/odf/.source/business.otp
+share/apps/kpresenter/templates/odf/.source/flood_light.otp
+share/apps/kpresenter/templates/odf/.source/rounded_square.otp
+share/apps/kpresenter/templates/odf/.source/simple_waves.otp
+share/apps/kpresenter/templates/odf/.source/skyline_monotone.otp
+share/apps/kpresenter/templates/odf/.source/skyline_monotone_wide.otp
+share/apps/kpresenter/templates/odf/.source/skyline_morning.otp
+share/apps/kpresenter/templates/odf/.source/skyline_morning_wide.otp
+share/apps/kpresenter/templates/odf/.source/skyline_night.otp
+share/apps/kpresenter/templates/odf/.source/skyline_night_wide.otp
+share/apps/kpresenter/templates/odf/.source/strange_far_hills.otp
+share/apps/kpresenter/templates/odf/blue_orange_vector.desktop
+share/apps/kpresenter/templates/odf/burning_desire.desktop
+share/apps/kpresenter/templates/odf/business.desktop
+share/apps/kpresenter/templates/odf/flood_light.desktop
+share/apps/kpresenter/templates/odf/rounded_square.desktop
+share/apps/kpresenter/templates/odf/simple_waves.desktop
+share/apps/kpresenter/templates/odf/skyline_monotone.desktop
+share/apps/kpresenter/templates/odf/skyline_monotone_wide.desktop
+share/apps/kpresenter/templates/odf/skyline_morning.desktop
+share/apps/kpresenter/templates/odf/skyline_morning_wide.desktop
+share/apps/kpresenter/templates/odf/skyline_night.desktop
+share/apps/kpresenter/templates/odf/skyline_night_wide.desktop
+share/apps/kpresenter/templates/odf/strange_far_hills.desktop
share/apps/krita/backgrounds/old_paper.png
share/apps/krita/brushes/A---1-Basic-Big.vbr
share/apps/krita/brushes/A---1-Blending-brush.vbr
@@ -1551,16 +1528,47 @@ share/apps/krita/brushes/A-starfield.gih
share/apps/krita/brushes/A-starfield2.gih
share/apps/krita/brushes/A-wall-texture.gih
share/apps/krita/brushes/Z-Test-pressure.gih
+share/apps/krita/brushes/ab001.myb
+share/apps/krita/brushes/ab001_prev.png
+share/apps/krita/brushes/ab002.myb
+share/apps/krita/brushes/ab002_prev.png
+share/apps/krita/brushes/ab007.myb
+share/apps/krita/brushes/ab007_prev.png
+share/apps/krita/brushes/ab009.myb
+share/apps/krita/brushes/ab009_prev.png
+share/apps/krita/brushes/ab023.myb
+share/apps/krita/brushes/ab023_prev.png
+share/apps/krita/brushes/ab026.myb
+share/apps/krita/brushes/ab026_prev.png
+share/apps/krita/brushes/ab028.myb
+share/apps/krita/brushes/ab028_prev.png
+share/apps/krita/brushes/ab033.myb
+share/apps/krita/brushes/ab033_prev.png
+share/apps/krita/brushes/ab043.myb
+share/apps/krita/brushes/ab043_prev.png
share/apps/krita/brushmodels/3d-deform-brush.mtl
share/apps/krita/brushmodels/3d-deform-brush.obj
-share/apps/krita/brushmodels/3d-pencil.mtl
-share/apps/krita/brushmodels/3d-pencil.obj
share/apps/krita/brushmodels/airbrush.mtl
share/apps/krita/brushmodels/airbrush.obj
share/apps/krita/brushmodels/smudge-finger.mtl
share/apps/krita/brushmodels/smudge-finger.obj
share/apps/krita/brushmodels/stylus.mtl
share/apps/krita/brushmodels/stylus.obj
+share/apps/krita/defaultpresets/chalkbrush.kpp
+share/apps/krita/defaultpresets/complex.kpp
+share/apps/krita/defaultpresets/curvebrush.kpp
+share/apps/krita/defaultpresets/deformbrush.kpp
+share/apps/krita/defaultpresets/duplicate.kpp
+share/apps/krita/defaultpresets/dynabrush.kpp
+share/apps/krita/defaultpresets/eraser.kpp
+share/apps/krita/defaultpresets/experimentbrush.kpp
+share/apps/krita/defaultpresets/filter.kpp
+share/apps/krita/defaultpresets/gridbrush.kpp
+share/apps/krita/defaultpresets/hairybrush.kpp
+share/apps/krita/defaultpresets/paintbrush.kpp
+share/apps/krita/defaultpresets/particlebrush.kpp
+share/apps/krita/defaultpresets/smudge.kpp
+share/apps/krita/defaultpresets/spraybrush.kpp
share/apps/krita/dtd/krita.dtd
share/apps/krita/gradients/Abstract_1.ggr
share/apps/krita/gradients/Abstract_2.ggr
@@ -1641,20 +1649,22 @@ share/apps/krita/gradients/Wood_2.ggr
share/apps/krita/gradients/Yellow_Contrast.ggr
share/apps/krita/gradients/Yellow_Orange.ggr
share/apps/krita/icons/hicolor/48x48/actions/template_cmyk_empty.png
+share/apps/krita/icons/hicolor/48x48/actions/template_comics_empty.png
share/apps/krita/icons/hicolor/48x48/actions/template_gray_empty.png
share/apps/krita/icons/hicolor/48x48/actions/template_rgb_empty.png
-share/apps/krita/images/krita-chalk.png
share/apps/krita/images/krita-curve.png
share/apps/krita/images/krita-deform.png
share/apps/krita/images/krita-duplicate.png
share/apps/krita/images/krita-dyna.png
share/apps/krita/images/krita-eraser.png
share/apps/krita/images/krita-filterop.png
+share/apps/krita/images/krita-grid.png
+share/apps/krita/images/krita-hatching.png
share/apps/krita/images/krita-paintbrush.png
-share/apps/krita/images/krita-pencil.png
share/apps/krita/images/krita-smudgebrush.png
share/apps/krita/images/krita-spray.png
share/apps/krita/images/krita-sumi.png
+share/apps/krita/images/krita_first_start.kra
share/apps/krita/images/previewfilter.png
share/apps/krita/kpartplugins/scan-krita.rc
share/apps/krita/krita.rc
@@ -1667,6 +1677,13 @@ share/apps/krita/metadata/schemas/tiff.schema
share/apps/krita/metadata/schemas/xmp.schema
share/apps/krita/metadata/schemas/xmpmm.schema
share/apps/krita/metadata/schemas/xmprights.schema
+share/apps/krita/paintoppresets/Fur.kpp
+share/apps/krita/paintoppresets/Sketchy.kpp
+share/apps/krita/paintoppresets/chalk.kpp
+share/apps/krita/paintoppresets/chrome.kpp
+share/apps/krita/paintoppresets/pixelpencil.kpp
+share/apps/krita/paintoppresets/shaded.kpp
+share/apps/krita/paintoppresets/softbrush.kpp
share/apps/krita/palettes/1-All-Color-for-good-colors-choice.gpl
share/apps/krita/palettes/1-Pastel-soft-pink.gpl
share/apps/krita/palettes/1-Red-Dragon-cave.gpl
@@ -1751,8 +1768,13 @@ share/apps/krita/pics/arrow_south.png
share/apps/krita/pics/arrow_south_east.png
share/apps/krita/pics/arrow_south_west.png
share/apps/krita/pics/arrow_west.png
-share/apps/krita/pics/closedhand_cursor.xpm
+share/apps/krita/pics/cursor-cross.xpm
share/apps/krita/pics/deletelayer.png
+share/apps/krita/pics/extended_color_selector.png
+share/apps/krita/pics/height_icon.png
+share/apps/krita/pics/kis_colselng_color_patches.png
+share/apps/krita/pics/kis_colselng_color_triangle.png
+share/apps/krita/pics/kis_colselng_my_paint_shade_selector.png
share/apps/krita/pics/krita_draw_path.png
share/apps/krita/pics/krita_tool_color_fill.png
share/apps/krita/pics/krita_tool_color_picker.png
@@ -1775,11 +1797,15 @@ share/apps/krita/pics/locked.png
share/apps/krita/pics/lowerlayer.png
share/apps/krita/pics/newlayer.png
share/apps/krita/pics/novisible.png
-share/apps/krita/pics/openhand_cursor.xpm
+share/apps/krita/pics/offset_horizontal.png
+share/apps/krita/pics/offset_vertical.png
+share/apps/krita/pics/paintop_presets_disabled.png
share/apps/krita/pics/paintop_settings_01.png
share/apps/krita/pics/paintop_settings_02.png
+share/apps/krita/pics/paintop_settings_disabled.png
share/apps/krita/pics/polyline.png
share/apps/krita/pics/raiselayer.png
+share/apps/krita/pics/ratio_icon.png
share/apps/krita/pics/rotate_cursor.xpm
share/apps/krita/pics/select_pixel.png
share/apps/krita/pics/select_shape.png
@@ -1788,6 +1814,8 @@ share/apps/krita/pics/selection_exclude.png
share/apps/krita/pics/selection_intersect.png
share/apps/krita/pics/selection_replace.png
share/apps/krita/pics/selection_subtract.png
+share/apps/krita/pics/shear_horizontal.png
+share/apps/krita/pics/shear_vertical.png
share/apps/krita/pics/tablet.png
share/apps/krita/pics/tool_brush_selection.png
share/apps/krita/pics/tool_brush_selection_cursor.png
@@ -1811,8 +1839,6 @@ share/apps/krita/pics/tool_outline_selection_cursor.png
share/apps/krita/pics/tool_path_selection.png
share/apps/krita/pics/tool_perspectivegrid.png
share/apps/krita/pics/tool_perspectivegrid_cursor.png
-share/apps/krita/pics/tool_perspectivetransform.png
-share/apps/krita/pics/tool_perspectivetransform_cursor.png
share/apps/krita/pics/tool_polygon.png
share/apps/krita/pics/tool_polygon_cursor.png
share/apps/krita/pics/tool_polygonal_selection.png
@@ -1831,25 +1857,7 @@ share/apps/krita/pics/transparency-unlocked.png
share/apps/krita/pics/unlinked.png
share/apps/krita/pics/unlocked.png
share/apps/krita/pics/visible.png
-share/apps/krita/scripts/decorations/VanishingPoints.rb
-share/apps/krita/scripts/dockers/flipbookdocker.rb
-share/apps/krita/scripts/dockers/palettedocker.rb
-share/apps/krita/scripts/extensions/changecs.rb
-share/apps/krita/scripts/extensions/filterstest.rb
-share/apps/krita/scripts/extensions/invert.js
-share/apps/krita/scripts/extensions/invert.py
-share/apps/krita/scripts/extensions/invert.rb
-share/apps/krita/scripts/extensions/pilexport.py
-share/apps/krita/scripts/extensions/pilimport.py
-share/apps/krita/scripts/extensions/pilimport.ui
-share/apps/krita/scripts/extensions/randompaint.rb
-share/apps/krita/scripts/extensions/reshapehisto.py
-share/apps/krita/scripts/extensions/sky.rb
-share/apps/krita/scripts/extensions/torture-filters.rb
-share/apps/krita/scripts/extensions/torture-painting.rb
-share/apps/krita/scripts/filters/invert.rb
-share/apps/krita/scripts/filters/random.rb
-share/apps/krita/scripts/scripts.rc
+share/apps/krita/pics/width_icon.png
share/apps/krita/shaders/bilinear_gradient.frag
share/apps/krita/shaders/conical_gradient.frag
share/apps/krita/shaders/conical_symetric_gradient.frag
@@ -1891,6 +1899,15 @@ share/apps/krita/shaders/square_gradient.frag
share/apps/krita/templates/cmyk/.directory
share/apps/krita/templates/cmyk/.source/white_2000x800.kra
share/apps/krita/templates/cmyk/white_2000x800.desktop
+share/apps/krita/templates/comics/.directory
+share/apps/krita/templates/comics/.source/BD-EuroTemplate.kra
+share/apps/krita/templates/comics/.source/Comics-USTemplate.kra
+share/apps/krita/templates/comics/.source/Manga-JpTemplate.kra
+share/apps/krita/templates/comics/.source/a4_waffle_grid.kra
+share/apps/krita/templates/comics/BD-EuroTemplate.desktop
+share/apps/krita/templates/comics/Comics-USTemplate.desktop
+share/apps/krita/templates/comics/Manga-JpTemplate.desktop
+share/apps/krita/templates/comics/a4_waffle_grid.desktop
share/apps/krita/templates/gray/.directory
share/apps/krita/templates/gray/.source/white_640x480.kra
share/apps/krita/templates/gray/white_640x480.desktop
@@ -1911,9 +1928,7 @@ share/apps/krita/templates/rgb/white_1024x768.desktop
share/apps/krita/templates/rgb/white_1280x1024.desktop
share/apps/krita/templates/rgb/white_1600x1200.desktop
share/apps/krita/templates/rgb/white_640x480.desktop
-share/apps/kritaplugins/backgrounds.rc
share/apps/kritaplugins/bigbrother.rc
-share/apps/kritaplugins/bracketing2hdr.rc
share/apps/kritaplugins/colorrange.rc
share/apps/kritaplugins/colorspaceconversion.rc
share/apps/kritaplugins/dropshadow.rc
@@ -1929,7 +1944,6 @@ share/apps/kritaplugins/metadataeditor/exif.rc
share/apps/kritaplugins/metadataeditor/exif.ui
share/apps/kritaplugins/modify_selection.rc
share/apps/kritaplugins/rotateimage.rc
-share/apps/kritaplugins/scripting.rc
share/apps/kritaplugins/shearimage.rc
share/apps/kritaplugins/together.rc
share/apps/kritaplugins/tonemapping.rc
@@ -2126,6 +2140,7 @@ share/apps/kspread/templates/HomeFamily/BMI.desktop
share/apps/kspread/templates/HomeFamily/CreditCardTracker.desktop
share/apps/kspread/templates/HomeFamily/MenuPlan.desktop
share/apps/kspread/templates/HomeFamily/VacationChecklist.desktop
+share/apps/kword/html-odf/converter.xsl
share/apps/kword/icons/hicolor/128x128/actions/template_colorful.png
share/apps/kword/icons/hicolor/48x48/actions/template_a4.png
share/apps/kword/icons/hicolor/48x48/actions/template_businesscards10.png
@@ -2218,8 +2233,8 @@ share/apps/musicshape/fonts/Emmentaler-14.ttf
%%GTL%%share/apps/pigmentcms/ctlcolorspaces/rgba32f.ctlcs
%%GTL%%share/apps/pigmentcms/ctlcolorspaces/xyza16f.ctlcs
%%GTL%%share/apps/pigmentcms/ctlcolorspaces/xyza32f.ctlcs
-%%GTL%%share/apps/pigmentcms/ctlcolorspaces/ycbcr8u.ctlcs
%%GTL%%share/apps/pigmentcms/ctlcolorspaces/ycbcr16u.ctlcs
+%%GTL%%share/apps/pigmentcms/ctlcolorspaces/ycbcr8u.ctlcs
%%GTL%%share/apps/pigmentcms/ctlcolortransformations/BurnHighlights.ctlt
%%GTL%%share/apps/pigmentcms/ctlcolortransformations/BurnMidtones.ctlt
%%GTL%%share/apps/pigmentcms/ctlcolortransformations/BurnShadows.ctlt
@@ -2266,51 +2281,13 @@ share/config/kexirc
share/config/kplatorc
share/config/kplatoworkrc
share/config/kpresenterrc
+share/config/krita.knsrc
share/config/kritarc
share/config/kspreadrc
share/config/kwordrc
share/doc/HTML/en/karbon/common
share/doc/HTML/en/karbon/index.cache.bz2
share/doc/HTML/en/karbon/index.docbook
-share/doc/HTML/en/kchart/common
-share/doc/HTML/en/kchart/file-toolbar.png
-share/doc/HTML/en/kchart/file-toolbar2.png
-share/doc/HTML/en/kchart/frame_chart.png
-share/doc/HTML/en/kchart/hi22-action-chart_line.png
-share/doc/HTML/en/kchart/hi22-action-data.png
-share/doc/HTML/en/kchart/hi22-action-options.png
-share/doc/HTML/en/kchart/hi22-action-wizard.png
-share/doc/HTML/en/kchart/index.cache.bz2
-share/doc/HTML/en/kchart/index.docbook
-share/doc/HTML/en/kchart/kchart-config1.png
-share/doc/HTML/en/kchart/kchart-config2.png
-share/doc/HTML/en/kchart/kchart-config3.png
-share/doc/HTML/en/kchart/kchart-config4.png
-share/doc/HTML/en/kchart/kchart-config5.png
-share/doc/HTML/en/kchart/kchart-config6.png
-share/doc/HTML/en/kchart/kchart-config7.png
-share/doc/HTML/en/kchart/kchart-config8.png
-share/doc/HTML/en/kchart/kchart-dataeditor.png
-share/doc/HTML/en/kchart/kchart-default.png
-share/doc/HTML/en/kchart/kchart-example1-1.png
-share/doc/HTML/en/kchart/kchart-example1-2.png
-share/doc/HTML/en/kchart/kchart-example1-3.png
-share/doc/HTML/en/kchart/kchart-example1-4.png
-share/doc/HTML/en/kchart/kchart-example1-5.png
-share/doc/HTML/en/kchart/kchart-example1-6.png
-share/doc/HTML/en/kchart/kchart-example1-7.png
-share/doc/HTML/en/kchart/kchart-example1-8.png
-share/doc/HTML/en/kchart/kchart-example1-9.png
-share/doc/HTML/en/kchart/kchart-kspread-bar.png
-share/doc/HTML/en/kchart/kchart-kspread.png
-share/doc/HTML/en/kchart/kchart-startupdialog.png
-share/doc/HTML/en/kchart/kchart-wizard0.png
-share/doc/HTML/en/kchart/kchart-wizard1.png
-share/doc/HTML/en/kchart/kchart-wizard2.png
-share/doc/HTML/en/kchart/kchart-wizard3.png
-share/doc/HTML/en/kchart/kchart-wizard4.png
-share/doc/HTML/en/kchart/shortcut.png
-share/doc/HTML/en/kchart/toolbars.png
share/doc/HTML/en/kexi/basics.docbook
share/doc/HTML/en/kexi/building.docbook
share/doc/HTML/en/kexi/common
@@ -2522,7 +2499,6 @@ share/icons/hicolor/16x16/actions/black.png
share/icons/hicolor/16x16/actions/highlight.png
share/icons/hicolor/16x16/actions/pen.png
share/icons/hicolor/16x16/apps/karbon.png
-share/icons/hicolor/16x16/apps/kchart.png
share/icons/hicolor/16x16/apps/kformula.png
share/icons/hicolor/16x16/apps/kplato.png
share/icons/hicolor/16x16/apps/kplatowork.png
@@ -2543,7 +2519,6 @@ share/icons/hicolor/22x22/apps/kword.png
share/icons/hicolor/22x22/mimetypes/application-x-vnd.kde.kplato.png
share/icons/hicolor/22x22/mimetypes/application-x-vnd.kde.kplato.work.png
share/icons/hicolor/32x32/apps/karbon.png
-share/icons/hicolor/32x32/apps/kchart.png
share/icons/hicolor/32x32/apps/kformula.png
share/icons/hicolor/32x32/apps/kplato.png
share/icons/hicolor/32x32/apps/kplatowork.png
@@ -2555,7 +2530,6 @@ share/icons/hicolor/32x32/mimetypes/application-x-vnd.kde.kplato.png
share/icons/hicolor/32x32/mimetypes/application-x-vnd.kde.kplato.work.png
share/icons/hicolor/45x45/mimetypes/application-x-vnd.kde.kplato.work.png
share/icons/hicolor/48x48/apps/karbon.png
-share/icons/hicolor/48x48/apps/kchart.png
share/icons/hicolor/48x48/apps/kformula.png
share/icons/hicolor/48x48/apps/kplato.png
share/icons/hicolor/48x48/apps/kplatowork.png
@@ -2613,10 +2587,12 @@ share/kde4/services/artistictextshape.desktop
share/kde4/services/autocorrect.desktop
share/kde4/services/changecase.desktop
share/kde4/services/chartshape.desktop
+share/kde4/services/commentshape.desktop
share/kde4/services/defaulttools.desktop
share/kde4/services/divineproportionshape.desktop
share/kde4/services/formulashape.desktop
share/kde4/services/generic_filter.desktop
+share/kde4/services/html-odf_export.desktop
share/kde4/services/karbon_1x_import.desktop
%%EPS%%share/kde4/services/karbon_eps_import.desktop
share/kde4/services/karbon_pdf_import.desktop
@@ -2630,13 +2606,6 @@ share/kde4/services/karbon_wpg_import.desktop
share/kde4/services/karbonfiltereffects.desktop
share/kde4/services/karbonpart.desktop
share/kde4/services/karbontools.desktop
-share/kde4/services/kchart_bmp_export.desktop
-share/kde4/services/kchart_jpeg_export.desktop
-share/kde4/services/kchart_mng_export.desktop
-share/kde4/services/kchart_png_export.desktop
-share/kde4/services/kchart_svg_export.desktop
-share/kde4/services/kchart_xbm_export.desktop
-share/kde4/services/kchart_xpm_export.desktop
share/kde4/services/kchartpart.desktop
share/kde4/services/kexi/kexicsv_importexporthandler.desktop
share/kde4/services/kexi/kexiformhandler.desktop
@@ -2648,6 +2617,7 @@ share/kde4/services/kexi/kexitablehandler.desktop
share/kde4/services/kexidb_mysqldriver.desktop
share/kde4/services/kexidb_pqxxsqldriver.desktop
share/kde4/services/kexidb_sqlite3driver.desktop
+%%SYBASE%%share/kde4/services/kexidb_sybasedriver.desktop
%%XBASE%%share/kde4/services/kexidb_xbasedriver.desktop
share/kde4/services/keximigrate_kspread.desktop
share/kde4/services/keximigrate_mdb.desktop
@@ -2661,10 +2631,14 @@ share/kde4/services/kformdesigner/kformdesigner_containers.desktop
share/kde4/services/kformdesigner/kformdesigner_kexidbfactory.desktop
share/kde4/services/kformdesigner/kformdesigner_stdwidgets.desktop
share/kde4/services/kformulapart.desktop
+share/kde4/services/kodocinfopropspage.desktop
share/kde4/services/kofficedockers.desktop
share/kde4/services/kofficethumbnail.desktop
share/kde4/services/kolcmsengine.desktop
share/kde4/services/kopabackgroundtool.desktop
+share/kde4/services/koreport_barcodeplugin.desktop
+share/kde4/services/koreport_chartplugin.desktop
+share/kde4/services/koreport_shapeplugin.desktop
share/kde4/services/kounavail.desktop
share/kde4/services/kplato_icalendar_export.desktop
share/kde4/services/kplatopart.desktop
@@ -2672,9 +2646,12 @@ share/kde4/services/kplatoworkpart.desktop
share/kde4/services/kpr_pageeffect_barwipe.desktop
share/kde4/services/kpr_pageeffect_clockwipe.desktop
share/kde4/services/kpr_pageeffect_edgewipe.desktop
+share/kde4/services/kpr_pageeffect_fade.desktop
share/kde4/services/kpr_pageeffect_iriswipe.desktop
share/kde4/services/kpr_pageeffect_matrixwipe.desktop
share/kde4/services/kpr_pageeffect_slidewipe.desktop
+share/kde4/services/kpr_pageeffect_spacerotation.desktop
+share/kde4/services/kpr_pageeffect_swapeffect.desktop
share/kde4/services/kpr_shapeanimation_example.desktop
share/kde4/services/kpresenter_powerpoint_import.desktop
share/kde4/services/kpresenter_pptx_import.desktop
@@ -2684,6 +2661,7 @@ share/kde4/services/kpresentertoolanimation.desktop
share/kde4/services/kprvariables.desktop
share/kde4/services/krita_bmp_export.desktop
share/kde4/services/krita_bmp_import.desktop
+share/kde4/services/krita_colorselectorng.desktop
share/kde4/services/krita_colorspaces_extensions_plugin.desktop
%%GTL%%share/kde4/services/krita_ctlcs_plugin.desktop
share/kde4/services/krita_digitalmixer.desktop
@@ -2707,12 +2685,8 @@ share/kde4/services/krita_specificcolorselector.desktop
share/kde4/services/krita_tiff_export.desktop
share/kde4/services/krita_tiff_import.desktop
share/kde4/services/krita_xcf_import.desktop
-share/kde4/services/kritabackgrounds.desktop
share/kde4/services/kritabigbrother.desktop
share/kde4/services/kritablurfilter.desktop
-share/kde4/services/kritabracketing2hdr.desktop
-share/kde4/services/kritabumpmapfilter.desktop
-share/kde4/services/kritachalkpaintop.desktop
share/kde4/services/kritacolorgenerator.desktop
share/kde4/services/kritacolorrange.desktop
share/kde4/services/kritacolorsfilter.desktop
@@ -2734,6 +2708,7 @@ share/kde4/services/kritafastcolortransfer.desktop
share/kde4/services/kritafilterop.desktop
share/kde4/services/kritagridpaintop.desktop
share/kde4/services/kritahairypaintop.desktop
+share/kde4/services/kritahatchingpaintop.desktop
share/kde4/services/kritahistogram.desktop
share/kde4/services/kritaimageenhancement.desktop
share/kde4/services/kritaimagesize.desktop
@@ -2742,7 +2717,6 @@ share/kde4/services/kritalevelfilter.desktop
share/kde4/services/kritametadataeditor.desktop
share/kde4/services/kritamodifyselection.desktop
share/kde4/services/kritanoisefilter.desktop
-share/kde4/services/kritaoilpaintfilter.desktop
share/kde4/services/kritapart.desktop
share/kde4/services/kritaparticlepaintop.desktop
share/kde4/services/kritapixelizefilter.desktop
@@ -2751,15 +2725,12 @@ share/kde4/services/kritarandompickfilter.desktop
share/kde4/services/kritarotateimage.desktop
share/kde4/services/kritaroundcornersfilter.desktop
share/kde4/services/kritarulerassistanttool.desktop
-share/kde4/services/kritascripting.desktop
share/kde4/services/kritaselectiontools.desktop
share/kde4/services/kritaseparatechannels.desktop
share/kde4/services/kritashearimage.desktop
%%GTL%%share/kde4/services/kritashivafilters.desktop
%%GTL%%share/kde4/services/kritashivagenerators.desktop
-share/kde4/services/kritasmalltilesfilter.desktop
-share/kde4/services/kritasobelfilter.desktop
-share/kde4/services/kritasoftpaintop.desktop
+share/kde4/services/kritasketchpaintop.desktop
share/kde4/services/kritaspraypaintop.desktop
share/kde4/services/kritatogether.desktop
share/kde4/services/kritatonemapping.desktop
@@ -2767,7 +2738,6 @@ share/kde4/services/kritatoolcrop.desktop
share/kde4/services/kritatooldyna.desktop
share/kde4/services/kritatoolgrid.desktop
share/kde4/services/kritatoolperspectivegrid.desktop
-share/kde4/services/kritatoolperspectivetransform.desktop
share/kde4/services/kritatoolpolygon.desktop
share/kde4/services/kritatoolpolyline.desktop
share/kde4/services/kritatoolstar.desktop
@@ -2814,6 +2784,7 @@ share/kde4/services/kword_amipro_import.desktop
share/kde4/services/kword_applixword_import.desktop
share/kde4/services/kword_ascii_export.desktop
share/kde4/services/kword_ascii_import.desktop
+share/kde4/services/kword_dcm_import.desktop
share/kde4/services/kword_docbook_export.desktop
share/kde4/services/kword_docx_import.desktop
share/kde4/services/kword_hancomword_import.desktop
@@ -2830,16 +2801,18 @@ share/kde4/services/kword_wml_import.desktop
share/kde4/services/kword_wp_export.desktop
share/kde4/services/kword_wp_import.desktop
share/kde4/services/kwordpart.desktop
+share/kde4/services/libokularGenerator_odp.desktop
share/kde4/services/musicshape.desktop
+share/kde4/services/okularOdp.desktop
share/kde4/services/paragraphtool.desktop
share/kde4/services/pathshapes.desktop
share/kde4/services/pictureshape.desktop
+share/kde4/services/pluginshape.desktop
share/kde4/services/spellcheck.desktop
share/kde4/services/spreadsheetshape.desktop
share/kde4/services/textshape.desktop
share/kde4/services/textvariables.desktop
share/kde4/services/thesaurustool.desktop
-share/kde4/services/vectorshape.desktop
share/kde4/services/videoshape.desktop
share/kde4/services/xslt_export.desktop
share/kde4/services/xslt_import.desktop
@@ -2859,6 +2832,7 @@ share/kde4/servicetypes/kofficepart.desktop
share/kde4/servicetypes/kofilter.desktop
share/kde4/servicetypes/kofilterwrapper.desktop
share/kde4/servicetypes/koplugin.desktop
+share/kde4/servicetypes/koreport_itemplugin.desktop
share/kde4/servicetypes/kplato_schedulerplugin.desktop
share/kde4/servicetypes/kpr_pageeffect.desktop
share/kde4/servicetypes/kpr_shapeanimation.desktop
@@ -2899,7 +2873,6 @@ share/templates/TextDocument.desktop
@dirrm share/doc/HTML/en/koffice
@dirrm share/doc/HTML/en/kformula
@dirrm share/doc/HTML/en/kexi
-@dirrm share/doc/HTML/en/kchart
@dirrm share/doc/HTML/en/karbon
@dirrm share/color/icc/pigment
@dirrm share/color/icc/krita
@@ -2938,6 +2911,7 @@ share/templates/TextDocument.desktop
@dirrm share/apps/kword/icons/hicolor/128x128
@dirrm share/apps/kword/icons/hicolor
@dirrm share/apps/kword/icons
+@dirrm share/apps/kword/html-odf
@dirrm share/apps/kword
@dirrm share/apps/kspread/templates/HomeFamily/.source
@dirrm share/apps/kspread/templates/HomeFamily
@@ -2973,20 +2947,18 @@ share/templates/TextDocument.desktop
@dirrm share/apps/krita/templates/rgb
@dirrm share/apps/krita/templates/gray/.source
@dirrm share/apps/krita/templates/gray
+@dirrm share/apps/krita/templates/comics/.source
+@dirrm share/apps/krita/templates/comics
@dirrm share/apps/krita/templates/cmyk/.source
@dirrm share/apps/krita/templates/cmyk
@dirrm share/apps/krita/templates
%%GTL%%@dirrm share/apps/krita/shiva/kernels
%%GTL%%@dirrm share/apps/krita/shiva
@dirrm share/apps/krita/shaders
-@dirrm share/apps/krita/scripts/filters
-@dirrm share/apps/krita/scripts/extensions
-@dirrm share/apps/krita/scripts/dockers
-@dirrm share/apps/krita/scripts/decorations
-@dirrm share/apps/krita/scripts
@dirrm share/apps/krita/pics
@dirrm share/apps/krita/patterns
@dirrm share/apps/krita/palettes
+@dirrm share/apps/krita/paintoppresets
@dirrm share/apps/krita/metadata/schemas
@dirrm share/apps/krita/metadata
@dirrm share/apps/krita/kpartplugins
@@ -2997,10 +2969,15 @@ share/templates/TextDocument.desktop
@dirrm share/apps/krita/icons
@dirrm share/apps/krita/gradients
@dirrm share/apps/krita/dtd
+@dirrm share/apps/krita/defaultpresets
@dirrm share/apps/krita/brushmodels
@dirrm share/apps/krita/brushes
@dirrm share/apps/krita/backgrounds
@dirrm share/apps/krita
+@dirrm share/apps/kpresenter/templates/odf/.source
+@dirrm share/apps/kpresenter/templates/odf
+@dirrm share/apps/kpresenter/templates/exportHTML/templates
+@dirrm share/apps/kpresenter/templates/exportHTML
@dirrm share/apps/kpresenter/templates/Screen/.source
@dirrm share/apps/kpresenter/templates/Screen
@dirrm share/apps/kpresenter/templates
@@ -3010,6 +2987,8 @@ share/templates/TextDocument.desktop
@dirrm share/apps/kpresenter/kpartplugins
@dirrm share/apps/kpresenter/icons/hicolor/scalable/actions
@dirrm share/apps/kpresenter/icons/hicolor/scalable
+@dirrm share/apps/kpresenter/icons/hicolor/64x64/actions
+@dirrm share/apps/kpresenter/icons/hicolor/64x64
@dirrm share/apps/kpresenter/icons/hicolor/48x48/actions
@dirrm share/apps/kpresenter/icons/hicolor/48x48
@dirrm share/apps/kpresenter/icons/hicolor
@@ -3123,23 +3102,6 @@ share/templates/TextDocument.desktop
@dirrm share/apps/kexi/icons/hicolor
@dirrm share/apps/kexi/icons
@dirrm share/apps/kexi
-@dirrm share/apps/kchart/templates/chart/.source
-@dirrm share/apps/kchart/templates/chart
-@dirrm share/apps/kchart/templates
-@dirrm share/apps/kchart/pics
-@dirrm share/apps/kchart/icons/hicolor/scalable/actions
-@dirrm share/apps/kchart/icons/hicolor/scalable
-@dirrm share/apps/kchart/icons/hicolor/48x48/actions
-@dirrm share/apps/kchart/icons/hicolor/48x48
-@dirrm share/apps/kchart/icons/hicolor/32x32/actions
-@dirrm share/apps/kchart/icons/hicolor/32x32
-@dirrm share/apps/kchart/icons/hicolor/22x22/actions
-@dirrm share/apps/kchart/icons/hicolor/22x22
-@dirrm share/apps/kchart/icons/hicolor/16x16/actions
-@dirrm share/apps/kchart/icons/hicolor/16x16
-@dirrm share/apps/kchart/icons/hicolor
-@dirrm share/apps/kchart/icons
-@dirrm share/apps/kchart
@dirrm share/apps/karbon/templates/Basic/.source
@dirrm share/apps/karbon/templates/Basic
@dirrm share/apps/karbon/templates
diff --git a/editors/koffice-kde4-l10n-ca/distinfo b/editors/koffice-kde4-l10n-ca/distinfo
index 6d38a9fdc888..d4854c8de1a6 100644
--- a/editors/koffice-kde4-l10n-ca/distinfo
+++ b/editors/koffice-kde4-l10n-ca/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-ca-2.2.2.tar.bz2) = e5682579bdd4a8dd6235900215fbf5fa07f947fc459105740e96200d4667ed23
-SIZE (KDE/koffice-l10n/koffice-l10n-ca-2.2.2.tar.bz2) = 609607
+SHA256 (KDE/koffice-l10n/koffice-l10n-ca-2.3.1.tar.bz2) = 7471fb7811d3455364ce068047a40bf4fc00b8d080d331a1f1f83c6442cb5c43
+SIZE (KDE/koffice-l10n/koffice-l10n-ca-2.3.1.tar.bz2) = 602505
diff --git a/editors/koffice-kde4-l10n-ca/pkg-plist b/editors/koffice-kde4-l10n-ca/pkg-plist
index af9b1554cdfc..51ee28868da2 100644
--- a/editors/koffice-kde4-l10n-ca/pkg-plist
+++ b/editors/koffice-kde4-l10n-ca/pkg-plist
@@ -1,4 +1,3 @@
-share/apps/koffice/autocorrect/ca.xml
share/doc/HTML/ca/karbon/common
share/doc/HTML/ca/karbon/index.cache.bz2
share/doc/HTML/ca/karbon/index.docbook
@@ -23,6 +22,13 @@ share/doc/HTML/ca/kexi/querydesigning.docbook
share/doc/HTML/ca/kformula/common
share/doc/HTML/ca/kformula/index.cache.bz2
share/doc/HTML/ca/kformula/index.docbook
+share/doc/HTML/ca/kivio/common
+share/doc/HTML/ca/kivio/credits.docbook
+share/doc/HTML/ca/kivio/index.cache.bz2
+share/doc/HTML/ca/kivio/index.docbook
+share/doc/HTML/ca/kivio/introduction.docbook
+share/doc/HTML/ca/kivio/usage.docbook
+share/doc/HTML/ca/kivio/working.docbook
share/doc/HTML/ca/koffice/common
share/doc/HTML/ca/koffice/index.cache.bz2
share/doc/HTML/ca/koffice/index.docbook
@@ -54,18 +60,22 @@ share/doc/HTML/ca/thesaurus/index.cache.bz2
share/doc/HTML/ca/thesaurus/index.docbook
share/locale/ca/LC_MESSAGES/ArtisticTextShape.mo
share/locale/ca/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/ca/LC_MESSAGES/BarcodePlugin.mo
share/locale/ca/LC_MESSAGES/CalendarTool.mo
share/locale/ca/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/ca/LC_MESSAGES/ChartPlugin.mo
share/locale/ca/LC_MESSAGES/ChartShape.mo
+share/locale/ca/LC_MESSAGES/CommentShape.mo
share/locale/ca/LC_MESSAGES/DivineProportion.mo
share/locale/ca/LC_MESSAGES/FormulaShape.mo
-share/locale/ca/LC_MESSAGES/FreOffice.mo
share/locale/ca/LC_MESSAGES/KarbonTools.mo
share/locale/ca/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/ca/LC_MESSAGES/MusicShape.mo
share/locale/ca/LC_MESSAGES/ParagraphTool.mo
share/locale/ca/LC_MESSAGES/PathShapes.mo
share/locale/ca/LC_MESSAGES/PictureShape.mo
+share/locale/ca/LC_MESSAGES/PluginShape.mo
+share/locale/ca/LC_MESSAGES/ShapePlugin.mo
share/locale/ca/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/ca/LC_MESSAGES/TableShape.mo
share/locale/ca/LC_MESSAGES/TextShape.mo
@@ -104,9 +114,8 @@ share/locale/ca/LC_MESSAGES/thesaurus_tool.mo
@dirrm share/doc/HTML/ca/kspread
@dirrm share/doc/HTML/ca/kpresenter
@dirrm share/doc/HTML/ca/koffice
+@dirrm share/doc/HTML/ca/kivio
@dirrm share/doc/HTML/ca/kformula
@dirrm share/doc/HTML/ca/kexi
@dirrm share/doc/HTML/ca/kchart
@dirrm share/doc/HTML/ca/karbon
-@dirrmtry share/apps/koffice/autocorrect
-@dirrmtry share/apps/koffice
diff --git a/editors/koffice-kde4-l10n-ca_valencia/distinfo b/editors/koffice-kde4-l10n-ca_valencia/distinfo
index bf0731ec0f7b..41fae6c10982 100644
--- a/editors/koffice-kde4-l10n-ca_valencia/distinfo
+++ b/editors/koffice-kde4-l10n-ca_valencia/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-ca@valencia-2.2.2.tar.bz2) = f330d0838915b98fd4aa6b348bdaf39d2fb4289732772e08f4307fd450d4cd1d
-SIZE (KDE/koffice-l10n/koffice-l10n-ca@valencia-2.2.2.tar.bz2) = 322040
+SHA256 (KDE/koffice-l10n/koffice-l10n-ca@valencia-2.3.1.tar.bz2) = 4552b512bff48dce5326b350ab77e68dd5b79476719c9b50ff5afdb3f28cd45b
+SIZE (KDE/koffice-l10n/koffice-l10n-ca@valencia-2.3.1.tar.bz2) = 333798
diff --git a/editors/koffice-kde4-l10n-ca_valencia/pkg-plist b/editors/koffice-kde4-l10n-ca_valencia/pkg-plist
index 06f878d3c7a8..27cf4c451e29 100644
--- a/editors/koffice-kde4-l10n-ca_valencia/pkg-plist
+++ b/editors/koffice-kde4-l10n-ca_valencia/pkg-plist
@@ -1,17 +1,21 @@
share/locale/ca@valencia/LC_MESSAGES/ArtisticTextShape.mo
share/locale/ca@valencia/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/ca@valencia/LC_MESSAGES/BarcodePlugin.mo
share/locale/ca@valencia/LC_MESSAGES/CalendarTool.mo
share/locale/ca@valencia/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/ca@valencia/LC_MESSAGES/ChartPlugin.mo
share/locale/ca@valencia/LC_MESSAGES/ChartShape.mo
+share/locale/ca@valencia/LC_MESSAGES/CommentShape.mo
share/locale/ca@valencia/LC_MESSAGES/DivineProportion.mo
share/locale/ca@valencia/LC_MESSAGES/FormulaShape.mo
-share/locale/ca@valencia/LC_MESSAGES/FreOffice.mo
share/locale/ca@valencia/LC_MESSAGES/KarbonTools.mo
share/locale/ca@valencia/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/ca@valencia/LC_MESSAGES/MusicShape.mo
share/locale/ca@valencia/LC_MESSAGES/ParagraphTool.mo
share/locale/ca@valencia/LC_MESSAGES/PathShapes.mo
share/locale/ca@valencia/LC_MESSAGES/PictureShape.mo
+share/locale/ca@valencia/LC_MESSAGES/PluginShape.mo
+share/locale/ca@valencia/LC_MESSAGES/ShapePlugin.mo
share/locale/ca@valencia/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/ca@valencia/LC_MESSAGES/TableShape.mo
share/locale/ca@valencia/LC_MESSAGES/TextShape.mo
diff --git a/editors/koffice-kde4-l10n-da/distinfo b/editors/koffice-kde4-l10n-da/distinfo
index 3af8e66ba3e3..7264b974102c 100644
--- a/editors/koffice-kde4-l10n-da/distinfo
+++ b/editors/koffice-kde4-l10n-da/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-da-2.2.2.tar.bz2) = 04528abc8dfd2785a282fc4228f7c9a88a8760376e79fd9e8c6b129a299d8dc5
-SIZE (KDE/koffice-l10n/koffice-l10n-da-2.2.2.tar.bz2) = 601612
+SHA256 (KDE/koffice-l10n/koffice-l10n-da-2.3.1.tar.bz2) = 0e68b45c8a2f0e357eaa24905605ea16f6ee4877363319afb9f484c261bbcf53
+SIZE (KDE/koffice-l10n/koffice-l10n-da-2.3.1.tar.bz2) = 574070
diff --git a/editors/koffice-kde4-l10n-da/pkg-plist b/editors/koffice-kde4-l10n-da/pkg-plist
index 140e1b40126d..33bc29023ca0 100644
--- a/editors/koffice-kde4-l10n-da/pkg-plist
+++ b/editors/koffice-kde4-l10n-da/pkg-plist
@@ -25,17 +25,6 @@ share/doc/HTML/da/kformula/index.docbook
share/doc/HTML/da/koffice/common
share/doc/HTML/da/koffice/index.cache.bz2
share/doc/HTML/da/koffice/index.docbook
-share/doc/HTML/da/kpresenter/a11y.docbook
-share/doc/HTML/da/kpresenter/common
-share/doc/HTML/da/kpresenter/faq.docbook
-share/doc/HTML/da/kpresenter/great-presentations.docbook
-share/doc/HTML/da/kpresenter/guides.docbook
-share/doc/HTML/da/kpresenter/index.cache.bz2
-share/doc/HTML/da/kpresenter/index.docbook
-share/doc/HTML/da/kpresenter/menus.docbook
-share/doc/HTML/da/kpresenter/options.docbook
-share/doc/HTML/da/kpresenter/screen.docbook
-share/doc/HTML/da/kpresenter/tutorial.docbook
share/doc/HTML/da/kspread/a11y.docbook
share/doc/HTML/da/kspread/advanced.docbook
share/doc/HTML/da/kspread/basics.docbook
@@ -53,18 +42,22 @@ share/doc/HTML/da/thesaurus/index.cache.bz2
share/doc/HTML/da/thesaurus/index.docbook
share/locale/da/LC_MESSAGES/ArtisticTextShape.mo
share/locale/da/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/da/LC_MESSAGES/BarcodePlugin.mo
share/locale/da/LC_MESSAGES/CalendarTool.mo
share/locale/da/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/da/LC_MESSAGES/ChartPlugin.mo
share/locale/da/LC_MESSAGES/ChartShape.mo
+share/locale/da/LC_MESSAGES/CommentShape.mo
share/locale/da/LC_MESSAGES/DivineProportion.mo
share/locale/da/LC_MESSAGES/FormulaShape.mo
-share/locale/da/LC_MESSAGES/FreOffice.mo
share/locale/da/LC_MESSAGES/KarbonTools.mo
share/locale/da/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/da/LC_MESSAGES/MusicShape.mo
share/locale/da/LC_MESSAGES/ParagraphTool.mo
share/locale/da/LC_MESSAGES/PathShapes.mo
share/locale/da/LC_MESSAGES/PictureShape.mo
+share/locale/da/LC_MESSAGES/PluginShape.mo
+share/locale/da/LC_MESSAGES/ShapePlugin.mo
share/locale/da/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/da/LC_MESSAGES/TableShape.mo
share/locale/da/LC_MESSAGES/TextShape.mo
@@ -101,7 +94,6 @@ share/locale/da/LC_MESSAGES/kword.mo
share/locale/da/LC_MESSAGES/thesaurus_tool.mo
@dirrm share/doc/HTML/da/thesaurus
@dirrm share/doc/HTML/da/kspread
-@dirrm share/doc/HTML/da/kpresenter
@dirrm share/doc/HTML/da/koffice
@dirrm share/doc/HTML/da/kformula
@dirrm share/doc/HTML/da/kexi
diff --git a/editors/koffice-kde4-l10n-el/distinfo b/editors/koffice-kde4-l10n-el/distinfo
index 948578079b22..1e33ac4a1859 100644
--- a/editors/koffice-kde4-l10n-el/distinfo
+++ b/editors/koffice-kde4-l10n-el/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-el-2.2.2.tar.bz2) = 3846c902fa59e473c823bb783f7036c860a5329cd34d3430a3ba08b01e2b3dff
-SIZE (KDE/koffice-l10n/koffice-l10n-el-2.2.2.tar.bz2) = 334551
+SHA256 (KDE/koffice-l10n/koffice-l10n-el-2.3.1.tar.bz2) = 76804f96c3a931f369fdbc0b8a5d2041870bb7273995822973273ef715ed52a3
+SIZE (KDE/koffice-l10n/koffice-l10n-el-2.3.1.tar.bz2) = 344757
diff --git a/editors/koffice-kde4-l10n-en_GB/distinfo b/editors/koffice-kde4-l10n-en_GB/distinfo
index 03f5c3f62b49..cdd9d9779cf3 100644
--- a/editors/koffice-kde4-l10n-en_GB/distinfo
+++ b/editors/koffice-kde4-l10n-en_GB/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-en_GB-2.2.2.tar.bz2) = f1b8962de072c2304b70c271ec75918e3c71590a900575552a7b8d1481095934
-SIZE (KDE/koffice-l10n/koffice-l10n-en_GB-2.2.2.tar.bz2) = 346856
+SHA256 (KDE/koffice-l10n/koffice-l10n-en_GB-2.3.1.tar.bz2) = 965533eb638a1246db6bb0bc4ab208783eaa860a447bc653551e2c91cc9731af
+SIZE (KDE/koffice-l10n/koffice-l10n-en_GB-2.3.1.tar.bz2) = 335483
diff --git a/editors/koffice-kde4-l10n-en_GB/pkg-plist b/editors/koffice-kde4-l10n-en_GB/pkg-plist
index 6c0b2c94bcf8..9af23af103db 100644
--- a/editors/koffice-kde4-l10n-en_GB/pkg-plist
+++ b/editors/koffice-kde4-l10n-en_GB/pkg-plist
@@ -1,17 +1,21 @@
share/locale/en_GB/LC_MESSAGES/ArtisticTextShape.mo
share/locale/en_GB/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/en_GB/LC_MESSAGES/BarcodePlugin.mo
share/locale/en_GB/LC_MESSAGES/CalendarTool.mo
share/locale/en_GB/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/en_GB/LC_MESSAGES/ChartPlugin.mo
share/locale/en_GB/LC_MESSAGES/ChartShape.mo
+share/locale/en_GB/LC_MESSAGES/CommentShape.mo
share/locale/en_GB/LC_MESSAGES/DivineProportion.mo
share/locale/en_GB/LC_MESSAGES/FormulaShape.mo
-share/locale/en_GB/LC_MESSAGES/FreOffice.mo
share/locale/en_GB/LC_MESSAGES/KarbonTools.mo
share/locale/en_GB/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/en_GB/LC_MESSAGES/MusicShape.mo
share/locale/en_GB/LC_MESSAGES/ParagraphTool.mo
share/locale/en_GB/LC_MESSAGES/PathShapes.mo
share/locale/en_GB/LC_MESSAGES/PictureShape.mo
+share/locale/en_GB/LC_MESSAGES/PluginShape.mo
+share/locale/en_GB/LC_MESSAGES/ShapePlugin.mo
share/locale/en_GB/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/en_GB/LC_MESSAGES/TableShape.mo
share/locale/en_GB/LC_MESSAGES/TextShape.mo
diff --git a/editors/koffice-kde4-l10n-es/distinfo b/editors/koffice-kde4-l10n-es/distinfo
index c98687a9d623..01b983b69996 100644
--- a/editors/koffice-kde4-l10n-es/distinfo
+++ b/editors/koffice-kde4-l10n-es/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-es-2.2.2.tar.bz2) = 9624407d6099a0e29abb7019062ead5e53886f4bd2496240cd2c9b7105e37a56
-SIZE (KDE/koffice-l10n/koffice-l10n-es-2.2.2.tar.bz2) = 6222081
+SHA256 (KDE/koffice-l10n/koffice-l10n-es-2.3.1.tar.bz2) = 44a83ca8e92159e8121a2535244db45595d78044a8cee5297e4652d0591c2e3f
+SIZE (KDE/koffice-l10n/koffice-l10n-es-2.3.1.tar.bz2) = 6264314
diff --git a/editors/koffice-kde4-l10n-es/pkg-plist b/editors/koffice-kde4-l10n-es/pkg-plist
index a84a70fae0ba..1ae4e5902896 100644
--- a/editors/koffice-kde4-l10n-es/pkg-plist
+++ b/editors/koffice-kde4-l10n-es/pkg-plist
@@ -1,4 +1,3 @@
-share/apps/koffice/autocorrect/es.xml
share/doc/HTML/es/karbon/common
share/doc/HTML/es/karbon/index.cache.bz2
share/doc/HTML/es/karbon/index.docbook
@@ -74,6 +73,13 @@ share/doc/HTML/es/kformula/shortcut1.png
share/doc/HTML/es/kformula/sin.png
share/doc/HTML/es/kformula/toolbars.png
share/doc/HTML/es/kformula/upper-index.png
+share/doc/HTML/es/kivio/common
+share/doc/HTML/es/kivio/credits.docbook
+share/doc/HTML/es/kivio/index.cache.bz2
+share/doc/HTML/es/kivio/index.docbook
+share/doc/HTML/es/kivio/introduction.docbook
+share/doc/HTML/es/kivio/usage.docbook
+share/doc/HTML/es/kivio/working.docbook
share/doc/HTML/es/koffice/common
share/doc/HTML/es/koffice/index.cache.bz2
share/doc/HTML/es/koffice/index.docbook
@@ -138,18 +144,22 @@ share/doc/HTML/es/thesaurus/index.cache.bz2
share/doc/HTML/es/thesaurus/index.docbook
share/locale/es/LC_MESSAGES/ArtisticTextShape.mo
share/locale/es/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/es/LC_MESSAGES/BarcodePlugin.mo
share/locale/es/LC_MESSAGES/CalendarTool.mo
share/locale/es/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/es/LC_MESSAGES/ChartPlugin.mo
share/locale/es/LC_MESSAGES/ChartShape.mo
+share/locale/es/LC_MESSAGES/CommentShape.mo
share/locale/es/LC_MESSAGES/DivineProportion.mo
share/locale/es/LC_MESSAGES/FormulaShape.mo
-share/locale/es/LC_MESSAGES/FreOffice.mo
share/locale/es/LC_MESSAGES/KarbonTools.mo
share/locale/es/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/es/LC_MESSAGES/MusicShape.mo
share/locale/es/LC_MESSAGES/ParagraphTool.mo
share/locale/es/LC_MESSAGES/PathShapes.mo
share/locale/es/LC_MESSAGES/PictureShape.mo
+share/locale/es/LC_MESSAGES/PluginShape.mo
+share/locale/es/LC_MESSAGES/ShapePlugin.mo
share/locale/es/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/es/LC_MESSAGES/TableShape.mo
share/locale/es/LC_MESSAGES/TextShape.mo
@@ -188,8 +198,7 @@ share/locale/es/LC_MESSAGES/thesaurus_tool.mo
@dirrm share/doc/HTML/es/kspread
@dirrm share/doc/HTML/es/kpresenter
@dirrm share/doc/HTML/es/koffice
+@dirrm share/doc/HTML/es/kivio
@dirrm share/doc/HTML/es/kformula
@dirrm share/doc/HTML/es/kchart
@dirrm share/doc/HTML/es/karbon
-@dirrmtry share/apps/koffice/autocorrect
-@dirrmtry share/apps/koffice
diff --git a/editors/koffice-kde4-l10n-et/distinfo b/editors/koffice-kde4-l10n-et/distinfo
index 7ae9f1fa1be5..55395324322c 100644
--- a/editors/koffice-kde4-l10n-et/distinfo
+++ b/editors/koffice-kde4-l10n-et/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-et-2.2.2.tar.bz2) = c857460c23c24a3a031dbdf740d9d08d0b74699874f01586ec5ea7630360851f
-SIZE (KDE/koffice-l10n/koffice-l10n-et-2.2.2.tar.bz2) = 700518
+SHA256 (KDE/koffice-l10n/koffice-l10n-et-2.3.1.tar.bz2) = 1afdea159e43e0d2e1e4b6eff9307e53c6f42fea2dfb1ff23a8138f4792c4a5f
+SIZE (KDE/koffice-l10n/koffice-l10n-et-2.3.1.tar.bz2) = 732850
diff --git a/editors/koffice-kde4-l10n-et/pkg-plist b/editors/koffice-kde4-l10n-et/pkg-plist
index aeefc31ea46a..0c33162c3bfe 100644
--- a/editors/koffice-kde4-l10n-et/pkg-plist
+++ b/editors/koffice-kde4-l10n-et/pkg-plist
@@ -22,6 +22,13 @@ share/doc/HTML/et/kexi/querydesigning.docbook
share/doc/HTML/et/kformula/common
share/doc/HTML/et/kformula/index.cache.bz2
share/doc/HTML/et/kformula/index.docbook
+share/doc/HTML/et/kivio/common
+share/doc/HTML/et/kivio/credits.docbook
+share/doc/HTML/et/kivio/index.cache.bz2
+share/doc/HTML/et/kivio/index.docbook
+share/doc/HTML/et/kivio/introduction.docbook
+share/doc/HTML/et/kivio/usage.docbook
+share/doc/HTML/et/kivio/working.docbook
share/doc/HTML/et/koffice/common
share/doc/HTML/et/koffice/index.cache.bz2
share/doc/HTML/et/koffice/index.docbook
@@ -59,18 +66,22 @@ share/doc/HTML/et/thesaurus/index.cache.bz2
share/doc/HTML/et/thesaurus/index.docbook
share/locale/et/LC_MESSAGES/ArtisticTextShape.mo
share/locale/et/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/et/LC_MESSAGES/BarcodePlugin.mo
share/locale/et/LC_MESSAGES/CalendarTool.mo
share/locale/et/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/et/LC_MESSAGES/ChartPlugin.mo
share/locale/et/LC_MESSAGES/ChartShape.mo
+share/locale/et/LC_MESSAGES/CommentShape.mo
share/locale/et/LC_MESSAGES/DivineProportion.mo
share/locale/et/LC_MESSAGES/FormulaShape.mo
-share/locale/et/LC_MESSAGES/FreOffice.mo
share/locale/et/LC_MESSAGES/KarbonTools.mo
share/locale/et/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/et/LC_MESSAGES/MusicShape.mo
share/locale/et/LC_MESSAGES/ParagraphTool.mo
share/locale/et/LC_MESSAGES/PathShapes.mo
share/locale/et/LC_MESSAGES/PictureShape.mo
+share/locale/et/LC_MESSAGES/PluginShape.mo
+share/locale/et/LC_MESSAGES/ShapePlugin.mo
share/locale/et/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/et/LC_MESSAGES/TableShape.mo
share/locale/et/LC_MESSAGES/TextShape.mo
@@ -109,6 +120,7 @@ share/locale/et/LC_MESSAGES/thesaurus_tool.mo
@dirrm share/doc/HTML/et/kspread
@dirrm share/doc/HTML/et/kpresenter
@dirrm share/doc/HTML/et/koffice
+@dirrm share/doc/HTML/et/kivio
@dirrm share/doc/HTML/et/kformula
@dirrm share/doc/HTML/et/kexi
@dirrm share/doc/HTML/et/kchart
diff --git a/editors/koffice-kde4-l10n-gl/distinfo b/editors/koffice-kde4-l10n-gl/distinfo
index 1876a119d69a..6efdf06e932e 100644
--- a/editors/koffice-kde4-l10n-gl/distinfo
+++ b/editors/koffice-kde4-l10n-gl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-gl-2.2.2.tar.bz2) = a26f72b2071916566e8ef1786ee92bd468e928f052f6f1f2d900c0a9400c7abd
-SIZE (KDE/koffice-l10n/koffice-l10n-gl-2.2.2.tar.bz2) = 355068
+SHA256 (KDE/koffice-l10n/koffice-l10n-gl-2.3.1.tar.bz2) = be51e1f1796db2c276c72896cc2d4f945745f39c176396d2ed5ea5131867650b
+SIZE (KDE/koffice-l10n/koffice-l10n-gl-2.3.1.tar.bz2) = 367162
diff --git a/editors/koffice-kde4-l10n-it/distinfo b/editors/koffice-kde4-l10n-it/distinfo
index d7c928c4f646..2d5982b3b35f 100644
--- a/editors/koffice-kde4-l10n-it/distinfo
+++ b/editors/koffice-kde4-l10n-it/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-it-2.2.2.tar.bz2) = 921f2d5ae5e96fb7050de23d7bce95373b3b6afd3161b4a7905ef59eba158f54
-SIZE (KDE/koffice-l10n/koffice-l10n-it-2.2.2.tar.bz2) = 680382
+SHA256 (KDE/koffice-l10n/koffice-l10n-it-2.3.1.tar.bz2) = 28968c68a511f49a1dad01b583a02344ee2999767ef77fe915f11ef35bc197aa
+SIZE (KDE/koffice-l10n/koffice-l10n-it-2.3.1.tar.bz2) = 709310
diff --git a/editors/koffice-kde4-l10n-it/pkg-plist b/editors/koffice-kde4-l10n-it/pkg-plist
index accd4348e14b..0ee71e024c12 100644
--- a/editors/koffice-kde4-l10n-it/pkg-plist
+++ b/editors/koffice-kde4-l10n-it/pkg-plist
@@ -1,4 +1,3 @@
-share/apps/koffice/autocorrect/it.xml
share/doc/HTML/it/karbon/common
share/doc/HTML/it/karbon/index.cache.bz2
share/doc/HTML/it/karbon/index.docbook
@@ -23,6 +22,13 @@ share/doc/HTML/it/kexi/querydesigning.docbook
share/doc/HTML/it/kformula/common
share/doc/HTML/it/kformula/index.cache.bz2
share/doc/HTML/it/kformula/index.docbook
+share/doc/HTML/it/kivio/common
+share/doc/HTML/it/kivio/credits.docbook
+share/doc/HTML/it/kivio/index.cache.bz2
+share/doc/HTML/it/kivio/index.docbook
+share/doc/HTML/it/kivio/introduction.docbook
+share/doc/HTML/it/kivio/usage.docbook
+share/doc/HTML/it/kivio/working.docbook
share/doc/HTML/it/koffice/common
share/doc/HTML/it/koffice/index.cache.bz2
share/doc/HTML/it/koffice/index.docbook
@@ -54,18 +60,22 @@ share/doc/HTML/it/thesaurus/index.cache.bz2
share/doc/HTML/it/thesaurus/index.docbook
share/locale/it/LC_MESSAGES/ArtisticTextShape.mo
share/locale/it/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/it/LC_MESSAGES/BarcodePlugin.mo
share/locale/it/LC_MESSAGES/CalendarTool.mo
share/locale/it/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/it/LC_MESSAGES/ChartPlugin.mo
share/locale/it/LC_MESSAGES/ChartShape.mo
+share/locale/it/LC_MESSAGES/CommentShape.mo
share/locale/it/LC_MESSAGES/DivineProportion.mo
share/locale/it/LC_MESSAGES/FormulaShape.mo
-share/locale/it/LC_MESSAGES/FreOffice.mo
share/locale/it/LC_MESSAGES/KarbonTools.mo
share/locale/it/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/it/LC_MESSAGES/MusicShape.mo
share/locale/it/LC_MESSAGES/ParagraphTool.mo
share/locale/it/LC_MESSAGES/PathShapes.mo
share/locale/it/LC_MESSAGES/PictureShape.mo
+share/locale/it/LC_MESSAGES/PluginShape.mo
+share/locale/it/LC_MESSAGES/ShapePlugin.mo
share/locale/it/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/it/LC_MESSAGES/TableShape.mo
share/locale/it/LC_MESSAGES/TextShape.mo
@@ -104,9 +114,8 @@ share/locale/it/LC_MESSAGES/thesaurus_tool.mo
@dirrm share/doc/HTML/it/kspread
@dirrm share/doc/HTML/it/kpresenter
@dirrm share/doc/HTML/it/koffice
+@dirrm share/doc/HTML/it/kivio
@dirrm share/doc/HTML/it/kformula
@dirrm share/doc/HTML/it/kexi
@dirrm share/doc/HTML/it/kchart
@dirrm share/doc/HTML/it/karbon
-@dirrmtry share/apps/koffice/autocorrect
-@dirrmtry share/apps/koffice
diff --git a/editors/koffice-kde4-l10n-kk/distinfo b/editors/koffice-kde4-l10n-kk/distinfo
index 1539e54255e7..ec204fc4f491 100644
--- a/editors/koffice-kde4-l10n-kk/distinfo
+++ b/editors/koffice-kde4-l10n-kk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-kk-2.2.2.tar.bz2) = a5dac93be9fda80bc9096b47f85e86073e5cc91809bbf6e48ce197b8f1b9867c
-SIZE (KDE/koffice-l10n/koffice-l10n-kk-2.2.2.tar.bz2) = 323371
+SHA256 (KDE/koffice-l10n/koffice-l10n-kk-2.3.1.tar.bz2) = 5693c247306be4de0eabdb17abfb834053914ca9d9af65d6a194918dce40ab8f
+SIZE (KDE/koffice-l10n/koffice-l10n-kk-2.3.1.tar.bz2) = 333063
diff --git a/editors/koffice-kde4-l10n-nb/distinfo b/editors/koffice-kde4-l10n-nb/distinfo
index 4a89c66d01b0..3211936459ce 100644
--- a/editors/koffice-kde4-l10n-nb/distinfo
+++ b/editors/koffice-kde4-l10n-nb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-nb-2.2.2.tar.bz2) = 299f406d52bb0230e868044a15fe99a743b3683648be84289b9e033f854a5ba7
-SIZE (KDE/koffice-l10n/koffice-l10n-nb-2.2.2.tar.bz2) = 319304
+SHA256 (KDE/koffice-l10n/koffice-l10n-nb-2.3.1.tar.bz2) = b4cdaf535836c7cbbf8c86661e564fa6a32a2f157e846c9bd76294dc004b0bc8
+SIZE (KDE/koffice-l10n/koffice-l10n-nb-2.3.1.tar.bz2) = 329384
diff --git a/editors/koffice-kde4-l10n-nb/pkg-plist b/editors/koffice-kde4-l10n-nb/pkg-plist
index 691d9c9feac7..5e1e98f18df4 100644
--- a/editors/koffice-kde4-l10n-nb/pkg-plist
+++ b/editors/koffice-kde4-l10n-nb/pkg-plist
@@ -1,18 +1,22 @@
share/apps/koffice/autocorrect/nb.xml
share/locale/nb/LC_MESSAGES/ArtisticTextShape.mo
share/locale/nb/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/nb/LC_MESSAGES/BarcodePlugin.mo
share/locale/nb/LC_MESSAGES/CalendarTool.mo
share/locale/nb/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/nb/LC_MESSAGES/ChartPlugin.mo
share/locale/nb/LC_MESSAGES/ChartShape.mo
+share/locale/nb/LC_MESSAGES/CommentShape.mo
share/locale/nb/LC_MESSAGES/DivineProportion.mo
share/locale/nb/LC_MESSAGES/FormulaShape.mo
-share/locale/nb/LC_MESSAGES/FreOffice.mo
share/locale/nb/LC_MESSAGES/KarbonTools.mo
share/locale/nb/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/nb/LC_MESSAGES/MusicShape.mo
share/locale/nb/LC_MESSAGES/ParagraphTool.mo
share/locale/nb/LC_MESSAGES/PathShapes.mo
share/locale/nb/LC_MESSAGES/PictureShape.mo
+share/locale/nb/LC_MESSAGES/PluginShape.mo
+share/locale/nb/LC_MESSAGES/ShapePlugin.mo
share/locale/nb/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/nb/LC_MESSAGES/TableShape.mo
share/locale/nb/LC_MESSAGES/TextShape.mo
@@ -47,5 +51,5 @@ share/locale/nb/LC_MESSAGES/kspreadsolver.mo
share/locale/nb/LC_MESSAGES/kthesaurus.mo
share/locale/nb/LC_MESSAGES/kword.mo
share/locale/nb/LC_MESSAGES/thesaurus_tool.mo
-@dirrmtry share/apps/koffice/autocorrect
-@dirrmtry share/apps/koffice
+@dirrm share/apps/koffice/autocorrect
+@dirrm share/apps/koffice
diff --git a/editors/koffice-kde4-l10n-nds/distinfo b/editors/koffice-kde4-l10n-nds/distinfo
index edd3c12212ab..aee71fd06280 100644
--- a/editors/koffice-kde4-l10n-nds/distinfo
+++ b/editors/koffice-kde4-l10n-nds/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-nds-2.2.2.tar.bz2) = bb110c368203d0a2de8e60baa9006bc5d55dc296e75378d72a5ae0a18ec17da6
-SIZE (KDE/koffice-l10n/koffice-l10n-nds-2.2.2.tar.bz2) = 960450
+SHA256 (KDE/koffice-l10n/koffice-l10n-nds-2.3.1.tar.bz2) = 0d0328d7a9595869960eb2aa52d3b4ca4eefa95a9ccd205fea8ae7316d472fab
+SIZE (KDE/koffice-l10n/koffice-l10n-nds-2.3.1.tar.bz2) = 971559
diff --git a/editors/koffice-kde4-l10n-nds/pkg-plist b/editors/koffice-kde4-l10n-nds/pkg-plist
index e18a297e0ee4..cc7ca7fb38a3 100644
--- a/editors/koffice-kde4-l10n-nds/pkg-plist
+++ b/editors/koffice-kde4-l10n-nds/pkg-plist
@@ -1,18 +1,21 @@
-share/apps/koffice/autocorrect/nds.xml
share/locale/nds/LC_MESSAGES/ArtisticTextShape.mo
share/locale/nds/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/nds/LC_MESSAGES/BarcodePlugin.mo
share/locale/nds/LC_MESSAGES/CalendarTool.mo
share/locale/nds/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/nds/LC_MESSAGES/ChartPlugin.mo
share/locale/nds/LC_MESSAGES/ChartShape.mo
+share/locale/nds/LC_MESSAGES/CommentShape.mo
share/locale/nds/LC_MESSAGES/DivineProportion.mo
share/locale/nds/LC_MESSAGES/FormulaShape.mo
-share/locale/nds/LC_MESSAGES/FreOffice.mo
share/locale/nds/LC_MESSAGES/KarbonTools.mo
share/locale/nds/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/nds/LC_MESSAGES/MusicShape.mo
share/locale/nds/LC_MESSAGES/ParagraphTool.mo
share/locale/nds/LC_MESSAGES/PathShapes.mo
share/locale/nds/LC_MESSAGES/PictureShape.mo
+share/locale/nds/LC_MESSAGES/PluginShape.mo
+share/locale/nds/LC_MESSAGES/ShapePlugin.mo
share/locale/nds/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/nds/LC_MESSAGES/TableShape.mo
share/locale/nds/LC_MESSAGES/TextShape.mo
@@ -47,5 +50,3 @@ share/locale/nds/LC_MESSAGES/kspreadsolver.mo
share/locale/nds/LC_MESSAGES/kthesaurus.mo
share/locale/nds/LC_MESSAGES/kword.mo
share/locale/nds/LC_MESSAGES/thesaurus_tool.mo
-@dirrmtry share/apps/koffice/autocorrect
-@dirrmtry share/apps/koffice
diff --git a/editors/koffice-kde4-l10n-nl/distinfo b/editors/koffice-kde4-l10n-nl/distinfo
index d7e3bd20fc8f..0c63c62da5b8 100644
--- a/editors/koffice-kde4-l10n-nl/distinfo
+++ b/editors/koffice-kde4-l10n-nl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-nl-2.2.2.tar.bz2) = c304a1ff3f4cd4582057bc6585ba6acdfca4759bffa81df95301d6da61fb72f4
-SIZE (KDE/koffice-l10n/koffice-l10n-nl-2.2.2.tar.bz2) = 2751492
+SHA256 (KDE/koffice-l10n/koffice-l10n-nl-2.3.1.tar.bz2) = 13785ed2b38303f5dc3e98b7d133abdf350d2d66453682583ed57b7e38f0f810
+SIZE (KDE/koffice-l10n/koffice-l10n-nl-2.3.1.tar.bz2) = 2789033
diff --git a/editors/koffice-kde4-l10n-nl/pkg-plist b/editors/koffice-kde4-l10n-nl/pkg-plist
index 4d4120d5ffc0..377260caf2a1 100644
--- a/editors/koffice-kde4-l10n-nl/pkg-plist
+++ b/editors/koffice-kde4-l10n-nl/pkg-plist
@@ -53,6 +53,13 @@ share/doc/HTML/nl/kformula/shortcut1.png
share/doc/HTML/nl/kformula/sin.png
share/doc/HTML/nl/kformula/toolbars.png
share/doc/HTML/nl/kformula/upper-index.png
+share/doc/HTML/nl/kivio/common
+share/doc/HTML/nl/kivio/credits.docbook
+share/doc/HTML/nl/kivio/index.cache.bz2
+share/doc/HTML/nl/kivio/index.docbook
+share/doc/HTML/nl/kivio/introduction.docbook
+share/doc/HTML/nl/kivio/usage.docbook
+share/doc/HTML/nl/kivio/working.docbook
share/doc/HTML/nl/koffice/common
share/doc/HTML/nl/koffice/index.cache.bz2
share/doc/HTML/nl/koffice/index.docbook
@@ -156,18 +163,22 @@ share/doc/HTML/nl/thesaurus/index.cache.bz2
share/doc/HTML/nl/thesaurus/index.docbook
share/locale/nl/LC_MESSAGES/ArtisticTextShape.mo
share/locale/nl/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/nl/LC_MESSAGES/BarcodePlugin.mo
share/locale/nl/LC_MESSAGES/CalendarTool.mo
share/locale/nl/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/nl/LC_MESSAGES/ChartPlugin.mo
share/locale/nl/LC_MESSAGES/ChartShape.mo
+share/locale/nl/LC_MESSAGES/CommentShape.mo
share/locale/nl/LC_MESSAGES/DivineProportion.mo
share/locale/nl/LC_MESSAGES/FormulaShape.mo
-share/locale/nl/LC_MESSAGES/FreOffice.mo
share/locale/nl/LC_MESSAGES/KarbonTools.mo
share/locale/nl/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/nl/LC_MESSAGES/MusicShape.mo
share/locale/nl/LC_MESSAGES/ParagraphTool.mo
share/locale/nl/LC_MESSAGES/PathShapes.mo
share/locale/nl/LC_MESSAGES/PictureShape.mo
+share/locale/nl/LC_MESSAGES/PluginShape.mo
+share/locale/nl/LC_MESSAGES/ShapePlugin.mo
share/locale/nl/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/nl/LC_MESSAGES/TableShape.mo
share/locale/nl/LC_MESSAGES/TextShape.mo
@@ -206,6 +217,7 @@ share/locale/nl/LC_MESSAGES/thesaurus_tool.mo
@dirrm share/doc/HTML/nl/kspread
@dirrm share/doc/HTML/nl/kpresenter
@dirrm share/doc/HTML/nl/koffice
+@dirrm share/doc/HTML/nl/kivio
@dirrm share/doc/HTML/nl/kformula
@dirrm share/doc/HTML/nl/kexi
@dirrm share/doc/HTML/nl/kchart
diff --git a/editors/koffice-kde4-l10n-sv/distinfo b/editors/koffice-kde4-l10n-sv/distinfo
index 0f98ac5e1d7d..0e37289caac5 100644
--- a/editors/koffice-kde4-l10n-sv/distinfo
+++ b/editors/koffice-kde4-l10n-sv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-sv-2.2.2.tar.bz2) = a902a61469be30dcb76c128d577e0e24243cd8bb8a0706b4dc6fc637568463e3
-SIZE (KDE/koffice-l10n/koffice-l10n-sv-2.2.2.tar.bz2) = 2414809
+SHA256 (KDE/koffice-l10n/koffice-l10n-sv-2.3.1.tar.bz2) = 556dd84f3db05ac890888f661f742afe7ac40252bf5d1ff76ab03aee701bde6f
+SIZE (KDE/koffice-l10n/koffice-l10n-sv-2.3.1.tar.bz2) = 2447893
diff --git a/editors/koffice-kde4-l10n-sv/pkg-plist b/editors/koffice-kde4-l10n-sv/pkg-plist
index 9ed75becae39..9dc75262dea5 100644
--- a/editors/koffice-kde4-l10n-sv/pkg-plist
+++ b/editors/koffice-kde4-l10n-sv/pkg-plist
@@ -68,6 +68,13 @@ share/doc/HTML/sv/kformula/scilab-edit.png
share/doc/HTML/sv/kformula/shortcut0.png
share/doc/HTML/sv/kformula/shortcut1.png
share/doc/HTML/sv/kformula/toolbars.png
+share/doc/HTML/sv/kivio/common
+share/doc/HTML/sv/kivio/credits.docbook
+share/doc/HTML/sv/kivio/index.cache.bz2
+share/doc/HTML/sv/kivio/index.docbook
+share/doc/HTML/sv/kivio/introduction.docbook
+share/doc/HTML/sv/kivio/usage.docbook
+share/doc/HTML/sv/kivio/working.docbook
share/doc/HTML/sv/koffice/common
share/doc/HTML/sv/koffice/index.cache.bz2
share/doc/HTML/sv/koffice/index.docbook
@@ -208,18 +215,22 @@ share/doc/HTML/sv/thesaurus/index.cache.bz2
share/doc/HTML/sv/thesaurus/index.docbook
share/locale/sv/LC_MESSAGES/ArtisticTextShape.mo
share/locale/sv/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/sv/LC_MESSAGES/BarcodePlugin.mo
share/locale/sv/LC_MESSAGES/CalendarTool.mo
share/locale/sv/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/sv/LC_MESSAGES/ChartPlugin.mo
share/locale/sv/LC_MESSAGES/ChartShape.mo
+share/locale/sv/LC_MESSAGES/CommentShape.mo
share/locale/sv/LC_MESSAGES/DivineProportion.mo
share/locale/sv/LC_MESSAGES/FormulaShape.mo
-share/locale/sv/LC_MESSAGES/FreOffice.mo
share/locale/sv/LC_MESSAGES/KarbonTools.mo
share/locale/sv/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/sv/LC_MESSAGES/MusicShape.mo
share/locale/sv/LC_MESSAGES/ParagraphTool.mo
share/locale/sv/LC_MESSAGES/PathShapes.mo
share/locale/sv/LC_MESSAGES/PictureShape.mo
+share/locale/sv/LC_MESSAGES/PluginShape.mo
+share/locale/sv/LC_MESSAGES/ShapePlugin.mo
share/locale/sv/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/sv/LC_MESSAGES/TableShape.mo
share/locale/sv/LC_MESSAGES/TextShape.mo
@@ -258,6 +269,7 @@ share/locale/sv/LC_MESSAGES/thesaurus_tool.mo
@dirrm share/doc/HTML/sv/kspread
@dirrm share/doc/HTML/sv/kpresenter
@dirrm share/doc/HTML/sv/koffice
+@dirrm share/doc/HTML/sv/kivio
@dirrm share/doc/HTML/sv/kformula
@dirrm share/doc/HTML/sv/kexi
@dirrm share/doc/HTML/sv/kchart
diff --git a/editors/koffice-kde4-l10n-tr/distinfo b/editors/koffice-kde4-l10n-tr/distinfo
index 57ef3e827f48..96f5ec21d388 100644
--- a/editors/koffice-kde4-l10n-tr/distinfo
+++ b/editors/koffice-kde4-l10n-tr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-tr-2.2.2.tar.bz2) = 784139a8368446e466e958e2be464a1fe33108fc06d5c781cf3425d5c3382e36
-SIZE (KDE/koffice-l10n/koffice-l10n-tr-2.2.2.tar.bz2) = 312335
+SHA256 (KDE/koffice-l10n/koffice-l10n-tr-2.3.1.tar.bz2) = aec91ddf2d1ec7e58c51665aeee0fe1d8399a2ad6b1da313c1881d9dea87babb
+SIZE (KDE/koffice-l10n/koffice-l10n-tr-2.3.1.tar.bz2) = 322315
diff --git a/editors/koffice-kde4-l10n-tr/pkg-plist b/editors/koffice-kde4-l10n-tr/pkg-plist
index fb00c5b31e64..ba549f520e10 100644
--- a/editors/koffice-kde4-l10n-tr/pkg-plist
+++ b/editors/koffice-kde4-l10n-tr/pkg-plist
@@ -5,7 +5,6 @@ share/locale/tr/LC_MESSAGES/ChangecasePlugin.mo
share/locale/tr/LC_MESSAGES/ChartShape.mo
share/locale/tr/LC_MESSAGES/DivineProportion.mo
share/locale/tr/LC_MESSAGES/FormulaShape.mo
-share/locale/tr/LC_MESSAGES/FreOffice.mo
share/locale/tr/LC_MESSAGES/KarbonTools.mo
share/locale/tr/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/tr/LC_MESSAGES/MusicShape.mo
@@ -16,7 +15,6 @@ share/locale/tr/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/tr/LC_MESSAGES/TableShape.mo
share/locale/tr/LC_MESSAGES/TextShape.mo
share/locale/tr/LC_MESSAGES/VariablesPlugin.mo
-share/locale/tr/LC_MESSAGES/VideoShape.mo
share/locale/tr/LC_MESSAGES/desktop_koffice.mo
share/locale/tr/LC_MESSAGES/karbon.mo
share/locale/tr/LC_MESSAGES/kchart.mo
@@ -33,7 +31,6 @@ share/locale/tr/LC_MESSAGES/koproperty.mo
share/locale/tr/LC_MESSAGES/kounavail.mo
share/locale/tr/LC_MESSAGES/kplato.mo
share/locale/tr/LC_MESSAGES/kplatolibs.mo
-share/locale/tr/LC_MESSAGES/kplatorcpsplugin.mo
share/locale/tr/LC_MESSAGES/kplatowork.mo
share/locale/tr/LC_MESSAGES/kpresenter.mo
share/locale/tr/LC_MESSAGES/krita.mo
diff --git a/editors/koffice-kde4-l10n-wa/Makefile b/editors/koffice-kde4-l10n-wa/Makefile
index 189b91a3e911..04737724ccb7 100644
--- a/editors/koffice-kde4-l10n-wa/Makefile
+++ b/editors/koffice-kde4-l10n-wa/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= koffice-l10n
-PORTVERSION= ${KOFFICE2_VERSION}
+PORTVERSION= 2.2.2
CATEGORIES?= editors kde
MAINTAINER= kde@FreeBSD.org
diff --git a/editors/koffice-kde4-l10n/Makefile b/editors/koffice-kde4-l10n/Makefile
index 4bf0801dea02..41b28656de6e 100644
--- a/editors/koffice-kde4-l10n/Makefile
+++ b/editors/koffice-kde4-l10n/Makefile
@@ -19,12 +19,13 @@ NO_BUILD= yes
# NO_INSTALL= yes
USE_KDE4= kdeprefix
-KOFFICE2_LANG_ALL= ca ca@valencia da de el en_GB es et fr gl it ja kk \
+KOFFICE2_LANG_ALL= ca ca@valencia da de el en_GB es et fr gl hu it ja kk \
nb nds nl pl pt pt_BR ru sv tr uk wa zh_CN zh_TW
ca@valencia_PORT= editors/koffice-kde4-l10n-ca_valencia
de_PORT= german/koffice-kde4-l10n
fr_PORT= french/koffice-kde4-l10n
+hu_PORT= hungarian/koffice-kde4-l10n
ja_PORT= japanese/koffice-kde4-l10n
pl_PORT= polish/koffice-kde4-l10n
pt_BR_PORT= portuguese/koffice-kde4-l10n-pt_BR
diff --git a/editors/koffice-kde4-l10n/files/bsd.l10n.mk b/editors/koffice-kde4-l10n/files/bsd.l10n.mk
index 11ccaafa38c5..d25c266004c5 100644
--- a/editors/koffice-kde4-l10n/files/bsd.l10n.mk
+++ b/editors/koffice-kde4-l10n/files/bsd.l10n.mk
@@ -5,8 +5,6 @@ PKGNAMEPREFIX= ${KOFFICE2_L10N:S/@/_/}-
DISTNAME= ${PORTNAME}-${KOFFICE2_L10N}-${PORTVERSION}
DIST_SUBDIR= KDE/koffice-l10n
-BUILD_DEPENDS= ${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
-
USE_BZIP2= yes
USE_QT_VER= 4
QT_COMPONENTS= uic_build moc_build qmake_build rcc_build xml
diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile
index 7652082a8fa9..e075c1d769be 100644
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@@ -7,10 +7,9 @@
PORTNAME= koffice
PORTVERSION= ${KOFFICE2_VERSION}
-PORTREVISION= 6
CATEGORIES= editors kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTNAME}-${PORTVERSION}/
+MASTER_SITE_SUBDIR= ${KOFFICE2_BRANCH}/${PORTNAME}-${PORTVERSION}/
PKGNAMESUFFIX= -kde4
DIST_SUBDIR= KDE
@@ -19,17 +18,16 @@ COMMENT= Office suite for KDE
BUILD_DEPENDS= eigen>=2.0.b3:${PORTSDIR}/math/eigen2 \
gmm++>=3.0.4:${PORTSDIR}/math/gmm++ \
- ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx30 \
- ${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
+ ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx30
LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs \
qca.2:${PORTSDIR}/devel/qca \
GraphicsMagick++.1:${PORTSDIR}/graphics/GraphicsMagick \
IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
exiv2.9:${PORTSDIR}/graphics/exiv2 \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- kipi.7:${PORTSDIR}/graphics/kdegraphics4 \
- lcms.1:${PORTSDIR}/graphics/lcms \
- wpg-0.1:${PORTSDIR}/graphics/libwpg01 \
+ kdcraw.9:${PORTSDIR}/graphics/kdegraphics4 \
+ lcms2.2:${PORTSDIR}/graphics/lcms2 \
+ wpg-0.2:${PORTSDIR}/graphics/libwpg \
png.6:${PORTSDIR}/graphics/png \
poppler-qt4.3:${PORTSDIR}/graphics/poppler-qt4 \
tiff.4:${PORTSDIR}/graphics/tiff \
@@ -38,7 +36,8 @@ LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs \
freetype.9:${PORTSDIR}/print/freetype2 \
qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
- fftw3.5:${PORTSDIR}/math/fftw3
+ fftw3.5:${PORTSDIR}/math/fftw3 \
+ dcmdata.3:${PORTSDIR}/devel/dcmtk
RUN_DEPENDS= ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx30
USE_BZIP2= yes
@@ -66,7 +65,7 @@ OPTIONS+= XBASE "XBase support in Kexi" off
.include <bsd.port.options.mk>
.if exists(${LOCALBASE}/include/qconfig.h)
-IGNORE= does not build with x11-toolkits/qt33 installed. Please, deinstall qt-3.x first
+IGNORE= does not build with x11-toolkits/qt33 installed. Please deinstall qt-3.x first
.endif
.if !defined(WITHOUT_GTL) || exists (${LOCALBASE}/lib/libQtShiva.so)
@@ -78,6 +77,7 @@ PLIST_SUB+= GTL="@comment "
.endif
.if exists(${LOCALBASE}/lib/pstoedit/libp2edrvlplot.so)
+QT_COMPONENTS+= qt3support
BUILD_DEPENDS+= ${LOCALBASE}/lib/pstoedit/libp2edrvlplot.so:${PORTSDIR}/graphics/pstoedit
RUN_DEPENDS+= ${LOCALBASE}/lib/pstoedit/libp2edrvlplot.so:${PORTSDIR}/graphics/pstoedit
PLIST_SUB+= EPS=""
diff --git a/editors/koffice-kde4/distinfo b/editors/koffice-kde4/distinfo
index 41fd5054a1a3..2f3345de45c3 100644
--- a/editors/koffice-kde4/distinfo
+++ b/editors/koffice-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-2.2.2.tar.bz2) = e5b060f640dd7ecd13b5d17f7e9ace7c0d1c0621e5fb83529f6e6db2d5c1edcb
-SIZE (KDE/koffice-2.2.2.tar.bz2) = 56470974
+SHA256 (KDE/koffice-2.3.1.tar.bz2) = e73da38cfbfb2c6b7170767065addc0de38725e82c4fa49c76bcf375ee44f143
+SIZE (KDE/koffice-2.3.1.tar.bz2) = 75687214
diff --git a/editors/koffice-kde4/files/patch-cmake__modules__FindWPD.cmake b/editors/koffice-kde4/files/patch-cmake__modules__FindWPD.cmake
index 9567bcb4515f..c3b84828ea03 100644
--- a/editors/koffice-kde4/files/patch-cmake__modules__FindWPD.cmake
+++ b/editors/koffice-kde4/files/patch-cmake__modules__FindWPD.cmake
@@ -1,11 +1,17 @@
---- ./cmake/modules/FindWPD.cmake.orig 2010-03-30 13:10:16.507260418 +1100
-+++ ./cmake/modules/FindWPD.cmake 2010-03-30 13:09:54.253774780 +1100
-@@ -24,7 +24,7 @@
+--- ./cmake/modules/FindWPD.cmake.orig 2011-03-25 01:34:51.930775929 +0100
++++ ./cmake/modules/FindWPD.cmake 2011-03-25 01:37:46.910772674 +0100
+@@ -19,13 +19,11 @@
+ else (WPD_INCLUDE_DIR AND WPD_LIBRARIES)
+ if(NOT WIN32)
+ INCLUDE(FindPkgConfig)
+- pkg_check_modules(WPD libwpd-0.8)
+ pkg_check_modules(WPD libwpd-0.9)
+ endif(NOT WIN32)
FIND_PATH(WPD_INCLUDE_DIR libwpd/libwpd.h
${WPD_INCLUDE_DIR}
- /usr/include/libwpd-0.8
-+ PATH_SUFFIXES libwpd-0.8
+- /usr/include/libwpd-0.9
++ PATH_SUFFIXES libwpd-0.9
)
-
diff --git a/editors/koffice-kde4/files/patch-cmake__modules__FindWPG.cmake b/editors/koffice-kde4/files/patch-cmake__modules__FindWPG.cmake
index fe0baab4eb6f..307c72f717b9 100644
--- a/editors/koffice-kde4/files/patch-cmake__modules__FindWPG.cmake
+++ b/editors/koffice-kde4/files/patch-cmake__modules__FindWPG.cmake
@@ -1,11 +1,24 @@
---- ./cmake/modules/FindWPG.cmake.orig 2010-03-30 00:05:52.000000000 +1100
-+++ ./cmake/modules/FindWPG.cmake 2010-03-30 13:07:46.392743489 +1100
-@@ -29,7 +29,7 @@
+--- ./cmake/modules/FindWPG.cmake.orig 2011-03-25 01:38:36.660731693 +0100
++++ ./cmake/modules/FindWPG.cmake 2011-03-25 01:40:49.690727037 +0100
+@@ -18,11 +18,10 @@
+
+ IF (NOT WIN32)
+ INCLUDE(FindPkgConfig)
+- pkg_check_modules(LIBWPG libwpg-0.1)
+ pkg_check_modules(LIBWPG libwpg-0.2)
+ ENDIF (NOT WIN32)
+
+- FIND_LIBRARY(LIBWPG_STREAM_LIBRARIES NAMES libwpg-stream-0.1 wpg-stream-0.1 libwpd-stream-0.9 wpd-stream-0.9
++ FIND_LIBRARY(LIBWPG_STREAM_LIBRARIES NAMES libwpd-stream-0.9 wpd-stream-0.9
+ PATHS
+ ${LIBWPG_LIBRARIES}
+ )
+@@ -30,7 +29,7 @@
FIND_PATH(LIBWPG_INCLUDE_DIR libwpg/libwpg.h
PATHS
${LIBWPG_INCLUDE_DIRS}
- PATH_SUFFIXES libwpg
-+ PATH_SUFFIXES libwpg-0.1
++ PATH_SUFFIXES libwpg-0.2
)
IF (LIBWPG_INCLUDE_DIR AND LIBWPG_LIBRARIES)
diff --git a/editors/koffice-kde4/files/patch-krita_plugins_formats_CMakeLists.txt b/editors/koffice-kde4/files/patch-krita_plugins_formats_CMakeLists.txt
index a9fa28617d33..277c45975334 100644
--- a/editors/koffice-kde4/files/patch-krita_plugins_formats_CMakeLists.txt
+++ b/editors/koffice-kde4/files/patch-krita_plugins_formats_CMakeLists.txt
@@ -1,8 +1,8 @@
---- ./krita/plugins/formats/CMakeLists.txt.orig 2009-08-24 01:58:24.000000000 +1100
-+++ ./krita/plugins/formats/CMakeLists.txt 2009-09-04 23:56:05.000000000 +1100
-@@ -15,15 +15,23 @@
+--- krita/plugins/formats/CMakeLists.txt.orig 2010-11-30 04:06:29.223954558 +0100
++++ krita/plugins/formats/CMakeLists.txt 2010-11-30 04:14:21.883911180 +0100
+@@ -15,15 +15,22 @@
macro_optional_find_package(Poppler)
- macro_log_feature( POPPLER_FOUND "poppler-qt4" "The Poppler Qt4 interface library" "http://poppler.freedesktop.org" FALSE "" "Required by the Krita PDF filter (version 0.6.x is currently required)")
+ macro_log_feature( POPPLER_FOUND "poppler-qt4" "The Poppler Qt4 interface library" "http://poppler.freedesktop.org" FALSE "" "Required by the Krita PDF filter")
-macro_optional_find_package(Kdcraw)
-macro_log_feature( KDCRAW_FOUND "kdcraw" "The KDCraw library" "http://www.digikam.org/" FALSE "" "Required by the Krita RAW filter")
@@ -11,7 +11,7 @@
macro_log_feature(OPENJPEG_FOUND "openjpeg" "Free library for JPEG 2000 image compression" "http://www.openjpeg.org" FALSE "" "Required by the Krita JPEG 2000 filter")
macro_optional_find_package(GIF2)
- macro_log_feature(GIF_FOUND "libungif/giflib" "Free library for reading and writing GIF images" "htt://XXX!!!" FALSE "" "Required by the Krita GIF filter")
+ macro_log_feature(GIF_FOUND "libungif/giflib" "Free library for reading and writing GIF images" "http://directory.fsf.org/project/libungif/" FALSE "" "Required by the Krita GIF filter")
+# Check for Kdcraw
+PKG_CHECK_MODULES(LIBKDCRAW libkdcraw-kde4>=0.4.0)
@@ -19,7 +19,6 @@
+ PATHS ${LIBKDCRAW_INCLUDE_DIRS} ${KDE4_INCLUDE_DIR} NO_DEFAULT_PATH)
+FIND_LIBRARY(KDCRAW_LIBRARY NAMES kdcraw
+ PATHS ${LIBKDCRAW_LIBRARY_DIRS} ${KDE4_LIB_DIR} NO_DEFAULT_PATH)
-+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(KDCRAW DEFAULT_MSG KDCRAW_LIBRARY KDCRAW_INCLUDE_DIR)
+macro_log_feature( KDCRAW_FOUND "kdcraw" "The KDCraw library" "http://www.digikam.org/" FALSE "" "Required by the Krita RAW filter")
diff --git a/editors/koffice-kde4/files/patch-libwpg02-libwpd09 b/editors/koffice-kde4/files/patch-libwpg02-libwpd09
new file mode 100644
index 000000000000..ee14437564d5
--- /dev/null
+++ b/editors/koffice-kde4/files/patch-libwpg02-libwpd09
@@ -0,0 +1,1334 @@
+diff -Nur ./filters/karbon/wpg/import/CMakeLists.txt ./filters/karbon/wpg/import/CMakeLists.txt
+--- ./filters/karbon/wpg/import/CMakeLists.txt 2011-01-15 21:05:35.000000000 +0100
++++ ./filters/karbon/wpg/import/CMakeLists.txt 2011-01-18 07:40:25.000000000 +0100
+@@ -1,16 +1,11 @@
+
+-
+ include_directories(${CMAKE_BINARY_DIR}/filters/ ${WPD_INCLUDE_DIR} ${LIBWPG_INCLUDE_DIR}/)
+
+-set(wpgimport_PART_SRCS
+-WPGImport.cpp
+-OdgExporter.cxx
+-FileOutputHandler.cxx
+-GraphicsElement.cxx)
++set(wpgimport_PART_SRCS WPGImport.cpp)
+
+ kde4_add_plugin(wpgimport ${wpgimport_PART_SRCS})
+
+-target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES})
++target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES} ${WPD_LIBRARIES})
+
+ install(TARGETS wpgimport DESTINATION ${PLUGIN_INSTALL_DIR})
+ install(FILES karbon_wpg_import.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+diff -Nur ./filters/karbon/wpg/import/FileOutputHandler.cxx ./filters/karbon/wpg/import/FileOutputHandler.cxx
+--- ./filters/karbon/wpg/import/FileOutputHandler.cxx 2011-01-15 21:05:35.000000000 +0100
++++ ./filters/karbon/wpg/import/FileOutputHandler.cxx 1970-01-01 01:00:00.000000000 +0100
+@@ -1,95 +0,0 @@
+-/* libwpg
+- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
+- *
+- * 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; if not, write to the
+- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+- * Boston, MA 02111-1301 USA
+- *
+- * For further information visit http://libwpg.sourceforge.net
+- */
+-
+-/* "This product is not manufactured, approved, or supported by
+- * Corel Corporation or Corel Corporation Limited."
+- */
+-
+-#include "FileOutputHandler.hxx"
+-
+-FileOutputHandler::FileOutputHandler(std::ostringstream &contentStream) :
+- mbIsTagOpened(false),
+- mContentStream(contentStream)
+-{
+-}
+-
+-void FileOutputHandler::startDocument()
+-{
+-}
+-
+-void FileOutputHandler::startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList)
+-{
+- if (mbIsTagOpened)
+- {
+- mContentStream << ">";
+- mbIsTagOpened = false;
+- }
+- mContentStream << "<" << psName;
+-
+- for (std::vector<std::pair<std::string, std::string> >::const_iterator i = xPropList.begin(); i != xPropList.end(); i++)
+- {
+- mContentStream << " " << (*i).first.c_str() << "=\"" << (*i).second.c_str() << "\"";
+- }
+- mbIsTagOpened = true;
+- msOpenedTagName = psName;
+-}
+-
+-void FileOutputHandler::endElement(const char *psName)
+-{
+- if (mbIsTagOpened)
+- {
+- if( msOpenedTagName == psName )
+- {
+- mContentStream << "/>";
+- mbIsTagOpened = false;
+- }
+- else // should not happen, but handle it
+- {
+- mContentStream << ">";
+- mContentStream << "</" << psName << ">";
+- mbIsTagOpened = false;
+- }
+- }
+- else
+- {
+- mContentStream << "</" << psName << ">";
+- mbIsTagOpened = false;
+- }
+-}
+-
+-void FileOutputHandler::characters(const std::string &sCharacters)
+-{
+- if (mbIsTagOpened)
+- {
+- mContentStream << ">";
+- mbIsTagOpened = false;
+- }
+- mContentStream << sCharacters.c_str();
+-}
+-
+-void FileOutputHandler::endDocument()
+-{
+- if (mbIsTagOpened)
+- {
+- mContentStream << ">";
+- mbIsTagOpened = false;
+- }
+-}
+diff -Nur ./filters/karbon/wpg/import/FileOutputHandler.hxx ./filters/karbon/wpg/import/FileOutputHandler.hxx
+--- ./filters/karbon/wpg/import/FileOutputHandler.hxx 2011-01-15 21:05:35.000000000 +0100
++++ ./filters/karbon/wpg/import/FileOutputHandler.hxx 1970-01-01 01:00:00.000000000 +0100
+@@ -1,49 +0,0 @@
+-/* libwpg
+- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
+- *
+- * 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; if not, write to the
+- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+- * Boston, MA 02111-1301 USA
+- *
+- * For further information visit http://libwpg.sourceforge.net
+- */
+-
+-/* "This product is not manufactured, approved, or supported by
+- * Corel Corporation or Corel Corporation Limited."
+- */
+-
+-#ifndef FILEOUTPUTHANDLER_H
+-#define FILEOUTPUTHANDLER_H
+-
+-#include <iostream>
+-#include <sstream>
+-#include <string>
+-#include "GraphicsHandler.hxx"
+-
+-class FileOutputHandler : public GraphicsHandler
+-{
+- public:
+- explicit FileOutputHandler(std::ostringstream &contentStream);
+- virtual void startDocument();
+- virtual void endDocument();
+- virtual void startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList);
+- virtual void endElement(const char *psName);
+- virtual void characters(const std::string &sCharacters);
+-
+- private:
+- bool mbIsTagOpened;
+- std::string msOpenedTagName;
+- std::ostringstream &mContentStream;
+-};
+-#endif
+diff -Nur ./filters/karbon/wpg/import/GraphicsElement.cxx ./filters/karbon/wpg/import/GraphicsElement.cxx
+--- ./filters/karbon/wpg/import/GraphicsElement.cxx 2011-01-15 21:05:35.000000000 +0100
++++ ./filters/karbon/wpg/import/GraphicsElement.cxx 1970-01-01 01:00:00.000000000 +0100
+@@ -1,66 +0,0 @@
+-/* GraphicsElement: The items we are collecting to be put into the Writer
+- * document: paragraph and spans of text, as well as section breaks.
+- *
+- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca)
+- *
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 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 library; if not, write to the
+- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+- * Boston, MA 02111-1301 USA
+- *
+- * For further information visit http://libwpg.sourceforge.net
+- *
+- */
+-
+-/* "This product is not manufactured, approved, or supported by
+- * Corel Corporation or Corel Corporation Limited."
+- */
+-
+-#include "GraphicsElement.hxx"
+-#include "GraphicsHandler.hxx"
+-#include <string.h>
+-
+-#define ASCII_SPACE 0x0020
+-
+-void TagGraphicsElement::print() const
+-{
+-}
+-
+-void OpenTagGraphicsElement::write(GraphicsHandler *pHandler) const
+-{
+- pHandler->startElement(getTagName().c_str(), maAttrList);
+-}
+-
+-void OpenTagGraphicsElement::print() const
+-{
+- TagGraphicsElement::print();
+-}
+-
+-void OpenTagGraphicsElement::addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue)
+-{
+- std::pair<std::string, std::string> tmpAttribute;
+- tmpAttribute.first = szAttributeName;
+- tmpAttribute.second = sAttributeValue;
+- maAttrList.push_back(tmpAttribute);
+-}
+-
+-void CloseTagGraphicsElement::write(GraphicsHandler *pHandler) const
+-{
+-
+- pHandler->endElement(getTagName().c_str());
+-}
+-
+-void CharDataGraphicsElement::write(GraphicsHandler *pHandler) const
+-{
+- pHandler->characters(msData);
+-}
+diff -Nur ./filters/karbon/wpg/import/GraphicsElement.hxx ./filters/karbon/wpg/import/GraphicsElement.hxx
+--- ./filters/karbon/wpg/import/GraphicsElement.hxx 2011-01-15 21:05:35.000000000 +0100
++++ ./filters/karbon/wpg/import/GraphicsElement.hxx 1970-01-01 01:00:00.000000000 +0100
+@@ -1,84 +0,0 @@
+-/* GraphicsElement: The items we are collecting to be put into the Writer
+- * document: paragraph and spans of text, as well as section breaks.
+- *
+- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca)
+- *
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 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 library; if not, write to the
+- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+- * Boston, MA 02111-1301 USA
+- *
+- * For further information visit http://libwpd.sourceforge.net
+- *
+- */
+-
+-/* "This product is not manufactured, approved, or supported by
+- * Corel Corporation or Corel Corporation Limited."
+- */
+-
+-#ifndef _GRAPHICSELEMENT_H
+-#define _GRAPHICSELEMENT_H
+-#include <string>
+-#include <map>
+-#include <vector>
+-
+-#include "GraphicsHandler.hxx"
+-
+-class GraphicsElement
+-{
+-public:
+- virtual ~GraphicsElement() {}
+- virtual void write(GraphicsHandler *pHandler) const = 0;
+- virtual void print() const {}
+-};
+-
+-class TagGraphicsElement : public GraphicsElement
+-{
+-public:
+- explicit TagGraphicsElement(const char *szTagName) : msTagName(szTagName) {}
+- const std::string &getTagName() const { return msTagName; }
+- virtual void print() const;
+-private:
+- const std::string msTagName;
+-};
+-
+-class OpenTagGraphicsElement : public TagGraphicsElement
+-{
+-public:
+- explicit OpenTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {}
+- ~OpenTagGraphicsElement() {}
+- void addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue);
+- virtual void write(GraphicsHandler *pHandler) const;
+- virtual void print () const;
+-private:
+- std::vector<std::pair<std::string, std::string> > maAttrList;
+-};
+-
+-class CloseTagGraphicsElement : public TagGraphicsElement
+-{
+-public:
+- explicit CloseTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {}
+- virtual void write(GraphicsHandler *pHandler) const;
+-};
+-
+-class CharDataGraphicsElement : public GraphicsElement
+-{
+-public:
+- CharDataGraphicsElement(const char *sData) : GraphicsElement(), msData(sData) {}
+- virtual void write(GraphicsHandler *pHandler) const;
+-private:
+- std::string msData;
+-};
+-
+-
+-#endif
+diff -Nur ./filters/karbon/wpg/import/GraphicsHandler.hxx ./filters/karbon/wpg/import/GraphicsHandler.hxx
+--- ./filters/karbon/wpg/import/GraphicsHandler.hxx 2011-01-15 21:05:35.000000000 +0100
++++ ./filters/karbon/wpg/import/GraphicsHandler.hxx 1970-01-01 01:00:00.000000000 +0100
+@@ -1,43 +0,0 @@
+-/*
+- * Copyright (C) 2004 William Lachance (wlach@interlog.com)
+- * Copyright (C) 2004 Net Integration Technologies (http://www.net-itech.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 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 General Public License for more details.
+- *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+- * Boston, MA 02111-1301 USA
+- *
+- * Contributor(s): Martin Gallwey (gallwey@sun.com)
+- *
+- */
+-
+-/* "This product is not manufactured, approved, or supported by
+- * Corel Corporation or Corel Corporation Limited."
+- */
+-#ifndef _GRAPHICSHANDLER_H
+-#define _GRAPHICSHANDLER_H
+-#include <string>
+-#include <map>
+-#include <vector>
+-
+-class GraphicsHandler
+-{
+-public:
+- virtual ~GraphicsHandler() {}
+- virtual void startDocument() = 0;
+- virtual void endDocument() = 0;
+- virtual void startElement(const char *psName, const std::vector< std::pair <std::string, std::string> > &xPropList) = 0;
+- virtual void endElement(const char *psName) = 0;
+- virtual void characters(const std::string &sCharacters) = 0;
+-};
+-#endif
+diff -Nur ./filters/karbon/wpg/import/karbon_wpg_import.desktop ./filters/karbon/wpg/import/karbon_wpg_import.desktop
+--- ./filters/karbon/wpg/import/karbon_wpg_import.desktop 2011-01-15 21:05:35.000000000 +0100
++++ ./filters/karbon/wpg/import/karbon_wpg_import.desktop 2011-01-18 07:41:33.000000000 +0100
+@@ -42,7 +42,7 @@
+ Name[x-test]=xxKarbon WPG Import Filterxx
+ Name[zh_CN]=Karbon WPG 导入过滤器
+ Name[zh_TW]=Karbon WPG 匯入過濾程式
+-X-KDE-Export=application/vnd.oasis.opendocument.graphics
++X-KDE-Export=image/svg+xml
+ X-KDE-Import=application/x-wpg
+ X-KDE-Weight=1
+ X-KDE-Library=wpgimport
+diff -Nur ./filters/karbon/wpg/import/OdgExporter.cxx ./filters/karbon/wpg/import/OdgExporter.cxx
+--- ./filters/karbon/wpg/import/OdgExporter.cxx 2011-01-15 21:05:35.000000000 +0100
++++ ./filters/karbon/wpg/import/OdgExporter.cxx 1970-01-01 01:00:00.000000000 +0100
+@@ -1,662 +0,0 @@
+-/* libwpg
+- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
+- *
+- * 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; if not, write to the
+- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+- * Boston, MA 02111-1301 USA
+- *
+- * For further information visit http://libwpg.sourceforge.net
+- */
+-
+-/* "This product is not manufactured, approved, or supported by
+- * Corel Corporation or Corel Corporation Limited."
+- */
+-
+-#include "OdgExporter.hxx"
+-#include "GraphicsElement.hxx"
+-#include "GraphicsHandler.hxx"
+-#include <locale.h>
+-
+-static std::string doubleToString(const double value)
+-{
+- std::ostringstream tempStream;
+- tempStream << value;
+- std::string decimalPoint(localeconv()->decimal_point);
+- if ((decimalPoint.size() == 0) || (decimalPoint == "."))
+- return tempStream.str();
+- std::string stringValue(tempStream.str());
+- if (!stringValue.empty())
+- {
+- std::string::size_type pos;
+- while ((pos = stringValue.find(decimalPoint)) != std::string::npos)
+- stringValue.replace(pos,decimalPoint.size(),".");
+- }
+- return stringValue;
+-}
+-
+-
+-OdgExporter::OdgExporter(GraphicsHandler *pHandler, const bool isFlatXML):
+- mpHandler(pHandler),
+- m_fillRule(AlternatingFill),
+- m_gradientIndex(1),
+- m_dashIndex(1),
+- m_styleIndex(1),
+- m_width(0.0f),
+- m_height(0.0f),
+- m_isFlatXML(isFlatXML)
+-{
+-}
+-
+-OdgExporter::~OdgExporter()
+-{
+- for (std::vector <GraphicsElement *>::iterator iterStroke = mStrokeDashElements.begin();
+- iterStroke != mStrokeDashElements.end(); iterStroke++)
+- delete (*iterStroke);
+-
+- for (std::vector <GraphicsElement *>::iterator iterGradient = mGradientElements.begin();
+- iterGradient != mGradientElements.end(); iterGradient++)
+- delete (*iterGradient);
+-
+- for (std::vector <GraphicsElement *>::iterator iterAutomaticStyles = mAutomaticStylesElements.begin();
+- iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++)
+- delete (*iterAutomaticStyles);
+-
+- for (std::vector<GraphicsElement *>::iterator bodyIter = mBodyElements.begin();
+- bodyIter != mBodyElements.end(); bodyIter++)
+- delete (*bodyIter);
+-}
+-
+-void OdgExporter::startGraphics(double width, double height)
+-{
+- m_gradientIndex = 1;
+- m_dashIndex = 1;
+- m_styleIndex = 1;
+- m_width = width;
+- m_height = height;
+-
+-
+- mpHandler->startDocument();
+- OpenTagGraphicsElement tmpOfficeDocumentContent("office:document");
+- tmpOfficeDocumentContent.addAttribute("xmlns:office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0");
+- tmpOfficeDocumentContent.addAttribute("xmlns:style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0");
+- tmpOfficeDocumentContent.addAttribute("xmlns:text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0");
+- tmpOfficeDocumentContent.addAttribute("xmlns:draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0");
+- tmpOfficeDocumentContent.addAttribute("xmlns:dc", "http://purl.org/dc/elements/1.1/");
+- tmpOfficeDocumentContent.addAttribute("xmlns:svg", "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0");
+- tmpOfficeDocumentContent.addAttribute("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0");
+- tmpOfficeDocumentContent.addAttribute("xmlns:config", "urn:oasis:names:tc:opendocument:xmlns:config:1.0");
+- tmpOfficeDocumentContent.addAttribute("xmlns:ooo", "http://openoffice.org/2004/office");
+- tmpOfficeDocumentContent.addAttribute("office:version", "1.0");
+- if (m_isFlatXML)
+- tmpOfficeDocumentContent.addAttribute("office:mimetype", "application/x-vnd.oasis.openoffice.drawing");
+- tmpOfficeDocumentContent.write(mpHandler);
+-
+- OpenTagGraphicsElement("office:settings").write(mpHandler);
+-
+- OpenTagGraphicsElement configItemSetOpenElement("config:config-item-set");
+- configItemSetOpenElement.addAttribute("config:name", "ooo:view-settings");
+- configItemSetOpenElement.write(mpHandler);
+-
+- OpenTagGraphicsElement configItemOpenElement1("config:config-item");
+- configItemOpenElement1.addAttribute("config:name", "VisibleAreaTop");
+- configItemOpenElement1.addAttribute("config:type", "int");
+- configItemOpenElement1.write(mpHandler);
+- mpHandler->characters("0");
+- mpHandler->endElement("config:config-item");
+-
+- OpenTagGraphicsElement configItemOpenElement2("config:config-item");
+- configItemOpenElement2.addAttribute("config:name", "VisibleAreaLeft");
+- configItemOpenElement2.addAttribute("config:type", "int");
+- configItemOpenElement2.write(mpHandler);
+- mpHandler->characters("0");
+- mpHandler->endElement("config:config-item");
+-
+- OpenTagGraphicsElement configItemOpenElement3("config:config-item");
+- configItemOpenElement3.addAttribute("config:name", "VisibleAreaWidth");
+- configItemOpenElement3.addAttribute("config:type", "int");
+- configItemOpenElement3.write(mpHandler);
+- m_value.str("");
+- m_value << (unsigned)(2540 * width);
+- mpHandler->characters(m_value.str());
+- mpHandler->endElement("config:config-item");
+-
+- OpenTagGraphicsElement configItemOpenElement4("config:config-item");
+- configItemOpenElement4.addAttribute("config:name", "VisibleAreaHeight");
+- configItemOpenElement4.addAttribute("config:type", "int");
+- configItemOpenElement4.write(mpHandler);
+- m_value.str("");
+- m_value << (unsigned)(2540 * height);
+- mpHandler->characters(m_value.str());
+- mpHandler->endElement("config:config-item");
+-
+- mpHandler->endElement("config:config-item-set");
+-
+- mpHandler->endElement("office:settings");
+-
+-}
+-
+-void OdgExporter::endGraphics()
+-{
+- OpenTagGraphicsElement("office:styles").write(mpHandler);
+-
+- for (std::vector <GraphicsElement *>::const_iterator iterStroke = mStrokeDashElements.begin();
+- iterStroke != mStrokeDashElements.end(); iterStroke++)
+- (*iterStroke)->write(mpHandler);
+-
+- for (std::vector <GraphicsElement *>::const_iterator iterGradient = mGradientElements.begin();
+- iterGradient != mGradientElements.end(); iterGradient++)
+- (*iterGradient)->write(mpHandler);
+-
+- mpHandler->endElement("office:styles");
+-
+- OpenTagGraphicsElement("office:automatic-styles").write(mpHandler);
+-
+- for (std::vector <GraphicsElement *>::const_iterator iterAutomaticStyles = mAutomaticStylesElements.begin();
+- iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++)
+- (*iterAutomaticStyles)->write(mpHandler);
+-
+- OpenTagGraphicsElement tmpStylePageLayoutOpenElement("style:page-layout");
+- tmpStylePageLayoutOpenElement.addAttribute("style:name", "PM0");
+- tmpStylePageLayoutOpenElement.write(mpHandler);
+-
+- OpenTagGraphicsElement tmpStylePageLayoutPropertiesOpenElement("style:page-layout-properties");
+- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-top", "0in");
+- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-bottom", "0in");
+- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-left", "0in");
+- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-right", "0in");
+- m_value.str("");
+- m_value << doubleToString(m_width) << "in";
+- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-width", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(m_height) << "in";
+- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-height", m_value.str());
+- m_value.str("");
+- tmpStylePageLayoutPropertiesOpenElement.addAttribute("style:print-orientation", "portrait");
+- tmpStylePageLayoutPropertiesOpenElement.write(mpHandler);
+-
+- mpHandler->endElement("style:page-layout-properties");
+-
+- mpHandler->endElement("style:page-layout");
+-
+- OpenTagGraphicsElement tmpStyleStyleOpenElement("style:style");
+- tmpStyleStyleOpenElement.addAttribute("style:name", "dp1");
+- tmpStyleStyleOpenElement.addAttribute("style:family", "drawing-page");
+- tmpStyleStyleOpenElement.write(mpHandler);
+-
+- OpenTagGraphicsElement tmpStyleDrawingPagePropertiesOpenElement("style:drawing-page-properties");
+- // tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:background-size", "border");
+- tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:fill", "none");
+- tmpStyleDrawingPagePropertiesOpenElement.write(mpHandler);
+-
+- mpHandler->endElement("style:drawing-page-properties");
+-
+- mpHandler->endElement("style:style");
+-
+- mpHandler->endElement("office:automatic-styles");
+-
+- OpenTagGraphicsElement("office:master-styles").write(mpHandler);
+-
+- OpenTagGraphicsElement tmpStyleMasterPageOpenElement("style:master-page");
+- tmpStyleMasterPageOpenElement.addAttribute("style:name", "Default");
+- tmpStyleMasterPageOpenElement.addAttribute("style:page-layout-name", "PM0");
+- tmpStyleMasterPageOpenElement.addAttribute("draw:style-name", "dp1");
+- tmpStyleMasterPageOpenElement.write(mpHandler);
+-
+- mpHandler->endElement("style:master-page");
+-
+- mpHandler->endElement("office:master-styles");
+-
+- OpenTagGraphicsElement("office:body").write(mpHandler);
+-
+- OpenTagGraphicsElement("office:drawing").write(mpHandler);
+-
+- OpenTagGraphicsElement tmpDrawPageOpenElement("draw:page");
+- tmpDrawPageOpenElement.addAttribute("draw:name", "page1");
+- tmpDrawPageOpenElement.addAttribute("draw:style-name", "dp1");
+- tmpDrawPageOpenElement.addAttribute("draw:master-page-name", "Default");
+- tmpDrawPageOpenElement.write(mpHandler);
+-
+- for (std::vector<GraphicsElement *>::const_iterator bodyIter = mBodyElements.begin();
+- bodyIter != mBodyElements.end(); bodyIter++)
+- {
+- (*bodyIter)->write(mpHandler);
+- }
+-
+- mpHandler->endElement("draw:page");
+- mpHandler->endElement("office:drawing");
+- mpHandler->endElement("office:body");
+- mpHandler->endElement("office:document");
+-
+- mpHandler->endDocument();
+-}
+-
+-void OdgExporter::setPen(const libwpg::WPGPen& pen)
+-{
+- m_pen = pen;
+-}
+-
+-void OdgExporter::setBrush(const libwpg::WPGBrush& brush)
+-{
+- m_brush = brush;
+-}
+-
+-void OdgExporter::setFillRule(FillRule rule)
+-{
+- m_fillRule = rule;
+-}
+-
+-void OdgExporter::startLayer(unsigned int)
+-{
+-}
+-
+-void OdgExporter::endLayer(unsigned int)
+-{
+-}
+-
+-void OdgExporter::drawRectangle(const libwpg::WPGRect& rect, double rx, double )
+-{
+- writeStyle();
+- OpenTagGraphicsElement *pDrawRectElement = new OpenTagGraphicsElement("draw:rect");
+- m_value.str("");
+- m_value << "gr" << m_styleIndex-1;
+- pDrawRectElement->addAttribute("draw:style-name", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(rect.x1) << "in";
+- pDrawRectElement->addAttribute("svg:x", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(rect.y1) << "in";
+- pDrawRectElement->addAttribute("svg:y", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(rect.x2-rect.x1) << "in";
+- pDrawRectElement->addAttribute("svg:width", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(rect.y2-rect.y1) << "in";
+- pDrawRectElement->addAttribute("svg:height", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(rx) << "in";
+- // FIXME: what to do when rx != ry ?
+- pDrawRectElement->addAttribute("draw:corner-radius", m_value.str());
+- m_value.str("");
+- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawRectElement));
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:rect")));
+-}
+-
+-void OdgExporter::drawEllipse(const libwpg::WPGPoint& center, double rx, double ry)
+-{
+- writeStyle();
+- OpenTagGraphicsElement *pDrawEllipseElement = new OpenTagGraphicsElement("draw:ellipse");
+- m_value.str("");
+- m_value << "gr" << m_styleIndex-1;
+- pDrawEllipseElement->addAttribute("draw:style-name", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(center.x - rx) << "in";
+- pDrawEllipseElement->addAttribute("svg:x", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(center.y - ry) << "in";
+- pDrawEllipseElement->addAttribute("svg:y", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(2 * rx) << "in";
+- pDrawEllipseElement->addAttribute("svg:width", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(2 * ry) << "in";
+- pDrawEllipseElement->addAttribute("svg:height", m_value.str());
+- m_value.str("");
+- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawEllipseElement));
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:ellipse")));
+-}
+-
+-void OdgExporter::drawPolygon(const libwpg::WPGPointArray& vertices)
+-{
+- if(vertices.count() < 2)
+- return;
+-
+- if(vertices.count() == 2)
+- {
+- const libwpg::WPGPoint& p1 = vertices[0];
+- const libwpg::WPGPoint& p2 = vertices[1];
+-
+- writeStyle();
+- OpenTagGraphicsElement *pDrawLineElement = new OpenTagGraphicsElement("draw:line");
+- m_value.str("");
+- m_value << "gr" << m_styleIndex-1;
+- pDrawLineElement->addAttribute("draw:style-name", m_value.str());
+- m_value.str("");
+- pDrawLineElement->addAttribute("draw:text-style-name", "P1");
+- pDrawLineElement->addAttribute("draw:layer", "layout");
+- m_value << doubleToString(p1.x) << "in";
+- pDrawLineElement->addAttribute("svg:x1", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(p1.y) << "in";
+- pDrawLineElement->addAttribute("svg:y1", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(p2.x) << "in";
+- pDrawLineElement->addAttribute("svg:x2", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(p2.y) << "in";
+- pDrawLineElement->addAttribute("svg:y2", m_value.str());
+- m_value.str("");
+- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawLineElement));
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:line")));
+- }
+- else
+- {
+- // draw as path
+- libwpg::WPGPath path;
+- path.moveTo(vertices[0]);
+- for(unsigned long ii = 1; ii < vertices.count(); ii++)
+- path.lineTo(vertices[ii]);
+- path.closed = true;
+- drawPath(path);
+- }
+-}
+-
+-void OdgExporter::drawPath(const libwpg::WPGPath& path)
+-{
+- if(path.count() == 0)
+- return;
+-
+- // try to find the bounding box
+- // this is simple convex hull technique, the bounding box might not be
+- // accurate but that should be enough for this purpose
+- libwpg::WPGPoint p = path.element(0).point;
+- libwpg::WPGPoint q = path.element(0).point;
+- for(unsigned k = 0; k < path.count(); k++)
+- {
+- libwpg::WPGPathElement element = path.element(k);
+- p.x = (p.x > element.point.x) ? element.point.x : p.x;
+- p.y = (p.y > element.point.y) ? element.point.y : p.y;
+- q.x = (q.x < element.point.x) ? element.point.x : q.x;
+- q.y = (q.y < element.point.y) ? element.point.y : q.y;
+- if(element.type == libwpg::WPGPathElement::CurveToElement)
+- {
+- p.x = (p.x > element.extra1.x) ? element.extra1.x : p.x;
+- p.y = (p.y > element.extra1.y) ? element.extra1.y : p.y;
+- q.x = (q.x < element.extra1.x) ? element.extra1.x : q.x;
+- q.y = (q.y < element.extra1.y) ? element.extra1.y : q.y;
+- p.x = (p.x > element.extra2.x) ? element.extra2.x : p.x;
+- p.y = (p.y > element.extra2.y) ? element.extra2.y : p.y;
+- q.x = (q.x < element.extra2.x) ? element.extra2.x : q.x;
+- q.y = (q.y < element.extra2.y) ? element.extra2.y : q.y;
+- }
+- }
+- double vw = q.x - p.x;
+- double vh = q.y - p.y;
+-
+- writeStyle();
+-
+- OpenTagGraphicsElement *pDrawPathElement = new OpenTagGraphicsElement("draw:path");
+- m_value.str("");
+- m_value << "gr" << m_styleIndex-1;
+- pDrawPathElement->addAttribute("draw:style-name", m_value.str());
+- m_value.str("");
+- pDrawPathElement->addAttribute("draw:text-style-name", "P1");
+- pDrawPathElement->addAttribute("draw:layer", "layout");
+- m_value << doubleToString(p.x) << "in";
+- pDrawPathElement->addAttribute("svg:x", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(p.y) << "in";
+- pDrawPathElement->addAttribute("svg:y", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(vw) << "in";
+- pDrawPathElement->addAttribute("svg:width", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(vh) << "in";
+- pDrawPathElement->addAttribute("svg:height", m_value.str());
+- m_value.str("");
+- m_value << "0 0 " << (int)(vw*2540) << " " << (int)(vh*2540);
+- pDrawPathElement->addAttribute("svg:viewBox", m_value.str());
+- m_value.str("");
+-
+- for(unsigned i = 0; i < path.count(); i++)
+- {
+- libwpg::WPGPathElement element = path.element(i);
+- libwpg::WPGPoint point = element.point;
+- switch(element.type)
+- {
+- // 2540 is 2.54*1000, 2.54 in = 1 in
+- case libwpg::WPGPathElement::MoveToElement:
+- m_value << "M" << (int)((point.x-p.x)*2540) << " ";
+- m_value << (int)((point.y-p.y)*2540);
+- break;
+-
+- case libwpg::WPGPathElement::LineToElement:
+- m_value << "L" << (int)((point.x-p.x)*2540) << " ";
+- m_value << (int)((point.y-p.y)*2540);
+- break;
+-
+- case libwpg::WPGPathElement::CurveToElement:
+- m_value << "C" << (int)((element.extra1.x-p.x)*2540) << " ";
+- m_value << (int)((element.extra1.y-p.y)*2540) << " ";
+- m_value << (int)((element.extra2.x-p.x)*2540) << " ";
+- m_value << (int)((element.extra2.y-p.y)*2540) << " ";
+- m_value << (int)((point.x-p.x)*2540) << " ";
+- m_value << (int)((point.y-p.y)*2540);
+- break;
+-
+- default:
+- break;
+- }
+- }
+- if(path.closed)
+- m_value << " Z";
+- pDrawPathElement->addAttribute("svg:d", m_value.str());
+- m_value.str("");
+- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawPathElement));
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:path")));
+-}
+-
+-
+-void OdgExporter::drawBitmap(const libwpg::WPGBitmap& bitmap)
+-{
+- OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame");
+- m_value.str("");
+- m_value << doubleToString(bitmap.rect.x1) << "in";
+- pDrawFrameElement->addAttribute("svg:x", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(bitmap.rect.y1) << "in";
+- pDrawFrameElement->addAttribute("svg:y", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(bitmap.rect.height()) << "in";
+- pDrawFrameElement->addAttribute("svg:height", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(bitmap.rect.width()) << "in";
+- pDrawFrameElement->addAttribute("svg:width", m_value.str());
+- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement));
+-
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image")));
+-
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data")));
+-
+- libwpg::WPGString base64Binary;
+- bitmap.generateBase64DIB(base64Binary);
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr())));
+-
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data")));
+-
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image")));
+-
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame")));
+-}
+-
+-void OdgExporter::drawImageObject(const libwpg::WPGBinaryData& binaryData)
+-{
+- if (binaryData.mimeType.length() <= 0)
+- return;
+- OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame");
+- m_value.str("");
+- m_value << doubleToString(binaryData.rect.x1) << "in";
+- pDrawFrameElement->addAttribute("svg:x", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(binaryData.rect.y1) << "in";
+- pDrawFrameElement->addAttribute("svg:y", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(binaryData.rect.height()) << "in";
+- pDrawFrameElement->addAttribute("svg:height", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(binaryData.rect.width()) << "in";
+- pDrawFrameElement->addAttribute("svg:width", m_value.str());
+- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement));
+-
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image")));
+-
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data")));
+-
+- libwpg::WPGString base64Binary = binaryData.getBase64Data();
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr())));
+-
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data")));
+-
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image")));
+-
+- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame")));
+-}
+-
+-
+-static std::string colorToHex(const libwpg::WPGColor& color)
+-{
+- char hexdigits[] = "0123456789abcdef";
+- char buffer[] = "123456";
+- buffer[0] = hexdigits[(color.red >> 4) & 15];
+- buffer[1] = hexdigits[color.red & 15];
+- buffer[2] = hexdigits[(color.green >> 4) & 15];
+- buffer[3] = hexdigits[color.green & 15];
+- buffer[4] = hexdigits[(color.blue >> 4) & 15];
+- buffer[5] = hexdigits[color.blue & 15];
+- return std::string(buffer);
+-}
+-
+-void OdgExporter::writeStyle()
+-{
+- m_value.str("");
+- m_name.str("");
+-
+- if(!m_pen.solid && (m_pen.dashArray.count() >=2 ) )
+- {
+- // ODG only supports dashes with the same length of spaces inbetween
+- // here we take the first space and assume everything else the same
+- // note that dash length is written in percentage
+- double distance = m_pen.dashArray.at(1);
+- OpenTagGraphicsElement *tmpDrawStrokeDashElement = new OpenTagGraphicsElement("draw:stroke-dash");
+- tmpDrawStrokeDashElement->addAttribute("draw:style", "rect");
+- m_value << "Dash_" << m_dashIndex++;
+- tmpDrawStrokeDashElement->addAttribute("draw:name", m_value.str());
+- m_value.str("");
+- m_value << doubleToString(distance*100) << "%";
+- tmpDrawStrokeDashElement->addAttribute("draw:distance", m_value.str());
+- m_value.str("");
+- for(unsigned i = 0; i < m_pen.dashArray.count()/2; i++)
+- {
+- m_name << "draw:dots" << i+1;
+- tmpDrawStrokeDashElement->addAttribute(m_name.str(), "1");
+- m_name.str("");
+- m_name << "draw:dots" << i+1 << "-length";
+- m_value << doubleToString(100*m_pen.dashArray.at(i*2)) << "%";
+- tmpDrawStrokeDashElement->addAttribute(m_name.str(), m_value.str());
+- m_name.str("");
+- m_value.str("");
+- }
+- mStrokeDashElements.push_back(static_cast<GraphicsElement *>(tmpDrawStrokeDashElement));
+- mStrokeDashElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:stroke-dash")));
+- }
+-
+- if(m_brush.style == libwpg::WPGBrush::Gradient)
+- {
+- OpenTagGraphicsElement *tmpDrawGradientElement = new OpenTagGraphicsElement("draw:gradient");
+- tmpDrawGradientElement->addAttribute("draw:style", "linear");
+- m_value << "Gradient_" << m_gradientIndex++;
+- tmpDrawGradientElement->addAttribute("draw:name", m_value.str());
+- m_value.str("");
+-
+- // ODG angle unit is 0.1 degree
+- double angle = -m_brush.gradient.angle();
+- while(angle < 0)
+- angle += 360;
+- while(angle > 360)
+- angle -= 360;
+-
+- m_value << (unsigned)(angle*10);
+- tmpDrawGradientElement->addAttribute("draw:angle", m_value.str());
+- m_value.str("");
+-
+- libwpg::WPGColor startColor = m_brush.gradient.stopColor(0);
+- libwpg::WPGColor stopColor = m_brush.gradient.stopColor(1);
+- m_value << "#" << colorToHex(startColor);
+- tmpDrawGradientElement->addAttribute("draw:start-color", m_value.str());
+- m_value.str("");
+- m_value << "#" << colorToHex(stopColor);
+- tmpDrawGradientElement->addAttribute("draw:end-color", m_value.str());
+- m_value.str("");
+- tmpDrawGradientElement->addAttribute("draw:start-intensity", "100%");
+- tmpDrawGradientElement->addAttribute("draw:end-intensity", "100%");
+- tmpDrawGradientElement->addAttribute("draw:border", "0%");
+- mGradientElements.push_back(static_cast<GraphicsElement *>(tmpDrawGradientElement));
+- mGradientElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:gradient")));
+- }
+-
+- OpenTagGraphicsElement *tmpStyleStyleElement = new OpenTagGraphicsElement("style:style");
+- m_value << "gr" << m_styleIndex;
+- tmpStyleStyleElement->addAttribute("style:name", m_value.str());
+- m_value.str("");
+- tmpStyleStyleElement->addAttribute("style:family", "graphic");
+- tmpStyleStyleElement->addAttribute("style:parent-style-name", "standard");
+- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleStyleElement));
+-
+- OpenTagGraphicsElement *tmpStyleGraphicPropertiesElement = new OpenTagGraphicsElement("style:graphic-properties");
+-
+- if(m_pen.width > 0.0)
+- {
+- m_value << doubleToString(m_pen.width) << "in";
+- tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-width", m_value.str());
+- m_value.str("");
+- m_value << "#" << colorToHex(m_pen.foreColor);
+- tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-color", m_value.str());
+- m_value.str("");
+-
+- if(!m_pen.solid)
+- {
+- tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "dash");
+- m_value << "Dash_" << m_dashIndex-1;
+- tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke-dash", m_value.str());
+- m_value.str("");
+- }
+- }
+- else
+- tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "none");
+-
+- if(m_brush.style == libwpg::WPGBrush::NoBrush)
+- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "none");
+-
+- if(m_brush.style == libwpg::WPGBrush::Solid)
+- {
+- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "solid");
+- m_value << "#" << colorToHex(m_brush.foreColor);
+- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-color", m_value.str());
+- m_value.str("");
+- }
+-
+- if(m_brush.style == libwpg::WPGBrush::Gradient)
+- {
+- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "gradient");
+- m_value << "Gradient_" << m_gradientIndex-1;
+- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-gradient-name", m_value.str());
+- m_value.str("");
+- }
+-
+- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleGraphicPropertiesElement));
+- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:graphic-properties")));
+-
+- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:style")));
+- m_styleIndex++;
+-}
+diff -Nur ./filters/karbon/wpg/import/OdgExporter.hxx ./filters/karbon/wpg/import/OdgExporter.hxx
+--- ./filters/karbon/wpg/import/OdgExporter.hxx 2011-01-15 21:05:35.000000000 +0100
++++ ./filters/karbon/wpg/import/OdgExporter.hxx 1970-01-01 01:00:00.000000000 +0100
+@@ -1,116 +0,0 @@
+-/* libwpg
+- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
+- *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+- * Boston, MA 02111-1301 USA
+- *
+- * For further information visit http://libwpg.sourceforge.net
+- */
+-
+-/* "This product is not manufactured, approved, or supported by
+- * Corel Corporation or Corel Corporation Limited."
+- */
+-
+-#ifndef __ODGEXPORTER_H__
+-#define __ODGEXPORTER_H__
+-
+-#include <iostream>
+-#include <sstream>
+-#include <string>
+-
+-#include <libwpg/libwpg.h>
+-#include "GraphicsElement.hxx"
+-
+-class OdgExporter : public libwpg::WPGPaintInterface {
+-public:
+- explicit OdgExporter(GraphicsHandler *pHandler,
+- const bool isFlatXML = false);
+- ~OdgExporter();
+-
+-#if LIBWPG_VERSION_MINOR<2
+- void startGraphics(double imageWidth, double imageHeight);
+- void endGraphics();
+- void startLayer(unsigned int id);
+- void endLayer(unsigned int id);
+-
+- void setPen(const libwpg::WPGPen& pen);
+- void setBrush(const libwpg::WPGBrush& brush);
+- void setFillRule(FillRule rule);
+-
+- void drawRectangle(const libwpg::WPGRect& rect, double rx, double ry);
+- void drawEllipse(const libwpg::WPGPoint& center, double rx, double ry);
+- void drawPolygon(const libwpg::WPGPointArray& vertices);
+- void drawPath(const libwpg::WPGPath& path);
+- void drawBitmap(const libwpg::WPGBitmap& bitmap);
+- void drawImageObject(const libwpg::WPGBinaryData& binaryData);
+-
+-private:
+- std::vector <GraphicsElement *> mBodyElements;
+- std::vector <GraphicsElement *> mAutomaticStylesElements;
+- std::vector <GraphicsElement *> mStrokeDashElements;
+- std::vector <GraphicsElement *> mGradientElements;
+- GraphicsHandler *mpHandler;
+-
+- libwpg::WPGPen m_pen;
+- libwpg::WPGBrush m_brush;
+- FillRule m_fillRule;
+- int m_gradientIndex;
+- int m_dashIndex;
+- int m_styleIndex;
+- void writeStyle();
+- std::ostringstream m_value, m_name;
+- double m_width, m_height;
+- const bool m_isFlatXML;
+-#else
+- virtual void startGraphics(const ::WPXPropertyList &propList);
+- virtual void endGraphics();
+- virtual void setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &gradient);
+- virtual void startLayer(const ::WPXPropertyList &propList);
+- virtual void endLayer();
+- virtual void drawRectangle(const ::WPXPropertyList& propList);
+- virtual void drawEllipse(const ::WPXPropertyList& propList);
+- virtual void drawPolygon(const ::WPXPropertyListVector &vertices);
+- virtual void drawPath(const ::WPXPropertyListVector &path);
+- virtual void drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData &binaryData);
+- virtual void startEmbeddedGraphics(const ::WPXPropertyList &propList);
+- virtual void endEmbeddedGraphics();
+- virtual void drawPolyline(const ::WPXPropertyListVector &vertices);
+- virtual void startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path);
+- virtual void endTextObject();
+- virtual void startTextLine(const ::WPXPropertyList &propList);
+- virtual void endTextLine();
+- virtual void startTextSpan(const ::WPXPropertyList &propList);
+- virtual void endTextSpan();
+- virtual void insertText(const ::WPXString &str);
+-
+-
+-private:
+- std::vector <GraphicsElement *> mBodyElements;
+- std::vector <GraphicsElement *> mAutomaticStylesElements;
+- std::vector <GraphicsElement *> mStrokeDashElements;
+- std::vector <GraphicsElement *> mGradientElements;
+- GraphicsHandler *mpHandler;
+-
+- int m_gradientIndex;
+- int m_dashIndex;
+- int m_styleIndex;
+- void writeStyle();
+- std::ostringstream m_value, m_name;
+- double m_width, m_height;
+- const bool m_isFlatXML;
+-#endif
+-};
+-
+-#endif // __ODGEXPORTER_H__
+diff -Nur ./filters/karbon/wpg/import/WPGImport.cpp ./filters/karbon/wpg/import/WPGImport.cpp
+--- ./filters/karbon/wpg/import/WPGImport.cpp 2011-01-15 21:05:35.000000000 +0100
++++ ./filters/karbon/wpg/import/WPGImport.cpp 2011-01-02 17:46:15.000000000 +0100
+@@ -20,28 +20,26 @@
+ #include <WPGImport.h>
+ #include <WPGImport.moc>
+
+-#include <QBuffer>
+-#include <QByteArray>
+-#include <QString>
+-
+-#include <kdebug.h>
+ #include <KoFilterChain.h>
+ #include <KoGlobal.h>
+ #include <KoUnit.h>
++#include <KoXmlWriter.h>
++
+ #include <kpluginfactory.h>
++#include <KDebug>
+
+-#include <KoXmlWriter.h>
++
++#include <QtCore/QString>
++#include <QtCore/QFile>
+
+ #include <libwpg/libwpg.h>
+ #if LIBWPG_VERSION_MINOR<2
+ #include <libwpg/WPGStreamImplementation.h>
+ #else
+ #include <libwpd-stream/libwpd-stream.h>
++#include <libwpd/libwpd.h>
+ #endif
+
+-#include "FileOutputHandler.hxx"
+-#include "OdgExporter.hxx"
+-
+ #include <iostream>
+
+ K_PLUGIN_FACTORY(WPGImportFactory, registerPlugin<WPGImport>();)
+@@ -56,35 +54,13 @@
+ {
+ }
+
+-static QByteArray createManifest()
+-{
+- KoXmlWriter* manifestWriter;
+- QByteArray manifestData;
+- QBuffer manifestBuffer(&manifestData);
+-
+- manifestBuffer.open(QIODevice::WriteOnly);
+- manifestWriter = new KoXmlWriter(&manifestBuffer);
+-
+- manifestWriter->startDocument("manifest:manifest");
+- manifestWriter->startElement("manifest:manifest");
+- manifestWriter->addAttribute("xmlns:manifest", "urn:oasis:names:tc:openoffice:xmlns:manifest:1.0");
+- manifestWriter->addManifestEntry("/", "application/vnd.oasis.opendocument.graphics");
+- //manifestWriter->addManifestEntry( "styles.xml", "text/xml" );
+- manifestWriter->addManifestEntry("content.xml", "text/xml");
+- manifestWriter->endElement();
+- manifestWriter->endDocument();
+- delete manifestWriter;
+-
+- return manifestData;
+-}
+-
+
+ KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByteArray& to)
+ {
+ if (from != "application/x-wpg")
+ return KoFilter::NotImplemented;
+
+- if (to != "application/vnd.oasis.opendocument.graphics")
++ if (to != "image/svg+xml")
+ return KoFilter::NotImplemented;
+
+ #if LIBWPG_VERSION_MINOR<2
+@@ -96,6 +72,7 @@
+ input = olestream;
+ }
+ }
++ libwpg::WPGString output;
+ #else
+ WPXInputStream* input = new WPXFileStream(m_chain->inputFile().toLocal8Bit());
+ if (input->isOLEStream()) {
+@@ -105,59 +82,31 @@
+ input = olestream;
+ }
+ }
++ ::WPXString output;
+ #endif
+
+ if (!libwpg::WPGraphics::isSupported(input)) {
+- std::cerr << "ERROR: Unsupported file format (unsupported version) or file is encrypted!" << std::endl;
++ kWarning() << "ERROR: Unsupported file format (unsupported version) or file is encrypted!";
+ delete input;
+ return KoFilter::NotImplemented;
+ }
+
+- // do the conversion
+- std::ostringstream tmpStringStream;
+- FileOutputHandler tmpHandler(tmpStringStream);
+- OdgExporter exporter(&tmpHandler);
+- libwpg::WPGraphics::parse(input, &exporter);
+- delete input;
+-
+-
+- // create output store
+- KoStore* storeout;
+- storeout = KoStore::createStore(m_chain->outputFile(), KoStore::Write,
+- "application/vnd.oasis.opendocument.graphics", KoStore::Zip);
+-
+- if (!storeout) {
+- kWarning() << "Couldn't open the requested file.";
+- return KoFilter::FileNotFound;
+- }
+-
+-#if 0
+- if (!storeout->open("styles.xml")) {
+- kWarning() << "Couldn't open the file 'styles.xml'.";
+- return KoFilter::CreationError;
++ if (!libwpg::WPGraphics::generateSVG(input, output)) {
++ kWarning() << "ERROR: SVG Generation failed!";
++ delete input;
++ return KoFilter::ParsingError;
+ }
+- //storeout->write( createStyles() );
+- storeout->close();
+-#endif
+
+- if (!storeout->open("content.xml")) {
+- kWarning() << "Couldn't open the file 'content.xml'.";
+- return KoFilter::CreationError;
+- }
+- storeout->write(tmpStringStream.str().c_str());
+- storeout->close();
++ delete input;
+
+- // store document manifest
+- storeout->enterDirectory("META-INF");
+- if (!storeout->open("manifest.xml")) {
+- kWarning() << "Couldn't open the file 'META-INF/manifest.xml'.";
+- return KoFilter::CreationError;
++ QFile outputFile(m_chain->outputFile());
++ if(!outputFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
++ kWarning() << "ERROR: Could not open output file" << m_chain->outputFile();
++ return KoFilter::InternalError;
+ }
+- storeout->write(createManifest());
+- storeout->close();
+
+- // we are done!
+- delete storeout;
++ outputFile.write(output.cstr());
++ outputFile.close();
+
+ return KoFilter::OK;
+ }
diff --git a/editors/koffice-kde4/pkg-plist b/editors/koffice-kde4/pkg-plist
index 47db91fc016f..f7030a3a735a 100644
--- a/editors/koffice-kde4/pkg-plist
+++ b/editors/koffice-kde4/pkg-plist
@@ -1,5 +1,6 @@
bin/karbon
bin/kexi
+bin/kformula
bin/koconverter
bin/kplato
bin/kplatowork
@@ -12,6 +13,17 @@ include/DebugPigment.h
include/InsertSemanticObjectActionBase.h
include/InsertSemanticObjectCreateAction.h
include/InsertSemanticObjectReferenceAction.h
+include/KWApplicationConfig.h
+include/KWCanvas.h
+include/KWCanvasBase.h
+include/KWCanvasItem.h
+include/KWDocument.h
+include/KWFrameLayout.h
+include/KWPage.h
+include/KWPageManager.h
+include/KWPageStyle.h
+include/KWViewMode.h
+include/KWord.h
include/KoApplication.h
include/KoApplicationAdaptor.h
include/KoBasicHistogramProducers.h
@@ -20,12 +32,12 @@ include/KoBookmarkManager.h
include/KoBorder.h
include/KoCanvasBase.h
include/KoCanvasController.h
+include/KoCanvasControllerWidget.h
include/KoCanvasObserverBase.h
include/KoCanvasSupervisor.h
include/KoChannelInfo.h
include/KoChartInterface.h
include/KoChartModel.h
-include/KoChildrenData.h
include/KoColor.h
include/KoColorConversionTransformation.h
include/KoColorConversionTransformationAbstractFactory.h
@@ -40,6 +52,7 @@ include/KoColorSpace.h
include/KoColorSpaceAbstract.h
include/KoColorSpaceConstants.h
include/KoColorSpaceEngine.h
+include/KoColorSpaceFactory.h
include/KoColorSpaceMaths.h
include/KoColorSpaceRegistry.h
include/KoColorSpaceTraits.h
@@ -48,6 +61,7 @@ include/KoColorTransformationFactory.h
include/KoColorTransformationFactoryRegistry.h
include/KoColumns.h
include/KoCompositeOp.h
+include/KoConfig.h
include/KoConvolutionOp.h
include/KoCopyController.h
include/KoCutController.h
@@ -77,6 +91,13 @@ include/KoFallBackColorTransformation.h
include/KoFilter.h
include/KoFilterChain.h
include/KoFilterChainLinkList.h
+include/KoFilterEffect.h
+include/KoFilterEffectConfigWidgetBase.h
+include/KoFilterEffectFactoryBase.h
+include/KoFilterEffectLoadingContext.h
+include/KoFilterEffectRegistry.h
+include/KoFilterEffectRenderContext.h
+include/KoFilterEffectStack.h
include/KoFilterManager.h
include/KoFlake.h
include/KoFontFace.h
@@ -96,6 +117,8 @@ include/KoImageCollection.h
include/KoImageData.h
include/KoImageSelectionWidget.h
include/KoInlineObject.h
+include/KoInlineObjectFactoryBase.h
+include/KoInlineObjectRegistry.h
include/KoInlineTextObjectManager.h
include/KoInputDevice.h
include/KoInsets.h
@@ -119,12 +142,16 @@ include/KoOdfReadStore.h
include/KoOdfStylesReader.h
include/KoOdfWriteStore.h
include/KoPACanvas.h
+include/KoPACanvasBase.h
+include/KoPACanvasItem.h
include/KoPADocument.h
include/KoPALoadingContext.h
include/KoPAPageBase.h
include/KoPAPageContainerModel.h
include/KoPAUtil.h
include/KoPAView.h
+include/KoPAViewBase.h
+include/KoPAViewMode.h
include/KoPageApp.h
include/KoPageFormat.h
include/KoPageLayout.h
@@ -169,6 +196,7 @@ include/KoShapeBorderCommand.h
include/KoShapeBorderModel.h
include/KoShapeConfigWidgetBase.h
include/KoShapeContainer.h
+include/KoShapeContainerDefaultModel.h
include/KoShapeContainerModel.h
include/KoShapeController.h
include/KoShapeControllerBase.h
@@ -202,7 +230,6 @@ include/KoStore.h
include/KoStoreDevice.h
include/KoStyleStack.h
include/KoSubpathRemoveCommand.h
-include/KoTableInterface.h
include/KoText.h
include/KoTextAnchor.h
include/KoTextBlockBorderData.h
@@ -215,10 +242,12 @@ include/KoTextEditor.h
include/KoTextInlineRdf.h
include/KoTextLocator.h
include/KoTextMeta.h
+include/KoTextOnShapeContainer.h
include/KoTextPage.h
include/KoTextPaste.h
include/KoTextRdfCore.h
include/KoTextShapeData.h
+include/KoTextShapeDataBase.h
include/KoToolBase.h
include/KoToolFactoryBase.h
include/KoToolManager.h
@@ -231,9 +260,7 @@ include/KoUniColorDialog.h
include/KoUnit.h
include/KoUpdater.h
include/KoVariable.h
-include/KoVariableFactory.h
include/KoVariableManager.h
-include/KoVariableRegistry.h
include/KoVersionDialog.h
include/KoView.h
include/KoViewAdaptor.h
@@ -254,14 +281,12 @@ include/RdfSemanticTreeWidgetSelectAction.h
include/changetracker/KoChangeTracker.h
include/changetracker/KoChangeTrackerElement.h
include/changetracker/KoDeleteChangeMarker.h
-include/config-openexr.h
-include/config-opengl.h
include/flake_export.h
include/kexi/forms/FormWidget.h
include/kexi/forms/FormWidgetInterface.h
include/kexi/forms/WidgetInfo.h
+include/kexi/forms/WidgetTreeWidget.h
include/kexi/forms/objecttree.h
-include/kexi/forms/objecttreeview.h
include/kexi/forms/widgetfactory.h
include/kexi/forms/widgetlibrary.h
include/kexi/forms/widgetwithsubpropertiesinterface.h
@@ -273,6 +298,7 @@ include/kis_config_widget.h
include/kis_convolution_kernel.h
include/kis_convolution_painter.h
include/kis_convolution_worker.h
+include/kis_coordinates_converter.h
include/kis_cubic_curve.h
include/kis_cursor.h
include/kis_debug.h
@@ -299,13 +325,13 @@ include/kis_node_facade.h
include/kis_node_graph_listener.h
include/kis_paint_device.h
include/kis_painter.h
+include/kis_perspectivetransform_worker.h
include/kis_processing_information.h
include/kis_properties_configuration.h
include/kis_random_accessor.h
include/kis_selection.h
include/kis_serializable_configuration.h
include/kis_shared.h
-include/kis_shared_data.h
include/kis_shared_ptr.h
include/kis_shared_ptr_vector.h
include/kis_tiled_data_manager.h
@@ -313,7 +339,9 @@ include/kis_tool.h
include/kis_transaction.h
include/kis_transform_worker.h
include/kis_types.h
+include/kis_ui_types.h
include/kis_view2.h
+include/kis_warptransform_worker.h
include/koChart.h
include/kofficeversion.h
include/komain_export.h
@@ -322,6 +350,7 @@ include/kopageapp_export.h
include/kotext_export.h
include/kowidgets_export.h
include/krita_export.h
+include/kword_export.h
include/pigment_export.h
include/styles/KoCharacterStyle.h
include/styles/KoListLevelProperties.h
@@ -330,27 +359,58 @@ include/styles/KoParagraphStyle.h
include/styles/KoSectionStyle.h
include/styles/KoStyleManager.h
include/styles/KoTableCellStyle.h
-include/styles/KoTableColumnFormat.h
include/styles/KoTableColumnStyle.h
include/styles/KoTableFormat.h
-include/styles/KoTableRowFormat.h
include/styles/KoTableRowStyle.h
+lib/kde4/Filterkpr2odf.so
+lib/kde4/abiwordexport.so
+lib/kde4/abiwordimport.so
+lib/kde4/amiproexport.so
+lib/kde4/amiproimport.so
+lib/kde4/applixspreadimport.so
+lib/kde4/applixwordimport.so
lib/kde4/artistictextshape.so
+lib/kde4/asciiexport.so
+lib/kde4/asciiimport.so
lib/kde4/autocorrect.so
lib/kde4/changecase.so
lib/kde4/chartshape.so
+lib/kde4/commentshape.so
+lib/kde4/csvexport.so
+lib/kde4/csvimport.so
+lib/kde4/dbaseimport.so
+lib/kde4/dcmimport.so
lib/kde4/defaulttools.so
lib/kde4/divineproportionshape.so
+lib/kde4/docbookexport.so
+lib/kde4/docximport.so
+lib/kde4/excelimporttodoc.so
lib/kde4/formulashape.so
+lib/kde4/generickofilter.so
+lib/kde4/gnumericexport.so
+lib/kde4/gnumericimport.so
+lib/kde4/hancomwordimport.so
+lib/kde4/htmlexport.so
+lib/kde4/htmlimport.so
+lib/kde4/htmlodf_export.so
+lib/kde4/icalendarexport.so
+lib/kde4/karbon1ximport.so
lib/kde4/karbon_flattenpathplugin.so
lib/kde4/karbon_refinepathplugin.so
lib/kde4/karbon_roundcornersplugin.so
lib/kde4/karbon_whirlpinchplugin.so
+%%EPS%%lib/kde4/karbonepsimport.so
lib/kde4/karbonfiltereffects.so
+lib/kde4/karbonpart.so
+lib/kde4/karbonpdfimport.so
+lib/kde4/karbonpngexport.so
+lib/kde4/karbonsvgexport.so
+lib/kde4/karbonsvgimport.so
lib/kde4/karbontools.so
lib/kde4/kexidb_mysqldriver.so
lib/kde4/kexidb_pqxxsqldriver.so
lib/kde4/kexidb_sqlite3driver.so
+%%SYBASE%%lib/kde4/kexidb_sybasedriver.so
%%XBASE%%lib/kde4/kexidb_xbasedriver.so
lib/kde4/kexihandler_csv_importexport.so
lib/kde4/kexihandler_form.so
@@ -370,31 +430,43 @@ lib/kde4/kexirelationdesignshape.so
lib/kde4/kformdesigner_containers.so
lib/kde4/kformdesigner_kexidbwidgets.so
lib/kde4/kformdesigner_stdwidgets.so
+lib/kde4/kformulapart.so
+lib/kde4/kodocinfopropspage.so
lib/kde4/kofficedockers.so
lib/kde4/kofficescan.so
lib/kde4/kofficethumbnail.so
lib/kde4/kolcmsengine.so
lib/kde4/kopabackgroundtool.so
+lib/kde4/koreport_barcodeplugin.so
+lib/kde4/koreport_chartplugin.so
+lib/kde4/koreport_shapeplugin.so
+lib/kde4/kounavailpart.so
+lib/kde4/kplatopart.so
+lib/kde4/kplatoworkpart.so
lib/kde4/kpr_pageeffect_barwipe.so
lib/kde4/kpr_pageeffect_clockwipe.so
lib/kde4/kpr_pageeffect_edgewipe.so
+lib/kde4/kpr_pageeffect_fade.so
lib/kde4/kpr_pageeffect_iriswipe.so
lib/kde4/kpr_pageeffect_matrixwipe.so
lib/kde4/kpr_pageeffect_slidewipe.so
+lib/kde4/kpr_pageeffect_spacerotation.so
+lib/kde4/kpr_pageeffect_swapeffect.so
lib/kde4/kpr_shapeanimation_example.so
lib/kde4/kpresentereventactions.so
+lib/kde4/kpresenterpart.so
lib/kde4/kpresentertoolanimation.so
lib/kde4/kprvariables.so
lib/kde4/krita_colorspaces_extensions.so
%%GTL%%lib/kde4/krita_ctlcs_plugin.so
-lib/kde4/kritabackgrounds.so
+lib/kde4/krita_raw_import.so
lib/kde4/kritabigbrother.so
lib/kde4/kritablurfilter.so
-lib/kde4/kritabracketing2hdr.so
-lib/kde4/kritabumpmap.so
-lib/kde4/kritachalkpaintop.so
+lib/kde4/kritabmpexport.so
+lib/kde4/kritabmpimport.so
lib/kde4/kritacolorgenerator.so
lib/kde4/kritacolorrange.so
+lib/kde4/kritacolorselectorng.so
lib/kde4/kritacolorsfilters.so
lib/kde4/kritacolorspaceconversion.so
lib/kde4/kritaconvolutionfilters.so
@@ -409,47 +481,60 @@ lib/kde4/kritadropshadow.so
lib/kde4/kritadynapaintop.so
lib/kde4/kritaembossfilter.so
lib/kde4/kritaexample.so
+%%GTL%%lib/kde4/kritaexrexport.so
+%%GTL%%lib/kde4/kritaexrimport.so
lib/kde4/kritaextensioncolorsfilters.so
lib/kde4/kritaextensionsmanager.so
lib/kde4/kritafastcolortransferfilter.so
lib/kde4/kritafilterop.so
+lib/kde4/kritagifimport.so
lib/kde4/kritagridpaintop.so
lib/kde4/kritahairypaintop.so
+lib/kde4/kritahatchingpaintop.so
lib/kde4/kritahistogram.so
lib/kde4/kritaimageenhancement.so
lib/kde4/kritaimagesize.so
+lib/kde4/kritajp2export.so
+lib/kde4/kritajp2import.so
+lib/kde4/kritajpegexport.so
+lib/kde4/kritajpegimport.so
lib/kde4/kritalayercompose.so
lib/kde4/kritalevelfilter.so
lib/kde4/kritametadataeditor.so
lib/kde4/kritamodifyselection.so
lib/kde4/kritanoisefilter.so
-lib/kde4/kritaoilpaintfilter.so
+lib/kde4/kritaoraexport.so
+lib/kde4/kritaoraimport.so
+lib/kde4/kritapart.so
lib/kde4/kritaparticlepaintop.so
+lib/kde4/kritapdfimport.so
lib/kde4/kritapixelizefilter.so
+lib/kde4/kritapngexport.so
+lib/kde4/kritapngimport.so
+lib/kde4/kritappmexport.so
+lib/kde4/kritappmimport.so
lib/kde4/kritaraindropsfilter.so
lib/kde4/kritarandompickfilter.so
lib/kde4/kritarotateimage.so
lib/kde4/kritaroundcornersfilter.so
lib/kde4/kritarulerassistanttool.so
-lib/kde4/kritascripting.so
lib/kde4/kritaselectiontools.so
lib/kde4/kritaseparatechannels.so
lib/kde4/kritashearimage.so
%%GTL%%lib/kde4/kritashivafilters.so
%%GTL%%lib/kde4/kritashivagenerators.so
+lib/kde4/kritasketchpaintop.so
lib/kde4/kritasmallcolorselector.so
-lib/kde4/kritasmalltilesfilter.so
-lib/kde4/kritasobelfilter.so
-lib/kde4/kritasoftpaintop.so
lib/kde4/kritaspecificcolorselector.so
lib/kde4/kritaspraypaintop.so
+lib/kde4/kritatiffexport.so
+lib/kde4/kritatiffimport.so
lib/kde4/kritatogether.so
lib/kde4/kritatonemapping.so
lib/kde4/kritatoolcrop.so
lib/kde4/kritatooldyna.so
lib/kde4/kritatoolgrid.so
lib/kde4/kritatoolperspectivegrid.so
-lib/kde4/kritatoolperspectivetransform.so
lib/kde4/kritatoolpolygon.so
lib/kde4/kritatoolpolyline.so
lib/kde4/kritatoolstar.so
@@ -457,6 +542,7 @@ lib/kde4/kritatooltransform.so
lib/kde4/kritatrianglecolorselector.so
lib/kde4/kritaunsharpfilter.so
lib/kde4/kritawavefilter.so
+lib/kde4/kritaxcfimport.so
lib/kde4/krossmodulekexidb.so
lib/kde4/krossmodulekplato.so
lib/kde4/krossmodulekspread.so
@@ -468,128 +554,68 @@ lib/kde4/kspreaddatabasemodule.so
lib/kde4/kspreaddatetimemodule.so
lib/kde4/kspreadengineeringmodule.so
lib/kde4/kspreadfinancialmodule.so
+lib/kde4/kspreadhtmlexport.so
+lib/kde4/kspreadhtmlimport.so
lib/kde4/kspreadinformationmodule.so
+lib/kde4/kspreadlatexexport.so
lib/kde4/kspreadlogicmodule.so
lib/kde4/kspreadmathmodule.so
+lib/kde4/kspreadpart.so
lib/kde4/kspreadreferencemodule.so
+lib/kde4/kspreadsolver.so
lib/kde4/kspreadstatisticalmodule.so
lib/kde4/kspreadtextmodule.so
lib/kde4/kspreadtrigonometrymodule.so
-lib/kde4/libFilterkpr2odf.so
-lib/kde4/libabiwordexport.so
-lib/kde4/libabiwordimport.so
-lib/kde4/libamiproexport.so
-lib/kde4/libamiproimport.so
-lib/kde4/libapplixspreadimport.so
-lib/kde4/libapplixwordimport.so
-lib/kde4/libasciiexport.so
-lib/kde4/libasciiimport.so
-lib/kde4/libcsvexport.so
-lib/kde4/libcsvimport.so
-lib/kde4/libdbaseimport.so
-lib/kde4/libdocbookexport.so
-lib/kde4/libdocximport.so
-lib/kde4/libexcelimport.so
-lib/kde4/libgenerickofilter.so
-lib/kde4/libgnumericexport.so
-lib/kde4/libgnumericimport.so
-lib/kde4/libhancomwordimport.so
-lib/kde4/libhtmlexport.so
-lib/kde4/libhtmlimport.so
-lib/kde4/libicalendarexport.so
-lib/kde4/libkarbon1ximport.so
-%%EPS%%lib/kde4/libkarbonepsimport.so
-lib/kde4/libkarbonpart.so
-lib/kde4/libkarbonpdfimport.so
-lib/kde4/libkarbonpngexport.so
-lib/kde4/libkarbonsvgexport.so
-lib/kde4/libkarbonsvgimport.so
-lib/kde4/libkchartgenericimageexport.so
-lib/kde4/libkchartsvgexport.so
-lib/kde4/libkformulapart.so
-lib/kde4/libkounavailpart.so
-lib/kde4/libkplatopart.so
-lib/kde4/libkplatoworkpart.so
-lib/kde4/libkpresenterpart.so
-lib/kde4/libkrita_raw_import.so
-lib/kde4/libkritabmpexport.so
-lib/kde4/libkritabmpimport.so
-%%GTL%%lib/kde4/libkritaexrexport.so
-%%GTL%%lib/kde4/libkritaexrimport.so
-lib/kde4/libkritagifimport.so
-lib/kde4/libkritajp2export.so
-lib/kde4/libkritajp2import.so
-lib/kde4/libkritajpegexport.so
-lib/kde4/libkritajpegimport.so
-lib/kde4/libkritaoraexport.so
-lib/kde4/libkritaoraimport.so
-lib/kde4/libkritapart.so
-lib/kde4/libkritapdfimport.so
-lib/kde4/libkritapngexport.so
-lib/kde4/libkritapngimport.so
-lib/kde4/libkritappmexport.so
-lib/kde4/libkritappmimport.so
-lib/kde4/libkritapsdimport.so
-lib/kde4/libkritatiffexport.so
-lib/kde4/libkritatiffimport.so
-lib/kde4/libkritaxcfimport.so
-lib/kde4/libkspreadhtmlexport.so
-lib/kde4/libkspreadhtmlimport.so
-lib/kde4/libkspreadlatexexport.so
-lib/kde4/libkspreadpart.so
-lib/kde4/libkspreadsolver.so
-lib/kde4/libkwordkword1dot3import.so
-lib/kde4/libkwordpart.so
-lib/kde4/liboowriterexport.so
-lib/kde4/liboowriterimport.so
-lib/kde4/libopencalcexport.so
-lib/kde4/libopencalcimport.so
-lib/kde4/libpalmdocexport.so
-lib/kde4/libpalmdocimport.so
-lib/kde4/libpowerpointimport.so
-lib/kde4/libpptximport.so
-lib/kde4/libqproimport.so
-lib/kde4/librtfexport.so
-lib/kde4/librtfimport.so
-lib/kde4/libwmfexport.so
-lib/kde4/libwmfimport.so
-lib/kde4/libwmlexport.so
-lib/kde4/libwmlimport.so
-lib/kde4/libwpexport.so
-lib/kde4/libwpgimport.so
-lib/kde4/libwpimport.so
-lib/kde4/libxlsximport.so
-lib/kde4/libxsltexport.so
-lib/kde4/libxsltimport.so
+lib/kde4/kwordkword1dot3import.so
+lib/kde4/kwordpart.so
lib/kde4/musicshape.so
+lib/kde4/okularGenerator_odp.so
+lib/kde4/oowriterexport.so
+lib/kde4/oowriterimport.so
+lib/kde4/opencalcexport.so
+lib/kde4/opencalcimport.so
+lib/kde4/palmdocexport.so
+lib/kde4/palmdocimport.so
lib/kde4/paragraphtool.so
lib/kde4/pathshapes.so
lib/kde4/pictureshape.so
+lib/kde4/pluginshape.so
+lib/kde4/powerpointimport.so
+lib/kde4/pptximport.so
+lib/kde4/qproimport.so
+lib/kde4/rtfexport.so
+lib/kde4/rtfimport.so
lib/kde4/spellcheck.so
lib/kde4/spreadsheetshape.so
lib/kde4/textshape.so
lib/kde4/textvariables.so
lib/kde4/thesaurustool.so
-lib/kde4/vectorshape.so
lib/kde4/videoshape.so
+lib/kde4/wmfexport.so
+lib/kde4/wmfimport.so
+lib/kde4/wmlexport.so
+lib/kde4/wmlimport.so
+lib/kde4/wpexport.so
+lib/kde4/wpgimport.so
+lib/kde4/wpimport.so
+lib/kde4/xlsximport.so
+lib/kde4/xsltexport.so
+lib/kde4/xsltimport.so
lib/libchartshapelib.so
-lib/libchartshapelib.so.7
-lib/libchartshapelib.so.7.0.0
+lib/libchartshapelib.so.8
+lib/libchartshapelib.so.8.0.0
lib/libflake.so
-lib/libflake.so.7
-lib/libflake.so.7.0.0
+lib/libflake.so.8
+lib/libflake.so.8.0.0
lib/libkarboncommon.so
-lib/libkarboncommon.so.7
-lib/libkarboncommon.so.7.0.0
+lib/libkarboncommon.so.8
+lib/libkarboncommon.so.8.0.0
lib/libkarbonui.so
-lib/libkarbonui.so.7
-lib/libkarbonui.so.7.0.0
-lib/libkchartcommon.so
-lib/libkchartcommon.so.7
-lib/libkchartcommon.so.7.0.0
+lib/libkarbonui.so.8
+lib/libkarbonui.so.8.0.0
lib/libkdchart.so
-lib/libkdchart.so.7
-lib/libkdchart.so.7.0.0
+lib/libkdchart.so.8
+lib/libkdchart.so.8.0.0
lib/libkdeinit4_karbon.so
lib/libkdeinit4_kplato.so
lib/libkdeinit4_kplatowork.so
@@ -598,134 +624,137 @@ lib/libkdeinit4_krita.so
lib/libkdeinit4_kspread.so
lib/libkdeinit4_kthesaurus.so
lib/libkdeinit4_kword.so
+lib/libkdeinit_kformula.so
lib/libkexicore.so
-lib/libkexicore.so.7
-lib/libkexicore.so.7.0.0
+lib/libkexicore.so.8
+lib/libkexicore.so.8.0.0
lib/libkexidatatable.so
-lib/libkexidatatable.so.7
-lib/libkexidatatable.so.7.0.0
+lib/libkexidatatable.so.8
+lib/libkexidatatable.so.8.0.0
lib/libkexidb.so
-lib/libkexidb.so.7
-lib/libkexidb.so.7.0.0
+lib/libkexidb.so.8
+lib/libkexidb.so.8.0.0
lib/libkexiextendedwidgets.so
-lib/libkexiextendedwidgets.so.7.0.0
+lib/libkexiextendedwidgets.so.8
+lib/libkexiextendedwidgets.so.8.0.0
lib/libkexiformutils.so
-lib/libkexiformutils.so.7
-lib/libkexiformutils.so.7.0.0
+lib/libkexiformutils.so.8
+lib/libkexiformutils.so.8.0.0
lib/libkexiguiutils.so
-lib/libkexiguiutils.so.7
-lib/libkexiguiutils.so.7.0.0
+lib/libkexiguiutils.so.8
+lib/libkexiguiutils.so.8.0.0
lib/libkeximain.so
-lib/libkeximain.so.7
-lib/libkeximain.so.7.0.0
+lib/libkeximain.so.8
+lib/libkeximain.so.8.0.0
lib/libkeximigrate.so
-lib/libkeximigrate.so.7
-lib/libkeximigrate.so.7.0.0
+lib/libkeximigrate.so.8
+lib/libkeximigrate.so.8.0.0
lib/libkexirelationsview.so
-lib/libkexirelationsview.so.7
-lib/libkexirelationsview.so.7.0.0
+lib/libkexirelationsview.so.8
+lib/libkexirelationsview.so.8.0.0
lib/libkexiutils.so
-lib/libkexiutils.so.7
-lib/libkexiutils.so.7.0.0
+lib/libkexiutils.so.8
+lib/libkexiutils.so.8.0.0
lib/libkformdesigner.so
-lib/libkformdesigner.so.7
-lib/libkformdesigner.so.7.0.0
+lib/libkformdesigner.so.8
+lib/libkformdesigner.so.8.0.0
lib/libkformulalib.so
-lib/libkformulalib.so.7
-lib/libkformulalib.so.7.0.0
+lib/libkformulalib.so.8
+lib/libkformulalib.so.8.0.0
lib/libkformulaprivate.so
-lib/libkformulaprivate.so.7
-lib/libkformulaprivate.so.7.0.0
+lib/libkformulaprivate.so.8
+lib/libkformulaprivate.so.8.0.0
lib/libkochart.so
-lib/libkochart.so.7
-lib/libkochart.so.7.0.0
+lib/libkochart.so.8
+lib/libkochart.so.8.0.0
lib/libkokross.so
-lib/libkokross.so.7
-lib/libkokross.so.7.0.0
+lib/libkokross.so.8
+lib/libkokross.so.8.0.0
lib/libkomain.so
-lib/libkomain.so.7
-lib/libkomain.so.7.0.0
+lib/libkomain.so.8
+lib/libkomain.so.8.0.0
lib/libkoodf.so
-lib/libkoodf.so.7
-lib/libkoodf.so.7.0.0
+lib/libkoodf.so.8
+lib/libkoodf.so.8.0.0
lib/libkopageapp.so
-lib/libkopageapp.so.7
-lib/libkopageapp.so.7.0.0
+lib/libkopageapp.so.8
+lib/libkopageapp.so.8.0.0
lib/libkoplugin.so
-lib/libkoplugin.so.7
-lib/libkoplugin.so.7.0.0
+lib/libkoplugin.so.8
+lib/libkoplugin.so.8.0.0
lib/libkoproperty.so
-lib/libkoproperty.so.7
-lib/libkoproperty.so.7.0.0
+lib/libkoproperty.so.8
+lib/libkoproperty.so.8.0.0
lib/libkoreport.so
-lib/libkoreport.so.7
-lib/libkoreport.so.7.0.0
+lib/libkoreport.so.8
+lib/libkoreport.so.8.0.0
lib/libkotext.so
-lib/libkotext.so.7
-lib/libkotext.so.7.0.0
+lib/libkotext.so.8
+lib/libkotext.so.8.0.0
lib/libkowidgets.so
-lib/libkowidgets.so.7
-lib/libkowidgets.so.7.0.0
+lib/libkowidgets.so.8
+lib/libkowidgets.so.8.0.0
lib/libkowmf.so
-lib/libkowmf.so.7
-lib/libkowmf.so.7.0.0
+lib/libkowmf.so.8
+lib/libkowmf.so.8.0.0
lib/libkplatokernel.so
-lib/libkplatokernel.so.7
-lib/libkplatokernel.so.7.0.0
+lib/libkplatokernel.so.8
+lib/libkplatokernel.so.8.0.0
lib/libkplatomodels.so
-lib/libkplatomodels.so.7
-lib/libkplatomodels.so.7.0.0
+lib/libkplatomodels.so.8
+lib/libkplatomodels.so.8.0.0
lib/libkplatoprivate.so
-lib/libkplatoprivate.so.7
-lib/libkplatoprivate.so.7.0.0
+lib/libkplatoprivate.so.8
+lib/libkplatoprivate.so.8.0.0
lib/libkplatoui.so
-lib/libkplatoui.so.7
-lib/libkplatoui.so.7.0.0
+lib/libkplatoui.so.8
+lib/libkplatoui.so.8.0.0
lib/libkplatoworkapp.so
-lib/libkplatoworkapp.so.7
-lib/libkplatoworkapp.so.7.0.0
+lib/libkplatoworkapp.so.8
+lib/libkplatoworkapp.so.8.0.0
lib/libkplatoworkfactory.so
-lib/libkplatoworkfactory.so.7
-lib/libkplatoworkfactory.so.7.0.0
+lib/libkplatoworkfactory.so.8
+lib/libkplatoworkfactory.so.8.0.0
lib/libkpresenterprivate.so
-lib/libkpresenterprivate.so.7
-lib/libkpresenterprivate.so.7.0.0
+lib/libkpresenterprivate.so.8
+lib/libkpresenterprivate.so.8.0.0
lib/libkritaimage.so
-lib/libkritaimage.so.7
-lib/libkritaimage.so.7.0.0
+lib/libkritaimage.so.8
+lib/libkritaimage.so.8.0.0
lib/libkritalibbrush.so
-lib/libkritalibbrush.so.7
-lib/libkritalibbrush.so.7.0.0
+lib/libkritalibbrush.so.8
+lib/libkritalibbrush.so.8.0.0
lib/libkritalibpaintop.so
-lib/libkritalibpaintop.so.7
-lib/libkritalibpaintop.so.7.0.0
+lib/libkritalibpaintop.so.8
+lib/libkritalibpaintop.so.8.0.0
lib/libkritaui.so
-lib/libkritaui.so.7
-lib/libkritaui.so.7.0.0
-lib/libkrossmodulekrita.so
-lib/libkrossmodulekrita.so.7
-lib/libkrossmodulekrita.so.7.0.0
+lib/libkritaui.so.8
+lib/libkritaui.so.8.0.0
lib/libkspreadcommon.so
-lib/libkspreadcommon.so.7
-lib/libkspreadcommon.so.7.0.0
+lib/libkspreadcommon.so.8
+lib/libkspreadcommon.so.8.0.0
+lib/libkspreadodf.so
+lib/libkspreadodf.so.8
+lib/libkspreadodf.so.8.0.0
lib/libkwmf.so
-lib/libkwmf.so.7
-lib/libkwmf.so.7.0.0
+lib/libkwmf.so.8
+lib/libkwmf.so.8.0.0
lib/libkwordexportfilters.so
-lib/libkwordexportfilters.so.7
-lib/libkwordexportfilters.so.7.0.0
+lib/libkwordexportfilters.so.8
+lib/libkwordexportfilters.so.8.0.0
lib/libkwordprivate.so
-lib/libkwordprivate.so.7
-lib/libkwordprivate.so.7.0.0
+lib/libkwordprivate.so.8
+lib/libkwordprivate.so.8.0.0
lib/libmsooxml.so
-lib/libmsooxml.so.7
-lib/libmsooxml.so.7.0.0
+lib/libmsooxml.so.8
+lib/libmsooxml.so.8.0.0
lib/libpigmentcms.so
-lib/libpigmentcms.so.7
-lib/libpigmentcms.so.7.0.0
+lib/libpigmentcms.so.8
+lib/libpigmentcms.so.8.0.0
share/applications/kde4/KThesaurus.desktop
share/applications/kde4/karbon.desktop
share/applications/kde4/kexi.desktop
+share/applications/kde4/kformula.desktop
share/applications/kde4/koffice.desktop
share/applications/kde4/kplato.desktop
share/applications/kde4/kplatowork.desktop
@@ -745,6 +774,7 @@ share/applications/kde4/krita_tiff.desktop
share/applications/kde4/krita_xcf.desktop
share/applications/kde4/kspread.desktop
share/applications/kde4/kword.desktop
+share/applications/kde4/okularApplication_odp.desktop
share/apps/cmake/modules/FindKOfficeLibs.cmake
share/apps/formulashape/fonts/Arev.ttf
share/apps/formulashape/fonts/ArevBI.ttf
@@ -811,109 +841,6 @@ share/apps/karbon/kpartplugins/WhirlPinchPlugin.rc
share/apps/karbon/templates/Basic/.directory
share/apps/karbon/templates/Basic/.source/empty.odg
share/apps/karbon/templates/Basic/empty.desktop
-share/apps/kchart/icons/hicolor/16x16/actions/chart_area.png
-share/apps/kchart/icons/hicolor/16x16/actions/chart_area_3d.png
-share/apps/kchart/icons/hicolor/16x16/actions/chart_bar.png
-share/apps/kchart/icons/hicolor/16x16/actions/chart_bar_3d.png
-share/apps/kchart/icons/hicolor/16x16/actions/chart_boxwhisker.png
-share/apps/kchart/icons/hicolor/16x16/actions/chart_hilo.png
-share/apps/kchart/icons/hicolor/16x16/actions/chart_line.png
-share/apps/kchart/icons/hicolor/16x16/actions/chart_line_3d.png
-share/apps/kchart/icons/hicolor/16x16/actions/chart_pie.png
-share/apps/kchart/icons/hicolor/16x16/actions/chart_pie_3d.png
-share/apps/kchart/icons/hicolor/16x16/actions/chart_polar.png
-share/apps/kchart/icons/hicolor/16x16/actions/chart_ring.png
-share/apps/kchart/icons/hicolor/16x16/actions/data.png
-share/apps/kchart/icons/hicolor/16x16/actions/options.png
-share/apps/kchart/icons/hicolor/16x16/actions/wizard.png
-share/apps/kchart/icons/hicolor/22x22/actions/chart_area.png
-share/apps/kchart/icons/hicolor/22x22/actions/chart_area_3d.png
-share/apps/kchart/icons/hicolor/22x22/actions/chart_bar.png
-share/apps/kchart/icons/hicolor/22x22/actions/chart_bar_3d.png
-share/apps/kchart/icons/hicolor/22x22/actions/chart_boxwhisker.png
-share/apps/kchart/icons/hicolor/22x22/actions/chart_hilo.png
-share/apps/kchart/icons/hicolor/22x22/actions/chart_line.png
-share/apps/kchart/icons/hicolor/22x22/actions/chart_line_3d.png
-share/apps/kchart/icons/hicolor/22x22/actions/chart_pie.png
-share/apps/kchart/icons/hicolor/22x22/actions/chart_pie_3d.png
-share/apps/kchart/icons/hicolor/22x22/actions/chart_polar.png
-share/apps/kchart/icons/hicolor/22x22/actions/chart_ring.png
-share/apps/kchart/icons/hicolor/22x22/actions/data.png
-share/apps/kchart/icons/hicolor/22x22/actions/options.png
-share/apps/kchart/icons/hicolor/22x22/actions/wizard.png
-share/apps/kchart/icons/hicolor/32x32/actions/chart_area.png
-share/apps/kchart/icons/hicolor/32x32/actions/chart_area_3d.png
-share/apps/kchart/icons/hicolor/32x32/actions/chart_bar.png
-share/apps/kchart/icons/hicolor/32x32/actions/chart_bar_3d.png
-share/apps/kchart/icons/hicolor/32x32/actions/chart_boxwhisker.png
-share/apps/kchart/icons/hicolor/32x32/actions/chart_hilo.png
-share/apps/kchart/icons/hicolor/32x32/actions/chart_line.png
-share/apps/kchart/icons/hicolor/32x32/actions/chart_line_3d.png
-share/apps/kchart/icons/hicolor/32x32/actions/chart_pie.png
-share/apps/kchart/icons/hicolor/32x32/actions/chart_pie_3d.png
-share/apps/kchart/icons/hicolor/32x32/actions/chart_polar.png
-share/apps/kchart/icons/hicolor/32x32/actions/chart_ring.png
-share/apps/kchart/icons/hicolor/32x32/actions/data.png
-share/apps/kchart/icons/hicolor/32x32/actions/options.png
-share/apps/kchart/icons/hicolor/32x32/actions/wizard.png
-share/apps/kchart/icons/hicolor/48x48/actions/chart_area.png
-share/apps/kchart/icons/hicolor/48x48/actions/chart_area_3d.png
-share/apps/kchart/icons/hicolor/48x48/actions/chart_bar.png
-share/apps/kchart/icons/hicolor/48x48/actions/chart_bar_3d.png
-share/apps/kchart/icons/hicolor/48x48/actions/chart_boxwhisker.png
-share/apps/kchart/icons/hicolor/48x48/actions/chart_hilo.png
-share/apps/kchart/icons/hicolor/48x48/actions/chart_line.png
-share/apps/kchart/icons/hicolor/48x48/actions/chart_line_3d.png
-share/apps/kchart/icons/hicolor/48x48/actions/chart_pie.png
-share/apps/kchart/icons/hicolor/48x48/actions/chart_pie_3d.png
-share/apps/kchart/icons/hicolor/48x48/actions/chart_polar.png
-share/apps/kchart/icons/hicolor/48x48/actions/chart_ring.png
-share/apps/kchart/icons/hicolor/48x48/actions/options.png
-share/apps/kchart/icons/hicolor/48x48/actions/template_barchart.png
-share/apps/kchart/icons/hicolor/48x48/actions/template_empty.png
-share/apps/kchart/icons/hicolor/scalable/actions/chart_area.svgz
-share/apps/kchart/icons/hicolor/scalable/actions/chart_area_3d.svgz
-share/apps/kchart/icons/hicolor/scalable/actions/chart_bar.svgz
-share/apps/kchart/icons/hicolor/scalable/actions/chart_bar_3d.svgz
-share/apps/kchart/icons/hicolor/scalable/actions/chart_boxwhisker.svgz
-share/apps/kchart/icons/hicolor/scalable/actions/chart_hilo.svgz
-share/apps/kchart/icons/hicolor/scalable/actions/chart_line.svgz
-share/apps/kchart/icons/hicolor/scalable/actions/chart_line_3d.svgz
-share/apps/kchart/icons/hicolor/scalable/actions/chart_pie.svgz
-share/apps/kchart/icons/hicolor/scalable/actions/chart_pie_3d.svgz
-share/apps/kchart/icons/hicolor/scalable/actions/chart_polar.svgz
-share/apps/kchart/icons/hicolor/scalable/actions/chart_ring.svgz
-share/apps/kchart/icons/hicolor/scalable/actions/template_barchart.svgz
-share/apps/kchart/icons/hicolor/scalable/actions/template_empty.svgz
-share/apps/kchart/pics/chart_area_normal.png
-share/apps/kchart/pics/chart_area_percent.png
-share/apps/kchart/pics/chart_area_stacked.png
-share/apps/kchart/pics/chart_bar_beside.png
-share/apps/kchart/pics/chart_bar_layer.png
-share/apps/kchart/pics/chart_bar_percent.png
-share/apps/kchart/pics/chart_hilo_close.png
-share/apps/kchart/pics/chart_hilo_normal.png
-share/apps/kchart/pics/chart_hilo_openclose.png
-share/apps/kchart/pics/chart_legend_bottom.png
-share/apps/kchart/pics/chart_legend_bottomleft.png
-share/apps/kchart/pics/chart_legend_bottomright.png
-share/apps/kchart/pics/chart_legend_left.png
-share/apps/kchart/pics/chart_legend_nolegend.png
-share/apps/kchart/pics/chart_legend_right.png
-share/apps/kchart/pics/chart_legend_top.png
-share/apps/kchart/pics/chart_legend_topleft.png
-share/apps/kchart/pics/chart_legend_topright.png
-share/apps/kchart/pics/chart_line_normal.png
-share/apps/kchart/pics/chart_line_percent.png
-share/apps/kchart/pics/chart_line_stacked.png
-share/apps/kchart/pics/chart_polar_normal.png
-share/apps/kchart/pics/chart_polar_percent.png
-share/apps/kchart/pics/chart_polar_stacked.png
-share/apps/kchart/templates/chart/.directory
-share/apps/kchart/templates/chart/.source/BarChart.chrt
-share/apps/kchart/templates/chart/.source/Empty.chrt
-share/apps/kchart/templates/chart/BarChart.desktop
-share/apps/kchart/templates/chart/Empty.desktop
share/apps/kexi/icons/hicolor/128x128/actions/form_action.png
share/apps/kexi/icons/hicolor/16x16/actions/add_field.png
share/apps/kexi/icons/hicolor/16x16/actions/aofit.png
@@ -963,6 +890,7 @@ share/apps/kexi/icons/hicolor/16x16/actions/state_text.png
share/apps/kexi/icons/hicolor/16x16/actions/subform.png
share/apps/kexi/icons/hicolor/16x16/actions/table.png
share/apps/kexi/icons/hicolor/16x16/actions/table_newobj.png
+share/apps/kexi/icons/hicolor/16x16/actions/tabwidget-tab.png
share/apps/kexi/icons/hicolor/16x16/actions/tabwidget.png
share/apps/kexi/icons/hicolor/16x16/actions/test_it.png
share/apps/kexi/icons/hicolor/16x16/actions/textedit.png
@@ -1029,6 +957,7 @@ share/apps/kexi/icons/hicolor/22x22/actions/state_text.png
share/apps/kexi/icons/hicolor/22x22/actions/subform.png
share/apps/kexi/icons/hicolor/22x22/actions/table.png
share/apps/kexi/icons/hicolor/22x22/actions/table_newobj.png
+share/apps/kexi/icons/hicolor/22x22/actions/tabwidget-tab.png
share/apps/kexi/icons/hicolor/22x22/actions/tabwidget.png
share/apps/kexi/icons/hicolor/22x22/actions/test_it.png
share/apps/kexi/icons/hicolor/22x22/actions/textedit.png
@@ -1161,6 +1090,9 @@ share/apps/koffice/icons/hicolor/16x16/actions/tab_last.png
share/apps/koffice/icons/hicolor/16x16/actions/tab_left.png
share/apps/koffice/icons/hicolor/16x16/actions/tab_right.png
share/apps/koffice/icons/hicolor/16x16/actions/textcolor.png
+share/apps/koffice/icons/hicolor/16x16/actions/tool-changetracking.png
+share/apps/koffice/icons/hicolor/16x16/actions/tool-paragraph.png
+share/apps/koffice/icons/hicolor/16x16/actions/tool-text.png
share/apps/koffice/icons/hicolor/16x16/actions/under.png
share/apps/koffice/icons/hicolor/16x16/actions/view-barcode.png
share/apps/koffice/icons/hicolor/16x16/actions/view-sort-ascending.png
@@ -1440,8 +1372,10 @@ share/apps/kplato/scripts/samples/sample_project.py
share/apps/kplato/scripts/scripts.rc
share/apps/kplato/templates/Simple/.directory
share/apps/kplato/templates/Simple/.source/8HourDay-40HourWeek.kplatot
+share/apps/kplato/templates/Simple/.source/Basicproject.kplatot
share/apps/kplato/templates/Simple/.source/Plain.kplatot
share/apps/kplato/templates/Simple/8HourDay-40HourWeek.desktop
+share/apps/kplato/templates/Simple/Basicproject.desktop
share/apps/kplato/templates/Simple/Plain.desktop
share/apps/kplatowork/icons/hicolor/128x128/actions/template_empty.png
share/apps/kplatowork/icons/hicolor/16x16/actions/template_empty.png
@@ -1464,6 +1398,19 @@ share/apps/kpresenter/icons/hicolor/48x48/actions/template_titlelandscape.png
share/apps/kpresenter/icons/hicolor/48x48/actions/template_titleportrait.png
share/apps/kpresenter/icons/hicolor/48x48/actions/template_twocolumnlandscape.png
share/apps/kpresenter/icons/hicolor/48x48/actions/template_twocolumnportrait.png
+share/apps/kpresenter/icons/hicolor/64x64/actions/blue_orange_vector.png
+share/apps/kpresenter/icons/hicolor/64x64/actions/burning_desire.png
+share/apps/kpresenter/icons/hicolor/64x64/actions/business.png
+share/apps/kpresenter/icons/hicolor/64x64/actions/flood_light.png
+share/apps/kpresenter/icons/hicolor/64x64/actions/rounded_square.png
+share/apps/kpresenter/icons/hicolor/64x64/actions/simple_waves.png
+share/apps/kpresenter/icons/hicolor/64x64/actions/skyline_monotone.png
+share/apps/kpresenter/icons/hicolor/64x64/actions/skyline_monotone_wide.png
+share/apps/kpresenter/icons/hicolor/64x64/actions/skyline_morning.png
+share/apps/kpresenter/icons/hicolor/64x64/actions/skyline_morning_wide.png
+share/apps/kpresenter/icons/hicolor/64x64/actions/skyline_night.png
+share/apps/kpresenter/icons/hicolor/64x64/actions/skyline_night_wide.png
+share/apps/kpresenter/icons/hicolor/64x64/actions/strange_far_hills.png
share/apps/kpresenter/icons/hicolor/scalable/actions/template_emptylandscape.svgz
share/apps/kpresenter/icons/hicolor/scalable/actions/template_emptyportrait.svgz
share/apps/kpresenter/icons/hicolor/scalable/actions/template_onecolumnlandscape.svgz
@@ -1499,6 +1446,36 @@ share/apps/kpresenter/templates/Screen/.source/emptyLandscape.otp
share/apps/kpresenter/templates/Screen/.source/emptyLandscapeWide.otp
share/apps/kpresenter/templates/Screen/emptyLandscape.desktop
share/apps/kpresenter/templates/Screen/emptyLandscapeWide.desktop
+share/apps/kpresenter/templates/exportHTML/slides.html
+share/apps/kpresenter/templates/exportHTML/templates/Default.zip
+share/apps/kpresenter/templates/exportHTML/toc.html
+share/apps/kpresenter/templates/odf/.directory
+share/apps/kpresenter/templates/odf/.source/blue_orange_vector.otp
+share/apps/kpresenter/templates/odf/.source/burning_desire.otp
+share/apps/kpresenter/templates/odf/.source/business.otp
+share/apps/kpresenter/templates/odf/.source/flood_light.otp
+share/apps/kpresenter/templates/odf/.source/rounded_square.otp
+share/apps/kpresenter/templates/odf/.source/simple_waves.otp
+share/apps/kpresenter/templates/odf/.source/skyline_monotone.otp
+share/apps/kpresenter/templates/odf/.source/skyline_monotone_wide.otp
+share/apps/kpresenter/templates/odf/.source/skyline_morning.otp
+share/apps/kpresenter/templates/odf/.source/skyline_morning_wide.otp
+share/apps/kpresenter/templates/odf/.source/skyline_night.otp
+share/apps/kpresenter/templates/odf/.source/skyline_night_wide.otp
+share/apps/kpresenter/templates/odf/.source/strange_far_hills.otp
+share/apps/kpresenter/templates/odf/blue_orange_vector.desktop
+share/apps/kpresenter/templates/odf/burning_desire.desktop
+share/apps/kpresenter/templates/odf/business.desktop
+share/apps/kpresenter/templates/odf/flood_light.desktop
+share/apps/kpresenter/templates/odf/rounded_square.desktop
+share/apps/kpresenter/templates/odf/simple_waves.desktop
+share/apps/kpresenter/templates/odf/skyline_monotone.desktop
+share/apps/kpresenter/templates/odf/skyline_monotone_wide.desktop
+share/apps/kpresenter/templates/odf/skyline_morning.desktop
+share/apps/kpresenter/templates/odf/skyline_morning_wide.desktop
+share/apps/kpresenter/templates/odf/skyline_night.desktop
+share/apps/kpresenter/templates/odf/skyline_night_wide.desktop
+share/apps/kpresenter/templates/odf/strange_far_hills.desktop
share/apps/krita/backgrounds/old_paper.png
share/apps/krita/brushes/A---1-Basic-Big.vbr
share/apps/krita/brushes/A---1-Blending-brush.vbr
@@ -1551,16 +1528,47 @@ share/apps/krita/brushes/A-starfield.gih
share/apps/krita/brushes/A-starfield2.gih
share/apps/krita/brushes/A-wall-texture.gih
share/apps/krita/brushes/Z-Test-pressure.gih
+share/apps/krita/brushes/ab001.myb
+share/apps/krita/brushes/ab001_prev.png
+share/apps/krita/brushes/ab002.myb
+share/apps/krita/brushes/ab002_prev.png
+share/apps/krita/brushes/ab007.myb
+share/apps/krita/brushes/ab007_prev.png
+share/apps/krita/brushes/ab009.myb
+share/apps/krita/brushes/ab009_prev.png
+share/apps/krita/brushes/ab023.myb
+share/apps/krita/brushes/ab023_prev.png
+share/apps/krita/brushes/ab026.myb
+share/apps/krita/brushes/ab026_prev.png
+share/apps/krita/brushes/ab028.myb
+share/apps/krita/brushes/ab028_prev.png
+share/apps/krita/brushes/ab033.myb
+share/apps/krita/brushes/ab033_prev.png
+share/apps/krita/brushes/ab043.myb
+share/apps/krita/brushes/ab043_prev.png
share/apps/krita/brushmodels/3d-deform-brush.mtl
share/apps/krita/brushmodels/3d-deform-brush.obj
-share/apps/krita/brushmodels/3d-pencil.mtl
-share/apps/krita/brushmodels/3d-pencil.obj
share/apps/krita/brushmodels/airbrush.mtl
share/apps/krita/brushmodels/airbrush.obj
share/apps/krita/brushmodels/smudge-finger.mtl
share/apps/krita/brushmodels/smudge-finger.obj
share/apps/krita/brushmodels/stylus.mtl
share/apps/krita/brushmodels/stylus.obj
+share/apps/krita/defaultpresets/chalkbrush.kpp
+share/apps/krita/defaultpresets/complex.kpp
+share/apps/krita/defaultpresets/curvebrush.kpp
+share/apps/krita/defaultpresets/deformbrush.kpp
+share/apps/krita/defaultpresets/duplicate.kpp
+share/apps/krita/defaultpresets/dynabrush.kpp
+share/apps/krita/defaultpresets/eraser.kpp
+share/apps/krita/defaultpresets/experimentbrush.kpp
+share/apps/krita/defaultpresets/filter.kpp
+share/apps/krita/defaultpresets/gridbrush.kpp
+share/apps/krita/defaultpresets/hairybrush.kpp
+share/apps/krita/defaultpresets/paintbrush.kpp
+share/apps/krita/defaultpresets/particlebrush.kpp
+share/apps/krita/defaultpresets/smudge.kpp
+share/apps/krita/defaultpresets/spraybrush.kpp
share/apps/krita/dtd/krita.dtd
share/apps/krita/gradients/Abstract_1.ggr
share/apps/krita/gradients/Abstract_2.ggr
@@ -1641,20 +1649,22 @@ share/apps/krita/gradients/Wood_2.ggr
share/apps/krita/gradients/Yellow_Contrast.ggr
share/apps/krita/gradients/Yellow_Orange.ggr
share/apps/krita/icons/hicolor/48x48/actions/template_cmyk_empty.png
+share/apps/krita/icons/hicolor/48x48/actions/template_comics_empty.png
share/apps/krita/icons/hicolor/48x48/actions/template_gray_empty.png
share/apps/krita/icons/hicolor/48x48/actions/template_rgb_empty.png
-share/apps/krita/images/krita-chalk.png
share/apps/krita/images/krita-curve.png
share/apps/krita/images/krita-deform.png
share/apps/krita/images/krita-duplicate.png
share/apps/krita/images/krita-dyna.png
share/apps/krita/images/krita-eraser.png
share/apps/krita/images/krita-filterop.png
+share/apps/krita/images/krita-grid.png
+share/apps/krita/images/krita-hatching.png
share/apps/krita/images/krita-paintbrush.png
-share/apps/krita/images/krita-pencil.png
share/apps/krita/images/krita-smudgebrush.png
share/apps/krita/images/krita-spray.png
share/apps/krita/images/krita-sumi.png
+share/apps/krita/images/krita_first_start.kra
share/apps/krita/images/previewfilter.png
share/apps/krita/kpartplugins/scan-krita.rc
share/apps/krita/krita.rc
@@ -1667,6 +1677,13 @@ share/apps/krita/metadata/schemas/tiff.schema
share/apps/krita/metadata/schemas/xmp.schema
share/apps/krita/metadata/schemas/xmpmm.schema
share/apps/krita/metadata/schemas/xmprights.schema
+share/apps/krita/paintoppresets/Fur.kpp
+share/apps/krita/paintoppresets/Sketchy.kpp
+share/apps/krita/paintoppresets/chalk.kpp
+share/apps/krita/paintoppresets/chrome.kpp
+share/apps/krita/paintoppresets/pixelpencil.kpp
+share/apps/krita/paintoppresets/shaded.kpp
+share/apps/krita/paintoppresets/softbrush.kpp
share/apps/krita/palettes/1-All-Color-for-good-colors-choice.gpl
share/apps/krita/palettes/1-Pastel-soft-pink.gpl
share/apps/krita/palettes/1-Red-Dragon-cave.gpl
@@ -1751,8 +1768,13 @@ share/apps/krita/pics/arrow_south.png
share/apps/krita/pics/arrow_south_east.png
share/apps/krita/pics/arrow_south_west.png
share/apps/krita/pics/arrow_west.png
-share/apps/krita/pics/closedhand_cursor.xpm
+share/apps/krita/pics/cursor-cross.xpm
share/apps/krita/pics/deletelayer.png
+share/apps/krita/pics/extended_color_selector.png
+share/apps/krita/pics/height_icon.png
+share/apps/krita/pics/kis_colselng_color_patches.png
+share/apps/krita/pics/kis_colselng_color_triangle.png
+share/apps/krita/pics/kis_colselng_my_paint_shade_selector.png
share/apps/krita/pics/krita_draw_path.png
share/apps/krita/pics/krita_tool_color_fill.png
share/apps/krita/pics/krita_tool_color_picker.png
@@ -1775,11 +1797,15 @@ share/apps/krita/pics/locked.png
share/apps/krita/pics/lowerlayer.png
share/apps/krita/pics/newlayer.png
share/apps/krita/pics/novisible.png
-share/apps/krita/pics/openhand_cursor.xpm
+share/apps/krita/pics/offset_horizontal.png
+share/apps/krita/pics/offset_vertical.png
+share/apps/krita/pics/paintop_presets_disabled.png
share/apps/krita/pics/paintop_settings_01.png
share/apps/krita/pics/paintop_settings_02.png
+share/apps/krita/pics/paintop_settings_disabled.png
share/apps/krita/pics/polyline.png
share/apps/krita/pics/raiselayer.png
+share/apps/krita/pics/ratio_icon.png
share/apps/krita/pics/rotate_cursor.xpm
share/apps/krita/pics/select_pixel.png
share/apps/krita/pics/select_shape.png
@@ -1788,6 +1814,8 @@ share/apps/krita/pics/selection_exclude.png
share/apps/krita/pics/selection_intersect.png
share/apps/krita/pics/selection_replace.png
share/apps/krita/pics/selection_subtract.png
+share/apps/krita/pics/shear_horizontal.png
+share/apps/krita/pics/shear_vertical.png
share/apps/krita/pics/tablet.png
share/apps/krita/pics/tool_brush_selection.png
share/apps/krita/pics/tool_brush_selection_cursor.png
@@ -1811,8 +1839,6 @@ share/apps/krita/pics/tool_outline_selection_cursor.png
share/apps/krita/pics/tool_path_selection.png
share/apps/krita/pics/tool_perspectivegrid.png
share/apps/krita/pics/tool_perspectivegrid_cursor.png
-share/apps/krita/pics/tool_perspectivetransform.png
-share/apps/krita/pics/tool_perspectivetransform_cursor.png
share/apps/krita/pics/tool_polygon.png
share/apps/krita/pics/tool_polygon_cursor.png
share/apps/krita/pics/tool_polygonal_selection.png
@@ -1831,25 +1857,7 @@ share/apps/krita/pics/transparency-unlocked.png
share/apps/krita/pics/unlinked.png
share/apps/krita/pics/unlocked.png
share/apps/krita/pics/visible.png
-share/apps/krita/scripts/decorations/VanishingPoints.rb
-share/apps/krita/scripts/dockers/flipbookdocker.rb
-share/apps/krita/scripts/dockers/palettedocker.rb
-share/apps/krita/scripts/extensions/changecs.rb
-share/apps/krita/scripts/extensions/filterstest.rb
-share/apps/krita/scripts/extensions/invert.js
-share/apps/krita/scripts/extensions/invert.py
-share/apps/krita/scripts/extensions/invert.rb
-share/apps/krita/scripts/extensions/pilexport.py
-share/apps/krita/scripts/extensions/pilimport.py
-share/apps/krita/scripts/extensions/pilimport.ui
-share/apps/krita/scripts/extensions/randompaint.rb
-share/apps/krita/scripts/extensions/reshapehisto.py
-share/apps/krita/scripts/extensions/sky.rb
-share/apps/krita/scripts/extensions/torture-filters.rb
-share/apps/krita/scripts/extensions/torture-painting.rb
-share/apps/krita/scripts/filters/invert.rb
-share/apps/krita/scripts/filters/random.rb
-share/apps/krita/scripts/scripts.rc
+share/apps/krita/pics/width_icon.png
share/apps/krita/shaders/bilinear_gradient.frag
share/apps/krita/shaders/conical_gradient.frag
share/apps/krita/shaders/conical_symetric_gradient.frag
@@ -1891,6 +1899,15 @@ share/apps/krita/shaders/square_gradient.frag
share/apps/krita/templates/cmyk/.directory
share/apps/krita/templates/cmyk/.source/white_2000x800.kra
share/apps/krita/templates/cmyk/white_2000x800.desktop
+share/apps/krita/templates/comics/.directory
+share/apps/krita/templates/comics/.source/BD-EuroTemplate.kra
+share/apps/krita/templates/comics/.source/Comics-USTemplate.kra
+share/apps/krita/templates/comics/.source/Manga-JpTemplate.kra
+share/apps/krita/templates/comics/.source/a4_waffle_grid.kra
+share/apps/krita/templates/comics/BD-EuroTemplate.desktop
+share/apps/krita/templates/comics/Comics-USTemplate.desktop
+share/apps/krita/templates/comics/Manga-JpTemplate.desktop
+share/apps/krita/templates/comics/a4_waffle_grid.desktop
share/apps/krita/templates/gray/.directory
share/apps/krita/templates/gray/.source/white_640x480.kra
share/apps/krita/templates/gray/white_640x480.desktop
@@ -1911,9 +1928,7 @@ share/apps/krita/templates/rgb/white_1024x768.desktop
share/apps/krita/templates/rgb/white_1280x1024.desktop
share/apps/krita/templates/rgb/white_1600x1200.desktop
share/apps/krita/templates/rgb/white_640x480.desktop
-share/apps/kritaplugins/backgrounds.rc
share/apps/kritaplugins/bigbrother.rc
-share/apps/kritaplugins/bracketing2hdr.rc
share/apps/kritaplugins/colorrange.rc
share/apps/kritaplugins/colorspaceconversion.rc
share/apps/kritaplugins/dropshadow.rc
@@ -1929,7 +1944,6 @@ share/apps/kritaplugins/metadataeditor/exif.rc
share/apps/kritaplugins/metadataeditor/exif.ui
share/apps/kritaplugins/modify_selection.rc
share/apps/kritaplugins/rotateimage.rc
-share/apps/kritaplugins/scripting.rc
share/apps/kritaplugins/shearimage.rc
share/apps/kritaplugins/together.rc
share/apps/kritaplugins/tonemapping.rc
@@ -2126,6 +2140,7 @@ share/apps/kspread/templates/HomeFamily/BMI.desktop
share/apps/kspread/templates/HomeFamily/CreditCardTracker.desktop
share/apps/kspread/templates/HomeFamily/MenuPlan.desktop
share/apps/kspread/templates/HomeFamily/VacationChecklist.desktop
+share/apps/kword/html-odf/converter.xsl
share/apps/kword/icons/hicolor/128x128/actions/template_colorful.png
share/apps/kword/icons/hicolor/48x48/actions/template_a4.png
share/apps/kword/icons/hicolor/48x48/actions/template_businesscards10.png
@@ -2218,8 +2233,8 @@ share/apps/musicshape/fonts/Emmentaler-14.ttf
%%GTL%%share/apps/pigmentcms/ctlcolorspaces/rgba32f.ctlcs
%%GTL%%share/apps/pigmentcms/ctlcolorspaces/xyza16f.ctlcs
%%GTL%%share/apps/pigmentcms/ctlcolorspaces/xyza32f.ctlcs
-%%GTL%%share/apps/pigmentcms/ctlcolorspaces/ycbcr8u.ctlcs
%%GTL%%share/apps/pigmentcms/ctlcolorspaces/ycbcr16u.ctlcs
+%%GTL%%share/apps/pigmentcms/ctlcolorspaces/ycbcr8u.ctlcs
%%GTL%%share/apps/pigmentcms/ctlcolortransformations/BurnHighlights.ctlt
%%GTL%%share/apps/pigmentcms/ctlcolortransformations/BurnMidtones.ctlt
%%GTL%%share/apps/pigmentcms/ctlcolortransformations/BurnShadows.ctlt
@@ -2266,51 +2281,13 @@ share/config/kexirc
share/config/kplatorc
share/config/kplatoworkrc
share/config/kpresenterrc
+share/config/krita.knsrc
share/config/kritarc
share/config/kspreadrc
share/config/kwordrc
share/doc/HTML/en/karbon/common
share/doc/HTML/en/karbon/index.cache.bz2
share/doc/HTML/en/karbon/index.docbook
-share/doc/HTML/en/kchart/common
-share/doc/HTML/en/kchart/file-toolbar.png
-share/doc/HTML/en/kchart/file-toolbar2.png
-share/doc/HTML/en/kchart/frame_chart.png
-share/doc/HTML/en/kchart/hi22-action-chart_line.png
-share/doc/HTML/en/kchart/hi22-action-data.png
-share/doc/HTML/en/kchart/hi22-action-options.png
-share/doc/HTML/en/kchart/hi22-action-wizard.png
-share/doc/HTML/en/kchart/index.cache.bz2
-share/doc/HTML/en/kchart/index.docbook
-share/doc/HTML/en/kchart/kchart-config1.png
-share/doc/HTML/en/kchart/kchart-config2.png
-share/doc/HTML/en/kchart/kchart-config3.png
-share/doc/HTML/en/kchart/kchart-config4.png
-share/doc/HTML/en/kchart/kchart-config5.png
-share/doc/HTML/en/kchart/kchart-config6.png
-share/doc/HTML/en/kchart/kchart-config7.png
-share/doc/HTML/en/kchart/kchart-config8.png
-share/doc/HTML/en/kchart/kchart-dataeditor.png
-share/doc/HTML/en/kchart/kchart-default.png
-share/doc/HTML/en/kchart/kchart-example1-1.png
-share/doc/HTML/en/kchart/kchart-example1-2.png
-share/doc/HTML/en/kchart/kchart-example1-3.png
-share/doc/HTML/en/kchart/kchart-example1-4.png
-share/doc/HTML/en/kchart/kchart-example1-5.png
-share/doc/HTML/en/kchart/kchart-example1-6.png
-share/doc/HTML/en/kchart/kchart-example1-7.png
-share/doc/HTML/en/kchart/kchart-example1-8.png
-share/doc/HTML/en/kchart/kchart-example1-9.png
-share/doc/HTML/en/kchart/kchart-kspread-bar.png
-share/doc/HTML/en/kchart/kchart-kspread.png
-share/doc/HTML/en/kchart/kchart-startupdialog.png
-share/doc/HTML/en/kchart/kchart-wizard0.png
-share/doc/HTML/en/kchart/kchart-wizard1.png
-share/doc/HTML/en/kchart/kchart-wizard2.png
-share/doc/HTML/en/kchart/kchart-wizard3.png
-share/doc/HTML/en/kchart/kchart-wizard4.png
-share/doc/HTML/en/kchart/shortcut.png
-share/doc/HTML/en/kchart/toolbars.png
share/doc/HTML/en/kexi/basics.docbook
share/doc/HTML/en/kexi/building.docbook
share/doc/HTML/en/kexi/common
@@ -2522,7 +2499,6 @@ share/icons/hicolor/16x16/actions/black.png
share/icons/hicolor/16x16/actions/highlight.png
share/icons/hicolor/16x16/actions/pen.png
share/icons/hicolor/16x16/apps/karbon.png
-share/icons/hicolor/16x16/apps/kchart.png
share/icons/hicolor/16x16/apps/kformula.png
share/icons/hicolor/16x16/apps/kplato.png
share/icons/hicolor/16x16/apps/kplatowork.png
@@ -2543,7 +2519,6 @@ share/icons/hicolor/22x22/apps/kword.png
share/icons/hicolor/22x22/mimetypes/application-x-vnd.kde.kplato.png
share/icons/hicolor/22x22/mimetypes/application-x-vnd.kde.kplato.work.png
share/icons/hicolor/32x32/apps/karbon.png
-share/icons/hicolor/32x32/apps/kchart.png
share/icons/hicolor/32x32/apps/kformula.png
share/icons/hicolor/32x32/apps/kplato.png
share/icons/hicolor/32x32/apps/kplatowork.png
@@ -2555,7 +2530,6 @@ share/icons/hicolor/32x32/mimetypes/application-x-vnd.kde.kplato.png
share/icons/hicolor/32x32/mimetypes/application-x-vnd.kde.kplato.work.png
share/icons/hicolor/45x45/mimetypes/application-x-vnd.kde.kplato.work.png
share/icons/hicolor/48x48/apps/karbon.png
-share/icons/hicolor/48x48/apps/kchart.png
share/icons/hicolor/48x48/apps/kformula.png
share/icons/hicolor/48x48/apps/kplato.png
share/icons/hicolor/48x48/apps/kplatowork.png
@@ -2613,10 +2587,12 @@ share/kde4/services/artistictextshape.desktop
share/kde4/services/autocorrect.desktop
share/kde4/services/changecase.desktop
share/kde4/services/chartshape.desktop
+share/kde4/services/commentshape.desktop
share/kde4/services/defaulttools.desktop
share/kde4/services/divineproportionshape.desktop
share/kde4/services/formulashape.desktop
share/kde4/services/generic_filter.desktop
+share/kde4/services/html-odf_export.desktop
share/kde4/services/karbon_1x_import.desktop
%%EPS%%share/kde4/services/karbon_eps_import.desktop
share/kde4/services/karbon_pdf_import.desktop
@@ -2630,13 +2606,6 @@ share/kde4/services/karbon_wpg_import.desktop
share/kde4/services/karbonfiltereffects.desktop
share/kde4/services/karbonpart.desktop
share/kde4/services/karbontools.desktop
-share/kde4/services/kchart_bmp_export.desktop
-share/kde4/services/kchart_jpeg_export.desktop
-share/kde4/services/kchart_mng_export.desktop
-share/kde4/services/kchart_png_export.desktop
-share/kde4/services/kchart_svg_export.desktop
-share/kde4/services/kchart_xbm_export.desktop
-share/kde4/services/kchart_xpm_export.desktop
share/kde4/services/kchartpart.desktop
share/kde4/services/kexi/kexicsv_importexporthandler.desktop
share/kde4/services/kexi/kexiformhandler.desktop
@@ -2648,6 +2617,7 @@ share/kde4/services/kexi/kexitablehandler.desktop
share/kde4/services/kexidb_mysqldriver.desktop
share/kde4/services/kexidb_pqxxsqldriver.desktop
share/kde4/services/kexidb_sqlite3driver.desktop
+%%SYBASE%%share/kde4/services/kexidb_sybasedriver.desktop
%%XBASE%%share/kde4/services/kexidb_xbasedriver.desktop
share/kde4/services/keximigrate_kspread.desktop
share/kde4/services/keximigrate_mdb.desktop
@@ -2661,10 +2631,14 @@ share/kde4/services/kformdesigner/kformdesigner_containers.desktop
share/kde4/services/kformdesigner/kformdesigner_kexidbfactory.desktop
share/kde4/services/kformdesigner/kformdesigner_stdwidgets.desktop
share/kde4/services/kformulapart.desktop
+share/kde4/services/kodocinfopropspage.desktop
share/kde4/services/kofficedockers.desktop
share/kde4/services/kofficethumbnail.desktop
share/kde4/services/kolcmsengine.desktop
share/kde4/services/kopabackgroundtool.desktop
+share/kde4/services/koreport_barcodeplugin.desktop
+share/kde4/services/koreport_chartplugin.desktop
+share/kde4/services/koreport_shapeplugin.desktop
share/kde4/services/kounavail.desktop
share/kde4/services/kplato_icalendar_export.desktop
share/kde4/services/kplatopart.desktop
@@ -2672,9 +2646,12 @@ share/kde4/services/kplatoworkpart.desktop
share/kde4/services/kpr_pageeffect_barwipe.desktop
share/kde4/services/kpr_pageeffect_clockwipe.desktop
share/kde4/services/kpr_pageeffect_edgewipe.desktop
+share/kde4/services/kpr_pageeffect_fade.desktop
share/kde4/services/kpr_pageeffect_iriswipe.desktop
share/kde4/services/kpr_pageeffect_matrixwipe.desktop
share/kde4/services/kpr_pageeffect_slidewipe.desktop
+share/kde4/services/kpr_pageeffect_spacerotation.desktop
+share/kde4/services/kpr_pageeffect_swapeffect.desktop
share/kde4/services/kpr_shapeanimation_example.desktop
share/kde4/services/kpresenter_powerpoint_import.desktop
share/kde4/services/kpresenter_pptx_import.desktop
@@ -2684,6 +2661,7 @@ share/kde4/services/kpresentertoolanimation.desktop
share/kde4/services/kprvariables.desktop
share/kde4/services/krita_bmp_export.desktop
share/kde4/services/krita_bmp_import.desktop
+share/kde4/services/krita_colorselectorng.desktop
share/kde4/services/krita_colorspaces_extensions_plugin.desktop
%%GTL%%share/kde4/services/krita_ctlcs_plugin.desktop
share/kde4/services/krita_digitalmixer.desktop
@@ -2707,12 +2685,8 @@ share/kde4/services/krita_specificcolorselector.desktop
share/kde4/services/krita_tiff_export.desktop
share/kde4/services/krita_tiff_import.desktop
share/kde4/services/krita_xcf_import.desktop
-share/kde4/services/kritabackgrounds.desktop
share/kde4/services/kritabigbrother.desktop
share/kde4/services/kritablurfilter.desktop
-share/kde4/services/kritabracketing2hdr.desktop
-share/kde4/services/kritabumpmapfilter.desktop
-share/kde4/services/kritachalkpaintop.desktop
share/kde4/services/kritacolorgenerator.desktop
share/kde4/services/kritacolorrange.desktop
share/kde4/services/kritacolorsfilter.desktop
@@ -2734,6 +2708,7 @@ share/kde4/services/kritafastcolortransfer.desktop
share/kde4/services/kritafilterop.desktop
share/kde4/services/kritagridpaintop.desktop
share/kde4/services/kritahairypaintop.desktop
+share/kde4/services/kritahatchingpaintop.desktop
share/kde4/services/kritahistogram.desktop
share/kde4/services/kritaimageenhancement.desktop
share/kde4/services/kritaimagesize.desktop
@@ -2742,7 +2717,6 @@ share/kde4/services/kritalevelfilter.desktop
share/kde4/services/kritametadataeditor.desktop
share/kde4/services/kritamodifyselection.desktop
share/kde4/services/kritanoisefilter.desktop
-share/kde4/services/kritaoilpaintfilter.desktop
share/kde4/services/kritapart.desktop
share/kde4/services/kritaparticlepaintop.desktop
share/kde4/services/kritapixelizefilter.desktop
@@ -2751,15 +2725,12 @@ share/kde4/services/kritarandompickfilter.desktop
share/kde4/services/kritarotateimage.desktop
share/kde4/services/kritaroundcornersfilter.desktop
share/kde4/services/kritarulerassistanttool.desktop
-share/kde4/services/kritascripting.desktop
share/kde4/services/kritaselectiontools.desktop
share/kde4/services/kritaseparatechannels.desktop
share/kde4/services/kritashearimage.desktop
%%GTL%%share/kde4/services/kritashivafilters.desktop
%%GTL%%share/kde4/services/kritashivagenerators.desktop
-share/kde4/services/kritasmalltilesfilter.desktop
-share/kde4/services/kritasobelfilter.desktop
-share/kde4/services/kritasoftpaintop.desktop
+share/kde4/services/kritasketchpaintop.desktop
share/kde4/services/kritaspraypaintop.desktop
share/kde4/services/kritatogether.desktop
share/kde4/services/kritatonemapping.desktop
@@ -2767,7 +2738,6 @@ share/kde4/services/kritatoolcrop.desktop
share/kde4/services/kritatooldyna.desktop
share/kde4/services/kritatoolgrid.desktop
share/kde4/services/kritatoolperspectivegrid.desktop
-share/kde4/services/kritatoolperspectivetransform.desktop
share/kde4/services/kritatoolpolygon.desktop
share/kde4/services/kritatoolpolyline.desktop
share/kde4/services/kritatoolstar.desktop
@@ -2814,6 +2784,7 @@ share/kde4/services/kword_amipro_import.desktop
share/kde4/services/kword_applixword_import.desktop
share/kde4/services/kword_ascii_export.desktop
share/kde4/services/kword_ascii_import.desktop
+share/kde4/services/kword_dcm_import.desktop
share/kde4/services/kword_docbook_export.desktop
share/kde4/services/kword_docx_import.desktop
share/kde4/services/kword_hancomword_import.desktop
@@ -2830,16 +2801,18 @@ share/kde4/services/kword_wml_import.desktop
share/kde4/services/kword_wp_export.desktop
share/kde4/services/kword_wp_import.desktop
share/kde4/services/kwordpart.desktop
+share/kde4/services/libokularGenerator_odp.desktop
share/kde4/services/musicshape.desktop
+share/kde4/services/okularOdp.desktop
share/kde4/services/paragraphtool.desktop
share/kde4/services/pathshapes.desktop
share/kde4/services/pictureshape.desktop
+share/kde4/services/pluginshape.desktop
share/kde4/services/spellcheck.desktop
share/kde4/services/spreadsheetshape.desktop
share/kde4/services/textshape.desktop
share/kde4/services/textvariables.desktop
share/kde4/services/thesaurustool.desktop
-share/kde4/services/vectorshape.desktop
share/kde4/services/videoshape.desktop
share/kde4/services/xslt_export.desktop
share/kde4/services/xslt_import.desktop
@@ -2859,6 +2832,7 @@ share/kde4/servicetypes/kofficepart.desktop
share/kde4/servicetypes/kofilter.desktop
share/kde4/servicetypes/kofilterwrapper.desktop
share/kde4/servicetypes/koplugin.desktop
+share/kde4/servicetypes/koreport_itemplugin.desktop
share/kde4/servicetypes/kplato_schedulerplugin.desktop
share/kde4/servicetypes/kpr_pageeffect.desktop
share/kde4/servicetypes/kpr_shapeanimation.desktop
@@ -2899,7 +2873,6 @@ share/templates/TextDocument.desktop
@dirrm share/doc/HTML/en/koffice
@dirrm share/doc/HTML/en/kformula
@dirrm share/doc/HTML/en/kexi
-@dirrm share/doc/HTML/en/kchart
@dirrm share/doc/HTML/en/karbon
@dirrm share/color/icc/pigment
@dirrm share/color/icc/krita
@@ -2938,6 +2911,7 @@ share/templates/TextDocument.desktop
@dirrm share/apps/kword/icons/hicolor/128x128
@dirrm share/apps/kword/icons/hicolor
@dirrm share/apps/kword/icons
+@dirrm share/apps/kword/html-odf
@dirrm share/apps/kword
@dirrm share/apps/kspread/templates/HomeFamily/.source
@dirrm share/apps/kspread/templates/HomeFamily
@@ -2973,20 +2947,18 @@ share/templates/TextDocument.desktop
@dirrm share/apps/krita/templates/rgb
@dirrm share/apps/krita/templates/gray/.source
@dirrm share/apps/krita/templates/gray
+@dirrm share/apps/krita/templates/comics/.source
+@dirrm share/apps/krita/templates/comics
@dirrm share/apps/krita/templates/cmyk/.source
@dirrm share/apps/krita/templates/cmyk
@dirrm share/apps/krita/templates
%%GTL%%@dirrm share/apps/krita/shiva/kernels
%%GTL%%@dirrm share/apps/krita/shiva
@dirrm share/apps/krita/shaders
-@dirrm share/apps/krita/scripts/filters
-@dirrm share/apps/krita/scripts/extensions
-@dirrm share/apps/krita/scripts/dockers
-@dirrm share/apps/krita/scripts/decorations
-@dirrm share/apps/krita/scripts
@dirrm share/apps/krita/pics
@dirrm share/apps/krita/patterns
@dirrm share/apps/krita/palettes
+@dirrm share/apps/krita/paintoppresets
@dirrm share/apps/krita/metadata/schemas
@dirrm share/apps/krita/metadata
@dirrm share/apps/krita/kpartplugins
@@ -2997,10 +2969,15 @@ share/templates/TextDocument.desktop
@dirrm share/apps/krita/icons
@dirrm share/apps/krita/gradients
@dirrm share/apps/krita/dtd
+@dirrm share/apps/krita/defaultpresets
@dirrm share/apps/krita/brushmodels
@dirrm share/apps/krita/brushes
@dirrm share/apps/krita/backgrounds
@dirrm share/apps/krita
+@dirrm share/apps/kpresenter/templates/odf/.source
+@dirrm share/apps/kpresenter/templates/odf
+@dirrm share/apps/kpresenter/templates/exportHTML/templates
+@dirrm share/apps/kpresenter/templates/exportHTML
@dirrm share/apps/kpresenter/templates/Screen/.source
@dirrm share/apps/kpresenter/templates/Screen
@dirrm share/apps/kpresenter/templates
@@ -3010,6 +2987,8 @@ share/templates/TextDocument.desktop
@dirrm share/apps/kpresenter/kpartplugins
@dirrm share/apps/kpresenter/icons/hicolor/scalable/actions
@dirrm share/apps/kpresenter/icons/hicolor/scalable
+@dirrm share/apps/kpresenter/icons/hicolor/64x64/actions
+@dirrm share/apps/kpresenter/icons/hicolor/64x64
@dirrm share/apps/kpresenter/icons/hicolor/48x48/actions
@dirrm share/apps/kpresenter/icons/hicolor/48x48
@dirrm share/apps/kpresenter/icons/hicolor
@@ -3123,23 +3102,6 @@ share/templates/TextDocument.desktop
@dirrm share/apps/kexi/icons/hicolor
@dirrm share/apps/kexi/icons
@dirrm share/apps/kexi
-@dirrm share/apps/kchart/templates/chart/.source
-@dirrm share/apps/kchart/templates/chart
-@dirrm share/apps/kchart/templates
-@dirrm share/apps/kchart/pics
-@dirrm share/apps/kchart/icons/hicolor/scalable/actions
-@dirrm share/apps/kchart/icons/hicolor/scalable
-@dirrm share/apps/kchart/icons/hicolor/48x48/actions
-@dirrm share/apps/kchart/icons/hicolor/48x48
-@dirrm share/apps/kchart/icons/hicolor/32x32/actions
-@dirrm share/apps/kchart/icons/hicolor/32x32
-@dirrm share/apps/kchart/icons/hicolor/22x22/actions
-@dirrm share/apps/kchart/icons/hicolor/22x22
-@dirrm share/apps/kchart/icons/hicolor/16x16/actions
-@dirrm share/apps/kchart/icons/hicolor/16x16
-@dirrm share/apps/kchart/icons/hicolor
-@dirrm share/apps/kchart/icons
-@dirrm share/apps/kchart
@dirrm share/apps/karbon/templates/Basic/.source
@dirrm share/apps/karbon/templates/Basic
@dirrm share/apps/karbon/templates
diff --git a/french/calligra-l10n/distinfo b/french/calligra-l10n/distinfo
index a0735ae57605..9c6054e8f573 100644
--- a/french/calligra-l10n/distinfo
+++ b/french/calligra-l10n/distinfo
@@ -1,3 +1,2 @@
-MD5 (KDE/koffice-l10n/koffice-l10n-fr-2.2.2.tar.bz2) = 25242975ae4d8575fec807665ee3da06
-SHA256 (KDE/koffice-l10n/koffice-l10n-fr-2.2.2.tar.bz2) = aab32109be8c482a62168c4736135c07ab7983927a939c0164622259e41a683f
-SIZE (KDE/koffice-l10n/koffice-l10n-fr-2.2.2.tar.bz2) = 6367480
+SHA256 (KDE/koffice-l10n/koffice-l10n-fr-2.3.1.tar.bz2) = b700fb94c973f9d37302de70b578f9b9c55a5f7bf8ead36e5c17033a49a63bdc
+SIZE (KDE/koffice-l10n/koffice-l10n-fr-2.3.1.tar.bz2) = 6331869
diff --git a/french/calligra-l10n/pkg-plist b/french/calligra-l10n/pkg-plist
index 85db12bcbe8d..374078311210 100644
--- a/french/calligra-l10n/pkg-plist
+++ b/french/calligra-l10n/pkg-plist
@@ -1,4 +1,3 @@
-share/apps/koffice/autocorrect/fr.xml
share/doc/HTML/fr/karbon/common
share/doc/HTML/fr/karbon/index.cache.bz2
share/doc/HTML/fr/karbon/index.docbook
@@ -35,62 +34,24 @@ share/doc/HTML/fr/kchart/kchart-wizard3.png
share/doc/HTML/fr/kchart/kchart-wizard4.png
share/doc/HTML/fr/kchart/shortcut.png
share/doc/HTML/fr/kchart/toolbars.png
-share/doc/HTML/fr/kformula/ambiguous-string.png
-share/doc/HTML/fr/kformula/common
-share/doc/HTML/fr/kformula/file-toolbar.png
-share/doc/HTML/fr/kformula/file-toolbar2.png
-share/doc/HTML/fr/kformula/green1.png
-share/doc/HTML/fr/kformula/green2.png
-share/doc/HTML/fr/kformula/index.cache.bz2
-share/doc/HTML/fr/kformula/index.docbook
-share/doc/HTML/fr/kformula/kfontinst1.png
-share/doc/HTML/fr/kformula/kfontinst2.png
-share/doc/HTML/fr/kformula/kfontinst3.png
-share/doc/HTML/fr/kformula/kfontinst4.png
-share/doc/HTML/fr/kformula/kfontinst5.png
-share/doc/HTML/fr/kformula/rk-edit0.png
-share/doc/HTML/fr/kformula/rk-edit1.png
-share/doc/HTML/fr/kformula/rk-edit2.png
-share/doc/HTML/fr/kformula/scilab-edit.png
-share/doc/HTML/fr/kformula/scilab.png
-share/doc/HTML/fr/kformula/shortcut0.png
-share/doc/HTML/fr/kformula/shortcut1.png
-share/doc/HTML/fr/kformula/toolbars.png
-share/doc/HTML/fr/koffice/common
-share/doc/HTML/fr/koffice/index.cache.bz2
-share/doc/HTML/fr/koffice/index.docbook
-share/doc/HTML/fr/kspread/advanced.docbook
-share/doc/HTML/fr/kspread/basics.docbook
-share/doc/HTML/fr/kspread/cellformat0.png
-share/doc/HTML/fr/kspread/cellformat1.png
-share/doc/HTML/fr/kspread/cellformat2.png
-share/doc/HTML/fr/kspread/cellformat3.png
-share/doc/HTML/fr/kspread/cellformat4.png
-share/doc/HTML/fr/kspread/cellformat5.png
-share/doc/HTML/fr/kspread/chart1.png
-share/doc/HTML/fr/kspread/commands.docbook
-share/doc/HTML/fr/kspread/common
-share/doc/HTML/fr/kspread/config.docbook
-share/doc/HTML/fr/kspread/configdialog.docbook
-share/doc/HTML/fr/kspread/copy1.png
-share/doc/HTML/fr/kspread/faq.docbook
-share/doc/HTML/fr/kspread/format.docbook
-share/doc/HTML/fr/kspread/importexport.docbook
-share/doc/HTML/fr/kspread/index.cache.bz2
-share/doc/HTML/fr/kspread/index.docbook
-share/doc/HTML/fr/kspread/shortcut1.png
-share/doc/HTML/fr/kspread/shortcut2.png
-share/doc/HTML/fr/kspread/shortcut3.png
-share/doc/HTML/fr/kspread/sort1.png
-share/doc/HTML/fr/kspread/starting1.png
+share/doc/HTML/fr/kivio/common
+share/doc/HTML/fr/kivio/credits.docbook
+share/doc/HTML/fr/kivio/index.cache.bz2
+share/doc/HTML/fr/kivio/index.docbook
+share/doc/HTML/fr/kivio/introduction.docbook
+share/doc/HTML/fr/kivio/usage.docbook
+share/doc/HTML/fr/kivio/working.docbook
share/doc/HTML/fr/thesaurus/common
share/doc/HTML/fr/thesaurus/index.cache.bz2
share/doc/HTML/fr/thesaurus/index.docbook
share/locale/fr/LC_MESSAGES/ArtisticTextShape.mo
share/locale/fr/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/fr/LC_MESSAGES/BarcodePlugin.mo
share/locale/fr/LC_MESSAGES/CalendarTool.mo
share/locale/fr/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/fr/LC_MESSAGES/ChartPlugin.mo
share/locale/fr/LC_MESSAGES/ChartShape.mo
+share/locale/fr/LC_MESSAGES/CommentShape.mo
share/locale/fr/LC_MESSAGES/DivineProportion.mo
share/locale/fr/LC_MESSAGES/FormulaShape.mo
share/locale/fr/LC_MESSAGES/KarbonTools.mo
@@ -99,6 +60,8 @@ share/locale/fr/LC_MESSAGES/MusicShape.mo
share/locale/fr/LC_MESSAGES/ParagraphTool.mo
share/locale/fr/LC_MESSAGES/PathShapes.mo
share/locale/fr/LC_MESSAGES/PictureShape.mo
+share/locale/fr/LC_MESSAGES/PluginShape.mo
+share/locale/fr/LC_MESSAGES/ShapePlugin.mo
share/locale/fr/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/fr/LC_MESSAGES/TableShape.mo
share/locale/fr/LC_MESSAGES/TextShape.mo
@@ -120,6 +83,7 @@ share/locale/fr/LC_MESSAGES/koproperty.mo
share/locale/fr/LC_MESSAGES/kounavail.mo
share/locale/fr/LC_MESSAGES/kplato.mo
share/locale/fr/LC_MESSAGES/kplatolibs.mo
+share/locale/fr/LC_MESSAGES/kplatorcpsplugin.mo
share/locale/fr/LC_MESSAGES/kplatowork.mo
share/locale/fr/LC_MESSAGES/kpresenter.mo
share/locale/fr/LC_MESSAGES/krita.mo
@@ -133,10 +97,6 @@ share/locale/fr/LC_MESSAGES/kthesaurus.mo
share/locale/fr/LC_MESSAGES/kword.mo
share/locale/fr/LC_MESSAGES/thesaurus_tool.mo
@dirrm share/doc/HTML/fr/thesaurus
-@dirrm share/doc/HTML/fr/kspread
-@dirrm share/doc/HTML/fr/koffice
-@dirrm share/doc/HTML/fr/kformula
+@dirrm share/doc/HTML/fr/kivio
@dirrm share/doc/HTML/fr/kchart
@dirrm share/doc/HTML/fr/karbon
-@dirrmtry share/apps/koffice/autocorrect
-@dirrmtry share/apps/koffice
diff --git a/french/koffice-kde4-l10n/distinfo b/french/koffice-kde4-l10n/distinfo
index a0735ae57605..9c6054e8f573 100644
--- a/french/koffice-kde4-l10n/distinfo
+++ b/french/koffice-kde4-l10n/distinfo
@@ -1,3 +1,2 @@
-MD5 (KDE/koffice-l10n/koffice-l10n-fr-2.2.2.tar.bz2) = 25242975ae4d8575fec807665ee3da06
-SHA256 (KDE/koffice-l10n/koffice-l10n-fr-2.2.2.tar.bz2) = aab32109be8c482a62168c4736135c07ab7983927a939c0164622259e41a683f
-SIZE (KDE/koffice-l10n/koffice-l10n-fr-2.2.2.tar.bz2) = 6367480
+SHA256 (KDE/koffice-l10n/koffice-l10n-fr-2.3.1.tar.bz2) = b700fb94c973f9d37302de70b578f9b9c55a5f7bf8ead36e5c17033a49a63bdc
+SIZE (KDE/koffice-l10n/koffice-l10n-fr-2.3.1.tar.bz2) = 6331869
diff --git a/french/koffice-kde4-l10n/pkg-plist b/french/koffice-kde4-l10n/pkg-plist
index 85db12bcbe8d..374078311210 100644
--- a/french/koffice-kde4-l10n/pkg-plist
+++ b/french/koffice-kde4-l10n/pkg-plist
@@ -1,4 +1,3 @@
-share/apps/koffice/autocorrect/fr.xml
share/doc/HTML/fr/karbon/common
share/doc/HTML/fr/karbon/index.cache.bz2
share/doc/HTML/fr/karbon/index.docbook
@@ -35,62 +34,24 @@ share/doc/HTML/fr/kchart/kchart-wizard3.png
share/doc/HTML/fr/kchart/kchart-wizard4.png
share/doc/HTML/fr/kchart/shortcut.png
share/doc/HTML/fr/kchart/toolbars.png
-share/doc/HTML/fr/kformula/ambiguous-string.png
-share/doc/HTML/fr/kformula/common
-share/doc/HTML/fr/kformula/file-toolbar.png
-share/doc/HTML/fr/kformula/file-toolbar2.png
-share/doc/HTML/fr/kformula/green1.png
-share/doc/HTML/fr/kformula/green2.png
-share/doc/HTML/fr/kformula/index.cache.bz2
-share/doc/HTML/fr/kformula/index.docbook
-share/doc/HTML/fr/kformula/kfontinst1.png
-share/doc/HTML/fr/kformula/kfontinst2.png
-share/doc/HTML/fr/kformula/kfontinst3.png
-share/doc/HTML/fr/kformula/kfontinst4.png
-share/doc/HTML/fr/kformula/kfontinst5.png
-share/doc/HTML/fr/kformula/rk-edit0.png
-share/doc/HTML/fr/kformula/rk-edit1.png
-share/doc/HTML/fr/kformula/rk-edit2.png
-share/doc/HTML/fr/kformula/scilab-edit.png
-share/doc/HTML/fr/kformula/scilab.png
-share/doc/HTML/fr/kformula/shortcut0.png
-share/doc/HTML/fr/kformula/shortcut1.png
-share/doc/HTML/fr/kformula/toolbars.png
-share/doc/HTML/fr/koffice/common
-share/doc/HTML/fr/koffice/index.cache.bz2
-share/doc/HTML/fr/koffice/index.docbook
-share/doc/HTML/fr/kspread/advanced.docbook
-share/doc/HTML/fr/kspread/basics.docbook
-share/doc/HTML/fr/kspread/cellformat0.png
-share/doc/HTML/fr/kspread/cellformat1.png
-share/doc/HTML/fr/kspread/cellformat2.png
-share/doc/HTML/fr/kspread/cellformat3.png
-share/doc/HTML/fr/kspread/cellformat4.png
-share/doc/HTML/fr/kspread/cellformat5.png
-share/doc/HTML/fr/kspread/chart1.png
-share/doc/HTML/fr/kspread/commands.docbook
-share/doc/HTML/fr/kspread/common
-share/doc/HTML/fr/kspread/config.docbook
-share/doc/HTML/fr/kspread/configdialog.docbook
-share/doc/HTML/fr/kspread/copy1.png
-share/doc/HTML/fr/kspread/faq.docbook
-share/doc/HTML/fr/kspread/format.docbook
-share/doc/HTML/fr/kspread/importexport.docbook
-share/doc/HTML/fr/kspread/index.cache.bz2
-share/doc/HTML/fr/kspread/index.docbook
-share/doc/HTML/fr/kspread/shortcut1.png
-share/doc/HTML/fr/kspread/shortcut2.png
-share/doc/HTML/fr/kspread/shortcut3.png
-share/doc/HTML/fr/kspread/sort1.png
-share/doc/HTML/fr/kspread/starting1.png
+share/doc/HTML/fr/kivio/common
+share/doc/HTML/fr/kivio/credits.docbook
+share/doc/HTML/fr/kivio/index.cache.bz2
+share/doc/HTML/fr/kivio/index.docbook
+share/doc/HTML/fr/kivio/introduction.docbook
+share/doc/HTML/fr/kivio/usage.docbook
+share/doc/HTML/fr/kivio/working.docbook
share/doc/HTML/fr/thesaurus/common
share/doc/HTML/fr/thesaurus/index.cache.bz2
share/doc/HTML/fr/thesaurus/index.docbook
share/locale/fr/LC_MESSAGES/ArtisticTextShape.mo
share/locale/fr/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/fr/LC_MESSAGES/BarcodePlugin.mo
share/locale/fr/LC_MESSAGES/CalendarTool.mo
share/locale/fr/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/fr/LC_MESSAGES/ChartPlugin.mo
share/locale/fr/LC_MESSAGES/ChartShape.mo
+share/locale/fr/LC_MESSAGES/CommentShape.mo
share/locale/fr/LC_MESSAGES/DivineProportion.mo
share/locale/fr/LC_MESSAGES/FormulaShape.mo
share/locale/fr/LC_MESSAGES/KarbonTools.mo
@@ -99,6 +60,8 @@ share/locale/fr/LC_MESSAGES/MusicShape.mo
share/locale/fr/LC_MESSAGES/ParagraphTool.mo
share/locale/fr/LC_MESSAGES/PathShapes.mo
share/locale/fr/LC_MESSAGES/PictureShape.mo
+share/locale/fr/LC_MESSAGES/PluginShape.mo
+share/locale/fr/LC_MESSAGES/ShapePlugin.mo
share/locale/fr/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/fr/LC_MESSAGES/TableShape.mo
share/locale/fr/LC_MESSAGES/TextShape.mo
@@ -120,6 +83,7 @@ share/locale/fr/LC_MESSAGES/koproperty.mo
share/locale/fr/LC_MESSAGES/kounavail.mo
share/locale/fr/LC_MESSAGES/kplato.mo
share/locale/fr/LC_MESSAGES/kplatolibs.mo
+share/locale/fr/LC_MESSAGES/kplatorcpsplugin.mo
share/locale/fr/LC_MESSAGES/kplatowork.mo
share/locale/fr/LC_MESSAGES/kpresenter.mo
share/locale/fr/LC_MESSAGES/krita.mo
@@ -133,10 +97,6 @@ share/locale/fr/LC_MESSAGES/kthesaurus.mo
share/locale/fr/LC_MESSAGES/kword.mo
share/locale/fr/LC_MESSAGES/thesaurus_tool.mo
@dirrm share/doc/HTML/fr/thesaurus
-@dirrm share/doc/HTML/fr/kspread
-@dirrm share/doc/HTML/fr/koffice
-@dirrm share/doc/HTML/fr/kformula
+@dirrm share/doc/HTML/fr/kivio
@dirrm share/doc/HTML/fr/kchart
@dirrm share/doc/HTML/fr/karbon
-@dirrmtry share/apps/koffice/autocorrect
-@dirrmtry share/apps/koffice
diff --git a/german/calligra-l10n/distinfo b/german/calligra-l10n/distinfo
index efc0ed42399c..c79d21a53138 100644
--- a/german/calligra-l10n/distinfo
+++ b/german/calligra-l10n/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-de-2.2.2.tar.bz2) = 161a92273355bdee8cde14853a032f2ade9b5501c37754b69e0148aa64decfb0
-SIZE (KDE/koffice-l10n/koffice-l10n-de-2.2.2.tar.bz2) = 1282437
+SHA256 (KDE/koffice-l10n/koffice-l10n-de-2.3.1.tar.bz2) = 5a424b1d61075804a04285ef6f7ae7f0d73ee1ad593fbe888eb93224f08effa2
+SIZE (KDE/koffice-l10n/koffice-l10n-de-2.3.1.tar.bz2) = 1309419
diff --git a/german/calligra-l10n/pkg-plist b/german/calligra-l10n/pkg-plist
index c5558fbca6c4..c6a7a320ff72 100644
--- a/german/calligra-l10n/pkg-plist
+++ b/german/calligra-l10n/pkg-plist
@@ -1,4 +1,3 @@
-share/apps/koffice/autocorrect/de.xml
share/doc/HTML/de/karbon/common
share/doc/HTML/de/karbon/index.cache.bz2
share/doc/HTML/de/karbon/index.docbook
@@ -60,6 +59,13 @@ share/doc/HTML/de/kformula/scilab-edit.png
share/doc/HTML/de/kformula/shortcut0.png
share/doc/HTML/de/kformula/shortcut1.png
share/doc/HTML/de/kformula/toolbars.png
+share/doc/HTML/de/kivio/common
+share/doc/HTML/de/kivio/credits.docbook
+share/doc/HTML/de/kivio/index.cache.bz2
+share/doc/HTML/de/kivio/index.docbook
+share/doc/HTML/de/kivio/introduction.docbook
+share/doc/HTML/de/kivio/usage.docbook
+share/doc/HTML/de/kivio/working.docbook
share/doc/HTML/de/koffice/common
share/doc/HTML/de/koffice/index.cache.bz2
share/doc/HTML/de/koffice/index.docbook
@@ -95,18 +101,22 @@ share/doc/HTML/de/thesaurus/index.cache.bz2
share/doc/HTML/de/thesaurus/index.docbook
share/locale/de/LC_MESSAGES/ArtisticTextShape.mo
share/locale/de/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/de/LC_MESSAGES/BarcodePlugin.mo
share/locale/de/LC_MESSAGES/CalendarTool.mo
share/locale/de/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/de/LC_MESSAGES/ChartPlugin.mo
share/locale/de/LC_MESSAGES/ChartShape.mo
+share/locale/de/LC_MESSAGES/CommentShape.mo
share/locale/de/LC_MESSAGES/DivineProportion.mo
share/locale/de/LC_MESSAGES/FormulaShape.mo
-share/locale/de/LC_MESSAGES/FreOffice.mo
share/locale/de/LC_MESSAGES/KarbonTools.mo
share/locale/de/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/de/LC_MESSAGES/MusicShape.mo
share/locale/de/LC_MESSAGES/ParagraphTool.mo
share/locale/de/LC_MESSAGES/PathShapes.mo
share/locale/de/LC_MESSAGES/PictureShape.mo
+share/locale/de/LC_MESSAGES/PluginShape.mo
+share/locale/de/LC_MESSAGES/ShapePlugin.mo
share/locale/de/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/de/LC_MESSAGES/TableShape.mo
share/locale/de/LC_MESSAGES/TextShape.mo
@@ -145,9 +155,8 @@ share/locale/de/LC_MESSAGES/thesaurus_tool.mo
@dirrm share/doc/HTML/de/kspread
@dirrm share/doc/HTML/de/kpresenter
@dirrm share/doc/HTML/de/koffice
+@dirrm share/doc/HTML/de/kivio
@dirrm share/doc/HTML/de/kformula
@dirrm share/doc/HTML/de/kexi
@dirrm share/doc/HTML/de/kchart
@dirrm share/doc/HTML/de/karbon
-@dirrmtry share/apps/koffice/autocorrect
-@dirrmtry share/apps/koffice
diff --git a/german/koffice-kde4-l10n/distinfo b/german/koffice-kde4-l10n/distinfo
index efc0ed42399c..c79d21a53138 100644
--- a/german/koffice-kde4-l10n/distinfo
+++ b/german/koffice-kde4-l10n/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-de-2.2.2.tar.bz2) = 161a92273355bdee8cde14853a032f2ade9b5501c37754b69e0148aa64decfb0
-SIZE (KDE/koffice-l10n/koffice-l10n-de-2.2.2.tar.bz2) = 1282437
+SHA256 (KDE/koffice-l10n/koffice-l10n-de-2.3.1.tar.bz2) = 5a424b1d61075804a04285ef6f7ae7f0d73ee1ad593fbe888eb93224f08effa2
+SIZE (KDE/koffice-l10n/koffice-l10n-de-2.3.1.tar.bz2) = 1309419
diff --git a/german/koffice-kde4-l10n/pkg-plist b/german/koffice-kde4-l10n/pkg-plist
index c5558fbca6c4..c6a7a320ff72 100644
--- a/german/koffice-kde4-l10n/pkg-plist
+++ b/german/koffice-kde4-l10n/pkg-plist
@@ -1,4 +1,3 @@
-share/apps/koffice/autocorrect/de.xml
share/doc/HTML/de/karbon/common
share/doc/HTML/de/karbon/index.cache.bz2
share/doc/HTML/de/karbon/index.docbook
@@ -60,6 +59,13 @@ share/doc/HTML/de/kformula/scilab-edit.png
share/doc/HTML/de/kformula/shortcut0.png
share/doc/HTML/de/kformula/shortcut1.png
share/doc/HTML/de/kformula/toolbars.png
+share/doc/HTML/de/kivio/common
+share/doc/HTML/de/kivio/credits.docbook
+share/doc/HTML/de/kivio/index.cache.bz2
+share/doc/HTML/de/kivio/index.docbook
+share/doc/HTML/de/kivio/introduction.docbook
+share/doc/HTML/de/kivio/usage.docbook
+share/doc/HTML/de/kivio/working.docbook
share/doc/HTML/de/koffice/common
share/doc/HTML/de/koffice/index.cache.bz2
share/doc/HTML/de/koffice/index.docbook
@@ -95,18 +101,22 @@ share/doc/HTML/de/thesaurus/index.cache.bz2
share/doc/HTML/de/thesaurus/index.docbook
share/locale/de/LC_MESSAGES/ArtisticTextShape.mo
share/locale/de/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/de/LC_MESSAGES/BarcodePlugin.mo
share/locale/de/LC_MESSAGES/CalendarTool.mo
share/locale/de/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/de/LC_MESSAGES/ChartPlugin.mo
share/locale/de/LC_MESSAGES/ChartShape.mo
+share/locale/de/LC_MESSAGES/CommentShape.mo
share/locale/de/LC_MESSAGES/DivineProportion.mo
share/locale/de/LC_MESSAGES/FormulaShape.mo
-share/locale/de/LC_MESSAGES/FreOffice.mo
share/locale/de/LC_MESSAGES/KarbonTools.mo
share/locale/de/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/de/LC_MESSAGES/MusicShape.mo
share/locale/de/LC_MESSAGES/ParagraphTool.mo
share/locale/de/LC_MESSAGES/PathShapes.mo
share/locale/de/LC_MESSAGES/PictureShape.mo
+share/locale/de/LC_MESSAGES/PluginShape.mo
+share/locale/de/LC_MESSAGES/ShapePlugin.mo
share/locale/de/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/de/LC_MESSAGES/TableShape.mo
share/locale/de/LC_MESSAGES/TextShape.mo
@@ -145,9 +155,8 @@ share/locale/de/LC_MESSAGES/thesaurus_tool.mo
@dirrm share/doc/HTML/de/kspread
@dirrm share/doc/HTML/de/kpresenter
@dirrm share/doc/HTML/de/koffice
+@dirrm share/doc/HTML/de/kivio
@dirrm share/doc/HTML/de/kformula
@dirrm share/doc/HTML/de/kexi
@dirrm share/doc/HTML/de/kchart
@dirrm share/doc/HTML/de/karbon
-@dirrmtry share/apps/koffice/autocorrect
-@dirrmtry share/apps/koffice
diff --git a/hungarian/calligra-l10n/Makefile b/hungarian/calligra-l10n/Makefile
new file mode 100644
index 000000000000..cdbf330a4db9
--- /dev/null
+++ b/hungarian/calligra-l10n/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for: koffice-kde4-l10n-hu
+# Date created: 2011-01-05
+# Whom: Max Brazhnikov <makc@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= koffice-l10n
+PORTVERSION= ${KOFFICE2_VERSION}
+CATEGORIES?= editors kde
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Hungarian messages and documentation for KOffice2
+
+KOFFICE2_L10N= hu
+
+.include "${.CURDIR}/../../editors/koffice-kde4-l10n/files/bsd.l10n.mk"
+.include <bsd.port.mk>
diff --git a/hungarian/calligra-l10n/distinfo b/hungarian/calligra-l10n/distinfo
new file mode 100644
index 000000000000..546ababb9bc2
--- /dev/null
+++ b/hungarian/calligra-l10n/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/koffice-l10n/koffice-l10n-hu-2.3.1.tar.bz2) = 7c9d94aa30951b87c49f0c58002eba5819fe6102e34c043009e94eea5b136504
+SIZE (KDE/koffice-l10n/koffice-l10n-hu-2.3.1.tar.bz2) = 383920
diff --git a/hungarian/calligra-l10n/pkg-descr b/hungarian/calligra-l10n/pkg-descr
new file mode 100644
index 000000000000..9cb0386755e8
--- /dev/null
+++ b/hungarian/calligra-l10n/pkg-descr
@@ -0,0 +1,3 @@
+Localized messages and documentation for koffice.
+
+WWW: http://koffice.kde.org/
diff --git a/hungarian/calligra-l10n/pkg-plist b/hungarian/calligra-l10n/pkg-plist
new file mode 100644
index 000000000000..74a66d7eb57b
--- /dev/null
+++ b/hungarian/calligra-l10n/pkg-plist
@@ -0,0 +1,50 @@
+share/locale/hu/LC_MESSAGES/ArtisticTextShape.mo
+share/locale/hu/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/hu/LC_MESSAGES/BarcodePlugin.mo
+share/locale/hu/LC_MESSAGES/CalendarTool.mo
+share/locale/hu/LC_MESSAGES/ChartPlugin.mo
+share/locale/hu/LC_MESSAGES/ChartShape.mo
+share/locale/hu/LC_MESSAGES/CommentShape.mo
+share/locale/hu/LC_MESSAGES/DivineProportion.mo
+share/locale/hu/LC_MESSAGES/FormulaShape.mo
+share/locale/hu/LC_MESSAGES/KarbonTools.mo
+share/locale/hu/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
+share/locale/hu/LC_MESSAGES/MusicShape.mo
+share/locale/hu/LC_MESSAGES/ParagraphTool.mo
+share/locale/hu/LC_MESSAGES/PathShapes.mo
+share/locale/hu/LC_MESSAGES/PictureShape.mo
+share/locale/hu/LC_MESSAGES/PluginShape.mo
+share/locale/hu/LC_MESSAGES/ShapePlugin.mo
+share/locale/hu/LC_MESSAGES/SpellCheckPlugin.mo
+share/locale/hu/LC_MESSAGES/TableShape.mo
+share/locale/hu/LC_MESSAGES/TextShape.mo
+share/locale/hu/LC_MESSAGES/VariablesPlugin.mo
+share/locale/hu/LC_MESSAGES/VideoShape.mo
+share/locale/hu/LC_MESSAGES/desktop_koffice.mo
+share/locale/hu/LC_MESSAGES/karbon.mo
+share/locale/hu/LC_MESSAGES/kchart.mo
+share/locale/hu/LC_MESSAGES/kexi.mo
+share/locale/hu/LC_MESSAGES/kformula.mo
+share/locale/hu/LC_MESSAGES/kocolorspaces.mo
+share/locale/hu/LC_MESSAGES/koconverter.mo
+share/locale/hu/LC_MESSAGES/koffice-defaulttools.mo
+share/locale/hu/LC_MESSAGES/koffice-dockers.mo
+share/locale/hu/LC_MESSAGES/koffice-simpletextedit.mo
+share/locale/hu/LC_MESSAGES/koffice.mo
+share/locale/hu/LC_MESSAGES/kofficefilters.mo
+share/locale/hu/LC_MESSAGES/koproperty.mo
+share/locale/hu/LC_MESSAGES/kounavail.mo
+share/locale/hu/LC_MESSAGES/kplato.mo
+share/locale/hu/LC_MESSAGES/kplatolibs.mo
+share/locale/hu/LC_MESSAGES/kplatowork.mo
+share/locale/hu/LC_MESSAGES/kpresenter.mo
+share/locale/hu/LC_MESSAGES/krita.mo
+share/locale/hu/LC_MESSAGES/krossmodulekplato.mo
+share/locale/hu/LC_MESSAGES/krossmodulekspread.mo
+share/locale/hu/LC_MESSAGES/krossmodulekword.mo
+share/locale/hu/LC_MESSAGES/kscan_plugin.mo
+share/locale/hu/LC_MESSAGES/kspread.mo
+share/locale/hu/LC_MESSAGES/kspreadsolver.mo
+share/locale/hu/LC_MESSAGES/kthesaurus.mo
+share/locale/hu/LC_MESSAGES/kword.mo
+share/locale/hu/LC_MESSAGES/thesaurus_tool.mo
diff --git a/hungarian/koffice-kde4-l10n/Makefile b/hungarian/koffice-kde4-l10n/Makefile
new file mode 100644
index 000000000000..cdbf330a4db9
--- /dev/null
+++ b/hungarian/koffice-kde4-l10n/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for: koffice-kde4-l10n-hu
+# Date created: 2011-01-05
+# Whom: Max Brazhnikov <makc@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= koffice-l10n
+PORTVERSION= ${KOFFICE2_VERSION}
+CATEGORIES?= editors kde
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Hungarian messages and documentation for KOffice2
+
+KOFFICE2_L10N= hu
+
+.include "${.CURDIR}/../../editors/koffice-kde4-l10n/files/bsd.l10n.mk"
+.include <bsd.port.mk>
diff --git a/hungarian/koffice-kde4-l10n/distinfo b/hungarian/koffice-kde4-l10n/distinfo
new file mode 100644
index 000000000000..546ababb9bc2
--- /dev/null
+++ b/hungarian/koffice-kde4-l10n/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/koffice-l10n/koffice-l10n-hu-2.3.1.tar.bz2) = 7c9d94aa30951b87c49f0c58002eba5819fe6102e34c043009e94eea5b136504
+SIZE (KDE/koffice-l10n/koffice-l10n-hu-2.3.1.tar.bz2) = 383920
diff --git a/hungarian/koffice-kde4-l10n/pkg-descr b/hungarian/koffice-kde4-l10n/pkg-descr
new file mode 100644
index 000000000000..9cb0386755e8
--- /dev/null
+++ b/hungarian/koffice-kde4-l10n/pkg-descr
@@ -0,0 +1,3 @@
+Localized messages and documentation for koffice.
+
+WWW: http://koffice.kde.org/
diff --git a/hungarian/koffice-kde4-l10n/pkg-plist b/hungarian/koffice-kde4-l10n/pkg-plist
new file mode 100644
index 000000000000..74a66d7eb57b
--- /dev/null
+++ b/hungarian/koffice-kde4-l10n/pkg-plist
@@ -0,0 +1,50 @@
+share/locale/hu/LC_MESSAGES/ArtisticTextShape.mo
+share/locale/hu/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/hu/LC_MESSAGES/BarcodePlugin.mo
+share/locale/hu/LC_MESSAGES/CalendarTool.mo
+share/locale/hu/LC_MESSAGES/ChartPlugin.mo
+share/locale/hu/LC_MESSAGES/ChartShape.mo
+share/locale/hu/LC_MESSAGES/CommentShape.mo
+share/locale/hu/LC_MESSAGES/DivineProportion.mo
+share/locale/hu/LC_MESSAGES/FormulaShape.mo
+share/locale/hu/LC_MESSAGES/KarbonTools.mo
+share/locale/hu/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
+share/locale/hu/LC_MESSAGES/MusicShape.mo
+share/locale/hu/LC_MESSAGES/ParagraphTool.mo
+share/locale/hu/LC_MESSAGES/PathShapes.mo
+share/locale/hu/LC_MESSAGES/PictureShape.mo
+share/locale/hu/LC_MESSAGES/PluginShape.mo
+share/locale/hu/LC_MESSAGES/ShapePlugin.mo
+share/locale/hu/LC_MESSAGES/SpellCheckPlugin.mo
+share/locale/hu/LC_MESSAGES/TableShape.mo
+share/locale/hu/LC_MESSAGES/TextShape.mo
+share/locale/hu/LC_MESSAGES/VariablesPlugin.mo
+share/locale/hu/LC_MESSAGES/VideoShape.mo
+share/locale/hu/LC_MESSAGES/desktop_koffice.mo
+share/locale/hu/LC_MESSAGES/karbon.mo
+share/locale/hu/LC_MESSAGES/kchart.mo
+share/locale/hu/LC_MESSAGES/kexi.mo
+share/locale/hu/LC_MESSAGES/kformula.mo
+share/locale/hu/LC_MESSAGES/kocolorspaces.mo
+share/locale/hu/LC_MESSAGES/koconverter.mo
+share/locale/hu/LC_MESSAGES/koffice-defaulttools.mo
+share/locale/hu/LC_MESSAGES/koffice-dockers.mo
+share/locale/hu/LC_MESSAGES/koffice-simpletextedit.mo
+share/locale/hu/LC_MESSAGES/koffice.mo
+share/locale/hu/LC_MESSAGES/kofficefilters.mo
+share/locale/hu/LC_MESSAGES/koproperty.mo
+share/locale/hu/LC_MESSAGES/kounavail.mo
+share/locale/hu/LC_MESSAGES/kplato.mo
+share/locale/hu/LC_MESSAGES/kplatolibs.mo
+share/locale/hu/LC_MESSAGES/kplatowork.mo
+share/locale/hu/LC_MESSAGES/kpresenter.mo
+share/locale/hu/LC_MESSAGES/krita.mo
+share/locale/hu/LC_MESSAGES/krossmodulekplato.mo
+share/locale/hu/LC_MESSAGES/krossmodulekspread.mo
+share/locale/hu/LC_MESSAGES/krossmodulekword.mo
+share/locale/hu/LC_MESSAGES/kscan_plugin.mo
+share/locale/hu/LC_MESSAGES/kspread.mo
+share/locale/hu/LC_MESSAGES/kspreadsolver.mo
+share/locale/hu/LC_MESSAGES/kthesaurus.mo
+share/locale/hu/LC_MESSAGES/kword.mo
+share/locale/hu/LC_MESSAGES/thesaurus_tool.mo
diff --git a/japanese/koffice-kde4-l10n/distinfo b/japanese/koffice-kde4-l10n/distinfo
index 07dbf50f34b0..fd17b5d35b69 100644
--- a/japanese/koffice-kde4-l10n/distinfo
+++ b/japanese/koffice-kde4-l10n/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-ja-2.2.2.tar.bz2) = d4699cf315f6d68dd5a8235a5dcb4819a1ff90c0bc084923aecc8eda2d9ed972
-SIZE (KDE/koffice-l10n/koffice-l10n-ja-2.2.2.tar.bz2) = 292978
+SHA256 (KDE/koffice-l10n/koffice-l10n-ja-2.3.1.tar.bz2) = 8a3cf11dbf8a671cee212bae1a0aa4703e42ae4195160dc8b1e03ffaa880771f
+SIZE (KDE/koffice-l10n/koffice-l10n-ja-2.3.1.tar.bz2) = 301209
diff --git a/japanese/koffice-kde4-l10n/pkg-plist b/japanese/koffice-kde4-l10n/pkg-plist
index 8ec21c9d4f61..86f5e276e77e 100644
--- a/japanese/koffice-kde4-l10n/pkg-plist
+++ b/japanese/koffice-kde4-l10n/pkg-plist
@@ -1,17 +1,21 @@
share/locale/ja/LC_MESSAGES/ArtisticTextShape.mo
share/locale/ja/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/ja/LC_MESSAGES/BarcodePlugin.mo
share/locale/ja/LC_MESSAGES/CalendarTool.mo
share/locale/ja/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/ja/LC_MESSAGES/ChartPlugin.mo
share/locale/ja/LC_MESSAGES/ChartShape.mo
+share/locale/ja/LC_MESSAGES/CommentShape.mo
share/locale/ja/LC_MESSAGES/DivineProportion.mo
share/locale/ja/LC_MESSAGES/FormulaShape.mo
-share/locale/ja/LC_MESSAGES/FreOffice.mo
share/locale/ja/LC_MESSAGES/KarbonTools.mo
share/locale/ja/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/ja/LC_MESSAGES/MusicShape.mo
share/locale/ja/LC_MESSAGES/ParagraphTool.mo
share/locale/ja/LC_MESSAGES/PathShapes.mo
share/locale/ja/LC_MESSAGES/PictureShape.mo
+share/locale/ja/LC_MESSAGES/PluginShape.mo
+share/locale/ja/LC_MESSAGES/ShapePlugin.mo
share/locale/ja/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/ja/LC_MESSAGES/TableShape.mo
share/locale/ja/LC_MESSAGES/TextShape.mo
diff --git a/polish/calligra-l10n/Makefile b/polish/calligra-l10n/Makefile
index 00e94ca6fe88..f62d76e68f01 100644
--- a/polish/calligra-l10n/Makefile
+++ b/polish/calligra-l10n/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= koffice-l10n
-PORTVERSION= ${KOFFICE2_VERSION}
+PORTVERSION= 2.2.2
CATEGORIES?= polish editors kde
MAINTAINER= kde@FreeBSD.org
diff --git a/polish/koffice-kde4-l10n/Makefile b/polish/koffice-kde4-l10n/Makefile
index 00e94ca6fe88..f62d76e68f01 100644
--- a/polish/koffice-kde4-l10n/Makefile
+++ b/polish/koffice-kde4-l10n/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= koffice-l10n
-PORTVERSION= ${KOFFICE2_VERSION}
+PORTVERSION= 2.2.2
CATEGORIES?= polish editors kde
MAINTAINER= kde@FreeBSD.org
diff --git a/portuguese/calligra-l10n-pt_BR/distinfo b/portuguese/calligra-l10n-pt_BR/distinfo
index d37e84ac43ac..4c4da4c1d2ac 100644
--- a/portuguese/calligra-l10n-pt_BR/distinfo
+++ b/portuguese/calligra-l10n-pt_BR/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-pt_BR-2.2.2.tar.bz2) = fa6c687090216bb2af23d4a0937b8d614dd7c6b49ce39fc2e9af7b10937d26f9
-SIZE (KDE/koffice-l10n/koffice-l10n-pt_BR-2.2.2.tar.bz2) = 820763
+SHA256 (KDE/koffice-l10n/koffice-l10n-pt_BR-2.3.1.tar.bz2) = 91d7e5ee489b05bf82e744a4d77de94bed777e86b0574bac0bbeb5d8980c6143
+SIZE (KDE/koffice-l10n/koffice-l10n-pt_BR-2.3.1.tar.bz2) = 848637
diff --git a/portuguese/calligra-l10n-pt_BR/pkg-plist b/portuguese/calligra-l10n-pt_BR/pkg-plist
index deb0c2672d59..3b8e366aed2d 100644
--- a/portuguese/calligra-l10n-pt_BR/pkg-plist
+++ b/portuguese/calligra-l10n-pt_BR/pkg-plist
@@ -29,6 +29,13 @@ share/doc/HTML/pt_BR/kexi/querydesigning.docbook
share/doc/HTML/pt_BR/kformula/common
share/doc/HTML/pt_BR/kformula/index.cache.bz2
share/doc/HTML/pt_BR/kformula/index.docbook
+share/doc/HTML/pt_BR/kivio/common
+share/doc/HTML/pt_BR/kivio/credits.docbook
+share/doc/HTML/pt_BR/kivio/index.cache.bz2
+share/doc/HTML/pt_BR/kivio/index.docbook
+share/doc/HTML/pt_BR/kivio/introduction.docbook
+share/doc/HTML/pt_BR/kivio/usage.docbook
+share/doc/HTML/pt_BR/kivio/working.docbook
share/doc/HTML/pt_BR/koffice/common
share/doc/HTML/pt_BR/koffice/index.cache.bz2
share/doc/HTML/pt_BR/koffice/index.docbook
@@ -66,18 +73,22 @@ share/doc/HTML/pt_BR/thesaurus/index.cache.bz2
share/doc/HTML/pt_BR/thesaurus/index.docbook
share/locale/pt_BR/LC_MESSAGES/ArtisticTextShape.mo
share/locale/pt_BR/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/pt_BR/LC_MESSAGES/BarcodePlugin.mo
share/locale/pt_BR/LC_MESSAGES/CalendarTool.mo
share/locale/pt_BR/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/pt_BR/LC_MESSAGES/ChartPlugin.mo
share/locale/pt_BR/LC_MESSAGES/ChartShape.mo
+share/locale/pt_BR/LC_MESSAGES/CommentShape.mo
share/locale/pt_BR/LC_MESSAGES/DivineProportion.mo
share/locale/pt_BR/LC_MESSAGES/FormulaShape.mo
-share/locale/pt_BR/LC_MESSAGES/FreOffice.mo
share/locale/pt_BR/LC_MESSAGES/KarbonTools.mo
share/locale/pt_BR/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/pt_BR/LC_MESSAGES/MusicShape.mo
share/locale/pt_BR/LC_MESSAGES/ParagraphTool.mo
share/locale/pt_BR/LC_MESSAGES/PathShapes.mo
share/locale/pt_BR/LC_MESSAGES/PictureShape.mo
+share/locale/pt_BR/LC_MESSAGES/PluginShape.mo
+share/locale/pt_BR/LC_MESSAGES/ShapePlugin.mo
share/locale/pt_BR/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/pt_BR/LC_MESSAGES/TableShape.mo
share/locale/pt_BR/LC_MESSAGES/TextShape.mo
@@ -116,6 +127,7 @@ share/locale/pt_BR/LC_MESSAGES/thesaurus_tool.mo
@dirrm share/doc/HTML/pt_BR/kspread
@dirrm share/doc/HTML/pt_BR/kpresenter
@dirrm share/doc/HTML/pt_BR/koffice
+@dirrm share/doc/HTML/pt_BR/kivio
@dirrm share/doc/HTML/pt_BR/kformula
@dirrm share/doc/HTML/pt_BR/kexi
@dirrm share/doc/HTML/pt_BR/kchart
diff --git a/portuguese/calligra-l10n/distinfo b/portuguese/calligra-l10n/distinfo
index c5ff2d75a200..47b46ddba1ea 100644
--- a/portuguese/calligra-l10n/distinfo
+++ b/portuguese/calligra-l10n/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-pt-2.2.2.tar.bz2) = 86154c175b38c56d9ff759e8395307232b8a69191d790002cb942d9a49f7972a
-SIZE (KDE/koffice-l10n/koffice-l10n-pt-2.2.2.tar.bz2) = 976389
+SHA256 (KDE/koffice-l10n/koffice-l10n-pt-2.3.1.tar.bz2) = 53e72b3b9bd8880435131bcc8b63c0f14358498befc286d2d23dab7d2d2c7541
+SIZE (KDE/koffice-l10n/koffice-l10n-pt-2.3.1.tar.bz2) = 609680
diff --git a/portuguese/calligra-l10n/pkg-plist b/portuguese/calligra-l10n/pkg-plist
index cd75ec2a90f5..b549a16e6320 100644
--- a/portuguese/calligra-l10n/pkg-plist
+++ b/portuguese/calligra-l10n/pkg-plist
@@ -4,6 +4,21 @@ share/doc/HTML/pt/karbon/index.docbook
share/doc/HTML/pt/kchart/common
share/doc/HTML/pt/kchart/index.cache.bz2
share/doc/HTML/pt/kchart/index.docbook
+share/doc/HTML/pt/kexi/basics.docbook
+share/doc/HTML/pt/kexi/building.docbook
+share/doc/HTML/pt/kexi/common
+share/doc/HTML/pt/kexi/comparing.docbook
+share/doc/HTML/pt/kexi/configuration.docbook
+share/doc/HTML/pt/kexi/credits.docbook
+share/doc/HTML/pt/kexi/database.docbook
+share/doc/HTML/pt/kexi/designingforms.docbook
+share/doc/HTML/pt/kexi/enteringdataintotables.docbook
+share/doc/HTML/pt/kexi/enteringdatausingforms.docbook
+share/doc/HTML/pt/kexi/index.cache.bz2
+share/doc/HTML/pt/kexi/index.docbook
+share/doc/HTML/pt/kexi/intro.docbook
+share/doc/HTML/pt/kexi/menus.docbook
+share/doc/HTML/pt/kexi/querydesigning.docbook
share/doc/HTML/pt/kformula/common
share/doc/HTML/pt/kformula/index.cache.bz2
share/doc/HTML/pt/kformula/index.docbook
@@ -17,9 +32,6 @@ share/doc/HTML/pt/kivio/working.docbook
share/doc/HTML/pt/koffice/common
share/doc/HTML/pt/koffice/index.cache.bz2
share/doc/HTML/pt/koffice/index.docbook
-share/doc/HTML/pt/koshell/common
-share/doc/HTML/pt/koshell/index.cache.bz2
-share/doc/HTML/pt/koshell/index.docbook
share/doc/HTML/pt/kpresenter/a11y.docbook
share/doc/HTML/pt/kpresenter/common
share/doc/HTML/pt/kpresenter/faq.docbook
@@ -31,35 +43,6 @@ share/doc/HTML/pt/kpresenter/menus.docbook
share/doc/HTML/pt/kpresenter/options.docbook
share/doc/HTML/pt/kpresenter/screen.docbook
share/doc/HTML/pt/kpresenter/tutorial.docbook
-share/doc/HTML/pt/krita/commands-dialogs.docbook
-share/doc/HTML/pt/krita/commands-menus.docbook
-share/doc/HTML/pt/krita/commands-palettes.docbook
-share/doc/HTML/pt/krita/commands-toolbars.docbook
-share/doc/HTML/pt/krita/commands.docbook
-share/doc/HTML/pt/krita/common
-share/doc/HTML/pt/krita/credits.docbook
-share/doc/HTML/pt/krita/developers-plugins.docbook
-share/doc/HTML/pt/krita/developers-scripting.docbook
-share/doc/HTML/pt/krita/developers.docbook
-share/doc/HTML/pt/krita/faq.docbook
-share/doc/HTML/pt/krita/index.cache.bz2
-share/doc/HTML/pt/krita/index.docbook
-share/doc/HTML/pt/krita/installation.docbook
-share/doc/HTML/pt/krita/introduction.docbook
-share/doc/HTML/pt/krita/scripting.docbook
-share/doc/HTML/pt/krita/settings.docbook
-share/doc/HTML/pt/krita/tutorial-quick-starts.docbook
-share/doc/HTML/pt/krita/tutorial-select-layer.docbook
-share/doc/HTML/pt/krita/tutorial-starting.docbook
-share/doc/HTML/pt/krita/tutorial-tablet.docbook
-share/doc/HTML/pt/krita/tutorial.docbook
-share/doc/HTML/pt/krita/using-colorspaces.docbook
-share/doc/HTML/pt/krita/using-filters.docbook
-share/doc/HTML/pt/krita/using-images.docbook
-share/doc/HTML/pt/krita/using-layers.docbook
-share/doc/HTML/pt/krita/using-selections.docbook
-share/doc/HTML/pt/krita/using-views.docbook
-share/doc/HTML/pt/krita/using.docbook
share/doc/HTML/pt/kspread/a11y.docbook
share/doc/HTML/pt/kspread/advanced.docbook
share/doc/HTML/pt/kspread/basics.docbook
@@ -72,74 +55,27 @@ share/doc/HTML/pt/kspread/format.docbook
share/doc/HTML/pt/kspread/importexport.docbook
share/doc/HTML/pt/kspread/index.cache.bz2
share/doc/HTML/pt/kspread/index.docbook
-share/doc/HTML/pt/kugar/common
-share/doc/HTML/pt/kugar/datadtd.docbook
-share/doc/HTML/pt/kugar/dataref.docbook
-share/doc/HTML/pt/kugar/designer.docbook
-share/doc/HTML/pt/kugar/index.cache.bz2
-share/doc/HTML/pt/kugar/index.docbook
-share/doc/HTML/pt/kugar/progguide.docbook
-share/doc/HTML/pt/kugar/starting.docbook
-share/doc/HTML/pt/kugar/template-elements.docbook
-share/doc/HTML/pt/kugar/template.docbook
-share/doc/HTML/pt/kugar/templatedtd.docbook
-share/doc/HTML/pt/kugar/tutorial.docbook
-share/doc/HTML/pt/kword/a11y.docbook
-share/doc/HTML/pt/kword/basics.docbook
-share/doc/HTML/pt/kword/bookmarks.docbook
-share/doc/HTML/pt/kword/chapnumb.docbook
-share/doc/HTML/pt/kword/columns.docbook
-share/doc/HTML/pt/kword/common
-share/doc/HTML/pt/kword/doccomments.docbook
-share/doc/HTML/pt/kword/doclinks.docbook
-share/doc/HTML/pt/kword/docstruct.docbook
-share/doc/HTML/pt/kword/docvariables.docbook
-share/doc/HTML/pt/kword/editing.docbook
-share/doc/HTML/pt/kword/expressions.docbook
-share/doc/HTML/pt/kword/footendnotes.docbook
-share/doc/HTML/pt/kword/formatchar.docbook
-share/doc/HTML/pt/kword/formatframes.docbook
-share/doc/HTML/pt/kword/formatpara.docbook
-share/doc/HTML/pt/kword/formulas.docbook
-share/doc/HTML/pt/kword/frames.docbook
-share/doc/HTML/pt/kword/fundimentals.docbook
-share/doc/HTML/pt/kword/graphics.docbook
-share/doc/HTML/pt/kword/headerfooter.docbook
-share/doc/HTML/pt/kword/index.cache.bz2
-share/doc/HTML/pt/kword/index.docbook
-share/doc/HTML/pt/kword/insertfile.docbook
-share/doc/HTML/pt/kword/kparts.docbook
-share/doc/HTML/pt/kword/lists.docbook
-share/doc/HTML/pt/kword/mailmerge.docbook
-share/doc/HTML/pt/kword/mbtb.docbook
-share/doc/HTML/pt/kword/migrating.docbook
-share/doc/HTML/pt/kword/opt.docbook
-share/doc/HTML/pt/kword/pageformat.docbook
-share/doc/HTML/pt/kword/storeprint.docbook
-share/doc/HTML/pt/kword/styles.docbook
-share/doc/HTML/pt/kword/table.docbook
-share/doc/HTML/pt/kword/tabstops.docbook
-share/doc/HTML/pt/kword/techinfo.docbook
-share/doc/HTML/pt/kword/templatecreation.docbook
-share/doc/HTML/pt/kword/toc.docbook
-share/doc/HTML/pt/kword/tutorial.docbook
share/doc/HTML/pt/thesaurus/common
share/doc/HTML/pt/thesaurus/index.cache.bz2
share/doc/HTML/pt/thesaurus/index.docbook
share/locale/pt/LC_MESSAGES/ArtisticTextShape.mo
share/locale/pt/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/pt/LC_MESSAGES/BarcodePlugin.mo
share/locale/pt/LC_MESSAGES/CalendarTool.mo
share/locale/pt/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/pt/LC_MESSAGES/ChartPlugin.mo
share/locale/pt/LC_MESSAGES/ChartShape.mo
+share/locale/pt/LC_MESSAGES/CommentShape.mo
share/locale/pt/LC_MESSAGES/DivineProportion.mo
share/locale/pt/LC_MESSAGES/FormulaShape.mo
-share/locale/pt/LC_MESSAGES/FreOffice.mo
share/locale/pt/LC_MESSAGES/KarbonTools.mo
share/locale/pt/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/pt/LC_MESSAGES/MusicShape.mo
share/locale/pt/LC_MESSAGES/ParagraphTool.mo
share/locale/pt/LC_MESSAGES/PathShapes.mo
share/locale/pt/LC_MESSAGES/PictureShape.mo
+share/locale/pt/LC_MESSAGES/PluginShape.mo
+share/locale/pt/LC_MESSAGES/ShapePlugin.mo
share/locale/pt/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/pt/LC_MESSAGES/TableShape.mo
share/locale/pt/LC_MESSAGES/TextShape.mo
@@ -175,14 +111,11 @@ share/locale/pt/LC_MESSAGES/kthesaurus.mo
share/locale/pt/LC_MESSAGES/kword.mo
share/locale/pt/LC_MESSAGES/thesaurus_tool.mo
@dirrm share/doc/HTML/pt/thesaurus
-@dirrm share/doc/HTML/pt/kword
-@dirrm share/doc/HTML/pt/kugar
@dirrm share/doc/HTML/pt/kspread
-@dirrm share/doc/HTML/pt/krita
@dirrm share/doc/HTML/pt/kpresenter
-@dirrm share/doc/HTML/pt/koshell
@dirrm share/doc/HTML/pt/koffice
@dirrm share/doc/HTML/pt/kivio
@dirrm share/doc/HTML/pt/kformula
+@dirrm share/doc/HTML/pt/kexi
@dirrm share/doc/HTML/pt/kchart
@dirrm share/doc/HTML/pt/karbon
diff --git a/portuguese/koffice-kde4-l10n-pt_BR/distinfo b/portuguese/koffice-kde4-l10n-pt_BR/distinfo
index d37e84ac43ac..4c4da4c1d2ac 100644
--- a/portuguese/koffice-kde4-l10n-pt_BR/distinfo
+++ b/portuguese/koffice-kde4-l10n-pt_BR/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-pt_BR-2.2.2.tar.bz2) = fa6c687090216bb2af23d4a0937b8d614dd7c6b49ce39fc2e9af7b10937d26f9
-SIZE (KDE/koffice-l10n/koffice-l10n-pt_BR-2.2.2.tar.bz2) = 820763
+SHA256 (KDE/koffice-l10n/koffice-l10n-pt_BR-2.3.1.tar.bz2) = 91d7e5ee489b05bf82e744a4d77de94bed777e86b0574bac0bbeb5d8980c6143
+SIZE (KDE/koffice-l10n/koffice-l10n-pt_BR-2.3.1.tar.bz2) = 848637
diff --git a/portuguese/koffice-kde4-l10n-pt_BR/pkg-plist b/portuguese/koffice-kde4-l10n-pt_BR/pkg-plist
index deb0c2672d59..3b8e366aed2d 100644
--- a/portuguese/koffice-kde4-l10n-pt_BR/pkg-plist
+++ b/portuguese/koffice-kde4-l10n-pt_BR/pkg-plist
@@ -29,6 +29,13 @@ share/doc/HTML/pt_BR/kexi/querydesigning.docbook
share/doc/HTML/pt_BR/kformula/common
share/doc/HTML/pt_BR/kformula/index.cache.bz2
share/doc/HTML/pt_BR/kformula/index.docbook
+share/doc/HTML/pt_BR/kivio/common
+share/doc/HTML/pt_BR/kivio/credits.docbook
+share/doc/HTML/pt_BR/kivio/index.cache.bz2
+share/doc/HTML/pt_BR/kivio/index.docbook
+share/doc/HTML/pt_BR/kivio/introduction.docbook
+share/doc/HTML/pt_BR/kivio/usage.docbook
+share/doc/HTML/pt_BR/kivio/working.docbook
share/doc/HTML/pt_BR/koffice/common
share/doc/HTML/pt_BR/koffice/index.cache.bz2
share/doc/HTML/pt_BR/koffice/index.docbook
@@ -66,18 +73,22 @@ share/doc/HTML/pt_BR/thesaurus/index.cache.bz2
share/doc/HTML/pt_BR/thesaurus/index.docbook
share/locale/pt_BR/LC_MESSAGES/ArtisticTextShape.mo
share/locale/pt_BR/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/pt_BR/LC_MESSAGES/BarcodePlugin.mo
share/locale/pt_BR/LC_MESSAGES/CalendarTool.mo
share/locale/pt_BR/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/pt_BR/LC_MESSAGES/ChartPlugin.mo
share/locale/pt_BR/LC_MESSAGES/ChartShape.mo
+share/locale/pt_BR/LC_MESSAGES/CommentShape.mo
share/locale/pt_BR/LC_MESSAGES/DivineProportion.mo
share/locale/pt_BR/LC_MESSAGES/FormulaShape.mo
-share/locale/pt_BR/LC_MESSAGES/FreOffice.mo
share/locale/pt_BR/LC_MESSAGES/KarbonTools.mo
share/locale/pt_BR/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/pt_BR/LC_MESSAGES/MusicShape.mo
share/locale/pt_BR/LC_MESSAGES/ParagraphTool.mo
share/locale/pt_BR/LC_MESSAGES/PathShapes.mo
share/locale/pt_BR/LC_MESSAGES/PictureShape.mo
+share/locale/pt_BR/LC_MESSAGES/PluginShape.mo
+share/locale/pt_BR/LC_MESSAGES/ShapePlugin.mo
share/locale/pt_BR/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/pt_BR/LC_MESSAGES/TableShape.mo
share/locale/pt_BR/LC_MESSAGES/TextShape.mo
@@ -116,6 +127,7 @@ share/locale/pt_BR/LC_MESSAGES/thesaurus_tool.mo
@dirrm share/doc/HTML/pt_BR/kspread
@dirrm share/doc/HTML/pt_BR/kpresenter
@dirrm share/doc/HTML/pt_BR/koffice
+@dirrm share/doc/HTML/pt_BR/kivio
@dirrm share/doc/HTML/pt_BR/kformula
@dirrm share/doc/HTML/pt_BR/kexi
@dirrm share/doc/HTML/pt_BR/kchart
diff --git a/portuguese/koffice-kde4-l10n/distinfo b/portuguese/koffice-kde4-l10n/distinfo
index c5ff2d75a200..47b46ddba1ea 100644
--- a/portuguese/koffice-kde4-l10n/distinfo
+++ b/portuguese/koffice-kde4-l10n/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-pt-2.2.2.tar.bz2) = 86154c175b38c56d9ff759e8395307232b8a69191d790002cb942d9a49f7972a
-SIZE (KDE/koffice-l10n/koffice-l10n-pt-2.2.2.tar.bz2) = 976389
+SHA256 (KDE/koffice-l10n/koffice-l10n-pt-2.3.1.tar.bz2) = 53e72b3b9bd8880435131bcc8b63c0f14358498befc286d2d23dab7d2d2c7541
+SIZE (KDE/koffice-l10n/koffice-l10n-pt-2.3.1.tar.bz2) = 609680
diff --git a/portuguese/koffice-kde4-l10n/pkg-plist b/portuguese/koffice-kde4-l10n/pkg-plist
index cd75ec2a90f5..b549a16e6320 100644
--- a/portuguese/koffice-kde4-l10n/pkg-plist
+++ b/portuguese/koffice-kde4-l10n/pkg-plist
@@ -4,6 +4,21 @@ share/doc/HTML/pt/karbon/index.docbook
share/doc/HTML/pt/kchart/common
share/doc/HTML/pt/kchart/index.cache.bz2
share/doc/HTML/pt/kchart/index.docbook
+share/doc/HTML/pt/kexi/basics.docbook
+share/doc/HTML/pt/kexi/building.docbook
+share/doc/HTML/pt/kexi/common
+share/doc/HTML/pt/kexi/comparing.docbook
+share/doc/HTML/pt/kexi/configuration.docbook
+share/doc/HTML/pt/kexi/credits.docbook
+share/doc/HTML/pt/kexi/database.docbook
+share/doc/HTML/pt/kexi/designingforms.docbook
+share/doc/HTML/pt/kexi/enteringdataintotables.docbook
+share/doc/HTML/pt/kexi/enteringdatausingforms.docbook
+share/doc/HTML/pt/kexi/index.cache.bz2
+share/doc/HTML/pt/kexi/index.docbook
+share/doc/HTML/pt/kexi/intro.docbook
+share/doc/HTML/pt/kexi/menus.docbook
+share/doc/HTML/pt/kexi/querydesigning.docbook
share/doc/HTML/pt/kformula/common
share/doc/HTML/pt/kformula/index.cache.bz2
share/doc/HTML/pt/kformula/index.docbook
@@ -17,9 +32,6 @@ share/doc/HTML/pt/kivio/working.docbook
share/doc/HTML/pt/koffice/common
share/doc/HTML/pt/koffice/index.cache.bz2
share/doc/HTML/pt/koffice/index.docbook
-share/doc/HTML/pt/koshell/common
-share/doc/HTML/pt/koshell/index.cache.bz2
-share/doc/HTML/pt/koshell/index.docbook
share/doc/HTML/pt/kpresenter/a11y.docbook
share/doc/HTML/pt/kpresenter/common
share/doc/HTML/pt/kpresenter/faq.docbook
@@ -31,35 +43,6 @@ share/doc/HTML/pt/kpresenter/menus.docbook
share/doc/HTML/pt/kpresenter/options.docbook
share/doc/HTML/pt/kpresenter/screen.docbook
share/doc/HTML/pt/kpresenter/tutorial.docbook
-share/doc/HTML/pt/krita/commands-dialogs.docbook
-share/doc/HTML/pt/krita/commands-menus.docbook
-share/doc/HTML/pt/krita/commands-palettes.docbook
-share/doc/HTML/pt/krita/commands-toolbars.docbook
-share/doc/HTML/pt/krita/commands.docbook
-share/doc/HTML/pt/krita/common
-share/doc/HTML/pt/krita/credits.docbook
-share/doc/HTML/pt/krita/developers-plugins.docbook
-share/doc/HTML/pt/krita/developers-scripting.docbook
-share/doc/HTML/pt/krita/developers.docbook
-share/doc/HTML/pt/krita/faq.docbook
-share/doc/HTML/pt/krita/index.cache.bz2
-share/doc/HTML/pt/krita/index.docbook
-share/doc/HTML/pt/krita/installation.docbook
-share/doc/HTML/pt/krita/introduction.docbook
-share/doc/HTML/pt/krita/scripting.docbook
-share/doc/HTML/pt/krita/settings.docbook
-share/doc/HTML/pt/krita/tutorial-quick-starts.docbook
-share/doc/HTML/pt/krita/tutorial-select-layer.docbook
-share/doc/HTML/pt/krita/tutorial-starting.docbook
-share/doc/HTML/pt/krita/tutorial-tablet.docbook
-share/doc/HTML/pt/krita/tutorial.docbook
-share/doc/HTML/pt/krita/using-colorspaces.docbook
-share/doc/HTML/pt/krita/using-filters.docbook
-share/doc/HTML/pt/krita/using-images.docbook
-share/doc/HTML/pt/krita/using-layers.docbook
-share/doc/HTML/pt/krita/using-selections.docbook
-share/doc/HTML/pt/krita/using-views.docbook
-share/doc/HTML/pt/krita/using.docbook
share/doc/HTML/pt/kspread/a11y.docbook
share/doc/HTML/pt/kspread/advanced.docbook
share/doc/HTML/pt/kspread/basics.docbook
@@ -72,74 +55,27 @@ share/doc/HTML/pt/kspread/format.docbook
share/doc/HTML/pt/kspread/importexport.docbook
share/doc/HTML/pt/kspread/index.cache.bz2
share/doc/HTML/pt/kspread/index.docbook
-share/doc/HTML/pt/kugar/common
-share/doc/HTML/pt/kugar/datadtd.docbook
-share/doc/HTML/pt/kugar/dataref.docbook
-share/doc/HTML/pt/kugar/designer.docbook
-share/doc/HTML/pt/kugar/index.cache.bz2
-share/doc/HTML/pt/kugar/index.docbook
-share/doc/HTML/pt/kugar/progguide.docbook
-share/doc/HTML/pt/kugar/starting.docbook
-share/doc/HTML/pt/kugar/template-elements.docbook
-share/doc/HTML/pt/kugar/template.docbook
-share/doc/HTML/pt/kugar/templatedtd.docbook
-share/doc/HTML/pt/kugar/tutorial.docbook
-share/doc/HTML/pt/kword/a11y.docbook
-share/doc/HTML/pt/kword/basics.docbook
-share/doc/HTML/pt/kword/bookmarks.docbook
-share/doc/HTML/pt/kword/chapnumb.docbook
-share/doc/HTML/pt/kword/columns.docbook
-share/doc/HTML/pt/kword/common
-share/doc/HTML/pt/kword/doccomments.docbook
-share/doc/HTML/pt/kword/doclinks.docbook
-share/doc/HTML/pt/kword/docstruct.docbook
-share/doc/HTML/pt/kword/docvariables.docbook
-share/doc/HTML/pt/kword/editing.docbook
-share/doc/HTML/pt/kword/expressions.docbook
-share/doc/HTML/pt/kword/footendnotes.docbook
-share/doc/HTML/pt/kword/formatchar.docbook
-share/doc/HTML/pt/kword/formatframes.docbook
-share/doc/HTML/pt/kword/formatpara.docbook
-share/doc/HTML/pt/kword/formulas.docbook
-share/doc/HTML/pt/kword/frames.docbook
-share/doc/HTML/pt/kword/fundimentals.docbook
-share/doc/HTML/pt/kword/graphics.docbook
-share/doc/HTML/pt/kword/headerfooter.docbook
-share/doc/HTML/pt/kword/index.cache.bz2
-share/doc/HTML/pt/kword/index.docbook
-share/doc/HTML/pt/kword/insertfile.docbook
-share/doc/HTML/pt/kword/kparts.docbook
-share/doc/HTML/pt/kword/lists.docbook
-share/doc/HTML/pt/kword/mailmerge.docbook
-share/doc/HTML/pt/kword/mbtb.docbook
-share/doc/HTML/pt/kword/migrating.docbook
-share/doc/HTML/pt/kword/opt.docbook
-share/doc/HTML/pt/kword/pageformat.docbook
-share/doc/HTML/pt/kword/storeprint.docbook
-share/doc/HTML/pt/kword/styles.docbook
-share/doc/HTML/pt/kword/table.docbook
-share/doc/HTML/pt/kword/tabstops.docbook
-share/doc/HTML/pt/kword/techinfo.docbook
-share/doc/HTML/pt/kword/templatecreation.docbook
-share/doc/HTML/pt/kword/toc.docbook
-share/doc/HTML/pt/kword/tutorial.docbook
share/doc/HTML/pt/thesaurus/common
share/doc/HTML/pt/thesaurus/index.cache.bz2
share/doc/HTML/pt/thesaurus/index.docbook
share/locale/pt/LC_MESSAGES/ArtisticTextShape.mo
share/locale/pt/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/pt/LC_MESSAGES/BarcodePlugin.mo
share/locale/pt/LC_MESSAGES/CalendarTool.mo
share/locale/pt/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/pt/LC_MESSAGES/ChartPlugin.mo
share/locale/pt/LC_MESSAGES/ChartShape.mo
+share/locale/pt/LC_MESSAGES/CommentShape.mo
share/locale/pt/LC_MESSAGES/DivineProportion.mo
share/locale/pt/LC_MESSAGES/FormulaShape.mo
-share/locale/pt/LC_MESSAGES/FreOffice.mo
share/locale/pt/LC_MESSAGES/KarbonTools.mo
share/locale/pt/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/pt/LC_MESSAGES/MusicShape.mo
share/locale/pt/LC_MESSAGES/ParagraphTool.mo
share/locale/pt/LC_MESSAGES/PathShapes.mo
share/locale/pt/LC_MESSAGES/PictureShape.mo
+share/locale/pt/LC_MESSAGES/PluginShape.mo
+share/locale/pt/LC_MESSAGES/ShapePlugin.mo
share/locale/pt/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/pt/LC_MESSAGES/TableShape.mo
share/locale/pt/LC_MESSAGES/TextShape.mo
@@ -175,14 +111,11 @@ share/locale/pt/LC_MESSAGES/kthesaurus.mo
share/locale/pt/LC_MESSAGES/kword.mo
share/locale/pt/LC_MESSAGES/thesaurus_tool.mo
@dirrm share/doc/HTML/pt/thesaurus
-@dirrm share/doc/HTML/pt/kword
-@dirrm share/doc/HTML/pt/kugar
@dirrm share/doc/HTML/pt/kspread
-@dirrm share/doc/HTML/pt/krita
@dirrm share/doc/HTML/pt/kpresenter
-@dirrm share/doc/HTML/pt/koshell
@dirrm share/doc/HTML/pt/koffice
@dirrm share/doc/HTML/pt/kivio
@dirrm share/doc/HTML/pt/kformula
+@dirrm share/doc/HTML/pt/kexi
@dirrm share/doc/HTML/pt/kchart
@dirrm share/doc/HTML/pt/karbon
diff --git a/ukrainian/calligra-l10n/distinfo b/ukrainian/calligra-l10n/distinfo
index 3f64227caec2..79bfa0dcd8b4 100644
--- a/ukrainian/calligra-l10n/distinfo
+++ b/ukrainian/calligra-l10n/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-uk-2.2.2.tar.bz2) = a6da893ea11914be77346cb818cb48881a2c7f1f24051a74b7e9b1fd4a890878
-SIZE (KDE/koffice-l10n/koffice-l10n-uk-2.2.2.tar.bz2) = 611069
+SHA256 (KDE/koffice-l10n/koffice-l10n-uk-2.3.1.tar.bz2) = 8bee57111bcb25e686e0fae969722c961e34715bff25b70635d1f4883d3170b7
+SIZE (KDE/koffice-l10n/koffice-l10n-uk-2.3.1.tar.bz2) = 651611
diff --git a/ukrainian/calligra-l10n/pkg-plist b/ukrainian/calligra-l10n/pkg-plist
index 32a5d5d0cbb7..bb08be35b3ae 100644
--- a/ukrainian/calligra-l10n/pkg-plist
+++ b/ukrainian/calligra-l10n/pkg-plist
@@ -22,6 +22,13 @@ share/doc/HTML/uk/kexi/querydesigning.docbook
share/doc/HTML/uk/kformula/common
share/doc/HTML/uk/kformula/index.cache.bz2
share/doc/HTML/uk/kformula/index.docbook
+share/doc/HTML/uk/kivio/common
+share/doc/HTML/uk/kivio/credits.docbook
+share/doc/HTML/uk/kivio/index.cache.bz2
+share/doc/HTML/uk/kivio/index.docbook
+share/doc/HTML/uk/kivio/introduction.docbook
+share/doc/HTML/uk/kivio/usage.docbook
+share/doc/HTML/uk/kivio/working.docbook
share/doc/HTML/uk/koffice/common
share/doc/HTML/uk/koffice/index.cache.bz2
share/doc/HTML/uk/koffice/index.docbook
@@ -53,18 +60,22 @@ share/doc/HTML/uk/thesaurus/index.cache.bz2
share/doc/HTML/uk/thesaurus/index.docbook
share/locale/uk/LC_MESSAGES/ArtisticTextShape.mo
share/locale/uk/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/uk/LC_MESSAGES/BarcodePlugin.mo
share/locale/uk/LC_MESSAGES/CalendarTool.mo
share/locale/uk/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/uk/LC_MESSAGES/ChartPlugin.mo
share/locale/uk/LC_MESSAGES/ChartShape.mo
+share/locale/uk/LC_MESSAGES/CommentShape.mo
share/locale/uk/LC_MESSAGES/DivineProportion.mo
share/locale/uk/LC_MESSAGES/FormulaShape.mo
-share/locale/uk/LC_MESSAGES/FreOffice.mo
share/locale/uk/LC_MESSAGES/KarbonTools.mo
share/locale/uk/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/uk/LC_MESSAGES/MusicShape.mo
share/locale/uk/LC_MESSAGES/ParagraphTool.mo
share/locale/uk/LC_MESSAGES/PathShapes.mo
share/locale/uk/LC_MESSAGES/PictureShape.mo
+share/locale/uk/LC_MESSAGES/PluginShape.mo
+share/locale/uk/LC_MESSAGES/ShapePlugin.mo
share/locale/uk/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/uk/LC_MESSAGES/TableShape.mo
share/locale/uk/LC_MESSAGES/TextShape.mo
@@ -103,6 +114,7 @@ share/locale/uk/LC_MESSAGES/thesaurus_tool.mo
@dirrm share/doc/HTML/uk/kspread
@dirrm share/doc/HTML/uk/kpresenter
@dirrm share/doc/HTML/uk/koffice
+@dirrm share/doc/HTML/uk/kivio
@dirrm share/doc/HTML/uk/kformula
@dirrm share/doc/HTML/uk/kexi
@dirrm share/doc/HTML/uk/kchart
diff --git a/ukrainian/koffice-kde4-l10n/distinfo b/ukrainian/koffice-kde4-l10n/distinfo
index 3f64227caec2..79bfa0dcd8b4 100644
--- a/ukrainian/koffice-kde4-l10n/distinfo
+++ b/ukrainian/koffice-kde4-l10n/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-uk-2.2.2.tar.bz2) = a6da893ea11914be77346cb818cb48881a2c7f1f24051a74b7e9b1fd4a890878
-SIZE (KDE/koffice-l10n/koffice-l10n-uk-2.2.2.tar.bz2) = 611069
+SHA256 (KDE/koffice-l10n/koffice-l10n-uk-2.3.1.tar.bz2) = 8bee57111bcb25e686e0fae969722c961e34715bff25b70635d1f4883d3170b7
+SIZE (KDE/koffice-l10n/koffice-l10n-uk-2.3.1.tar.bz2) = 651611
diff --git a/ukrainian/koffice-kde4-l10n/pkg-plist b/ukrainian/koffice-kde4-l10n/pkg-plist
index 32a5d5d0cbb7..bb08be35b3ae 100644
--- a/ukrainian/koffice-kde4-l10n/pkg-plist
+++ b/ukrainian/koffice-kde4-l10n/pkg-plist
@@ -22,6 +22,13 @@ share/doc/HTML/uk/kexi/querydesigning.docbook
share/doc/HTML/uk/kformula/common
share/doc/HTML/uk/kformula/index.cache.bz2
share/doc/HTML/uk/kformula/index.docbook
+share/doc/HTML/uk/kivio/common
+share/doc/HTML/uk/kivio/credits.docbook
+share/doc/HTML/uk/kivio/index.cache.bz2
+share/doc/HTML/uk/kivio/index.docbook
+share/doc/HTML/uk/kivio/introduction.docbook
+share/doc/HTML/uk/kivio/usage.docbook
+share/doc/HTML/uk/kivio/working.docbook
share/doc/HTML/uk/koffice/common
share/doc/HTML/uk/koffice/index.cache.bz2
share/doc/HTML/uk/koffice/index.docbook
@@ -53,18 +60,22 @@ share/doc/HTML/uk/thesaurus/index.cache.bz2
share/doc/HTML/uk/thesaurus/index.docbook
share/locale/uk/LC_MESSAGES/ArtisticTextShape.mo
share/locale/uk/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/uk/LC_MESSAGES/BarcodePlugin.mo
share/locale/uk/LC_MESSAGES/CalendarTool.mo
share/locale/uk/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/uk/LC_MESSAGES/ChartPlugin.mo
share/locale/uk/LC_MESSAGES/ChartShape.mo
+share/locale/uk/LC_MESSAGES/CommentShape.mo
share/locale/uk/LC_MESSAGES/DivineProportion.mo
share/locale/uk/LC_MESSAGES/FormulaShape.mo
-share/locale/uk/LC_MESSAGES/FreOffice.mo
share/locale/uk/LC_MESSAGES/KarbonTools.mo
share/locale/uk/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
share/locale/uk/LC_MESSAGES/MusicShape.mo
share/locale/uk/LC_MESSAGES/ParagraphTool.mo
share/locale/uk/LC_MESSAGES/PathShapes.mo
share/locale/uk/LC_MESSAGES/PictureShape.mo
+share/locale/uk/LC_MESSAGES/PluginShape.mo
+share/locale/uk/LC_MESSAGES/ShapePlugin.mo
share/locale/uk/LC_MESSAGES/SpellCheckPlugin.mo
share/locale/uk/LC_MESSAGES/TableShape.mo
share/locale/uk/LC_MESSAGES/TextShape.mo
@@ -103,6 +114,7 @@ share/locale/uk/LC_MESSAGES/thesaurus_tool.mo
@dirrm share/doc/HTML/uk/kspread
@dirrm share/doc/HTML/uk/kpresenter
@dirrm share/doc/HTML/uk/koffice
+@dirrm share/doc/HTML/uk/kivio
@dirrm share/doc/HTML/uk/kformula
@dirrm share/doc/HTML/uk/kexi
@dirrm share/doc/HTML/uk/kchart