From 7e34e4c5b5dac037435d0fc2c6db1f71199006e0 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 15 Nov 2014 04:03:58 -0500
Subject: [PATCH] Merge branch 'release-1.0' of github.com:roundcube/roundcubemail into release-1.0

---
 program/localization/fo_FO/messages.inc |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/program/localization/fo_FO/messages.inc b/program/localization/fo_FO/messages.inc
index 7bec7c9..6bc9573 100644
--- a/program/localization/fo_FO/messages.inc
+++ b/program/localization/fo_FO/messages.inc
@@ -135,7 +135,6 @@
 $messages['importmessageerror'] = 'Innflyting bar ikki til! Tann uppsendi fílurin er ikki gyldigur boð ella postkassa fílur';
 $messages['opnotpermitted'] = 'Ger ikki loyvd!';
 $messages['nofromaddress'] = 'Manglar teldupostur í valda samleika.';
-$messages['editorwarning'] = 'Um tú skiftur til reinan tekst verður øll forsniðing mist. Ynskir tú at halda fram?';
 $messages['httpreceivedencrypterror'] = 'Ein oyðandi samansetings feilur uppstóð. Vinarliga set teg í samband við umsitaran beinanvegin. <b>Tíni boð kundu ikki sendast.</b>';
 $messages['smtpconnerror'] = 'SMTP Feilur ($code): Samband til ambatara riggaði ikki.';
 $messages['smtpautherror'] = 'SMTP Feilur ($code): Atgongd nokta.';

--
Gitblit v1.9.1