From c0309556342871c2f65b5212ffdf35579d1ce7e6 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 13 Jan 2006 11:03:36 -0500
Subject: [PATCH] Switched to full UTF-8 support

---
 program/localization/fi/labels.inc        |   58 +-
 program/localization/lv/labels.inc        |    2 
 program/localization/nn_NO/messages.inc   |    4 
 program/localization/tr/labels.inc        |  124 ++++----
 program/steps/settings/manage_folders.inc |   10 
 program/localization/it/messages.inc      |    8 
 program/localization/pl/messages.inc      |    2 
 program/localization/se/labels.inc        |   70 ++--
 program/localization/ru/messages.inc      |    2 
 program/localization/it/labels.inc        |   18 
 program/localization/pt_BR/labels.inc     |   44 +-
 program/localization/nl/messages.inc      |    2 
 program/steps/mail/func.inc               |   10 
 program/localization/fr/messages.inc      |   26 
 program/localization/ru/labels.inc        |    2 
 program/localization/nn_NO/labels.inc     |   24 
 program/localization/tw/messages.inc      |    2 
 program/localization/nb_NO/messages.inc   |    4 
 program/localization/tw/labels.inc        |    2 
 program/localization/se/messages.inc      |   16 
 program/localization/pt_BR/messages.inc   |   18 
 program/localization/fr/labels.inc        |   78 ++--
 program/steps/mail/sendmail.inc           |   28 +
 program/localization/tr/messages.inc      |   32 +-
 /dev/null                                 |   56 ---
 program/localization/pl/labels.inc        |    2 
 program/localization/pt_PT/labels.inc     |   42 +-
 program/localization/nb_NO/labels.inc     |   26 
 program/localization/en_US/messages.inc   |    0 
 program/localization/en_US/labels.inc     |    0 
 program/steps/mail/getunread.inc          |    1 
 program/localization/es/labels.inc        |   32 +-
 program/localization/es/messages.inc      |   22 
 program/localization/fi/messages.inc      |   30 +-
 program/js/app.js                         |   16 
 program/localization/lv/messages.inc      |    2 
 program/localization/pt_PT/messages.inc   |   56 +++
 37 files changed, 435 insertions(+), 436 deletions(-)

diff --git a/program/js/app.js b/program/js/app.js
index 650dbaa..4ed77fb 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -2708,8 +2708,8 @@
   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 @@
 
     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 @@
     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
similarity index 100%
rename from program/localization/en/labels.inc
rename to program/localization/en_US/labels.inc
diff --git a/program/localization/en/messages.inc b/program/localization/en_US/messages.inc
similarity index 100%
rename from program/localization/en/messages.inc
rename to program/localization/en_US/messages.inc
diff --git a/program/localization/es/labels.inc b/program/localization/es/labels.inc
index 19bad21..55962c9 100644
--- a/program/localization/es/labels.inc
+++ b/program/localization/es/labels.inc
@@ -19,14 +19,14 @@
 
 // login page
 $labels['username']  = 'Nombre de usuario';
-$labels['password']  = 'Contrase�a';
+$labels['password']  = 'Contraseña';
 $labels['server']    = 'Servidor';
 $labels['login']     = 'Entrar';
 
 // taskbar
-$labels['logout']   = 'Cerrar sesi�n';
+$labels['logout']   = 'Cerrar sesión';
 $labels['mail']     = 'E-Mail';
-$labels['settings'] = 'Configuraci�n';
+$labels['settings'] = 'Configuración';
 $labels['addressbook'] = 'Contactos';
 
 // mailbox names
@@ -44,9 +44,9 @@
 $labels['bcc']     = 'BCC';
 $labels['replyto'] = 'Responder';
 $labels['date']    = 'Fecha';
-$labels['size']    = 'Tama�o';
+$labels['size']    = 'Tamaño';
 $labels['priority'] = 'Prioridad';
-$labels['organization'] = 'Organizaci�n';
+$labels['organization'] = 'Organización';
 
 // aliases
 $labels['reply-to'] = $labels['replyto'];
@@ -59,13 +59,13 @@
 $labels['download'] = 'descargar';
 
 $labels['filename'] = 'Nombre del fichero';
-$labels['filesize'] = 'Tama�o del fichero';
+$labels['filesize'] = 'Tamaño del fichero';
 
 $labels['preferhtml'] = 'Prefiero HTML';
 $labels['htmlmessage'] = 'Mensaje HTML';
 $labels['prettydate'] = 'Fechas cortas';
 
-$labels['addtoaddressbook'] = 'A�adir a contactos';
+$labels['addtoaddressbook'] = 'Añadir a contactos';
 
 // weekdays short
 $labels['sun'] = 'D';
@@ -83,7 +83,7 @@
 $labels['wednesday'] = 'Miercoles';
 $labels['thursday']  = 'Jueves';
 $labels['friday']    = 'Viernes';
-$labels['saturday']  = 'S�bado';
+$labels['saturday']  = 'Sábado';
 
 $labels['today'] = 'Hoy';
 
@@ -106,19 +106,19 @@
 // message compose
 $labels['compose']  = 'Escribir un mensaje';
 $labels['sendmessage']  = 'Enviar ahora el mensaje';
-$labels['addattachment']  = 'A�adir un fichero';
+$labels['addattachment']  = 'Añadir un fichero';
 
 $labels['attachments'] = 'Adjuntos';
 $labels['upload'] = 'Subir';
 $labels['close']  = 'Cerrar';
 
 $labels['low']     = 'Bajo';
-$labels['lowest']  = 'Baj�simo';
+$labels['lowest']  = 'Bajísimo';
 $labels['normal']  = 'Normal';
 $labels['high']    = 'Alto';
-$labels['highest'] = 'Alt�simo';
+$labels['highest'] = 'Altísimo';
 
-$labels['showimages'] = 'Mostrar im�genes';
+$labels['showimages'] = 'Mostrar imágenes';
 
 
 // address boook
@@ -127,7 +127,7 @@
 $labels['surname']   = 'Apellido';
 $labels['email']     = 'E-Mail';
 
-$labels['addcontact'] = 'A�adir nuevo contacto';
+$labels['addcontact'] = 'Añadir nuevo contacto';
 $labels['editcontact'] = 'Editar contacto';
 
 $labels['edit']   = 'Editar';
@@ -142,7 +142,7 @@
 
 
 // settings
-$labels['settingsfor']  = 'Configuraci�n para';
+$labels['settingsfor']  = 'Configuración para';
 
 $labels['preferences']  = 'Preferencias';
 $labels['userpreferences']  = 'Preferencias de usuario';
@@ -155,10 +155,10 @@
 $labels['newitem']  = 'Nuevo';
 $labels['edititem']  = 'Editar';
 
-$labels['setdefault']  = 'Seleccionar opci�n por defecto';
+$labels['setdefault']  = 'Seleccionar opción por defecto';
 $labels['language']  = 'Idioma';
 $labels['timezone']  = 'Zona horaria';
-$labels['pagesize']  = 'Filas por p�gina';
+$labels['pagesize']  = 'Filas por página';
 
 
 $labels['folders']  = 'Carpetas';
