4 files changed, 78 insertions, 103 deletions

diff --git a/editors/calligra-l10n-et/Makefile b/editors/calligra-l10n-et/Makefile
index 9f661dde4dde..d7218e496f82 100644
--- a/editors/calligra-l10n-et/Makefile
+++ b/editors/calligra-l10n-et/Makefile
@@ -5,14 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	koffice-l10n
-PORTVERSION=	${KOFFICE2_VERSION}
+PORTNAME=	calligra-l10n
+PORTVERSION=	${CALLIGRA_VERSION}
 CATEGORIES?=	editors kde
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Estonian messages and documentation for KOffice2
+COMMENT=	Estonian messages and documentation for Calligra
 
-KOFFICE2_L10N=	et
+CALLIGRA_L10N=	et
 
-.include "${.CURDIR}/../../editors/koffice-kde4-l10n/files/bsd.l10n.mk"
+.include "${.CURDIR}/../../editors/calligra-l10n/files/bsd.l10n.mk"
 .include <bsd.port.mk>
diff --git a/editors/calligra-l10n-et/distinfo b/editors/calligra-l10n-et/distinfo
index 38cc20ad1623..b88a110381ca 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.3.2.tar.bz2) = e4220a8059dc8c7cc59d0a494b962e05191fee1e9801d2685b5084bc3faccd8d
-SIZE (KDE/koffice-l10n/koffice-l10n-et-2.3.2.tar.bz2) = 732317
+SHA256 (KDE/calligra-l10n/calligra-l10n-et-2.4.2.tar.bz2) = 77549b15b7aaaf5cd79b9344a161063de3ddd08672cbe3eae2d2c601e0600906
+SIZE (KDE/calligra-l10n/calligra-l10n-et-2.4.2.tar.bz2) = 686583
diff --git a/editors/calligra-l10n-et/pkg-descr b/editors/calligra-l10n-et/pkg-descr
index 9cb0386755e8..b8f8785a6a78 100644
--- a/editors/calligra-l10n-et/pkg-descr
+++ b/editors/calligra-l10n-et/pkg-descr
@@ -1,3 +1,3 @@
-Localized messages and documentation for koffice.
+Localized messages and documentation for Calligra.
 
