updated da, de_DE, pt_BR, bs_BA, fr, pl, et_EE translations

13 files changed, 665 insertions, 642 deletions

diff --git a/program/localization/bs_BA/labels.inc b/program/localization/bs_BA/labels.inc
index 4bdc71d83..b88322b79 100644
--- a/program/localization/bs_BA/labels.inc
+++ b/program/localization/bs_BA/labels.inc
@@ -5,12 +5,11 @@
  | language/bs_BA/labels.inc                                             |
  |                                                                       |
  | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005, RoundQube Dev. - Switzerland                      |
+ | Copyright (C) 2005, 2006, RoundQube Dev. - Switzerland                |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author:        Begzudin Omerovic  <boNOSPAM@oglasi.com>               |
- | Corrections:   Salčin Adis        <adminNOSPAM@chat.ba>               |
+ | Author: Begzudin Omerovic <Begzudin.Omerovic@gmail.com>               |
  +-----------------------------------------------------------------------+
 
  $Id$
@@ -19,178 +18,216 @@
 
 $labels = array();
 
-// login page // Login-Seite
-$labels['welcome']   = 'Welcome to Roundcube|Mail';
-$labels['username']  = 'Korisnički email';
-$labels['password']  = 'Šifra';
+// login page
+$labels['welcome']   = 'Dobrodošli na $product';
+$labels['username']  = 'Korisničko ime';
+$labels['password']  = 'Lozinka';
 $labels['server']    = 'Server';
 $labels['login']     = 'Prijava';
 
-// taskbar // Aktionsleiste
+// taskbar
 $labels['logout']   = 'Odjava';
-$labels['mail']     = 'E-Mail';
-$labels['settings'] = 'Lične Postavke';
-$labels['addressbook'] = 'Adresar';
-
-// mailbox names // E-Mail-Ordnernamen
-$labels['inbox']  = 'Primljene';
-$labels['sent']   = 'Poslate';
-$labels['trash']  = 'Obrisane';
-$labels['drafts'] = 'Draft';
-$labels['junk']   = 'Smeće(Junk)';
-
-// message listing // Nachrichtenliste
+$labels['mail']     = 'Sanduče';
+$labels['settings'] = 'Podešavanja';
+$labels['addressbook'] = 'Imenik';
+
+// mailbox names
+$labels['inbox']  = 'Inbox';
+$labels['drafts'] = 'Drafts';
+$labels['sent']   = 'Poslano';
+$labels['trash']  = 'Trash';
+$labels['junk']   = 'Junk';
+
+// message listing
 $labels['subject'] = 'Naslov';
-$labels['from']    = 'Pošiljalac';
-$labels['to']      = 'Primalac';
-$labels['cc']      = 'Kopija (CC)';
-$labels['bcc']     = 'Slijepa kopija (BCC)';
-$labels['replyto'] = 'Odgovori na';
+$labels['from']    = 'Od';
+$labels['to']      = 'Za';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
+$labels['replyto'] = 'Reply-To';
 $labels['date']    = 'Datum';
 $labels['size']    = 'Veličina';
 $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organizacija';
 
-// aliases // [Platzhalter]
+// aliases
 $labels['reply-to'] = $labels['replyto'];
 
-$labels['mailboxlist'] = 'Mape';
-$labels['messagesfromto'] = 'Poruke $from do $to od $count';
-$labels['messagenrof'] = 'Poruke $nr od $count';
+$labels['mailboxlist'] = 'Fascikle';
+$labels['messagesfromto'] = 'Poruke od $from do $to od ukupno $count';
+$labels['messagenrof'] = 'Poruka broj $nr od $count';
 
-$labels['moveto']   = 'Pomjeri u...';
-$labels['download'] = 'Snimi(Download)';
+$labels['moveto']   = 'prebaci u...';
+$labels['download'] = 'preuzmi (download)';
 
-$labels['filename'] = 'Ime fajla';
-$labels['filesize'] = 'Veličina fajla';
+$labels['filename'] = 'Ime datoteke';
+$labels['filesize'] = 'Veličina datoteke';
 
-$labels['preferhtml'] = 'Sa HTML';
-$labels['htmlmessage'] = 'HTML Poruka';
-$labels['prettydate'] = 'Kratak prikaz datuma';
+$labels['preferhtml'] = 'HTML format u prednosti';
+$labels['htmlmessage'] = 'HTML format poruke';
+$labels['prettydate'] = 'Formatiran datum';
 
-$labels['addtoaddressbook'] = 'Dodajte u adresar';
+$labels['addtoaddressbook'] = 'Dodaj u imenik';
 
-// weekdays short // Wochentage (Abkürzungen) 
-$labels['sun'] = 'Ne';
-$labels['mon'] = 'Po';
-$labels['tue'] = 'Ut';
-$labels['wed'] = 'Sr';
-$labels['thu'] = 'Če';
-$labels['fri'] = 'Pe';
-$labels['sat'] = 'Su';
+// weekdays short
+$labels['sun'] = 'Ned';
+$labels['mon'] = 'Pon';
+$labels['tue'] = 'Uto';
+$labels['wed'] = 'Sri';
+$labels['thu'] = 'Čet';
+$labels['fri'] = 'Pet';
+$labels['sat'] = 'Sub';
 
-// weekdays long // Wochentage (normal)
+// weekdays long
 $labels['sunday']    = 'Nedjelja';
 $labels['monday']    = 'Ponedjeljak';
 $labels['tuesday']   = 'Utorak';
 $labels['wednesday'] = 'Srijeda';
 $labels['thursday']  = 'Četvrtak';
-$labels['friday']    = 'petak';
+$labels['friday']    = 'Petak';
 $labels['saturday']  = 'Subota';
 
-$labels['today'] = 'Danas';
-
-// toolbar buttons // Symbolleisten-Tipps
-$labels['writenewmessage']  = 'Napisati novu poruku';
-$labels['replytomessage']   = 'Odogovoriti na poruku';
-$labels['replytoallmessage'] = 'Odgovoriti počiljaocu i svim primateljima';
-$labels['forwardmessage']   = 'Proslijediti poruku';
-$labels['deletemessage']    = 'Prebaciti poruku u "Obrisane Poruke"';
-$labels['printmessage']     = 'Odštampati poruku';
-$labels['previousmessages'] = 'Pokazat prethodni set poruka';
-$labels['nextmessages']     = 'Pokazat naredni set poruka';
+$labels['today'] = 'danas';
+
+// toolbar buttons
+$labels['checkmail']        = 'Provjera novih poruka';
+$labels['writenewmessage']  = 'Nova poruka';
+$labels['replytomessage']   = 'Odgovori na poruku';
+$labels['replytoallmessage'] = 'Odgovori pošiljaocu i svim primaocima';
+$labels['forwardmessage']   = 'Proslijedi poruku';
+$labels['deletemessage']    = 'Prebaci poruku u korpu (Trash)';
+$labels['printmessage']     = 'Odštampaj poruku';
+$labels['previousmessage'] = 'Prikaži prethodnu poruku';
+$labels['previousmessages'] = 'Prikaži prethodni skup poruka';
+$labels['nextmessages']     = 'Prikaži sljedeći skup poruka';
+$labels['lastmessage']     = 'Prikaži zadnju poruku';
+$labels['lastmessages']     = 'Prikaži zadnji skup poruka';
 $labels['backtolist']       = 'Povratak na listu poruka';
+$labels['viewsource']       = 'Prikaži poruku u izvornom obliku';
 
-$labels['select'] = 'Odabrati';
-$labels['all']    = 'Sve';
-$labels['none']   = 'Nijednu';
+$labels['select'] = 'Obilježi';
+$labels['all'] = 'Sve';
+$labels['none'] = 'Nijednu';
 $labels['unread'] = 'Nepročitane';
 
-$labels['compact'] = 'Zbiti';
+$labels['compact'] = 'Skraćeno';
+$labels['empty'] = 'Izprazni';
+$labels['purge'] = 'Očisti';
 
+$labels['quota'] = 'Kvota';
+$labels['unknown']  = 'nepoznato';
+$labels['unlimited']  = 'beskonačna';
 
-// message compose // Nachrichten erstellen
-$labels['compose']  = 'Napisati poruku';
-$labels['sendmessage']  = 'Poslati poruku sada';
-$labels['addattachment']  = 'Dodati fajl';
-$labels['charset']  = 'Standard';
+$labels['quicksearch']  = 'Brza pretraga';
+$labels['resetsearch']  = 'Prikaži sve poruke';
 
-$labels['attachments'] = 'Dodatci';
-$labels['upload'] = 'Ubaciti';
-$labels['close']  = 'Zatvoriti';
 
-$labels['low']     = 'Nisko';
-$labels['lowest']  = 'Najniže';
-$labels['normal']  = 'Normalno';
-$labels['high']    = 'Visoko';
-$labels['highest'] = 'Najviše';
+// message compose
+$labels['compose']  = 'Nova poruka';
+$labels['savemessage']  = 'Sačuvaj u \'Drafts\'';
+$labels['sendmessage']  = 'Pošalji poruku';
+$labels['addattachment']  = 'Priloži datoteku';
+$labels['charset']  = 'Skup znakova';
+$labels['editortype']  = 'Vrsta editora';
+$labels['returnreceipt'] = 'Potvrda o prispijeću poruke';
 
-$labels['nosubject']  = '(nema naslova)';
-$labels['showimages'] = 'Prikazati slike';
+$labels['checkspelling'] = 'Provjera pravopisa';
+$labels['resumeediting'] = 'Povratak u režim pisanja';
+$labels['revertto'] = 'Vrati na';
 
+$labels['attachments'] = 'Dodatci (Attachments)';
+$labels['upload'] = 'Dodaj';
+$labels['close']  = 'Zatvori';
 
-// address book // Adressbuch
-$labels['name']      = 'Prikazano ime';
+$labels['low']     = 'Nizak';
+$labels['lowest']  = 'Najniži';
+$labels['normal']  = 'Srednji';
+$labels['high']    = 'Visok';
+$labels['highest'] = 'Najviši';
+
+$labels['nosubject']  = '(bez naslova)';
+$labels['showimages'] = 'Prikaži slike';
+$labels['htmltoggle']  = 'HTML';
+$labels['plaintoggle']  = 'Običan tekst';
+
+// address boook
+$labels['name']      = 'Puno ime';
 $labels['firstname'] = 'Ime';
 $labels['surname']   = 'Prezime';
 $labels['email']     = 'E-Mail';
 
-$labels['addcontact'] = 'Dodati novi kontakt';
-$labels['editcontact'] = 'Izmjeniti kontakt';
+$labels['addcontact'] = 'Dodaj novi kontakt';
+$labels['editcontact'] = 'Izmijeni kontakt';
+
+$labels['edit']   = 'Izmijeni';
+$labels['cancel'] = 'Otkaži';
+$labels['save']   = 'Sačuvaj';
+$labels['delete'] = 'Obriši';
 