diff --git a/program/localization/es/messages.inc b/program/localization/es/messages.inc
index 15c6560..228ce7e 100644
--- a/program/localization/es/messages.inc
+++ b/program/localization/es/messages.inc
@@ -17,19 +17,19 @@
 
 $messages = array();
 
-$messages['loginfailed']  = 'Contrase�a incorrecta';
+$messages['loginfailed']  = 'Contraseña incorrecta';
 
 $messages['cookiesdisabled'] = 'Su navegador no acepta cookies';
 
-$messages['sessionerror'] = 'Su sesi�n no existe o ha expirado';
+$messages['sessionerror'] = 'Su sesión no existe o ha expirado';
 
-$messages['imaperror'] = 'Fallo de conexi�n con el servidor IMAP';
+$messages['imaperror'] = 'Fallo de conexión con el servidor IMAP';
 
-$messages['nomessagesfound'] = 'No se han encontrado mensajes en este buz�n';
+$messages['nomessagesfound'] = 'No se han encontrado mensajes en este buzón';
 
-$messages['loggedout'] = 'Ha cerrado la sesi�n. �Hasta pronto!';
+$messages['loggedout'] = 'Ha cerrado la sesión. ¡Hasta pronto!';
 
-$messages['mailboxempty'] = 'El buz�n esta vacio';
+$messages['mailboxempty'] = 'El buzón esta vacio';
 
 $messages['loadingdata'] = 'Cargando datos...';
 
@@ -37,19 +37,19 @@
 
 $messages['successfullysaved'] = 'guardado correctamente';
 
-$messages['addedsuccessfully'] = 'Contacto a�adido 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�n de correo';
+$messages['contactexists'] = 'Ya existe un contacto con esta dirección de correo';
 
-$messages['blockedimages'] = 'Para proteger su privacidad, las im�genes 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. �Lo 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 b92ef79..3ea0569 100644
--- a/program/localization/fi/labels.inc
+++ b/program/localization/fi/labels.inc
@@ -19,34 +19,34 @@
 $labels = array();
 
 // login page
-$labels['username']  = 'K�ytt�j�tunnus';
+$labels['username']  = 'Käyttäjätunnus';
 $labels['password']  = 'Salasana';
 $labels['server']    = 'Palvelin';
 $labels['login']     = 'Kirjaudu';
 
 // taskbar
 $labels['logout']   = 'Kirjaudu ulos';
-$labels['mail']     = 'S�hk�posti';
+$labels['mail']     = 'Sähköposti';
 $labels['settings'] = 'Omat asetukset';
 $labels['addressbook'] = 'Osoitekirja';
 
 // mailbox names
 $labels['inbox']  = 'Saapuneet';
-$labels['sent']   = 'L�hetetyt';
+$labels['sent']   = 'Lähetetyt';
 $labels['trash']  = 'Roskakori';
 $labels['drafts'] = 'Drafts';
 $labels['junk']   = 'Roskaposti';
 
 // message listing
 $labels['subject'] = 'Aihe';
-$labels['from']    = 'L�hett�j�';
+$labels['from']    = 'Lähettäjä';
 $labels['to']      = 'Vastaanottaja';
 $labels['cc']      = 'Kopio';
 $labels['bcc']     = 'Piilokopio';
 $labels['replyto'] = 'Reply-To';
-$labels['date']    = 'P�iv�ys';
+$labels['date']    = 'Päiväys';
 $labels['size']    = 'Koko';
-$labels['priority'] = 'T�rkeys';
+$labels['priority'] = 'Tärkeys';
 $labels['organization'] = 'Organisaatio';
 
 // aliases
@@ -56,17 +56,17 @@
 $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�yt� HTML:aa';
+$labels['preferhtml'] = 'Käytä HTML:aa';
 $labels['htmlmessage'] = 'HTML-viesti';
-$labels['prettydate'] = 'N�tit p�iv�ykset';
+$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['friday']    = 'Perjantai';
 $labels['saturday']  = 'Lauantai';
 
-$labels['today'] = 'T�n��n';
+$labels['today'] = 'Tänään';
 
 // toolbar buttons
 $labels['writenewmessage']  = 'Kirjoita uusi viesti';
 $labels['replytomessage']   = 'Vastaa viestiin';
 $labels['replytoallmessage'] = 'Vastaa kaikille';
-$labels['forwardmessage']   = 'V�lit� viesti';
-$labels['deletemessage']    = 'Siirr� viesti roskakoriin';
+$labels['forwardmessage']   = 'Välitä viesti';
+$labels['deletemessage']    = 'Siirrä viesti roskakoriin';
 $labels['printmessage']     = 'Tulosta viesti';
-$labels['previousmessages'] = 'N�yt� edelliset viestit';
-$labels['nextmessages']     = 'N�yt� seuraavat viestit';
+$labels['previousmessages'] = 'Näytä edelliset viestit';
+$labels['nextmessages']     = 'Näytä seuraavat viestit';
 $labels['backtolist']       = 'Takaisin viesteihin';
-$labels['viewsource']       = 'N�yt� l�hdekoodi';
+$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�het� 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['high']    = 'Korkea';
 $labels['highest'] = 'Korkein';
 
-$labels['showimages'] = 'N�yt� kuvat';
+$labels['showimages'] = 'Näytä kuvat';
 
 
 // address boook
-$labels['name']      = 'N�kyv� 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['settingsfor']  = 'Asetukset';
 
 $labels['preferences']  = 'Asetukset';
-$labels['userpreferences']  = 'K�ytt�j�n asetukset';
-$labels['editpreferences']  = 'Muokkaa k�ytt�j�n 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['setdefault']  = 'Aseta vakioksi';
 $labels['language']  = 'Kieli';
-$labels['timezone']  = 'Aikavy�hyke';
-$labels['pagesize']  = 'Rivej� sivulla';
+$labels['timezone']  = 'Aikavyöhyke';
+$labels['pagesize']  = 'Rivejä sivulla';
 
 
 $labels['folders']  = 'Kansiot';
 $labels['foldername']  = 'Kansion nimi';
-$labels['subscribed']  = 'N�ytet��n';
+$labels['subscribed']  = 'Näytetään';
 $labels['create']  = 'Luo uusi';
 $labels['createfolder']  = 'Luo uusi kansio';
 $labels['deletefolder']  = 'Poista kansio';
-$labels['managefolders']  = 'Kansioiden yll�pito';
+$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 329085b..e1d2196 100644
--- a/program/localization/fi/messages.inc
+++ b/program/localization/fi/messages.inc
@@ -18,43 +18,43 @@
 
 $messages = array();
 
-$messages['loginfailed']  = 'Sis��nkirjautuminen ep�onnistui';
+$messages['loginfailed']  = 'Sisäänkirjautuminen epäonnistui';
 
-$messages['cookiesdisabled'] = 'Selaimesi ei hyv�ksy ev�steit�';
+$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�onnistui';
+$messages['imaperror'] = 'Yhteys IMAP-palvelimeen epäonnistui';
 