-WWW: http://koffice.kde.org/
+WWW: http://calligra.org
diff --git a/editors/calligra-l10n-et/pkg-plist b/editors/calligra-l10n-et/pkg-plist
index 0c33162c3bfe..5ed24a9ff2c8 100644
--- a/editors/calligra-l10n-et/pkg-plist
+++ b/editors/calligra-l10n-et/pkg-plist
@@ -1,127 +1,102 @@
-share/doc/HTML/et/karbon/common
-share/doc/HTML/et/karbon/index.cache.bz2
-share/doc/HTML/et/karbon/index.docbook
-share/doc/HTML/et/kchart/common
-share/doc/HTML/et/kchart/index.cache.bz2
-share/doc/HTML/et/kchart/index.docbook
-share/doc/HTML/et/kexi/basics.docbook
-share/doc/HTML/et/kexi/building.docbook
-share/doc/HTML/et/kexi/common
-share/doc/HTML/et/kexi/comparing.docbook
-share/doc/HTML/et/kexi/configuration.docbook
-share/doc/HTML/et/kexi/credits.docbook
-share/doc/HTML/et/kexi/database.docbook
-share/doc/HTML/et/kexi/designingforms.docbook
-share/doc/HTML/et/kexi/enteringdataintotables.docbook
-share/doc/HTML/et/kexi/enteringdatausingforms.docbook
-share/doc/HTML/et/kexi/index.cache.bz2
-share/doc/HTML/et/kexi/index.docbook
-share/doc/HTML/et/kexi/intro.docbook
-share/doc/HTML/et/kexi/menus.docbook
-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
-share/doc/HTML/et/kpresenter/a11y.docbook
-share/doc/HTML/et/kpresenter/common
-share/doc/HTML/et/kpresenter/faq.docbook
-share/doc/HTML/et/kpresenter/great-presentations.docbook
-share/doc/HTML/et/kpresenter/guides.docbook
-share/doc/HTML/et/kpresenter/index.cache.bz2
-share/doc/HTML/et/kpresenter/index.docbook
-share/doc/HTML/et/kpresenter/menus.docbook
-share/doc/HTML/et/kpresenter/options.docbook
-share/doc/HTML/et/kpresenter/screen.docbook
-share/doc/HTML/et/kpresenter/tutorial.docbook
-share/doc/HTML/et/kspread/a11y.docbook
-share/doc/HTML/et/kspread/advanced.docbook
-share/doc/HTML/et/kspread/basics.docbook
-share/doc/HTML/et/kspread/chart1.png
-share/doc/HTML/et/kspread/commands.docbook
-share/doc/HTML/et/kspread/common
-share/doc/HTML/et/kspread/config.docbook
-share/doc/HTML/et/kspread/configdialog.docbook
-share/doc/HTML/et/kspread/copy1.png
-share/doc/HTML/et/kspread/faq.docbook
-share/doc/HTML/et/kspread/format.docbook
-share/doc/HTML/et/kspread/importexport.docbook
-share/doc/HTML/et/kspread/index.cache.bz2
-share/doc/HTML/et/kspread/index.docbook
-share/doc/HTML/et/kspread/shortcut1.png
-share/doc/HTML/et/kspread/shortcut2.png
-share/doc/HTML/et/kspread/sort1.png
-share/doc/HTML/et/kspread/starting1.png
+share/doc/HTML/et/calligra/common
+share/doc/HTML/et/calligra/index.cache.bz2
+share/doc/HTML/et/calligra/index.docbook
+share/doc/HTML/et/sheets/a11y.docbook
+share/doc/HTML/et/sheets/advanced.docbook
+share/doc/HTML/et/sheets/basics.docbook
+share/doc/HTML/et/sheets/chart1.png
+share/doc/HTML/et/sheets/commands.docbook
+share/doc/HTML/et/sheets/common
+share/doc/HTML/et/sheets/config.docbook
+share/doc/HTML/et/sheets/configdialog.docbook
+share/doc/HTML/et/sheets/copy1.png
+share/doc/HTML/et/sheets/faq.docbook
+share/doc/HTML/et/sheets/format.docbook
+share/doc/HTML/et/sheets/importexport.docbook
+share/doc/HTML/et/sheets/index.cache.bz2
+share/doc/HTML/et/sheets/index.docbook
+share/doc/HTML/et/sheets/shortcut1.png
+share/doc/HTML/et/sheets/shortcut2.png
+share/doc/HTML/et/sheets/sort1.png
+share/doc/HTML/et/sheets/starting1.png
+share/doc/HTML/et/stage/a11y.docbook
+share/doc/HTML/et/stage/common
+share/doc/HTML/et/stage/faq.docbook
+share/doc/HTML/et/stage/great-presentations.docbook
+share/doc/HTML/et/stage/guides.docbook
+share/doc/HTML/et/stage/index.cache.bz2
+share/doc/HTML/et/stage/index.docbook
+share/doc/HTML/et/stage/menus.docbook
+share/doc/HTML/et/stage/options.docbook
+share/doc/HTML/et/stage/screen.docbook
+share/doc/HTML/et/stage/tutorial.docbook
 share/doc/HTML/et/thesaurus/common
 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/MapShape.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
+share/locale/et/LC_MESSAGES/TreeShape.mo
 share/locale/et/LC_MESSAGES/VariablesPlugin.mo
+share/locale/et/LC_MESSAGES/VectorShape.mo
 share/locale/et/LC_MESSAGES/VideoShape.mo
-share/locale/et/LC_MESSAGES/desktop_koffice.mo
+share/locale/et/LC_MESSAGES/braindump.mo
+share/locale/et/LC_MESSAGES/calligra-defaulttools.mo
+share/locale/et/LC_MESSAGES/calligra-dockers.mo
+share/locale/et/LC_MESSAGES/calligra-opener.mo
+share/locale/et/LC_MESSAGES/calligra.mo
+share/locale/et/LC_MESSAGES/calligrafilters.mo
+share/locale/et/LC_MESSAGES/desktop_calligra.mo
+share/locale/et/LC_MESSAGES/flow.mo
+share/locale/et/LC_MESSAGES/googledocs_plugin.mo
 share/locale/et/LC_MESSAGES/karbon.mo