-$labels['edit']   = 'Izmjeniti';
-$labels['cancel'] = 'Otkazati';
-$labels['save']   = 'Snimiti';
-$labels['delete'] = 'Obrisati';
+$labels['newcontact']     = 'Dodaj novi kontakt';
+$labels['deletecontact']  = 'Obriši odabrane kontakte';
+$labels['composeto']      = 'Napiši mail...';
+$labels['contactsfromto'] = 'Kontakti od $from do $to od ukupno $count';
+$labels['print']          = 'Štampaj';
+$labels['export']         = 'Izvezi';
 
-$labels['newcontact']     = 'Napraviti novu kontakt karticu';
-$labels['deletecontact']  = 'Obrisati odabrane kontakte';
-$labels['composeto']      = 'Napisati mail na';
-$labels['contactsfromto'] = 'Kontakti $from do $to od $count';
-$labels['print']          = 'Odštampati';
-$labels['export']         = 'Izvesti(Export)';
+$labels['previouspage']   = 'Prikaži predhodnu stranicu';
+$labels['firstpage']      = 'Prikaži prvi skup';
+$labels['nextpage']       = 'Prikaži sljedeću stranicu';
+$labels['lastpage']       = 'Prikaži zadnji skup';
 
 // LDAP search
-$labels['ldapsearch'] = 'LDAP mapu pretraži';
+$labels['ldapsearch'] = 'Pretraga LDAP imenika';
 
-$labels['ldappublicsearchname']   = 'Ime kontakta';
-$labels['ldappublicsearchtype']   = 'Tačan tip pretrage';
-$labels['ldappublicserverselect'] = 'Odaberi server';
-$labels['ldappublicsearchfield']  = 'Traži u';
-$labels['ldappublicsearchform']   = 'Adresu pretraži';
-$labels['ldappublicsearch'] = 'Pretraži';
+$labels['ldappublicsearchname']    = 'Ime kontakta';
+$labels['ldappublicsearchtype'] = 'Potpuna fraza?';
+$labels['ldappublicserverselect'] = 'Odaberi servere';
+$labels['ldappublicsearchfield'] = 'Pretraži na';
+$labels['ldappublicsearchform'] = 'Pretraži kontakte';
+$labels['ldappublicsearch'] = 'Pretraga';
 
-// settings // Einstellungen
-$labels['settingsfor']  = 'Podešavanje za';
 
-$labels['preferences']  = 'Postavke';
-$labels['userpreferences']  = 'Korisničke postavke';
-$labels['editpreferences']  = 'Izmjeniti korisničke postavke';
+// settings
+$labels['settingsfor']  = 'Podešavanja za';
 
-$labels['identities']  = 'Identitet';
-$labels['manageidentities']  = 'Uredi identitete za ovog korisnika';
-$labels['newidentity']  = 'Novi Identitet';
+$labels['preferences']  = 'Podešavanja';
+$labels['userpreferences']  = 'Opšta podešavanja';
+$labels['editpreferences']  = 'Izmjena opštih podešavanja';
 
-$labels['newitem']  = 'Novi unos';
-$labels['edititem']  = 'Izmjeni unos';
+$labels['identities']  = 'Identiteti';
+$labels['manageidentities']  = 'Podesi identitete za ovaj nalog';
+$labels['newidentity']  = 'Dodaj identitet';
 
-$labels['setdefault']  = 'Postavi standardno';
+$labels['newitem']  = 'New item';
+$labels['edititem']  = 'Edit item';
+
+$labels['setdefault']  = 'Postavi glavnim';
 $labels['language']  = 'Jezik';
 $labels['timezone']  = 'Vremenska zona';
-$labels['pagesize']  = 'Poruka po stranici';
+$labels['pagesize']  = 'Redova po stranici';
 $labels['signature'] = 'Potpis';
-
-$labels['folder']  = 'Mapa';
-$labels['folders']  = 'Mape';
-$labels['foldername']  = 'Ime mape';
-$labels['subscribed']  = 'Pretplatiti';
-$labels['create']      = 'Napraviti';
-$labels['createfolder']  = 'Napraviti novi mapu';
-$labels['deletefolder']  = 'Obrisati mapu';
-$labels['managefolders']  = 'Uredi mape';
+$labels['dstactive']  = 'Ljetno pomjeranje vremena';
+
+$labels['htmleditor']= 'Pisi HTML poruke';
+$labels['htmlsignature'] ='HTML potpis';
+$labels['previewpane'] ='Pokaži prethodu poruku';
+$labels['autosavedraft'] ='Automatski spasi predlozak';
+$labels['everynminutes'] ='svakih $n minuta';
+$labels['never'] ='nikada';
+
+$labels['folder']  = 'Fascikla';
+$labels['folders']  = 'Fascikle';
+$labels['foldername']  = 'Ime fascikle';
+$labels['subscribed']  = 'Pretplaćen';
+$labels['create']  = 'Napravi';
+$labels['createfolder']  = 'Napravi novu fasciklu';
+$labels['rename'] = 'Preimenuj';
+$labels['renamefolder'] = 'Preimenuj fasciklu';
+$labels['deletefolder']  = 'Obriši fasciklu';
+$labels['managefolders']  = 'Podesi fasciklu';
 
 $labels['sortby'] = 'Sortiraj po';
-$labels['sortasc']  = 'Sortiraj opadajuće';
-$labels['sortdesc'] = 'Sortiraj rastuće';
+$labels['sortasc']  = 'Sortiraj rastućim nizom';
+$labels['sortdesc'] = 'Sortiraj opadajućim nizom';
 
 ?>
diff --git a/program/localization/bs_BA/messages.inc b/program/localization/bs_BA/messages.inc
index bb30bee27..d996d4656 100644
--- a/program/localization/bs_BA/messages.inc
+++ b/program/localization/bs_BA/messages.inc
@@ -5,12 +5,11 @@
  | language/bs_BA/messages.inc                                           |
  |                                                                       |
  | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005, 2006, RoundCube Dev. - Switzerland                |
+ | Copyright (C) 2005, 2006, RoundQube Dev. - Switzerland                |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author:      Begzudin Omerovic <boNOSPAM@oglasi.com>                  |
- | Korigirao:   Salčin Adis <adminNOSPAM@chat.ba>                        |
+ | Author: Begzudin Omerovic <Begzudin.Omerovic@gmail.com>               |
  +-----------------------------------------------------------------------+
 
  $Id$
@@ -19,69 +18,100 @@
 
 $messages = array();
 
-$messages['loginfailed']  = 'Prijava nije uspjela!';
+$messages['loginfailed']  = 'Prijava neuspješna';
 
-$messages['cookiesdisabled'] = 'Vaš browser ne dozvoljava cookie!';
+$messages['cookiesdisabled'] = 'Vaš pretraživač ne podržava kolačiće (cookies)';
 
-$messages['sessionerror'] = 'Vaša sesija je nevažeća ili istekla!';
+$messages['sessionerror'] = 'Sesija nije validna ili je istekla';
 
-$messages['imaperror'] = 'Veza sa IMAP serverom nije uspostavljena!';
+$messages['imaperror'] = 'Neuspješna konekcija na IMAP server';
 
-$messages['nomessagesfound'] = 'Nemate poruka u vašem sandučiću';
+$messages['nomessagesfound'] = 'Nema poruka u sandučetu';
 
-$messages['loggedout'] = 'Vaša sesija je uspješno okončana. Doviđenja!';
+$messages['loggedout'] = 'Uspješno ste se odjavili.';
 
-$messages['mailboxempty'] = 'Sandučić je prazan';
+$messages['mailboxempty'] = 'Sanduče je prazno';
 
-$messages['loading'] = $messages['loadingdata'] = 'Podatci se učitavaju...';
+$messages['loading'] = 'Učitavanje...';
 
-$messages['sendingmessage'] = 'Šaljem poruku...';
+$messages['loadingdata'] = 'Učitavanje podataka...';
 
-$messages['messagesent'] = 'Poruka uspješno poslana...';
+$messages['checkingmail'] = 'Provjera novih poruka u toku...';
 
-$messages['successfullysaved'] = 'Uspješno snimljeno';
+$messages['sendingmessage'] = 'Poruka se šalje...';
 
-$messages['addedsuccessfully'] = 'Kontakt dodan u adresar';
+$messages['messagesent'] = 'Poruka je uspješno poslana';
 
-$messages['contactexists'] = 'Postoji već jedan kontakt sa istom takvom e-mail adresom';
+$messages['savingmessage'] = 'Poruka se snima...';
 
-$messages['blockedimages'] = 'Da bismo zaštitili Vašu privatnost, eksterne slike se ne prikazuju.';
+$messages['messagesaved'] = 'Poruka uspješno sačuvana u \'Drafts\'';
 
-$messages['encryptedmessage'] = 'Ova poruka je šifrirana i nemožemo je prikazati. Izvinite!';
+$messages['successfullysaved'] = 'Snimanje uspješno obavljeno';
 
-$messages['nocontactsfound'] = 'Nismo našli kontakte';
+$messages['addedsuccessfully'] = 'Kontakt uspješno dodat u imenik';
 
-$messages['sendingfailed'] = 'Slanje poruke nije uspjelo';
+$messages['contactexists'] = 'Kontakt sa ovom e-mail adresom već postoji u imeniku';
 
-$messages['errorsaving'] = 'Kod snimanja se desila greška';
+$messages['blockedimages'] = 'Zbog zaštite privatnosti, slike sa drugih servera su blokirane.';
 
-$messages['errormoving'] = 'Nemoguće premjestiti ovu poruku';
+$messages['encryptedmessage'] = 'Ova poruka je šifrovana pa se ne može prikazati';
 
-$messages['errordeleting'] = 'Nemoguće izbrisati ovu poruku';
+$messages['nocontactsfound'] = 'Imenik je prazan';
 
-$messages['deletefolderconfirm']  = 'Sigurno želite ovu mapu obrisati?';
+$messages['sendingfailed'] = 'Greška pri slanju poruke';
 
-$messages['formincomplete']    = 'Formular nije u potpunosti popunjen';
+$messages['errorsaving'] = 'Greška pri snimanju';
 
-$messages['noemailwarning']    = 'Unesite ispravnu e-mail adresu';
+$messages['errormoving'] = 'Greška pri premještanju poruke';
 
-$messages['nonamewarning']     = 'Molimo, unesite ime';
+$messages['errordeleting'] = 'Greška pri brisanju poruke';
 
-$messages['nopagesizewarning'] = 'Molimo unesite prikaz poruka po stranici';
+$messages['deletecontactconfirm']  = 'Da li želite da obrišete izabrane kontakte?';
 
-$messages['norecipientwarning'] = 'Molimo unesite najmanje jednog primaoca';
+$messages['deletemessagesconfirm'] = 'Da li stvarno želite izbrisati poruku(e)?';
 
-$messages['nosubjectwarning']  = 'Naslov polje je prazno. Želite li to sada ispuniti?';
+$messages['deletefolderconfirm']  = 'Da li zaista želite da obrišete ovu fasciklu?';
 
-$messages['nobodywarning'] = 'Želite li poslati poruku bez sadržaja?';
+$messages['purgefolderconfirm']  = 'Da li zaista želite da obrišete sve poruke u fascikli?';
 
