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/nb_NO/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/nb_NO/messages.inc')
| -rw-r--r-- | program/localization/nb_NO/messages.inc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/program/localization/nb_NO/messages.inc b/program/localization/nb_NO/messages.inc index c2a489714..47394f374 100644 --- a/program/localization/nb_NO/messages.inc +++ b/program/localization/nb_NO/messages.inc @@ -135,7 +135,6 @@ $messages['importmessagesuccess'] = 'Kopierte $nr meldinger'; $messages['importmessageerror'] = 'Importeringen var mislykket! Den opplastede filen er ikke en gyldig melding, eller er ikke kompatibel med meldingssystemet.'; $messages['opnotpermitted'] = 'Handling ikke tillatt!'; $messages['nofromaddress'] = 'E-postadresse mangler i valgt identitet'; -$messages['editorwarning'] = 'Ved å bytte format til ren tekst vil all tekstformatering gå tapt. Ønsker du å fortsette?'; $messages['httpreceivedencrypterror'] = 'En uopprettelig feil oppsto. Vennligst kontakt systemansvarlig umiddelbart. <b>Din melding kunne ikke sendes.</b>'; $messages['smtpconnerror'] = 'SMTP-feil ($code): Klarte ikke koble til server'; $messages['smtpautherror'] = 'SMTP-feil ($code): Pålogging feilet'; |