4 files changed, 46 insertions, 35 deletions

diff --git a/editors/calligra-l10n-nb/Makefile b/editors/calligra-l10n-nb/Makefile
index 9fc75ae830f1..2f5036689b60 100644
--- a/editors/calligra-l10n-nb/Makefile
+++ b/editors/calligra-l10n-nb/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=	Norwegian Bokmaal messages and documentation for KOffice2
+COMMENT=	Norwegian Bokmaal messages and documentation for Calligra
 
-KOFFICE2_L10N=	nb
+CALLIGRA_L10N=	nb
 
-.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-nb/distinfo b/editors/calligra-l10n-nb/distinfo
index a1036cf3d614..54ce7ff8a893 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.3.2.tar.bz2) = 6a2cce45cbb63bb3915536c62199f18e0c3bde6cfac47bbc2ad147bcd40674c1
-SIZE (KDE/koffice-l10n/koffice-l10n-nb-2.3.2.tar.bz2) = 329542
+SHA256 (KDE/calligra-l10n/calligra-l10n-nb-2.4.2.tar.bz2) = 0f7e99dcc03a556f617918d5f34840353b8df951f1c26b62cfd6a94524f3a38c
+SIZE (KDE/calligra-l10n/calligra-l10n-nb-2.4.2.tar.bz2) = 367184
diff --git a/editors/calligra-l10n-nb/pkg-descr b/editors/calligra-l10n-nb/pkg-descr
index 9cb0386755e8..b8f8785a6a78 100644
--- a/editors/calligra-l10n-nb/pkg-descr
+++ b/editors/calligra-l10n-nb/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-nb/pkg-plist b/editors/calligra-l10n-nb/pkg-plist
index 5e1e98f18df4..16d440928fa1 100644
--- a/editors/calligra-l10n-nb/pkg-plist
+++ b/editors/calligra-l10n-nb/pkg-plist
@@ -1,55 +1,66 @@
-share/apps/koffice/autocorrect/nb.xml
+share/apps/calligra/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/MapShape.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
+share/locale/nb/LC_MESSAGES/TreeShape.mo
 share/locale/nb/LC_MESSAGES/VariablesPlugin.mo
+share/locale/nb/LC_MESSAGES/VectorShape.mo
 share/locale/nb/LC_MESSAGES/VideoShape.mo
-share/locale/nb/LC_MESSAGES/desktop_koffice.mo
+share/locale/nb/LC_MESSAGES/braindump.mo
+share/locale/nb/LC_MESSAGES/calligra-defaulttools.mo
+share/locale/nb/LC_MESSAGES/calligra-dockers.mo
+share/locale/nb/LC_MESSAGES/calligra-opener.mo
+share/locale/nb/LC_MESSAGES/calligra.mo
+share/locale/nb/LC_MESSAGES/calligrafilters.mo
+share/locale/nb/LC_MESSAGES/desktop_calligra.mo
+share/locale/nb/LC_MESSAGES/flow.mo
+share/locale/nb/LC_MESSAGES/googledocs_plugin.mo
 share/locale/nb/LC_MESSAGES/karbon.mo
-share/locale/nb/LC_MESSAGES/kchart.mo
 share/locale/nb/LC_MESSAGES/kexi.mo
-share/locale/nb/LC_MESSAGES/kformula.mo
+share/locale/nb/LC_MESSAGES/kformdesigner_mapbrowser.mo
+share/locale/nb/LC_MESSAGES/kformdesigner_webbrowser.mo
+share/locale/nb/LC_MESSAGES/koabstraction.mo
 share/locale/nb/LC_MESSAGES/kocolorspaces.mo
 share/locale/nb/LC_MESSAGES/koconverter.mo
-share/locale/nb/LC_MESSAGES/koffice-defaulttools.mo
-share/locale/nb/LC_MESSAGES/koffice-dockers.mo
-share/locale/nb/LC_MESSAGES/koffice-simpletextedit.mo
-share/locale/nb/LC_MESSAGES/koffice.mo
-share/locale/nb/LC_MESSAGES/kofficefilters.mo
 share/locale/nb/LC_MESSAGES/koproperty.mo
+share/locale/nb/LC_MESSAGES/koreport_barcodeplugin.mo
+share/locale/nb/LC_MESSAGES/koreport_chartplugin.mo
+share/locale/nb/LC_MESSAGES/koreport_mapsplugin.mo
+share/locale/nb/LC_MESSAGES/koreport_shapeplugin.mo
+share/locale/nb/LC_MESSAGES/koreport_webplugin.mo
 share/locale/nb/LC_MESSAGES/kounavail.mo
-share/locale/nb/LC_MESSAGES/kplato.mo
-share/locale/nb/LC_MESSAGES/kplatolibs.mo
-share/locale/nb/LC_MESSAGES/kplatorcpsplugin.mo
-share/locale/nb/LC_MESSAGES/kplatowork.mo
-share/locale/nb/LC_MESSAGES/kpresenter.mo
 share/locale/nb/LC_MESSAGES/krita.mo
-share/locale/nb/LC_MESSAGES/krossmodulekplato.mo
-share/locale/nb/LC_MESSAGES/krossmodulekspread.mo
-share/locale/nb/LC_MESSAGES/krossmodulekword.mo
+share/locale/nb/LC_MESSAGES/krossmoduleplan.mo
+share/locale/nb/LC_MESSAGES/krossmoduletables.mo
+share/locale/nb/LC_MESSAGES/krossmodulewords.mo
 share/locale/nb/LC_MESSAGES/kscan_plugin.mo
-share/locale/nb/LC_MESSAGES/kspread.mo
-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/okularGenerator_odp.mo
+share/locale/nb/LC_MESSAGES/plan.mo
+share/locale/nb/LC_MESSAGES/planlibs.mo
+share/locale/nb/LC_MESSAGES/planrcpsplugin.mo
+share/locale/nb/LC_MESSAGES/plantjplugin.mo
+share/locale/nb/LC_MESSAGES/planwork.mo
+share/locale/nb/LC_MESSAGES/sheets.mo
+share/locale/nb/LC_MESSAGES/stage.mo
+share/locale/nb/LC_MESSAGES/tablessolver.mo
 share/locale/nb/LC_MESSAGES/thesaurus_tool.mo
-@dirrm share/apps/koffice/autocorrect
-@dirrm share/apps/koffice
+share/locale/nb/LC_MESSAGES/words.mo
+@dirrmtry share/apps/calligra/autocorrect
+@dirrmtry share/apps/calligra