-$messages['notsentwarning'] = 'Poruka nije poslana. Želite li da se izbriše ova vaša poruka?';
+$messages['formincomplete'] = 'Forma nije u cijelosti popunjena';
 
-$messages['noldapserver'] = 'Unesite ldp server za pretragu';
+$messages['noemailwarning'] = 'Unesite ispravnu e-mail adresu';
 
-$messages['nocontactsreturned'] = 'Nisu pronađene kontakt adrese';
+$messages['nonamewarning']  = 'Unesite ime';
 
-$messages['nosearchname'] = 'Molimo unesite ime kontakta ili e-mail adresu';
+$messages['nopagesizewarning'] = 'Unesite veličinu stranice';
 
+$messages['norecipientwarning'] = 'Unesite primaoca / primaoce (ZA)';
+
+$messages['nosubjectwarning']  = 'Polje \'Naslov\' je prazno. Želite li da unesete naslov poruke?';
+
+$messages['nobodywarning'] = 'Da li želite da pošaljete poruku bez teksta?';
+
+$messages['notsentwarning'] = 'Poruka nije poslana. Da li želite da odbacite ovu poruku?';
+
+$messages['noldapserver'] = 'Unesite LDAP server za pretragu';
+
+$messages['nocontactsreturned'] = 'Nije pronađen ni jedan kontakt';
+
+$messages['nosearchname'] = 'Unesite ime ili e-mail adresu';
+
+$messages['searchsuccessful'] = 'Broj pronađenih poruka: $nr';
+
+$messages['searchnomatch'] = 'Tražena fraza nije pronađena ni u jednoj poruci';
+
+$messages['searching'] = 'Pretraga u toku...';
+
+$messages['checking'] = 'Provjera u toku...';
+
+$messages['nospellerrors'] = 'Nije pronađena ni jedna pravopisna greška';
+
+$messages['folderdeleted'] = 'Fascikla uspješno obrisana';
+
+$messages['deletedsuccessfully'] = 'Uspješno izbrisano';
+
+$messages['converting'] = 'Vračeno formatiranje iz poruke ...';
+
+$messages['messageopenerror'] = 'Nije učitana poruka sa servera';
 
 ?>
diff --git a/program/localization/da/labels.inc b/program/localization/da/labels.inc
index 2496b3be6..7a4244ea2 100644
--- a/program/localization/da/labels.inc
+++ b/program/localization/da/labels.inc
@@ -12,6 +12,7 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
  | Danish translation: Martin Moeller <martin@liga.dk>                   |
+ |                     Jesper R. Meyer <jrm@upthere.dk>                  |
  +-----------------------------------------------------------------------+
  
  $Id$
@@ -21,51 +22,53 @@
 $labels = array();
 
 // login page
-$labels['username']  = 'Brugernavn';
-$labels['password']  = 'Adgangskode';
-$labels['server']    = 'Server';
-$labels['login']     = 'Log på';
+$labels['welcome'] = 'Velkommen til $product';
+$labels['username'] = 'Brugernavn';
+$labels['password'] = 'Adgangskode';
+$labels['server'] = 'Server';
+$labels['login'] = 'Log på';
 
 // taskbar
-$labels['logout']   = 'Log af';
-$labels['mail']     = 'Email';
+$labels['logout'] = 'Log af';
+$labels['mail'] = 'Email';
 $labels['settings'] = 'Personlige indstillinger';
 $labels['addressbook'] = 'Adressebog';
 
 // mailbox names
-$labels['inbox']  = 'Indbakke';
-$labels['sent']   = 'Sendt post';
-$labels['trash']  = 'Skrald';
+$labels['inbox'] = 'Indbakke';
 $labels['drafts'] = 'Kladder';
-$labels['junk']   = 'Ragelse';
+$labels['sent'] = 'Sendt post';
+$labels['trash'] = 'Skrald';
+$labels['junk'] = 'Ragelse';
 
 // message listing
 $labels['subject'] = 'Emne';
-$labels['from']    = 'Afsender';
-$labels['to']      = 'Modtager';
-$labels['cc']      = 'Kopi til';
-$labels['bcc']     = 'BCC';
+$labels['from'] = 'Afsender';
+$labels['to'] = 'Modtager';
+$labels['cc'] = 'Kopi til';
+$labels['bcc'] = 'BCC';
 $labels['replyto'] = 'Svar til';
-$labels['date']    = 'Dato';
-$labels['size']    = 'Størrelse';
+$labels['date'] = 'Dato';
+$labels['size'] = 'Størrelse';
 $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organisation';
 
 // aliases
-$labels['reply-to'] = $labels['replyto'];
+$labels['reply-to'] = 'Svar til';
 
-$labels['mailboxlist'] = 'Foldere';
+$labels['mailboxlist'] = 'Mapper';
 $labels['messagesfromto'] = 'Beskeder $from til $to af $count';
 $labels['messagenrof'] = 'Besked $nr af $count';
 
-$labels['moveto']   = 'flyt til...';
+$labels['moveto'] = 'flyt til...';
 $labels['download'] = 'download';
 
 $labels['filename'] = 'Filnavn';
 $labels['filesize'] = 'Filstørrelse';
 
 $labels['preferhtml'] = 'Foretræk HTML';
-$labels['htmlmessage'] = 'HTML besked';
+$labels['htmlmessage'] = 'HTML-besked';
+$labels['prettydate'] = 'Pæn datovisning';
 
 $labels['addtoaddressbook'] = 'Tilføj til adressebogen';
 
@@ -79,145 +82,156 @@ $labels['fri'] = 'Fre';
 $labels['sat'] = 'Lør';
 
 // weekdays long
-$labels['sunday']    = 'Søndag';
-$labels['monday']    = 'Mandag';
-$labels['tuesday']   = 'Tirsdag';
+$labels['sunday'] = 'Søndag';
+$labels['monday'] = 'Mandag';
+$labels['tuesday'] = 'Tirsdag';
 $labels['wednesday'] = 'Onsdag';
-$labels['thursday']  = 'Torsdag';
-$labels['friday']    = 'Fredag';
-$labels['saturday']  = 'Lørdag';
+$labels['thursday'] = 'Torsdag';
+$labels['friday'] = 'Fredag';
+$labels['saturday'] = 'Lørdag';
 
 $labels['today'] = 'I dag';
 
 // toolbar buttons
-$labels['writenewmessage']  = 'Opret en ny besked';
-$labels['replytomessage']   = 'Svar på denne besked';
-$labels['forwardmessage']   = 'Videresend denne besked';
-$labels['deletemessage']    = 'Flyt beskeden til skrald';
-$labels['printmessage']     = 'Udskriv denne besked';
+$labels['checkmail'] = 'Se efter nye beskeder';
+$labels['writenewmessage'] = 'Skriv en ny besked';
+$labels['replytomessage'] = 'Svar på denne besked';
+$labels['replytoallmessage'] = 'Svar til alle modtagere';
+$labels['forwardmessage'] = 'Videresend denne besked';
+$labels['deletemessage'] = 'Flyt beskeden til skrald';
+$labels['printmessage'] = 'Udskriv denne besked';
+$labels['previousmessage'] = 'Vis forrige besked';
 $labels['previousmessages'] = 'Vis forrige sæt beskeder';
-$labels['nextmessages']     = 'Vis næste sæt beskeder';
-$labels['backtolist']       = 'Tilbage til beskedlisten';
+$labels['firstmessage'] = 'Vis første besked';
+$labels['firstmessages'] = 'Vis første sæt beskeder';
+$labels['nextmessage'] = 'Vis næste besked';
+$labels['nextmessages'] = 'Vis næste sæt beskeder';
+$labels['lastmessage'] = 'Vis sidste besked';
+$labels['lastmessages'] = 'Vis sidste sæt beskeder';
+$labels['backtolist'] = 'Tilbage til beskedlisten';
+$labels['viewsource'] = 'Vis rå besked';
 
 $labels['select'] = 'Vælg';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Ingen';
 $labels['unread'] = 'Ulæste';
 
+$labels['compact'] = 'Ryd op';
+$labels['empty'] = 'Tøm';
+$labels['purge'] = 'Udrens';
+
+$labels['quota'] = 'Disk forbrug';
+$labels['unknown'] = 'ukendt';
+$labels['unlimited'] = 'ubegrænset';
+
+$labels['quicksearch'] = 'Hurtigsøgning';
+$labels['resetsearch'] = 'Nulstil søgning';
+
 // message compose
-$labels['compose']  = 'Forfat en besked';
-$labels['sendmessage']  = 'Send beskeden nu';
-$labels['addattachment']  = 'Vedhæft en fil';
+$labels['compose'] = 'Forfat en besked';
+$labels['sendmessage'] = 'Send beskeden nu';
+$labels['savemessage'] = 'Gem denne kladde';
+$labels['addattachment'] = 'Vedhæft en fil';
+$labels['charset'] = 'Tegnsæt';
+$labels['editortype'] = 'Tekstbehandler';
+$labels['returnreceipt'] = 'Anmod om kvittering';
 
+$labels['checkspelling'] = 'Stavekontrol';
+$labels['resumeediting'] = 'Genoptag redigering';
+$labels['revertto'] = 'Vend tilbage til';
+
+$labels['attachments'] = 'Vedhæftninger';
 $labels['upload'] = 'Upload';
-$labels['close']  = 'Luk';
+$labels['close'] = 'Luk';
 
-$labels['low']     = 'Lav';
-$labels['lowest']  = 'Lavest';
-$labels['normal']  = 'Normal';
-$labels['high']    = 'Høj';
+$labels['low'] = 'Lav';
+$labels['lowest'] = 'Lavest';
+$labels['normal'] = 'Normal';
+$labels['high'] = 'Høj';
 $labels['highest'] = 'Højest';
 
+$labels['nosubject'] = '(intet emne)';
 $labels['showimages'] = 'Vis billeder';
 
+$labels['htmltoggle'] = 'HTML';
+$labels['plaintoggle'] = 'Almindelig tekst';
 
-// address boook
-$labels['name']      = 'Vist navn';
+// address book
+$labels['name'] = 'Vist navn';
 $labels['firstname'] = 'Fornavn';
-$labels['surname']   = 'Efternavn';
-$labels['email']     = 'Email';
+$labels['surname'] = 'Efternavn';
+$labels['email'] = 'Email';
 
 $labels['addcontact'] = 'Tilføj en ny kontakt';
 $labels['editcontact'] = 'Redigér kontakt';
 
-$labels['edit']   = 'Redigér';
+$labels['edit'] = 'Redigér';
 $labels['cancel'] = 'Afbryd';
-$labels['save']   = 'Gem';
+$labels['save'] = 'Gem';
 $labels['delete'] = 'Slet';
 
-$labels['newcontact']     = 'Opret nyt kontaktkort';
-$labels['deletecontact']  = 'Slet valgte kontakter';
-$labels['composeto']      = 'Skriv brev til';
+$labels['newcontact'] = 'Opret nyt kontaktkort';
+$labels['deletecontact'] = 'Slet valgte kontakter';
+$labels['composeto'] = 'Skriv brev til';
 $labels['contactsfromto'] = 'Kontakter $from til $to af $count';
