diff options
author | Cyrill von Wattenwyl <cvw@adfinis.com> | 2014-09-02 11:20:52 +0200 |
---|---|---|
committer | Cyrill von Wattenwyl <cvw@adfinis.com> | 2014-09-02 11:20:52 +0200 |
commit | 11a40dd1fef6c5b78b054617caba4325f95ee386 (patch) | |
tree | de2e1d7efd6423ef4d1256dd5c90a972ad172719 /program/localization/fo_FO/messages.inc | |
parent | 187fd666aa2f32dedfe544d69b7cb213698197f2 (diff) | |
parent | ba084313bfc9c7a5a83e0611fe4376543cc1653d (diff) |
Merge branch 'master' of https://github.com/roundcube/roundcubemail
Conflicts:
plugins/password/config.inc.php.dist
Diffstat (limited to 'program/localization/fo_FO/messages.inc')
-rw-r--r-- | 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 7bec7c974..6bc957342 100644 --- a/program/localization/fo_FO/messages.inc +++ b/program/localization/fo_FO/messages.inc @@ -135,7 +135,6 @@ $messages['importmessagesuccess'] = 'Innflutt $nr boð.'; $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.'; |