summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--program/js/app.js16
-rw-r--r--program/localization/en_US/labels.inc (renamed from program/localization/en/labels.inc)0
-rw-r--r--program/localization/en_US/messages.inc (renamed from program/localization/en/messages.inc)0
-rw-r--r--program/localization/es/labels.inc32
-rw-r--r--program/localization/es/messages.inc22
-rw-r--r--program/localization/fi/labels.inc58
-rw-r--r--program/localization/fi/messages.inc30
-rw-r--r--program/localization/fr/labels.inc78
-rw-r--r--program/localization/fr/messages.inc26
-rw-r--r--program/localization/it/labels.inc18
-rw-r--r--program/localization/it/messages.inc8
-rw-r--r--program/localization/lv/labels.inc2
-rw-r--r--program/localization/lv/messages.inc2
-rw-r--r--program/localization/nb_NO/labels.inc26
-rw-r--r--program/localization/nb_NO/messages.inc4
-rw-r--r--program/localization/nl/messages.inc2
-rw-r--r--program/localization/nn_NO/labels.inc24
-rw-r--r--program/localization/nn_NO/messages.inc4
-rw-r--r--program/localization/pl/labels.inc2
-rw-r--r--program/localization/pl/messages.inc2
-rw-r--r--program/localization/pt_BR/labels.inc44
-rw-r--r--program/localization/pt_BR/messages.inc18
-rw-r--r--program/localization/pt_PT/labels.inc (renamed from program/localization/pt/labels.inc)42
-rw-r--r--program/localization/pt_PT/messages.inc (renamed from program/localization/pt/messages.inc)30
-rwxr-xr-xprogram/localization/ru/labels.inc2
-rwxr-xr-xprogram/localization/ru/messages.inc2
-rw-r--r--program/localization/se/labels.inc70
-rw-r--r--program/localization/se/messages.inc16
-rw-r--r--program/localization/tr/labels.inc124
-rw-r--r--program/localization/tr/messages.inc32
-rwxr-xr-xprogram/localization/tw/labels.inc2
-rwxr-xr-xprogram/localization/tw/messages.inc2
-rw-r--r--program/steps/mail/func.inc10
-rw-r--r--program/steps/mail/getunread.inc1
-rw-r--r--program/steps/mail/sendmail.inc28
-rw-r--r--program/steps/settings/manage_folders.inc10
36 files changed, 394 insertions, 395 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 650dbaaf7..4ed77fb3a 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -2708,8 +2708,8 @@ function rcube_webmail()
console(request_obj.responseText);
// if we get javascript code from server -> execute it
- if (request_obj.responseText && (ctype=='text/javascript' || ctype=='application/x-javascript'))
- eval(request_obj.responseText);
+ if (request_obj.get_text() && (ctype=='text/javascript' || ctype=='application/x-javascript'))
+ eval(request_obj.get_text());
// process the response data according to the sent action
switch (request_obj.__action)
@@ -2966,9 +2966,6 @@ function rcube_http_request()
else if(this.xmlhttp.readyState == 4)
{
- this.responseText = this.xmlhttp.responseText;
- this.responseXML = this.xmlhttp.responseXML;
-
if(this.xmlhttp.status == 0)
this.onabort(this);
else if(this.xmlhttp.status == 200)
@@ -2986,6 +2983,15 @@ function rcube_http_request()
return this.xmlhttp.getResponseHeader(name);
};
+ this.get_text = function()
+ {
+ return this.xmlhttp.responseText;
+ };
+
+ this.get_xml = function()
+ {
+ return this.xmlhttp.responseXML;
+ };
this.reset();
diff --git a/program/localization/en/labels.inc b/program/localization/en_US/labels.inc
index 1355c071d..1355c071d 100644
--- a/program/localization/en/labels.inc
+++ b/program/localization/en_US/labels.inc
diff --git a/program/localization/en/messages.inc b/program/localization/en_US/messages.inc
index 5a662d279..5a662d279 100644
--- a/program/localization/en/messages.inc
+++ b/program/localization/en_US/messages.inc
diff --git a/program/localization/es/labels.inc b/program/localization/es/labels.inc
index 19bad2187..55962c949 100644
--- a/program/localization/es/labels.inc
+++ b/program/localization/es/labels.inc
@@ -19,14 +19,14 @@ $labels = array();
// login page
$labels['username'] = 'Nombre de usuario';
-$labels['password'] = 'Contrase馻';
+$labels['password'] = 'Contrase帽a';
$labels['server'] = 'Servidor';
$labels['login'] = 'Entrar';
// taskbar
-$labels['logout'] = 'Cerrar sesi髇';
+$labels['logout'] = 'Cerrar sesi贸n';
$labels['mail'] = 'E-Mail';
-$labels['settings'] = 'Configuraci髇';
+$labels['settings'] = 'Configuraci贸n';
$labels['addressbook'] = 'Contactos';
// mailbox names
@@ -44,9 +44,9 @@ $labels['cc'] = 'CC';
$labels['bcc'] = 'BCC';
$labels['replyto'] = 'Responder';
$labels['date'] = 'Fecha';
-$labels['size'] = 'Tama駉';
+$labels['size'] = 'Tama帽o';
$labels['priority'] = 'Prioridad';
-$labels['organization'] = 'Organizaci髇';
+$labels['organization'] = 'Organizaci贸n';
// aliases
$labels['reply-to'] = $labels['replyto'];
@@ -59,13 +59,13 @@ $labels['moveto'] = 'mover a...';
$labels['download'] = 'descargar';
$labels['filename'] = 'Nombre del fichero';
-$labels['filesize'] = 'Tama駉 del fichero';
+$labels['filesize'] = 'Tama帽o del fichero';
$labels['preferhtml'] = 'Prefiero HTML';
$labels['htmlmessage'] = 'Mensaje HTML';
$labels['prettydate'] = 'Fechas cortas';
-$labels['addtoaddressbook'] = 'A馻dir a contactos';
+$labels['addtoaddressbook'] = 'A帽adir a contactos';
// weekdays short
$labels['sun'] = 'D';
@@ -83,7 +83,7 @@ $labels['tuesday'] = 'Martes';
$labels['wednesday'] = 'Miercoles';
$labels['thursday'] = 'Jueves';
$labels['friday'] = 'Viernes';
-$labels['saturday'] = 'S醔ado';
+$labels['saturday'] = 'S谩bado';
$labels['today'] = 'Hoy';
@@ -106,19 +106,19 @@ $labels['unread'] = 'No leidos';
// message compose
$labels['compose'] = 'Escribir un mensaje';
$labels['sendmessage'] = 'Enviar ahora el mensaje';
-$labels['addattachment'] = 'A馻dir un fichero';
+$labels['addattachment'] = 'A帽adir un fichero';
$labels['attachments'] = 'Adjuntos';
$labels['upload'] = 'Subir';
$labels['close'] = 'Cerrar';
$labels['low'] = 'Bajo';
-$labels['lowest'] = 'Baj韘imo';
+$labels['lowest'] = 'Baj铆simo';
$labels['normal'] = 'Normal';
$labels['high'] = 'Alto';
-$labels['highest'] = 'Alt韘imo';
+$labels['highest'] = 'Alt铆simo';
-$labels['showimages'] = 'Mostrar im醙enes';
+$labels['showimages'] = 'Mostrar im谩genes';
// address boook
@@ -127,7 +127,7 @@ $labels['firstname'] = 'Nombre';
$labels['surname'] = 'Apellido';
$labels['email'] = 'E-Mail';
-$labels['addcontact'] = 'A馻dir nuevo contacto';
+$labels['addcontact'] = 'A帽adir nuevo contacto';
$labels['editcontact'] = 'Editar contacto';
$labels['edit'] = 'Editar';
@@ -142,7 +142,7 @@ $labels['contactsfromto'] = 'Contactos $from a $to de $count';
// settings
-$labels['settingsfor'] = 'Configuraci髇 para';
+$labels['settingsfor'] = 'Configuraci贸n para';
$labels['preferences'] = 'Preferencias';
$labels['userpreferences'] = 'Preferencias de usuario';
@@ -155,10 +155,10 @@ $labels['newidentity'] = 'Nueva identidad';
$labels['newitem'] = 'Nuevo';
$labels['edititem'] = 'Editar';
-$labels['setdefault'] = 'Seleccionar opci髇 por defecto';
+$labels['setdefault'] = 'Seleccionar opci贸n por defecto';
$labels['language'] = 'Idioma';
$labels['timezone'] = 'Zona horaria';
-$labels['pagesize'] = 'Filas por p醙ina';
+$labels['pagesize'] = 'Filas por p谩gina';
$labels['folders'] = 'Carpetas';
diff --git a/program/localization/es/messages.inc b/program/localization/es/messages.inc
index 15c65600f..228ce7ee4 100644
--- a/program/localization/es/messages.inc
+++ b/program/localization/es/messages.inc
@@ -17,19 +17,19 @@
$messages = array();
-$messages['loginfailed'] = 'Contrase馻 incorrecta';
+$messages['loginfailed'] = 'Contrase帽a incorrecta';
$messages['cookiesdisabled'] = 'Su navegador no acepta cookies';
-$messages['sessionerror'] = 'Su sesi髇 no existe o ha expirado';
+$messages['sessionerror'] = 'Su sesi贸n no existe o ha expirado';
-$messages['imaperror'] = 'Fallo de conexi髇 con el servidor IMAP';
+$messages['imaperror'] = 'Fallo de conexi贸n con el servidor IMAP';
-$messages['nomessagesfound'] = 'No se han encontrado mensajes en este buz髇';
+$messages['nomessagesfound'] = 'No se han encontrado mensajes en este buz贸n';
-$messages['loggedout'] = 'Ha cerrado la sesi髇. asta pronto!';
+$messages['loggedout'] = 'Ha cerrado la sesi贸n. 隆Hasta pronto!';
-$messages['mailboxempty'] = 'El buz髇 esta vacio';
+$messages['mailboxempty'] = 'El buz贸n esta vacio';
$messages['loadingdata'] = 'Cargando datos...';
@@ -37,19 +37,19 @@ $messages['messagesent'] = 'Mensaje enviado correctamente';
$messages['successfullysaved'] = 'guardado correctamente';
-$messages['addedsuccessfully'] = 'Contacto a馻dido correctamente a la libreta de direcciones';
+$messages['addedsuccessfully'] = 'Contacto a帽adido correctamente a la libreta de direcciones';
-$messages['contactexists'] = 'Ya existe un contacto con esta direcci髇 de correo';
+$messages['contactexists'] = 'Ya existe un contacto con esta direcci贸n de correo';
-$messages['blockedimages'] = 'Para proteger su privacidad, las im醙enes remotas han sido bloqueadas en este mensaje';
+$messages['blockedimages'] = 'Para proteger su privacidad, las im谩genes remotas han sido bloqueadas en este mensaje';
-$messages['encryptedmessage'] = 'Este es un mensaje cifrado y no puede ser mostrado. o siento!';
+$messages['encryptedmessage'] = 'Este es un mensaje cifrado y no puede ser mostrado. 隆Lo siento!';
$messages['nocontactsfound'] = 'No hay contactos';
$messages['sendingfailed'] = 'Error al enviar mensaje';
-$messages['errorsaving'] = 'Ocurri un error mientras se guardaba';
+$messages['errorsaving'] = 'Ocurri贸 un error mientras se guardaba';
?>
diff --git a/program/localization/fi/labels.inc b/program/localization/fi/labels.inc
index b92ef7941..3ea0569a9 100644
--- a/program/localization/fi/labels.inc
+++ b/program/localization/fi/labels.inc
@@ -19,34 +19,34 @@
$labels = array();
// login page
-$labels['username'] = 'K鋣tt鋔鋞unnus';
+$labels['username'] = 'K盲ytt盲j盲tunnus';
$labels['password'] = 'Salasana';
$labels['server'] = 'Palvelin';
$labels['login'] = 'Kirjaudu';
// taskbar
$labels['logout'] = 'Kirjaudu ulos';
-$labels['mail'] = 'S鋒k鰌osti';
+$labels['mail'] = 'S盲hk枚posti';
$labels['settings'] = 'Omat asetukset';
$labels['addressbook'] = 'Osoitekirja';
// mailbox names
$labels['inbox'] = 'Saapuneet';
-$labels['sent'] = 'L鋒etetyt';
+$labels['sent'] = 'L盲hetetyt';
$labels['trash'] = 'Roskakori';
$labels['drafts'] = 'Drafts';
$labels['junk'] = 'Roskaposti';
// message listing
$labels['subject'] = 'Aihe';
-$labels['from'] = 'L鋒ett鋔';
+$labels['from'] = 'L盲hett盲j盲';
$labels['to'] = 'Vastaanottaja';
$labels['cc'] = 'Kopio';
$labels['bcc'] = 'Piilokopio';
$labels['replyto'] = 'Reply-To';
-$labels['date'] = 'P鋓v鋣s';
+$labels['date'] = 'P盲iv盲ys';
$labels['size'] = 'Koko';
-$labels['priority'] = 'T鋜keys';
+$labels['priority'] = 'T盲rkeys';
$labels['organization'] = 'Organisaatio';
// aliases
@@ -56,17 +56,17 @@ $labels['mailboxlist'] = 'Kansiot';
$labels['messagesfromto'] = 'Viestit $from-$to/$count';
$labels['messagenrof'] = 'Viesti $nr/$count';
-$labels['moveto'] = 'siirr...';
+$labels['moveto'] = 'siirr盲...';
$labels['download'] = 'lataa';
$labels['filename'] = 'Tiedoston nimi';
$labels['filesize'] = 'Tiedoston koko';
-$labels['preferhtml'] = 'K鋣t HTML:aa';
+$labels['preferhtml'] = 'K盲yt盲 HTML:aa';
$labels['htmlmessage'] = 'HTML-viesti';
-$labels['prettydate'] = 'N鋞it p鋓v鋣kset';
+$labels['prettydate'] = 'N盲tit p盲iv盲ykset';
-$labels['addtoaddressbook'] = 'Lis滗 osoitekirjaan';
+$labels['addtoaddressbook'] = 'Lis盲盲 osoitekirjaan';
// weekdays short
$labels['sun'] = 'Su';
@@ -86,32 +86,32 @@ $labels['thursday'] = 'Torstai';
$labels['friday'] = 'Perjantai';
$labels['saturday'] = 'Lauantai';
-$labels['today'] = 'T鋘滗n';
+$labels['today'] = 'T盲n盲盲n';
// toolbar buttons
$labels['writenewmessage'] = 'Kirjoita uusi viesti';
$labels['replytomessage'] = 'Vastaa viestiin';
$labels['replytoallmessage'] = 'Vastaa kaikille';
-$labels['forwardmessage'] = 'V鋖it viesti';
-$labels['deletemessage'] = 'Siirr viesti roskakoriin';
+$labels['forwardmessage'] = 'V盲lit盲 viesti';
+$labels['deletemessage'] = 'Siirr盲 viesti roskakoriin';
$labels['printmessage'] = 'Tulosta viesti';
-$labels['previousmessages'] = 'N鋣t edelliset viestit';
-$labels['nextmessages'] = 'N鋣t seuraavat viestit';
+$labels['previousmessages'] = 'N盲yt盲 edelliset viestit';
+$labels['nextmessages'] = 'N盲yt盲 seuraavat viestit';
$labels['backtolist'] = 'Takaisin viesteihin';
-$labels['viewsource'] = 'N鋣t l鋒dekoodi';
+$labels['viewsource'] = 'N盲yt盲 l盲hdekoodi';
$labels['select'] = 'Valitse';
$labels['all'] = 'Kaikki';
-$labels['none'] = 'Ei mit滗n';
+$labels['none'] = 'Ei mit盲盲n';
$labels['unread'] = 'Lukemattomat';
// message compose
$labels['compose'] = 'Viestin kirjoitus';
-$labels['sendmessage'] = 'L鋒et viesti';
+$labels['sendmessage'] = 'L盲het盲 viesti';
$labels['addattachment'] = 'Liitetiedosto';
$labels['attachments'] = 'Liitetiedostot';
-$labels['upload'] = 'Lis滗';
+$labels['upload'] = 'Lis盲盲';
$labels['close'] = 'Sulje';
$labels['low'] = 'Matala';
@@ -120,16 +120,16 @@ $labels['normal'] = 'Normaali';
$labels['high'] = 'Korkea';
$labels['highest'] = 'Korkein';
-$labels['showimages'] = 'N鋣t kuvat';
+$labels['showimages'] = 'N盲yt盲 kuvat';
// address boook
-$labels['name'] = 'N鋕yv nimi';
+$labels['name'] = 'N盲kyv盲 nimi';
$labels['firstname'] = 'Etunimi';
$labels['surname'] = 'Sukunimi';
$labels['email'] = 'E-Mail';
-$labels['addcontact'] = 'Lis滗 kontakti';
+$labels['addcontact'] = 'Lis盲盲 kontakti';
$labels['editcontact'] = 'Muokkaa kontaktia';
$labels['edit'] = 'Muokkaa';
@@ -149,11 +149,11 @@ $labels['export'] = 'Vie (export)';
$labels['settingsfor'] = 'Asetukset';
$labels['preferences'] = 'Asetukset';
-$labels['userpreferences'] = 'K鋣tt鋔鋘 asetukset';
-$labels['editpreferences'] = 'Muokkaa k鋣tt鋔鋘 asetuksia';
+$labels['userpreferences'] = 'K盲ytt盲j盲n asetukset';
+$labels['editpreferences'] = 'Muokkaa k盲ytt盲j盲n asetuksia';
$labels['identities'] = 'Identiteetit';
-$labels['manageidentities'] = 'Muokkaa tunnuksen identiteettej';
+$labels['manageidentities'] = 'Muokkaa tunnuksen identiteettej盲';
$labels['newidentity'] = 'Uusi identiteetti';
$labels['newitem'] = 'Uusi';
@@ -161,17 +161,17 @@ $labels['edititem'] = 'Muokkaa';
$labels['setdefault'] = 'Aseta vakioksi';
$labels['language'] = 'Kieli';
-$labels['timezone'] = 'Aikavy鰄yke';
-$labels['pagesize'] = 'Rivej sivulla';
+$labels['timezone'] = 'Aikavy枚hyke';
+$labels['pagesize'] = 'Rivej盲 sivulla';
$labels['folders'] = 'Kansiot';
$labels['foldername'] = 'Kansion nimi';
-$labels['subscribed'] = 'N鋣tet滗n';
+$labels['subscribed'] = 'N盲ytet盲盲n';
$labels['create'] = 'Luo uusi';
$labels['createfolder'] = 'Luo uusi kansio';
$labels['deletefolder'] = 'Poista kansio';
-$labels['managefolders'] = 'Kansioiden yll鋚ito';
+$labels['managefolders'] = 'Kansioiden yll盲pito';
?> \ No newline at end of file
diff --git a/program/localization/fi/messages.inc b/program/localization/fi/messages.inc
index 329085bb8..e1d219689 100644
--- a/program/localization/fi/messages.inc
+++ b/program/localization/fi/messages.inc
@@ -18,43 +18,43 @@
$messages = array();
-$messages['loginfailed'] = 'Sis滗nkirjautuminen ep鋙nnistui';
+$messages['loginfailed'] = 'Sis盲盲nkirjautuminen ep盲onnistui';
-$messages['cookiesdisabled'] = 'Selaimesi ei hyv鋕sy ev鋝teit';
+$messages['cookiesdisabled'] = 'Selaimesi ei hyv盲ksy ev盲steit盲';
-$messages['sessionerror'] = 'Sessio ei kelpaa tai ei ole en滗 voimassa';
+$messages['sessionerror'] = 'Sessio ei kelpaa tai ei ole en盲盲 voimassa';
-$messages['imaperror'] = 'Yhteys IMAP-palvelimeen ep鋙nnistui';
+$messages['imaperror'] = 'Yhteys IMAP-palvelimeen ep盲onnistui';
-$messages['nomessagesfound'] = 'Kansiossa ei ole s鋒k鰌ostiviestej';
+$messages['nomessagesfound'] = 'Kansiossa ei ole s盲hk枚postiviestej盲';
-$messages['loggedout'] = 'Sinut on kirjattu ulos j鋜jestelm鋝t.';
+$messages['loggedout'] = 'Sinut on kirjattu ulos j盲rjestelm盲st盲.';
-$messages['mailboxempty'] = 'Kansio on tyhj';
+$messages['mailboxempty'] = 'Kansio on tyhj盲';
$messages['loadingdata'] = 'Ladataan...';
-$messages['messagesent'] = 'Viesti l鋒etetty';
+$messages['messagesent'] = 'Viesti l盲hetetty';
$messages['successfullysaved'] = 'Tallennus onnistui';
-$messages['addedsuccessfully'] = 'Kontakti lis鋞ty osoitekirjaan';
+$messages['addedsuccessfully'] = 'Kontakti lis盲tty osoitekirjaan';
-$messages['contactexists'] = 'Samalla s鋒k鰌ostiosoitteella on jo olemassa kontakti';
+$messages['contactexists'] = 'Samalla s盲hk枚postiosoitteella on jo olemassa kontakti';
-$messages['blockedimages'] = 'Turvallisuussyist viestin kuvia ei n鋣tetty.';
+$messages['blockedimages'] = 'Turvallisuussyist盲 viestin kuvia ei n盲ytetty.';
-$messages['encryptedmessage'] = 'Viesti on salattu, eik sit voida n鋣tt滗.';
+$messages['encryptedmessage'] = 'Viesti on salattu, eik盲 sit盲 voida n盲ytt盲盲.';
$messages['nocontactsfound'] = 'Ei kontakteja';
-$messages['sendingfailed'] = 'Viestin l鋒etys ep鋙nnistui';
+$messages['sendingfailed'] = 'Viestin l盲hetys ep盲onnistui';
$messages['errorsaving'] = 'Tallennuksessa tapahtui virhe';
-$messages['errormoving'] = 'Viesti ei voitu siirt滗';
+$messages['errormoving'] = 'Viesti盲 ei voitu siirt盲盲';
-$messages['errordeleting'] = 'Viesti ei voitu poistaa';
+$messages['errordeleting'] = 'Viesti盲 ei voitu poistaa';
?> \ No newline at end of file
diff --git a/program/localization/fr/labels.inc b/program/localization/fr/labels.inc
index c429d5b03..183e6a7f0 100644
--- a/program/localization/fr/labels.inc
+++ b/program/localization/fr/labels.inc
@@ -27,12 +27,12 @@ $labels['login'] = 'Connexion';
// taskbar
$labels['logout'] = 'Quitter';
$labels['mail'] = 'e-Mail';
-$labels['settings'] = 'Pr閒閞ences';
+$labels['settings'] = 'Pr茅f茅rences';
$labels['addressbook'] = 'Carnet d\'adresses';
// mailbox names
-$labels['inbox'] = 'Bo顃e de r閏eption';
-$labels['sent'] = 'Messages envoy閟';
+$labels['inbox'] = 'Bo卯te de r茅ception';
+$labels['sent'] = 'Messages envoy茅s';
$labels['trash'] = 'Corbeille';
$labels['drafts'] = 'Brouillons';
$labels['junk'] = 'A trier';
@@ -43,26 +43,26 @@ $labels['from'] = 'De';
$labels['to'] = 'A';
$labels['cc'] = 'Cc';
$labels['bcc'] = 'Cci';
-$labels['replyto'] = 'R閜ondre ';
+$labels['replyto'] = 'R茅pondre 脿';
$labels['date'] = 'Date';
$labels['size'] = 'Taille';
-$labels['priority'] = 'Priorit';
+$labels['priority'] = 'Priorit茅';
$labels['organization'] = 'Organisation';
// aliases
$labels['reply-to'] = $labels['replyto'];
$labels['mailboxlist'] = 'Dossiers';
-$labels['messagesfromto'] = 'Messages $from $to sur $count';
+$labels['messagesfromto'] = 'Messages $from 脿 $to sur $count';
$labels['messagenrof'] = 'Message $nr sur $count';
-$labels['moveto'] = 'D閜lacer vers...';
-$labels['download'] = 'T閘閏harger';
+$labels['moveto'] = 'D茅placer vers...';
+$labels['download'] = 'T茅l茅charger';
$labels['filename'] = 'Nom du fichier';
$labels['filesize'] = 'Taille du fichier';
-$labels['preferhtml'] = 'Pr閒閞er HTML';
+$labels['preferhtml'] = 'Pr茅f茅rer HTML';
$labels['htmlmessage'] = 'Message HTML';
$labels['addtoaddressbook'] = 'Ajouter au carnet d\'adresses';
@@ -88,17 +88,17 @@ $labels['saturday'] = 'Samedi';
$labels['today'] = 'Aujourd\'hui';
// toolbar buttons
-$labels['writenewmessage'] = 'Cr閑r un nouveau message';
-$labels['replytomessage'] = 'R閜ondre au message';
-$labels['replytoallmessage'] = 'R閜ondre tous';
+$labels['writenewmessage'] = 'Cr茅er un nouveau message';
+$labels['replytomessage'] = 'R茅pondre au message';
+$labels['replytoallmessage'] = 'R茅pondre 脿 tous';
$labels['forwardmessage'] = 'Transmettre le message';
-$labels['deletemessage'] = 'D閜lacer le message dans la corbeille';
+$labels['deletemessage'] = 'D茅placer le message dans la corbeille';
$labels['printmessage'] = 'Imprimer ce message';
-$labels['previousmessages'] = 'Voir les messages pr閏閐ents';
+$labels['previousmessages'] = 'Voir les messages pr茅c茅dents';
$labels['nextmessages'] = 'Voir les messages suivants';
-$labels['backtolist'] = 'Retourner la liste des messages';
+$labels['backtolist'] = 'Retourner 脿 la liste des messages';
-$labels['select'] = 'S閘ectionner';
+$labels['select'] = 'S茅lectionner';
$labels['all'] = 'Tous';
$labels['none'] = 'Aucun';
$labels['unread'] = 'Non lus';
@@ -113,17 +113,17 @@ $labels['upload'] = 'Joindre';
$labels['close'] = 'Fermer';
$labels['low'] = 'Basse';
-$labels['lowest'] = 'Tr鑣 basse';
+$labels['lowest'] = 'Tr猫s basse';
$labels['normal'] = 'Normale';
-$labels['high'] = 'Elev閑';
-$labels['highest'] = 'Tr鑣 閘ev閑';
+$labels['high'] = 'Elev茅e';
+$labels['highest'] = 'Tr猫s 茅lev茅e';
$labels['showimages'] = 'Montrer les images';
// address boook
-$labels['name'] = 'Nom afficher';
-$labels['firstname'] = 'Pr閚om';
+$labels['name'] = 'Nom 脿 afficher';
+$labels['firstname'] = 'Pr茅nom';
$labels['surname'] = 'Nom';
$labels['email'] = 'e-Mail';
@@ -135,27 +135,27 @@ $labels['cancel'] = 'Annuler';
$labels['save'] = 'Sauvegarder';
$labels['delete'] = 'Supprimer';
-$labels['newcontact'] = 'Cr閑r un nouveau contact';
-$labels['deletecontact'] = 'Supprimer les contacts s閘ectionn閟';
-$labels['composeto'] = 'Ecrire un message ';
-$labels['contactsfromto'] = 'Contacts $from $to sur $count';
+$labels['newcontact'] = 'Cr茅er un nouveau contact';
+$labels['deletecontact'] = 'Supprimer les contacts s茅lectionn茅s';
+$labels['composeto'] = 'Ecrire un message 脿';
+$labels['contactsfromto'] = 'Contacts $from 脿 $to sur $count';
// settings
-$labels['settingsfor'] = 'Param鑤res pour';
+$labels['settingsfor'] = 'Param猫tres pour';
-$labels['preferences'] = 'Pr閒閞ences';
-$labels['userpreferences'] = 'Pr閒閞ences utilisateur';
-$labels['editpreferences'] = 'Editer les pr閒閞ences utilisateur';
+$labels['preferences'] = 'Pr茅f茅rences';
+$labels['userpreferences'] = 'Pr茅f茅rences utilisateur';
+$labels['editpreferences'] = 'Editer les pr茅f茅rences utilisateur';
-$labels['identities'] = 'Identit閟';
-$labels['manageidentities'] = 'G閞er les identit閟 pour ce compte';
-$labels['newidentity'] = 'Nouvelle identit';
+$labels['identities'] = 'Identit茅s';
+$labels['manageidentities'] = 'G茅rer les identit茅s pour ce compte';
+$labels['newidentity'] = 'Nouvelle identit茅';
-$labels['newitem'] = 'Nouvel 閘閙ent';
-$labels['edititem'] = 'Editer l\'閘閙ent';
+$labels['newitem'] = 'Nouvel 茅l茅ment';
+$labels['edititem'] = 'Editer l\'茅l茅ment';
-$labels['setdefault'] = 'Param鑤res par d閒aut';
+$labels['setdefault'] = 'Param猫tres par d茅faut';
$labels['language'] = 'Langue';
$labels['timezone'] = 'Fuseau horaire';
$labels['pagesize'] = 'nombre de lignes par page';
@@ -163,11 +163,11 @@ $labels['pagesize'] = 'nombre de lignes par page';
$labels['folders'] = 'Dossiers';
$labels['foldername'] = 'Nom du dossier';
-$labels['subscribed'] = 'Abonn';
-$labels['create'] = 'Cr閑r';
-$labels['createfolder'] = 'Cr閑r un nouveau dossier';
+$labels['subscribed'] = 'Abonn茅';
+$labels['create'] = 'Cr茅er';
+$labels['createfolder'] = 'Cr茅er un nouveau dossier';
$labels['deletefolder'] = 'Supprimer le dossier';
-$labels['managefolders'] = 'G閞er les dossiers';
+$labels['managefolders'] = 'G茅rer les dossiers';
?>
diff --git a/program/localization/fr/messages.inc b/program/localization/fr/messages.inc
index 0ecfb7618..7b6804df6 100644
--- a/program/localization/fr/messages.inc
+++ b/program/localization/fr/messages.inc
@@ -22,33 +22,33 @@ $messages['loginfailed'] = 'Erreur de connexion';
$messages['cookiesdisabled'] = 'Votre navigateur n\'accepte pas les cookies';
-$messages['sessionerror'] = 'Votre session n\'est pas valide ou a expir';
+$messages['sessionerror'] = 'Votre session n\'est pas valide ou a expir茅';
$messages['imaperror'] = 'Erreur de connexion au serveur IMAP';
-$messages['nomessagesfound'] = 'Auncun message trouv dans cette bo顃e aux lettres';
+$messages['nomessagesfound'] = 'Auncun message trouv茅 dans cette bo卯te aux lettres';
-$messages['loggedout'] = 'Vous venez de vous d閏onnecter avec succ鑣. Au revoir !';
+$messages['loggedout'] = 'Vous venez de vous d茅connecter avec succ猫s. Au revoir !';
-$messages['mailboxempty'] = 'Bo顃e aux lettres vide';
+$messages['mailboxempty'] = 'Bo卯te aux lettres vide';
-$messages['loadingdata'] = 'Chargement des donn閑s en cours...';
+$messages['loadingdata'] = 'Chargement des donn茅es en cours...';
-$messages['messagesent'] = 'Message envoy';
+$messages['messagesent'] = 'Message envoy茅';
-$messages['successfullysaved'] = 'Sauvegarde effectu閑';
+$messages['successfullysaved'] = 'Sauvegarde effectu茅e';
-$messages['addedsuccessfully'] = 'Contact ajout dans le carnet d\'adresses';
+$messages['addedsuccessfully'] = 'Contact ajout茅 dans le carnet d\'adresses';
-$messages['contactexists'] = 'Un contact avec cette adresse e-Mail existe d閖';
+$messages['contactexists'] = 'Un contact avec cette adresse e-Mail existe d茅j脿';
-$messages['blockedimages'] = 'Afin de pr閟erver votre intimit, les images distantes ont 閠 bloqu閑s dans ce message.';
+$messages['blockedimages'] = 'Afin de pr茅server votre intimit茅, les images distantes ont 茅t茅 bloqu茅es dans ce message.';
-$messages['encryptedmessage'] = 'Ceci est un message crypt et il ne peut pas 阾re affich. D閟ol !';
+$messages['encryptedmessage'] = 'Ceci est un message crypt茅 et il ne peut pas 锚tre affich茅. D茅sol茅 !';
-$messages['nocontactsfound'] = 'Aucun contact trouv';
+$messages['nocontactsfound'] = 'Aucun contact trouv茅';
-$messages['sendingfailed'] = 'Le message n\'a pas 閠 envoy';
+$messages['sendingfailed'] = 'Le message n\'a pas 茅t茅 envoy茅';
$messages['errorsaving'] = 'Une erreur est apparue pendant la sauvegarde';
diff --git a/program/localization/it/labels.inc b/program/localization/it/labels.inc
index 111a1ac43..593a8756a 100644
--- a/program/localization/it/labels.inc
+++ b/program/localization/it/labels.inc
@@ -46,7 +46,7 @@ $labels['bcc'] = 'Bcc';
$labels['replyto'] = 'Rispondi a';
$labels['date'] = 'Data';
$labels['size'] = 'Dimensione';
-$labels['priority'] = 'Priorit';
+$labels['priority'] = 'Priorit脿';
$labels['organization'] = 'Organizzazione';
// aliases
@@ -78,11 +78,11 @@ $labels['sat'] = 'Sab';
// weekdays long
$labels['sunday'] = 'Domenica';
-$labels['monday'] = 'Luned';
-$labels['tuesday'] = 'Marted';
-$labels['wednesday'] = 'Mercoled';
-$labels['thursday'] = 'Gioved';
-$labels['friday'] = 'Venerd';
+$labels['monday'] = 'Luned矛';
+$labels['tuesday'] = 'Marted矛';
+$labels['wednesday'] = 'Mercoled矛';
+$labels['thursday'] = 'Gioved矛';
+$labels['friday'] = 'Venerd矛';
$labels['saturday'] = 'Sabato';
$labels['today'] = 'Oggi';
@@ -148,9 +148,9 @@ $labels['preferences'] = 'Preferenze';
$labels['userpreferences'] = 'Preferenze utente';
$labels['editpreferences'] = 'Modifica preferenze utente';
-$labels['identities'] = 'Identit';
-$labels['manageidentities'] = 'Gestisci le identit per questo account';
-$labels['newidentity'] = 'Nuova identit';
+$labels['identities'] = 'Identit脿';
+$labels['manageidentities'] = 'Gestisci le identit脿 per questo account';
+$labels['newidentity'] = 'Nuova identit脿';
$labels['newitem'] = 'Nuovo oggetto';
$labels['edititem'] = 'Modifica oggetto';
diff --git a/program/localization/it/messages.inc b/program/localization/it/messages.inc
index 1525ea131..23608a4c2 100644
--- a/program/localization/it/messages.inc
+++ b/program/localization/it/messages.inc
@@ -22,7 +22,7 @@ $messages['loginfailed'] = 'Login non riuscito';
$messages['cookiesdisabled'] = 'Il browser non accetta cookie';
-$messages['sessionerror'] = 'La sessione invalida o scaduta.';
+$messages['sessionerror'] = 'La sessione 猫 invalida o scaduta.';
$messages['imaperror'] = 'Connessione al server IMAP non riuscita';
@@ -30,7 +30,7 @@ $messages['nomessagesfound'] = 'Non ci sono messaggi in questa mailbox';
$messages['loggedout'] = 'Sessione chiusa correttamente. Arrivederci!';
-$messages['mailboxempty'] = 'La mailbox vuota';
+$messages['mailboxempty'] = 'La mailbox 猫 vuota';
$messages['loadingdata'] = 'Sto caricando i dati...';
@@ -40,11 +40,11 @@ $messages['successfullysaved'] = 'Salvato con successo';
$messages['addedsuccessfully'] = 'Contatto aggiunto con successo alla rubrica';
-$messages['contactexists'] = 'Esiste gi un contatto con questa email';
+$messages['contactexists'] = 'Esiste gi脿 un contatto con questa email';
$messages['blockedimages'] = 'Per proteggere la privacy, le immagini remote in questo messaggio sono bloccate.';
-$messages['encryptedmessage'] = 'Questo un messaggio criptato e non pu essere visualizzato. Mi dispiace!';
+$messages['encryptedmessage'] = 'Questo 猫 un messaggio criptato e non pu貌 essere visualizzato. Mi dispiace!';
$messages['nocontactsfound'] = 'Nessun contatto trovato';
diff --git a/program/localization/lv/labels.inc b/program/localization/lv/labels.inc
index 056698450..fd2c500a5 100644
--- a/program/localization/lv/labels.inc
+++ b/program/localization/lv/labels.inc
@@ -16,8 +16,6 @@
*/
-$utf8_decoding = TRUE;
-
$labels = array();
// login page
diff --git a/program/localization/lv/messages.inc b/program/localization/lv/messages.inc
index 319908eeb..1e43dd065 100644
--- a/program/localization/lv/messages.inc
+++ b/program/localization/lv/messages.inc
@@ -16,8 +16,6 @@
*/
-$utf8_decoding = TRUE;
-
$messages = array();
$messages['loginfailed'] = 'Neizdev膩s piesl膿gties';
diff --git a/program/localization/nb_NO/labels.inc b/program/localization/nb_NO/labels.inc
index 47af32b44..859808665 100644
--- a/program/localization/nb_NO/labels.inc
+++ b/program/localization/nb_NO/labels.inc
@@ -35,7 +35,7 @@ $labels['inbox'] = 'Innboks';
$labels['sent'] = 'Sendte elementer';
$labels['trash'] = 'Slettede elementer';
$labels['drafts'] = 'Kladd';
-$labels['junk'] = 'S鴓pel';
+$labels['junk'] = 'S酶ppel';
// message listing
$labels['subject'] = 'Emne';
@@ -45,7 +45,7 @@ $labels['cc'] = 'Kopi';
$labels['bcc'] = 'Blindkopi';
$labels['replyto'] = 'Svar-til';
$labels['date'] = 'Dato';
-$labels['size'] = 'St鴕relse';
+$labels['size'] = 'St酶rrelse';
$labels['priority'] = 'Prioritet';
$labels['organization'] = 'Organisasjon';
@@ -60,7 +60,7 @@ $labels['moveto'] = 'flytt til...';
$labels['download'] = 'last ned';
$labels['filename'] = 'Filnavn';
-$labels['filesize'] = 'Filest鴕relse';
+$labels['filesize'] = 'Filest酶rrelse';
$labels['preferhtml'] = 'Foretrekk HTML';
$labels['htmlmessage'] = 'HTML-melding';
@@ -69,32 +69,32 @@ $labels['prettydate'] = 'Pene datoer';
$labels['addtoaddressbook'] = 'Legg til adressebok';
// weekdays short
-$labels['sun'] = 'S鴑';
+$labels['sun'] = 'S酶n';
$labels['mon'] = 'Man';
$labels['tue'] = 'Tir';
$labels['wed'] = 'Ons';
$labels['thu'] = 'Tor';
$labels['fri'] = 'Fre';
-$labels['sat'] = 'L鴕';
+$labels['sat'] = 'L酶r';
// weekdays long
-$labels['sunday'] = 'S鴑dag';
+$labels['sunday'] = 'S酶ndag';
$labels['monday'] = 'Mandag';
$labels['tuesday'] = 'Tirsdag';
$labels['wednesday'] = 'Onsdag';
$labels['thursday'] = 'Torsdag';
$labels['friday'] = 'Fredag';
-$labels['saturday'] = 'L鴕dag';
+$labels['saturday'] = 'L酶rdag';
$labels['today'] = 'I dag';
// toolbar buttons
$labels['writenewmessage'] = 'Skriv en ny melding';
-$labels['replytomessage'] = 'Svar p meldingen';
+$labels['replytomessage'] = 'Svar p氓 meldingen';
$labels['forwardmessage'] = 'Videresend meldingen';
$labels['deletemessage'] = 'Flytt melding til Slettede elementer';
$labels['printmessage'] = 'Skriv ut meldingen';
-$labels['previousmessages'] = 'Vis foreg錯nde side med meldinger';
+$labels['previousmessages'] = 'Vis foreg氓ende side med meldinger';
$labels['nextmessages'] = 'Vis neste side med med meldinger';
$labels['backtolist'] = 'Tilbake til meldingslisten';
$labels['viewsource'] = 'Vis kilde';
@@ -106,7 +106,7 @@ $labels['unread'] = 'Uleste';
// message compose
$labels['compose'] = 'Skriv en melding';
-$labels['sendmessage'] = 'Send meldingen n';
+$labels['sendmessage'] = 'Send meldingen n氓';
$labels['addattachment'] = 'Legg ved en fil';
$labels['attachments'] = 'Vedlegg';
@@ -116,8 +116,8 @@ $labels['close'] = 'Lukk';
$labels['low'] = 'Lav';
$labels['lowest'] = 'Lavest';
$labels['normal'] = 'Normal';
-$labels['high'] = 'H鴜';
-$labels['highest'] = 'H鴜est';
+$labels['high'] = 'H酶y';
+$labels['highest'] = 'H酶yest';
$labels['showimages'] = 'Vis bilder';
@@ -159,7 +159,7 @@ $labels['newitem'] = 'Nytt element';
$labels['edititem'] = 'Redigere element';
$labels['setdefault'] = 'Sett som standard';
-$labels['language'] = 'Spr錵';
+$labels['language'] = 'Spr氓k';
$labels['timezone'] = 'Tidssone';
$labels['pagesize'] = 'Rader pr side';
diff --git a/program/localization/nb_NO/messages.inc b/program/localization/nb_NO/messages.inc
index 23b941cf8..c63a66ce5 100644
--- a/program/localization/nb_NO/messages.inc
+++ b/program/localization/nb_NO/messages.inc
@@ -22,7 +22,7 @@ $messages['loginfailed'] = 'Feil ved innlogging';
$messages['cookiesdisabled'] = 'Nettleseren din tillater ikke informasjonskapsler (cookies)';
-$messages['sessionerror'] = 'Sesjonen din er ugyldig eller utl鴓t p tid';
+$messages['sessionerror'] = 'Sesjonen din er ugyldig eller utl酶pt p氓 tid';
$messages['imaperror'] = 'Feil ved tilkobling til IMAP-tjener';
@@ -42,7 +42,7 @@ $messages['addedsuccessfully'] = 'Kontakten ble lagt til i adresseboken';
$messages['contactexists'] = 'En kontakt med denne e-postadressen eksisterer allerede';
-$messages['blockedimages'] = 'For beskytte privatlivet ditt er eksterne bilder blokkert i denne meldingen.';
+$messages['blockedimages'] = 'For 氓 beskytte privatlivet ditt er eksterne bilder blokkert i denne meldingen.';
$messages['encryptedmessage'] = 'Dette er en kryptert melding og kan ikke vises. Beklager!';
diff --git a/program/localization/nl/messages.inc b/program/localization/nl/messages.inc
index 39909e922..31b2348d3 100644
--- a/program/localization/nl/messages.inc
+++ b/program/localization/nl/messages.inc
@@ -28,7 +28,7 @@ $messages['imaperror'] = 'Verbinding met IMAP-server mislukt';
$messages['nomessagesfound'] = 'Geen berichten gevonden in Postvak IN';
-$messages['loggedout'] = 'Je bent succesvol uitgelegd. Tot ziens!';
+$messages['loggedout'] = 'Je bent succesvol uitgelogd. Tot ziens!';
$messages['mailboxempty'] = 'Postbak is leeg';
diff --git a/program/localization/nn_NO/labels.inc b/program/localization/nn_NO/labels.inc
index 15b7800a0..0e6152d99 100644
--- a/program/localization/nn_NO/labels.inc
+++ b/program/localization/nn_NO/labels.inc
@@ -35,7 +35,7 @@ $labels['inbox'] = 'Innboks';
$labels['sent'] = 'Sende element';
$labels['trash'] = 'Sletta element';
$labels['drafts'] = 'Kladd';
-$labels['junk'] = 'S鴓pel';
+$labels['junk'] = 'S酶ppel';
// message listing
$labels['subject'] = 'Emne';
@@ -62,7 +62,7 @@ $labels['download'] = 'last ned';
$labels['filename'] = 'Filnamn';
$labels['filesize'] = 'Filstorleik';
-$labels['preferhtml'] = 'F鴕etrekk HTML';
+$labels['preferhtml'] = 'F酶retrekk HTML';
$labels['htmlmessage'] = 'HTML-melding';
$labels['prettydate'] = 'Pene datoar';
@@ -70,7 +70,7 @@ $labels['addtoaddressbook'] = 'Legg til i adressebok';
// weekdays short
$labels['sun'] = 'Sun';
-$labels['mon'] = 'M錸';
+$labels['mon'] = 'M氓n';
$labels['tue'] = 'Tys';
$labels['wed'] = 'Ons';
$labels['thu'] = 'Tor';
@@ -79,7 +79,7 @@ $labels['sat'] = 'Lau';
// weekdays long
$labels['sunday'] = 'Sundag';
-$labels['monday'] = 'M錸dag';
+$labels['monday'] = 'M氓ndag';
$labels['tuesday'] = 'Tysdag';
$labels['wednesday'] = 'Onsdag';
$labels['thursday'] = 'Torsdag';
@@ -90,11 +90,11 @@ $labels['today'] = 'I dag';
// toolbar buttons
$labels['writenewmessage'] = 'Skriv ei ny melding';
-$labels['replytomessage'] = 'Svar p meldinga';
+$labels['replytomessage'] = 'Svar p氓 meldinga';
$labels['forwardmessage'] = 'Vidaresend meldinga';
$labels['deletemessage'] = 'Flytt melding til Sletta element';
$labels['printmessage'] = 'Skriv ut meldinga';
-$labels['previousmessages'] = 'Vis f鴕eg錫nde side med meldingar';
+$labels['previousmessages'] = 'Vis f酶reg氓ande side med meldingar';
$labels['nextmessages'] = 'Vis neste side med med meldingar';
$labels['backtolist'] = 'Tilbake til meldingslista';
$labels['viewsource'] = 'Vis kjelde';
@@ -113,18 +113,18 @@ $labels['attachments'] = 'Vedlegg';
$labels['upload'] = 'Last opp';
$labels['close'] = 'Steng';
-$labels['low'] = 'L錱';
-$labels['lowest'] = 'L錱ast';
+$labels['low'] = 'L氓g';
+$labels['lowest'] = 'L氓gast';
$labels['normal'] = 'Normal';
-$labels['high'] = 'H鴊';
-$labels['highest'] = 'H鴊ast';
+$labels['high'] = 'H酶g';
+$labels['highest'] = 'H酶gast';
$labels['showimages'] = 'Vis bilete';
// address book
$labels['name'] = 'Visingsnamn';
-$labels['firstname'] = 'F鴕enamn';
+$labels['firstname'] = 'F酶renamn';
$labels['surname'] = 'Etternamn';
$labels['email'] = 'E-post';
@@ -159,7 +159,7 @@ $labels['newitem'] = 'Nytt element';
$labels['edititem'] = 'Redigere element';
$labels['setdefault'] = 'Set som standard';
-$labels['language'] = 'Spr錵';
+$labels['language'] = 'Spr氓k';
$labels['timezone'] = 'Tidssone';
$labels['pagesize'] = 'Rader pr side';
diff --git a/program/localization/nn_NO/messages.inc b/program/localization/nn_NO/messages.inc
index 31a1c6404..a724884cd 100644
--- a/program/localization/nn_NO/messages.inc
+++ b/program/localization/nn_NO/messages.inc
@@ -22,7 +22,7 @@ $messages['loginfailed'] = 'Feil ved innlogging';
$messages['cookiesdisabled'] = 'Nettlesaren din tillet ikkje informasjonskapslar (cookies)';
-$messages['sessionerror'] = 'Sesjonen din er ulovleg eller har g錿t ut p tid';
+$messages['sessionerror'] = 'Sesjonen din er ulovleg eller har g氓tt ut p氓 tid';
$messages['imaperror'] = 'Feil ved tilkopling til IMAP-tenar';
@@ -42,7 +42,7 @@ $messages['addedsuccessfully'] = 'Kontakta vart lagt til i adresseboka';
$messages['contactexists'] = 'Ei kontakt med denne e-postadressa eksisterer allereie';
-$messages['blockedimages'] = 'For ta vare p privatlivet ditt er eksterne bilete blokkert i denne meldinga.';
+$messages['blockedimages'] = 'For 氓 ta vare p氓 privatlivet ditt er eksterne bilete blokkert i denne meldinga.';
$messages['encryptedmessage'] = 'Dette er ei kryptert melding og kan ikkje visast. Orsak!';
diff --git a/program/localization/pl/labels.inc b/program/localization/pl/labels.inc
index 1a2640a73..c310a3ecb 100644
--- a/program/localization/pl/labels.inc
+++ b/program/localization/pl/labels.inc
@@ -16,8 +16,6 @@
*/
-$utf8_decoding = TRUE;
-
$labels = array();
// login page
diff --git a/program/localization/pl/messages.inc b/program/localization/pl/messages.inc
index a560b94b1..783be419e 100644
--- a/program/localization/pl/messages.inc
+++ b/program/localization/pl/messages.inc
@@ -16,8 +16,6 @@
*/
-$utf8_decoding = TRUE;
-
$messages = array();
$messages['loginfailed'] = 'B艂膮d logowania.';
diff --git a/program/localization/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc
index 2b8943ba2..cb3450e8d 100644
--- a/program/localization/pt_BR/labels.inc
+++ b/program/localization/pt_BR/labels.inc
@@ -21,8 +21,8 @@
$labels = array();
-// P醙ina de login
-$labels['username'] = 'Usu醨io';
+// P谩gina de login
+$labels['username'] = 'Usu谩rio';
$labels['password'] = 'Senha';
$labels['server'] = 'Servidor';
$labels['login'] = 'Login';
@@ -30,8 +30,8 @@ $labels['login'] = 'Login';
// Barra de tarefas
$labels['logout'] = 'Sair';
$labels['mail'] = 'E-mail';
-$labels['settings'] = 'Configura珲es pessoais';
-$labels['addressbook'] = 'Cat醠ogo de endere鏾s';
+$labels['settings'] = 'Configura莽玫es pessoais';
+$labels['addressbook'] = 'Cat谩logo de endere莽os';
// Nome das pastas de correio
$labels['inbox'] = 'Caixa de entrada';
@@ -50,7 +50,7 @@ $labels['junk'] = 'Spam';
$labels['subject'] = 'Assunto';
$labels['from'] = 'De';
$labels['to'] = 'Para';
-$labels['cc'] = 'C髉ia';
+$labels['cc'] = 'C贸pia';
$labels['bcc'] = 'Bcc';
$labels['replyto'] = 'Responder para';
$labels['date'] = 'Data';
@@ -58,7 +58,7 @@ $labels['size'] = 'Tamanho';
$labels['priority'] = 'Prioridade';
$labels['organization'] = 'Empresa';
-// R髏ulos
+// R贸tulos
$labels['reply-to'] = $labels['replyto'];
$labels['mailboxlist'] = 'Mensagens';
@@ -75,7 +75,7 @@ $labels['preferhtml'] = 'Prefere HTML';
$labels['htmlmessage'] = 'Mensagem HTML';
$labels['prettydate'] = 'Formatar datas';
-$labels['addtoaddressbook'] = 'Incluir no cat醠ogo de endere鏾s';
+$labels['addtoaddressbook'] = 'Incluir no cat谩logo de endere莽os';
// Dias da semana abreviados
$labels['sun'] = 'Dom';
@@ -84,33 +84,33 @@ $labels['tue'] = 'Ter';
$labels['wed'] = 'Qua';
$labels['thu'] = 'Qui';
$labels['fri'] = 'Sex';
-$labels['sat'] = 'S醔';
+$labels['sat'] = 'S谩b';
// Dias da semana completos
$labels['sunday'] = 'Domingo';
$labels['monday'] = 'Segunda-feira';
-$labels['tuesday'] = 'Ter鏰-feira';
+$labels['tuesday'] = 'Ter莽a-feira';
$labels['wednesday'] = 'Quarta-feira';
$labels['thursday'] = 'Quinta-feira';
$labels['friday'] = 'Sexta-feira';
-$labels['saturday'] = 'S醔ado';
+$labels['saturday'] = 'S谩bado';
$labels['today'] = 'Hoje';
-// Bot鮡s da barra de ferramentas
+// Bot玫es da barra de ferramentas
$labels['writenewmessage'] = 'Escrever nova mensagem';
$labels['replytomessage'] = 'Responder';
$labels['forwardmessage'] = 'Encaminhar';
$labels['deletemessage'] = 'Mover para a lixeira';
$labels['printmessage'] = 'Imprimir';
$labels['previousmessages'] = 'Anterior';
-$labels['nextmessages'] = 'Pr髕imo';
+$labels['nextmessages'] = 'Pr贸ximo';
$labels['backtolist'] = 'Voltar';
$labels['select'] = 'Selecionar';
$labels['all'] = 'Todos';
$labels['none'] = 'Nenhum';
-$labels['unread'] = 'N鉶 lido';
+$labels['unread'] = 'N茫o lido';
// Escrever mensagem
$labels['compose'] = 'Escrever nova mensagem';
@@ -130,7 +130,7 @@ $labels['highest'] = 'Urgente';
$labels['showimages'] = 'Exibir imagens';
-// Cat醠ogo de endere鏾s
+// Cat谩logo de endere莽os
$labels['name'] = 'Nome';
$labels['firstname'] = 'Primeiro nome';
$labels['surname'] = 'Sobrenome';
@@ -147,15 +147,15 @@ $labels['delete'] = 'Excluir';
$labels['newcontact'] = 'Criar novo contato';
$labels['deletecontact'] = 'Excluir contatos selecionados';
$labels['composeto'] = 'Compor email para ';
-$labels['contactsfromto'] = 'Contatos de $from at $to de $count';
+$labels['contactsfromto'] = 'Contatos de $from at茅 $to de $count';
-// Configura珲es
-$labels['settingsfor'] = 'Configura珲es para';
+// Configura莽玫es
+$labels['settingsfor'] = 'Configura莽玫es para';
-$labels['preferences'] = 'Prefer阯cias';
-$labels['userpreferences'] = 'Prefer阯cias do usu醨io';
-$labels['editpreferences'] = 'Editar prefer阯cias do usu醨io';
+$labels['preferences'] = 'Prefer锚ncias';
+$labels['userpreferences'] = 'Prefer锚ncias do usu谩rio';
+$labels['editpreferences'] = 'Editar prefer锚ncias do usu谩rio';
$labels['identities'] = 'Identidade';
$labels['manageidentities'] = 'Gerenciar identidades para essa conta';
@@ -164,10 +164,10 @@ $labels['newidentity'] = 'Nova identidade';
$labels['newitem'] = 'Novo item';
$labels['edititem'] = 'Editar item';
-$labels['setdefault'] = 'Padr鉶';
+$labels['setdefault'] = 'Padr茫o';
$labels['language'] = 'Idioma';
$labels['timezone'] = 'Time zone';
-$labels['pagesize'] = 'Linhas por p醙ina';
+$labels['pagesize'] = 'Linhas por p谩gina';
$labels['folders'] = 'Pastas';
diff --git a/program/localization/pt_BR/messages.inc b/program/localization/pt_BR/messages.inc
index ec34041d4..af653f9de 100644
--- a/program/localization/pt_BR/messages.inc
+++ b/program/localization/pt_BR/messages.inc
@@ -22,31 +22,31 @@ $messages = array();
$messages['loginfailed'] = 'Falha no login';
-$messages['cookiesdisabled'] = 'Seu navegador n鉶 suporta cookies';
+$messages['cookiesdisabled'] = 'Seu navegador n茫o suporta cookies';
-$messages['sessionerror'] = 'A sess鉶 do seu navegador inv醠ida ou expirou';
+$messages['sessionerror'] = 'A sess茫o do seu navegador 茅 inv谩lida ou expirou';
-$messages['imaperror'] = 'A conex鉶 com o servidor IMAP falhou';
+$messages['imaperror'] = 'A conex茫o com o servidor IMAP falhou';
$messages['nomessagesfound'] = 'Nenhuma mensagem foi encontrada na caixa postal';
-$messages['loggedout'] = 'Sua sess鉶 foi finalizada com sucesso. At breve!';
+$messages['loggedout'] = 'Sua sess茫o foi finalizada com sucesso. At茅 breve!';
-$messages['mailboxempty'] = 'A caixa postal est vazia';
+$messages['mailboxempty'] = 'A caixa postal est谩 vazia';
-$messages['loadingdata'] = 'Carregando informa珲es...';
+$messages['loadingdata'] = 'Carregando informa莽玫es...';
$messages['messagesent'] = 'Mensagem enviada';
$messages['successfullysaved'] = 'Salvo com sucesso';
-$messages['addedsuccessfully'] = 'Contato inclu韉o com sucesso';
+$messages['addedsuccessfully'] = 'Contato inclu铆do com sucesso';
-$messages['contactexists'] = 'Um contato com esse e-mail j existe';
+$messages['contactexists'] = 'Um contato com esse e-mail j谩 existe';
$messages['blockedimages'] = 'Para proteger sua privacidade, as imagens desta mensagem foram bloqueadas.';
-$messages['encryptedmessage'] = 'Esta mensagem est criptografada e n鉶 pode ser exibida. Desculpe.';
+$messages['encryptedmessage'] = 'Esta mensagem est谩 criptografada e n茫o pode ser exibida. Desculpe.';
$messages['nocontactsfound'] = 'Nenhum contato foi encontrado.';
diff --git a/program/localization/pt/labels.inc b/program/localization/pt_PT/labels.inc
index 6ca4dfa01..7dec93462 100644
--- a/program/localization/pt/labels.inc
+++ b/program/localization/pt_PT/labels.inc
@@ -2,7 +2,7 @@
/*
+-----------------------------------------------------------------------+
- | language/pt/labels.inc |
+ | language/pt_PT/labels.inc |
| |
| Portuguese for Portugal Language file of the RoundCube Webmail client |
| Copyright (C) 2005, RoundQube Dev. - Switzerland |
@@ -19,7 +19,7 @@
$labels = array();
// login page
-$labels['username'] = 'Endere鏾 de E-Mail';
+$labels['username'] = 'Endere莽o de E-Mail';
$labels['password'] = 'Password';
$labels['server'] = 'Servidor';
$labels['login'] = 'Login';
@@ -27,8 +27,8 @@ $labels['login'] = 'Login';
// taskbar
$labels['logout'] = 'Sair';
$labels['mail'] = 'E-Mail';
-$labels['settings'] = 'Defini珲es Pessoais';
-$labels['addressbook'] = 'Livro de Endere鏾s';
+$labels['settings'] = 'Defini莽玫es Pessoais';
+$labels['addressbook'] = 'Livro de Endere莽os';
// mailbox names
$labels['inbox'] = 'Recebidas';
@@ -41,13 +41,13 @@ $labels['junk'] = 'SPAM';
$labels['subject'] = 'Assunto';
$labels['from'] = 'De';
$labels['to'] = 'Para';
-$labels['cc'] = 'C髉ia';
+$labels['cc'] = 'C贸pia';
$labels['bcc'] = 'Bcc';
$labels['replyto'] = 'Responder-a';
$labels['date'] = 'Data';
$labels['size'] = 'Tamanho';
$labels['priority'] = 'Prioridade';
-$labels['organization'] = 'Organiza玢o';
+$labels['organization'] = 'Organiza莽茫o';
// aliases
$labels['reply-to'] = $labels['replyto'];
@@ -66,7 +66,7 @@ $labels['preferhtml'] = 'Prefiro HTML';
$labels['htmlmessage'] = 'Mensagem HTML';
$labels['prettydate'] = ' Datas bonitas';
-$labels['addtoaddressbook'] = 'Adicionar ao livro de endere鏾s';
+$labels['addtoaddressbook'] = 'Adicionar ao livro de endere莽os';
// weekdays short
$labels['sun'] = 'Dom';
@@ -80,11 +80,11 @@ $labels['sat'] = 'Sab';
// weekdays long
$labels['sunday'] = 'Domingo';
$labels['monday'] = 'Segunda';
-$labels['tuesday'] = 'Ter鏰';
+$labels['tuesday'] = 'Ter莽a';
$labels['wednesday'] = 'Quarta';
$labels['thursday'] = 'Quinta';
$labels['friday'] = 'Sexta';
-$labels['saturday'] = 'S醔ado';
+$labels['saturday'] = 'S谩bado';
$labels['today'] = 'Hoje';
@@ -97,12 +97,12 @@ $labels['deletemessage'] = 'Mover a mensagem para a reciclagem';
$labels['printmessage'] = 'Imprimir esta mensagem';
$labels['previousmessages'] = 'Mostrar grupo de mensagens anterior';
$labels['nextmessages'] = 'Mostrar grupo de mensagens seguinte';
-$labels['backtolist'] = 'Voltar lista de mensagens';
+$labels['backtolist'] = 'Voltar 脿 lista de mensagens';
$labels['select'] = 'Seleccionar';
$labels['all'] = 'Todas';
$labels['none'] = 'Nenhuma';
-$labels['unread'] = 'N鉶 lidas';
+$labels['unread'] = 'N茫o lidas';
// message compose
$labels['compose'] = 'Escrever uma mensagem';
@@ -125,7 +125,7 @@ $labels['showimages'] = 'Mostrar imagens';
// address boook
$labels['name'] = 'Mostrar nome';
$labels['firstname'] = 'Primeiro nome';
-$labels['surname'] = '趌timo nome';
+$labels['surname'] = '脷ltimo nome';
$labels['email'] = 'E-Mail';
$labels['addcontact'] = 'Adicionar novo contacto';
@@ -136,18 +136,18 @@ $labels['cancel'] = 'Cancelar';
$labels['save'] = 'Gravar';
$labels['delete'] = 'Apagar';
-$labels['newcontact'] = 'Criar novo cart鉶 de contacto';
+$labels['newcontact'] = 'Criar novo cart茫o de contacto';
$labels['deletecontact'] = 'Apagar contactos seleccionados';
$labels['composeto'] = 'Escrever email para';
-$labels['contactsfromto'] = 'Contactos $from at $to de $count';
+$labels['contactsfromto'] = 'Contactos $from at茅 $to de $count';
// settings
-$labels['settingsfor'] = 'Defini珲es para';
+$labels['settingsfor'] = 'Defini莽玫es para';
-$labels['preferences'] = 'Prefer阯cias';
-$labels['userpreferences'] = 'Prefer阯cias do utilizador';
-$labels['editpreferences'] = 'Editar prefer阯cias do utilizador';
+$labels['preferences'] = 'Prefer锚ncias';
+$labels['userpreferences'] = 'Prefer锚ncias do utilizador';
+$labels['editpreferences'] = 'Editar prefer锚ncias do utilizador';
$labels['identities'] = 'Identidades';
$labels['manageidentities'] = 'Gerir identidades para esta conta';
@@ -157,9 +157,9 @@ $labels['newitem'] = 'Novo item';
$labels['edititem'] = 'Editar item';
$labels['setdefault'] = 'Definir como default';
-$labels['language'] = 'L韓gua';
-$labels['timezone'] = 'Zona hor醨ia';
-$labels['pagesize'] = 'Linhas por p醙ina';
+$labels['language'] = 'L铆ngua';
+$labels['timezone'] = 'Zona hor谩ria';
+$labels['pagesize'] = 'Linhas por p谩gina';
$labels['folders'] = 'Pastas';
diff --git a/program/localization/pt/messages.inc b/program/localization/pt_PT/messages.inc
index 4276365eb..8d424e16c 100644
--- a/program/localization/pt/messages.inc
+++ b/program/localization/pt_PT/messages.inc
@@ -2,7 +2,7 @@
/*
+-----------------------------------------------------------------------+
- | language/pt/messages.inc |
+ | language/pt_PT/messages.inc |
| |
| Portuguese for Portugal Language file of the RoundCube Webmail client |
| Copyright (C) 2005, RoundCube Dev. - Switzerland |
@@ -18,19 +18,19 @@
$messages = array();
-$messages['loginfailed'] = 'Autentica玢o falhou';
+$messages['loginfailed'] = 'Autentica莽茫o falhou';
-$messages['cookiesdisabled'] = 'O seu browser n鉶 aceita cookies';
+$messages['cookiesdisabled'] = 'O seu browser n茫o aceita cookies';
-$messages['sessionerror'] = 'A sua sess鉶 inv醠ida ou expirou';
+$messages['sessionerror'] = 'A sua sess茫o 茅 inv谩lida ou expirou';
-$messages['imaperror'] = 'Liga玢o ao servidor IMAP falhou';
+$messages['imaperror'] = 'Liga莽茫o ao servidor IMAP falhou';
-$messages['nomessagesfound'] = 'N鉶 foram encontradas mensagens nesta caixa de correio';
+$messages['nomessagesfound'] = 'N茫o foram encontradas mensagens nesta caixa de correio';
-$messages['loggedout'] = 'Voc terminou a sess鉶 com sucesso. Adeus!';
+$messages['loggedout'] = 'Voc锚 terminou a sess茫o com sucesso. Adeus!';
-$messages['mailboxempty'] = 'A caixa de correio est vazia';
+$messages['mailboxempty'] = 'A caixa de correio est谩 vazia';
$messages['loadingdata'] = 'Carregando dados...';
@@ -38,19 +38,19 @@ $messages['messagesent'] = 'Mensagem enviada com sucesso';
$messages['successfullysaved'] = 'Gravado com sucesso';
-$messages['addedsuccessfully'] = 'Contacto adicionado ao livro de endere鏾s com sucesso';
+$messages['addedsuccessfully'] = 'Contacto adicionado ao livro de endere莽os com sucesso';
-$messages['contactexists'] = 'J existe um contacto com este endere鏾 de e-mail';
+$messages['contactexists'] = 'J谩 existe um contacto com este endere莽o de e-mail';
-$messages['blockedimages'] = 'Para proteger a sua privacidade, as imagens remotas est鉶 bloqueadas nesta mensagem.';
+$messages['blockedimages'] = 'Para proteger a sua privacidade, as imagens remotas est茫o bloqueadas nesta mensagem.';
-$messages['encryptedmessage'] = 'Esta uma mensagem encriptada e n鉶 pode ser mostrada. Desculpe!';
+$messages['encryptedmessage'] = 'Esta 茅 uma mensagem encriptada e n茫o pode ser mostrada. Desculpe!';
-$messages['nocontactsfound'] = 'N鉶 foram encontrados contactos';
+$messages['nocontactsfound'] = 'N茫o foram encontrados contactos';
-$messages['sendingfailed'] = 'A mensagem n鉶 foi enviada';
+$messages['sendingfailed'] = 'A mensagem n茫o foi enviada';
-$messages['errorsaving'] = 'Ocorreu um erro no decorrer da grava玢o';
+$messages['errorsaving'] = 'Ocorreu um erro no decorrer da grava莽茫o';
?>
diff --git a/program/localization/ru/labels.inc b/program/localization/ru/labels.inc
index 2b89e07ad..a7543f1c5 100755
--- a/program/localization/ru/labels.inc
+++ b/program/localization/ru/labels.inc
@@ -16,8 +16,6 @@
*/
-$utf8_decoding = TRUE;
-
$labels = array();
// login page
diff --git a/program/localization/ru/messages.inc b/program/localization/ru/messages.inc
index 5dc0d98a4..631c852bf 100755
--- a/program/localization/ru/messages.inc
+++ b/program/localization/ru/messages.inc
@@ -16,8 +16,6 @@
*/
-$utf8_decoding = TRUE;
-
$messages = array();
$messages['loginfailed'] = '袧械褍写邪褔薪邪褟 邪胁褌芯褉懈蟹邪褑懈褟';
diff --git a/program/localization/se/labels.inc b/program/localization/se/labels.inc
index 7e06e459a..9f8ad5881 100644
--- a/program/localization/se/labels.inc
+++ b/program/localization/se/labels.inc
@@ -19,15 +19,15 @@
$labels = array();
// login page
-$labels['username'] = 'Anv鋘darnamn';
-$labels['password'] = 'L鰏enord';
+$labels['username'] = 'Anv盲ndarnamn';
+$labels['password'] = 'L枚senord';
$labels['server'] = 'Server';
$labels['login'] = 'Logga in';
// taskbar
$labels['logout'] = 'Logga ut';
$labels['mail'] = 'E-post';
-$labels['settings'] = 'Personliga inst鋖lningar';
+$labels['settings'] = 'Personliga inst盲llningar';
$labels['addressbook'] = 'Adressbok';
// mailbox names
@@ -35,11 +35,11 @@ $labels['inbox'] = 'Inbox';
$labels['sent'] = 'Skickat';
$labels['trash'] = 'Papperskorg';
$labels['drafts'] = 'Utskick';
-$labels['junk'] = 'Skr鋚post';
+$labels['junk'] = 'Skr盲ppost';
// message listing
-$labels['subject'] = '膍ne';
-$labels['from'] = 'Avs鋘dare';
+$labels['subject'] = '脛mne';
+$labels['from'] = 'Avs盲ndare';
$labels['to'] = 'Mottagare';
$labels['cc'] = 'Kopia';
$labels['bcc'] = 'Bcc';
@@ -62,47 +62,47 @@ $labels['download'] = 'ladda ner';
$labels['filename'] = 'Filnamn';
$labels['filesize'] = 'Filstorlek';
-$labels['preferhtml'] = 'F鰎edra HTML';
+$labels['preferhtml'] = 'F枚redra HTML';
$labels['htmlmessage'] = 'HTML-meddelanden';
$labels['prettydate'] = 'Fina datum';
-$labels['addtoaddressbook'] = 'L鋑g till adressbok';
+$labels['addtoaddressbook'] = 'L盲gg till adressbok';
// weekdays short
-$labels['sun'] = 'S鰊';
-$labels['mon'] = 'M錸';
+$labels['sun'] = 'S枚n';
+$labels['mon'] = 'M氓n';
$labels['tue'] = 'Tis';
$labels['wed'] = 'Ons';
$labels['thu'] = 'Tor';
$labels['fri'] = 'Fre';
-$labels['sat'] = 'L鰏';
+$labels['sat'] = 'L枚s';
// weekdays long
-$labels['sunday'] = 'S鰊dag';
-$labels['monday'] = 'M錸dag';
+$labels['sunday'] = 'S枚ndag';
+$labels['monday'] = 'M氓ndag';
$labels['tuesday'] = 'Tisdag';
$labels['wednesday'] = 'Onsdag';
$labels['thursday'] = 'Torsdag';
$labels['friday'] = 'Fredag';
-$labels['saturday'] = 'L鰀ag';
+$labels['saturday'] = 'L枚dag';
$labels['today'] = 'Idag';
// toolbar buttons
$labels['writenewmessage'] = 'Skapa nytt meddelande';
-$labels['replytomessage'] = 'Svar p meddelande';
+$labels['replytomessage'] = 'Svar p氓 meddelande';
$labels['replytoallmessage'] = 'Svara alla';
$labels['forwardmessage'] = 'Skicka vidare meddelande';
$labels['deletemessage'] = 'Flytta till papperskorgen';
$labels['printmessage'] = 'Skriv ut';
$labels['previousmessages'] = 'Visa tidigare';
-$labels['nextmessages'] = 'Visa n鋝ta';
+$labels['nextmessages'] = 'Visa n盲sta';
$labels['backtolist'] = 'Tillbaka till meddelandelistan';
-$labels['select'] = 'V鋖j';
+$labels['select'] = 'V盲lj';
$labels['all'] = 'Alla';
$labels['none'] = 'Ingen';
-$labels['unread'] = 'Ol鋝t';
+$labels['unread'] = 'Ol盲st';
// message compose
$labels['compose'] = 'Skriv meddelande';
@@ -111,27 +111,27 @@ $labels['addattachment'] = 'Bifoga fil';
$labels['attachments'] = 'Filer';
$labels['upload'] = 'Ladda upp';
-$labels['close'] = 'St鋘g';
+$labels['close'] = 'St盲ng';
-$labels['low'] = 'L錱';
-$labels['lowest'] = 'L鋑st';
+$labels['low'] = 'L氓g';
+$labels['lowest'] = 'L盲gst';
$labels['normal'] = 'Normal';
-$labels['high'] = 'H鰃';
-$labels['highest'] = 'H鰃st';
+$labels['high'] = 'H枚g';
+$labels['highest'] = 'H枚gst';
$labels['showimages'] = 'Visa bilder';
// address boook
$labels['name'] = 'Visa namn';
-$labels['firstname'] = 'F鰎namn';
+$labels['firstname'] = 'F枚rnamn';
$labels['surname'] = 'Efternamn';
$labels['email'] = 'E-post';
-$labels['addcontact'] = 'L鋑g till ny kontakt';
-$labels['editcontact'] = '膎dra kontakt';
+$labels['addcontact'] = 'L盲gg till ny kontakt';
+$labels['editcontact'] = '脛ndra kontakt';
-$labels['edit'] = '膎dra';
+$labels['edit'] = '脛ndra';
$labels['cancel'] = 'Avbryt';
$labels['save'] = 'Spara';
$labels['delete'] = 'Radera';
@@ -143,21 +143,21 @@ $labels['contactsfromto'] = 'Kontakter $from till $to av $count';
// settings
-$labels['settingsfor'] = 'Inst鋖lningar f鰎';
+$labels['settingsfor'] = 'Inst盲llningar f枚r';
-$labels['preferences'] = 'Inst鋖lningar';
-$labels['userpreferences'] = 'Anv鋘darinst鋖lningar';
-$labels['editpreferences'] = '膎dra anv鋘darinst鋖lningar';
+$labels['preferences'] = 'Inst盲llningar';
+$labels['userpreferences'] = 'Anv盲ndarinst盲llningar';
+$labels['editpreferences'] = '脛ndra anv盲ndarinst盲llningar';
$labels['identities'] = 'Identiteter';
-$labels['manageidentities'] = 'Hantera identiteter f鰎 kontot';
+$labels['manageidentities'] = 'Hantera identiteter f枚r kontot';
$labels['newidentity'] = 'Ny identitet';
$labels['newitem'] = 'Ny post';
-$labels['edititem'] = '膎dra post';
+$labels['edititem'] = '脛ndra post';
-$labels['setdefault'] = 'S鋞t som standard';
-$labels['language'] = 'Spr錵';
+$labels['setdefault'] = 'S盲tt som standard';
+$labels['language'] = 'Spr氓k';
$labels['timezone'] = 'Tidszon';
$labels['pagesize'] = 'Rader per sida';
diff --git a/program/localization/se/messages.inc b/program/localization/se/messages.inc
index a5f9f73be..ad06b7b1e 100644
--- a/program/localization/se/messages.inc
+++ b/program/localization/se/messages.inc
@@ -2,7 +2,7 @@
/*
+-----------------------------------------------------------------------+
- | language/en/messages.inc |
+ | language/se/messages.inc |
| |
| Language file of the RoundCube Webmail client |
| Copyright (C) 2005, RoundCube Dev. - Switzerland |
@@ -20,17 +20,17 @@ $messages = array();
$messages['loginfailed'] = 'Inloggningen misslyckades';
-$messages['cookiesdisabled'] = 'Din webbl鋝are accepterar inte cookies';
+$messages['cookiesdisabled'] = 'Din webbl盲sare accepterar inte cookies';
-$messages['sessionerror'] = 'Din session 鋜 felaktig eller har g錿t ut';
+$messages['sessionerror'] = 'Din session 盲r felaktig eller har g氓tt ut';
$messages['imaperror'] = 'Kommunikationen med IMAP-servern misslyckades';
-$messages['nomessagesfound'] = 'Inga meddelanden i den h鋜 mappen';
+$messages['nomessagesfound'] = 'Inga meddelanden i den h盲r mappen';
-$messages['loggedout'] = 'Du har avslutat sessionen. Hej d!';
+$messages['loggedout'] = 'Du har avslutat sessionen. Hej d氓!';
-$messages['mailboxempty'] = 'Mappen 鋜 tom';
+$messages['mailboxempty'] = 'Mappen 盲r tom';
$messages['loading'] = 'Laddar....';
@@ -44,9 +44,9 @@ $messages['addedsuccessfully'] = 'Kontakt har lagts till i adressboken';
$messages['contactexists'] = 'En kontakt med den angivna e-postadressen existerar redan';
-$messages['blockedimages'] = 'F鰎 att skydda dig har externa bilder blockerats fr錸 meddelandet';
+$messages['blockedimages'] = 'F枚r att skydda dig har externa bilder blockerats fr氓n meddelandet';
-$messages['encryptedmessage'] = 'Det h鋜 鋜 ett krypterat meddelande som inte kan visas. Tyv鋜r!';
+$messages['encryptedmessage'] = 'Det h盲r 盲r ett krypterat meddelande som inte kan visas. Tyv盲rr!';
$messages['nocontactsfound'] = 'Inga kontakter hittades';
diff --git a/program/localization/tr/labels.inc b/program/localization/tr/labels.inc
index 9daa54422..78ec838c9 100644
--- a/program/localization/tr/labels.inc
+++ b/program/localization/tr/labels.inc
@@ -9,7 +9,7 @@
| Licensed under the GNU GPL |
| |
+-----------------------------------------------------------------------+
- | Author: Melih Ta㩳izen <melih@marmara.edu.tr> |
+ | Author: Melih Ta艧dizen <melih@marmara.edu.tr> |
+-----------------------------------------------------------------------+
$Id$
@@ -19,47 +19,47 @@
$labels = array();
// login page
-$labels['username'] = 'Kullan齝 Ad';
-$labels['password'] = '辤fre';
+$labels['username'] = 'Kullan谋c谋 Ad谋';
+$labels['password'] = '艦ifre';
$labels['server'] = 'Sunucu';
-$labels['login'] = 'Giri';
+$labels['login'] = 'Giri艧';
// taskbar
-$labels['logout'] = '驱k';
+$labels['logout'] = '脟谋k谋艧';
$labels['mail'] = 'E-Posta';
-$labels['settings'] = 'Ki㱮sel Ayarlar';
+$labels['settings'] = 'Ki艧isel Ayarlar';
$labels['addressbook'] = 'Adres Defteri';
// mailbox names
$labels['inbox'] = 'Gelen Kutusu';
-$labels['sent'] = 'G鰊derilenler';
-$labels['trash'] = '泅p';
+$labels['sent'] = 'G枚nderilenler';
+$labels['trash'] = '脟枚p';
$labels['drafts'] = 'Taslaklar';
$labels['junk'] = 'Gereksiz(spam)';
// message listing
$labels['subject'] = 'Konu';
-$labels['from'] = 'G鰊deren';
-$labels['to'] = 'Al齝';
+$labels['from'] = 'G枚nderen';
+$labels['to'] = 'Al谋c谋';
$labels['cc'] = 'Kopya';
$labels['bcc'] = 'Gizli Kopya';
$labels['replyto'] = 'Cevapla';
$labels['date'] = 'Tarih';
$labels['size'] = 'Boyut';
-$labels['priority'] = '謓celik';
+$labels['priority'] = '脰ncelik';
$labels['organization'] = 'Organizasyon';
// aliases
$labels['reply-to'] = $labels['replyto'];
-$labels['mailboxlist'] = 'Klas鰎ler';
-$labels['messagesfromto'] = '$from\' dan/den $to\' e/a $count tane mesaj var.';
+$labels['mailboxlist'] = 'Klas枚rler';
+$labels['messagesfromto'] = '$from - $to aras谋, Toplam $count mesaj';
$labels['messagenrof'] = '$nr / $count';
-$labels['moveto'] = '辵raya ta...';
-$labels['download'] = '輓dir';
+$labels['moveto'] = '艦uraya ta艧谋...';
+$labels['download'] = '陌ndir';
-$labels['filename'] = 'Dosya Ad';
+$labels['filename'] = 'Dosya Ad谋';
$labels['filesize'] = 'Dosya Boyutu';
$labels['preferhtml'] = 'HTML Tercih et';
@@ -72,7 +72,7 @@ $labels['addtoaddressbook'] = 'Add to address book';
$labels['sun'] = 'Paz';
$labels['mon'] = 'Pts';
$labels['tue'] = 'Sal';
-$labels['wed'] = '莂r';
+$labels['wed'] = '脟ar';
$labels['thu'] = 'Per';
$labels['fri'] = 'Cum';
$labels['sat'] = 'Cts';
@@ -80,97 +80,97 @@ $labels['sat'] = 'Cts';
// weekdays long
$labels['sunday'] = 'Pazar';
$labels['monday'] = 'Pazartesi';
-$labels['tuesday'] = 'Sal';
-$labels['wednesday'] = '莂rmba';
-$labels['thursday'] = 'Per㧐mbe';
+$labels['tuesday'] = 'Sal谋';
+$labels['wednesday'] = '脟ar艧amba';
+$labels['thursday'] = 'Per艧embe';
$labels['friday'] = 'Cuma';
$labels['saturday'] = 'Cumartesi';
-$labels['today'] = 'Bug黱';
+$labels['today'] = 'Bug眉n';
// toolbar buttons
$labels['writenewmessage'] = 'Yeni Mesaj';
$labels['replytomessage'] = 'Cevapla';
-$labels['forwardmessage'] = '輑et';
-$labels['deletemessage'] = '泅p Klas鰎黱e ta';
-$labels['printmessage'] = 'Mesaj Yazd齬';
-$labels['previousmessages'] = 'Sonraki mesajlar g鰏ter';
-$labels['nextmessages'] = '謓ceki mesajlar g鰏ter';
+$labels['forwardmessage'] = '陌let';
+$labels['deletemessage'] = '脟枚p Klas枚r眉ne ta艧谋';
+$labels['printmessage'] = 'Mesaj谋 Yazd谋r';
+$labels['previousmessages'] = 'Sonraki mesajlar谋 g枚ster';
+$labels['nextmessages'] = '脰nceki mesajlar谋 g枚ster';
$labels['backtolist'] = 'Mesaj Listesi';
-$labels['viewsource'] = 'Kaynak Kodu G鰏ter';
+$labels['viewsource'] = 'Kaynak Kodu G枚ster';
-$labels['select'] = 'Se';
-$labels['all'] = 'T黰';
-$labels['none'] = 'Hi鏱iri';
-$labels['unread'] = 'Okunmam';
+$labels['select'] = 'Se莽';
+$labels['all'] = 'T眉m眉';
+$labels['none'] = 'Hi莽biri';
+$labels['unread'] = 'Okunmam谋艧';
// message compose
$labels['compose'] = 'Yeni Mesaj';
-$labels['sendmessage'] = 'Mesaj g鰊der';
+$labels['sendmessage'] = 'Mesaj谋 g枚nder';
$labels['addattachment'] = 'Dosya ekle';
-$labels['attachments'] = 'Eklenmi Dosyalar';
-$labels['upload'] = 'Y黭le';
+$labels['attachments'] = 'Eklenmi艧 Dosyalar';
+$labels['upload'] = 'Y眉kle';
$labels['close'] = 'Kapat';
-$labels['low'] = 'Az謓emsiz';
-$labels['lowest'] = '謓emli';
+$labels['low'] = 'Az脰nemsiz';
+$labels['lowest'] = '脰nemli';
$labels['normal'] = 'Normal';
-$labels['high'] = '謓emli';
-$labels['highest'] = '莖k 謓emli';
+$labels['high'] = '脰nemli';
+$labels['highest'] = '脟ok 脰nemli';
-$labels['showimages'] = 'Resimleri G鰏ter';
+$labels['showimages'] = 'Resimleri G枚ster';
// address boook
-$labels['name'] = 'G鰎黱en 輘im';
+$labels['name'] = 'G枚r眉nen 陌sim';
$labels['firstname'] = 'Ad';
$labels['surname'] = 'Soayad';
$labels['email'] = 'E-Posta';
$labels['addcontact'] = 'Yeni Kontak Ekle';
-$labels['editcontact'] = 'Kontak d鼁enle';
+$labels['editcontact'] = 'Kontak d眉zenle';
-$labels['edit'] = 'D鼁en';
-$labels['cancel'] = '輕tal';
+$labels['edit'] = 'D眉zen';
+$labels['cancel'] = '陌ptal';
$labels['save'] = 'Kaydet';
$labels['delete'] = 'Sil';
$labels['newcontact'] = 'Yeni kontak ekle';
-$labels['deletecontact'] = 'Se鏸li kontaklar sil';
-$labels['composeto'] = '辵 ki㱮ye mesaj yaz:';
-$labels['contactsfromto'] = '$from \'den/dan $to \'e/a $count tane mesaj var';
-$labels['print'] = 'Yazd齬';
-$labels['export'] = 'Farkl kaydet';
+$labels['deletecontact'] = 'Se莽ili kontaklar谋 sil';
+$labels['composeto'] = '艦u ki艧iye mesaj yaz:';
+$labels['contactsfromto'] = '$from - $to aras谋, Toplam $count kontak';
+$labels['print'] = 'Yazd谋r';
+$labels['export'] = 'Farkl谋 kaydet';
// settings
$labels['settingsfor'] = 'Ayarlar:';
$labels['preferences'] = 'Ayarlar';
-$labels['userpreferences'] = 'Kullan齝 Ayarlar';
-$labels['editpreferences'] = 'Kullan齝 Ayarlar齨 D鼁enle';
+$labels['userpreferences'] = 'Kullan谋c谋 Ayarlar谋';
+$labels['editpreferences'] = 'Kullan谋c谋 Ayarlar谋n谋 D眉zenle';
$labels['identities'] = 'Kimlikler';
-$labels['manageidentities'] = 'Bu hesap i鏸n kimlikleri d鼁enle';
+$labels['manageidentities'] = 'Bu hesap i莽in kimlikleri d眉zenle';
$labels['newidentity'] = 'Yeni Kimlik';
-$labels['newitem'] = 'Yeni 逐e';
-$labels['edititem'] = '逐eyi d鼁enle';
+$labels['newitem'] = 'Yeni 脰臒e';
+$labels['edititem'] = '脰臒eyi d眉zenle';
-$labels['setdefault'] = 'Varsay齦an olarak ata';
+$labels['setdefault'] = 'Varsay谋lan olarak ata';
$labels['language'] = 'Dil';
$labels['timezone'] = 'Zaman Dilimi';
-$labels['pagesize'] = 'Sayfada G鰏terilecek Sat齬';
+$labels['pagesize'] = 'Sayfada G枚sterilecek Sat谋r';
-$labels['folders'] = 'Klas鰎ler';
-$labels['foldername'] = 'Klas鰎 ad';
-$labels['subscribed'] = 'Kay齮l';
-$labels['create'] = 'Olu⺶ur';
-$labels['createfolder'] = 'Yeni klas鰎 olu⺶ur';
-$labels['deletefolder'] = 'Klas鰎 sl';
-$labels['managefolders'] = 'Klas鰎leri d鼁enle';
+$labels['folders'] = 'Klas枚rler';
+$labels['foldername'] = 'Klas枚r ad谋';
+$labels['subscribed'] = 'Kay谋tl谋';
+$labels['create'] = 'Olu艧tur';
+$labels['createfolder'] = 'Yeni klas枚r olu艧tur';
+$labels['deletefolder'] = 'Klas枚r sl';
+$labels['managefolders'] = 'Klas枚rleri d眉zenle';
?> \ No newline at end of file
diff --git a/program/localization/tr/messages.inc b/program/localization/tr/messages.inc
index a4fe9a806..ef6b7d68b 100644
--- a/program/localization/tr/messages.inc
+++ b/program/localization/tr/messages.inc
@@ -9,7 +9,7 @@
| Licensed under the GNU GPL |
| |
+-----------------------------------------------------------------------+
- | Author: Melih Ta㩳izen <melih@marmara.edu.tr> |
+ | Author: Melih Ta艧dizen <melih@marmara.edu.tr> |
+-----------------------------------------------------------------------+
$Id$
@@ -18,41 +18,41 @@
$messages = array();
-$messages['loginfailed'] = 'Bar齭齴 Giri';
+$messages['loginfailed'] = 'Ba艧ar谋s谋z Giri艧';
-$messages['cookiesdisabled'] = 'Taray齝齨齴齨 Cerez(cookie) deste餴 a琮k de餴l';
+$messages['cookiesdisabled'] = 'Taray谋c谋n谋z谋n Cerez(cookie) deste臒i a莽谋k de臒il';
-$messages['sessionerror'] = 'Oturumunuz hatal ve ya uzun s黵e iem yapmad齨齴 i鏸n kapand';
+$messages['sessionerror'] = 'Oturumunuz hatal谋 ve ya uzun s眉re i艧lem yapmad谋臒谋n谋z i莽in kapand谋';
-$messages['imaperror'] = 'IMAP sunucusuna ba餷an齦amad';
+$messages['imaperror'] = 'IMAP sunucusuna ba臒lan谋lamad谋';
$messages['nomessagesfound'] = 'Gelen kutusnda mesaj yok';
-$messages['loggedout'] = 'Oturumunuz bar齳la kapat齦d. G黮e G黮e!';
+$messages['loggedout'] = 'Oturumunuz ba艧ar谋yla kapat谋ld谋. G眉le G眉le!';
-$messages['mailboxempty'] = 'Gelen kutusu bo';
+$messages['mailboxempty'] = 'Gelen kutusu bo艧';
-$messages['loadingdata'] = 'Veri y黭leniyor...';
+$messages['loadingdata'] = 'Veri y眉kleniyor...';
-$messages['messagesent'] = 'Mesaj g鰊derildi';
+$messages['messagesent'] = 'Mesaj g枚nderildi';
$messages['successfullysaved'] = 'Kaydedildi';
$messages['addedsuccessfully'] = 'Kontak eklendi';
-$messages['contactexists'] = 'Bu e-posta adresine sahip bir kontak zaten kay齮l';
+$messages['contactexists'] = 'Bu e-posta adresine sahip bir kontak zaten kay谋tl谋';
-$messages['blockedimages'] = 'G黺enli餴niz i鏸n harici resimler engellendi.';
+$messages['blockedimages'] = 'G眉venli臒iniz i莽in harici resimler engellendi.';
-$messages['encryptedmessage'] = '辤frelenm㱮 bir mesaj, okuyamazs齨齴!';
+$messages['encryptedmessage'] = '艦ifrelenm艧i bir mesaj, okuyamazs谋n谋z!';
-$messages['nocontactsfound'] = 'Kontak bulunamad';
+$messages['nocontactsfound'] = 'Kontak bulunamad谋';
-$messages['sendingfailed'] = 'Mesaj g鰊derilemedi';
+$messages['sendingfailed'] = 'Mesaj g枚nderilemedi';
-$messages['errorsaving'] = 'Kaydederken hata olu⺶u';
+$messages['errorsaving'] = 'Kaydederken hata olu艧tu';
-$messages['errormoving'] = 'Mesaj tanamad';
+$messages['errormoving'] = 'Mesaj ta艧谋namad谋';
$messages['errordeleting'] = 'Mesaj silinemedi';
diff --git a/program/localization/tw/labels.inc b/program/localization/tw/labels.inc
index 9503cbc3f..4537d827a 100755
--- a/program/localization/tw/labels.inc
+++ b/program/localization/tw/labels.inc
@@ -16,8 +16,6 @@
*/
-$utf8_decoding = TRUE;
-
$labels = array();
// login page
diff --git a/program/localization/tw/messages.inc b/program/localization/tw/messages.inc
index 0260c60bf..7697cf574 100755
--- a/program/localization/tw/messages.inc
+++ b/program/localization/tw/messages.inc
@@ -16,8 +16,6 @@
*/
-$utf8_decoding = TRUE;
-
$messages = array();
$messages['loginfailed'] = '鐧诲叆澶辨晽';
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 8ebd1c59c..4c6e56a50 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -148,7 +148,7 @@ function rcmail_build_folder_tree(&$arrFolders, $folder, $delm='/', $path='')
if (!isset($arrFolders[$currentFolder]))
{
$arrFolders[$currentFolder] = array('id' => $path,
- 'name' => $currentFolder,
+ 'name' => UTF7DecodeString($currentFolder),
'folders' => array());
}
@@ -160,7 +160,7 @@ function rcmail_build_folder_tree(&$arrFolders, $folder, $delm='/', $path='')
// return html for a structured list <ul> for the mailbox tree
function rcmail_render_folder_tree_html(&$arrFolders, &$special, &$mbox, $maxlength, $nestLevel=0)
{
- global $JS_OBJECT_NAME, $IMAP, $CONFIG;
+ global $JS_OBJECT_NAME, $IMAP, $CONFIG, $OUTPUT;
$idx = 0;
$out = '';
@@ -174,7 +174,7 @@ function rcmail_render_folder_tree_html(&$arrFolders, &$special, &$mbox, $maxlen
$foldername = rcube_label($folder_lc);
else
{
- $foldername = UTF7DecodeString($folder['name']);
+ $foldername = $OUTPUT->encode_string($folder['name']);
// shorten the folder name to a given length
if ($maxlength && $maxlength>1)
@@ -231,7 +231,7 @@ function rcmail_render_folder_tree_html(&$arrFolders, &$special, &$mbox, $maxlen
// return html for a flat list <select> for the mailbox tree
function rcmail_render_folder_tree_select(&$arrFolders, &$special, &$mbox, $maxlength, $nestLevel=0)
{
- global $IMAP;
+ global $IMAP, $OUTPUT;
$idx = 0;
$out = '';
@@ -242,7 +242,7 @@ function rcmail_render_folder_tree_select(&$arrFolders, &$special, &$mbox, $maxl
$foldername = rcube_label($folder_lc);
else
{
- $foldername = UTF7DecodeString($folder['name']);
+ $foldername = $OUTPUT->encode_string($folder['name']);
// shorten the folder name to a given length
if ($maxlength && $maxlength>1)
diff --git a/program/steps/mail/getunread.inc b/program/steps/mail/getunread.inc
index d35dcf9f1..260221719 100644
--- a/program/steps/mail/getunread.inc
+++ b/program/steps/mail/getunread.inc
@@ -29,6 +29,7 @@ if (!empty($a_folders))
{
$commands = sprintf("this.set_unread_count('%s', %d);\n", $mbox, $IMAP->messagecount($mbox, 'UNSEEN'));
rcube_remote_response($commands, TRUE);
+ ob_flush();
}
}
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index c29fcf1d3..ee278189a 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -77,6 +77,11 @@ if (empty($_POST['_to']) && empty($_POST['_subject']) && $_POST['_message'])
if (empty($CHARSET))
$CHARSET = 'ISO-8859-1';
+$input_charset = $CHARSET;
+$message_charset = isset($_POST['_charset']) ? $_POST['_charset'] : $input_charset;
+
+// unset global var
+$CHARSET = '';
$mailto_regexp = array('/[,;]\s*[\r\n]+/', '/[\r\n]+/', '/[,;]\s*$/m');
$mailto_replace = array(', ', ', ', '');
@@ -100,20 +105,20 @@ $message_id = sprintf('<%s@%s>', md5(uniqid('rcmail')), $_SESSION['imap_host']);
// compose headers array
$headers = array('Date' => date('D, j M Y G:i:s O'),
'From' => $identity_arr['string'],
- 'To' => $mailto);
+ 'To' => rcube_charset_convert($mailto, $input_charset, $message_charset));
// additional recipients
if ($_POST['_cc'])
- $headers['Cc'] = preg_replace($mailto_regexp, $mailto_replace, stripslashes($_POST['_cc']));
+ $headers['Cc'] = rcube_charset_convert(preg_replace($mailto_regexp, $mailto_replace, stripslashes($_POST['_cc'])), $input_charset, $message_charset);
if ($_POST['_bcc'])
- $headers['Bcc'] = preg_replace($mailto_regexp, $mailto_replace, stripslashes($_POST['_bcc']));
+ $headers['Bcc'] = rcube_charset_convert(preg_replace($mailto_regexp, $mailto_replace, stripslashes($_POST['_bcc'])), $input_charset, $message_charset);
if (strlen($identity_arr['bcc']))
$headers['Bcc'] = ($headers['Bcc'] ? $headers['Bcc'].', ' : '') . $identity_arr['bcc'];
// add subject
-$headers['Subject'] = trim(stripslashes($_POST['_subject']));
+$headers['Subject'] = rcube_charset_convert(trim(stripslashes($_POST['_subject'])), $input_charset, $message_charset);
if (strlen($identity_arr['organization']))
$headers['Organization'] = $identity_arr['organization'];
@@ -141,6 +146,8 @@ $headers['X-Sender'] = $from;
if ($CONFIG['useragent'])
$headers['User-Agent'] = $CONFIG['useragent'];
+// fetch message body
+$message_body = rcube_charset_convert(stripslashes($_POST['_message']), $input_charset, $message_charset);
// append generic footer to all messages
if (!empty($CONFIG['generic_message_footer']))
@@ -150,7 +157,7 @@ if (!empty($CONFIG['generic_message_footer']))
{
$content = fread($fp, filesize($file));
fclose($fp);
- $_POST['_message'] .= "\r\n" . $content;
+ $message_body .= "\r\n" . rcube_charset_convert($content, 'UTF-8', $message_charset);
}
}
@@ -160,8 +167,8 @@ $header_delm = $rcmail_config['mail_header_delimiter'] ? $rcmail_config['mail_he
// create PEAR::Mail_mime instance
$MAIL_MIME = new Mail_mime($header_delm);
-$MAIL_MIME->setTXTBody(stripslashes($_POST['_message']), FALSE, TRUE);
-//$MAIL_MIME->setTXTBody(wordwrap(stripslashes($_POST['_message'])), FALSE, TRUE);
+$MAIL_MIME->setTXTBody($message_body, FALSE, TRUE);
+//$MAIL_MIME->setTXTBody(wordwrap($message_body), FALSE, TRUE);
// add stored attachments, if any
@@ -176,8 +183,6 @@ if (is_array($_FILES['_attachments']['tmp_name']))
$MAIL_MIME->addAttachment($filepath, $files['type'][$i], $files['name'][$i], TRUE);
-$message_charset = isset($_POST['_charset']) ? $_POST['_charset'] : $CHARSET;
-
// encoding settings for mail composing
$message_param = array('text_encoding' => '7bit',
'html_encoding' => 'quoted-printable',
@@ -230,7 +235,7 @@ else
// reset stored headers and overwrite
$MAIL_MIME->_headers = array();
$header_str = $MAIL_MIME->txtHeaders($headers_php);
-
+
if(ini_get('safe_mode'))
$sent = mail($headers_enc['To'], $headers_enc['Subject'], $msg_body, $header_str);
else
@@ -238,6 +243,9 @@ else
}
+// resore page charset
+$CHARSET = $input_charset;
+
// return to compose page if sending failed
if (!$sent)
{
diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc
index 33d83dfff..0702ce91d 100644
--- a/program/steps/settings/manage_folders.inc
+++ b/program/steps/settings/manage_folders.inc
@@ -29,7 +29,7 @@ rcmail_imap_init(TRUE);
if ($_action=='subscribe')
{
if (strlen($_GET['_mboxes']))
- $IMAP->subscribe(explode(',', $_GET['_mboxes']));
+ $IMAP->subscribe(array($_GET['_mboxes']));
if ($_GET['_remote'])
rcube_remote_response('// subscribed');
@@ -39,7 +39,7 @@ if ($_action=='subscribe')
else if ($_action=='unsubscribe')
{
if (strlen($_GET['_mboxes']))
- $IMAP->unsubscribe(explode(',', $_GET['_mboxes']));
+ $IMAP->unsubscribe(array($_GET['_mboxes']));
if ($_GET['_remote'])
rcube_remote_response('// unsubscribed');
@@ -53,7 +53,7 @@ else if ($_action=='create-folder')
if ($create && $_GET['_remote'])
{
- $commands = sprintf("this.add_folder_row('%s')", rep_specialchars_output($create, 'js'));
+ $commands = sprintf("this.add_folder_row('%s')", $OUTPUT->encode_string(rep_specialchars_output($create, 'js')));
rcube_remote_response($commands);
}
else if (!$create && $_GET['_remote'])
@@ -69,7 +69,7 @@ else if ($_action=='create-folder')
else if ($_action=='delete-folder')
{
if (strlen($_GET['_mboxes']))
- $deleted = $IMAP->delete_mailbox(explode(',', $_GET['_mboxes']));
+ $deleted = $IMAP->delete_mailbox(array($_GET['_mboxes']));
if ($_GET['_remote'] && $deleted)
rcube_remote_response(sprintf("this.remove_folder_row('%s')", rep_specialchars_output($_GET['_mboxes'], 'js')));
@@ -129,7 +129,7 @@ function rcube_subscription_form($attrib)
$out .= sprintf('<tr id="rcmrow%d" class="%s"><td>%s</td><td>%s</td><td><a href="#delete" onclick="%s.command(\'delete-folder\',\'%s\')" title="%s">%s</a></td>',
$i+1,
$zebra_class,
- rep_specialchars_output(UTF7DecodeString($folder), 'html', 'all'),
+ $OUTPUT->encode_string(rep_specialchars_output(UTF7DecodeString($folder), 'html', 'all')),
$checkbox_subscribe->show(in_array($folder, $a_subscribed)?$folder:'', array('value' => $folder)),
$JS_OBJECT_NAME,
$folder_js,