+$labels['print'] = 'Print';
+$labels['export'] = 'Eksport';
 
+$labels['previouspage'] = 'Vis forrige sæt';
+$labels['firstpage'] = 'Vis første sæt';
+$labels['nextpage'] = 'Vis næste sæt';
+$labels['lastpage'] = 'Vis sidste sæt';
 
-// settings
-$labels['settingsfor']  = 'Indstillinger for';
-
-$labels['preferences']  = 'Præferencer';
-$labels['userpreferences']  = 'Brugerpræferencer';
-$labels['editpreferences']  = 'Redigér brugerpræferencer';
-
-$labels['identities']  = 'Identiteter';
-$labels['manageidentities']  = 'Styr identiteterne for denne konto';
-$labels['newidentity']  = 'Ny identitet';
-
-$labels['newitem']  = 'Nyt punkt';
-$labels['edititem']  = 'Redigér punkt';
-
-$labels['setdefault']  = 'Sæt standard';
-$labels['language']  = 'Sprog';
-$labels['timezone']  = 'Tidszone';
-$labels['pagesize']  = 'Rækker per side';
-
-
-$labels['folders']  = 'Foldere';
-$labels['foldername']  = 'Foldernavn';
-$labels['subscribed']  = 'Abonneret';
-$labels['create']  = 'Opret';
-$labels['createfolder']  = 'Opret ny folder';
-$labels['deletefolder']  = 'Slet folder';
-$labels['managefolders']  = 'Styr foldere';
-
-$labels['attachments'] = 'Vedhæftninger';
-$labels['prettydate']  = 'Pæn datovisning';
-$labels['print']       = 'Print';
-$labels['export']      = 'Eksport';
-$labels['viewsource']  = 'Vis rå besked';
-$labels['replytoallmessage'] = 'Svar til alle modtagere';
-
-$labels['folder']  = 'Folder';
-$labels['compact'] = 'Ryd op';
-$labels['empty'] = 'Tøm';
-$labels['purge'] = 'Udrens';
-$labels['quota'] = 'Disk forbrug';
-
-$labels['sortby']   = 'Sortér efter';
-$labels['sortdesc'] = 'Nyeste først';
-$labels['sortasc']  = 'Ældste først';
-
-$labels['nosubject']  = '(intet emne)';
-$labels['signature'] = 'Signatur';
-$labels['charset']  = 'Tegnsæt';
+// LDAP search
+$labels['ldapsearch'] = 'LDAP-kartotekssøgning';
 
-$labels['ldapsearch'] = 'LDAP kartotekssøgning';
-$labels['ldappublicsearchname']    = 'Kontaktens navn';
+$labels['ldappublicsearchname'] = 'Kontaktens navn';
 $labels['ldappublicsearchtype'] = 'Præcis søgning?';
 $labels['ldappublicserverselect'] = 'Vælg servere';
 $labels['ldappublicsearchfield'] = 'Søg på';
 $labels['ldappublicsearchform'] = 'Søg efter en kontakt';
 $labels['ldappublicsearch'] = 'Søg';
 
-$labels['welcome'] = 'Velkommen til $product';
-
-$labels['unknown'] = 'ukendt';
-$labels['unlimited'] = 'ubegrænset';
-$labels['dstactive'] = 'Sommertid';
+// settings
+$labels['settingsfor'] = 'Indstillinger for';
 
-$labels['previouspage'] = 'Vis forrige sæt';
-$labels['nextpage']     = 'Vis næste sæt';
+$labels['preferences'] = 'Præferencer';
+$labels['userpreferences'] = 'Brugerpræferencer';
+$labels['editpreferences'] = 'Redigér brugerpræferencer';
 
-$labels['returnreceipt'] = 'Anmod om kvittering';
+$labels['identities'] = 'Identiteter';
+$labels['manageidentities'] = 'Styr identiteterne for denne konto';
+$labels['newidentity'] = 'Ny identitet';
 
-$labels['checkmail'] = 'Se efter nye beskeder';
-$labels['checkspelling'] = 'Ret stavning';
-$labels['resumeediting'] = 'Genoptag redigering';
-$labels['revertto'] = 'Vend tilbage til';
+$labels['newitem'] = 'Nyt punkt';
+$labels['edititem'] = 'Redigér punkt';
 
-$labels['savemessage']  = 'Gem denne kladde';
+$labels['setdefault'] = 'Sæt standard';
+$labels['language'] = 'Sprog';
+$labels['timezone'] = 'Tidszone';
+$labels['pagesize'] = 'Rækker per side';
+$labels['signature'] = 'Signatur';
+$labels['dstactive'] = 'Sommertid';
+$labels['htmleditor'] = 'Skriv HTML-besked';
+$labels['htmlsignature'] = 'HTML-signatur';
+$labels['previewpane'] = 'Forhåndsvisning';
+
+$labels['autosavedraft'] = 'Gem kladde automatisk';
+$labels['everynminutes'] = 'hver $n. minut';
+$labels['never'] = 'aldrig';
+
+$labels['folder'] = 'Mapper';
+$labels['folders'] = 'Mapper';
+$labels['foldername'] = 'Mappenavn';
+$labels['subscribed'] = 'Abonneret';
+$labels['create'] = 'Opret';
+$labels['createfolder'] = 'Opret ny mappe';
 $labels['rename'] = 'Omdøb';
-$labels['renamefolder'] = 'Omdøb folder';
+$labels['renamefolder'] = 'Omdøb mappe';
+$labels['deletefolder'] = 'Slet mappe';
+$labels['managefolders'] = 'Administrér mapper';
 
-# i use an additional description field - this might be used somewhere else
-$labels['description'] = 'Beskrivelse';
+$labels['sortby'] = 'Sortér efter';
+$labels['sortasc'] = 'Ældste først';
+$labels['sortdesc'] = 'Nyeste først';
 ?>
diff --git a/program/localization/da/messages.inc b/program/localization/da/messages.inc
index 9da95bede..afad4d03a 100644
--- a/program/localization/da/messages.inc
+++ b/program/localization/da/messages.inc
@@ -12,6 +12,7 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
  | Danish translation : Martin Moeller <martin@liga.dk>                  |
+ |                      Jesper R. Meyer <jesper@upthere.dk>              |
  +-----------------------------------------------------------------------+
 
  $Id$
@@ -20,7 +21,7 @@
 
 $messages = array();
 
-$messages['loginfailed']  = 'Det lykkedes ikke at logge på';
+$messages['loginfailed'] = 'Det lykkedes ikke at logge på';
 
 $messages['cookiesdisabled'] = 'Din browser accepterer ikke cookies';
 
@@ -34,19 +35,29 @@ $messages['loggedout'] = 'Du er nu logget af webmail. Farvel så længe!';
 
 $messages['mailboxempty'] = 'Postkassen er tom!';
 
+$messages['loading'] = 'Indlæser...';
+
 $messages['loadingdata'] = 'Indlæser data...';
 
+$messages['checkingmail'] = 'Tjekker for nye beskeder...';
+
+$messages['sendingmessage'] = 'Sender besked...';
+
 $messages['messagesent'] = 'Beskeden blev sendt korrekt';
 
+$messages['savingmessage'] = 'Gemmer besked...';
+
+$messages['messagesaved'] = 'Beskeden er gemt i kladdemappen';
+
 $messages['successfullysaved'] = 'Det lykkedes at gemme';
 
 $messages['addedsuccessfully'] = 'Kontakten blev tilføjet adressebogen';
 
 $messages['contactexists'] = 'Der er allerede en kontakt med denne email adresse';
 
-$messages['blockedimages'] = 'For at beskytte dit privatliv er billeder fra internet servere blokeret i denne besked.';
+$messages['blockedimages'] = 'For at beskytte dit privatliv er billeder fra internetservere blokeret i denne besked.';
 
-$messages['encryptedmessage'] = 'Dette er en krypteret besked og kan ikke vises. Beklager!';
+$messages['encryptedmessage'] = 'Beskeden er krypteret og kan ikke vises. Beklager!';
 
 $messages['nocontactsfound'] = 'Ingen kontakter blev fundet';
 
@@ -54,28 +65,56 @@ $messages['sendingfailed'] = 'Kunne ikke sende beskeden';
 
 $messages['errorsaving'] = 'Der opstod en fejl ved lagring af data';
 
-$messages['loading'] = 'Indlæser...';
-$messages['sendingmessage'] = 'Sender besked...';
-$messages['errormoving']    = 'Kunne ikke flytte beskeden';
-$messages['errordeleting']  = 'Kunne ikke slette beskeden';
+$messages['errormoving'] = 'Kunne ikke flytte beskeden';
+
+$messages['errordeleting'] = 'Kunne ikke slette beskeden';
+
+$messages['deletecontactconfirm'] = 'Vil du virkelig slette den/de valgte kontakt(er)?';
+
+$messages['deletemessagesconfirm'] = 'Vil du virkelig slette den/de valgte besked(er)?';
+
+$messages['deleteconfirm'] = 'Vil du virkelig slette denne mappe?';
+
+$messages['purgefolderconfirm'] = 'Vil du virkelig slette alle beskeder i denne mappe?';
+
+$messages['formincomplete'] = 'Formularen var ikke fuldstændig fyldt ud';
+
 $messages['noemailwarning'] = 'Indtast venligst en gyldig email adresse';
-$messages['nonamewarning']  = 'Angiv venligst et navn';
+
+$messages['nonamewarning'] = 'Angiv venligst et navn';
+
 $messages['nopagesizewarning'] = 'Angiv sidestørrelsen';
-$messages['formincomplete']    = 'Formularen var ikke fuldstændig fyldt ud';
+
 $messages['norecipientwarning'] = 'Indtast mindst én modtager';
-$messages['nosubjectwarning']  = '"Emne" feltet er tomt. Kunne du tænke dig at skrive et nu?';
+
+$messages['nosubjectwarning'] = '\'Emne\'-feltet er tomt. Kunne du tænke dig at skrive et nu?';
+
 $messages['nobodywarning'] = 'Send denne besked uden tekst?';
-$messages['deletefolderconfirm']  = 'Vil du virkelig slette denne folder?';
+
 $messages['notsentwarning'] = 'Beskeden er ikke blevet sendt. Vil du kassere din besked?';
 
-$messages['noldapserver'] = 'Vælg venligst hvilken LDAP server der skal søges i';
+$messages['noldapserver'] = 'Vælg venligst hvilken LDAP-server der skal søges i';
+
 $messages['nocontactsreturned'] = 'Ingen kontakter blev fundet';
+
 $messages['nosearchname'] = 'Indtast venligst en kontakts navn eller email adresse';
 
+$messages['searchsuccessful'] = 'Fandt $nr beskeder';
+
+$messages['searchnomatch'] = 'Søgningen fandt ingen beskeder';
+
+$messages['searching'] = 'Søger...';
+
 $messages['checking'] = 'Tjekker...';
+
 $messages['nospellerrors'] = 'Ingen stavefejl fundet';
