From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop

---
 plugins/managesieve/localization/nb_NO.inc |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/plugins/managesieve/localization/nb_NO.inc b/plugins/managesieve/localization/nb_NO.inc
index 167283c..c2c17b2 100644
--- a/plugins/managesieve/localization/nb_NO.inc
+++ b/plugins/managesieve/localization/nb_NO.inc
@@ -57,6 +57,9 @@
 $labels['recipient'] = 'Mottaker';
 $labels['vacationaddresses'] = 'Liste med mottakeradresser (adskilt med komma):';
 $labels['vacationdays'] = 'Periode mellom meldinger (i dager):';
+$labels['vacationinterval'] = 'Periode mellom meldinger:';
+$labels['days'] = 'dager';
+$labels['seconds'] = 'sekunder';
 $labels['vacationreason'] = 'Innhold (begrunnelse for fravær)';
 $labels['vacationsubject'] = 'Meldingsemne:';
 $labels['rulestop'] = 'Stopp evaluering av regler';

--
Gitblit v1.9.1