-share/locale/et/LC_MESSAGES/kchart.mo
 share/locale/et/LC_MESSAGES/kexi.mo
-share/locale/et/LC_MESSAGES/kformula.mo
+share/locale/et/LC_MESSAGES/kformdesigner_mapbrowser.mo
+share/locale/et/LC_MESSAGES/kformdesigner_webbrowser.mo
+share/locale/et/LC_MESSAGES/koabstraction.mo
 share/locale/et/LC_MESSAGES/kocolorspaces.mo
 share/locale/et/LC_MESSAGES/koconverter.mo
-share/locale/et/LC_MESSAGES/koffice-defaulttools.mo
-share/locale/et/LC_MESSAGES/koffice-dockers.mo
-share/locale/et/LC_MESSAGES/koffice-simpletextedit.mo
-share/locale/et/LC_MESSAGES/koffice.mo
-share/locale/et/LC_MESSAGES/kofficefilters.mo
 share/locale/et/LC_MESSAGES/koproperty.mo
+share/locale/et/LC_MESSAGES/koreport_barcodeplugin.mo
+share/locale/et/LC_MESSAGES/koreport_chartplugin.mo
+share/locale/et/LC_MESSAGES/koreport_mapsplugin.mo
+share/locale/et/LC_MESSAGES/koreport_shapeplugin.mo
+share/locale/et/LC_MESSAGES/koreport_webplugin.mo
 share/locale/et/LC_MESSAGES/kounavail.mo
-share/locale/et/LC_MESSAGES/kplato.mo
-share/locale/et/LC_MESSAGES/kplatolibs.mo
-share/locale/et/LC_MESSAGES/kplatorcpsplugin.mo
-share/locale/et/LC_MESSAGES/kplatowork.mo
-share/locale/et/LC_MESSAGES/kpresenter.mo
 share/locale/et/LC_MESSAGES/krita.mo
-share/locale/et/LC_MESSAGES/krossmodulekplato.mo
-share/locale/et/LC_MESSAGES/krossmodulekspread.mo
-share/locale/et/LC_MESSAGES/krossmodulekword.mo
+share/locale/et/LC_MESSAGES/krossmoduleplan.mo
+share/locale/et/LC_MESSAGES/krossmoduletables.mo
+share/locale/et/LC_MESSAGES/krossmodulewords.mo
 share/locale/et/LC_MESSAGES/kscan_plugin.mo
-share/locale/et/LC_MESSAGES/kspread.mo
-share/locale/et/LC_MESSAGES/kspreadsolver.mo
 share/locale/et/LC_MESSAGES/kthesaurus.mo
-share/locale/et/LC_MESSAGES/kword.mo
+share/locale/et/LC_MESSAGES/okularGenerator_odp.mo
+share/locale/et/LC_MESSAGES/plan.mo
+share/locale/et/LC_MESSAGES/planlibs.mo
+share/locale/et/LC_MESSAGES/planrcpsplugin.mo
+share/locale/et/LC_MESSAGES/plantjplugin.mo
+share/locale/et/LC_MESSAGES/planwork.mo
+share/locale/et/LC_MESSAGES/sheets.mo
+share/locale/et/LC_MESSAGES/stage.mo
+share/locale/et/LC_MESSAGES/tablessolver.mo
 share/locale/et/LC_MESSAGES/thesaurus_tool.mo
+share/locale/et/LC_MESSAGES/words.mo
 @dirrm share/doc/HTML/et/thesaurus
-@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
-@dirrm share/doc/HTML/et/karbon
+@dirrm share/doc/HTML/et/stage
+@dirrm share/doc/HTML/et/sheets
+@dirrm share/doc/HTML/et/calligra