-$messages['checkingmail'] = 'Tjekker for nye beskeder...';
-$messages['savingmessage'] = 'Gemmer besked...';
-$messages['messagesaved'] = 'Beskeden er gemt i kladdemappen';
-$messages['folderdeleted'] = 'Folderen blev slettet korrekt';
+
+$messages['folderdeleted'] = 'Mappen blev slettet korrekt';
+
+$messages['deletedsuccessfully'] = 'Slettet korrekt';
+
+$messages['converting'] = 'Fjerner formatering fra besked...';
+
+$messages['messageopenerror'] = 'Beskeden kunne ikke hentes fra serveren';
+
 ?>
diff --git a/program/localization/de_DE/messages.inc b/program/localization/de_DE/messages.inc
index 34c6ef784..fbec4b739 100644
--- a/program/localization/de_DE/messages.inc
+++ b/program/localization/de_DE/messages.inc
@@ -19,93 +19,53 @@
 */
 
 $messages = array();
-
-$messages['loginfailed']  = 'Anmelden fehlgeschlagen';
-
-$messages['cookiesdisabled'] = 'Ihr Browser akzeptiert keine Cookies';
-
-$messages['sessionerror'] = 'Ihre Session ist ungültig oder abgelaufen';
-
-$messages['imaperror'] = 'Keine Verbindung zum IMAP Server';
-
-$messages['nomessagesfound'] = 'Keine Nachrichten in diesem Ordner';
-
-$messages['loggedout'] = 'Sie haben Ihre Session erfolgreich beendet. Auf Wiedersehen!';
-
-$messages['mailboxempty'] = 'Ordner ist leer';
-
-$messages['loading'] = $messages['loadingdata'] = 'Daten werden geladen...';
-
-$messages['checkingmail'] = 'Überprüfung auf neue Nachrichten...';
-
-$messages['sendingmessage'] = 'Nachricht wird gesendet...';
-
-$messages['messagesent'] = 'Nachricht erfolgreich gesendet';
-
-$messages['savingmessage'] = 'Nachricht wird gespeichert...';
-
-$messages['messagesaved'] = 'Nachricht als Entwurf gespeichert';
-
-$messages['successfullysaved'] = 'Erfolgreich gespeichert';
-
-$messages['addedsuccessfully'] = 'Kontakt zum Adressbuch hinzugefügt';
-
-$messages['contactexists'] = 'Es existiert bereits ein Eintrag mit dieser E-Mail-Adresse';
-
-$messages['blockedimages'] = 'Um Ihre Privatsphäre zur schützen, wurden externe Bilder blockiert.';
-
-$messages['encryptedmessage'] = 'Dies ist eine verschlüsselte Nachricht und kann leider nicht angezeigt werden.';
-
-$messages['nocontactsfound'] = 'Keine Kontakte gefunden';
-
-$messages['sendingfailed'] = 'Versand der Nachricht fehlgeschlagen';
-
-$messages['errorsaving'] = 'Beim Speichern ist ein Fehler aufgetreten';
-
-$messages['errormoving'] = 'Nachricht konnte nicht verschoben werden';
-
-$messages['errordeleting'] = 'Nachricht konnte nicht gelöscht werden';
-
-$messages['deletecontactconfirm']  = 'Wollen Sie die ausgewählten Kontakte wirklich löschen';
-
-$messages['deletefolderconfirm']  = 'Wollen Sie diesen Ordner wirklich löschen?';
-
-$messages['purgefolderconfirm']  = 'Wollen Sie diesen Ordner wirklich leeren?';
-
-$messages['formincomplete']    = 'Das Formular wurde nicht vollständig ausgefüllt';
-
-$messages['noemailwarning']    = 'Bitte geben Sie eine gültige E-Mail-Adresse ein';
-
-$messages['nonamewarning']     = 'Bitte geben Sie einen Namen ein';
-
-$messages['nopagesizewarning'] = 'Bitte geben Sie eine Einträge pro Seite ein';
-
-$messages['norecipientwarning'] = 'Bitte geben Sie mindestens einen Empfänger an';
-
-$messages['nosubjectwarning']  = 'Die Betreffzeile ist leer. Möchten Sie jetzt einen Betreff eingeben?';
-
-$messages['nobodywarning'] = 'Diese Nachricht ohne Inhalt senden?';
-
-$messages['notsentwarning'] = 'Ihre Nachricht wurde nicht gesendet. Wollen Sie die Nachricht verwerfen?';
-
-$messages['noldapserver'] = 'Bitte wählen Sie einen LDAP-Server aus';
-
-$messages['nocontactsreturned'] = 'Es wurden keine Kontakte gefunden';
-
-$messages['nosearchname'] = 'Bitte geben Sie einen Namen oder eine E-Mail-Adresse ein';
-
-$messages['searchsuccessful'] = '$nr Nachrichten gefunden';
-
-$messages['searchnomatch'] = 'Keine Treffer';
-
-$messages['searching'] = 'Suche...';
-
-$messages['checking'] = 'Prüfe...';
-
-$messages['nospellerrors'] = 'Keine Rechtschreibfehler gefunden';
-
-$messages['folderdeleted'] = 'Ordner erfolgreich gelöscht';
-
-$messages['messageopenerror'] = 'Die Nachricht konnte nicht vom Server geladen werden';
-
-?>
\ No newline at end of file
+$messages[loginfailed] = 'Anmelden fehlgeschlagen';
+$messages[cookiesdisabled] = 'Ihr Browser akzeptiert keine Cookies';
+$messages[sessionerror] = 'Ihre Session ist ungültig oder abgelaufen';
+$messages[imaperror] = 'Keine Verbindung zum IMAP Server';
+$messages[nomessagesfound] = 'Keine Nachrichten in diesem Ordner';
+$messages[loggedout] = 'Sie haben Ihre Session erfolgreich beendet. Auf Wiedersehen!';
+$messages[mailboxempty] = 'Ordner ist leer';
+$messages[loading] = 'Daten werden geladen...';
+$messages[loadingdata] = 'Daten werden geladen...';
+$messages[checkingmail] = 'Überprüfung auf neue Nachrichten...';
+$messages[sendingmessage] = 'Nachricht wird gesendet...';
+$messages[messagesent] = 'Nachricht erfolgreich gesendet';
+$messages[savingmessage] = 'Nachricht wird gespeichert...';
+$messages[messagesaved] = 'Nachricht als Entwurf gespeichert';
+$messages[successfullysaved] = 'Erfolgreich gespeichert';
+$messages[addedsuccessfully] = 'Kontakt zum Adressbuch hinzugefügt';
+$messages[contactexists] = 'Es existiert bereits ein Eintrag mit dieser E-Mail-Adresse';
+$messages[blockedimages] = 'Um Ihre Privatsphäre zur schützen, wurden externe Bilder blockiert.';
+$messages[encryptedmessage] = 'Dies ist eine verschlüsselte Nachricht und kann leider nicht angezeigt werden.';
+$messages[nocontactsfound] = 'Keine Kontakte gefunden';
+$messages[sendingfailed] = 'Versand der Nachricht fehlgeschlagen';
+$messages[errorsaving] = 'Beim Speichern ist ein Fehler aufgetreten';
+$messages[errormoving] = 'Nachricht konnte nicht verschoben werden';
+$messages[errordeleting] = 'Nachricht konnte nicht gelöscht werden';
+$messages[deletecontactconfirm] = 'Wollen Sie die ausgewählten Kontakte wirklich löschen';
+$messages[deletemessagesconfirm] = 'Wollen Sie die ausgewählten Nachrichten wirklich löschen?';
+$messages[deletefolderconfirm] = 'Wollen Sie diesen Ordner wirklich löschen?';
+$messages[purgefolderconfirm] = 'Wollen Sie diesen Ordner wirklich leeren?';
+$messages[formincomplete] = 'Das Formular wurde nicht vollständig ausgefüllt';
+$messages[noemailwarning] = 'Bitte geben Sie eine gültige E-Mail-Adresse ein';
+$messages[nonamewarning] = 'Bitte geben Sie einen Namen ein';
+$messages[nopagesizewarning] = 'Bitte geben Sie eine Einträge pro Seite ein';
+$messages[norecipientwarning] = 'Bitte geben Sie mindestens einen Empfänger an';
+$messages[nosubjectwarning] = 'Die Betreffzeile ist leer. Möchten Sie jetzt einen Betreff eingeben?';
+$messages[nobodywarning] = 'Diese Nachricht ohne Inhalt senden?';
+$messages[notsentwarning] = 'Ihre Nachricht wurde nicht gesendet. Wollen Sie die Nachricht verwerfen?';
+$messages[noldapserver] = 'Bitte wählen Sie einen LDAP-Server aus';
+$messages[nocontactsreturned] = 'Es wurden keine Kontakte gefunden';
+$messages[nosearchname] = 'Bitte geben Sie einen Namen oder eine E-Mail-Adresse ein';
+$messages[searchsuccessful] = '$nr Nachrichten gefunden';
+$messages[searchnomatch] = 'Keine Treffer';
+$messages[searching] = 'Suche...';
+$messages[checking] = 'Prüfe...';
+$messages[nospellerrors] = 'Keine Rechtschreibfehler gefunden';
+$messages[folderdeleted] = 'Ordner erfolgreich gelöscht';
+$messages[deletedsuccessfully] = 'Erfolgreich gelöscht.';
+$messages[converting] = 'Entferne Formatierung von Nachricht...';
+$messages[messageopenerror] = 'Die Nachricht konnte nicht vom Server geladen werden';
+
+?>
diff --git a/program/localization/et_EE/labels.inc b/program/localization/et_EE/labels.inc
index c69f0b48d..9d2bf4ad2 100644
--- a/program/localization/et_EE/labels.inc
+++ b/program/localization/et_EE/labels.inc
@@ -1,17 +1,19 @@
 <?php
 
 /*
- +-----------------------------------------------------------------------+
- | language/et_EE/labels.inc                                             |
- |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005, RoundQube Dev. - Switzerland                      |
- | Licensed under the GNU GPL                                            |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Üllar Pajus <yllar.pajus@gmail.com>                           
- +-----------------------------------------------------------------------+
-  $Id: labels.inc,v 1.5 2006/05/05 16:53:21 roundcube Exp $
+  +-----------------------------------------------------------------------+
+  | language/et_EE/labels.inc                                             |
+  |                                                                       |
+  | Language file of the RoundCube Webmail client                         |
+  | Copyright (C) 2005, RoundQube Dev. - Switzerland                      |
+  | Licensed under the GNU GPL                                            |
+  |                                                                       |
+  +-----------------------------------------------------------------------+
+  | Author: Üllar Pajus <yllar.pajus@gmail.com>                           |
+  +-----------------------------------------------------------------------+
+
+ $Id: messages.inc 394 2006-12-04 10:31:40Z yllar $ 
+
 */
 
 $labels = array();
diff --git a/program/localization/et_EE/messages.inc b/program/localization/et_EE/messages.inc
index 6564e63f7..e3dcec236 100644
--- a/program/localization/et_EE/messages.inc
+++ b/program/localization/et_EE/messages.inc
@@ -12,8 +12,9 @@
  | Author: Üllar Pajus <yllar.pajus@gmail.com>                           |
  +-----------------------------------------------------------------------+
 