-$messages['nomessagesfound'] = 'Kansiossa ei ole s�hk�postiviestej�';
+$messages['nomessagesfound'] = 'Kansiossa ei ole sähköpostiviestejä';
 
-$messages['loggedout'] = 'Sinut on kirjattu ulos j�rjestelm�st�.';
+$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�hetetty';
+$messages['messagesent'] = 'Viesti lähetetty';
 
 $messages['successfullysaved'] = 'Tallennus onnistui';
 
-$messages['addedsuccessfully'] = 'Kontakti lis�tty osoitekirjaan';
+$messages['addedsuccessfully'] = 'Kontakti lisätty osoitekirjaan';
 
-$messages['contactexists'] = 'Samalla s�hk�postiosoitteella on jo olemassa kontakti';
+$messages['contactexists'] = 'Samalla sähköpostiosoitteella on jo olemassa kontakti';
 
-$messages['blockedimages'] = 'Turvallisuussyist� viestin kuvia ei n�ytetty.';
+$messages['blockedimages'] = 'Turvallisuussyistä viestin kuvia ei näytetty.';
 
-$messages['encryptedmessage'] = 'Viesti on salattu, eik� sit� voida n�ytt��.';
+$messages['encryptedmessage'] = 'Viesti on salattu, eikä sitä voida näyttää.';
 
 $messages['nocontactsfound'] = 'Ei kontakteja';
 
-$messages['sendingfailed'] = 'Viestin l�hetys ep�onnistui';
+$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 c429d5b..183e6a7 100644
--- a/program/localization/fr/labels.inc
+++ b/program/localization/fr/labels.inc
@@ -27,12 +27,12 @@
 // taskbar
 $labels['logout']   = 'Quitter';
 $labels['mail']     = 'e-Mail';
-$labels['settings'] = 'Pr�f�rences';
+$labels['settings'] = 'Préférences';
 $labels['addressbook'] = 'Carnet d\'adresses';
 
 // mailbox names
-$labels['inbox']  = 'Bo�te de r�ception';
-$labels['sent']   = 'Messages envoy�s';
+$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['to']      = 'A';
 $labels['cc']      = 'Cc';
 $labels['bcc']     = 'Cci';
-$labels['replyto'] = 'R�pondre �';
+$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�placer vers...';
-$labels['download'] = 'T�l�charger';
+$labels['moveto']   = 'Déplacer vers...';
+$labels['download'] = 'Télécharger';
 
 $labels['filename'] = 'Nom du fichier';
 $labels['filesize'] = 'Taille du fichier';
 
-$labels['preferhtml'] = 'Pr�f�rer HTML';
+$labels['preferhtml'] = 'Préférer HTML';
 $labels['htmlmessage'] = 'Message HTML';
 
 $labels['addtoaddressbook'] = 'Ajouter au carnet d\'adresses';
@@ -88,17 +88,17 @@
 $labels['today'] = 'Aujourd\'hui';
 
 // toolbar buttons
-$labels['writenewmessage']  = 'Cr�er un nouveau message';
-$labels['replytomessage']   = 'R�pondre au message';
-$labels['replytoallmessage'] = 'R�pondre � 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�placer 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�c�dents';
+$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�lectionner';
+$labels['select'] = 'Sélectionner';
 $labels['all'] = 'Tous';
 $labels['none'] = 'Aucun';
 $labels['unread'] = 'Non lus';
@@ -113,17 +113,17 @@
 $labels['close']  = 'Fermer';
 
 $labels['low']     = 'Basse';
-$labels['lowest']  = 'Tr�s basse';
+$labels['lowest']  = 'Très basse';
 $labels['normal']  = 'Normale';
-$labels['high']    = 'Elev�e';
-$labels['highest'] = 'Tr�s �lev�e';
+$labels['high']    = 'Elevée';
+$labels['highest'] = 'Très élevée';
 
 $labels['showimages'] = 'Montrer les images';
 
 
 // address boook
-$labels['name']      = 'Nom � afficher';
-$labels['firstname'] = 'Pr�nom';
+$labels['name']      = 'Nom à afficher';
+$labels['firstname'] = 'Prénom';
 $labels['surname']   = 'Nom';
 $labels['email']     = 'e-Mail';
 
@@ -135,27 +135,27 @@
 $labels['save']   = 'Sauvegarder';
 $labels['delete'] = 'Supprimer';
 
-$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';
+$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�tres pour';
+$labels['settingsfor']  = 'Paramètres pour';
 
-$labels['preferences']  = 'Pr�f�rences';
-$labels['userpreferences']  = 'Pr�f�rences utilisateur';
-$labels['editpreferences']  = 'Editer les pr�f�rences utilisateur';
+$labels['preferences']  = 'Préférences';
+$labels['userpreferences']  = 'Préférences utilisateur';
+$labels['editpreferences']  = 'Editer les préférences utilisateur';
 
-$labels['identities']  = 'Identit�s';
-$labels['manageidentities']  = 'G�rer les identit�s 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 �l�ment';
-$labels['edititem']  = 'Editer l\'�l�ment';
+$labels['newitem']  = 'Nouvel élément';
+$labels['edititem']  = 'Editer l\'élément';
 
-$labels['setdefault']  = 'Param�tres par d�faut';
+$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['folders']  = 'Dossiers';
 $labels['foldername']  = 'Nom du dossier';
-$labels['subscribed']  = 'Abonn�';
-$labels['create']  = 'Cr�er';
-$labels['createfolder']  = 'Cr�er 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�rer les dossiers';
+$labels['managefolders']  = 'Gérer les dossiers';
 
 
 ?>
diff --git a/program/localization/fr/messages.inc b/program/localization/fr/messages.inc
index 0ecfb76..7b6804d 100644
--- a/program/localization/fr/messages.inc
+++ b/program/localization/fr/messages.inc
@@ -22,33 +22,33 @@
 
 $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�te aux lettres';
+$messages['nomessagesfound'] = 'Auncun message trouvé dans cette boîte aux lettres';
 
-$messages['loggedout'] = 'Vous venez de vous d�connecter avec succ�s. Au revoir !';
+$messages['loggedout'] = 'Vous venez de vous déconnecter avec succès. Au revoir !';
 
-$messages['mailboxempty'] = 'Bo�te aux lettres vide';
+$messages['mailboxempty'] = 'Boîte aux lettres vide';
 
-$messages['loadingdata'] = 'Chargement des donn�es en cours...';
+$messages['loadingdata'] = 'Chargement des données en cours...';
 
-$messages['messagesent'] = 'Message envoy�';
+$messages['messagesent'] = 'Message envoyé';
 
-$messages['successfullysaved'] = 'Sauvegarde effectu�e';
+$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�j�';
+$messages['contactexists'] = 'Un contact avec cette adresse e-Mail existe déjà';
 
-$messages['blockedimages'] = 'Afin de pr�server votre intimit�, les images distantes ont �t� bloqu�es 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 �tre affich�. D�sol� !';
+$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 �t� 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 111a1ac..593a875 100644
--- a/program/localization/it/labels.inc
+++ b/program/localization/it/labels.inc
@@ -46,7 +46,7 @@
 $labels['replyto'] = 'Rispondi a';
 $labels['date']    = 'Data';
 $labels['size']    = 'Dimensione';