- $Id: messages.inc,v 1.3 2006/02/19 18:31:40 roundcube Exp $
- */
+ $Id: messages.inc 394 2006-12-04 10:31:40Z yllar $
+
+*/
 
 $messages = array();
 $messages['loginfailed'] = 'Sisselogimine ebaõnnestus';
diff --git a/program/localization/fr/labels.inc b/program/localization/fr/labels.inc
index 9e95f297d..5c2bc6a27 100644
--- a/program/localization/fr/labels.inc
+++ b/program/localization/fr/labels.inc
@@ -17,59 +17,42 @@
 */
 
 $labels = array();
-
-// login page
-$labels['welcome']   = 'Bienvenue à $product';
-$labels['username']  = 'ID utilisateur';
-$labels['password']  = 'Mot de passe';
-$labels['server']    = 'Serveur';
-$labels['login']     = 'Connexion';
-
-// taskbar
-$labels['logout']   = 'Quitter';
-$labels['mail']     = 'e-Mail';
+$labels['welcome'] = 'Bienvenue à $product';
+$labels['username'] = 'ID utilisateur';
+$labels['password'] = 'Mot de passe';
+$labels['server'] = 'Serveur';
+$labels['login'] = 'Connexion';
+$labels['logout'] = 'Quitter';
+$labels['mail'] = 'e-Mail';
 $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['trash']  = 'Corbeille';
+$labels['inbox'] = 'Boîte de réception';
 $labels['drafts'] = 'Brouillons';
-$labels['junk']   = 'A trier';
-
-// message listing
+$labels['sent'] = 'Messages envoyés';
+$labels['trash'] = 'Corbeille';
+$labels['junk'] = 'Pourriel';
 $labels['subject'] = 'Objet';
-$labels['from']    = 'De';
-$labels['to']      = 'A';
-$labels['cc']      = 'Cc';
-$labels['bcc']     = 'Cci';
+$labels['from'] = 'De';
+$labels['to'] = 'A';
+$labels['cc'] = 'Cc';
+$labels['bcc'] = 'Cci';
 $labels['replyto'] = 'Répondre à';
-$labels['date']    = 'Date';
-$labels['size']    = 'Taille';
+$labels['date'] = 'Date';
+$labels['size'] = 'Taille';
 $labels['priority'] = 'Priorité';
 $labels['organization'] = 'Organisation';
-
-// aliases
-$labels['reply-to'] = $labels['replyto'];
-
+$labels['reply-to'] = 'Répondre à';
 $labels['mailboxlist'] = 'Dossiers';
 $labels['messagesfromto'] = 'Messages $from à $to sur $count';
 $labels['messagenrof'] = 'Message $nr sur $count';
-
-$labels['moveto']   = 'Déplacer vers...';
+$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['htmlmessage'] = 'Message HTML';
 $labels['prettydate'] = 'Affichage réduit des dates';
-
 $labels['addtoaddressbook'] = 'Ajouter au carnet d\'adresses';
-
-// weekdays short
 $labels['sun'] = 'Dim';
 $labels['mon'] = 'Lun';
 $labels['tue'] = 'Mar';
@@ -77,145 +60,124 @@ $labels['wed'] = 'Mer';
 $labels['thu'] = 'Jeu';
 $labels['fri'] = 'Ven';
 $labels['sat'] = 'Sam';
-
-// weekdays long
-$labels['sunday']    = 'Dimanche';
-$labels['monday']    = 'Lundi';
-$labels['tuesday']   = 'Mardi';
+$labels['sunday'] = 'Dimanche';
+$labels['monday'] = 'Lundi';
+$labels['tuesday'] = 'Mardi';
 $labels['wednesday'] = 'Mercredi';
-$labels['thursday']  = 'Jeudi';
-$labels['friday']    = 'Vendredi';
-$labels['saturday']  = 'Samedi';
-
+$labels['thursday'] = 'Jeudi';
+$labels['friday'] = 'Vendredi';
+$labels['saturday'] = 'Samedi';
 $labels['today'] = 'Aujourd\'hui';
-
-// toolbar buttons
 $labels['checkmail'] = 'Vérification des nouveaux messages';
-$labels['writenewmessage']  = 'Créer un nouveau message';
-$labels['replytomessage']   = 'Répondre au message';
+$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['printmessage']     = 'Imprimer ce message';
+$labels['forwardmessage'] = 'Transmettre le message';
+$labels['deletemessage'] = 'Déplacer le message dans la corbeille';
+$labels['printmessage'] = 'Imprimer ce message';
+$labels['previousmessage'] = 'Voir le message précédent';
 $labels['previousmessages'] = 'Voir les messages précédents';
-$labels['nextmessages']     = 'Voir les messages suivants';
-$labels['backtolist']       = 'Retourner à la liste des messages';
-$labels['viewsource']       = 'Voir le code source';
-
+$labels['firstmessage'] = 'Voir le premier message';
+$labels['firstmessages'] = 'Voir la première page de messages';
+$labels['nextmessage'] = 'Voir le message suivant';
+$labels['nextmessages'] = 'Voir les messages suivants';
+$labels['lastmessage'] = 'Voir le dernier message';
+$labels['lastmessages'] = 'Voir la dernière page de messages';
+$labels['backtolist'] = 'Retourner à la liste des messages';
+$labels['viewsource'] = 'Voir le code source';
 $labels['select'] = 'Sélectionner';
 $labels['all'] = 'Tous';
 $labels['none'] = 'Aucun';
 $labels['unread'] = 'Non lus';
-
-//$labels['compact'] = 'Compresser';
+$labels['compact'] = 'Compact';
 $labels['empty'] = 'Vider';
 $labels['purge'] = 'Purger';
-
 $labels['quota'] = 'Utilisation Disque';
 $labels['unknown'] = 'inconnue';
 $labels['unlimited'] = 'illimitée';
-
-$labels['quicksearch']  = 'Recherche rapide';
-$labels['resetsearch']  = 'Réinitialiser la recherche';
-
-
-// message compose
-$labels['compose']  = 'Composer un nouveau message';
-$labels['savemessage']  = 'Sauvegarder ce brouillon';
-$labels['sendmessage']  = 'Envoyer le message maintenant';
-$labels['addattachment']  = 'Joindre un fichier';
-$labels['charset']  = 'Encodage';
+$labels['quicksearch'] = 'Recherche rapide';
+$labels['resetsearch'] = 'Réinitialiser la recherche';
+$labels['compose'] = 'Composer un nouveau message';
+$labels['sendmessage'] = 'Envoyer le message maintenant';
+$labels['savemessage'] = 'Sauvegarder ce brouillon';
+$labels['addattachment'] = 'Joindre un fichier';
+$labels['charset'] = 'Encodage';
+$labels['editortype'] = 'Type d\'éditeur';
 $labels['returnreceipt'] = 'Accusé de réception';
-
 $labels['checkspelling'] = 'Vérifier l\'orthographe';
 $labels['resumeediting'] = 'Retourner à l\'édition';
 $labels['revertto'] = 'Revenir à';
-
 $labels['attachments'] = 'Fichiers joints';
 $labels['upload'] = 'Joindre';
-$labels['close']  = 'Fermer';
-
-$labels['low']     = 'Basse';
-$labels['lowest']  = 'La plus basse';
-$labels['normal']  = 'Normale';
-$labels['high']    = 'Elevée';
+$labels['close'] = 'Fermer';
+$labels['low'] = 'Basse';
+$labels['lowest'] = 'La plus basse';
+$labels['normal'] = 'Normale';
+$labels['high'] = 'Elevée';
 $labels['highest'] = 'La plus élevée';
-
-$labels['nosubject']  = '(pas de sujet)';
+$labels['nosubject'] = '(pas de sujet)';
 $labels['showimages'] = 'Montrer les images';
-
-
-// address boook
-$labels['name']      = 'Nom à afficher';
+$labels['htmltoggle'] = 'HTML';
+$labels['plaintoggle'] = 'texte brut';
+$labels['name'] = 'Nom à afficher';
 $labels['firstname'] = 'Prénom';
-$labels['surname']   = 'Nom';
-$labels['email']     = 'e-Mail';
-
-$labels['addcontact'] = 'Ajouter un nouveau contact';
+$labels['surname'] = 'Nom';
+$labels['email'] = 'e-Mail';
+$labels['addcontact'] = 'Ajouter le contact sélectionné à votre Carnet d\'adresses';
 $labels['editcontact'] = 'Editer le contact';
-
-$labels['edit']   = 'Editer';
+$labels['edit'] = 'Editer';
 $labels['cancel'] = 'Annuler';
-$labels['save']   = 'Sauvegarder';
+$labels['save'] = 'Sauvegarder';
 $labels['delete'] = 'Supprimer';
-
-$labels['newcontact']     = 'Créer un nouveau contact';
-$labels['addcontact']     = 'Ajouter le contact sélectionné à votre Carnet d\'adresses';
-$labels['deletecontact']  = 'Supprimer les contacts sélectionnés';
-$labels['composeto']      = 'Ecrire un message à';
+$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['print']          = 'Imprimer';
-$labels['export']         = 'Exporter';
-
+$labels['print'] = 'Imprimer';
+$labels['export'] = 'Exporter';
 $labels['previouspage'] = 'Montrer page précédente';
-$labels['nextpage']     = 'Montrer page suivante';
-
-
-// LDAP search
+$labels['firstpage'] = 'Voir la première page';
+$labels['nextpage'] = 'Montrer page suivante';
+$labels['lastpage'] = 'Voir la dernière page';
 $labels['ldapsearch'] = 'Recherche dans répertoires LDAP';
-
-$labels['ldappublicsearchname']    = 'Nom du contact';
+$labels['ldappublicsearchname'] = 'Nom du contact';
 $labels['ldappublicsearchtype'] = 'Correspondance exacte ?';
 $labels['ldappublicserverselect'] = 'Sélectionnez les serveurs';
 $labels['ldappublicsearchfield'] = 'Recherche sur';
 $labels['ldappublicsearchform'] = 'Chercher un contact';
 $labels['ldappublicsearch'] = 'Recherche';
-
-
-// settings
-$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['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['setdefault']  = 'Paramètres par défaut';
-$labels['language']  = 'Langue';
-$labels['timezone']  = 'Fuseau horaire';
-$labels['pagesize']  = 'Nombre de lignes par page';
+$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['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['setdefault'] = 'Paramètres par défaut';
+$labels['language'] = 'Langue';
+$labels['timezone'] = 'Fuseau horaire';
+$labels['pagesize'] = 'Nombre de lignes par page';
 $labels['signature'] = 'Signature';
 $labels['dstactive'] = 'Heure d\'été';
-
-$labels['folder']  = 'Dossier';
-$labels['folders']  = 'Dossiers';
-$labels['foldername']  = 'Nom du dossier';
-$labels['subscribed']  = 'Abonné';
-$labels['create']  = 'Créer';
-$labels['createfolder']  = 'Créer un nouveau dossier';
+$labels['htmleditor'] = 'Composer un message au format HTML';
+$labels['htmlsignature'] = 'Signature HTML';
+$labels['previewpane'] = 'Afficher le panneau d\'aperçu';
+$labels['autosavedraft'] = 'Sauvegarde automatique des brouillons';
+$labels['everynminutes'] = 'toutes les $n minutes';
+$labels['never'] = 'jamais';
+$labels['folder'] = 'Dossier';
+$labels['folders'] = 'Dossiers';
+$labels['foldername'] = 'Nom du dossier';
+$labels['subscribed'] = 'Abonné';
+$labels['create'] = 'Créer';
+$labels['createfolder'] = 'Créer un nouveau dossier';
 $labels['rename'] = 'Renommer';
 $labels['renamefolder'] = 'Renommer le dossier';
-$labels['deletefolder']  = 'Supprimer le dossier';
-$labels['managefolders']  = 'Gérer les dossiers';
-
+$labels['deletefolder'] = 'Supprimer le dossier';
+$labels['managefolders'] = 'Gérer les dossiers';
 $labels['sortby'] = 'Trier par';
-$labels['sortasc']  = 'Tri ascendant';
+$labels['sortasc'] = 'Tri ascendant';
 $labels['sortdesc'] = 'Tri descendant';
-
 ?>
diff --git a/program/localization/fr/messages.inc b/program/localization/fr/messages.inc
index 0b14ec3cf..922cf3d29 100644
--- a/program/localization/fr/messages.inc
+++ b/program/localization/fr/messages.inc
@@ -17,94 +17,52 @@
 */
 
 $messages = array();
-
-$messages['loginfailed']  = 'Erreur de connexion';
-
+$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['imaperror'] = 'Erreur de connexion au serveur IMAP';
-
 $messages['nomessagesfound'] = 'Aucun message trouvé dans cette boîte aux lettres';
-
 $messages['loggedout'] = 'Vous venez de vous déconnecter avec succès. Au revoir !';
-
 $messages['mailboxempty'] = 'Boîte aux lettres vide';
-
 $messages['loading'] = 'Chargement en cours...';
-
 $messages['loadingdata'] = 'Chargement des données en cours...';
-
 $messages['checkingmail'] = 'Vérification des nouveaux messages ...';
-
 $messages['sendingmessage'] = 'Message en cours d\'envoi...';
-
 $messages['messagesent'] = 'Message envoyé';
-
 $messages['savingmessage'] = 'Sauvegarde du message...';
-
 $messages['messagesaved'] = 'Message sauvegardé dans Brouillons';
-
 $messages['successfullysaved'] = 'Sauvegarde effectuée';
-
 $messages['addedsuccessfully'] = 'Contact ajouté dans le carnet d\'adresses';
-
 $messages['contactexists'] = 'Un contact avec cette adresse e-Mail existe déjà';
-
 $messages['blockedimages'] = 'Afin de préserver votre vie privée, 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['nocontactsfound'] = 'Aucun contact trouvé';
-
 $messages['sendingfailed'] = 'Le message n\'a pas été envoyé';
-
 $messages['errorsaving'] = 'Une erreur est apparue pendant la sauvegarde';
-
 $messages['errormoving'] = 'Impossible de déplacer le message';
-
 $messages['errordeleting'] = 'Impossible d\'effacer le message';
-
-$messages['deletecontactconfirm']  = 'Voulez-vous vraiment effacer les contacts sélectionnés ?';
-
-$messages['deletefolderconfirm']  = 'Voulez-vous vraiment effacer ce dossier ?';
-
-$messages['purgefolderconfirm']  = 'Voulez-vous vraiment effacer tous les messages dans ce dossier ?';
-
+$messages['deletecontactconfirm'] = 'Voulez-vous vraiment effacer les contacts sélectionnés ?';
+$messages['deletemessagesconfirm'] = 'Voulez-vous vraiment supprimer le(s) message(s) séléctionné(s) ?';
+$messages['deletefolderconfirm'] = 'Voulez-vous vraiment effacer ce dossier ?';
+$messages['purgefolderconfirm'] = 'Voulez-vous vraiment effacer tous les messages dans ce dossier ?';
 $messages['formincomplete'] = 'Le formulaire n\'a pas été entièrement rempli';
-
 $messages['noemailwarning'] = 'Entrez une adresse e-Mail valide SVP';
-
-$messages['nonamewarning']  = 'Entrez un nom SVP';
-
+$messages['nonamewarning'] = 'Entrez un nom SVP';
 $messages['nopagesizewarning'] = 'Entrez une taille de page SVP';
-
 $messages['norecipientwarning'] = 'Entrez au moins un destinataire SVP';
-
-$messages['nosubjectwarning']  = 'Le champ "Objet" est vide. Souhaitez-vous le compléter maintenant ?';
-
+$messages['nosubjectwarning'] = 'Le champ "Objet" est vide. Souhaitez-vous le compléter maintenant ?';
 $messages['nobodywarning'] = 'Envoyer ce message sans texte ?';
-
 $messages['notsentwarning'] = 'Le message n\'a pas été envoyé. Voulez-vous abandonner ce message ?';
-
 $messages['noldapserver'] = 'Choisissez un serveur ldap pour la recherche';
-
 $messages['nocontactsreturned'] = 'Aucun contact trouvé';
-
 $messages['nosearchname'] = 'Entrez un nom ou une adresse e-Mail de contact';
-
 $messages['searchsuccessful'] = '$nr messages trouvés';
-
 $messages['searchnomatch'] = 'Aucun résultat trouvé';
-
 $messages['searching'] = 'En cours de recherche...';
-
 $messages['checking'] = 'Vérification...';
-
 $messages['nospellerrors'] = 'Aucune faute trouvée';
-
 $messages['folderdeleted'] = 'Dossier effacé';
-
-
+$messages['deletedsuccessfully'] = 'Supprimé(s) avec succès';
+$messages['converting'] = 'Suppression du formattage ...';
+$messages['messageopenerror'] = 'Impossible de charger le message du serveur';
 ?>
diff --git a/program/localization/pl/labels.inc b/program/localization/pl/labels.inc
index 55f96c0ae..41b5a9f1d 100644
--- a/program/localization/pl/labels.inc
+++ b/program/localization/pl/labels.inc
@@ -19,14 +19,14 @@ $Id$
 $labels = array();
 
 // login page
-$labels['username']  = 'E-mail';
+$labels['username']  = 'Login';
 $labels['password']  = 'Hasło';
 $labels['server']    = 'Serwer';
 $labels['login']     = 'Zaloguj';
 
 // taskbar
 $labels['logout']   = 'Wyloguj';
-$labels['mail']     = 'E-Mail';
+$labels['mail']     = 'Skrzynka odbiorcza';
 $labels['settings'] = 'Ustawienia';
 $labels['addressbook'] = 'Książka Adresowa';
 
@@ -181,6 +181,12 @@ $labels['language']  = 'Język';
 $labels['timezone']  = 'Strefy czasu';
 $labels['pagesize']  = 'wierszy na stronie';
 $labels['signature'] = 'Podpis';
+$labels['htmleditor'] = 'Twórz wiadomości HTML';
+$labels['htmlsignature'] = 'Podpis w HTML';
+
+$labels['autosavedraft']  = 'Automatyczny zapis tworzonej wiadomości';
+$labels['everynminutes']  = 'co $n minut';
+$labels['never']  = 'nigdy';
 
 $labels['folders']  = 'Foldery';
 $labels['foldername']  = 'Nazwa folderu';
@@ -203,6 +209,8 @@ $labels['dstactive'] = 'czas letni';
 
 $labels['previouspage'] = 'poprzednia strona';
 $labels['nextpage']     = 'następna strona';
+$labels['quicksearch']  = 'Szybkie szukanie';
+$labels['resetsearch']  = 'Wyczyść filtr';
 
 $labels['returnreceipt'] = 'Potwierdzenie odbioru';
 
diff --git a/program/localization/pl/messages.inc b/program/localization/pl/messages.inc
index 352c32a26..cadd6fb75 100644
--- a/program/localization/pl/messages.inc
+++ b/program/localization/pl/messages.inc
@@ -18,19 +18,19 @@ $Id$
 
 $messages = array();
 
-$messages['loginfailed']  = 'Błąd logowania.';
+$messages['loginfailed']  = 'Błąd logowania!';
 
-$messages['cookiesdisabled'] = 'Twoja przeglądarka nie obsługuje Ciasteczek.';
+$messages['cookiesdisabled'] = 'Twoja przeglądarka nie obsługuje ciasteczek!';
 
-$messages['sessionerror'] = 'Błąd sesji,bądź sesja wygasła.';
+$messages['sessionerror'] = 'Błąd sesji, bądź sesja wygasła!';
 
-$messages['imaperror'] = 'Błąd połączenia z serwerem.';
+$messages['imaperror'] = 'Błąd połączenia z serwerem!';
 
 $messages['nomessagesfound'] = 'Brak wiadomości w skrzynce.';
 
-$messages['loggedout'] = 'Do widzenia.';
+$messages['loggedout'] = 'Użytkownik wylogował się poprawnie.';
 
-$messages['mailboxempty'] = 'Skrzynka jest pusta.';
+$messages['mailboxempty'] = 'Skrzynka jest pusta!';
 
 $messages['loadingdata'] = 'Ładowanie...';
 
@@ -44,37 +44,37 @@ $messages['successfullysaved'] = 'Zapisano.';
 
 $messages['addedsuccessfully'] = 'Kontakt został dodany.';
 
-$messages['contactexists'] = 'Kontakt o podanym adresie e-mail istnieje.';
+$messages['contactexists'] = 'Kontakt o podanym adresie e-mail istnieje!';
 
 $messages['blockedimages'] = 'Ze względów bezpieczeństwa zewnętrzne obrazki zostały zablokowane.';
 
-$messages['encryptedmessage'] = 'Przepraszamy, nie można wyświeltlić zaszyfrowanej wiadomości.';
+$messages['encryptedmessage'] = 'Przepraszamy, nie można wyświeltlić zaszyfrowanej wiadomości!';
 
-$messages['nocontactsfound'] = 'Nie znaleziono kontaktu.';
+$messages['nocontactsfound'] = 'Nie znaleziono kontaktu!';
 
-$messages['sendingfailed'] = 'Nie udało się wysłać wiadomości.';
+$messages['sendingfailed'] = 'Nie udało się wysłać wiadomości!';
 
-$messages['errorsaving'] = 'Błąd podczas zapisu.';
+$messages['errorsaving'] = 'Błąd podczas zapisu!';
 
-$messages['errorsavingcontact'] = 'Błąd podczas zapisywania kontaktu.';
+$messages['errorsavingcontact'] = 'Błąd podczas zapisywania kontaktu!';
 
-$messages['errormoving'] = 'Nie można przeniść wybranej wiadomości';
+$messages['errormoving'] = 'Nie można przenieść wybranej wiadomości!';
 
-$messages['errordeleting'] = 'Nie można usunąć wiadomości';
+$messages['errordeleting'] = 'Nie można usunąć wiadomości!';
 
 $messages['deletecontactconfirm']  = 'Czy rzeczywiscie chcesz usunąć wybrane kontakty ?';
 
 $messages['deletefolderconfirm']  = 'Czy rzeczywiście chcesz usunąć wybrany folder ?';
 
-$messages['formincomplete'] = 'Proszę uzupełnić formularz';
+$messages['formincomplete'] = 'Proszę uzupełnić formularz!';
 
-$messages['noemailwarning'] = 'Wpisz poprawny adres e-mail';
+$messages['noemailwarning'] = 'Wpisz poprawny adres e-mail!';
 
-$messages['nonamewarning']  = 'Podaj imię';
+$messages['nonamewarning']  = 'Podaj imię!';
 
-$messages['nopagesizewarning'] = 'Podaj poprawną wartość';
+$messages['nopagesizewarning'] = 'Podaj poprawną wartość!';
 
-$messages['norecipientwarning'] = 'Podaj conajmniej jednego odbiorece';
+$messages['norecipientwarning'] = 'Podaj conajmniej jednego odbiorcę!';
 
 $messages['nosubjectwarning']  = 'Nie podałeś tematu wiadomości. Czy chcesz go teraz uzupełnić?';
 
@@ -82,9 +82,9 @@ $messages['nobodywarning'] = 'Ta wiadomość jest pusta, czy mimo to chesz ją w
 
 $messages['notsentwarning'] = 'Wiadomość nie została wysłana. czy chesz usunąć tą wiadomość?';
 
-$messages['noldapserver'] = 'Proszę wybrać serwer LDAP';
+$messages['noldapserver'] = 'Proszę wybrać serwer LDAP!';
 
-$messages['nocontactsreturned'] = 'Nie znaleziono kontaktów';
+$messages['nocontactsreturned'] = 'Nie znaleziono kontaktów!';
 
 $messages['nosearchname'] = 'Proszę podać nazwę kontaktu lub jego adres email.';
 
@@ -100,5 +100,5 @@ $messages['savingmessage'] = 'Zapisywanie wiadomości...';
 
 $messages['messagesaved'] = 'Wiadomośc została zapisana w kopiach roboczych.';
 
-$messages['folderdeleted'] = 'Folder został pomyślnie usunięty';
+$messages['folderdeleted'] = 'Folder został pomyślnie usunięty.';
 ?>
\ No newline at end of file
diff --git a/program/localization/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc
index b50425ae6..98c93be05 100644
--- a/program/localization/pt_BR/labels.inc
+++ b/program/localization/pt_BR/labels.inc
@@ -10,6 +10,7 @@
  |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Anderson S. Ferreira <anderson@cnpm.embrapa.br>               |
+ | Updated by: Robson F. Ramaldes <rframaldes@gmail.com>                 |
  +-----------------------------------------------------------------------+
 
  $Id$
@@ -18,7 +19,8 @@
 
 $labels = array();
 
-// Página de login
+// Página de loginOnthaal aan $product
+$labels['welcome']   = 'Bem Vindo ao $product';
 $labels['username']  = 'Usuário';
 $labels['password']  = 'Senha';
 $labels['server']    = 'Servidor';
@@ -32,6 +34,7 @@ $labels['addressbook'] = 'Catálogo de endereços';
 
 // Nome das pastas de correio
 $labels['inbox']  = 'Caixa de entrada';
+$labels['drafts'] = 'Rascunhos';
 $labels['sent']   = 'Enviados';
 $labels['trash']  = 'Lixeira';
 $labels['drafts'] = 'Rascunhos';
@@ -89,6 +92,7 @@ $labels['saturday']  = 'Sábado';
 $labels['today'] = 'Hoje';
 
 // toolbar buttons
+$labels['checkmail']        = 'Verificar se há novas mensagens';
 $labels['writenewmessage']  = 'Criar nova mensagem';
 $labels['replytomessage']   = 'Responder';
 $labels['replytoallmessage'] = 'Responder para todos';
@@ -110,13 +114,26 @@ $labels['empty'] = 'Vazio';
 $labels['purge'] = 'Apagar';
 
 $labels['quota'] = 'Utilização';
+$labels['unknown']  = 'desconhecido';
+$labels['unlimited']  = 'sem limitação';
+
+$labels['quicksearch']  = 'Pesquisa Rápida';
+$labels['resetsearch']  = 'Limpar';
+
 
 
 // message compose
 $labels['compose']  = 'Escrever mensagem';
+$labels['savemessage']  = 'Salvar Rascunho';
 $labels['sendmessage']  = 'Enviar';
 $labels['addattachment']  = 'Anexar';
-$labels['charset']  = 'Charset';
+$labels['charset']  = 'Codificação';
+
+$labels['returnreceipt'] = 'Receber Confirmação';
+$labels['checkspelling'] = 'Verificar Ortografia';
+$labels['resumeediting'] = 'Continuar';
+$labels['revertto'] = 'Revert to';
+
 
 $labels['attachments'] = 'Anexos';
 $labels['upload'] = 'Upload';
@@ -128,7 +145,7 @@ $labels['normal']  = 'Normal';
 $labels['high']    = 'Alta';
 $labels['highest'] = 'Mais alta';
 
-$labels['nosubject']  = '(no assunto)';
+$labels['nosubject']  = '(sem assunto)';
 $labels['showimages'] = 'Exibir imagens';
 
 
@@ -147,12 +164,17 @@ $labels['save']   = 'Salvar';
 $labels['delete'] = 'Apagar';
 
 $labels['newcontact']     = 'Criar novo contato';
+$labels['addcontact']     = 'Incluir contato selecionado ao catálogo de endereços';
 $labels['deletecontact']  = 'Apagar contatos selecionados';
 $labels['composeto']      = 'Escrever mensagem para';
 $labels['contactsfromto'] = 'Contatos $from - $to of $count';
 $labels['print']          = 'Imprimir';
 $labels['export']         = 'Exportar';
 
+$labels['previouspage']   = 'Página Anterior';
+$labels['nextpage']       = 'Próxima P�gina';
+
+
 // LDAP search
 $labels['ldapsearch'] = 'Pesquisa no diretório LDAP';
 
@@ -183,6 +205,7 @@ $labels['language']  = 'Idioma';
 $labels['timezone']  = 'Time zone';
 $labels['pagesize']  = 'Linhas por página';
 $labels['signature'] = 'Assinatura';
+$labels['dstactive']  = 'Horário de Verão';
 
 $labels['folder']  = 'Pasta';
 $labels['folders']  = 'Pastas';
@@ -190,6 +213,8 @@ $labels['foldername']  = 'Nome da pasta';
 $labels['subscribed']  = 'Assinado';
 $labels['create']  = 'Criar';
 $labels['createfolder']  = 'Criar nova pasta';
+$labels['rename'] = 'Renomear';
+$labels['renamefolder'] = 'Renomear Pasta';
 $labels['deletefolder']  = 'Apagar pasta';
 $labels['managefolders']  = 'Gerenciar pastas';
 
@@ -197,29 +222,4 @@ $labels['sortby'] = 'Ordenado por';
 $labels['sortasc']  = 'Ascendente';
 $labels['sortdesc'] = 'Descendente';
 
-// New labels since 0.1beta
-
-$labels['welcome'] = 'Bem-vindo ao $product';
-
-$labels['unknown'] = 'Desconhecido';
-$labels['unlimited'] = 'Ilimitado';
-$labels['dstactive'] = 'Horário de verão';
-
-$labels['previouspage'] = 'Exibir página anterior';
-$labels['nextpage']     = 'Exibir próxima página';
-
-$labels['returnreceipt'] = 'Confirmação de leitura';
-
-$labels['checkmail'] = 'Verificando novas mensagens';
-$labels['checkspelling'] = 'Verificando ortografia';
-$labels['resumeediting'] = 'Continuar a edição';
-$labels['revertto'] = 'Reverter para';
-
-$labels['savemessage']  = 'Salvar rascunho';
-$labels['rename'] = 'Renomear';
-$labels['renamefolder'] = 'Renomear pasta';
-
-// I use an additional description field - this might be used somewhere else
-$labels['description'] = 'Descrição';
-
-?>
+?>
\ No newline at end of file
diff --git a/program/localization/pt_BR/messages.inc b/program/localization/pt_BR/messages.inc
index f427b68c2..e56268d98 100644
--- a/program/localization/pt_BR/messages.inc
+++ b/program/localization/pt_BR/messages.inc
@@ -10,6 +10,7 @@
  |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Anderson S. Ferreira <anderson@cnpm.embrapa.br>               |
+ | Updated by: Robson F. Ramaldes <rframaldes@gmail.com>                 |
  +-----------------------------------------------------------------------+
 
  $Id$
@@ -32,10 +33,20 @@ $messages['loggedout'] = 'Sua sessão foi finalizada com sucesso. Até breve!';
 
 $messages['mailboxempty'] = 'A caixa postal está vazia';
 
+$messages['loading'] = 'Carregando...';
+
 $messages['loadingdata'] = 'Carregando informações...';
 
+$messages['checkingmail'] = 'Verificando se há novas mensagens...';
+
+$messages['sendingmessage'] = 'Enviando...';
+
 $messages['messagesent'] = 'Mensagem enviada';
 
+$messages['savingmessage'] = 'Salvando Mensagem...';
+
+$messages['messagesaved'] = 'Rascunho Salvo';
+
 $messages['successfullysaved'] = 'Salvo com sucesso';
 
 $messages['addedsuccessfully'] = 'Contato incluído com sucesso';
@@ -74,7 +85,7 @@ $messages['norecipientwarning'] = 'Por favor, informe pelo menos um destinatári
 
 $messages['nosubjectwarning']  = 'O campo assunto não foi informado. Deseja incluí-lo agora?';
 
-$messages['nobodywarning'] = 'Enviar a mensagem se texto?';
+$messages['nobodywarning'] = 'Enviar a mensagem sem texto?';
 
 $messages['notsentwarning'] = 'A mensegem não foi enviada, deseja excluí-la?';
 
@@ -84,17 +95,18 @@ $messages['nocontactsreturned'] = 'Nenhum contato foi encontrado';
 
 $messages['nosearchname'] = 'Por favor, informe o nome do contado ou seu endereço de e-mail';
 
-// New messages since 0.1beta
-$messages['checking'] = 'Verificando...';
+$messages['searchsuccessful'] = '$nr mensagens encontradas';
+
+$messages['searchnomatch'] = 'A pesquisa não encontrou resultados';
 
-$messages['nospellerrors'] = 'Nenhum erro ortográfico foi encontrado';
+$messages['searching'] = 'Pesquisando...';
+
+$messages['checking'] = 'Verificando...';
 
-$messages['checkingmail'] = 'Verificando novas mensagens...';
+$messages['nospellerrors'] = 'Nenhum erro ortográfico encontrado';
 
-$messages['savingmessage'] = 'Salvando a mensagem...';
+$messages['folderdeleted'] = 'Pasta exclu�da com sucesso';
 
-$messages['messagesaved'] = 'Mensagem salva como rascunho';
 
-$messages['folderdeleted'] = 'Pasta excluida com sucesso';
 
-?>
+?>
\ No newline at end of file