-$labels['priority'] = 'Priorit�';
+$labels['priority'] = 'Priorità';
 $labels['organization'] = 'Organizzazione';
 
 // aliases
@@ -78,11 +78,11 @@
 
 // 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['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 1525ea1..23608a4 100644
--- a/program/localization/it/messages.inc
+++ b/program/localization/it/messages.inc
@@ -22,7 +22,7 @@
 
 $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['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['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 0566984..fd2c500 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 319908e..1e43dd0 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 47af32b..8598086 100644
--- a/program/localization/nb_NO/labels.inc
+++ b/program/localization/nb_NO/labels.inc
@@ -35,7 +35,7 @@
 $labels['sent']   = 'Sendte elementer';
 $labels['trash']  = 'Slettede elementer';
 $labels['drafts'] = 'Kladd';
-$labels['junk']   = 'S�ppel';
+$labels['junk']   = 'Søppel';
 
 // message listing
 $labels['subject'] = 'Emne';
@@ -45,7 +45,7 @@
 $labels['bcc']     = 'Blindkopi';
 $labels['replyto'] = 'Svar-til';
 $labels['date']    = 'Dato';
-$labels['size']    = 'St�rrelse';
+$labels['size']    = 'Størrelse';
 $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organisasjon';
 
@@ -60,7 +60,7 @@
 $labels['download'] = 'last ned';
 
 $labels['filename'] = 'Filnavn';
-$labels['filesize'] = 'Filest�rrelse';
+$labels['filesize'] = 'Filestørrelse';
 
 $labels['preferhtml'] = 'Foretrekk HTML';
 $labels['htmlmessage'] = 'HTML-melding';
@@ -69,32 +69,32 @@
 $labels['addtoaddressbook'] = 'Legg til adressebok';
 
 // weekdays short
-$labels['sun'] = 'S�n';
+$labels['sun'] = 'Søn';
 $labels['mon'] = 'Man';
 $labels['tue'] = 'Tir';
 $labels['wed'] = 'Ons';
 $labels['thu'] = 'Tor';
 $labels['fri'] = 'Fre';
-$labels['sat'] = 'L�r';
+$labels['sat'] = 'Lør';
 
 // weekdays long
-$labels['sunday']    = 'S�ndag';
+$labels['sunday']    = 'Søndag';
 $labels['monday']    = 'Mandag';
 $labels['tuesday']   = 'Tirsdag';
 $labels['wednesday'] = 'Onsdag';
 $labels['thursday']  = 'Torsdag';
 $labels['friday']    = 'Fredag';
-$labels['saturday']  = 'L�rdag';
+$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�ende 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 @@
 
 // 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['low']     = 'Lav';
 $labels['lowest']  = 'Lavest';
 $labels['normal']  = 'Normal';
-$labels['high']    = 'H�y';
-$labels['highest'] = 'H�yest';
+$labels['high']    = 'Høy';
+$labels['highest'] = 'Høyest';
 
 $labels['showimages'] = 'Vis bilder';
 
@@ -159,7 +159,7 @@
 $labels['edititem']  = 'Redigere element';
 
 $labels['setdefault']  = 'Sett som standard';
-$labels['language']  = 'Spr�k';
+$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 23b941c..c63a66c 100644
--- a/program/localization/nb_NO/messages.inc
+++ b/program/localization/nb_NO/messages.inc
@@ -22,7 +22,7 @@
 
 $messages['cookiesdisabled'] = 'Nettleseren din tillater ikke informasjonskapsler (cookies)';
 
-$messages['sessionerror'] = 'Sesjonen din er ugyldig eller utl�pt 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['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 39909e9..31b2348 100644
--- a/program/localization/nl/messages.inc
+++ b/program/localization/nl/messages.inc
@@ -28,7 +28,7 @@
 
 $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 15b7800..0e6152d 100644
--- a/program/localization/nn_NO/labels.inc
+++ b/program/localization/nn_NO/labels.inc
@@ -35,7 +35,7 @@
 $labels['sent']   = 'Sende element';
 $labels['trash']  = 'Sletta element';
 $labels['drafts'] = 'Kladd';
-$labels['junk']   = 'S�ppel';
+$labels['junk']   = 'Søppel';
 
 // message listing
 $labels['subject'] = 'Emne';
@@ -62,7 +62,7 @@
 $labels['filename'] = 'Filnamn';
 $labels['filesize'] = 'Filstorleik';
 
-$labels['preferhtml'] = 'F�retrekk HTML';
+$labels['preferhtml'] = 'Føretrekk HTML';
 $labels['htmlmessage'] = 'HTML-melding';
 $labels['prettydate'] = 'Pene datoar';
 
@@ -70,7 +70,7 @@
 
 // weekdays short
 $labels['sun'] = 'Sun';
-$labels['mon'] = 'M�n';
+$labels['mon'] = 'Mån';
 $labels['tue'] = 'Tys';
 $labels['wed'] = 'Ons';
 $labels['thu'] = 'Tor';
@@ -79,7 +79,7 @@
 
 // weekdays long
 $labels['sunday']    = 'Sundag';
-$labels['monday']    = 'M�ndag';
+$labels['monday']    = 'Måndag';
 $labels['tuesday']   = 'Tysdag';
 $labels['wednesday'] = 'Onsdag';
 $labels['thursday']  = 'Torsdag';
@@ -90,11 +90,11 @@
 
 // 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�reg�ande 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['upload'] = 'Last opp';
 $labels['close']  = 'Steng';
 
-$labels['low']     = 'L�g';
-$labels['lowest']  = 'L�gast';
+$labels['low']     = 'Låg';
+$labels['lowest']  = 'Lågast';
 $labels['normal']  = 'Normal';
-$labels['high']    = 'H�g';
-$labels['highest'] = 'H�gast';
+$labels['high']    = 'Høg';
+$labels['highest'] = 'Høgast';
 
 $labels['showimages'] = 'Vis bilete';
 
 
 // address book
 $labels['name']      = 'Visingsnamn';
-$labels['firstname'] = 'F�renamn';
+$labels['firstname'] = 'Førenamn';
 $labels['surname']   = 'Etternamn';
 $labels['email']     = 'E-post';
 
@@ -159,7 +159,7 @@
 $labels['edititem']  = 'Redigere element';
 
 $labels['setdefault']  = 'Set som standard';
-$labels['language']  = 'Spr�k';
+$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 31a1c64..a724884 100644
--- a/program/localization/nn_NO/messages.inc
+++ b/program/localization/nn_NO/messages.inc
@@ -22,7 +22,7 @@
 
 $messages['cookiesdisabled'] = 'Nettlesaren din tillet ikkje informasjonskapslar (cookies)';
 
-$messages['sessionerror'] = 'Sesjonen din er ulovleg eller har g�tt 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['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 1a2640a..c310a3e 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 a560b94..783be41 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/messages.inc b/program/localization/pt/messages.inc
deleted file mode 100644
index 4276365..0000000
--- a/program/localization/pt/messages.inc
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | language/pt/messages.inc                                              |
- |                                                                       |
- | Portuguese for Portugal Language file of the RoundCube Webmail client |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
- | Licensed under the GNU GPL                                            |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Alexandro Pestana (DJ_Alex), Portugal <wpcd@hotmail.com>      |
- +-----------------------------------------------------------------------+
-
- $Id$
-
-*/
-
-$messages = array();
-
-$messages['loginfailed']  = 'Autentica��o falhou';
-
-$messages['cookiesdisabled'] = 'O seu browser n�o aceita cookies';
-
-$messages['sessionerror'] = 'A sua sess�o � inv�lida ou expirou';
-
-$messages['imaperror'] = 'Liga��o ao servidor IMAP falhou';
-
-$messages['nomessagesfound'] = 'N�o foram encontradas mensagens nesta caixa de correio';
-
-$messages['loggedout'] = 'Voc� terminou a sess�o com sucesso. Adeus!';
-
-$messages['mailboxempty'] = 'A caixa de correio est� vazia';
-
-$messages['loadingdata'] = 'Carregando dados...';
-
-$messages['messagesent'] = 'Mensagem enviada com sucesso';
-
-$messages['successfullysaved'] = 'Gravado com sucesso';
-
-$messages['addedsuccessfully'] = 'Contacto adicionado ao livro de endere�os com sucesso';
-
-$messages['contactexists'] = 'J� existe um contacto com este endere�o de e-mail';
-
-$messages['blockedimages'] = 'Para proteger a sua privacidade, as imagens remotas est�o bloqueadas nesta mensagem.';
-
-$messages['encryptedmessage'] = 'Esta � uma mensagem encriptada e n�o pode ser mostrada. Desculpe!';
-
-$messages['nocontactsfound'] = 'N�o foram encontrados contactos';
-
-$messages['sendingfailed'] = 'A mensagem n�o foi enviada';
-
-$messages['errorsaving'] = 'Ocorreu um erro no decorrer da grava��o';
-
-
-?>
diff --git a/program/localization/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc
index 2b8943b..cb3450e 100644
--- a/program/localization/pt_BR/labels.inc
+++ b/program/localization/pt_BR/labels.inc
@@ -21,8 +21,8 @@
 
 $labels = array();
 
-// P�gina de login
-$labels['username']  = 'Usu�rio';
+// Página de login
+$labels['username']  = 'Usuário';
 $labels['password']  = 'Senha';
 $labels['server']    = 'Servidor';
 $labels['login']     = 'Login';
@@ -30,8 +30,8 @@
 // Barra de tarefas
 $labels['logout']   = 'Sair';
 $labels['mail']     = 'E-mail';
-$labels['settings'] = 'Configura��es pessoais';
-$labels['addressbook'] = 'Cat�logo de endere�os';
+$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['subject'] = 'Assunto';
 $labels['from']    = 'De';
 $labels['to']      = 'Para';
-$labels['cc']      = 'C�pia';
+$labels['cc']      = 'Cópia';
 $labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Responder para';
 $labels['date']    = 'Data';
@@ -58,7 +58,7 @@
 $labels['priority'] = 'Prioridade';
 $labels['organization'] = 'Empresa';
 
-// R�tulos
+// Rótulos
 $labels['reply-to'] = $labels['replyto'];
 
 $labels['mailboxlist'] = 'Mensagens';
@@ -75,7 +75,7 @@
 $labels['htmlmessage'] = 'Mensagem HTML';
 $labels['prettydate'] = 'Formatar datas';
 
-$labels['addtoaddressbook'] = 'Incluir no cat�logo de endere�os';
+$labels['addtoaddressbook'] = 'Incluir no catálogo de endereços';
 
 // Dias da semana abreviados
 $labels['sun'] = 'Dom';
@@ -84,33 +84,33 @@
 $labels['wed'] = 'Qua';
 $labels['thu'] = 'Qui';
 $labels['fri'] = 'Sex';
-$labels['sat'] = 'S�b';
+$labels['sat'] = 'Sáb';
 
 // Dias da semana completos
 $labels['sunday']    = 'Domingo';
 $labels['monday']    = 'Segunda-feira';
-$labels['tuesday']   = 'Ter�a-feira';
+$labels['tuesday']   = 'Terça-feira';
 $labels['wednesday'] = 'Quarta-feira';
 $labels['thursday']  = 'Quinta-feira';
 $labels['friday']    = 'Sexta-feira';
-$labels['saturday']  = 'S�bado';
+$labels['saturday']  = 'Sábado';
 
 $labels['today'] = 'Hoje';
 
-// Bot�es 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�ximo';
+$labels['nextmessages']     = 'Próximo';
 $labels['backtolist']       = 'Voltar';
 
 $labels['select'] = 'Selecionar';
 $labels['all'] = 'Todos';
 $labels['none'] = 'Nenhum';
-$labels['unread'] = 'N�o lido';
+$labels['unread'] = 'Não lido';
 
 // Escrever mensagem
 $labels['compose']  = 'Escrever nova mensagem';
@@ -130,7 +130,7 @@
 $labels['showimages'] = 'Exibir imagens';
 
 
-// Cat�logo de endere�os
+// Catálogo de endereços
 $labels['name']      = 'Nome';
 $labels['firstname'] = 'Primeiro nome';
 $labels['surname']   = 'Sobrenome';
@@ -147,15 +147,15 @@
 $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�ncias';
-$labels['userpreferences']  = 'Prefer�ncias do usu�rio';
-$labels['editpreferences']  = 'Editar prefer�ncias do usu�rio';
+$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['newitem']  = 'Novo item';
 $labels['edititem']  = 'Editar item';
 
-$labels['setdefault']  = 'Padr�o';
+$labels['setdefault']  = 'Padrão';
 $labels['language']  = 'Idioma';
 $labels['timezone']  = 'Time zone';
-$labels['pagesize']  = 'Linhas por p�gina';
+$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 ec34041..af653f9 100644
--- a/program/localization/pt_BR/messages.inc
+++ b/program/localization/pt_BR/messages.inc
@@ -22,31 +22,31 @@
 
 $messages['loginfailed']  = 'Falha no login';
 
-$messages['cookiesdisabled'] = 'Seu navegador n�o suporta cookies';
+$messages['cookiesdisabled'] = 'Seu navegador não suporta cookies';
 
-$messages['sessionerror'] = 'A sess�o do seu navegador � inv�lida ou expirou';
+$messages['sessionerror'] = 'A sessão do seu navegador é inválida ou expirou';
 
-$messages['imaperror'] = 'A conex�o 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�o 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�do 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�o 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
similarity index 81%
rename from program/localization/pt/labels.inc
rename to program/localization/pt_PT/labels.inc
index 6ca4dfa..7dec934 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�o de E-Mail';
+$labels['username']  = 'Endereço de E-Mail';
 $labels['password']  = 'Password';
 $labels['server']    = 'Servidor';
 $labels['login']     = 'Login';
@@ -27,8 +27,8 @@
 // taskbar
 $labels['logout']   = 'Sair';
 $labels['mail']     = 'E-Mail';
-$labels['settings'] = 'Defini��es Pessoais';
-$labels['addressbook'] = 'Livro de Endere�os';
+$labels['settings'] = 'Definições Pessoais';
+$labels['addressbook'] = 'Livro de Endereços';
 
 // mailbox names
 $labels['inbox']  = 'Recebidas';
@@ -41,13 +41,13 @@
 $labels['subject'] = 'Assunto';
 $labels['from']    = 'De';
 $labels['to']      = 'Para';
-$labels['cc']      = 'C�pia';
+$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['htmlmessage'] = 'Mensagem HTML';
 $labels['prettydate'] = ' Datas bonitas';
 
-$labels['addtoaddressbook'] = 'Adicionar ao livro de endere�os';
+$labels['addtoaddressbook'] = 'Adicionar ao livro de endereços';
 
 // weekdays short
 $labels['sun'] = 'Dom';
@@ -80,11 +80,11 @@
 // weekdays long
 $labels['sunday']    = 'Domingo';
 $labels['monday']    = 'Segunda';
-$labels['tuesday']   = 'Ter�a';
+$labels['tuesday']   = 'Terça';
 $labels['wednesday'] = 'Quarta';
 $labels['thursday']  = 'Quinta';
 $labels['friday']    = 'Sexta';
-$labels['saturday']  = 'S�bado';
+$labels['saturday']  = 'Sábado';
 
 $labels['today'] = 'Hoje';
 
@@ -97,12 +97,12 @@
 $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�o lidas';
+$labels['unread'] = 'Não lidas';
 
 // message compose
 $labels['compose']  = 'Escrever uma mensagem';
@@ -125,7 +125,7 @@
 // address boook
 $labels['name']      = 'Mostrar nome';
 $labels['firstname'] = 'Primeiro nome';
-$labels['surname']   = '�ltimo nome';
+$labels['surname']   = 'Último nome';
 $labels['email']     = 'E-Mail';
 
 $labels['addcontact'] = 'Adicionar novo contacto';
@@ -136,18 +136,18 @@
 $labels['save']   = 'Gravar';
 $labels['delete'] = 'Apagar';
 
-$labels['newcontact']     = 'Criar novo cart�o 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�ncias';
-$labels['userpreferences']  = 'Prefer�ncias do utilizador';
-$labels['editpreferences']  = 'Editar prefer�ncias 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['edititem']  = 'Editar item';
 
 $labels['setdefault']  = 'Definir como default';
-$labels['language']  = 'L�ngua';
-$labels['timezone']  = 'Zona hor�ria';
-$labels['pagesize']  = 'Linhas por p�gina';
+$labels['language']  = 'Língua';
+$labels['timezone']  = 'Zona horária';
+$labels['pagesize']  = 'Linhas por página';
 
 
 $labels['folders']  = 'Pastas';
diff --git a/program/localization/pt_PT/messages.inc b/program/localization/pt_PT/messages.inc
new file mode 100644
index 0000000..8d424e1
--- /dev/null
+++ b/program/localization/pt_PT/messages.inc
@@ -0,0 +1,56 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | language/pt_PT/messages.inc                                           |
+ |                                                                       |
+ | Portuguese for Portugal Language file of the RoundCube Webmail client |
+ | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | Licensed under the GNU GPL                                            |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Alexandro Pestana (DJ_Alex), Portugal <wpcd@hotmail.com>      |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+$messages = array();
+
+$messages['loginfailed']  = 'Autenticação falhou';
+
+$messages['cookiesdisabled'] = 'O seu browser não aceita cookies';
+
+$messages['sessionerror'] = 'A sua sessão é inválida ou expirou';
+
+$messages['imaperror'] = 'Ligação ao servidor IMAP falhou';
+
+$messages['nomessagesfound'] = 'Não foram encontradas mensagens nesta caixa de correio';
+
+$messages['loggedout'] = 'Você terminou a sessão com sucesso. Adeus!';
+
+$messages['mailboxempty'] = 'A caixa de correio está vazia';
+
+$messages['loadingdata'] = 'Carregando dados...';
+
+$messages['messagesent'] = 'Mensagem enviada com sucesso';
+
+$messages['successfullysaved'] = 'Gravado com sucesso';
+
+$messages['addedsuccessfully'] = 'Contacto adicionado ao livro de endereços com sucesso';
+
+$messages['contactexists'] = 'Já existe um contacto com este endereço de e-mail';
+
+$messages['blockedimages'] = 'Para proteger a sua privacidade, as imagens remotas estão bloqueadas nesta mensagem.';
+
+$messages['encryptedmessage'] = 'Esta é uma mensagem encriptada e não pode ser mostrada. Desculpe!';
+
+$messages['nocontactsfound'] = 'Não foram encontrados contactos';
+
+$messages['sendingfailed'] = 'A mensagem não foi enviada';
+
+$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 2b89e07..a7543f1 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 5dc0d98..631c852 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 7e06e45..9f8ad58 100644
--- a/program/localization/se/labels.inc
+++ b/program/localization/se/labels.inc
@@ -19,15 +19,15 @@
 $labels = array();
 
 // login page
-$labels['username']  = 'Anv�ndarnamn';
-$labels['password']  = 'L�senord';
+$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�llningar';
+$labels['settings'] = 'Personliga inställningar';
 $labels['addressbook'] = 'Adressbok';
 
 // mailbox names
@@ -35,11 +35,11 @@
 $labels['sent']   = 'Skickat';
 $labels['trash']  = 'Papperskorg';
 $labels['drafts'] = 'Utskick';
-$labels['junk']   = 'Skr�ppost';
+$labels['junk']   = 'Skräppost';
 
 // message listing
-$labels['subject'] = '�mne';
-$labels['from']    = 'Avs�ndare';
+$labels['subject'] = 'Ämne';
+$labels['from']    = 'Avsändare';
 $labels['to']      = 'Mottagare';
 $labels['cc']      = 'Kopia';
 $labels['bcc']     = 'Bcc';
@@ -62,47 +62,47 @@
 $labels['filename'] = 'Filnamn';
 $labels['filesize'] = 'Filstorlek';
 
-$labels['preferhtml'] = 'F�redra HTML';
+$labels['preferhtml'] = 'Föredra HTML';
 $labels['htmlmessage'] = 'HTML-meddelanden';
 $labels['prettydate'] = 'Fina datum';
 
-$labels['addtoaddressbook'] = 'L�gg till adressbok';
+$labels['addtoaddressbook'] = 'Lägg till adressbok';
 
 // weekdays short
-$labels['sun'] = 'S�n';
-$labels['mon'] = 'M�n';
+$labels['sun'] = 'Sön';
+$labels['mon'] = 'Mån';
 $labels['tue'] = 'Tis';
 $labels['wed'] = 'Ons';
 $labels['thu'] = 'Tor';
 $labels['fri'] = 'Fre';
-$labels['sat'] = 'L�s';
+$labels['sat'] = 'Lös';
 
 // weekdays long
-$labels['sunday']    = 'S�ndag';
-$labels['monday']    = 'M�ndag';
+$labels['sunday']    = 'Söndag';
+$labels['monday']    = 'Måndag';
 $labels['tuesday']   = 'Tisdag';
 $labels['wednesday'] = 'Onsdag';
 $labels['thursday']  = 'Torsdag';
 $labels['friday']    = 'Fredag';
-$labels['saturday']  = 'L�dag';
+$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�sta';
+$labels['nextmessages']     = 'Visa nästa';
 $labels['backtolist']       = 'Tillbaka till meddelandelistan';
 
-$labels['select'] = 'V�lj';
+$labels['select'] = 'Välj';
 $labels['all'] = 'Alla';
 $labels['none'] = 'Ingen';
-$labels['unread'] = 'Ol�st';
+$labels['unread'] = 'Oläst';
 
 // message compose
 $labels['compose']  = 'Skriv meddelande';
@@ -111,27 +111,27 @@
 
 $labels['attachments'] = 'Filer';
 $labels['upload'] = 'Ladda upp';
-$labels['close']  = 'St�ng';
+$labels['close']  = 'Stäng';
 
-$labels['low']     = 'L�g';
-$labels['lowest']  = 'L�gst';
+$labels['low']     = 'Låg';
+$labels['lowest']  = 'Lägst';
 $labels['normal']  = 'Normal';
-$labels['high']    = 'H�g';
-$labels['highest'] = 'H�gst';
+$labels['high']    = 'Hög';
+$labels['highest'] = 'Högst';
 
 $labels['showimages'] = 'Visa bilder';
 
 
 // address boook
 $labels['name']      = 'Visa namn';
-$labels['firstname'] = 'F�rnamn';
+$labels['firstname'] = 'Förnamn';
 $labels['surname']   = 'Efternamn';
 $labels['email']     = 'E-post';
 
-$labels['addcontact'] = 'L�gg till ny kontakt';
-$labels['editcontact'] = '�ndra kontakt';
+$labels['addcontact'] = 'Lägg till ny kontakt';
+$labels['editcontact'] = 'Ändra kontakt';
 
-$labels['edit']   = '�ndra';
+$labels['edit']   = 'Ändra';
 $labels['cancel'] = 'Avbryt';
 $labels['save']   = 'Spara';
 $labels['delete'] = 'Radera';
@@ -143,21 +143,21 @@
 
 
 // settings
-$labels['settingsfor']  = 'Inst�llningar f�r';
+$labels['settingsfor']  = 'Inställningar för';
 
-$labels['preferences']  = 'Inst�llningar';
-$labels['userpreferences']  = 'Anv�ndarinst�llningar';
-$labels['editpreferences']  = '�ndra anv�ndarinst�llningar';
+$labels['preferences']  = 'Inställningar';
+$labels['userpreferences']  = 'Användarinställningar';
+$labels['editpreferences']  = 'Ändra användarinställningar';
 
 $labels['identities']  = 'Identiteter';
-$labels['manageidentities']  = 'Hantera identiteter f�r kontot';
+$labels['manageidentities']  = 'Hantera identiteter för kontot';
 $labels['newidentity']  = 'Ny identitet';
 
 $labels['newitem']  = 'Ny post';
-$labels['edititem']  = '�ndra post';
+$labels['edititem']  = 'Ändra post';
 
-$labels['setdefault']  = 'S�tt som standard';
-$labels['language']  = 'Spr�k';
+$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 a5f9f73..ad06b7b 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['loginfailed']  = 'Inloggningen misslyckades';
 
-$messages['cookiesdisabled'] = 'Din webbl�sare accepterar inte cookies';
+$messages['cookiesdisabled'] = 'Din webbläsare accepterar inte cookies';
 
-$messages['sessionerror'] = 'Din session �r felaktig eller har g�tt 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�r 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 �r tom';
+$messages['mailboxempty'] = 'Mappen är tom';
 
 $messages['loading'] = 'Laddar....';
 
@@ -44,9 +44,9 @@
 
 $messages['contactexists'] = 'En kontakt med den angivna e-postadressen existerar redan';
 
-$messages['blockedimages'] = 'F�r att skydda dig har externa bilder blockerats fr�n meddelandet';
+$messages['blockedimages'] = 'För att skydda dig har externa bilder blockerats från meddelandet';
 
-$messages['encryptedmessage'] = 'Det h�r �r ett krypterat meddelande som inte kan visas. Tyv�rr!';
+$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 9daa544..78ec838 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�dizen <melih@marmara.edu.tr>                         |
+ | Author: Melih Taşdizen <melih@marmara.edu.tr>                         |
  +-----------------------------------------------------------------------+
 
  $Id$
@@ -19,47 +19,47 @@
 $labels = array();
 
 // login page
-$labels['username']  = 'Kullan�c� Ad�';
-$labels['password']  = '�ifre';
+$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�isel Ayarlar';
+$labels['settings'] = 'Kişisel Ayarlar';
 $labels['addressbook'] = 'Adres Defteri';
 
 // mailbox names
 $labels['inbox']  = 'Gelen Kutusu';
-$labels['sent']   = 'G�nderilenler';
-$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�nderen';
-$labels['to']      = 'Al�c�';
+$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'] = '�ncelik';
+$labels['priority'] = 'Öncelik';
 $labels['organization'] = 'Organizasyon';
 
 // aliases
 $labels['reply-to'] = $labels['replyto'];
 
-$labels['mailboxlist'] = 'Klas�rler';
-$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']   = '�uraya ta��...';
-$labels['download'] = '�ndir';
+$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['sun'] = 'Paz';
 $labels['mon'] = 'Pts';
 $labels['tue'] = 'Sal';
-$labels['wed'] = '�ar';
+$labels['wed'] = 'Çar';
 $labels['thu'] = 'Per';
 $labels['fri'] = 'Cum';
 $labels['sat'] = 'Cts';
@@ -80,97 +80,97 @@
 // weekdays long
 $labels['sunday']    = 'Pazar';
 $labels['monday']    = 'Pazartesi';
-$labels['tuesday']   = 'Sal�';
-$labels['wednesday'] = '�ar�amba';
-$labels['thursday']  = 'Per�embe';
+$labels['tuesday']   = 'Salı';
+$labels['wednesday'] = 'Çarşamba';
+$labels['thursday']  = 'Perşembe';
 $labels['friday']    = 'Cuma';
 $labels['saturday']  = 'Cumartesi';
 
-$labels['today'] = 'Bug�n';
+$labels['today'] = 'Bugün';
 
 // toolbar buttons
 $labels['writenewmessage']  = 'Yeni Mesaj';
 $labels['replytomessage']   = 'Cevapla';
-$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['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�ster';
+$labels['viewsource']       = 'Kaynak Kodu Göster';
 
-$labels['select'] = 'Se�';
-$labels['all'] = 'T�m�';
-$labels['none'] = 'Hi�biri';
-$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�nder';
+$labels['sendmessage']  = 'Mesajı gönder';
 $labels['addattachment']  = 'Dosya ekle';
 
-$labels['attachments'] = 'Eklenmi� Dosyalar';
-$labels['upload'] = 'Y�kle';
+$labels['attachments'] = 'Eklenmiş Dosyalar';
+$labels['upload'] = 'Yükle';
 $labels['close']  = 'Kapat';
 
-$labels['low']     = 'Az�nemsiz';
-$labels['lowest']  = '�nemli';
+$labels['low']     = 'AzÖnemsiz';
+$labels['lowest']  = 'Önemli';
 $labels['normal']  = 'Normal';
-$labels['high']    = '�nemli';
-$labels['highest'] = '�ok �nemli';
+$labels['high']    = 'Önemli';
+$labels['highest'] = 'Çok Önemli';
 
-$labels['showimages'] = 'Resimleri G�ster';
+$labels['showimages'] = 'Resimleri Göster';
 
 
 // address boook
-$labels['name']      = 'G�r�nen �sim';
+$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�zenle';
+$labels['editcontact'] = 'Kontak düzenle';
 
-$labels['edit']   = 'D�zen';
-$labels['cancel'] = '�ptal';
+$labels['edit']   = 'Düzen';
+$labels['cancel'] = 'İptal';
 $labels['save']   = 'Kaydet';
 $labels['delete'] = 'Sil';
 
 $labels['newcontact']     = 'Yeni kontak ekle';
-$labels['deletecontact']  = 'Se�ili kontaklar� sil';
-$labels['composeto']      = '�u ki�iye mesaj yaz:';
-$labels['contactsfromto'] = '$from \'den/dan $to \'e/a $count tane mesaj var';
-$labels['print']          = 'Yazd�r';
-$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�c� Ayarlar�';
-$labels['editpreferences']  = 'Kullan�c� Ayarlar�n� D�zenle';
+$labels['userpreferences']  = 'Kullanıcı Ayarları';
+$labels['editpreferences']  = 'Kullanıcı Ayarlarını Düzenle';
 
 $labels['identities']  = 'Kimlikler';
-$labels['manageidentities']  = 'Bu hesap i�in kimlikleri d�zenle';
+$labels['manageidentities']  = 'Bu hesap için kimlikleri düzenle';
 $labels['newidentity']  = 'Yeni Kimlik';
 
-$labels['newitem']  = 'Yeni ��e';
-$labels['edititem']  = '��eyi d�zenle';
+$labels['newitem']  = 'Yeni Öğe';
+$labels['edititem']  = 'Öğeyi düzenle';
 
-$labels['setdefault']  = 'Varsay�lan olarak ata';
+$labels['setdefault']  = 'Varsayılan olarak ata';
 $labels['language']  = 'Dil';
 $labels['timezone']  = 'Zaman Dilimi';
-$labels['pagesize']  = 'Sayfada G�sterilecek Sat�r';
+$labels['pagesize']  = 'Sayfada Gösterilecek Satır';
 
 
-$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';
+$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 a4fe9a8..ef6b7d6 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�dizen <melih@marmara.edu.tr>                         |
+ | Author: Melih Taşdizen <melih@marmara.edu.tr>                         |
  +-----------------------------------------------------------------------+
 
  $Id$
@@ -18,41 +18,41 @@
 
 $messages = array();
 
-$messages['loginfailed']  = 'Ba�ar�s�z Giri�';
+$messages['loginfailed']  = 'Başarısız Giriş';
 
-$messages['cookiesdisabled'] = 'Taray�c�n�z�n Cerez(cookie) deste�i a��k de�il';
+$messages['cookiesdisabled'] = 'Tarayıcınızın Cerez(cookie) desteği açık değil';
 
-$messages['sessionerror'] = 'Oturumunuz hatal� ve ya uzun s�re i�lem yapmad���n�z i�in kapand�';
+$messages['sessionerror'] = 'Oturumunuz hatalı ve ya uzun süre işlem yapmadığınız için kapandı';
 
-$messages['imaperror'] = 'IMAP sunucusuna ba�lan�lamad�';
+$messages['imaperror'] = 'IMAP sunucusuna bağlanılamadı';
 
 $messages['nomessagesfound'] = 'Gelen kutusnda mesaj yok';
 
-$messages['loggedout'] = 'Oturumunuz ba�ar�yla kapat�ld�. G�le G�le!';
+$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�kleniyor...';
+$messages['loadingdata'] = 'Veri yükleniyor...';
 
-$messages['messagesent'] = 'Mesaj g�nderildi';
+$messages['messagesent'] = 'Mesaj gönderildi';
 
 $messages['successfullysaved'] = 'Kaydedildi';
 
 $messages['addedsuccessfully'] = 'Kontak eklendi';
 
-$messages['contactexists'] = 'Bu e-posta adresine sahip bir kontak zaten kay�tl�';
+$messages['contactexists'] = 'Bu e-posta adresine sahip bir kontak zaten kayıtlı';
 
-$messages['blockedimages'] = 'G�venli�iniz i�in harici resimler engellendi.';
+$messages['blockedimages'] = 'Güvenliğiniz için harici resimler engellendi.';
 
-$messages['encryptedmessage'] = '�ifrelenm�i bir mesaj, okuyamazs�n�z!';
+$messages['encryptedmessage'] = 'Şifrelenmşi bir mesaj, okuyamazsınız!';
 
-$messages['nocontactsfound'] = 'Kontak bulunamad�';
+$messages['nocontactsfound'] = 'Kontak bulunamadı';
 
-$messages['sendingfailed'] = 'Mesaj g�nderilemedi';
+$messages['sendingfailed'] = 'Mesaj gönderilemedi';
 
-$messages['errorsaving'] = 'Kaydederken hata olu�tu';
+$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 9503cbc..4537d82 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 0260c60..7697cf5 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 8ebd1c5..4c6e56a 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -148,7 +148,7 @@
   if (!isset($arrFolders[$currentFolder]))
     {
     $arrFolders[$currentFolder] = array('id' => $path,
-                                        'name' => $currentFolder,
+                                        'name' => UTF7DecodeString($currentFolder),
                                         'folders' => array());
     }
 
@@ -160,7 +160,7 @@
 // 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 @@
       $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 @@
 // 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 @@
       $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 d35dcf9..2602217 100644
--- a/program/steps/mail/getunread.inc
+++ b/program/steps/mail/getunread.inc
@@ -29,6 +29,7 @@
     {
     $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 c29fcf1..ee27818 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -77,6 +77,11 @@
 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 @@
 // 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 @@
 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 @@
     {
     $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 @@
 
 // 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
@@ -175,8 +182,6 @@
   foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath)
     $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',
@@ -230,7 +235,7 @@
   // 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 @@
   }
 
 
+// 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 33d83df..0702ce9 100644
--- a/program/steps/settings/manage_folders.inc
+++ b/program/steps/settings/manage_folders.inc
@@ -29,7 +29,7 @@
 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 @@
 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 @@
 
   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=='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 @@
     $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,

--
Gitblit v1.9.1